diff --git a/admin-web-master/dist.zip b/admin-web-master/dist.zip index ee62cb8..793281e 100644 --- a/admin-web-master/dist.zip +++ b/admin-web-master/dist.zip diff --git a/admin-web-master/src/utils/request.js b/admin-web-master/src/utils/request.js index b350a45..be369f9 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://128.10.249.9:9003'; + baseURL = 'http://128.10.249.9:9003'; } else { diff --git a/admin-web-master/src/views/shopRental/rentTermination/index.vue b/admin-web-master/src/views/shopRental/rentTermination/index.vue index fa464e9..5ead25f 100644 --- a/admin-web-master/src/views/shopRental/rentTermination/index.vue +++ b/admin-web-master/src/views/shopRental/rentTermination/index.vue @@ -74,7 +74,7 @@ 待审核 已同意 已拒绝 - 待发起 + 待审核 diff --git a/ceres-uniapp-master/components/canvasShow/config/api.js b/ceres-uniapp-master/components/canvasShow/config/api.js index 8e7347b..b0bf576 100644 --- a/ceres-uniapp-master/components/canvasShow/config/api.js +++ b/ceres-uniapp-master/components/canvasShow/config/api.js @@ -6,8 +6,8 @@ // const BASEURL = (process.env.NODE_ENV === 'production') ? 'https://jy.scjysm.asia:18086/cdwlMall/meserver/api' : 'http://192.168.2.230:9007' const host = `${window.location.protocol}//${window.location.host}` const DOMAIN_PREFIX =`${host}/cdwlMall/meserver/api` -// const BASEURL = (process.env.NODE_ENV === 'production') ? DOMAIN_PREFIX :'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/api' -const BASEURL = (process.env.NODE_ENV === 'production') ? DOMAIN_PREFIX :'http://128.10.249.9:9007' +const BASEURL = (process.env.NODE_ENV === 'production') ? DOMAIN_PREFIX :'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/api' +// const BASEURL = (process.env.NODE_ENV === 'production') ? DOMAIN_PREFIX :'http://128.10.249.9:9007' diff --git a/ceres-uniapp-master/config/api.js b/ceres-uniapp-master/config/api.js index 02ddab3..80628f2 100644 --- a/ceres-uniapp-master/config/api.js +++ b/ceres-uniapp-master/config/api.js @@ -1,18 +1,18 @@ // const DOMAIN_PREFIXPING = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server' // const DOMAIN_PREFIX = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/api' -const TIAOZHUAN = 'https://jy.scjysm.asia:18086/cdwlMall/' -const DOMAIN_PREFIXPING = 'http://128.10.249.9:9003' -const DOMAIN_PREFIX = 'http://128.10.249.9:9007' +// const TIAOZHUAN = 'https://jy.scjysm.asia:18086/cdwlMall/' +// const DOMAIN_PREFIXPING = 'http://128.10.249.9:9003' +// const DOMAIN_PREFIX = 'http://128.10.249.9:9007' // const DOMAIN_PREFIXPING = 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/admin-server' // const DOMAIN_PREFIX = 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/api' // const TIAOZHUAN = 'https://zhgw-uat.028wlkj.com/cdwlMall/' -// const host = `${window.location.protocol}//${window.location.host}` -// const DOMAIN_PREFIXPING = `${host}/cdwlMall/meserver/admin-server` -// const DOMAIN_PREFIX =`${host}/cdwlMall/meserver/api` -// const TIAOZHUAN = `${host}/cdwlMall/` +const host = `${window.location.protocol}//${window.location.host}` +const DOMAIN_PREFIXPING = `${host}/cdwlMall/meserver/admin-server` +const DOMAIN_PREFIX =`${host}/cdwlMall/meserver/api` +const TIAOZHUAN = `${host}/cdwlMall/` diff --git a/ceres-uniapp-master/pages_category_page1/goodsModule/goodsDetails.vue b/ceres-uniapp-master/pages_category_page1/goodsModule/goodsDetails.vue index 2afe59a..edb43d2 100644 --- a/ceres-uniapp-master/pages_category_page1/goodsModule/goodsDetails.vue +++ b/ceres-uniapp-master/pages_category_page1/goodsModule/goodsDetails.vue @@ -42,10 +42,21 @@ }} - - 商品组合：{{productData.combinationName}} - + + + + + + + + {{item.name}} + + + + + @@ -291,7 +302,8 @@ eventType: 1, productIds: '', } - } + }, + zuheList:[] } }, created() { @@ -355,6 +367,8 @@ // 绑定分销关系 salesId && this.shopId ? this.bindSalesCustomer(salesId, this.shopId) : '' this.allCartNum = uni.getStorageSync('allCartNum') + + }, onUnload() { // 判断是否要埋点 @@ -591,6 +605,17 @@ await this.handleGetGroupBookingRollList() this.handleSetDownTime(); } + const names = this.productData.combinationName.split("+&") + const images = this.productData.productImage.split("+&") + const length = Math.min(names.length, images.length) + for (let i = 0; i < length; i++) { + const item = { + name: names[i], + imgurl: images[i] + }; + + this.zuheList.push(item); + } await this.$refs.goodEvaluateAndQuestion.handleGetProblemList() }) } finally { @@ -668,6 +693,60 @@ } \ No newline at end of file diff --git a/lvdao-miniapp/pagesA/PunchInAct/PunchInDetails.vue b/lvdao-miniapp/pagesA/PunchInAct/PunchInDetails.vue new file mode 100644 index 0000000..6c254cc --- /dev/null +++ b/lvdao-miniapp/pagesA/PunchInAct/PunchInDetails.vue @@ -0,0 +1,252 @@ + + + + + diff --git a/lvdao-miniapp/pagesA/PunchInAct/PunchInSetting.vue b/lvdao-miniapp/pagesA/PunchInAct/PunchInSetting.vue new file mode 100644 index 0000000..3fa950d --- /dev/null +++ b/lvdao-miniapp/pagesA/PunchInAct/PunchInSetting.vue @@ -0,0 +1,306 @@ + + + + + \ No newline at end of file diff --git a/lvdao-miniapp/utils/request.js b/lvdao-miniapp/utils/request.js index 1a2bfae..e848b48 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,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://128.10.249.9:9003'+ url; // bases = 'https://zhld.028wlkj.com:49008/cdwlMall/admin-server' + url; bases = c1 + 'cdwlMall/meserver/admin-server' + url; @@ -30,8 +30,8 @@ const sendRequest = (url, method = 'GET', data = {}, baseUrl,contentType) => { // bases = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/api' + url; // bases = 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/api' + url; // bases = 'http://128.10.249.22:9003:9007' + url; - bases = 'http://128.10.249.9:9007' + url; - // bases = c1 + 'cdwlMall/meserver/api' + url; + // bases = 'http://128.10.249.9:9007' + url; + bases = c1 + 'cdwlMall/meserver/api' + url; }else{ // bases = 'http://128.10.249.22:9004' + url; @@ -39,7 +39,7 @@ const sendRequest = (url, method = 'GET', data = {}, baseUrl,contentType) => { // bases = 'http://172.16.61.123/cdwlMall/business-server' + url; // bases = 'https://jy.scjysm.asia:18086/cdwlMall/business-server' + url; // bases = 'https://zhgw.028wlkj.com:20443/cdwlMall/business-server' + url; - bases = 'http://128.10.249.9:9004' + url; + // bases = 'http://128.10.249.9:9004' + url; // bases = 'https://zhld.028wlkj.com:49008/cdwlMall/business-server' + url; bases = c1 + 'cdwlMall/business-server' + url; diff --git a/merchant-web-master/dist.zip b/merchant-web-master/dist.zip index 1078b2e..4b0b4f3 100644 --- a/merchant-web-master/dist.zip +++ b/merchant-web-master/dist.zip diff --git a/settled-merchant-master/dist.zip b/settled-merchant-master/dist.zip index baa4543..4a7c950 100644 --- a/settled-merchant-master/dist.zip +++ b/settled-merchant-master/dist.zip