Feat(我的):按照新设计调整

assets/css/style.less

@@ -2417,11 +2417,25 @@ page {
 
 .user .wrapper .myOrder .title,
 .user .wrapper .myService .title {
-  height: 0.88*100rpx;
+  height: 88rpx;
-  padding: 0 0.3*100rpx;
+  padding: 0 30rpx;
-  border-bottom: 1px dashed #eee;
+  border-bottom: 1px solid #ECECEE;
-  font-size: 0.3*100rpx;
+  font-size: 28rpx;
-  color: #282828;
+  color: #333;
+  font-weight: 600;
+}
+.user .wrapper .myService .title {
+  border-bottom: 0;
+}
+
+.user .wrapper .myOrder .title .line,
+.user .wrapper .myService .title .line {
+  display: block;
+  width: 6rpx;
+  height: 28rpx;
+  margin: 0 15rpx 0 0;
+  border-radius: 6rpx;
+  background-color: #FF564A;
 }
 
 .user .wrapper .myOrder .title .allOrder {

pages/user/User/index.vue

@@ -1,19 +1,21 @@
 <template>
   <view class="user">
     <hx-navbar
-        title="云南香道滇官方商城"
+        title="地标文化特产"
         :fixed="true"
         :back="false"
         :left-slot="false"
         :right-slot="false"
         statusBarFontColor="#ffffff"
-        color="#333333"
+        color="#ffffff"
         :bgImgHeight="bgImgHeight"
-        :background-color="[246,246,246]"
+        :background-color="[209,68,74]"
     />
-
+    <view
-    <view v-if="$store.getters.token||userInfo.uid" class="acea-row row-column" style="background: #f6f6f6;">
+      v-if="$store.getters.token || userInfo.uid"
-
+      class="acea-row row-column"
+      style="background: #fff;"
+    >
       <view class="header acea-row row-column"
             style="flex-wrap: nowrap;background: #fff !important;margin: 0 30rpx;border-radius: 16rpx;box-shadow: 0px 6rpx 12rpx rgba(0, 0, 0, 0.1);">
         <view class="innTag acea-row row-middle row-center align-left" @click="innTagClick" v-if="userInfo.hotel != null && userInfo.hotel.checkState=='C1'">
@@ -138,17 +140,14 @@
           </view>
         </view>
       </view>
-
+      <view class="my-wrapper wrapper">
-      <view class="wrapper" style="margin-top: 20rpx !important;margin-bottom: 30rpx !important;">
         <view class="myOrder">
           <view class="title acea-row row-between-wrapper">
             <view class="acea-row row-middle">
-              <text
+              <text class="line"></text>
-                  style="width: 6rpx;background: #FF564A;height: 28rpx;border-radius: 3rpx;margin-right:10rpx;"></text>
+              <text>我的订单</text>
-              <text style="font-size: 26rpx;color: #333333;font-weight: 400;">我的订单</text>
             </view>
             <text @click="goMyOrder(0)" class="allOrder">
-              <text>全部订单</text>
               <text class="iconfont icon-jiantou"></text>
             </text>
           </view>
@@ -213,82 +212,26 @@
 
         <!-- 我的服务开始 -->
         <view class="myService" style="margin-top: 30rpx !important;">
-          <view class="title acea-row row-middle" style="border-bottom: 1px solid #f6f6f6;padding: 10rpx 0;">
+          <view class="title acea-row row-middle">
-            <text
+            <text class="line"></text>
-                style="width: 6rpx;background: #FF564A;height: 28rpx;border-radius: 3rpx;margin-right:10rpx;margin-left: 30rpx;"></text>
+            <text>所有功能</text>
-            <text style="font-size: 26rpx;color:#333333;font-weight: 400;">所有功能</text>
           </view>
-          <view class="serviceList acea-row row-middle">
+          <view class="my-tool-wrap">
-
+            <view class="cont">
-            <view class="item" @click="goCoupons()">
+              <view
-              <view class="pictrue">
+                v-for="(item, index) in toolList"
-                <image :src="webUrl+'/20231130162907823563.png'"/>
+                :key="index"
+                class="tool-item flex"
+                @click="toolItemClickHandle(item)"
+              >
+                <image
+                  :src="webUrl + item.icon"
+                  class="img"
+                />
+                <view class="txt">
+                  {{ item.text }}
                 </view>
-              <view class="cell">我的优惠券</view>
-              <text class="iconfont icon-jiantou"></text>
               </view>
-
-            <view class="item" @click="goGroupManage()">
-              <view class="pictrue">
-                <image :src="webUrl+'/20221010165555111608.png'"/>
-              </view>
-              <view class="cell">团队管理</view>
-              <text class="iconfont icon-jiantou"></text>
-            </view>
-
-            <view class="item" @click="goAddressManage()">
-              <view class="pictrue" style="margin-left: -6rpx;">
-                <image :src="webUrl+'/20221010165951067571.png'"/>
-              </view>
-              <view class="cell">物流地址管理</view>
-              <text class="iconfont icon-jiantou"></text>
-            </view>
-
-            <view class="item" @click="goBankcardManage()">
-              <view class="pictrue">
-                <image :src="webUrl+'/20221010165555111608.png'"/>
-              </view>
-              <view class="cell">银行卡管理</view>
-              <text class="iconfont icon-jiantou"></text>
-            </view>
-
-            <!--            <view v-if="userInfo.hotel==null || userInfo.hotel.checkState!='C1'" class="item" @click="goInnApply()">-->
-            <!--              <view class="pictrue">-->
-            <!--                <image :src="webUrl+'/20221010170138874734.png'"/>-->
-            <!--              </view>-->
-            <!--              <view class="cell acea-row row-between row-middle" style="flex-wrap: nowrap;">-->
-            <!--                <view class="" style="flex-shrink: 0;margin-right: 10rpx;">申请我的店铺</view>-->
-            <!--                <view v-if="userInfo.hotel!=null" class="acea-row row-column row-right" style="text-align: right;">-->
-            <!--                  <view class="" style="font-size: 24rpx;color: #0DC5C5;">-->
-            <!--                    {{ checkStateStr(userInfo.hotel.checkState) }}-->
-            <!--                  </view>-->
-
-            <!--                  <block v-if="userInfo.hotel.checkState=='C2' && userInfo.hotel.checkMsg.length>0">-->
-            <!--                    <text style="font-size: 24rpx;color: #aaa;">驳回原因:{{ userInfo.hotel.checkMsg }}</text>-->
-            <!--                  </block>-->
-            <!--                </view>-->
-
-            <!--              </view>-->
-            <!--              <text class="iconfont icon-jiantou"></text>-->
-            <!--            </view>-->
-
-            <view v-if="userInfo.hotel != null && userInfo.hotel.checkState=='C1'" class="item"
-                  @click="goInnInfoEdit()">
-              <view class="pictrue">
-                <image :src="webUrl+'/20221010170138874734.png'"/>
-              </view>
-              <view class="cell">
-                <view class="">修改店铺信息</view>
-              </view>
-              <text class="iconfont icon-jiantou"></text>
-            </view>
-
-            <view class="item" @click="goRoomLogs()">
-              <view class="pictrue">
-                <image :src="webUrl+'/20221010170316834157.png'"/>
-              </view>
-              <view class="cell">客服历史会话</view>
-              <text class="iconfont icon-jiantou"></text>
             </view>
           </view>
         </view>
@@ -352,7 +295,63 @@ export default {
         "unpaidCount": 0,
         "unshippedCount": 0
       },
-      spreadPoster: {}
+      spreadPoster: {},
+      toolList: [
+        {
+          text: '我的优惠券',
+          url: '/pkg_user/views/myCoupons',
+          icon: '/icon/icon-coupon.png',
+          allowEnter: true
+        },
+        {
+          text: '物流地址',
+          url: '/pages/user/address/AddressManagement/index',
+          icon: '/icon/icon-addr.png',
+          allowEnter: true
+        },
+        {
+          text: '我的收藏',
+          url: '/pkg_user/views/myFavorite',
+          icon: '/icon/icon-star.png',
+          allowEnter: true
+        },
+        {
+          text: '银行卡管理',
+          url: '/pkg_user/views/bankCardList',
+          icon: '/icon/icon-card.png',
+          allowEnter: true
+        },
+        {
+          text: '账户明细',
+          url: '/pages/user/UserBill/index',
+          icon: '/icon/icon-coin.png',
+          allowEnter: true
+        },
+        {
+          text: '提现申请',
+          url: '/pkg_user/views/withdrawal',
+          icon: '/icon/icon-money.png',
+          allowEnter: true
+        },
+        {
+          text: '团队管理',
+          url: '/pages/user/promotion/UserPromotion/index',
+          icon: '/icon/icon-users.png',
+          allowEnter: true
+        },
+        {
+          text: '帮助中心',
+          url: '',
+          icon: '/icon/icon-help.png',
+          allowEnter: true
+        },
+        {
+          text: '设置中心',
+          url: '/pkg_user/views/personalData',
+          icon: '/icon/icon-setting.png',
+          allowEnter: true
+        }
+      ]
     };
   },
   computed: mapGetters(["userInfo"]),
