From 980724bb30c87d2a38920062cd6ddc1d3b2c502d Mon Sep 17 00:00:00 2001
From: Kiyan <fourcels@gmail.com>
Date: Wed, 17 May 2017 11:27:22 +0800
Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=9F=8E=E7=BA=A2=E5=8C=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/app.json                 |  13 ++--
 app/images/icon_hongbao2.png | Bin 0 -> 3291 bytes
 app/pages/login/login.js     |   2 +-
 app/pages/mine/coupon.js     | 139 +++++++++++++++++++++++++++++++++++
 app/pages/mine/coupon.json   |   3 +
 app/pages/mine/coupon.wxml   |  28 +++++++
 app/pages/mine/coupon.wxss   |  53 +++++++++++++
 app/pages/mine/mine.wxml     |  11 ++-
 app/pages/order/quasi.js     |  37 +++++++++-
 app/pages/order/quasi.wxml   |  12 +--
 app/pages/order/quasi.wxss   |   6 +-
 app/pages/order/show.js      |  11 +--
 app/pages/order/show.wxml    |  15 +++-
 app/utils/apis.js            |  45 ++++++++++++
 app/utils/util.js            |   9 +++
 15 files changed, 355 insertions(+), 29 deletions(-)
 create mode 100644 app/images/icon_hongbao2.png
 create mode 100644 app/pages/mine/coupon.js
 create mode 100644 app/pages/mine/coupon.json
 create mode 100644 app/pages/mine/coupon.wxml
 create mode 100644 app/pages/mine/coupon.wxss

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 0000000000000000000000000000000000000000..e521bd5f3ea4c60a081da581a04d1a3687de673e
GIT binary patch
literal 3291
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
Z-rrM3O<dBJc4z<q002ovPDHLkV1nB57Uci{

literal 0
HcmV?d00001

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 @@
+<!--pages/mine/coupon.wxml-->
+<import src="/templates/load-more.wxml" />
+<view class="coupon-list">
+  <view id="{{item.draw_id}}" bindtap="{{selectedId ? 'onItemTap' : ''}}" wx:for="{{list}}" wx:key="draw_id" class="coupon-item">
+    <image wx:if="{{selectedId == item.draw_id}}" class="coupon-item__selected-img" src="/images/address_list_selected.png"></image>
+    <view class="coupon-item__bd weui-flex">
+      <view class="weui-flex__item">
+        <view class="coupon-item__name">
+          {{item.name}}
+        </view>
+        <view class="coupon-item__deadline">
+          有效期至 {{item.deadline_time_format}}
+        </view>
+      </view>
+      <view class="">
+        <view class="coupon-item__money">
+          ¥
+          <text class="coupon-item__money-num">{{item.money}}</text>
+        </view>
+      </view>
+    </view>
+    <view class="coupon-item__ft">
+      仅限{{item.phone}}使用
+    </view>
+  </view>
+</view>
+
+<template is="load-more" data="{{hasMore: hasMore, loading: loading, noMoreLabel: '没有更多红包'}}"></template>
\ 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}}
   </view>
 </view>
-<view class="weui-cells">
-  <navigator wx:if="{{loginInfo}}" url="/pages/address/list" class="weui-cell weui-cell_access" hover-class="weui-cell_active">
+<view wx:if="{{loginInfo}}" class="weui-cells">
+  <navigator  url="/pages/address/list" class="weui-cell weui-cell_access" hover-class="weui-cell_active">
     <view class="weui-cell__bd">收货地址</view>
     <view class="weui-cell__ft weui-cell__ft_in-access"></view>
   </navigator>
+  <navigator url="/pages/mine/coupon" class="weui-cell weui-cell_access" hover-class="weui-cell_active">
+    <view class="weui-cell__bd">我的红包</view>
+    <view class="weui-cell__ft weui-cell__ft_in-access"></view>
+  </navigator>
+</view>
+<view class="weui-cells">
   <view data-phone="400-926-2108" bindtap="onPhoneTap" class="weui-cell weui-cell_access">
     <view class="weui-cell__bd">客服热线</view>
     <view class="weui-cell__ft weui-cell__ft_in-access">400-926-2108</view>
   </view>
 </view>
+
 <view class="button-sp-area">
   <button loading="{{loading}}" bindtap="onLogout" wx:if="{{loginInfo}}"  class="weui-btn weui-btn_plain" >
     退出账号
diff --git a/app/pages/order/quasi.js b/app/pages/order/quasi.js
index 6add4e1..1abde1e 100644
--- a/app/pages/order/quasi.js
+++ b/app/pages/order/quasi.js
@@ -1,6 +1,6 @@
 // pages/order/quasi.js
 import {
-  getQuasiOrderInfo, updateOrderAddr,
+  getQuasiOrderInfo, updateOrderAddr, updateOrderCoupon,
   addOrder, getPayment
 } from '../../utils/apis'
 
