1
This commit is contained in:
parent
1a27280593
commit
60b57a0082
@ -19,7 +19,7 @@
|
|||||||
"type" : "uniCloud"
|
"type" : "uniCloud"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"playground" : "custom",
|
"playground" : "standard",
|
||||||
"type" : "uni-app:app-android"
|
"type" : "uni-app:app-android"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
|||||||
@ -2506,17 +2506,10 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
<<<<<<< HEAD
|
|
||||||
"path": "pages/projectEnd/trainPlan/searchTeam/personList",
|
"path": "pages/projectEnd/trainPlan/searchTeam/personList",
|
||||||
"style": {
|
"style": {
|
||||||
"navigationBarTitleText": ""
|
"navigationBarTitleText": "",
|
||||||
=======
|
|
||||||
"path" : "pages/projectEnd/trainPlan/searchTeam/personList",
|
|
||||||
"style" :
|
|
||||||
{
|
|
||||||
"navigationBarTitleText" : "",
|
|
||||||
"onReachBottomDistance": 100
|
"onReachBottomDistance": 100
|
||||||
>>>>>>> 8d4c6f69b5f932e4842d3f9ddd13043de9837210
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
<template>
|
<template>
|
||||||
<view class="fullHeight">
|
<view class="fullHeight">
|
||||||
<levitatedsphere id="levitatedsphere" :x="100" :y="80"></levitatedsphere>
|
<!-- <levitatedsphere id="levitatedsphere" :x="100" :y="80"></levitatedsphere> -->
|
||||||
<view>
|
<view>
|
||||||
<!-- :webview-styles="styles" -->
|
<!-- :webview-styles="styles" -->
|
||||||
<web-view class="webView" :src="work_url" :fullscreen="false" @onPostMessage="handlePostMessage">
|
<web-view class="webView" :src="work_url" :fullscreen="false" @onPostMessage="handlePostMessage">
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user