提交订单

src/main/resources/static/js/shopping/confirm.js

@@ -17,6 +17,7 @@ const defaultPostageParam = {
 };
 const defaultConfirmParam = {
         cartType:1, 		// 购买类型:（1自主下单, 3协销下单）
+        orderMiniType:0,    // 订单提交状态 0初始提交 1 继续提交
         orderSource:1,		// 订单来源 1WWW 6小程序[采美,星范]
         addressId:0,		// 收货地址Id
         clubCouponId:0,		// 关联优惠券Id
@@ -680,16 +681,11 @@ var shoppingConfirm = new Vue({
             n=(r1>=r2)?r1:r2;
             return ((arg1*m-arg2*m)/m).toFixed(n);
         },
-        submitOrder: function(){// 提交按钮点击
-            var _self = this;
-            if (_self.returnGoodsStutas && !_self.agreementActive) {
+        submitOrder(){// 提交按钮点击
+            if (this.returnGoodsStutas && !this.agreementActive) {
                 CAIMEI.Alert('请先阅读《特殊商品退货须知》并勾选后再提交订单～', '确定', false);
-            } else if (_self.totalPrice < 1000) {
-                _self.isModelAlert = true;
-                _self.isShowConfirm = 1;
-                _self.isModelAlertText = '采购金额过小，将扣除500采美豆。建议您使用微信扫描 以下二维码，进入采美旗下“颜选美学”小程序购买小额 商品。';
             } else {
-                _self.handleClickOrderSubmitMit()
+                this.handleClickOrderSubmitMit()
             }
         },
         handleClickOrderSubmitMit() {// 提交订单
@@ -764,16 +760,13 @@ var shoppingConfirm = new Vue({
             _self.confirmParam.orderInfo = JSON.stringify(_self.confirmParam.orderInfo);
             _self.confirmParam.orderInvoice = JSON.stringify(_self.confirmParam.orderInvoice);
             console.log('confirmParam',_self.confirmParam);
-            _self.createdOrderVerify(_self.confirmParam);
+            _self.handleConfirmOrder();
         },
         createdOrderVerify(params) {// 还原提交订单参数格式
             const _self = this;
             OrderApi.createdOrderVerify(params,function (res) {
                 if (res.data.code === -1) {
-                    _self.isModelAlert = true;
-                    _self.isShowConfirm = 2;
-                    _self.submitLoading = false;
-                    _self.isModelAlertText = '订单内存在械字号三类商品，需要拥有医疗执业许可证的医美机构才能购买。建议升级医美机构后再下单，否则会导致订单退款或影响发货。';
+
                 }else{
                     _self.handleConfirmOrder();
                 }
@@ -803,38 +796,60 @@ var shoppingConfirm = new Vue({
                             CAIMEI.Storage.setItem('confirmOrderInfo',JSON.stringify({data:order}));
                             window.location.href = '/pay/caimei-paylist.html?orderId='+data.orderId;
                         }
-
                     }
-                }else if(res.code === -3){
-                    _self.isModelAlert = true;
-                    _self.isShowConfirm = 3;
-                    _self.submitLoading = false;
-                    _self.isModelAlertText = '您已有2个采购金额过小的订单，本次不能再进行采购。您可使用微信扫描以下二维码，进入采美旗下“颜选美学”小程序购买小额商品。';
-                    _self.formatConfirmParam();
-                }else if(res.code === -4){
-                    _self.isModelAlert = true;
-                    _self.isShowConfirm = 4;
-                    _self.submitLoading = false;
-                    _self.isModelAlertText = '采美豆不足，不能提交订单。您可使用微信扫描以下二维码，进入采美旗下“颜选美学”小程序购买小额商品。';
-                    _self.formatConfirmParam();
-                }else{
-                    CAIMEI.Alert(res.msg,'确定',true, function(){
-                        setTimeout(function(){
-                            _self.submitLoading = false;
-                            _self.formatConfirmParam();
-                        },500);
-                    });
+                }else {
+                    _self.handleError(res)
                 }
             });
         },
-        handleClickApply(){
-            window.location.href = '/user/setting/upgrade.html';
+        handleError(data){// 异常处理弹窗
+            const _self = this;
+            if(data.code === -5) {
+                _self.isModelAlert = true;
+                _self.isShowConfirm = 1;
+                _self.submitLoading = false;
+                _self.isModelAlertText = '采购金额过小，将扣除500采美豆。建议您使用微信扫描 以下二维码，进入采美旗下“颜选美学”小程序购买小额 商品。';
+                _self.formatConfirmParam();
+            }else if(data.code === -6){
+                _self.isModelAlert = true;
+                _self.isShowConfirm = 2;
+                _self.submitLoading = false;
+                _self.isModelAlertText = '订单内存在械字号三类商品，需要拥有医疗执业许可证的医美机构才能购买。建议升级医美机构后再下单，否则会导致订单退款或影响发货。';
+                _self.formatConfirmParam();
+            }else if(data.code === -3){
+                _self.isModelAlert = true;
+                _self.isShowConfirm = 3;
+                _self.submitLoading = false;
+                _self.isModelAlertText = '您已有2个采购金额过小的订单，本次不能再进行采购。您可使用微信扫描以下二维码，进入采美旗下“颜选美学”小程序购买小额商品。';
+                _self.formatConfirmParam();
+            }else if(data.code === -4){
+                _self.isModelAlert = true;
+                _self.isShowConfirm = 4;
+                _self.submitLoading = false;
+                _self.isModelAlertText = '采美豆不足，不能提交订单。您可使用微信扫描以下二维码，进入采美旗下“颜选美学”小程序购买小额商品。';
+                _self.formatConfirmParam();
+            }else{
+                CAIMEI.Alert(data.msg,'确定',true, function(){
+                    setTimeout(function(){
+                        _self.submitLoading = false;
+                        _self.formatConfirmParam();
+                    },500);
+                });
+            }
+        },
+        handleAgainComit(type){// 继续提交
+            if(type === 1){// 低于 500继续提交
+                this.confirmParam.orderMiniType = 1;
+                this.handleClickOrderSubmitMit();
+            }else{
+                this.confirmParam.orderMiniType = 2;
+                this.handleClickOrderSubmitMit();
+            }
         },
         formatConfirmParam:function(){// 还原提交订单参数格式
-            var _self = this;
-            _self.confirmParam.payInfo = JSON.parse(_self.confirmParam.payInfo);
-            _self.confirmParam.orderInfo = JSON.parse(_self.confirmParam.orderInfo);
-            _self.confirmParam.orderInvoice = JSON.parse(_self.confirmParam.orderInvoice);
+            this.confirmParam.payInfo = JSON.parse(this.confirmParam.payInfo);
+            this.confirmParam.orderInfo = JSON.parse(this.confirmParam.orderInfo);
+            this.confirmParam.orderInvoice = JSON.parse(this.confirmParam.orderInvoice);
         },
         handleCloseModel:function () {
             this.isModelAlert = false;

src/main/resources/templates/shopping/confirm.html

@@ -425,12 +425,12 @@
             </div>
             <div class="button" id="payButton">
                 <template v-if="isShowConfirm === 1">
-                    <a class="btn confirm" href="javascript:void(0);" @click.stop="handleClickOrderSubmitMit">继续提交</a>
+                    <a class="btn confirm" href="javascript:void(0);" @click.stop="handleAgainComit(1)">继续提交</a>
                     <a class="btn cancel" href="javascript:void(0);" @click.stop="handleCloseModel" v-if="isShowConfirm === 1">取消</a>
                 </template>
                 <template v-if="isShowConfirm === 2">
-                    <a class="btn cancel" href="javascript:void(0);" @click.stop="handleConfirmOrder">继续提交</a>
-                    <a class="btn confirm" href="javascript:void(0);" @click.stop="handleClickApply">去升级</a>
+                    <a class="btn cancel" href="javascript:void(0);" @click.stop="handleAgainComit(2)">继续提交</a>
+                    <a class="btn confirm" target="_blank" href="/user/setting/upgrade.html">去升级</a>
                 </template>
                 <template v-if="isShowConfirm === 3 || isShowConfirm === 4">
                     <a class="btn confirm" href="javascript:void(0);" @click.stop="handleCloseModel">了解</a>