bugCommit

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

@@ -244,7 +244,7 @@ header{box-shadow: 0 2px 10px #ebecef;}
 .pageWrap span{display:inline-block;height:40px;line-height:40px;margin:0 5px;color:#93979F}
 .pageWrap b{color:#2D3036;font-weight:normal}
 .pageWrap input{box-sizing:border-box;width:80px;height:40px;line-height:40px;font-size:16px;border:1px solid #EBECEF;outline:none;border-radius:2px;text-align:center}
-.crumbs{width:1184px;margin:0 auto;box-sizing:border-box;padding:15px 0;font-size:14px}
+.crumbs{width:1184px;margin:0 auto;box-sizing:border-box;padding:12px 0;font-size:16px}
 /* 登录弹框 */
 .loginAlert{padding-top:5px;}
 .loginAlert span:first-child:after{content: '，';}

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

@@ -14,7 +14,7 @@
 .formLine .address.error textarea{border-color:#f94b4b}
 .formLine input:focus{border-color:#ffe6dc;}
 .formLine p{height:auto;line-height:32px}
-.formLine p em{font-style:normal;color:#f94b4b;margin:0 5px}
+.formLine p em{font-style:normal;color:#f94b4b;margin:0 1px}
 .formLine p span{color:#ffb496;}
 .formLine p span a{color:#e15616;text-decoration: underline;}
 .formLine .checked{position:absolute;width:20px;height:20px;top:40px;right:5px;display:none}

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

@@ -29,6 +29,18 @@ input[type=checkbox]:after{width:100%;height:100%;top:0;content:" ";background-c
 input[type=checkbox]:checked:after{content:"\2713";font-size:12px;background:#E15616;border: 1px solid #E15616;color:#FFF;}
 input[type=checkbox][disabled=disabled]:after{width:100%;height:100%;top:0;content:" ";background-color:#f1f0f5;color:#FFF;display:inline-block;visibility:visible;border-radius:2px;border:1px solid #B8BFCA}
 input[type=checkbox][disabled=disabled]{cursor:default;}
+::-webkit-input-placeholder {
+  color: #9AA5B5;
+}
+:-moz-placeholder {/* Firefox 18- */
+  color: #9AA5B5;
+}
+::-moz-placeholder{/* Firefox 19+ */
+  color: #9AA5B5;
+}
+:-ms-input-placeholder {
+  color: #9AA5B5;
+}
 /* 定义动画效果 */
 @-webkit-keyframes fadeInDown{
   from{opacity:0;-webkit-transform:translate3d(0,-15px,0);transform:translate3d(0,-15px,0);}

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

@@ -105,6 +105,7 @@ li{list-style:none}
     box-shadow: 0px 3px 6px rgba(0,0,0,0.07);}
     .addressWrap .info{position:relative;width:810px;text-align:left}
     .addressWrap .info>p{height:30px;line-height:30px;font-size:14px;color:#22272e}
+    .addressWrap .info>p.none{height:90px;line-height:90px;font-size:14px;color:#9AA5B5;text-align: center;}
     .addressWrap .info>p .label{color:#627386;margin-right:5px;display:inline-block;min-width:60px;height:30px;text-align:justify;vertical-align:top}
     .addressWrap .info>p .label:after{content:'';display:inline-block;width:100%}
     .addressWrap .info .btnBox{height:24px;line-height:24px;font-size:14px;color:#1890f9;position:absolute;top:0;right:0}
@@ -112,9 +113,10 @@ li{list-style:none}
     .addressWrap .info .btnBox .default span{display:inline-block;height:24px;background-color:#f94b4b;font-size:12px;color:#FFFFFF;border-radius:12px;text-align:center;vertical-align:top;padding:0 12px;margin-left:5px;cursor:pointer}
     .addressWrap .info .btnBox .default a{display:inline-block;height:24px;line-height:24px;vertical-align:top;margin-left:15px;color:#1890f9}
     .addressWrap .info .btnBox .group{position:absolute;right:-345px;top:0}
-    .addressWrap .btnBox .group{text-align:center;width:320px;height:92px;padding-top:5px;box-sizing:border-box;border-left:1px dashed #b8bfca}
+    .addressWrap .btnBox .group{text-align:left;height:92px;box-sizing:border-box;border-left:1px dashed #b8bfca;padding: 0 30px;}
     .addressWrap .btnBox .group .btn{display:block;width:128px;height:34px;line-height:34px;margin:0 auto;text-align:center;font-size:14px;color:#1890f9;border:1px solid #FFFFFF}
     .addressWrap .btnBox .group .btn.con{background-color:#FFE6DC;color:#E15616;border-color:#E15616}
+    .addressWrap .btnBox .group .btn.con.none{margin-top: 30px;}
     .addressWrap .btnBox .group .btn.save{background-color:#E15616;color:#FFF;border-color:#E15616}
     .addressWrap .btnBox .group .btn.save.disable{background: #EFEFEF;color:#999999;border-color:#EFEFEF;}
     .addressWrap .formLine{padding-bottom:16px;font-size:14px;position:relative;padding-left:90px;text-align:left;width:526px}
@@ -131,7 +133,7 @@ li{list-style:none}
     .addressWrap .form .btnBox .group .btn{display:inline-block}
     .addressWrap .form .btnBox .group .btn.save{margin-right:15px}
     .addressWrap .btnBox .group p:first-child{line-height:32px}
-    .addressWrap .btnBox .group .check{display:inline-block;height:18px;line-height:18px;color:#1890f9}
+    .addressWrap .btnBox .group .check{display:inline-block;height:18px;line-height:18px;color:#1890f9;margin-bottom: 22px;}
     .addressWrap .btnBox .group .check input{vertical-align:top;margin-right:10px}
     .model-address-content{width:100%;height:100%;position:fixed;top:0;left:0;background-color:rgba(0,0,0,.4)}
     .model-address-content .model-content{width:650px;height:593px;padding:0 0 16px 0;position:absolute;top:0;left:0;right:0;bottom:0;background-color:#FFFFFF;margin:auto;border-radius:2px;box-sizing:border-box}
@@ -248,6 +250,7 @@ li{list-style:none}
     .addressWrap .info,.model-address-content .content .list{line-height:7.4vw;background:#FFF;padding:3.3vw}
     .model-address-content .content .list{margin-bottom:1vw;border-bottom:1px dashed #eee;position:relative}
     .addressWrap .info>p,.model-address-content .content .list p{display:inline-block;min-width:49%;line-height:5vw;font-size:3.4vw;color:#22272e}
+    .addressWrap .info>p.none{display:inline-block;min-width:49%;line-height:5vw;font-size:3.4vw;color:#9AA5B5;text-align: center;}
     .addressWrap .info>p .label,.model-address-content .content .list p .label{color:#627386;margin-right:2vw}
     .addressWrap .info .btnBox,.model-address-content .content .list-right{padding-top:2vw}
     .addressWrap .info .btnBox .btn,.model-address-content .content .list-btn{display:inline-block;height:8vw;line-height:8vw;font-size:3.4vw;color:#1890f9;padding:0 3vw;border-radius:4.5vw;background-color:#e0f1ff;border:solid 1px #1890f9}

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

@@ -12,7 +12,7 @@ li{list-style:none}
     .order-header .header-bt p span{color: #E15616;margin: 0 5px;}
     .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;position: relative;margin-top: 10px}
+    .container{width: 100%;height: auto;box-sizing: border-box;position: relative;margin-top: 8px}
     .container .empty{background-color:#FFF;}
     .container .section.address-none{height: 318px;left: 0;top:0;background-color: #FFF;box-shadow: 0px 3px 6px 0px
 		rgba(34, 39, 46, 0.07);z-index: 999;padding: 16px 0;box-sizing: border-box;margin-bottom: 10px}
@@ -26,12 +26,12 @@ li{list-style:none}
     .addressWrap .formLine textarea{width:420px;min-height:114px;padding:10px 16px;line-height:20px;resize:none}
     .addressWrap .formLine select{width:136px;height:36px}
     .addressWrap .btnBox{position:absolute;left:610px;top:100px}
-    .addressWrap .btnBox .group{text-align:center;width:380px;height:92px;padding-top:5px;box-sizing:border-box;border-left:1px dashed #b8bfca}
+    .addressWrap .btnBox .group{text-align:left;height:92px;box-sizing:border-box;border-left:1px dashed #b8bfca;padding: 0 30px;}
     .addressWrap .btnBox .group p:first-child{line-height:32px}
     .addressWrap .btnBox .group .btn{display:inline-block;width:128px;height:34px;line-height:34px;margin:0 auto;text-align:center;font-size:14px;color:#1890f9;border:1px solid #FFFFFF}
     .addressWrap .btnBox .group .btn.con{background-color:#FFE6DC;color:#E15616;border-color:#E15616}
     .addressWrap .btnBox .group .btn.save{background-color:#E15616;color:#FFF;border-color:#E15616;margin-right:15px}
-    .addressWrap .btnBox .group .check{display:inline-block;height:18px;line-height:18px;color:#1890f9}
+    .addressWrap .btnBox .group .check{display:inline-block;height:18px;line-height:18px;color:#1890f9;margin-bottom: 25px;}
     .addressWrap .btnBox .group .check input{vertical-align:top;margin-right:10px}
     .container .section{width: 100%;height: auto;}
     .container .section .list{width: 100%;height: 123px;box-sizing: border-box;padding:6px 16px;float: left;background-color: #FFF;box-shadow: 0px 3px 6px 0px rgba(0, 0, 0, 0.07);margin-bottom: 10px;}

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

@@ -5,6 +5,7 @@ li{list-style:none}
  */
 @media screen and (min-width:768px){
     /*个人中心右侧*/
+    .crumbs{font-size: 16px;}
     .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);position:relative}
     .user-header .logo{width:110px;height:78px;float:left;border:1px solid #f5f5f5;border-radius:2px;margin-right:8px;position:relative;cursor:pointer}
     .user-header .logo .logo-file{width:110px;height:78px;position:relative;outline:none;opacity:0;position:absolute;top:0;left:0;cursor:pointer}
@@ -28,7 +29,7 @@ li{list-style:none}
     .user-header .message .icon span{display:block;width:20px;height:20px;background-image:linear-gradient(90deg,#ff5353 0%,#ff2424 100%);position:absolute;top:-9px;left:-9px;font-style:normal;font-size:12px;color:#f94b4b;line-height:20px;text-align:center;border-radius:50%;color:#fff}
     .user-header .message .icon span.ellipse{width:30px;height:20px;border-radius:10px;line-height:20px;left:-22px}
     .user-content{width:100%;height:auto;margin-top:10px}
-    .user-content .title{width: 100%;height: 44px;line-height: 44px;font-size: 16px;text-align: left;color: #22272e;}
+    .user-content .title{width: 100%;height: 44px;line-height: 44px;font-size: 16px;text-align: left;color: #22272e;padding: 0 20px}
     .user-content .title a{display: block;float: right;position: relative;padding-right: 36px;position: relative;}
     .user-content .title a .icon{display: block;width: 18px;height: 18px;position: absolute;top: 5px;right: 10px;}
     .user-content .title a .icon:before{width: 18px;height: 18px;background-position: -304px -32px;}

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

@@ -16,7 +16,7 @@ li{list-style:none}
     .order-header .header-bt .header-button .btn-serch{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;float: left;margin: 0 5px;}
     .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{width: 100%;height:auto;box-sizing: border-box;margin-top: 8px;}
     .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;}

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

@@ -12,7 +12,7 @@ li{list-style:none}
     .order-container .title a .icon{display: block;width: 18px;height: 18px;position: absolute;top: 5px;right: 10px;}
     .order-container .title a .icon:before{width: 18px;height: 18px;background-position: -304px -32px;}
     .order-container .section{width: 100%;height: auto;}
-    .order-container .section .section-info {margin-bottom: 10px;box-sizing:border-box;padding:10px 20px;background-color: #FFFFFF;}
+    .order-container .section .section-info {margin-bottom: 8px;box-sizing:border-box;padding:10px 20px;background-color: #FFFFFF;}
     .order-container .section .section-info .order-title{width:100%;box-sizing:border-box;height:40px;position:relative;padding-left:45px;margin-bottom: 0;}
     .order-container .section .section-info .order-title .bag{display: block;position: absolute;left:0;top: 12px; width: 36px;height: 16px;background-image: linear-gradient(335deg,#e15616 0%,#ffb496 100%);border-radius: 2px;font-size: 10px;color: #FFFFFF;line-height: 16px;text-align: center;}
     .order-container .section .section-info .order-title .title-name{line-height:  40px;font-size: 14px;color: #22272e;}

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

@@ -30,7 +30,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;}
 
-    .order-container{width: 100%;min-height:410px;margin-top: 20px;}
+    .order-container{width: 100%;min-height:410px;margin-top: 8px;}
     .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;}

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

@@ -24,7 +24,7 @@ li{list-style:none}
     .order-header .header-bt .search-time .search-main .search-input .icon:before{width: 12px;height:  12px;background-position: -348px -378px;}
     .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{width: 100%;margin-top: 8px;}
     .container .empty{background-color:#FFF;}
     .container .section{width: 100%;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;}

src/main/resources/templates/shopping/confirm.html

@@ -27,14 +27,19 @@
         <div class="addressWrap clear">
             <div v-show="!isShowAddressForm">
                 <div class="info">
-                    <p><span class="label">收货人:</span>{{address.name}}</p>
-                    <p><span class="label">联系方式:</span>{{address.mobile}}</p>
-                    <p><span class="label">收货地址:</span>{{address.province}}{{address.city}}{{address.town}}{{address.desc}}</p>
+                    <template v-if="addressList.length>0">
+                        <p><span class="label">收货人:</span>{{address.name}}</p>
+                        <p><span class="label">联系方式:</span>{{address.mobile}}</p>
+                        <p><span class="label">收货地址:</span>{{address.province}}{{address.city}}{{address.town}}{{address.desc}}</p>
+                    </template>
+                    <template v-else>
+                        <p class="none">暂无收货地址信息,请先添加地址</p>
+                    </template>
                     <div class="btnBox mfbt">
-                        <span class="default"><i class="icon mIcon" v-if="address.default"></i><span v-if="address.default">默认地址</span><a href="javascript:void(0)" @click="updateAddress()">修改</a></span>
+                        <span class="default"><i class="icon mIcon" v-if="address.default"></i><span v-if="address.default">默认地址</span><a v-if="addressList.length>0" href="javascript:void(0)" @click="updateAddress()">修改</a></span>
                         <div class="group">
-                            <a class="btn"  href="javascript:void(0)" @click="showAddressBox()">选择地址</a>
-                            <a class="btn con"  href="javascript:void(0)" @click="createAddress()">新建地址</a>
+                            <a class="btn"  v-if="addressList.length>0" href="javascript:void(0)" @click="showAddressBox()">选择地址</a>
+                            <a class="btn con" :class="addressList.length>0 ? '' : 'none'"  href="javascript:void(0)" @click="createAddress()">新建地址</a>
                         </div>
                     </div>
                 </div>