寄卖模块优化 TeaC+茶宝+寄卖服务费支付

src/pages/product/p_details.vue

@@ -10,8 +10,12 @@
                 <span v-if="Number(detail.cha_bao) != 0 && Number(detail.cost_price) != 0">+</span>
                 <span v-if="Number(detail.cha_bao) != 0">{{ detail.cha_bao }}茶宝</span>
             </view>
+            <view v-else-if="type == 1" class="price flex_c">
+                <text class="p_favour_teac" v-if="type == 1">￥: {{ $h.Add(detail.teac,$h.Mul(detail.trade_teac, 2))||0 }} TeaC +{{ detail.treasure_price||0 }} 茶宝</text>
+                <text class="p_trade_teac" v-if="type == 1">寄卖服务费：{{$h.Mul(detail.service,2)}} 元</text>
+            </view>
             <view v-else class="price" :class="type == 2 ? 'samll' : ''">
-                <text class="p_favour" v-if="type == 1">￥{{ detail.total_amount }}</text>
+                <!-- <text class="p_favour" v-if="type == 1">￥{{ detail.total_amount }}</text> -->
                 <text class="p_favour" v-if="type == 2">￥{{ detail.trade_price }} + {{detail.trade_num}}批发券 + {{detail.treasure_price}}茶宝</text>
                 <text class="p_favour" v-if="type == 3">￥{{ detail.cost_price }}</text>
                 <text class="p_favour" v-if="type == 4">￥{{ $h.Sub(detail.cost_price,detail.consume) }}</text>
@@ -20,7 +24,7 @@
                     <text class="p_favour">￥{{ detail.cost_price }}</text>
                     <text class="un_p_favour">￥{{ detail.original_price }}</text>
                 </template>
-                <text class="p_trade" v-if="type == 1">（含服务费{{$h.Mul(detail.service,2)}}元）</text>
+                <!-- <text class="p_trade" v-if="type == 1">（含服务费{{$h.Mul(detail.service,2)}}元）</text> -->
                 <text class="p_trade" v-if="(type == 3 || type == 4)">送 {{detail.give_cha_bao}} 茶宝</text>
                 <view v-if="type == 4">
                     <text class="un_p_favour un_p">{{ detail.cost_price }}</text>
@@ -70,7 +74,8 @@
                     <image class="goods_img" :src="detail.original_img" mode=""></image>
                     <view class="goods_con flex_c flex_jb">
                         <view class="shop_names">{{ detail.goods_name }}</view>
-                        <view class="goods_msg" v-if="type == 1">￥{{ detail.total_amount }}</view>
+                        <view class="goods_msg" v-if="type == 1">￥: {{ $h.Add(detail.teac,$h.Mul(detail.trade_teac, 2))||0 }}TeaC + {{ detail.treasure_price }}茶宝</view>
+                        <view class="goods_smsg" v-if="type == 1">寄卖服务费：{{$h.Mul(detail.service,2)}} 元</view>
                         <view class="goods_msg" v-else-if="type == 2">{{ detail.trade_price }}元+{{ detail.trade_num }}批发券+{{ detail.treasure_price }}茶宝</view>
                         <view class="goods_msg" v-else>￥{{ afterSpecPrice }}</view>
                         <view class="num_con flex_r flex_je" v-if="type != 6">
