shish %!s(int64=2) %!d(string=hai) anos
pai
achega
30c7eef4dd

+ 1 - 1
hdApp/src/admin/clear/info.vue

@@ -179,7 +179,7 @@ export default {
 			let that = this
 			detail({ id:info.id }).then(res => {
 				if(res.code == 1) {
-					that.pageTo({ url: '/pagesPurchase/gatherPay?orderSn=' + res.data.orderSn + '&actPrice=' + res.data.actPrice+'&remainSecond='+res.data.remainSecond})
+					that.pageTo({ url: '/pagesPurchase/gatherPay?orderSn=' + res.data.orderSn + '&actPrice=' + res.data.actPrice+'&remainSecond='+res.data.remainSecond+'&id='+res.data.id})
 				}
 			})
 		},

+ 4 - 2
hdApp/src/pagesPurchase/gatherPay.vue

@@ -51,6 +51,7 @@ export default {
       },
       psdKey: '',
       orderSn: '',
+      id:0,
       actPrice: '',
       getPayType:1,
       hasRequestApi:false,
@@ -59,6 +60,7 @@ export default {
   },
   onLoad (options) {
     this.orderSn = options.orderSn
+    this.id = options.id ? options.id : 0
     this.actPrice = options.actPrice
     this.getPayType = options.getPayType
     this.orderTime = options.remainSecond - 10 > 0 ? (options.remainSecond - 10) : 0
@@ -72,7 +74,7 @@ export default {
     if(that.needCheck == 1){
       that.needCheck = 0
       that.$util.confirmModal({content:'已付款成功?',okText:'是的',cancelText:'没有'},() => {
-        that.pageTo({ url: '/pagesPurchase/gatherResult', type: 2 })
+        that.pageTo({ url: '/pagesPurchase/gatherResult?id='+that.id, type: 2 })
       })
     }
   },
@@ -196,7 +198,7 @@ export default {
     },
     getSuccess () {
       let that = this
-      that.pageTo({ url: '/pagesPurchase/gatherResult', type: 2 })
+      that.pageTo({ url: '/pagesPurchase/gatherResult?id='+that.id, type: 2 })
     },
     getError () {
     },

+ 14 - 5
hdApp/src/pagesPurchase/gatherResult.vue

@@ -5,8 +5,9 @@
       <view class="result-view">
         <view :class="['iconfont', 'iconchenggong']"></view>
         <view class="result-title">支付成功</view>
-        <button class="admin-button-com big" @click="goClose()">返回首页</button>
-        <view style="margin-top:60upx;font-size:32upx;" @click="goClearRemind()">如何查看还有几个待结订单?</view>
+        <button class="admin-button-com big" @click="getDetail()">订单详情</button>
+        <button class="admin-button-com big" @click="goBack()" style="margin-top:30upx;">返回</button>
+        <view style="margin-top:60upx;font-size:32upx;" @click="goClearRemind()">如何知道我还有多少待结账?</view>
       </view>
     </view>
   </view>
@@ -14,15 +15,23 @@
 <script>
 export default {
   name: "AppResult",
+	data() {
+		return {
+			id:0
+		}
+	},
   methods: {
-    goClose () {
-      this.pageTo({ url: "/admin/home/workbench", type: 3})
+    getDetail(){
+      this.pageTo({ url: "/admin/clear/info?id="+this.id,type:2})
+    },
+    goBack () {
+      uni.navigateBack()
     },
     goClearRemind() {
       this.pageTo({ url: "/admin/order/clearRemind"})
     },
     init(){
-
+      this.id = this.option.id ? this.option.id : 0
     }
   },
 };

+ 1 - 1
hdApp/src/pagesPurchase/gathering.vue

@@ -195,7 +195,7 @@ export default {
                 that.pageTo({ url: '/admin/clear/list', type: 2})
               })              
             }else{
-              that.pageTo({ url: '/pagesPurchase/gatherPay?orderSn=' + res.data.orderSn + '&actPrice=' + res.data.actPrice+'&remainSecond='+res.data.remainSecond+'&getPayType='+res.data.getPayType, type: 2 })
+              that.pageTo({ url: '/pagesPurchase/gatherPay?orderSn=' + res.data.orderSn + '&actPrice=' + res.data.actPrice+'&remainSecond='+res.data.remainSecond+'&getPayType='+res.data.getPayType+'&id='+res.data.id, type: 2 })
             } 
           }
         })