xiaoe_mp_npm 0.5.29-alpha1 → 0.5.29-alpha3

package/.gitlab-ci.yml

@@ -7,7 +7,6 @@ build_test:
     - feature/live_marketing_iteration
     - feature/remove-error-report
     - fix/record-lottery
-    - feature/android-contact-pay
   tags:
     - fe-group-prod-runner-2
   script:

package/miniprogram_dist/GoodsItem/index.js

@@ -94,6 +94,11 @@ Component({
       type: Object,
       value: {},
     },
+    // 是否去客服内支付
+    allContactPay: {
+      type: Boolean,
+      value: false
+    },
     //店铺设置是否展示券后价
     coupon_switch: {
       type: Boolean,
@@ -207,8 +212,7 @@ Component({
       // 以下各种情况，按去查看 -> 已抢光 -> 查看详情 -> 免费领取 -> 券后 -> 去抢购 优先级展示
       // 超级会员全免权益
       let svipAllFree = data.goodsItem.resource_rights_type === 1
-    //   data.isIOS && 
-      if (!data.IOSMiniProgramCanBuy) {
+      if (data.allContactPay || (data.isIOS && !data.IOSMiniProgramCanBuy)) {
         // IOS小程序中不能买的展示去查看，跳转到小程序客服
         return "去查看"
       } else if (data.goodsItem.hasStock && data.goodsItem.leftStock === 0) {

package/miniprogram_dist/LiveGoodsList/index.js

@@ -38,6 +38,11 @@ Component({
         alive_state: 2
       },
     },
+    // 是否去客服内支付
+    allContactPay: {
+      type: Boolean,
+      value: false
+    },
     ENV_NAME: {
       type: String,
       value: ""

package/miniprogram_dist/LiveGoodsList/index.wxml

@@ -33,6 +33,7 @@
         <block wx:if="{{showExplainingGoods}}">
           <goods-item
               aliveInfo="{{aliveInfo}}"
+              allContactPay="{{allContactPay}}"
               goodsInfo="{{formExplainingGoods}}"
               index="{{explainingGoodsIndex}}"
               coupon_switch="{{coupon_switch}}"
@@ -53,6 +54,7 @@
             wx:for-item="goodsItem"
             wx:key="index"
             goodsInfo="{{goodsItem}}"
+            allContactPay="{{allContactPay}}"
             index="{{index}}"
             coupon_switch="{{coupon_switch}}"
             bind:sendNewMsg="sendNewMsg"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xiaoe_mp_npm",
-  "version": "0.5.29-alpha1",
+  "version": "0.5.29-alpha3",
   "description": "",
   "main": "miniprogram_dist/index.js",
   "scripts": {

package/src/GoodsItem/index.js

@@ -94,6 +94,11 @@ Component({
       type: Object,
       value: {},
     },
+    // 是否去客服内支付
+    allContactPay: {
+      type: Boolean,
+      value: false
+    },
     //店铺设置是否展示券后价
     coupon_switch: {
       type: Boolean,
@@ -207,8 +212,7 @@ Component({
       // 以下各种情况，按去查看 -> 已抢光 -> 查看详情 -> 免费领取 -> 券后 -> 去抢购 优先级展示
       // 超级会员全免权益
       let svipAllFree = data.goodsItem.resource_rights_type === 1
-    //   data.isIOS && 
-      if (!data.IOSMiniProgramCanBuy) {
+      if (data.allContactPay || (data.isIOS && !data.IOSMiniProgramCanBuy)) {
         // IOS小程序中不能买的展示去查看，跳转到小程序客服
         return "去查看"
       } else if (data.goodsItem.hasStock && data.goodsItem.leftStock === 0) {

package/src/LiveGoodsList/index.js

@@ -38,6 +38,11 @@ Component({
         alive_state: 2
       },
     },
+    // 是否去客服内支付
+    allContactPay: {
+      type: Boolean,
+      value: false
+    },
     ENV_NAME: {
       type: String,
       value: ""

package/src/LiveGoodsList/index.wxml

@@ -33,6 +33,7 @@
         <block wx:if="{{showExplainingGoods}}">
           <goods-item
               aliveInfo="{{aliveInfo}}"
+              allContactPay="{{allContactPay}}"
               goodsInfo="{{formExplainingGoods}}"
               index="{{explainingGoodsIndex}}"
               coupon_switch="{{coupon_switch}}"
@@ -53,6 +54,7 @@
             wx:for-item="goodsItem"
             wx:key="index"
             goodsInfo="{{goodsItem}}"
+            allContactPay="{{allContactPay}}"
             index="{{index}}"
             coupon_switch="{{coupon_switch}}"
             bind:sendNewMsg="sendNewMsg"