Forráskód Böngészése

机构个人中心-我的采美h5

chao 4 éve
szülő
commit
d08163334d

+ 20 - 5
src/main/resources/static/css/user-center/dashboard.css

@@ -46,7 +46,7 @@ li{list-style:none}
     .user-content .section .user-main .tabs-left .item a .icon.icon-3:before{width: 24px;height: 24px;background-position: -69px -516px;}
     .user-content .section .user-main .tabs-left .item a .icon.icon-4:before{width: 24px;height: 24px;background-position: -102px -516px;}
     .user-content .section .user-main .tabs-left .item a .icon.icon-5:before{width: 24px;height: 24px;background-position: -136px -516px;}
-    .user-content .section .user-main .tabs-left .item a p{font-size: 14px;color: #22272e;text-align: center;line-height: 20px;margin-top: 3px;}
+    .user-content .section .user-main .tabs-left .item a .p{display:block;font-size: 14px;color: #22272e;text-align: center;line-height: 20px;margin-top: 3px;}
     .user-content .section .user-main .tabs-right{float: right;line-height: 60px;font-size: 14px;color: #22272e;}
     .user-content .section .user-main .tabs-right a{display: block;float: right;padding-right: 16px;position: relative}
     .user-content .section .user-main .tabs-right a .icon{width: 18px;height: 18px;display: block;position: absolute;top: 4px;right: -10px;}
@@ -74,7 +74,7 @@ li{list-style:none}
     .user-content .section .user-main .product-item .product-img{width: 171px;height: 171px;float: left;border: 1px solid #e2e7ef;}
     .user-content .section .user-main .product-item .product-img img{width: 173px;height: 173px;display: block;}
     .user-content .section .user-main .product-item .product-name{width: 100%;height: 40px;float: left;margin-top: 10px;}
-    .user-content .section .user-main .product-item .product-name p{font-size: 14px;color: #93979f;text-align: justify;line-height: 20px;text-overflow: -o-ellipsis-lastline;overflow: hidden;text-overflow: ellipsis;display: -webkit-box;-webkit-line-clamp: 2;line-clamp: 2;-webkit-box-orient: vertical;}
+    .user-content .section .user-main .product-item .product-name p{font-size: 14px;color: #93979f;text-align: justify;line-height: 20px;overflow: hidden;text-overflow: ellipsis;display: -webkit-box;-webkit-line-clamp: 2;line-clamp: 2;-webkit-box-orient: vertical;}
     .user-content .section .user-main .product-item .product-name p:hover{color: #E15616;text-decoration: underline;}
     .user-content .section .user-main.news{height: 207px;padding: 13px 20px;}
     .user-content .section .user-main .new-list{width: 100%;height: 36px;float: left;cursor: pointer;}
@@ -88,7 +88,7 @@ li{list-style:none}
 * 移动端
 */
 @media screen and (max-width:768px){
-    .user-header{box-sizing:border-box;width:100%;height:33.9vw;padding:2.7vw;background:#fff;box-shadow:0 .8vw 1.6vw 0 rgba(0,0,0,0.07);position:relative}
+    .user-header{box-sizing:border-box;width:100%;padding:2.7vw;background:#fff;position:relative}
     .user-header .logo{width:26.7vw;height:19.4vw;border:solid 1px #f5f5f5;margin-right:2.7vw;position:relative}
     .user-header .logo .logo-file{width:26.7vw;height:19.4vw;outline:none;opacity:0;position:absolute;top:0;left:0}
     .user-header .logo .file{position:absolute;top:5vw;left:9vw;width:9vw;height:9vw}
@@ -102,8 +102,23 @@ li{list-style:none}
     .user-header .message{position:absolute;right:0;top:5vw}
     .user-header .message .mIcon{position:absolute;right:0;top:0}
     .user-header .message .mIcon:before{width:8vw;height:8vw;background-position:-16.5vw -60.3vw}
-    .user-header .message .ellipse{display:inline-block;padding:.3vw;border-radius:2vw;font-size:2.8vw;background-color:#f55c5c;color:#FFF;font-style:normal;position:absolute;right:4vw;top:-1vw}
-
+    .user-header .message .ellipse{padding:.6vw;border-radius:3.1vw;font-size:3.1vw;background-color:#f55c5c;color:#FFF;font-style:normal;position:absolute;right:4vw;top:-1vw;transform:scale(.7)}
+    .user-content{width:100%;margin:0 auto 2.4vw auto;background:#FFF}
+    .user-content .user-main .tabs-left{box-sizing:border-box;width:100vw;padding:.7vw 6vw 4vw 6vw}
+    .user-content .user-main .tabs-left .item{width:20.8vw;height:8.4vw;line-height:8.4vw;text-align:center;border-radius:4.2vw;border:1px solid #b8bfca;font-size:3.3vw;color:#627386;margin:3.3vw 4vw 0 4vw;position:relative}
+    .user-content .user-main .tabs-left .item .icon span{height:4.6vw;line-height:4.6vw;padding:0 .6vw;border-radius:2.1vw;font-size:3.1vw;background-color:#f55c5c;color:#FFF;font-style:normal;position:absolute;right:1vw;top:-2vw}
+    .user-content .title{box-sizing:border-box;padding:0 3.2vw;height:10.3vw;line-height:10.3vw;font-size:3.4vw;color:#22272e}
+    .user-content .title a{float:right;color:#627386}
+    .user-content .title a:after{content:'\276F';margin-left:1vw}
+    .user-content .user-main.product{width:100%;height:43vw;overflow-x:scroll;overflow-y:hidden;white-space:nowrap}
+    .user-content .product-item{display:inline-block;width:26.7vw;height:43vw;margin-left:2.6vw;overflow:hidden}
+    .user-content .product-item .product-img{box-sizing:border-box;width:100%;height:26.7vw;border:solid 1px #fef6f3}
+    .user-content .product-item .product-name p{margin-top:2.6vw;line-height:6vw;font-size:3.4vw;color:#627386;overflow:hidden;text-overflow:ellipsis;display:-webkit-box;-webkit-line-clamp:2;-webkit-box-orient:vertical}
+    .user-content .user-main.news{box-sizing:border-box;width:100%;padding:0 3.2vw 2vw 3.2vw}
+    .user-content .user-main .new-list{box-sizing:border-box;display:block;margin-bottom:2vw;font-size:3.4vw;position:relative;padding-left:4vw;line-height:6vw}
+    .user-content .user-main .new-list:before{content:'\25CF';color:#9aa5b5;position:absolute;left:0}
+    .user-content .user-main .new-list .text{white-space:nowrap;overflow:hidden;text-overflow:ellipsis;color:#4a4f58}
+    .user-content .user-main .new-list .time{color:#9aa5b5}
 
 
 

+ 24 - 1
src/main/resources/templates/user-center/address/form.html

@@ -4,7 +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">
 </head>
 <body>
 <!-- 引用头部 -->
@@ -12,7 +12,30 @@
 
 <!-- 我的采美 -->
 <div>
+    <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">
+            <!--左侧导航-->
+            <template th:replace="user-center/components/tableft"></template>
+            <div class="right">
+
+
+
+
+
+
+
+
 
+            </div>
+        </div>
+    </div>
 </div>
 
 <!-- 引入底部 -->

+ 5 - 4
src/main/resources/templates/user-center/address/list.html

@@ -4,21 +4,22 @@
 <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/address/list.css(v=${version})}" rel="stylesheet" type="text/css">
 </head>
 <body>
 <!-- 引用头部 -->
 <template th:replace="components/header"></template>
 <!-- 我的地址 -->
-<div id="orderPage" v-cloak>
-    <div class="navLayout" th:object="${pageInfo}">
-        <div class="crumbs">
+<div id="orderPage">
+    <div class="navLayout" v-cloak>
+        <div v-if="isPC" class="crumbs">
             <span>我的交易</span>
             <span>&gt;</span>
             <span>收货地址管理</span>
         </div>
         <div class="wrap clear">
-            <!--左侧面包屑-->
+            <!--左侧导航-->
             <template th:replace="user-center/components/tableft"></template>
             <div class="right">
                 <div class="order-header">

+ 19 - 14
src/main/resources/templates/user-center/dashboard.html

@@ -46,59 +46,64 @@
                         </div>
                     </div>
                     <div class="user-content clear">
-                        <div class="title">我的订单</div>
+                        <div v-show="isPC" class="title">我的订单</div>
                         <div class="section">
                             <div class="user-main tabs">
-                                <div class="tabs-left">
+                                <div class="tabs-left mfw">
+                                    <div v-if="!isPC" class="item">
+                                        <a href="javascript:void(0);" @click="orderListPath(0)">
+                                            <span class="p">全部订单</span>
+                                        </a>
+                                    </div>
                                     <div class="item">
                                         <a href="javascript:void(0);" @click="orderListPath(1)">
-                                            <i class="icon mIcon icon-1">
+                                            <i class="icon icon-1">
                                                 <span v-if="confirmedCount>0" :class="[confirmedCount < 10 ? 'circular':'ellipse']">{{confirmedCount == 99 ? '99+' : confirmedCount}}</span>
                                             </i>
-                                            <p>待确认</p>
+                                            <span class="p">待确认</span>
                                         </a>
                                     </div>
                                     <div class="item">
                                         <a href="javascript:void(0);" @click="orderListPath(2)">
-                                            <i class="icon mIcon icon-2">
+                                            <i class="icon icon-2">
                                                 <span v-if="paymentCount>0" :class="[paymentCount < 10 ? 'circular':'ellipse']">{{paymentCount == 99 ? '99+' : paymentCount}}</span>
                                             </i>
-                                            <p>待付款</p>
+                                            <span class="p">待付款</span>
                                         </a>
                                     </div>
                                     <div class="item">
                                         <a href="javascript:void(0);" @click="orderListPath(3)">
-                                            <i class="icon mIcon icon-3">
+                                            <i class="icon icon-3">
                                                 <span v-if="waitShipmentsCount>0" :class="[waitShipmentsCount < 10 ? 'circular':'ellipse']">{{waitShipmentsCount == 99 ? '99+' : waitShipmentsCount}}</span>
                                             </i>
-                                            <p>待发货</p>
+                                            <span class="p">待发货</span>
                                         </a>
                                     </div>
                                     <div class="item">
                                         <a href="javascript:void(0);" @click="orderListPath(4)">
-                                            <i class="icon mIcon icon-4">
+                                            <i class="icon icon-4">
                                                 <span v-if="shipmentsCount>0" :class="[shipmentsCount < 10 ? 'circular':'ellipse']">{{shipmentsCount == 99 ? '99+' : shipmentsCount}}</span>
                                             </i>
-                                            <p>已发货</p>
+                                            <span class="p">已发货</span>
                                         </a>
                                     </div>
                                     <div class="item">
                                         <a href="javascript:void(0);" @click="orderListPath(5)">
-                                            <i class="icon mIcon icon-5">
+                                            <i class="icon icon-5">
                                                 <span v-if="salesReturnCount>0" :class="[salesReturnCount < 10 ? 'circular':'ellipse']">{{salesReturnCount == 99 ? '99+' : salesReturnCount}}</span>
                                             </i>
-                                            <p>退货/款</p>
+                                            <span class="p">退货/款</span>
                                         </a>
                                     </div>
                                 </div>
-                                <div class="tabs-right"><a href="javascript:void(0);" @click="orderListPath(0)">全部订单<span class="icon mIcon"></span></a></div>
+                                <div v-if="isPC" class="tabs-right"><a href="javascript:void(0);" @click="orderListPath(0)">全部订单<span class="icon mIcon"></span></a></div>
                             </div>
                         </div>
                     </div>
                     <div class="user-content">
                         <div class="title">今日推荐</div>
                         <div class="section">
-                            <div class="user-main product">
+                            <div class="user-main product clear">
                                 <a class="product-item" v-for="(item, index) in productList" :key="index" :href="item.link" target="_blank">
                                     <div class="product-img">
                                         <img :src="item.image" :alt="item.title">

+ 5 - 4
src/main/resources/templates/user-center/operation/form.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/base/form.css(v=${version})}" rel="stylesheet" type="text/css">
     <link th:href="@{/css/user-center/operation/form.css(v=${version})}" rel="stylesheet" type="text/css">
 </head>
@@ -11,9 +12,9 @@
 <!-- 引用头部 -->
 <template th:replace="components/header"></template>
 <!-- 运营人员管理 -->
-<div id="operationPage" v-cloak>
-    <div class="navLayout" th:object="${pageInfo}">
-        <div class="crumbs">
+<div id="operationPage">
+    <div class="navLayout" v-cloak>
+        <div v-if="isPC" class="crumbs">
             <span>机构管理中心</span>
             <span>&gt;</span>
             <span>运营人员管理</span>
@@ -21,7 +22,7 @@
             <span>添加运营人员</span>
         </div>
         <div class="wrap clear">
-            <!--左侧面包屑-->
+            <!--左侧导航-->
             <template th:replace="user-center/components/tableft"></template>
             <div class="right">
                 <div class="order-header">

+ 5 - 4
src/main/resources/templates/user-center/operation/list.html

@@ -4,21 +4,22 @@
 <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/operation/list.css(v=${version})}" rel="stylesheet" type="text/css">
 </head>
 <body>
 <!-- 引用头部 -->
 <template th:replace="components/header"></template>
 <!-- 运营人员管理 -->
-<div id="operationPage" v-cloak>
-    <div class="navLayout" th:object="${pageInfo}">
-        <div class="crumbs">
+<div id="operationPage">
+    <div class="navLayout" v-cloak>
+        <div v-if="isPC" class="crumbs">
             <span>机构管理中心</span>
             <span>&gt;</span>
             <span>运营人员管理</span>
         </div>
         <div class="wrap clear">
-            <!--左侧面包屑-->
+            <!--左侧导航-->
             <template th:replace="user-center/components/tableft"></template>
             <div class="right">
                 <div class="order-header">

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

@@ -4,15 +4,17 @@
 <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/order/detail.css(v=${version})}" rel="stylesheet" type="text/css">
 
 </head>
 <body>
 <!-- 引用头部 -->
 <template th:replace="components/header"></template>
-<div id="orderPage" v-cloak>
-    <div class="navLayout" th:object="${pageInfo}">
-        <div class="crumbs">
+
+<div id="orderPage">
+    <div class="navLayout" v-cloak>
+        <div v-if="isPC" class="crumbs">
             <span>我的交易</span>
             <span>&gt;</span>
             <span>我的订单</span>
@@ -20,7 +22,7 @@
             <span>订单详情</span>
         </div>
         <div class="wrap clear">
-            <!--左侧面包屑-->
+            <!--左侧导航-->
             <template th:replace="user-center/components/tableft"></template>
             <div class="right">
                 <!--loading-->

+ 3 - 2
src/main/resources/templates/user-center/order/list.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/order/orderlist.css(v=${version})}" rel="stylesheet" type="text/css">
 </head>
 <body>
@@ -11,8 +12,8 @@
 <template th:replace="components/header"></template>
 <!-- 我的订单 -->
 <div id="orderPage" v-cloak>
-    <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>

+ 3 - 3
src/main/resources/templates/user-center/repair/detail.html

@@ -12,8 +12,8 @@
 <template th:replace="components/header"></template>
 <!--维修详情-->
 <div id="repairDetailPage">
-    <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>
@@ -21,7 +21,7 @@
             <span>维修详情</span>
         </div>
         <div class="wrap clear">
-            <!--左侧面包屑-->
+            <!--左侧导航-->
             <template th:replace="user-center/components/tableft"></template>
             <div class="right">
                 <div class="container clear">

+ 4 - 4
src/main/resources/templates/user-center/repair/form-user.html

@@ -11,9 +11,9 @@
 <!-- 引用头部 -->
 <template th:replace="components/header"></template>
 <!-- 我的维修 -->
-<div id="addFormPage" v-cloak>
-    <div class="navLayout" th:object="${pageInfo}">
-        <div class="crumbs">
+<div id="addFormPage">
+    <div class="navLayout" v-cloak>
+        <div v-if="isPC" class="crumbs">
             <span>我的交易</span>
             <span>&gt;</span>
             <span>我的维修</span>
@@ -21,7 +21,7 @@
             <span>申请维修</span>
         </div>
         <div class="wrap clear">
-            <!--左侧面包屑-->
+            <!--左侧导航-->
             <template th:replace="user-center/components/tableft"></template>
             <div class="right">
                 <div class="container clear">

+ 4 - 5
src/main/resources/templates/user-center/repair/list.html

@@ -10,16 +10,15 @@
 <!-- 引用头部 -->
 <template th:replace="components/header"></template>
 <!-- 我的维修 -->
-<div id="orderPage" v-cloak>
-    <div class="navLayout" th:object="${pageInfo}">
-        <div class="crumbs">
+<div id="orderPage">
+    <div class="navLayout" v-cloak>
+        <div v-if="isPC" class="crumbs">
             <span>我的交易</span>
             <span>&gt;</span>
             <span>我的维修</span>
-            <a class="link" href="/user/repair/form.html">申请维修</a>
         </div>
         <div class="wrap clear">
-            <!--左侧面包屑-->
+            <!--左侧导航-->
             <template th:replace="user-center/components/tableft"></template>
             <div class="right">
                 <div class="order-header">

+ 4 - 4
src/main/resources/templates/user-center/setting/information.html

@@ -12,15 +12,15 @@
 <!-- 引用头部 -->
 <template th:replace="components/header"></template>
 <!-- 修改资料 -->
-<div id="informationPage" v-cloak>
-    <div class="navLayout" th:object="${pageInfo}">
-        <div class="crumbs">
+<div id="informationPage">
+    <div class="navLayout" v-cloak>
+        <div v-if="isPC" class="crumbs">
             <span>机构管理中心</span>
             <span>&gt;</span>
             <span>修改资料</span>
         </div>
         <div class="wrap clear">
-            <!--左侧面包屑-->
+            <!--左侧导航-->
             <template th:replace="user-center/components/tableft"></template>
             <div class="right">
                 <!--loading-->

+ 4 - 4
src/main/resources/templates/user-center/setting/password.html

@@ -12,15 +12,15 @@
 <!-- 引用头部 -->
 <template th:replace="components/header"></template>
 <!-- 重置密码 -->
-<div id="passwordPage" v-cloak>
-    <div class="navLayout" th:object="${pageInfo}">
-        <div class="crumbs">
+<div id="passwordPage">
+    <div class="navLayout" v-cloak>
+        <div v-if="isPC" class="crumbs">
             <span>账户设置</span>
             <span>&gt;</span>
             <span>重置密码</span>
         </div>
         <div class="wrap clear">
-            <!--左侧面包屑-->
+            <!--左侧导航-->
             <template th:replace="user-center/components/tableft"></template>
             <div class="right">
                 <div class="right-header">

+ 4 - 4
src/main/resources/templates/user-center/setting/phone.html

@@ -12,15 +12,15 @@
 <!-- 引用头部 -->
 <template th:replace="components/header"></template>
 <!-- 修改资料 -->
-<div id="phonePage" v-cloak>
-    <div class="navLayout" th:object="${pageInfo}">
-        <div class="crumbs" v-if="isPC">
+<div id="phonePage">
+    <div class="navLayout" v-cloak>
+        <div v-if="isPC" class="crumbs">
             <span>账户设置</span>
             <span>&gt;</span>
             <span>更换手机号</span>
         </div>
         <div class="wrap clear">
-            <!--左侧面包屑-->
+            <!--左侧导航-->
             <template th:replace="user-center/components/tableft"></template>
             <div class="right">
                 <div class="header">

+ 4 - 4
src/main/resources/templates/user-center/setting/upgrade.html

@@ -12,15 +12,15 @@
 <!-- 引用头部 -->
 <template th:replace="components/header"></template>
 <!-- 升级机构 -->
-<div id="upgradePage" v-cloak>
-    <div class="navLayout" th:object="${pageInfo}">
-        <div class="crumbs">
+<div id="upgradePage">
+    <div class="navLayout" v-cloak>
+        <div v-if="isPC" class="crumbs">
             <span>机构管理中心</span>
             <span>&gt;</span>
             <span>机构升级</span>
         </div>
         <div class="wrap clear">
-            <!--左侧面包屑-->
+            <!--左侧导航-->
             <template th:replace="user-center/components/tableft"></template>
             <div class="right">
                 <!--loading-->