Merge branch 'dev_7.1.0' into feature-zyw-sc

# Conflicts:
#	src/project.config.json

src/pages/confirmOrder/confirmOrder.js

@@ -8,7 +8,9 @@ wxService.page({
   data: {
     addressInfo: '',
     showSelectCoupon: false,
-    skuIds: []
+    skuIds: [],
+    trolleySku2Buy: Array,
+    currentOrderList: Array
   },
 
   /**
@@ -22,39 +24,58 @@ wxService.page({
    */
   onShow: function () {
     let trolleySku2Buy = this.options.trolleySku2Buy
-    console.log('thtrolleySku2Bu', JSON.parse(trolleySku2Buy))
     // 下单 && 计算优惠价
-    if(trolleySku2Buy.length){
-      // this.getBill(trolleySku2Buy) // 下单
-      this.calPreferentialPrice(trolleySku2Buy)  // 计算优惠价
+    if (trolleySku2Buy.length) {
+      this.setData({ trolleySku2Buy }, () => {
+        this.calPreferentialPrice(trolleySku2Buy)  // 计算优惠价
+      })
     }
   },
-  //  下单
-  getBill(trolleySku2Buy) {
+  // 计算优惠价
+  calPreferentialPrice(trolleySku2Buy) {
     wx.showLoading({
       title: '加载中'
     })
-    wxService.post(`/sale/trade/buyer/bill`,trolleySku2Buy).then(res => {
+    wxService.post(`/sale/trade/buyer/preview`, trolleySku2Buy).then(res => {
       if (res) {
         const { result, data } = res.data
         if (result == 0) {
           wx.hideLoading()
-          console.log('data', data)
+          this.setData({ currentOrderList: data })
         }
       }
     })
   },
-  // 计算优惠价
-  calPreferentialPrice(trolleySku2Buy) {
+  handelGobuy() {
+    const { trolleySku2Buy } = this.data
+    this.getBill(trolleySku2Buy) // 下单
+  },
+  //  下单
+  getBill(trolleySku2Buy) {
     wx.showLoading({
       title: '加载中'
     })
-    wxService.post(`/sale/trade/buyer/preview`,trolleySku2Buy).then(res => {
+    wxService.post(`/sale/trade/buyer/bill`, trolleySku2Buy).then(res => {
       if (res) {
         const { result, data } = res.data
         if (result == 0) {
-          wx.hideLoading()
+          delete data.appId
           console.log('data', data)
+          wx.requestPayment(Object.assign({
+            success(res) {
+              wx.hideLoading()
+              // 支付成功页面
+              wxService.router('/subPackage/page/pages/paymentStatus/paymentStatus')
+            },
+            fail(res) {
+              wx.hideLoading()
+              wx.showToast({
+                title: '支付失败',
+                icon: 'none',
+                mask: true
+              })
+            }
+          }, data))
         }
       }
     })

src/pages/order/order.js

@@ -154,14 +154,17 @@ wxService.page({
   // 查看详情
   handelCheckRfDetail(e){
     const { id } = e.currentTarget.dataset
+    wxService.router(`/pages/orderDetail/orderDetail?id=${id}`)
   },
   // 退货寄回
   handelCheckRfSend(e){
     const { id } = e.currentTarget.dataset
+    console.log('handelCheckRfSend', id )
   },
   // 取消退款
   handelCancelRefund(e){
     const { id } = e.currentTarget.dataset
+    console.log('取消退款', id )
   },
   // 订单详情
   handelDetail(e) {

src/pages/order/order.wxml

@@ -26,12 +26,14 @@
 						<text class="number">{{item.id}}</text>
 					</view>
 					<!--订单状态(C:取消;N:新建,P:已支付;D:已发货;R:已收货)  关闭 取消  新建 待付款  已支付 待发货  已发货 待收货 已完成 已收货 交易关闭 取消-->
-					<!--退单状态(C:取消;N:新建,A:已审核;R:退货已发R货;D:退货已收货)-->
+					<!--退单状态(C:取消;N:新建;A:已审核;R:已拒绝;R:退货已发;D:退货已收货)-->
+					<!-- RJ-退款驳回  R-退货中 N-待审核  A-待寄回  C-退款取消 D-退款成功 退款中 -->
 					<view wx:if="{{currentIndex == 5}}">
 						<text class="order-status" wx-if="{{item.status == 'C'}}">退款取消</text>
 						<text class="order-status" wx-if="{{item.status == 'N'}}">待审核</text>
 						<text class="order-status" wx-if="{{item.status == 'A'}}">待寄回</text>
 						<text class="order-status" wx-if="{{item.status == 'R'}}">退货中</text>
+						<text class="order-status" wx-if="{{item.status == 'RJ'}}">退款驳回</text>
 						<text class="order-status" wx-if="{{item.status == 'D'}}">退款成功</text>
 					</view>
 					<view wx:else>
@@ -106,21 +108,24 @@
 
 				<view wx:if="{{currentIndex == 5}}">
 					<view class="btn-group">
-						<!--退单状态(C:取消;N:新建,A:已审核;R:退货已发R货;D:退货已收货)-->
 						<view class="order-status-rf" wx-if="{{item.status == 'C'}}">
 							<button class="btn btn-sm btn-default" data-id="{{item.id}}" bindtap="handelCheckRfDetail">查看详情</button>
 						</view>
 						<view class="order-status-rf" wx-if="{{item.status == 'N'}}">
 							<button class="btn btn-sm btn-default" data-id="{{item.id}}" bindtap="handelCheckRfDetail">查看详情</button>
-							<button class="btn btn-sm btn-default" data-id="{{item.id}}" bindtap="handelCheckRfSend">退货寄回</button>
 							<button class="btn btn-sm btn-primary btn-outline" data-id="{{item.id}}" bindtap="handelCancelRefund">取消退款</button>
 						</view>
 						<view class="order-status-rf" wx-if="{{item.status == 'A'}}">
 							<button class="btn btn-sm btn-default" data-id="{{item.id}}" bindtap="handelCheckRfDetail">查看详情</button>
+							<button class="btn btn-sm btn-default" data-id="{{item.id}}" bindtap="handelCheckRfSend">退货寄回</button>
+							<button class="btn btn-sm btn-primary btn-outline" data-id="{{item.id}}" bindtap="handelCancelRefund">取消退款</button>
 						</view>
 						<view class="order-status-rf" wx-if="{{item.status == 'R'}}">
 							<button class="btn btn-sm btn-default" data-id="{{item.id}}" bindtap="handelCheckRfDetail">查看详情</button>
 						</view>
+						<view class="order-status-rf" wx-if="{{item.status == 'RJ'}}">
+							<button class="btn btn-sm btn-default" data-id="{{item.id}}" bindtap="handelCheckRfDetail">查看详情</button>
+						</view>
 						<view class="order-status-rf" wx-if="{{item.status == 'D'}}">
 							<button class="btn btn-sm btn-default" data-id="{{item.id}}" bindtap="handelCheckRfDetail">查看详情</button>
 						</view>

src/pages/refundDetail/refundDetail.wxml

 <!--pages/refundDetail/refundDetail.wxml-->
 <view class="page-refund-detail">
 	<view class="header-wrap" style="background-image:url('/assets/imgs/7_1_0/rf_bgc.jpg')">
-		<!--<image class="header-bg" src="/assets/imgs/7_1_0/address-line.png"></image>-->
-		<view class="refund-status">
+		<view class="refund-status"  wx-if="{{refundDetail.status == 'C'}}">
+			<view class="status">退货取消</view>
+			<view class="desc">你已取消退款啦~</view>
+		</view>
+			<view class="refund-status"  wx-if="{{refundDetail.status == 'N'}}">
 			<view class="status">待审核</view>
 			<view class="desc">退款申请已经提交，等待商家处理哦~</view>
 		</view>
+			<view class="refund-status"  wx-if="{{refundDetail.status == 'A'}}">
+			<view class="status">待寄回</view>
+			<view class="desc">商家已经同意你的退款申请</view>
+		</view>
+			<view class="refund-status"  wx-if="{{refundDetail.status == 'R'}}">
+			<view class="status">退货中</view>
+			<view class="desc">工作人员正在处理，请耐心等待哦~</view>
+		</view>
+			<view class="refund-status"  wx-if="{{refundDetail.status == 'RJ'}}">
+			<view class="status">退款驳回</view>
+			<view class="desc">如有疑问可联系商家~</view>
+		</view>
+			<view class="refund-status"  wx-if="{{refundDetail.status == 'D'}}">
+			<view class="status">退货完成</view>
+			<view class="desc">退货成功，很抱歉给您带来了不便~</view>
+		</view>
 	</view>
 
 	<view class="logistics-wrap">

src/project.config.json

@@ -39,7 +39,7 @@
 			"list": []
 		},
 		"miniprogram": {
-			"current": 14,
+			"current": 17,
 			"list": [
 				{
 					"id": -1,
@@ -147,10 +147,10 @@
 					"scene": null
 				},
 				{
-					"id": -1,
+					"id": 17,
 					"name": "确认订单",
 					"pathName": "pages/confirmOrder/confirmOrder",
-					"query": "",
+					"query": "trolleySku2Buy=[{\"count\":3,\"skuId\":1556108807316001},{\"count\":1,\"skuId\":1556108807316000}]",
 					"scene": null
 				},
 				{