xiaoe_mp_npm 0.5.36-alpha1 → 0.5.37

package/miniprogram_dist/GoodsItem/index.js

@@ -7,7 +7,7 @@
  * @LastEditTime: 2021-11-18 19:49:11
  */
 import { debounce } from "../common/utils/index"
-import { getUserPermission, snapCheck } from "../common/api/liveGoodsList"
+import { getUserPermission, getUserPermissionNew, snapCheck, snapCheckNew } from "../common/api/liveGoodsList"
 import {
   ASSOCIATION,
   PUNCH_CARD
@@ -74,6 +74,10 @@ Component({
         }, () => this.countTime())
       }
     },
+    index: {
+      type: Number,
+      value: 0
+    },
     sending: {
       type: Boolean,
       value: false
@@ -119,6 +123,11 @@ Component({
     style:{
       type: String,
       value: ''
+    },
+    // 是否是新带货接口灰度
+    isGrayMarketing: {
+      type: Boolean,
+      value: false
     }
   },
 
@@ -306,7 +315,8 @@ Component({
           coupon_id: this.data.goodsItem.coupon_id,
           alive_id: this.data.aliveInfo.alive_id
       }
-      snapCheck(params).then(res => {
+      const url = this.properties.isGrayMarketing ? snapCheckNew : snapCheck
+      url(params).then(res => {
         this.hideToast()
         let { code, data } = res.data
         if (code === 0) {
@@ -388,7 +398,8 @@ Component({
           app_id:this.data.aliveInfo.app_id,
           user_id:this.data.aliveInfo.user_id,
         }
-        getUserPermission(params).then((res) => {
+        const url = this.properties.isGrayMarketing ? getUserPermissionNew : getUserPermission
+        url(params).then((res) => {
           let { code, data } = res.data
           if (code === 0) {
             resolve(!!data.auth_state)

package/miniprogram_dist/GoodsItem/index.wxml

@@ -17,7 +17,7 @@
             borderRadius="{{'2.13vmin'}}"
             src="{{filterSrc}}"
           />
-          <text class="index {{isIOS && 'ios-index'}}" style="{{!isStudent ? 'border-radius: 1.07vmin 0 1.07vmin 0;' : ''}}">{{goodsItem.order_weight}}</text>
+          <text class="index {{isIOS && 'ios-index'}}" style="{{!isStudent ? 'border-radius: 1.07vmin 0 1.07vmin 0;' : ''}}">{{index + 1}}</text>
           <text class="goods-type {{isIOS && 'ios-goods-type'}}">{{goodsItem.resource_type_name}}</text>
           <image wx:if="{{ isShowExamplaining }}" class="goods-explaining" src="../../common/assets/images/liveGoodsList/explaining.png" />
         </view>
@@ -85,3 +85,7 @@
           <text class="switch-txt">学员端展示商品</text>
         </view>
 </view>
+
+
+
+

package/miniprogram_dist/LiveGoodsList/index.js

@@ -7,7 +7,7 @@
  * @LastEditTime: 2021-11-18 19:52:02
  */
 
-import { getGoodsList, getCouponSwitch } from "../common/api/liveGoodsList"
+import { getGoodsList,getGoodsListNew, getCouponSwitch } from "../common/api/liveGoodsList"
 import Dialog from '@vant/weapp/dialog/dialog';
 import {
   ASSOCIATION,
@@ -104,6 +104,11 @@ Component({
     overlayStyle: {
       type: String,
       value: ''
+    },
+    // 是否是新带货接口灰度
+    isGrayMarketing: {
+      type: Boolean,
+      value: false
     }
   },
   data: {
@@ -205,7 +210,8 @@ Component({
             page: 1,
             port: 1
           }
-          getGoodsList(params).then((res) => {
+          const url = this.properties.isGrayMarketing ? getGoodsListNew : getGoodsList
+          url(params).then((res) => {
             console.log('2222222222')
             let {data, code} = res.data
             if (code === 0 && data && data.length > 0) {
@@ -233,7 +239,8 @@ Component({
             app_id:this.properties.aliveInfo.app_id,
             user_id:this.properties.aliveInfo.user_id,
           }
-          getGoodsList(params).then(res=>{
+          const url = this.properties.isGrayMarketing ? getGoodsListNew : getGoodsList
+          url(params).then(res=>{
             let { data, code } = res.data
             if (code === 0) {
               // 关闭弹窗的时候返回的数据丢弃 // 上拉加载与下拉刷新一起触发时丢弃上拉加载数据

package/miniprogram_dist/LiveGoodsList/index.wxml

@@ -36,6 +36,7 @@
               aliveInfo="{{aliveInfo}}"
               allContactPay="{{allContactPay}}"
               goodsInfo="{{formExplainingGoods}}"
+              index="{{explainingGoodsIndex}}"
               coupon_switch="{{coupon_switch}}"
               bind:sendNewMsg="sendNewMsg"
               bind:showConfirmOrder="showConfirmOrder"
@@ -46,6 +47,7 @@
               envName="{{ENV_NAME}}"
               sensorReportParams="{{sensorReportParams}}"
               isFullScreen="{{ popPosition === 'right'}}"
+              isGrayMarketing="{{ isGrayMarketing}}"
           ></goods-item>
         </block>
       <!-- 讲解中的商品 end -->
@@ -55,6 +57,7 @@
             wx:key="index"
             goodsInfo="{{goodsItem}}"
             allContactPay="{{allContactPay}}"
+            index="{{index}}"
             coupon_switch="{{coupon_switch}}"
             bind:sendNewMsg="sendNewMsg"
             bind:showConfirmOrder="showConfirmOrder"
@@ -67,6 +70,7 @@
             envName="{{ENV_NAME}}"
             sensorReportParams="{{sensorReportParams}}"
             isFullScreen="{{ popPosition === 'right'}}"
+            isGrayMarketing="{{ isGrayMarketing}}"
         ></goods-item>
         <view class="finished-text" wx:if="{{!refreshing && finishedTxt !== 'no-data'}}">{{finishedTxt}}</view>
         <view class="no-data" wx:if="{{!refreshing && finishedTxt === 'no-data'}}">
@@ -78,4 +82,4 @@
     </view>
   </custom-popup>
 </view>
-<van-dialog id="van-dialog" confirm-button-color="#105cfb" catchtap="stopEvent"/>
+<van-dialog id="van-dialog" confirm-button-color="#105cfb" catchtap="stopEvent"/>

package/miniprogram_dist/TeacherGoodsList/index.wxml

@@ -14,6 +14,7 @@
       <view wx:for="{{goodsInfo}}" wx:for-item="goodsItem" wx:key="index" style="margin-top: 3.2vmin;">
       <goods-item
             goodsInfo="{{goodsItem}}"
+            index="{{index}}"
             aliveInfo="{{aliveInfo}}"
             bind:sendGoodsCard="sendGoodsCard"
             class="goods-item"
@@ -37,4 +38,4 @@
         <view class="chat-text">请联系管理员，或前往电脑端管理台【直播间设置-互动设置-直播带货配置】添加商品</view>
       </block>
     </view>
-    <!-- 商品列表 end-->
+    <!-- 商品列表 end-->

package/miniprogram_dist/common/api/liveGoodsList.js

@@ -19,9 +19,14 @@ let gateway = (data = "_alive/") => {
 
 const GOODS_LIST = {
     GOODS_LIST: `${gateway()}xe.ecommerce.alive_goods_system.marketing.list.get/1.0.0`,
+    GOODS_LIST_NEW: `${gateway()}xe.ecommerce.marketing.list.get/3.0.0`,
     COUPON_SWITCH: `${gateway()}xe.marketing.coupon.switch.config/1.0.0`,
     USER_PERMISSION: `${gateway()}xe.ecommerce.alive_goods_system.check.permission/1.0.0`,
+    USER_PERMISSION_NEW: `${gateway()}xe.ecommerce.check.permission/3.0.0`,
+
     SNAP_CHECK: `${gateway()}xe.ecommerce.alive_goods_system.check.snap_up/1.0.0`,
+    SNAP_CHECK_NEW: `${gateway()}xe.ecommerce.check.snap_up/3.0.0`,
+
     SHOW_GOODS: `${gateway()}xe.user.display_package.edit`
 };
 
@@ -30,6 +35,11 @@ const getGoodsList = (params, isNeedBiz = true, config = {}) => {
     return http.player.post(GOODS_LIST.GOODS_LIST, params, isNeedBiz, config);
 }
 
+// 获取商品列表-new
+const getGoodsListNew = (params, isNeedBiz = false, config = {}) => {
+    return http.player.post(GOODS_LIST.GOODS_LIST_NEW, params, isNeedBiz, config);
+}
+
 // 获取券后价展示店铺设置
 const getCouponSwitch = (params, isNeedBiz = true, config = {}) => {
     return http.player.post(GOODS_LIST.COUPON_SWITCH, params, isNeedBiz, config);
@@ -40,11 +50,21 @@ const getUserPermission = (params, isNeedBiz = true, config = {}) => {
     return http.player.post(GOODS_LIST.USER_PERMISSION, params, isNeedBiz, config);
 }
 
+// 获取权益接口-new
+const getUserPermissionNew = (params, isNeedBiz = false, config = {}) => {
+    return http.player.post(GOODS_LIST.USER_PERMISSION_NEW, params, isNeedBiz, config);
+}
+
 // 去抢购
 const snapCheck = (params, isNeedBiz = true, config = {}) => {
     return http.player.post(GOODS_LIST.SNAP_CHECK, params, isNeedBiz, config);
 }
 
+// 去抢购-new
+const snapCheckNew = (params, isNeedBiz = false, config = {}) => {
+    return http.player.post(GOODS_LIST.SNAP_CHECK_NEW, params, isNeedBiz, config);
+}
+
 //展示隐藏商品
 const showGoods = (params, isNeedBiz = true, config = {}) => {
     return http.player.post(GOODS_LIST.SHOW_GOODS, params, isNeedBiz, config);
@@ -52,8 +72,11 @@ const showGoods = (params, isNeedBiz = true, config = {}) => {
 
 module.exports = {
   getGoodsList,
+  getGoodsListNew,
   getCouponSwitch,
   getUserPermission,
+  getUserPermissionNew,
   snapCheck,
+  snapCheckNew,
   showGoods
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xiaoe_mp_npm",
-  "version": "0.5.36-alpha1",
+  "version": "0.5.37",
   "description": "",
   "main": "miniprogram_dist/index.js",
   "scripts": {
@@ -75,4 +75,4 @@
     "miniprogram-computed": "4.2.1",
     "mp-plugins-info-collection": "1.1.2"
   }
-}
+}

package/src/GoodsItem/index.js

@@ -7,7 +7,7 @@
  * @LastEditTime: 2021-11-18 19:49:11
  */
 import { debounce } from "../common/utils/index"
-import { getUserPermission, snapCheck } from "../common/api/liveGoodsList"
+import { getUserPermission, getUserPermissionNew, snapCheck, snapCheckNew } from "../common/api/liveGoodsList"
 import {
   ASSOCIATION,
   PUNCH_CARD
@@ -74,6 +74,10 @@ Component({
         }, () => this.countTime())
       }
     },
+    index: {
+      type: Number,
+      value: 0
+    },
     sending: {
       type: Boolean,
       value: false
@@ -119,6 +123,11 @@ Component({
     style:{
       type: String,
       value: ''
+    },
+    // 是否是新带货接口灰度
+    isGrayMarketing: {
+      type: Boolean,
+      value: false
     }
   },
 
@@ -306,7 +315,8 @@ Component({
           coupon_id: this.data.goodsItem.coupon_id,
           alive_id: this.data.aliveInfo.alive_id
       }
-      snapCheck(params).then(res => {
+      const url = this.properties.isGrayMarketing ? snapCheckNew : snapCheck
+      url(params).then(res => {
         this.hideToast()
         let { code, data } = res.data
         if (code === 0) {
@@ -388,7 +398,8 @@ Component({
           app_id:this.data.aliveInfo.app_id,
           user_id:this.data.aliveInfo.user_id,
         }
-        getUserPermission(params).then((res) => {
+        const url = this.properties.isGrayMarketing ? getUserPermissionNew : getUserPermission
+        url(params).then((res) => {
           let { code, data } = res.data
           if (code === 0) {
             resolve(!!data.auth_state)

package/src/GoodsItem/index.wxml

@@ -17,7 +17,7 @@
             borderRadius="{{'2.13vmin'}}"
             src="{{filterSrc}}"
           />
-          <text class="index {{isIOS && 'ios-index'}}" style="{{!isStudent ? 'border-radius: 1.07vmin 0 1.07vmin 0;' : ''}}">{{goodsItem.order_weight}}</text>
+          <text class="index {{isIOS && 'ios-index'}}" style="{{!isStudent ? 'border-radius: 1.07vmin 0 1.07vmin 0;' : ''}}">{{index + 1}}</text>
           <text class="goods-type {{isIOS && 'ios-goods-type'}}">{{goodsItem.resource_type_name}}</text>
           <image wx:if="{{ isShowExamplaining }}" class="goods-explaining" src="../../common/assets/images/liveGoodsList/explaining.png" />
         </view>
@@ -85,3 +85,7 @@
           <text class="switch-txt">学员端展示商品</text>
         </view>
 </view>
+
+
+
+

package/src/LiveGoodsList/index.js

@@ -7,7 +7,7 @@
  * @LastEditTime: 2021-11-18 19:52:02
  */
 
-import { getGoodsList, getCouponSwitch } from "../common/api/liveGoodsList"
+import { getGoodsList,getGoodsListNew, getCouponSwitch } from "../common/api/liveGoodsList"
 import Dialog from '@vant/weapp/dialog/dialog';
 import {
   ASSOCIATION,
@@ -104,6 +104,11 @@ Component({
     overlayStyle: {
       type: String,
       value: ''
+    },
+    // 是否是新带货接口灰度
+    isGrayMarketing: {
+      type: Boolean,
+      value: false
     }
   },
   data: {
@@ -205,7 +210,8 @@ Component({
             page: 1,
             port: 1
           }
-          getGoodsList(params).then((res) => {
+          const url = this.properties.isGrayMarketing ? getGoodsListNew : getGoodsList
+          url(params).then((res) => {
             console.log('2222222222')
             let {data, code} = res.data
             if (code === 0 && data && data.length > 0) {
@@ -233,7 +239,8 @@ Component({
             app_id:this.properties.aliveInfo.app_id,
             user_id:this.properties.aliveInfo.user_id,
           }
-          getGoodsList(params).then(res=>{
+          const url = this.properties.isGrayMarketing ? getGoodsListNew : getGoodsList
+          url(params).then(res=>{
             let { data, code } = res.data
             if (code === 0) {
               // 关闭弹窗的时候返回的数据丢弃 // 上拉加载与下拉刷新一起触发时丢弃上拉加载数据

package/src/LiveGoodsList/index.wxml

@@ -36,6 +36,7 @@
               aliveInfo="{{aliveInfo}}"
               allContactPay="{{allContactPay}}"
               goodsInfo="{{formExplainingGoods}}"
+              index="{{explainingGoodsIndex}}"
               coupon_switch="{{coupon_switch}}"
               bind:sendNewMsg="sendNewMsg"
               bind:showConfirmOrder="showConfirmOrder"
@@ -46,6 +47,7 @@
               envName="{{ENV_NAME}}"
               sensorReportParams="{{sensorReportParams}}"
               isFullScreen="{{ popPosition === 'right'}}"
+              isGrayMarketing="{{ isGrayMarketing}}"
           ></goods-item>
         </block>
       <!-- 讲解中的商品 end -->
@@ -55,6 +57,7 @@
             wx:key="index"
             goodsInfo="{{goodsItem}}"
             allContactPay="{{allContactPay}}"
+            index="{{index}}"
             coupon_switch="{{coupon_switch}}"
             bind:sendNewMsg="sendNewMsg"
             bind:showConfirmOrder="showConfirmOrder"
@@ -67,6 +70,7 @@
             envName="{{ENV_NAME}}"
             sensorReportParams="{{sensorReportParams}}"
             isFullScreen="{{ popPosition === 'right'}}"
+            isGrayMarketing="{{ isGrayMarketing}}"
         ></goods-item>
         <view class="finished-text" wx:if="{{!refreshing && finishedTxt !== 'no-data'}}">{{finishedTxt}}</view>
         <view class="no-data" wx:if="{{!refreshing && finishedTxt === 'no-data'}}">
@@ -78,4 +82,4 @@
     </view>
   </custom-popup>
 </view>
-<van-dialog id="van-dialog" confirm-button-color="#105cfb" catchtap="stopEvent"/>
+<van-dialog id="van-dialog" confirm-button-color="#105cfb" catchtap="stopEvent"/>

package/src/TeacherGoodsList/index.wxml

@@ -14,6 +14,7 @@
       <view wx:for="{{goodsInfo}}" wx:for-item="goodsItem" wx:key="index" style="margin-top: 3.2vmin;">
       <goods-item
             goodsInfo="{{goodsItem}}"
+            index="{{index}}"
             aliveInfo="{{aliveInfo}}"
             bind:sendGoodsCard="sendGoodsCard"
             class="goods-item"
@@ -37,4 +38,4 @@
         <view class="chat-text">请联系管理员，或前往电脑端管理台【直播间设置-互动设置-直播带货配置】添加商品</view>
       </block>
     </view>
-    <!-- 商品列表 end-->
+    <!-- 商品列表 end-->

package/src/common/api/liveGoodsList.js

@@ -19,9 +19,14 @@ let gateway = (data = "_alive/") => {
 
 const GOODS_LIST = {
     GOODS_LIST: `${gateway()}xe.ecommerce.alive_goods_system.marketing.list.get/1.0.0`,
+    GOODS_LIST_NEW: `${gateway()}xe.ecommerce.marketing.list.get/3.0.0`,
     COUPON_SWITCH: `${gateway()}xe.marketing.coupon.switch.config/1.0.0`,
     USER_PERMISSION: `${gateway()}xe.ecommerce.alive_goods_system.check.permission/1.0.0`,
+    USER_PERMISSION_NEW: `${gateway()}xe.ecommerce.check.permission/3.0.0`,
+
     SNAP_CHECK: `${gateway()}xe.ecommerce.alive_goods_system.check.snap_up/1.0.0`,
+    SNAP_CHECK_NEW: `${gateway()}xe.ecommerce.check.snap_up/3.0.0`,
+
     SHOW_GOODS: `${gateway()}xe.user.display_package.edit`
 };
 
@@ -30,6 +35,11 @@ const getGoodsList = (params, isNeedBiz = true, config = {}) => {
     return http.player.post(GOODS_LIST.GOODS_LIST, params, isNeedBiz, config);
 }
 
+// 获取商品列表-new
+const getGoodsListNew = (params, isNeedBiz = false, config = {}) => {
+    return http.player.post(GOODS_LIST.GOODS_LIST_NEW, params, isNeedBiz, config);
+}
+
 // 获取券后价展示店铺设置
 const getCouponSwitch = (params, isNeedBiz = true, config = {}) => {
     return http.player.post(GOODS_LIST.COUPON_SWITCH, params, isNeedBiz, config);
@@ -40,11 +50,21 @@ const getUserPermission = (params, isNeedBiz = true, config = {}) => {
     return http.player.post(GOODS_LIST.USER_PERMISSION, params, isNeedBiz, config);
 }
 
+// 获取权益接口-new
+const getUserPermissionNew = (params, isNeedBiz = false, config = {}) => {
+    return http.player.post(GOODS_LIST.USER_PERMISSION_NEW, params, isNeedBiz, config);
+}
+
 // 去抢购
 const snapCheck = (params, isNeedBiz = true, config = {}) => {
     return http.player.post(GOODS_LIST.SNAP_CHECK, params, isNeedBiz, config);
 }
 
+// 去抢购-new
+const snapCheckNew = (params, isNeedBiz = false, config = {}) => {
+    return http.player.post(GOODS_LIST.SNAP_CHECK_NEW, params, isNeedBiz, config);
+}
+
 //展示隐藏商品
 const showGoods = (params, isNeedBiz = true, config = {}) => {
     return http.player.post(GOODS_LIST.SHOW_GOODS, params, isNeedBiz, config);
@@ -52,8 +72,11 @@ const showGoods = (params, isNeedBiz = true, config = {}) => {
 
 module.exports = {
   getGoodsList,
+  getGoodsListNew,
   getCouponSwitch,
   getUserPermission,
+  getUserPermissionNew,
   snapCheck,
+  snapCheckNew,
   showGoods
 }