Merge branch 'master' into lwh/head-distribution

server/config.js

@@ -10,8 +10,8 @@ const PANDORA_URI = {
 };
 
 const API_INTERNAL_URI = {
-  development: "http://bp-dev.ini.yidian-inc.com",
-  test: "http://bp-test.ini.yidian-inc.com",
+  test: "http://bp-dev.ini.yidian-inc.com",
+  development: "http://bp-test.ini.yidian-inc.com",
   production: "http://bp.int.yidian-inc.com"
 };
 

src/pages/Activity/ActivityDetail/index.vue

@@ -50,8 +50,8 @@
             </p>
             <p class="endTime">{{ showTimer }}</p>
           </div>
-          <p class="title">拼单商品</p>
-          <div class="images-wrapper">
+          <!-- <p class="title">拼单商品</p> -->
+          <!-- <div class="images-wrapper">
             <div
               class="image-block"
               v-for="picItem in goodsList"
@@ -65,7 +65,7 @@
               ></el-image>
               <span class="goodsPrice">{{ `¥${picItem.price}` }}</span>
             </div>
-          </div>
+          </div> -->
         </el-card>
         <!-- 商品描述 -->
         <el-card class="activityIntroduce box-card">
@@ -100,8 +100,11 @@
                 <span class="originPrice">{{
                   `¥${goodsItem.original_price} `
                 }}</span>
-                <span class="sold" v-if="goodsItem.inventory_rest==0">抢光了</span>
-                <span class="sold" v-else>已售{{ goodsItem.all_have_buy_goods_count }}</span
+                <span class="sold" v-if="goodsItem.inventory_rest == 0"
+                  >抢光了</span
+                >
+                <span class="sold" v-else
+                  >已售{{ goodsItem.all_have_buy_goods_count }}</span
                 >
               </p>
             </div>
@@ -135,7 +138,7 @@ export default {
       marketingInfo: {},
       endTime: "",
       showTimer: "",
-      detailInfo: {},
+      detailInfo: {}
     };
   },
   watch: {},
@@ -147,11 +150,11 @@ export default {
         let dataArr = await Promise.all([
           ActivityService.checkActivityDetail({
             marketing_id: this.$route.query.marketing_id,
-            marketing_type: this.$route.query.marketing_type,
+            marketing_type: this.$route.query.marketing_type
           }),
           ActivityService.checkActivityDetailInfo({
-            marketing_id: this.$route.query.marketing_id,
-          }),
+            marketing_id: this.$route.query.marketing_id
+          })
         ]);
         this.pageLoading = false;
         this.goodsList = dataArr[0].result.goods_list;
@@ -203,7 +206,7 @@ export default {
 
     closePage() {
       this.$router.go(-1);
-    },
+    }
   },
   async created() {
     await this.checkActivityDetail();
@@ -211,7 +214,7 @@ export default {
   },
   beforeUnmount() {
     clearInterval(this.timer);
-  },
+  }
 };
 </script>
 <style lang="less" scoped>
@@ -306,9 +309,9 @@ export default {
             }
           }
           .sold {
-            position:absolute;
-            right: 20px;;
-            color:#d44549;
+            position: absolute;
+            right: 20px;
+            color: #d44549;
             font-weight: 500;
           }
         }

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

@@ -2,7 +2,7 @@
   <div id="map" class="mapContainer">
     <div class="mapWrapper">
       <div class="search">
-        <el-form ref="form" label-width="80px" @submit.prevent>
+        <el-form ref="form" @submit.prevent>
           <el-form-item label-position="left">
             <el-button @click="handleSearch">搜索</el-button>
             <el-input
@@ -28,6 +28,7 @@
     </div>
 
     <div class="mapInfo">
+      <div class="infoAll">
         <h3 class="title">拖拽选址</h3>
         <ul class="info">
           <li><span>经度：</span>{{ dragData.lng }}</li>
@@ -36,9 +37,16 @@
         </ul>
       </div>
       <div class="confirmButton">
