合并

MrShi

19 小时以前 e4f9739d74323aacf09d139700f22a383910ee97

 mini-program/pages/mine/mine.vue

@@ -6,7 +6,11 @@
            <view class="head-bar-nav" :style="{ height: navHeight + 'px' }"></view>
         </view>
         <view class="user">
<<<<<<< HEAD
            <view class="user-left" @click="jumpUser">
=======
            <view class="user-left"  @click="jumpSettings">
>>>>>>> 7b09a9950f13521190a4aef9bbc2a6163445566c
               <view class="user-image">
                  <image :src="userInfo.imgFullUrl?userInfo.imgFullUrl:'/static/icon/default.png'" mode="widthFix"></image>
               </view>
@@ -174,6 +178,9 @@
         },
         // 跳转设置
         jumpSettings() {
            if(!this.userInfo && !this.userInfo.id){
               return
            }
            uni.navigateTo({
               url: '/pages/settings/settings'
            })