1.修改【快捷买单】支付界面提示词

2.UI去除“云宝
3.赠送界面:“云宝”改成“原始股”，手续费和“TeaC”一样，暂不开放

src/pages/account/giveAsPresent.vue

@@ -3,7 +3,7 @@
     <view class="list flex_r flex_ac flex_jb mar_t16">
       <view class="list_name">赠送类型:</view>
       <view class="list_text">
-        <div class="option-i" @click="s==2?$toast('暂未开放！'):value = s" v-for="(i,s) in list" :key="s">
+        <div class="option-i" @click="i.status!=1?$toast('暂未开放！'):value = s" v-for="(i,s) in list" :key="s">
           <img src="@/static/img/xuanzhong_icon.png" v-if="value == s" class="ico" alt="" />
           <img src="@/static/img/weixuanzhong_icon.png" v-else class="ico" alt="" />
           <span class="txt" :class="value == s?'txt_active':''">{{ i.name }}</span>
@@ -11,8 +11,8 @@
       </view>
     </view>
     <view class="list flex_r flex_ac flex_jb mar_t16" v-if="value == 0">
-      <view class="list_name">当前云宝:</view>
-      <view class="list_text"><text>{{ userinfo.user_money }}</text></view>
+      <view class="list_name">当前原始股:</view>
+      <view class="list_text"><text>{{ localInfo.original_equity || 0 }}</text></view>
     </view>
     <view class="list flex_r flex_ac flex_jb mar_t16" v-else-if="value == 1">
       <view class="list_name">当前茶宝:</view>
