后端 + 前端：提交购物车订单

mobile-web/src/api/order.js

@@ -21,7 +21,7 @@ export function confirmReceiving(orderId) {
   });
 }
 
-export function getConfirmCreateOrder(skuId, quantity) {
+export function getOrderConfirmCreateOrder(skuId, quantity) {
   return request({
     url: '/order-api/users/order/confirm_create_order',
     method: 'get',
@@ -45,6 +45,18 @@ export function createOrder(params) {
   });
 }
 
+export function createOrderFromCart(userAddressId,
+                                    remark) {
+  return request({
+    url: '/order-api/users/order/create_order_from_cart',
+    method: 'post',
+    params: {
+      userAddressId,
+      remark,
+    }
+  });
+}
+
 // Cart
 
 export function addCart(skuId, quantity) {
@@ -87,6 +99,17 @@ export function updateCartSelected(skuIds, selected) {
   });
 }
 
+export function getCartConfirmCreateOrder(skuId, quantity) {
+  return request({
+    url: '/order-api/users/cart/confirm_create_order',
+    method: 'get',
+    params: {
+      skuId,
+      quantity,
+    }
+  });
+}
+
 // 物流信息
 
 export function getLogisticsInfo(params) {

mobile-web/src/page/cart/index.vue

@@ -157,7 +157,7 @@ export default {
       })
     },
     onSubmit() {
-      this.$router.push('/order')
+      this.$router.push('/order?from=cart')
     },
     convertProduct(item) {
       // debugger;

mobile-web/src/page/shipping/order.vue

@@ -68,7 +68,12 @@
 
 <script>
 
-  import {createOrder, getConfirmCreateOrder} from '../../api/order';
+  import {
+    createOrder,
+    getOrderConfirmCreateOrder,
+    getCartConfirmCreateOrder,
+    createOrderFromCart
+  } from '../../api/order';
   import {GetDefaultAddress} from '../../api/user';
   import orderStore from '../../store/order'
 
@@ -96,30 +101,43 @@
     },
     methods: {
       onSubmit() {
-        const { skuId, quantity } = this.$route.query;
         const userAddressId = this.addressData.id;
         const remark = '';
 
-        const orderItems = [{
-          skuId,
-          quantity,
-        }];
-
-        createOrder({
-          orderItems,
-          userAddressId,
-          remark,
-        }).then(result => {
-          if (result) {
-            const { orderNo } = result;
-            this.$router.push({  //核心语句
-              path:`/order/success`,   //跳转的路径
-              query:{           //路由传参时push和query搭配使用 ，作用时传递参数
-                ...result,
+        if (this.from === 'direct_order') {
+            const { skuId, quantity } = this.$route.query;
+            const orderItems = [{
+              skuId,
+              quantity,
+            }];
+            createOrder({
+              orderItems,
+              userAddressId,
+              remark,
+            }).then(result => {
+              if (result) {
+                const { orderNo } = result;
+                this.$router.push({  //核心语句
+                  path:`/order/success`,   //跳转的路径
+                  query:{           //路由传参时push和query搭配使用 ，作用时传递参数
+                    ...result,
+                  }
+                });
               }
             });
-          }
-        })
+        } else if (this.from === 'cart') {
+          createOrderFromCart(userAddressId, remark).then(result => {
+            if (result) {
+              const { orderNo } = result;
+              this.$router.push({  //核心语句
+                path:`/order/success`,   //跳转的路径
+                query:{           //路由传参时push和query搭配使用 ，作用时传递参数
+                  ...result,
+                }
+              });
+            }
+          });
+        }
       },
       convertProduct(item) {
         // debugger;
@@ -143,13 +161,18 @@
       this.addressData = this.$store.state.addressData;
 
       // 加载商品信息
+      // debugger;
       if (this.from === 'direct_order') {
-        getConfirmCreateOrder(this.skuId, this.quantity).then(data => {
+        getOrderConfirmCreateOrder(this.skuId, this.quantity).then(data => {
+          this.itemGroups = data.itemGroups;
+          this.fee = data.fee;
+        })
+      } else if (this.from === 'cart') {
+        getCartConfirmCreateOrder().then(data => {
           this.itemGroups = data.itemGroups;
           this.fee = data.fee;
         })
       }
-
     },
     created() {
       // 加载地址
@@ -160,6 +183,9 @@
         }
       })
       // 处理来源
+      if (this.$route.query.from === 'cart') {
+        this.from = this.$route.query.from;
+      }
     },
     store: orderStore,
   };