Merge remote-tracking branch 'origin/master'

doum

21 小时以前 33c2164b1785a4b3c128f71ff577a989e2d91bdc

 small-program/pages/settings/settings.vue

@@ -34,12 +34,6 @@
               <u-icon name="arrow-right" color="#999999" size="17"></u-icon>
            </view>
         </view>
         <view class="list-item" @click="jumpxy">
            <view class="list-item-label">协议与说明</view>
            <view class="list-item-val">
               <u-icon name="arrow-right" color="#999999" size="17"></u-icon>
            </view>
         </view>
      </view>
      <view class="loginOut" @click="tuichu">退出登录</view>
      <!-- 更换手机号 -->
@@ -48,7 +42,7 @@
            <view class="tc-contemt">
               <view class="tc-contemt-title">更换绑定手机号？</view>
               <view class="tc-contemt-nr">
                  更换后现手机号{{returnPhone(form.phone)}}将不能用于登录，180天内只可更换一次
                  更换后现手机号{{returnPhone(userInfo.telephone)}}将不能用于登录
               </view>
            </view>
            <view class="tc-btn">
@@ -57,6 +51,7 @@
            </view>
         </view>
      </u-popup>
      <auth-login v-if="showLogin" @close="showLogin = false"></auth-login>
   </view>
</template>

@@ -70,6 +65,7 @@
      data() {
         return {
            show: false,
            showLogin: false,
            form: {
               nickName: '',
               name: '',
@@ -104,8 +100,11 @@
         jumpPhone() {
            this.show = false
            uni.navigateTo({
               url: '/pages/change-binding/change-binding'
               url: '/shop/pages/change-binding/change-binding'
            })
         },
         handleBindPhone() {
            this.showLogin = true
         },
         jumpAddr() {
            uni.navigateTo({
@@ -153,6 +152,7 @@
               .then(res => {
                  if (res.code === 200) {
                     this.$store.commit('empty')
                     uni.$emit('loginOut')
                     uni.switchTab({
                        url: '/pages/index/index'
                     })