@@ -51,7 +51,7 @@ export default {
       id: "",
       give_num: "",
       userinfo: undefined, // 获取用户信息
-
+      localInfo: undefined,
       pickerShow: false,
       value: 1,
       list: [],
@@ -60,6 +60,7 @@ export default {
   components: {},
   onLoad() {
     this.userinfo = uni.getStorageSync("userinfo");
+    this.localInfo = uni.getStorageSync("localInfo");
     this.getGiveList();
   },
   methods: {
@@ -85,10 +86,10 @@ export default {
         this.$toast("赠送数量不得超过茶宝余额");
         return;
       } else if (
-        this.give_num > Number(this.userinfo.user_money) &&
+        this.give_num > Number(this.localInfo.original_equity) &&
         this.value == 0
       ) {
-        this.$toast("赠送数量不得超过云宝余额");
+        this.$toast("赠送数量不得超过原始股余额");
         return;
       } else if (this.id == "") {
         this.$toast("请输入赠送账号");
@@ -107,7 +108,7 @@ export default {
         });
       }
     },
-    // 赠送云宝
+    // 赠送原始股
     giveMoney() {
         let url = "v1/my/moneyGive"
         if (this.value == 1) { url = "v1/my/give" }
@@ -131,6 +132,7 @@ export default {
 
     async getuserInfo() {
       this.userinfo = await uni.userfun();
+      this.localInfo = await uni.Luserfun();
     },
 
     OnpickerShow() {

src/pages/my/index.vue

@@ -73,7 +73,7 @@
                 <div class="flex_c flex_jse">
                     <div class="i_num flex_c flex_as" @click="goto('/pagesB/my/shuZhiWallet')">
                         <p class="flex_r flex_ac flex_jc">
-                            <image src="/static/wallet/4.png" class="ico" /><span>余额</span></p>
+                            <image src="/static/wallet/4.png" class="ico" /><span>我的余额</span></p>
                         <p class="dinB">{{localInfo.property||0}}</p>
                     </div>
                     
@@ -84,16 +84,17 @@
                     </div>
                 </div>
                 <div class="flex_c flex_jse">
-                    <div class="i_num flex_c flex_ae" @click="goto('/pages/accountDetails/teaBaby')">
+                    <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/6.png" class="ico" /><span>茶宝</span></p>
-                        <p class="dinB">{{userinfo.cha_bao||0}}</p>
+                            <image src="/static/wallet/11.png" class="ico" /><span>商户余额</span></p>
+                        <p class="dinB">{{localInfo.merchant_money || 0}}</p>
                     </div>
-                    <div class="i_num flex_c flex_ae mar_t30" @click="goto('/pagesB/accountDetails/OriginalShares')">
+                    <div class="i_num flex_c flex_ae mar_t30" @click="goto('/pages/accountDetails/teaBaby')">
                         <p class="flex_r flex_ac flex_jc">
-                            <image src="/static/wallet/5.png" class="ico" /><span>原始股</span></p>
-                        <p class="dinB">{{localInfo.original_equity || 0}}</p>
+                            <image src="/static/wallet/6.png" class="ico" /><span>茶宝</span></p>
+                        <p class="dinB">{{userinfo.cha_bao||0}}</p>
                     </div>
+                    
                 </div>
             </view>
             <view class="acc_info_next flex_r flex_jb mar_t16">
@@ -107,14 +108,17 @@
                         <span>≈{{teacCountCny||0}}CNY</span>
                     </div>
                 </div>
-                <div class="acc_info_next_item flex_c flex_ac flex_jc">
-                    <div class="flex_r flex_ac flex_jc">
+                <div class="acc_info_next_item flex_r flex_ac 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">
+                        <span>{{localInfo.original_equity || 0}}</span>
+                    </div>
+                    <!-- <div class="flex_r flex_ac flex_jc">
                         <image src="@/static/wallet/10.png" class="ico" />
                         <span>数字茶权</span>
-                    </div>
-                    <!-- <div class="acc_info_next_bottom flex_r flex_ac flex_jb">
-                        <span>1</span>
-                        <span>≈3000CNY</span>
                     </div> -->
                 </div>
             </view>
@@ -671,9 +675,13 @@ page {
         }
     }
     &_item:last-child{
-        color: #003C6B;
+        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;
+        }
     }
 }
 

src/pagesB/my/myWallet.vue

@@ -9,13 +9,13 @@
                 </div>
                 <div class="i_num" @click="goto('/pagesB/my/shuZhiWallet')">
                     <p class="flex_r flex_ac flex_jc">
-                        <image src="@/static/wallet/4.png" class="ico" /><span>余额</span></p>
+                        <image src="@/static/wallet/4.png" class="ico" /><span>我的余额</span></p>
                     <p class="dinB">{{localInfo.property}}</p>
                 </div>
-                <div class="i_num">
+                <div class="i_num" @click="goto('/pagesB/accountDetails/OriginalShares')">
                     <p class="flex_r flex_ac flex_jc">
                         <image src="@/static/wallet/5.png" class="ico" /><span>原始股</span></p>
-                    <p class="dinB">{{localInfo.original_equity||0}}</p>
+                    <p class="dinB">{{localInfo.original_equity || 0}}</p>
                 </div>
             </view>
             <view class="flex_r flex_jse">
@@ -24,10 +24,10 @@
                         <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('/pages/accountDetails/running')">
+                <div class="i_num" @click="goto('/pagesC/settledMerchant/balanceLog',{s:0})">
                     <p class="flex_r flex_ac flex_jc">
-                        <image src="@/static/wallet/7.png" class="ico" /><span>云宝</span></p>
-                    <p class="dinB">{{userinfo.user_money}}</p>
+                        <image src="@/static/wallet/11.png" class="ico" /><span>商户余额</span></p>
+                    <p class="dinB">{{localInfo.merchant_money || 0}}</p>
                 </div>
                 <div class="i_num" @click="goto('/pagesB/accountDetails/TeaC')">
                     <p class="flex_r flex_ac flex_jc">

src/pagesC/settledMerchant/pay.vue

@@ -48,7 +48,7 @@ export default {
             let that = this
             uni.showModal({
                 title: "温馨提示",
-                content: "你将支付该订单，请确认。",
+                content: "你将支付该订单，请核对支付金额正确后点击“确认”。\r\n 请注意:平台余额支付无需密码，点击“确认”就会支付成功。",
                 showCancel: true,
                 confirmText: "确认",
                 confirmColor: "#f02f2f",