diff --git a/components/config/customerServicePopup.vue b/components/config/customerServicePopup.vue
index 573d528..a110108 100644
--- a/components/config/customerServicePopup.vue
+++ b/components/config/customerServicePopup.vue
@@ -6,13 +6,13 @@
联系客服
确定拨打客服电话?
-
-
+
+ 取消
-
-
+
+ 确定
@@ -28,38 +28,6 @@
phone:'',
}
},
-
- computed: {
- customStyle1() {
- return {
- height: '60rpx',
- background: '#FFF',
- color: '#000000',
- fontSize: '36rpx',
- borderRadius: '40rpx', //圆角
-
- // nvue中必须是下方的写法
- 'border-top-right-radius': '40rpx',
- 'border-bottom-left-radius': '40rpx',
- 'border-bottom-right-radius': '40rpx',
- 'width': '150rpx',
- }
- },
- customStyle2() {
- return {
- height: '60rpx',
- background: '#fd5100',
- color: '#FFF',
- fontSize: '34px',
- borderRadius: '40rpx', //圆角
- // nvue中必须是下方的写法
- 'border-top-right-radius': '40rpx',
- 'border-bottom-left-radius': '40rpx',
- 'border-bottom-right-radius': '40rpx',
- 'width': '150rpx',
- }
- }
- },
mounted() {
this.getCustomPhone()
},
@@ -78,39 +46,15 @@
// 拨打电话
confirm() {
this.show = false
- let phone = this.phone; // 需要拨打的电话号码
- // console.log('拨打电话', phone)
- const res = uni.getSystemInfoSync();
- // ios系统默认有个模态框
- if (res.platform == 'ios') {
- uni.makePhoneCall({
- phoneNumber: phone,
- success() {
- console.log('ios拨打成功');
- },
- fail() {
- console.log('ios拨打失败');
- }
- })
- } else {
- //安卓手机手动设置一个showActionSheet
- uni.showActionSheet({
- itemList: [phone, '呼叫'],
- success: function(res) {
- if (res.tapIndex == 1) {
- uni.makePhoneCall({
- phoneNumber: phone,
- success() {
- console.log('安卓拨打成功');
- },
- fail() {
- console.log('安卓拨打失败');
- }
- })
- }
- }
- })
- }
+ uni.makePhoneCall({
+ phoneNumber: this.phone,
+ success() {
+ console.log('安卓拨打成功');
+ },
+ fail() {
+ console.log('安卓拨打失败');
+ }
+ })
},
}
}
@@ -134,7 +78,7 @@
.title {
padding: 10rpx 0 0 15rpx;
- background-color: #fd5100;
+ background-color: $uni-color;
color: #FFF;
text-align: left;
width: 100%;
@@ -154,6 +98,19 @@
display: flex;
justify-content: center;
gap: 50rpx;
+ view{
+ height: 60rpx;
+ line-height: 60rpx;
+ padding: 0 50rpx;
+ border-radius: 30rpx;
+ }
+ .btn1{
+ background-color: #fff;
+ }
+ .btn2{
+ background-color: $uni-color;
+ color: #fff;
+ }
}
}
\ No newline at end of file
diff --git a/pages.json b/pages.json
index 490bd07..4efcd23 100644
--- a/pages.json
+++ b/pages.json
@@ -51,6 +51,9 @@
{
"path": "mine/purse"
},
+ {
+ "path": "mine/updateUserInfo"
+ },
{
"path": "mine/runningWater"
},
diff --git a/pages/index/center.vue b/pages/index/center.vue
index 84c1a42..2946fdc 100644
--- a/pages/index/center.vue
+++ b/pages/index/center.vue
@@ -5,11 +5,11 @@
-
+
- {{ userInfo.nickName || '用户昵称' }}
+ {{ username }}
@@ -30,9 +30,9 @@
-
+
@@ -185,6 +185,18 @@
computed: {
...mapGetters(['userShop']),
...mapState(['userInfo']),
+ username(){
+ return this.userInfo.shop
+ && this.userInfo.shop.name
+ || this.userInfo.nickName
+ || '用户昵称'
+ },
+ headImage(){
+ return this.userInfo.shop
+ && this.userInfo.shop.pic
+ || this.userInfo.headImage
+ || '/static/image/center/3.png'
+ },
},
data() {
return {
@@ -295,7 +307,7 @@
.headImage {
width: 120rpx;
height: 120rpx;
- background-image: url(/static/image/center/3.png);
+ // background-image: url(/static/image/center/3.png);
background-size: 100% 100%;
overflow: hidden;
border-radius: 50%;
diff --git a/pages_order/mine/updateUserInfo.vue b/pages_order/mine/updateUserInfo.vue
index 4a12579..f7240cd 100644
--- a/pages_order/mine/updateUserInfo.vue
+++ b/pages_order/mine/updateUserInfo.vue
@@ -8,9 +8,11 @@
头像
@@ -25,12 +27,12 @@
性别
{{form.sex}}
-->
-
+
@@ -45,15 +47,12 @@