From b22db9a73c1f229477dc96807d7cdd02915182da Mon Sep 17 00:00:00 2001 From: chen <2659004835@qq.com> Date: Fri, 18 Feb 2022 21:20:26 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=AE=A2=E5=8D=95=E5=88=97?= =?UTF-8?q?=E8=A1=A8=EF=BC=8C=E8=AE=A2=E5=8D=95=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- commons/hengmei.css | 2 + commons/icon-font.css | 10 +- components/cate-items/cate-tu.vue | 10 - components/detail-bottom-nav/bottom-nav.vue | 52 +- components/list-doctor.vue | 7 +- components/list-pu.vue | 9 +- components/payment-subgroup/payment.vue | 27 + pages.json | 241 +------ pages/tabbar/cate/cate.vue | 8 +- pagesA/activityTask/activityTask.vue | 250 -------- pagesA/coupon/coupon.vue | 199 ------ pagesA/getReadyDan/getReadyDan.vue | 131 ++-- pagesA/immediatePayment/immediatePayment.vue | 221 ------- pagesA/integralManage/integralManage.vue | 189 ------ .../makeAnPppointment/makeAnPppointment.vue | 148 ----- pagesA/member/member.vue | 181 ------ pagesA/my-diary-edit/my-diary-edit.vue | 285 --------- pagesA/my-diary/my-diary.vue | 116 ---- pagesA/myAddress/myAddress.vue | 6 +- pagesA/myOrder/myOrder.vue | 261 ++------ pagesA/peacockCoin/peacockCoin.vue | 230 ------- pagesA/pointsMall/pointsMall.vue | 228 ------- pagesA/ppointmentEv/ppointmentEv.vue | 301 --------- pagesA/shopCart/shopCart.vue | 310 --------- pagesA/signIn/signIn.vue | 189 ------ pagesA/suggestions/suggestions.vue | 213 ------- pagesB/aboutUs/aboutUs.vue | 4 +- pagesB/articleDetail/articleDetail.vue | 288 --------- pagesB/customer/customer.vue | 53 -- pagesB/customerCheck/customerCheck.vue | 171 ----- pagesB/customerList/customerList.vue | 380 ----------- pagesB/doctor/doctor.vue | 177 ------ pagesB/doctorDetail/doctorDetail.vue | 279 -------- pagesB/messagecenter/messagecenter.vue | 210 ------- pagesB/myCollection/myCollection.vue | 449 ------------- pagesB/mysharer/mysharer.vue | 188 ------ pagesB/orderDetail/orderDetail.vue | 6 +- pagesB/personalPoster/personalPoster.vue | 223 ------- pagesB/problemDetail/problemDetail.vue | 591 ----------------- pagesB/searchPage/searchPage.vue | 7 +- pagesB/sharingCenter/sharingCenter.vue | 195 ------ pagesB/shopDetail/shopDetail.vue | 593 +----------------- pagesB/shopSearch/shopSearch.vue | 438 ------------- pagesB/userFootprint/userFootprint.vue | 177 ------ 44 files changed, 253 insertions(+), 8000 deletions(-) create mode 100644 components/payment-subgroup/payment.vue delete mode 100644 pagesA/activityTask/activityTask.vue delete mode 100644 pagesA/coupon/coupon.vue delete mode 100644 pagesA/immediatePayment/immediatePayment.vue delete mode 100644 pagesA/integralManage/integralManage.vue delete mode 100644 pagesA/makeAnPppointment/makeAnPppointment.vue delete mode 100644 pagesA/member/member.vue delete mode 100644 pagesA/my-diary-edit/my-diary-edit.vue delete mode 100644 pagesA/my-diary/my-diary.vue delete mode 100644 pagesA/peacockCoin/peacockCoin.vue delete mode 100644 pagesA/pointsMall/pointsMall.vue delete mode 100644 pagesA/ppointmentEv/ppointmentEv.vue delete mode 100644 pagesA/shopCart/shopCart.vue delete mode 100644 pagesA/signIn/signIn.vue delete mode 100644 pagesA/suggestions/suggestions.vue delete mode 100644 pagesB/articleDetail/articleDetail.vue delete mode 100644 pagesB/customer/customer.vue delete mode 100644 pagesB/customerCheck/customerCheck.vue delete mode 100644 pagesB/customerList/customerList.vue delete mode 100644 pagesB/doctor/doctor.vue delete mode 100644 pagesB/doctorDetail/doctorDetail.vue delete mode 100644 pagesB/messagecenter/messagecenter.vue delete mode 100644 pagesB/myCollection/myCollection.vue delete mode 100644 pagesB/mysharer/mysharer.vue delete mode 100644 pagesB/personalPoster/personalPoster.vue delete mode 100644 pagesB/problemDetail/problemDetail.vue delete mode 100644 pagesB/sharingCenter/sharingCenter.vue delete mode 100644 pagesB/shopSearch/shopSearch.vue delete mode 100644 pagesB/userFootprint/userFootprint.vue diff --git a/commons/hengmei.css b/commons/hengmei.css index 96ca8f7..be64797 100644 --- a/commons/hengmei.css +++ b/commons/hengmei.css @@ -401,6 +401,7 @@ button:after{content: none!important;} /* 字体颜色 */ .colf{color: #FFFFFF;} +.colf6{color: #f6f6f6;} .colb{color: #000000;} .colc{color: #CCCCCC;} .col3{color: #333333;} @@ -440,6 +441,7 @@ button:after{content: none!important;} .bcdb{background-color: #DBDBDB;} .bcf8{background: #F85050;} .bacf5{background: #F5F5F5;} +.bacf6{background-color: #f6f6f6;} /* 圆角 */ .radius10{border-radius: 10rpx;} diff --git a/commons/icon-font.css b/commons/icon-font.css index 95e2557..9c3f2bc 100644 --- a/commons/icon-font.css +++ b/commons/icon-font.css @@ -1,8 +1,8 @@ @font-face { font-family: "iconfont"; /* Project id 3180711 */ - src: url('https://at.alicdn.com/t/font_3180711_uyflswe9ahn.woff2?t=1645085513026') format('woff2'), - url('https://at.alicdn.com/t/font_3180711_uyflswe9ahn.woff?t=1645085513026') format('woff'), - url('https://at.alicdn.com/t/font_3180711_uyflswe9ahn.ttf?t=1645085513026') format('truetype'); + src: url('https://at.alicdn.com/t/font_3180711_o717yf8virj.woff2?t=1645176467979') format('woff2'), + url('https://at.alicdn.com/t/font_3180711_o717yf8virj.woff?t=1645176467979') format('woff'), + url('https://at.alicdn.com/t/font_3180711_o717yf8virj.ttf?t=1645176467979') format('truetype'); } .icon { @@ -13,6 +13,10 @@ -moz-osx-font-smoothing: grayscale; } +.icon-navigate-now:before { + content: "\e640"; +} + .icon-send-goods:before { content: "\e601"; } diff --git a/components/cate-items/cate-tu.vue b/components/cate-items/cate-tu.vue index 810b988..eea330c 100644 --- a/components/cate-items/cate-tu.vue +++ b/components/cate-items/cate-tu.vue @@ -41,16 +41,6 @@ // console.log('一级索引：',e1); // console.log('二级索引：',e2); // console.log(this.list[e1].list[e2].content); - if(this.isDetail){ - uni.navigateTo({ - url:`/pagesB/problemDetail/problemDetail?id=${this.list[e1].list[e2].id}&category_id=${this.list[e1].list[e2].category_id}` - }) - } else { - uni.navigateTo({ - url:`/pagesB/searchPage/searchPage?keyWorld=${this.list[e1].list[e2].content}` - }) - } - }, delSearch(){ // this.list = [] diff --git a/components/detail-bottom-nav/bottom-nav.vue b/components/detail-bottom-nav/bottom-nav.vue index 2c4b19b..e16c1fe 100644 --- a/components/detail-bottom-nav/bottom-nav.vue +++ b/components/detail-bottom-nav/bottom-nav.vue @@ -2,12 +2,12 @@ - - + + - - + + @@ -30,13 +30,24 @@ - - - - + 库存：99 + + + + + + + + + + + + + + + - @@ -52,6 +63,7 @@ }, data() { return { + showFrame:false, dropObj:{ title:'尺寸', childrenList:[ @@ -65,17 +77,32 @@ } ] }, + buyNum:1 }; }, methods:{ + immediatelyBuy(){ + uni.navigateTo({ + url:`/pagesA/getReadyDan/getReadyDan` + }) + }, chooseItem(e){ this.log(e) + }, + // 数量加减事件 + deladdEvent(index){ + if(index==0){//减少数量 + this.buyNum-- + } else {//增加数量 + this.buyNum++ + } } } } diff --git a/components/list-doctor.vue b/components/list-doctor.vue index 0f6b9a0..a212037 100644 --- a/components/list-doctor.vue +++ b/components/list-doctor.vue @@ -49,12 +49,7 @@ }, methods:{ chooseDoctor(index){//选择医生事件 - console.log(this.list[index].id); - if(this.list[index].show_detail==1){ - uni.navigateTo({ - url:'/pagesB/doctorDetail/doctorDetail?doctor_id='+this.list[index].id - }) - } else this.$toolAll.tools.showToast('禁止查看该医生信息') + }, } } diff --git a/components/list-pu.vue b/components/list-pu.vue index 7b2a36b..a91c4f8 100644 --- a/components/list-pu.vue +++ b/components/list-pu.vue @@ -127,14 +127,7 @@ if(e==0) this.vision = false }, goDetail(index){//查看详情 - if(this.jieDuan==false){ - let isAuth = this.$toolAll.tools.returnAuth() - if(!isAuth){ - uni.navigateTo({ - url:'/pagesB/problemDetail/problemDetail?id='+this.list[index].id+'&category_id='+this.list[index].category_id - }) - } else this.jieDuan = true - } + }, chooseLike(index){//喜欢不喜欢事件 // console.log('喜欢不喜欢：',index); diff --git a/components/payment-subgroup/payment.vue b/components/payment-subgroup/payment.vue new file mode 100644 index 0000000..ca215bc --- /dev/null +++ b/components/payment-subgroup/payment.vue @@ -0,0 +1,27 @@ + + + + + diff --git a/pages.json b/pages.json index 7a27b05..b8b7a70 100644 --- a/pages.json +++ b/pages.json @@ -3,21 +3,24 @@ { "path" : "pages/tabbar/pagehome/pagehome", "style" :{} - },{ + } + ,{ "path" : "pages/tabbar/my/my", "style" :{} - },{ + } + ,{ "path" : "pages/login/login", - "style" :{ - "navigationBarTextStyle":"black" //状态栏字体颜色 - } - },{ + "style" :{} + } + ,{ "path" : "pages/tabbar/cate/cate", "style" : {} - },{ + } + ,{ "path": "pages/login/agreement", "style" :{} - },{ + } + ,{ "path" : "pages/tabbar/cart/cart", "style" :{} } @@ -31,142 +34,17 @@ "style" : {} } ,{ - "path" : "makeAnPppointment/makeAnPppointment",//自主预约列表 - "style" : {} - } - ,{ - "path" : "ppointmentEv/ppointmentEv",//提交自主预约 - "style" :{} - } - ,{ - "path" : "suggestions/suggestions",//投诉及建议 - "style" : {} - } - ,{ - "path" : "shopCart/shopCart", - "style" : - { - "navigationBarTitleText": "", - "enablePullDownRefresh": false - } - - } - ,{ "path" : "getReadyDan/getReadyDan", - "style" : - { - "navigationBarTitleText": "", - "enablePullDownRefresh": false - } + "style" : {} } - ,{ - "path" : "immediatePayment/immediatePayment", - "style" : - { - "navigationBarTitleText": "", - "enablePullDownRefresh": false - } - - } - ,{ - "path" : "member/member", - "style" : - { - "navigationBarTitleText": "", - "enablePullDownRefresh": false - } - - } - ,{ - "path" : "integralManage/integralManage", - "style" : - { - "navigationBarTitleText": "", - "enablePullDownRefresh": false - } - - } - ,{ - "path" : "peacockCoin/peacockCoin", - "style" : - { - "navigationBarTitleText": "", - "enablePullDownRefresh": false - } - - } - ,{ - "path" : "signIn/signIn", - "style" : - { - "navigationBarTitleText": "", - "enablePullDownRefresh": false - } - - } - ,{ + ,{ "path" : "myOrder/myOrder", - "style" : - { - "navigationBarTitleText": "", - "enablePullDownRefresh": false + "style" : {} } - - } - ,{ + ,{ "path" : "myAddress/myAddress", - "style" : - { - "navigationBarTitleText": "", - "enablePullDownRefresh": false - } - - } - ,{ - "path" : "activityTask/activityTask", - "style" : - { - "navigationBarTitleText": "", - "enablePullDownRefresh": false - } - - } - ,{ - "path" : "coupon/coupon", - "style" : - { - "navigationBarTitleText": "", - "enablePullDownRefresh": false - } - - } - ,{ - "path" : "pointsMall/pointsMall", - "style" : - { - "navigationBarTitleText": "", - "enablePullDownRefresh": false - } - - } - ,{ - "path" : "my-diary/my-diary", - "style" : - { - "navigationBarTitleText": "", - "enablePullDownRefresh": false - } - - } - ,{ - "path" : "my-diary-edit/my-diary-edit", - "style" : - { - "navigationBarTitleText": "", - "enablePullDownRefresh": false - } - + "style" : {} } ] }, @@ -177,95 +55,22 @@ "path" : "searchPage/searchPage",//搜索页 "style" :{} } - ,{ - "path" : "mysharer/mysharer",//我的分享人 - "style" :{} - } - ,{ - "path" : "messagecenter/messagecenter",//消息中心 - "style" : {} - } - ,{ - "path" : "myCollection/myCollection",//我的收藏 - "style" : {} - } - ,{ - "path" : "customerList/customerList",//客户列表 - "style" : {} - } - ,{ - "path" : "userFootprint/userFootprint",//用户足迹 - "style" : {} - } - ,{ - "path" : "personalPoster/personalPoster",//二维码海报 - "style" : {} - },{ - "path" : "sharingCenter/sharingCenter",//分享中心 - "style" : {} - } - ,{ + ,{ "path" : "aboutUs/aboutUs",//关于我们 "style" : {} } - ,{ - "path" : "articleDetail/articleDetail",//详情 - "style" : {} - } - ,{ - "path" : "doctor/doctor",//医生列表 - "style" : {} - } - ,{ - "path" : "doctorDetail/doctorDetail",//医生详情 - "style" :{} - } - ,{ - "path" : "problemDetail/problemDetail",//问题分类详情 - "style" : {} - }, - { + ,{ "path":"video/playVideo", "style":{} - }, - { - "path":"customer/customer", - "style":{} } - ,{ + ,{ "path" : "shopDetail/shopDetail", - "style" : - { - "navigationBarTitleText": "", - "enablePullDownRefresh": false - } + "style" : {} } - ,{ + ,{ "path" : "orderDetail/orderDetail", - "style" : - { - "navigationBarTitleText": "", - "enablePullDownRefresh": false - } - - } - ,{ - "path" : "customerCheck/customerCheck", - "style" : - { - "navigationBarTitleText": "", - "enablePullDownRefresh": false - } - - } - ,{ - "path" : "shopSearch/shopSearch", - "style" : - { - "navigationBarTitleText": "", - "enablePullDownRefresh": false - } + "style" : {} } ] @@ -279,7 +84,7 @@ }, "globalStyle": { "navigationBarTextStyle": "black", - "navigationBarTitleText": "恒美", + "navigationBarTitleText": "佩利商城", "navigationBarBackgroundColor": "#FFFFFF",//导航栏背景色 "backgroundColor": "#FFFFFF",//窗口背景色 "navigationStyle":"custom"//去掉所有原生导航栏 diff --git a/pages/tabbar/cate/cate.vue b/pages/tabbar/cate/cate.vue index d13b489..328df04 100644 --- a/pages/tabbar/cate/cate.vue +++ b/pages/tabbar/cate/cate.vue @@ -6,8 +6,8 @@ :ifReturn="false" :ifCenter="true" :navBarTitle="'分类'"> - - + + 分类筛选 @@ -23,7 +23,7 @@ - + 筛选 @@ -77,7 +77,7 @@ }, data() { return { - statusBarHeight:uni.getSystemInfoSync().statusBarHeight, + statusBarHeight:uni.getSystemInfoSync().statusBarHeight + 50, publicColor:uni.getStorageSync('publicColor'), chooseCateList:[],//选中的分类列表 temporaryCate:[],//暂存分类数据 diff --git a/pagesA/activityTask/activityTask.vue b/pagesA/activityTask/activityTask.vue deleted file mode 100644 index d6a53e8..0000000 --- a/pagesA/activityTask/activityTask.vue +++ /dev/null @@ -1,250 +0,0 @@ - - - - - diff --git a/pagesA/coupon/coupon.vue b/pagesA/coupon/coupon.vue deleted file mode 100644 index 6ec8352..0000000 --- a/pagesA/coupon/coupon.vue +++ /dev/null @@ -1,199 +0,0 @@ - - - - - diff --git a/pagesA/getReadyDan/getReadyDan.vue b/pagesA/getReadyDan/getReadyDan.vue index 7d75b15..9bdb5bc 100644 --- a/pagesA/getReadyDan/getReadyDan.vue +++ b/pagesA/getReadyDan/getReadyDan.vue @@ -1,105 +1,82 @@ diff --git a/pagesA/immediatePayment/immediatePayment.vue b/pagesA/immediatePayment/immediatePayment.vue deleted file mode 100644 index e9c3acc..0000000 --- a/pagesA/immediatePayment/immediatePayment.vue +++ /dev/null @@ -1,221 +0,0 @@ - - - - - diff --git a/pagesA/integralManage/integralManage.vue b/pagesA/integralManage/integralManage.vue deleted file mode 100644 index f371518..0000000 --- a/pagesA/integralManage/integralManage.vue +++ /dev/null @@ -1,189 +0,0 @@ - - - - - diff --git a/pagesA/makeAnPppointment/makeAnPppointment.vue b/pagesA/makeAnPppointment/makeAnPppointment.vue deleted file mode 100644 index 783b597..0000000 --- a/pagesA/makeAnPppointment/makeAnPppointment.vue +++ /dev/null @@ -1,148 +0,0 @@ - - - - - diff --git a/pagesA/member/member.vue b/pagesA/member/member.vue deleted file mode 100644 index fe21ba3..0000000 --- a/pagesA/member/member.vue +++ /dev/null @@ -1,181 +0,0 @@ - - - - - diff --git a/pagesA/my-diary-edit/my-diary-edit.vue b/pagesA/my-diary-edit/my-diary-edit.vue deleted file mode 100644 index efd01ce..0000000 --- a/pagesA/my-diary-edit/my-diary-edit.vue +++ /dev/null @@ -1,285 +0,0 @@ -