4
0

23 Commit-ok aa3b8a66e6 ... 05dc4859bc

Szerző SHA1 Üzenet Dátum
  unknown 05dc4859bc 合并前提交 4 hete
  wenjie 64f3550295 修改bug 4 hete
  wenjie f429d13af3 修复bug 1 hónapja
  wenjie 9224f6fbcf 修改bug 1 hónapja
  wenjie 9b88a21ae6 修改退货退款bug 1 hónapja
  wenjie 1d25999e4e 首页布局优化 1 hónapja
  wenjie c161b75b9f 修复售后bug 1 hónapja
  wenjie 3c239f38b9 1 hónapja
  wenjie 890b920e9f 填写快递信息修改 1 hónapja
  wenjie f756d85e10 修改登录按钮 1 hónapja
  wenjie efc2d81000 添加防抖 1 hónapja
  wenjie e103c1fae7 换电脑前提交 1 hónapja
  wenjie dd4402dc94 添加评论页面 1 hónapja
  wenjie ae9628ae0b 退货物流接口对接 1 hónapja
  wenjie cb4ba890ef Merge branch 'master' into dev 1 hónapja
  wenjie 9615eb450b Merge branch 'master' into dev 1 hónapja
  wenjie d5bbac9348 Merge branch 'master' into dev 1 hónapja
  wenjie 2f1921bc4c 评价 物流填写 1 hónapja
  wenjie c78d61a394 Merge branch 'master' into dev 1 hónapja
  wenjie f34192a7e5 退货信息填写 1 hónapja
  wenjie 561f142d9b 合并问题修改 1 hónapja
  wenjie 071ca2f735 Merge branch 'master' into dev 1 hónapja
  wenjie a04000db85 快递功能 1 hónapja
