diff --git a/app/app.json b/app/app.json
index d848aff..8373225 100644
--- a/app/app.json
+++ b/app/app.json
@@ -1,15 +1,16 @@
{
"pages": [
- "pages/order/list",
- "pages/order/show",
- "pages/order/review",
"pages/index/index",
- "pages/index/search",
- "pages/index/category",
+ "pages/order/show",
+ "pages/order/quasi",
+ "pages/mine/coupon",
"pages/shop/show",
"pages/mine/mine",
+ "pages/order/list",
+ "pages/order/review",
+ "pages/index/search",
+ "pages/index/category",
"pages/address/select",
- "pages/order/quasi",
"pages/address/list",
"pages/index/address",
"pages/address/add",
diff --git a/app/images/icon_hongbao2.png b/app/images/icon_hongbao2.png
new file mode 100644
index 0000000..e521bd5
Binary files /dev/null and b/app/images/icon_hongbao2.png differ
diff --git a/app/pages/login/login.js b/app/pages/login/login.js
index 7c4445e..85d309b 100644
--- a/app/pages/login/login.js
+++ b/app/pages/login/login.js
@@ -7,7 +7,7 @@ var initCount = 60
Page({
data: {
codeLabel: '获取验证码',
- phone: '13000000004',
+ phone: '',
},
onLoad: function (options) {
// 页面初始化 options为页面跳转所带来的参数
diff --git a/app/pages/mine/coupon.js b/app/pages/mine/coupon.js
new file mode 100644
index 0000000..03733b6
--- /dev/null
+++ b/app/pages/mine/coupon.js
@@ -0,0 +1,139 @@
+// pages/mine/coupon.js
+import {
+ getShareUserList
+} from '../../utils/apis'
+
+import {
+ getPrevPage
+} from '../../utils/util'
+
+Page({
+
+ /**
+ * 页面的初始数据
+ */
+ data: {
+ page: 0,
+ hasMore: true,
+ loading: false,
+ },
+
+ /**
+ * 生命周期函数--监听页面加载
+ */
+ onLoad: function (options) {
+ this.id = options.id || 30
+ this.callback = options.callback || 'callback'
+ this.setData({
+ selectedId: this.id
+ })
+ this.loadData()
+ },
+
+ /**
+ * 生命周期函数--监听页面初次渲染完成
+ */
+ onReady: function () {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面显示
+ */
+ onShow: function () {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面隐藏
+ */
+ onHide: function () {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面卸载
+ */
+ onUnload: function () {
+
+ },
+
+ /**
+ * 页面相关事件处理函数--监听用户下拉动作
+ */
+ onPullDownRefresh: function () {
+
+ },
+
+ /**
+ * 页面上拉触底事件的处理函数
+ */
+ onReachBottom(e) {
+ var {
+ hasMore, loading
+ } = this.data
+ if (hasMore && !loading) {
+ this.loadData()
+ }
+ },
+
+ /**
+ * 用户点击右上角分享
+ */
+ onShareAppMessage: function () {
+
+ },
+
+ /**
+ * 页面上拉触底事件的处理函数
+ */
+ onReachBottom: function () {
+
+ },
+
+ /**
+ * 页面相关事件处理函数--监听用户下拉动作
+ */
+ onPullDownRefresh: function () {
+
+ },
+ loadData() {
+ var that = this
+ var {
+ loading, page
+ } = this.data
+ if (loading) {
+ return
+ }
+ this.setData({
+ loading: true
+ })
+ getShareUserList({
+ page,
+ success(data) {
+ var {list} = that.data
+ var {list: list2, has_more, page} = data
+ list2 = list2.map(item => {
+ item['deadline_time_format'] = item.deadline_time.split(' ')[0]
+ return item
+ })
+ that.setData({
+ loading: false,
+ list: list ? list.concat(list2) : list2,
+ hasMore: has_more,
+ page: page + 1
+ })
+ }
+ })
+ },
+ onItemTap(e) {
+ var {id} = e.currentTarget
+ var {selectedId} = this.data
+ if (id == selectedId) {
+ return;
+ }
+ var callback = getPrevPage()[this.callback]
+ callback && callback(id)
+ wx.navigateBack()
+ }
+})
\ No newline at end of file
diff --git a/app/pages/mine/coupon.json b/app/pages/mine/coupon.json
new file mode 100644
index 0000000..b56266c
--- /dev/null
+++ b/app/pages/mine/coupon.json
@@ -0,0 +1,3 @@
+{
+ "navigationBarTitleText": "我的红包"
+}
\ No newline at end of file
diff --git a/app/pages/mine/coupon.wxml b/app/pages/mine/coupon.wxml
new file mode 100644
index 0000000..1864378
--- /dev/null
+++ b/app/pages/mine/coupon.wxml
@@ -0,0 +1,28 @@
+
+
+
+
+
+
+
+
+ {{item.name}}
+
+
+ 有效期至 {{item.deadline_time_format}}
+
+
+
+
+ ¥
+ {{item.money}}
+
+
+
+
+ 仅限{{item.phone}}使用
+
+
+
+
+
\ No newline at end of file
diff --git a/app/pages/mine/coupon.wxss b/app/pages/mine/coupon.wxss
new file mode 100644
index 0000000..70262a6
--- /dev/null
+++ b/app/pages/mine/coupon.wxss
@@ -0,0 +1,53 @@
+/* pages/mine/coupon.wxss */
+@import '/templates/load-more.wxss';
+
+.coupon-list {
+ padding: 0 15px;
+}
+
+.coupon-item {
+ position: relative;
+ margin-top: 10px;
+ padding: 0 15px;
+ background-color: #fff;
+ border-radius: 5px;
+}
+
+.coupon-item__bd {
+ padding: 15px 0 10px 0;
+}
+
+.coupon-item__name {
+ color: #ff5801;
+}
+
+.coupon-item__deadline {
+ color: #999;
+ font-size: 0.8em;
+}
+
+.coupon-item__ft {
+ padding: 5px 0;
+ font-size: 0.8em;
+ color: #999;
+ border-top: 1rpx dashed #e8e8e8;
+}
+
+.coupon-item__money {
+ padding: 5px 10px;
+ color: #ff5801;
+ font-size: 1.2em;
+ line-height: 1;
+}
+
+.coupon-item__money-num {
+ font-size: 2em;
+}
+
+.coupon-item__selected-img {
+ position: absolute;
+ left: 0;
+ top: 0;
+ width: 40px;
+ height: 39px;
+}
\ No newline at end of file
diff --git a/app/pages/mine/mine.wxml b/app/pages/mine/mine.wxml
index 41b8e6d..4a4b5ca 100644
--- a/app/pages/mine/mine.wxml
+++ b/app/pages/mine/mine.wxml
@@ -11,16 +11,23 @@
{{loginInfo.phone}}
-
-
+
+
收货地址
+
+ 我的红包
+
+
+
+
客服热线
400-926-2108
+
-
+
红包
¥{{info.coupon_money}}
-
+
红包
暂无可用
@@ -42,7 +42,7 @@
-
+
餐盒费
¥{{info.packing_fee}}
@@ -53,7 +53,7 @@
¥{{info.delivery_fee}}
-
+
商城优惠
@@ -65,7 +65,7 @@
- 总计¥{{info.order_price}} 优惠¥{{info.cut_money}}
+ 总计¥{{info.order_price}} 优惠¥{{info.cut_money_total}}
@@ -77,7 +77,7 @@
- 已优惠¥{{info.cut_money}}
+ 已优惠¥{{info.cut_money_total}}
待支付
¥{{info.pay_price}}
diff --git a/app/pages/order/quasi.wxss b/app/pages/order/quasi.wxss
index 61be79d..cd61062 100644
--- a/app/pages/order/quasi.wxss
+++ b/app/pages/order/quasi.wxss
@@ -49,9 +49,9 @@
}
.quasi-goods__item-name-icon {
- margin: -2px 5px 0 0;
- height: 21px;
- width: 21px;
+ margin: -4px 5px 0 0;
+ height: 20px;
+ width: 20px;
vertical-align: middle;
}
diff --git a/app/pages/order/show.js b/app/pages/order/show.js
index c3dd99d..46fd703 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 || 1468
+ this.id = options.id || 1488
this.loadData()
},
onReady: function () {
@@ -80,6 +80,7 @@ Page({
order_id,
success(data) {
data['add_time_format'] = datetimeFormat(data.add_time)
+ data['cut_money_total'] = +data.cut_money + +data.coupon_money
data['flow'] = data.flow.map(item => {
item['time_format'] = datetimeFormat(item.time)
return item
@@ -107,13 +108,13 @@ Page({
onPhoneTap(e) {
var that = this
- var {info: {seller_phone, localphone, delivery_phone}} = this.data
+ var {info: {seller_phone, localphone, runner_phone}} = this.data
var phones = [
`商家电话: ${seller_phone}`,
`客服电话: ${localphone}`
]
- if(delivery_phone) {
- phones.push(`跑腿电话: ${delivery_phone}`)
+ if (runner_phone) {
+ phones.push(`跑腿电话: ${runner_phone}`)
}
wx.showActionSheet({
itemList: phones,
@@ -124,7 +125,7 @@ Page({
} else if (tapIndex == 1) {
makePhoneCall(localphone)
} else if(tapIndex == 2) {
- makePhoneCall(delivery_phone)
+ makePhoneCall(runner_phone)
}
},
fail: function (res) {
diff --git a/app/pages/order/show.wxml b/app/pages/order/show.wxml
index 31a4058..172cd8f 100644
--- a/app/pages/order/show.wxml
+++ b/app/pages/order/show.wxml
@@ -49,7 +49,7 @@
-
+
餐盒费
¥{{info.packing_fee}}
@@ -60,19 +60,26 @@
¥{{info.delivery_fee}}
-
-
+
+
商城优惠
-¥{{info.cut_money}}
+
+
+ 红包
+
+
+ -¥{{info.coupon_money}}
+
- 总计¥{{info.order_price}} 优惠¥{{info.cut_money}}
+ 总计¥{{info.order_price}} 优惠¥{{info.cut_money_total}}
diff --git a/app/utils/apis.js b/app/utils/apis.js
index bf48a89..597bba1 100644
--- a/app/utils/apis.js
+++ b/app/utils/apis.js
@@ -371,6 +371,28 @@ export function updateOrderAddr(options) {
})
}
+// 更新准订单红包
+export function updateOrderCoupon(options) {
+ var {
+ quasi_order_id, user_coupon_id,
+ success, error
+ } = options
+ getApp().getLoginInfo(loginInfo => {
+ if (!loginInfo.user_info) {
+ return alert('用户未登录')
+ }
+ var {user_id, user_token} = loginInfo.user_info
+ fetch({
+ url: 'index.php?m=Mall&c=Order&a=updateOrderCoupon',
+ data: {
+ user_id, user_token,
+ quasi_order_id, user_coupon_id
+ },
+ success, error
+ })
+
+ })
+}
// 添加订单
export function addOrder(options) {
@@ -576,3 +598,26 @@ export function search(options) {
}
+// 获取用户红包列表
+export function getShareUserList(options) {
+ var {
+ page,
+ success, error
+ } = options
+ page = page || 0
+ getApp().getLoginInfo(loginInfo => {
+ if (!loginInfo.user_info) {
+ return alert('用户未登录')
+ }
+ var {user_id, user_token} = loginInfo.user_info
+ fetch({
+ url: 'index.php?m=Mall&c=Coupon&a=getShareUserList',
+ data: {
+ user_id, user_token,
+ page
+ },
+ success, error
+ })
+
+ })
+}
\ No newline at end of file
diff --git a/app/utils/util.js b/app/utils/util.js
index d29de0e..cf2fc46 100644
--- a/app/utils/util.js
+++ b/app/utils/util.js
@@ -339,4 +339,13 @@ export function requestPayment(options) {
}
}
}, data))
+}
+
+// 分享
+export function share(options) {
+ if (!wx.showShareMenu) {
+ return alert('当前微信版本过低, 无法使用该功能, 请升级到最新微信版本后重试.')
+ }
+
+ wx.showShareMenu(options)
}
\ No newline at end of file