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