From f6c3cf7af9643bedace4b141fd04d89bf85e893a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E7=BF=94=E5=AE=87-=E6=97=85=E7=AE=A1=E5=AE=B6?=
 <153298343@qq.com>
Date: Fri, 18 Nov 2022 09:21:21 +0800
Subject: [PATCH] up

---
 .env.development                              |  4 +--
 src/views/productService/clubProduct.vue      |  2 +-
 .../common/addCommonServiceProduct.vue        | 25 +++++++++++--------
 .../components/confinement/addClubPic.vue     | 14 +++++------
 .../components/confinement/addClubProduct.vue |  2 +-
 .../confinement/addConfinementClub.vue        |  2 +-
 .../components/confinement/addProductPic.vue  | 10 ++++----
 src/views/productService/confinementClub.vue  |  3 ++-
 8 files changed, 33 insertions(+), 29 deletions(-)

diff --git a/.env.development b/.env.development
index 0df4943..31fed3c 100644
--- a/.env.development
+++ b/.env.development
@@ -2,5 +2,5 @@
 ENV = 'development'
 
 # base api
-#VUE_APP_BASE_API = http://yybtest.ali251.langye.net/
-VUE_APP_BASE_API = https://yunyubang.ali251.langye.net/
+VUE_APP_BASE_API = http://yybtest.ali251.langye.net/
+#VUE_APP_BASE_API = https://yunyubang.ali251.langye.net/
diff --git a/src/views/productService/clubProduct.vue b/src/views/productService/clubProduct.vue
index 902807f..62e1ff2 100644
--- a/src/views/productService/clubProduct.vue
+++ b/src/views/productService/clubProduct.vue
@@ -73,7 +73,7 @@
               <div slot="content" style="display:flex;flex-direction: column">
                 <Button size="small" type="primary" @click="editorClick(scope.row)" style="margin: 0 6px 4px 0">产品编辑</Button>
                 <Button size="small" type="primary"  style="margin: 0 6px 4px 0" @click="comboClick(scope.row)">产品套餐</Button>
-                <Button size="small" type="primary"  style="margin: 0 6px 4px 0" @click="picClick(scope.row)">产品图片</Button>
+                <Button size="small" type="primary"  style="margin: 0 6px 4px 0" @click="picClick(scope.row)">产品文件</Button>
               </div>
             </Poptip>
 
diff --git a/src/views/productService/components/common/addCommonServiceProduct.vue b/src/views/productService/components/common/addCommonServiceProduct.vue
index 5a56e4e..c03edaa 100644
--- a/src/views/productService/components/common/addCommonServiceProduct.vue
+++ b/src/views/productService/components/common/addCommonServiceProduct.vue
@@ -347,15 +347,14 @@
       },
       pichandleRemove(file, fileList) {
         //console.log(file, fileList);
+        this.picfileList = fileList;
       },
+      pichandleBeforeRemove(file, fileList) {},
       pichandlePreview(file) {
         console.log(file);
       },
       pichandleSuccess(response, file, fileList) {
-        this.picfileList.push(response.url)
-      },
-      pichandleBeforeRemove(file) {
-        this.picfileList.splice(this.picfileList.indexOf(file.response.id), 1)
+        this.picfileList = fileList;
       },
 
       addListCombo() {
@@ -464,11 +463,13 @@
           coverPicture: res?.cover_picture,
           timeLimit: res?.time_limit?.split(','),
           content: res?.content,
-          video: res?.video,
-          set_list: [],
-          picture_list:  []
+          video: res?.video,
+          set_list: [],
+          picture_list: []
         }
