寄售功能调整，零售批发合并

src/pages.json

@@ -29,7 +29,7 @@
 		{
 			"path": "pages/product/productRetail",
 			"style": {
-				"navigationBarTitleText": "零售专区"
+				"navigationBarTitleText": "数智云店"
 			}
 		},
 		{

src/pages/account/wealth.vue

@@ -6,10 +6,10 @@
         <view class="list_name">云宝</view>
         <view class="list_text dinB">{{ userinfo.user_money }}</view>
       </view>
-      <view class="list flex_c flex_ac" @click="goto('/pages/accountDetails/integral')">
+      <!-- <view class="list flex_c flex_ac" @click="goto('/pages/accountDetails/integral')">
         <view class="list_name">批发券</view>
         <view class="list_text dinB">{{ userinfo.integral }}</view>
-      </view>
+      </view> -->
     </view>
     <view class="con flex_r flex_ac mar_t16">
       <view class="list flex_c flex_ac" @click="goto('/pages/accountDetails/teaBaby')">

src/pages/cash/index.vue

@@ -37,7 +37,7 @@ export default {
             imgs: "",
             index: 0,
             userinfo: undefined, // 获取用户信息
-            local_uinfo: undefined,
+            localInfo: undefined,
 
             user_money: 0, //余额
             available_money: 0, //数智生活可提金额
@@ -155,8 +155,8 @@ export default {
             this.user_money = this.userinfo.user_money;
         },
         async getLU() {
-            this.local_uinfo = await uni.Luserfun();
-            this.user_money = this.local_uinfo.property;
+            this.localInfo = await uni.Luserfun();
+            this.user_money = this.localInfo.property;
             post("local/withdrawAmount").then((res) => {
                 if (res.code === 0) {
                     this.available_money = res.data

src/pages/index/index.vue

@@ -46,7 +46,8 @@
                     <view class="content-view">
                         <view :class="['product-title', 'ellipsis']">{{ i.goods_name }}</view>
                         <view class="product-price">
-                            <text class="product-price-original">{{ i.price }}</text>
+                            <text class="product-price-original" v-if="i.type == 1">{{ i.total_amount }}</text>
+                            <text class="product-price-original" v-else>{{ i.price }}</text>
                             <text class="product-text" v-if="[3,4].includes(i.type)">赠<text class="corFE2C15">{{ i.give_cha_bao }}</text>茶宝</text>
                         </view>
                         <view class="product-txt" v-if="i.type == 4">
@@ -54,7 +55,7 @@
                             <text class="product-text">消费金抵</text>
                             <span class="corFE2C15">￥{{ Number(i.consume) }}</span>
                         </view>
-                        <view class="product-txt" v-if="i.type == 1">赠送{{ i.give_integral + "批发券" }}</view>
+                        <!-- <view class="product-txt" v-if="i.type == 1">赠送{{ i.give_integral + "批发券" }}</view> -->
                         <view class="product-txt" v-if="[3,4].includes(i.type)">限时赠送<text class="corFE2C15">{{ i.teac }}</text>TeaC</view>
                         <view class="product-txt fenxiang" v-if="[3,4].includes(i.type)">
                             <text class="iconfont red">&#xe62b;</text>

src/pages/my/index.vue

@@ -70,7 +70,7 @@
                         <image class="fun_img" src="/static/my/upgrade.png"></image>
                         <view class="fun_text">激活升级</view>
                     </navigator>
-                    <navigator v-if="local_uinfo.level_id>1" class="fun_list flex_c flex_ac" url="/pagesB/orderingfood/group" hover-class="none">
+                    <navigator v-if="localInfo.level_id>1" class="fun_list flex_c flex_ac" url="/pagesB/orderingfood/group" hover-class="none">
                         <image class="fun_img" src="/static/my/l_group.png"></image>
                         <view class="fun_text">我的用户</view>
                     </navigator>
@@ -114,7 +114,13 @@
                         <view class="fun_text">提现明细</view>
                     </navigator>
                 </view>
-                <view class="fun_tit mar_t50">云店订单</view>
+                <view class="fun_tit mar_t50 flex_r flex_ac flex_jb">
+                    <view>云店订单</view>
+                    <view class="moarbtn" @click="goto('/pages/szw-order-list/index')">
+                        <text>查看全部</text>
+                        <text class="iconfont">&#xe62e;</text>
+                    </view>
+                </view>
                 <view class="fun_con mar_t50 flex_r flex_ac flex_jb">
                     <navigator class="fun_list flex_c flex_ac" url="/pages/szw-order-list/index?status=1" hover-class="none">
                         <image class="fun_img" src="/static/my/payment.png"></image>
@@ -209,7 +215,7 @@ export default {
             invited: "",
             allChaYou: "",
             isAuthentication: uni.getStorageSync("isAuthentication"), //是否开启实名模块
-            local_uinfo: {}, //数智生活信息
+            localInfo: {}, //数智生活信息
         };
     },
     onLoad(options) {
@@ -371,7 +377,7 @@ export default {
             });
         },
         async getLU() {
-            this.local_uinfo = await uni.Luserfun()
+            this.localInfo = await uni.Luserfun()
         },
         activation() {
             this.$refs.activation.open()
@@ -599,6 +605,7 @@ page {
     color: #666;
     font-weight: bold;
     padding-left: 36rpx;
+    padding-right: 30rpx;
 }
 
 .fun {
@@ -638,5 +645,17 @@ page {
     }
 }
 
+.moarbtn{
+    font-size: 22rpx;
+    color: #999;
+    .iconfont{
+        text-decoration-skip: 20rpx;
+        margin-left: 6rpx;
+        color: #999;
+    }
+    text{
+        vertical-align: middle;
+    }
+}
 // 功能列表-end
 </style>

src/pages/orderingfood/merchantlist.vue

@@ -2,18 +2,18 @@
     <div class="merchantlist">
         <div class="head">
             <div class="bg"></div>
-            <div class="card">
-                <div class="live_name">{{ typeto(local_uinfo.level_id) }}</div>
+            <div class="card" :style="{marginTop:IsMobile?'-55px':'-135px'}">
+                <div class="live_name">{{ typeto(localInfo.level_id) }}</div>
                 <view class="regional">
-                    <template v-if="local_uinfo.regional">
+                    <template v-if="localInfo.regional">
                         <img src="@/static/my/regional.png" alt="" srcset="" class="ico">
                         <!-- <span class="ico iconfont">&#xf727;</span> -->
-                        <span class="txtinfo">区域节点：{{ local_uinfo.regional }}</span>
+                        <span class="txtinfo">区域节点：{{ localInfo.regional }}</span>
                     </template>
                 </view>
                 <div class="mm">
                     <span>账户余额</span>
-                    <span class="balance dinB">{{ local_uinfo.integral || 0 }}</span>
+                    <span class="balance dinB">{{ localInfo.integral || 0 }}</span>
                 </div>
             </div>
         </div>
@@ -52,6 +52,7 @@ export default {
     components: { activation },
     data() {
         return {
+            IsMobile: true,
             loading: true,
             Query: {
                 lat: 113.9367,
@@ -61,7 +62,7 @@ export default {
             },
             merchant: {},
             merchantList: [],
-            local_uinfo: {},
+            localInfo: {},
             tabs,
         };
     },
@@ -106,7 +107,7 @@ export default {
             })
         },
         async getLU() {
-            this.local_uinfo = await uni.Luserfun()
+            this.localInfo = await uni.Luserfun()
         },
         typeto(va) {
             switch (va) {
@@ -129,7 +130,13 @@ export default {
             this.$refs.activation.open()
         }
     },
-    onLoad(da){},
+    onLoad(da){
+        let app = uni.getSystemInfoSync();
+        console.log(app.platform);
+        if(["android","ios","devtools"].includes(app.platform)){
+            this.IsMobile = true
+        }else this.IsMobile = false
+    },
     onShow() {
         this.isActivation();
     },

src/pages/product/p_details.vue

@@ -11,7 +11,7 @@
                 <span v-if="Number(detail.cha_bao) != 0">{{ detail.cha_bao }}茶宝</span>
             </view>
             <view v-else class="price" :class="type == 2 ? 'samll' : ''">
-				<text class="p_favour" v-if="(type == 1)">￥{{ detail.cost_price }}</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 +20,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">送 {{detail.trade_give_num}} 批发券</text>
+				<!-- <text class="p_trade" v-if="type == 1">送 {{detail.trade_give_num}} 批发券</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>
@@ -67,13 +67,14 @@
         <uni-popup ref="shopping" type="bottom">
             <view class="shopping">
                 <view class="close_con flex_r flex_je">
-                    <image class="close_img" src="/static/close.png" @tap="closeBtn" mode=""></image>
+                    <view class="iconfont close_img" @tap="closeBtn">&#xe609;</view>
                 </view>
                 <view class="goods_info flex_r">
                     <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 == 2">{{ detail.trade_price }}元+{{ detail.trade_num }}批发券+{{ detail.treasure_price }}茶宝</view>
+                        <view class="goods_msg" v-if="type == 1">￥{{ detail.total_amount }}</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>￥{{ detail.cost_price }}</view>
                         <view class="num_con flex_r flex_je" v-if="type != 6">
                             <uni-number-box :min="1" @change="bindChange" :value="buyNum"></uni-number-box>
@@ -81,14 +82,14 @@
                         <view class="num_str flex_r flex_je" v-else>x 1</view>
                     </view>
                 </view>
-                <view class="goods_option flex_r flex_ac flex_jse" v-if="type == 2">
+                <view class="goods_option flex_r flex_ac flex_jse" v-if="type == 1">
                     <view class="goods_raido flex_r flex_ac" @tap="setWay('0')">
                         <view class="raido_img" :class="pfway == '0' ? 'raido_box' : ''"></view>
-                        <view class="raido_text">发货邮寄</view>
+                        <view class="raido_text">零售产品邮寄</view>
                     </view>
                     <view class="goods_raido flex_r flex_ac" @tap="setWay('1')">
                         <view class="raido_img" :class="pfway == '1' ? 'raido_box' : ''"></view>
-                        <view class="raido_text">申请寄卖</view>
+                        <view class="raido_text">零售产品置换</view>
                     </view>
                 </view>
                 <checkbox-group class="flex_r flex_ac flex_jc" @change="checkboxChange">
@@ -235,8 +236,7 @@ export default {
             let da = {
                 ...this.goodsDa,
                 num: Number(this.buyNum),
-                // prom_type:this.qhway,
-                is_sell: this.type == 2 ? this.pfway : "0",
+                is_sell: ['1','2'].includes(this.type) ? this.pfway : "0",
             };
             this.goto("/pages/to-pay-list/index", da);
         },
@@ -511,8 +511,8 @@ page {
 }
 
 .close_img {
-    width: 36rpx;
-    height: 36rpx;
+    font-size: 38rpx;
+    color: #999;
 }
 
 .option_box {

src/pages/product/productRetail.vue

@@ -18,7 +18,7 @@
                         <text class="product-text">消费金抵</text>
                         <span class="corFE2C15">￥{{ Number(i.consume) }}</span>
                     </view>
-                    <view class="product-txt" v-if="type == 1">赠送{{ i.give_integral + "批发券" }}</view>
+                    <!-- <view class="product-txt" v-if="type == 1">赠送{{ i.give_integral + "批发券" }}</view> -->
                     <view class="product-txt" v-if="type == 6">每<text class="green">{{i.interval_time}}</text> 分钟降价 <text class="green">{{i.drop_range * 100}}%</text> </view>
                     <view class="product-txt" v-if="['3','4'].includes(type)">限时赠送<text class="corFE2C15">{{ i.teac }}</text>TeaC</view>
                     <view class="product-txt fenxiang" v-if="['3','4'].includes(type)">
@@ -41,9 +41,9 @@ export default {
     components: { notGoods },
     data() {
         return {
-            goods: [], // 商品列表
-            type: '',
             title: '',
+            type: '',
+            goods: [], // 商品列表
             haveGoods: false, // 是否有商品
         };
     },

src/pages/sign/index.vue

@@ -58,7 +58,7 @@
                         <text class="product-text">消费金抵</text>
                         <span class="corFE2C15">￥{{ Number(i.consume) }}</span>
                     </view>
-                    <view class="product-txt" v-if="i.type == 1">赠送{{ i.give_integral + "批发券" }}</view>
+                    <!-- <view class="product-txt" v-if="i.type == 1">赠送{{ i.give_integral + "批发券" }}</view> -->
                     <view class="product-txt" v-if="['3','4'].includes(i.type)">限时赠送<text class="corFE2C15">{{ i.teac }}</text>TeaC</view>
                     <view class="product-txt fenxiang" v-if="['3','4'].includes(i.type)">
                         <text class="iconfont red">&#xe62b;</text>

src/pages/speed-up/index.vue

@@ -30,7 +30,7 @@
 				</view>
 				<view class="sign_up_con">
 					<view style="display: flex;justify-content: center;position: relative;">
-					  <cmd-progress type="circle" :percent="(detail.oCountqd2/detail.oCountqd1) * 100" stroke-color="#009688" :stroke-width="12" :width="168" :showInfo="false"></cmd-progress>
+					  <cmd-progress type="circle" :percent="(totalSign/(detail.qsCount*detail.oCountqd1)) * 100" stroke-color="#009688" :stroke-width="12" :width="168" :showInfo="false"></cmd-progress>
 					  <view class="status flex_r flex_ac flex_jc">加速中</view>
 					</view>
 				</view>
@@ -50,7 +50,7 @@
 			<view class="sign_con flex_r flex_ac flex_jb">
 				<view class="sign_insfo flex_c flex_jc">
 					<view class="sign_name">分享加速</view>
-					<view class="sign_msg" style="max-width: 80%;">分享新用户在零售专区消费可获得加速，直至最快寄卖匹配周期。</view>
+					<view class="sign_msg" style="max-width: 80%;">分享新用户在数智云店消费可获得加速，直至最快寄卖匹配周期。</view>
 				</view>
 				<view class="pro_con">
 					<image src="/static/img/promotion.png" mode=""></image>
@@ -83,6 +83,7 @@ import cmdProgress from "@/components/cmd-progress/cmd-progress.vue"
 				dayNum: '', //剩余天数
 				timeNum: '', //剩余时间（减去整天数过后的）
 				// speedUpDayNum: "",//加速天数
+				totalSign: 0, //已签到天数
 			};
 		},
 		onLoad:function(e){
@@ -110,6 +111,15 @@ import cmdProgress from "@/components/cmd-progress/cmd-progress.vue"
 
 					}
 				})
+				
+				let da = {
+					time: new Date().getTime() / 1000
+				}
+				post("v1/user/sign", da).then((res) => {
+					if (res.code == 0) {
+						this.totalSign = res.data.total_sign;
+					}
+				});
 			},
 			timeCalculate(data){
 				console.log("寄卖结束：",this.$day(data.create_time).add(19 - data.speed_days, 'day').format("YYYY-MM-DD HH:mm:ss"));

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

@@ -263,7 +263,7 @@ export default {
       return (da) => {
         switch (da) {
           case 1:
-            return "零售专区";
+            return "数智云店";
           case 2:
             return "批发专区";
           case 3:
@@ -300,14 +300,11 @@ export default {
   },
   // 监听卸载页面  同等于  返回拦截
   onUnload() {
-    // #ifdef  H5 || APP-PLUS
-    this.goto("/pages/my/index");
-    // #endif
-    // #ifdef  MP-WEIXIN
-    uni.switchTab({
-      url: "/pages/my/index",
-    });
-    // #endif
+    let pages = getCurrentPages();
+    let prevPage = pages[pages.length - 2].route
+    if(prevPage == "pages/to-pay-list/index"){
+      uni.switchTab({ url: "/pages/my/index" });
+    }
   },
 };
 </script>

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

@@ -1,7 +1,7 @@
 <template>
     <view class="container">
+        <!-- shipping_method    发货方式：0邮寄 1自提 2邮寄自提 -->
         <template v-if="Data.is_sell != 1">
-            <!-- shipping_method    发货方式：0邮寄 1自提 2邮寄自提 -->
             <div class="qtmd mar_b20" v-if="goodsInfo.shipping_method == 2">
                 <view class="order_list flex_r flex_ac flex_jb">
                     <view class="list_name">发货方式</view>
@@ -22,8 +22,7 @@
             </div>
         </template>
         <!-- 收货地址 -->
-        <!-- is_sell    0：邮寄 1：寄售 -->
-        <!-- prom_type    0：邮寄 1：自提 -->
+        <!-- is_sell    0：邮寄 1：寄售         prom_type    0：邮寄 1：自提 -->
         <view class="address mar_b20" v-if="Data.is_sell != 1 && prom_type != 1">
             <block v-if="DefaultAddress.name">
                 <view class="add_head flex_r flex_ac flex_jb">
@@ -48,42 +47,33 @@
         <!-- 收货地址-end -->
         <!-- 商品信息 -->
         <view class="goods_info mar_b20">
-            <view class="info_type">{{ modularName }}</view>
+            <view class="info_type" v-if="Data.type != 1">{{ modularName }}</view>
             <view class="goods flex_r">
                 <image class="goods_img" :src="goodsInfo.original_img" mode=""></image>
                 <view class="goods_con flex_c flex_jc flex_jb">
                     <view class="goods_name ellipsis2">{{ goodsInfo.goods_name }}</view>
-                    <view class="goods_msg" v-if="Data.type == 2">{{ goodsInfo.trade_price }}元+{{ goodsInfo.trade_num }}批发券+{{ goodsInfo.treasure_price }}茶宝</view>
-                    <view class="goods_msg" v-else>{{ goodsInfo.cost_price }}</view>
-                    <view class="goods_num">x {{ Data.num }}</view>
+                    <!-- <view class="goods_msg" v-if="Data.type == 2">{{ goodsInfo.trade_price }}元+{{ goodsInfo.trade_num }}批发券+{{ goodsInfo.treasure_price }}茶宝</view> -->
+                    <template v-if="Data.type != 1">
+                        <view class="goods_msg">{{ goodsInfo.cost_price }}</view>
+                        <view class="goods_num">x {{ Data.num }}</view>
+                    </template>
                 </view>
             </view>
         </view>
         <!-- 商品信息-end -->
         <!-- 订单信息 -->
-        <view class="order">
+        <view class="order mar_b20">
+            <view class="info_type" v-if="Data.type == 1">{{ modularName }}</view>
             <view class="order_list flex_r flex_ac flex_jb">
                 <view class="list_name">数量</view>
                 <view class="list_con">{{ Data.num }}</view>
             </view>
-			<template v-if="Data.type==2">
-                <view class="order_list flex_r flex_ac flex_jb" v-if="Data.is_sell == 1">
-                    <view class="flex_r flex_ac">
-                        <view class="list_name">服务费</view>
-                        <view class="list_con p_color">(寄卖，{{ freight.service }}元/每套)</view>
-                    </view>
-                    <view class="list_con">￥{{ $h.Mul(freight.service, Data.num) }}</view>
-                </view>
-                <view class="order_list flex_r flex_ac flex_jb" v-else-if="prom_type != 1">
-                    <view class="flex_r flex_ac">
-                        <view class="list_name">服务费</view>
-                        <view class="list_con p_color">(邮寄，{{ freight.freight }}元/每套)</view>
-                    </view>
-                    <view class="list_con">￥{{ $h.Mul(freight.freight, Data.num) }}</view>
-                </view>
-            </template>
-            <template v-else>
-                <view class="order_list flex_r flex_ac flex_jb" v-if="Data.is_sell != 1 && prom_type != 1">
+            <view class="order_list flex_r flex_ac flex_jb">
+                <view class="list_name">商品单价</view>
+                <view class="list_con">￥{{ parseFloat(goodsInfo.cost_price) }}</view>
+            </view>
+            <template v-if="Data.type != 1">
+                <view class="order_list flex_r flex_ac flex_jb" v-if="Data.is_sell != 1 && prom_type != 1 && freight > 0">
                     <view class="flex_r flex_ac">
                         <view class="list_name">运费</view>
                         <view class="list_con p_color">({{ freight }}元/每套)</view>
@@ -106,33 +96,63 @@
                 </view>
                 <view class="list_con">{{ $h.Mul(goodsInfo.trade_num, Data.num) }} 批发券</view>
             </view>
-			<template v-if="Data.type==4 && isAct">
-				<view class="order_list flex_r flex_ac flex_jb">
-					<view class="list_name">商品原价</view>
-					<view class="list_con">￥{{ originalPrice }}</view>
-				</view>
-				<view class="order_list flex_r flex_ac flex_jb">
-					<view class="flex_r flex_ac">
-						<view class="list_name">消费金抵</view>
-                    	<view class="list_con p_color">(可用 {{ parseFloat(local_uinfo.integral) }})</view>
-					</view>
-					<view class="list_con p_color">-￥{{ goldNum }}</view>
-				</view>
-			</template>
-            
-			<view class="order_list flex_r flex_ac flex_jb" v-if="Data.type != 5">
-                <view class="list_name">商品金额</view>
+            <template v-if="Data.type==4 && isAct">
+                <view class="order_list flex_r flex_ac flex_jb">
+                    <view class="list_name">商品原价</view>
+                    <view class="list_con">￥{{ originalPrice }}</view>
+                </view>
+                <view class="order_list flex_r flex_ac flex_jb">
+                    <view class="flex_r flex_ac">
+                        <view class="list_name">消费金抵</view>
+                        <view class="list_con p_color">(可用 {{ parseFloat(localInfo.integral) }})</view>
+                    </view>
+                    <view class="list_con p_color">-￥{{ goldNum }}</view>
+                </view>
+            </template>
+            <view class="order_list flex_r flex_ac flex_jb">
+                <view class="list_name">小计</view>
                 <view class="list_con">￥{{ CommodityPrice || 0 }}</view>
             </view>
+        </view>
+        <view class="order mar_b20" v-if="Data.type == 1">
+            <view class="info_type">批发专区</view>
+            <view class="order_list flex_r flex_ac flex_jb">
+                <view class="list_name">数量</view>
+                <view class="list_con">{{ Data.num * 2 }}</view>
+            </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>
+            <view class="order_list flex_r flex_ac flex_jb">
+                <view class="flex_r flex_ac">
+                    <view class="list_name">寄卖服务</view>
+                    <view class="list_con p_color">({{ goodsInfo.service }}元/每套)</view>
+                </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 }}</view>
+            </view>
             <view class="order_list flex_r flex_ac flex_jb" v-if="['1','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="list_name">数智余额</view>
-                <view class="list_con g_color">￥{{ local_uinfo.property }}</view>
+                <view class="list_con g_color">￥{{ localInfo.property }}</view>
             </view>
-
+        </view>
+        <view class="msginfo" v-if="Data.type == 1">
+            <view class="title">特别提示</view>
+            <view>1、寄卖服务费只能使用数智余额抵扣或微信支付</view>
         </view>
         <!-- 订单信息-end -->
         <!-- 底部操作栏 -->
@@ -157,20 +177,22 @@ export default {
     data() {
         return {
             Data: {},
-            goodsInfo: "", // 商品信息
-            modularName: "", // 商品类型
-            DefaultAddress: {}, // 用户默认地址
-			CommodityPrice: 0, //商品价格
-            obligation: 0, //待支付
+            goodsInfo: "", //商品信息
+            modularName: "", //商品类型
+            DefaultAddress: {}, //用户默认地址
+            originalPrice: 0, //商品原价(总价)
+            CommodityPrice: 0, //商品折扣后价格（总价）
+            wholesalePriceTotal: 0, //批发总价
+            obligation: 0, //待支付 （可以理解为必须微信支付的）
             freight: 0, //运费
-			goldNum: 0, //消费金抵扣
-			originalPrice: 0, //抵扣后价格
+            goldNum: 0, //消费金抵扣
+            amountTotal: 0, //合计
 
-            userinfo: {},
-            local_uinfo: {},
+            userinfo: uni.getStorageSync("userinfo"),
+            localInfo: uni.getStorageSync("localInfo"),
 
-            prom_type: 0,
-			isAct: false, //是否激活数智生活
+            prom_type: 0, //0：邮寄 1：自提
+            isAct: false, //是否激活数智生活
         };
     },
     components: {
@@ -178,26 +200,13 @@ export default {
     },
     onLoad(e) {
         this.Data = e;
-		this.isActivation();    //查询是否激活数智生活
-        this.getLU();   //获取数智生活用户信息
-        this.getuserInfo(); //获取云店用户信息
+        this.isActivation(); //查询是否激活数智生活
         this.loadAddress(); //获取收货地址
-        this.loadData(e);   //加载订单商品数据
+        this.loadData(e); //加载订单商品数据
 
         this.modularName = this.tidyTpye(e.type);
     },
-    computed: {
-        runp() {
-            switch (this.Data.type) {
-                case '2':
-                    return this.goodsInfo.trade_price;
-                case '4':
-                    return this.$h.Sub(this.goodsInfo.cost_price, this.isAct ? this.goodsInfo.consume : 0);
-                default:
-                    return this.goodsInfo.cost_price;
-            }
-        }
-    },
+    computed: {},
     methods: {
         onprom(va) {
             this.prom_type = va
@@ -206,76 +215,92 @@ export default {
         // 是否激活数智生活
         async isActivation() {
             let res = await post("local/isActivation", this.Query);
-			if (res.code === 0) {
-				this.isAct = true
-			}else {
-				uni.hideToast();
-				this.isAct = false
-			}
+            if (res.code === 0) {
+                this.isAct = true
+            } else {
+                uni.hideToast();
+                this.isAct = false
+            }
         },
         loadData(da) {
             post("v1/goods/goodsDetail", da).then((res) => {
                 if (res.code === 0) {
                     this.goodsInfo = res.data.data;
                     if (this.goodsInfo.shipping_method != 2) this.prom_type = this.goodsInfo.shipping_method
-                    post("v1/goods/freight", { type: da.type, id: da.id }).then((res) => {
-                        if (res.code === 0) this.freight = res.data.freight;
-
-                        let type = this.Data.type;  // 商品类型（零售、批发 ...）
-						
-                        // 计算待支付
-                        let p = type == 2 ? this.goodsInfo.trade_price : this.goodsInfo.cost_price; //商品单价
-                        let y = 0;  //运费单价
-                        if(type == 2){
-                            if(this.Data.is_sell == 1) y = this.freight.service
-                            else if(this.prom_type != 1 && this.Data.is_sell != 1) y = this.freight.freight
-                        }
-                        else y = this.prom_type == 1 ? 0 : this.freight; // 运费单价   寄卖、自提 运费为0
-                        let ps = this.$h.Mul(p, this.Data.num); //商品总价
-                        let ys = this.$h.Mul(y, this.Data.num) //运费总价
-                        let a = this.$h.Add(ps, ys); //商品总价加运费
-						this.originalPrice = ps; this.CommodityPrice = ps;
-
-                        let um = 0; //数智生活余额
-                        if(this.isAct) um = this.local_uinfo.property; //数智生活余额
-                        let userBalance = this.$h.Add(this.userinfo.user_money, um); //用户总余额（数智生活余额+云宝）
-
-                        let b = this.$h.Sub(a, userBalance); //待支付金额
-                        let b1 = this.$h.Sub(ps, userBalance); //待支付金额 - 零售&批发&云宝货易 运费必须现金支付
-
-                        if (type == 4) {
-                            if(this.isAct){
-                                let up = this.local_uinfo.integral; //数智生活消费金
-								let goldnum = this.$h.Mul(this.goodsInfo.consume, this.Data.num);   //商品消费金 可抵金额
-								this.goldNum = up > goldnum ? goldnum : up; //可抵金额，消费金不够及余额多少抵多少
-								let sp = this.$h.Sub(ps, this.goldNum); //抵扣后价格
-								this.CommodityPrice = sp;
-								let b2 = this.$h.Sub(sp, um); //消费金电商  可以使用数智生活佣金支付
-								this.obligation = b2 > 0 ? b2 : 0;
-							}
-							else this.obligation = a;
-						}
-                        else if (["5", "6"].includes(type)) this.obligation = a;
-                        else if (["1", "2", "3"].includes(type)) this.obligation = b1 > 0 ? this.$h.Add(b1, ys) : ys;
-                        else this.obligation = b > 0 ? b : 0;
-                    });
+                    if(da.type==1)this.calculatePrice(1,this.Data.num);
+                    else{
+                        post("v1/goods/freight", { type: da.type, id: da.id }).then((res) => {
+                            if (res.code === 0) this.freight = res.data.freight;
+                            this.calculatePrice(this.Data.type,this.Data.num);
+                        });
+                    }
                 }
             });
         },
+        calculatePrice(type,num){
+            setTimeout(() => {
+                // 计算待支付
+                let p = this.goodsInfo.cost_price; //商品单价
+                let y = (this.prom_type == 1 || this.Data.is_sell == 1 || type == 1) ? 0 : this.freight; // 运费单价   寄卖、自提 运费为0
+                let ps = this.$h.Mul(p, num); //商品总价
+                let ys = this.$h.Mul(y, num); //运费总价
+                let a = this.$h.Add(ps, ys); //商品总价加运费
+                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 wpt = this.$h.Add(wp,wy)
+                    this.wholesalePriceTotal = wpt;
+                    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); //用户总余额（数智生活余额+云宝）
+    
+                let b = this.$h.Sub(a, userBalance); //待支付金额
+                let b1 = this.$h.Sub(ps, userBalance); //待支付金额 - 零售&批发&云宝货易 运费必须现金支付
+    
+                let obligation = 0;
+                if (type == 1) {
+                    b1 = this.$h.Sub(ps, this.userinfo.user_money); //用云宝计算后 待支付价格
+                    let sp = this.$h.Sub(wy,um);  //寄卖服务费只能用数智生活余额支付或微信支付
+                    console.log("sp",sp);
+                    obligation = b1 > 0 ? b1 : 0; 
+                    obligation = this.$h.Add(obligation,sp > 0 ? sp : 0);
+                }
+                else if (type == 4) {
+                    if (this.isAct) {
+                        let up = this.localInfo.integral; //数智生活消费金
+                        let goldnum = this.$h.Mul(this.goodsInfo.consume, num); //商品消费金 可抵金额
+                        this.goldNum = up > goldnum ? goldnum : up; //可抵金额，消费金不够及余额多少抵多少
+                        let sp = this.$h.Sub(ps, this.goldNum); //抵扣后价格
+                        this.CommodityPrice = sp; this.amountTotal = sp;
+                        let b2 = this.$h.Sub(sp, um); //消费金电商  可以使用数智生活佣金支付
+                        obligation = b2 > 0 ? b2 : 0;
+                    } else obligation = a;
+                }
+                else if (["5", "6"].includes(type)) obligation = a;
+                else if (["3"].includes(type)) obligation = b1 > 0 ? this.$h.Add(b1, ys) : ys;
+                else obligation = b > 0 ? b : 0;
+                this.obligation = obligation;
+            }, 100);
+        },
         // 获取用户地址
         async loadAddress() {
             let res = await post("v1/user/addressList");
-			if (res.code === 0) {
-				let da = res.data.data;
-				if (da.length) {
-					for (const i of da) {
-						if (i.status == 1) {
-							this.DefaultAddress = i;
-							break;
-						} else this.DefaultAddress = da[0];
-					}
-				}
-			}
+            if (res.code === 0) {
+                let da = res.data.data;
+                if (da.length) {
+                    for (const i of da) {
+                        if (i.status == 1) {
+                            this.DefaultAddress = i;
+                            break;
+                        } else this.DefaultAddress = da[0];
+                    }
+                }
+            }
         },
         //获取微信的收货地址
         getwexinAddress() {
@@ -391,7 +416,7 @@ export default {
             this.userinfo = await uni.userfun();
         },
         async getLU() {
-            this.local_uinfo = await uni.Luserfun()
+            this.localInfo = await uni.Luserfun()
         },
     },
 };
@@ -403,7 +428,7 @@ page {
 }
 
 .container {
-    padding: 20rpx;
+    padding: 20rpx 20rpx 150rpx;
     box-sizing: border-box;
 }
 
@@ -585,6 +610,7 @@ page {
 .p_color {
     color: #ff6d44;
 }
+
 .g_color {
     color: #18bb88;
 }
@@ -664,4 +690,18 @@ page {
         }
     }
 }
+.msginfo{
+    font-size: 24rpx;
+    color: #999;
+    margin-top: 30rpx;
+    .title {
+        color: #666;
+        font-size: 26rpx;
+        height: 26rpx;
+        line-height: 26rpx;
+        // padding-left: 12rpx;
+        // border-left: 6rpx solid #00b76c;
+        margin-bottom: 16rpx;
+    }
+}
 </style>

src/pagesB/cinema/confirmOrder.vue

@@ -126,7 +126,7 @@ export default {
                         // 支付失败
                       }
                     });
-                }else this.goto("/pagesB/orderingfood/orderlist")
+                }else if (res.code == 0 && res.data == 200) this.goto("/pagesB/orderingfood/orderlist")
             })
         },
         cinemaDesc(){

src/pagesB/directCharge/coupon.vue

@@ -171,7 +171,7 @@ export default {
                             // 支付失败
                         }
                     });
