From 8f44cd4e2d7098d707c3cb2b22bc6579a424a674 Mon Sep 17 00:00:00 2001 From: lion <120344285@qq.com> Date: Mon, 3 Apr 2023 13:28:43 +0800 Subject: [PATCH] upup --- config.js | 8 ++--- .../pages/shopDetail/shopDetail.vue | 8 ++--- .../packageBuy/pages/shopList/shopList.vue | 8 ++--- .../pages/careCenter/careCenter.vue | 33 +++++++++++-------- .../pages/commonService/commonCenter.vue | 31 +++++++++-------- pages/active/active.vue | 10 +++--- pages/active/detail.vue | 8 ++--- pages/active/my.vue | 6 ++-- pages/home/home.vue | 8 ++--- 9 files changed, 65 insertions(+), 55 deletions(-) diff --git a/config.js b/config.js index 2968860..76bbd47 100644 --- a/config.js +++ b/config.js @@ -3,11 +3,11 @@ export const appConfig = { //appId:"wx3dc65ce9b588727a",//孕育咨询 //baseUrl: 'http://yunyubang.localhost.com', - // baseUrl:'https://yunyubang.ali251.langye.net',// 'https://yunyubang2021.langye.net', //孕育邦 - baseUrl: 'https://yybtest.ali251.langye.net', + baseUrl:'https://yunyubang.ali251.langye.net',// 'https://yunyubang2021.langye.net', //孕育邦 + // baseUrl: 'https://yybtest.ali251.langye.net', - // newBaseUrl: 'https://yunyubang.ali251.langye.net', - newBaseUrl: 'http://yybtest.ali251.langye.net', + newBaseUrl: 'https://yunyubang.ali251.langye.net', + // newBaseUrl: 'http://yybtest.ali251.langye.net', //baseUrl:'https://yybtest2021.langye.net',//孕育咨询 openidInfoKey: 'openid_info_yunyubang' diff --git a/packages/packageBuy/pages/shopDetail/shopDetail.vue b/packages/packageBuy/pages/shopDetail/shopDetail.vue index 5714566..0960b09 100644 --- a/packages/packageBuy/pages/shopDetail/shopDetail.vue +++ b/packages/packageBuy/pages/shopDetail/shopDetail.vue @@ -1503,13 +1503,13 @@ border-bottom: 2rpx solid #EAEAEA; .imgOuter { - width: 260rpx; - height: 210rpx; + width: 280rpx; + height: 200rpx; position: relative; image { - width: 260rpx; - height: 210rpx; + width: 280rpx; + height: 200rpx; border-radius: 5rpx; } diff --git a/packages/packageBuy/pages/shopList/shopList.vue b/packages/packageBuy/pages/shopList/shopList.vue index 2c9c451..200cb9c 100644 --- a/packages/packageBuy/pages/shopList/shopList.vue +++ b/packages/packageBuy/pages/shopList/shopList.vue @@ -319,13 +319,13 @@ border-bottom: 2rpx solid #EAEAEA; .imgOuter { - width: 260rpx; - height: 210rpx; + width: 280rpx; + height: 200rpx; position: relative; image { - width: 260rpx; - height: 210rpx; + width: 280rpx; + height: 200rpx; border-radius: 5rpx; } diff --git a/packages/packageCarecenter/pages/careCenter/careCenter.vue b/packages/packageCarecenter/pages/careCenter/careCenter.vue index 1045f06..62d8017 100644 --- a/packages/packageCarecenter/pages/careCenter/careCenter.vue +++ b/packages/packageCarecenter/pages/careCenter/careCenter.vue @@ -381,21 +381,26 @@ } }, distanceComputed() { - return function(dis) { - if (dis) { - if (dis.indexOf('km') !== -1) { - let dism = dis.split('km')[0]*1000 - if(dism<1000){ - return Number(dism).toFixed(1) + 'm' - }else{ - return Number(dis.split('km')[0]).toFixed(1) + 'km' - } - - } - if (dis.indexOf('m') !== -1) { - return Number(dis.split('m')[0]).toFixed(1) + 'm' - } + return function(dis) { + if(dis<1){ + return dis*1000 + 'm' + }else{ + return dis + 'km' } + // if (dis) { + // if (dis.indexOf('km') !== -1) { + // let dism = dis.split('km')[0]*1000 + // if(dism<1000){ + // return Number(dism).toFixed(1) + 'm' + // }else{ + // return Number(dis.split('km')[0]).toFixed(1) + 'km' + // } + + // } + // if (dis.indexOf('m') !== -1) { + // return Number(dis.split('m')[0]).toFixed(1) + 'm' + // } + // } } } }, diff --git a/packages/packageCarecenter/pages/commonService/commonCenter.vue b/packages/packageCarecenter/pages/commonService/commonCenter.vue index 3b71b22..f781737 100644 --- a/packages/packageCarecenter/pages/commonService/commonCenter.vue +++ b/packages/packageCarecenter/pages/commonService/commonCenter.vue @@ -386,20 +386,25 @@ } }, distanceComputed() { - return function(dis) { - if (dis) { - if (dis.indexOf('km') !== -1) { - let dism = dis.split('km')[0]*1000 - if(dism<1000){ - return Number(dism).toFixed(1) + 'm' - }else{ - return Number(dis.split('km')[0]).toFixed(1) + 'km' - } - } - if (dis.indexOf('m') !== -1) { - return Number(dis.split('m')[0]).toFixed(1) + 'm' - } + return function(dis) { + if(dis<1){ + return dis*1000 + 'm' + }else{ + return dis + 'km' } + // if (dis) { + // if (dis.indexOf('km') !== -1) { + // let dism = dis.split('km')[0]*1000 + // if(dism<1000){ + // return Number(dism).toFixed(1) + 'm' + // }else{ + // return Number(dis.split('km')[0]).toFixed(1) + 'km' + // } + // } + // if (dis.indexOf('m') !== -1) { + // return Number(dis.split('m')[0]).toFixed(1) + 'm' + // } + // } } } }, diff --git a/pages/active/active.vue b/pages/active/active.vue index 8512752..9d9609b 100644 --- a/pages/active/active.vue +++ b/pages/active/active.vue @@ -52,7 +52,7 @@ {{item.address}} - {{item.start_date}} {{item.end_date}} + {{$u.timeFormat(item.start_date+' 00:00:00', 'yyyy年mm月dd日')}}至{{$u.timeFormat(item.end_date+' 00:00:00', 'yyyy年mm月dd日')}} @@ -318,13 +318,13 @@ border-bottom: 2rpx solid #EAEAEA; .imgOuter { - width: 260rpx; - height: 210rpx; + width: 280rpx; + height: 200rpx; position: relative; image { - width: 260rpx; - height: 210rpx; + width: 280rpx; + height: 200rpx; border-radius: 5rpx; } diff --git a/pages/active/detail.vue b/pages/active/detail.vue index 8ee7365..2cac2b6 100644 --- a/pages/active/detail.vue +++ b/pages/active/detail.vue @@ -83,7 +83,7 @@ - {{info.start_date}} {{info.start_time}} + {{$u.timeFormat(info.start_date+' 00:00:00', 'yyyy年mm月dd日')}} {{info.start_time}} @@ -92,7 +92,7 @@ - {{info.end_date}} {{info.end_time}} + {{$u.timeFormat(info.end_date+' 00:00:00', 'yyyy年mm月dd日')}} {{info.end_time}} @@ -124,7 +124,7 @@ - {{info.apply_start}} + {{$u.timeFormat(info.apply_start, 'yyyy年mm月dd日 hh:MM:ss')}} @@ -133,7 +133,7 @@ - {{info.apply_end}} + {{$u.timeFormat(info.apply_end, 'yyyy年mm月dd日 hh:MM:ss')}} diff --git a/pages/active/my.vue b/pages/active/my.vue index dfa225e..a353513 100644 --- a/pages/active/my.vue +++ b/pages/active/my.vue @@ -33,7 +33,7 @@ - {{item.start_date}} {{item.start_time}} + {{$u.timeFormat(item.start_date+' 00:00:00', 'yyyy年mm月dd日')}} {{item.start_time}} @@ -41,8 +41,8 @@ 结束时间： - - {{item.end_date}} {{item.end_time}} + + {{$u.timeFormat(item.end_date+' 00:00:00', 'yyyy年mm月dd日')}} {{item.end_time}} diff --git a/pages/home/home.vue b/pages/home/home.vue index cc8b6d9..62dd943 100644 --- a/pages/home/home.vue +++ b/pages/home/home.vue @@ -453,13 +453,13 @@ border-bottom: 2rpx solid #EAEAEA; .imgOuter { - width: 260rpx; - height: 210rpx; + width: 280rpx; + height: 200rpx; position: relative; image { - width: 260rpx; - height: 210rpx; + width: 280rpx; + height: 200rpx; border-radius: 5rpx; }