Merge branch 'master' of http://39.98.150.180/webapp/GreenwayWeb

wesley88
2 parents 8d14e1a2 66ab3b4a
Showing 13 changed files with 105 additions and 50 deletions
admin-web-master/src/views/activity/activityBz.vue
admin-web-master/src/views/activity/activityHis.vue
admin-web-master/src/views/activity/activitySp.vue
admin-web-master/src/views/activity/index.vue
admin-web-master/src/views/advertisement/advertisingReview/advertisingReview.vue
admin-web-master/src/views/atmosphere/atmosphereBz.vue
admin-web-master/src/views/atmosphere/atmosphereGl.vue
admin-web-master/src/views/atmosphere/atmosphereHis.vue
admin-web-master/src/views/atmosphere/atmosphereSp.vue
admin-web-master/src/views/serve/procedure.vue
admin-web-master/src/views/shopbus/businessList/index.vue
lvdao-miniapp/pages/home/home.vue
lvdao-miniapp/utils/request.js
@@ -812,7 +812,7 @@
 							//   .then(data => console.log(data))
 							//   .catch(error => console.log(error));
-							this.$emit('childClose', false);
+							
 							this.$refs.editor.html = '<p><br></p>'
 							this.ruleForm = {
 								classificationCode: '',
@@ -843,7 +843,7 @@
 								solutionEditor: null,
 							}
 						})
-						
+						this.$emit('childClose', false);
 					} else {
 						this.$message({
 							message: '请填写数据',
@@ -283,9 +283,7 @@
 										</el-table-column>
 										<el-table-column label="操作" min-width="20%">
 											<template slot-scope="scope">
-												<!-- <div class="tableBtn greens" @click="Down(scope.row)">下载</div> -->
-												<a class="tableBtn greens" :href="scope.row.attachmentUrl"
-													target="_blank" download>下载</a>
+										<div class="tableBtn greens" @click="Down($baseURL+scope.row.attachmentUrl)">下载</div>
 											</template>
 										</el-table-column>
@@ -935,9 +933,7 @@
 									</el-table-column>
 									<el-table-column label="操作" min-width="20%">
 										<template slot-scope="scope">
-											<!-- <div class="tableBtn greens" @click="Down(scope.row)">下载</div> -->
-											<a class="tableBtn greens" :href="scope.row.attachmentUrl" target="_blank"
-												download>下载</a>
+											<div class="tableBtn greens" @click="Down($baseURL+scope.row.attachmentUrl)">下载</div>
 										</template>
 									</el-table-column>
@@ -2515,7 +2511,15 @@ this.ListOne = item.planName
 				})
 			},
-
+Down(url){
+				  const a = document.createElement('a');
+				      a.href = url;
+				      a.download = url.split('/').pop(); // 以文件名作为下载后的文件名
+				      a.style.display = 'none';
+				      document.body.appendChild(a);
+				      a.click();
+				      document.body.removeChild(a);
+			},
 			async daochu() {
 				let res = await excelQueryByPage(this.pageindex)
 				if (!res) {
@@ -734,9 +734,9 @@
 									</el-table-column>
 									<el-table-column label="操作" min-width="20%">
 										<template slot-scope="scope">
-											<!-- <div class="tableBtn greens" @click="Down(scope.row)">下载</div> -->
-											<a class="tableBtn greens" :href="scope.row.attachmentUrl"
-												target="_blank" download>下载</a>
+												<div class="tableBtn greens" @click="Down($baseURL+scope.row.attachmentUrl)">下载</div>
+											<!-- <a class="tableBtn greens" :href="scope.row.attachmentUrl"
+												target="_blank" download>下载</a> -->
 										</template>
 									</el-table-column>
@@ -1622,6 +1622,15 @@
 				this.liuYe = 1
 			},
+			Down(url){
+				  const a = document.createElement('a');
+				      a.href = url;
+				      a.download = url.split('/').pop(); // 以文件名作为下载后的文件名
+				      a.style.display = 'none';
+				      document.body.appendChild(a);
+				      a.click();
+				      document.body.removeChild(a);
+			},
 		}
 	}
 </script>
@@ -123,7 +123,7 @@
 										<div class="tableBtn greens" @click="xiaoguo(scope.row)"
 											v-if="scope.row.state == '5'">效果评估</div>
 										<!-- <div class="tableBtn greens">策略调整</div> -->
-										<div class="tableBtn greens" @click="koop(scope.row)">复制</div>
+										<!-- <div class="tableBtn greens" @click="koop(scope.row)">复制</div> -->
 										<div class="tableBtn greens" @click="handleDelete(scope.row.id)">删除</div>
 									</template>
 								</el-table-column>
@@ -736,9 +736,9 @@
 									</el-table-column>
 									<el-table-column label="操作" min-width="20%">
 										<template slot-scope="scope">
-											<!-- <div class="tableBtn greens" @click="Down(scope.row)">下载</div> -->
-											<a class="tableBtn greens" :href="$baseURL+scope.row.attachmentUrl"
-												target="_blank" download>下载</a>
+											<div class="tableBtn greens" @click="Down($baseURL+scope.row.attachmentUrl)">下载</div>
+											<!-- <a class="tableBtn greens" :href="$baseURL+scope.row.attachmentUrl"
+												target="_blank" download>下载</a> -->
 										</template>
 									</el-table-column>
@@ -2262,6 +2262,15 @@
 			},
+			Down(url){
+				  const a = document.createElement('a');
+				      a.href = url;
+				      a.download = url.split('/').pop(); // 以文件名作为下载后的文件名
+				      a.style.display = 'none';
+				      document.body.appendChild(a);
+				      a.click();
+				      document.body.removeChild(a);
+			},
 			async daochu() {
 				let res = await excelQueryByPage(this.pageindex)
 				if (!res) {
@@ -59,11 +59,11 @@
           <!-- <el-table-column label="申请人" prop="applicant" ></el-table-column> -->
-          <el-table-column label="投放定价" prop="tenant">
+          <!-- <el-table-column label="投放定价" prop="tenant">
             <template slot-scope="scope">
               {{scope.row.rotationOrde || '-'}}
             </template>
-          </el-table-column>
+          </el-table-column> -->
           <el-table-column label="投放时间" prop="scheduleTime" >
           </el-table-column>
           <el-table-column prop="applicationTime" label="提交时间" >
@@ -718,21 +718,23 @@
 								message: '保存成功',
 								type: 'success'
 							});
+							console.log(this.tableData,'111111111111111111')
 							for (let i = 0; i < this.tableData.length; i++) {
 								this.tableData[i].detailsId = res.data.id
 								MingAdd(this.tableData[i]).then(res => {
 								})
 							}
+							console.log(this.dataList,'22222222222222222222')
 							for (let i = 0; i < this.dataList.length; i++) {
-								let fuji = {
-									detailsId: res.data.id,
-									attachmentName: this.dataList[i].name,
-									attachmentUrl: this.dataList[i].response.data.url,
-								}
-								fujiaAdd(fuji).then(res => {
-									
-								})
+							let fuji = {
+								detailsId: res.data.id,
+								attachmentName: this.dataList[i].name,
+								attachmentUrl: this.dataList[i].url,
+							}
+							fujiaAdd(fuji).then(res => {
+								console.log('成功')
+							})
 							}
 							// const pdf = new jsPDF('p', 'mm', 'a4');
@@ -760,7 +762,7 @@
 							//   .then(response => response.json())
 							//   .then(data => console.log(data))
 							//   .catch(error => console.log(error));
-
+							this.$emit('childClose', false);
 							this.$refs.editor.html = '<p><br></p>'
 							this.ruleForm = {
 								classificationCode: '',
@@ -122,7 +122,7 @@
 										<div class="tableBtn greens" @click="xiaoguo(scope.row)"
 											v-if="scope.row.state == '5'">效果评估</div>
 										<!-- <div class="tableBtn greens">策略调整</div> -->
-										<div class="tableBtn greens" @click="koop(scope.row)">复制</div>
+										<!-- <div class="tableBtn greens" @click="koop(scope.row)">复制</div> -->
 										<div class="tableBtn greens" @click="handleDelete(scope.row.id)">删除</div>
 									</template>
 								</el-table-column>
@@ -730,8 +730,7 @@
 									</el-table-column>
 									<el-table-column label="操作" prop="text" min-width="20%">
 										<template slot-scope="scope">
-											<a class="tableBtn greens" :href="scope.row.attachmentUrl" target="_blank"
-												download>下载</a>
+											<div class="tableBtn greens" @click="Down($baseURL+scope.row.attachmentUrl)">下载</div>
 										</template>
 									</el-table-column>
@@ -2304,6 +2303,15 @@
 			},
+			Down(url){
+				  const a = document.createElement('a');
+				      a.href = url;
+				      a.download = url.split('/').pop(); // 以文件名作为下载后的文件名
+				      a.style.display = 'none';
+				      document.body.appendChild(a);
+				      a.click();
+				      document.body.removeChild(a);
+			},
 			async daochu() {
 				let res = await excelQueryByPage(this.pageindex)
 				if (!res) {
@@ -283,9 +283,7 @@
 										</el-table-column>
 										<el-table-column label="操作" min-width="20%">
 											<template slot-scope="scope">
-												<!-- <div class="tableBtn greens" @click="Down(scope.row)">下载</div> -->
-												<a class="tableBtn greens" :href="scope.row.attachmentUrl"
-													target="_blank" download>下载</a>
+										<div class="tableBtn greens" @click="Down($baseURL+scope.row.attachmentUrl)">下载</div>
 											</template>
 										</el-table-column>
@@ -1106,9 +1104,7 @@
 									</el-table-column>
 									<el-table-column label="操作" min-width="20%">
 										<template slot-scope="scope">
-											<!-- <div class="tableBtn greens" @click="Down(scope.row)">下载</div> -->
-											<a class="tableBtn greens" :href="scope.row.attachmentUrl" target="_blank"
-												download>下载</a>
+								<div class="tableBtn greens" @click="Down($baseURL+scope.row.attachmentUrl)">下载</div>
 										</template>
 									</el-table-column>
@@ -2667,7 +2663,15 @@ this.ListOne = item.planName
 					this.getAll()
 				})
 			},
-
+Down(url){
+				  const a = document.createElement('a');
+				      a.href = url;
+				      a.download = url.split('/').pop(); // 以文件名作为下载后的文件名
+				      a.style.display = 'none';
+				      document.body.appendChild(a);
+				      a.click();
+				      document.body.removeChild(a);
+			},
 			async daochu() {
 				let res = await excelQueryByPage(this.pageindex)
@@ -890,7 +890,7 @@
                   </el-table-column>
                   <el-table-column label="操作" prop="text" min-width="20%">
                     <template slot-scope="scope">
-                  <a class="tableBtn greens" :href="scope.row.attachmentUrl" target="_blank" download>下载</a>
+							<div class="tableBtn greens" @click="Down($baseURL+scope.row.attachmentUrl)">下载</div>
                      </template>
                   </el-table-column>
@@ -1671,6 +1671,15 @@
                  formTime(data){
                     this.zhixingList.planTime = data
                  },
+				 Down(url){
+				 	  const a = document.createElement('a');
+				 	      a.href = url;
+				 	      a.download = url.split('/').pop(); // 以文件名作为下载后的文件名
+				 	      a.style.display = 'none';
+				 	      document.body.appendChild(a);
+				 	      a.click();
+				 	      document.body.removeChild(a);
+				 },
     }
   }
 </script>
@@ -116,7 +116,6 @@
 												<div v-if="edit" style="
                                 height: 38px;
                                 line-height: 38px;
-                                border: 1px solid #ebeef5;
                                 padding: 0 20px;
                                 font-size: 14px;
                               ">
@@ -143,7 +142,6 @@
 												<div v-if="edit" style="
                                 height: 38px;
                                 line-height: 38px;
-                                border: 1px solid #ebeef5;
                                 padding: 0 20px;
                                 font-size: 14px;
                               ">
@@ -176,11 +174,20 @@
 												<div style="
                                 font-size: 14px;
                               ">
-													<div>
-														<div style="padding:20px;" v-if="edit"
-															v-html="secondData.announcementContent"></div>
-														<wang-editor v-model="secondData.announcementContent"
-															ref="editor" v-else></wang-editor>
+							  <div style="padding:20px;width: 100%;" v-if="edit"
+							  	v-html="secondData.announcementContent"></div>
+							  <!-- <wang-editor v-model="secondData.announcementContent"
+							  	ref="editor" v-else></wang-editor> -->
+							  	<el-input
+								style="width: 100%;"
+							  		  type="textarea"
+							  		  :rows="5"
+							  		  placeholder="请输入内容"
+							  		  v-else
+							  		  v-model="secondData.announcementContent"/>
+													<div style="width: 100%;">
+														
+														
 													</div>
 												</div>
@@ -244,8 +251,12 @@
 							</el-form-item>
 							<el-form-item label="公告内容" >
 								<div>
-									<wang-editor v-model="ruleForm.announcementContent" ref="editor"></wang-editor>
-
+									<!-- <wang-editor v-model="ruleForm.announcementContent" ref="editor"></wang-editor> -->
+									<el-input
+									  type="textarea"
+									  :rows="5"
+									  placeholder="请输入内容"
+									  v-model="ruleForm.announcementContent"/>
 								</div>
 							</el-form-item>
 						</el-form>
@@ -220,7 +220,7 @@
 	  v-if="dialogVisible"
 	  style="background-color: #fff;min-height: 94vh;"
 	>
-	<div style="height:58px;line-height:58px;">
+	<div style="height:58px;line-height:58px;padding-left: 20px;">
 	  <div style="color:#0006"> <span>商城商家管理</span> <span style="padding:0 5px;">></span> <span
 	      style="color:#000000e6">{{ userState === 0?'新增商家':userState === 1?'修改商家':'查看商家'}}</span></div> 
 	</div>
@@ -714,7 +714,6 @@
 						url: `/pagesA/weball/shopweb?phone=${uni.getStorageSync('user').phone}`
 					})
 				}else{ 
-						console.log('2222222')
 					uni.navigateTo({
 						url: `/pagesA/weball/shopweb?phone="1"`
 					})
@@ -21,7 +21,7 @@ const sendRequest = (url, method = &#39;GET&#39;, data = {}, baseUrl,contentType) =&gt; {
 		// bases = 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/admin-server' + url;
 		// bases = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server' + url;
-		// bases = 'http://128.10.249.9:9003'+ url;
+		// bases = 'http://192.168.8.103:9003'+ url;
 		// bases = 'https://zhld.028wlkj.com:49008/cdwlMall/admin-server' + url;
 		bases = c1 + 'cdwlMall/meserver/admin-server' + url;