sileya-ai
/
vr-shopxo-uniapp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev' into dev-sws

master
sws 2023-09-09 09:54:49 +08:00
parent fadb631e54 8c99d210e2
commit f63d476605
2 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
components/user-base/user-base.vue
View File

@ -96,6 +96,11 @@
if (this.pages.indexOf(type) != -1 && this.client.indexOf(this.application_client_type) != -1) {
// 当前缓存用户
var user = app.globalData.get_user_cache_info() || {};
// 默认昵称则赋空值
var arr = ['支付宝用户', '百度用户', '头条用户', 'QQ用户', '快手用户', '微信用户', 'WeChat User', 'Usuarios de Wechat'];
if((user.nickname || null) != null && arr.indexOf(user.nickname) != -1) {
user.nickname = '';
}
// 头像是默认则置为空
if (user != null && (user.avatar || null) != null && user.avatar.indexOf('default-user-avatar') != -
1) {

33
pages/user-orderaftersale-detail/user-orderaftersale-detail.vue
View File

@ -42,11 +42,11 @@
</view>
<view v-if="(plugins_intellectstools_data.service_qq || null) != null" class="item padding-main br-t single-text">
<text>Q Q：</text>
<text class="cp" @tap="text_copy_event" :data-value="plugins_intellectstools_data.service_qq">{{plugins_intellectstools_data.service_qq}}</text>
<text class="cp" @tap="text_event" data-event="copy" :data-value="plugins_intellectstools_data.service_qq">{{plugins_intellectstools_data.service_qq}}</text>
</view>
<view v-if="(plugins_intellectstools_data.service_tel || null) != null" class="item padding-main br-t single-text">
<text>电话：</text>
<text class="cp" @tap="tel_event" :data-value="plugins_intellectstools_data.service_tel">{{plugins_intellectstools_data.service_tel}}</text>
<text class="cp" @tap="text_event" data-event="tel" :data-value="plugins_intellectstools_data.service_tel">{{plugins_intellectstools_data.service_tel}}</text>
</view>
<view v-if="(plugins_intellectstools_data.service_weixin || null) != null || (plugins_intellectstools_data.service_line || null) != null" class="oh qrcode tc br-t">
<view v-if="(plugins_intellectstools_data.service_weixin || null) != null" class="item padding-bottom-lg dis-inline-block">
@ -74,8 +74,14 @@
<!-- 退货地址 -->
<view v-if="new_aftersale_data.status == 1 && new_aftersale_data.type == 1 && return_goods_address != null" class="return-address msg-tips msg-tips-warning padding-main border-radius-main spacing-mb">
<text class="cr-base fw-b">退货地址：</text>
<text class="cr-blue">{{return_goods_address}}</text>
<text class="cr-base fw-b">退货地址：</text>
<view class="cr-blue" @tap="text_event" data-event="copy" :data-value="return_goods_address.name+' '+return_goods_address.tel+' '+return_goods_address.address">
<view>
<text class="margin-right-xxxl">{{return_goods_address.name}}</text>
<text>{{return_goods_address.tel}}</text>
</view>
<view>{{return_goods_address.address}}</view>
</view>
</view>
<!-- 提示 -->
@ -725,17 +731,7 @@
this.setData({
plugins_intellectstools_service_status: !this.plugins_intellectstools_service_status
});
},
// 客服电话
tel_event(e) {
app.globalData.call_tel(e.currentTarget.dataset.value);
},
// 剪切板
text_copy_event(e) {
app.globalData.text_copy_event(e);
},
},
// 图片预览
image_show_event(e) {
@ -745,7 +741,12 @@
// 进入客服系统
chat_event() {
app.globalData.chat_entry_handle(this.plugins_intellectstools_data.chat.chat_url);
}
},
// 文本事件
text_event(e) {
app.globalData.text_event_handle(e);
},
}
};
</script>