Browse Source

feat: 封面上传 - 客户群发&客户欢迎语 - H5推广&链接上传新增upload_to_oss参数

zhengxy 2 years ago
parent
commit
7a95004227

+ 15 - 3
project/src/components/assembly/editCon.vue

@@ -125,7 +125,9 @@
125 125
       <div class="lineItem">
126 126
         <label>图文封面:</label>
127 127
         <el-upload class="avatar-uploader" :action="URL.BASEURL + URL.material_upload" name="material_file"
128
-          :show-file-list="false" :data="fileData" :on-success="uploadSuccess" :on-progress='beforeUploadUpload'
128
+          :show-file-list="false"
129
+          :data="(isKHQF || isKHHYY) ? {...fileData, upload_to_oss: 0} : fileData"
130
+          :on-success="uploadSuccess" :on-progress='beforeUploadUpload'
129 131
           :on-error='uploadFail' accept=".jpg,.jpeg,.png">
130 132
           <img v-if="link.picurl" :src="link.picurl" class="fm_img">
131 133
           <i v-else class="el-icon-plus avatar-uploader-icon"></i>
@@ -239,7 +241,9 @@
239 241
       <div class="lineItem">
240 242
         <label>图文封面:</label>
241 243
         <el-upload class="avatar-uploader" :action="URL.BASEURL + URL.material_upload" name="material_file"
242
-          :show-file-list="false" :data="fileData" :on-success="uploadSuccess" :on-progress='beforeUploadUpload'
244
+          :show-file-list="false"
245
+          :data="(isKHQF || isKHHYY) ? {...fileData, upload_to_oss: 0} : fileData"
246
+          :on-success="uploadSuccess" :on-progress='beforeUploadUpload'
243 247
           :on-error='uploadFail' accept=".jpg,.jpeg,.png">
244 248
           <img v-if="linkExtend.picurl" :src="linkExtend.picurl" class="fm_img">
245 249
           <i v-else class="el-icon-plus avatar-uploader-icon"></i>
@@ -290,7 +294,15 @@ export default {
290 294
     phone_width: {
291 295
       type: String,
292 296
       default: ''
293
-    }
297
+    },
298
+    isKHQF: { // 当前组件是否应用在"客户群发" => true => "H5推广"和"链接"上传封面接口新增"upload_to_oss: 0"参数
299
+      type: Boolean,
300
+      default: () => false,
301
+    },
302
+    isKHHYY: { // 当前组件是否应用在"客户欢迎语" => true => "H5推广"和"链接"上传封面接口新增"upload_to_oss: 0"参数
303
+      type: Boolean,
304
+      default: () => false,
305
+    },
294 306
   },
295 307
   data () {
296 308
     return {

+ 7 - 2
project/src/components/assembly/welcom_edit.vue

@@ -23,7 +23,8 @@
23 23
         }" placeholder="结束时间">
24 24
         </el-time-select>
25 25
       </div>
26
-      <edit-con source="welcom" phone_width="230px" :afferent_content='msg_data_obj.content' :afferent_attachments='msg_data_obj.attachments' :disabled="!editFlag" @editContent="(val)=>{msg_data_obj.content = val;dataChange();}" @changeAttachment='getAttachment'></edit-con>
26
+      <edit-con source="welcom" phone_width="230px" :afferent_content='msg_data_obj.content' :afferent_attachments='msg_data_obj.attachments' :disabled="!editFlag" :isKHHYY="isKHHYY" @editContent="(val)=>{msg_data_obj.content = val;dataChange();}" @changeAttachment='getAttachment'></edit-con>
27
+      <!-- isKHHYY 是否为"客户欢迎语" -->
27 28
     </div>
28 29
     <div class="deleteBox" v-if="deleteFlag" @click.stop="deleteEvent">
29 30
       <i class="el-icon-delete-solid"></i>
@@ -41,7 +42,11 @@ export default {
41 42
     },
42 43
     editInfo: {
43 44
       type: Object
44
-    }
45
+    },
46
+    isKHHYY: { // 当前组件是否应用在"客户欢迎语"
47
+      type: Boolean,
48
+      default: () => false,
49
+    },
45 50
   },
46 51
   data () {
47 52
     return {

+ 2 - 2
project/src/components/customOperate/createMassMsg.vue

@@ -118,8 +118,8 @@
118 118
       </div>
119 119
       <div class="regulations regulations2">
120 120
         <label style="margin-top:4px"><em>*</em>群发内容</label>
121
-        <edit-con ref="editCon" :afferent_content='content' :afferent_attachments='attachments' :disabled="!editFlag"
122
-          @editContent="(val) => { content = val }" @changeAttachment='getAttachment'></edit-con>
121
+        <edit-con ref="editCon" :afferent_content='content' :afferent_attachments='attachments' :disabled="!editFlag" :isKHQF="true" @editContent="(val) => { content = val }" @changeAttachment='getAttachment'></edit-con>
122
+        <!-- isKHQF 是否为"客户群发" -->
123 123
       </div>
124 124
       <div class="regulations regulations2">
125 125
         <label><em>*</em>群发时间</label>

+ 4 - 1
project/src/components/customOperate/welcom_message.vue

@@ -38,7 +38,8 @@
38 38
       </div>
39 39
       <div class="regulations">
40 40
         <label style="margin-top:4px"><em>*</em>欢迎语</label>
41
-        <edit-con ref="editCon" source="welcom" :afferent_content='main_msg_data.content' :afferent_attachments='main_msg_data.attachments' @editContent="(val)=>{main_msg_data.content = val}" @changeAttachment='getAttachment'></edit-con>
41
+        <edit-con ref="editCon" source="welcom" :afferent_content='main_msg_data.content' :afferent_attachments='main_msg_data.attachments' :isKHHYY="true" @editContent="(val)=>{main_msg_data.content = val}" @changeAttachment='getAttachment'></edit-con>
42
+        <!-- isKHHYY 是否为"客户欢迎语" -->
42 43
       </div>
43 44
       <h3 class="bigTitle" style="margin-top:20px">
44 45
         分时段欢迎语:
@@ -56,8 +57,10 @@
56 57
           <label style="margin-top:30px;text-align:right">时段{{index+1}}:</label>
57 58
           <welcom-edit :deleteFlag='timeIntervalList.length==1?false:true'
58 59
                        :editInfo="item"
60
+                       :isKHHYY="true"
59 61
                        @welcomEditCon='(val)=>{getWelcomEdit(val,index)}'
60 62
                        @deleteWelcomCon='deleteWelcomCon(index)'></welcom-edit>
63
+          <!-- isKHHYY 是否为"客户欢迎语" -->
61 64
         </div>
62 65
         <div class="add_welcom_hint" @click="addWelcom">
63 66
           <i class="el-icon-circle-plus-outline"></i>