Merge branch 'liuxin' into develop

src/pages/pay/pay-page.vue

@@ -2,7 +2,7 @@
   <h-view id="pay-page" class="public-style">
     <h-header :proportion="[5,1,1]" class="bar-custom">
       <div slot="left" class="h-header-btn">
-        <img src="@/assets/userBind/arrow.png" @click="changePage">
+        <img src="@/assets/userBind/arrow.png" @click="changePage" >
         <span>支付中心</span>
       </div>
     </h-header>
@@ -16,19 +16,19 @@
             <list-item :item-height="30">
               <item>
                 <div slot="name" class="name">时间</div>
-                <div slot="content">{{ date }}</div>
+                <div slot="content">{{ info.order_date }}</div>
               </item>
               <item>
                 <div slot="name" class="name">姓名</div>
-                <div slot="content">{{ userName }}</div>
+                <div slot="content">{{ info.pay_amount_name }}</div>
               </item>
               <item>
                 <div slot="name" class="name">订单号</div>
-                <div slot="content">{{ money|orderNum }}</div>
+                <div slot="content">{{ info.order_number }}</div>
               </item>
               <item>
                 <div slot="name" class="name">还款金额</div>
-                <div slot="content">{{ money|currency }}</div>
+                <div slot="content">{{ info.orderamount|currency }}</div>
               </item>
             </list-item>
           </div>
@@ -43,19 +43,19 @@
             <list-item :item-height="30">
               <item>
                 <div slot="name" class="name">时间</div>
-                <div slot="content">{{ date }}</div>
+                <div slot="content">{{ info.order_date }}</div>
               </item>
               <item>
                 <div slot="name" class="name">姓名</div>
-                <div slot="content">{{ userName }}</div>
+                <div slot="content">{{ info.pay_amount_name }}</div>
               </item>
               <item>
                 <div slot="name" class="name">订单号</div>
-                <div slot="content">{{ money|orderNum }}</div>
+                <div slot="content">{{ info.order_number }}</div>
               </item>
               <item>
                 <div slot="name" class="name">还款金额</div>
-                <div slot="content">{{ money|currency }}</div>
+                <div slot="content">{{ info.orderamount|currency }}</div>
               </item>
             </list-item>
           </div>
@@ -73,7 +73,11 @@ export default {
       name: '',
       url: '',
       info: {
-
+        order_number: '',
+        pay_amount_name: '',
+        order_date: '',
+        orderamount: '',
+        order_id: '',
       },
       showSelect: false,
       showpay: true,
@@ -115,7 +119,7 @@ export default {
       vm.$post(url, param).then(function (res) {
         vm.hlsPopup.hideLoading()
         if (res.result === 'S') {
-
+          Object.assign(vm.info, res.info)
         } else {
           hlsPopup.showLongCenter(res.message)
         }
@@ -131,6 +135,7 @@ export default {
       vm.$post(url, param).then(function (res) {
         vm.hlsPopup.hideLoading()
         if (res.result === 'S') {
+          vm.getDetail()
           if (res.return_code !== '0000') {
             vm.isFaild = true
             vm.isSuccess = false
@@ -150,17 +155,17 @@ export default {
 </script>
 <style lang="less">
 #pay-page {
-  .box{
+  .box {
     display: flex;
     justify-content: center;
     align-items: center;
-    flex-wrap:wrap;
+    flex-wrap: wrap;
   }
-  button{
+  button {
     color: #fff;
     background-color: @headerColor;
-    width:50%;
-    height:40px;
+    width: 50%;
+    height: 40px;
     border-radius: 5px;
   }
   .my-content {
@@ -208,7 +213,7 @@ export default {
       }
     }
   }
-  .content{
+  .content {
     background-color: #fff;
   }
 }