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/App.vue b/admin-web-master/src/App.vue index 896be6f..441f9f0 100644 --- a/admin-web-master/src/App.vue +++ b/admin-web-master/src/App.vue @@ -78,7 +78,7 @@ path: '/investigation/index' }) - }) + }) }, diff --git a/admin-web-master/src/components/add/addmap.vue b/admin-web-master/src/components/add/addmap.vue index dd26e4d..e381fd2 100644 --- a/admin-web-master/src/components/add/addmap.vue +++ b/admin-web-master/src/components/add/addmap.vue @@ -26,7 +26,7 @@ --> - + diff --git a/admin-web-master/src/components/buscha/busCha.vue b/admin-web-master/src/components/buscha/busCha.vue index aaabf86..1a502b2 100644 --- a/admin-web-master/src/components/buscha/busCha.vue +++ b/admin-web-master/src/components/buscha/busCha.vue @@ -201,7 +201,7 @@
- + diff --git a/ceres-uniapp-master/components/canvasShow/basics/banner.vue b/ceres-uniapp-master/components/canvasShow/basics/banner.vue index 8ac07e5..3149930 100644 --- a/ceres-uniapp-master/components/canvasShow/basics/banner.vue +++ b/ceres-uniapp-master/components/canvasShow/basics/banner.vue @@ -44,7 +44,7 @@ NET.request2(API.cereCarouselImage, pagesize, 'POST').then(res => { res.data.content.map(item=>{ if(item.state ==1){ - item.imageUrl ='https://zhgw-uat.028wlkj.com/cdwlMall/zsfwzxt/lb/f96559b3-949e-49f3-9db0-72dc59795b0f-0c5150bb-7419-43e2-a8b0-e57c305eb99b-%E5%BE%AE%E4%BF%A1%E5%9B%BE%E7%89%87_20250110172248.jpg' + item.imageUrl ='https://zhgw-uat.028wlkj.com/cdwlMall/zsfwzxt/sp/6fcdaf60-9442-4172-8247-9869761aa247-0c5150bb-7419-43e2-a8b0-e57c305eb99b-微信图片_20250110172248.jpg' item.jumpUrl = '' } 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..7b93e40 100644 --- a/ceres-uniapp-master/config/api.js +++ b/ceres-uniapp-master/config/api.js @@ -1,12 +1,12 @@ // 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 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 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}` 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..3f0fb88 --- /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..cf1895f --- /dev/null +++ b/lvdao-miniapp/pagesA/PunchInAct/PunchInSetting.vue @@ -0,0 +1,494 @@ + + + + + \ No newline at end of file diff --git a/lvdao-miniapp/pagesA/myZiyuan/addMyshop.vue b/lvdao-miniapp/pagesA/myZiyuan/addMyshop.vue index 5d9f941..9c60fb2 100644 --- a/lvdao-miniapp/pagesA/myZiyuan/addMyshop.vue +++ b/lvdao-miniapp/pagesA/myZiyuan/addMyshop.vue @@ -162,7 +162,8 @@ pageindex: { pageNumber: 0, pageSize: 100, - contactNumber:'' + contactNumber:'', + dataStatus:"1" }, ids:'', showUp:true diff --git a/lvdao-miniapp/pagesA/weball/shopweb.vue b/lvdao-miniapp/pagesA/weball/shopweb.vue new file mode 100644 index 0000000..db1c95d --- /dev/null +++ b/lvdao-miniapp/pagesA/weball/shopweb.vue @@ -0,0 +1,28 @@ + + + + + diff --git a/lvdao-miniapp/utils/request.js b/lvdao-miniapp/utils/request.js index d54f4cc..b6a9b4c 100644 --- a/lvdao-miniapp/utils/request.js +++ b/lvdao-miniapp/utils/request.js @@ -20,8 +20,8 @@ const sendRequest = (url, method = 'GET', data = {}, baseUrl,contentType) => { // bases = 'http://172.16.61.123/cdwlMall/admin-server' + url; // 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; 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