100 módosított fájl, 69 hozzáadás és 19 törlés
  1. 24 0
      app.js
  2. 11 8
      app.json
  3. 4 4
      components/commStar/commStar.wxss
  4. 30 7
      components/tabbar/tabbar.js
  5. BIN
      images/icon/activity-bg.png
  6. BIN
      images/icon/basket-icon.png
  7. BIN
      images/icon/car-btn.png
  8. BIN
      images/icon/car-icon.png
  9. BIN
      images/icon/car.png
  10. BIN
      images/icon/chat-icon.png
  11. BIN
      images/icon/chat.png
  12. BIN
      images/icon/clear-his.png
  13. BIN
      images/icon/clear-his12.png
  14. BIN
      images/icon/close-white.png
  15. BIN
      images/icon/close.png
  16. BIN
      images/icon/close2.png
  17. BIN
      images/icon/comm-result.png
  18. BIN
      images/icon/copy.png
  19. BIN
      images/icon/coupon-banner.png
  20. BIN
      images/icon/coupon-bg.png
  21. BIN
      images/icon/coupon-ot.png
  22. BIN
      images/icon/coupon-received.png
  23. BIN
      images/icon/coupon-robbed.png
  24. BIN
      images/icon/coupon-used.png
  25. BIN
      images/icon/empty-basket.png
  26. BIN
      images/icon/erweima.png
  27. BIN
      images/icon/flash-banner.png
  28. BIN
      images/icon/flash-bg.png
  29. BIN
      images/icon/getCoupon.png
  30. BIN
      images/icon/gift.png
  31. BIN
      images/icon/good-icon.png
  32. BIN
      images/icon/goumaihuiyuan@2x.png
  33. BIN
      images/icon/grade.png
  34. BIN
      images/icon/group-banner.png
  35. BIN
      images/icon/group-bg.png
  36. BIN
      images/icon/head01.png
  37. BIN
      images/icon/head04.png
  38. BIN
      images/icon/hot-icon.png
  39. BIN
      images/icon/hotsell03.png
  40. BIN
      images/icon/integral-icon.png
  41. BIN
      images/icon/integral.png
  42. BIN
      images/icon/jifen.png
  43. BIN
      images/icon/logo.png
  44. BIN
      images/icon/menu-01.png
  45. BIN
      images/icon/menu-02.png
  46. BIN
      images/icon/menu-03.png
  47. BIN
      images/icon/menu-04.png
  48. BIN
      images/icon/miaosha.png
  49. BIN
      images/icon/more.png
  50. BIN
      images/icon/myCoupon.png
  51. BIN
      images/icon/new-icon.png
  52. BIN
      images/icon/new.png
  53. BIN
      images/icon/none.png
  54. BIN
      images/icon/photo.png
  55. BIN
      images/icon/play-red.png
  56. BIN
      images/icon/plus-sign.png
  57. BIN
      images/icon/position.png
  58. BIN
      images/icon/price_bg.png
  59. BIN
      images/icon/prod-col-red.png
  60. BIN
      images/icon/prod-col.png
  61. BIN
      images/icon/redPack.png
  62. BIN
      images/icon/refund.png
  63. BIN
      images/icon/refunds.png
  64. BIN
      images/icon/revise.png
  65. BIN
      images/icon/rmb-icon.png
  66. BIN
      images/icon/search-col.png
  67. BIN
      images/icon/search-col2.png
  68. BIN
      images/icon/search.png
  69. BIN
      images/icon/seckill.png
  70. BIN
      images/icon/sender-icon.png
  71. BIN
      images/icon/sender.png
  72. BIN
      images/icon/setting.png
  73. BIN
      images/icon/share-prod.png
  74. BIN
      images/icon/shop-car.png
  75. BIN
      images/icon/shop-customer-service.png
  76. BIN
      images/icon/shop-icon.png
  77. BIN
      images/icon/shop.png
  78. BIN
      images/icon/shopPosition.png
  79. BIN
      images/icon/sort1.png
  80. BIN
      images/icon/sort2.png
  81. BIN
      images/icon/spell-group-order.png
  82. BIN
      images/icon/star-empty.png
  83. BIN
      images/icon/star-red.png
  84. BIN
      images/icon/thumb (1).png
  85. BIN
      images/icon/thumb.png
  86. BIN
      images/icon/ticket.png
  87. BIN
      images/icon/toComment.png
  88. BIN
      images/icon/toDelivery.png
  89. BIN
      images/icon/toPay.png
  90. BIN
      images/icon/toTake.png
  91. BIN
      images/icon/top-icon.png
  92. BIN
      images/icon/top1.png
  93. BIN
      images/icon/tuiguang01.png
  94. BIN
      images/icon/tuiguang02.png
  95. BIN
      images/icon/tuiguang03.png
  96. BIN
      images/icon/up-arrow.png
  97. BIN
      images/icon/user-bg.png
  98. BIN
      images/icon/user-icon.png
  99. BIN
      images/icon/warn.png
  100. BIN
      images/icon/weixin.png

+ 24 - 0
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);
   }
 })

+ 11 - 8
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",
@@ -71,7 +64,10 @@
     "pages/MaterialFlowInfo/MaterialFlowInfo",
     "pages/ledRedPackage/ledRedPackage",
     "pages/Review/Review",
-    "components/tabbar/tabbar"
+    "components/tabbar/tabbar",
+    "pages/setting/setting",
+    "pages/editUserName/editUserName",
+    "pages/commResult/commResult"
   ],
   "subpackages": [
     {
@@ -90,6 +86,12 @@
       ]
     }
   ],
+  "plugins": {
+    "logisticsPlugin": {
+      "version": "2.3.0",
+      "provider": "wx9ad912bf20548d92"
+    }
+  },
   "window": {
     "backgroundTextStyle": "light",
     "navigationBarBackgroundColor": "#006CE8",
@@ -153,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",

+ 4 - 4
components/commStar/commStar.wxss

@@ -3,11 +3,11 @@
   margin-left: 3px;
 }
 .stars image {
-  width: 35rpx;
-  height: 35rpx;
+  width: 30rpx;
+  height: 30rpx;
 }
 .stars.write image{
-  width: 40rpx;
-  height: 40rpx;
+  width: 30rpx;
+  height: 30rpx;
   margin-right:20rpx;
 }

