Merge remote-tracking branch 'origin/master'

doum

19 小时以前 d0da0ce546110de49cca9e0358029a51c53188d6

 mini-program/pages/login/login.vue

@@ -14,7 +14,7 @@
            <view class="icon">
               <image src="/static/icon/login_ic_password@2x.png" mode="widthFix"></image>
            </view>
            <input :focus='focus1' @blur="focus1=false"    type="safe-password" v-model="form.password" placeholder="请输入密码" />
            <input :focus='focus1' @blur="focus1=false"    type="password" v-model="form.password" placeholder="请输入密码" />
         </view>
      </view>
      <view class="login-btn" @click="submitDo">立即登录</view>
@@ -22,7 +22,7 @@
         <image src="/static/icon/ic_agree@2x.png" v-if="!radio" @click="changeRadio()" mode="widthFix"></image>
         <image src="/static/icon/ic_agree_sel@2x.png" v-if="radio" @click="changeRadio()"  mode="widthFix"></image>
         <view class="login-info-text">
            我已阅读并同意<text>《鼎元科技用户服务协议》</text>及<text>《鼎元科技用户隐私政策》</text>
            我已阅读并同意<text @click="jumpService(4)">《鼎元科技用户服务协议》</text>及<text  @click="jumpService(5)">《鼎元科技用户隐私政策》</text>
         </view>
      </view>
   </view>
@@ -48,35 +48,49 @@
            radio:false
         };
      },
      onShow() {
      async onLoad() {
      },
      async onShow() {
         await this.$onLaunched;
         this.focus=false
         this.focus1=false
         this.form.openid=this.openid
          this.checkShopLogin()
         this.checkShopLogin()
      },
      methods:{
         jumpService(flag) {
            uni.navigateTo({
               url: '/pagesA/pages/rich-text-page/rich-text-page?flag='+flag
            })
         },
          async checkShopLogin(){
            uni.showLoading( )
            var that =this
            console.log("shopInfo",this.shopInfo)
            console.log("shopToken",this.shopToken)
				
            console.log("openid",this.openid)
            if( this.shopInfo !=null && this.shopInfo.id!=null && (this.shopToken!=null &&this.shopToken!='')){
               //验证token是否有效
               let res = await that.$u.api.getShopInfo({tokenType:1  })
               if (res.code === 200) {
                  await that.$store.commit('setShopInfo', res.data) 
                  that.jumpShopIndex()
               }else if( this.openid !=null && this.openid !=''){
                  let res = await that.$u.api.shopOpenidLogin(this.form)
                     if (res.code === 200 && res.data.shop!=null && res.data.token!=null) {
                     await that.$store.commit('setShopInfo', res.data.shop)
                     await that.$store.commit('setShopToken', res.data.token)
                     that.jumpShopIndex()
                  }
               }
            }else if( this.openid !=null && this.openid !=''){
               //优先静默登陆
               let res = await that.$u.api.shopOpenidLogin(this.form)
               if (res.code === 200 && res.shop!=null && res.token!=null) {
                  if (res.code === 200 && res.data.shop!=null && res.data.token!=null) {
                  await that.$store.commit('setShopInfo', res.data.shop)
                  await that.$store.commit('setShopToken', res.data.token)
                  that.jumpShopIndex()
               }
            }
            } 
            setTimeout(function () {
               uni.hideLoading();
            }, 1000);
         },  
         changeRadio(){
            this.radio = !this.radio
@@ -116,7 +130,7 @@
               })
         },
         jumpShopIndex() {
            uni.navigateTo({
            uni.redirectTo({
               url: '/pages/distributor/distributor'
            })
         }