样式修改

src/pages/my/index.vue

@@ -108,13 +108,14 @@
                         <span>≈{{teacCountCny||0}}CNY</span>
                     </div>
                 </div>
-                <div class="acc_info_next_item flex_r flex_ac flex_jb" @click="goto('/pagesB/accountDetails/OriginalShares')">
+                <div class="acc_info_next_item flex_r flex_jb" @click="goto('/pagesB/accountDetails/OriginalShares')">
                     <div class="flex_c flex_ac">
                         <image src="@/static/wallet/12.png" class="ico" />
                         <span>原始股</span>
                     </div>
-                    <div class="acc_info_next_item_bottom dinB">
+                    <div class="acc_info_next_item_bottom dinB flex_c flex_ae flex_jb">
                         <span>{{localInfo.original_equity || 0}}</span>
+                        <span>≈{{equityCountCny||0}}CNY</span>
                     </div>
                     <!-- <div class="flex_r flex_ac flex_jc">
                         <image src="@/static/wallet/10.png" class="ico" />
@@ -291,7 +292,8 @@ export default {
             }, //数智生活信息
             merchantSetlet: {},
             isBusinessCenter: false,
-            teacCountCny: 0
+            teacCountCny: 0,
+            equityCountCny: 0
         };
     },
     onLoad(options) {
@@ -369,7 +371,7 @@ export default {
             } else this.login();
             this.localInfo = await uni.Luserfun()
             this.merchantSet();
-            this.getTeacCountCny()
+            this.getConvertCny()
         },
         // 跳转到实名页面
         goToAutonym() {
@@ -423,10 +425,11 @@ export default {
             }
         },
         // teaC价值
-        getTeacCountCny(){
-            post("v1/getTeacCountCny").then((res) => {
+        getConvertCny(){
+            post("v1/getConvertCny").then((res) => {
                 if (res.code === 0) {
-                    this.teacCountCny = Math.floor(Number(res.data.data) * Number(this.userinfo.teac))
+                    this.teacCountCny = Math.floor(Number(res.data.data.teac) * Number(this.userinfo.teac))
+                    this.equityCountCny = Math.floor(Number(res.data.data.equity) * Number(this.localInfo.original_equity))
                 }
             });
         },
@@ -666,7 +669,7 @@ page {
         .ico {
             width: 42rpx;
             height: 42rpx;
-            margin-right: 12rpx;
+            // margin-right: 12rpx;
         }
 
         &_bottom{
@@ -678,10 +681,10 @@ page {
         color: #0B414D;
         background: url("http://teaclub.oss-cn-chengdu.aliyuncs.com/img/12.png");
         background-size: 100% 100%;
-        .acc_info_next_item_bottom{
-            font-size: 36rpx;
-            font-weight: 600;
-        }
+        // .acc_info_next_item_bottom{
+        //     font-size: 30rpx;
+        //     font-weight: 600;
+        // }
     }
 }
 

src/pagesC/settledMerchant/myShop.vue

@@ -40,8 +40,8 @@
                     <div class="r" @click.stop="copyText(i.user_mobile)"><span class="iconfont">&#xe9d3;</span>电话：{{i.user_mobile}}<span class="iconfont copy">&#xe602;</span></div>
                 </div>
                 <div class="elseMoney1 flex_r flex_jb flex_ac">
-                    <div class="total_money" @click="goto('/pagesC/settledMerchant/shopOrderLog',{s:1,shop_id: i.shop_id})">总收入<span>￥{{i.total_money || "0.00"}}</span></div>
-                    <div class="day_income" @click="goto('/pagesC/settledMerchant/shopOrderLog',{s:1,shop_id: i.shop_id})">今日收入<span>￥{{i.day_income || "0.00"}}</span></div>
+                    <div class="total_money" @click.stop="goto('/pagesC/settledMerchant/shopOrderLog',{s:1,shop_id: i.shop_id})">总收入<span>￥{{i.total_money || "0.00"}}</span></div>
+                    <div class="day_income" @click.stop="goto('/pagesC/settledMerchant/shopOrderLog',{s:1,shop_id: i.shop_id})">今日收入<span>￥{{i.day_income || "0.00"}}</span></div>
                 </div>
             </div>
         </div>
@@ -244,6 +244,10 @@ export default {
                 font-size: 28rpx;
                 margin-left: 8rpx;
             }
+            div{
+                height: 90rpx;
+                line-height: 90rpx;
+            }
         }
     }
 

src/pagesC/settledMerchant/shopOrderLog.vue

@@ -13,7 +13,7 @@
     </view>
     <div class="h_top">
       <div class="balance_box">
-        <div class="b_teg">可提现余额(元)</div>
+        <div class="b_teg">待结算金额(元)</div>
         <div class="dinB balance">￥{{ count.unsettle_money }}</div>
         <div class="b_static flex_r flex_ac flex_jb">
           <div>