换电脑前提交

app.js

@@ -2,6 +2,7 @@
 var http = require("utils/http.js");
 App({
   onLaunch: function () {
+    this.eventPool = {}; // 事件池：key=事件名，value=回调数组
     http.getToken();
     //自定义导航栏 获取设备顶部窗口的高度（不同设备窗口高度不一样，根据这个来设置自定义导航栏的高度）
     const windowInfo = wx.getWindowInfo()
@@ -18,5 +19,28 @@ App({
     totalCartCount: 0,
     statusBarHeight: 0,
     navBarHeight: 0,
+  },
+    // 注册事件：只避免“同一实例重复注册同一回调”
+  on(eventName, callback) {
+    if (!this.eventPool[eventName]) this.eventPool[eventName] = [];
+    // 只判断当前回调是否已存在，不影响其他实例的回调
+    const isExist = this.eventPool[eventName].some(cb => cb === callback);
+    if (!isExist) {
+      this.eventPool[eventName].push(callback);
+    }
+  },
+
+  // 触发事件：所有注册的回调都会执行（但同一时间只有1个实例活跃）
+  emit(eventName, data) {
+    const callbacks = this.eventPool[eventName] || [];
+    // 调试用：查看当前注册的回调数（同一时间通常为1，切换页面时可能短暂为2）
+    console.log(`事件${eventName}当前回调数：`, callbacks.length);
+    callbacks.forEach(callback => callback(data));
+  },
+
+  // 精准移除：只删当前实例的回调，不影响其他实例
+  off(eventName, callback) {
+    const callbacks = this.eventPool[eventName] || [];
+    this.eventPool[eventName] = callbacks.filter(cb => cb !== callback);
   }
 })

app.json

@@ -19,7 +19,6 @@
     "pages/prod/prod",
     "pages/login/login",
     "pages/couponCenter/couponCenter",
-    "pages/prod-classify/prod-classify",
     "pages/recent-news/recent-news",
     "pages/news-detail/news-detail",
     "pages/dis-center/dis-center",
@@ -27,14 +26,11 @@
     "pages/income-details/income-details",
     "pages/take-notes/take-notes",
     "pages/draw-rule/draw-rule",
-    "pages/promotion-order/promotion-order",
-    "pages/promotionProd/promotionProd",
     "pages/applyDist/applyDist",
     "pages/applyDistCon/applyDistCon",
     "pages/InvitationCards/InvitationCards",
     "pages/withdrawal/withdrawal",
     "pages/claimer/claimer",
-    "pages/spellGroupDetails/spellGroupDetails",
     "pages/confirmOrder/confirmOrder",
     "pages/snapUpList/snapUpList",
     "pages/snapUpDetail/snapUpDetail",
@@ -45,7 +41,6 @@
     "pages/DetailsOfRefund/DetailsOfRefund",
     "pages/chooseRefundWay/chooseRefundWay",
     "pages/writeReturnLogistics/writeReturnLogistics",
-    "pages/spellMembersDetails/spellMembersDetails",
     "pages/groupConfirmOrder/groupConfirmOrder",
     "pages/shopCollect/shopCollect",
     "pages/openAShop/openAShop",
@@ -58,9 +53,7 @@
     "pages/specialDiscount/specialDiscount",
     "pages/shopCategory/shopCategory",
     "pages/sub-category/sub-category",
-    "pages/aBulkList/aBulkList",
     "pages/alterShopPassword/alterShopPassword",
-    "pages/salesmanLevel/salesmanLevel",
     "pages/accountLogin/accountLogin",
     "components/IntegralGoodsList/IntegralGoodsList",
     "pages/register/register",
@@ -93,6 +86,12 @@
       ]
     }
   ],
