Merge remote-tracking branch 'origin/developerB' into developerB

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

@@ -0,0 +1,48 @@
+@charset "utf-8";
+/**
+ * PC端
+ */
+@media screen and (min-width:768px){
+    .navLayout {min-height: 900px;opacity: 0;}
+    .navLayout.active {opacity: 1;}
+    .crumbs{padding-left: 220px;}
+    .navLayout .left{float:left;width:200px;line-height:50px;white-space:nowrap;text-indent:16px;font-size:16px;background:#FFF}
+    .navLayout .left .title{color:#22272e;font-weight:bold;border-bottom:1px solid #f5f5f5}
+    .navLayout .navList .tab{display:block;color:#22272e;position:relative;cursor: pointer;}
+    .navLayout .navList .tab:before{content:'\276F';font-weight:normal;position:absolute;right:10px;top:0;transform:rotate(90deg);width:32px;height:32px;line-height:32px;text-align:center;color:#bec2c9}
+    .navLayout .navList .con{position:relative;}
+    .navLayout .navList .con:before,.navLayout .navList .con:after{content:'';position:absolute;width:168px;border-top:1px solid #f5f5f5;left:16px}
+    .navLayout .navList .con:before{top:0}
+    .navLayout .navList .con:after{bottom:0}
+    .navLayout .navList .con a{display:block;font-size:14px;color:#627386;text-indent:32px}
+    .navLayout .navList.on .tab:before{top:18px;transform:rotate(270deg);color:#e15616}
+    .navLayout .navList.on .tab{color:#e15616}
+    .navLayout .navList .con a.on{color:#e15616;background-color:#ffe6dc}
+    .navLayout .right{float:right;width:968px}
+
+
+}
+
+/**
+* 移动端
+*/
+@media screen and (max-width:768px){
+.centerNav{width:100%;height:11vw;background:#FFF;position:relative;z-index:90;}
+.centerNav .centerBox{content:'';position:fixed;background-color:rgba(74,79,88,.7);width:100%;height:100%;display:none}
+.centerNav .wrap{position:absolute;top:0;left:0;width:100%;background:#FFF;padding-bottom:4vw;border-radius:0 0 3vw 3vw;font-size:3.4vw;z-index:9}
+.centerNav .wrap .centerList:first-child .tab{border-top:solid 1px #f0f2f4}
+.centerNav .centerList .tab{display:block;margin:0 auto;width:93.4vw;height:10.8vw;line-height:10.8vw;color:#22272e;position:relative}
+.centerNav .centerList .tab.home{border-bottom:solid 1px #f0f2f4;}
+.centerNav .centerList .tab.home:after{content:'\276F';font-weight:normal;position:absolute;top:0;font-size:3.6vw;color:#4A4F58;right:4vw;line-height:9.6vw}
+.centerNav .centerList .tab.home.on:after{transform:rotate(90deg)}
+.centerNav .centerList .tab:before{width:6.4vw;height:6.4vw;vertical-align:middle}
+.centerNav .centerList .tab.home:before{background-position:-50.5vw -53vw}
+.centerNav .centerList .tab.tr:before{background-position:-58.8vw -53vw}
+.centerNav .centerList .tab.ma:before{background-position:-67.1vw -53vw}
+.centerNav .centerList .tab.se:before{background-position:-41.7vw -53vw}
+.centerNav .centerList .tab.sh:before{background-position:-75.6vw -53vw}
+.centerNav .centerList .con a{display:inline-block;height:8.4vw;line-height:8.4vw;padding:0 3.5vw;border:1px solid #b8bfca;border-radius:2px;color:#627386;margin:0 0 2vw 4vw;}
+
+
+
+}

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

@@ -460,49 +460,6 @@
     float: right;
     background-position: -48.8vw 2.7vw;
 }
-.left{
-    width: 100%;
-    background: #fff;
-}
-.mIcon.navList:before{
-     width: 6.7vw;
-     height: 6.7vw;
-     position: absolute;
-     top: .8vw;
-}
-.mIcon.one:before{
-    background-position: -59.2vw -51.5vw;
-}
-.mIcon.two:before{
-    background-position: -75.7vw -51.5vw;
-}
-.mIcon.three:before{
-    background-position: -33.9vw -51.5vw;
-}
-.mIcon.four:before{
-    background-position: -42.1vw -51.5vw;
-}
-.navList{
-    padding:2.7vw;
-    position: relative;
-}
-.navList .tab{
-    margin-left: 6.7vw;
-    color: #22272e;
-}
-.con{
-    margin-top: 2.7vw;
-}
-.con a{
-    color: #627386;
-    height: 8.6vw;
-    line-height: 8.6vw;
-    border: 1px solid #b8bfca;
-    display: inline-block;
-    width: 20.8vw;
-    text-align: center;
-    margin: 1.9vw 1.3vw;
-}
 .information {
      background: #fff;
     padding: 2.7vw;

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

@@ -4,23 +4,7 @@ li{list-style:none}
  * PC端
  */
 @media screen and (min-width:768px){
-    .navLayout {min-height: 900px;opacity: 0;}
-    .navLayout.active {opacity: 1;}
-    .crumbs{padding-left: 220px;}
-    .navLayout .left{float:left;width:200px;line-height:50px;white-space:nowrap;text-indent:16px;font-size:16px;background:#FFF}
-    .navLayout .left .title{color:#22272e;font-weight:bold;border-bottom:1px solid #f5f5f5}
-    .navLayout .navList .tab{display:block;color:#22272e;position:relative;cursor: pointer;}
-    .navLayout .navList .tab:before{content:'\276F';font-weight:normal;position:absolute;right:10px;top:0;transform:rotate(90deg);width:32px;height:32px;line-height:32px;text-align:center;color:#bec2c9}
-    .navLayout .navList .con{position:relative;}
-    .navLayout .navList .con:before,.navLayout .navList .con:after{content:'';position:absolute;width:168px;border-top:1px solid #f5f5f5;left:16px}
-    .navLayout .navList .con:before{top:0}
-    .navLayout .navList .con:after{bottom:0}
-    .navLayout .navList .con a{display:block;font-size:14px;color:#627386;text-indent:32px}
-    .navLayout .navList.on .tab:before{top:18px;transform:rotate(270deg);color:#e15616}
-    .navLayout .navList.on .tab{color:#e15616}
-    .navLayout .navList .con a.on{color:#e15616;background-color:#ffe6dc}
     /*个人中心右侧*/
-    .navLayout .right{float:right;width:968px}
     .user-header{width: 100%;height: 120px;box-sizing: border-box;padding: 20px;background-color: #FFF;box-shadow: 0px 3px 6px 0px rgba(0, 0, 0, 0.07);}
     .user-header .header-ml{width: 50%;height:80px;float: left;}
     .user-header .header-ml .logo{width: 110px;height:78px;float: left;border: 1px solid #f5f5f5;border-radius: 2px;margin-right: 8px;position: relative;cursor: pointer;}
@@ -105,18 +89,7 @@ li{list-style:none}
 * 移动端
 */
 @media screen and (max-width:768px){
-.navLayout{background:#FFF;border-top:1px solid #F5F5F5;border-bottom:1px solid #F5F5F5;}
-.navLayout.active {opacity: 1;}
-.navLayout .crumbs{display:none;}
-.navLayout .left{width:29.3vw;border-right:1px solid #F5F5F5;line-height:11.8vw;white-space:nowrap;text-indent:3.3vw;font-size:3.4vw;}
-.navLayout .left .title{color:#22272e;font-weight:bold;border-bottom:1px solid #f5f5f5;font-size: 3.7vw;}
-.navLayout .navList .tab{display:block;color:#22272e;position:relative}
-.navLayout .navList .tab:before{content:'\276F';font-weight:normal;position:absolute;right:1.4vw;top:1vw;transform:rotate(90deg);width:6.4vw;height:6.4vw;line-height:6.4vw;text-align:center;color:#bec2c9}
-.navLayout .navList .con a{display:block;color:#9aa5b5;}
-.navLayout .navList.on .tab:before{top:4vw;transform:rotate(270deg);color:#e15616}
-.navLayout .navList.on .tab{color:#e15616}
-.navLayout .navList .con a.on{color:#e15616;background-color:#ffe6dc}
-.navLayout .right{width:70.5vw}
+
 
 
 

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

@@ -172,6 +172,17 @@ $(function(){
             $('#scrollTop').find('.phoneHover').hide();
             looseBody();
         });
+        $('body').on("click", '#centerNav .home',function () {
+            $('#centerNav').find('.home').toggleClass("on");
+            $('#centerNav').find('.centerBox').slideToggle();
+            fixedBody();
+        }).on("click", '#centerNav .wrap',function (e) {
+            e.stopPropagation();
+        }).on("click", '#centerNav .centerBox',function () {
+             $('#centerNav').find('.home').removeClass("on");
+            $('#centerNav').find('.centerBox').slideUp();
+            looseBody();
+        });
     }
     // 侧边栏滚动判断
     $(window).scroll(function () {

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

@@ -1,6 +1,6 @@
-<div class="left">
+<div v-if="isPC"  class="left">
     <div class="title"><a href="/supplier/dashboard.html">我的采美</a></div>
-    <div class="navList mIcon one">
+    <div class="navList">
         <span class="tab">我的交易</span>
         <div class="con" style="display:none">
             <!--<a href="/supplier/dashboard.html">我的首页</a>-->
@@ -9,10 +9,10 @@
             <a href="/">评价管理</a>
         </div>
     </div>
-    <div class="navList mIcon two">
+    <div class="navList">
         <span class="tab">我的店铺</span>
         <div class="con" style="display:none">
-            <a href="/">查看店铺</a>
+            <a :href="'/supplier/index.html?id='+GLOBAL_SHOP_ID">查看店铺</a>
             <a href="/supplier/decoration.html">装扮主页</a>
             <a href="/supplier/release.html">发布商品</a>
             <a href="/supplier/goods.html">我的商品</a>
@@ -20,14 +20,14 @@
 
         </div>
     </div>
-    <div class="navList mIcon three">
+    <div class="navList">
         <span class="tab">管理中心</span>
         <div class="con" style="display:none">
             <a href="/supplier/setting/information.html">资料信息</a>
             <a href="/supplier/operation/list.html">员工管理</a>
         </div>
     </div>
-    <div class="navList mIcon four">
+    <div class="navList">
         <span class="tab">账户设置</span>
         <div class="con" style="display:none">
             <a href="/supplier/setting/password.html">重置密码</a>
@@ -35,3 +35,45 @@
         </div>
     </div>
 </div>
+<div v-if="!isPC" class="centerNav" id="centerNav">
+    <div class="centerList">
+        <a class="tab mIcon home" href="javascript:void(0);">我的采美</a>
+    </div>
+    <div class="centerBox">
+        <div class="wrap">
+            <div class="centerList">
+                <span class="tab mIcon tr">我的交易</span>
+                <div class="con">
+                    <a href="/supplier/order/list.html">我的订单</a>
+                    <a href="/supplier/order/settlement.html">结算管理</a>
+                    <a href="/">评价管理</a>
+                </div>
+            </div>
+            <div class="centerList">
+                <span class="tab mIcon sh">我的店铺</span>
+                <div class="con">
+                    <a :href="'/supplier/index.html?id='+GLOBAL_SHOP_ID">查看店铺</a>
+                    <a href="/supplier/decoration.html">装扮主页</a>
+                    <a href="/supplier/release.html">发布商品</a>
+                    <a href="/supplier/goods.html">我的商品</a>
+                    <a href="/supplier/goods.html">品牌管理</a>
+                </div>
+            </div>
+            <div class="centerList">
+                <span class="tab mIcon ma">机构管理中心</span>
+                <div class="con">
+                    <a href="/supplier/setting/information.html">资料信息</a>
+                    <a href="/supplier/operation/list.html">员工管理</a>
+                </div>
+            </div>
+            <div class="centerList">
+                <span class="tab mIcon se">账户设置</span>
+                <div class="con">
+                    <a href="/supplier/setting/password.html">重置密码</a>
+                    <a href="/supplier/setting/phone.html">更换手机</a>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+

src/main/resources/templates/supplier-center/dashboard.html

@@ -4,6 +4,7 @@
 <head>
     <title>采美365网-中国美业全方位线上交易服务互动平台，做美业，上采美</title>
     <template th:replace="components/head-link"></template>
+    <link th:href="@{/css/base/center.css(v=${version})}" rel="stylesheet" type="text/css">
     <link th:if="${pageId==1026}" th:href="@{/css/base/form.css(v=${version})}" rel="stylesheet" type="text/css">
     <link th:href="@{/css/supplier-center/dashboard.css(v=${version})}" rel="stylesheet" type="text/css">
 </head>
@@ -15,7 +16,6 @@
 <div id="dashboard">
     <div class="wrap clear navLayout">
     <p class="zhuti" v-if="isPC">我的交易 &gt; 我的首页 </p>
-    <div v-else class="wrap_tittle mIcon" @click="opentitle"><i class="mIcon open"></i><span style="margin-left: 25px;">我的主页</span></div>
         <!--左侧面包屑-->
         <template th:replace="supplier-center/components/tableft"></template>
 

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

@@ -1,4 +1,4 @@
-<div class="left">
+<div v-if="isPC" class="left">
     <div class="title"><a href="/user/dashboard.html">我的采美</a></div>
     <div class="navList">
         <span class="tab">我的交易</span>
@@ -23,3 +23,34 @@
         </div>
     </div>
 </div>
+<div v-if="!isPC" class="centerNav" id="centerNav">
+    <div class="centerList">
+        <a class="tab mIcon home" href="javascript:void(0);">我的采美</a>
+    </div>
+    <div class="centerBox">
+        <div class="wrap">
+            <div class="centerList">
+                <span class="tab mIcon tr">我的交易</span>
+                <div class="con">
+                    <a href="/user/order/list.html">我的订单</a>
+                    <a href="/user/repair/list.html">我的维修</a>
+                    <a href="/user/address/list.html">收货地址管理</a>
+                </div>
+            </div>
+            <div class="centerList">
+                <span class="tab mIcon ma">机构管理中心</span>
+                <div class="con">
+                    <a href="/user/setting/information.html">机构资料</a>
+                    <a href="/user/operation/list.html">运营人员管理</a>
+                </div>
+            </div>
+            <div class="centerList">
+                <span class="tab mIcon se">账户设置</span>
+                <div class="con">
+                    <a href="/user/setting/password.html">重置密码</a>
+                    <a href="/user/setting/phone.html">更换手机号</a>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>

src/main/resources/templates/user-center/dashboard.html

@@ -4,6 +4,7 @@
 <head>
     <title>采美365网-中国美业全方位线上交易服务互动平台，做美业，上采美</title>
     <template th:replace="components/head-link"></template>
+    <link th:href="@{/css/base/center.css(v=${version})}" rel="stylesheet" type="text/css">
     <link th:href="@{/css/user-center/dashboard.css(v=${version})}" rel="stylesheet" type="text/css">
 </head>
 <body>
@@ -12,13 +13,13 @@
 
 <!-- 我的采美 -->
 <div id="dashboard">
-    <div class="navLayout" :class="isRequset ? 'active':''" v-if="isRequset">
-        <div class="crumbs">
+    <div class="navLayout" :class="isRequset ? 'active':''" v-if="isRequset" v-cloak>
+        <div v-if="isPC" class="crumbs">
             <span>我的交易</span>
             <span>&gt;</span>
             <span>我的首页</span>
         </div>
-        <div class="wrap clear mf">
+        <div class="wrap clear">
             <!--左侧面包屑-->
             <template th:replace="user-center/components/tableft"></template>
             <div class="right">