From 7d8d4e26b15b2cb74b0d4284543cb7a04a676ad8 Mon Sep 17 00:00:00 2001 From: chen <2659004835@qq.com> Date: Thu, 18 Nov 2021 17:24:38 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=97=E8=A1=A8=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E5=8F=91=E5=B8=83=E8=80=85=E5=A4=B4=E5=83=8F=E3=80=81?= =?UTF-8?q?=E6=98=B5=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages.json | 276 +++---- pages/tabbar/cate/cate.vue | 6 +- pages/tabbar/pagehome/pagehome.vue | 6 +- pagesA/getReadyDan/getReadyDan.vue | 187 ----- pagesA/immediatePayment/immediatePayment.vue | 95 --- pagesA/shopCart/shopCart.vue | 120 ---- pagesB/doctorDetail/doctorDetail.vue | 6 +- pagesB/myCollection/myCollection.vue | 6 +- pagesB/orderDetail/orderDetail.vue | 185 ----- pagesB/problemDetail/problemDetail.vue | 18 +- pagesB/searchPage/searchPage.vue | 6 +- pagesB/shopDetail/shopDetail.vue | 719 ------------------- 12 files changed, 137 insertions(+), 1493 deletions(-) delete mode 100644 pagesA/getReadyDan/getReadyDan.vue delete mode 100644 pagesA/immediatePayment/immediatePayment.vue delete mode 100644 pagesA/shopCart/shopCart.vue delete mode 100644 pagesB/orderDetail/orderDetail.vue delete mode 100644 pagesB/shopDetail/shopDetail.vue diff --git a/pages.json b/pages.json index 048b7e3..d268953 100644 --- a/pages.json +++ b/pages.json @@ -1,183 +1,117 @@ { - "pages": [ - { - "path" : "pages/tabbar/pagehome/pagehome", - "style" :{} - },{ - "path" : "pages/login/login", - "style" :{ - "navigationBarTextStyle":"black" //状态栏字体颜色 + "pages": [{ + "path": "pages/tabbar/pagehome/pagehome", + "style": {} + }, { + "path": "pages/login/login", + "style": { + "navigationBarTextStyle": "black" //状态栏字体颜色 } - },{ - "path" : "pages/tabbar/my/my", - "style" :{} + }, { + "path": "pages/tabbar/my/my", + "style": {} }, { - "path" : "pages/tabbar/shop/shop", - "style" :{} - }, - { - "path" : "pages/tabbar/cate/cate", - "style" : {} - }, - + "path": "pages/tabbar/shop/shop", + "style": {} + }, { - "path":"pages/login/xiey", - "style" :{} - } - ], - "subPackages": [ - {//A包 - "root": "pagesA", - "pages": [ - { - "path" : "nodifyData/nodifyData",//修改资料 - "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 - } - - } - ,{ - "path" : "immediatePayment/immediatePayment", - "style" : - { - "navigationBarTitleText": "", - "enablePullDownRefresh": false - } - - } - ] - }, - {//B包 - "root": "pagesB", - "pages": [ - { - "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 - } - - } - ,{ - "path" : "orderDetail/orderDetail", - "style" : - { - "navigationBarTitleText": "", - "enablePullDownRefresh": false - } - - } - ,{ - "path" : "customerCheck/customerCheck", - "style" : - { - "navigationBarTitleText": "", - "enablePullDownRefresh": false - } - - } - ] + "path": "pages/tabbar/cate/cate", + "style": {} + }, + + { + "path": "pages/login/xiey", + "style": {} } ], - "preloadRule": { - "pages/tabbar/pagehome/pagehome": { - "network": "all", - "packages": ["pagesA"] - } - }, + "subPackages": [{ //A包 + "root": "pagesA", + "pages": [{ + "path": "nodifyData/nodifyData", //修改资料 + "style": {} + }, { + "path": "makeAnPppointment/makeAnPppointment", //自主预约列表 + "style": {} + }, { + "path": "ppointmentEv/ppointmentEv", //提交自主预约 + "style": {} + }, { + "path": "suggestions/suggestions", //投诉及建议 + "style": {} + }] + }, + { //B包 + "root": "pagesB", + "pages": [{ + "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": "customerCheck/customerCheck", + "style": { + "navigationBarTitleText": "", + "enablePullDownRefresh": false + } + + } + ] + } + ], + "preloadRule": { + "pages/tabbar/pagehome/pagehome": { + "network": "all", + "packages": ["pagesA"] + } + }, "globalStyle": { "navigationBarTextStyle": "black", "navigationBarTitleText": "恒美", - "navigationBarBackgroundColor": "#FFFFFF",//导航栏背景色 - "backgroundColor": "#FFFFFF",//窗口背景色 - "navigationStyle":"custom"//去掉所有原生导航栏 + "navigationBarBackgroundColor": "#FFFFFF", //导航栏背景色 + "backgroundColor": "#FFFFFF", //窗口背景色 + "navigationStyle": "custom" //去掉所有原生导航栏 } } diff --git a/pages/tabbar/cate/cate.vue b/pages/tabbar/cate/cate.vue index 3bc9388..59a5bda 100644 --- a/pages/tabbar/cate/cate.vue +++ b/pages/tabbar/cate/cate.vue @@ -220,6 +220,8 @@ if(res.data.list.list.length!=0){ this.total = res.data.list.total res.data.list.list.forEach(item=>{ + let fabImg = ''; + if(item.published_headimgurl!='' && item.published_headimgurl!=null) fabImg = this.$http + item.published_headimgurl let tObj = { category_id:item.category_id,//栏目ID id:item.id, @@ -230,8 +232,8 @@ video:this.$http + item.video,//视频地址 title:item.title,//标题 content:item.subtitle,//副标题 - head_img:'/static/public/logo.png',//发布者头像 - name:'恒美植发',//发布者昵称 + head_img: fabImg || '/static/public/logo.png',//发布者头像 + name:item.published_by || '恒美植发',//发布者昵称 isVideo:item.video.includes(".mp4")//是否是视频 } if(this.newCurrent==0 && item.category_id==32) this.dataList.push(tObj) diff --git a/pages/tabbar/pagehome/pagehome.vue b/pages/tabbar/pagehome/pagehome.vue index a3546e7..350b942 100644 --- a/pages/tabbar/pagehome/pagehome.vue +++ b/pages/tabbar/pagehome/pagehome.vue @@ -417,6 +417,8 @@ if(res.data.list.list.length!=0){ this.total = res.data.list.total res.data.list.list.forEach(item=>{ + let fabImg = ''; + if(item.published_headimgurl!='' && item.published_headimgurl!=null) fabImg = this.$http + item.published_headimgurl let ktObj = { category_id:item.category_id,//栏目ID id:item.id, @@ -427,8 +429,8 @@ video:this.$http + item.video,//视频地址 title:item.title,//内容标题 content:item.subtitle,//副标题 - head_img:'/static/public/logo.png',//用户头像 - name:'恒美植发',//用户昵称 + head_img: fabImg || '/static/public/logo.png',//用户头像 + name:item.published_by || '恒美植发',//用户昵称 isVideo:item.video.includes(".mp4")//是否是视频 } this.dataList.push(ktObj) diff --git a/pagesA/getReadyDan/getReadyDan.vue b/pagesA/getReadyDan/getReadyDan.vue deleted file mode 100644 index 75854d1..0000000 --- a/pagesA/getReadyDan/getReadyDan.vue +++ /dev/null @@ -1,187 +0,0 @@ - - - - - diff --git a/pagesA/immediatePayment/immediatePayment.vue b/pagesA/immediatePayment/immediatePayment.vue deleted file mode 100644 index 65104f2..0000000 --- a/pagesA/immediatePayment/immediatePayment.vue +++ /dev/null @@ -1,95 +0,0 @@ - - - - - diff --git a/pagesA/shopCart/shopCart.vue b/pagesA/shopCart/shopCart.vue deleted file mode 100644 index 59ea91c..0000000 --- a/pagesA/shopCart/shopCart.vue +++ /dev/null @@ -1,120 +0,0 @@ - - - - - diff --git a/pagesB/doctorDetail/doctorDetail.vue b/pagesB/doctorDetail/doctorDetail.vue index 8ff97d9..5472be3 100644 --- a/pagesB/doctorDetail/doctorDetail.vue +++ b/pagesB/doctorDetail/doctorDetail.vue @@ -166,6 +166,8 @@ this.total = res.data.list.total if(res.data.list.list.length!=0){ res.data.list.list.forEach(item=>{ + let fabImg = ''; + if(item.published_headimgurl!='' && item.published_headimgurl!=null) fabImg = this.$http + item.published_headimgurl let tObj = { category_id:item.category_id,//栏目ID id:item.id, @@ -176,8 +178,8 @@ video:this.$http + item.video,//视频地址 title:item.title,//标题 content:item.subtitle,//副标题 - head_img:'/static/public/logo.png',//发布者头像 - name:'恒美植发',//发布者昵称 + head_img:fabImg || '/static/public/logo.png',//发布者头像 + name:item.published_by || '恒美植发',//发布者昵称 isVideo:item.video.includes(".mp4")//是否是视频 } if(this.newCurrent==0 && item.category_id==32) this.dataList.push(tObj) diff --git a/pagesB/myCollection/myCollection.vue b/pagesB/myCollection/myCollection.vue index d51207e..9befc46 100644 --- a/pagesB/myCollection/myCollection.vue +++ b/pagesB/myCollection/myCollection.vue @@ -110,6 +110,8 @@ if(res.data.list.list.length!=0){ uni.hideToast() res.data.list.list.forEach(item=>{ + let fabImg = ''; + if(item.published_headimgurl!='' && item.published_headimgurl!=null) fabImg = this.$http + item.published_headimgurl let tObj = { category_id:item.category_id,//栏目ID id:item.id, @@ -120,8 +122,8 @@ video:this.$http + item.video,//视频地址 title:item.title,//标题 content:item.subtitle,//副标题 - head_img:'/static/public/logo.png',//发布者头像 - name:'恒美植发',//发布者昵称 + head_img:fabImg || '/static/public/logo.png',//发布者头像 + name:item.published_by || '恒美植发',//发布者昵称 isVideo:item.video.includes(".mp4")//是否是视频 } if(this.newCurrent==0 && item.category_id==32) this.dataList.push(tObj) diff --git a/pagesB/orderDetail/orderDetail.vue b/pagesB/orderDetail/orderDetail.vue deleted file mode 100644 index 9df726f..0000000 --- a/pagesB/orderDetail/orderDetail.vue +++ /dev/null @@ -1,185 +0,0 @@ - - - - - diff --git a/pagesB/problemDetail/problemDetail.vue b/pagesB/problemDetail/problemDetail.vue index 44c9e77..ee4e227 100644 --- a/pagesB/problemDetail/problemDetail.vue +++ b/pagesB/problemDetail/problemDetail.vue @@ -26,10 +26,10 @@ - + - 恒美植发 + {{detailObj.published_by || '恒美植发'}} {{detailObj.published_at}}发布 @@ -199,7 +199,8 @@ invite_code:'', isShowP:false, bcurrent:0, - isAutoPlay:false + isAutoPlay:false, + fabImg:''//发布者头像 } }, onPageScroll(e) { @@ -440,7 +441,10 @@ }).exec() } // 详情 - this.detailObj = res.data.detail + this.detailObj = res.data.detail; + if(this.detailObj.published_headimgurl!=''){ + this.fabImg = this.$http + this.detailObj.published_headimgurl; + } let maiOjb = { e:1,//内容访问 c:this.detailObj.id*1, @@ -483,6 +487,8 @@ // 相关推荐xgList if(res.data.diary.length!=0){ res.data.diary.forEach(item=>{ + let fabImg = ''; + if(item.published_headimgurl!='' && item.published_headimgurl!=null) fabImg = this.$http + item.published_headimgurl let tObj = { category_id:item.category_id,//栏目ID id:item.id, @@ -493,8 +499,8 @@ video:this.$http + item.video,//视频地址 title:item.title,//标题 content:item.subtitle,//副标题 - head_img:'/static/public/logo.png',//发布者头像 - name:'恒美植发',//发布者昵称 + head_img:fabImg || '/static/public/logo.png',//发布者头像 + name:item.published_by || '恒美植发',//发布者昵称 isVideo:item.video.includes(".mp4")//是否是视频 } if(item.cover!='' && item.video==''){ diff --git a/pagesB/searchPage/searchPage.vue b/pagesB/searchPage/searchPage.vue index 6c11e33..174c3a0 100644 --- a/pagesB/searchPage/searchPage.vue +++ b/pagesB/searchPage/searchPage.vue @@ -190,6 +190,8 @@ this.total = res.data.list.total if(res.data.list.list.length!=0){ res.data.list.list.forEach(item=>{ + let fabImg = ''; + if(item.published_headimgurl!='' && item.published_headimgurl!=null) fabImg = this.$http + item.published_headimgurl let tObj = { category_id:item.category_id,//栏目ID id:item.id, @@ -200,8 +202,8 @@ video:this.$http + item.video,//视频地址 title:item.title,//标题 content:item.subtitle,//副标题 - head_img:'/static/public/logo.png',//发布者头像 - name:'恒美植发',//发布者昵称 + head_img:fabImg || '/static/public/logo.png',//发布者头像 + name:item.published_by || '恒美植发',//发布者昵称 isVideo:item.video.includes(".mp4")//是否是视频 } if(this.newCurrent==0 && item.category_id==32) this.dataList.push(tObj) diff --git a/pagesB/shopDetail/shopDetail.vue b/pagesB/shopDetail/shopDetail.vue deleted file mode 100644 index 47e7cad..0000000 --- a/pagesB/shopDetail/shopDetail.vue +++ /dev/null @@ -1,719 +0,0 @@ - - - - -