Merge branch 'develop' of https://hel.hand-china.com/xugong/hls-xcmg-vue-app into develop

src/pages/pay/marginPay/first-pay.vue

@@ -30,14 +30,14 @@
               <CurrencyInput v-model="money" type="number" placeholder="请输入支付金额" />
               <!-- <div @click="createOrder">
                 <img src="@/assets/payment/into.png" >
-              </div> -->
+              </div>-->
             </div>
           </div>
         </div>
         <div class="write">
           <div class="box">
             <span>备注</span>
-            <textarea placeholder="请输入您的备注……" />
+            <textarea v-model="pay_note" placeholder="请输入您的备注……" />
           </div>
         </div>
       </section>
@@ -53,7 +53,7 @@
       </div>
     </h-content>
     <bottom-tab>
-      <tab-button class="footer" @click.native="toPayEntry(money)">支&nbsp;&nbsp;付</tab-button>
+      <tab-button class="footer" @click.native="putOrder(money)">提交订单</tab-button>
     </bottom-tab>
   </h-view>
 </template>
@@ -69,25 +69,40 @@ export default {
     return {
       money: 0,
       default: 0,
+      pay_note: '', // 备注
     }
   },
   beforeRouteEnter (to, from, next) {
-    next(vm => {
-    })
+    next(vm => {})
   },
   computed: {},
   watch: {},
   methods: {
-
-    toPayEntry (money) {
-      this.$router.push({
-        name: 'MarginPayEntry',
-        params: {
-          money,
+    putOrder (money) {
+      let vm = this
+      let url = process.env.basePath + 'create_order_agent_amt'
+      let param = {
+        info: {
+          bp_id: window.localStorage.bp_id,
+          amount: money,
+          pay_note: this.pay_note,
         },
+      }
+      vm.hlsPopup.showLoading('请稍候')
+      vm.hlsHttp.post(url, param).then(function (res) {
+        vm.hlsPopup.hideLoading()
+        if (res.result === 'S') {
+          this.$router.push({
+            name: 'MarginPayEntry',
+            params: {
+              order_id: res.order_id,
+              money,
+            },
+          })
+        }
       })
     },
-
+    toPayEntry (money) {},
   },
 }
 </script>
@@ -97,7 +112,7 @@ export default {
     width: 96%;
     height: 172px;
     background-color: #fff;
-    margin-top:10px;
+    margin-top: 10px;
     box-shadow: 0 1px 3px 2px rgba(168, 168, 168, 0.14);
     span {
       font-family: PingFangSC-Regular;
@@ -119,7 +134,7 @@ export default {
       }
     }
   }
-   .top-head {
+  .top-head {
     width: 100%;
     height: 142px;
     background: url("../../../assets/payment/back1.png");

src/pages/pay/payment/pay-entry.vue

@@ -258,7 +258,7 @@ export default {
       })
     },
     affirm () {
-     // this.confirm = true
+      // this.confirm = true
       this.confirmToPay()
     },
     confirmToPay (e) {

src/router/index.js

@@ -244,8 +244,8 @@ export default new Router({
     {path: '/new-list', component: NewList, name: 'NewList', meta: {keepAlive: true}},
     {path: '/payment-contract-record', component: PaymentContractRecord, name: 'PaymentContractRecord', meta: {keepAlive: true}},
     // 保证金支付
-    {path: '/margin-first-pay', component: MarginFirstPay, name: 'MarginFirstPay', meta: {keepAlive: true}},
-    {path: '/margin-pay-entry', component: MarginPayEntry, name: 'MarginPayEntry', meta: {keepAlive: true}},
+    {path: '/margin-first-pay', component: MarginFirstPay, name: 'MarginFirstPay', meta: {keepAlive: false}},
+    {path: '/margin-pay-entry', component: MarginPayEntry, name: 'MarginPayEntry', meta: {keepAlive: false}},
     // 支付页
     {path: '/pay-page', component: PayPage, name: 'PayPage', meta: {keepAlive: false}},
     // 产品查询