diff --git a/.env b/.env
new file mode 100644
index 0000000..6dc5b52
--- /dev/null
+++ b/.env
@@ -0,0 +1,2 @@
+VITE_APP_NAME=webSoft
+VITE_API_URL=/api
diff --git a/.env.development b/.env.development
new file mode 100644
index 0000000..f164563
--- /dev/null
+++ b/.env.development
@@ -0,0 +1,9 @@
+VITE_APP_NAME=后台管理系统
+VITE_SOCKET_URL=wss://server.gxwebsoft.com
+VITE_SERVER_URL=https://server.gxwebsoft.com/api
+#VITE_THINK_URL=https://gxtyzx-api.websoft.top/api
+VITE_API_URL=https://modules.gxwebsoft.com/api
+
+#VITE_SERVER_URL=http://127.0.0.1:9090/api
+#VITE_API_URL=http://127.0.0.1:9001/api
+VITE_THINK_URL=http://127.0.0.1:9099/api
diff --git a/.env.production b/.env.production
new file mode 100644
index 0000000..ee66a2b
--- /dev/null
+++ b/.env.production
@@ -0,0 +1,8 @@
+VITE_APP_NAME=后台管理系统
+VITE_SOCKET_URL=wss://server.gxwebsoft.com
+VITE_SERVER_URL=https://server.gxwebsoft.com/api
+VITE_THINK_URL=https://gxtyzx-api.websoft.top/api
+VITE_API_URL=https://modules.gxwebsoft.com/api
+#VITE_SERVER_URL=http://127.0.0.1:9090/api
+#VITE_API_URL=http://127.0.0.1:9001/api
+#VITE_THINK_URL=http://127.0.0.1:9099/api
diff --git a/src/App.vue b/src/App.vue
index 8d7681a..1882325 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,7 +1,14 @@
\ No newline at end of file
+ .web-text-secondary {
+ margin-right: 20rpx;
+ }
+}
+
diff --git a/src/package/user/emergency.vue b/src/package/user/emergency.vue
index db6b368..07e4cf1 100644
--- a/src/package/user/emergency.vue
+++ b/src/package/user/emergency.vue
@@ -6,7 +6,7 @@
-
+
@@ -30,11 +30,11 @@
-
-
+
+
-
-
+
+
import { useUserStore } from '@/store/modules/user';
-import * as Api from '@/api/booking/emergency';
+import * as Api from '@/api/think/thinkUsersEmergency';
import * as MpMenuApi from '@/api/cms/mp-menu/index';
import { getWxOpenId } from '@/api/passport/login';
import { openUrl } from '@/utils/common';
@@ -68,12 +68,12 @@ export default {
statusBarHeight: 104,
isLogin: false,
form: {
- name: '',
- phone: ''
+ contractName: '',
+ contractPhone: ''
},
rules: {
// 对name字段进行必填验证
- name: {
+ contractName: {
rules: [
{
required: true,
@@ -87,7 +87,7 @@ export default {
]
},
// 对email字段进行必填验证
- phone: {
+ contractPhone: {
rules: [
{
required: true,
@@ -119,8 +119,8 @@ export default {
}
// 获取联系人列表
- Api.pageEmergency({
- userId: userInfo.userId
+ Api.pageThinkUsersEmergency({
+ uid: uni.getStorageSync('uid')
}).then((res) => {
app.list = res.list;
});
@@ -151,7 +151,7 @@ export default {
uni.showLoading({
title: '请求中.'
});
- Api.removeEmergency(item.emergencyId).then((res) => {
+ Api.removeThinkUsersEmergency(item.id).then((res) => {
uni.showToast({
title: '操作成功',
icon: 'none'
@@ -167,7 +167,7 @@ export default {
this.$refs.form
.validate()
.then((res) => {
- Api.addEmergency(this.form)
+ Api.addThinkUsersEmergency({...this.form,sort: 99})
.then((msg) => {
uni.showToast({
title: msg,
diff --git a/src/package/user/ic-card.vue b/src/package/user/ic-card.vue
index 3d16842..f204141 100644
--- a/src/package/user/ic-card.vue
+++ b/src/package/user/ic-card.vue
@@ -1,224 +1,228 @@
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 温馨提示
- 1、请输入卡号和姓名及手机号码进行激活
- 2、如果忘记用户信息,请先联系场馆
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+ 温馨提示
+ 1、请输入卡号和姓名及手机号码进行激活
+ 2、如果忘记用户信息,请先联系场馆
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/package/user/integral.vue b/src/package/user/integral.vue
index 1799367..359e2e9 100644
--- a/src/package/user/integral.vue
+++ b/src/package/user/integral.vue
@@ -6,7 +6,7 @@
当前积分
- {{ Math.floor(userInfo.users.integral) }}
+ {{ Math.floor(users.integral) }}
{
+ if (data) {
+ app.users = data;
+ }
+ });
+
// 当前登录用户信息
const userInfo = await userStore.fetchUserInfo();
if (Object.keys(userInfo).length > 0) {
app.isLogin = true
app.userInfo = userInfo
- // 获取用户副表信息
- UserApi.getByPhone({
- phone: userInfo.phone
- }).then((data) => {
- if (data) {
- app.userInfo.users = data;
- app.userInfo.ouid = data.uid;
- uni.setStorageSync('ouid',data.uid);
- }
- });
+
} else {
app.isLogin = false
}
@@ -138,8 +137,10 @@
const app = this
app.openLogin()
app.todaySign = true
- Api.addIntegral({
- id: app.userInfo.users.id
+ Api.addThinkIntegral({
+ id: uni.getStorageSync('uid'),
+ username: uni.getStorageSync('username'),
+ phone: uni.getStorageSync('phone')
}).then(res => {
// UserApi.updatePointsBySign()
// app.userInfo.points++
diff --git a/src/package/user/personal.vue b/src/package/user/personal.vue
index 7b37ff2..27fffa8 100644
--- a/src/package/user/personal.vue
+++ b/src/package/user/personal.vue
@@ -17,17 +17,17 @@
-
-
+
+
-
+
-
+
-
+
@@ -67,7 +67,7 @@
import {
useUserStore
} from '@/store/modules/user';
- import * as UserApi from '@/api/booking/users';
+ import * as UserApi from '@/api/think/thinkUsers';
import * as MpMenuApi from '@/api/cms/mp-menu/index';
import {
getWxOpenId
@@ -110,9 +110,7 @@
app.isLogin = true
app.form = userInfo
// 获取用户副表信息
- UserApi.getByPhone({
- phone: userInfo.phone
- }).then(data => {
+ UserApi.getThinkUsers(uni.getStorageSync('uid')).then(data => {
if (data) {
app.form = Object.assign({}, app.form, data);
}
@@ -145,16 +143,16 @@
async chooseAvatar({detail}) {
const url = detail.avatarUrl
this.form.avatarUrl = await uploadOssByPath(url)
- UserApi.updateUsers({
- id: this.form.id,
- avatarUrl: `${this.form.avatarUrl}`
- })
+ await UserApi.updateThinkUsers({
+ id: this.form.id,
+ avatarUrl: `${this.form.avatarUrl}`
+ })
},
save() {
const app = this
const { form } = this
- if(!uni.$uv.test.idCard(form.idCard)){
+ if(!uni.$uv.test.idCard(form.idcard)){
uni.showToast({
title: '请填写真实身份证号',
icon: 'none'
@@ -162,13 +160,7 @@
return false
}
- UserApi.updateUsers({
- phone: form.phone,
- username: form.username,
- realName: form.realName,
- idCard: form.idCard,
- id: form.id
- }).then(res => {
+ UserApi.updateThinkUsers(this.form).then(res => {
uni.showToast({
title: '保存成功',
icon: 'success'
diff --git a/src/pages/index.vue b/src/pages/index.vue
index 7b9bf99..8251346 100644
--- a/src/pages/index.vue
+++ b/src/pages/index.vue
@@ -157,11 +157,13 @@ export default {
name: 'star',
title: '元芳'
}
- ]
+ ],
+ openid: null
};
},
onLoad() {
this.reload();
+ this.openid = uni.getStorageSync('openid');
},
methods: {
async reload() {
diff --git a/src/pages/order.vue b/src/pages/order.vue
index fd59e11..53ed966 100644
--- a/src/pages/order.vue
+++ b/src/pages/order.vue
@@ -14,17 +14,17 @@
- {{ item.merchantName }}
+ {{ item.siteName }}
-
+
已取消
-
+
已完成
- 已支付
-
+ 已支付
+
未支付
@@ -34,10 +34,10 @@
-
-
+
+ @click="openUrl(`/package/order/detail?id=${item.id}`)"/>
@@ -49,9 +49,9 @@
-
+