更新Note

1. 修复购物车,订单和退单后后置任务正确执行
	2. 修复佣金记录金额和详情
	3. 修复管理端 移动应用界面下订单管理数据统计不准确的问题
	4. 修复短信API升级-后台使用一号通
	5. 修复用户管理相关问题
	6. 修复核销点核销后核销地址不准确
	7. 修复资源同步云服务的问题
新增功能
	1. 秒杀
		a. 秒杀时段配置
		b. 秒杀商品维护
	2. 财务管理
		a. 申请提现
		b. 财务记录
			i. 充值记录
			ii. 资金监控
		c. 佣金记录
	3. 普通商品显示该商品正在参加的活动信息[秒杀]

admin/src/views/store/creatStore/index.vue

@@ -117,7 +117,7 @@
           <el-col :span="24">
             <el-col v-bind="grid">
               <el-form-item label="排序：">
-                <el-input-number v-model="formValidate.sort" placeholder="请输入排序" />
+                <el-input-number v-model="formValidate.sort" :max="9999" placeholder="请输入排序" />
               </el-form-item>
             </el-col>
             <el-col v-bind="grid">
@@ -138,6 +138,23 @@
               </el-checkbox-group>
             </el-form-item>
           </el-col>
+          <el-col :span="24">
+            <el-form-item label="活动优先级：">
+              <div class="color-list acea-row row-middle">
+                <div
+                  class="color-item" :class="activity[item]"
+                  v-for="item in formValidate.activity"
+                  :key="item"
+                  draggable="true"
+                  @dragstart="handleDragStart($event, item)"
+                  @dragover.prevent="handleDragOver($event, item)"
+                  @dragenter="handleDragEnterFont($event, item)"
+                  @dragend="handleDragEnd($event, item)"
+                >{{item}}</div>
+                <div class="tip">可拖动按钮调整活动的优先展示顺序</div>
+              </div>
+            </el-form-item>
+          </el-col>
         </el-row>
         <el-row v-show="currentTab === 3">
           <el-col :span="24">
@@ -386,7 +403,8 @@
     specType: false,
     id: 0,
     couponIds: [],
-    coupons: []
+    coupons: [],
+    activity: ['默认','秒杀','砍价','拼团']
   }
   const objTitle = {
     price: {
@@ -417,6 +435,7 @@
     components: { CreatTemplates },
     data() {
       return {
+        activity: { '默认': 'red', '秒杀': 'blue', '砍价': 'green', '拼团': 'yellow' },
         props2: {
           children: 'child',
           label: 'name',
@@ -867,7 +886,8 @@
             id: info.id,
             giveIntegral: info.giveIntegral,
             ficti: info.ficti,
-            coupons: info.coupons
+            coupons: info.coupons,
+            activity: info.activityStr ? info.activityStr.split(',') : ['默认','秒杀','砍价','拼团']
           }
           if(info.isHot) this.checkboxGroup.push('isHot')
           if(info.isGood) this.checkboxGroup.push('isGood')
@@ -1012,11 +1032,41 @@
         const dst = newItems.indexOf(item)
         newItems.splice(dst, 0, ...newItems.splice(src, 1))
         this.formValidate.sliderImages = newItems;
+      },
+      handleDragEnterFont(e, item) {
+        e.dataTransfer.effectAllowed = 'move'
+        if (item === this.dragging) {
+          return
+        }
+        const newItems = [...this.formValidate.activity]
+        const src = newItems.indexOf(this.dragging)
+        const dst = newItems.indexOf(item)
+        newItems.splice(dst, 0, ...newItems.splice(src, 1))
+        this.formValidate.activity = newItems;
       }
     }
   }
 </script>
 <style scoped lang="scss">
+  .color-item{
+    height: 30px;
+    line-height: 30px;
+    padding: 0 10px;
+    color:#fff;
+    margin-right :10px;
+  }
+  .color-list .color-item.blue{
+    background-color: #1E9FFF;
+  }
+  .color-list .color-item.yellow{
+    background-color: rgb(254, 185, 0);
+  }
+  .color-list .color-item.green{
+    background-color: #009688;
+  }
+  .color-list .color-item.red{
+    background-color: #ed4014;
+  }
   .proCoupon{
     /deep/.el-form-item__content{
       margin-top: 5px;