diff --git a/.DS_Store b/.DS_Store index 3d5ec3d..5a86ea1 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/config.js b/config.js index dd2f3a5..76bbd47 100644 --- a/config.js +++ b/config.js @@ -4,10 +4,10 @@ export const appConfig = { //baseUrl: 'http://yunyubang.localhost.com', baseUrl:'https://yunyubang.ali251.langye.net',// 'https://yunyubang2021.langye.net', //孕育邦 - //baseUrl: 'https://yybtest.ali251.langye.net', + // baseUrl: 'https://yybtest.ali251.langye.net', newBaseUrl: 'https://yunyubang.ali251.langye.net', - //newBaseUrl: 'http://yybtest.ali251.langye.net', + // newBaseUrl: 'http://yybtest.ali251.langye.net', //baseUrl:'https://yybtest2021.langye.net',//孕育咨询 openidInfoKey: 'openid_info_yunyubang' diff --git a/packages/packageCarecenter/pages/commonService/commonCenter.vue b/packages/packageCarecenter/pages/commonService/commonCenter.vue index fda740f..9d99db7 100644 --- a/packages/packageCarecenter/pages/commonService/commonCenter.vue +++ b/packages/packageCarecenter/pages/commonService/commonCenter.vue @@ -23,6 +23,10 @@ + + + + @@ -193,7 +197,13 @@ strategies: [], //攻略 } }, - methods: { + methods: { + goto(type){ + let url = type==1?"/packages/packageCarecenter/pages/careCenter/careCenter":"/packages/packageCarecenter/pages/commonService/commonCenter?type=maternity"; + uni.redirectTo({ + url:url + }) + }, changeSearchArea(e) { this.search.areaName = (e === "" ? "全部区域" : e); if (this.tabIndex === 1) { @@ -428,11 +438,12 @@ justify-content: center; } - .careBanner { - display: block; - width: 690rpx; - height: 220rpx; - margin: 20rpx auto; + .careBanner { + display: inline-block; + width: 357rpx; + height: 182rpx; + margin: 20rpx auto; + margin-bottom:0 } .strategyBox { diff --git a/packages/packageOrder/pages/myOrder/myOrder.vue b/packages/packageOrder/pages/myOrder/myOrder.vue index 723438a..425ba12 100644 --- a/packages/packageOrder/pages/myOrder/myOrder.vue +++ b/packages/packageOrder/pages/myOrder/myOrder.vue @@ -26,7 +26,7 @@ - {{timeFormat(item.created_at, 'yyyy年mm月dd日')}} + {{$u.timeFormat(item.created_at, 'yyyy年mm月dd日')}} ¥{{item.total}} diff --git a/pages/active/detail.vue b/pages/active/detail.vue index 9a0fabc..0fb541d 100644 --- a/pages/active/detail.vue +++ b/pages/active/detail.vue @@ -52,22 +52,40 @@ - - 活动时间: + + + + 开始时间: + + + + {{info.start_date}} {{info.start_time}} + + + + + 结束时间: + - - {{info.start_date}} {{info.start_time}} ~ {{info.end_date}} {{info.end_time}} + + {{info.end_date}} {{info.end_time}} - - 活动地点: + + + + 活动地点: + - + {{info.address}} - - 参与人数: + + + + 参与人数: + - + {{info.member_sum}} @@ -1368,8 +1386,13 @@ width: 100%; box-sizing: border-box; - ul-col:nth-of-type(2n){ - color:red + u-col{ + image{ + width: 26rpx; + height: 26rpx; + display: inline-block; + margin-right: 12rpx; + } } } .details { diff --git a/pages/active/my.vue b/pages/active/my.vue index 8038126..dfa225e 100644 --- a/pages/active/my.vue +++ b/pages/active/my.vue @@ -8,41 +8,83 @@ - {{item.txt}}    - + - {{item.order_name || '暂无'}} + {{item.active_name || '暂无'}} - {{item.statusName}} - - - - - - {{timeFormat(item.created_at, 'yyyy年mm月dd日')}} - - ¥{{item.total}} + + {{item.statusName}} + + + + + + + 开始时间: + + + + {{item.start_date}} {{item.start_time}} + + + + + 结束时间: + + + + {{item.end_date}} {{item.end_time}} + + + + + 活动地点: + + + + {{item.address}} + + + - + + 核销码 查看 - 支付 - + + + {{list.length>0?"":"暂无数据"}} - + + + + + + 核销码:{{codetext}} + + + + + + + + + + 待付款 @@ -77,7 +119,8 @@