Explorar o código

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

zhengjinyi %!s(int64=4) %!d(string=hai) anos
pai
achega
7ed60c6e2b

+ 2 - 3
src/main/resources/static/css/base/center.css

@@ -3,8 +3,7 @@
  * PC端
  */
 @media screen and (min-width:768px){
-    .navLayout {min-height: 900px;opacity: 0;}
-    .navLayout.active {opacity: 1;}
+    .navLayout {min-height: 900px;}
     .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}
@@ -42,7 +41,7 @@
 .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;}
-
+.centerNav .centerList .con a.on{color:#e15616;border-color:#e15616;}
 
 
 }

+ 0 - 84
src/main/resources/static/css/supplier-center/dashboard.css

@@ -1,88 +1,4 @@
  @media screen and (min-width:768px) {
-     /*左侧导航*/
-     .left {
-         float: left;
-         width: 200px;
-         line-height: 50px;
-         white-space: nowrap;
-         text-indent: 16px;
-         font-size: 16px;
-         background: #FFF;
-     }
-
-     #dashboard.left .title {
-         color: #22272e;
-         font-weight: bold;
-         border-bottom: 1px solid #f5f5f5
-     }
-
-     .navList .tab {
-         display: block;
-         color: #22272e;
-         position: relative
-     }
-
-     .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
-     }
-
-     .navList .con {
-         position: relative;
-     }
-
-     .navList .con:before, .navLayout .navList .con:after {
-         content: '';
-         position: absolute;
-         width: 168px;
-         border-top: 1px solid #f5f5f5;
-         left: 16px
-     }
-
-     .navList .con:before {
-         top: 0
-     }
-
-     .navList .con:after {
-         bottom: 0
-     }
-
-     .navList .con a {
-         display: block;
-         font-size: 14px;
-         color: #627386;
-         text-indent: 32px
-     }
-
-     .navList.on .tab:before {
-         top: 18px;
-         transform: rotate(270deg);
-         color: #e15616
-     }
-
-     .navList.on .tab {
-         color: #e15616
-     }
-
-     .navList .con a.on {
-         color: #e15616;
-         background-color: #ffe6dc
-     }
-
-     .right {
-         float: right;
-         width: 968px
-     }
-
      .pageContent {
          background: #FFF;
          padding: 16px

+ 0 - 30
src/main/resources/static/css/supplier-center/tableft.css

@@ -1,30 +0,0 @@
-@media screen and (min-width:768px) {
-    .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}
-}
-
-@media screen and (max-width:768px) {
-    .left { width: 100%;background: #fff;}
-    .navList {padding: 2.7vw; position: relative;}
-    .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;}
-}

+ 0 - 32
src/main/resources/static/css/user-center/message.css

@@ -4,23 +4,6 @@ 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}
     .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;}
@@ -45,21 +28,6 @@ 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}
-
-
-
 
 
 }

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

