diff --git a/main.js b/main.js index be3f3d1..6202c38 100644 --- a/main.js +++ b/main.js @@ -1,12 +1,12 @@ import Vue from 'vue' import App from './App' import cuCustom from './colorui/components/cu-custom.vue' - import serviceHotline from '@/components/service-hotline.vue' +import serviceHotline from '@/components/service-hotline.vue' import encode from '@/utils/encode' import global from '@/api/global.js' -Vue.component('cu-custom',cuCustom) -Vue.component('service-hotline',serviceHotline) +Vue.component('cu-custom', cuCustom) +Vue.component('service-hotline', serviceHotline) Vue.config.productionTip = false App.mpType = 'app' @@ -14,6 +14,6 @@ Vue.prototype.utils = encode Vue.prototype.global = global const app = new Vue({ - ...App + ...App }) app.$mount() diff --git a/manifest.json b/manifest.json index 3324f0a..a5898c8 100644 --- a/manifest.json +++ b/manifest.json @@ -1,86 +1,89 @@ { - "name" : "星油云站", - "appid" : "__UNI__EA8D131", - "description" : "", - "versionName" : "1.0.0", - "versionCode" : "100", - "transformPx" : false, - /* 5+App特有相关 */ - "app-plus" : { - "usingComponents" : true, - "nvueCompiler" : "uni-app", - "compilerVersion" : 3, - "splashscreen" : { - "alwaysShowBeforeRender" : true, - "waiting" : true, - "autoclose" : true, - "delay" : 0 - }, - /* 模块配置 */ - "modules" : {}, - /* 应用发布信息 */ - "distribute" : { - /* android打包配置 */ - "android" : { - "permissions" : [ - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "" - ] - }, - /* ios打包配置 */ - "ios" : {}, - /* SDK配置 */ - "sdkConfigs" : {} - } - }, - /* 快应用特有相关 */ - "quickapp" : {}, - /* 小程序特有相关 */ - "mp-weixin" : { - "appid" : "wxaf56b8bae925ba19", - "setting" : { - "urlCheck" : true, - "es6" : false, - "postcss" : false, - "minified" : true - }, - "usingComponents" : true, - "permission" : { - "scope.userLocation" : { - "desc" : "需要获取附近位置" - } - }, - "uniStatistics" : { - "enable" : true - } - }, - "mp-alipay" : { - "usingComponents" : true - }, - "mp-baidu" : { - "usingComponents" : true - }, - "mp-toutiao" : { - "usingComponents" : true - } + "name": "星油云站", + "appid": "__UNI__EA8D131", + "description": "", + "versionName": "1.0.0", + "versionCode": "100", + "transformPx": false, + /* 5+App特有相关 */ + "app-plus": { + "usingComponents": true, + "nvueCompiler": "uni-app", + "compilerVersion": 3, + "splashscreen": { + "alwaysShowBeforeRender": true, + "waiting": true, + "autoclose": true, + "delay": 0 + }, + /* 模块配置 */ + "modules": {}, + /* 应用发布信息 */ + "distribute": { + /* android打包配置 */ + "android": { + "permissions": [ + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "" + ] + }, + /* ios打包配置 */ + "ios": {}, + /* SDK配置 */ + "sdkConfigs": {} + } + }, + /* 快应用特有相关 */ + "quickapp": {}, + /* 小程序特有相关 */ + "mp-weixin": { + "appid": "wxaf56b8bae925ba19", + "setting": { + "urlCheck": true, + "es6": false, + "postcss": false, + "minified": true + }, + "usingComponents": true, + "permission": { + "scope.userLocation": { + "desc": "需要获取附近位置" + } + }, + "optimization": { + "subPackages": true + }, + "uniStatistics": { + "enable": true + } + }, + "mp-alipay": { + "usingComponents": true + }, + "mp-baidu": { + "usingComponents": true + }, + "mp-toutiao": { + "usingComponents": true + } } diff --git a/package-lock.json b/package-lock.json index 24bc608..6727649 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12,11 +12,6 @@ "follow-redirects": "1.5.10" } }, - "bcryptjs": { - "version": "2.4.3", - "resolved": "https://registry.npm.taobao.org/bcryptjs/download/bcryptjs-2.4.3.tgz", - "integrity": "sha1-mrVie5PmBiH/fNrF2pczAn3x0Ms=" - }, "crypto-js": { "version": "4.0.0", "resolved": "https://registry.npm.taobao.org/crypto-js/download/crypto-js-4.0.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcrypto-js%2Fdownload%2Fcrypto-js-4.0.0.tgz", @@ -38,11 +33,6 @@ "debug": "=3.1.0" } }, - "js-base64": { - "version": "2.6.1", - "resolved": "https://registry.npm.taobao.org/js-base64/download/js-base64-2.6.1.tgz?cache=0&sync_timestamp=1592639177349&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fjs-base64%2Fdownload%2Fjs-base64-2.6.1.tgz", - "integrity": "sha1-wyg3QiXS5lVpeR3tc8JY4sWTNMc=" - }, "js-cookie": { "version": "2.2.1", "resolved": "https://registry.npm.taobao.org/js-cookie/download/js-cookie-2.2.1.tgz", @@ -63,11 +53,6 @@ "resolved": "https://registry.npm.taobao.org/ms/download/ms-2.0.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fms%2Fdownload%2Fms-2.0.0.tgz", "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" }, - "react-native-bcrypt": { - "version": "2.4.0", - "resolved": "https://registry.npm.taobao.org/react-native-bcrypt/download/react-native-bcrypt-2.4.0.tgz", - "integrity": "sha1-ld/y28hJwisl8Lk3mre/69IUC/0=" - }, "tki-qrcode": { "version": "0.1.6", "resolved": "https://registry.npm.taobao.org/tki-qrcode/download/tki-qrcode-0.1.6.tgz", diff --git a/package.json b/package.json index 54813bf..0697b84 100644 --- a/package.json +++ b/package.json @@ -14,13 +14,10 @@ "license": "ISC", "dependencies": { "axios": "0.19.2", - "bcryptjs": "^2.4.3", "crypto-js": "4.0.0", - "js-base64": "2.6.1", "js-cookie": "2.2.1", "js-md5": "0.7.3", "jsencrypt": "^3.0.0-rc.1", - "react-native-bcrypt": "^2.4.0", "tki-qrcode": "^0.1.6" } } diff --git a/pages.json b/pages.json index e0abaa1..8ff30e9 100644 --- a/pages.json +++ b/pages.json @@ -1,22 +1,25 @@ { "pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages - { - "path": "pages/startPage/startPage", - "style": {} - },{ - "path": "pages/login/login", - "style": { - - } - }, { - "path": "pages/operation-analysis/operation-analysis", + { + "path": "pages/startPage/startPage", + "style": {} + },{ + "path": "pages/index/index", "style": { + "navigationBarTitleText": "星油", "enablePullDownRefresh": true } + }, + { + "path": "pages/staff/editStaff/editStaff", + "style": {} }, { - "path": "pages/operation-analysis/analysis/daily", + "path": "pages/station-info/station-info", + "style": {} + }, { + "path": "pages/login/login", "style": { - "enablePullDownRefresh": true + } }, { "path": "pages/login/posLogin/posLogin", @@ -40,26 +43,12 @@ }, { "path": "pages/stationDetail/stationDetail", "style": {} - }, { - "path": "pages/index/index", - "style": { - "navigationBarTitleText": "星油", - "enablePullDownRefresh": true - } }, { "path": "pages/staff/List/List", "style": { "enablePullDownRefresh": true } }, - { - "path": "pages/staff/editStaff/editStaff", - "style": {} - }, - - - - { "path": "pages/qrcode/QrCode_xy", "style": {} @@ -69,10 +58,7 @@ "style": {} }, - { - "path": "pages/station-info/station-info", - "style": {} - }, + { "path": "pages/Auth/Auth", "style": {} @@ -81,16 +67,33 @@ "style": {} } - , { - "path": "pages/operation-analysis/analysis/analysis", - "style": {} - }, { - "path": "pages/operation-analysis/analysis/monthly", - "style": { - "enablePullDownRefresh": true - } - } + ], + "subPackages": [{ + "root": "packageChart", + "pages": [{ + "path": "operation-analysis/analysis/analysis", + "style": {} + }, { + "path": "operation-analysis/analysis/monthly", + "style": { + "enablePullDownRefresh": true + } + }, + { + "path": "operation-analysis/operation-analysis", + "style": { + "enablePullDownRefresh": true + } + }, { + "path": "operation-analysis/analysis/daily", + "style": { + "enablePullDownRefresh": true + } + } + ] + }], + "globalStyle": { "mp-alipay": { /* 支付宝小程序特有相关 */ diff --git a/pages/index/index.vue b/pages/index/index.vue index 6d241c3..b6cc3c9 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -13,9 +13,7 @@ - - @@ -221,7 +219,21 @@ console.log('chengg', res) } }) - } + }, + // 方便测试 + // complete: () => { + // uni.setStorageSync('qrCode', 'XM&1309328197641433088') + // uni.navigateTo({ + // url: that.scanUrl, + // fail: (err) => { + // console.log(err) + // }, + // success: (res) => { + // console.log('chengg', res) + // } + // }) + // } + }) }, // 方便开发 diff --git a/utils/request.js b/utils/request.js index d7af378..f411631 100644 --- a/utils/request.js +++ b/utils/request.js @@ -1,9 +1,9 @@ import axios from 'axios' import utils from '@/utils/encode' const service = axios.create({ - baseURL: 'http://192.168.0.104:48080', // 小杰 + // baseURL: 'http://192.168.0.104:48080', // 小杰 // baseURL: 'http://192.168.0.112:48080', // 龙龙 - // baseURL: 'https://www.51xingka.net/oilApp', + baseURL: 'https://www.51xingka.net/oilApp', timeout: 5000 }) service.interceptors.request.use(