zhaoxiaohai %!s(int64=3) %!d(string=hai) anos
pai
achega
5a1ef48d66

+ 3 - 0
components/My_ChangeUser/index.js

@@ -27,6 +27,9 @@ Component({
             let list = wx.getStorageSync('account_list');
             const userList = setData.imageType(list, "headportrait"),
                 userIndex = (wx.getStorageSync('userData').index) ? wx.getStorageSync('userData').index : 0;
+            this.triggerEvent('userChange', {
+                userIndex: userIndex
+            });
             this.setData({
                 userList,
                 userIndex

+ 1 - 1
components/My_liveAccountMsg/index.wxml

@@ -11,7 +11,7 @@
                 <view class="title" style="margin-right: 8rpx;">密码</view>{{accountMsg.channelpasswd}}
             </view>
             <view>
-                <view class="title">直播间地址</view>
+                <view class="title">观看地址</view>
                 <view class="chained-address u-line-1">{{accountMsg.fliveshowurl}}</view>
                 <view data-url="{{accountMsg.fliveshowurl}}" class="chained-address-copy" bindtap="copyTheAddress">复制</view>
             </view>

+ 1 - 2
components/My_navBar/index.js

@@ -15,7 +15,6 @@ Component({
             //获取当前登录用户名
             const that = this;
             setTimeout(() => {
-                // let data = getApp().globalData.account_list[wx.getStorageSync('userData').index];
                 let data = wx.getStorageSync('account_list')[[wx.getStorageSync('userData').index]]
                 let userName = '';
                 (data.fbrand != null && data.fbrand != undefined) ? userName = data.fbrand + '-': userName = data.fname + '-';
@@ -44,7 +43,7 @@ Component({
         a1212() {
             //跳转到选择账号
             wx.navigateTo({
-                url: '/pages/login/index?type=changeUser',
+                url: '/pages/login/index?type=changeUser&inherit=1',
             })
         }
     }

+ 1 - 1
custom-tab-bar/index.js

@@ -27,7 +27,7 @@ Component({
             {
                 icon: 'https://bwj.obs.cn-east-2.myhuaweicloud.com/resources/WeChat/tabbar-icon/service.png',
                 iconA: 'https://bwj.obs.cn-east-2.myhuaweicloud.com/resources/WeChat/tabbar-icon/service-a.png',
-                text: '在线客服',
+                text: '客服投诉',
                 url: '/pages/tabbar-pages/customer-service-staff/index'
             },
             {

+ 1 - 1
pages/tabbar-pages/user/index.js

@@ -104,7 +104,7 @@ Page({
                 wx.showToast({
                     title: '退出成功',
                 })
-                wx.setStorageSync('userData', {}) //清空用户数据
+                
                 setTimeout(() => {
                     wx.reLaunch({
                         url: '/pages/login/index',