-                }else this.goto("/pagesB/orderingfood/orderlist")
+                }else if (res.code == 0 && res.data == 200) this.goto("/pagesB/orderingfood/orderlist")
             })
         }
     },

src/pagesB/directCharge/payment.vue

@@ -150,7 +150,7 @@ export default {
                             // 支付失败
                         }
                     });
-                }else this.goto("/pagesB/orderingfood/orderlist")
+                }else if (res.code == 0 && res.data == 200) this.goto("/pagesB/orderingfood/orderlist")
             })
         },
     },

src/pagesB/hotel/hotelDetail.vue

@@ -213,7 +213,7 @@ export default {
                             // 支付失败
                         }
                     });
-                }else this.goto("/pagesB/orderingfood/orderlist")
+                }else if (res.code == 0 && res.data == 200) this.goto("/pagesB/orderingfood/orderlist")
             })
         }
     },

src/pagesB/my/shuZhiWallet.vue

@@ -10,7 +10,7 @@
         <div class="h_top">
             <div class="balance_box">
                 <div class="b_teg">我的余额(元)</div>
-                <div class="dinB balance">{{ local_uinfo.property }}</div>
+                <div class="dinB balance">{{ localInfo.property }}</div>
             </div>
         </div>
         <div class="btn_bar flex_r flex_jse">
