diff --git a/admin-web-master/dist (2).zip b/admin-web-master/dist (2).zip new file mode 100644 index 0000000..bcd6a94 --- /dev/null +++ b/admin-web-master/dist (2).zip diff --git a/admin-web-master/dist.zip b/admin-web-master/dist.zip deleted file mode 100644 index 1f2347b..0000000 --- a/admin-web-master/dist.zip +++ /dev/null diff --git a/admin-web-master/src/views/shopRental/manage/index.vue b/admin-web-master/src/views/shopRental/manage/index.vue index caaa69e..890f0d1 100644 --- a/admin-web-master/src/views/shopRental/manage/index.vue +++ b/admin-web-master/src/views/shopRental/manage/index.vue @@ -272,7 +272,7 @@ general(fd).then(res => { console.log(res); let data = JSON.parse(res.data) - if(data.code == '200'){ + if(data.code == '0'){ this.$message({ type: 'success', message: '发起成功' diff --git a/lvdao-miniapp/main.js b/lvdao-miniapp/main.js index 04a1ae4..05955c5 100644 --- a/lvdao-miniapp/main.js +++ b/lvdao-miniapp/main.js @@ -8,13 +8,13 @@ import uView from "uview-ui"; import DialogBox from './components/DialogBox/DialogBox'; // let hostall = window.location.href; // let c1 = hostall.split('cdwlMall')[0]; -let c1 = 'https://jy.scjysm.asia:18086/' -// let c1 = 'https://zhgw-uat.028wlkj.com/' +// let c1 = 'https://jy.scjysm.asia:18086/' +let c1 = 'https://zhgw-uat.028wlkj.com/' Vue.config.productionTip = false Vue.prototype.$http = http Vue.prototype.$imgUrl = (url) => { - return (c1 + "cdwlMall/questionnaire/file/static" + url); - // return (c1 + "cdwlMall/zsfwzxt/test/file/static" + url); + // return (c1 + "cdwlMall/questionnaire/file/static" + url); + return (c1 + "cdwlMall/zsfwzxt/test/file/static" + url); } Vue.prototype.$img = c1+ 'cdwlMall' // Vue.prototype.$upload = "https://zhld.028wlkj.com:49008/cdwlMall/admin-server/miniio/upload" diff --git a/lvdao-miniapp/pagesA/projectManagement/projectDetails.vue b/lvdao-miniapp/pagesA/projectManagement/projectDetails.vue index f76f4c7..4bcf840 100644 --- a/lvdao-miniapp/pagesA/projectManagement/projectDetails.vue +++ b/lvdao-miniapp/pagesA/projectManagement/projectDetails.vue @@ -39,7 +39,7 @@ :class="{ 'share-modal-animate': showShareModal }"> 生成海报 - + 取消 @@ -100,9 +100,8 @@ generatePoster() { this.closeShareModal() this.$http.sendRequest(`/cerePromotion/getSharePic/${this.tableData.id}`, 'GET','', 1).then(res => { - console.log(res,'123123123123123') + this.posterUrl = this.imgurl+res.data.data this.showPosterMask = true; - // this.posterUrl = }) // setTimeout(() => { diff --git a/lvdao-miniapp/utils/request.js b/lvdao-miniapp/utils/request.js index 6bd5f6a..7b6e030 100644 --- a/lvdao-miniapp/utils/request.js +++ b/lvdao-miniapp/utils/request.js @@ -1,8 +1,8 @@ // let hostall = window.location.href; // let c1 = hostall.split('cdwlMall')[0]; -let c1 = 'https://jy.scjysm.asia:18086/' -// let c1 = 'https://zhgw-uat.028wlkj.com/' +// let c1 = 'https://jy.scjysm.asia:18086/' +let c1 = 'https://zhgw-uat.028wlkj.com/' //封装request请求 const sendRequest = (url, method = 'GET', data = {}, baseUrl,contentType) => { //判断header提交数据类型 @@ -21,10 +21,10 @@ const sendRequest = (url, method = 'GET', data = {}, baseUrl,contentType) => { // bases = 'https://zhgw.028wlkj.com:20443/cdwlMall/meserver/admin-server' + url; // bases = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server' + url; - bases = 'http://128.10.249.46:9003'+ url; + // bases = 'http://128.10.249.46:9003'+ url; // bases = 'https://zhld.028wlkj.com:49008/cdwlMall/admin-server' + url; - // bases = c1 + 'cdwlMall/meserver/admin-server' + url; + bases = c1 + 'cdwlMall/meserver/admin-server' + url; }else if(baseUrl == 3){ // bases = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/api' + url;