xiaoe_mp_npm 0.5.42-test2 → 0.5.42-test21

package/src/TeacherGoodsList/index.scss

@@ -29,7 +29,6 @@ $deviceWidth: 750;
     display: flex;
     flex-direction: column;
     height: 100%;
-    padding: 0 vmin(32);
     .finished-text{
       display: flex;
       justify-content: center;
@@ -38,9 +37,13 @@ $deviceWidth: 750;
       padding: 2.67vmin 0;
     }
     .check-box{
-      padding-left: vmin(32) !important;
+      padding-left: 0 !important;
+    }
+    .full-item{
+      margin-left: vmin(32);
     }
 }
+
 .no-data{
   display: flex;
   flex-direction: column;

package/src/TeacherGoodsList/index.wxml

@@ -10,7 +10,7 @@
 -->
 <!-- 商品列表 start-->
 <scroll-view
-  class="goods-list"
+  class="goods-list {{isFullScreen?'full-list':''}}"
   scroll-y="true"
   bindscrolltolower="onScrolltolower"
   refresher-triggered="{{refreshing}}"
@@ -19,28 +19,30 @@
   wx:if="{{aliveConf.is_takegoods && finishedTxt !== 'no-data'}}"
 >
   <block wx:if="{{isManage}}">
-    <van-checkbox-group value="{{ selectList }}" bind:change="onChange">
-      <van-checkbox
-        name="{{goodsItem.id}}"
-        label-class="check-box"
-        wx:for="{{goodsInfo}}"
-        wx:for-item="goodsItem"
-        wx:key="index"
-      >
-        <goods-item
-          goodsInfo="{{goodsItem}}"
-          aliveInfo="{{aliveInfo}}"
-          bind:sendGoodsCard="sendGoodsCard"
-          class="goods-item"
-          envName="{{ENV_NAME}}"
-          sensorReportParams="{{sensorReportParams}}"
-          current_role="teacher"
-          index="{{index}}"
-          sending="{{sending && index === sendingIndex}}"
-          isFullScreen="{{isFullScreen}}"
-          isManage="{{true}}"
-        ></goods-item>
-      </van-checkbox>
+    <van-checkbox-group value="{{ selectGoodsIndexArr }}" bind:change="onChange">
+      <view wx:for="{{goodsInfo}}" class="full-item" wx:for-item="goodsItem" wx:key="index">
+        <van-checkbox 
+          name="{{goodsItem.id}}" 
+          label-class="check-box" 
+          catchtap="selectToast" 
+          data-item="{{index}}" 
+          disabled="{{selectGoodsIndexArr.length >= 10 && selectGoodsModule.checkBoxDisable(selectGoodsIndexArr,goodsItem.id)}}"
+        >
+          <goods-item
+            goodsInfo="{{goodsItem}}"
+            aliveInfo="{{aliveInfo}}"
+            bind:sendGoodsCard="sendGoodsCard"
+            class="goods-item"
+            envName="{{ENV_NAME}}"
+            sensorReportParams="{{sensorReportParams}}"
+            current_role="teacher"
+            index="{{index}}"
+            sending="{{sending && index === sendingIndex}}"
+            isFullScreen="{{isFullScreen}}"
+            isManage="{{true}}"
+          ></goods-item>
+        </van-checkbox>
+      </view>
     </van-checkbox-group>
   </block>
   <block wx:else>
@@ -81,8 +83,24 @@
 <view class="goods-select" catchtouchmove wx:if="{{isManage}}">
   <view class="selected">
     <text>已选</text>
-    <text class="selected-num">{{selectList.length}}</text>
+    <text class="selected-num">{{selectGoods.length}}</text>
   </view>
   <view class="select-btn show" data-type="show" bindtap="changeShowType">显示</view>
   <view class="select-btn hide" data-type="hide" bindtap="changeShowType">隐藏</view>
 </view>
+
+
+
+<wxs module="selectGoodsModule">
+  var checkBoxDisable = function(arr, id) {
+    if(arr.indexOf(id) === -1) {
+      return true
+    }else {
+      return false
+    }
+  }
+
+  module.exports = {
+    checkBoxDisable: checkBoxDisable
+  }
+</wxs>

package/src/TeacherGoodsList/index.wxss

@@ -1,6 +1,7 @@
 .box {
   margin: 0 3.2vmin;
 }
+
 .title {
   margin: 0;
   padding: 8.53vmin 4.27vmin 4.27vmin;
@@ -10,36 +11,26 @@
   line-height: 5.33vmin;
   text-align: center;
 }
+
 .btn {
   display: block;
   width: 100%;
   margin: 2.67vmin 0;
   background-color: #fff;
 }
-.goods-list {
-  box-sizing: border-box;
-  min-height: 80vmin;
-  display: flex;
-  flex-direction: column;
-  height: 100%;
-}
-.goods-list .finished-text {
-  display: flex;
-  justify-content: center;
-  color: #999;
-  font-size: 3.73vmin;
-  padding: 2.67vmin 0;
-}
+
 .no-data {
   display: flex;
   flex-direction: column;
   align-items: center;
   padding-top: 21.87vmin;
 }
+
 .no-data .no-data-png {
   width: 23.47vmin;
   height: 23.47vmin;
 }
+
 .no-data .no-data-text {
   color: #333333;
   font-size: 3.73vmin;
@@ -48,6 +39,7 @@
   margin-top: 4.27vmin;
   margin-bottom: 2.13vmin;
 }
+
 .no-data .chat-text {
   opacity: 1;
   color: #999999;
@@ -57,3 +49,148 @@
   padding: 0 12vmin 0 11.73vmin;
   text-align: center;
 }
+
+.goods-select {
+  right: 0;
+  position: fixed;
+  bottom: 0;
+  background: #FFFFFF;
+  height: 13.86667vmin;
+  border-top: 0.13333vmin solid #ebebeb;
+  backdrop-filter: blur(10.66667vmin);
+  padding: 3.2vmin 4.26667vmin;
+  display: flex;
+  align-items: center;
+  width: 100%;
+  justify-content: flex-end;
+  box-sizing: border-box;
+  z-index: 99;
+}
+
+.goods-select .selected {
+  margin-right: 3.2vmin;
+  font-size: 3.73333vmin;
+  color: #999999;
+}
+
+.goods-select .selected .selected-num {
+  color: #333333;
+  margin-left: 1.33333vmin;
+}
+
+.goods-select .select-btn {
+  width: 17.06667vmin;
+  height: 7.46667vmin;
+  border-radius: 1.06667vmin;
+  opacity: 1;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  font-size: 3.2vmin;
+  font-weight: 500;
+}
+
+.goods-select .show {
+  background: #1472ff;
+  color: #ffffff;
+  margin-right: 3.2vmin;
+}
+
+.goods-select .hide {
+  background: #ffffff;
+  color: #333333;
+  border: 1rpx solid #cccccc;
+}
+
+.goods-list {
+  box-sizing: border-box;
+  min-height: 80vmin;
+  display: flex;
+  flex-direction: column;
+  height: 100%;
+}
+
+.goods-list .finished-text {
+  display: flex;
+  justify-content: center;
+  color: #999;
+  font-size: 3.73vmin;
+  padding: 2.67vmin 0;
+}
+
+.goods-list .check-box {
+  padding-left: 0 !important;
+}
+
+.goods-list .full-item {
+  margin-left: 4.26667vmin;
+}
+
+@media screen and (min-width: 768px) and (orientation: portrait) {
+  .goods-list {
+    box-sizing: border-box;
+    min-height: 80vmin;
+    display: flex;
+    flex-direction: column;
+    height: 100%;
+  }
+  .goods-list .finished-text {
+    display: flex;
+    justify-content: center;
+    color: #999;
+    font-size: 3.73vmin;
+    padding: 2.67vmin 0;
+  }
+  .goods-list .check-box {
+    padding-left: 0 !important;
+  }
+  .goods-list .full-item {
+    margin-left: 2.08333vmin;
+  }
+}
+
+@media screen and (min-height: 630px) and (orientation: landscape) {
+  .goods-list {
+    box-sizing: border-box;
+    min-height: 80vmin;
+    display: flex;
+    flex-direction: column;
+    height: 100%;
+  }
+  .goods-list .finished-text {
+    display: flex;
+    justify-content: center;
+    color: #999;
+    font-size: 3.73vmin;
+    padding: 2.67vmin 0;
+  }
+  .goods-list .check-box {
+    padding-left: 0 !important;
+  }
+  .goods-list .full-item {
+    margin-left: 2.53968vmin;
+  }
+}
+
+@media screen and (min-height: 768px) and (orientation: landscape) {
+  .goods-list {
+    box-sizing: border-box;
+    min-height: 80vmin;
+    display: flex;
+    flex-direction: column;
+    height: 100%;
+  }
+  .goods-list .finished-text {
+    display: flex;
+    justify-content: center;
+    color: #999;
+    font-size: 3.73vmin;
+    padding: 2.67vmin 0;
+  }
+  .goods-list .check-box {
+    padding-left: 0 !important;
+  }
+  .goods-list .full-item {
+    margin-left: 2.08333vmin;
+  }
+}

package/src/common/api/liveGoodsList.js

@@ -27,7 +27,9 @@ const GOODS_LIST = {
     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`
+    SHOW_GOODS: `${gateway()}xe.user.display_package.edit`,
+
+    REQUEST_CHANGE_SHOW: `${gateway()}elive/goods/xe.alive_goods.batch_edit_display/1.0.0`
 };
 
 // 获取商品列表
@@ -70,6 +72,11 @@ const showGoods = (params, isNeedBiz = true, config = {}) => {
     return http.player.post(GOODS_LIST.SHOW_GOODS, params, isNeedBiz, config);
 }
 
+// 批量操作显示隐藏
+const requestChangeShow = (params, isNeedBiz = false, config = {}) => {
+    return http.player.post(GOODS_LIST.REQUEST_CHANGE_SHOW, params, isNeedBiz, config)
+  }
+
 module.exports = {
   getGoodsList,
   getGoodsListNew,
@@ -78,5 +85,6 @@ module.exports = {
   getUserPermissionNew,
   snapCheck,
   snapCheckNew,
-  showGoods
+  showGoods,
+  requestChangeShow
 }

package/src/common/utils/index.js

@@ -54,3 +54,17 @@ export const isEmptyObject = (object) => {
 export const isPhone = (val) => {
     return /^1(3|4|5|6|7|8)\d{9}$/.test(val);
 }
+
+// 大屏适配 rpx 转 vmin
+export const rpxToVmin = (rpx) => {
+  const { screenWidth, screenHeight, deviceOrientation, platform } = wx.getSystemInfoSync()
+  const isPadSize = (screenWidth >= 768 && deviceOrientation === 'portrait') || (screenHeight >= 768 && deviceOrientation === 'landscape')
+  const isPcEquipment = platform === 'windows' || platform === 'mac' || platform === 'devtools'
+  const pcHighResolution = screenHeight >= 768
+  let deviceWidth = 750
+  // ipad平板
+  if (isPadSize) deviceWidth = 1536
+  // PC高分辨率或PC放大项目
+  if (isPcEquipment) deviceWidth = pcHighResolution ? 1536 : 1260
+  return `${rpx * 100 / deviceWidth}vmin`
+}

package/src/coupon/components/CouponItem/index.less

@@ -26,6 +26,7 @@
         }
     }
 }
+
 .couponNewV2 {
     position: relative;
     display: flex;

package/src/coupon/components/CouponItem/index.scss

@@ -0,0 +1,247 @@
+$deviceWidth: 750;
+@function vmin($rpx) {
+  @return #{$rpx * 100 / $deviceWidth}vmin;
+}
+
+@mixin couponNewWrap{
+  width: 100%;
+  margin-bottom: vmin(26.4);
+  margin-left: auto;
+  margin-right: auto;
+
+  .couponNewV2 {
+    position: relative;
+    display: flex;
+    width: 100%;
+    height: vmin(224.4);
+    margin-left: auto;
+    margin-right: auto;
+    overflow: hidden;
+    border-radius: vmin(8);
+    background-color: #fff;
+
+    // 优惠券不可用样式
+    .disabledState{
+      background-color: #EEEEEE!important;
+      .couponValue{
+          background: #CDCDCD!important;
+      }
+    }
+  
+    .couponValue {
+        width: vmin(228);
+        height: vmin(224.4);
+        background: #FF821F !important;
+        box-sizing: border-box;
+        border-radius: vmin(8) 0 0 vmin(8);
+        .couponPrice {
+            position: relative;
+            width: 100%;
+            height: vmin(99);
+            margin: vmin(31) auto vmin(8);
+            text-align: center;
+            line-height: vmin(99);
+            font-size: vmin(97);
+            font-weight: 500;
+            color: #fff;
+            .fontSmall {
+                font-size: vmin(53) !important;
+            }
+            .fontLastSmall{
+                font-size: vmin(35) !important;
+            }
+  
+            .fixedfont{
+                font-size: vmin(26.4) !important;
+  
+            }
+            .fixedPercent{
+                font-size: vmin(35) !important;
+            }
+            span {
+                position: relative;
+                display: inline-block;
+            }
+             .discountFont,.coupon-symbol{
+                font-size: vmin(35);
+                margin-left: vmin(2);
+                margin-left: -vmin(1);
+            }
+  
+        }
+  
+        .couponUseCondition {
+            width: 100%;
+            overflow: hidden;
+            max-height: vmin(88);
+            line-height: vmin(40);
+            color:#fff;
+            text-align: center;
+        }
+  
+        .couponMaxDiscountNum {
+          width: 100%;
+          text-align: center;
+          color: #fff;
+          margin-bottom: vmin(55);
+          font-size: vmin(10);
+        }
+    }
+  
+    .couponInfo {
+        position: relative;
+        display: flex;
+        flex-direction: column;
+        justify-content: space-between;
+        width: vmin(374);
+        height: 100%;
+        overflow: hidden;
+        box-sizing: border-box;
+        padding: vmin(18) 0 vmin(18) vmin(26.4);
+        border-bottom-right-radius: vmin(8);
+        border-top-right-radius: vmin(8);
+        color:#888888;
+        font-size: vmin(22);
+        text-align: left;
+        span{
+            display: inline-block;
+        }
+        .couponName {
+            width: 100%;
+            line-height: vmin(33);
+            white-space: nowrap;
+            overflow: hidden;
+            text-overflow: ellipsis;
+            margin-bottom: vmin(18);
+            color:#505050;
+            font-size: vmin(26.4);
+            font-weight:500;
+        }
+        .couponUseTime {
+            width: 100%;
+            height: vmin(31);
+            line-height: vmin(31);
+            font-size: vmin(22);
+        }
+        .noSuperposition{
+          color: #FF821F;
+        }
+        .moreInfo{
+            display: flex;
+            align-items: center;
+            padding: vmin(2) 0;
+        }
+        .operateBtn{
+            width: vmin(26.4);
+            height: vmin(26.4);
+            cursor: pointer;
+            margin-left: vmin(6.6);
+            background-size: 100% 100%;
+        }
+        .retract{
+            background: url('../../../common/assets/images/coupon/up.svg') center no-repeat;
+        }
+    }
+  
+    .couponState {
+        position: absolute;
+        right: 0;
+        width: vmin(132);
+        height: 100%;
+        .superImg{
+          width: vmin(88);
+          height: vmin(88);
+          background-size: 100% 100%;
+          position: absolute;
+          right: 0;
+        }
+        .coupon-choose-box {
+            display: flex;
+            align-items: center;
+            justify-content: center;
+            width: 100%;
+            height: 100%;
+            border-radius: 0 vmin(8) vmin(8) 0;
+  
+            .coupon-choose {
+                width: vmin(44);
+                height: vmin(44);
+                background-size: 100% 100%;
+                border-radius: 50%;
+                box-sizing: border-box;
+                // background: url('../../assets/images/couponSelect/coupon_select.png');
+                background-size: 100% 100%;
+            }
+  
+            .coupon-unchoosed {
+                border: vmin(4) solid #CCC;
+                background: none;
+            }
+        }
+    }
+  }
+
+  &:last-child {
+      margin-bottom: 0;
+  }
+
+  .detailInfo{
+      display: flex;
+      align-items: center;
+      padding: vmin(35);
+      background-color: #FFFAF4;
+      box-sizing: border-box;
+      border-radius: 0 0 0.53vmin 0.53vmin;
+      color: #505050;
+      font-size: vmin(22);
+      background: #FFFAF4;
+      text-align: left;
+
+      // 详细信息不可用优惠券时的字段
+      &.whiteBg{
+        background-color: #fff!important;
+      }
+
+      .disabledHint{
+        width: vmin(30);
+        height: vmin(30);
+        margin-right: vmin(8);
+        transform: translateY(vmin(6));
+      }
+
+      .instructions {
+        font-size: vmin(14);
+        color: #505050;
+        text {
+          white-space: pre-wrap;
+        }
+      }
+  }
+}
+
+
+.couponNewWrap {
+  @include couponNewWrap;
+}
+// 竖屏pad
+@media screen and (min-width: 768px) and (orientation: portrait) {
+  $deviceWidth: 1536 !global;
+  .couponNewWrap {
+    @include couponNewWrap;
+  }
+}
+// PC 放大适配
+@media screen and (min-height: 630px) and (orientation: landscape) {
+  $deviceWidth: 1260 !global;
+
+  .couponNewWrap {
+    @include couponNewWrap;
+  }
+}
+// 横屏pad
+@media screen and (min-height: 768px) and (orientation: landscape) {
+  $deviceWidth: 1536 !global;
+  .couponNewWrap {
+    @include couponNewWrap;
+  }
+}