diff --git a/.env.development b/.env.development
index b3b870e..0cc5e9d 100644
--- a/.env.development
+++ b/.env.development
@@ -1,4 +1,4 @@
VITE_COMMON_API_PREFIX = /api-base
-VITE_COMMON_API_URL = http://store-manage.hmily.club
+VITE_COMMON_API_URL = http://store-manage.hmily.club/api
diff --git a/src/App.vue b/src/App.vue
index 9334c3f..69da161 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -3,16 +3,25 @@ import { useUserStoreWithOut } from '@/store/modules/user'
export default {
onLaunch: function () {
const userStore = useUserStoreWithOut()
-
+ // if (userStore.isLogin) {
+ // userStore.fetchUserInfo()
+ // } else {
+ // uni.navigateTo({
+ // url: '/pages/login/index',
+ // })
+ // }
+ // #ifdef APP-PLUS
if (userStore.isLogin) {
- userStore.fetchUserInfo()
+ plus.navigator.closeSplashscreen()
} else {
- uni.navigateTo({
+ uni.reLaunch({
url: '/pages/login/index',
+ success: () => {
+ plus.navigator.closeSplashscreen()
+ },
})
}
-
- console.log('App Launch')
+ // #endif
},
onShow: function () {
console.log('App Show')
diff --git a/src/components/cu-navbar/index.vue b/src/components/cu-navbar/index.vue
index f8b2621..98140d6 100644
--- a/src/components/cu-navbar/index.vue
+++ b/src/components/cu-navbar/index.vue
@@ -11,11 +11,12 @@
>
-
+ > -->
+
diff --git a/src/manifest.json b/src/manifest.json
index d30ecdc..210d5ea 100644
--- a/src/manifest.json
+++ b/src/manifest.json
@@ -1,5 +1,5 @@
{
- "name" : "aa",
+ "name" : "托管门店助手",
"appid" : "__UNI__ADB6360",
"description" : "",
"versionName" : "1.0.0",
@@ -11,11 +11,11 @@
"nvueStyleCompiler" : "uni-app",
"compilerVersion" : 3,
"splashscreen" : {
- "alwaysShowBeforeRender" : true,
+ "alwaysShowBeforeRender" : false,
"waiting" : true,
- "autoclose" : true,
+ "autoclose" : false,
"delay" : 0
- },
+ },
/* 模块配置 */
"modules" : {},
/* 应用发布信息 */
diff --git a/src/pages.json b/src/pages.json
index 098dae8..4a6d729 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -1,6 +1,20 @@
{
"pages": [
-
+ {
+ "path": "pages/guide/judge",
+ "style": {
+ "enablePullDownRefresh": false,
+ "onReachBottomDistance": 100,
+ "navigationStyle": "custom",
+ "app-plus": {
+ "contentAdjust": false,
+ "bounce": "none"
+ }
+ },
+ "meta": {
+ "login": false
+ }
+ },
{
"path": "pages/home/index",
"style": {
@@ -30,6 +44,12 @@
"style": {
"navigationBarTitleText": "我的"
}
+ },
+ {
+ "path": "pages/message/index",
+ "style": {
+ "navigationBarTitleText": "消息"
+ }
}
],
"subPackages": [
diff --git a/src/pages/guide/judge.vue b/src/pages/guide/judge.vue
new file mode 100644
index 0000000..6ea695b
--- /dev/null
+++ b/src/pages/guide/judge.vue
@@ -0,0 +1,26 @@
+
+
+
+
+
diff --git a/src/pages/home/index.vue b/src/pages/home/index.vue
index 5480d6d..7e13b8c 100644
--- a/src/pages/home/index.vue
+++ b/src/pages/home/index.vue
@@ -1,12 +1,15 @@
-
-
-
-
+
+
+
+
+
+
+
-
+
昨日累计金额
截止{{ yesterday }}
@@ -44,6 +47,7 @@
diff --git a/src/pages/login/Layout.vue b/src/pages/login/Layout.vue
index 81c6f81..c159ebd 100644
--- a/src/pages/login/Layout.vue
+++ b/src/pages/login/Layout.vue
@@ -2,10 +2,10 @@
-
-
+
+
- 体彩管理系统
+ 托管门店助手
欢迎登录
diff --git a/src/pages/message/components/item.vue b/src/pages/message/components/item.vue
new file mode 100644
index 0000000..232cd33
--- /dev/null
+++ b/src/pages/message/components/item.vue
@@ -0,0 +1,28 @@
+
+
+
+ {{ statusFun('system', 'messages', 'name') }}
+ {{
+ timeFormat(item?.created_at, 'mm月dd日 hh:MM')
+ }}
+
+ {{item?.content}}
+
+
+
+
diff --git a/src/pages/message/index.vue b/src/pages/message/index.vue
new file mode 100644
index 0000000..7c062bd
--- /dev/null
+++ b/src/pages/message/index.vue
@@ -0,0 +1,96 @@
+
+
+
+
+ 一键已读
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/revert/index.vue b/src/pages/revert/index.vue
index 1f1e647..39787e1 100644
--- a/src/pages/revert/index.vue
+++ b/src/pages/revert/index.vue
@@ -1,6 +1,6 @@
-
+
+
- |
+ |
- |
+ |
- |
+ |
@@ -19,20 +31,45 @@
- 退出登录
+ 退出登录
+
+
diff --git a/src/pages/statement/index.vue b/src/pages/statement/index.vue
index 2397f35..7a99bd2 100644
--- a/src/pages/statement/index.vue
+++ b/src/pages/statement/index.vue
@@ -1,37 +1,7 @@
-
-
-
-
-
-
-
-
+
{
config.baseURL = apiUrl;
config.timeout = 10000;
config.header = Object.assign({
- // 'Content-Type': 'application/json;charset=UTF-8',
+ Accept: 'application/json'
}, config.header);
/* 设置全局配置 */
config.validateStatus = (statusCode) => {
@@ -48,6 +48,14 @@ http.interceptors.response.use(async (response) => {
// 处理响应结果
const { statusCode, data } = response
if (statusCode >= 400) {
+ if(statusCode === 401) {
+ const userStore = useUserStoreWithOut();
+ userStore.logout();
+ uni.navigateTo({
+ url: '/pages/login/index'
+ })
+ return Promise.reject(response)
+ }
uni.showToast({
title: data.message || '服务器错误',
icon: 'none'
diff --git a/src/utils/status.js b/src/utils/status.js
index 35fa8c9..a71eca2 100644
--- a/src/utils/status.js
+++ b/src/utils/status.js
@@ -1,4 +1,17 @@
const data = {
+ messages:[{
+ value:'system',
+ name:'系统消息',
+ },{
+ value:'work',
+ name:'工作消息',
+ },{
+ value:'exam',
+ name:'考试通知',
+ },{
+ value:'approval',
+ name:'审批通知',
+ }],
statusExpense: [{
value: 1,
name: '待提审',