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

src/pages/order/order.js

@@ -60,6 +60,10 @@ wxService.page({
   onShow: function () {
     this.initOrderList(this.data.pageNo, this.data.pageSize, this.data.trade)
   },
+  // 确认收货
+  handelConfirmReceipt() {
+
+  },
   handelDetail(e) {
     // const {detail} = e.currentTarget.dataset
     const { id } = e.currentTarget.dataset

src/pages/order/order.wxml

@@ -61,11 +61,20 @@
 					</view>
 				</view>
 				<view class="btn-group">
-					<button class="btn btn-sm btn-primary btn-outline ">立即支付</button>
-					<button class="btn btn-sm btn-default ">查看物流</button>
-					<button class="btn btn-sm btn-default ">确认收货</button>
-					<button class="btn btn-sm btn-primary btn-outline ">再来一单</button>
-					<button class="btn btn-sm btn-default ">删除订单</button>
+					<text class="order-status" wx-if="{{item.status == 'C'}}">
+						<button class="btn btn-sm btn-default">删除订单</button></text>
+					<text class="order-status" wx-if="{{item.status == 'N'}}">
+					<button class="btn btn-sm btn-primary btn-outline">立即支付</button>
+					</text>
+					<text class="order-status" wx-if="{{item.status == 'P'}}">
+					<button class="btn btn-sm btn-default">查看物流</button>
+					</text>
+					<text class="order-status" wx-if="{{item.status == 'D'}}">
+					<button class="btn btn-sm btn-default">查看物流</button>
+					</text>
+					<button class="btn btn-sm btn-default" bindtap="handelConfirmReceipt">确认收货</button>
+					<text class="order-status" wx-if="{{item.status == 'R'}}"/>
+					<!--<button class="btn btn-sm btn-primary btn-outline ">再来一单</button>-->
 				</view>
 			</view>
 		</block>

src/pages/orderDetail/orderDetail.js

@@ -23,7 +23,7 @@ wxService.page({
    * 生命周期函数--监听页面显示
    */
   onShow: function () {
-    const {id} = this.options
+    const { id } = this.options
     let detailOrderList = wx.getStorageSync('orderList')
     let currentDetail = detailOrderList.filter(item => item.id == id)
 
@@ -32,6 +32,18 @@ wxService.page({
       detail: currentDetail[0]
     })
   },
+  // 删除订单
+  handelDelOrder() {
+    console.log('删除订单')
+  },
+  // 立即支付
+  handelToPay() { console.log('立即支付') },
+  // 取消订单
+  handelCancelOrder() { console.log('取消订单') },
+  // 申请退款
+  handelRequestRefund() { console.log('申请退款') },
+  // 确认收货
+  handelConfirmReceipt() { console.log('确认收货') },
   copy(e) {
     wx.setClipboardData({
       //准备复制的数据

src/pages/orderDetail/orderDetail.wxml

-
 <view class="page-order-detail">
 	<view class="header-wrap" style="background-image:url('/assets/imgs/7_1_0/rf_bgc.jpg')">
 		<view class="refund-status">
@@ -48,7 +47,7 @@
 	<view class="pro-wrap">
 		<block wx:for="{{detail.skuVOList}}" wx:for-item="item" wx:key="">
 			<view class="pro-list">
-        <image class="pro-img" src="{{item.mainImgUrl}}"></image>
+				<image class="pro-img" src="{{item.mainImgUrl}}" />
 				<view class="pro-info">
 					<view class="pro-name">{{item.productName}}</view>
 					<view class="pro-desc">
@@ -100,23 +99,21 @@
 	</view>
 	<!-- 底部按钮 -->
 	<view class="button-wrap" wx-if="{{detail.status == 'C'}}">
-    <button class="btn btn-primary btn-lg">删除订单</button>
+		<button class="btn btn-primary btn-lg" bindtap="handelDelOrder">删除订单</button>
 	</view>
 	<view class="button-wrap" wx-if="{{detail.status == 'N'}}">
-    <button class="btn btn-primary btn-lg">立即支付</button>
-    <button class="btn btn-lg btn-gray">取消订单</button>
+		<button class="btn btn-primary btn-lg" bindtap="handelToPay">立即支付</button>
+		<button class="btn btn-lg btn-gray" bindtap="handelCancelOrder">取消订单</button>
 	</view>
 	<view class="button-wrap" wx-if="{{detail.status == 'P'}}">
-    <button class="btn btn-lg btn-gray">申请退款</button>
+		<button class="btn btn-lg btn-gray" bindtap="handelRequestRefund">申请退款</button>
 	</view>
 	<view class="button-wrap" wx-if="{{detail.status == 'D'}}">
-    <button class="btn btn-primary btn-lg">申请退款</button>
-    <button class="btn btn-lg btn-gray">确认收货</button>
+		<button class="btn btn-primary btn-lg" bindtap="handelRequestRefund">申请退款</button>
+		<button class="btn btn-lg btn-gray" bindtap="handelCancelOrder">确认收货</button>
 	</view>
 	<view class="button-wrap" wx-if="{{detail.status == 'R'}}">
-    <button class="btn btn-lg btn-gray">申请退款</button>
+		<button class="btn btn-lg btn-gray" bindtap="handelConfirmReceipt">申请退款</button>
 	</view>
 </view>
 
-
-

src/project.config.json

@@ -39,7 +39,7 @@
 			"list": []
 		},
 		"miniprogram": {
-			"current": 36,
+			"current": 25,
 			"list": [
 				{
 					"id": -1,
@@ -203,10 +203,10 @@
 					"scene": null
 				},
 				{
-					"id": -1,
+					"id": 25,
 					"name": "订单详情",
 					"pathName": "pages/orderDetail/orderDetail",
-					"query": "",
+					"query": "id=613402110104571904",
 					"scene": null
 				},
 				{