冲突合并

This commit is contained in:
BianLzhaoMin 2024-11-21 13:51:56 +08:00
commit 133e28f941
3 changed files with 640 additions and 431 deletions

View File

@ -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

View File

@ -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>