@@ -46,7 +46,7 @@ import { post } from "@/request/api.js";
     components: {},
     data () {
       return {
-            local_uinfo: {
+            localInfo: {
                 property:0
             },
             List: [],
@@ -67,7 +67,7 @@ import { post } from "@/request/api.js";
             })
         },
         async getLU() {
-            this.local_uinfo = await uni.Luserfun();
+            this.localInfo = await uni.Luserfun();
         },
         onBack() {
             uni.navigateBack();

src/pagesB/orderingfood/activationcode.vue

@@ -5,7 +5,7 @@
             <div class="u_info">
                 <div class="p1">{{ userinfo.nickname }}</div>
                 <div class="p1">手机号：{{ userinfo.mobile }}</div>
-                <div class="p3">加入时间：{{ local_uinfo.create_time }}</div>
+                <div class="p3">加入时间：{{ localInfo.create_time }}</div>
             </div>
         </div>
         <div class="con">
@@ -44,7 +44,7 @@ export default {
     data() {
         return {
             userinfo: uni.getStorageSync('userinfo'),
-            local_uinfo: {},
+            localInfo: {},
             Purview: {},
             code: undefined,
             codes: {},
@@ -60,7 +60,7 @@ export default {
     },
     methods: {
         async getLU() {
-            this.local_uinfo = await uni.Luserfun()
+            this.localInfo = await uni.Luserfun()
         },
         getPurview() {
             post("local/getPurview").then(res => {

src/pagesB/orderingfood/payTheBill.vue

@@ -153,7 +153,7 @@ export default {
                         // 支付失败
                       }
                     });
-                }else this.goto("/pagesB/orderingfood/orderlist")
+                }else if (res.code == 0 && res.data == 200) this.goto("/pagesB/orderingfood/orderlist")
             })
         }
     },

