xiaoe_mp_npm 1.0.6-alpha1 → 1.0.6-alpha2

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 (7) hide show
  1. package/miniprogram_dist/ConfirmOrder/components/GoodsInfo/index.js +10 -4
  2. package/miniprogram_dist/ConfirmOrder/components/SvipSelect/SvipSelect.js +0 -1
  3. package/miniprogram_dist/common/utils/constants.js +6 -6
  4. package/package.json +1 -1
  5. package/src/ConfirmOrder/components/GoodsInfo/index.js +10 -4
  6. package/src/ConfirmOrder/components/SvipSelect/SvipSelect.js +0 -1
  7. package/src/common/utils/constants.js +6 -6
package/miniprogram_dist/ConfirmOrder/components/GoodsInfo/index.js CHANGED
@@ -238,12 +238,18 @@ Component({
238
238
  svipPrice(data) {
239
239
  let skuPriceInfo = data.svipInfo.sku_svip_price_list;
240
240
  if (skuPriceInfo && data.isSvip) {
241
- if (data.marketingData && data.marketingData.is_super_vip === 1 && (data.marketingData.is_subscribe === 0 || ( data.marketingData.is_subscribe === 1 && data.marketingData.user_subscribed === 1))) {
242
- // 影响活动价格 并且支持叠加实用，返回空的超级会员价，直接展示活动价格
241
+ if (data.marketingData &&
242
+ data.marketingData.in_activity === 1 &&
243
+ data.marketingData.is_super_vip === 1 &&
244
+ (data.marketingData.is_subscribe === 0 ||
245
+ (data.marketingData.is_subscribe === 1 && data.marketingData.user_subscribed === 1)
246
+ )
247
+ ){
243
248
  return '--'
244
249
  }else{
245
- // 不叠加使用超级会员价
246
- return skuPriceInfo[data.baseInfo.sku];
250
+ // 有超级会员 + 不叠加使用超级会员价
251
+ // 返回价格进行比价
252
+ return skuPriceInfo[data.baseInfo.sku];
247
253
  }
248
254
  }
249
255
  return 0;
package/miniprogram_dist/ConfirmOrder/components/SvipSelect/SvipSelect.js CHANGED
@@ -54,7 +54,6 @@ Component({
54
54
  }
55
55
  },
56
56
  computedTxt() {
57
- console.log('this.prePayInfo.select_svip==>', this.data.svipSelectInfo.select_svip);
58
57
  switch (this.data.svipSelectInfo.select_svip) {
59
58
  case 'svip_unavailable':
60
59
  this.setData({
package/miniprogram_dist/common/utils/constants.js CHANGED
@@ -228,12 +228,12 @@ export const SVIP_SPU_TYPE = [
228
228
  BIG_SPECIAL_COLUMN,
229
229
  TRAINING_CAMP,
230
230
  MEMBER,
231
- BAN_TAK
232
- // VALUE_COUPON,
233
- // ENTITY_GOODS,
234
- // OFFLINE_CLASS,
235
- // AI_CLASS,
236
- // OFFLINE_PERIOD,
231
+ BAN_TAK,
232
+ VALUE_COUPON,
233
+ ENTITY_GOODS,
234
+ OFFLINE_CLASS,
235
+ AI_CLASS,
236
+ OFFLINE_PERIOD
237
237
  ]
238
238
 
239
239
  // ios端需要屏蔽支付的商品类型
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "xiaoe_mp_npm",
3
- "version": "1.0.6-alpha1",
3
+ "version": "1.0.6-alpha2",
4
4
  "description": "",
5
5
  "main": "miniprogram_dist/index.js",
6
6
  "scripts": {
package/src/ConfirmOrder/components/GoodsInfo/index.js CHANGED
@@ -238,12 +238,18 @@ Component({
238
238
  svipPrice(data) {
239
239
  let skuPriceInfo = data.svipInfo.sku_svip_price_list;
240
240
  if (skuPriceInfo && data.isSvip) {
241
- if (data.marketingData && data.marketingData.is_super_vip === 1 && (data.marketingData.is_subscribe === 0 || ( data.marketingData.is_subscribe === 1 && data.marketingData.user_subscribed === 1))) {
242
- // 影响活动价格 并且支持叠加实用，返回空的超级会员价，直接展示活动价格
241
+ if (data.marketingData &&
242
+ data.marketingData.in_activity === 1 &&
243
+ data.marketingData.is_super_vip === 1 &&
244
+ (data.marketingData.is_subscribe === 0 ||
245
+ (data.marketingData.is_subscribe === 1 && data.marketingData.user_subscribed === 1)
246
+ )
247
+ ){
243
248
  return '--'
244
249
  }else{
245
- // 不叠加使用超级会员价
246
- return skuPriceInfo[data.baseInfo.sku];
250
+ // 有超级会员 + 不叠加使用超级会员价
251
+ // 返回价格进行比价
252
+ return skuPriceInfo[data.baseInfo.sku];
247
253
  }
248
254
  }
249
255
  return 0;
package/src/ConfirmOrder/components/SvipSelect/SvipSelect.js CHANGED
@@ -54,7 +54,6 @@ Component({
54
54
  }
55
55
  },
56
56
  computedTxt() {
57
- console.log('this.prePayInfo.select_svip==>', this.data.svipSelectInfo.select_svip);
58
57
  switch (this.data.svipSelectInfo.select_svip) {
59
58
  case 'svip_unavailable':
60
59
  this.setData({
package/src/common/utils/constants.js CHANGED
@@ -228,12 +228,12 @@ export const SVIP_SPU_TYPE = [
228
228
  BIG_SPECIAL_COLUMN,
229
229
  TRAINING_CAMP,
230
230
  MEMBER,
231
- BAN_TAK
232
- // VALUE_COUPON,
233
- // ENTITY_GOODS,
234
- // OFFLINE_CLASS,
235
- // AI_CLASS,
236
- // OFFLINE_PERIOD,
231
+ BAN_TAK,
232
+ VALUE_COUPON,
233
+ ENTITY_GOODS,
234
+ OFFLINE_CLASS,
235
+ AI_CLASS,
236
+ OFFLINE_PERIOD
237
237
  ]
238
238
 
239
239
  // ios端需要屏蔽支付的商品类型