From d65fdc8f92849ce98d6d3b48caad7a3eff3ec36a Mon Sep 17 00:00:00 2001
From: Kiyan <fourcels@gmail.com>
Date: Fri, 26 May 2017 15:27:39 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=20=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E5=A4=87=E6=B3=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/app.json                 |  3 +-
 app/pages/order/content.js   | 99 ++++++++++++++++++++++++++++++++++++
 app/pages/order/content.json |  3 ++
 app/pages/order/content.wxml | 15 ++++++
 app/pages/order/content.wxss |  1 +
 app/pages/order/quasi.js     | 12 +++--
 app/pages/order/quasi.wxml   | 11 ++++
 app/pages/order/quasi.wxss   |  5 +-
 app/pages/order/show.js      |  2 +-
 app/pages/order/show.wxml    | 12 ++++-
 app/utils/apis.js            |  4 +-
 11 files changed, 157 insertions(+), 10 deletions(-)
 create mode 100644 app/pages/order/content.js
 create mode 100644 app/pages/order/content.json
 create mode 100644 app/pages/order/content.wxml
 create mode 100644 app/pages/order/content.wxss

diff --git a/app/app.json b/app/app.json
index 8373225..9562533 100644
--- a/app/app.json
+++ b/app/app.json
@@ -1,12 +1,13 @@
 {
   "pages": [
     "pages/index/index",
+    "pages/order/list",
     "pages/order/show",
     "pages/order/quasi",
+    "pages/order/content",
     "pages/mine/coupon",
     "pages/shop/show",
     "pages/mine/mine",
-    "pages/order/list",
     "pages/order/review",
     "pages/index/search",
     "pages/index/category",
diff --git a/app/pages/order/content.js b/app/pages/order/content.js
new file mode 100644
index 0000000..10bb94e
--- /dev/null
+++ b/app/pages/order/content.js
@@ -0,0 +1,99 @@
+// pages/order/content.js
+import {
+  getPrevPage
+} from '../../utils/util'
+const limit = 50
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    limit,
+    content: ''
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+    this.callback = options.callback || 'callback'
+    var {content} = options
+    if (content) {
+      this.setData({
+        content
+      })
+    }
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: function () {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage: function () {
+
+  },
+
+  onContentInput(e) {
+    var {value} = e.detail
+    var {content} = this.data
+    if (value.length <= limit) {
+      this.setData({
+        content: value
+      })
+    } else {
+      this.setData({
+        content
+      })
+    }
+  },
+  onSaveTap(e) {
+    var {content} = this.data
+    var cb = getPrevPage()[this.callback]
+    cb && cb(content)
+    wx.navigateBack({
+      delta: 1,
+    })
+  }
+})
\ No newline at end of file
diff --git a/app/pages/order/content.json b/app/pages/order/content.json
new file mode 100644
index 0000000..2ef5a6c
--- /dev/null
+++ b/app/pages/order/content.json
@@ -0,0 +1,3 @@
+{
+  "navigationBarTitleText": "附加信息"
+}
\ No newline at end of file
diff --git a/app/pages/order/content.wxml b/app/pages/order/content.wxml
new file mode 100644
index 0000000..7925e5e
--- /dev/null
+++ b/app/pages/order/content.wxml
@@ -0,0 +1,15 @@
+<!--pages/order/content.wxml-->
+<view class="weui-cells weui-cells_after-title">
+  <view class="weui-cell">
+    <view class="weui-cell__bd">
+      <textarea bindinput="onContentInput" value="{{content}}" class="weui-textarea" placeholder="口味, 偏好等要求" style="height: 3.3em" />
+      <view class="weui-textarea-counter">{{content.length}}/{{limit}}</view>
+    </view>
+  </view>
+</view>
+
+<view class="button-sp-area">
+  <button bindtap="onSaveTap" disabled="{{disabled}}" class="weui-btn" type="primary" loading="{{loading}}">
+    确定
+  </button>
+</view>
\ No newline at end of file
diff --git a/app/pages/order/content.wxss b/app/pages/order/content.wxss
new file mode 100644
index 0000000..d2c56b0
--- /dev/null
+++ b/app/pages/order/content.wxss
@@ -0,0 +1 @@
+/* pages/order/content.wxss */
\ No newline at end of file
diff --git a/app/pages/order/quasi.js b/app/pages/order/quasi.js
index 1abde1e..ef159f1 100644
--- a/app/pages/order/quasi.js
+++ b/app/pages/order/quasi.js
@@ -9,11 +9,11 @@ import {
 } from '../../utils/util'
 Page({
   data: {
-    
+    content: ''
   },
   onLoad: function (options) {
     // 页面初始化 options为页面跳转所带来的参数
-    this.id = options.id || '2825'
+    this.id = options.id || '2843'
     this.loadData()
   },
   onReady: function () {
@@ -116,10 +116,15 @@ Page({
       }
     })
   },
+  callbackContent(content) {
+    this.setData({
+      content
+    })
+  },
   onAddOrder(e) {
     var that = this
     var {id} = this
-    var {loading} = this.data
+    var {loading, content} = this.data
     if (loading) {
       return
     }
@@ -127,6 +132,7 @@ Page({
       loading: true
     })
     addOrder({
+      remark: content,
       quasi_order_id: id,
       success(data) {
         var order_id = data['order']['order_id']
diff --git a/app/pages/order/quasi.wxml b/app/pages/order/quasi.wxml
index 2f5ce64..33db77a 100644
--- a/app/pages/order/quasi.wxml
+++ b/app/pages/order/quasi.wxml
@@ -19,6 +19,7 @@
       <view class="weui-cell__bd">支付方式</view>
       <view class="">在线支付</view>
     </view>
+
     <navigator url="/pages/mine/coupon?id={{info.user_coupon_id}}&callback=callbackCoupon" wx:if="{{info.user_coupon_id}}" class="weui-cell weui-cell_access" hover-class="weui-cell_active">
       <view class="weui-cell__bd">红包</view>
       <view class="weui-cell__ft_in-access">¥{{info.coupon_money}}</view>
@@ -28,6 +29,7 @@
       <view class="weui-cell__ft">暂无可用</view>
     </view>
   </view>
+
   <view class="quasi-goods">
     <view class="quasi-goods__hd">
       <image class="quasi-goods__img" src="/images/shop-512.png"></image>
@@ -75,6 +77,15 @@
       </view>
     </view>
   </view>
+
+  <view class="weui-cells">
+    <navigator url="./content?callback=callbackContent&content={{content}}" class="weui-cell weui-cell_access" hover-class="weui-cell_active">
+      <view class="weui-cell__bd weui-cell__bd_content">备注</view>
+      <view>{{content}}</view>
+      <view class="weui-cell__ft weui-cell__ft_in-access">{{content ? '' : '口味, 偏好等要求'}}</view>
+    </navigator>
+  </view>
+
 </view>
 <view class="quasi-actions">
   <view class="quasi-actions__cut">已优惠¥{{info.cut_money_total}}</view>
diff --git a/app/pages/order/quasi.wxss b/app/pages/order/quasi.wxss
index cd61062..b3b5e67 100644
--- a/app/pages/order/quasi.wxss
+++ b/app/pages/order/quasi.wxss
@@ -7,6 +7,9 @@
 .weui-media-box_address::after {
   right: 15px;
 }
+.weui-cell__bd_content {
+  min-width: 4em;
+}
 
 /* quasi-goods */
 
@@ -95,4 +98,4 @@
 }
 .menu-cart__btn::after {
   content: none;
-}
\ No newline at end of file
+}
diff --git a/app/pages/order/show.js b/app/pages/order/show.js
index 46fd703..9a21c2f 100644
--- a/app/pages/order/show.js
+++ b/app/pages/order/show.js
@@ -24,7 +24,7 @@ Page({
   },
   onLoad: function (options) {
     // 页面初始化 options为页面跳转所带来的参数
-    this.id = options.id || 1488
+    this.id = options.id || 1497
     this.loadData()
   },
   onReady: function () {
diff --git a/app/pages/order/show.wxml b/app/pages/order/show.wxml
index 172cd8f..0b05bfb 100644
--- a/app/pages/order/show.wxml
+++ b/app/pages/order/show.wxml
@@ -1,11 +1,10 @@
-
 <!--pages/order/show.wxml-->
 <view class="order-show-tab tab">
   <view class="tab__navbar">
     <view bindtap="navChange" id="{{index}}" wx:for="{{tabNavs}}" wx:key="{{index}}" class="tab__navbar-item {{index == activeNavIndex?  'tab__navbar-item_active': ''}} ">
       订单状态
     </view>
-    <view bindtap="onPhoneTap"  class="phone">
+    <view bindtap="onPhoneTap" class="phone">
       <image class="phone__icon" src="/images/chat_phone_normal.png"></image>
     </view>
   </view>
@@ -110,6 +109,7 @@
             </view>
           </view>
         </view>
+
         <view class="weui-cell">
           <view class="weui-cell__hd">
             配送服务
@@ -118,6 +118,14 @@
             爱跑腿专送
           </view>
         </view>
+        <view class="weui-cell">
+          <view class="weui-cell__hd">
+            备注
+          </view>
+          <view class="weui-cell__bd">
+            {{info.remark || '无'}}
+          </view>
+        </view>
       </view>
       <view class="weui-cells__title">订单信息</view>
       <view class="weui-cells weui-cells_after-title">
diff --git a/app/utils/apis.js b/app/utils/apis.js
index 597bba1..dda435b 100644
--- a/app/utils/apis.js
+++ b/app/utils/apis.js
@@ -397,7 +397,7 @@ export function updateOrderCoupon(options) {
 // 添加订单
 export function addOrder(options) {
   var {
-    quasi_order_id,
+    quasi_order_id, remark,
     success, error
   } = options
   getApp().getLoginInfo(loginInfo => {
@@ -409,7 +409,7 @@ export function addOrder(options) {
       url: 'index.php?m=Mall&c=Order&a=addOrder',
       data: {
         user_id, user_token,
-        quasi_order_id
+        quasi_order_id, remark
       },
       success, error
     })