确认订单限制小于1000订单提交

src/main/resources/static/css/product/instruement-list.css

@@ -95,6 +95,10 @@
     .sortBox li.up:after{border-top-color:#E15616;opacity:.3}
     .sortBox li.down:after{border-top-color:#E15616}
     .sortBox li.down:before{border-bottom-color:#E15616;opacity:.3}
+    .sortBox li.screen:before{border-width:0 0 0 0;border-color:transparent transparent transparent transparent;top:5vw;}
+    .sortBox li.screen:after{border-width:0 0 0 0;border-color:transparent transparent transparent transparent;top:5vw}
+    .sortBox li.screen .mIcon{width: 4vw;height: 4vw;display: block;position: absolute;top: 0.8vw;right: -2vw;}
+    .sortBox li.screen .mIcon:before{width: 4vw;height: 4vw;background-position: -70vw -78vw;}
     .list-container ul{margin: 3.2vw auto;width: 97vw;}
     .list-container ul li{width: 45.6vw;height: 70vw;overflow: hidden;margin: 0 1.3vw 2.6vw 1.3vw;background: #fff;text-align: left;}
     .productItem .price em {display: block;height: 7vw;line-height: 7vw;color: #4A4F58;font-style: normal;float: left;}

src/main/resources/static/css/product/list.css

@@ -94,6 +94,10 @@ li{list-style:none}
     .sortBox li.up:after{border-top-color:#E15616;opacity:.3}
     .sortBox li.down:after{border-top-color:#E15616}
     .sortBox li.down:before{border-bottom-color:#E15616;opacity:.3}
+    .sortBox li.screen:before{border-width:0 0 0 0;border-color:transparent transparent transparent transparent;top:5vw;}
+    .sortBox li.screen:after{border-width:0 0 0 0;border-color:transparent transparent transparent transparent;top:5vw}
+    .sortBox li.screen .mIcon{width: 4vw;height: 4vw;display: block;position: absolute;top: 0.8vw;right: -2vw;}
+    .sortBox li.screen .mIcon:before{width: 4vw;height: 4vw;background-position: -70vw -78vw;}
     .productList{margin: 3.2vw auto;width: 97vw;}
     .productList .productItem{width: 45.6vw;height: 70vw;overflow: hidden;margin: 0 1.3vw 2.6vw 1.3vw;background: #fff;text-align: left;}
     .productItem .price em {display: block;height: 7vw;line-height: 7vw;color: #4A4F58;font-style: normal;float: left;}

src/main/resources/static/css/shopping/shopping.css

@@ -242,10 +242,10 @@ li{list-style:none}
     .confirm-Model .model-content{width: 389px;height: 342px;background: #FFFFFF;border-radius: 2px;position: absolute;top: 0;right: 0;left: 0;bottom: 0;margin: auto;z-index: 9998;}
     .confirm-Model .model-content .title{width: 100%;height: 48px;box-sizing: border-box;font-size: 14px;line-height: 48px;text-align: left;color: #333333;float: left;position: relative;border-bottom: 1px solid #EFEFEF;background-color: #F8F8F8;padding: 0 14px;}
     .confirm-Model .model-content .title .icon-close{width: 16px;height: 16px;display: block;position: absolute;right:12px;top: 12px;background: url("/img/base/icon.png")-319px 0 no-repeat;cursor: pointer;}
-    .confirm-Model .model-content .content{margin: 24px 0 0 0;width: 100%;height: auto;line-height: 24px;float: left;padding: 0 14px;box-sizing: border-box;}
-    .confirm-Model .model-content .content p{text-align: left;font-size: 12px;color: #666666;font-weight: normal;}
+    .confirm-Model .model-content .content{margin: 20px 0 0 0;width: 100%;height: auto;line-height: 24px;float: left;padding: 0 14px;box-sizing: border-box;}
+    .confirm-Model .model-content .content p{text-align: left;font-size: 14px;color: #666666;font-weight: normal;}
     .confirm-Model .model-content .content p.small{font-size:12px;color: #E15621;}
-    .confirm-Model .model-content .content-image {width: 100%;height: 128px;float: left;margin-bottom: 20px;}
+    .confirm-Model .model-content .content-image {width: 100%;height: 128px;float: left;margin: 12px 0;}
     .confirm-Model .model-content .content-image img{width: 128px;height: 128px;display: block;margin: 0 auto;}
     .confirm-Model .model-content .button{width: 100%;height: 32px;float: left;padding: 0 14px;box-sizing: border-box;}
     .confirm-Model .model-content .button a{height: 32px;padding: 0 15px;display: block;margin-left: 10px;border-radius: 2px;font-size: 14px;text-align: center;line-height: 32px;color: #FFFFFF;float: right;box-sizing: border-box;border: 1px solid #FFFFFF;}

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

@@ -662,16 +662,13 @@ var shoppingConfirm = new Vue({
             if( _self.hanldShouldPayFee<1000){
                 _self.isModelAlert = true;
                 _self.isModelAlertText = '采购金额过小，将扣除500采美豆。建议您使用微信扫描 以下二维码，进入采美旗下“呵呵商城”小程序购买小额 商品。';
-            }else if(_self.hanldShouldPayFee<1000 && _self.userBeans<0){
-                _self.isModelAlert = true;
-                _self.isShowConfirm = false;
-                _self.isModelAlertText = '采美豆不足，不能提交订单。您可使用微信扫描以下二维码，进入采美旗下“呵呵商城”小程序购买小额商品。';
             }else{
                 _self.handleClickOrderSubmitMit()
             }
         },
         handleClickOrderSubmitMit:function () {// 提交订单
             var _self = this;
+            _self.isModelAlert = false;
             if(_self.submitLoading){return false;}
             if(!_self.confirmParam.addressId){
                 CAIMEI.dialog('请先添加收货地址～');
@@ -760,6 +757,14 @@ var shoppingConfirm = new Vue({
                         CAIMEI.Storage.setItem('confirmOrderInfo',JSON.stringify({data:order}));
                         window.location.href = '/pay/caimei-paycash.html?type=confirm&orderId='+data.orderId;
                     }
+                }else if(res.code === -3){
+                    _self.isModelAlert = true;
+                    _self.isShowConfirm = false;
+                    _self.submitLoading = false;
+                    _self.isModelAlertText = res.msg;
+                    _self.confirmParam.payInfo = JSON.parse(_self.confirmParam.payInfo);
+                    _self.confirmParam.orderInfo = JSON.parse(_self.confirmParam.orderInfo);
+                    _self.confirmParam.orderInvoice = JSON.parse(_self.confirmParam.orderInvoice);
                 }else{
                     CAIMEI.Alert(res.msg,'确定',true, function(){
                         setTimeout(function(){
@@ -774,6 +779,7 @@ var shoppingConfirm = new Vue({
         },
         handleCloseModel:function () {
             this.isModelAlert = false;
+            this.isShowConfirm= true;
         },
         getProductIds: function(list){// 获取订单商品id列表
             var productIds = [];
@@ -789,7 +795,6 @@ var shoppingConfirm = new Vue({
     created: function () {
         var _self = this;
         var urlType = getUrlParam("type") ? getUrlParam("type")*1 : "";
-        console.log('urlType',urlType)
         if(globalUserData){
             _self.userId = _self.productParam.userId = _self.cartParam.userId = _self.postageParam.userId = _self.supportParm.userId =   globalUserData.userId;
             _self.confirmParam.clubId = globalUserData.clubId
@@ -798,20 +803,18 @@ var shoppingConfirm = new Vue({
             // type:（1购物车提交[对应表cm_cart]，2直接购买提交, 3协销下单）
             if(urlType === 1) {//购物车提交
                 _self.confirmParam.cartType = 1;
-                // _self.cartParam.productIds = _self.postageParam.productIds = _self.productIds = window.localStorage.getItem("shoppingProductIds");
                 _self.cartParam.productIds =  _self.productIds = window.localStorage.getItem("shoppingProductIds");
                 // 获取列表数据
                 _self.getCartCreateOrderInfo();
             }else if(urlType === 2){//立即购买
                 _self.confirmParam.cartType = 2;
-                // _self.productParam.productId = _self.postageParam.productIds = _self.productIds = getUrlParam("productId");
                 _self.productParam.productId =  _self.productIds = getUrlParam("productId");
                 _self.productParam.productCount = getUrlParam("count");
                 if(_self.productParam.productId && _self.productParam.productCount) {
                     _self.getProductCreateOrderInfo();
                 }
             }else if(urlType === 3){// 组合商品立即购买
-                _self.supportParm.productInfo = window.localStorage.getItem("KEY_SUPPORE");
+                _self.supportParm.productInfo = CAIMEI.Storage.getItem("KEY_SUPPORE");
                 _self.OrderClubProductSupporting()
                 console.log('_self.supportParm.productInfo',_self.supportParm.productInfo)
             }

src/main/resources/static/js/user-center/account/beans.js

@@ -72,8 +72,8 @@ var orderPage = new Vue({
                     12:'登录奖励',
                     13:'查看商品资料',
                     14:'购买超级会员',
-                    15:'系统退回',
-                    16:'系统扣除',
+                    15:'系统扣除',
+                    16:'系统退回',
                 };
             Object.keys(stateTextObject).forEach(function(key){
                 if(key == state){

src/main/resources/templates/product/instruelist.html

@@ -128,7 +128,10 @@
                             <li v-else @click="toSortList('price',0)"><span>价格</span></li>
                         </template>
                         <template v-if="!isPC">
-                            <li @click="showIsProductScreen"><span>筛选</span></li>
+                            <li class="screen" @click="showIsProductScreen">
+                                <span>筛选</span>
+                                <i class="mIcon"></i>
+                            </li>
                         </template>
                 </ul>
                 <div class="sortBox-checked" v-if="isPC">

src/main/resources/templates/product/list.html

@@ -153,7 +153,10 @@
                     <li v-else @click="toSortList('price',0)"><span>价格</span></li>
                 </template>
                 <template v-if="!isPC">
-                    <li @click="showIsProductScreen"><span>筛选</span></li>
+                    <li class="screen" @click="showIsProductScreen">
+                        <span>筛选</span>
+                        <i class="mIcon"></i>
+                    </li>
                 </template>
             </ul>
             <div class="sortBox-checked" v-if="isPC">