update: 替换

index.html

@@ -26,7 +26,7 @@
   <script src="//web-1251519181.file.myqcloud.com/lib/vuex/3.1.0/vuex.min.js"></script>
   <script src="//web-1251519181.file.myqcloud.com/lib/elementUI/index.2.5.4.js"></script>
   <!-- 组件引用cdn -->
-  <script src="//web-1251519181.file.myqcloud.com/components/header.2.0.57.js"></script>
+  <script src="//web-1251519181.file.myqcloud.com/components/header.2.0.58.js"></script>
   <script src="//web-1251519181.file.myqcloud.com/components/aside-menu.2.0.15.js"></script>
   <script src="//web-1251519181.file.myqcloud.com/components/footer.2.0.04.js"></script>
   <script src='//web-1251519181.file.myqcloud.com/components/store-linkage.2.0.41.js'></script>

src/components/store/store-group.vue

@@ -190,8 +190,14 @@ 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,7 +186,10 @@ 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,9 +120,7 @@
                     </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,9 +45,7 @@
               </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,9 +46,7 @@
                 </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">
@@ -430,7 +428,10 @@ 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

@@ -337,9 +337,7 @@
                   </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,8 +59,14 @@ 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

@@ -277,8 +277,14 @@ 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,
       // 门店控件
@@ -635,6 +641,11 @@ export default {
       request.post(url, params).then(res => {
         if (res.data.errorCode === 0) {
           this.submitLoading = false;
+          if (this.integralMallPickUpPointId === '-1') {
+            this.$message.success(res.data.result);
+          } else {
+            this.$message.success('保存成功');
+          }
           this.$router.push({
             name: 'deliverSet'
           });

src/views/setting/pickedAuto.vue

@@ -218,8 +218,14 @@ 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,