@@ -4,22 +4,6 @@ li{list-style:none}
  * PC端
  */
 @media screen and (min-width:768px){
-    .navLayout {min-height: 900px;}
-    .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}
     .order-header{width: 100%;height: 138px;box-sizing: border-box;padding: 20px;background-color: #FFF;box-shadow: 0px 3px 6px 0px rgba(0, 0, 0, 0.07);}
     .order-header .header-tp{width: 100%;height: 38px;float: left;margin-bottom: 25px;}
     .order-header .header-tp .header-tabs{width: 828px;height: 38px;float: left;}

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

@@ -14,105 +14,109 @@
 
 <!-- 我的采美 -->
 <div id="dashboard">
-    <div class="wrap clear navLayout">
-    <p class="zhuti" v-if="isPC">我的交易 &gt; 我的首页 </p>
-        <!--左侧面包屑-->
-        <template th:replace="supplier-center/components/tableft"></template>
+    <div class="navLayout" v-cloak>
+        <div v-if="isPC" class="crumbs">
+            <span>我的采美</span>
+        </div>
+        <div class="wrap clear">
+            <!--左侧导航-->
+            <template th:replace="supplier-center/components/tableft"></template>
 
-        <div class="right">
-            <div class="information">
-                <div class="head">
-                     <i class="icon Image" v-if="goodImage==null"></i>
-                     <img :src="goodImage" v-else>
-                     <input type="file" ref="goodImage" name="file" class="file_img" @change="uploadGoodsImagesFn" accept="image/png,image/jpeg,image/gif,image/jpg">
-                </div>
-                <div class="info_main">
-                    <div class="mainContent">
-                        <h3>{{shopinfo.sname}}</h3>
-                          <span v-if="promotions!=null" class="priceTag">
-                          <i class="tag icon mIcon" @click="toggleThisLadder($event)" v-text="promotions?promotions.name:''"></i>
-                          <div class="promotion mFixed">
-                                    <div>
-                                        <p class="t">
-                                            <em v-if="promotions.mode==2">{{promotions.name+',满 ¥'+toFloat(promotions.touchPrice)+' 减 ¥'+toFloat(promotions.reducedPrice)}}</em>
-                                            <em v-if="promotions.mode==3">{{promotions.name+',满 ¥'+toFloat(promotions.touchPrice)+' 赠送商品'}}</em>
-                                        </p>
-                                        <p>促销时间:<em >不限时</em><em v-else>{{promotions.beginTime.substr(0,10)+' ~ '+promotions.endTime.substr(0,10)}}</em></p>
-                                        <p v-if="promotions.type==2" class="r"><a class="more" :href="'/product/promotions.html?id='+promotions.id">更多凑单商品>>></a></p>
-                                        <template v-if="promotions.mode==3">
-                                            <p>赠品:</p>
-                                            <p>
-                                                <span v-for="g in promotions.giftList" class="p">
-                                                    <img :src="g.image">
-                                                    <span v-text="g.name"></span>
-                                                    <span v-text="'× '+g.number"></span>
-                                                </span>
+            <div class="right">
+                <div class="information">
+                    <div class="head">
+                         <i class="icon Image" v-if="goodImage==null"></i>
+                         <img :src="goodImage" v-else>
+                         <input type="file" ref="goodImage" name="file" class="file_img" @change="uploadGoodsImagesFn" accept="image/png,image/jpeg,image/gif,image/jpg">
+                    </div>
+                    <div class="info_main">
+                        <div class="mainContent">
+                            <h3>{{shopinfo.sname}}</h3>
+                              <span v-if="promotions!=null" class="priceTag">
+                              <i class="tag icon mIcon" @click="toggleThisLadder($event)" v-text="promotions?promotions.name:''"></i>
+                              <div class="promotion mFixed">
+                                        <div>
+                                            <p class="t">
+                                                <em v-if="promotions.mode==2">{{promotions.name+',满 ¥'+toFloat(promotions.touchPrice)+' 减 ¥'+toFloat(promotions.reducedPrice)}}</em>
+                                                <em v-if="promotions.mode==3">{{promotions.name+',满 ¥'+toFloat(promotions.touchPrice)+' 赠送商品'}}</em>
                                             </p>
-                                        </template>
-                                        <p class="r"><a class="close" @click="hideThisLadder($event)" href="JavaScript:void(0);">了解</a></p>
+                                            <p>促销时间:<em >不限时</em><em v-else>{{promotions.beginTime.substr(0,10)+' ~ '+promotions.endTime.substr(0,10)}}</em></p>
+                                            <p v-if="promotions.type==2" class="r"><a class="more" :href="'/product/promotions.html?id='+promotions.id">更多凑单商品>>></a></p>
+                                            <template v-if="promotions.mode==3">
+                                                <p>赠品:</p>
+                                                <p>
+                                                    <span v-for="g in promotions.giftList" class="p">
+                                                        <img :src="g.image">
+                                                        <span v-text="g.name"></span>
+                                                        <span v-text="'× '+g.number"></span>
+                                                    </span>
+                                                </p>
+                                            </template>
+                                            <p class="r"><a class="close" @click="hideThisLadder($event)" href="JavaScript:void(0);">了解</a></p>
+                                        </div>
                                     </div>
-                                </div>
-                          </span>
+                              </span>
+                        </div>
+                        <p class="username">用户名:{{shopinfo.name}}</p>
+                        <span class="perfect">立即完善</span>
+                        <span class="ziliao">资料完整度:<span>{{homeData.dataIntegrity}}</span></span>
+                    </div>
+                    <div class="message">
+                      <a href="/supplier/message/list.html">
+                        <span class="msg_num" v-if="msgFlag">{{homeData.unReadMessageCount}}</span>
+                        <span class="icon mIcon msg"></span>
+                        </a>
                     </div>
-                    <p class="username">用户名:{{shopinfo.name}}</p>
-                    <span class="perfect">立即完善</span>
-                    <span class="ziliao">资料完整度:<span>{{homeData.dataIntegrity}}</span></span>
-                </div>
-                <div class="message">
-                  <a href="/supplier/message/list.html">
-                    <span class="msg_num" v-if="msgFlag">{{homeData.unReadMessageCount}}</span>
-                    <span class="icon mIcon msg"></span>
-                    </a>
-                </div>
-            </div>
-            <div class="product">
-                <p>商品数据</p>
-                 <ul>
-                     <li class="icon confirm mIcon">
-                         <a href="">全部商品<span>{{homeData.allNum}}</span></a>
-                     </li>
-                      <li class="icon other confirm mIcon">
-                          <a>已上架<span>{{homeData.upNum}}</span></a>
-                     </li>
-                     <li class="icon down confirm mIcon">
-                         <a>已下架<span>{{homeData.downNum}}</span></a>
-                     </li>
-                 </ul>
-            </div>
-            <div class="ranking">
-                <div class="rank_top">
-                    <p>单品销售排名</p>
-                    <span>(统计标准:已确认的订单)</span>
                 </div>
-                <div class="sales-ranke">
-                    <ul>
-                        <li>排名</li>
-                        <li>商品信息</li>
-                        <li>销量</li>
-                    </ul>
+                <div class="product">
+                    <p>商品数据</p>
+                     <ul>
+                         <li class="icon confirm mIcon">
+                             <a href="">全部商品<span>{{homeData.allNum}}</span></a>
+                         </li>
+                          <li class="icon other confirm mIcon">
+                              <a>已上架<span>{{homeData.upNum}}</span></a>
+                         </li>
+                         <li class="icon down confirm mIcon">
+                             <a>已下架<span>{{homeData.downNum}}</span></a>
+                         </li>
+                     </ul>
                 </div>
-                <div class="shop-ranke">
-                   <ul v-for="(rk,index) in rankingList" :key="index">
-                       <li><i class="icon rank mIcon" :class="'rank'+index"></i></li>
-                       <li>
-                          <div class="shop-img">
-                             <img :src="rk.image">
-                          </div>
-                          <p>{{rk.name}}</p>
-                        </li>
-                        <li class="sales-num"><span>{{rk.total}}</span></li>
-                    </ul>
+                <div class="ranking">
+                    <div class="rank_top">
+                        <p>单品销售排名</p>
+                        <span>(统计标准:已确认的订单)</span>
+                    </div>
+                    <div class="sales-ranke">
+                        <ul>
+                            <li>排名</li>
+                            <li>商品信息</li>
+                            <li>销量</li>
+                        </ul>
+                    </div>
+                    <div class="shop-ranke">
+                       <ul v-for="(rk,index) in rankingList" :key="index">
+                           <li><i class="icon rank mIcon" :class="'rank'+index"></i></li>
+                           <li>
+                              <div class="shop-img">
+                                 <img :src="rk.image">
+                              </div>
+                              <p>{{rk.name}}</p>
+                            </li>
+                            <li class="sales-num"><span>{{rk.total}}</span></li>
+                        </ul>
+                    </div>
                 </div>
-            </div>
-<!-- 销售情况统计  -->
-            <div class="Statistics">
-                <div class="Stati_top">
-                    <p>销售情况统计</p>
-                    <span>(统计标准:已确认的订单)</span>
+                <!-- 销售情况统计  -->
+                <div class="Statistics">
+                    <div class="Stati_top">
+                        <p>销售情况统计</p>
+                        <span>(统计标准:已确认的订单)</span>
+                    </div>
+                     <div id="StatisticsEacths" style="">
+                    <!-- echarts表   -->
+                     </div>
                 </div>
-                 <div id="StatisticsEacths" style="">
-                <!-- echarts表   -->
-                 </div>
             </div>
         </div>
     </div>
@@ -124,8 +128,4 @@
 <script charset="utf-8" type="text/javascript" th:src="@{/lib/echarts.min.js(v=${version})}"></script>
 <script charset="utf-8" type="text/javascript" th:src="@{/js/supplier-center/dashboard.js(v=${version})}"></script>
 </body>
-    <script type="text/javascript">
-
-
-</script>
 </html>

+ 6 - 9
src/main/resources/templates/supplier-center/message/list.html

@@ -4,7 +4,7 @@
 <head>
     <title>采美365网-消息列表-中国美业全方位线上交易服务互动平台,做美业,上采美</title>
     <template th:replace="components/head-link"></template>
-    <link th:href="@{/css/supplier-center/tableft.css(v=${version})}" rel="stylesheet" type="text/css">
+    <link th:href="@{/css/base/center.css(v=${version})}" rel="stylesheet" type="text/css">
     <link th:href="@{/css/supplier-center/message.css(v=${version})}" rel="stylesheet" type="text/css">
 </head>
 <body>
@@ -13,17 +13,14 @@
 
 <!-- 我的消息 -->
 <div id="message">
-    <div class="navLayout" :class="isRequset ? 'active':''"   >
-        <div class="crumbs" v-if="isPC">
-            <span>我的交易</span>
-            <span>&gt;</span>
-            <span>我的首页</span>
+    <div class="navLayout" v-cloak>
+        <div v-if="isPC" class="crumbs">
+            <span>我的采美</span>
             <span>&gt;</span>
             <span>我的消息</span>
         </div>
-        <div v-else class="wrap_tittle mIcon"><span style="padding-left: 6.7vw">我的消息</span><i class="mIcon open"></i></div>
-        <div class="wrap clear ">
-            <!--左侧面包屑-->
+        <div class="wrap clear">
+            <!--左侧导航-->
             <template th:replace="supplier-center/components/tableft"></template>
             <div class="right">
                 <div class="mymessage-tt">所有信息</div>

+ 8 - 9
src/main/resources/templates/supplier-center/order/list.html

@@ -4,7 +4,7 @@
 <head>
     <title>采美365网-中国美业全方位线上交易服务互动平台,做美业,上采美</title>
     <template th:replace="components/head-link"></template>
-    <link th:href="@{/css/supplier-center/tableft.css(v=${version})}" rel="stylesheet" type="text/css">
+    <link th:href="@{/css/base/center.css(v=${version})}" rel="stylesheet" type="text/css">
     <link th:href="@{/css/supplier-center/orderlist.css(v=${version})}" rel="stylesheet" type="text/css">
 
 </head>
@@ -14,18 +14,17 @@
 
 <!-- 我的采美 -->
 <div id="orderList">
-  <div class="navLayout" :class="isRequset ? 'active':''"   >
-    <div class="crumbs" v-if="isPC">
+    <div class="navLayout" v-cloak>
+        <div v-if="isPC" class="crumbs">
+            <span>我的采美</span>
+            <span>&gt;</span>
             <span>我的交易</span>
             <span>&gt;</span>
             <span>我的订单</span>
         </div>
-         <div v-else class="wrap_tittle mIcon" @click="opentittle"><i class="mIcon open"></i><span style="margin-left: 25px;">我的订单</span></div>
-         <div class="wrap clear " >
-          <!--左侧面包屑-->
-          <div v-show="open">
-              <template th:replace="supplier-center/components/tableft" ></template>
-          </div>
+        <div class="wrap clear">
+            <!--左侧导航-->
+            <template th:replace="user-center/components/tableft"></template>
 
             <div class="right">
                 <div class="new-s-item">

+ 3 - 5
src/main/resources/templates/user-center/dashboard.html

@@ -13,14 +13,12 @@
 
 <!-- 我的采美 -->
 <div id="dashboard">
-    <div class="navLayout" :class="isRequset ? 'active':''" v-if="isRequset" v-cloak>
+    <div class="navLayout" v-cloak>
         <div v-if="isPC" class="crumbs">
-            <span>我的交易</span>
-            <span>&gt;</span>
-            <span>我的首页</span>
+            <span>我的采美</span>
         </div>
         <div class="wrap clear">
-            <!--左侧面包屑-->
+            <!--左侧导航-->
             <template th:replace="user-center/components/tableft"></template>
             <div class="right">
                 <div class="user-header">

+ 5 - 7
src/main/resources/templates/user-center/message/list.html

@@ -12,16 +12,14 @@
 
 <!-- 我的消息 -->
 <div id="dashboard">
-    <div class="navLayout" :class="isRequset ? 'active':''" v-if="isRequset">
-        <div class="crumbs">
-            <span>我的交易</span>
-            <span>&gt;</span>
-            <span>我的首页</span>
+    <div class="navLayout" 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">
                 <div class="content clear">

+ 6 - 4
src/main/resources/templates/user-center/order/list.html

@@ -11,14 +11,16 @@
 <template th:replace="components/header"></template>
 <!-- 我的采美 -->
 <div id="dashboard">
-    <div class="navLayout" th:object="${pageInfo}">
-        <div class="crumbs">
+    <div class="navLayout" v-cloak>
+        <div v-if="isPC" class="crumbs">
+            <span>我的采美</span>
+            <span>&gt;</span>
             <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">
                 <div class="order-header">