diff --git a/manifest.json b/manifest.json index 199d7c8..6c70362 100644 --- a/manifest.json +++ b/manifest.json @@ -1,79 +1,93 @@ -{ - "name": "EMS移动端", - "appid": "__UNI__B330617", - "description": "", - "versionName": "1.2.0", - "versionCode": "100", - "transformPx": false, - "app-plus": { - "usingComponents": true, - "nvueCompiler": "uni-app", - "safearea": { - "background": "#FFFFFF", - "top": { - "offset": "auto" - } - }, - "splashscreen": { - "alwaysShowBeforeRender": true, - "waiting": true, - "autoclose": true, - "delay": 0 - }, - "modules": {}, - "distribute": { - "android": { - "permissions": [ - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "" - ] - }, - "ios": { - "dSYMs": false - }, - "sdkConfigs": {} - } - }, - "quickapp": {}, - "mp-weixin": { - "appid": "wxccd7e2a0911b3397", - "setting": { - "urlCheck": false, - "es6": false, - "minified": true, - "postcss": true - }, - "optimization": { - "subPackages": true - }, - "usingComponents": true - }, - "vueVersion": "2", - "h5": { - "template": "static/index.html", - "devServer": { - "port": 9090, - "https": false - }, - "title": "EMS-App", - "router": { - "mode": "hash", - "base": "./" - } - }, - "locale": "zh-Hans", - "fallbackLocale": "zh-Hans" -} \ No newline at end of file +{ + "name" : "上动EMS", + "appid" : "__UNI__B330617", + "description" : "", + "versionName" : "1.2.0", + "versionCode" : "100", + "transformPx" : false, + "app-plus" : { + "usingComponents" : true, + "nvueCompiler" : "uni-app", + "safearea" : { + "background" : "#FFFFFF", + "top" : { + "offset" : "auto" + } + }, + "splashscreen" : { + "alwaysShowBeforeRender" : true, + "waiting" : true, + "autoclose" : true, + "delay" : 0 + }, + "modules" : {}, + "distribute" : { + "android" : { + "permissions" : [ + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "" + ] + }, + "ios" : { + "dSYMs" : false + }, + "sdkConfigs" : {}, + "icons" : { + "android" : { + "hdpi" : "static/logo.png", + "xhdpi" : "static/logo.png", + "xxhdpi" : "static/logo.png", + "xxxhdpi" : "static/logo.png" + }, + "ios" : { + "appstore" : "" + } + }, + "splashscreen" : { + "androidStyle" : "common" + } + } + }, + "quickapp" : {}, + "mp-weixin" : { + "appid" : "wxccd7e2a0911b3397", + "setting" : { + "urlCheck" : false, + "es6" : false, + "minified" : true, + "postcss" : true + }, + "optimization" : { + "subPackages" : true + }, + "usingComponents" : true + }, + "vueVersion" : "2", + "h5" : { + "template" : "static/index.html", + "devServer" : { + "port" : 9090, + "https" : false + }, + "title" : "上动EMS", + "router" : { + "mode" : "hash", + "base" : "./" + } + }, + "locale" : "zh-Hans", + "fallbackLocale" : "zh-Hans" +} diff --git a/pages/mine/about/index.vue b/pages/mine/about/index.vue index a4e0740..c680319 100644 --- a/pages/mine/about/index.vue +++ b/pages/mine/about/index.vue @@ -1,75 +1,75 @@ - - - - - + + + + + \ No newline at end of file diff --git a/pages/work/dtdc/index.vue b/pages/work/dtdc/index.vue index 3373500..55ea42b 100644 --- a/pages/work/dtdc/index.vue +++ b/pages/work/dtdc/index.vue @@ -75,7 +75,7 @@ - @@ -140,6 +140,7 @@ }, options: { + padding: [10, 5, 0, 10], duration: 0, animation: false, dataLabel: false, @@ -149,6 +150,16 @@ itemCount: 3, disableGrid: true }, + extra: { + area: { + type: "curve", + opacity: 0.2, + addLine: true, + width: 2, + gradient: true, + activeType: "hollow" + } + } }, range: [], end: Date.now(), diff --git a/pages/work/index.vue b/pages/work/index.vue index 1b8985a..a8aea0c 100644 --- a/pages/work/index.vue +++ b/pages/work/index.vue @@ -41,7 +41,7 @@ - @@ -49,7 +49,7 @@ - @@ -78,6 +78,7 @@ activeChartData: {}, pageScrollTop: 0, glqxOptions: { + padding: [10, 5, 0, 10], dataLabel: false, enableScroll: true, xAxis: { @@ -85,6 +86,16 @@ itemCount: 3, disableGrid: true }, + extra: { + area: { + type: "curve", + opacity: 0.2, + addLine: true, + width: 2, + gradient: true, + activeType: "hollow" + } + } // update: true, // duration: 2, // animation: false, @@ -92,6 +103,7 @@ // padding: [10, 15, 10, 15] }, options: { + padding: [10, 5, 0, 10], dataLabel: false, enableScroll: true, xAxis: { @@ -99,6 +111,16 @@ itemCount: 5, disableGrid: true }, + extra: { + area: { + type: "curve", + opacity: 0.2, + addLine: true, + width: 2, + gradient: true, + activeType: "hollow" + } + } // update: true, // duration: 2, // animation: false, diff --git a/static/images/banner/banner01.jpg b/static/images/banner/banner01.jpg deleted file mode 100644 index c44d84c..0000000 Binary files a/static/images/banner/banner01.jpg and /dev/null differ diff --git a/static/images/banner/banner02.jpg b/static/images/banner/banner02.jpg deleted file mode 100644 index 1086afd..0000000 Binary files a/static/images/banner/banner02.jpg and /dev/null differ diff --git a/static/images/banner/banner03.jpg b/static/images/banner/banner03.jpg deleted file mode 100644 index 092a5fc..0000000 Binary files a/static/images/banner/banner03.jpg and /dev/null differ diff --git a/static/logo.png b/static/logo.png index d4ebbf0..024672c 100644 Binary files a/static/logo.png and b/static/logo.png differ diff --git a/static/logo200.png b/static/logo200.png deleted file mode 100644 index ffa9988..0000000 Binary files a/static/logo200.png and /dev/null differ