Merge branch 'master' of http://101.37.21.97:3000/wash/wash_admin_ui

# Conflicts:
#	src/views/order/cloth/collectCloth.vue

src/views/order/cloth/collectCloth.vue

@@ -44,7 +44,7 @@
                                 <a style="color: #409eff;"  @click="showAdvanceOrder = true" v-if="!orderForm.orderNo">选择预约订单</a>
                                 <a style="color: #409eff; margin-left: 10px;" @click="clearAppointment" v-if="orderForm.orderNo">删除</a>
                             </el-descriptions-item>
-                        </el-descriptions>                        
+                        </el-descriptions>
                     </el-card>
                 </el-col>
                 <el-col :span="18" :xs="24">
@@ -148,7 +148,7 @@
                         <el-radio-group v-model="orderForm.isAppointment">
                             <el-radio-button v-for="dict in dict.type.sys_yes_no" :key="dict.value" :label="dict.value">{{ dict.label }}</el-radio-button>
                         </el-radio-group>
-                    </el-form-item>                  
+                    </el-form-item>
                      <el-form-item label="预约单号" prop="orderNo" v-if="orderForm.isAppointment == 'Y'">
                         <el-input v-model="orderForm.orderNo" placeholder="请输入预约单号" clearable required />
                     </el-form-item>  -->
@@ -170,11 +170,11 @@
             ></el-date-picker>
           </el-form-item> -->
 
-                    <el-form-item v-if="orderForm.isAppointment == 'Y'" label="取衣方式" prop="sendClothWay">
+                    <!-- <el-form-item v-if="orderForm.isAppointment == 'Y'" label="取衣方式" prop="sendClothWay">
                         <el-select v-model="orderForm.sendClothWay" placeholder="请选择" clearable>
                             <el-option v-for="dict in dict.type.cloth_send_type" :key="dict.value" :label="dict.label" :value="dict.value" />
                         </el-select>
-                    </el-form-item>
+                    </el-form-item> -->
 
                     <el-form-item label="备注" prop="remark">
                         <el-input v-model="orderForm.remark" placeholder="请输入订单备注" clearable />
@@ -1450,9 +1450,9 @@ export default {
 
                 return
             }
-            // if (!this.orderForm.sendClothWay) {
-            //     this.$message.error('请先选取衣方式')
-            //     return
+            // if (this.orderForm.isAppointment == 'Y' && !this.isEmpty(this.orderForm.orderNo) && !this.orderForm.sendClothWay) {
+            //   this.$message.error('请先选取衣方式')
+            //   return
             // }
 
             if (this.orderForm.isAppointment == 'Y') {

src/views/order/cloth/component/cashCloth.vue

@@ -218,9 +218,9 @@
                         <span>元</span>
                     </template>
 
-                    <template v-if="calculateTotalDiscountByActivity(activity, 'A6')">
+                    <template v-if="calculateTotalDiscountByActivity(activity)">
                         <span style="margin-left: 10px">平台折扣活动优惠</span>
-                        <span style="color: #ff4949">{{ calculateTotalDiscountByActivity(activity, 'A7') }}</span>
+                        <span style="color: #ff4949">{{ calculateTotalDiscountByActivity(activity) }}</span>
                         <span>元</span>
                     </template>
 
@@ -547,7 +547,7 @@ export default {
                 totalDiscountAmount = totalDiscountAmount + cloth.deductAmount
             })
             if (this.activity.id) {
-                totalDiscountAmount = totalDiscountAmount + this.calculateTotalDiscountByActivity(this.activity, 'A1')
+                totalDiscountAmount = totalDiscountAmount + this.calculateTotalDiscountByActivity(this.activity)
             }
             return Math.round(totalDiscountAmount * 100) / 100
         },
@@ -906,9 +906,9 @@ export default {
                     if (payTimeType == 1) {
                         params.payType = 0
                     }
-                    if (this.calculateTotalDiscountByActivity(this.activity, 'A3')) {
+                    if (this.calculateTotalDiscountByActivity(this.activity)) {
                         params.activityId = this.activity.id
-                        params.activityDiscountAmount = this.calculateTotalDiscountByActivity(this.activity, 'A4')
+                        params.activityDiscountAmount = this.calculateTotalDiscountByActivity(this.activity)
                     }
                   params.sendClothWay = this.orderForm.sendClothWay
                     console.log(params)