去掉商户余额相关ui

src/pages/my/index.vue

@@ -69,21 +69,26 @@
             
             <!-- 节点-end -->
             <!-- 账户信息 -->
-            <view class="acc_info flex_r flex_jse">
-                <div class="flex_c flex_jse">
-                    <div class="i_num flex_c flex_as" @click="goto('/pagesB/my/shuZhiWallet')">
+            <view class="acc_info flex_r flex_jb acc_box">
+                <!-- <div class="flex_r flex_jb"> -->
+                    <div class="i_num flex_c flex_ac" @click="goto('/pagesB/my/shuZhiWallet')">
                         <p class="flex_r flex_ac flex_jc">
                             <image src="/static/wallet/4.png" class="ico" /><span>我的余额</span></p>
-                        <p class="dinB">{{localInfo.property||0}}</p>
+                        <p class="dinB tc">{{localInfo.property||0}}</p>
                     </div>
                     
-                    <div class="i_num flex_c flex_as mar_t30" @click="goto('/pagesB/accountDetails/ConsumptionCharge')">
+                    <div class="i_num flex_c flex_ac" @click="goto('/pagesB/accountDetails/ConsumptionCharge')">
                         <p class="flex_r flex_ac flex_jc">
                             <image src="/static/wallet/3.png" class="ico" /><span>消费金</span></p>
-                        <p class="dinB">{{localInfo.integral||0}}</p>
+                        <p class="dinB tc">{{localInfo.integral||0}}</p>
                     </div>
-                </div>
-                <div class="flex_c flex_jse">
+                    <div class="i_num flex_c flex_ac" @click="goto('/pages/accountDetails/teaBaby')">
+                        <p class="flex_r flex_ac flex_jc">
+                            <image src="/static/wallet/6.png" class="ico" /><span>茶宝</span></p>
+                        <p class="dinB tc">{{userinfo.cha_bao||0}}</p>
+                    </div>
+                <!-- </div> -->
+                <!-- <div class="flex_c flex_jse">
                     <div class="i_num flex_c flex_ae" @click="goto('/pagesC/settledMerchant/balanceLog',{s:0})">
                         <p class="flex_r flex_ac flex_jc">
                             <image src="/static/wallet/11.png" class="ico" /><span>商户余额</span></p>
@@ -95,7 +100,7 @@
                         <p class="dinB">{{userinfo.cha_bao||0}}</p>
                     </div>
                     
-                </div>
+                </div> -->
             </view>
             <view class="acc_info_next flex_r flex_jb mar_t16">
                 <div class="acc_info_next_item flex_r flex_jb" @click="goto('/pagesB/accountDetails/TeaC')">
