From 700f576596095f81182a8f81112d50812c685136 Mon Sep 17 00:00:00 2001 From: yujialong <479214531@qq.com> Date: Fri, 29 Mar 2024 15:00:43 +0800 Subject: [PATCH] fix --- apis/modules/user.js | 3 +++ config/request.js | 2 +- libs/util.js | 10 +++++----- order/orderDetail/orderDetail.vue | 1 - pages/login/login.vue | 7 +------ styles/common.scss | 1 + team/qrcode/qrcode.vue | 2 +- 7 files changed, 12 insertions(+), 14 deletions(-) diff --git a/apis/modules/user.js b/apis/modules/user.js index 27f7a1b..a704bd0 100644 --- a/apis/modules/user.js +++ b/apis/modules/user.js @@ -20,6 +20,9 @@ export const updateAvatars = url => { export const userBinding = (data) => { return post('users/users/user/userBinding', data) } +export const sendPhoneOrEmailCode = (data) => { + return post('users/users/userAccount/sendPhoneOrEmailCode', data) +} export const examinePassword = (data) => { return post('users/users/userAccount/examinePassword', data) diff --git a/config/request.js b/config/request.js index 6f3a944..7bc9e7d 100644 --- a/config/request.js +++ b/config/request.js @@ -5,7 +5,7 @@ */ export default { - baseURL: 'https://huorantech.cn/', + baseURL: 'https://www.occupationlab.com/', // baseURL: 'http://192.168.31.152:9000/', // baseURL: 'http://121.37.12.51/', headers: { diff --git a/libs/util.js b/libs/util.js index c2969a6..3d4b6fc 100644 --- a/libs/util.js +++ b/libs/util.js @@ -1,11 +1,11 @@ import Product from '@/config/product' const files = [ - 'https://huorantech.cn/%E7%94%A8%E6%88%B7%E6%9C%8D%E5%8A%A1%E5%8D%8F%E8%AE%AE.docx', // 用户服务协议 - 'https://huorantech.cn/%E7%94%A8%E6%88%B7%E9%9A%90%E7%A7%81%E5%8D%8F%E8%AE%AE.docx', // 用户隐私协议 - 'https://huorantech.cn/%E4%BA%BA%E5%B7%A5%E6%99%BA%E8%83%BD%E5%AE%9E%E9%AA%8C%E5%AE%A4%E5%BB%BA%E8%AE%BE%E6%96%B9%E6%A1%88-2020.1.docx', // 人工智能 - 'https://huorantech.cn/%E5%A4%A7%E6%95%B0%E6%8D%AE%E7%AE%A1%E7%90%86%E4%B8%8E%E5%BA%94%E7%94%A8%E4%B8%93%E4%B8%9A%E5%BB%BA%E8%AE%BE%E6%96%B9%E6%A1%88.docx', // 大数据 - 'https://huorantech.cn/%E9%87%91%E8%9E%8D%E7%A7%91%E6%8A%80%E5%AE%9E%E9%AA%8C%E5%AE%A4%E5%BB%BA%E8%AE%BE%E6%96%B9%E6%A1%88V2.0.docx', // 金融科技 + 'https://huoran.oss-cn-shenzhen.aliyuncs.com/1709798714897.docx', // 用户服务协议 + 'https://huoran.oss-cn-shenzhen.aliyuncs.com/1709798737175.docx', // 用户隐私协议 + 'https://huoran.oss-cn-shenzhen.aliyuncs.com/1709798668435.docx', // 人工智能 + 'https://huoran.oss-cn-shenzhen.aliyuncs.com/1709798621083.docx', // 大数据 + 'https://huoran.oss-cn-shenzhen.aliyuncs.com/1709798646462.docx', // 金融科技 ] const docExts = ['doc', 'xls', 'ppt', 'pdf', 'docx', 'xlsx', 'pptx'] export default { diff --git a/order/orderDetail/orderDetail.vue b/order/orderDetail/orderDetail.vue index c8edc64..9193684 100644 --- a/order/orderDetail/orderDetail.vue +++ b/order/orderDetail/orderDetail.vue @@ -712,7 +712,6 @@ }); } }) - }, // 从购物车选择产品下单的，则提交订单后删除购物车相对应产品 async delShopCart(courses) { diff --git a/pages/login/login.vue b/pages/login/login.vue index ea27a15..63229b6 100644 --- a/pages/login/login.vue +++ b/pages/login/login.vue @@ -69,12 +69,6 @@ lang: 'zh_CN', desc: '登录', success: ({ userInfo }) => { - console.log(22, userInfo) - uni.setStorageSync('userName', userInfo.nickName) - uni.setStorageSync('avatar', userInfo.avatarUrl) - uni.setStorageSync('token', 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJzdWIiOiJ1c2VyIiwiaWF0IjoxNjk4OTkxMTU1LCJleHAiOjE2OTk4NTUxNTUsImFjY291bnRJZCI6IjEwOCJ9.u1zi29b93oGhY38gkgldBhhvguXFGeVPd_x2OalQBXQ') - this.toIndex() - return uni.login({ success: ({ code }) => { if (code) { @@ -145,6 +139,7 @@ this.submiting = true const phone = data.phoneNumber if (this.isReg) { // 注册 + this.submiting = false this.$util.to(`../reg/reg?openid=${this.openid}&phone=${phone}`) } else { // 登录绑定手机号 userBinding({ diff --git a/styles/common.scss b/styles/common.scss index 5b18094..8a817e6 100644 --- a/styles/common.scss +++ b/styles/common.scss @@ -204,6 +204,7 @@ ul { padding: 10rpx; background-color: #fff; transition: .3s; + overflow: auto; &.active { top: 0; } diff --git a/team/qrcode/qrcode.vue b/team/qrcode/qrcode.vue index 1c33c7a..6b57199 100644 --- a/team/qrcode/qrcode.vue +++ b/team/qrcode/qrcode.vue @@ -63,7 +63,7 @@ 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}&provinceId=${uni.getStorageSync('provinceId')}&cityId=${uni.getStorageSync('cityId')}` + this.link = `https://www.occupationlab.com/#/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 => {}) },