update: 订单优化

src/views/order/giftExchange.vue

@@ -111,6 +111,7 @@
                     <el-dropdown-item command="orderInfo.definedCode">付款时间：{{ orderInfo.payTime ? getTimeAll(orderInfo.payTime) : '--' }}</el-dropdown-item>
                     <el-dropdown-item command="orderInfo.definedCode">发货时间：{{ orderInfo.deliveryTime ? getTimeAll(orderInfo.deliveryTime) : '--' }}</el-dropdown-item>
                     <el-dropdown-item command="orderInfo.definedCode">交易完成时间：{{ orderInfo.finishTime ? getTimeAll(orderInfo.finishTime) : '--' }}</el-dropdown-item>
+                    <el-dropdown-item command="orderInfo.definedCode">交易确认类型：{{ !orderInfo.finishType ? '--' : orderInfo.finishType == 1 ? '买家确认收货' : '系统自动确认收货' }}</el-dropdown-item>
                     <el-dropdown-item command="orderInfo.definedCode">收货信息：{{ orderInfo.definedCode }} {{ orderInfo.consignee }} {{ orderInfo.consigneePhone }} {{ orderInfo.receivingAddress }}</el-dropdown-item>
                   </el-dropdown-menu>
                 </el-dropdown>
@@ -621,6 +622,15 @@ export default {
         creatorId: this.creatorId,
         requestProject: 'integral-mall'
       };
+      if (this.searchDateType === 1) {
+        // 下单时间
+        this.params.beginTime = this.beginTime;
+        this.params.endTime = this.endTime;
+      } else {
+        // 交易完成时间
+        this.params.finishBeginTime = this.beginTime;
+        this.params.finishEndTime = this.endTime;
+      }
       this.dialogVisible = true;
       // window.location = `${exportOnlineListExcel}?orderStatus=${this.listParams.orderStatus}&changeType=${this.listParams.changeType}&searchParams=${this.listParams.searchParams}&beginTime=${this.listParams.beginTime}&endTime=${this.listParams.endTime}&requestProject=marketing`;
     },

src/views/setting/convenSet.vue

@@ -29,7 +29,16 @@
               <el-checkbox label="2">协管门店</el-checkbox>
             </el-checkbox-group>
           </el-form-item>
-          <el-form-item prop="autoConfirmReceipt" label="自动确认收货"> </el-form-item>
+          <el-form-item prop="autoConfirmReceipt" label="自动确认收货">
+            <el-switch v-model="form.autoConfirmReceipt" active-value="1" inactive-value="0"> </el-switch>
+          </el-form-item>
+          <el-form-item prop="autoConfirmReceiptDay" v-if="form.autoConfirmReceipt === '1'" :rules="[{ required: true, message: '请选择自动收货天数' }]">
+            <el-select v-model="form.autoConfirmReceiptDay" placeholder="请选择">
+              <el-option label="7天后" value="7"> </el-option>
+              <el-option label="15天后" value="15"> </el-option>
+              <el-option label="30天后" value="30"> </el-option>
+            </el-select>
+          </el-form-item>
           <el-form-item>
             <el-button type="primary" @click="handleSubmit('form')" :loading="btnLoading">确定</el-button>
           </el-form-item>
@@ -50,7 +59,9 @@ export default {
       form: {
         cardType: '',
         openAutoShelf: false,
-        showStoreType: []
+        showStoreType: [],
+        autoConfirmReceipt: '0',
+        autoConfirmReceiptDay: ''
       },
       formRules: {
         cardType: [{ required: true, message: '请选择积分消耗卡', trigger: 'change' }],
@@ -68,6 +79,8 @@ export default {
       request.get('/api-integral-mall/get-card-config').then(res => {
         if (res.data.errorCode === 0) {
           this.form.cardType = res.data.result.cardType || '';
+          this.form.autoConfirmReceipt = res.data.result.autoConfirmReceipt || '0';
+          this.form.autoConfirmReceiptDay = res.data.result.autoConfirmReceiptDay || '';
           this.form.openAutoShelf = res.data.result.openAutoShelf === 1 ? true : false;
           this.form.showStoreType = res.data.result.showStoreType ? res.data.result.showStoreType.split(',') : [];
         } else {
@@ -77,12 +90,15 @@ export default {
     },
     handleSubmit(form) {
       this.$refs[form].validate(valid => {
+        console.log(valid);
         if (valid) {
           let params = {
             // cardType: this.form.cardType,
+            autoConfirmReceipt: this.form.autoConfirmReceipt,
             openAutoShelf: this.form.openAutoShelf ? 1 : 0,
             showStoreType: this.form.showStoreType.join(',')
           };
+          if (params.autoConfirmReceipt === '1') params.autoConfirmReceiptDay = this.form.autoConfirmReceiptDay;
           this.btnLoading = true;
           request.get('/api-integral-mall/save-card-config', { params }).then(res => {
             if (res.data.errorCode === 0) {