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 @@
+
+
+
+
+
+ {{content.length}}/{{limit}}
+
+
+
+
+
+
+
\ 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 @@
支付方式
在线支付
+
红包
¥{{info.coupon_money}}
@@ -28,6 +29,7 @@
暂无可用
+
@@ -75,6 +77,15 @@
+
+
+
+ 备注
+ {{content}}
+ {{content ? '' : '口味, 偏好等要求'}}
+
+
+
已优惠¥{{info.cut_money_total}}
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 @@
-
订单状态
-
+
@@ -110,6 +109,7 @@
+
配送服务
@@ -118,6 +118,14 @@
爱跑腿专送
+
+
+ 备注
+
+
+ {{info.remark || '无'}}
+
+
订单信息
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
})