+        <el-button class="button_pre" @click="cancel">取 消</el-button>
+        <el-button class="button_next" type="primary" @click="confirm"
+          >确 定</el-button
+        >
+      </div>
+    </div>
+    <!-- <div class="confirmButton">
       <el-button @click="cancel">取 消</el-button>
       <el-button type="primary" @click="confirm">确 定</el-button>
-    </div>
+    </div> -->
   </div>
 </template>
 
@@ -193,15 +201,6 @@ export default {
 </script>
 
 <style lang="less" scoped>
-// .mapDialog {
-//   margin-top: 11vh !important;
-//   display: flex !important;
-//   flex-direction: column !important;
-//   background: red !important;
-//   /deep/ .el-dialog__body {
-//     height: 90%;
-//   }
-// }
 .mapContainer {
   height: 100%;
   width: 100%;
@@ -229,6 +228,10 @@ export default {
     width: 20%;
     padding-left: 20px;
     display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    align-items: flex-start;
+    .infoAll {
       flex-direction: column;
       justify-content: start;
       align-items: flex-start;
@@ -237,9 +240,15 @@ export default {
       }
     }
     .confirmButton {
-    position: absolute;
-    bottom: 100px;
-    right: 100px;
+      display: flex;
+      flex-wrap: wrap;
+      .button_pre {
+        margin-right: 15px;
+      }
+      .button_next {
+        margin-left: 0;
+      }
+    }
   }
 }
 .m-map .search {

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

@@ -627,15 +627,16 @@ export default {
   justify-content: center;
   align-items: center;
 }
-.mapDialog {
-  height: 80%;
-  margin-top: 10vh !important;
-
-  .my-map {
-    height: 100%;
-  }
-}
 /deep/ .el-dialog__body {
   height: 85% !important;
 }
+/deep/ .mapDialog {
+  margin-top: 10vh !important;
+  height: 80%;
+  display: flex !important;
+  flex-direction: column !important;
+  /deep/ .el-dialog__body {
+    height: 90%;
+  }
+}
 </style>

src/pages/Groupmeal/newOrderManagement/index.vue

@@ -41,12 +41,13 @@
             v-model="orderQueryObj.goods_id"
             placeholder="请选择"
             filterable
+            @change="changeGoodsName"
           >
             <el-option
               v-for="item in tradeNameArr"
-              :key="item.goods_id"
+              :key="item.goods_sku_id"
               :label="item.goods_name"
-              :value="item.goods_id"
+              :value="item.goods_sku_id"
             ></el-option>
           </el-select>
         </el-form-item>
@@ -390,7 +391,7 @@ import {
   newOrderItemList,
   newOrderRefundReject,
   newRefundOrder,
-  newGetOrderExportURL,
+  newGetOrderExportURL
 } from "@/service/Groupmeal/groupmeal";
 import page from "../components/Pagination/index.vue";
 import dayJs from "dayjs";
@@ -398,7 +399,7 @@ export default {
   name: "orderManagement",
   components: {
     Layout,
-    page,
+    page
   },
   data() {
     return {
@@ -406,7 +407,7 @@ export default {
       orderQueryObj: {
         page: 1,
         page_size: 10,
-        marketing_id: "0", // 活动名称
+        marketing_id: "", // 活动名称
         order_status: "0", // 订单状态
         goods_id: "", // 商品名称
         cust_user: "", // 收货人
@@ -414,7 +415,7 @@ export default {
         sub_shop_id: "", // 自提点
         take_place_address: "", //详细地址
         create_time_start: "", // 开始时间
-        create_time_end: "", // 结束时间
+        create_time_end: "" // 结束时间
       },
       order_time: [], // 下单时间
       // 下拉框数据
@@ -424,36 +425,36 @@ export default {
       orderStatusArr: [
         {
           value: "0",
-          label: "全部",
+          label: "全部"
         },
         {
           value: "1",
-          label: "未支付",
+          label: "未支付"
         },
         {
           value: "2",
-          label: "已支付",
+          label: "已支付"
         },
         {
           value: "3",
-          label: "待退款",
+          label: "待退款"
         },
         {
           value: "4",
-          label: "已退款",
+          label: "已退款"
         },
         {
           value: "5",
-          label: "退款中",
+          label: "退款中"
         },
         {
           value: "6",
-          label: "已拒绝",
+          label: "已拒绝"
         },
         {
           value: "7",
-          label: "售后",
-        },
+          label: "售后"
+        }
       ],
       // 商品名称
       tradeNameArr: [],
@@ -482,10 +483,11 @@ export default {
           refundedGoodsSel: false,
           payment: "",
           // restoreInventory: false,
-          goods_name: "",
-        },
+          goods_name: ""
+        }
       ],
-      flag: []
+      flag: [],
+      currentTakePlaceAddressList: {} // 存储接口每次返回的自提点和详细地址
     };
   },
 
@@ -498,7 +500,7 @@ export default {
     },
     exportURL3() {
       return newGetOrderExportURL(this.orderQueryObj.marketing_id, "3");
-    },
+    }
   },
 
   methods: {
@@ -510,7 +512,7 @@ export default {
     async getMarketingListMet() {
       try {
         const res = await newGetMarketingList();
-        let allArr = [{ marketing_id: "0", marketing_name: "全部活动" }];
+        let allArr = [{ marketing_id: "", marketing_name: "全部活动" }];
         let arr = allArr.concat(res.result);
         this.activityNameArr = arr;
       } catch (error) {
@@ -525,72 +527,97 @@ export default {
       this.orderQueryObj.sub_shop_id = "";
       this.orderQueryObj.take_place_address = "";
       const params = {
-        marketing_id: val,
+        marketing_id: val
       };
       const res = await newGetGoodsList(params); // 商品名称
-      this.getSubShopListMet(val); //自提点
-      // const res = await getSubShopList(params);
-      this.tradeNameArr = res.result;
-      //  this.selLiftPoinArr = res.result;
+      await this.getSubShopListMet(val); //自提点
+      let allallTemplateArr = [{ goods_sku_id: "", goods_name: "全部" }];
+      this.tradeNameArr = allallTemplateArr.concat(res.result); // 商品名称选项列表
+    },
+
+    // 改变商品名称
+    changeGoodsName() {
+      this.getSubShopListMet();
     },
 
     // 获取自提点
-    async getSubShopListMet(params) {
+    async getSubShopListMet() {
       try {
-        let marketing_id = "";
-        if (params) {
-          marketing_id = params;
-        }
-        const res = await newGetSubShopList({ marketing_id: marketing_id });
-        this.selLiftPoinArr = res.result.take_place_list;
+        // 获取自提点和详细地址类标
+        const res = await newGetSubShopList({
+          marketing_id: this.orderQueryObj.marketing_id,
+          goods_id: this.orderQueryObj.goods_id
+        });
+        let firstTakePlaceSelectOption = [
+          { take_place_id: "", take_place_name: "全部" }
+        ];
+        // 自提点
+        this.selLiftPoinArr = firstTakePlaceSelectOption.concat(
+          res.result.take_place_list
+        );
+        // 分界线
         this.flag = res.result.take_place_list;
-        this.detailedAddressArr = res.result.address_list;
-
+        let firstAddressDetailSelectOption = ["全部"];
+        // 详细地址
+        this.detailedAddressArr = firstAddressDetailSelectOption.concat(
+          res.result.address_list
+        );
+        // 暂存
+        this.currentTakePlaceAddressList = res.result;
       } catch (error) {
         this.$message.error("发生未知错误,请稍后再试一下吧~~~");
         console.error(error);
       }
     },
 
-    // 自提点获取详细地址
-    subShopSel(val) {
-      let addressVal,
-        arr = [];
-      this.orderQueryObj.take_place_address = "";
-      this.orderQueryObj.sub_shop_list = "";
-      for (var i in this.selLiftPoinArr) {
-        if (this.selLiftPoinArr[i].take_place_id == val) {
-          addressVal = this.selLiftPoinArr[i].address;
+    // 自提点 详细地址 互选操作 数据转换
+    formatTakePlaceAddress(type) {
+      if (type === 1) {
+        // 自提点改变
+        // 获取自提点名称
+        if (this.orderQueryObj.sub_shop_id === "") {
+          this.detailedAddressArr = ["全部"].concat(
+            this.currentTakePlaceAddressList.address_list
+          );
+        } else {
+          let takePlaceNameList = this.selLiftPoinArr.filter(item => {
+            return item.take_place_id === this.orderQueryObj.sub_shop_id;
+          });
+          let takePlaceName = takePlaceNameList[0].address; // 详细地址
+          let filterDataList = this.currentTakePlaceAddressList.address_list.filter(
+            item => {
+              return item === takePlaceName;
             }
+          );
+          this.detailedAddressArr = ["全部"].concat(filterDataList);
         }
-
-      for (var n in this.detailedAddressArr) {
-        if (this.detailedAddressArr[n] == addressVal) {
-          arr.push(this.detailedAddressArr[n]);
+      } else {
+        // 详细地址改变
+        if (this.orderQueryObj.take_place_address === "全部") {
+          this.selLiftPoinArr = [
+            { take_place_id: "", take_place_name: "全部" }
+          ].concat(this.currentTakePlaceAddressList.take_place_list);
+        } else {
+          let takePlaceNameList = this.currentTakePlaceAddressList.take_place_list.filter(
+            item => {
+              return item.address === this.orderQueryObj.take_place_address;
+            }
+          );
+          this.selLiftPoinArr = [
+            { take_place_id: "", take_place_name: "全部" }
+          ].concat(takePlaceNameList);
         }
       }
-      this.orderQueryObj.take_place_address = arr[0];
-      this.detailedAddressArr = arr;
     },
 
-    // 详细地址获取自提点
-    takePlaceAddressSel(val) {
-      let arr = [],
-        arrID = [];
-      this.orderQueryObj.sub_shop_id = "";
-      this.orderQueryObj.sub_shop_list = "";
-      this.selLiftPoinArr = this.flag;
-      for (var i in this.selLiftPoinArr) {
-        if (val == this.selLiftPoinArr[i].address) {
-          arr.push(this.selLiftPoinArr[i]);
-          arrID.push(this.selLiftPoinArr[i].take_place_id);
-        }
-      }
+    // 改变自提点--获取详细地址
+    subShopSel() {
+      this.formatTakePlaceAddress(1);
+    },
 
-      this.selLiftPoinArr = arr;
-      if (this.orderQueryObj.sub_shop_id == "") {
-        this.orderQueryObj.sub_shop_list = arrID.join(",");
-      }
+    // 详细地址获取自提点
+    takePlaceAddressSel() {
+      this.formatTakePlaceAddress(2);
     },
 
     // 获取今天日期
@@ -625,7 +652,7 @@ export default {
     resetOrder(formName) {
       if (this.$route.query.marketing_type == "4") {
         this.$router.push({
-          path: "/op/groupmeal/newOrderManagement",
+          path: "/op/groupmeal/newOrderManagement"
         });
         this.$route.query.marketing_type = "";
       }
@@ -645,23 +672,24 @@ export default {
     searchOrder() {
       if (this.$route.query.marketing_type == "4") {
         this.$router.push({
-          path: "/op/groupmeal/newOrderManagement",
+          path: "/op/groupmeal/newOrderManagement"
         });
         this.$route.query.marketing_type = "";
       }
       this.orderQueryObj.page = 1;
       this.orderQueryObj.page_size = 10;
+      if (Array.isArray(this.order_time)) {
         this.orderQueryObj.create_time_start = this.order_time[0];
         this.orderQueryObj.create_time_end = this.order_time[1];
+      } else {
+        this.orderQueryObj.create_time_start = "";
+        this.orderQueryObj.create_time_end = "";
+      }
       if (this.orderQueryObj.order_status === "0") {
         this.activeName = "all";
         this.orderStatusArr[1].disabled = false;
         this.orderStatusArr[2].disabled = false;
       }
-
-      // this.orderQueryObj.order_status = "0";
-      // this.orderStatusArr[1].disabled = false;
-      // this.orderStatusArr[2].disabled = false;
       this.getOrderListMet(this.orderQueryObj);
     },
 
@@ -695,7 +723,7 @@ export default {
     async printOrderMet(forcePrint) {
       const params = {
         marketing_id: this.orderQueryObj.marketing_id,
-        force_print: forcePrint ? "1" : "",
+        force_print: forcePrint ? "1" : ""
       };
       const res = await newOrderPrint(params);
       return res;
@@ -715,7 +743,7 @@ export default {
       if (res.code === 0) {
         this.$message({
           type: "success",
-          message: "打印成功",
+          message: "打印成功"
         });
         return;
       }
@@ -733,7 +761,7 @@ export default {
         try {
           await this.$confirm(res.reason, "打印", {
             cancelButtonText: "取消",
-            confirmButtonText: "确定",
+            confirmButtonText: "确定"
           });
         } catch (e) {
           // 取消
@@ -759,10 +787,37 @@ export default {
             goods_id: "",
             cust_user: "",
             order_id: "",
-            sub_shop_id: "",
+            sub_shop_id: ""
+          });
+        } else {
+          // 详细地址进行了选择 一个详细地址对应多个自提点
+          let params = {};
+          let takePlaceListParams = "";
+          if (
+            this.orderQueryObj.take_place_address !== "全部" &&
+            this.orderQueryObj.take_place_address !== "" &&
+            (this.orderQueryObj.sub_shop_id === "" ||
+              this.orderQueryObj.sub_shop_id === "全部")
+          ) {
+            // 自提点传列表字符串
+            let takePlaceNameList = this.currentTakePlaceAddressList.take_place_list.filter(
+              item => {
+                return item.address === this.orderQueryObj.take_place_address;
+              }
+            );
+            takePlaceListParams = takePlaceNameList
+              .map(item => {
+                return item.take_place_id;
+              })
+              .join(",");
+            let currentParams = JSON.parse(JSON.stringify(this.orderQueryObj));
+            params = Object.assign(currentParams, {
+              sub_shop_id: takePlaceListParams
             });
           } else {
-          res = await newGetOrderList(this.orderQueryObj);
+            params = this.orderQueryObj;
+          }
+          res = await newGetOrderList(params);
         }
         this.goodsNum = res.goods_num; // 商品共计
         this.totalNum = res.count; // 商品总数
@@ -784,21 +839,21 @@ export default {
       try {
         await this.$confirm("确定要拒绝退款么?", "拒绝", {
           cancelButtonText: "取消",
-          confirmButtonText: "确定",
+          confirmButtonText: "确定"
         });
       } catch (e) {
         // 取消
         return;
       }
       const params = {
-        order_id: val.order_id,
+        order_id: val.order_id
       };
       const res = await newOrderRefundReject(params);
 
       if (res.code === 0) {
         this.$message({
           type: "success",
-          message: "订单已驳回",
+          message: "订单已驳回"
         });
       } else {
         this.$message.error(res.reason);
@@ -824,7 +879,7 @@ export default {
       this.checkAll = false;
       this.refundGoods = [];
       const params = {
-        order_id: val.order_id,
+        order_id: val.order_id
       };
       const res = await newOrderItemList(params);
       this.refundGoods = res.result;
@@ -853,15 +908,15 @@ export default {
       //   }
       // }
 
-      const convertToNumber = (str) => {
+      const convertToNumber = str => {
         return !Number.isNaN(parseFloat(str)) ? parseFloat(str) : 0;
       };
 
-      const processRefundItem = (item) => {
+      const processRefundItem = item => {
         return {
           order_item_id: item.order_item_id,
           refund_num: item.refundableQuantity || 0,
-          refund_amount: convertToNumber(item.amountToRefund),
+          refund_amount: convertToNumber(item.amountToRefund)
           // refund_type: item.refund_type
         };
       };
@@ -884,13 +939,13 @@ export default {
         return;
       }
       this.$message.error(res.reason);
-    },
+    }
   },
   created() {
     this.getMarketingListMet(); // 活动名称
     this.getSubShopListMet(); // 自提点
     this.getOrderListMet(); // table列表
-  },
+  }
 };
 </script>