+ 30 - 7
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);
+    }
+  },
 
   /**
    * 生命周期函数--监听页面加载

BIN
images/icon/activity-bg.png


BIN
images/icon/basket-icon.png


BIN
images/icon/car-btn.png


BIN
images/icon/car-icon.png


BIN
images/icon/car.png


BIN
images/icon/chat-icon.png


BIN
images/icon/chat.png


BIN
images/icon/clear-his.png


BIN
images/icon/clear-his12.png


BIN
images/icon/close-white.png


BIN
images/icon/close.png


BIN
images/icon/close2.png


BIN
images/icon/comm-result.png


BIN
images/icon/copy.png


BIN
images/icon/coupon-banner.png


BIN
images/icon/coupon-bg.png


BIN
images/icon/coupon-ot.png


BIN
images/icon/coupon-received.png


BIN
images/icon/coupon-robbed.png


BIN
images/icon/coupon-used.png


BIN
images/icon/empty-basket.png


BIN
images/icon/erweima.png


BIN
images/icon/flash-banner.png


BIN
images/icon/flash-bg.png


BIN
images/icon/getCoupon.png


BIN
images/icon/gift.png


BIN
images/icon/good-icon.png


BIN
images/icon/goumaihuiyuan@2x.png


BIN
images/icon/grade.png


BIN
images/icon/group-banner.png


BIN
images/icon/group-bg.png


BIN
images/icon/head01.png


BIN
images/icon/head04.png


BIN
images/icon/hot-icon.png


BIN
images/icon/hotsell03.png


BIN
images/icon/integral-icon.png


BIN
images/icon/integral.png


BIN
images/icon/jifen.png


BIN
images/icon/logo.png


BIN
images/icon/menu-01.png


BIN
images/icon/menu-02.png


BIN
images/icon/menu-03.png


BIN
images/icon/menu-04.png


BIN
images/icon/miaosha.png


BIN
images/icon/more.png


BIN
images/icon/myCoupon.png


BIN
images/icon/new-icon.png


BIN
images/icon/new.png


BIN
images/icon/none.png


BIN
images/icon/photo.png


BIN
images/icon/play-red.png


BIN
images/icon/plus-sign.png


BIN
images/icon/position.png


BIN
images/icon/price_bg.png


BIN
images/icon/prod-col-red.png


BIN
images/icon/prod-col.png


BIN
images/icon/redPack.png


BIN
images/icon/refund.png


BIN
images/icon/refunds.png


BIN
images/icon/revise.png


BIN
images/icon/rmb-icon.png


BIN
images/icon/search-col.png


BIN
images/icon/search-col2.png


BIN
images/icon/search.png


BIN
images/icon/seckill.png


BIN
images/icon/sender-icon.png


BIN
images/icon/sender.png


BIN
images/icon/setting.png


BIN
images/icon/share-prod.png


BIN
images/icon/shop-car.png


BIN
images/icon/shop-customer-service.png


BIN
images/icon/shop-icon.png


BIN
images/icon/shop.png


BIN
images/icon/shopPosition.png


BIN
images/icon/sort1.png


BIN
images/icon/sort2.png


BIN
images/icon/spell-group-order.png


BIN
images/icon/star-empty.png


BIN
images/icon/star-red.png


BIN
images/icon/thumb (1).png


BIN
images/icon/thumb.png


BIN
images/icon/ticket.png


BIN
images/icon/toComment.png


BIN
images/icon/toDelivery.png


BIN
images/icon/toPay.png


BIN
images/icon/toTake.png


BIN
images/icon/top-icon.png


BIN
images/icon/top1.png


BIN
images/icon/tuiguang01.png


BIN
images/icon/tuiguang02.png


BIN
images/icon/tuiguang03.png


BIN
images/icon/up-arrow.png


BIN
images/icon/user-bg.png


BIN
images/icon/user-icon.png


BIN
images/icon/warn.png


BIN
images/icon/weixin.png


Nem az összes módosított fájl került megjelenítésre, mert túl sok fájl változott