From 393d25535ae478761d62ec396dee3bec678c10b4 Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期二, 22 十月 2024 16:36:45 +0800
Subject: [PATCH] update 客服更新
---
sub_pages/customer/trade/list.vue | 8 ++-
pages/home/home.vue | 47 ++++++++++++++++++-----
static/common/icon-kf-2.png | 0
pages/user/address/address.vue | 21 ++++++++--
sub_pages/customer/trade/detail.vue | 14 ++++---
5 files changed, 66 insertions(+), 24 deletions(-)
diff --git a/pages/home/home.vue b/pages/home/home.vue
index 2aa83e4..ed3974e 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -2,7 +2,7 @@
<view class="main-container user-home">
<view class="bg-top-green"></view>
<!-- 顶部，可能 -->
- <view class="school flex" :style="{'padding-top':(StatusBar + 14)+'px'
+ <view class="school flex" :style="{'padding-top':(StatusBar + 8 )+'px'
,height:CustomBar+'rpx','line-height':CustomBar+'rpx' }">
<!-- <picker @change="PickerChangeSchool" :value="areaIndex" :range="schools" range-key="name">
<view class="picker flex">
@@ -15,11 +15,16 @@
<view class="picker flex" @click.stop="goToAddress">
<uni-icons type="location" class="m-r-5" size="18"></uni-icons>
<view>
- {{ addressDesc || (address&&address.id?address.address: '选择地址') }}
- </view>
+ {{ current_address }}
+ </view>
+ <uni-icons class="icon" type="left" style="transform: rotate(-90deg);margin-left: 10rpx;" size="22"></uni-icons>
+
</view>
<view class="m-l-a m-r-0" style="position: relative;" @click="goto('/sub_pages/supplier/customer_service/customer_service',false)">
- <image src="@/static/common/icon-kf.png" class="icon-kf img100"></image>
+ <view class="icon-kf-p">
+ <!-- <view>客服</view> -->
+ <image src="@/static/common/icon-kf.png" class="icon-kf img100"></image>
+ </view>
</view>
</view>
<view class="search-container m-t-12 flex" @click="goto('/pages/home/components/home-search',false)">
@@ -150,8 +155,16 @@
},
currentInfo: state => {
return state.currentInfo || {}
- },
- }),
+ },
+
+ }),
+ current_address(){
+ var desc = this.addressDesc || (this.address&&this.address.id?this.address.address: '选择地址')
+ if(desc.length>=15){
+ return desc.substring(0,15) + '...'
+ }
+ return desc
+ }
},
components: {
homeCategory,
@@ -475,7 +488,7 @@
return
}
uni.navigateTo({
- url: '/pages/user/address/address?source=select'
+ url: '/pages/user/address/address?source=home'
})
},
buttonSearchFlow() {
@@ -520,12 +533,24 @@
/* #ifdef PUB_CUSTOMER */
@import "@/sub_pages/customer/coupon/coupon.scss";
/* #endif */
- .icon-kf{
- width: 44rpx;
- height: 44rpx;
+ .icon-kf-p{
// margin-top: 12rpx;
position: absolute;
right: 0rpx;
- bottom: 22rpx;
+ bottom: 16rpx;
+ text-align: center;
+ // font-size: 12rpx;
+ color: #fff;
+ // min-width: 120rpx;
+ display: flex;
+ // width: fit-content;
+ height: 44rpx;
+ line-height: 44rpx;
+ // height: 64rpx;
+ .icon-kf{
+ width: 44rpx;
+ height: 44rpx;
+ // margin-left: 20rpx;
+ }
}
</style>
\ No newline at end of file
diff --git a/pages/user/address/address.vue b/pages/user/address/address.vue
index 21a8e14..964b65a 100644
--- a/pages/user/address/address.vue
+++ b/pages/user/address/address.vue
@@ -77,6 +77,9 @@
<view class="desc del t-green m-l-10" v-if="source==='select'" @click="selectAddress(item)">
选择此地址
</view>
+ <view class="desc del t-green m-l-10" v-if="source==='home'" @click="selectAddress(item)">
+ 按此地址定位
+ </view>
</view>
</view>
@@ -529,6 +532,7 @@
this.$store.commit('setDefaultAddress', {
...item
})
+
}
}, err => {
@@ -543,11 +547,20 @@
})
},
async selectAddress(item) {
- await this.$message.confirm('确定选择此地址作为收货地址吗')
//携带，然后返回
- this.$store.commit('setDefaultAddress', {
- ...item
- })
+
+ if(this.source==='home'){
+ this.$store.commit('setAddressDesc', '')
+ this.$store.commit('setDefaultAddress', {
+ ...item
+ })
+ }else{
+ await this.$message.confirm('确定选择此地址作为收货地址吗')
+ this.$store.commit('setDefaultAddress', {
+ ...item
+ })
+
+ }
this.backpage()
},
async deleteAddress(item) {
diff --git a/static/common/icon-kf-2.png b/static/common/icon-kf-2.png
new file mode 100644
index 0000000..157595f
--- /dev/null
+++ b/static/common/icon-kf-2.png
Binary files differ
diff --git a/sub_pages/customer/trade/detail.vue b/sub_pages/customer/trade/detail.vue
index 719e18e..25216ec 100644
--- a/sub_pages/customer/trade/detail.vue
+++ b/sub_pages/customer/trade/detail.vue
@@ -77,12 +77,14 @@
<view class="m-r-15">剩余:{{ dto.stock || 0 }}</view>
<view class=" ">{{ dto.unit || '-' }}</view>
</view>
- <view class="m-l-a m-r-15">
+ <!-- style="background-color: #20613D;border-radius: 50%;" -->
+ <view class="m-l-a m-r-0">
<button open-type="contact" class="component-button-contact">
- <image src="../../../static/common/icon-kf.png" class="icon-kf m-l-15 img100"></image>
-
+ <!-- <image src="@/static/common/icon-kf.png" class="icon-kf img100"></image> -->
+ <image src="@/static/common/icon-kf-2.png" class="icon-kf img100"></image>
+
</button>
-
+ <!-- <view class="text-center m-t-4" style="color: #fff;">客服</view> -->
</view>
</view>
@@ -686,8 +688,8 @@
.icon-kf {
width: 44rpx;
height: 44rpx;
- width: 90rpx;
- height: 90rpx;
+ width: 100rpx;
+ height: 100rpx;
}
.gwc {
diff --git a/sub_pages/customer/trade/list.vue b/sub_pages/customer/trade/list.vue
index 048e2e2..7cbc6c9 100644
--- a/sub_pages/customer/trade/list.vue
+++ b/sub_pages/customer/trade/list.vue
@@ -19,8 +19,10 @@
</view> -->
</view>
<view class="info">
+
<button open-type="contact" class="component-button-contact">
- <image src="../../../static/common/icon-kf.png" class="icon-kf m-l-5 m-r-15 img100"></image>
+ <!-- <image src="@/static/common/icon-kf.png" class="icon-kf m-l-5 m-r-15 img100"></image> -->
+ <image src="@/static/common/icon-kf-2.png" class="icon-kf m-l-5 m-r-15 img100"></image>
</button>
</view>
<view class="info-price">
@@ -576,8 +578,8 @@
.icon-kf {
width: 44rpx;
height: 44rpx;
- width: 90rpx;
- height: 90rpx;
+ width: 100rpx;
+ height: 100rpx;
}
.desc {
--
Gitblit v1.9.3