From 34703a7672c876bc05320083bb8e836d07175cdd Mon Sep 17 00:00:00 2001
From: BigBoss <2280520255@qq.com>
Date: Mon, 8 Jun 2020 21:00:37 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E9=80=BB=E8=BE=91=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/myOrder/components/OrderCard.vue |  16 ++-
 src/pages/myOrder/myOrder.vue              |  14 ++-
 src/pages/myOrderPaying/myOrderPaying.vue  | 183 ++++++++++++++++-------------
 src/store/modules/statusConfirm.js         |  14 +--
 4 files changed, 122 insertions(+), 105 deletions(-)

diff --git a/src/pages/myOrder/components/OrderCard.vue b/src/pages/myOrder/components/OrderCard.vue
index 29d5ada..83fc7d4 100644
--- a/src/pages/myOrder/components/OrderCard.vue
+++ b/src/pages/myOrder/components/OrderCard.vue
@@ -65,7 +65,7 @@
         class="btns"
         v-if="status == '2'"
       >
-        <view class="btn-type2">再次购买</view>
+        <view class="btn-type2" @click="toDetail">再次购买</view>
       </view>
       <!-- 	<view class="btns" v-if="status == '3'">
 				<view class="btn-type2">再次购买</view>
@@ -73,7 +73,7 @@
 		</view>
 		<view class="card" v-if="current == '10'" @click="toOrderInfo(status,order.pay_id)">
 			<view class="cardHeader">
-				<text class="orderId" v-if="status == '0'||status == '1'">订单号：{{order.mch_id}}</text>
+				<text class="orderId" v-if="status == '0'||status == '1'">订单号：{{order.pay_id}}</text>
 				<text class="orderId" v-if="status == '2'||status == '3'">下单时间：{{order.pay_time}}</text>
 				<text class="orderType" v-if="status=='0'">待付款</text>
 				<text class="orderType" v-if="status=='1'">待收货</text>
@@ -100,7 +100,7 @@
 				<view class="btn-type2">确认收货</view>
 			</view>
 			<view class="btns" v-if="status == '2'||status == '3'">
-				<view class="btn-type2">再次购买</view>
+				<view class="btn-type2" @click="toDetail(order.order_info[0].pid)">再次购买</view>
 			</view>
 			<!-- <view class="btns" v-if="status == '3'">
 
@@ -124,7 +124,7 @@
 			
 		},
 		created() {
-			console.log(this.order);
+			console.log('order',this.order);
 			// console.log(this.order.status );
 			// console.log(this.current);
 		},
@@ -133,7 +133,6 @@
 				return this.order.status
 			},
 			orderInfoList(){
-				console.log('orderInfoList', this.order.order_info)
 				return this.order.order_info
 			}
 		},
