update:活动详情增加参与查看人，新订单详细地址修改

src/pages/Activity/ActivityDetail/index.vue

@@ -42,6 +42,8 @@
         <el-card class="activityGoods box-card">
           <div class="my-header">
             <h3>{{ marketingInfo.marketing_name }}</h3>
+             <!-- 查看参与字段待确认 -->
+            <p><span>{{detailInfo.lookUserCount}}人查看</span>｜<span>{{detailInfo.haveBuyGoodsUserCount}}人参与</span></p>
             <p class="endTime">{{ showTimer }}</p>
           </div>
           <p class="title">拼单商品</p>
@@ -144,7 +146,6 @@ export default {
             marketing_id: this.$route.query.marketing_id
           })
         ]);
-
         this.pageLoading = false;
         this.goodsList = dataArr[0].result.goods_list;
         this.marketingInfo = dataArr[0].result.marketing_info;

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

@@ -10,7 +10,8 @@
       >
     </div>
     <!-- Tab -->
-    <el-table :data="comTableData" border style="width: 100%">
+    <el-table :data="comTableData" border style="width: 100%" :header-cell-style="cellClass">
+      <el-table-column label="显示顺序" align="center" width="50px">
       <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>
@@ -21,6 +22,7 @@
           <i class="el-icon-bottom" @click="upDown(scope.$index, scope.row)"></i>
         </template>
       </el-table-column>
+      </el-table-column>
       <el-table-column
         prop="goods_sku_id"
         label="商品ID"
@@ -361,6 +363,12 @@ var addProduct = {
     };
   },
   methods: {
+    cellClass({row,column,rowIndex,columnIndex}){
+        if(rowIndex === 1){
+           return {display:'none'}
+        }
+    },
+
     // 上移
     upMove(index) {
       if (index <= 0) {

src/pages/Groupmeal/newOrderManagement/index.vue

@@ -79,11 +79,12 @@
           </el-select>
         </el-form-item>
 
-        <el-form-item label="详细地址：" prop="detailed_address">
+        <el-form-item label="详细地址：" prop="take_place_address">
           <el-select
-            v-model="orderQueryObj.detailed_address"
+            v-model="orderQueryObj.take_place_address"
             placeholder="请选择"
             filterable
+            @change="takePlaceAddressSel"
           >
             <el-option
               v-for="item in detailedAddressArr"
@@ -409,7 +410,7 @@ export default {
         cust_user: "", // 收货人
         order_id: "", // 订单编号
         sub_shop_id: "", // 自提点
-        detailed_address: "", //详细地址
+        take_place_address: "", //详细地址
         create_time_start: "", // 开始时间
         create_time_end: "", // 结束时间
       },
@@ -519,7 +520,7 @@ export default {
     async activityNameSel(val) {
       this.orderQueryObj.goods_id = "";
       this.orderQueryObj.sub_shop_id = "";
-      this.orderQueryObj.detailed_address = "";
+      this.orderQueryObj.take_place_address = "";
       const params = {
         marketing_id: val,
       };
@@ -548,8 +549,10 @@ export default {
 
     // 自提点获取详细地址
     subShopSel(val) {
-      var addressVal,arr = [];
-      this.orderQueryObj.detailed_address = "";
+      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;
@@ -561,9 +564,28 @@ export default {
           arr.push(this.detailedAddressArr[n]);
         }
       }
+      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 = "";
+      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);
+        }
+      }
+      this.selLiftPoinArr = arr;
+      if (this.orderQueryObj.sub_shop_id == "") {
+        this.orderQueryObj.sub_shop_list = arrID.join(",");
+      }
+    },
+
     // 获取今天日期
     today() {
       this.order_time[0] = dayJs(
@@ -601,6 +623,7 @@ export default {
       this.order_time = [];
       this.orderQueryObj.create_time_start = "";
       this.orderQueryObj.create_time_end = "";
+      this.orderQueryObj.sub_shop_list = "";
       this.orderQueryObj.page = 1;
       this.orderQueryObj.page_size = 10;
       this.$refs[formName].resetFields();