update:详细地址,部分页面优化

src/pages/Activity/releaseProduc/components/addProduc.vue

@@ -11,13 +11,14 @@
     </div>
     <!-- Tab -->
     <el-table :data="comTableData" border style="width: 100%">
-      <el-table-column label="显示顺序" align="center" width="140">
+      <el-table-column label="" align="center" width="50px">
         <template #default="scope">
           <i class="el-icon-top" @click="upMove(scope.$index, scope.row)" style="margin-right:15px;"></i>
-          <i
-            class="el-icon-bottom"
-            @click="upDown(scope.$index, scope.row)"
-          ></i>
+        </template>
+      </el-table-column>
+      <el-table-column label="" align="center" width="50px">
+        <template #default="scope">
+          <i class="el-icon-bottom" @click="upDown(scope.$index, scope.row)"></i>
         </template>
       </el-table-column>
       <el-table-column

src/pages/Activity/releaseProduc/components/spellOrderSet.vue

@@ -446,7 +446,6 @@ export default {
         if (valid) {
           await this.addPlace();
           this.$refs.ruleForm.resetFields();
-          this.$refs.multipleTable.clearSelection();
           this.dialogFormVisible = false;
         } else {
           return false;

src/pages/Activity/releaseProduc/index.vue

@@ -8,9 +8,9 @@
       space="30%"
       :align-center="true"
     >
-      <el-step title="信息编辑"></el-step>
-      <el-step title="添加商品"></el-step>
-      <el-step title="拼单设置"></el-step>
+      <el-step title="信息编辑" @click="step1"></el-step>
+      <el-step title="添加商品" @click="step2"></el-step>
+      <el-step title="拼单设置" @click="step3"></el-step>
     </el-steps>
     <div class="content">
       <infoEditing
@@ -58,13 +58,13 @@ import spellOrderSet from "./components/spellOrderSet.vue";
 import {
   addMarketing,
   marketingInfo,
-  updateMarketing
+  updateMarketing,
 } from "../../../service/Activity/index";
 export default {
   components: {
     infoEditing,
     addProduc,
-    spellOrderSet
+    spellOrderSet,
   },
   data() {
     return {
@@ -78,11 +78,40 @@ export default {
       takePlaceIDArr: [],
       startTime: "",
       endTime: "",
-      stepTwoTitle: "" // 传给addProduct的title
+      stepTwoTitle: "", // 传给addProduct的title
     };
   },
 
   methods: {
+    // 步骤条点击事件
+    step1() {
+      if (this.$route.query.marketing_id != undefined) {
+        this.active = 1;
+      }
+    },
+    step2() {
+      if (this.$route.query.marketing_id != undefined) {
+        if (this.$refs.infoEdit.infoEditForm.title == "") {
+          ElMessage.error("请填写商品标题");
+          return;
+        }
+        this.active = 2;
+      }
+    },
+    step3() {
+      if (this.$route.query.marketing_id != undefined) {
+        if (this.$refs.infoEdit.infoEditForm.title == "") {
+          ElMessage.error("请填写商品标题");
+          return;
+        }else if (this.$refs.addProduc.comTableData.length == 0) {
+          ElMessage.error("请至少选择一个商品");
+          return;
+        }else{
+           this.active = 3;
+        }
+      }
+    },
+
     // 上一步
     prev() {
       this.active--;
@@ -115,7 +144,7 @@ export default {
       }
       let params = {
         marketing_id: marketingId,
-        marketing_type: "4"
+        marketing_type: "4",
       };
       const res = await marketingInfo(params);
       this.infoEditArr = res.result.marketing_info;
@@ -138,7 +167,7 @@ export default {
         if (reg.test(path)) return unescape(RegExp.$2.replace(/\+/g, " "));
         return "";
       }
-      let list = this.$refs.infoEdit.picSubmitList.map(item => {
+      let list = this.$refs.infoEdit.picSubmitList.map((item) => {
         let rs = getUrlParms(item.url, "url");
         return rs;
       });
@@ -161,14 +190,14 @@ export default {
         end_time: dayJs(this.endDate).format("YYYY-MM-DD HH:mm:ss"),
         pindan_pic: picList,
         pindan_desc: this.$refs.infoEdit.infoEditForm.desc,
-        take_place_ids: this.takePlaceIDArr
+        take_place_ids: this.takePlaceIDArr,
       };
       if (this.$route.query.marketing_id == undefined) {
         const res = await addMarketing(params);
         if (res.code === 0) {
           ElMessage.success({
             message: "添加成功",
-            type: "success"
+            type: "success",
           });
           this.$router.push({ path: "/op/activity/manage" });
         } else {
@@ -179,7 +208,7 @@ export default {
         if (res.code === 0) {
           ElMessage.success({
             message: "修改成功",
-            type: "success"
+            type: "success",
           });
           this.$router.push({ path: "/op/activity/manage" });
         } else {
@@ -189,11 +218,11 @@ export default {
     },
     getTakeTakePlaceListFromChild(val) {
       this.takePlaceIDArr = val;
-    }
+    },
   },
   created() {
     this.marketingInfoMet();
-  }
+  },
 };
 </script>
 

src/pages/Groupmeal/newOrderManagement/index.vue

@@ -68,6 +68,7 @@
             v-model="orderQueryObj.sub_shop_id"
             placeholder="请选择"
             filterable
+            @change="subShopSel"
           >
             <el-option
               v-for="item in selLiftPoinArr"
@@ -85,10 +86,10 @@
             filterable
           >
             <el-option
-              v-for="item in selLiftPoinArr"
-              :key="item.take_place_id"
-              :label="item.take_place_name"
-              :value="item.take_place_id"
+              v-for="item in detailedAddressArr"
+              :key="item"
+              :label="item"
+              :value="item"
             ></el-option>
           </el-select>
         </el-form-item>
@@ -408,7 +409,7 @@ export default {
         cust_user: "", // 收货人
         order_id: "", // 订单编号
         sub_shop_id: "", // 自提点
-        detailed_address:"",  //详细地址
+        detailed_address: "", //详细地址
         create_time_start: "", // 开始时间
         create_time_end: "", // 结束时间
       },
@@ -455,6 +456,8 @@ export default {
       tradeNameArr: [],
       // 自提点
       selLiftPoinArr: [],
+      // 详细地址
+      detailedAddressArr: [],
 
       activeName: "all", // Tabs标签页
       goodsNum: "", // 商品总计
@@ -516,6 +519,7 @@ export default {
     async activityNameSel(val) {
       this.orderQueryObj.goods_id = "";
       this.orderQueryObj.sub_shop_id = "";
+      this.orderQueryObj.detailed_address = "";
       const params = {
         marketing_id: val,
       };
@@ -534,13 +538,32 @@ export default {
           marketing_id = params;
         }
         const res = await newGetSubShopList({ marketing_id: marketing_id });
-        this.selLiftPoinArr = res.result;
+        this.selLiftPoinArr = res.result.take_place_list;
+        this.detailedAddressArr = res.result.address_list;
       } catch (error) {
         this.$message.error("发生未知错误,请稍后再试一下吧~~~");
         console.error(error);
       }
     },
 
+    // 自提点获取详细地址
+    subShopSel(val) {
+      var addressVal,arr = [];
+      this.orderQueryObj.detailed_address = "";
+      for (var i in this.selLiftPoinArr) {
+        if (this.selLiftPoinArr[i].take_place_id == val) {
+          addressVal = this.selLiftPoinArr[i].address;
+        }
+      }
+
+      for (var n in this.detailedAddressArr) {
+        if (this.detailedAddressArr[n] == addressVal) {
+          arr.push(this.detailedAddressArr[n]);
+        }
+      }
+      this.detailedAddressArr = arr;
+    },
+
     // 获取今天日期
     today() {
       this.order_time[0] = dayJs(
@@ -549,8 +572,7 @@ export default {
       this.order_time[1] = dayJs(
         new Date(
           new Date(new Date().toLocaleDateString()).getTime() +
-            24 * 60 * 60 * 1000 -
-            1
+            24 * 60 * 60 * 1000
         )
       ).format("YYYY-MM-DD HH:mm:ss");
     },
@@ -564,7 +586,7 @@ export default {
         )
       ).format("YYYY-MM-DD HH:mm:ss");
       this.order_time[1] = dayJs(
-        new Date(new Date(new Date().toLocaleDateString()).getTime() - 1)
+        new Date(new Date(new Date().toLocaleDateString()).getTime())
       ).format("YYYY-MM-DD HH:mm:ss");
     },