冲突合并
This commit is contained in:
commit
133e28f941
|
|
@ -13,7 +13,7 @@
|
||||||
"type" : "uniCloud"
|
"type" : "uniCloud"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"playground" : "standard",
|
"playground" : "custom",
|
||||||
"type" : "uni-app:app-android"
|
"type" : "uni-app:app-android"
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
|
|
|
||||||
File diff suppressed because it is too large
Load Diff
|
|
@ -102,7 +102,7 @@
|
||||||
<view @tap="onPreviewImage(index)" v-for="(item, index) in standGuardList" :key="index">
|
<view @tap="onPreviewImage(index)" v-for="(item, index) in standGuardList" :key="index">
|
||||||
<image
|
<image
|
||||||
class="image-content"
|
class="image-content"
|
||||||
:src="`${config.loginBaseUrl}ynPlan${item.imgPath}`"
|
:src="`http://192.168.0.14:19191/ynPlanApp${item.imgPath}`"
|
||||||
mode="scaleToFill"
|
mode="scaleToFill"
|
||||||
lazy-load="true"
|
lazy-load="true"
|
||||||
></image>
|
></image>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue