diff --git a/admin-web-master/src/utils/request.js b/admin-web-master/src/utils/request.js index 29f9279..cce1d9f 100644 --- a/admin-web-master/src/utils/request.js +++ b/admin-web-master/src/utils/request.js @@ -17,12 +17,12 @@ let baseURL = '' if(host === 'localhost:8080' || host === 'localhost:8081' || host === 'localhost:9528'|| host === '192.168.31.45:9528'|| host === 'localhost:9529' ) { // baseURL = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server'; - // baseURL = 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/admin-server'; + baseURL = 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/admin-server'; // baseURL = process.env.VUE_APP_DOMAIN_PREFIX_1; - baseURL = 'http://192.168.8.103:9003'; + // baseURL = 'http://192.168.8.103:9003'; } else { diff --git a/admin-web-master/src/views/activity/activityBz.vue b/admin-web-master/src/views/activity/activityBz.vue index adaa99f..2b9f9e6 100644 --- a/admin-web-master/src/views/activity/activityBz.vue +++ b/admin-web-master/src/views/activity/activityBz.vue @@ -812,7 +812,7 @@ // .then(data => console.log(data)) // .catch(error => console.log(error)); - this.$emit('childClose', false); + this.$refs.editor.html = '


' this.ruleForm = { classificationCode: '', @@ -843,7 +843,7 @@ solutionEditor: null, } }) - + this.$emit('childClose', false); } else { this.$message({ message: '请填写数据', diff --git a/admin-web-master/src/views/activity/activityHis.vue b/admin-web-master/src/views/activity/activityHis.vue index 6739777..492608c 100644 --- a/admin-web-master/src/views/activity/activityHis.vue +++ b/admin-web-master/src/views/activity/activityHis.vue @@ -283,9 +283,7 @@ @@ -935,9 +933,7 @@ @@ -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) { diff --git a/admin-web-master/src/views/activity/activitySp.vue b/admin-web-master/src/views/activity/activitySp.vue index f209290..e5d9b80 100644 --- a/admin-web-master/src/views/activity/activitySp.vue +++ b/admin-web-master/src/views/activity/activitySp.vue @@ -734,9 +734,9 @@ @@ -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); + }, } } diff --git a/admin-web-master/src/views/activity/index.vue b/admin-web-master/src/views/activity/index.vue index d5f74f8..ead24d8 100644 --- a/admin-web-master/src/views/activity/index.vue +++ b/admin-web-master/src/views/activity/index.vue @@ -123,7 +123,7 @@
效果评估
-
复制
+
删除
@@ -736,9 +736,9 @@ @@ -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) { diff --git a/admin-web-master/src/views/advertisement/advertisingReview/advertisingReview.vue b/admin-web-master/src/views/advertisement/advertisingReview/advertisingReview.vue index 8d8fd26..5a277c0 100644 --- a/admin-web-master/src/views/advertisement/advertisingReview/advertisingReview.vue +++ b/admin-web-master/src/views/advertisement/advertisingReview/advertisingReview.vue @@ -59,11 +59,11 @@ - + diff --git a/admin-web-master/src/views/atmosphere/atmosphereBz.vue b/admin-web-master/src/views/atmosphere/atmosphereBz.vue index 3f229f9..4e71531 100644 --- a/admin-web-master/src/views/atmosphere/atmosphereBz.vue +++ b/admin-web-master/src/views/atmosphere/atmosphereBz.vue @@ -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 = '


' this.ruleForm = { classificationCode: '', diff --git a/admin-web-master/src/views/atmosphere/atmosphereGl.vue b/admin-web-master/src/views/atmosphere/atmosphereGl.vue index adbbbc5..b196e55 100644 --- a/admin-web-master/src/views/atmosphere/atmosphereGl.vue +++ b/admin-web-master/src/views/atmosphere/atmosphereGl.vue @@ -122,7 +122,7 @@
效果评估
-
复制
+
删除
 @@ -730,8 +730,7 @@ @@ -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) { diff --git a/admin-web-master/src/views/atmosphere/atmosphereHis.vue b/admin-web-master/src/views/atmosphere/atmosphereHis.vue index 249d98a..fca7fe0 100644 --- a/admin-web-master/src/views/atmosphere/atmosphereHis.vue +++ b/admin-web-master/src/views/atmosphere/atmosphereHis.vue @@ -283,9 +283,7 @@ @@ -1106,9 +1104,7 @@ @@ -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) diff --git a/admin-web-master/src/views/atmosphere/atmosphereSp.vue b/admin-web-master/src/views/atmosphere/atmosphereSp.vue index 6b40445..cf34e84 100644 --- a/admin-web-master/src/views/atmosphere/atmosphereSp.vue +++ b/admin-web-master/src/views/atmosphere/atmosphereSp.vue @@ -890,7 +890,7 @@ @@ -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); + }, } } diff --git a/admin-web-master/src/views/serve/procedure.vue b/admin-web-master/src/views/serve/procedure.vue index 2710caa..8bc375e 100644 --- a/admin-web-master/src/views/serve/procedure.vue +++ b/admin-web-master/src/views/serve/procedure.vue @@ -116,7 +116,6 @@
@@ -143,7 +142,6 @@
@@ -176,11 +174,20 @@
-
-
- +
+ + +
+ +
@@ -244,8 +251,12 @@
- - + +
diff --git a/admin-web-master/src/views/shopbus/businessList/index.vue b/admin-web-master/src/views/shopbus/businessList/index.vue index afc2076..d2dfc0e 100644 --- a/admin-web-master/src/views/shopbus/businessList/index.vue +++ b/admin-web-master/src/views/shopbus/businessList/index.vue @@ -220,7 +220,7 @@ v-if="dialogVisible" style="background-color: #fff;min-height: 94vh;" > -
+
商城商家管理 > {{ userState === 0?'新增商家':userState === 1?'修改商家':'查看商家'}}
diff --git a/lvdao-miniapp/pages/home/home.vue b/lvdao-miniapp/pages/home/home.vue index 7964861..23b052b 100644 --- a/lvdao-miniapp/pages/home/home.vue +++ b/lvdao-miniapp/pages/home/home.vue @@ -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"` }) diff --git a/lvdao-miniapp/pagesA/application/application.vue b/lvdao-miniapp/pagesA/application/application.vue index 227648a..ce1548d 100644 --- a/lvdao-miniapp/pagesA/application/application.vue +++ b/lvdao-miniapp/pagesA/application/application.vue @@ -13,7 +13,7 @@ diff --git a/lvdao-miniapp/utils/request.js b/lvdao-miniapp/utils/request.js index d0d23db..0d38bc9 100644 --- a/lvdao-miniapp/utils/request.js +++ b/lvdao-miniapp/utils/request.js @@ -21,7 +21,7 @@ const sendRequest = (url, method = 'GET', data = {}, baseUrl,contentType) => { // 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;