update: update

package.json

@@ -24,6 +24,7 @@
     "vue": "^2.5.2",
     "vue-axios": "^2.1.1",
     "vue-clipboard2": "^0.2.1",
+    "vuedraggable": "^2.24.3",
     "vuex": "^3.0.1"
   },
   "devDependencies": {

src/components/store/store-group.vue

@@ -190,14 +190,8 @@ export default {
     removeSelect(item, index) {
       // item.disabled = false;
       // this.$set(this.leftList, 'item', false);
-      this.selectRightList.splice(
-        copy(this.selectRightList).findIndex(i => i.storeGroupId === item.storeGroupId),
-        1
-      );
-      this.selectLeftList.splice(
-        this.selectLeftList.findIndex(i => i.storeGroupId === item.storeGroupId),
-        1
-      );
+      this.selectRightList.splice(copy(this.selectRightList).findIndex(i => i.storeGroupId === item.storeGroupId), 1);
+      this.selectLeftList.splice(this.selectLeftList.findIndex(i => i.storeGroupId === item.storeGroupId), 1);
       this.selectIdList = [];
       for (let item of this.selectLeftList) {
         this.selectIdList.push(item.storeGroupId);

src/components/store/store-part.vue

@@ -186,10 +186,7 @@ export default {
     // 移除
     removeItem(item, index) {
       this.selectRightList.splice(index, 1);
-      this.selectLeftList.splice(
-        this.selectLeftList.findIndex(i => i.integralMallPickUpPointId === item.integralMallPickUpPointId),
-        1
-      );
+      this.selectLeftList.splice(this.selectLeftList.findIndex(i => i.integralMallPickUpPointId === item.integralMallPickUpPointId), 1);
       //取消表格选中数据
       let obj = this.tableData.find(i => {
         return i.integralMallPickUpPointId === item.integralMallPickUpPointId;

src/views/activities/flashSale/detail.vue

@@ -120,7 +120,9 @@
                     </template>
                   </el-table-column>
                   <el-table-column label="原价" v-if="!isEdit">
-                    <template slot-scope="{ row }">{{ row.integralCost }}积分+{{ row.cashCost }}元</template>
+                    <template slot-scope="{ row }"
+                      >{{ row.integralCost }}积分+{{ row.cashCost }}元</template
+                    >
                   </el-table-column>
                   <el-table-column label="当前库存" v-if="!isEdit">
                     <template slot-scope="{ row }">{{ row.virtualStock }}</template>

src/views/activities/flashSale/list.vue

@@ -45,7 +45,9 @@
               </template>
             </el-table-column>
             <el-table-column label="状态" prop="activityStatus">
-              <template slot-scope="{ row }"> <span :class="[row.activityStatus === 0 ? 'dm-status--warning' : row.activityStatus === 1 ? 'dm-status--primary--flash' : 'dm-status--info']"> </span>{{ row.activityStatus === 0 ? '未开始' : row.activityStatus === 1 ? '进行中' : '已结束' }} </template>
+              <template slot-scope="{ row }">
+                <span :class="[row.activityStatus === 0 ? 'dm-status--warning' : row.activityStatus === 1 ? 'dm-status--primary--flash' : 'dm-status--info']"> </span>{{ row.activityStatus === 0 ? '未开始' : row.activityStatus === 1 ? '进行中' : '已结束' }}
+              </template>
             </el-table-column>
             <el-table-column label="商品数量">
               <template slot-scope="{ row }">

src/views/goods/coupon/info.vue

@@ -46,7 +46,9 @@
                 </template>
               </el-table-column>
               <el-table-column label="领取限制">
-                <template slot-scope="scope"> {{ scope.row.cardLimit }}张/人 </template>
+                <template slot-scope="scope">
+                  {{ scope.row.cardLimit }}张/人
+                </template>
               </el-table-column>
               <el-table-column label="适用门店">
                 <template slot-scope="scope">
@@ -428,10 +430,7 @@ export default {
       couponRules: {
         integralCost: [{ required: true, message: '请输入积分费用', trigger: 'blur' }],
         cashCost: [{ required: true, message: '请输入现金费用', trigger: 'blur' }],
-        virtualStock: [
-          { required: true, message: '请输入库存', trigger: 'blur' },
-          { validator: stockValidator, trigger: 'blur' }
-        ],
+        virtualStock: [{ required: true, message: '请输入库存', trigger: 'blur' }, { validator: stockValidator, trigger: 'blur' }],
         gradeType: [{ required: true, message: '请选择适用会员', trigger: 'change' }],
         memberGrade: [{ required: true, message: '请选择适用会员', trigger: 'change' }],
         exchangeFixDate: [{ required: true, message: '请选择时间', trigger: 'change' }],

src/views/goods/gift/info.vue

@@ -342,7 +342,9 @@
                   </template>
                 </el-table-column>
                 <el-table-column label="领取限制">
-                  <template slot-scope="scope">{{ scope.row.cardLimit }}张/人</template>
+                  <template slot-scope="scope"
+                    >{{ scope.row.cardLimit }}张/人</template
+                  >
                 </el-table-column>
                 <el-table-column label="适用门店">
                   <template slot-scope="scope">{{ scope.row.storeMode === 0 ? '所有门店' : scope.row.storeMode === 1 ? '部分分组' : '部分门店' }}</template>

src/views/order/agreeRefund.vue

@@ -59,14 +59,8 @@ export default {
       refundPoint: '',
       refundMoney: '',
       modalRules: {
-        refundPoint: [
-          { required: true, message: '请输入积分', trigger: 'blur' },
-          { validator: refundPointValidator, trigger: 'blur' }
-        ],
-        refundMoney: [
-          { required: true, message: '请输入金额', trigger: 'blur' },
-          { validator: refundMoneyValidator, trigger: 'blur' }
-        ]
+        refundPoint: [{ required: true, message: '请输入积分', trigger: 'blur' }, { validator: refundPointValidator, trigger: 'blur' }],
+        refundMoney: [{ required: true, message: '请输入金额', trigger: 'blur' }, { validator: refundMoneyValidator, trigger: 'blur' }]
       },
       submitLoading: false //按钮禁止重复提交
     };

src/views/setting/editDeliver.vue

@@ -276,14 +276,8 @@ export default {
         timeHours: [{ validator: timeHoursValidator, trigger: 'blur' }],
         timeMinuter: [{ validator: timeMinuterValidator, trigger: 'blur' }],
         timeDay: [{ validator: timeDayValidator, trigger: 'blur' }],
-        orderTimeHours: [
-          { required: true, message: '请输入时间', trigger: 'blur' },
-          { validator: orderTimeHoursValidator, trigger: 'blur' }
-        ],
-        overTime: [
-          { required: true, message: '请输入提货有效期', trigger: 'blur' },
-          { validator: overTimeValidator, trigger: 'blur' }
-        ]
+        orderTimeHours: [{ required: true, message: '请输入时间', trigger: 'blur' }, { validator: orderTimeHoursValidator, trigger: 'blur' }],
+        overTime: [{ required: true, message: '请输入提货有效期', trigger: 'blur' }, { validator: overTimeValidator, trigger: 'blur' }]
       },
       validateTime,
       // 门店控件

src/views/setting/pickedAuto.vue

@@ -218,14 +218,8 @@ export default {
         timeHours: [{ validator: timeHoursValidator, trigger: 'blur' }],
         timeMinuter: [{ validator: timeMinuterValidator, trigger: 'blur' }],
         timeDay: [{ validator: timeDayValidator, trigger: 'blur' }],
-        orderTimeHours: [
-          { required: true, message: '请输入时间', trigger: 'blur' },
-          { validator: orderTimeHoursValidator, trigger: 'blur' }
-        ],
-        overTime: [
-          { required: true, message: '请输入提货有效期', trigger: 'blur' },
-          { validator: overTimeValidator, trigger: 'blur' }
-        ]
+        orderTimeHours: [{ required: true, message: '请输入时间', trigger: 'blur' }, { validator: orderTimeHoursValidator, trigger: 'blur' }],
+        overTime: [{ required: true, message: '请输入提货有效期', trigger: 'blur' }, { validator: overTimeValidator, trigger: 'blur' }]
       },
       submitLoading: false,
       clearableBtn: false,