提交订单

src/main/resources/static/css/base/base.pc.css

@@ -100,7 +100,7 @@ header{box-shadow: 0 2px 10px #ebecef;}
 .baseHeadCenter .headCart .addBtn{display:inline-block;width:100%;height:44px;line-height:44px;box-sizing:border-box;border:1px solid #FFE6DC;position:relative;color:#333;font-size:14px;text-align:center;white-space:nowrap}
 .baseHeadCenter .headCart .addBtn:before{display:inline-block;width:20px;height:20px;vertical-align:middle;background-position:-30px -1px;margin-right:2px}
 .baseHeadCenter .headCart .addBtn em{color:#E15616;font-style:normal;margin-left:4px;}
-.baseHeadCenter .cartData{display:none;position:absolute;right:0;top:44px;width:360px;box-sizing:border-box;background:#FFF;z-index:999;box-shadow:0px 3px 6px rgba(45,48,54,2);border-radius:2px}
+.baseHeadCenter .cartData{display:none;position:absolute;right:0;top:44px;width:360px;box-sizing:border-box;background:#FFF;z-index:999;box-shadow:0px 3px 6px rgba(45,48,54,0.2);border-radius:2px}
 .baseHeadCenter .cartData .empty{padding:72px 10px;text-align:center;font-size:16px;line-height:26px;}
 .baseHeadCenter .cartData .empty a{color:#E15616;margin:0 5px;border-bottom:1px solid #e15616}
 .baseHeadCenter .cartData .empty img{display:block;margin:0 auto 28px auto;width:160px;height:136px}

src/main/resources/static/js/account/login.js

@@ -74,6 +74,7 @@ var loginPage = new Vue({
                 }else {
                     clearTimeout(timer); //清理定时任务
                     if(response.code == 0){
+                        var _userIdentity = response.data.userIdentity;
                         _self.userData = {
                             account: response.data.account,
                             email: response.data.email,
@@ -89,6 +90,17 @@ var loginPage = new Vue({
                             token: response.data.token
                         };
                         _self.setStorages( _self.userData);
+                        // 登录成功页面跳转
+                        var beforePath = localStorage.getItem("loginBeforePath");
+                        if(_userIdentity == 4 || _userIdentity ==2){
+                            window.location.href = '/user/dashboard.html';
+                        }else if(_userIdentity == 3){
+                            window.location.href = '/supplier/dashboard.html';
+                        }else if (beforePath) {
+                            window.location.href = beforePath;
+                        }else {
+                            window.location.href = '/index.html';
+                        }
                     }else if(response.code == -4){
                         window.location.href = 'binding.html';
                     }

src/main/resources/static/js/user-center/order/detail.js

@@ -13,7 +13,7 @@ var orderPage = new Vue({
         returnedPurchaseList:[],//订单退款信息
         orderIdentificationId:'',//订单标识
         modelType:0,
-        isFiexd:false
+        isFiexd:true
     },
     filters: {
         NumFormat:function(text) {//处理金额
@@ -282,7 +282,7 @@ var orderPage = new Vue({
             var isCSS1Compat = ((document.compatMode || "") === "CSS1Compat"); // 判断渲染模式是不是标准模式
             var scrollHeight = supportPageOffset ? window.pageYOffset : isCSS1Compat ? document.documentElement.scrollTop : document.body.scrollTop;
             console.log(scrollHeight)
-            if(scrollHeight>340){
+            if(scrollHeight<100){
                 _self.isFiexd = true
             }else{
                 _self.isFiexd = false