diff --git a/config/dev.js b/config/dev.js
index 5e761df..23fba98 100644
--- a/config/dev.js
+++ b/config/dev.js
@@ -2,7 +2,7 @@
export const DEV_CONFIG = {
// 临时token,用于开发测试
TEMP_TOKEN:
- 'eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6IjIwZGUwMWIxLTYyZTMtNDZiNi04ZDY2LWM5MGNkMzk0MzBkZSJ9.3XuGxoM7Q4sQBt7UJXYgHG_FWI88unIsvq7ni-Jg5_UDpgjLa7SaM-ZDIgWQw73r-Jrs37g5ubahxTa8aiZTkA',
+ 'eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6IjViMTMzOTU5LWRkOGYtNDUwZS1hNDNmLTQyNTZmNzljNjU4YyJ9.vEal-nq4biYni9F3YhBr6pt6mEepOYFQzlSeERQ-Ft_YejklpzmjhvIF9nO3PkjS7F5ns4unIUt8Ov0JEWnY2Q',
// 是否使用临时token
USE_TEMP_TOKEN: true,
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 5f02f60..9213645 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -341,9 +341,12 @@ export default {
}
console.log('续费数据:', renewData)
-
+ uni.showLoading({
+ title: '正在生成续费订单',
+ mask: 'true',
+ })
const response = await renewDevice(renewData)
-
+ uni.hideLoading()
if (response.code === 200) {
const data = response.data
const wxpPayParams = data.payParams
diff --git a/pages/lease/lease.vue b/pages/lease/lease.vue
index fae5dfc..8c24253 100644
--- a/pages/lease/lease.vue
+++ b/pages/lease/lease.vue
@@ -170,7 +170,6 @@
-
@@ -481,15 +480,20 @@ export default {
content: `确认支付 ¥${this.payAmount} 吗?\n\n${this.formData.quantity}台${this.formData.equipment}\n周期:${this.formData.period}`,
success: async res => {
if (res.confirm) {
- this.$refs.toast.show({
- type: 'loading',
- message: '正在提交订单中...',
- overlay: true, // 启用遮罩
- duration: 10000,
+ // this.$refs.toast.show({
+ // type: 'loading',
+ // message: '正在提交订单中...',
+ // overlay: true, // 启用遮罩
+ // duration: 10000,
+ // })
+ uni.showLoading({
+ title: '正在生成订单',
+ mask: 'true',
})
// 这里可以调用支付API
const response = await createLeaseOrder(this.formData)
- this.$refs.toast.hide()
+ // this.$refs.toast.hide()
+ uni.hideLoading()
if (response.code === 200) {
const data = response.data
console.log(data)
@@ -520,7 +524,7 @@ export default {
fail: function (res) {
uni.showToast({
title: '支付失败',
- icon: 'fail',
+ icon: 'error',
})
},
complete: function (res) {
diff --git a/pages/login/login.vue b/pages/login/login.vue
index f998c04..42c0e3f 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -79,10 +79,11 @@
+
@@ -64,29 +90,3 @@
-
- 123
-
-
-
diff --git a/utils/request.js b/utils/request.js
index d6b3b05..f4dd455 100644
--- a/utils/request.js
+++ b/utils/request.js
@@ -19,7 +19,7 @@ const ENV_CONFIG = {
release: {
// 正式版
// baseUrl: 'https://chu.chuangtewl.com/prod-api',
- // baseUrl: 'http://192.168.2.88:4601',
+ // baseUrl: 'http://192.168.2.21:4601',
baseUrl: 'http://192.168.2.21:4601',
appId: 1,
},