+  "plugins": {
+    "logisticsPlugin": {
+      "version": "2.3.0",
+      "provider": "wx9ad912bf20548d92"
+    }
+  },
   "window": {
     "backgroundTextStyle": "light",
     "navigationBarBackgroundColor": "#006CE8",
@@ -156,6 +155,7 @@
     "van-steps": "@vant/weapp/steps/index",
     "van-empty": "@vant/weapp/empty/index",
     "van-toast": "@vant/weapp/toast/index",
+    "van-count-down": "@vant/weapp/count-down/index",
     "navbar": "/components/topNavtar/topNavtar",
     "tabbar": "/components/tabbar/tabbar",
     "van-loading": "@vant/weapp/loading/index",

components/tabbar/tabbar.js

@@ -1,4 +1,5 @@
 // components/tabbar/tabbar.js
+const app = getApp();
 Component({
   options: {
     styleIsolation: 'apply-shared' // 页面样式影响组件，组件样式不影响页面
@@ -28,6 +29,9 @@ Component({
       console.log(1111111,url);
       wx.switchTab({
         url,
+        complete(e){
+          console.log(1111111,url,e);
+        }
       })
     },
     /**
@@ -41,20 +45,39 @@ Component({
   },
   pageLifetimes: {
     show: function() {
-      // 页面被展示
-      var app = getApp();
-      this.setData({
-        num:app.globalData.totalCartCount
-      })
-      
+      const that = this;
+      // 2. 从本地取初始数量
+      const initNum = app.globalData.totalCartCount || 0;
+      that.setData({ num: initNum });
+  
+      // 3. 注册回调（用箭头函数，确保引用唯一，不会每次创建新函数）
+      this.updateCartCallback = (newNum) => {
+          console.log('updateCartCallback');
+  
+        that.setData({ num: newNum });
+        app.globalData.totalCartCount = newNum;
+      };
+      app.on('updateCartNum', this.updateCartCallback);
     },
     hide: function() {
-      // 页面被隐藏
+       // 只移除当前实例的回调，不影响其他页面的 TabBar 实例
+       if (this.updateCartCallback) {
+        app.off('updateCartNum', this.updateCartCallback);
+      }
     },
     resize: function(size) {
       // 页面尺寸变化
     }
   },
+  attached() {
+  
+  },
+   // 组件卸载时（极端情况兜底）
+   detached() {
+    if (this.updateCartCallback) {
+      app.off('updateCartNum', this.updateCartCallback);
+    }
+  },
 
   /**
    * 生命周期函数--监听页面加载

pages/DetailsOfRefund/DetailsOfRefund.js

@@ -56,6 +56,7 @@ Page({
     selectTimeshow: false,
     time: '',//取件时间
     userAddr: '',//取件地址
+    shopInfo:null,
     sendInfo: {},
     currentSelectedIndex: -1, // 初始没有选中项，索引设为 -1
     cancelPay: false,
@@ -114,6 +115,62 @@ Page({
     //获取退款申请详情
     this.getRefundDetail()
 
+  },
+  // 配送退货提交
+  submit(e){
+    console.log(e);
+    if(!this.data.time){
+      return wx.showToast({
+        title:'请选择时间',
+        icon:'none'
+      })
+    }else if(!e.currentTarget.dataset.info){
+      return wx.showToast({
+        title:'请选择收件地址',
+        icon:'none'
+      })
+    }
+    let that = this
+    var params = {
+      url: "/p/appointment",
+      method: "POST",
+      data: {
+        appointmentTime:that.data.time,
+        deliveryAddress:e.currentTarget.dataset.info.address+e.currentTarget.dataset.info.addressName,
+        customerName:e.currentTarget.dataset.info.receiver,
+        refundNumber:that.data.refundSn,
+        phoneNumber:e.currentTarget.dataset.info.mobile,
+        refundMethod:1,
+      },
+      callBack: (res)=> {
+         //获取退款申请详情
+         that.getRefundDetail()
+      }
+    }
+    http.request(params);
+  },
+  // 获取配送退货填写内容
+  getRefundWriteInfo(){
+    let that = this
+    var params = {
+      url: "/p/appointment/"+this.data.refundSn,
+      method: "GET",
+      data: {
+      },
+      callBack: (res)=> {
+        let userAddr = {}
+        userAddr.addrDetail = ''
+        userAddr.addressName = res.data.deliveryAddress
+        userAddr.receiver =  res.data.customerName
+        userAddr.mobile =  res.data.phoneNumber
+        that.setData({
+          time:res.data.appointmentTime,
+          userAddr
+        })
+        console.log(that.data.time);
+      }
+    }
+    http.request(params);
   },
    /**
    * 获取退款申请详情
@@ -141,6 +198,13 @@ Page({
         if(res.refundDelivery.imgs){
           refundPhotoFiles = res.refundDelivery.imgs.split(',')
         }
+        if(res.returnMoneySts == 65&&res.applyType == 2&&dvyType==1){//快递寄回
+          ths.getShopAddress(res.refundDelivery.shopId)
+        }else if(res.returnMoneySts == 65&&res.applyType == 2&&res.dvyType==3&&res.isReturnLogistics){
+          ths.getRefundWriteInfo()
+        }
+        ths.getRefundWriteInfo()
+
         ths.setData({
           applyTime: res.applyTime, //申请时间
           applyType: res.applyType, //申请类型:1,仅退款,2退款退货
@@ -173,7 +237,24 @@ Page({
           sendPay:res.refundDelivery.deyNu //物流编号，判断是否提交成功
         })
         wx.hideLoading();
-        ths.get_countDown()
+        // ths.get_countDown()
+      }
+    };
+    http.request(params);
+  },
+
+  // 获取退货地址
+  getShopAddress(shopId){
+    var ths = this;
+    var params = {
+      url: "/p/refundAddr/info/"+shopId,
+      method: "GET",
+      callBack: res => {
+        if(res.code == 200){
+          ths.setData({
+            shopInfo:res.data
+          })
+        }
       }
     };
     http.request(params);
@@ -328,6 +409,7 @@ Page({
       url: `/pages/writeReturnLogistics/writeReturnLogistics?refundSn=${refundSn}&shopId=${this.data.refundDelivery.shopId}&type=${type}`,
     })
   },
+
   
 
   /**

pages/DetailsOfRefund/DetailsOfRefund.wxml

@@ -14,6 +14,7 @@
     </view>
   </view>
 
+  <!-- <view class="write-info box" > -->
   <view class="write-info box" wx:if="{{returnMoneySts == 65&&applyType == 2&&dvyType==3&&!isReturnLogistics}}">
     <view class="sub-title">配送信息</view>
     <view class="form-box">
@@ -53,10 +54,49 @@
     <view class="notice">无需支付配送费</view>
     <view class="desc">1.因个人原因退货，需客户承担商品返还商家的运费</view>
     <view class="desc">2.请确保商品不影响二次销售，否则商家会拒绝收货</view>
-    <view class="btn">提交</view>
+    <view class="btn" data-info="{{userAddr}}" bind:tap="submit">提交</view>
   </view>
 
-  <!-- <view class="write-info-box box" wx:if="{{applyType == 2&&!isReturnLogistics}}"> -->
+  <!-- <view class="write-info box" wx:if="{{isReturnLogistics}}"> -->
+  <view class="write-info box" wx:if="{{returnMoneySts == 65&&applyType == 2&&dvyType==3&&isReturnLogistics}}">
+    <view class="sub-title">配送信息</view>
+    <view class="form-box">
+      <view class="form-item">
+        <view class="label">
+          <view class="icon">*</view>
+          取件时间
+        </view>
+        <view class="value {{time?'black':''}}" data-type="time">
+          {{time||'请选择时间'}}
+        </view>
+      </view>
+      <view class="form-item">
+        <view class="label">
+          <view class="icon">*</view>
+          取件地址
+        </view>
+        <view class="value-box">
+          <view class="value {{userAddr?'black':''}}" data-type="address">
+            {{userAddr?userAddr.addressName+userAddr.addrDetail:'请选择取件地址'}}
+          </view>
+          <view class="value {{userAddr?'black':''}}" wx:if="{{userAddr}}">
+            {{userAddr.receiver + ' ' +userAddr.mobile}}  
+          </view>
+        </view>
+      </view>
+      <view class="form-item">
+        <view class="label">
+          <view class="icon">*</view>
+          退货方式
+        </view>
+        <view class="value black">
+          上门取件 
+        </view>
+      </view>
+    </view>
+  </view>
+
+  <!-- <view class="write-info-box box" wx:if="{{!isReturnLogistics}}"> -->
   <view class="write-info-box box" wx:if="{{returnMoneySts == 65&&applyType == 2&&dvyType==1&&!isReturnLogistics}}">
     <view class="sub-title">退货方式</view>
     <view class="btn-box">
@@ -69,15 +109,15 @@
     <view class="shop-info">
       <view class="sub-title">退货地址</view>
       <view class="name-box">
-        <view class="name">杨锦新 </view>
-        <view class="tel">18900000000</view>
+        <view class="name">{{shopInfo.receiverName}} </view>
+        <view class="tel">{{shopInfo.receiverMobile}}</view>
       </view>
-      <view class="address">贵州省-贵阳市-观山湖区富力中心A座3401</view>
+      <view class="address">{{shopInfo.province}}-{{shopInfo.city}}-{{shopInfo.area}}{{shopInfo.addr}}</view>
     </view>
   
   </view>
   <!-- 已填写 -->
-  <!-- <view class="write-info-box box" wx:if="{{applyType == 2&&isReturnLogistics}}"> -->
+  <!-- <view class="write-info-box box" wx:if="{{isReturnLogistics}}"> -->
   <view class="write-info-box box" wx:if="{{returnMoneySts == 65&&applyType == 2&&dvyType==1&&isReturnLogistics}}">
     <view class="title-box">
       <view class="sub-title">退货方式</view>
@@ -148,7 +188,7 @@
             <view class="price">单价：￥{{item.price}}</view>
           </view>
           <view class="price-box">
-            <view class="price">￥{{((item.productCount*100)*(item.price*100))/10000}}</view>
+            <view class="price">￥{{calc.preciseMultiply(item.productCount,item.price)}}</view>
             <view class="num">x{{item.productCount}}</view>
           </view>
         </view>
@@ -215,4 +255,6 @@
     </view>
   </van-popup>
 
-</view>
+</view>
+
+<wxs module="calc" src="../../wxs/calc.wxs" />

pages/DetailsOfRefund/DetailsOfRefund.wxss

@@ -63,6 +63,7 @@
   display: flex;
   font-size: 28rpx;
   color: #222222;
+  width: 150rpx;
 }
 .DetailsOfRefund .write-info .form-box .form-item .label .icon{
   color: #FF4D3A;
@@ -73,6 +74,14 @@
   font-size: 28rpx;
   color: #AAAAAA;
 }
+.DetailsOfRefund .form-box .form-item .value-box{
+  flex: 1;
+  padding-left: 40rpx;
+  text-align: right;
+  display: flex;
+  flex-direction: column;
+  align-items: flex-end;
+}
 .DetailsOfRefund .write-info .form-box .form-item .value.black{
   color: #222222;
 }
@@ -448,4 +457,6 @@ popup-box {
   font-weight: bold;
   font-size: 28rpx;
   color: #222222;
-}
+}
+
+