-        this.$refs['tinymce'].setContent(this.form.content)
+        this.$refs['tinymce'].setContent(this.form.content);
+        this.picfileList = this.getPic();
+        this.set_list = this.getCombo();
       },
 
       loadMoreClub() {
@@ -506,7 +507,11 @@
 
         let list = [];
 
-
+        this.picfileList.map(item => {
+          list.push({
+            picture: item.response.url,type:0
+          });
+        })
 
         let _form = {
           name: this.form.name,
@@ -556,8 +561,6 @@
       isShow(newVal) {
         if (newVal) {
           this.getClubs()
-          this.getEquips()
-          this.getRoomTypes()
 
           if (this.type === 'editor') {
             this.getDetail()
diff --git a/src/views/productService/components/confinement/addClubPic.vue b/src/views/productService/components/confinement/addClubPic.vue
index 2a3b2e9..e263b6b 100644
--- a/src/views/productService/components/confinement/addClubPic.vue
+++ b/src/views/productService/components/confinement/addClubPic.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <xy-dialog :is-show.sync="isShow" title="商户图片" ok-text="保存" @on-ok="submit">
+    <xy-dialog :is-show.sync="isShow" title="商户文件" ok-text="保存" @on-ok="submit">
       <el-upload
         :multiple="true"
         class="upload-demo"
@@ -13,7 +13,7 @@
         :file-list="fileList"
         list-type="picture" multiple>
         <el-button size="small" type="primary">点击上传</el-button>
-        <div slot="tip" class="el-upload__tip">只能上传jpg/png文件，且不超过2M</div>
+        <div slot="tip" class="el-upload__tip">只能上传jpg/png/mp4文件，且不超过10M</div>
       </el-upload>
     </xy-dialog>
   </div>
@@ -30,7 +30,7 @@ export default {
       action:`${process.env.VUE_APP_BASE_API}api/admin/upload-file`,
 
       fileList:[],
-      pics:[],//需要上传的图片
+      pics:[],//需要上传的文件
     }
   },
   methods: {
@@ -45,10 +45,10 @@ export default {
 
     handleBefore(file){
       console.log(file)
-      if((file.size/1000) > 2048){
+      if((file.size/1000) > 10240){
         Message({
           type:'warning',
-          message:'上传图片大小超过2M！'
+          message:'上传文件/视频大小超过10M！'
         })
         return false
       }
@@ -68,7 +68,7 @@ export default {
         destroyPicture({id:file.id}).then(res => {
           Message({
             type:'success',
-            message:'删除图片成功'
+            message:'删除文件成功'
           })
         }).catch(err => {
           this.getPic()
@@ -87,7 +87,7 @@ export default {
       })).then(res => {
         Message({
           type:'success',
-          message:`新增${res.length}张图片`
+          message:`新增${res.length}张文件`
         })
         this.isShow = false
       }).catch(err => {
diff --git a/src/views/productService/components/confinement/addClubProduct.vue b/src/views/productService/components/confinement/addClubProduct.vue
index 19db692..66c149d 100644
--- a/src/views/productService/components/confinement/addClubProduct.vue
+++ b/src/views/productService/components/confinement/addClubProduct.vue
@@ -82,7 +82,7 @@
       <template v-slot:video>
         <div class="xy-table-item">
           <div class="xy-table-item-label">
-            宣传视频：
+            探店视频：
           </div>
           <div class="xy-table-item-content">
             <div v-if="form.video" style="position: relative;">
diff --git a/src/views/productService/components/confinement/addConfinementClub.vue b/src/views/productService/components/confinement/addConfinementClub.vue
index e48f839..917f135 100644
--- a/src/views/productService/components/confinement/addConfinementClub.vue
+++ b/src/views/productService/components/confinement/addConfinementClub.vue
@@ -144,7 +144,7 @@
       <template v-slot:videoFile>
         <div class="xy-table-item">
           <div class="xy-table-item-label">
-            宣传视频：
+            探店视频：
           </div>
           <div class="xy-table-item-content">
             <div v-if="form.videoFile" style="position: relative;">
diff --git a/src/views/productService/components/confinement/addProductPic.vue b/src/views/productService/components/confinement/addProductPic.vue
index 2e22299..845dd92 100644
--- a/src/views/productService/components/confinement/addProductPic.vue
+++ b/src/views/productService/components/confinement/addProductPic.vue
@@ -13,7 +13,7 @@
         :file-list="fileList"
         list-type="picture" multiple>
         <el-button size="small" type="primary">点击上传</el-button>
-        <div slot="tip" class="el-upload__tip">只能上传jpg/png文件，且不超过2M</div>
+        <div slot="tip" class="el-upload__tip">只能上传jpg/png/mp4文件，且不超过10M</div>
       </el-upload>
     </xy-dialog>
   </div>
@@ -49,10 +49,10 @@ export default {
 
     handleBefore(file){
       console.log(file)
-      if((file.size/1000) > 2048){
+      if((file.size/1000) > 10240){
         Message({
           type:'warning',
-          message:'上传图片大小超过2M！'
+          message:'上传文件大小超过10M！'
         })
         return false
       }
@@ -72,7 +72,7 @@ export default {
         destroyPicture({id:file.id}).then(res => {
           Message({
             type:'success',
-            message:'删除图片成功'
+            message:'删除文件成功'
           })
         }).catch(err => {
           this.getPic()
@@ -91,7 +91,7 @@ export default {
       })).then(res => {
         Message({
           type:'success',
-          message:`新增${res.length}张图片`
+          message:`新增${res.length}张文件`
         })
         this.isShow = false
       }).catch(err => {
diff --git a/src/views/productService/confinementClub.vue b/src/views/productService/confinementClub.vue
index 6cf47e0..4101794 100644
--- a/src/views/productService/confinementClub.vue
+++ b/src/views/productService/confinementClub.vue
@@ -30,7 +30,7 @@
               <div slot="content" style="display:flex;flex-direction: column">
                 <Button  size="small" type="primary" @click="editorClub(scope.row)" style="margin: 0 6px 4px 0">信息编辑</Button>
                 <Button  size="small" type="primary" @click="showInfo(scope.row)" style="margin: 0 6px 4px 0;">商户简介</Button>
-                <Button  size="small" type="primary" @click="showPic(scope.row)" style="margin: 0 6px 4px 0;">商户图片</Button>
+                <Button  size="small" type="primary" @click="showPic(scope.row)" style="margin: 0 6px 4px 0;">商户附件</Button>
               </div>
             </Poptip>
 
@@ -143,6 +143,7 @@ export default {
       console.log(res)
       this.list = res.rows
       this.total = res.total
+      
     },
     pageChange(e){
       this.select.page = e