Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
visualcloud
/
Vmatrix-client
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Wiki
Members
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
989bf579
authored
Jan 13, 2020
by
hank
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改ios 白屏
parent
e3a1723c
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
18 additions
and
16 deletions
+18
-16
src/utils/request.js
+1
-1
src/views/tempaltes/editMore.vue
+17
-15
No files found.
src/utils/request.js
View file @
989bf579
...
@@ -7,7 +7,7 @@ import { getToken, removeToken } from "@/utils/auth";
...
@@ -7,7 +7,7 @@ import { getToken, removeToken } from "@/utils/auth";
// console.log(process.env)
// console.log(process.env)
const
service
=
axios
.
create
({
const
service
=
axios
.
create
({
baseURL
:
process
.
env
.
VUE_APP_BASE_API
,
// api 的 base_url
baseURL
:
process
.
env
.
VUE_APP_BASE_API
,
// api 的 base_url
timeout
:
3
00
*
1000
,
// 请求超时时间, 30秒
timeout
:
5
00
*
1000
,
// 请求超时时间, 30秒
withCredentials
:
true
withCredentials
:
true
});
});
...
...
src/views/tempaltes/editMore.vue
View file @
989bf579
...
@@ -160,15 +160,6 @@
...
@@ -160,15 +160,6 @@
:src=
"templateData.frameUrl+'?isEdit=1&filmId='+templateData.filmId + '#' + time"
:src=
"templateData.frameUrl+'?isEdit=1&filmId='+templateData.filmId + '#' + time"
frameborder=
"0"
frameborder=
"0"
></iframe>
></iframe>
<iframe
style=
"height: 0px;width: 100%;"
v-show=
"false"
v-if=
"isIos && dataLoaded"
@
load=
"iframetestLoad"
scrolling=
"no"
:src=
"templateData.frameUrl+'?isEdit=1&filmId='+templateData.filmId + '#' + time"
frameborder=
"0"
></iframe>
<div
<div
class=
"iframe-container"
class=
"iframe-container"
:style=
"!isIos ? 'width: 100vw' : ''"
:style=
"!isIos ? 'width: 100vw' : ''"
...
@@ -254,9 +245,9 @@
...
@@ -254,9 +245,9 @@
<van-button
type=
"info"
@
click=
"enterSubmit"
style=
"width: 100%"
>
发布
</van-button>
<van-button
type=
"info"
@
click=
"enterSubmit"
style=
"width: 100%"
>
发布
</van-button>
</div>
</div>
<van-action-sheet
v-model=
"showSheet"
:round=
"true"
:actions=
"actions"
@
select=
"onSheetSelect"
/>
<van-action-sheet
v-model=
"showSheet"
:round=
"true"
:actions=
"actions"
@
select=
"onSheetSelect"
/>
<van-popup
v-model=
"isPreview"
style=
"width:100%"
>
<
!--
<
van-popup
v-model=
"isPreview"
style=
"width:100%"
>
<preview
v-if=
"isPreview"
:myonClickLeft=
"colsePreview"
></preview>
<preview
v-if=
"isPreview"
:myonClickLeft=
"colsePreview"
></preview>
</van-popup>
</van-popup>
-->
<van-popup
v-model=
"pageViews"
style=
"width:100%"
position=
"right"
>
<van-popup
v-model=
"pageViews"
style=
"width:100%"
position=
"right"
>
<div
class=
"page-container"
>
<div
class=
"page-container"
>
<div
class=
"page-content-tips"
>
备注:长按移动模板顺序
</div>
<div
class=
"page-content-tips"
>
备注:长按移动模板顺序
</div>
...
@@ -270,7 +261,7 @@
...
@@ -270,7 +261,7 @@
:list=
"templateData.listData"
:list=
"templateData.listData"
>
>
<div
class=
"page-item"
v-for=
"(item, index) in templateData.listData"
:key=
"index"
>
<div
class=
"page-item"
v-for=
"(item, index) in templateData.listData"
:key=
"index"
>
<div
name=
"clear"
class=
"delete-page"
@
click=
"deletePage(index)"
></div>
<div
name=
"clear"
class=
"delete-page"
@
click=
"deletePage(index)"
></div>
<div
class=
"page-item-item"
>
<div
class=
"page-item-item"
>
<div
<div
:src=
"item.thumb"
:src=
"item.thumb"
...
@@ -292,7 +283,7 @@
...
@@ -292,7 +283,7 @@
<
script
>
<
script
>
import
NavBar
from
"@/views/layout/navbar"
;
import
NavBar
from
"@/views/layout/navbar"
;
import
preview
from
"./preview"
;
//
import preview from "./preview";
// import slider from "./slider";
// import slider from "./slider";
import
{
swiper
,
swiperSlide
}
from
"vue-awesome-swiper"
;
import
{
swiper
,
swiperSlide
}
from
"vue-awesome-swiper"
;
import
"swiper/dist/css/swiper.css"
;
import
"swiper/dist/css/swiper.css"
;
...
@@ -520,7 +511,7 @@ export default {
...
@@ -520,7 +511,7 @@ export default {
// 放页面拖拽发生时执行
// 放页面拖拽发生时执行
this
.
message
({
this
.
message
({
type
:
"setList"
,
type
:
"setList"
,
pages
:
this
.
templateData
.
listData
pages
:
this
.
templateData
.
listData
});
});
},
},
setList
()
{
setList
()
{
...
@@ -652,6 +643,16 @@ export default {
...
@@ -652,6 +643,16 @@ export default {
this
.
gifloaded
=
true
;
this
.
gifloaded
=
true
;
this
.
iframeLoaded
=
true
;
this
.
iframeLoaded
=
true
;
this
.
setList
();
this
.
setList
();
if
(
this
.
isIos
)
{
this
.
isPreview
=
true
;
this
.
$nextTick
(()
=>
{
setTimeout
(()
=>
{
this
.
isPreview
=
false
;
},
1000
);
// window.frames["tiframe"].location.reload()
});
}
},
},
pageShow
()
{
pageShow
()
{
this
.
message
({
this
.
message
({
...
@@ -879,7 +880,7 @@ export default {
...
@@ -879,7 +880,7 @@ export default {
},
},
components
:
{
components
:
{
NavBar
,
NavBar
,
preview
,
//
preview,
draggable
,
draggable
,
editMenu
,
editMenu
,
swiper
,
swiper
,
...
@@ -1146,6 +1147,7 @@ export default {
...
@@ -1146,6 +1147,7 @@ export default {
margin
:
0
auto
;
margin
:
0
auto
;
padding-left
:
22px
;
padding-left
:
22px
;
padding-right
:
22px
;
padding-right
:
22px
;
min-height
:
169px
;
padding-top
:
16px
;
padding-top
:
16px
;
padding-bottom
:
16px
;
padding-bottom
:
16px
;
margin-bottom
:
10px
;
margin-bottom
:
10px
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment