Merge branch 'developer' of http://git.caimei365.com/zhengjinyi/caimei-applets-hehe into developer

.gitignore

@@ -1,4 +1,5 @@
-/unpackage/
+unpackage/
 /node_modules/
 /.hbuilderx/
 /services/config.env.js
+/.idea/

pages.json

@@ -68,7 +68,7 @@
                     }
                 },
                 {
-                    "path": "goods-floorMore",
+                    "path": "good-floorMore",
                     "style": {
                         "navigationBarTitleText": "商品列表",
                         "enablePullDownRefresh": true

pages/tabBar/index/index.vue

@@ -158,7 +158,7 @@ export default {
         },
         //跳转楼层
         navToDetailPage(floor) {
-            this.$api.navigateTo(`/pages/goods/goods-floorMore?floorId=${floor.floorId}&title=${floor.title}`)
+            this.$api.navigateTo(`/pages/goods/good-floorMore?floorId=${floor.floorId}&title=${floor.title}`)
         },
         // 点击了活动弹窗
         activeClick() {

unpackage/dist/dev/mp-weixin/app.json

@@ -0,0 +1,84 @@
+{
+  "pages": [
+    "pages/tabBar/index/index",
+    "pages/tabBar/cart/index",
+    "pages/tabBar/user/index",
+    "pages/authorize/authorize",
+    "pages/login/login"
+  ],
+  "subPackages": [
+    {
+      "root": "pages/goods/",
+      "pages": [
+        "list",
+        "cart",
+        "search",
+        "product-detail",
+        "good-floorMore",
+        "goods-coupon-list",
+        "goods-coupon-list-search"
+      ]
+    },
+    {
+      "root": "pages/user/",
+      "pages": [
+        "address/addressManage",
+        "address/address",
+        "order/create-order",
+        "order/success",
+        "order/error",
+        "order/order-list",
+        "order/order-list-retail",
+        "order/order-details",
+        "order/order-payment",
+        "order/search-order",
+        "order/order-logistics",
+        "activity/activity",
+        "activity/activity-list",
+        "activity/coupon-find-list",
+        "activity/coupon-list"
+      ]
+    }
+  ],
+  "window": {
+    "navigationBarTextStyle": "black",
+    "navigationBarTitleText": "呵呵商城",
+    "navigationBarBackgroundColor": "#FFFFFF",
+    "backgroundColor": "#FFFFFF"
+  },
+  "tabBar": {
+    "height": "80",
+    "color": "#999999",
+    "selectedColor": "#ff457b",
+    "borderStyle": "black",
+    "backgroundColor": "#ffffff",
+    "list": [
+      {
+        "pagePath": "pages/tabBar/index/index",
+        "iconPath": "static/icon-index@2x.png",
+        "selectedIconPath": "static/icon-index-active@2x.png",
+        "text": "商城"
+      },
+      {
+        "pagePath": "pages/tabBar/cart/index",
+        "iconPath": "static/icon-cart@2x.png",
+        "selectedIconPath": "static/icon-cart-active@2x.png",
+        "text": "购物车"
+      },
+      {
+        "pagePath": "pages/tabBar/user/index",
+        "iconPath": "static/icon-user@2x.png",
+        "selectedIconPath": "static/icon-user-active@2x.png",
+        "text": "我的"
+      }
+    ]
+  },
+  "permission": {},
+  "navigateToMiniProgramAppIdList": [
+    "wx5a5cda32926f55ac"
+  ],
+  "uniStatistics": {
+    "enable": true
+  },
+  "usingComponents": {}
+}