update

app.json

@@ -1,12 +1,45 @@
 {
-  "pages":[
+  "pages": [
     "pages/index/index",
-    "pages/logs/logs"
+    "pages/discover/discover",
+    "pages/shopCart/shopCart",
+    "pages/person/person"
   ],
-  "window":{
-    "backgroundTextStyle":"light",
-    "navigationBarBackgroundColor": "#fff",
-    "navigationBarTitleText": "WeChat",
-    "navigationBarTextStyle":"black"
+  "window": {
+    "backgroundTextStyle": "dark",
+    "navigationBarBackgroundColor": "#FF6760",
+    "navigationBarTitleText": "熊猫美妆",
+    "navigationBarTextStyle": "white"
+  },
+  "tabBar": {
+    "selectedColor": "#FF6760",
+    "backgroundColor": "#ffffff",
+    "borderStyle": "black",
+    "list": [
+      {
+        "iconPath": "./image/tabbar/tabbar_home_default@2x.png",
+        "selectedIconPath": "./image/tabbar/tabbar_home_hight@2x.png",
+        "pagePath": "pages/index/index",
+        "text": "首页"
+      },
+      {
+        "iconPath": "./image/tabbar/tabbar_shopguide_default@2x.png",
+        "selectedIconPath": "./image/tabbar/tabbar_shopguide_hight@2x.png",
+        "pagePath": "pages/discover/discover",
+        "text": "发现"
+      },
+      {
+        "iconPath": "./image/tabbar/tabbar_shopcar_default@2x.png",
+        "selectedIconPath": "./image/tabbar/tabbar_shopcar_hight@2x.png",
+        "pagePath": "pages/shopCart/shopCart",
+        "text": "购物车"
+      },
+      {
+        "iconPath": "./image/tabbar/tabbar_set_default@2x.png",
+        "selectedIconPath": "./image/tabbar/tabbar_set_hight@2x.png",
+        "pagePath": "pages/person/person",
+        "text": "我"
+      }
+    ]
   }
-}
+}

app.wxss

@@ -8,6 +8,3 @@
   padding: 200rpx 0;
   box-sizing: border-box;
 } 
-.con{
-  background: skyblue;
-}

pages/components/carousel/carousel.js

@@ -0,0 +1,23 @@
+// pages/components/carousel/carousel.js
+Component({
+  /**
+   * 组件的属性列表
+   */
+  properties: {
+
+  },
+
+  /**
+   * 组件的初始数据
+   */
+  data: {
+
+  },
+
+  /**
+   * 组件的方法列表
+   */
+  methods: {
+
+  }
+})

pages/components/carousel/carousel.json

@@ -0,0 +1,4 @@
+{
+  "component": true,
+  "usingComponents": {}
+}

pages/components/carousel/carousel.wxml

@@ -0,0 +1,2 @@
+<!--pages/components/carousel/carousel.wxml-->
+<text>pages/components/carousel/carousel.wxml</text>

pages/components/carousel/carousel.wxss

@@ -0,0 +1 @@
+/* pages/components/carousel/carousel.wxss */

pages/discover/discover.js

@@ -0,0 +1,66 @@
+// pages/discover/discover.js
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+  
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+  
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+  
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+  
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide: function () {
+  
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {
+  
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: function () {
+  
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+  
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage: function () {
+  
+  }
+})

pages/discover/discover.json

@@ -0,0 +1,3 @@
+{
+    "navigationBarTitleText": "发现"
+}

pages/discover/discover.wxml

@@ -0,0 +1,2 @@
+<!--pages/discover/discover.wxml-->
+<text>pages/discover/discover.wxml</text>

pages/discover/discover.wxss

@@ -0,0 +1 @@
+/* pages/discover/discover.wxss */

pages/logs/logs.json

@@ -1,3 +0,0 @@
-{
-  "navigationBarTitleText": "查看启动日志"
-}

pages/logs/logs.wxml

@@ -1,6 +0,0 @@
-<!--logs.wxml-->
-<view class="container log-list">
-  <block wx:for="{{logs}}" wx:for-item="log">
-    <text class="log-item">{{index + 1}}. {{log}}</text>
-  </block>
-</view>

pages/person/person.js

@@ -0,0 +1,66 @@
+// pages/person/person.js
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+  
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+  
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+  
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+  
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide: function () {
+  
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {
+  
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: function () {
+  
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+  
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage: function () {
+  
+  }
+})

pages/person/person.json

@@ -0,0 +1,3 @@
+{
+    "navigationBarTitleText": "我"
+}

pages/person/person.wxml

@@ -0,0 +1,2 @@
+<!--pages/person/person.wxml-->
+<text>pages/person/person.wxml</text>

pages/person/person.wxss

@@ -0,0 +1 @@
+/* pages/person/person.wxss */

pages/shopCart/shopCart.json

@@ -0,0 +1,3 @@
+{
+  "navigationBarTitleText": "购物车"
+}

pages/shopCart/shopCart.wxml

@@ -0,0 +1,4 @@
+<!--logs.wxml-->
+<view class="container log-list">
+  shop_cart
+</view>