From 16f7cdb6636932ceb17943b97668f9ce087c105d Mon Sep 17 00:00:00 2001 From: luffy <1029559041@qq.com> Date: Tue, 7 Jan 2020 17:49:23 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=9E=83=E5=9C=BE=E5=88=86?= =?UTF-8?q?=E7=B1=BB=E6=94=BF=E7=AD=96=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 3 + src/common/config.js | 4 +- src/pages.json | 10 + src/pages/index/index.vue | 2 +- src/pages/waste_sorting/policy.vue | 33 ++ ...ll_sorted_waste_containers_in_Shanghai.jpg | Bin 0 -> 57616 bytes yarn.lock | 488 +++++++++++++++++- 7 files changed, 520 insertions(+), 20 deletions(-) create mode 100644 src/pages/waste_sorting/policy.vue create mode 100644 src/static/800px-Small_sorted_waste_containers_in_Shanghai.jpg diff --git a/package.json b/package.json index 77c0f49..2644023 100644 --- a/package.json +++ b/package.json @@ -33,6 +33,7 @@ "@dcloudio/uni-mp-toutiao": "^2.0.0-23320190923002", "@dcloudio/uni-mp-weixin": "^2.0.0-23320190923002", "@dcloudio/uni-stat": "^2.0.0-23320190923002", + "@dcloudio/uni-ui": "^1.1.3", "flyio": "^0.6.2", "mpvue-weui": "^1.0.13", "regenerator-runtime": "^0.12.1", @@ -54,7 +55,9 @@ "babel-plugin-import": "^1.11.0", "mini-types": "*", "miniprogram-api-typings": "^2.8.0-2", + "node-sass": "^4.13.0", "postcss-comment": "^2.0.0", + "sass-loader": "^8.0.0", "vue-template-compiler": "^2.6.10" }, "browserslist": [ diff --git a/src/common/config.js b/src/common/config.js index 4cf8854..26c4b22 100644 --- a/src/common/config.js +++ b/src/common/config.js @@ -1,7 +1,7 @@ export var config={ //服务器地址 - server:"http://192.168.43.136", + server:"http://waste.com", // 接口 interface:{ //图片解析 @@ -22,4 +22,4 @@ export var getInterface=function(url){ console.log('生产环境') return config.server+url } -} \ No newline at end of file +} diff --git a/src/pages.json b/src/pages.json index 6370ba6..fb39a92 100644 --- a/src/pages.json +++ b/src/pages.json @@ -7,6 +7,12 @@ "navigationBarTitleText": "查询" } }, + { + "path": "pages/waste_sorting/policy", + "style": { + "navigationBarTitleText": "政策与法规" + } + }, { "path": "pages/waste_sorting/baike", "style": { @@ -28,6 +34,10 @@ }, "tabBar": { "list": [ + { + "pagePath": "pages/waste_sorting/policy", + "text": "政策与法规" + }, { "pagePath": "pages/waste_sorting/query", "text": "查询" diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue index 3280c0d..f1f76f5 100644 --- a/src/pages/index/index.vue +++ b/src/pages/index/index.vue @@ -1,6 +1,6 @@