From f7fda43e64270960bd099b39dfd3bbe720732e4d Mon Sep 17 00:00:00 2001
From: chenxuhui <qwehui12@163.com>
Date: Tue, 20 Nov 2018 14:32:53 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E6=B6=88=E6=81=AF=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.json                                      |   3 +-
 imgs/messageAlert.png                         | Bin 0 -> 2311 bytes
 pages/message/message.js                      |   9 ++-
 pages/message/message.json                    |   4 +-
 pages/message/message.wxml                    |  22 ++++-
 pages/message/message.wxss                    |  75 +++++++++++++++++-
 pages/message/messageDetail/messageDetail.js  |  67 ++++++++++++++++
 .../message/messageDetail/messageDetail.json  |   3 +
 .../message/messageDetail/messageDetail.wxml  |   2 +
 .../message/messageDetail/messageDetail.wxss  |   1 +
 pages/orderList/orderDetail/orderDetail.js    |   2 +-
 11 files changed, 182 insertions(+), 6 deletions(-)
 create mode 100644 imgs/messageAlert.png
 create mode 100644 pages/message/messageDetail/messageDetail.js
 create mode 100644 pages/message/messageDetail/messageDetail.json
 create mode 100644 pages/message/messageDetail/messageDetail.wxml
 create mode 100644 pages/message/messageDetail/messageDetail.wxss

diff --git a/app.json b/app.json
index 2bab428..dc217b4 100644
--- a/app.json
+++ b/app.json
@@ -7,7 +7,8 @@
     "pages/orderList/orderDetail/orderDetail",
     "pages/myCars/myCars",
     "pages/myCars/carsDetail/carsDetail",
