修改问题

src/pages/product/p_details.vue

@@ -139,6 +139,22 @@
             <view class="raido_text">发货邮寄</view>
           </view>
         </view>
+        <view class="goods_option flex_r flex_ac flex_jc" v-if="type == 1 || type == 3 || type == 5">
+          <view class="goods_raido flex_r flex_ac" @tap="setQhWay('0')">
+            <view
+              class="raido_img"
+              :class="qhway == '0' ? 'raido_box' : ''"
+            ></view>
+            <view class="raido_text">发货邮寄</view>
+          </view>
+          <view class="goods_raido flex_r flex_ac" @tap="setQhWay('1')">
+            <view
+              class="raido_img"
+              :class="qhway == '1' ? 'raido_box' : ''"
+            ></view>
+            <view class="raido_text">到店自提</view>
+          </view>
+        </view>
         <checkbox-group class="flex_r flex_ac flex_jc" @change="checkboxChange">
           <label class="option_box">
             <checkbox
@@ -238,6 +254,7 @@ export default {
       checked: false, //是否选中协议
       buyNum: 1, //购买数量
       pfway: "1", // 批发
+      qhway:"0", //提货方式
       shopInfo: {}, // 商铺信息
       showAuth: false,
 
@@ -296,6 +313,7 @@ export default {
     toPayOrder: function () {
       let da = {
         ...this.goodsDa,
+        prom_type:this.qhway,
         num: Number(this.buyNum),
         is_sell: this.type == 2 ? this.pfway : "0",
       };
@@ -311,6 +329,9 @@ export default {
     setWay(e) {
       this.pfway = e;
     },
+    setQhWay(e){
+      this.qhway = e
+    },
     // 点击同意协议
     checkboxChange(e) {
       let index = e.detail.value.indexOf("1");

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

@@ -192,11 +192,11 @@ export default {
               appEv.errTips("支付已取消");
             }
             // appEv.errTips('支付成功');
-            this.loadData();
+            this.loadData(); 
           });
         }
       });
-    },
+    },      
     // 取消订单
     toCancel(e) {
       let that = this;
@@ -260,11 +260,14 @@ export default {
       return (da) => {
         let str;
         if (da[1] === 0) str = "待发货";
-        if (da[1] === 1) str = "待收货";
-        if (da[1] === 2) str = "已收货";
+        if (da[1] === 1) str = "已发货";
+        if (da[1] === 2) str = "已完成";
         if (da[1] === 3) str = "申请退货";
-        if (da[1] === 4) str = "已退货";
+        if (da[1] === 4) str = "确认退货";
         if (da[1] === 5) str = "已作废";
+        if (da[1] === 6) str = "转邮寄";
+        if (da[1] === 7) str = "待收货";
+        if (da[1] === 8) str = "待自提";
         if ([0,2].includes(da[0]) && da[1] != 5) str = "待支付";
         return str
       };

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

@@ -1,7 +1,7 @@
 <template>
   <view class="container">
     <!-- 收货地址 -->
-    <view class="address" v-if="Data.is_sell != 1">
+    <view class="address" v-if="Data.is_sell != 1 && Data.prom_type == 0">
       <block
         v-if="
           DefaultAddress != '' &&
@@ -60,7 +60,7 @@
         <view class="list_name">数量</view>
         <view class="list_con">{{ Data.num }}</view>
       </view>
-      <view class="order_list flex_r flex_ac flex_jb" v-if="Data.is_sell != 1">
+      <view class="order_list flex_r flex_ac flex_jb" v-if="Data.is_sell != 1 && Data.prom_type == 0">
         <view class="flex_r flex_ac">
           <view class="list_name">运费</view>
           <view class="list_con p_color">({{ freight }}元/每套)</view>
@@ -154,7 +154,7 @@ export default {
     this.Data = e;
     this.loadData(e);
     this.loadAddress();
-
+    console.log(this.Data);
     this.userinfo = uni.getStorageSync("userinfo");
     // 1零售 2批发 3精品 4今日值买
     this.modularName = this.tidyTpye(e.type);
@@ -176,6 +176,9 @@ export default {
                 ? this.goodsInfo.trade_price
                 : this.goodsInfo.cost_price; //商品单价
             let y = this.Data.is_sell == 1 ? 0 : this.freight; // 运费   寄售的话退运费为0
+            if(this.Data.prom_type == "1"){
+              y = 0
+            }
             let a = (p * this.Data.num + y * this.Data.num) * 100; //商品总价
             let b = (a - this.userinfo.user_money * 100) / 100; //待支付金额
             if (["4", "6"].includes(this.Data.type)) this.obligation = a / 100;

src/pages/top-up/index.vue

@@ -8,7 +8,7 @@
             <view class="select_name">{{ array[index] }}</view>
             <image
               style="width: 25rpx; height: 25rpx; margin-left: 15rpx"
-              src="/static/img/down.png"
+              src="/static/down.png"
               mode=""
             >
             </image>
@@ -62,7 +62,7 @@
             <checkbox class="checkboxCom" value="agree" />
             <view>我同意</view>
           </label>
-          <navigator url="/pages/agreement/recharge" hover-class="li_hover"
+          <navigator url="/pages/agreement/privacy" hover-class="li_hover"
             ><text>《充值协议》</text></navigator
           >
         </checkbox-group>
@@ -101,7 +101,7 @@
       <view class="list_name">充值方式</view>
       <view class="option_con flex_r flex_ac flex_jb mar_t16">
         <view class="way_con flex_r flex_ac">
-          <image class="way_img" src="/static/img/weixin_icon.png" mode=""></image>
+          <image class="way_img" src="/static/weixin_icon.png" mode=""></image>
           <view class="way_text">微信支付</view>
         </view>
         <view
@@ -200,8 +200,6 @@ export default {
 	  }else{
 		  this.isDisabled = true
 	  }
-   //    this.isDisabled = false= value.length == 0;
-	  // console.log(e.detail,"aaaaaaaaaaa")
     },
   },
 };
@@ -282,14 +280,14 @@ page {
 .way_radio {
   width: 39rpx;
   height: 35rpx;
-  background: url("~@/static/img/weixuanzhong.png");
+  background: url("~@/static/weixuanzhong.png");
   background-repeat: no-repeat;
   background-size: 35rpx 35rpx;
   background-position: center center;
 }
 
 .select_way {
-  background: url("~@/static/img/xuanzhong_icon.png");
+  background: url("~@/static/xuanzhong_icon.png");
   background-repeat: no-repeat;
   background-size: 39rpx 35rpx;
   background-position: center center;