feat: 新增亦可直接付款

src/pages/confirmOrder/index.vue

@@ -1,93 +1,100 @@
 <template>
   <div class="mine">
     <div class="qr-code">
-      <div id="qrCode"
-           ref="qrCodeDiv"></div>
+      <div id="qrCode" ref="qrCodeDiv"></div>
     </div>
   </div>
 </template>
 
 <script>
-import QRCode from 'qrcodejs2'
-import api from '../../server/home'
+import QRCode from "qrcodejs2";
+import api from "../../server/home";
 export default {
   components: {},
-  data () {
+  data() {
     return {
-      qrcode_string: '',
-      ticket: '',
+      qrcode_string: "",
+      ticket: "",
       checkCodeInterval: null,
-      checkCodeTimeout: null,
+      checkCodeTimeout: null
     };
   },
   computed: {},
   watch: {},
 
   methods: {
-    getAuthCode () {
+    getAuthCode() {
       api.getAuthCode().then(res => {
-        this.qrcode_string = res.data.qrcode_string
-        this.ticket = res.data.ticket
+        this.qrcode_string = res.data.qrcode_string;
+        this.ticket = res.data.ticket;
         this.$nextTick(() => {
           this.bindQRCode();
-          this.checkCode()
-        })
-      })
+          this.checkCode();
+        });
+      });
     },
-    checkCode () {
+    checkCode() {
       this.checkCodeInterval = setInterval(e => {
         api.checkCode({ ticket: this.ticket }).then(res => {
           if (res.data.status == 1) {
-            clearInterval(this.checkCodeInterval)
-            this.getOrderByCode()
+            clearInterval(this.checkCodeInterval);
+            this.getOrderByCode();
           }
-        })
-      }, 1000)
+        });
+      }, 1000);
       //十分钟强制清除，防止页面崩溃
       this.checkCodeTimeout = setTimeout(() => {
-        clearTimeout(this.checkCodeTimeout)
-      }, 360000)
+        clearTimeout(this.checkCodeTimeout);
+      }, 360000);
     },
-    getOrderByCode () {
+    getOrderByCode() {
       api.getOrderByCode({ ticket: this.ticket }).then(res => {
         if (res.code == 200) {
+          // 无订单入口
+          if (res.data.order_id == 0) {
+            this.$router.push({
+              path: "/confirmOrder/addOrder",
+              query: {   //user_id
+                data: JSON.stringify(res.data),
+                // user_id:res.data.user.user_id
+              }
+            });
+          return
+          }
+
           this.$router.push({
-            path: '/confirmOrder/details',
+            path: "/confirmOrder/details",
             query: {
               id: res.data.order_id
             }
-          })
+          });
         }
-      })
+      });
     },
-    bindQRCode () {
+    bindQRCode() {
       new QRCode(this.$refs.qrCodeDiv, {
         text: this.qrcode_string,
         width: 200,
         height: 200,
         colorDark: "#333333", //二维码颜色
         colorLight: "#ffffff", //二维码背景色
-        correctLevel: QRCode.CorrectLevel.L//容错率，L/M/H
-      })
+        correctLevel: QRCode.CorrectLevel.L //容错率，L/M/H
+      });
     }
   },
 
-  created () {
-    this.getAuthCode()
-
+  created() {
+    this.getAuthCode();
   },
 
-  mounted () {
-
-  },
-  destroyed () {
+  mounted() {},
+  destroyed() {
     if (this.checkCodeInterval) {
-      clearInterval(this.checkCodeInterval)
-      clearTimeout(this.checkCodeTimeout)
+      clearInterval(this.checkCodeInterval);
+      clearTimeout(this.checkCodeTimeout);
     }
   }
-}
-
+};
 </script>
 
 <style lang='less' scoped>

src/router/map/home.js

@@ -11,6 +11,7 @@ import HistoricalOrder from '@/pages/historicalOrder/index'
 import HistoricalOrderDetails from '@/pages/historicalOrder/details'
 import ConfirmOrder from '@/pages/confirmOrder/index'
 import ConfirmOrderDetails from '@/pages/confirmOrder/details'
+import ConfirmOrderAddOrder from '@/pages/confirmOrder/addOrder'
 import StoreDetection from '@/pages/storeDetection/index'
 import Coupon from '@/pages/coupon/index'
 import projectOrder from '@/pages/customerMan/myOrder'
@@ -19,9 +20,14 @@ export default {
   path: '/layout',
   name: '首页',
   component: layout,
-  children: [
-    { path: '/home', component: Home },
-    { path: '/testSkin', component: TestSkin },
+  children: [{
+      path: '/home',
+      component: Home
+    },
+    {
+      path: '/testSkin',
+      component: TestSkin
+    },
     {
       path: '/testSkin/details',
       meta: {
@@ -29,7 +35,10 @@ export default {
       },
       component: TestSkinDetails
     },
-    { path: '/customerMan', component: CustomerMan },
+    {
+      path: '/customerMan',
+      component: CustomerMan
+    },
     {
       path: '/customerMan/details',
       meta: {
@@ -44,7 +53,10 @@ export default {
       },
       component: projectOrder
     },
-    { path: '/historicalOrder', component: HistoricalOrder },
+    {
+      path: '/historicalOrder',
+      component: HistoricalOrder
+    },
     {
       path: '/historicalOrder/details',
       meta: {
@@ -52,7 +64,10 @@ export default {
       },
       component: HistoricalOrderDetails
     },
-    { path: '/confirmOrder', component: ConfirmOrder },
+    {
+      path: '/confirmOrder',
+      component: ConfirmOrder
+    },
     {
       path: '/confirmOrder/details',
       meta: {
@@ -60,8 +75,22 @@ export default {
       },
       component: ConfirmOrderDetails
     },
-    { path: '/storeDetection', component: StoreDetection },
-    { path: '/coupon', component: Coupon },
+    {
+      path: '/confirmOrder/addOrder',
+      meta: {
+        isback: true,
+      },
+      component: ConfirmOrderAddOrder
+    },
+
+    {
+      path: '/storeDetection',
+      component: StoreDetection
+    },
+    {
+      path: '/coupon',
+      component: Coupon
+    },
 
   ]
 }

src/server/home.js

@@ -120,6 +120,11 @@ export default class Home {
     return $http.get(url.getUserProject, parms);
   }
 
+  // 新增项目订单
+  static padOrderAdd (parms) {
+    return $http.post(url.padOrderAdd, parms);
+  }
+
 }
 
 

src/server/urls.js

@@ -74,5 +74,7 @@ export default {
   // 获取优惠券订单
   getUserCoupon: '/v2/pad/user/coupon',
 
+  // 获取优惠券订单
+  padOrderAdd: '/v2/pad/order/add',
 
 }