@@ -142,6 +141,13 @@
 			};
 		},
 		methods:{
+			toDetail(pid){
+				console.log('pid',pid)
+				uni.navigateTo({
+					url: '../details/details?pid='+pid,
+					fail: (res) => {console.log(res)},
+				});
+			},
 			toRefundment(){
 				uni.navigateTo({
 					url: '../refundment/refundment',
diff --git a/src/pages/myOrder/myOrder.vue b/src/pages/myOrder/myOrder.vue
index f14d133..f66e37c 100644
--- a/src/pages/myOrder/myOrder.vue
+++ b/src/pages/myOrder/myOrder.vue
@@ -48,7 +48,7 @@ export default {
         { current: "10", text: "全部" },
         { current: "0", text: "待付款" },
         { current: "1", text: "待收货" },
-        { current: "2", text: "待评价" }
+        { current: "2", text: "已完成" }
         // {current:"3",text:'已评价'},
         // {current:"4",text:'退款'},
       ],
@@ -57,11 +57,16 @@ export default {
     };
   },
 
+onShow() {
+	store.dispatch("myOrder/getList", {
+	  way: ""
+	});
+},
   onLoad: function(option) {
     // 获取订单列表
-    store.dispatch("myOrder/getList", {
-      way: ""
-    });
+    // store.dispatch("myOrder/getList", {
+    //   way: ""
+    // });
     // 从user过来传的status，给current，以显示对应item
     this.current = option.status;
   },
@@ -74,7 +79,6 @@ export default {
   methods: {
     // tab点击事件
     onClickItem(e) {
-      console.log("onClickItem", e);
       if (this.current !== e) {
         this.current = e;
       }
diff --git a/src/pages/myOrderPaying/myOrderPaying.vue b/src/pages/myOrderPaying/myOrderPaying.vue
index f049325..b4f3cd0 100644
--- a/src/pages/myOrderPaying/myOrderPaying.vue
+++ b/src/pages/myOrderPaying/myOrderPaying.vue
@@ -125,12 +125,13 @@
 </template>
 
 <script>
-import store from "@/store";
+import store from "@/store";
+import MD5Util from '../../utils/md5'
 import UniCountdown from "../../components/UniCountdown/UniCountdown.vue";
 export default {
   components: {
     UniCountdown
-  },
+  },
   data() {
     return {
       payId: "",
@@ -140,7 +141,8 @@ export default {
       openid: "",
       lefttime: 0,
       isPay: 0,
-	  orderInfo:Object
+	  orderInfo:Object,
+	  totalPrice:0,
     };
   },
   onLoad:async function ({payId,status,isPay}) {
@@ -157,8 +159,9 @@ export default {
       uid: uid,
       openid: openid
     });
-	console.log(this.$store.state.orderRead.orderInfo)
-    this.orderInfo = this.$store.state.orderRead.orderInfo
+	// console.log(this.$store.state.orderRead.orderInfo)
+    this.orderInfo = this.$store.state.orderRead.orderInfo
+	this.totalPrice = this.orderInfo.total_fee
   },
   // 若从支付页面跳转过来，返回直接返回到首页
   onBackPress(option) {
@@ -226,76 +229,79 @@ export default {
     },
     paylog() {
 		console.log('pay',this.orderInfo)
-		//   const { data, exKeyName: keyName } = res
-		//   const uid = uni.getStorageSync('uid')
-		//   const timeStamp = new Date().getTime().toString()
-		//   const nonceStr = 'asfafasfasfasfasf'
-		//   // 支付参数
-		//   const fieldSet = {
-		//     openid: this.$store.state.user.userInfo.openid,
-		//     uid: this.$store.state.user.userInfo.uid,
-		//     shopid: 0,
-		//     payCate: 2020,
-		//     payMoney: this.totalPrice,
-		//     payWoodId: `fcdj-${uid}-${keyName}`,
-		//     payWoodDesc: '在【非常戴镜】的微信付款凭证',
-		//     nonceStr,
-		//     signType: 'MD5',
-		//     app_uid: 2020,
-		//     timeStamp,
-		//     keyname: keyName,
-		//     billInfo: JSON.stringify(data),
-		//   }
-		//   // 请求后台支付接口
-		//   store.dispatch('order/pay', fieldSet).then(({ data, data2, pay_id: payId }) => {
-		//     if (data.return_code === 'SUCCESS' && data.result_code === 'SUCCESS') {
-		//       const stringA = `appId=wx115b25aa396d27ac&nonceStr=${nonceStr}&package=prepay_id=${data.prepay_id}&signType=MD5&timeStamp=${timeStamp}`
-		//       const stringSignTemp = stringA + '&key=NewMoney2017hatemydaddy123456789'
+		  const { data, exKeyName: keyName } = this.orderInfo
+		  const uid = uni.getStorageSync('uid')
+		  const timeStamp = new Date().getTime().toString()
+		  const nonceStr = 'asfafasfasfasfasf'
+		  // 支付参数
+		  const fieldSet = {
+		    openid: this.$store.state.user.userInfo.openid,
+		    uid: this.$store.state.user.userInfo.uid,
+		    shopid: 0,
+		    payCate: 2020,
+		    payMoney: this.totalPrice,
+		    payWoodId: `fcdj-${uid}-${keyName}`,
+		    payWoodDesc: '在【非常戴镜】的微信付款凭证',
+		    nonceStr,
+		    signType: 'MD5',
+		    app_uid: 2020,
+		    timeStamp,
+		    keyname: keyName,
+		    billInfo: JSON.stringify(data),
+		  }
+		  // 请求后台支付接口
+		  store.dispatch('order/pay', fieldSet).then(({ data, data2, pay_id: payId }) => {
+		    if (data.return_code === 'SUCCESS' && data.result_code === 'SUCCESS') {
+		      const stringA = `appId=wx115b25aa396d27ac&nonceStr=${nonceStr}&package=prepay_id=${data.prepay_id}&signType=MD5&timeStamp=${timeStamp}`
+		      const stringSignTemp = stringA + '&key=NewMoney2017hatemydaddy123456789'
 		
-		//       // 微信支付接口
-		//       uni.requestPayment({
-		//         appId: data.appid,
-		//         timeStamp,
-		//         nonceStr,
-		//         total_fee: this.totalPrice,
-		//         package: `prepay_id=${data.prepay_id}`,
-		//         signType: 'MD5',
-		//         paySign: MD5Util.MD5(stringSignTemp).toUpperCase(),
-		//         success: (res) => {
-		//           // 支付成功
-		//           uni.showModal({
-		//             content: '支付成功',
-		//             showCancel: false,
-		//           })
-		//           // 跳转订单详情页->状态 待收货
-		//           uni.reLaunch({
-		//             url: `../myOrderPaying/myOrderPaying?payId=${payId}&status=1&isPay=1`,
-		//           })
-		//         },
-		//         fail: (res) => {
-		//           // 支付失败
-		//           uni.showModal({
-		//             content: '支付失败',
-		//             showCancel: false,
-		//           })
-		//           // 跳转订单详情页->状态 待付款
-		//           uni.reLaunch({
-		//             url: `../myOrderPaying/myOrderPaying?payId=${payId}&status=0&isPay=1`,
-		//           })
-		//         },
-		//         complete: () => {
-		//           uni.hideLoading()
-		//         },
-		//       })
-		//     } else {
-		//       uni.showModal({
-		//         content: '支付失败',
-		//         showCancel: false,
-		//       })
-		//       console.log('支付失败')
-		//       uni.hideLoading()
-		//     }
-		//   })
+		      // 微信支付接口
+		      uni.requestPayment({
+		        appId: data.appid,
+		        timeStamp,
+		        nonceStr,
+		        total_fee: this.totalPrice,
+		        package: `prepay_id=${data.prepay_id}`,
+		        signType: 'MD5',
+		        paySign: MD5Util.MD5(stringSignTemp).toUpperCase(),
+		        success: (res) => {
+		          // 支付成功
+		          uni.showModal({
+		            content: '支付成功',
+		            showCancel: false,
+		          })
+		          // 跳转订单详情页->状态 待收货
+		          uni.reLaunch({
+		            url: `../myOrderPaying/myOrderPaying?payId=${payId}&status=2&isPay=1`,
+		          })
+		        },
+		        fail: (res) => {
+		          // 支付失败
+		          uni.showModal({
+		            content: '支付失败',
+		            showCancel: false,
+		          })
+		          // 跳转订单详情页->刷新本页面
+				  uni.redirectTo({
+				  	url: `../myOrderPaying/myOrderPaying?payId=${payId}&status=1&isPay=1`,
+				  })
+		        },
+		        complete: () => {
+		          uni.hideLoading()
+		        },
+		      })
+		    } else {
+		      uni.showModal({
+		        content: '支付失败',
+		        showCancel: false,
+		      })
+		      console.log('支付失败')
+		      uni.hideLoading()
+			  uni.redirectTo({
+				url: `../myOrderPaying/myOrderPaying?payId=${payId}&status=1&isPay=1`,
+			  })
+		    }
+		  })
 		
 		//修改订单状态 待付款==>待收货
 		store.dispatch("statusConfirm/confirm", {
@@ -308,9 +314,9 @@ export default {
 		    orderInfo: this.orderInfo.order_info
 		  })
 		  .then(
-		    setTimeout(() => {
-		      uni.navigateBack();
-		    }, 1500)
+		    // setTimeout(() => {
+		    //   uni.navigateBack();
+		    // }, 1500)
 		  );
 	},
     confirmOrder() {
@@ -325,11 +331,24 @@ export default {
           judgeContent: "",
           orderInfo: this.orderInfo.order_info
         })
-        .then(
-          setTimeout(() => {
-            uni.navigateBack();
-          }, 1500)
-        );
+        .then((res)=>{
+			if(res.data.code === 1){
+				uni.showToast({
+					title:'已确认',
+					mask:true,
+					duration:1500,
+					icon:'success'
+				})
+			}else{
+				uni-uni.showToast({
+					title: '服务器错误，确认失败!',
+					mask:true
+				});
+			}
+			setTimeout(() => {
+			  uni.navigateBack();
+			}, 1500)
+		});
     }
   },
   filters: {
diff --git a/src/store/modules/statusConfirm.js b/src/store/modules/statusConfirm.js
index 90ba15d..69ff24b 100644
--- a/src/store/modules/statusConfirm.js
+++ b/src/store/modules/statusConfirm.js
@@ -13,19 +13,7 @@ const actions = {
         data: param|| { },
 			success: (res) => {
 			console.log(res.data);
-			if(res.data.code === 1){
-				uni.showToast({
-					title:'已确认',
-					mask:true,
-					duration:1500,
-					icon:'success'
-				})
-			}else{
-				uni-uni.showToast({
-					title: '服务器错误，确认失败!',
-					mask:true
-				});
-			}
+			
 		},
     })
   }
-- 
2.0.0