xiaoe_mp_npm 1.1.22-test02 → 1.1.23

package/miniprogram_dist/ConfirmOrder/components/ConfirmOrderContent/index.js

@@ -219,8 +219,8 @@ Component({
     prePayInfo: {}, // 批价信息
     payResult: {}, // 支付接口返回信息
     assertNeedCollectInfo: {},
-    infoIsLoadSuc: true,//信息采集加载状态
-    needCollect: true, //信息采集状态二次确认
+    infoIsLoadSuc: false,//信息采集加载状态
+    needCollect: false, //信息采集状态二次确认
     successCallbackParams: {}, // 支付成功回调参数
     waitInformation: true, // 是否是第一次批价，用来第一次批价等信息采集接口返回
     setTime: null, // 计时器

package/miniprogram_dist/GoodsItem/index.js

@@ -105,6 +105,7 @@ Component({
           preheating,
           isSeckill,
           checked,
+          inputValue: newVal.order_weight,
           isExplainDisabled: false,
         }, () => {
           const isSoldOut = +newVal.is_sell_out === 1;
@@ -237,6 +238,14 @@ Component({
       type: Boolean,
       value: false
     },
+    isGoToSort: {
+      type: Boolean,
+      value: false
+    },
+    goodsTotal: {
+      type: Number,
+      value: 0
+    },
   },
 
   lifetimes: {
@@ -275,6 +284,8 @@ Component({
     skillNowTime: 0, // 秒杀活动对比的当前时间
     hideBubble: false,
     customStyle: 'top: 16rpx;margin-left: 4rpx;',
+    inputValue: '', // 排序输入值
+    isEdit: false, // 是否点击编辑框
     isExplainDisabled: false,
     disableExplainTimer: null,
   },
@@ -1438,6 +1449,59 @@ Component({
           })
         },
       })
+    },
+    onInput(e) {
+      this.setData({
+        inputValue: e.detail.value.replace(/\D/g, ''),
+      })
+    },
+    saveInput() {
+      this.setData({
+        isEdit: false,
+      })
+      // 非法情况
+      if (this.data.inputValue > this.data.goodsTotal || (Number(this.data.inputValue) === 0 && this.data.inputValue !== "")) {
+        if (this.data.inputValue > this.data.goodsTotal) {
+          wx.showToast({
+            title: '最大序号' + this.data.goodsTotal,
+            icon: 'none'
+          });
+        } else {
+          wx.showToast({
+            title: '最小序号' + 1,
+            icon: 'none'
+          });
+        }
+        this.setData({
+          inputValue: this.data.goodsItem.order_weight
+        });
+      } else {
+        //为空时
+        if (this.data.inputValue === "") {
+          this.setData({
+            inputValue: this.data.goodsItem.order_weight
+          });
+          return;
+        }
+        if (this.data.goodsItem.order_weight === Number(this.data.inputValue)) return;
+        let changeItem = JSON.parse(JSON.stringify(this.data.goodsItem));
+        changeItem.order_weight = Number(this.data.inputValue);
+        this.triggerEvent("resort", {
+            changeItem,
+            failCB: () => {
+                this.setData({
+                  inputValue: this.data.goodsItem.order_weight
+                });
+            }
+        });
+      }
+    },
+    // 是否点击编辑框
+    editgoodsIndex() {
+      this.setData({
+        isEdit: true,
+      })
     }
-  }
+  },
+    
 })

package/miniprogram_dist/GoodsItem/index.scss

