Merge branch 'developerB' of git.caimei365.com:chao/caimei-caimei365-www into developerB

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

@@ -187,6 +187,10 @@
 .priceTag .promotion .p img{width:10vw;height:10vw;position:absolute;left:0;top:1vw}
 .priceTag .promotion .p span{display:block;text-overflow:ellipsis;overflow:hidden;white-space:nowrap}
 .priceTag .promotion .more{color:#f55c5c;text-decoration:underline;float:right;}
-/*.btnBox a{color:#fff;font-size:3vw;text-align:center}*/
+/* loading */
+.loading{box-sizing:border-box;padding:20vw 0;text-align:center;}
+.empty{box-sizing:border-box;padding:15vw 0;text-align:center;color:#4A4F58;line-height:8vw;font-size:3.4vw;}
+.empty img{width:40vw;height:40vw;}
+.empty a{color:#E15616;}
 
 

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

@@ -279,5 +279,8 @@ header{box-shadow: 0 2px 10px #ebecef;}
 .priceTag .promotion p.r{text-align:right;}
 .priceTag .promotion p.c{text-align:center;}
 .priceTag .promotion .more{color:#f55c5c;text-decoration:underline;float:right;}
-/*  加载  */
-.loading {box-sizing: border-box;padding: 200px 0;text-align: center;}
+/* 加载  */
+.loading{box-sizing:border-box;padding:200px 0;text-align:center;}
+.empty{box-sizing:border-box;padding:100px 0;text-align:center;color:#4A4F58;line-height:30px;font-size:16px;}
+.empty img{width:180px;height:180px;}
+.empty a{color:#E15616;}

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

@@ -4,10 +4,6 @@ li{list-style:none}
  * PC端
  */
 @media screen and (min-width:768px){
-    .loading{box-sizing:border-box;padding:200px 0;text-align:center;}
-    .empty{box-sizing:border-box;padding:100px 0;text-align:center;color:#4A4F58;line-height:30px;font-size:16px;}
-    .empty img{width:180px;height:180px;}
-    .empty a{color:#E15616;}
     .equipmentList{width:1184px;margin:16px auto;}
     .equipmentList>ul{width:1216px;}
     .equipmentItem{float:left;width:284px;height:242px;background:#FFF;border-radius:2px;margin:0 16px 16px 0}
@@ -24,10 +20,6 @@ li{list-style:none}
 */
 @media screen and (max-width:768px){
     /*footer{display:none!important}*/
-    .loading{box-sizing:border-box;padding:20vw 0;text-align:center}
-    .empty{box-sizing:border-box;padding:15vw 0;text-align:center;color:#4A4F58;line-height:8vw;font-size:3.4vw}
-    .empty img{width:40vw;height:40vw}
-    .empty a{color:#E15616}
     .equipmentList{width:96vw;margin:2.6vw auto 0;overflow: hidden;}
     .equipmentList>ul{width:100vw;}
     .equipmentItem{width:45.4vw;height:40vw;background:#FFF;border-radius:2px;margin:0 1.3vw 2.6vw 1.3vw;}

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

@@ -15,10 +15,6 @@ 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}
-    .loading{box-sizing:border-box;padding:200px 0;text-align:center;}
-    .empty{box-sizing:border-box;padding:100px 0;text-align:center;color:#4A4F58;line-height:30px;font-size:16px;}
-    .empty img{width:180px;height:180px;}
-    .empty a{color:#E15616;}
     .productList{width:1200px;margin:0 auto;box-sizing:border-box}
     .productList .productItem{margin-bottom:16px}
     .login-btn{font-size: 12px}
@@ -47,10 +43,6 @@ 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}
-    .loading{box-sizing:border-box;padding:20vw 0;text-align:center;}
-    .empty{box-sizing:border-box;padding:15vw 0;text-align:center;color:#4A4F58;line-height:8vw;font-size:3.4vw;}
-    .empty img{width:40vw;height:40vw;}
-    .empty a{color:#E15616;}
     .productList{width:96.6vw;margin:1.3vw auto;box-sizing:border-box}
     .original-price{text-decoration:line-through}
     .listTitle{width:100%;min-height:3.2vw;box-sizing:border-box;padding:3.3vw;background:#fc5331 url(/img/cart/promotions.png) no-repeat right;background-size:auto 100%;color:#FFF}

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

@@ -8,10 +8,6 @@ li{list-style:none}
 @media screen and (min-width:768px){
     input[type="number"]{-moz-appearance:none;-webkit-appearance:none}
     input::-webkit-outer-spin-button,input::-webkit-inner-spin-button{-webkit-appearance:none}
-    .loading{box-sizing:border-box;padding:200px 0;text-align:center}
-    .empty{box-sizing:border-box;padding:100px 0;text-align:center;color:#4A4F58;line-height:30px;font-size:16px}
-    .empty img{width:180px;height:180px}
-    .empty a{color:#E15616}
     .pageTitle{height:57px;line-height:57px;padding-top:16px}
     .pageTitle h1{color:#2D3036;font-size:16px;font-weight:bold;float:left}
     .pageTitle h1 span{color:#627386;font-size:12px;font-weight:normal;margin-left:10px}
@@ -174,10 +170,6 @@ li{list-style:none}
 * 移动端
 */
 @media screen and (max-width:768px){
-    .loading{box-sizing:border-box;padding:20vw 0;text-align:center}
-    .empty{box-sizing:border-box;padding:15vw 0;text-align:center;color:#4A4F58;line-height:8vw;font-size:3.4vw}
-    .empty img{width:40vw;height:40vw}
-    .empty a{color:#E15616}
     .pageTitle .step{width:100%;height:12.4vw;line-height:12.4vw;background:#FFF;color:#9AA5B5;font-size:3.1vw;text-align:center}
     .pageTitle .step span{display:inline-block;height:4.2vw;line-height:4.2vw;vertical-align:middle;position:relative;padding-right:6.4vw}
     .pageTitle .step span:before{font-style:normal;font-size:5.2vw;vertical-align:text-top;margin-right:1vw}

src/main/resources/static/css/supplier-center/message.css

@@ -4,9 +4,7 @@ li{list-style:none}
  * PC端
  */
 @media screen and (min-width:768px){
-    .content .empty{box-sizing:border-box;padding:100px 0;text-align:center;color:#4A4F58;line-height:30px;font-size:16px;background-color:#FFF;}
-    .content .empty img{width:180px;height:180px;}
-    .content .empty a{color:#E15616;}
+    .content .empty{background-color:#FFF;}
     .content{width: 100%;min-height: 370px;background-color: #FFFFFF;box-sizing: border-box;padding:0 20px 20px 20px;box-shadow: 0px 3px 6px 0px rgba(0, 0, 0, 0.07);margin:0 0 10px 0;}
     .content .title{width: 100%;height: 56px;border-bottom: solid 1px #e2e7ef;line-height: 56px;color: #22272e;font-size: 16px;}
     .content .section .section-top{width: 100%;height: 54px;float: left;box-sizing: border-box;padding: 9px 0;border-bottom: solid 1px #e2e7ef;}
@@ -31,9 +29,6 @@ li{list-style:none}
 * 移动端
 */
 @media screen and (max-width:768px){
-    .content .empty{box-sizing:border-box;padding:100px 0;text-align:center;color:#4A4F58;line-height:30px;font-size:16px;background-color:#FFF;}
-    .content .empty img{width:180px;height:180px;}
-    .content .empty a{color:#E15616;}
     .content{width: 100%;background-color: #FFFFFF;box-sizing: border-box;padding:0 5.3vw 5.3vw 5.3vw;box-shadow: 0px .8vw 1.6vw 0px rgba(0, 0, 0, 0.07);margin:0 0 2.7vw 0;}
     .content .title{width: 100%;height: 10vw;line-height: 10vw;color: #22272e;font-size: 3.4vw;}
     .section-top{width: 100%;height: 54px;float: left;box-sizing: border-box;padding: 10px;background: #fff}

src/main/resources/static/css/supplier-center/operation/list.css

@@ -32,9 +32,7 @@ li{list-style:none}
     .order-header .header-bt .header-button .btn-add{width: 128px;height: 36px;display: block;background-color: #ffe6dc;border-radius: 2px;border: solid 1px #e15616;font-size: 14px;color: #e15616;line-height: 36px;text-align: center;float: left;margin: 0 5px;}
 
     .container{width: 100%;height:auto;box-sizing: border-box;margin-top: 16px;}
-    .container .empty{box-sizing:border-box;padding:100px 0;text-align:center;color:#4A4F58;line-height:30px;font-size:16px;background-color:#FFF;}
-    .container .empty img{width:180px;height:180px;}
-    .container .empty a{color:#E15616;}
+    .container .empty{background-color:#FFF;}
     .container .section{width: 100%;height:auto;padding-bottom: 16px;box-sizing: border-box;padding:0 16px 16px 16px;background-color: #FFFFFF;box-shadow: 0px 3px 6px 0px rgba(0, 0, 0, 0.07);}
     .container .section .title{width: 100%;height: 54px;border-bottom: 1px solid #e2e7ef;}
     .container .section .title .td{height: 54px;font-size: 14px;color:#627386;float: left;line-height:54px;text-align: left;}

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

@@ -4,10 +4,6 @@ li{list-style:none}
  * PC端
  */
 @media screen and (min-width:768px){
-    .loading{box-sizing:border-box;padding:200px 0;text-align:center;}
-    .empty{box-sizing:border-box;padding:100px 0;text-align:center;color:#4A4F58;line-height:30px;font-size:16px;}
-    .empty img{width:180px;height:180px;}
-    .empty a{color:#E15616;}
     .supplierList{width:1184px;margin:16px auto;background:#FFF}
     .supplierItem{box-sizing:border-box;padding:16px;border-top:1px solid #F5F5F5}
     .supplierItem:first-child{border:none}
@@ -34,10 +30,6 @@ li{list-style:none}
 * 移动端
 */
 @media screen and (max-width:768px){
-    .loading{box-sizing:border-box;padding:20vw 0;text-align:center}
-    .empty{box-sizing:border-box;padding:15vw 0;text-align:center;color:#4A4F58;line-height:8vw;font-size:3.4vw}
-    .empty img{width:40vw;height:40vw}
-    .empty a{color:#E15616}
     .supplierItem{width:100vw;margin:2.8vw auto 0;box-sizing:border-box;padding:2.6vw 3.3vw;background:#FFF;overflow:hidden}
     .supplierItem .left{padding-left:13.6vw;position:relative}
     .supplierItem .left .logo{position:absolute;left:0;top:0;width:12.2vw;height:12.2vw;background:url(/img/base/placeholder.png) no-repeat center center;background-size:80%;}

src/main/resources/static/css/user-center/address/list.css

@@ -28,9 +28,7 @@ li{list-style:none}
     .order-header .header-button{height: 38px;float: right;}
     .order-header .header-button .btn-server{width: 128px;height: 36px;display: block;background-color: #ffe6dc;border-radius: 2px;border: solid 1px #e15616;font-size: 14px;color: #e15616;line-height: 36px;text-align: center;}
     .container{width: 100%;height: auto;box-sizing: border-box;margin-top: 15px;position: relative;}
-    .container .empty{box-sizing:border-box;padding:100px 0;text-align:center;color:#4A4F58;line-height:30px;font-size:16px;background-color:#FFF;}
-    .container .empty img{width:180px;height:180px;}
-    .container .empty a{color:#E15616;}
+    .container .empty{background-color:#FFF;}
     .container .section.address-none{height: 318px;position: absolute;left: 0;top:0;background-color: #FFF;box-shadow: 0px 4px 6px 0px rgba(0, 0, 0, 0.4);z-index: 999;padding: 16px 0;box-sizing: border-box;}
     .container .section.address-none .address-main{width: 590px; float: left;height: 100%;}
     .container .section.address-none .formLine{padding-bottom:16px;font-size:14px;position:relative;width: 100%;height: auto;float: left;}

src/main/resources/static/css/user-center/message.css

@@ -5,9 +5,7 @@ li{list-style:none}
  */
 @media screen and (min-width:768px){
     .navLayout{min-height: 500px;}
-    .content .empty{box-sizing:border-box;padding:100px 0;text-align:center;color:#4A4F58;line-height:30px;font-size:16px;background-color:#FFF;}
-    .content .empty img{width:180px;height:180px;}
-    .content .empty a{color:#E15616;}
+    .content .empty{background-color:#FFF;}
     .content{width: 100%;min-height: 370px;background-color: #FFFFFF;box-sizing: border-box;padding:0 20px 20px 20px;box-shadow: 0px 3px 6px 0px rgba(0, 0, 0, 0.07);margin:0 0 10px 0;}
     .content .title{width: 100%;height: 56px;border-bottom: solid 1px #e2e7ef;line-height: 56px;color: #22272e;font-size: 16px;}
     .content .section .section-top{width: 100%;height: 54px;float: left;box-sizing: border-box;padding: 9px 0;border-bottom: solid 1px #e2e7ef;}

src/main/resources/static/css/user-center/operation/list.css

@@ -32,9 +32,7 @@ li{list-style:none}
     .order-header .header-bt .header-button .btn-add{width: 128px;height: 36px;display: block;background-color: #ffe6dc;border-radius: 2px;border: solid 1px #e15616;font-size: 14px;color: #e15616;line-height: 36px;text-align: center;float: left;margin: 0 5px;}
 
     .container{width: 100%;height:auto;box-sizing: border-box;margin-top: 16px;}
-    .container .empty{box-sizing:border-box;padding:100px 0;text-align:center;color:#4A4F58;line-height:30px;font-size:16px;background-color:#FFF;}
-    .container .empty img{width:180px;height:180px;}
-    .container .empty a{color:#E15616;}
+    .container .empty{background-color:#FFF;}
     .container .section{width: 100%;height:auto;padding-bottom: 16px;box-sizing: border-box;padding:0 16px 16px 16px;background-color: #FFFFFF;box-shadow: 0px 3px 6px 0px rgba(0, 0, 0, 0.07);}
     .container .section .title{width: 100%;height: 54px;border-bottom: 1px solid #e2e7ef;}
     .container .section .title .td{height: 54px;font-size: 14px;color:#627386;float: left;line-height:54px;text-align: left;}

src/main/resources/static/css/user-center/order/orderlist.css

@@ -47,9 +47,7 @@ li{list-style:none}
 
 
     .order-container{width: 100%;min-height:410px;margin-top: 20px;}
-    .order-container .empty{box-sizing:border-box;padding:100px 0;text-align:center;color:#4A4F58;line-height:30px;font-size:16px;background-color:#FFF;}
-    .order-container .empty img{width:180px;height:180px;}
-    .order-container .empty a{color:#E15616;}
+    .order-container .empty{background-color:#FFF;}
     .order-container .title{width: 100%;height: 44px;line-height: 44px;font-size: 16px;text-align: left;color: #22272e;}
     .order-container .title a{display: block;float: right;position: relative;padding-right: 36px;position: relative;}
     .order-container .title a .icon{display: block;width: 18px;height: 18px;position: absolute;top: 5px;right: 10px;}

src/main/resources/static/css/user-center/repair/list.css

@@ -39,9 +39,7 @@ li{list-style:none}
     .order-header .header-bt .header-button{height: 38px;float: right;}
     .order-header .header-bt .header-button .btn-server{width: 90px;height: 36px;display: block;background-color: #e15616;border-radius: 2px;border: solid 1px #e15616;font-size: 14px;color: #FFFFFF;line-height: 36px;text-align: center;}
     .container{width: 100%;margin-top: 15px;}
-    .container .empty{box-sizing:border-box;padding:100px 0;text-align:center;color:#4A4F58;line-height:30px;font-size:16px;background-color:#FFF;}
-    .container .empty img{width:180px;height:180px;}
-    .container .empty a{color:#E15616;}
+    .container .empty{background-color:#FFF;}
     .container .section{width: 100%;height: 411px;padding-bottom: 16px;box-sizing: border-box;padding: 0 16px;background-color: #FFFFFF;box-shadow: 0px 3px 6px 0px rgba(0, 0, 0, 0.07);}
     .container .section .title{width: 100%;height: 54px;border-bottom: 1px solid #e2e7ef;}
     .container .section .title .td{height: 54px;font-size: 14px;color:#627386;float: left;line-height:54px;text-align: left;}

src/main/resources/static/js/base.js

@@ -3,7 +3,7 @@ var isPC = ($(window).width()>768);
 var globalUserData = '';
 var GLOBAL_TOKEN = 'X-Token';
 var GLOBAL_USER_ID = 0;
-var GLOBAL_USER_IDENTITY = 0;
+var GLOBAL_USER_IDENTITY = 0;//2-会员机构；3-供应商；4-普通机构
 var GLOBAL_SHOP_ID = 0;
 if(localStorage.getItem('userInfo')){
     globalUserData = JSON.parse(localStorage.getItem('userInfo'));
@@ -129,13 +129,13 @@ $(function(){
             e.stopPropagation();
         });
     }
-    // 去登录弹窗
-    $('body').on("click", '.toLogin',function () {
+    // 登录弹窗
+    function loginAert(content, btnTxt){
         $.confirm({
             useBootstrap: false,
             boxWidth: (isPC?'338px':'74.6vw'),
             title: false,
-            content:'<div class="loginAlert"><span>你还未登录</span><span>请登录后再进行购买</span></div>',
+            content:'<div class="loginAlert">'+content+'</div>',
             closeIcon: true,
             animation: 'opacity',
             closeAnimation: 'opacity',
@@ -143,7 +143,7 @@ $(function(){
             scrollToPreviousElement: false,
             buttons: {
                 login: {
-                    text: '去登录',
+                    text: btnTxt,
                     btnClass: 'btn-confirm-login',
                     action: function(){
                         localStorage.setItem("loginBeforePath", window.location.href);
@@ -156,6 +156,13 @@ $(function(){
                 }
             }
         });
+    }
+    // 去登录弹窗
+    $('body').on("click", '.toLogin',function () {
+        loginAert('<span>你还未登录</span><span>请登录后再进行购买</span>', '去登录');
+    });
+    $('body').on("click", '.toLogOut',function () {
+        loginAert('<span>确定退出登录吗？</span>', '退出登录');
     });
     // 置顶
     $('#scrollTop').on("click", '.toTop',function () {
@@ -464,6 +471,11 @@ function toLogin() {//去登录
 function  upgrade () { //升级会员
     window.location.href='';
 }
+function toLogOut() {//登出
+    localStorage.removeItem('userInfo');
+    this.loginStatus = false;
+    window.location.href = "/index.html";
+}
 /**
  * 至少保留两位小数
  * 10 => "10.00"

src/main/resources/templates/components/header.html

@@ -45,7 +45,9 @@
             </a>
             <div class="mf h5Only mUserCenter">
                 <a :href="loginStatus?'/shopping/cart.html':'javascript:void(0);'" :class="loginStatus?'mAddCart mIcon':'mAddCart mIcon toLogin'" title="购物车"></a>
-                <a href="javascript:void(0);" :class="loginStatus?'mUserIcon mIcon':'mUserIcon mIcon toLogin'" title="个人中心"></a>
+                <a v-if="loginStatus&&GLOBAL_USER_IDENTITY==3" href="/supplier/dashboard.html" class="mUserIcon mIcon" title="供应商"></a>
+                <a v-else-if="loginStatus&&(GLOBAL_USER_IDENTITY==2||GLOBAL_USER_IDENTITY==4)" href="/user/dashboard.html" class="mUserIcon mIcon" title="机构"></a>
+                <a v-else href="javascript:void(0);" class="mUserIcon mIcon toLogin" title="个人中心"></a>
             </div>
             <div class="searchBox" id="topSearch">
                 <div class="search">

src/main/resources/templates/user-center/components/tableft.html

@@ -20,6 +20,7 @@
         <div class="con" style="display:none">
             <a href="/user/setting/password.html">重置密码</a>
             <a href="/user/setting/phone.html">更换手机号</a>
+            <a v-if="!isPC" class="toLogOut" href="javascript:void(0);">退出登录</a>
         </div>
     </div>
 </div>
@@ -49,6 +50,7 @@
                 <div class="con">
                     <a href="/user/setting/password.html">重置密码</a>
                     <a href="/user/setting/phone.html">更换手机号</a>
+                    <a v-if="!isPC" class="toLogOut" href="javascript:void(0);">退出登录</a>
                 </div>
             </div>
         </div>