Merge branch 'feature/activity' of...

Merge branch 'feature/activity' of https://git.yidian-inc.com:8021/bp/op-web-service into feature/activity

src/pages/Activity/ActivityDetail/index.vue

@@ -6,6 +6,7 @@
     element-loading-spinner="el-icon-loading"
     element-loading-background="rgba(0, 0, 0, 0.8)"
   >
+    <!-- 商品详情信息 -->
     <div class="activityInfo-wrapper">
       <el-card class="activityInfo">
         <div class="infoItem">
@@ -34,8 +35,10 @@
         </div>
       </el-card>
     </div>
+    <!-- 商品详情 -->
     <div class="activityDetail">
       <section class="content">
+        <!-- 商品列表 -->
         <el-card class="activityGoods box-card">
           <div class="my-header">
             <h3>{{ marketingInfo.marketing_name }}</h3>
@@ -58,6 +61,7 @@
             </div>
           </div>
         </el-card>
+        <!-- 商品描述 -->
         <el-card class="activityIntroduce box-card">
           <p class="introduceText">
             {{ marketingInfo.pindan_desc }}
@@ -225,9 +229,6 @@ export default {
       .infoItemText {
         font-weight: bolder;
       }
-      // display: flex;
-      // align-items: center;
-      // justify-content: center;
     }
   }
   .activityDetail {

src/pages/Activity/Manage/index.vue

@@ -286,7 +286,7 @@ export default {
         marketing_id: val.activiteId,
         online_status: 2, // 1 启用 2 关闭
         end_time: dayJs().format("YYYY-MM-DD HH:mm:ss")
-      };
+       };
     },
     // 开始
     handleStart(val) {

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

@@ -43,9 +43,9 @@
 import { GOODS_URI } from "../../../../../server/config";
 export default {
   props: {
-    editInfo: {
+    infoEditArr: {
       type: Object,
-      required: () => {}
+      defult: () => {}
     }
   },
   data() {
@@ -63,6 +63,25 @@ export default {
       uploadUrl: `${GOODS_URI}/ksy/ks3apiunencrypt/ks3api_upload` // 金山云上传地址
     };
   },
+  watch: {
+    infoEditArr: {
+      // 监听props属性 展示自提点列表
+      handler: async function(newVal) {
+        if (this.$route.query.marketing_id) {
+          this.propData = newVal;
+          this.infoEditForm.title = this.propData.marketing_name;
+          this.infoEditForm.desc = this.propData.pindan_desc;
+          for (var i in this.propData.pindan_pic_url) {
+            this.infoEditForm.picUrlList.push({
+              url: this.propData.pindan_pic_url[i]
+            });
+          }
+        }
+      },
+      deep: true
+      // immediate: true
+    }
+  },
   methods: {
     // 展示商品大图
     previewImage(file) {
@@ -101,7 +120,7 @@ export default {
     }
   },
   created() {
-    this.marketingInfoMet();
+    // this.marketingInfoMet();
   }
 };
 </script>

src/pages/Activity/releaseProduc/index.vue

@@ -16,7 +16,7 @@
       <infoEditing
         ref="infoEdit"
         v-show="active === 1"
-        :editInfo="infoEditArr"
+        :infoEditArr="infoEditArr"
       />
       <addProduc
         ref="addProduc"
@@ -102,10 +102,7 @@ export default {
         }
         this.addProducArr = this.$refs.addProduc.comTableData;
         this.active = 3;
-      } else {
-        console.log();
       }
-      // this.active++;
     },
 
     // 获取营销活动详情
@@ -150,7 +147,9 @@ export default {
         op_cur_user: store.state.userInfo.email,
         start_time: this.startDate,
         end_time: this.endDate,
-        pindan_pic: this.$refs.infoEdit.infoEditForm.picUploadList.join(","),
+        pindan_pic: this.infoEditArr.pindan_pic_url
+          .concat(this.$refs.infoEdit.infoEditForm.picUploadList)
+          .join(","),
         pindan_desc: this.$refs.infoEdit.infoEditForm.desc,
         take_place_ids: this.takePlaceIDArr
       };