@@ -16,6 +16,23 @@ $deviceWidth: 750;
   .main-card{
     display: flex;
     flex-direction: row;
+    align-items: center;
+    
+    .editor {
+      border: vmin(2) solid #e5e5e5;
+      width: vmin(80);
+      flex-shrink: 0;
+      border-radius: vmin(8);
+      margin-right: vmin(16);
+      .input {
+        padding: vmin(8) vmin(16);
+        text-align: center;
+      }
+      .changeborder {
+        border: vmin(2) solid #1472ff;
+        border-radius: vmin(8);
+      }
+    }
     .left {
       position: relative;
       width: vmin(224);

package/miniprogram_dist/GoodsItem/index.wxml

@@ -11,7 +11,7 @@
 <wxs src="./index.wxs" module="goodsItemTools" />
 <view class="goods-item {{isSpecifyGoods ? 'lottery-goods-item' : ''}}" bind:tap="cardToDetails" style="{{style}}">
   <!-- 讲解中商品 新增气泡 -->
-  <goods-bubble 
+  <goods-bubble
     wx:if="{{ isShowBubble }}"
     id="goodsBubble"
     goodsId="{{ goodsItem.id }}"
@@ -27,6 +27,17 @@
     distributionPattern="{{ goodsDistributionPattern }}"
   />
   <view class="main-card">
+    <view class="editor" wx:if="{{isGoToSort}}">
+      <input
+        type="text"
+        inputmode="numeric"
+        value="{{inputValue}}"
+        bindinput="onInput"
+        bindblur="saveInput"
+        bindfocus="editgoodsIndex"
+        class="input {{isEdit ? 'changeborder' : ''}}"
+      />
+    </view>
     <view class="left">
       <!-- 该封面组件是鹅直播上的全局组件 -->
       <imagePoster borderRadius="{{imageRadius}}" src="{{filterSrc}}" />

package/miniprogram_dist/GoodsItem/index.wxss

@@ -30,6 +30,22 @@
 .goods-item .main-card {
   display: flex;
   flex-direction: row;
+  align-items: center;
+}
+.goods-item .main-card .editor {
+  border: 0.26667vmin solid #e5e5e5;
+  width: 10.66667vmin;
+  flex-shrink: 0;
+  border-radius: 1.06667vmin;
+  margin-right: 2.13333vmin;
+}
+.goods-item .main-card .editor .input {
+  padding: 1.06667vmin 2.13333vmin;
+  text-align: center;
+}
+.goods-item .main-card .editor .changeborder {
+  border: 0.26667vmin solid #1472ff;
+  border-radius: 1.06667vmin;
 }
 .goods-item .main-card .left {
   position: relative;
@@ -758,6 +774,22 @@
   .goods-item .main-card {
     display: flex;
     flex-direction: row;
+    align-items: center;
+  }
+  .goods-item .main-card .editor {
+    border: 0.13021vmin solid #e5e5e5;
+    width: 5.20833vmin;
+    flex-shrink: 0;
+    border-radius: 0.52083vmin;
+    margin-right: 1.04167vmin;
+  }
+  .goods-item .main-card .editor .input {
+    padding: 0.52083vmin 1.04167vmin;
+    text-align: center;
+  }
+  .goods-item .main-card .editor .changeborder {
+    border: 0.13021vmin solid #1472ff;
+    border-radius: 0.52083vmin;
   }
   .goods-item .main-card .left {
     position: relative;
@@ -1487,6 +1519,22 @@
   .goods-item .main-card {
     display: flex;
     flex-direction: row;
+    align-items: center;
+  }
+  .goods-item .main-card .editor {
+    border: 0.15873vmin solid #e5e5e5;
+    width: 6.34921vmin;
+    flex-shrink: 0;
+    border-radius: 0.63492vmin;
+    margin-right: 1.26984vmin;
+  }
+  .goods-item .main-card .editor .input {
+    padding: 0.63492vmin 1.26984vmin;
+    text-align: center;
+  }
+  .goods-item .main-card .editor .changeborder {
+    border: 0.15873vmin solid #1472ff;
+    border-radius: 0.63492vmin;
   }
   .goods-item .main-card .left {
     position: relative;
@@ -2216,6 +2264,22 @@
   .goods-item .main-card {
     display: flex;
     flex-direction: row;
+    align-items: center;
+  }
+  .goods-item .main-card .editor {
+    border: 0.13021vmin solid #e5e5e5;
+    width: 5.20833vmin;
+    flex-shrink: 0;
+    border-radius: 0.52083vmin;
+    margin-right: 1.04167vmin;
+  }
+  .goods-item .main-card .editor .input {
+    padding: 0.52083vmin 1.04167vmin;
+    text-align: center;
+  }
+  .goods-item .main-card .editor .changeborder {
+    border: 0.13021vmin solid #1472ff;
+    border-radius: 0.52083vmin;
   }
   .goods-item .main-card .left {
     position: relative;

package/miniprogram_dist/LiveGoodsList/index.js

@@ -293,6 +293,9 @@ Component({
       const vmin = ($rpx) => {
         return `${$rpx * 100 / 750}vmin`;
       }
+      if (data.isFullScreen) {
+        contentStyle += `height: calc(100% - ${vmin(200)});`
+      }
       if (data.tagGroupList.length > 0) {
         contentStyle += `height: calc(100% - ${data.isFullScreen ? vmin(288) : vmin(220)});`
       }
@@ -438,7 +441,11 @@ Component({
               is_preheat: msgData[key],
               resource_ids: msgData.goods_info?.resource_ids || [],
             }
-            break
+            break;
+          case "order_list":
+            type = 'goodsOrderWeightHandler'
+            marketInfo = msgData[key]
+            break;
           default:
             break
         }
@@ -620,6 +627,12 @@ Component({
           })
           this.formatData(this.data.goodsInfo)
           break
+        case 'goodsOrderWeightHandler':
+          for(let i = 0; i < marketInfo.length; i++) {
+            let changeItem = marketInfo[i];
+            stuFormatItem(changeItem);
+            this.goodsListResort(changeItem);
+          }
         default:
           break
       }
@@ -631,6 +644,69 @@ Component({
         })
       }
     },
+    goodsListResort(changItem) {
+      const goodsInfo = this.data.goodsInfo;
+      const hasSameGoods = goodsInfo.findIndex(
+        (item) => item.id === changItem.id && item.order_weight === changItem.order_weight
+      );
+      if (hasSameGoods > -1) return;
+
+      let length = 200; // b端最大添加200条数据，故临时写，后续有优化统一更改
+      let tempList = [];
+      let truelength = goodsInfo.length;
+
+      // 1.创建一个完整长度的虚拟数据
+      for (let i = 0; i < length; i++) {
+        let tempgood = goodsInfo.find((item) => item.order_weight === i + 1);
+        // 若该商品被隐藏了，插入该商品
+        if (tempgood === undefined && changItem.old_order_weight === i + 1) {
+          tempgood = changItem;
+          truelength = truelength + 1;
+        }
+        tempList.push(tempgood ? JSON.parse(JSON.stringify(tempgood)) : { order_weight: i + 1 });
+      }
+
+      // 2.通过 id 找出原数据的 index
+      const oldIndex = tempList.findIndex((item) => item.id === changItem.id);
+
+      // 3.根据列表是否已有该数据进行插入还是更改位置
+      if (oldIndex === -1) {
+        // 插入数据到对应位置
+        tempList.splice(changItem.order_weight - 1, 0, changItem);
+      } else {
+        // 找目标插入位置 index（在当前视觉排序下，根据 newOrder 找位置）
+        let newIndex = tempList.findIndex(
+          (item, index) => index !== oldIndex && item.order_weight === changItem.order_weight
+        );
+        // 操作更改序号位置移动
+        tempList.splice(oldIndex, 1);
+        tempList.splice(newIndex, 0, changItem);
+      }
+
+      // 4.重排 order_weight
+      tempList.forEach((item, index) => {
+        item.order_weight = index + 1;
+      });
+
+      // 5.恢复排序
+      const newGoodsInfo = tempList
+        .filter((item) => item.id)
+        .filter(
+          (item) =>
+            this.data.total === goodsInfo.length || // 如果加载完了，全部展示
+            (this.data.total !== goodsInfo.length &&
+              item.order_weight <= goodsInfo[goodsInfo.length - 1].order_weight) // 未加载完成展示当前最大order_weight内的商品
+        )
+        .filter((item, index) => index < truelength);
+
+      this.setData({
+        goodsInfo: newGoodsInfo
+      }, () => {
+        this.setData({
+          formExplainingGoods: newGoodsInfo.find((item) => item.id === this.data.formExplainingGoods.id),
+        })
+      });
+    },
     sendNewMsg() {
       this.triggerEvent('sendNewMsg')
     },

package/miniprogram_dist/Task/TaskPopup/component/TaskItem/index.js

@@ -197,6 +197,13 @@ Component({
         return {}
       },
     },
+    taskConf: {
+      type: Object,
+      value: () => ({
+        is_hide_countdown: 0, // 0-显示倒计时 1-隐藏倒计时
+        is_hide_time: 0, // 0-显示任务时间 1-隐藏任务时间
+      })
+    }
   },
   data: {
     activeNames: ['1'],
@@ -214,6 +221,15 @@ Component({
     },
   },
   computed: {
+    // 是否显示任务时间
+    visibleTaskTime({ taskConf, taskItem, listType }) {
+      // 打开隐藏时间开关 + 未到开始时间的任务，才隐藏任务时间
+      const isValidTaskConfig = !(taskConf?.is_hide_time && +taskItem.join_state === 0 && taskItem.state !== 2)
+      // 只在任务列表中做处理
+      const isValidListType = listType === 'task' || listType === 'error'
+
+      return isValidTaskConfig && isValidListType
+    },
     // 是否是正在开始的拉新任务
     isSharingTaskStatus({ isInOrder, taskItem }) {
       const { task_module, join_state, progress, state, task_condition, task_type } = taskItem

package/miniprogram_dist/Task/TaskPopup/component/TaskItem/index.scss

@@ -66,8 +66,8 @@ $deviceWidth: 750;
     display: flex;
     align-items: center;
     image {
-      width: vmin(40);
-      height: vmin(40);
+      width: 100%;
+      height: 100%;
     }
   }
 
@@ -75,10 +75,10 @@ $deviceWidth: 750;
     width: vmin(4);
     height: calc(100% - #{vmin(40)});
     background-color: #e5e5e5;
-    position: absolute;
-    top: vmin(40);
-    left: 50%;
-    transform: translateX(-50%);
+    //position: absolute;
+    //top: vmin(40);
+    //left: 50%;
+    //transform: translateX(-50%);
     z-index: 1;
   }
 
@@ -94,22 +94,25 @@ $deviceWidth: 750;
       align-self: flex-end;
     }
 
-    .task-desc-btn {
-      flex-shrink: 0;
-      align-self: flex-end;
-      margin-left: vmin(8);
-    }
+    //.task-desc-btn {
+    //  flex-shrink: 0;
+    //  align-self: flex-end;
+    //  margin-left: vmin(8);
+    //}
   }
 
   .left {
     flex: 1;
-    margin-bottom: vmin(64);
+    padding-bottom: vmin(64);
+    overflow: hidden;
 
     .first {
-      line-height: vmin(40);
+      line-height: 1.4;
       display: flex;
+      flex-wrap: wrap;
       align-items: center;
       .title {
+        margin-right: vmin(16);
         font-size: vmin(28);
         font-weight: 500;
         color: #333333;
@@ -118,17 +121,19 @@ $deviceWidth: 750;
         max-width: vmin(290);
       }
       .reward {
-        margin-left: vmin(16);
+        margin-top: vmin(8);
+        min-width: 100%;
         color: #ff5429;
         font-size: vmin(24);
         display: flex;
         align-items: center;
         .reward-img {
+          margin-right: vmin(8);
           width: vmin(24);
           height: vmin(24);
         }
         .reward-text {
-          margin-left: vmin(8);
+          //margin-left: vmin(8);
           word-wrap: break-word;
           word-break: break-all;
         }
@@ -137,28 +142,33 @@ $deviceWidth: 750;
 
     .time {
       margin-top: vmin(8);
-      font-size: vmin(24);
+      //font-size: vmin(24);
       color: #999999;
-      line-height: vmin(32);
+      //line-height: vmin(32);
     }
 
     .task-tip {
       margin-top: vmin(8);
-      font-size: vmin(24);
+      //font-size: vmin(24);
       color: #ff5429;
+      display: flex;
+      flex-wrap: wrap;
       font-family: 'PingFang SC';
-      line-height: vmin(32);
-      align-items: center;
+      //line-height: vmin(32);
+      //align-items: center;
       .warning-text {
+        width: 100%;
       }
       .finish-text {
         display: inline-block;
         color: #999999;
+        // margin-right: vmin(20);
+        width: 100%;
       }
       .show-answer {
         display: inline-flex;
         align-items: center;
-        margin-left: vmin(20);
+        //margin-left: vmin(20);
         font-style: normal;
         font-weight: 400;
         line-height: vmin(32);
@@ -181,18 +191,34 @@ $deviceWidth: 750;
     align-items: center;
   }
 
+  .right {
+    //padding-bottom: vmin(64);
+    &.task-desc-btn {
+      flex-shrink: 0;
+      align-self: center;
+      margin-left: vmin(8);
+      width: vmin(144);
+      height: vmin(56);
+      font-size: vmin(24);
+    }
+    &.right_reset {
+      padding-bottom: vmin(32) !important;
+    }
+  }
+
   .btn {
     // padding: 0.12rem 0.36rem;
-    width: vmin(144);
+    width: 100%;
     height: vmin(56);
     background: linear-gradient(270deg, #ff9720 0%, #ff4040 100%);
     border-radius: vmin(72);
     color: #ffffff;
     font-weight: 500;
-    font-size: vmin(24);
+    //font-size: vmin(24);
     display: flex;
     justify-content: center;
     align-items: center;
+    text-align: center;
     line-height: vmin(32);
 
     &.reward-btn {

package/miniprogram_dist/Task/TaskPopup/component/TaskItem/index.wxml

@@ -57,7 +57,7 @@
       <view class="task-desc-box">
         <view class="task-desc-content">
           <!-- 任务时间 -->
-          <view class="time" wx:if="{{listType === 'task' || listType === 'error'}}">
+          <view class="time" wx:if="{{visibleTaskTime}}">
             任务时间：{{taskItem.show_start_at}} 至 {{taskItem.show_end_at}}
           </view>
 
@@ -112,12 +112,15 @@
             进度: {{ taskItem.task_progress || 0 }} / {{ taskItem.reward_frequency }}
           </view>
         </view>
+      </view>
+    </view>
 
-        <view class="task-desc-btn">
-          <!-- 右侧按钮 -->
-          <view class="btn-wrapper {{ taskIdx === taskLength - 1 ? 'un-bottom' : ''  }}">
-            <view wx:if="{{ isShowButton }}">
-              <instant-withdraw
+    <!-- 右侧按钮 -->
+    <view class="right task-desc-btn {{ taskIdx === taskLength - 1 || !taskLength ? 'right_reset' : '' }}">
+      <!-- 右侧按钮 -->
+      <view class="btn-wrapper {{ taskIdx === taskLength - 1 ? 'un-bottom' : ''  }}">
+        <view wx:if="{{ isShowButton }}">
+          <instant-withdraw
                   customClass="have_reward"
                   buttonText="{{ButtonText}}"
                   unableBtn="{{unableBtn}}"
@@ -128,18 +131,17 @@
                   alive_room_url="{{ roomInfo.alive_room_url }}"
                   task_id="{{ taskItem.id }}"
                   bind:success="successWithDraw"
-              ></instant-withdraw>
-            </view>
-            <view
+          ></instant-withdraw>
+        </view>
+        <view
                 wx:else
                 class="btn {{listType === 'reward' && 'reward-btn'}} {{(listType==='task' && (taskItem.join_state === 2 || taskItem.join_state === 3 || taskItem.join_state === 0 || taskItem.state === 2))&&'gray-btn'}} {{getFailStatus && 'orange-btn'}}"
                 catch:tap="btnClick"
-            >
-              {{btnText}}
-            </view>
-          </view>
+        >
+          {{btnText}}
         </view>
       </view>
     </view>
+
   </view>
 </view>