diff --git a/.babelrc b/.babelrc
index c06df4d..3297ecb 100644
--- a/.babelrc
+++ b/.babelrc
@@ -1,18 +1,23 @@
{
"presets": [
- ["env", {
- "modules": false,
- "targets": {
- "browsers": ["> 1%", "last 2 versions", "not ie <= 8"]
- }
- }],
- "stage-2"
+ ["env", {
+ "modules": false,
+ "targets": {
+ "browsers": ["> 1%", "last 2 versions", "not ie <= 8"]
+ }
+ }],
+ "stage-2"
+ ],
+ "plugins": [
+ ["transform-runtime", {
+ "polyfill": true,
+ "regenerator": true
+ }]
],
- "plugins": ["transform-runtime"],
"env": {
- "test": {
- "presets": ["env", "stage-2"],
- "plugins": ["istanbul"]
- }
+ "test": {
+ "presets": ["env", "stage-2"],
+ "plugins": ["istanbul"]
+ }
}
}
diff --git a/project.config.json b/project.config.json
index f621a84..ca13c0c 100644
--- a/project.config.json
+++ b/project.config.json
@@ -20,7 +20,7 @@
},
"miniprogramRoot": "dist/wx/",
"compileType": "miniprogram",
- "appid": "wx4d305a3b655ad75f",
+ "appid": "wx7764bfbd023a1c67",
"projectname": "maker",
"simulatorType": "wechat",
"simulatorPluginLibVersion": {},
@@ -49,24 +49,24 @@
"current": -1,
"list": [
{
- "id": -1,
+ "id": 0,
"name": "首页",
"pathName": "pages/index/main",
"query": "",
- "scene": null
+ "scene": 1011
},
{
"id": 1,
"name": "结果",
"pathName": "pages/result/main",
- "query": "_id=5ddd07973d804967211a10fc&users=猫大王",
+ "query": "_id=5ddce89b944bbb720aa771ea&users=猫大王",
"scene": null
},
{
"id": 2,
"name": "详情页",
"pathName": "pages/details/main",
- "query": "_id=5ddd07973d804967211a10fc",
+ "query": "_id=5ddce89b944bbb720aa771ea",
"scene": null
},
{
diff --git a/src/App.vue b/src/App.vue
index 0de7656..97343e2 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,15 +1,25 @@
diff --git a/src/app.json b/src/app.json
index d574468..43ea885 100644
--- a/src/app.json
+++ b/src/app.json
@@ -10,6 +10,37 @@
"backgroundTextStyle": "light",
"navigationBarBackgroundColor": "#FFDC34",
"navigationBarTextStyle": "white"
+ },
+ "tabBar": {
+ "color": "#999",
+ "backgroundColor": "#fff",
+ "selectedColor": "#333",
+ "borderStyle": "white",
+
+ "list": [{
+ "text": "首页",
+ "pagePath": "pages/index/main",
+ "iconPath": "static/tabs/home.png",
+ "selectedIconPath": "static/tabs/home-active.png"
+ }, {
+ "text": "列表",
+ "pagePath": "pages/list/main",
+ "iconPath": "static/tabs/list.png",
+ "selectedIconPath": "static/tabs/list-active.png"
+ }],
+
+ "items": [{
+ "name": "首页",
+ "pagePath": "pages/index/main",
+ "icon": "static/tabs/home.png",
+ "activeIcon": "static/tabs/home-active.png"
+ }, {
+ "name": "列表",
+ "pagePath": "pages/list/main",
+ "icon": "static/tabs/list.png",
+ "activeIcon": "static/tabs/list-active.png"
+ }],
+ "position": "bottom"
}
}
diff --git a/src/components/list-item.vue b/src/components/list-item.vue
index 1e128fa..b17f056 100644
--- a/src/components/list-item.vue
+++ b/src/components/list-item.vue
@@ -14,6 +14,8 @@