@@ -850,6 +849,13 @@ export default {
               duration: 1500
             });
           })
+    },
+    toolItemClickHandle(item) {
+      const url = item.url
+      if (!url || !item.allowEnter) {
+        return
+      }
+      uni.navigateTo({ url })
     }
   },
   watch: {
@@ -1017,13 +1023,13 @@ export default {
 }
 
 .myOrder {
-  box-shadow: 0px 6rpx 12rpx rgba(0, 0, 0, 0.1);
+  border-radius: 24rpx;
-  border-radius: 16rpx;
+  background: #F6F6F6 !important;
 }
 
 .myService {
-  box-shadow: 0px 6rpx 12rpx rgba(0, 0, 0, 0.1);
+  border-radius: 24rpx;
-  border-radius: 16rpx;
+  background: #F6F6F6 !important;
 }
 
 .user .wrapper .nav {
@@ -1101,4 +1107,34 @@ export default {
   //border-bottom-left-radius: 16rpx;
   //border-bottom-right-radius: 16rpx
 }
+.my-wrapper {
+  padding: 30upx;
+  .my-tool-wrap {
+    padding: 0 24rpx 24upx 24upx;
+    .cont {
+      display: flex;
+      flex-wrap: wrap;
+      justify-content: space-between;
+      padding: 24rpx 24rpx 0 24rpx;
+      margin: 0 0 24rpx 0;
+      border-radius: 24rpx;
+      background-color: #fff;
+      .tool-item {
+        width: 33.3333%;
+        margin: 0 0 36rpx 0;
+        align-items: center;
+        justify-content: center;
+        .img {
+          width: 28px;
+          height: 28px;
+        }
+        .txt {
+          padding: 0 0 0 6rpx;
+          color: #666;
+          font-size: 26rpx;
+        }
+      }
+    }
+  }
+}
 </style>