xiaoe_mp_npm 0.5.46 → 0.5.48

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (103) hide show
  1. package/.gitlab-ci.yml +0 -1
  2. package/miniprogram_dist/ConfirmOrder/components/ConfirmOrderContent/index.js +6 -0
  3. package/miniprogram_dist/ConfirmOrder/components/PayBar/index.js +1 -1
  4. package/miniprogram_dist/ConfirmOrder/components/PickupSelect/index.js +6 -0
  5. package/miniprogram_dist/CouponList/components/CouponItem/index.css +1715 -0
  6. package/miniprogram_dist/CouponList/components/CouponItem/index.js +15 -4
  7. package/miniprogram_dist/CouponList/components/CouponItem/index.min.css +1 -0
  8. package/miniprogram_dist/CouponList/components/CouponItem/index.scss +1 -1
  9. package/miniprogram_dist/CouponList/components/CouponItem/index.wxml +6 -2
  10. package/miniprogram_dist/CouponList/couponColumn/index.js +79 -0
  11. package/miniprogram_dist/CouponList/couponColumn/index.wxml +1 -0
  12. package/miniprogram_dist/CouponReceivePopup/index.js +72 -0
  13. package/miniprogram_dist/CouponReceivePopup/index.json +6 -0
  14. package/miniprogram_dist/CouponReceivePopup/index.scss +99 -0
  15. package/miniprogram_dist/CouponReceivePopup/index.wxml +85 -0
  16. package/miniprogram_dist/CouponReceivePopup/index.wxss +75 -0
  17. package/miniprogram_dist/GoodsItem/index.js +203 -125
  18. package/miniprogram_dist/GoodsItem/index.json +6 -6
  19. package/miniprogram_dist/GoodsItem/index.scss +256 -64
  20. package/miniprogram_dist/GoodsItem/index.wxml +159 -76
  21. package/miniprogram_dist/GoodsItem/index.wxs +19 -0
  22. package/miniprogram_dist/GoodsItem/index.wxss +976 -240
  23. package/miniprogram_dist/LiveGoodsList/index.js +355 -14
  24. package/miniprogram_dist/LiveGoodsList/index.wxml +31 -32
  25. package/miniprogram_dist/TeacherGoodsList/index.js +514 -11
  26. package/miniprogram_dist/TeacherGoodsList/index.json +3 -1
  27. package/miniprogram_dist/TeacherGoodsList/index.scss +146 -0
  28. package/miniprogram_dist/TeacherGoodsList/index.wxml +89 -20
  29. package/miniprogram_dist/TeacherGoodsList/index.wxss +132 -14
  30. package/miniprogram_dist/common/api/liveGoodsList.js +10 -2
  31. package/package.json +1 -1
  32. package/src/AliveInvite/LiveRoomVertical/index.wxss +252 -252
  33. package/src/CollectionAddress/index.wxss +5 -5
  34. package/src/ConfirmOrder/components/AddressEdit/index.wxss +120 -120
  35. package/src/ConfirmOrder/components/AddressManage/index.wxss +98 -98
  36. package/src/ConfirmOrder/components/AddressSelect/index.wxss +67 -67
  37. package/src/ConfirmOrder/components/ChoosePicker/index.wxss +18 -18
  38. package/src/ConfirmOrder/components/ConfirmOrderContent/index.js +6 -0
  39. package/src/ConfirmOrder/components/GoodsInfo/components/GoodsCommerce/components/entityGiftList/index.wxss +45 -45
  40. package/src/ConfirmOrder/components/GoodsInfo/components/GoodsCommerce/components/entityItem/index.wxss +100 -100
  41. package/src/ConfirmOrder/components/GoodsInfo/components/GoodsCommerce/index.wxss +55 -55
  42. package/src/ConfirmOrder/components/GoodsInfo/components/ImageData/index.wxss +13 -13
  43. package/src/ConfirmOrder/components/Header/index.wxss +26 -26
  44. package/src/ConfirmOrder/components/IntegralSelect/componenets/integralTips/index.wxss +85 -85
  45. package/src/ConfirmOrder/components/Invoice/components/InvoiceSelect/index.wxss +155 -155
  46. package/src/ConfirmOrder/components/Invoice/components/InvoiceTip/index.wxss +51 -51
  47. package/src/ConfirmOrder/components/ModeSelect/index.wxss +44 -44
  48. package/src/ConfirmOrder/components/PayBar/index.js +1 -1
  49. package/src/ConfirmOrder/components/PickupSelect/index.js +6 -0
  50. package/src/ConfirmOrder/components/PickupSelect/index.wxss +22 -22
  51. package/src/ConfirmOrder/components/SelectSite/index.wxss +82 -82
  52. package/src/ConfirmOrder/components/Shipper/index.wxss +76 -76
  53. package/src/ConfirmOrder/components/ShipperEdit/index.wxss +78 -78
  54. package/src/ConfirmOrder/components/WechatAddress/index.wxss +22 -22
  55. package/src/ConfirmOrder/index.wxss +5 -5
  56. package/src/CouponList/components/CouponItem/index.css +1715 -0
  57. package/src/CouponList/components/CouponItem/index.js +15 -4
  58. package/src/CouponList/components/CouponItem/index.min.css +1 -0
  59. package/src/CouponList/components/CouponItem/index.scss +1 -1
  60. package/src/CouponList/components/CouponItem/index.wxml +6 -2
  61. package/src/CouponList/couponColumn/index.js +79 -0
  62. package/src/CouponList/couponColumn/index.wxml +1 -0
  63. package/src/CouponList/couponMsg/index.wxss +3 -3
  64. package/src/CouponReceivePopup/index.js +72 -0
  65. package/src/CouponReceivePopup/index.json +6 -0
  66. package/src/CouponReceivePopup/index.scss +99 -0
  67. package/src/CouponReceivePopup/index.wxml +85 -0
  68. package/src/CouponReceivePopup/index.wxss +1 -0
  69. package/src/CustomPopup/index.wxss +22 -22
  70. package/src/GoodsItem/index.js +203 -125
  71. package/src/GoodsItem/index.json +6 -6
  72. package/src/GoodsItem/index.scss +256 -64
  73. package/src/GoodsItem/index.wxml +159 -76
  74. package/src/GoodsItem/index.wxs +19 -0
  75. package/src/GoodsItem/index.wxss +1004 -241
  76. package/src/LiveGoodsList/index.js +355 -14
  77. package/src/LiveGoodsList/index.wxml +31 -32
  78. package/src/PayComplete/Components/CouponItem/index.wxss +122 -122
  79. package/src/PayComplete/Components/Header/index.wxss +27 -27
  80. package/src/PayComplete/Components/LeadGroup/index.wxss +33 -33
  81. package/src/PayComplete/Components/PayGifts/index.wxss +157 -157
  82. package/src/PayComplete/Components/PayState/earnIntegral/index.wxss +23 -23
  83. package/src/PayComplete/Components/PayState/index.wxss +20 -20
  84. package/src/PayComplete/index.wxss +27 -27
  85. package/src/PayModule/wechatLoading/index.wxss +57 -57
  86. package/src/Recommend/index.wxss +110 -110
  87. package/src/Sku/Header/index.wxss +27 -27
  88. package/src/Sku/goods-info/index.wxss +52 -52
  89. package/src/Sku/index/index.wxss +52 -52
  90. package/src/Sku/row-item/index.wxss +50 -50
  91. package/src/Sku/step/index.wxss +11 -11
  92. package/src/TeacherGoodsList/index.js +514 -11
  93. package/src/TeacherGoodsList/index.json +3 -1
  94. package/src/TeacherGoodsList/index.scss +146 -0
  95. package/src/TeacherGoodsList/index.wxml +89 -20
  96. package/src/TeacherGoodsList/index.wxss +151 -14
  97. package/src/common/api/liveGoodsList.js +10 -2
  98. package/src/common/css/theme.wxss +16 -16
  99. package/src/miniprogram_npm/miniprogram-computed/index.js +1 -0
  100. package/miniprogram_dist/GoodsItem/index.less +0 -299
  101. package/miniprogram_dist/TeacherGoodsList/index.less +0 -62
  102. package/src/GoodsItem/index.less +0 -299
  103. package/src/TeacherGoodsList/index.less +0 -62
