Merge refs/remotes/origin/master into refs/heads/master

pages/user/common/header/index.js

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

pages/user/common/header/index.json

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

pages/user/common/header/index.wxml

@@ -0,0 +1,2 @@
+<!--pages/user/common/header/index.wxml-->
+<text>pages/user/common/header/index.wxml</text>

pages/user/common/header/index.wxss

@@ -0,0 +1 @@
+/* pages/user/common/header/index.wxss */

pages/user/index.js

@@ -5,7 +5,7 @@ Page({
    * 页面的初始数据
    */
   data: {
-
+    list: ['我的消息', '我的议题', '我的收藏', '我的金点子', '我的活动']
   },
 
   /**

pages/user/index.json

@@ -1,3 +1,12 @@
 {
-  "usingComponents": {}
+  "usingComponents": {
+    "Header": "./common/header/index",
+    "MyMessage": "./common/myMessage/index",
+    "MyTopics": "./common/myTopics/index",
+    "MyFavorite": "./common/myFavorite/index",
+    "MyIdea": "./common/myIdea/index",
+    "MyActivity": "./common/myActivity/index",
+    "mp-cells":"/components/weui/cells/cells",
+    "mp-cell":"/components/weui/cell/cell"
+    }
 }

pages/user/index.wxml

@@ -1,2 +1,13 @@
 <!--pages/user/index.wxml-->
-<text>pages/user/index.wxml</text>
+<view class="content-wrapper">
+  <Header />
+  <mp-cells ext-class="my-cells">
+    <mp-cell link="true" hover="true" ext-class="my-cell" footer="说明文字">
+        <view class="cell-icon" Slot="icon">
+          <image style="width:15px;height:12px;" src="/images/user/msg.png"></image>
+        </view>
+        <view class="cell-title" Slot="title">我的消息</view>
+        <!-- <view class="cell-subTitle" Slot="footer">说明文字</view> -->
+    </mp-cell>
+  </mp-cells>
+</view>

pages/user/index.wxss

@@ -1 +1,17 @@
 /* pages/user/index.wxss */
+.my-cell{
+  display: flex;
+  flex-direction: row;
+}
+.cell-icon{
+  width: 15px;
+  height: 15px;
+}
+.cell-title{
+  color: #3B3B3B;
+  font-size: 14px;
+}
+.cell-subTitle{
+  color: #AAAAAA;
+  font-size: 12px;
+}