diff --git a/config/request.js b/config/request.js index 042bc89..6748186 100644 --- a/config/request.js +++ b/config/request.js @@ -5,9 +5,9 @@ */ export default { - // baseURL: 'https://huorantech.cn/', + baseURL: 'https://huorantech.cn/', // baseURL: 'http://192.168.31.151:9000/', - baseURL: 'http://121.37.12.51/', + // baseURL: 'http://121.37.12.51/', headers: { 'Content-Type': 'application/json;charset=UTF-8' }, diff --git a/order/orderDetail/orderDetail.vue b/order/orderDetail/orderDetail.vue index 285de49..53288b7 100644 --- a/order/orderDetail/orderDetail.vue +++ b/order/orderDetail/orderDetail.vue @@ -1101,6 +1101,12 @@ font-size: 32rpx; color: #007EFF; } + .period { + flex: none; + width: 100rpx; + font-size: 28rpx; + text-align: center; + } } .bottom { z-index: 2; diff --git a/team/qrcode/qrcode.vue b/team/qrcode/qrcode.vue index 0877d10..bc1bcae 100644 --- a/team/qrcode/qrcode.vue +++ b/team/qrcode/qrcode.vue @@ -59,8 +59,8 @@ generateInvitationCode(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=${accountId}&id=${this.id}&isTeam=1` - this.link = `http://121.37.12.51/backstage/#/join?accountId=${accountId}&id=${this.id}&isTeam=1` + this.link = `https://huorantech.cn/#/join?accountId=${accountId}&id=${this.id}&isTeam=1` + // this.link = `http://121.37.12.51/backstage/#/join?accountId=${accountId}&id=${this.id}&isTeam=1` }).catch(e => {}) }, // 二维码组件生成完成钩子。生成后把图片导出给image组件,image组件才可以长按二维码转发 diff --git a/team/setting/setting.vue b/team/setting/setting.vue index 4cca2df..909ddc6 100644 --- a/team/setting/setting.vue +++ b/team/setting/setting.vue @@ -65,7 +65,7 @@ success(res) { if (res.confirm) { uni.clearStorageSync() - that.$util.to('../login/login') + that.$util.to('/pages/login/login') } } })