Merge remote-tracking branch 'origin/2.0.1' into 2.0.1

jiangping

2025-06-06 77946261ec663aa1fe7f6f97e550532ed879f982

 h5/pages/login.vue

@@ -83,7 +83,7 @@
               code: code || this.code

            }).then(res => {

               if (res.code === 200) {

                  console.log('res', res);

                  // console.log('res', res);

                  that.$store.commit('setOpenId', res.data.openid)

                  if (res.data.token && res.data.token != '') {

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

@@ -92,10 +92,16 @@
                     })

                     const ywinfo = this.ywinfo

                     if (ywinfo.ywid && (ywinfo.type || ywinfo.type == 0)) {
                        getRecordByUserPoint({pointCode: ywinfo.ywid}).then(res => {
                        getRecordByUserPoint({

                           pointCode: ywinfo.ywid

                        }).then(res => {

                           if(res.data && res.data.id){
                              uni.redirectTo({
                                 url: "/pages/polling/point?id=" + res.data.id
                              })

                           } else {

                              uni.redirectTo({

                                 url: "/pages/polling/empty?message=" + res.message

                              })
                           }
                        })

@@ -148,15 +154,21 @@
                     this.setUserInfo(ress.data)
                     const ywinfo = this.ywinfo
                     if (ywinfo.ywid && (ywinfo.type || ywinfo.type == 0)) {
                     getRecordByUserPoint({pointCode: ywinfo.ywid}).then(res => {
                        getRecordByUserPoint({pointCode: ywinfo.ywid}).then(res => {
                        // getRecordByUserPoint({pointCode: ywinfo.ywid}).then(res => {

                        getRecordByUserPoint({

                           pointCode: ywinfo.ywid

                        }).then(res => {

                           if(res.data && res.data.id){
                              uni.redirectTo({
                                 url: "/pages/polling/point?id=" + res.data.id
                              })
                           } else {

                              uni.redirectTo({

                                 url: "/pages/polling/empty?message=" + res.message

                              })

                           }
                        })
                     })
                        // })

                     } else {
                        uni.redirectTo({
                           url: "/pages/index"