diff --git a/App.vue b/App.vue index 6fee664..1378ee1 100644 --- a/App.vue +++ b/App.vue @@ -34,18 +34,19 @@ padding: 10px; } .pagepaddings{padding: 14px;} + .page_content{padding: 0 12px 10px;} //内容框 .contentboxsty{border-radius: 8px;background: #1C2755;} //没有底部边框 .noborbot{border-bottom:none !important} + .t-icon{background-repeat: no-repeat;} .icon22{width: 22px;height: 22px;} - .paddrigth5{padding-right: 5px;} //字体大小 .font12{font-size: $uni-font-size-sm;} .font13{font-size:13px;} .font14{font-size: $uni-font-size-base;} - .font15{font-size: 15px;} + .font15{font-size: 15px!important;} .font20{font-size: 20px;} .font22{font-size: 22px;} .font24{font-size: 24px;} @@ -53,12 +54,21 @@ .font_bold{font-weight: bold;} //文字颜色 .text_color_black{color: #000;} + .theme_color{color: #009688 } + //颜色 + .but_color{background: #009688 !important;} // .text_{color: #00B68D;} //布局 .flex_layout{display: flex;} + .flex1{flex: 1;} //paddind + .padd_rigth5{padding-right: 5px;} + .padd_bot6{padding-bottom: 6px;} .padd_top12{padding-top:12px;} + .padd_rigth12{padding-right: 12px;} + .padd_bot12{padding-bottom: 12px;} + .padd_left12{padding-left:12px;} //margin .mar_top12{margin-top: 12px;} .page_list{margin-bottom: 12px;padding:0 12px;} @@ -74,7 +84,6 @@ } .list_content{padding:12px;} } - //页面固定按钮 .bottom_but{bottom: 40px;bottom: 40px;position: fixed;width: calc(100% - 28px); view{width: 50%;text-align: center;margin: 0 20px;border-radius: 19px;background: #DDD;line-height: 38px;} @@ -84,5 +93,4 @@ .page_add{display: flex;justify-content: center;margin: 7px 20px;border-radius: 17.5px;background: #1C2755;line-height: 35px;} } .bot_padding{padding-bottom: 100px;} - diff --git a/components/customTabBar/index.vue b/components/customTabBar/index.vue index 1b95621..0d3c209 100644 --- a/components/customTabBar/index.vue +++ b/components/customTabBar/index.vue @@ -31,8 +31,8 @@ export default { { id: 0, path: '/pages/index/index', - icon: '/static/indexB.png', - selectIcon: '/static/indexA.png', + icon: '/static/indexA.png', + selectIcon: '/static/indexB.png', text: '首页', centerItem: false }, @@ -48,8 +48,8 @@ export default { { id: 2, path: '/pages/person/person', - icon: '/static/personA.png', - selectIcon: '/static/personB.png', + icon: '/static/personB.png', + selectIcon: '/static/personA.png', text: '我的', centerItem: false } diff --git a/components/switchDefine.vue b/components/switchDefine.vue new file mode 100644 index 0000000..4fa2d9c --- /dev/null +++ b/components/switchDefine.vue @@ -0,0 +1,20 @@ + + + + + \ No newline at end of file diff --git a/env.js b/env.js new file mode 100644 index 0000000..98ae6f1 --- /dev/null +++ b/env.js @@ -0,0 +1,21 @@ +// 不同的环境变量配置 +const development = { + requestBaseUrl: 'http://development', + appid: '', +} + +const test = { + requestBaseUrl: 'https://api.dev.dwoodauto.com/api', + appid: 'wxd5xxxxee0fce1c81', +} + +const production = { + requestBaseUrl: 'http://production', + appid: 'wx3xxxx1ce403cab3', +} + +export default { + development, + test, + production +} diff --git a/main.js b/main.js index b5a203f..e0f84df 100644 --- a/main.js +++ b/main.js @@ -5,7 +5,8 @@ import "./static/iconfont/iconfont-weapp/iconfont-weapp-icon.css" // #ifndef VUE3 import Vue from 'vue' import App from './App' -import svg from './static/iconfont/svg.js' +import svg from './static/iconfont/svg.js' + Vue.use(svg); Vue.config.productionTip = false; @@ -20,8 +21,13 @@ app.$mount() // #ifdef VUE3 import { createSSRApp } from 'vue' import App from './App.vue' +import request from "./utils/api.js" +import publicMethods from "./utils/public.js" + export function createApp() { - const app = createSSRApp(App) + const app = createSSRApp(App) + app.config.globalProperties.$api = request; + app.config.globalProperties.$wf = publicMethods; return { app } diff --git a/manifest.json b/manifest.json index b79d783..a4b2d30 100644 --- a/manifest.json +++ b/manifest.json @@ -50,7 +50,7 @@ /* 快应用特有相关 */ "mp-weixin" : { /* 小程序特有相关 */ - "appid" : "wx62bd7b72516b9017", + "appid" : "wx38dc81b0eef130a3", "setting" : { "urlCheck" : false }, diff --git a/package.json b/package.json index 75f18a4..eae637e 100644 --- a/package.json +++ b/package.json @@ -1,16 +1,22 @@ { - "name": "mes_mobile", - "version": "1.0.0", - "description": "", - "main": "main.js", - "scripts": { - "test": "echo \"Error: no test specified\" && exit 1" - }, - "repository": { - "type": "git", - "url": "https://git.tool.dwoodauto.com/long/mes_mobile.git" - }, - "keywords": [], - "author": "", - "license": "ISC" -} + "uni-app": { + "scripts": { + "dev": { + "title": "微信小程序——开发版", + "env": { + "ENV_TYPE": "dev", + "UNI_PLATFORM": "mp-weixin", + "VITE_BASE_API": "https://api.dev.dwoodauto.com" + } + }, + "pro": { + "title": "微信小程序——正式版", + "env": { + "ENV_TYPE": "pro", + "UNI_PLATFORM": "mp-weixin", + "VITE_BASE_API": "http://pro.domain/" + } + } + } + } +} \ No newline at end of file diff --git a/pages.json b/pages.json index a2eb8c8..1d85178 100644 --- a/pages.json +++ b/pages.json @@ -119,6 +119,46 @@ "navigationBarTitleText" : "设备状态", "enablePullDownRefresh" : false } + }, + { + "path" : "pages/equipmentManage/deviceDetail", + "style" : + { + "navigationBarTitleText" : "设备信息", + "enablePullDownRefresh" : false + } + }, + { + "path" : "pages/person/faceAuthentication", + "style" : + { + "navigationBarTitleText" : "人脸认证", + "enablePullDownRefresh" : false + } + }, + { + "path" : "pages/person/myAuthority", + "style" : + { + "navigationBarTitleText" : "我的权限", + "enablePullDownRefresh" : false + } + }, + { + "path" : "pages/person/alarm", + "style" : + { + "navigationBarTitleText" : "设备报警", + "enablePullDownRefresh" : false + } + }, + { + "path" : "pages/person/safetyAccidents", + "style" : + { + "navigationBarTitleText" : "安全事故", + "enablePullDownRefresh" : false + } }], "globalStyle": { "navigationBarTextStyle": "white", diff --git a/pages/deviceStatus/deviceStatus.vue b/pages/deviceStatus/deviceStatus.vue index 1d8aa89..bb5cf80 100644 --- a/pages/deviceStatus/deviceStatus.vue +++ b/pages/deviceStatus/deviceStatus.vue @@ -1,23 +1,248 @@ - diff --git a/pages/equipmentManage/deviceDetail.vue b/pages/equipmentManage/deviceDetail.vue new file mode 100644 index 0000000..d0c5727 --- /dev/null +++ b/pages/equipmentManage/deviceDetail.vue @@ -0,0 +1,69 @@ + + + + + diff --git a/pages/equipmentManage/editDevice.vue b/pages/equipmentManage/editDevice.vue index 88fd097..160de5e 100644 --- a/pages/equipmentManage/editDevice.vue +++ b/pages/equipmentManage/editDevice.vue @@ -3,9 +3,9 @@ - + 选择设备 @@ -47,22 +47,29 @@ 状态 - - 启用 - 禁用 - + + + + 启用 + + + + + 禁用 + 设置备注 + +