diff --git a/App.vue b/App.vue
index 94d7a28..f1dd105 100644
--- a/App.vue
+++ b/App.vue
@@ -1,37 +1,37 @@
diff --git a/config.js b/config.js
index 1b743ca..c86d50a 100644
--- a/config.js
+++ b/config.js
@@ -1,29 +1,29 @@
// 应用全局配置
export default {
- // baseUrl: 'https://vue.ruoyi.vip/prod-api', //
- // baseUrl: '/prod-api', //前后端分离版的接口地址,转发代理 设置在了manifest.json文件中
- // baseUrl: 'http://192.168.3.27:18090', //前后端分离版的接口地址
- baseUrl: 'http://106.15.139.36:18090', //前后端分离版的接口地址
+ // baseUrl: 'https://vue.ruoyi.vip/prod-api', //
+ // baseUrl: '/prod-api', //前后端分离版的接口地址,转发代理 设置在了manifest.json文件中
+ // baseUrl: 'http://192.168.3.27:18090', //前后端分离版的接口地址
+ baseUrl: 'http://106.15.139.36:18090', //前后端分离版的接口地址
//测试提交
- // 应用信息
- appInfo: {
- // 应用名称
- name: "ruoyi-app",
- // 应用版本
- version: "1.2.0",
- // 应用logo
- logo: "/static/logo.png",
- // 官方网站
- site_url: "http://ruoyi.vip",
- // 政策协议
- agreements: [{
- title: "隐私政策",
- url: "https://ruoyi.vip/protocol.html"
- },
- {
- title: "用户服务协议",
- url: "https://ruoyi.vip/protocol.html"
- }
- ]
- }
+ // 应用信息
+ appInfo: {
+ // 应用名称
+ name: "ruoyi-app",
+ // 应用版本
+ version: "1.2.0",
+ // 应用logo
+ logo: "/static/logo.png",
+ // 官方网站
+ site_url: "http://ruoyi.vip",
+ // 政策协议
+ agreements: [{
+ title: "隐私政策",
+ url: "https://ruoyi.vip/protocol.html"
+ },
+ {
+ title: "用户服务协议",
+ url: "https://ruoyi.vip/protocol.html"
+ }
+ ]
+ }
}
diff --git a/main.js b/main.js
index d36a208..99bc045 100644
--- a/main.js
+++ b/main.js
@@ -1,36 +1,35 @@
// main.js
-import { createSSRApp } from 'vue'
+import {createSSRApp} from 'vue'
import App from './App'
-import store from './store' // Vuex store(如果还在用)
-import { install } from './plugins' // 自定义插件
-import './permission' // 路由权限
-import { useDict } from '@/utils/dict'
+import {install} from './plugins' // 自定义插件
+import './permission' // 路由权限
+import {useDict} from '@/utils/dict'
// import { createPinia } from 'pinia'
import * as Pinia from 'pinia';
import piniaPluginPersistedstate from 'pinia-plugin-persistedstate'
export function createApp() {
- const app = createSSRApp(App)
- // const pinia = createPinia()
-const pinia = Pinia.createPinia()
- // ✅ 安全注册持久化插件
- if (piniaPluginPersistedstate) {
- pinia.use(piniaPluginPersistedstate)
- } else {
- console.warn('pinia-plugin-persistedstate not found, persistence may not work')
- }
+ const app = createSSRApp(App)
+ // const pinia = createPinia()
+ const pinia = Pinia.createPinia()
+ // ✅ 安全注册持久化插件
+ if (piniaPluginPersistedstate) {
+ pinia.use(piniaPluginPersistedstate)
+ } else {
+ console.warn('pinia-plugin-persistedstate not found, persistence may not work')
+ }
- app.use(pinia)
- // app.use(store) // 如果你还在用 Vuex,否则可删除
+ app.use(pinia)
+ // app.use(store) // 如果你还在用 Vuex,否则可删除
- // 挂载全局方法
- app.config.globalProperties.useDict = useDict
+ // 挂载全局方法
+ app.config.globalProperties.useDict = useDict
- // 安装其他插件
- install(app)
+ // 安装其他插件
+ install(app)
- return {
- app,
- Pinia
- }
+ return {
+ app,
+ Pinia
+ }
}
\ No newline at end of file
diff --git a/manifest.json b/manifest.json
index d1ee0f3..141be45 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,23 +1,23 @@
{
- "name" : "若依移动端",
- "appid" : "__UNI__1863D69",
- "description" : "",
- "versionName" : "1.2.0",
- "versionCode" : "100",
- "transformPx" : false,
- "app-plus" : {
- "usingComponents" : true,
- "nvueCompiler" : "uni-app",
- "splashscreen" : {
- "alwaysShowBeforeRender" : true,
- "waiting" : true,
- "autoclose" : true,
- "delay" : 0
+ "name": "若依移动端",
+ "appid": "__UNI__1863D69",
+ "description": "",
+ "versionName": "1.2.0",
+ "versionCode": "100",
+ "transformPx": false,
+ "app-plus": {
+ "usingComponents": true,
+ "nvueCompiler": "uni-app",
+ "splashscreen": {
+ "alwaysShowBeforeRender": true,
+ "waiting": true,
+ "autoclose": true,
+ "delay": 0
},
- "modules" : {},
- "distribute" : {
- "android" : {
- "permissions" : [
+ "modules": {},
+ "distribute": {
+ "android": {
+ "permissions": [
"",
"",
"",
@@ -35,29 +35,29 @@
""
]
},
- "ios" : {
- "dSYMs" : false
+ "ios": {
+ "dSYMs": false
},
- "sdkConfigs" : {}
+ "sdkConfigs": {}
}
},
- "quickapp" : {},
- "mp-weixin" : {
- "appid" : "wxccd7e2a0911b3397",
- "setting" : {
- "urlCheck" : false,
- "es6" : false,
- "minified" : true,
- "postcss" : true
+ "quickapp": {},
+ "mp-weixin": {
+ "appid": "wxccd7e2a0911b3397",
+ "setting": {
+ "urlCheck": false,
+ "es6": false,
+ "minified": true,
+ "postcss": true
},
- "optimization" : {
- "subPackages" : true
+ "optimization": {
+ "subPackages": true
},
- "usingComponents" : true
+ "usingComponents": true
},
- "vueVersion" : "3",
- "h5" : {
- "template" : "static/index.html"
+ "vueVersion": "3",
+ "h5": {
+ "template": "static/index.html"
// "devServer" : {
// "port" : 30088,
// "https" : false,
@@ -75,11 +75,11 @@
// }
// }
// }
- },
- "title" : "RuoYi-App",
- "router" : {
- "mode" : "hash",
- "base" : "./"
- }
+ },
+ "title": "RuoYi-App",
+ "router": {
+ "mode": "hash",
+ "base": "./"
}
}
+}
diff --git a/package.json b/package.json
index e28cdf7..9f87a78 100644
--- a/package.json
+++ b/package.json
@@ -1,5 +1,5 @@
{
- "dependencies": {
- "pinia-plugin-persistedstate": "^4.5.0"
- }
+ "dependencies": {
+ "pinia-plugin-persistedstate": "^4.5.0"
+ }
}
diff --git a/pages.json b/pages.json
index 77b8a38..16548d8 100644
--- a/pages.json
+++ b/pages.json
@@ -1,155 +1,184 @@
{
- "pages": [{
- "path": "pages/login",
- "style": {
- "navigationBarTitleText": "登录"
+ "pages": [
+ {
+ "path": "pages/login",
+ "style": {
+ "navigationBarTitleText": "登录"
+ }
+ },
+ {
+ "path": "pages/register",
+ "style": {
+ "navigationBarTitleText": "注册"
+ }
+ },
+ {
+ "path": "pages/index",
+ "style": {
+ "navigationBarTitleText": "若依移动端框架",
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ "path": "pages/work/index",
+ "style": {
+ "navigationBarTitleText": "工作台"
+ }
+ },
+ {
+ "path": "pages/work/OrderManager/index",
+ "style": {
+ "navigationBarTitleText": "订单管理"
+ }
+ },
+ {
+ "path": "pages/work/BusinessApproval/index",
+ "style": {
+ "navigationBarTitleText": "商务审批"
+ }
+ },
+ {
+ "path": "pages/work/FinancialApproval/index",
+ "style": {
+ "navigationBarTitleText": "财务审批"
+ }
+ },
+ {
+ "path": "pages/work/OrderApproval/index",
+ "style": {
+ "navigationBarTitleText": "订单审核"
+ }
+ },
+ {
+ "path": "pages/mine/index",
+ "style": {
+ "navigationBarTitleText": "我的"
+ }
+ },
+ {
+ "path": "pages/mine/avatar/index",
+ "style": {
+ "navigationBarTitleText": "修改头像"
+ }
+ },
+ {
+ "path": "pages/mine/info/index",
+ "style": {
+ "navigationBarTitleText": "个人信息"
+ }
+ },
+ {
+ "path": "pages/mine/info/edit",
+ "style": {
+ "navigationBarTitleText": "编辑资料"
+ }
+ },
+ {
+ "path": "pages/mine/pwd/index",
+ "style": {
+ "navigationBarTitleText": "修改密码"
+ }
+ },
+ {
+ "path": "pages/mine/setting/index",
+ "style": {
+ "navigationBarTitleText": "应用设置"
+ }
+ },
+ {
+ "path": "pages/mine/help/index",
+ "style": {
+ "navigationBarTitleText": "常见问题"
+ }
+ },
+ {
+ "path": "pages/mine/about/index",
+ "style": {
+ "navigationBarTitleText": "关于我们"
+ }
+ },
+ {
+ "path": "pages/common/webview/index",
+ "style": {
+ "navigationBarTitleText": "浏览网页"
+ }
+ },
+ {
+ "path": "pages/common/textview/index",
+ "style": {
+ "navigationBarTitleText": "浏览文本"
+ }
+ },
+ {
+ "path": "pages/work/BusinessApproval/OrderDetail",
+ "style": {
+ "navigationBarTitleText": "商务订单详情"
+ }
+ },
+ {
+ "path": "pages/work/FinancialApproval/OrderDetail",
+ "style": {
+ "navigationBarTitleText": "财务订单详情"
+ }
+ },
+ {
+ "path": "pages/work/OrderApproval/OrderDetail",
+ "style": {
+ "navigationBarTitleText": "订单审批详情"
+ }
+ },
+ {
+ "path": "pages/work/OrderManager/components/LookData",
+ "style": {
+ "navigationBarTitleText": "订单详情",
+ "props": true
+ // 开启 props 传参
+ }
+ },
+ {
+ "path": "pages/work/OrderManager/components/NewAdd",
+ "style": {
+ "navigationBarTitleText": "新增订单"
+ }
+ },
+ {
+ "path": "pages/work/OrderManager/components/EditData",
+ "style": {
+ "navigationBarTitleText": "修改订单",
+ "props": true
+ // 开启 props 传参
+ }
+ }
+ ],
+ "tabBar": {
+ "color": "#000000",
+ "selectedColor": "#000000",
+ "borderStyle": "white",
+ "backgroundColor": "#ffffff",
+ "list": [
+ {
+ "pagePath": "pages/index",
+ "iconPath": "static/images/tabbar/home.png",
+ "selectedIconPath": "static/images/tabbar/home_.png",
+ "text": "首页"
+ },
+ {
+ "pagePath": "pages/work/index",
+ "iconPath": "static/images/tabbar/work.png",
+ "selectedIconPath": "static/images/tabbar/work_.png",
+ "text": "工作台"
+ },
+ {
+ "pagePath": "pages/mine/index",
+ "iconPath": "static/images/tabbar/mine.png",
+ "selectedIconPath": "static/images/tabbar/mine_.png",
+ "text": "我的"
+ }
+ ]
+ },
+ "globalStyle": {
+ "navigationBarTextStyle": "black",
+ "navigationBarTitleText": "RuoYi",
+ "navigationBarBackgroundColor": "#FFFFFF"
}
- }, {
- "path": "pages/register",
- "style": {
- "navigationBarTitleText": "注册"
- }
- }, {
- "path": "pages/index",
- "style": {
- "navigationBarTitleText": "若依移动端框架",
- "navigationStyle": "custom"
- }
- }, {
- "path": "pages/work/index",
- "style": {
- "navigationBarTitleText": "工作台"
- }
- }, {
- "path": "pages/work/OrderManager/index",
- "style": {
- "navigationBarTitleText": "订单管理"
- }
- }, {
- "path": "pages/work/BusinessApproval/index",
- "style": {
- "navigationBarTitleText": "商务审批"
- }
- }, {
- "path": "pages/work/FinancialApproval/index",
- "style": {
- "navigationBarTitleText": "财务审批"
- }
- }, {
- "path": "pages/work/OrderApproval/index",
- "style": {
- "navigationBarTitleText": "订单审核"
- }
- },{
- "path": "pages/mine/index",
- "style": {
- "navigationBarTitleText": "我的"
- }
- }, {
- "path": "pages/mine/avatar/index",
- "style": {
- "navigationBarTitleText": "修改头像"
- }
- }, {
- "path": "pages/mine/info/index",
- "style": {
- "navigationBarTitleText": "个人信息"
- }
- }, {
- "path": "pages/mine/info/edit",
- "style": {
- "navigationBarTitleText": "编辑资料"
- }
- }, {
- "path": "pages/mine/pwd/index",
- "style": {
- "navigationBarTitleText": "修改密码"
- }
- }, {
- "path": "pages/mine/setting/index",
- "style": {
- "navigationBarTitleText": "应用设置"
- }
- }, {
- "path": "pages/mine/help/index",
- "style": {
- "navigationBarTitleText": "常见问题"
- }
- }, {
- "path": "pages/mine/about/index",
- "style": {
- "navigationBarTitleText": "关于我们"
- }
- }, {
- "path": "pages/common/webview/index",
- "style": {
- "navigationBarTitleText": "浏览网页"
- }
- }, {
- "path": "pages/common/textview/index",
- "style": {
- "navigationBarTitleText": "浏览文本"
- }
- },{
- "path": "pages/work/BusinessApproval/OrderDetail",
- "style": {
- "navigationBarTitleText": "商务订单详情"
- }
- },{
- "path": "pages/work/FinancialApproval/OrderDetail",
- "style": {
- "navigationBarTitleText": "财务订单详情"
- }
- },{
- "path": "pages/work/OrderApproval/OrderDetail",
- "style": {
- "navigationBarTitleText": "订单审批详情"
- }
- },{
- "path": "pages/work/OrderManager/components/LookData",
- "style": {
- "navigationBarTitleText": "订单详情",
- "props": true // 开启 props 传参
- }
- },{
- "path": "pages/work/OrderManager/components/NewAdd",
- "style": {
- "navigationBarTitleText": "新增订单"
- }
- },{
- "path": "pages/work/OrderManager/components/EditData",
- "style": {
- "navigationBarTitleText": "修改订单",
- "props": true // 开启 props 传参
- }
- }],
-
- "tabBar": {
- "color": "#000000",
- "selectedColor": "#000000",
- "borderStyle": "white",
- "backgroundColor": "#ffffff",
- "list": [{
- "pagePath": "pages/index",
- "iconPath": "static/images/tabbar/home.png",
- "selectedIconPath": "static/images/tabbar/home_.png",
- "text": "首页"
- }, {
- "pagePath": "pages/work/index",
- "iconPath": "static/images/tabbar/work.png",
- "selectedIconPath": "static/images/tabbar/work_.png",
- "text": "工作台"
- }, {
- "pagePath": "pages/mine/index",
- "iconPath": "static/images/tabbar/mine.png",
- "selectedIconPath": "static/images/tabbar/mine_.png",
- "text": "我的"
- }
- ]
- },
- "globalStyle": {
- "navigationBarTextStyle": "black",
- "navigationBarTitleText": "RuoYi",
- "navigationBarBackgroundColor": "#FFFFFF"
- }
}
diff --git a/permission.js b/permission.js
index cbaec53..63b246c 100644
--- a/permission.js
+++ b/permission.js
@@ -1,39 +1,39 @@
-import { getToken } from '@/utils/auth'
+import {getToken} from '@/utils/auth'
// 登录页面
const loginPage = "/pages/login"
-
+
// 页面白名单
const whiteList = [
- '/pages/login', '/pages/register', '/pages/common/webview/index'
+ '/pages/login', '/pages/register', '/pages/common/webview/index'
]
// 检查地址白名单
function checkWhite(url) {
- const path = url.split('?')[0]
- return whiteList.indexOf(path) !== -1
+ const path = url.split('?')[0]
+ return whiteList.indexOf(path) !== -1
}
// 页面跳转验证拦截器
let list = ["navigateTo", "redirectTo", "reLaunch", "switchTab"]
list.forEach(item => {
- uni.addInterceptor(item, {
- invoke(to) {
- if (getToken()) {
- if (to.url === loginPage) {
- uni.reLaunch({ url: "/" })
+ uni.addInterceptor(item, {
+ invoke(to) {
+ if (getToken()) {
+ if (to.url === loginPage) {
+ uni.reLaunch({url: "/"})
+ }
+ return true
+ } else {
+ if (checkWhite(to.url)) {
+ return true
+ }
+ uni.reLaunch({url: loginPage})
+ return false
+ }
+ },
+ fail(err) {
+ console.log(err)
}
- return true
- } else {
- if (checkWhite(to.url)) {
- return true
- }
- uni.reLaunch({ url: loginPage })
- return false
- }
- },
- fail(err) {
- console.log(err)
- }
- })
+ })
})