-    "pages/myCars/creatNewCar/creatNewCar"
+    "pages/myCars/creatNewCar/creatNewCar",
+    "pages/message/messageDetail/messageDetail"
   ],
   "window": {
     "backgroundTextStyle": "light",
diff --git a/imgs/messageAlert.png b/imgs/messageAlert.png
new file mode 100644
index 0000000000000000000000000000000000000000..72bc9a66bcd7958bac6c12785b6c02294fb2a6d9
GIT binary patch
literal 2311
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
Y2sq{0Zy`3Ou+6_FA)Iiwh8e%>KQDXC{r~^~

literal 0
HcmV?d00001

diff --git a/pages/message/message.js b/pages/message/message.js
index cbe2eac..8235b53 100644
--- a/pages/message/message.js
+++ b/pages/message/message.js
@@ -5,7 +5,7 @@ Page({
    * 页面的初始数据
    */
   data: {
-
+    messageArr: [1, 2, 3, 4, 5, 6, 1, 2, 3, 4, 5, 6, 1, 2, 3, 4, 5, 6, 1, 2, 3, 4, 5, 6],
   },
 
   /**
@@ -15,6 +15,13 @@ Page({
 
   },
 
+  transToMessageDetail:function (event){
+    var itemID = event.currentTarget.dataset.itemid;
+    wx.navigateTo({
+      url: 'messageDetail/messageDetail?id=' + itemID,
+    })
+  },
+
   /**
    * 生命周期函数--监听页面初次渲染完成
    */
diff --git a/pages/message/message.json b/pages/message/message.json
index 9e26dfe..8173d91 100644
--- a/pages/message/message.json
+++ b/pages/message/message.json
@@ -1 +1,3 @@
-{}
\ No newline at end of file
+{
+  "navigationBarTitleText": "消息"
+}
\ No newline at end of file
diff --git a/pages/message/message.wxml b/pages/message/message.wxml
index 324a389..b4e957c 100644
--- a/pages/message/message.wxml
+++ b/pages/message/message.wxml
@@ -1,2 +1,22 @@
 <!--pages/message/message.wxml-->
-<text>pages/message/message.wxml</text>
+<view class='pageContainer'>
+  <block wx:for="{{messageArr}}" wx:for-item="item">
+    <template is="messageTemplate" data="{{item}}" />
+  </block>
+</view>
+
+<template name="messageTemplate">
+  <view class='listContainer' catchtap='transToMessageDetail' data-itemid='{{item.id}}'>
+    <view class='imageView'>
+    <image class='imgae' src='/imgs/messageAlert.png'></image>
+    </view>
+    <view class="contentInfoView">
+      <view class='topGroupView'>
+        <view class='titleView'>推送消息</view>
+        <view class='timeView'>2018/01/02</view>
+      </view>
+      <view class='detailMessageView'>您的订单已通过审核</view>
+    </view>
+  </view>
+  <view class='horizontallineView'></view>
+</template>
\ No newline at end of file
diff --git a/pages/message/message.wxss b/pages/message/message.wxss
index 2251458..e7312b7 100644
--- a/pages/message/message.wxss
+++ b/pages/message/message.wxss
@@ -1 +1,74 @@
-/* pages/message/message.wxss */
\ No newline at end of file
+/* pages/message/message.wxss */
+page{
+  background:#EAF1F8;
+}
+
+.pageContainer{
+  margin-top: 10rpx;
+  background-color: #fff;
+}
+
+.listContainer{
+  margin-left: 20rpx;
+  margin-right: 20rpx;
+  padding-top: 20rpx;
+  padding-bottom: 20rpx;
+  display: flex;
+  flex-direction: row;
+}
+
+.imageView{
+  width: 120rpx;
+  height: 100rpx; 
+}
+
+.imgae{
+  height: 100%;
+  width: 100%;
+}
+
+.contentInfoView{
+  height: 100rpx;
+  width: 100%;
+  padding-left: 20rpx;
+  display: flex;
+  flex-direction: column;
+}
+
+.topGroupView{
+  height: 50rpx;
+  line-height: 50rpx;
+  width: 100%;
+  display: flex;
+  flex-direction: row;
+}
+
+.titleView{
+  height: 100%;
+  width: 60%;
+  font-size: 18px;
+  /* 18px 字体大小差不多等于14pt */
+  /* font-size: 14pt; */
+  color:rgb(48, 48, 48);
+}
+
+.timeView{
+  height: 100%;
+  width: 40%;
+  text-align: right;
+  color: #888;
+}
+
+.detailMessageView{
+  height: 50rpx;
+  line-height: 50rpx;
+  width: 100%;
+  color: #888;
+}
+
+.horizontallineView {
+  height: 1rpx;
+  background-color: #dbdbdb;
+  margin-left: 20rpx;
+  margin-right: 0rpx;
+}
\ No newline at end of file
diff --git a/pages/message/messageDetail/messageDetail.js b/pages/message/messageDetail/messageDetail.js
new file mode 100644
index 0000000..8d3a522
--- /dev/null
+++ b/pages/message/messageDetail/messageDetail.js
@@ -0,0 +1,67 @@
+// pages/message/messageDetail/messageDetail.js
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+    var itemID = options.id;
+
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: function () {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage: function () {
+
+  }
+})
\ No newline at end of file
diff --git a/pages/message/messageDetail/messageDetail.json b/pages/message/messageDetail/messageDetail.json
new file mode 100644
index 0000000..f792469
--- /dev/null
+++ b/pages/message/messageDetail/messageDetail.json
@@ -0,0 +1,3 @@
+{
+  "navigationBarTitleText": "消息详情"
+}
\ No newline at end of file
diff --git a/pages/message/messageDetail/messageDetail.wxml b/pages/message/messageDetail/messageDetail.wxml
new file mode 100644
index 0000000..020f500
--- /dev/null
+++ b/pages/message/messageDetail/messageDetail.wxml
@@ -0,0 +1,2 @@
+<!--pages/message/messageDetail/messageDetail.wxml-->
+<text>pages/message/messageDetail/messageDetail.wxml</text>
diff --git a/pages/message/messageDetail/messageDetail.wxss b/pages/message/messageDetail/messageDetail.wxss
new file mode 100644
index 0000000..326c9cc
--- /dev/null
+++ b/pages/message/messageDetail/messageDetail.wxss
@@ -0,0 +1 @@
+/* pages/message/messageDetail/messageDetail.wxss */
\ No newline at end of file
diff --git a/pages/orderList/orderDetail/orderDetail.js b/pages/orderList/orderDetail/orderDetail.js
index 9b12918..8c30488 100644
--- a/pages/orderList/orderDetail/orderDetail.js
+++ b/pages/orderList/orderDetail/orderDetail.js
@@ -46,7 +46,7 @@ Page({
 
   onLoad: function(options) {
     var that = this;
-    let ID = Number(options.ID);
+    let ID = Number(options.id);
     wx.getSystemInfo({
       success: function (res) {
         that.setData({