Merge branch 'develop'

kustomization/overlays/dev/kustomization.yaml

@@ -13,4 +13,4 @@ patches:
 images:
 - name: REGISTRY/NAMESPACE/IMAGE:TAG
   newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly-dev/h5
-  newTag: acd42330a41342e32245932075947d06ec119e22
+  newTag: fd29e8b214f66be537ad4af0b51742bfb5b46d08

src/pages/index/comp/network-list/index.vue

@@ -2,11 +2,8 @@
   <view class="network-list">
     <scroll-view v-if="!isclick" class="list-view" scroll-y>
       <view v-for="(i, j) in list" :key="j" class="list-item" @click="handleSelect(j)">
-        <image
-          class="item-image"
-          src="https://lanhu-dds-backend.oss-cn-beijing.aliyuncs.com/merge_image/imgs/e9381486ae2144058e2743f3a92178ce_mergeImage.png"
-          mode="widthFix"
-        />
+        <image class="item-image" :src="i.brandLogo" mode="widthFix" />
+        <!--https://lanhu-dds-backend.oss-cn-beijing.aliyuncs.com/merge_image/imgs/e9381486ae2144058e2743f3a92178ce_mergeImage.png-->
         <view class="item-content">
           <view class="content-title">{{ i.companyName }}</view>
           <view class="serve">
@@ -91,7 +88,7 @@ const handleSelect = (j: number) => {
 }
 // 组件挂载
 onMounted(() => {
-  console.log(props.list)
+  console.log('列表组件 --->', props.list)
 })
 </script>
 <style scoped lang="scss">

src/pages/index/index.vue

@@ -84,6 +84,7 @@ export default {
     // 设置当前定位
     this.location = { lat: Number(lat), lng: Number(lng) }
     this.getServiceBitmap()
+    // console.log('执行到此处 --->', option)
   },
   methods: {
     // 切换类型