xiaoe_mp_npm 1.0.17 → 1.0.19-test01

package/miniprogram_dist/CouponList/couponColumn/index.js

@@ -101,7 +101,16 @@ Component({
           if (marketInfo?.length > 0) {
             switch (type) {
               case "couponConfList":
-                couponsList.push(...marketInfo);
+                let haveItemStatus = false;
+                marketInfo.map(item => {
+                  for (let index = 0; index < couponsList.length; index++) {
+                    if (item.id === couponsList[index].id) {
+                      haveItemStatus = true;
+                      break;
+                    }
+                  }
+                });
+                if (!haveItemStatus) couponsList.push(...marketInfo);
                 break;
               case "couponUpdateList":
                 marketInfo.map((item) => {

package/miniprogram_dist/GoodsItem/index.js

@@ -7,14 +7,22 @@
  * @LastEditTime: 2021-11-18 19:49:11
  */
 import { debounce, rpxToVmin } from "../common/utils/index"
-import { getUserPermission, getUserPermissionNew, snapCheck, snapCheckNew } from "../common/api/liveGoodsList"
+import {
+  getUserPermission,
+  getUserPermissionNew,
+  snapCheck,
+  snapCheckNew,
+  showGoods,
+  requestChangeShow,
+  setGoodsSellOut,
+  getGoodValue
+} from "../common/api/liveGoodsList"
 import {
   ASSOCIATION,
   PUNCH_CARD
 } from "../common/utils/constants.js";
 
 const { utils, sensorLog } = require("live-mp-tools");
-import { showGoods } from "../common/api/liveGoodsList"
 
 const computedBehavior = require('miniprogram-computed').behavior
 
@@ -74,13 +82,17 @@ Component({
           isSeckill,
           checked
         }, () => {
-          const isOver =
-            newVal.stock === 0 ||
-            (newVal.is_activity &&
-              (newVal.activity_type === 8 || newVal.activity_type === 3) &&
-              newVal.activity_stock - newVal.activity_order_num === 0)
+          const isSoldOut = +newVal.is_sell_out === 1;
+          const isRealOver = newVal.stock === 0 ||
+              (newVal.is_activity &&
+                  (newVal.activity_type === 8 || newVal.activity_type === 3) &&
+                  newVal.activity_stock - newVal.activity_order_num === 0);
+          const isOver = isSoldOut || isRealOver;
+
           this.setData({
             isOver,
+            isSoldOut,
+            isRealOver,
           })
           this.countTime()
         })
@@ -145,6 +157,10 @@ Component({
       type: Boolean,
       value: false
     },
+    visibleSwitchStatusBtn: {
+      type: Boolean,
+      value: false
+    },
     sendingGoodId: {
       type: String,
       value: '',
@@ -176,6 +192,9 @@ Component({
     switchLoading: false,
     imageRadius: rpxToVmin(16),
     isOver: false, //是否已抢光
+    isSoldOut: false, //商品是否设置已售罄
+    isRealOver: false, //商品是否为非手动售罄下的，真实抢光
+    changeStateLoading: false, // 修改状态 loading（如售罄状态、显示状态）
   },
   computed: {
     showPreferentialPrice(properties) {
@@ -235,16 +254,22 @@ Component({
         return ''
       }
     },
+    // 点击去查看
+    isNeedToContact(data) {
+      return Boolean(data.allContactPay || (data.isIOS && !data.IOSMiniProgramCanBuy))
+    },
     btnTxt(data) {
       // 以下各种情况，按去查看 -> 已抢光 -> 查看详情 -> 免费领取 -> 券后 -> 去抢购 优先级展示
       // 超级会员全免权益
       let svipAllFree = data.goodsItem.resource_rights_type === 1
-      if (data.allContactPay || (data.isIOS && !data.IOSMiniProgramCanBuy)) {
-        // IOS小程序中不能买的展示去查看，跳转到小程序客服
-        return "去查看"
+      if (data.isSoldOut && !data.isStudent) {
+        return "已售罄"
       } else if (data.isOver) {
         // 库存为0，已售罄
         return "已抢光"
+      } else if (data.allContactPay || (data.isIOS && !data.IOSMiniProgramCanBuy)) {
+        // IOS小程序中不能买的展示去查看，跳转到小程序客服
+        return "去查看"
       } else if (data.goodsItem.err_code) {
         // 券后价接口报错，领取不了优惠券的情况
         return "查看详情"
@@ -293,10 +318,15 @@ Component({
     filterSrc(data) {
       return utils.replaceCDN(data.goodsItem.img_url, '?imageMogr2/thumbnail/400x400>/ignore-error/1')
     },
-
+    // 是否展示已抢完
+    // 学员端：已设置售罄、或者已抢完
+    // 讲师端：已抢完，且未设置已售罄
+    isSellOut({ isStudent, isOver, isRealOver }) {
+      return isStudent ? isOver : isRealOver;
+    },
     // 已售百分比
     percentage(data) {
-      if (data.isOver) return 100
+      if (data.isSellOut) return 100
       // 无库存 拼团、限时抢购
       if (!data.goodsItem.activity_stock) return 28
       let num = 0
@@ -321,7 +351,7 @@ Component({
       }
 
       // "已抢光"
-      if (data.isOver) return '已抢光'
+      if (data.isSellOut) return '已抢光'
 
       // 没有库存 - 已开抢
       if (!data.goodsItem.activity_stock) return '已开抢'
@@ -355,8 +385,59 @@ Component({
    * 组件的方法列表
    */
   methods: {
-    snapUpCheck: debounce(function () {
-      this.showToast('努力加载中')
+    async checkSellOut() {
+      // 非真实抢光，需要拿最新状态判断下
+      if (this.data.isRealOver) return;
+
+      if (this.data.isNeedToContact) {
+        const goodsStatusRes = await this.getGoodsStatus()
+
+        if (!goodsStatusRes) return
+
+        // 更新售罄状态
+        const is_sell_out = +goodsStatusRes.is_sell_out
+        this.triggerEvent('changeGoodsState', {
+          index: this.properties.index,
+          type: 'is_sell_out',
+          state: is_sell_out,
+        });
+
+        if (is_sell_out) {
+          return wx.showToast({
+            title: '很遗憾, 手慢抢光了',
+            icon: 'none',
+            duration: 3000,
+          })
+        }
+
+        this.toDetails()
+      } else {
+        this.snapUpCheck()
+      }
+    },
+    snapUpCheck: debounce(async function () {
+      !this.data.isOver && this.showToast('努力加载中')
+
+      const goodsStatusRes = await this.getGoodsStatus()
+
+      if (!goodsStatusRes) return
+
+      // 更新售罄状态
+      const is_sell_out = +goodsStatusRes.is_sell_out
+      this.triggerEvent('changeGoodsState', {
+        index: this.properties.index,
+        type: 'is_sell_out',
+        state: is_sell_out,
+      });
+
+      if (is_sell_out) {
+        return wx.showToast({
+          title: '很遗憾, 手慢抢光了',
+          icon: 'none',
+          duration: 3000,
+        })
+      }
+
       this.triggerEvent('sendNewMsg')
       let { aliveInfo, sensorReportParams, goodsInfo, isFullScreen } = this.properties
       sensorLog.sensors.track('click_butt', {
@@ -417,6 +498,42 @@ Component({
         }
       })
     }, 1000, true),
+    getGoodsStatus() {
+      if (this.data.isRealOver) {
+        wx.showToast({
+          title: '很遗憾, 手慢抢光了',
+          icon: 'none',
+          duration: 3000,
+        })
+
+        return Promise.resolve(null)
+      }
+
+      const { id, spu_id, resource_id } = this.data.goodsItem
+      const { user_id, app_id, alive_id } = this.properties.aliveInfo
+
+      return getGoodValue({
+        spu_id: spu_id || id,
+        user_id,
+        app_id,
+        alive_id,
+        resource_id: id || resource_id,
+      }, true)
+          .then((res) => {
+            res = res.data || {}
+
+            if (res.code === 0 && res.data) {
+              return res.data
+            } else {
+              this.showToast(res?.msg || res?.data?.msg || '获取商品状态失败')
+              return null
+            }
+          })
+          .catch(() => {
+            this.showToast('获取商品状态失败')
+            return null
+          })
+    },
     cardToDetails() {
       if (!this.data.isStudent) { return }
       let { aliveInfo, sensorReportParams, goodsInfo, isFullScreen } = this.properties
@@ -445,6 +562,26 @@ Component({
     },
     // 点击空白热区进来判断权益，或者接口返回有权益的时候进来判断跳转路径
     judgePermission: debounce(async function (permission) {
+      const goodsStatusRes = await this.getGoodsStatus()
+
+      if (!goodsStatusRes) return
+
+      // 更新售罄状态
+      const is_sell_out = +goodsStatusRes.is_sell_out
+      this.triggerEvent('changeGoodsState', {
+        index: this.properties.index,
+        type: 'is_sell_out',
+        state: is_sell_out,
+      });
+
+      if (is_sell_out) {
+        return wx.showToast({
+          title: '很遗憾, 手慢抢光了',
+          icon: 'none',
+          duration: 3000,
+        })
+      }
+
       // 实物21 有价优惠券41 超级会员23 可多次购买,没有权益说法，直接拉起客服;直播商品有没有权益都是去详情页。
       if ([41, 21, 23, 4].indexOf(Number(this.data.goodsItem.resource_type)) > -1) {
         this.toDetails()
@@ -455,7 +592,6 @@ Component({
         permission = await this.getUserPermission()
       }
 
-      console.log("permission", permission)
       // 有权益的情况下
       if (permission) {
         // 电子书20/班课35 鹅学习不支持，无权益的情况下,内嵌h5, 有权益TOAST提示
@@ -486,10 +622,10 @@ Component({
         })
       })
     },
-    showConfirmOrder(sku) {
+    async showConfirmOrder(sku) {
       //带货列表返回的 resource_id就是业务侧的spu_id
       // 返回的id,就是业务侧的resource_id
-      let params = {
+      const params = {
         id: this.data.goodsItem.resource_id,
         spu_id: this.data.goodsItem.resource_id,
         resource_type: this.data.goodsItem.resource_type,
@@ -501,6 +637,7 @@ Component({
         aliveId: this.data.aliveInfo.alive_id,
         isCollectCoupons: this.data.showPreferentialPrice
       }
+
       this.triggerEvent("showConfirmOrder", params)
     },
     showSku() {
@@ -645,7 +782,7 @@ Component({
       let { aliveInfo } = this.properties
       let h5_url = this.formatUrl(goodsInfo)
       var path
-      // 音频 视频 
+      // 音频 视频
       if (goodsInfo.resource_type === 2 || goodsInfo.resource_type === 3) {
         path = `/pages/index/authorizePage?user_id=${aliveInfo.user_id}&app_id=${aliveInfo.app_id}&resource_id=${goodsInfo.id}&unique_type=elive`
       } else {
@@ -690,6 +827,133 @@ Component({
       }
       wx.navigateToMiniProgram(params)
     },
+    // 商品设置售罄/取消售罄
+    async changeSoldOut() {
+      if (this.data.changeStateLoading) return this.showToast('状态更改中，请稍后');
+
+      const confirmPromise = () => new Promise(resolve => {
+        wx.showModal({
+          title: '确认售罄？',
+          content: '标记售罄后不影响实际库存，仅在用户端展示商品已抢光，无法购买',
+          confirmText: '确认',
+          cancelText: '取消',
+          confirmColor: '#1472FF',
+          success: (res) => {
+            if (res.confirm) {
+              return resolve(true);
+            } else if (res.cancel) {
+              return resolve(false);
+            }
+          },
+          fail: () => resolve(false),
+        });
+      });
+
+      const isConfirmOperation = this.data.isSoldOut || await confirmPromise();
+
+      if (!isConfirmOperation) return;
+
+      const { alive_id, app_id, user_id } = this.properties.aliveInfo;
+      const {
+        goodsItem,
+        isSoldOut,
+      } = this.data;
+      const params = {
+        alive_id,
+        app_id,
+        resource_id: goodsItem.id,
+        is_sell_out: isSoldOut ? 0 : 1, // 该商品是否售罄 1-已售罄 0-未售罄
+        user_id,
+        token: wx.getStorageSync('login_data').token,
+      };
+
+      this.setData({
+        changeStateLoading: true,
+      });
+
+      const res = await setGoodsSellOut(params, false).catch(error => ({ data: { code: -1, msg: error?.message || error || '操作失败' } }));
+
+      this.setData({
+        changeStateLoading: false,
+      });
+
+      const { data: { code, msg } } = res;
+
+      if (code !== 0) {
+        return this.showToast(msg);
+      }
+
+      // 更新售罄状态
+      this.triggerEvent('changeGoodsState', {
+        index: this.properties.index,
+        type: 'is_sell_out',
+        state: params.is_sell_out,
+      });
+      this.showToast('操作成功');
+    },
+    // 商品设置显示/隐藏
+    async changeVisible() {
+      if (this.data.changeStateLoading) return this.showToast('状态更改中，请稍后');
+
+      // 确认隐藏商品弹窗
+      const confirmPromise = () => new Promise(resolve => {
+        wx.showModal({
+          title: '确认隐藏吗',
+          content: '用户端商品列表不展示已隐藏商品，讲师仍可通过讲解发送商品',
+          confirmText: '确认',
+          cancelText: '取消',
+          confirmColor: '#1472FF',
+          success: (res) => {
+            if (res.confirm) {
+              return resolve(true);
+            } else if (res.cancel) {
+              return resolve(false);
+            }
+          },
+          fail: () => resolve(false),
+        });
+      });
+
+      // 已隐藏的商品可以直接调用接口显示，已显示的需要弹窗提示
+      const isConfirmOperation = !this.data.goodsItem.is_display_package || await confirmPromise();
+
+      if (!isConfirmOperation) return;
+
+      // 确认隐藏/显示，格式化参数、调用接口处理
+      const { alive_id, app_id } = this.properties.aliveInfo;
+      const { id, true_type, is_display_package } = this.data.goodsItem;
+      const params = {
+        alive_id,
+        app_id,
+        resource_ids: [{ id, type: true_type }],
+        is_display_package: +is_display_package ? 0 : 1,
+        token: wx.getStorageSync('login_data').token,
+      };
+
+      this.setData({
+        changeStateLoading: true,
+      });
+
+      const res = await requestChangeShow(params, false).catch(error => ({ data: { code: -1, msg: error?.message || error || '操作失败' } }));
+
+      this.setData({
+        changeStateLoading: false,
+      });
+
+      const { data: { code, msg } } = res;
+
+      if (code !== 0) {
+        return this.showToast(msg);
+      }
+
+      // 更新商品显示、隐藏状态
+      this.triggerEvent('changeGoodsState', {
+        index: this.properties.index,
+        type: 'is_display_package',
+        state: params.is_display_package,
+      });
+      this.showToast('操作成功');
+    },
     sendGoodsCard(e) {
       let dataset = e.currentTarget.dataset;
       // 触发父组件的send
@@ -712,7 +976,6 @@ Component({
         is_display_package: this.data.checked ? 0 : 1
       };
       showGoods(params).then((res) => {
-        console.log(res, "resres")
         let { code } = res.data
         if (code === 0) {
           this.setData({

package/miniprogram_dist/GoodsItem/index.scss

@@ -1,4 +1,4 @@
-@import "..\\common\\css\\theme.wxss";
+@import "../common/css/theme.wxss";
 
 $deviceWidth: 750;
 @function vmin($rpx) {
@@ -469,6 +469,30 @@ $deviceWidth: 750;
   .full-hide-tip{
     width: 100%;
   }
+  .option-btn-wrap {
+    display: flex;
+    align-items: center;
+    justify-content: flex-end;
+    margin-top: vmin(16);
+
+    .option-btn {
+      font-size: vmin(24);
+      border-radius: vmin(8);
+      width: vmin(128);
+      height: vmin(56);
+        margin-right: vmin(24);
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        font-weight: bold;
+        color: #333;
+        border: vmin(1) solid #cccccc;
+
+        &:last-of-type {
+            margin-right: 0;
+        }
+    }
+  }
 }
 
 @keyframes turn {

package/miniprogram_dist/GoodsItem/index.wxml

@@ -1,7 +1,7 @@
-<!-- 
+<!--
   /*
-  * @Descripttion: 
-  * @version: 
+  * @Descripttion:
+  * @version:
   * @Author: conlinchen
   * @Date: 2021-10-28 18:17:48
  * @LastEditors: conlinchen
@@ -31,7 +31,8 @@
         </view>
         <view class="text">讲解中</view>
       </view>
-      <view class="is-over" wx:if="{{isOver}}">- 已抢光 -</view>
+      <view class="is-over" wx:if="{{!isStudent && isSoldOut}}">- 已售罄 -</view>
+      <view class="is-over" wx:elif="{{isOver}}">- 已抢光 -</view>
     </view>
     <view class="right {{isManage?'manage-right':''}}">
       <!-- 标题 -->
@@ -122,9 +123,9 @@
             send-message-path="{{params_url}}"
           >{{ btnTxt }}</button>
           <!-- 库存为0的情况 -->
-          <view class="no-stock-btn" wx:if="{{ btnTxt === '已抢光' }}" catchtap="()=>{}">{{ btnTxt }}</view>
+          <view class="no-stock-btn" wx:if="{{ btnTxt === '已抢光' || btnTxt === '已售罄' }}" catchtap="checkSellOut">{{ btnTxt }}</view>
           <!-- 正常情况 -->
-          <view class="buy-btn" catchtap="snapUpCheck" wx:if="{{ btnTxt === '购买' }}">{{ btnTxt }}</view>
+          <view class="buy-btn" catchtap="snapUpCheck" wx:elif="{{ btnTxt === '购买' }}">{{ btnTxt }}</view>
           <!-- 0元商品/超级会员免费/券后价、领券接口熔断的情况 -->
           <view
             class="buy-btn"
@@ -144,7 +145,7 @@
             </text>
           </view>-->
         </block>
-        <block wx:elif="{{!isManage && !isStudent}}">
+        <block wx:elif="{{!isManage && !isStudent && !visibleSwitchStatusBtn}}">
           <view
             class="buy-btn-teacher {{ sendingGoodId === goodsItem.id ? 'cancel-explain-bg' : 'explain-bg' }}"
             catchtap="sendGoodsCard"
@@ -159,7 +160,7 @@
               class="load"
               src="https://commonresource-1252524126.cdn.xiaoeknow.com/image/lik3ojn20167.png"
             />
-            {{ sendingGoodId === goodsItem.id ? '结束讲解' : '讲解' }} 
+            {{ sendingGoodId === goodsItem.id ? '结束讲解' : '讲解' }}
           </view>
         </block>
         <!-- 购买按钮 end -->
@@ -170,4 +171,31 @@
     class="hide-tip {{isFullScreen?'full-hide-tip':''}}"
     wx:if="{{!goodsItem.is_display_package && !isStudent}}"
   >用户端已隐藏该商品</view>
+  <block wx:if="{{visibleSwitchStatusBtn}}">
+    <view class="option-btn-wrap">
+      <view
+        class="option-btn"
+        catch:tap="changeSoldOut"
+        data-item="{{goodsItem}}"
+        data-type="10"
+        data-index="{{index}}"
+        data-id="{{goodsItem.id}}"
+        data-isExplain="{{changeStateLoading}}"
+      >
+        {{ isSoldOut ? '取消售罄' : '售罄' }}
+      </view>
+
+      <view
+        class="option-btn"
+        catch:tap="changeVisible"
+        data-item="{{goodsItem}}"
+        data-type="10"
+        data-index="{{index}}"
+        data-id="{{goodsItem.id}}"
+        data-isExplain="{{changeStateLoading}}"
+      >
+        {{ goodsItem.is_display_package ? '隐藏' : '显示' }}
+      </view>
+    </view>
+  </block>
 </view>

package/miniprogram_dist/GoodsItem/index.wxss

@@ -490,6 +490,28 @@
 .goods-item .full-hide-tip {
   width: 100%;
 }
+.goods-item .option-btn-wrap {
+  display: flex;
+  align-items: center;
+  justify-content: flex-end;
+  margin-top: 2.13333vmin;
+}
+.goods-item .option-btn-wrap .option-btn {
+  font-size: 3.2vmin;
+  border-radius: 1.06667vmin;
+  width: 17.06667vmin;
+  height: 7.46667vmin;
+  margin-right: 3.2vmin;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  font-weight: bold;
+  color: #333;
+  border: 0.13333vmin solid #cccccc;
+}
+.goods-item .option-btn-wrap .option-btn:last-of-type {
+  margin-right: 0;
+}
 @media screen and (min-width: 768px) and (orientation: portrait) {
   .goods-item {
     display: flex;
@@ -946,6 +968,28 @@
   .goods-item .full-hide-tip {
     width: 100%;
   }
+  .goods-item .option-btn-wrap {
+    display: flex;
+    align-items: center;
+    justify-content: flex-end;
+    margin-top: 1.04167vmin;
+  }
+  .goods-item .option-btn-wrap .option-btn {
+    font-size: 1.5625vmin;
+    border-radius: 0.52083vmin;
+    width: 8.33333vmin;
+    height: 3.64583vmin;
+    margin-right: 1.5625vmin;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    font-weight: bold;
+    color: #333;
+    border: 0.0651vmin solid #cccccc;
+  }
+  .goods-item .option-btn-wrap .option-btn:last-of-type {
+    margin-right: 0;
+  }
 }
 @media screen and (min-height: 630px) and (orientation: landscape) {
   .goods-item {
@@ -1403,6 +1447,28 @@
   .goods-item .full-hide-tip {
     width: 100%;
   }
+  .goods-item .option-btn-wrap {
+    display: flex;
+    align-items: center;
+    justify-content: flex-end;
+    margin-top: 1.26984vmin;
+  }
+  .goods-item .option-btn-wrap .option-btn {
+    font-size: 1.90476vmin;
+    border-radius: 0.63492vmin;
+    width: 10.15873vmin;
+    height: 4.44444vmin;
+    margin-right: 1.90476vmin;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    font-weight: bold;
+    color: #333;
+    border: 0.07937vmin solid #cccccc;
+  }
+  .goods-item .option-btn-wrap .option-btn:last-of-type {
+    margin-right: 0;
+  }
 }
 @media screen and (min-height: 768px) and (orientation: landscape) {
   .goods-item {
@@ -1860,4 +1926,26 @@
   .goods-item .full-hide-tip {
     width: 100%;
   }
+  .goods-item .option-btn-wrap {
+    display: flex;
+    align-items: center;
+    justify-content: flex-end;
+    margin-top: 1.04167vmin;
+  }
+  .goods-item .option-btn-wrap .option-btn {
+    font-size: 1.5625vmin;
+    border-radius: 0.52083vmin;
+    width: 8.33333vmin;
+    height: 3.64583vmin;
+    margin-right: 1.5625vmin;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    font-weight: bold;
+    color: #333;
+    border: 0.0651vmin solid #cccccc;
+  }
+  .goods-item .option-btn-wrap .option-btn:last-of-type {
+    margin-right: 0;
+  }
 }