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) // 下单
+    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/confirmOrder/confirmOrder.wxml

@@ -3,19 +3,23 @@
 	<view class="address-wrap">
 		<block wx:if="{{false}}">
 			<view class="address-section">
-        <input class="address-input" placeholder="请输入收货人姓名"></input>
-        <input class="address-input" placeholder="请输入手机号码"></input>
+				<input class="address-input" placeholder="请输入收货人姓名" />
+				<input class="address-input" placeholder="请输入手机号码" />
 			</view>
 			<view class="address-section">
 				<!-- <view class="">所在区域</view> -->
-        <picker class="address-input address-picker" mode="region" bindchange="bindRegionChange" value="{{region}}" custom-item="{{customItem}}">
-          <view class="picker-choose">
-            
-          </view>
+				<picker
+				 class="address-input address-picker"
+				 mode="region"
+				 bindchange="bindRegionChange"
+				 value="{{region}}"
+				 custom-item="{{customItem}}"
+				>
+					<view class="picker-choose" />
 				</picker>
 			</view>
 			<view class="address-section">
-        <input class="address-input address-detail" placeholder="请输入路名门牌号"></input>
+				<input class="address-input address-detail" placeholder="请输入路名门牌号" />
 			</view>
 		</block>
 		<block>
@@ -29,7 +33,7 @@
 						{{addressInfo.provinceName}} {{addressInfo.cityName}} {{addressInfo.countyName}} {{addressInfo.detailInfo}}
 					</view>
 					<view class="arrow-right-wrap">
-            <image class="arrow-right" src="/assets/imgs/7_1_0/arrow-right.png"></image>
+						<image class="arrow-right" src="/assets/imgs/7_1_0/arrow-right.png" />
 					</view>
 				</view>
 			</view>
@@ -39,61 +43,48 @@
 		</view>
 	</view>
 	<view class="address-line">
-    <image src="/assets/imgs/7_1_0/address-line.png"></image>
+		<image src="/assets/imgs/7_1_0/address-line.png" />
 	</view>
 	<!-- 分割线 -->
-  <view class="gray-line"></view>
+	<view class="gray-line" />
 	<!-- 商品列表 -->
 	<view class="pro-wrap">
+		<block wx:for="{{currentOrderList}}" wx:key="{{item}}">
 			<view class="pro-list">
-        <image class="pro-img" src="/assets/imgs/7_1_0/address-line.png"></image>
-        <view class="pro-info">
-          <view class="pro-name">商品名称商品名称商品名称商品名称商品名称商品名称商品名称商品名称商品名称商品名</view>
-          <view class="pro-desc">
-            规格
-          </view>
-          <view class="pro-price">
-            <text class="price">￥258</text>
-            <text class="number">x 1</text>
-          </view>
-        </view>
-      </view>
-
-      <view class="pro-list">
-        <image class="pro-img" src="/assets/imgs/7_1_0/address-line.png"></image>
+				<image class="pro-img" src="{{item.productImgUrl}}" />
 				<view class="pro-info">
-          <view class="pro-name">商品名称商品名称商品名称商品名称商品名称商品名称商品名称商品名称商品名称商品名</view>
+					<view class="pro-name">{{item.productName}}</view>
 					<view class="pro-desc">
-            规格
+						规格 {{item.skuSpec}}
 					</view>
 					<view class="pro-price">
-            <text class="price">￥258</text>
-            <text class="number">x 1</text>
+						<text class="price">￥{{item.price}}</text>
+						<text class="number">x {{item.count}}</text>
 					</view>
 				</view>
 			</view>
+		</block>
 	</view>
 	<!-- 分割线 -->
-  <view class="gray-line"></view>
-
+	<view class="gray-line" />
 
 	<!-- 商品合计 -->
 	<view class="pro-sum">
 		<view class="plus-wrap">
 			<view class="plus-top-text">
-        <image src="/assets/imgs/7_1_0/plus-icon.png"></image>
+				<image src="/assets/imgs/7_1_0/plus-icon.png" />
 				<text>现在勾选</text>
 			</view>
 			<view class="plus-bottom-text">
 				<text>vip可尊享N大权益</text>
-        <image src="/assets/imgs/7_1_0/explain.png"></image>
+				<image src="/assets/imgs/7_1_0/explain.png" />
 			</view>
 			<view class="select-desc {{isSelect ? 'select-tip' : 'unselect-tip'}}">
 				<!-- <image src="{{isSelect ? '/assets/imgs/7_1_0/selected.png' : '/assets/imgs/7_1_0/unselect.png'}}" class="{{isSelect ? 'select-tip' : 'unselect-tip'}}"></image> -->
 				<text>{{isSelect ? '已勾选，即享优惠' : '勾选开通'}}</text>
 			</view>
 			<view class="select-type {{isSelect ? 'theme-color' : ''}}">
-          <image src="{{isSelect ? '/assets/imgs/7_1_0/tick-success.png' : '/assets/imgs/7_1_0/tick.png'}}"></image>
+				<image src="{{isSelect ? '/assets/imgs/7_1_0/tick-success.png' : '/assets/imgs/7_1_0/tick.png'}}" />
 			</view>
 		</view>
 		<view class="order-sum">
@@ -115,7 +106,7 @@
 					<text class="price-label">优惠券</text>
 					<view class="select-coupon" bindtap="selectCoupon">
 						<text class="{{haveCoupon ? 'coupon-price' : 'no-coupon'}}">{{haveCoupon ? '-￥100' : '无可用优惠券'}}</text>
-            <image class="arrow-right" src="/assets/imgs/7_1_0/arrow-right.png"></image>
+						<image class="arrow-right" src="/assets/imgs/7_1_0/arrow-right.png" />
 					</view>
 				</view>
 			</view>
@@ -125,7 +116,7 @@
 					<text class="vip-desc"> （不可使用任何优惠或积分）</text>
 					<view class="select-coupon">
 						<text class="coupon-price">+￥100</text>
-            <image class="arrow-right" src="/assets/imgs/7_1_0/arrow-right.png"></image>
+						<image class="arrow-right" src="/assets/imgs/7_1_0/arrow-right.png" />
 					</view>
 				</view>
 			</view>
@@ -141,10 +132,9 @@
 			<text class="cost-label">实付款：</text>
 			<text class="cost-price">￥306</text>
 		</view>
-    <view class="theme-color buy-btn">立即购买</view>
+		<view class="theme-color buy-btn" bindtap="handelGobuy">立即购买</view>
 	</view>
 </view>
 
-<select-coupon
- show="{{showSelectCoupon}}"
-/>
+<select-coupon show="{{showSelectCoupon}}" />
+
\ No newline at end of file

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
 				},
 				{