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: eb4d0c480b89284c2d5cd9b2e577aedb27ed723f
+  newTag: 4a5a463823e22b9f0b46a0d071e9830626981f2a

src/manifest.json

 {
-    "name" : "hello",
+    "name" : "",
     "appid" : "__UNI__4DCD124",
-    "description" : "",
+    "description" : "云享飞",
     "versionName" : "1.0.0",
     "versionCode" : "100",
     "transformPx" : false,

src/pages.json

@@ -4,7 +4,7 @@
         {
             "path": "pages/index/index",
             "style": {
-                "navigationBarTitleText": "",
+                "navigationBarTitleText": "全国网点",
                 "navigationStyle": "custom"
             }
         },

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

@@ -37,6 +37,10 @@
     </scroll-view>
     <scroll-view v-else class="list-view-click animate__animated animate__slideInRight" scroll-y>
       <view v-for="(i, j) in getCurrentList" :key="j" class="list-item" @click="handleSelect(j)">
+        <view class="item-type">{{ currentType.name }}</view>
+        <view class="item-arrow">
+          <u-icon name="arrow-right"></u-icon>
+        </view>
         <image class="item-image" :src="i.brandLogo" mode="widthFix" />
         <view class="item-content">
           <view class="content-title">{{ i.companyName }}</view>
@@ -78,6 +82,16 @@ const props = defineProps({
   currentItem: {
     type: Object as unknown as PropType<ListType[0]>,
     default: () => ({})
+  },
+  currentType: {
+    type: Object as unknown as PropType<{
+      type: number
+      name: string
+      action: string
+      tagId: number
+      path?: string
+    }>,
+    default: () => ({})
   }
 })
 // 事件
@@ -97,7 +111,7 @@ watch(
   () => props.currentItem,
   () => {
     currentItem.value = props.currentItem
-    console.log(props.currentItem)
+    // console.log(props.currentItem)
   }
 )
 </script>
@@ -237,7 +251,7 @@ watch(
     z-index: 30;
     overflow-x: auto;
     box-sizing: border-box;
-    padding-left: 16rpx;
+    padding-left: 20rpx;
     .list-item {
       position: relative;
       display: flex;
@@ -251,11 +265,27 @@ watch(
       .item-content {
         margin-top: 32rpx;
       }
+      .item-type {
+        position: absolute;
+        top: 0;
+        left: 0;
+        height: 54rpx;
+        font-size: 22rpx;
+        color: #fefffe;
+        line-height: 32rpx;
+        padding: 2rpx 22rpx 20rpx 10rpx;
+      }
+      .item-arrow {
+        position: absolute;
+        right: 24rpx;
+        top: 32rpx;
+      }
     }
     .list-item::before {
-      content: '飞手团队';
+      content: '';
       display: block;
       height: 54rpx;
+      min-width: 128rpx;
       font-size: 22rpx;
       color: #fefffe;
       line-height: 32rpx;

src/pages/index/index.vue

@@ -48,6 +48,7 @@
       :list="networkList"
       :isclick="isclick"
       :current-item="currentItem"
+      :current-type="networkTypeList[currentTypeIndex]"
       @on-select="handleSelect"
     />
     <view v-else class="network-none">空空如也</view>
@@ -255,6 +256,9 @@ import weChatSDK from 'z-weixin-ts'
 					this.markers.push(labelMarker);
 					labelMarker.on('click', (e) => {
 					  this.currentItem = {...element,...this.networkList[index]};
+					  uni.setNavigationBarTitle({
+              title: this.networkTypeList[this.currentTypeIndex]?.name
+            })
 					  // console.log('执行到此处 --->', {...element,...this.networkList[index]})
 						this.openInfo({...element,...this.networkList[index]});
             this.isclick = true
@@ -288,7 +292,9 @@ import weChatSDK from 'z-weixin-ts'
                                 ${obj.companyName || '-'}
                             </div>
                             <div class="location">
-                                <span class="location-info"> ${this.networkTypeList[this.currentTypeIndex].name} | 距你${obj.distance}km </span>
+                                <span class="location-info">
+                                <span style="color: #fe7512">${this.networkTypeList[this.currentTypeIndex].name}</span>
+                                 | 距你${obj.distance}km </span>
                             </div>
                         </div>
                         <div class="info-right">