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: fd29e8b214f66be537ad4af0b51742bfb5b46d08
+  newTag: e748e155ed05e7ae1fbd92eb6610101f9d62f7ba

src/App.vue

@@ -21,4 +21,6 @@ onHide(() => {
 <style lang="scss">
 /* 注意要写在第一行，同时给style标签加入lang="scss"属性 */
 @import 'uview-plus/theme.scss';
+//动画
+@import '@/static/style/animate.css';
 </style>

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

 <template>
-  <view class="network-list">
+  <view class="network-list animate__animated animate__fadeIn">
     <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="i.brandLogo" mode="widthFix" />
@@ -35,13 +35,9 @@
         <view class="item-distance">据你{{ i.distance }}km </view>
       </view>
     </scroll-view>
-    <scroll-view v-else class="list-view-click" scroll-y>
+    <scroll-view v-else class="list-view-click animate__animated animate__slideInRight" 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" />
         <view class="item-content">
           <view class="content-title">{{ i.companyName }}</view>
           <view class="serve">
@@ -95,14 +91,16 @@ onMounted(() => {
 .network-list {
   position: fixed;
   // top: calc(100vh - 704rpx + 110rpx);
-  bottom: 44rpx;
+  //bottom: 44rpx;
+  bottom: 0;
   left: 0;
   width: 100%;
   z-index: 20;
   .list-view {
-    height: calc(100vh - 156rpx - 110rpx - (100vh - 504rpx));
+    //height: calc(100vh - 156rpx - 110rpx - (100vh - 504rpx));
     // 屏幕高度 - 底部 - 搜索 - 地图
-    height: 424rpx;
+    //height: 424rpx;
+    height: 464rpx;
     overflow-y: auto;
     //background-color: lightpink;
     background-color: #fff;
@@ -142,6 +140,7 @@ onMounted(() => {
         overflow: hidden;
         white-space: nowrap;
         text-overflow: ellipsis;
+        margin-bottom: 16rpx;
       }
       .serve {
         display: flex;
@@ -153,7 +152,7 @@ onMounted(() => {
             height: 32rpx;
             padding: 0 6rpx;
             line-height: 28rpx;
-            height: 28rpx;
+            //height: 28rpx;
             background: linear-gradient(270deg, #fff1ec 0%, #ffffff 54%, #ffe5db 100%);
             border-radius: 4rpx;
             border: 1rpx solid #ffb099;
@@ -205,7 +204,7 @@ onMounted(() => {
     .item-distance {
       position: absolute;
       right: 22rpx;
-      top: 38rpx;
+      top: 18rpx;
       // width: 90rpx;
       height: 28rpx;
       font-size: 20rpx;

src/pages/index/index.vue

@@ -18,7 +18,7 @@
       <text>列表</text>
     </view>
     <!-- 入驻飞享云 -->
-    <view v-if="!isclick" class="network-enter">
+    <view v-if="!isclick" class="network-enter animate__animated animate__slideInUp">
       <view class="network-enter-super">
         <image src="../../static/img/supermen.png" mode="widthFix" />
       </view>
@@ -65,8 +65,20 @@ export default {
     return {
       location: { lat: 22.539692, lng: 113.888588 },
       networkTypeList: [
-        { type: 0, name: '飞手团队', action: '派单', tagId: 5 },
-        { type: 1, name: '租赁商家', action: '租设备', tagId: 3 },
+        {
+          type: 0,
+          name: '飞手团队',
+          action: '派单',
+          tagId: 5,
+          path: '/page-service/service-category/index'
+        },
+        {
+          type: 1,
+          name: '租赁商家',
+          action: '租设备',
+          tagId: 3,
+          path: '/page-rent/rent-store/index'
+        },
         { type: 2, name: '培训机构', action: '报名培训', tagId: 4 },
         { type: 3, name: '维修网点', action: '维修设备', tagId: 10 }
       ],
@@ -108,7 +120,7 @@ export default {
         this.networkList = res.result.list || []
         setTimeout(() => {
           if (this.networkList.length !== 0) {
-            this.handleSelect(this.networkList[0])
+            this.handleSelect(this.networkList[0], 'map')
           } else {
             this.removeAllOverlay()
           }
@@ -116,7 +128,17 @@ export default {
       }
     },
     // 网点点击事件
-    handleSelect(e) {
+    handleSelect(e, from) {
+      if (from !== 'map') {
+        // 当前选择的类型
+        const item = this.networkTypeList[this.currentTypeIndex]
+        // 如果存在路径
+        if (item?.path) {
+          weChatSDK.miniProgram.navigateTo({
+            url: `${item?.path}?id=${e?.backUserAccountId}`
+          })
+        }
+      }
       this.setCenterPoint(e)
     },
     // 显示网点列表
@@ -243,7 +265,7 @@ import weChatSDK from 'z-weixin-ts'
 			openInfo(obj) {
 				// 构建信息窗体中显示的内容
 				const domStr = `
-					<div class="map-open-info">
+					<div class="map-open-info animate__animated animate__fadeIn">
                         <div class="info-left">
                             <div class="park-name">
                                 ${obj.companyName || '-'}
@@ -266,7 +288,7 @@ import weChatSDK from 'z-weixin-ts'
 				infoWindow.open(this.map, obj.position);
 				const navigate = document.querySelector('.navigate');
 				navigate.onclick = () => {
-          uni.openLocation({
+          weChatSDK.openLocation({
                     latitude: obj.lat,
                     longitude: obj.lon,
                     name: obj.companyName,
@@ -285,11 +307,10 @@ import weChatSDK from 'z-weixin-ts'
 			},
 			// 设置中心点
 			setCenterPoint(e){
-				console.log('执行到此处 --->',e)
 				this.map.setCenter([e.lon, e.lat])
 				this.openInfo({position:[e.lon, e.lat],...e});
-			},
-		},
+			}
+		}
 	};
 </script>
 <style lang="scss" scoped>
@@ -394,7 +415,7 @@ import weChatSDK from 'z-weixin-ts'
   }
   .network-enter {
     position: fixed;
-    bottom: calc(424rpx + 44rpx);
+    bottom: calc(424rpx + 40rpx);
     left: 0;
     width: 100%;
     height: 238rpx;
@@ -422,20 +443,20 @@ import weChatSDK from 'z-weixin-ts'
       }
       text {
         display: block;
-        width: 318rpx;
+        width: 338rpx;
         height: 42rpx;
         line-height: 42rpx;
         font-size: 30rpx;
         margin-top: 10rpx;
-        font-family: PingFangSC-Medium, PingFang SC;
+        //font-family: PingFangSC-Medium, PingFang SC;
         font-weight: 500;
         color: #ffffff;
       }
     }
     .network-enter-willjoin {
-      padding-top: 22rpx;
+      padding-top: 32rpx;
       margin-left: 82rpx;
-      animation: scale-animation 0.638s infinite;
+      animation: scale-animation 2.638s infinite;
       margin-right: 30rpx;
       image {
         width: 198rpx;
@@ -445,10 +466,10 @@ import weChatSDK from 'z-weixin-ts'
   }
   .network-type {
     position: fixed;
-    bottom: calc(424rpx + 44rpx);
+    bottom: calc(424rpx + 40rpx);
     left: 0;
     width: 100%;
-    height: 104rpx;
+    height: 86rpx;
     background: linear-gradient(180deg, rgba(255, 255, 255, 0.8) 0%, #ffffff 100%);
     // box-shadow: 0rpx -8rpx 16rpx 0rpx rgba(219, 45, 0, 0.5);
     border-radius: 48rpx 48rpx 0rpx 0rpx;
@@ -470,7 +491,8 @@ import weChatSDK from 'z-weixin-ts'
       //   box-shadow: 4rpx 8rpx 12rpx 0 rgba(135, 135, 135, 0.17);
     }
     .item-active {
-      line-height: 34rpx;
+      //line-height: 34rpx;
+      font-size: 30rpx;
       font-weight: 600;
       color: #000000;
       position: relative;
@@ -483,7 +505,7 @@ import weChatSDK from 'z-weixin-ts'
       background: #ff5321;
       border-radius: 5rpx;
       position: absolute;
-      top: 64rpx;
+      top: 54rpx;
       left: 50%;
       transform: translateX(-50%);
     }