@@ -462,6 +467,13 @@ page {
     .p_favour {
         font-size: 36rpx;
     }
+    .p_favour_teac{
+        font-size: 30rpx;
+    }
+    .p_trade_teac {
+        font-size: 20rpx;
+        // margin-left: 20rpx;
+    }
 
     .un_p_favour {
         font-size: 26rpx;
@@ -689,6 +701,10 @@ page {
     font-family: "SourceHanSansCN-Medium";
     font-weight: 500;
 }
+.goods_smsg{
+    font-size: 22rpx;
+    color: #ff6d44;
+}
 
 .raido_img {
     width: 39rpx;

src/pages/szw-order-details/index.vue

@@ -40,10 +40,14 @@
                                 <view class="goods_num">×{{ orderInfo.goods_num }}</view>
                             </view>
                             <view class="goods_spec">
-                                    <text class="goods_spec_text" v-if="orderInfo.goodsAttr">{{ orderInfo.goodsAttr.spec_name }}</text>
-                                    <text v-if="orderInfo.goodsAttribute">{{ orderInfo.goodsAttribute.attr_name }}</text>
-                                </view>
-                            <view class="goods_price r_color">￥{{ orderInfo.total_amount  }}</view>
+                                <text class="goods_spec_text" v-if="orderInfo.goodsAttr">{{ orderInfo.goodsAttr.spec_name }}</text>
+                                <text v-if="orderInfo.goodsAttribute">{{ orderInfo.goodsAttribute.attr_name }}</text>
+                            </view>
+                            <view v-if="orderInfo.type == 1">
+                                <view class="goods_price r_color" style="bottom:26rpx">{{ orderInfo.teac+"TeaC + "+ orderInfo.cha_bao+"茶宝" }}</view>
+                                <view class="good_server">寄卖服务费：￥{{ orderInfo.shipping_price || 0 }}</view>
+                            </view>
+                            <view class="goods_price r_color" v-else>￥{{ orderInfo.total_amount  }}</view>
                         </view>
                     </scroll-view>
                 </view>
@@ -599,7 +603,13 @@ page {
     line-height: 1.2;
     font-weight: 600;
 }
-
+.goodsDetail_info .good_server{
+    font-size: 20rpx;
+    color: rgb(245, 8, 8);
+    position: absolute;
+    bottom: 0rpx;
+    left: 0;
+}
 .goods-img-container .img-box .goods-img {
     width: 100%;
     display: block;

src/pages/szw-order-list/index.vue

@@ -22,10 +22,12 @@
                                     <text class="goods_spec_text" v-if="li.spec_name">{{ li.spec_name }}</text>
                                     <text v-if="li.attr_name">{{ li.attr_name }}</text>
                                 </view>
-                                <view class="good_text flex_r flex_ac flex_jb">
+                                <view class="good_text flex_r flex_ac flex_jb" :style="{bottom:li.type == 1?'15rpx':0}">
                                     <view class="unimport dinB">x {{ li.goods_num }}</view>
-                                    <view class="goods_price r_color">￥<text class="r_color">{{ li.total_amount }}</text></view>
+                                    <view class="goods_price r_color" v-if="li.type == 1"><text class="r_color">{{li.teac+'TeaC + '+ li.cha_bao+'茶宝' }}</text></view>
+                                    <view class="goods_price r_color" v-else>￥<text class="r_color">{{ li.total_amount }}</text></view>
                                 </view>
+                                <view class="good_server" v-if="li.type == 1">寄卖服务费：￥{{ li.shipping_price || 0 }}</view>
                             </view>
                         </view>
                     </view>
@@ -527,6 +529,14 @@ page {
         bottom: 0;
         left: 0;
     }
+    .good_server{
+        font-size: 20rpx;
+        color: rgb(245, 8, 8);
+        text-align: right;
+        position: absolute;
+        bottom: -10rpx;
+        right: 0;
+    }
     .goods_price{
         font-weight: 600;
         font-size: 32rpx;

src/pages/to-pay-list/index.vue

@@ -72,7 +72,11 @@
                 <view class="list_name">数量</view>
                 <view class="list_con">{{ Data.num }}</view>
             </view>
-            <view class="order_list flex_r flex_ac flex_jb">
+            <view class="order_list flex_r flex_ac flex_jb" v-if="Data.type == 1">
+                <view class="list_name">商品单价</view>
+                <view class="list_con">{{ parseFloat(goodsInfo.teac) }} TeaC</view>
+            </view>
+            <view class="order_list flex_r flex_ac flex_jb" v-else>
                 <view class="list_name">商品单价</view>
                 <view class="list_con">￥{{ parseFloat(goodsInfo.cost_price) }}</view>
             </view>
@@ -113,10 +117,19 @@
                     <view class="list_con p_color">-￥{{ goldNum }}</view>
                 </view>
             </template>
-            <view class="order_list flex_r flex_ac flex_jb">
+            <view class="order_list flex_r flex_ac flex_jb" v-if="Data.type == 1">
+                <view class="list_name">小计</view>
+                <view class="list_con">{{ $h.Mul(goodsInfo.teac, Data.num) }} TeaC</view>
+            </view>
+            <view class="order_list flex_r flex_ac flex_jb" v-if="Data.type == 1">
+                <view class="list_name">茶宝</view>
+                <view class="list_con">{{ $h.Mul(goodsInfo.treasure_price, Data.num) }} 茶宝</view>
+            </view>
+            <view class="order_list flex_r flex_ac flex_jb" v-else>
                 <view class="list_name">小计</view>
                 <view class="list_con">￥{{ CommodityPrice>0?CommodityPrice:0 || 0 }}</view>
             </view>
+            
         </view>
         <view class="order mar_b20" v-if="Data.type == 1">
             <view class="info_type">批发专区</view>
@@ -126,7 +139,15 @@
             </view>
             <view class="order_list flex_r flex_ac flex_jb">
                 <view class="list_name">商品单价</view>
-                <view class="list_con">￥{{ parseFloat(goodsInfo.trade_price) }}</view>
+                <view class="list_con">{{ parseFloat(goodsInfo.trade_teac) }} TeaC</view>
+            </view>
+            <!-- <view class="order_list flex_r flex_ac flex_jb" v-if="Data.type != 1">
+                <view class="list_name">小计</view>
+                <view class="list_con">￥{{ wholesalePriceTotal || 0 }}</view>
+            </view> -->
+            <view class="order_list flex_r flex_ac flex_jb">
+                <view class="list_name">小计</view>
+                <view class="list_con">{{($h.Mul(goodsInfo.trade_teac, Data.num * 2) || 0) +' TeaC'}}</view>
             </view>
             <view class="order_list flex_r flex_ac flex_jb">
                 <view class="flex_r flex_ac">
@@ -135,24 +156,33 @@
                 </view>
                 <view class="list_con">￥{{ $h.Mul(goodsInfo.service, Data.num * 2) }}</view>
             </view>
-            <view class="order_list flex_r flex_ac flex_jb">
-                <view class="list_name">小计</view>
-                <view class="list_con">￥{{ wholesalePriceTotal || 0 }}</view>
-            </view>
         </view>
         <view class="order">
             <view class="order_list flex_r flex_ac flex_jb">
                 <view class="list_name">订单合计</view>
-                <view class="list_con">￥{{ amountTotal>0?amountTotal:0 || 0 }}</view>
+                <view class="list_con" v-if="Data.type == 1">{{($h.Add($h.Mul(goodsInfo.teac, Data.num),$h.Mul(goodsInfo.trade_teac, Data.num * 2))||0) +'TeaC + '+(($h.Mul(goodsInfo.treasure_price, Data.num)) || 0) }}茶宝 + ￥{{ $h.Mul(goodsInfo.service, Data.num * 2) }}</view>
+                <view class="list_con" v-else>￥{{ amountTotal>0?amountTotal:0 || 0 }}</view>
             </view>
-            <view class="order_list flex_r flex_ac flex_jb" v-if="['1','2','3'].includes(Data.type)">
+            <view class="order_list flex_r flex_ac flex_jb" v-if="['2','3'].includes(Data.type)">
                 <view class="list_name">可用云宝</view>
                 <view class="list_con g_color">￥{{ userinfo.user_money }}</view>
             </view>
-            <view class="order_list flex_r flex_ac flex_jb" v-if="['1','2','3', '4'].includes(Data.type) && isAct">
+            <view class="order_list flex_r flex_ac flex_jb" v-if="['2','3', '4'].includes(Data.type) && isAct">
                 <view class="list_name">数智余额</view>
                 <view class="list_con g_color">￥{{ localInfo.property }}</view>
             </view>
+            <view class="order_list flex_r flex_ac flex_jb" v-if="Data.type == 1">
+                <view class="list_name">可用TeaC</view>
+                <view class="list_con g_color">￥{{ userinfo.teac }}</view>
+            </view>
+            <view class="order_list flex_r flex_ac flex_jb" v-if="Data.type == 1">
+                <view class="list_name">可用茶宝</view>
+                <view class="list_con g_color">￥{{ userinfo.cha_bao }}</view>
+            </view>
+            <view class="order_list flex_r flex_ac flex_jb" v-if="Data.type == 1">
+                <view class="list_name">余额</view>
+                <view class="list_con g_color">￥{{ localInfo.property }}</view>
+            </view>
         </view>
         <view class="msginfo" v-if="Data.type == 1">
             <view class="title">特别提示</view>
@@ -161,6 +191,7 @@
         <!-- 订单信息-end -->
         <!-- 底部操作栏 -->
         <view class="bar flex_r flex_ac flex_jb">
+            <!-- <view class="bar_info flex_r flex_ac" v-if="Data.type == 1">待支付<text>￥{{ $h.Mul(goodsInfo.service, Data.num * 2) }}</text></view> -->
             <view class="bar_info flex_r flex_ac">待支付<text>￥{{ obligation }}</text></view>
             <view class="pay_btn flex_r flex_ac flex_jc" @tap="payment">立即支付</view>
         </view>
@@ -299,7 +330,6 @@ export default {
                     this.amountTotal = this.$h.Add(wpt,this.amountTotal)
                     ps = this.$h.Add(ps, wp);
                 }
-    
                 let um = 0; //数智生活余额
                 if (this.isAct) um = this.localInfo.property; //数智生活余额
                 let userBalance = this.$h.Add(this.userinfo.user_money, um); //用户总余额（数智生活余额+云宝）
@@ -309,8 +339,9 @@ export default {
     
                 let obligation = 0;
                 if (type == 1) {
-                    b1 = this.$h.Sub(ps, this.userinfo.user_money); //用云宝计算后 待支付价格
-                    let sp = this.$h.Sub(wy,um);  //寄卖服务费只能用数智生活余额支付或微信支付
+                    // b1 = this.$h.Sub(ps, this.userinfo.user_money); //用云宝计算后 待支付价格
+                    b1 = this.$h.Sub(ps,um); // 寄卖服务待支付价格不使用云宝
+                    let sp = wy;  //寄卖服务费只能用数智生活余额支付或微信支付
                     obligation = b1 > 0 ? b1 : 0; 
                     obligation = this.$h.Add(obligation,sp > 0 ? sp : 0);
                 }

src/pagesB/specialregion/index.vue

@@ -6,10 +6,10 @@
                     <img :src="userinfo.head_pic" class="hpic" />
                     <span class="num">{{ userinfo.mobile }}</span>
                     <span class="copy" @click="copyText(userinfo.mobile)">复制</span>
-                    <div class="live">
+                    <!-- <div class="live">
                         <img src="/static/my/huangguan.png" class="hico" />
                         <span class="txt">{{ userinfo.level_name }}</span>
-                    </div>
+                    </div> -->
                 </div>
                 <view class="regional">
                     <template v-if="userinfo.regionalNode">
@@ -19,8 +19,8 @@
                 </view>
                 <div class="p2 flex_r flex_jse flex_ac">
                     <div class="i_num">
-                        <p>云宝</p>
-                        <p class="dinB">{{ userinfo.user_money }}</p>
+                        <p>TeaC</p>
+                        <p class="dinB">{{ userinfo.teac }}</p>
                     </div>
                     <!-- <div class="i_num">
                         <p>批发券</p>
@@ -72,9 +72,11 @@
                 <view class="content-view">
                     <view :class="['product-title', 'ellipsis2']">{{ i.goods_name }}</view>
                     <view class="product-price">
-                        <text class="product-price-original">{{ i.total_amount }}</text>
-                        <text class="product-txt">（含服务费{{$h.Mul(i.service,2)}}元）</text>
+                        <!-- <text class="product-price-original">{{ i.total_amount }}</text> 
+                        <text class="product-txt">（含服务费{{$h.Mul(i.service,2)}}元）</text> -->
+                        <text class="product-price-original">TeaC {{ i.teac }}+茶宝 {{ i.cha_bao }}</text>
                     </view>
+                    <view class="product-txt">寄卖服务费：{{$h.Mul(i.service,2)}}元</view>
                     <!-- <view class="product-txt">赠送{{ i.give_integral + "批发券" }}</view> -->
                 </view>
             </view>
@@ -349,11 +351,11 @@ export default {
 
     .product-price-original {
         color: #18bb88;
-        font-size: 32rpx;
+        font-size: 26rpx;
         font-weight: bold;
 
         &:before {
-            content: "￥";
+            // content: "￥";
             font-size: 20rpx;
         }
     }