src/pagesB/prepaidRefill/index.vue

@@ -150,7 +150,7 @@ export default {
                             // 支付失败
                         }
                     });
-                }else this.goto("/pagesB/orderingfood/orderlist")
+                }else if (res.code == 0 && res.data == 200) this.goto("/pagesB/orderingfood/orderlist")
             });
         },
     },

src/pagesB/scenicSpotTicket/scenicDetail.vue

@@ -202,7 +202,7 @@ export default {
                             // 支付失败
                         }
                     });
-                }else this.goto("/pagesB/orderingfood/orderlist")
+                }else if (res.code == 0 && res.data == 200) this.goto("/pagesB/orderingfood/orderlist")
             })
         },
         thatDay(va){

src/pagesB/specialregion/index.vue

@@ -5,7 +5,7 @@
                 <div class="p1">
                     <img :src="userinfo.head_pic" class="hpic" />
                     <span class="num">{{ userinfo.mobile }}</span>
-                    <span class="copy" @click="copyText(userinfo.nickname)">复制</span>
+                    <span class="copy" @click="copyText(userinfo.mobile)">复制</span>
                     <div class="live">
                         <img src="/static/my/huangguan.png" class="hico" />
                         <span class="txt">{{ userinfo.level_name }}</span>
@@ -22,10 +22,10 @@
                         <p>云宝</p>
                         <p class="dinB">{{ userinfo.user_money }}</p>
                     </div>
-                    <div class="i_num">
+                    <!-- <div class="i_num">
                         <p>批发券</p>
                         <p class="dinB">{{ userinfo.integral }}</p>
-                    </div>
+                    </div> -->
                     <div class="i_num">
                         <p>昨日收益</p>
                         <p class="dinB">{{ userinfo.yesterdayProfit }}</p>
@@ -33,12 +33,12 @@
                 </div>
             </div>
         </div>
-        <div class="muu">
+        <!-- <div class="muu">
             <image src="https://teaclub.oss-cn-chengdu.aliyuncs.com/static/02.jpg" @click="gt(1)" mode="widthFix" class="img" />
             <image src="https://teaclub.oss-cn-chengdu.aliyuncs.com/static/01.jpg" @click="gt(2)" mode="widthFix" class="img" />
-        </div>
+        </div> -->
         <div class="muus">
-            <view class="fun mar_t30">
+            <view class="fun">
                 <view class="fun_title">云店服务</view>
                 <view class="fun_con mar_t50 flex_r flex_ac">
                     <navigator class="fun_list flex_c flex_ac" url="/pages/szw-order-list/index" hover-class="none">
@@ -49,10 +49,10 @@
                         <image class="fun_img" src="/static/my/consign.png"></image>
                         <view class="fun_text">寄卖</view>
                     </navigator>
-                    <navigator class="fun_list flex_c flex_ac" url="/pages/account/conversion" hover-class="none">
+                    <!-- <navigator class="fun_list flex_c flex_ac" url="/pages/account/conversion" hover-class="none">
                         <image class="fun_img" src="/static/my/10.png"></image>
                         <view class="fun_text">转化</view>
-                    </navigator>
+                    </navigator> -->
                     <navigator class="fun_list flex_c flex_ac" url="/pagesB/address/list" hover-class="none">
                         <image class="fun_img" src="/static/my/dizhi.png"></image>
                         <view class="fun_text">地址管理</view>
@@ -64,10 +64,25 @@
                 </view>
             </view>
         </div>
+        <view class="product-list">
+            <view class="product" v-for="(i, s) in goods" :key="s" @click="NavToGoodsDetail(i.id)">
+                <view class="image-view">
+                    <image class="product-image" :src="i.original_img"></image>
+                </view>
+                <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>
+                    </view>
+                    <!-- <view class="product-txt">赠送{{ i.give_integral + "批发券" }}</view> -->
+                </view>
+            </view>
+        </view>
     </div>
 </template>
 <script>
-// import { post } from "@/request/api.js";
+let page = 1;
+import { post } from "@/request/api.js";
 import uniCopy from "@/utils/copy";
 export default {
     name: "specialregion",
@@ -75,7 +90,9 @@ export default {
     components: {},
     data() {
         return {
-            userinfo: {}, // 获取用户信息
+            userinfo:  uni.getStorageSync("userinfo"), // 获取用户信息
+            localInfo: uni.getStorageSync("localInfo"),
+            goods: [], // 商品列表
         };
     },
     methods: {
@@ -89,6 +106,7 @@ export default {
         // 获取userinfo
         async getuserInfo() {
             this.userinfo = await uni.userfun();
+            this.localInfo = await uni.Luserfun()
         },
         // 复制账号
         copyText(e) {
@@ -98,12 +116,48 @@ export default {
                 error: (e) => {},
             });
         },
+        loadData() {
+            let data = { page: page, type: 1 }
+            post("v1/goods/goodsList", data).then(res => {
+                if (res.code == 0) {
+                    let obj = res.data.data
+                    if (page == 1) this.goods = []
+                    if (obj.length) {
+                        obj.forEach(e => {
+                            this.goods.push(e)
+                        });
+                    } else {
+                        page = -1;
+                    }
+                } else {
+                    page = -1;
+                }
+
+            })
+        },
+        // 跳转到商品详情页
+        NavToGoodsDetail(id, type) {
+            uni.navigateTo({
+                url: '/pages/product/p_details?type=1&id=' + id
+            })
+        },
+    },
+    onLoad(da) {
+        this.loadData();
     },
-    onLoad(da) {},
     onShow() {
         this.getuserInfo();
     },
     mounted() {},
+    //页面上拉触底事件的处理函数
+    onReachBottom() {
+        if (page != -1) {
+            setTimeout(() => {
+                ++page;
+                this.loadData();
+            }, 10);
+        }
+    },
 };
 </script>
 <style scoped lang='scss'>
@@ -246,4 +300,114 @@ export default {
         font-size: 22rpx;
     }
 }
+// 商品列表
+.product-list {
+    width: 100%;
+    display: flex;
+    flex-wrap: wrap;
+    flex-direction: row;
+    padding: 50rpx 30rpx 60rpx;
+
+    .product {
+        width: 48.5%;
+        margin-bottom: 20rpx;
+        padding-bottom: 12rpx;
+        border-radius: 10rpx;
+        box-shadow: 4rpx 4rpx 16rpx 10rpx rgba($color: #000, $alpha: 0.15);
+
+        &:nth-child(2n) {
+            margin-left: 3%;
+        }
+    }
+
+    .product-image {
+        border-radius: 10rpx 10rpx 0 0;
+        width: 100%;
+        height: 42.3vw;
+        object-fit: cover;
+    }
+
+    .content-view {
+        padding: 0 16rpx;
+    }
+
+    .product-title {
+        width: 100%;
+        overflow: hidden;
+        line-height: 1.5;
+        font-size: 28rpx;
+        color: #121212;
+    }
+
+    .product-price {
+        color: #121212;
+        font-size: 28rpx;
+        position: relative;
+    }
+
+    .product-price-original {
+        color: #18bb88;
+        font-size: 32rpx;
+        font-weight: bold;
+
+        &:before {
+            content: "￥";
+            font-size: 20rpx;
+        }
+    }
+
+    .product-price-favour {
+        color: #888;
+        text-decoration: line-through;
+        font-size: 22rpx;
+        margin-right: 10rpx;
+
+        &:before {
+            content: "￥";
+        }
+    }
+
+    .product-tip {
+        position: absolute;
+        right: 20rpx;
+        background-color: #ff3333;
+        color: #ffffff;
+        padding: 0 20rpx;
+        border-radius: 10rpx;
+    }
+
+    .product-unit {
+        font-size: 24rpx;
+    }
+
+    .green {
+        color: #18bb88;
+    }
+
+    .product-txt,
+    .product-text {
+        font-size: 22rpx;
+        color: #787878;
+
+        .iconfont {
+            margin-right: 6rpx;
+        }
+    }
+
+    .product-text {
+        margin-left: 16rpx;
+    }
+
+    .red {
+        color: #FA2E18;
+    }
+
+    .fenxiang {
+        font-size: 20rpx;
+        background: rgba(250, 46, 24, 0.08);
+        display: inline-block;
+        border-radius: 6rpx;
+        padding: 0 16rpx;
+    }
+}
 </style>

src/utils/myfun.js

@@ -67,7 +67,7 @@ export function goto(url, json) {
 export function tidyTpye(va) {
     let a = Number(va)
     switch (a) {
-        case 1: return "零售专区";
+        case 1: return "数智云店";
         case 2: return "批发专区";
         case 3: return "云宝货易";
         case 4: return "消费金电商";