diff --git a/lvdao-miniapp/main.js b/lvdao-miniapp/main.js index a563597..8455df8 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/pages.json b/lvdao-miniapp/pages.json index b44670e..3c1c918 100644 --- a/lvdao-miniapp/pages.json +++ b/lvdao-miniapp/pages.json @@ -396,7 +396,7 @@ "name": "pagesA", "pages": [ { - "path": "/payweb/payweb", + "path": "payweb/payweb", "style": { "navigationBarBackgroundColor": "#FFFFFF", "navigationBarTitleText": "" diff --git a/lvdao-miniapp/pages/propertyPay/propertyPayList/propertyPayList.vue b/lvdao-miniapp/pages/propertyPay/propertyPayList/propertyPayList.vue index d26ec22..2ec91eb 100644 --- a/lvdao-miniapp/pages/propertyPay/propertyPayList/propertyPayList.vue +++ b/lvdao-miniapp/pages/propertyPay/propertyPayList/propertyPayList.vue @@ -344,7 +344,12 @@ } console.log(info) this.$http.sendRequest('/cerePaymentInfo/payWy', 'POST',info, 1).then(res => { - console.error(res) + console.error(res.data) + if(res.data.code =='200') { + uni.navigateTo({ + url:'/pagesA/payweb/payweb?url='+escape(res.data.data) + }) + } }) return // this.loadShow = true diff --git a/lvdao-miniapp/pagesA/payweb/payweb.vue b/lvdao-miniapp/pagesA/payweb/payweb.vue index 8183fd0..d42c179 100644 --- a/lvdao-miniapp/pagesA/payweb/payweb.vue +++ b/lvdao-miniapp/pagesA/payweb/payweb.vue @@ -1,6 +1,6 @@ @@ -8,9 +8,14 @@ export default { data() { return { - + url:'' } }, + onLoad(e) { + console.error(e.url) + this.url = unescape(e.url) + console.error(this.url) + }, methods: { } diff --git a/lvdao-miniapp/utils/request.js b/lvdao-miniapp/utils/request.js index 85b0720..937ae85 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.18:9003/'+ url; + // bases = 'http://128.10.249.18: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;