@@ -13,7 +13,7 @@ Page({
   },
   onLoad: function (options) {
     // 页面初始化 options为页面跳转所带来的参数
-    this.id = options.id || '2725'
+    this.id = options.id || '2825'
     this.loadData()
   },
   onReady: function () {
@@ -42,6 +42,8 @@ Page({
     getQuasiOrderInfo({
       quasi_order_id: id,
       success(data) {
+        data['cut_money_total'] = +data.cut_money + +data.coupon_money
+
         that.setData({
           info: data,
           loading: false
@@ -69,6 +71,37 @@ Page({
       quasi_order_id: id,
       addr_id,
       success(data) {
+        data['cut_money_total'] = +data.cut_money + +data.coupon_money
+        that.setData({
+          info: data,
+          loading: false
+        })
+        wx.hideNavigationBarLoading()
+      },
+      error() {
+        that.setData({
+          loading: false
+        })
+        wx.hideNavigationBarLoading()
+      }
+    })
+  },
+  callbackCoupon(user_coupon_id) {
+    var that = this
+    var {id} = this
+    var {loading} = this.data
+    if (loading) {
+      return
+    }
+    this.setData({
+      loading: true
+    })
+    wx.showNavigationBarLoading()
+    updateOrderCoupon({
+      quasi_order_id: id,
+      user_coupon_id,
+      success(data) {
+        data['cut_money_total'] = +data.cut_money + +data.coupon_money
         that.setData({
           info: data,
           loading: false
diff --git a/app/pages/order/quasi.wxml b/app/pages/order/quasi.wxml
index d3c2f8d..efd169f 100644
--- a/app/pages/order/quasi.wxml
+++ b/app/pages/order/quasi.wxml
@@ -19,11 +19,11 @@
       <view class="weui-cell__bd">支付方式</view>
       <view class="">在线支付</view>
     </view>
-    <navigator url="" wx:if="{{info.coupon_money > 0}}" class="weui-cell weui-cell_access" hover-class="weui-cell_active">
+    <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>
     </navigator>
-    <view class="weui-cell weui-cell_access">
+    <view wx:else class="weui-cell weui-cell_access">
       <view class="weui-cell__bd">红包</view>
       <view class="weui-cell__ft">暂无可用</view>
     </view>
@@ -42,7 +42,7 @@
         </view>
       </view>
       <view class="quasi-goods__list">
-        <view class="quasi-goods__item">
+        <view wx:if="{{info.packing_fee > 0}}" class="quasi-goods__item">
           <view class="quasi-goods__item-name">餐盒费</view>
           <view class="quasi-goods__item-num"></view>
           <view class="quasi-goods__item-price">¥{{info.packing_fee}}</view>
@@ -53,7 +53,7 @@
           <view class="quasi-goods__item-price">¥{{info.delivery_fee}}</view>
         </view>
       </view>
-      <view class="quasi-goods__list">
+      <view wx:if="{{info.cut_money > 0}}" class="quasi-goods__list">
         <view class="quasi-goods__item">
           <view class="quasi-goods__item-name quasi-goods__item-name_grey">
           <image class="quasi-goods__item-name-icon" src="/images/icon_jian.png"></image>商城优惠
@@ -65,7 +65,7 @@
       <view class="quasi-goods__list">
         <view class="quasi-goods__item">
           <view class="quasi-goods__item-name quasi-goods__item-name_grey">
-            总计¥{{info.order_price}} 优惠¥{{info.cut_money}}
+            总计¥{{info.order_price}} 优惠¥{{info.cut_money_total}}
           </view>
           <view class="quasi-goods__item-num"></view>
           <view class="quasi-goods__item-price primary-color">
@@ -77,7 +77,7 @@
   </view>
 </view>
 <view class="quasi-actions">
-  <view class="quasi-actions__cut">已优惠¥{{info.cut_money}}</view>
+  <view class="quasi-actions__cut">已优惠¥{{info.cut_money_total}}</view>
   <view class="quasi-actions__pay">
     待支付
     <text class="primary-color">¥{{info.pay_price}}</text>
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 @@
             </view>
           </view>
           <view class="quasi-goods__list">
-            <view class="quasi-goods__item">
+            <view wx:if="{{info.packing_fee > 0}}" class="quasi-goods__item">
               <view class="quasi-goods__item-name">餐盒费</view>
               <view class="quasi-goods__item-num"></view>
               <view class="quasi-goods__item-price">¥{{info.packing_fee}}</view>
@@ -60,19 +60,26 @@
               <view class="quasi-goods__item-price">¥{{info.delivery_fee}}</view>
             </view>
           </view>
-          <view class="quasi-goods__list">
-            <view class="quasi-goods__item">
+          <view wx:if="{{info.cut_money > 0 || info.user_coupon_id}}" class="quasi-goods__list">
+            <view wx:if="{{info.cut_money > 0}}" class="quasi-goods__item">
               <view class="quasi-goods__item-name quasi-goods__item-name_grey">
                 <image class="quasi-goods__item-name-icon" src="/images/icon_jian.png"></image>商城优惠
               </view>
               <view class="quasi-goods__item-num"></view>
               <view class="quasi-goods__item-price">-¥{{info.cut_money}}</view>
             </view>
+            <view wx:if="{{info.user_coupon_id}}" class="quasi-goods__item">
+              <view class="quasi-goods__item-name quasi-goods__item-name_grey">
+                <image class="quasi-goods__item-name-icon" src="/images/icon_hongbao.png"></image>红包
+              </view>
+              <view class="quasi-goods__item-num"></view>
+              <view class="quasi-goods__item-price">-¥{{info.coupon_money}}</view>
+            </view>
           </view>
           <view class="quasi-goods__list">
             <view class="quasi-goods__item">
               <view class="quasi-goods__item-name quasi-goods__item-name_grey">
-                总计¥{{info.order_price}} 优惠¥{{info.cut_money}}
+                总计¥{{info.order_price}} 优惠¥{{info.cut_money_total}}
               </view>
               <view class="quasi-goods__item-num"></view>
               <view class="quasi-goods__item-price primary-color">
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