diff --git a/packages/customerService/chattingRecords/index.vue b/packages/customerService/chattingRecords/index.vue index 9a1d525f..8507d379 100644 --- a/packages/customerService/chattingRecords/index.vue +++ b/packages/customerService/chattingRecords/index.vue @@ -66,9 +66,9 @@ export default { }, getAvatarUrl(record){ if(record.client_id_one == uni.getStorageSync('openId')){ - return record.two.avatar ? picUrl + record.two.avatar : 'http://localhost:8080/defaultTx.png' + return record.two.avatar ? picUrl + record.two.avatar : 'https://wechat-img-file.oss-cn-beijing.aliyuncs.com/property-img-file/defaultTx.png' }else{ - return record.one.avatar ? picUrl + record.one.avatar : 'http://localhost:8080/defaultTx.png' + return record.one.avatar ? picUrl + record.one.avatar : 'https://wechat-img-file.oss-cn-beijing.aliyuncs.com/property-img-file/defaultTx.png' } }, // 格式化时间 diff --git a/packages/customerService/index/index.vue b/packages/customerService/index/index.vue index 5991f75e..0116bcdb 100644 --- a/packages/customerService/index/index.vue +++ b/packages/customerService/index/index.vue @@ -142,7 +142,7 @@ export default { }, methods: { getAvatarUrl(record){ - return this.chatTarget.employee_image ? this.chatTarget.employee_image : 'http://localhost:8080/defaultTx.png' + return this.chatTarget.employee_image ? this.chatTarget.employee_image : 'https://wechat-img-file.oss-cn-beijing.aliyuncs.com/property-img-file/defaultTx.png' }, async connect(){ this.client = null diff --git a/packages/localLife/index/index.vue b/packages/localLife/index/index.vue index d22a0f9f..6585f684 100644 --- a/packages/localLife/index/index.vue +++ b/packages/localLife/index/index.vue @@ -103,7 +103,7 @@ 到店服务券 --> - + 快捷支付记录 @@ -161,12 +161,17 @@ export default { }, methods: { + + // 跳转快捷支付记录 + toPayInfo(){ + NavgateTo("/packages/localLife/payInfo/index") + }, + swiperChange(e) { this.currentIndex = e.detail.current; }, changeNav(item) { - console.log("🚀 ~ changeNav ~ item:", item) NavgateTo(`/packages/localLife/classify/index?item=${JSON.stringify(item)}`) }, diff --git a/pages/index/index.vue b/pages/index/index.vue index d4ace4fa..9c5df058 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -41,7 +41,7 @@ - + diff --git a/pages/user/index.css b/pages/user/index.css index 32e534e6..b6a652dc 100644 --- a/pages/user/index.css +++ b/pages/user/index.css @@ -1,6 +1,7 @@ page { background: #F6F7FB; } + .conatiner { /* height: 100%; */ /* height: 578rpx; */ @@ -22,6 +23,7 @@ page { margin-bottom: 35rpx; /* pointer-events: none; */ } + /* 头像 */ .avatar-container { display: flex; @@ -35,6 +37,7 @@ page { align-items: center; pointer-events: auto; } + /* 头像图片 */ .avatar { width: 130rpx; @@ -43,23 +46,28 @@ page { border-radius: 50%; overflow: hidden; } + .avatar_right { flex: 1; } + .avatar_title { display: flex; justify-content: space-between; align-items: center; } -.avatar_setting { + +.avatar_setting { display: flex; pointer-events: auto; } -.avatar_setting > image { + +.avatar_setting>image { width: 34rpx; height: 34rpx; } -.avatar_setting > image:first-child { + +.avatar_setting>image:first-child { margin-right: 40rpx; } @@ -68,9 +76,11 @@ page { font-size: 36rpx; pointer-events: auto; } + .avater_mobile { margin-top: 10rpx; } + .center { position: relative; margin: 0 20rpx; @@ -80,23 +90,26 @@ page { .gold_container { /* width: 710rpx; */ height: 127rpx; - background: linear-gradient( 90deg, #FFE9A3 0%, rgba(232,127,0,0.8) 100%); + background: linear-gradient(90deg, #FFE9A3 0%, rgba(232, 127, 0, 0.8) 100%); box-shadow: inset 0rpx 1rpx 2rpx 0rpx #E2C47C; border-radius: 30rpx 30rpx 30rpx 30rpx; margin: 37rpx 0 0; position: relative; } + .gold_title { display: flex; align-items: center; padding-top: 16rpx; } + .gold { margin-left: 37rpx; font-weight: normal; -font-size: 34rpx; -color: #7F3907; + font-size: 34rpx; + color: #7F3907; } + .monenyt { margin-left: 17rpx; margin-right: 37rpx; @@ -104,13 +117,15 @@ color: #7F3907; font-size: 40rpx; color: #7F3907; } + .price { margin-left: 37rpx; font-weight: normal; -font-size: 26rpx; -color: #7F3907; -margin-right: 20rpx; + font-size: 26rpx; + color: #7F3907; + margin-right: 20rpx; } + .gold_pic { width: 140rpx; height: 113rpx; @@ -118,17 +133,20 @@ margin-right: 20rpx; top: 0; right: 39rpx; } + .main { margin: 0 20rpx; border-radius: 20rpx 20rpx 20rpx 20rpx; background: #FFFFFF; } + .main1 { width: 100%; margin: 0; position: absolute; top: 80rpx; } + .main_title { padding-top: 25rpx; margin: 0 0 40rpx 30rpx; @@ -136,6 +154,7 @@ margin-right: 20rpx; font-size: 36rpx; color: #222222; } + .margin20 { margin-top: 20rpx; } @@ -148,22 +167,25 @@ margin-right: 20rpx; margin-right: 20rpx; margin-bottom: 21rpx; } + .section1 { justify-content: space-around; } + .section_label { display: flex; flex-direction: column; align-items: center; } -.nav_icon { - width: 50rpx; - height: 50rpx; - margin-bottom: 20rpx; +.nav_icon { + width: 50rpx; + height: 50rpx; + margin-bottom: 20rpx; } + .grid-text { - font-size: 28rpx; + font-size: 28rpx; font-weight: bold; } @@ -176,6 +198,14 @@ margin-right: 20rpx; border-radius: 20rpx; padding-bottom: 25rpx; } + +.item2 { + display: grid; + place-items: center; + /* 同时实现水平和垂直居中 */ +} + + .padding_bottom0 { padding-bottom: 0; } @@ -205,24 +235,26 @@ margin-right: 20rpx; position: fixed; right: 0; bottom: 212rpx; - background: rgba(255,55,11,0.6); + background: rgba(255, 55, 11, 0.6); border-radius: 50%; display: flex; flex-direction: column; justify-content: center; align-items: center; font-weight: normal; -font-size: 28rpx; -color: #FFFFFF; + font-size: 28rpx; + color: #FFFFFF; } -.customer > image { + +.customer>image { width: 50rpx; height: 55rpx; } .uicon-volume { - font-size: 28rpx !important; + font-size: 28rpx !important; } + .u-grid-item { - margin-bottom: 36rpx; -} + margin-bottom: 36rpx; +} \ No newline at end of file