123

src/pages/pay/index.vue

@@ -34,7 +34,8 @@
 </template>
 
 <script>
-import { createFriendlyDayOrder, createBrickDayOrder } from '@/api';
+import { createFriendlyDayOrder, createBrickDayOrder, createPay, createMeritBoxOrder } from '@/api';
+import { requestPayment } from '@/common/wechat-web';
 
 export default {
     components: {
@@ -42,7 +43,7 @@ export default {
     data(){
         return {
             query: this.$route.query,
-            payType: 0
+            payType: '1'
         }
     },
     methods: {
@@ -53,7 +54,9 @@ export default {
                     ...this.query,
 
                 }
-                return createFriendlyDayOrder(request)
+                const order = await createFriendlyDayOrder(request)
+                this.onPayment(order)
+                return
             }
             // 创建填砖加瓦订单
             if(this.query.goods_type === '-2'){
@@ -61,8 +64,20 @@ export default {
                     ...this.query,
 
                 }
-                return createBrickDayOrder(request)
-                 
+                const order = await createBrickDayOrder(request)
+                this.onPayment(order)
+                return  
+            }
+
+            // 创建功德箱订单
+            if(this.query.from === 'meritBox'){
+                const request = {
+                    temple_id: this.query.temple_id,
+                    price: this.query.amount
+                }
+                const order = await createMeritBoxOrder(request)
+                this.onPayment(order)
+                return  
             }
 
             // const request = {
@@ -71,6 +86,19 @@ export default {
 
             // createCommonOrder(request)
 
+        },
+        async onPayment(order){
+            console.log(order)
+            const result = await createPay(order.id);
+            const payResult = await requestPayment(result)
+            console.log(payResult)
+            this.$router.push({
+                name: 'pay-result',
+                query: {
+                    ...result,
+                    ...payResult
+                }
+            })
         }
     }
 }