@@ -640,6 +645,7 @@ page {
     .i_num {
         text-align: center;
         font-size: 32rpx;
+        width: 33%;
 
         p {
             color: #BE7329;
@@ -655,8 +661,16 @@ page {
             margin-top: 14rpx;
             font-size: 40rpx;
         }
+
+        .tc {
+            text-align: center;
+        }
     }
 }
+
+.acc_box{
+    padding: 36rpx;
+}
 .acc_info_next{
     &_item{
         width: 49%;

src/pagesB/my/myWallet.vue

@@ -1,7 +1,7 @@
 <template>
     <div class="myWallet">
         <div class="acc_info">
-            <view class="flex_r flex_jse acc_row">
+            <view class="flex_r flex_jb acc_row">
                 <div class="i_num" @click="goto('/pagesB/accountDetails/ConsumptionCharge')">
                     <p class="flex_r flex_ac flex_jc">
                         <image src="@/static/wallet/3.png" class="ico" /><span>消费金</span></p>
@@ -18,17 +18,17 @@
                     <p class="dinB">{{localInfo.original_equity || 0}}</p>
                 </div>
             </view>
-            <view class="flex_r flex_jse">
+            <view class="flex_r flex_jb">
                 <div class="i_num" @click="goto('/pages/accountDetails/teaBaby')">
                     <p class="flex_r flex_ac flex_jc">
                         <image src="@/static/wallet/6.png" class="ico" /><span>茶宝</span></p>
                     <p class="dinB">{{userinfo.cha_bao}}</p>
                 </div>
-                <div class="i_num" @click="goto('/pagesC/settledMerchant/balanceLog',{s:0})">
+                <!-- <div class="i_num" @click="goto('/pagesC/settledMerchant/balanceLog',{s:0})">
                     <p class="flex_r flex_ac flex_jc">
                         <image src="@/static/wallet/11.png" class="ico" /><span>商户余额</span></p>
                     <p class="dinB">{{localInfo.merchant_money || 0}}</p>
-                </div>
+                </div> -->
                 <div class="i_num" @click="goto('/pagesB/accountDetails/TeaC')">
                     <p class="flex_r flex_ac flex_jc">
                         <image src="@/static/wallet/8.png" class="ico" /><span>TeaC</span></p>
@@ -67,12 +67,13 @@ export default {
     background: url("http://teaclub.oss-cn-chengdu.aliyuncs.com/CloudShop/head_pic/7748b9c0380c76907a8a5ba82514f496f9ce55e5png");
     background-size: 100% 100%;
     border-radius: 16rpx;
-    padding: 36rpx 0;
+    padding: 36rpx;
     box-sizing: border-box;
 
     .i_num {
         font-size: 30rpx;
         text-align: center;
+        width: 33%;
         
         p {
             color: #BE7329;

src/pagesB/my/shuZhiWallet.vue

@@ -22,11 +22,10 @@
                 <span class="ico iconfont">&#xe68a;</span>
                 <span class="btn_txt">充值</span>
             </div>
-            <div class="btn_item conv" v-if="isMerchant" @click="goto('/pagesC/convert/index')">
-                <!-- <span class="ico iconfont">&#xe68a;</span> -->
+            <!-- <div class="btn_item conv" v-if="isMerchant" @click="goto('/pagesC/convert/index')">
                 <image class="ico" src="@/static/icon/convert.png" mode="widthFix" />
                 <span class="btn_txt">转化</span>
-            </div>
+            </div> -->
         </div>
         <div class="detailList" v-if="List.length">
             <div class="tit"><span>收支明细</span></div>
@@ -146,7 +145,7 @@ import { post } from "@/request/api.js";
 .btn_bar{
     padding: 30rpx 0;
     .btn_item{
-        width: 210rpx;
+        width: 210rpx !important;
         height: 70rpx;
         line-height: 70rpx;
         text-align: center;

src/pagesC/settledMerchant/myShop.vue

@@ -1,6 +1,6 @@
 <template>
     <div class="myshop">
-        <div class="card">
+        <!-- <div class="card">
             <div class="acc">商户余额</div>
             <div class="money" @click="goto('/pagesC/settledMerchant/balanceLog',{s:0})">￥{{money.withdraw_money || "0.00"}}</div>
             <div class="msg">可提现金额(元)</div>
@@ -16,7 +16,7 @@
         <div class="elseMoney flex_r flex_jb flex_ac">
             <div class="total_money" @click="goto('/pagesC/settledMerchant/balanceLog',{s:1})">总收入<span>￥{{money.total_money || "0.00"}}</span></div>
             <div class="day_income" @click="goto('/pagesC/settledMerchant/balanceLog',{s:1})">今日收入<span>￥{{money.day_income || "0.00"}}</span></div>
-        </div>
+        </div> -->
         <div class="list" v-if="list.length">
             <div class="list-item" v-for="(i,s) in list" :key="s" @click="goDetail(i.shop_id)">
                 <div class="head_info_row flex_r flex_ac flex_jb">
@@ -207,7 +207,7 @@ export default {
 }
 
 .list {
-    padding: 60rpx 0 30rpx;
+    padding: 0 0 30rpx;
 
     .list-item {
         margin-bottom: 150rpx;

src/pagesC/settledMerchant/shopOrderLog.vue

@@ -31,7 +31,7 @@
     <div class="detailList">
       <div class="tit"><span>订单明细</span></div>
       <!-- 顶部导航 -->
-      <view class="Tab_con flex_r flex_ac flex_jb">
+      <!-- <view class="Tab_con flex_r flex_ac flex_jb">
         <view
           class="tab_list flex_r flex_ac"
           :class="current == index ? 'active' : ''"
@@ -40,11 +40,14 @@
           @tap="SetStatus(index)"
           >{{ item.title }}</view
         >
-      </view>
+      </view> -->
       <!-- 顶部导航-end -->
       <div class="li" v-for="(i, s) in list" :key="s">
         <p class="flex_r flex_jb">
-          <span class="s5">消费:<span class="s2">{{i.pay_amount}}</span> <span class="s4" v-if="Number(i.not_discount)>0">（不优惠:{{i.not_discount}}）</span></span>
+          <view class="flex_c">
+            <span class="s5">消费:<span class="s2">{{i.pay_amount}}</span> </span>
+            <span class="s4" v-if="Number(i.not_discount)>0">(不参与优惠:{{i.not_discount}})</span>
+          </view>
           <span class="s5">结算:
             <span class="s2">{{i.num}}</span>
           </span>
@@ -52,8 +55,9 @@
         <image class="settle" src="https://cha-img.oss-cn-beijing.aliyuncs.com/images/settle.png" v-if="settledStatus.includes(i.status)" />
         <image class="settle" src="https://cha-img.oss-cn-beijing.aliyuncs.com/images/wait.png" v-if="waitStatus.includes(i.status)" />
         <p class="flex_r flex_jb">
+          <span class="s3">用户: {{ i.mobile }}</span>
+          <!-- <span class="s3">{{ i.type_id == 4 ? '智慧结算' : i.type_id == 1 ? '自助结算' : '其它' }}</span> -->
           <span class="s3">{{ i.update_time }}</span>
-          <span class="s3">{{ i.type_id == 4 ? '智慧结算' : i.type_id == 1 ? '自助结算' : '其它' }}</span>
         </p>
       </div>
     </div>
@@ -408,6 +412,7 @@ export default {
     }
     .s5{
       font-weight: bold;
+      font-size: 28rpx;
     }
     .s2 {
       font-weight: bold;