Merge remote-tracking branch 'origin/ckf' into develop

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

@@ -83,7 +83,6 @@ import { InterListType } from '@/api/interface'
 import { listCompanyInfoByCoopIdType } from '@/api/interface/common'
 
 type ListType = InterListType<listCompanyInfoByCoopIdType>
-
 // 传参
 const props = defineProps({
   list: {
@@ -123,7 +122,6 @@ const emits = defineEmits(['onSelect'])
 const handleSelect = (j: number) => {
   emits('onSelect', props.list[j])
 }
-
 // const toCooperation = () => {
 //   weChatSDK.miniProgram.navigateTo({
 //     url: '/page-mine/help-center/index'
@@ -138,13 +136,14 @@ onMounted(() => {
 .network-list {
   position: fixed;
   // top: calc(100vh - 704rpx + 110rpx);
-  top: 1156rpx;
+  bottom: 44rpx;
   left: 0;
   width: 100%;
+  z-index: 20;
   .list-view {
-    //height: calc(100vh - 156rpx - 110rpx - (100vh - 504rpx));
+    height: calc(100vh - 156rpx - 110rpx - (100vh - 504rpx));
     // 屏幕高度 - 底部 - 搜索 - 地图
-    height: 212rpx;
+    height: 424rpx;
     overflow-y: auto;
     //background-color: lightpink;
     background-color: #fff;
@@ -275,6 +274,24 @@ onMounted(() => {
       box-shadow: 0rpx 16rpx 32rpx 0rpx rgba(151, 151, 151, 0.5);
       border-radius: 24rpx;
       margin: 0 16rpx;
+      .item-content {
+        margin-top: 32rpx;
+      }
+    }
+    .list-item::before {
+      content: '飞手团队';
+      display: block;
+      height: 54rpx;
+      font-size: 22rpx;
+      color: #fefffe;
+      line-height: 32rpx;
+      padding: 2rpx 22rpx 20rpx 10rpx;
+      box-sizing: border-box;
+      background: url(https://lanhu.oss-cn-beijing.aliyuncs.com/SketchPng3d92bdd59fc666b3fe1d1f66ab351c446f566ebd73f61c6c6be6b918a9b3018d)
+        0 0 / cover no-repeat;
+      position: absolute;
+      top: 0;
+      left: 0;
     }
   }
 }

src/pages/index/index.vue

@@ -4,27 +4,22 @@
     <view class="network-return">
       <image src="../../static/img/return.png" mode="widthFix" />
     </view>
-    <!-- <view class="network-total">
-      <image
-        class="icon"
-        src="https://pad-video-x.oss-cn-shenzhen.aliyuncs.com/file/popup-network-point.png"
-      ></image>
-      <view>服务商158家</view>
-    </view> -->
     <!-- 位置图标 -->
-    <view class="network-location-click">
-      <u-icon
+    <view :class="isclick ? 'network-location-click' : 'network-location'">
+      <!-- <u-icon
         size="18"
         name="https://lanhu.oss-cn-beijing.aliyuncs.com/SketchPngb34fee468ca3e624ae37b2ed7f800c2cbc382947577b1daba895ca28cda483d4"
-      ></u-icon>
+      ></u-icon> -->
+      <image src="../../static/img/mylocation.png" mode="widthFix" />
       <text>我的位置</text>
     </view>
     <!-- 列表图标 -->
     <view :class="['network-list-click', isclick ? 'network-list-show' : '']">
-      <u-icon
+      <!-- <u-icon
         size="18"
         name="https://lanhu.oss-cn-beijing.aliyuncs.com/SketchPngf2561f36b7cad7d458a843b0a01249a692737b67280ad7f5a76b94264dabd383"
-      ></u-icon>
+      ></u-icon> -->
+      <image src="../../static/img/listicon.png" mode="widthFix" />
       <text>列表</text>
     </view>
     <!-- 入驻飞享云 -->
@@ -151,7 +146,7 @@ export default {
                 isclick:false,
 				icon: {
 					type: 'image',
-					image: 'https://lanhu-dds-backend.oss-cn-beijing.aliyuncs.com/merge_image/imgs/dab4b6b6de114edc8b91cd86bc0760c7_mergeImage.png',
+					image: '../../static/img/location-icon.png',
 					size: [24, 24],
 					anchor: 'bottom-center',
 				},
@@ -259,7 +254,7 @@ export default {
                             </div>
                         </div>
                         <div class="info-right">
-                            <img src="../../static/img/navigation.png" alt="">
+                            <image src="../../static/img/navigation.png" mode="widthFix" />
                             <span>导航</span>
                         </div>
 					</div>
@@ -361,7 +356,7 @@ export default {
   .network-location-click,//点击图标之后
   .network-list-click {
     position: fixed;
-    bottom: 642rpx;
+    bottom: calc(686rpx + 44rpx);
     right: 26rpx;
     width: 96rpx;
     height: 96rpx;
@@ -405,7 +400,7 @@ export default {
   }
   .network-enter {
     position: fixed;
-    top: 918rpx;
+    bottom: calc(424rpx + 44rpx);
     left: 0;
     width: 100%;
     height: 238rpx;
@@ -453,7 +448,7 @@ export default {
   }
   .network-type {
     position: fixed;
-    top: 1052rpx;
+    bottom: calc(424rpx + 44rpx);
     left: 0;
     width: 100%;
     height: 104rpx;
@@ -501,12 +496,12 @@ export default {
   }
   .network-none {
     position: fixed;
+    // top: calc(100vh - 704rpx + 110rpx);
+    bottom: 44rpx;
     left: 0;
-    // bottom: 300rpx;
-    top: calc(918rpx + 238rpx);
     width: 100%;
-    height: calc(100vh - 44rpx - 238rpx - 918rpx);
-    line-height: calc(100vh - 44rpx - 238rpx - 918rpx);
+    height: 424rpx;
+    line-height: 424rpx;
     font-size: 22rpx;
     font-weight: 400;
     color: #28292b;