冲突合并

2024-11-21 13:51:56 +08:00 · 2024-11-21 13:51:56 +08:00 · 133e28f941
parent 82c3fb357d 76d7d63731
commit 133e28f941
3 changed files with 640 additions and 431 deletions
--- a/.hbuilderx/launch.json
+++ b/.hbuilderx/launch.json
@ -13,7 +13,7 @@
            "type" : "uniCloud"
        },
        {
-            "playground" : "standard",
+            "playground" : "custom",
            "type" : "uni-app:app-android"
        }
    ]
--- a/pages/realName/index/pages/personDetail.vue
+++ b/pages/realName/index/pages/personDetail.vue
--- a/pages/workPlan/workPlan-details/index.vue
+++ b/pages/workPlan/workPlan-details/index.vue
@ -102,7 +102,7 @@
          <view @tap="onPreviewImage(index)" v-for="(item, index) in standGuardList" :key="index">
            <image
              class="image-content"
-              :src="`${config.loginBaseUrl}ynPlan${item.imgPath}`"
+              :src="`http://192.168.0.14:19191/ynPlanApp${item.imgPath}`"
              mode="scaleToFill"
              lazy-load="true"
            ></image>