“我的”页面调整

src/pages/my-tea-list/index.vue

@@ -17,8 +17,6 @@
                     </view>
                 </view>
                 <view class="head_option flex_r flex_ac">
-                    <!-- <image class="option_weixin" src="/static/img/weixin.png" mode="" @tap="copyText"></image> -->
-                    <!-- <view class="option_hr"></view> -->
                     <image class="option_phone" src="/static/img/dianhua.png" mode="" @tap="dial(higherInfo.mobile)"></image>
                 </view>
             </view>
@@ -181,11 +179,6 @@ page {
     color: #7f7f7f;
 }
 
-.option_weixin {
-    width: 42rpx;
-    height: 35rpx;
-}
-
 .option_phone {
     width: 36rpx;
     height: 36rpx;
@@ -212,13 +205,6 @@ page {
     border-radius: 50%;
 }
 
-.option_hr {
-    width: 3rpx;
-    height: 66rpx;
-    background: rgba(0, 0, 0, 0.12);
-    margin-left: 30rpx;
-}
-
 .copyBalance {
     padding: 0 10rpx;
     background: #1cbe8c;

src/pages/my/index.vue

@@ -4,7 +4,7 @@
       <!-- 用户信息 -->
       <view class="uerInfo mar_t16 flex_r">
         <view class="user_img">
-          <image @click="upheadimg" class="image" :src="userinfo.head_pic" mode=""></image>
+          <image @click="upheadimg" class="image" :src="userinfo.head_pic"></image>
           <view class="coupon_info flex_r flex_ac" @tap="goToAutonym" v-if="isShiMing">
             完成实名认证，享受更多权益
             <image src="/static/my/f_close.png" mode="widthFix" class="close_icon" @tap.stop="closeAuto">
@@ -31,8 +31,11 @@
             </view>
           </view>
           <view class="user_option flex_r flex_ac flex_je">
-            <image class="code_img" src="/static/my/f_img_code.png" @tap="getImgPage" mode=""></image>
-            <!-- <image class="code_img" src="/static/my/setting.png" @tap="getToSetting"></image> -->
+            <!-- <image class="code_img" src="/static/my/f_img_code.png" @tap="getImgPage"></image> -->
+            <navigator class="flex_c flex_ac" @tap="getImgPage" hover-class="none">
+              <image class="fun_img" src="/static/my/f_img_code.png"></image>
+              <view class="fun_text">分享海报</view>
+            </navigator>
           </view>
         </block>
         <block v-else>
@@ -50,143 +53,120 @@
       </view>
 
       <!-- 账户信息 -->
-      <view class="acc_info">
-        <view class="acc_head flex_r flex_jb">
-          <view class="acc_price">
-            <view class="price_txt">账号余额(元)</view>
-            <view class="price_num dinB">{{ userinfo.user_money }}</view>
-          </view>
-          <view class="C flex_r">
-            <navigator class="recharge flex_r flex_ac flex_jc" url="/pages/top-up/index" hover-class="none">充值</navigator>
-            <navigator class="recharge flex_r flex_ac flex_jc" url="/pages/account/conversion" hover-class="none">转化</navigator>
-            <view class="withdraw flex_r flex_ac flex_jc" @tap="getToCash">提现</view>
-          </view>
-        </view>
-        <view class="info_con flex_r flex_jb">
-          <view class="info_list flex_c flex_jb">
-            <view class="list_name">昨日收益(元)</view>
-            <view class="list_text dinB">{{ userinfo.yesterdayProfit || 0 }}</view>
-          </view>
-          <view class="info_list flex_c flex_jb" @tap="getToAccMoney">
-            <view class="list_name">茶宝</view>
-            <view class="list_text dinB">{{ userinfo.cha_bao || 0 }}</view>
-          </view>
-          <view class="info_list flex_c flex_jb" @tap="getToTeaList">
-            <view class="list_name">社区(人)</view>
-            <view class="list_text dinB">{{ allChaYou || 0 }}</view>
-          </view>
-        </view>
-        <view class="acc_hint mar_t50" @tap="SetHint">如何快速晋升身份权益？看这里>></view>
+      <view class="acc_info flex_r flex_jse">
+        <div class="i_num">
+          <p>茶宝</p>
+          <p class="dinB">{{userinfo.cha_bao}}</p>
+        </div>
+        <div class="i_num">
+          <p>TeaC</p>
+          <p class="dinB">{{userinfo.teac}}</p>
+        </div>
       </view>
       <!-- 账户信息-end -->
     </view>
     <!-- 功能列表 -->
     <view class="fun_container">
       <view class="fun mar_t30">
-        <view class="fun_title">我的账户</view>
+        <view class="fun_title">本地生活</view>
+        <view class="fun_con mar_t50 flex_r flex_ac flex_jb">
+          <navigator v-if="local_uinfo.level_id>1" class="fun_list flex_c flex_ac" url="/pagesB/orderingfood/group" hover-class="none">
+            <image class="fun_img" src="/static/my/l_group.png"></image>
+            <view class="fun_text">我的用户</view>
+          </navigator>
+          <navigator class="fun_list flex_c flex_ac" url="/pagesB/orderingfood/orderlist" hover-class="none">
+            <image class="fun_img" src="/static/my/order_history.png"></image>
+            <view class="fun_text">历史订单</view>
+          </navigator>
+          <navigator class="fun_list flex_c flex_ac" @click="activation" hover-class="none">
+            <image class="fun_img" src="/static/my/upgrade.png"></image>
+            <view class="fun_text">激活升级</view>
+          </navigator>
+          <navigator class="fun_list flex_c flex_ac" url="/pagesB/orderingfood/incomeExpenses" hover-class="none">
+            <image class="fun_img" src="/static/my/detail.png"></image>
+            <view class="fun_text">收支明细</view>
+          </navigator>
+          <navigator class="fun_list flex_c flex_ac" @click="getToCash('local')" hover-class="none">
+            <image class="fun_img" src="/static/my/deposit.png"></image>
+            <view class="fun_text">提现</view>
+          </navigator>
+        </view>
+      </view>
+      <view class="fun mar_t30">
+        <view class="fun_title">数智云店</view>
         <view class="fun_con mar_t50 flex_r flex_ac">
-          <!-- <navigator class="fun_list flex_c flex_ac" url="/pages/top-up/index" hover-class="none">
-            <image class="fun_img" src="/static/my/recharge.png" mode=""></image>
-            <view class="fun_text">充值</view>
-          </navigator> -->
           <navigator class="fun_list flex_c flex_ac" url="/pages/account/wealth" hover-class="none">
-            <image class="fun_img" src="/static/my/wealth.png" mode=""></image>
+            <image class="fun_img" src="/static/my/wealth.png"></image>
             <view class="fun_text">财富</view>
           </navigator>
           <navigator class="fun_list flex_c flex_ac" url="/pages/account/consignment" hover-class="none">
-            <image class="fun_img" src="/static/my/consign.png" mode=""></image>
+            <image class="fun_img" src="/static/my/consign.png"></image>
             <view class="fun_text">寄卖</view>
           </navigator>
+          <navigator class="fun_list flex_c flex_ac" @tap="getToTeaList" hover-class="none">
+            <image class="fun_img" src="/static/my/shequ.png"></image>
+            <view class="fun_text">社区</view>
+          </navigator>
           <navigator class="fun_list flex_c flex_ac" url="/pages/account/giveAsPresent" hover-class="none">
-            <image class="fun_img" src="/static/my/give.png" mode=""></image>
+            <image class="fun_img" src="/static/my/give.png"></image>
             <view class="fun_text">赠送</view>
           </navigator>
-          <navigator class="fun_list flex_c flex_ac" @click="getImgPage" hover-class="none">
-            <image class="fun_img" src="/static/my/sharePoster.png" mode=""></image>
-            <view class="fun_text">分享海报</view>
-          </navigator>
         </view>
-      </view>
-      <view class="fun mar_t30">
-        <view class="fun_title">账户明细</view>
         <view class="fun_con mar_t50 flex_r flex_ac">
+          <navigator class="fun_list flex_c flex_ac" url="/pages/account/conversion" hover-class="none">
+            <image class="fun_img" src="/static/my/10.png"></image>
+            <view class="fun_text">转化</view>
+          </navigator>
+          <navigator class="fun_list flex_c flex_ac" @tap="getToCash" hover-class="none">
+            <image class="fun_img" src="/static/my/13.png"></image>
+            <view class="fun_text">提现</view>
+          </navigator>
           <navigator class="fun_list flex_c flex_ac" url="/pages/accountDetails/running" hover-class="none">
-            <image class="fun_img" src="/static/my/fund.png" mode=""></image>
+            <image class="fun_img" src="/static/my/fund.png"></image>
             <view class="fun_text">流水明细</view>
           </navigator>
           <navigator class="fun_list flex_c flex_ac" url="/pages/accountDetails/withdraw" hover-class="none">
-            <image class="fun_img" src="/static/my/withdraw.png" mode=""></image>
+            <image class="fun_img" src="/static/my/withdraw.png"></image>
             <view class="fun_text">提现明细</view>
           </navigator>
         </view>
-      </view>
-      <view class="fun mar_t30">
-        <view class="fun_title flex_r flex_ac flex_jb">我的订单
-          <navigator class="more flexr flex_ac" url="/pages/szw-order-list/index?status=0" hover-class="none">
-            全部订单<image class="more_img" src="/static/my/more.png" mode=""></image>
-          </navigator>
-        </view>
+        <view class="fun_tit mar_t50">云店订单</view>
         <view class="fun_con mar_t50 flex_r flex_ac flex_jb">
           <navigator class="fun_list flex_c flex_ac" url="/pages/szw-order-list/index?status=1" hover-class="none">
-            <image class="fun_img" src="/static/my/payment.png" mode=""></image>
+            <image class="fun_img" src="/static/my/payment.png"></image>
             <view class="fun_text">待付款</view>
           </navigator>
           <navigator class="fun_list flex_c flex_ac" url="/pages/szw-order-list/index?status=5" hover-class="none">
-            <image class="fun_img" src="/static/my/pickInStore.png" mode=""></image>
+            <image class="fun_img" src="/static/my/pickInStore.png"></image>
             <view class="fun_text">待自提</view>
           </navigator>
           <navigator class="fun_list flex_c flex_ac" url="/pages/szw-order-list/index?status=2" hover-class="none">
-            <image class="fun_img" src="/static/my/deliver.png" mode=""></image>
+            <image class="fun_img" src="/static/my/deliver.png"></image>
             <view class="fun_text">待发货</view>
           </navigator>
           <navigator class="fun_list flex_c flex_ac" url="/pages/szw-order-list/index?status=3" hover-class="none">
-            <image class="fun_img" src="/static/my/take.png" mode=""></image>
+            <image class="fun_img" src="/static/my/take.png"></image>
             <view class="fun_text">待收货</view>
           </navigator>
           <navigator class="fun_list flex_c flex_ac" url="/pages/szw-order-list/index?status=4" hover-class="none">
-            <image class="fun_img" src="/static/my/refund.png" mode=""></image>
+            <image class="fun_img" src="/static/my/refund.png"></image>
             <view class="fun_text">已完成</view>
           </navigator>
         </view>
       </view>
-      <view class="fun mar_t30">
-        <view class="fun_title">本地生活</view>
-        <view class="fun_con mar_t50 flex_r flex_ac">
-          <navigator v-if="local_uinfo.level_id>1" class="fun_list flex_c flex_ac" url="/pagesB/orderingfood/group" hover-class="none">
-            <image class="fun_img" src="/static/my/l_group.png" mode=""></image>
-            <view class="fun_text">我的团队</view>
-          </navigator>
-          <navigator class="fun_list flex_c flex_ac" url="/pagesB/orderingfood/orderlist" hover-class="none">
-            <image class="fun_img" src="/static/my/order_history.png" mode=""></image>
-            <view class="fun_text">历史订单</view>
-          </navigator>
-          <navigator class="fun_list flex_c flex_ac" @click="activation" hover-class="none">
-            <image class="fun_img" src="/static/my/upgrade.png" mode=""></image>
-            <view class="fun_text">激活升级</view>
-          </navigator>
-          <navigator class="fun_list flex_c flex_ac" url="/pagesB/orderingfood/incomeExpenses" hover-class="none">
-            <image class="fun_img" src="/static/my/detail.png" mode=""></image>
-            <view class="fun_text">收支明细</view>
-          </navigator>
-          <navigator class="fun_list flex_c flex_ac" @click="getToCash('local')" hover-class="none">
-            <image class="fun_img" src="/static/my/deposit.png" mode=""></image>
-            <view class="fun_text">提现</view>
-          </navigator>
-        </view>
-      </view>
       <view class="fun mar_t30">
         <view class="fun_title">其他</view>
         <view class="fun_con mar_t50 flex_r flex_ac">
           <navigator class="fun_list flex_c flex_ac" url="/pagesB/address/list" hover-class="none">
-            <image class="fun_img" src="/static/my/dizhi.png" mode=""></image>
+            <image class="fun_img" src="/static/my/dizhi.png"></image>
             <view class="fun_text">地址管理</view>
           </navigator>
           <navigator class="fun_list flex_c flex_ac" url="/pagesB/my/assistant" hover-class="none">
-            <image class="fun_img" src="/static/my/assistant.png" mode=""></image>
+            <image class="fun_img" src="/static/my/assistant.png"></image>
             <view class="fun_text">开票助手</view>
           </navigator>
           <navigator class="fun_list flex_c flex_ac" url="/pagesB/invoice/invoiceList" hover-class="none">
-            <image class="fun_img" src="/static/my/assistantHistory.png" mode=""></image>
+            <image class="fun_img" src="/static/my/assistantHistory.png"></image>
             <view class="fun_text">开票历史</view>
           </navigator>
         </view>
@@ -195,20 +175,20 @@
         <view class="fun_title">我的服务</view>
         <view class="fun_con mar_t50 flex_r flex_ac">
           <navigator class="fun_list flex_c flex_ac" @click="goto('/pages/agreement/index',{tit:'关于我们',type:7})" hover-class="none">
-            <image class="fun_img" src="/static/my/about.png" mode=""></image>
+            <image class="fun_img" src="/static/my/about.png"></image>
             <view class="fun_text">关于我们</view>
           </navigator>
           <navigator class="fun_list flex_c flex_ac" @click="goto('/pages/agreement/index',{tit:'用户须知',type:8})" hover-class="none">
-            <image class="fun_img" src="/static/my/feedback.png" mode=""></image>
+            <image class="fun_img" src="/static/my/feedback.png"></image>
             <view class="fun_text">用户须知</view>
           </navigator>
           <navigator class="fun_list flex_c flex_ac" @click="goto('/pages/agreement/index',{tit:'新手教程',type:1})" hover-class="none">
-            <image class="fun_img" src="/static/my/green.png" mode=""></image>
+            <image class="fun_img" src="/static/my/green.png"></image>
             <view class="fun_text">新手教程</view>
           </navigator>
           <view class="fun_list flex_c flex_ac">
             <button open-type="contact" style="background: #fff; border: 0; line-height: 1; padding: 0">
-              <image class="fun_img" src="/static/my/service.png" mode=""></image>
+              <image class="fun_img" src="/static/my/service.png"></image>
               <view class="fun_text">在线客服</view>
             </button>
           </view>
@@ -440,7 +420,6 @@ page {
 }
 
 .container {
-  // padding: 0 0 30rpx;
   box-sizing: border-box;
 }
 
@@ -542,108 +521,14 @@ page {
 .user_option {
   width: 140rpx;
   text-align: right;
+  .fun_text{
+    font-size: 20rpx;
+  }
 }
 
 // 用户信息-end
 
 // 账户信息
-.acc_head {
-  width: 100%;
-  overflow: hidden;
-}
-
-.acc_price .price_txt {
-  font-size: 24rpx;
-  color: #fff;
-}
-
-.acc_price .price_num {
-  font-size: 50rpx;
-  color: #fff;
-  // font-weight: bold;
-  // font-family: "SourceHanSansSC-Bold";
-}
-
-.info_list:nth-child(1) {
-  padding-left: 0;
-}
-
-.list_name {
-  font-size: 24rpx;
-  color: #ffffff;
-}
-
-.list_text {
-  font-size: 36rpx;
-  color: #fff;
-  // font-family: "SourceHanSansSC-Bold";
-  // font-weight: bold;
-}
-
-.info_list:nth-last-child(1) {
-  border-right: 0;
-}
-
-.info_con {
-  width: 100%;
-  overflow: hidden;
-  margin-top: 40rpx;
-}
-
-.acc_hint {
-  width: 100%;
-  overflow: hidden;
-  font-size: 20rpx;
-  color: #fff;
-}
-
-.info_list {
-  width: calc(100% / 3);
-  height: 78rpx;
-  align-items: inherit;
-  box-sizing: border-box;
-  padding-left: 30rpx;
-}
-
-.withdraw {
-  width: 100rpx;
-  height: 54rpx;
-  background: #fff;
-  border-radius: 27rpx;
-  font-size: 26rpx;
-  color: #11a375;
-  font-family: "SourceHanSansSC-Medium";
-}
-
-.recharge {
-  width: 100rpx;
-  height: 54rpx;
-  box-sizing: border-box;
-  border: 3rpx solid #fff;
-  color: #fff;
-  font-family: "SourceHanSansSC-Medium";
-  border-radius: 27rpx;
-  font-size: 26rpx;
-  margin-right: 16rpx;
-}
-
-.regional{
-  padding: 0 10rpx;
-  margin-top: 16rpx;
-  .ico{
-    width: 32rpx;
-    height: 32rpx;
-    margin-right: 12rpx;
-  }
-  .txtinfo{
-    color: #000;
-    font-size: 25rpx;
-  }
-  .ico,.txtinfo{
-    vertical-align: middle;
-  }
-}
-
 .acc_info {
   width: 100%;
   overflow: hidden;
@@ -653,6 +538,18 @@ page {
   padding: 30rpx;
   box-sizing: border-box;
   margin-top: 38rpx;
+  .i_num{
+    width: 110rpx;
+    text-align: center;
+    font-size: 30rpx;
+    p{
+      color: #fff;
+    }
+    .dinB{
+      margin-top: 10rpx;
+      font-size: 36rpx;
+    }
+  }
 }
 
 // 账户信息-end
@@ -690,7 +587,7 @@ page {
 .fun_img {
   width: 50rpx;
   height: 50rpx;
-  margin-bottom: 20rpx;
+  margin-bottom: 10rpx;
 }
 
 .fun_container {
@@ -703,9 +600,15 @@ page {
 .fun_title {
   padding: 0 30rpx;
   font-size: 32rpx;
-  color: #232323;
-  font-family: "SourceHanSansSC-Bold";
+  color: #333;
+  font-weight: bold;
+}
+
+.fun_tit{
+  font-size: 28rpx;
+  color: #666;
   font-weight: bold;
+  padding-left: 36rpx;
 }
 
 .fun {

src/pages/tea-list/index.vue

@@ -18,12 +18,6 @@
         >
       </view>
       <view class="head_option flex_r flex_ac">
-        <!-- <image
-          class="option_weixin"
-          src="/static/img/weixin.png"
-          mode=""
-          @tap="copyText(item.wxNumber)"
-        ></image> -->
         <view class="option_hr"></view>
         <image
           class="option_phone"