Merge branch 'master' of http://192.168.31.40:10101/r/Demay_New

src/pages/discount-coupon/issue/components/template.vue

@@ -74,7 +74,7 @@
                     <div class="tips_msg_item_titles">
                       <div class="bot"></div>
                     </div>
-                    <div class="tips_msg_item_contents">需要先领取优惠券后再分享，这样其他扔领取了您分享的优惠券并消费后才会获得分润，否则无法获得分润</div>
+                    <div class="tips_msg_item_contents">需要先领取优惠券后再分享，这样其他人领取了您分享的优惠券并消费后才会获得分润，否则无法获得分润</div>
                   </div>
                 </div>
               </div>

src/pages/discount-coupon/management/index.vue

@@ -85,7 +85,7 @@
       <el-table-column show-overflow-tooltip align="center" min-width="120" prop="guaranteeMoney" label="保证金" sortable></el-table-column>
       <el-table-column show-overflow-tooltip align="center" min-width="80" prop="imageUrl" label="活动图片">
         <template #default="{row}">
-          <el-image style="width: 30px; height: 30px" :src="imgPath+row.fileLists[0].filePath+'/'+row.fileLists[0].fileName" :preview-src-list="[imgPath+row.fileLists[0].filePath+'/'+row.fileLists[0].fileName]">
+          <el-image style="width: 30px; height: 30px" :src="row.imgPath" :preview-src-list="[row.imgPath]">
           </el-image>
         </template>
       </el-table-column>
@@ -174,6 +174,13 @@ export default {
       let { code, pageInfo } = await getList(this.queryForm);
       this.listLoading = false;
       if (code == "000000") {
+        pageInfo.list.forEach(function (item) {
+          item.forEach(function (items) {
+            if (items.docType == 'platform_coupon_huizhi') {
+              item.imgPath = partten.imagePath + items.filePath + '/' + items.fileName
+            }
+          });
+        });
         this.list = Array.from(pageInfo.list);
         this.total = pageInfo.total;
         this.queryForm.pageNum = pageInfo.pageNum;