Merge remote-tracking branch 'origin/master'

jiangping

2024-12-12 fdd38a72d0b0b87724aa94f7f9b5b0885f34cff5

 h5/pages/login/login.vue

@@ -41,12 +41,16 @@
   export default {

      data() {

         return {

            code: ''

            code: '111'

         }

      },
      onLoad(option) {
         if(option.type){
				
         if(option.ywid){
            uni.setStorageSync('ywinfo', {
               type: option.type,
               yw: option.yw,
               ywid: option.ywid
            })
         }
      },

      onShow() {

@@ -54,7 +58,10 @@
         let url = 'https://atwl.ahzyssl.com/zhyq_h5/#/'

         let code = ''

         if (window.location.href.indexOf('code=') !== -1 || this.code) {



            const ywinfo = uni.getStorageSync('ywinfo') || {}
             if(ywinfo.ywid){
                this.userAuth(ywinfo.type)
             }

         } else {

            // let url = window.location.href

            const appID = 'wx173e6caf5abc718a'

@@ -119,7 +126,6 @@
                        that.$store.commit('setMember', res.data.member)

                     }

                     let flag = res.data.member && res.data.member.id

                     setTimeout(() => {

                        if (source == 0) {

                           if (res.data.token) {

                              that.$store.commit('setToken', res.data.token)

@@ -139,7 +145,6 @@
                        } else {

                           this.jump('/pages/index/index')

                        }

                     }, 300)

                  }

               })

            }