package/.gitlab-ci.yml CHANGED
@@ -7,7 +7,6 @@ build_test:
7
7
  - feature/live_marketing_iteration
8
8
  - feature/remove-error-report
9
9
  - fix/record-lottery
10
- - feature/coupon_fix
11
10
  tags:
12
11
  - fe-group-prod-runner-2
13
12
  script:
package/miniprogram_dist/ConfirmOrder/components/ConfirmOrderContent/index.js CHANGED
@@ -97,6 +97,7 @@ Component({
97
97
  resource_id: "",
98
98
  addressInfo: {}, // 地址信息（非自提）
99
99
  pickerUserInfo: {}, // 自提人信息
100
+ picksiteInfo:{}, //自提点信息
100
101
  hasEntityGoods: false, // 商品套餐是否包含实物商品
101
102
  superVipInfo: {}, // 超级会员信息
102
103
  businessConf: {},
@@ -773,6 +774,11 @@ Component({
773
774
  this.setData({
774
775
  pickerUserInfo: res.data.data || {}
775
776
  })
777
+ if(res.data.data?.lastSelfPickInfo){
778
+ this.setData({
779
+ picksiteInfo: res.data.data.lastSelfPickInfo.place_name ? res.data.data.lastSelfPickInfo : {}
780
+ })
781
+ }
776
782
  }
777
783
  }).catch((err) => console.log(err))
778
784
  .finally(() => {
package/miniprogram_dist/ConfirmOrder/components/PayBar/index.js CHANGED
@@ -192,7 +192,7 @@ Component({
192
192
  wx.showToast({
193
193
  title: this.data.checkList[key],
194
194
  icon: "none",
195
- duration: 20000
195
+ duration: 2000
196
196
  })
197
197
  }
198
198
  flag = false;
package/miniprogram_dist/ConfirmOrder/components/PickupSelect/index.js CHANGED
@@ -33,6 +33,12 @@ Component({
33
33
  lifetimes: {
34
34
  attached: async function () {
35
35
  // 在组件实例进入页面节点树时执行
36
+ if (this.data.express_type === 2){ //兼容有默认自提点的情况
37
+ this.triggerEvent('dataChange', {
38
+ name: 'address',
39
+ errMsg: '',
40
+ });
41
+ }
36
42
  if (this.data.express_type === 2 && !this.data.picksiteInfo?.place_name) {
37
43
  this.triggerEvent('dataChange', {
38
44
  name: 'address',