diff --git a/admin/src/views/decoration/tabbar.vue b/admin/src/views/decoration/tabbar.vue
index 52650b43..7b378ae9 100644
--- a/admin/src/views/decoration/tabbar.vue
+++ b/admin/src/views/decoration/tabbar.vue
@@ -157,6 +157,7 @@ const setData = async () => {
getData()
feedback.msgSuccess('保存成功')
}
+getData()
diff --git a/app/src/pages/register/register.vue b/app/src/pages/register/register.vue
new file mode 100644
index 00000000..68652dc4
--- /dev/null
+++ b/app/src/pages/register/register.vue
@@ -0,0 +1,76 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 已阅读并同意
+ 《服务协议》
+ 和《隐私协议》
+
+
+
+
+ 注册
+
+
+
+
+
+
+
+
diff --git a/app/src/plugins/modules/pinia.ts b/app/src/plugins/modules/pinia.ts
new file mode 100644
index 00000000..c5b769f3
--- /dev/null
+++ b/app/src/plugins/modules/pinia.ts
@@ -0,0 +1,6 @@
+import { App } from 'vue'
+import { createPinia } from 'pinia'
+const pinia = createPinia()
+export default (app: App) => {
+ app.use(pinia)
+}
diff --git a/app/src/static/images/icon_code.png b/app/src/static/images/icon_code.png
new file mode 100644
index 00000000..143e6d97
Binary files /dev/null and b/app/src/static/images/icon_code.png differ
diff --git a/app/src/static/images/icon_mobile.png b/app/src/static/images/icon_mobile.png
new file mode 100644
index 00000000..a5e76812
Binary files /dev/null and b/app/src/static/images/icon_mobile.png differ
diff --git a/app/src/static/images/icon_wx.png b/app/src/static/images/icon_wx.png
new file mode 100644
index 00000000..48102711
Binary files /dev/null and b/app/src/static/images/icon_wx.png differ
diff --git a/app/src/stores/app.ts b/app/src/stores/app.ts
new file mode 100644
index 00000000..82bdc1ec
--- /dev/null
+++ b/app/src/stores/app.ts
@@ -0,0 +1,8 @@
+import { defineStore } from 'pinia'
+
+export const useAppStore = defineStore({
+ id: 'userStore',
+ state: () => ({}),
+ getters: {},
+ actions: {}
+})
diff --git a/app/src/stores/user.ts b/app/src/stores/user.ts
new file mode 100644
index 00000000..4a821b83
--- /dev/null
+++ b/app/src/stores/user.ts
@@ -0,0 +1,12 @@
+import { getClient } from '@/utils/client'
+import { defineStore } from 'pinia'
+
+export const useAppStore = defineStore({
+ id: 'appStore',
+ // convert to a function
+ state: () => ({
+ client: getClient()
+ }),
+ getters: {},
+ actions: {}
+})
diff --git a/app/src/uni_modules/vk-uview-ui/components/u-form-item/u-form-item.vue b/app/src/uni_modules/vk-uview-ui/components/u-form-item/u-form-item.vue
index 9111eea5..34d2944c 100644
--- a/app/src/uni_modules/vk-uview-ui/components/u-form-item/u-form-item.vue
+++ b/app/src/uni_modules/vk-uview-ui/components/u-form-item/u-form-item.vue
@@ -429,7 +429,7 @@
.u-form-item {
@include vue-flex;
// align-items: flex-start;
- padding: 10rpx 0;
+ padding: 15rpx 0;
font-size: 28rpx;
color: $u-main-color;
box-sizing: border-box;
@@ -485,10 +485,8 @@
&__slot {
flex: 1;
- /* #ifndef MP */
@include vue-flex;
align-items: center;
- /* #endif */
}
&__icon {
diff --git a/app/src/utils/client.ts b/app/src/utils/client.ts
new file mode 100644
index 00000000..f030591c
--- /dev/null
+++ b/app/src/utils/client.ts
@@ -0,0 +1,57 @@
+import { ClientEnum } from '@/enums/appEnums'
+
+/**
+ * @description 判断是否为微信环境
+ * @return { Boolean }
+ */
+export const isWeixinClient = () => {
+ // #ifdef H5
+ return /MicroMessenger/i.test(navigator.userAgent)
+ // #endif
+}
+
+/**
+ * @description 获取当前是什么端
+ * @return { Object }
+ */
+
+export const getClient = () => {
+ //@ts-ignore
+ return handleClientEvent({
+ // 微信小程序
+ MP_WEIXIN: () => ClientEnum['MP_WEIXIN'],
+ // 微信公众号
+ OA_WEIXIN: () => ClientEnum['OA_WEIXIN'],
+ // H5
+ H5: () => ClientEnum['H5'],
+ // APP
+ IOS: () => ClientEnum['IOS'],
+ ANDROID: () => ClientEnum['ANDROID'],
+ // 其它
+ OTHER: () => null
+ })
+}
+
+// 根据端处理事件
+//@ts-ignore
+export const handleClientEvent = ({ MP_WEIXIN, OA_WEIXIN, H5, IOS, ANDROID, OTHER }) => {
+ // #ifdef MP-WEIXIN
+ return MP_WEIXIN()
+ // #endif
+
+ // #ifdef H5
+ return isWeixinClient() ? OA_WEIXIN() : H5()
+ // #endif
+
+ // #ifdef APP-PLUS
+ const system = uni.getSystemInfoSync()
+ if (system.platform == 'ios') {
+ return IOS()
+ } else {
+ return ANDROID()
+ }
+ // #endif
+ return OTHER()
+}
+
+export const client = getClient()
diff --git a/app/src/utils/request/index.ts b/app/src/utils/request/index.ts
index 12c13d50..57fef43b 100644
--- a/app/src/utils/request/index.ts
+++ b/app/src/utils/request/index.ts
@@ -32,11 +32,11 @@ const requestHooks: RequestHooks = {
if (!isTransformResponse) {
return response.data
}
+ console.log(response.data)
const { code, data, msg } = response.data as any
switch (code) {
case RequestCodeEnum.SUCCESS:
return data
-
case RequestCodeEnum.PARAMS_TYPE_ERROR:
case RequestCodeEnum.PARAMS_VALID_ERROR:
case RequestCodeEnum.REQUEST_METHOD_ERROR:
@@ -47,7 +47,8 @@ const requestHooks: RequestHooks = {
case RequestCodeEnum.NO_PERMISSTION:
case RequestCodeEnum.FAILED:
case RequestCodeEnum.SYSTEM_ERROR:
- return Promise.reject(data)
+ uni.$u.toast(msg)
+ return Promise.reject(msg)
case RequestCodeEnum.TOKEN_INVALID:
case RequestCodeEnum.TOKEN_EMPTY:
@@ -63,13 +64,13 @@ const defaultOptions: HttpRequestOptions = {
requestOptions: {
timeout: 10 * 1000
},
- baseUrl: 'https://likeadmin-java.yixiangonline.com',
+ baseUrl: import.meta.env.VITE_APP_BASE_URL,
//是否返回默认的响应
isReturnDefaultResponse: false,
// 需要对返回数据进行处理
isTransformResponse: true,
// 接口拼接地址
- urlPrefix: '/api',
+ urlPrefix: 'api',
// 忽略重复请求
ignoreCancel: false,
// 是否携带token