diff --git a/pages.json b/pages.json index 29887a8..3168caa 100644 --- a/pages.json +++ b/pages.json @@ -202,7 +202,7 @@ { "path": "user/myContactsAdd", "style": { - "navigationBarTitleText": "联系人信息" + "navigationBarTitleText": "出行人信息" } }, { diff --git a/pages/user/user.vue b/pages/user/user.vue index 6343b7c..2200315 100644 --- a/pages/user/user.vue +++ b/pages/user/user.vue @@ -350,11 +350,13 @@ height: 120rpx; background: #FFFFFF; border-radius: 50%; + overflow: hidden; } .headImg { - width: 60rpx; - height: 66rpx; + width: 100%; + height: 100%; + border-radius: 50%; } .username { diff --git a/static/js/CommonFunction.js b/static/js/CommonFunction.js index f412397..ae8e9e7 100644 --- a/static/js/CommonFunction.js +++ b/static/js/CommonFunction.js @@ -248,20 +248,22 @@ Vue.prototype.goOtherDetail = (item,type) => { uni.navigateToMiniProgram({ shortLink: item.ext_link }) - return + return true }else if(item.link_type == 2){ // 外部H5 uni.navigateTo({ url: '/subPackages/webPage/webPage?url=' + item.ext_link }); - return + return true } } // 根据类型判断详情页 Vue.prototype.goDetailByType= function(item){ - this.goOtherDetail(item) - + let res = this.goOtherDetail(item) + if (res) { + return + } let urlData = [ {name:'景区门票', url: '/subPackages/ticketBooking/detail',genre:'ticket'}, {name:'酒店民宿',url:'/subPackages/hotelHomestay/detail',genre:'hotel'}, diff --git a/subPackages/service/service.vue b/subPackages/service/service.vue index b5a1498..595443b 100644 --- a/subPackages/service/service.vue +++ b/subPackages/service/service.vue @@ -182,5 +182,6 @@ .actBtn { background: linear-gradient(90deg, #9EE4FE, #7FD491); + color: black; } diff --git a/subPackages/user/collect.vue b/subPackages/user/collect.vue index fc74abc..29ff363 100644 --- a/subPackages/user/collect.vue +++ b/subPackages/user/collect.vue @@ -31,6 +31,10 @@ }, // 通过type跳转详情 gotoDetail(item) { + let res = this.goOtherDetail(item.arr) + if (res) { + return + } // 1文章 2景点 3商品美食 4酒店 5商品文创 6商品线路 7活动 let url = '' switch (item.type){ diff --git a/subPackages/user/myAddressAdd.vue b/subPackages/user/myAddressAdd.vue index 5a6d069..88333ef 100644 --- a/subPackages/user/myAddressAdd.vue +++ b/subPackages/user/myAddressAdd.vue @@ -373,7 +373,7 @@ .list-item-post { display: flex; - color: #FFFFFF; + color: #000; font-size: 36rpx; width: 697rpx; height: 73rpx; diff --git a/subPackages/user/myContactsAdd.vue b/subPackages/user/myContactsAdd.vue index 6f59dd4..ae9ff16 100644 --- a/subPackages/user/myContactsAdd.vue +++ b/subPackages/user/myContactsAdd.vue @@ -239,7 +239,7 @@ font-size: 36rpx; font-family: PingFang SC; font-weight: 500; - color: #FFFFFF; + color: black; position: absolute; bottom: 53rpx; left: 27rpx; diff --git a/subPackages/user/travelerList.vue b/subPackages/user/travelerList.vue index bd74aea..c38dc08 100644 --- a/subPackages/user/travelerList.vue +++ b/subPackages/user/travelerList.vue @@ -89,7 +89,7 @@ - {{showType ? '添加联系人' : '添加出行人'}} + {{showType ? '添加收货地址' : '添加出行人'}}