修改

src/views/manage/sendSetting.vue

@@ -62,42 +62,42 @@
             ></el-input-number>
             元
           </el-form-item>
-          <!-- <el-form-item label="配送费：">
+          <el-form-item label="配送费：">
             <span style="color: orange; font-size: 12px"
               >*平台3公里内配送费收取4元,每增加一公里，增加配送费2元</span
             >
             <br />
             3公里内
-            <el-input type="text" style="width: 70px" v-model="form.desc"></el-input>
+            <el-input type="text" style="width: 70px" v-model="shopInfo.thirdDeliveryFee"></el-input>
             ，每增加1公里，增加配送费<el-input
               type="text"
               style="width: 70px"
-              v-model="form.desc"
+              v-model="shopInfo.oneDeliveryFee"
             ></el-input
             >元 <br /><br />
             免配送费，需下单满
-            <el-input type="text" style="width: 70px" v-model="form.desc"></el-input>元
+            <el-input type="text" style="width: 70px" v-model="shopInfo.freeDeliveryAmount"></el-input>元
           </el-form-item>
           <el-form-item label="商品打包费：">
             打包费收取方式:
-            <el-select v-model="value" placeholder="请选择" style="width: 120px">
-              <el-option label="商品数量" value="0" />
-              <el-option label="整笔订单" value="1" />
+            <el-select v-model="shopInfo.packingMethod" placeholder="请选择" style="width: 120px">
+              <el-option label="商品数量" :value="0" />
+              <el-option label="整笔订单" :value="1" />
             </el-select>
             <br />
             <br />
             每件商品收取打包费：<el-input
               type="text"
               style="width: 70px"
-              v-model="form.desc"
+              v-model="shopInfo.goodsPackingFee"
             ></el-input
             >元
-          </el-form-item> -->
+          </el-form-item>
         </el-col>
         <el-col :span="24" style="margin-top: 30px">
           <el-form-item>
             <el-button type="primary" @click="submitForm">保存</el-button>
-            <el-button>取消</el-button>
+            <!-- <el-button>取消</el-button> -->
           </el-form-item>
         </el-col>
       </el-row>

src/views/order/components/instantDelivery.vue

@@ -542,7 +542,7 @@ export default {
     resetQuery() {
       this.createTime = [];
       this.queryParams.createStartTime = "";
-      this.queryParams.createEndTime = "val[1]";
+      this.queryParams.createEndTime = "";
       this.resetForm("queryForm");
       this.queryParams.pageNo = 1;
       this.getList();

src/views/order/detail/transmission.vue

@@ -299,14 +299,14 @@ export default {
       } else {
         clearInterval(this.timer);
         this.countdown = "00:00";
-        this.isCountingDown = false;
+        //取消订单接口
+
       }
     },
     getSecondOrderInfo() {
       sendSecondOrderInfo(this.$route.query.carPayNo).then((res) => {
         if (res.code == 200) {
           this.spuList = res.data;
-
           if (this.spuList.length > 0) {
             this.spuList.forEach((e) => {
               if (e.goodsInfo) {