no-message

src/views/Forestage/Order/index.vue

@@ -23,17 +23,22 @@
 		</div>
 
     <order-sett ref="orderSett" :orderId="orderId" :userInfo="userInfo" @order-success="getList"></order-sett>
+
+    <order-detail ref="orderDetail" :orderDetail="orderDetail" :userInfo="userInfo"></order-detail>
+    <balance-tip ref="balanceTip" :orderDetail="orderDetail"></balance-tip>
   </div>
 </template>
 
 <script>
-import { ordercreat, orderlist } from '@/api/order.js'
+import { ordercreat, orderlist, orderDetail } from '@/api/order.js'
 import tools from '@/utils/tools.js'
 import OrderSett from '@/views/Forestage/Tourism/order-sett.vue'
+import OrderDetail from '@/views/Forestage/Tourism/order-detail.vue'
+import BalanceTip from '@/views/Forestage/Tourism/balance-tip.vue'
 import { userInfo } from '@/api/member'
 export default {
   name: 'Order',
-  components: { OrderSett },
+  components: { OrderSett, OrderDetail, BalanceTip },
   data () {
     return {
       page: 1,
@@ -42,7 +47,9 @@ export default {
       total: 0,
       lang: 'en',
       orderId: '',
-      userInfo: {}
+      userInfo: {},
+
+      orderDetail: {}
     }
   },
   mounted () {
@@ -88,10 +95,10 @@ export default {
       }
     },
 
-    goToPay (item) {
+    async goToPay (item) {
       const token = localStorage.getItem('userToken')
       if (token) {
-        if (this.isAJAX) {
+        /* if (this.isAJAX) {
           return
         }
         this.isAJAX = true
@@ -108,7 +115,11 @@ export default {
             this.isAJAX = false
             tools.error(res.msg)
           }
-        })
+        }) */
+        const result = await orderDetail({ orderId: item.id })
+        this.orderDetail = result.data
+        await this.getInfo()
+        this.$refs.orderDetail.setOpen(true)
       } else {
         this.$router.push({ path: '/login' })
       }
@@ -176,6 +187,7 @@ export default {
         font-size: 16px;
         background-color: #C7AB7B;
         border-radius: 4px;
+        cursor: pointer;
       }
     }
   }

src/views/Forestage/Tourism/order-detail.vue

@@ -156,6 +156,7 @@ export default {
     flex-direction: column;
     align-items: center;
     width: 100%;
+    padding-bottom: 20px;
 
     .title {
       color: #171717;

src/views/Forestage/Tourism/order-sett.vue

@@ -42,7 +42,7 @@ export default {
 
   },
   methods: {
-    async   setOpen(dialogVisible,orderId){
+    async setOpen(dialogVisible,orderId){
       this.dialogVisible=dialogVisible===true;
       if(dialogVisible){
         this.orderId=orderId