寄卖模块优化、去掉批发价字段

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

@@ -67,7 +67,8 @@
                     <view class="info_data">{{ orderInfo.pay_name }}</view>
                 </view>
                 <view class="li_box" v-if="orderInfo.total_amount">商品合计：
-                    <view class="info_data">{{ orderInfo.total_amount }}</view>
+                    <view class="info_data" v-if="orderInfo.type == 1">{{ orderInfo.teac+"TeaC + "+ orderInfo.cha_bao+"茶宝 +"+'￥'+(orderInfo.shipping_price || 0)  }}</view>
+                    <view class="info_data" v-else>{{ orderInfo.total_amount }}</view>
                 </view>
                 <!-- <view class="li_box" v-if="orderInfo.orderTypes == 2">批发券：
                     <view class="info_data">{{ orderInfo.totalPfInt }}</view>

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

@@ -173,11 +173,11 @@
             </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 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 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>
@@ -324,7 +324,7 @@ export default {
                 this.originalPrice = ps; this.CommodityPrice = ps; this.amountTotal = ps;
                 let wy = this.$h.Mul(this.goodsInfo.service, num*2); //寄卖服务费
                 if (type == 1) {
-                    let wp = this.$h.Mul(this.goodsInfo.trade_price, num*2);
+                    let wp = this.$h.Mul(this.goodsInfo.cost_price, num*2*0.2); // 批发价字段去除了 零售价+2*（零售价 *0.2+寄卖服务价）
                     let wpt = this.$h.Add(wp,wy)
                     this.wholesalePriceTotal = wpt;
                     this.amountTotal = this.$h.Add(wpt,this.amountTotal)
@@ -341,7 +341,7 @@ export default {
                 if (type == 1) {
                     // b1 = this.$h.Sub(ps, this.userinfo.user_money); //用云宝计算后 待支付价格
                     b1 = this.$h.Sub(ps,um); // 寄卖服务待支付价格不使用云宝
-                    let sp = wy;  //寄卖服务费只能用数智生活余额支付或微信支付
+                    let sp = this.$h.Sub(wy,um);  //寄卖服务费只能用数智生活余额支付或微信支付
                     obligation = b1 > 0 ? b1 : 0; 
                     obligation = this.$h.Add(obligation,sp > 0 ? sp : 0);
                 }

src/pagesB/accountDetails/TeaC.vue

@@ -103,7 +103,7 @@ export default {
                     case 5:
                         return "赠送支出TeaC";
                     case 6:
-                        return "消费TeaC";
+                        return "兑换支出TeaC";
                     case 7:
                         return "寄卖奖励TeaC";
                     case 8: