From 26d4d20643c1e5801663f0b142c6ff3dd33a96e5 Mon Sep 17 00:00:00 2001
From: yujialong <479214531@qq.com>
Date: Mon, 1 Jul 2024 10:10:46 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=96=E9=9F=B3=E5=B0=8F=E7=A8=8B=E5=BA=8F?=
=?UTF-8?q?=E4=B8=8A=E7=BA=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
apis/modules/user.js | 10 +-
components/notAuth/notAuth.vue | 4 +-
libs/uma.js | 2 -
order/addCourse/addCourse.vue | 7 +-
order/curClient/curClient.vue | 2 +
order/orderDetail/orderDetail.vue | 160 ++++++++++++++------------
order/productDetail/productDetail.vue | 2 +-
order/shopCart/shopCart.vue | 2 +
pages/login/login.vue | 91 +++++++--------
pages/orders/orders.vue | 4 +-
pages/person/person.vue | 3 +
pages/reg/reg.vue | 51 ++++----
team/qrcode/qrcode.vue | 6 +-
13 files changed, 188 insertions(+), 156 deletions(-)
diff --git a/apis/modules/user.js b/apis/modules/user.js
index cfea0c6..524f34c 100644
--- a/apis/modules/user.js
+++ b/apis/modules/user.js
@@ -13,6 +13,10 @@ export const douYinLoginByOpenid = (data) => {
return post('users/users/user/douYinLoginByOpenid?openid=' + data)
}
+export const douYinUserBinding = (data) => {
+ return post('users/users/user/douYinUserBinding', data)
+}
+
export const queryProvince = () => {
return get('nakadai/nakadai/province/queryProvince')
}
@@ -72,8 +76,8 @@ export const checkIfThePhoneNumberExists = phone => {
return post(`users/users/applets/mine/checkIfThePhoneNumberExists?phone=${phone}`)
}
-export const queryPartnerAccount = phone => {
- return post(`nakadai/nakadai/partnerAccount/queryPartnerAccount?phone=${phone}`)
+export const queryPartnerAccount = data => {
+ return post(`nakadai/nakadai/partnerAccount/queryPartnerAccount?phone=${data.phone}&openId=${data.openId}&douYinOpenId=${data.douYinOpenId}`)
}
export const getSessionKey = data => {
@@ -85,7 +89,7 @@ export const partnerAccountApplication = data => {
}
export const loginByOpenid = openid => {
- return post(`users/users/user/loginByOpenid?openid=` + openid)
+ return post(`users/users/user/loginByOpenid?openid=${openid}`)
}
export const checkWorkNumOrAccount = account => {
diff --git a/components/notAuth/notAuth.vue b/components/notAuth/notAuth.vue
index 466df5e..52f9d08 100644
--- a/components/notAuth/notAuth.vue
+++ b/components/notAuth/notAuth.vue
@@ -3,7 +3,7 @@
权限审核中，可联系下方平台运营加快审核进度
-
+
@@ -12,7 +12,7 @@
export default {
data() {
return {
-
+ src: uni.getSystemInfoSync().uniPlatform === 'mp-toutiao' ? 'https://occupationlab.com/images/dyQrcode.jpg' : 'https://occupationlab.com/images/customer.png'
}
},
methods: {
diff --git a/libs/uma.js b/libs/uma.js
index 2976ca7..a688ffd 100644
--- a/libs/uma.js
+++ b/libs/uma.js
@@ -1,5 +1,4 @@
-// #ifdef MP-WEIXIN
import uma from 'umtrack-wx';
uma.init({
appKey: '64cc98d5a1a164591b62da3e', // 由友盟分配的APP_KEY
@@ -17,4 +16,3 @@ uma.install = function(Vue) {
Vue.prototype.$uma = uma;
}
export default uma;
-// #endif
diff --git a/order/addCourse/addCourse.vue b/order/addCourse/addCourse.vue
index 3f85280..9aeccc6 100644
--- a/order/addCourse/addCourse.vue
+++ b/order/addCourse/addCourse.vue
@@ -67,7 +67,8 @@
value: 1
}],
checked: uni.getStorageSync('courses') || [], // 已经勾选的集合
- courses: uni.getStorageSync('courses') || []
+ courses: uni.getStorageSync('courses') || [],
+ submiting: false,
}
},
watch: {
@@ -259,6 +260,9 @@
submit() {
const list = this.checked // 已选产品
if (list.length) {
+ if (this.submiting) return false
+ this.submiting = true
+
const result = this.courses
const list1 = [] // 实训、理论
const list0 = [] // 数据前瞻
@@ -317,6 +321,7 @@
this.handleRenew(4, customerId, list4, result, resolve, reject)
}))
Promise.all(promises).then(_ => {
+ this.submiting = false
uni.setStorageSync('courses', result) // 把选中的产品添加至缓存
uni.redirectTo({
url: `../editCourse/editCourse?customerId=${customerId}&orderType=${this.orderType}`
diff --git a/order/curClient/curClient.vue b/order/curClient/curClient.vue
index 95c66fb..f02cfdc 100644
--- a/order/curClient/curClient.vue
+++ b/order/curClient/curClient.vue
@@ -216,8 +216,10 @@
margin-top: 20rpx;
background-color: #fff;
.item {
+ width: 100%;
padding: 20rpx 40rpx;
border-bottom: 1px solid #f1f1f1;
+ box-sizing: border-box;
}
.c-name {
font-size: 30rpx;
diff --git a/order/orderDetail/orderDetail.vue b/order/orderDetail/orderDetail.vue
index 9193684..02101fa 100644
--- a/order/orderDetail/orderDetail.vue
+++ b/order/orderDetail/orderDetail.vue
@@ -41,11 +41,11 @@
-->
-
+
订单编号
{{ form.orderNumber }}
-
+
订单时间
{{ form.createTime }}
@@ -57,82 +57,84 @@
-
-
- {{ c.name }}
-
-
-
-
+
+
+
+
+
@@ -293,6 +295,9 @@
}
this.courseList = store
this.courses = list
+ uni.pageScrollTo({
+ selector: '#products'
+ })
try {
uni.removeStorageSync('courses')
} catch (e) {}
@@ -759,7 +764,18 @@
this.delShopCart(courses)
uni.hideLoading()
this.$util.sucMsg('添加成功')
+
+ // #ifdef MP-WEIXIN
this.publicNotice()
+ // #endif
+
+ // #ifdef MP-TOUTIAO
+ setTimeout(() => {
+ uni.switchTab({
+ url: '/pages/orders/orders'
+ })
+ }, 1500)
+ // #endif
}).catch(res => {
uni.hideLoading()
})
diff --git a/order/productDetail/productDetail.vue b/order/productDetail/productDetail.vue
index a36100c..0c1111c 100644
--- a/order/productDetail/productDetail.vue
+++ b/order/productDetail/productDetail.vue
@@ -414,7 +414,7 @@
white-space: nowrap;
}
.des-html {
- width: 100%;;
+ width: calc(100% - 140rpx);
font-size: 28rpx !important;
}
.rich-text-content span {
diff --git a/order/shopCart/shopCart.vue b/order/shopCart/shopCart.vue
index 39c28ef..0ee501b 100644
--- a/order/shopCart/shopCart.vue
+++ b/order/shopCart/shopCart.vue
@@ -259,10 +259,12 @@
li {
display: flex;
align-items: center;
+ width: 100%;
padding: 30rpx 24rpx;
margin: 16rpx 24rpx;
background-color: #fff;
border-radius: 16rpx;
+ box-sizing: border-box;
}
.name {
margin-bottom: 10rpx;
diff --git a/pages/login/login.vue b/pages/login/login.vue
index 52d4cbf..1905efc 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -26,7 +26,7 @@