Merge branch 'master' of http://121.37.12.51:13000/huoran/FE_CRM

pages/login/login.vue

@@ -45,7 +45,6 @@
 			}
 		},
 		onShow() {
-			// uni.setStorageSync('token', 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJzdWIiOiJ1c2VyIiwiaWF0IjoxNjgwNTgwODQ5LCJleHAiOjE2ODA2MjQwNDksImFjY291bnRJZCI6IjIxNiJ9.oyssva0Fdvs0i8ud1mU_TF693qMGzx76xyYJiBbzeBI')
 			// 先授权用户信息，再授权手机号
 			this.checkLogin()
 		},

team/qrcode/qrcode.vue

@@ -63,8 +63,8 @@
 				generateInvitationCode(uni.getStorageSync('team').accountId).then(({ expireTime }) => {
 					const date = new Date(Date.now() + expireTime * 1000) // 返回的秒，要*1000
 					this.expireTime = `${date.getFullYear()}-${this.$util.preZero(date.getMonth() + 1)}-${this.$util.preZero(date.getDate())} ${this.$util.preZero(date.getHours())}:${this.$util.preZero(date.getMinutes())}:${this.$util.preZero(date.getMinutes())}`
-					// this.link = `https://huorantech.cn/#/join?accountId=${team.accountId}&id=${team.teamId}&isTeam=0&teamName=${this.my.info.userName}`
-					this.link = `http://121.37.12.51/backstage/#/join?accountId=${team.accountId}&id=${team.teamId}&isTeam=0&teamName=${this.my.info.userName}&provinceId=${uni.getStorageSync('provinceId')}&cityId=${uni.getStorageSync('cityId')}`
+					this.link = `https://huorantech.cn/#/join?accountId=${team.accountId}&id=${team.teamId}&isTeam=0&teamName=${this.my.info.userName}&provinceId=${uni.getStorageSync('provinceId')}&cityId=${uni.getStorageSync('cityId')}`
+					// this.link = `http://121.37.12.51/backstage/#/join?accountId=${team.accountId}&id=${team.teamId}&isTeam=0&teamName=${this.my.info.userName}&provinceId=${uni.getStorageSync('provinceId')}&cityId=${uni.getStorageSync('cityId')}`
 				}).catch(e => {})
 			},
 			// 二维码组件生成完成钩子。生成后把图片导出给image组件，image组件才可以长按二维码转发