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

pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.3.1.RELEASE</version>
+        <version>2.3.4.RELEASE</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
     <groupId>com.caimei</groupId>

src/main/resources/config/beta/application-beta.yml

@@ -40,7 +40,8 @@ spring:
 
 #日志配置
 logging:
-  path: /mnt/newdatadrive/data/runtime/tomcat-instance/caimei365-www/logs
+  file:
+    path: /mnt/newdatadrive/data/runtime/tomcat-instance/caimei365-www/logs
   level:
     root: info
 

src/main/resources/static/css/account/forget.css

@@ -28,10 +28,10 @@ footer .footTop{display:none;}
     .signAccount .title{height:8.6vw;line-height:8.6vw;font-size:3.4vw;color:#22272e;text-align:left;padding: 0 4vw;}
     .forget-form{padding:0;}
     .signAccount form{width:93.4vw;margin:0 auto;}
-    .subLine{margin-top:2vw;float: left;width: 100%;}
-    .right-header{width: 100%;height: 11.2vw;box-sizing: border-box;float: left;padding:0;background-color: #FFF;}
-    .right-header .tabs{width: 100%;height: 11.2vw;margin: 0 auto;}
-    .right-header .header-tabs{width:50%;height: 11.2vw;background-color: #f0f3f7;line-height: 11.2vw;text-align: center;color: #627386;float: left;cursor: pointer;}
+    .subLine{margin-top:2vw;width: 100%;}
+    .right-header{width: 100%;height:11.2vw;box-sizing: border-box;padding:0;background-color: #FFF;}
+    .right-header .tabs{width: 93.4vw;margin:3.2vw auto 0;font-size:3.4vw;}
+    .right-header .header-tabs{width:50%;height: 11.2vw;background-color: #f0f3f7;line-height: 11.2vw;text-align: center;color: #627386;cursor: pointer;}
     .right-header .header-tabs.current{background-color: #e15616;color: #FFFFFF;}
     .container{width: 100%;height: auto;box-sizing: border-box;float: left;background-color: #FFF;}
 }

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

@@ -4,7 +4,8 @@
 */
 .noneImportant{display:none!important;}
 .baseHeadCenter,#container,.footMain{width:100%;overflow:hidden;}
-.pcOnly,.jqSelect .pc,.baseHeadTop,.baseHeadCenter .headCart,.baseHeadCenter .hotKey,.baseTopNav>.wrap{display:none!important;}
+.pcOnly,.jqSelect .pc,.baseHeadCenter .headCart,.baseHeadCenter .hotKey,.baseTopNav>.wrap{display:none!important;}
+.baseHeadTop ul.wrap>li{display:none;}
 .mIcon:before{content:'';display:inline-block;font-size:0;background:url(/img/base/icon_m.png) no-repeat;background-size:100vw auto;transition:all .5s}
 .icon.shop,.icon.heart{vertical-align:middle;display:inline-block;height:5.5vw;line-height:5.5vw}
 .icon.shop:before{width:7.5vw;height:6vw;background-position:-91vw -.5vw}
@@ -64,6 +65,12 @@
 .baseHeadCenter.account .closeAccount{float:right;padding:3.5vw 2.8vw;width:6.4vw;height:6.4vw;text-align:center}
 .baseHeadCenter.account .closeAccount:before{content:'\2715';font-size:4.5vw;font-weight:bold}
 .baseHeadCenter.account .accountLogin{display:none;}
+#mGlobalMenu{position:fixed;bottom:0;left:0;background-color:rgba(74,79,88,.7);width:100%;height:100%;z-index:9990}
+#mGlobalMenu .cTab{display:none}
+#mGlobalMenu .cShow{display:none}
+#mGlobalMenu .cShow{width:100%;position:absolute;bottom:0;left:0;background:#FFF;line-height:14.4vw;text-align:center;font-size:3.4vw;padding:6vw 0;border-radius:3vw 3vw 0 0}
+#mGlobalMenu .cShow a{display:block}
+
 /* 分类 */
 .classifyBox{display:none;background:#F7F7F7;overflow:hidden}
 .classifyBox .clsHead{position:relative;background:#FFF}
@@ -153,10 +160,10 @@
 .payAlert i{font-style:normal;color:#f55c5c;}
 .payAlert .copy{display:inline-block;height:6.4vw;line-height:6.4vw;padding:0 3vw;color:#FFF;margin-left:2vw;background-color:#ff2929;background-image:linear-gradient(214deg,#ff2929 0%,#ff6d1b 100%)}
 /* 登录弹框 */
-.loginAlert{padding-top:1vw;text-align:center;}
+.loginAlert{padding-top:1vw;text-align:center;font-size:3.4vw;}
 .loginAlert span{display:block}
 .loginAlert:before{content:'';display:block;width:26.7vw;height:26.7vw;background:url(/img/account/to_login_m.png) no-repeat left top;background-size:100% 100%;margin:0 auto}
-
+.jconfirm .jconfirm-box .jconfirm-buttons button{font-size:3.4vw!important;}
 /* 咨询，回到顶部 */
 #scrollTop{display:none;position:fixed;right:0;;z-index:9999;bottom:4vw;}
 #scrollTop .item{width:12vw;background-color:rgba(190,194,201,.3);box-sizing:border-box;text-align:center;margin-bottom:2.5vw;font-size:3vw;position:relative}

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

@@ -30,7 +30,7 @@
 .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{display:block;margin:0 auto;width:93.4vw;height:10.8vw;line-height:10.8vw;font-size:3.4vw;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)}

src/main/resources/static/css/pay/caimei-paycash.css

@@ -127,7 +127,7 @@ input::-webkit-outer-spin-button {
     .pay-title .pay-input input{outline:none;box-sizing:border-box;width:100%;height:7vw;line-height:5vw;padding:1vw 0;text-indent:1.2em;font-size:3.4vw;text-align:left;background-color:#ffffff;border-radius:2px;border:solid 1px #b8bfca}
     .record-title,.method-title{font-size:3.7vw;color:#22272e;line-height:8vw}
     .pay-method-tab{padding-top:1.5vw;border-bottom:1px solid #EBEBEB;color:#22272e}
-    .pay-method-tab .item{display:block;box-sizing:border-box;height:9vw;line-height:9vw;padding:0 5vw;border:1px solid transparent;color:#93979F;font-size:3.4vw;margin-bottom:-1px}
+    .pay-method-tab .item{display:block;box-sizing:border-box;height:9vw;line-height:9vw;padding:0 5vw;border:1px solid transparent;font-size:3.4vw;margin-bottom:-1px}
     .pay-method-tab .item.active{color:#E15621;border-color:#EBEBEB;border-bottom-color:#FFF;background:#FFF}
     .payment{border:1px solid #EBEBEB;border-top:none;padding:2.6vw}
     .record-li{margin-top:3vw}

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

@@ -94,7 +94,12 @@ li{list-style:none}
     .summaryWrap .summary .back{color:#f55c5c}
     .summaryWrap .summary .back .icon:before{width:20px;height:20px;background-position:-345px 0;margin-right:15px}
     /* 收货地址 */
-    .addressWrap{padding:16px;position:relative}
+    .addressWrap{padding:16px;position:relative;    box-sizing: border-box;
+    text-align: center;
+    width: 100%;
+    background: #FFF;
+    margin-bottom: 8px;
+    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 .label{color:#627386;margin-right:5px;display:inline-block;min-width:60px;height:30px;text-align:justify;vertical-align:top}
@@ -248,8 +253,8 @@ li{list-style:none}
     .addressWrap .info .btnBox .default .mIcon:before,.model-address-content .content .list-defalut .mIcon:before{height:8vw;width:8vw;background-position:-94.1vw -36.7vw}
     .addressWrap .info .btnBox .default span,.model-address-content .content .list-defalut span{display:inline-block;height:6vw;line-height:6vw;font-size:3.1vw;color:#FFFFFF;background-color:#f94b4b;border-radius:3vw;padding:0 3vw;vertical-align:middle}
     .addressWrap .info .btnBox .default a,.model-address-content .content .list-defalut a{display:inline-block;height:6vw;line-height:6vw;margin-left:2vw;color:#1890f9;vertical-align:middle}
-    .model-address-content .content .list-defalut a{padding:0;margin:0}
-    .addressWrap .formWrap,.model-address-content{position:fixed;bottom:0;left:0;width:100%;height:100%;margin:0 auto;background-color:rgba(74,79,88,.7);z-index:999}
+    .model-address-content .content .list-defalut a{padding:0;margin:0;font-size: 3.1vw;}
+    .addressWrap .formWrap,.model-address-content{position:fixed;bottom:0;left:0;width:100%;height:100%;margin:0 auto;background-color:rgba(74,79,88,.7);z-index:999999;}
     .addressWrap .formWrap .form,.model-content{width:100%;box-sizing:border-box;position:absolute;bottom:0;left:0;background:#FFF;border-radius:2vw 2vw 0 0;padding:3.3vw}
     .addressWrap .formWrap .form .group{text-align:center}
     .addressWrap .btnBox .group p:first-child{margin-bottom:5vw}

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

@@ -384,7 +384,7 @@
     overflow: hidden;
     box-shadow: 0px .8vw 1.6vw 0px rgba(0, 0, 0, 0.07);
     width: 100%;
-    height: 33.9vw;
+    /*height: 33.9vw;*/
 }
 
 .head {
@@ -415,19 +415,20 @@
 }
 
 .username {
- color: #627386;
- font-size: 12px;
- margin: 10px 0;
+ color: #9aa5b5;
+ font-size: 3.2vw;
+ margin: 2.7vw 0;
 }
-
+.mainContent>p{    color: #22272e;
+    font-size: 3.7vw;}
 .perfect {
- width: 64px;
- height: 22px;
+ width: 13.6vw;
+ height: 4.7vw;
  background-color: #627386;
- border-radius: 2px;
+ border-radius:.53vw;
  color: #ffffff;
- font-size: 12px;
- line-height: 22px;
+ font-size: 3.2vw;
+ line-height: 4.7vw;
  text-align: center;
  display: inline-block;
  float: right;
@@ -479,7 +480,9 @@
 }
 
 .product {
- margin: 5.3vw 0;
+    margin: 1.3vw 0;
+    background: #fff;
+    height: 29.8vw;
 }
 
 .product p {
@@ -493,16 +496,15 @@
 }
 
 .product ul {
-     height: 50px;
-     line-height: 80px;
+     height:10.6vw;
+     line-height:17vw;
      background-color: #ffffff;
-     box-shadow: 0px 3px 6px 0px rgba(0, 0, 0, 0.07);
-     padding: 15px;
+     padding: 4vw;
 }
 
 .product li {
      display: inline-block;
-     width: 24vw;
+     width: 32%;
      text-align: center;
      color: #333333;
      position: relative;
@@ -513,16 +515,16 @@
     width: 9vw;
     height: 9vw;
     background-position: -66.7vw -60vw;
-    right: 37px;
-    top: -2px;
+    right: 13.9vw;
+    top: -2.53vw;
     position: absolute
 }
 
 .mIcon.other:before {
- background-position: -76vw -60vw;
+ background-position: -74vw -60vw;
 }
 .mIcon.down:before {
- background-position: -84vw -60vw;
+ background-position: -83vw -60vw;
 }
 .rank_top p {
  font-size: 3.4vw;
@@ -552,7 +554,7 @@
 }
 
 .sales-ranke ul {
- padding: 10px 0;
+ padding: 2.7vw 0;
  border-bottom: .27vw solid #e2e7ef
 }
 
@@ -562,9 +564,8 @@
 }
 
 .file_img {
- width: 26.7vw;
- height: 19.4vw;
- font-size: 999px;
+    width: 29.9vw;
+    height: 21.3vw;
  opacity: 0;
  top: 0px;
  left: 0px;
@@ -573,7 +574,7 @@
 
 .shop-ranke {
  background: #fff;
- padding-bottom: 20px;
+ padding-bottom: 5.3vw;
  box-shadow: 0px .8vw 1.6vw 0px rgba(0, 0, 0, 0.07);
 }
 
@@ -584,6 +585,7 @@
  color: #e15616;
  line-height: 12vw;
  position: relative;
+ font-size: 3.1vw;
 }
 
 .shop-ranke ul {
@@ -620,7 +622,7 @@
 }
 
 .mIcon.rank0:before {
- background-position: -25.3vw -226px;
+ background-position: -25.3vw -60.3vw;
 }
 
 .mIcon.rank1:before {
@@ -648,12 +650,28 @@
 }
 
 .confirm span {
- color: #e15616;
- padding: 1.3vw
+ padding: 1.3vw;
+    width: 3vw;
+    height: 3vw;
+    line-height: 3vw;
+    display: inline-block;
+    background: #f55c5c;
+    border-radius: 50%;
+    color: #fff;
+    font-size: 3vw;
+    text-align: center;
+    position: relative;
+    top: -8.8vw;
+    right: 6.7vw
+}
+.confirm.other span {
+ right: 3.5vw
+}
+.confirm.down span {
+ right: 4vw
 }
-
 .Statistics {
- margin-top: 4vw;
+ margin-top: 1.3vw;
  background: #fff;
  padding: 2.7vw;
 }

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

@@ -10,8 +10,6 @@ li{list-style:none}
     .content .section .section-top{width: 100%;height: 54px;float: left;box-sizing: border-box;padding: 9px 0;border-bottom: solid 1px #e2e7ef;}
     .content .section .section-top .cheacked{width: 100px;height: 36px;float: left;cursor: pointer;}
     .content .section .section-top .cheacked .icon{width: 16px;height: 16px;display: block;float: left;padding: 10px 15px}
-    .content .section .section-top .cheacked .icon.icon-weigouxuan:before{width: 16px;height: 16px;background-position: -236px 0;}
-    .content .section .section-top .cheacked .icon.icon-gouxuan:before{width: 16px;height: 16px;background-position: -210px 0;}
     .content .section .section-top .cheacked span{display: inline-block;line-height: 36px;font-size: 16px;color: #22272e;}
     .content .section .section-top .button{width: 250px;height: 36px;float: right;}
     .content .section .section-top .button .btn{width: 90px;height: 34px;float: right;margin-left: 16px;border-radius: 2px;background-color: #ffe6dc;line-height: 34px;text-align: center;font-size: 14px;color: #E15616;border: solid 1px #e15616;}
@@ -19,34 +17,33 @@ li{list-style:none}
     .content .section .section-content .new-list{width: 100%;height: 36px;float: left;box-sizing: border-box;}
     .content .section .section-content .new-list .text{line-height: 36px;white-space: nowrap;text-overflow: ellipsis;overflow: hidden;word-break: break-all;float: left;}
     .content .section .section-content .new-list .icon{width: 16px;height: 16px;display: block;float: left;padding: 10px 15px;line-height: 16px;cursor: pointer;}
-    .content .section .section-content .new-list .icon.icon-weigouxuan:before{width: 16px;height: 16px;background-position: -236px 0;}
-    .content .section .section-content .new-list .icon.icon-gouxuan:before{width: 16px;height: 16px;background-position: -210px 0;}
     .content .section .section-content .new-list .text p{line-height: 36px;font-size: 14px;color: #627386;float: left;width: 600px;overflow: hidden;word-wrap: normal;vertical-align: middle;text-overflow: ellipsis}
-    .content .section .section-content .new-list .time{line-height: 36px;font-size: 12px;color: #b8bfca;float: right;}
+    .content .section .section-content .new-list .time{line-height: 36px;font-size: 14px;color: #b8bfca;float: right;}
+    .check{float: left;margin: 8px}
+    .notclick{pointer-events: none;opacity: .6}
 }
 
 /**
 * 移动端
 */
 @media screen and (max-width:768px){
-    .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{width: 100%;background-color: #FFFFFF;box-sizing: border-box;padding:3.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}
     .section-top .cheacked{width: 100px;height: 36px;float: left;cursor: pointer;}
     .section-top .cheacked .icon{width: 16px;height: 16px;display: block;float: left;padding: 10px 15px}
-    .section-top .cheacked .icon.icon-weigouxuan:before{width: 16px;height: 16px;background-position:-36px -201px;}
-    .section-top .cheacked .icon.icon-gouxuan:before{width: 16px;height: 16px;background-position: -3px -201px;}
     .section-top .cheacked span{display: inline-block;line-height: 36px;font-size: 16px;color: #22272e;}
     .section-top .button{height: 36px;float: right;}
-    .section-top .button .btn{width: 90px;height: 34px;float: right;margin-left: 16px;border-radius: 2px;background-color: #ffe6dc;line-height: 34px;text-align: center;font-size: 14px;color: #E15616;border: solid 1px #e15616;}
+    .section-top .button .btn{width: 90px;height: 34px;float: right;margin-left: 16px;border-radius: 2px;background-color: #ffd8d8;
+    line-height: 34px;text-align: center;font-size: 14px;color: #f94b4b;border: solid 1px #f94b4b;border-radius: 6.4vw}
+    .section-top .button .btn.Read{border: .27vw solid #1890f9;color: #1890f9;background: #e0f1ff}
     .content .section .section-content{width: 100%;height: auto;float: left;box-sizing: border-box;padding: 10px 0;}
     .content .section .section-content .new-list{width: 100%;box-sizing: border-box;}
     .content .section .section-content .new-list .text{line-height: 36px;white-space: nowrap;text-overflow: ellipsis;overflow: hidden;word-break: break-all;float: left;}
     .content .section .section-content .new-list .icon{width: 16px;height: 16px;display: block;float: left;padding: 10px;line-height: 16px;cursor: pointer;}
-    .content .section .section-content .new-list .icon.icon-weigouxuan:before{width: 16px;height: 16px;background-position: -36px -201px;}
-    .content .section .section-content .new-list .icon.icon-gouxuan:before{width: 16px;height: 16px;background-position: -3px -201px;}
     .content .section .section-content .new-list .text p{line-height: 36px;font-size: 3.4vw;color: #627386;float: left;width: 77.6vw;overflow: hidden;word-wrap: normal;vertical-align: middle;text-overflow: ellipsis}
     .content .section .section-content .new-list .time{font-size: 3.1vw;color: #b8bfca;float: left;padding-left: 37px}
-
+    input.check {width: 3.5vw;height: 3.5vw;line-height: 3.5vw;vertical-align: top;margin: 3vw 3vw 1.3vw 3.3vw;float: left;}
+    .notclick{pointer-events: none;opacity: .6}
 }
 

src/main/resources/static/css/supplier-center/order/logistics.css

@@ -29,10 +29,10 @@
     textarea::placeholder {color: #9aa5b5;}
     .red{color: #f94b4b;}
     .companyBtn{width: 36px;height: 36px;background-color: #ffffff;border-radius: 2px;border: solid 1px #b8bfca;margin-left: 8px;cursor: pointer;font-size: 18px}
-    .icon.add:before {width: 25px;height: 25px;background-position: -168px -374px;position: absolute;top: 17px;right: 29px;}
+    .mIcon.add{background: url(/img/account/add.png) no-repeat;height: 80px;display: block;background-size: 80px;}
     .add-text {font-size: 12px;color: #333330;opacity: 0.5;position: absolute;top: 60%;right: 13px;}
-    .upload-file{position: relative;float: left;margin: 10px 10px 10px 0px;cursor: pointer;width: 80px;height: 80px;border-radius: 2px;border: solid 1px #b8bfca}
-    .input-file{width: 80px;height: 80px;opacity: 0;cursor: pointer;position: absolute}
+    .upload-file{position: relative;float: left;margin: 10px 10px 10px 0px;cursor: pointer;width: 80px;height: 80px;border-radius: 2px;}
+    .input-file{width: 80px;height: 80px;opacity: 0;cursor: pointer;position: absolute;top: 0}
     #uploadGoodsImages{overflow: hidden;float: left;width: 90%}
     .release-from{overflow: hidden;}
     .red-color{float: left;height: 80px;line-height: 80px;width: 85px;}
@@ -68,40 +68,39 @@
     .product-info {box-shadow: 0px .8vw 1.6vw 0px rgba(0, 0, 0, 0.07);background: #fff;margin-top: 2.7vw}
     .price {overflow: hidden;}
     .protitle {color: #22272e;font-size: 3.4vw;padding: 2.7vw 5.3vw;}
-    .product {background: #fff;padding: 2.7vw 5.3vw;box-shadow: 0px 3px 6px 0px rgba(0, 0, 0, 0.07);height: 50vw}
+    .product {background: #fff;padding: 2.7vw 5.3vw;box-shadow: 0px .8vw 1.3vw 0px rgba(0, 0, 0, 0.07);height: 50vw}
     .product-title {height: 5.3vw;line-height: 5.3vw;position: relative;width: 100%}
     .product-title li {display: inline-block;list-style: none;color: #9aa5b5;position: relative;top: 26vw;width: 21vw}
     .product-title li:nth-child(1) {width: 100%;text-align: left;top: 0;}
     .pro-information li {list-style: none;}
-    .pro-information li {width: 100%;padding: 10px 0;}
+    .pro-information li {width: 100%;padding: 2.7vw 0;}
     .pro-information li div {display: inline-block;color: #22272e;top: 11.6vw;width: 21vw;position: relative}
     .pro-information li div.product-img {width: 100%;text-align: left;top: 0}
-    .product-img img {width: 18.7vw;height: 18.7vw;border: solid 1px #e2e7ef;}
-    .product-img h3 {display: inline-block;width: 40vw;margin-left: 10px;font-size: 3.4VW;color: #22272e;vertical-align: middle;word-break: break-all;overflow: hidden;text-overflow: ellipsis;display: -webkit-inline-box;-webkit-line-clamp: 2;-webkit-box-orient: vertical}
+    .product-img img {width: 18.7vw;height: 18.7vw;border: solid .27vw #e2e7ef;}
+    .product-img h3 {display: inline-block;width: 40vw;margin-left: 2.7vw;font-size: 3.4VW;color: #22272e;vertical-align: middle;word-break: break-all;overflow: hidden;text-overflow: ellipsis;display: -webkit-inline-box;-webkit-line-clamp: 2;-webkit-box-orient: vertical}
     .add-logistics{height: auto;background-color: #ffffff;box-shadow: 0px 3px 6px 0px rgba(0, 0, 0, 0.07);margin-top: 2.7vw;padding: 20px;color: #627386;}
     .company-number{width: 100%;}
-    .logist-right>div{margin-top: 5px;}
+    .logist-right>div{margin-top: 1.3vw;}
     .company-number>div{margin: 4vw 0;}
     .logistics-order-number.company{width: 72vw}
-    .company{width: 75vw;height: 11.8vw;background-color: #ffffff;border-radius: .53vw;border: solid 1px #b8bfca;color: #9aa5b5;padding-left: 2.7vw;margin-top: 2.7vw}
-    input::placeholder,textarea::placeholder {color: #9aa5b5;font-size: 12px;}
+    .company{width: 75vw;height: 11.8vw;background-color: #ffffff;border-radius: .53vw;border: solid .27vw #b8bfca;color: #9aa5b5;padding-left: 2.7vw;margin-top: 2.7vw}
+    input::placeholder,textarea::placeholder {color: #9aa5b5;font-size:3.2vw;}
     textarea::placeholder {color: #9aa5b5;}
     .red{color: #f94b4b;}
-    .companyBtn{width: 11.8vw;height: 11.8vw;background-color: #ffffff;border-radius: .53vw;border: solid 1px #b8bfca;margin-left: .53vw;cursor: pointer;font-size: 4.8vw;color: #b8bfca;}
-    .mIcon.add:before {width: 8vw;height: 8vw;background-position: -8.2vw -60.3vw;position: absolute;top: 5.5vw;right: 8vw}
-    .add-text {font-size: 3.6vw;color: #333330;opacity: 0.5;position: absolute;top: 60%;right: 4.3vw}
-    .upload-file{position: relative;float: left;margin: 0 2.7vw 2.7vw 0px;cursor: pointer;width: 23vw;height: 23vw;border-radius: .53vw;border: solid .27vw #b8bfca}
-    .input-file{width: 23vw;height:23vw;opacity: 0;cursor: pointer;position: absolute}
-    #uploadGoodsImages{overflow: hidden;float: left;width: 90%;margin-top: 2.7vw}
+    .companyBtn{width: 11.8vw;height: 11.8vw;background-color: #ffffff;border-radius: .53vw;border: solid .27vw #b8bfca;margin-left: .53vw;cursor: pointer;font-size: 4.8vw;color: #b8bfca;}
+    .mIcon.add{background: url(/img/account/add.png) no-repeat;height: 23vw;display: block;    background-size: 23vw;}
+    .upload-file{position: relative;float: left;margin: 0 2.7vw 2.7vw 0px;cursor: pointer;width: 23vw;height: 23vw;border-radius: .53vw;}
+    .input-file{width: 23vw;height:23vw;opacity: 0;cursor: pointer;position: absolute;top: 0;}
+    #uploadGoodsImages{overflow: hidden;float: left;width: 100%;margin-top: 2.7vw}
     .release-from{overflow: hidden;}
     .upload-file img{width: 100%;height: 100%;}
     .mIcon.del:before {width: 5.3vw;height: 5.3vw;background-position: -90vw -7.5vw;position: absolute;top: -.8vw;right: -.8vw}
-    .form-upload-tips .icon-wen:before {width: 20px;height: 20px;background-position: -84px -144px;cursor: pointer;}
-    .wen-tips {width: 300px;height: 47px;background-color: #1890f9;box-shadow: 0px 3px 6px 0px rgba(24, 144, 249, 0.17);color: #fff;position: absolute;left: inherit;font-size: 12px;text-align: center;line-height: 47px;top: 33px;display: none;}
+    .form-upload-tips .icon-wen:before {width: 5.3vw;height: 5.3vw;background-position: -76.4vw 0vw;cursor: pointer;}
+    .wen-tips {width: 67.2vw;height:9vw;background-color: #1890f9;box-shadow: 0px .8vw 1.3vw 0px rgba(24, 144, 249, 0.17);color: #fff;position: absolute;left: inherit;font-size: 2.6vw;text-align: center;line-height: 9vw;top:8.8vw;display: none;}
     .form-upload-tips{float: left;position: relative;}
-    .form-upload-tips .wen-tips:before {content: '';width: 0px;height: 0px;border-width: 8px;border-style: solid;border-color: transparent transparent #1890f9 transparent;position: absolute;top: -15px;left:5px;}
+    .form-upload-tips .wen-tips:before {content: '';width: 0px;height: 0px;border-width: 8px;border-style: solid;border-color: transparent transparent #1890f9 transparent;position: absolute;top: -3.5vw;left:1.3vw;}
     .form-upload-tips:hover .wen-tips {display: block;}
-    .remarks textarea{width: 83.4vw;height: 42.4vw;background-color: #ffffff;border-radius: .53vw;border: solid 1px #b8bfca;resize: none;padding: 2.7vw;color: #9aa5b5;}
+    .remarks textarea{width: 83.4vw;height: 42.4vw;background-color: #ffffff;border-radius: .53vw;border: solid .27vw #b8bfca;resize: none;padding: 2.7vw;color: #9aa5b5;}
     .remarks{position: relative}
     .remarks .rema{line-height:10.7vw ;}
     .size-num {position: absolute;right: 2.7vw;top: 52vw;color: #9aa5b5}

src/main/resources/static/css/supplier-center/shop/release.css

@@ -8,25 +8,23 @@ input[type="number"]{
 div{box-sizing: border-box;}
 @media screen and (min-width:768px) {
 .container{width: 100%;height: auto;box-sizing: border-box;background-color: #FFFFFF;padding: 0 16px;}
-.release-stepbox{width: 100%;height: 70px;padding: 10px 100px;box-sizing: border-box;}
-.release-stepbox .stepSpan{float: left;width:94px;padding: 0 15px;margin-right: 80px;position: relative;}
+.release-stepbox{width: 100%;box-sizing: border-box;    line-height: 60px; padding-left: 80px}
+.release-stepbox .stepSpan{float: left;padding: 0 15px;margin-right: 80px;position: relative;}
 .release-stepbox .stepSpan:last-child{margin-right: 0;}
-.release-stepbox .stepSpan .line{width: 80px;height: 2px;background: #999999;position: absolute;right:-80px;top: 50%;}
-.release-stepbox .stepSpan p{font-size: 16px;line-height: 24px;color: #999999;text-align: center;}
-.release-stepbox .stepSpan p span{display: inline-block;width: 24px;height: 24px;font-size: 14px;text-align: center;line-height: 24px;background: #999999;color: #FFFFFF;border-radius: 40px;margin-top: 5px;}
-.release-stepbox .stepSpan.active .line{background: #E15616;}
+.release-stepbox .stepSpan p{font-size: 16px;line-height: 24px;color: #9aa5b5;text-align: center;display: inline-block}
+.release-stepbox .stepSpan p span{display: inline-block;width: 24px;height: 24px;font-size: 14px;text-align: center;line-height: 24px;background: #9aa5b5;color: #FFFFFF;border-radius: 40px;margin-top: 5px;}
 .release-stepbox .stepSpan.active  p{color:#E15616 ;}
 .release-stepbox .stepSpan.active p span{background: #E15616;}
-.release-container{width: 100%;height: auto;border-top: 2px solid #F5F5F5;padding:20px 0;opacity: 0;}
+.release-container{width: 100%;height: auto;border-top: 1px solid #e2e7ef;padding:20px 0;opacity: 0;}
 .release-container.active{opacity: 1;}
 .release-main-container{width: 100%;padding: 0 220px;box-sizing: border-box;}
 .release-from{width: 100%;height:auto;margin-bottom: 15px;line-height: 32px;font-size: 14px;color: #333;}
 .release-from.text p .em{color: #e15616;}
 .release-from.none{margin-bottom: 0;}
-.release-from .release-label{width: 100%;float: left;text-align: left;height: 32px;}
+.release-from .release-label{width: 100%;float: left;text-align: left;height: 32px;color: #627386;}
 .release-from .release-label span{color: #FF0000;}
 .release-from .release-input{width: 100%;height: auto;float: left;position: relative;}
-.release-from .release-input .input{width: 100%;height: 36px;padding: 0 10px;border-radius: 2px;border: 1px solid #EFEFEF;float: left;font-size: 13px;box-sizing: border-box;}
+.release-from .release-input .input{width: 100%;height: 36px;padding: 0 10px;border-radius: 2px;border: 1px solid #b8bfca;float: left;font-size: 13px;box-sizing: border-box;}
 .release-from .release-input .input.price{padding-left: 30px;}
 .release-from .release-input .yang{width: 30px;height: 36px;position: absolute;left: 0;top: 0;line-height: 36px;text-align: center;}
 .release-from .release-input .unit{height: 36px;padding: 0 10px;position: absolute;right: 0;top: 0;line-height: 36px;text-align: right;font-size: 14px;}
@@ -34,8 +32,8 @@ div{box-sizing: border-box;}
 .release-from .release-input .mg{margin-left: 10px;}
 .release-from .release-input .edit-btn{display: block;float: left;margin-left: 20px;color: #e15616;text-decoration: underline;}
 .release-from .release-input .input.keyword{width: 243px;margin:0 10px 10px 0;}
-.release-from .release-input .p{display: block;position: absolute;right: 0;bottom: 0;line-height: 32px;font-size: 12px;color: #FF9100;text-decoration: underline;}
-.release-from .release-input .add{display: inline-block;width: 100%;height: 20px;float: right;line-height: 20px;font-size: 14px;color: #FF9100;text-align: right;}
+.release-from .release-input .p{display: block;position: absolute;right: 0;bottom: 0;line-height: 32px;font-size: 12px;color: #e15616;text-decoration: underline;}
+.release-from .release-input .add{display: inline-block;width: 100%;height: 20px;float: right;line-height: 20px;font-size: 14px;color: #e15616;text-align: right;}
 .release-from .release-input .add span{font-size: 20px;}
 .release-from .release-input .input.keyword:nth-child(2n){margin-right: 0;}
 .release-from .release-input .release-param{width:100%;height: auto;padding: 0 10px;border: 1px solid #EFEFEF;float: left;margin-bottom: 10px;border-radius: 2px;position: relative;}
@@ -58,22 +56,22 @@ div{box-sizing: border-box;}
 .release-from  .upload-file .input-file{width: 76px;height: 76px;opacity:0;cursor: pointer;}
 .release-from  .upload-file .upload-img{width: 100%;height: 100%;display: block;border-radius: 2px;}
 .release-from .release-input .input.tags{width: 303px;}
-.release-from .release-input .add-btn{width: 107px;height: 34px;border-radius: 2px;border: 1px solid #e15616;float: left;margin-left: 10px;text-align: center;line-height: 34px;font-size: 14px;color:#e15616 ;cursor: pointer;}
-.release-from .release-input .add-btn.active{background-color: #e15616;color: #FFF;}
+.release-from .release-input .add-btn{width: 107px;height: 34px;border-radius: 2px;border: 1px solid #e15616;background:#ffe6dc;float: left;margin-left: 10px;text-align: center;line-height: 34px;font-size: 14px;color:#e15616 ;cursor: pointer;}
+.release-from .release-input .add-btn.active{background-color: #ffe6dc;color: #e15616;}
 .release-from .release-tips{width: 100%;color: #FF0000;float: left;}
 .release-from.text{height: auto;}
-.release-from .text{width: 100%;line-height: 32px;font-size: 12px;color: #999999;margin-top: 8px;}
+.release-from .text{width: 303px;line-height: 32px;font-size: 12px;color: #e15616;margin-top: 8px;}
 .release-from .tags-main{width: 100%;height: auto;}
 .release-from .tags-main .item-tags{padding: 0 10px;line-height: 28px;background: #FFF3E5;text-align: center;font-size:14px;color:  #333333;margin: 5px;border-radius: 2px;float: left;position: relative;}
 .release-from .tags-main .item-tags .del-tags{width: 16px;height: 16px;display: block;background: url("/img/base/icon.png") no-repeat;background-position: -175px -300px;position: absolute;right: -5px;top: -5px;cursor: pointer;}
 .release-from .select-main{padding: 0 10px;cursor: pointer;width: 133px;height: 32px;border: 1px solid #EFEFEF;border-radius: 2px;line-height: 32px;color: #333;font-size: 14px;margin-right: 10px;float: left;appearance: none;-webkit-appearance: none;-moz-appearance: none;position: relative;}
 .release-from .select-main:last-child{margin-right: 0;}
 .release-from .select-main.border{border: 1px solid #e15616;}
-.release-from .select-main .select{cursor: pointer;width: 113px;height: 30px;line-height: 30px;color: #606266;font-size: 12px;float: left;appearance: none;-webkit-appearance: none;-moz-appearance: none;border: none;background: url("/img/supplier/Retract.png") no-repeat scroll right 0px center transparent;}
+.release-from .select-main .select{cursor: pointer;width: 113px;height: 30px;line-height: 30px;color: #22272e;font-size: 12px;float: left;appearance: none;-webkit-appearance: none;-moz-appearance: none;border: none;background: url("/img/supplier/Retract.png") no-repeat scroll right 0px center transparent;}
 .release-from .select-main .option-main{width: 100%;min-height:50px;max-height: 200px;border: 1px solid #e4e7ed;border-radius: 2px;background-color: #fff;box-shadow: 0 2px 12px 0 rgba(0,0,0,.1);overflow: hidden;overflow-y: scroll;box-sizing: border-box;margin: 5px 0;padding: 10px 0;z-index: 88;position: absolute;top: 28px;left: 0;}
 .release-from .select-main .option {font-size: 14px;padding: 0 20px;position: relative;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;color: #606266;height: 34px;line-height: 34px;box-sizing: border-box;cursor: pointer;}
 .release-from .select-main .option:hover {background-color: #F5E7E0;color: #e15616;}
-.release-from .from-button{width: 100%;height: 70px;padding: 10px 0;}
+.release-from .from-button{width: fit-content;height: 70px;padding: 10px 0;margin: auto}
 .release-from .from-button.last{margin-left: 0;}
 .release-from .from-button.last .btn{width: 153px;}
 .release-from .from-button .btn{box-sizing: border-box;width: 232px;height: 50px;background-color: #e15616;box-shadow: 0px 3px 6px 0px rgba(249, 75, 75, 0.17);border-radius: 2px;display: block;line-height: 50px;text-align: center;float: left;margin: 0 5px;}
@@ -95,7 +93,7 @@ input[type="radio"]{opacity:0;}
 .release-from .release-input .release-props .release-radio input:checked + i{border-color:#e15616;color:#e15616}
 .release-from .release-input .release-props .release-radio input:checked + i:before{display:block}
 .release-from .release-input .release-province{width: 100%;height: auto;margin-top: 20px;}
-.release-from .release-input .release-province .province-item{line-height:26px;padding: 0 10px;text-align: center;font-size: 14px;color: #333;background: #F5F5F5;border-radius: 2px;display: block;margin: 0 10px 10px 0;float: left;}
+.release-from .release-input .release-province .province-item{line-height:26px;padding: 0 10px;text-align: center;font-size: 14px;color: #627386;background: #F0F3F7;border-radius: 2px;display: block;margin: 0 10px 10px 0;float: left;}
 .release-from .release-input .release-province .province-item.active{background: #e15616;color: #FFF;}
 /*税率弹窗*/
 .popup{width: 100%;height: 100%;background: rgba(0,0,0,0.3);position: fixed;top: 0;left: 0;z-index: 999;opacity: 0;}
@@ -110,7 +108,7 @@ input[type="radio"]{opacity:0;}
 .popup-layer .popup-content .popup-from input{width: 260px;height: 32px;border: 1px solid #EFEFEF;font-size: 14px;color: #333;padding: 0 10px;margin-left: 10px;box-sizing: border-box;}
 .popup-layer .popup-content .popup-from span{display: inline-block;height: 32px;font-size: 14px;color: #999;float: left;}
 .popup-layer .popup-content .popup-from .popup-p{width: 240px;height: 32px;font-size: 14px;color: #333;padding: 0 10px;float: left;}
-.popup-layer .popup-content .popup-from .popup-textarea{height: 78px;float: left;margin-left: 10px;width: 236px;border-radius: 2px;}
+.popup-layer .popup-content .popup-from .popup-textarea{height: 78px;float: left;margin-left: 10px;border-radius: 2px;}
 .popup-layer .popup-content .popup-from textarea{width: 100%;height: 100%;font-size: 12px;resize:none;border: 1px solid #EFEFEF;padding: 5px;}
 .popup-layer .popup-content .popup-from  .poze{width: 40px;height: 30px;text-align: center;font-size: 14px;position: absolute;right: 0;top: 0;padding: 0 10px;}
 .popup-layer .popup-content .popup-tips{color: #FF0000;float: left;margin-left: 10px;}
@@ -128,6 +126,9 @@ input[type="radio"]{opacity:0;}
 .ck-content {min-height: 500px;}
 .footTop{height: 100px;}
 .baseHeadCenter .keyword{height: 40px;line-height: 40px;}
+input::placeholder{color: #9aa5b5}
+.release-from.shili .text{width: 100%;color: #627386}
+.imgText .text{width: 100%;color: #627386}
 }
 
 /*移动*/

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

@@ -4,21 +4,6 @@ li{list-style:none}
  * PC端
  */
 @media screen and (min-width:768px){
-    .navLayout {min-height: 410px;}
-    .crumbs{padding-left: 220px;padding-right: 20px;}
-    .crumbs .link{display: block;float: right;font-size: 14px;color: #E15616;text-decoration: underline;}
-    .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: 78px;box-sizing: border-box;padding: 20px;background-color: #FFF;box-shadow: 0px 3px 6px 0px rgba(0, 0, 0, 0.07);}
@@ -30,28 +15,23 @@ li{list-style:none}
     .container{width: 100%;height: auto;box-sizing: border-box;margin-top: 15px;position: relative;}
     .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;}
-    .container .section.address-none .formLine input{box-sizing:border-box;width:100%;height:36px;line-height:34px;text-indent:1.2em;background-color:#FFF;border:1px solid #b8bfca;border-radius:2px}
-    .container .section.address-none .formLine select{cursor: pointer; box-sizing:border-box;width:162px;height:36px;line-height:34px;text-indent:1.2em;background-color:#FFF;border:1px solid #b8bfca;border-radius:2px}
-    .container .section.address-none .formLine textarea{width:100%;height:114px;box-sizing:border-box;border:solid 1px #b8bfca;padding:10px 16px;line-height:20px;resize: none;border-radius: 2px;outline: none;}
-    .container .section.address-none .label{width: 90px;float: left;}
-    .container .section.address-none .label.tex{height: 114px;}
-    .container .section.address-none .label p{height:auto;line-height:36px;font-size: 14px;text-align: right;}
-    .container .section.address-none .label p em{font-style:normal;color:#f94b4b;margin:0 5px}
-    .container .section.address-none .form-input{width: 496px;float: left;}
-    .container .section.address-none .address-sub{width: 340px; float: right;height: 100%;position: relative;box-sizing: border-box;padding: 98px 30px;}
-    .container .section.address-none .address-sub:before{content:'';width: 1px;height: 90px;border-left: 1px dashed #b8bfca;position: absolute;left: 0;top: 50%;margin-top: -45px;}
-    .container .section.address-none .address-sub .checked{width: 100%;height: 16px;line-height: 16px;float: left;cursor: pointer;}
-    .container .section.address-none .address-sub .checked .icon{width:16px;height: 16px;display: block;float: left;margin-right: 5px;}
-    .container .section.address-none .address-sub .checked .icon-weigouxuan:before{width:16px;height: 16px;background-position: -288px 0;}
-    .container .section.address-none .address-sub .checked .icon-gouxuan:before{width:16px;height: 16px;background-position: -262px 0;}
-    .container .section.address-none .address-sub .checked span{font-size: 14px;color:#1890f9;}
-    .container .section.address-none .address-sub .button{width: 100%;height: 36px;float: left;margin-top: 35px;}
-    .container .section.address-none .address-sub .btn{width: 128px;height: 34px;float: left;line-height: 34px;text-align: center;font-size: 14px;display: block;border: 1px solid #E15616;}
-    .container .section.address-none .address-sub .btn-confirm{background-color: #E15616;color: #ffffff;margin-right: 15px;}
-    .container .section.address-none .address-sub .btn-cancel{background-color: #FFE6DC;color: #E15616;}
-
+    .addressWrap{padding:16px;position:relative}
+    .addressWrap .formLine{padding-bottom:16px;font-size:14px;position:relative;padding-left:90px;text-align:left;width:450px}
+    .addressWrap .formLine .label{position:absolute;left:0;top:0;width:90px;text-align:right;line-height:36px;font-size:14px}
+    .addressWrap .formLine .checked{top:8px}
+    .addressWrap .formLine .errTips{display:none}
+    .addressWrap .formLine.error .errTips{display:block}
+    .addressWrap .formLine input{width:420px;height:36px}
+    .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 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 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;}
     .container .section .list-left{width: 660px;height: 100%;float: left;}
@@ -79,21 +59,39 @@ li{list-style:none}
 * 移动端
 */
 @media screen and (max-width:768px){
-.navLayout{background:#FFF;border-top:1px solid #F5F5F5;border-bottom:1px solid #F5F5F5;}
-.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}
-
-
+    .order-header{line-height:7.4vw;background:#FFF;padding:3.3vw;margin:1.5vw auto;font-size:3.1vw;position:relative}
+    .order-header p span{color:#E15616;margin:0 1vw}
+    .header-button .btn-server{position:absolute;right:3.3vw;top:3vw}
+    .container{box-sizing:border-box;width:100%;position:relative}
+    .container .list{line-height:7.4vw;background:#FFF;padding:3.3vw}
+    .container .list{margin-bottom:1vw;border-bottom:1px dashed #eee;position:relative}
+    .container .list p{display:inline-block;min-width:49%;line-height:5vw;font-size:3.4vw;color:#22272e}
+    .container .list p .label{color:#627386;margin-right:2vw}
+    .container .list-right{padding-top:2vw}
+    .container .list-btn,.header-button .btn-server{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}
+    .container .list-btn.ico{background-color:#ffd8d8;color:#f94b4b;border-color:#f94b4b;margin-left:2vw}
+    .header-button .btn-server{background-color:#E15616;color:#FFF;border-color:#E15616;}
+    .container .list-btn i{font-style:normal;}
+    .container .list-defalut{height:8vw;line-height:8vw}
+    .container .list-defalut .mIcon{display:inline-block;vertical-align:middle}
+    .container .list-defalut .mIcon:before{height:8vw;width:8vw;background-position:-94.1vw -36.7vw}
+    .container .list-defalut span{display:inline-block;height:6vw;line-height:6vw;font-size:3.1vw;color:#FFFFFF;background-color:#f94b4b;border-radius:3vw;padding:0 3vw;vertical-align:middle}
+    .container .list-defalut a{display:inline-block;height:6vw;line-height:6vw;margin-left:2vw;color:#1890f9;vertical-align:middle}
+    .container .list-defalut a{padding:0;margin:0;font-size: 3.1vw;}
+    .container .list .seclet{width:6vw;height:6vw;position:absolute;bottom:0;right:0;opacity:0}
+    .container .list .seclet .mIcon{width:6vw;height:6vw;display:block}
+    .container .list .seclet .mIcon:before{width:6vw;height:6vw;background-position:-75.1vw -7.8vw}
+    .container .list.checked{border:1px solid #E15616}
+    .container .list.checked .seclet{opacity:1}
+    .addressWrap{position:fixed;bottom:0;left:0;width:100%;height:100%;margin:0 auto;background-color:rgba(74,79,88,.7);z-index:999999;box-sizing:border-box;}
+    .addressWrap .form{width:100%;box-sizing:border-box;position:absolute;bottom:0;left:0;background:#FFF;border-radius:2vw 2vw 0 0;padding:3.3vw}
+    .addressWrap .btnBox .group{text-align:center}
+    .addressWrap .btnBox .group p:first-child{margin-bottom:5vw}
+    .addressWrap .btnBox .group .check{display:inline-block;color:#1890f9}
+    .addressWrap .btnBox .group .check input{vertical-align:top;margin-right:2vw}
+    .addressWrap .btnBox .group .btn{display:inline-block;width:40vw;height:11vw;line-height:11vw;text-align:center;font-size:3.4vw;color:#e15616;border:1px solid #e15616;background:#FFE6DC}
+    .addressWrap .btnBox .group .btn.save{background-color:#E15616;color:#FFF;border-color:#E15616}
 
 
 
 }
-

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

@@ -11,8 +11,6 @@ li{list-style:none}
     .content .section .section-top{width: 100%;height: 54px;float: left;box-sizing: border-box;padding: 9px 0;border-bottom: solid 1px #e2e7ef;}
     .content .section .section-top .cheacked{width: 100px;height: 36px;float: left;cursor: pointer;}
     .content .section .section-top .cheacked .icon{width: 16px;height: 16px;display: block;float: left;padding: 10px 15px}
-    .content .section .section-top .cheacked .icon.icon-weigouxuan:before{width: 16px;height: 16px;background-position: -236px 0;}
-    .content .section .section-top .cheacked .icon.icon-gouxuan:before{width: 16px;height: 16px;background-position: -210px 0;}
     .content .section .section-top .cheacked span{display: inline-block;line-height: 36px;font-size: 16px;color: #22272e;}
     .content .section .section-top .button{width: 250px;height: 36px;float: right;}
     .content .section .section-top .button .btn{width: 90px;height: 34px;float: right;margin-left: 16px;border-radius: 2px;background-color: #ffe6dc;line-height: 34px;text-align: center;font-size: 14px;color: #E15616;border: solid 1px #e15616;}
@@ -20,17 +18,33 @@ li{list-style:none}
     .content .section .section-content .new-list{width: 100%;height: 36px;float: left;box-sizing: border-box;}
     .content .section .section-content .new-list .text{line-height: 36px;white-space: nowrap;text-overflow: ellipsis;overflow: hidden;word-break: break-all;float: left;}
     .content .section .section-content .new-list .icon{width: 16px;height: 16px;display: block;float: left;padding: 10px 15px;line-height: 16px;cursor: pointer;}
-    .content .section .section-content .new-list .icon.icon-weigouxuan:before{width: 16px;height: 16px;background-position: -236px 0;}
-    .content .section .section-content .new-list .icon.icon-gouxuan:before{width: 16px;height: 16px;background-position: -210px 0;}
     .content .section .section-content .new-list .text p{width: 600px;line-height: 36px;font-size: 14px;color: #627386;float: left;overflow: hidden;text-overflow: ellipsis;}
-    .content .section .section-content .new-list .time{line-height: 36px;font-size: 12px;color: #b8bfca;float: right;}
+    .content .section .section-content .new-list .time{line-height: 36px;font-size: 14px;color: #b8bfca;float: right;}
+    .check{float: left;margin: 8px}
+    .notclick{pointer-events: none;opacity: .6}
 }
 
 /**
 * 移动端
 */
 @media screen and (max-width:768px){
-
-
+    .content{width: 100%;background-color: #FFFFFF;box-sizing: border-box;padding:3.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}
+    .section-top .cheacked{width: 100px;height: 36px;float: left;cursor: pointer;}
+    .section-top .cheacked .icon{width: 16px;height: 16px;display: block;float: left;padding: 10px 15px}
+    .section-top .cheacked span{display: inline-block;line-height: 36px;font-size: 16px;color: #22272e;}
+    .section-top .button{height: 36px;float: right;}
+    .section-top .button .btn{width: 90px;height: 34px;float: right;margin-left: 16px;border-radius: 2px;background-color: #ffd8d8;
+    line-height: 34px;text-align: center;font-size: 14px;color: #f94b4b;border: solid 1px #f94b4b;border-radius: 6.4vw}
+    .section-top .button .btn.Read{border: .27vw solid #1890f9;color: #1890f9;background: #e0f1ff}
+    .content .section .section-content{width: 100%;height: auto;float: left;box-sizing: border-box;padding: 10px 0;}
+    .content .section .section-content .new-list{width: 100%;box-sizing: border-box;}
+    .content .section .section-content .new-list .text{line-height: 36px;white-space: nowrap;text-overflow: ellipsis;overflow: hidden;word-break: break-all;float: left;}
+    .content .section .section-content .new-list .icon{width: 16px;height: 16px;display: block;float: left;padding: 10px;line-height: 16px;cursor: pointer;}
+    .content .section .section-content .new-list .text p{line-height: 36px;font-size: 3.4vw;color: #627386;float: left;width: 77.6vw;overflow: hidden;word-wrap: normal;vertical-align: middle;text-overflow: ellipsis}
+    .content .section .section-content .new-list .time{font-size: 3.1vw;color: #b8bfca;float: left;padding-left: 37px}
+    input.check {width: 3.5vw;height: 3.5vw;line-height: 3.5vw;vertical-align: top;margin: 3vw 3vw 1.3vw 3.3vw;float: left;}
+    .notclick{pointer-events: none;opacity: .6}
 }
 

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

@@ -5,20 +5,6 @@ li{list-style:none}
  */
 @media screen and (min-width:768px){
     .pageWrap{width: 100%;}
-    .navLayout {min-height: 410px;}
-    .crumbs{padding-left: 220px;padding-right: 20px;}
-    .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: 78px;box-sizing: border-box;padding: 20px;background-color: #FFF;}
@@ -40,17 +26,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 .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/css/user-center/operation/list.css

@@ -4,21 +4,6 @@ li{list-style:none}
  * PC端
  */
 @media screen and (min-width:768px){
-    .pageWrap{width: 100%;}
-    .navLayout {min-height: 410px;}
-    .crumbs{padding-left: 220px;padding-right: 20px;}
-    .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: 78px;box-sizing: border-box;padding: 20px;background-color: #FFF;box-shadow: 0px 3px 6px 0px rgba(0, 0, 0, 0.07);}
@@ -68,20 +53,10 @@ li{list-style:none}
 * 移动端
 */
 @media screen and (max-width:768px){
-    .navLayout{border-top:1px solid #F5F5F5;border-bottom:1px solid #F5F5F5;}
-    .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}
     .order-header{padding: 2.7vw 4vw;background: #fff}
-    .search{width:100%;height: 11.8vw;border: 1px solid #b8bfca;margin-bottom: 2.7vw;line-height: 11.8vw;}
+    .search{width:100%;height: 11.8vw;border: 1px solid #b8bfca;margin-bottom: 2.7vw;line-height: 11.8vw;font-size:3.1vw;overflow: hidden;}
     .search span.label{padding-left: 2.7vw;color: #627386}
-    .search-input {height: -webkit-fill-available;width: 70vw;border: none;border-radius: .27vw}
+    .search-input {height: -webkit-fill-available;width: 70vw;font-size:3.1vw;border: none;border-radius: .27vw}
     input::placeholder{color: #9aa5b5}
     .header-button a{width: 35.3vw;height: 11.2vw;border: 1px solid #e15616;text-align: center;line-height: 11.2vw;background: #ffe6dc;
     display: inline-block;color: #e15616;font-size: 3.7vw}

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

@@ -4,20 +4,6 @@ li{list-style:none}
  * PC端
  */
 @media screen and (min-width:768px){
-    .navLayout {min-height: 410px;}
-    .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-container{width: 100%;min-height:410px;}

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

@@ -4,20 +4,6 @@ li{list-style:none}
  * PC端
  */
 @media screen and (min-width:768px){
-    .navLayout {min-height: 410px;}
-    .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);}

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

@@ -10,8 +10,16 @@ body{background:#FFF;}
 .repair .desc{font-size:14px;color:#e15616;height:36px;line-height:36px;text-align:center;margin-bottom:30px;background-color:#fff7f3;background-image:-ms-linear-gradient(270deg,#ffffff 0%,#ffe6dc 50%,#ffffff 100%);background-image:-webkit-linear-gradient(270deg,#ffffff 0%,#ffe6dc 50%,#ffffff 100%);background-image:linear-gradient(270deg,#ffffff 0%,#ffe6dc 50%,#ffffff 100%)}
 .repair form{width:498px;margin:0 auto}
 .repair .fileInfo{font-size:14px;line-height:24px;color:#f94b4b}
-
-
+.formLine .formLine-file {width: 92px;height: 92px;position: relative;}
+.formLine .file {width: 92px;height: 92px;opacity: 0;position: absolute;top: 0;left: 0;z-index: 999;cursor: pointer;}
+.mIcon.add{background: url(/img/account/add.png) no-repeat;height: 92px;display: block;background-size: 92px;}
+.form-upload-image{width: 92px;height: 92px;position: relative;float: left;margin: 0px 10px 10px 0px;cursor: pointer;border-radius: 2px;border: solid 1px #b8bfca}
+.uploadGoodsImages{overflow: hidden}
+.uploadGoodsImages>div{display: inline-block}
+.upload-img{width: 100%;height: 100%;}
+.icon.del:before {width: 20px;height: 20px;background-position: -116px -138px;position: absolute;top: -3px;right: -3px;}
+input::placeholder,textarea::placeholder{color: #9aa5b5}
+.formLine p{color: #627386}
 }
 
 /**
@@ -24,7 +32,15 @@ footer{display:none}
 .repair .desc{font-size:3vw;color:#e15616;line-height:5.2vw;padding:2vw 0;text-align:center;margin-bottom:3vw;background-color:#fff7f3;background-image:-ms-linear-gradient(270deg,#ffffff 0%,#ffe6dc 50%,#ffffff 100%);background-image:-webkit-linear-gradient(270deg,#ffffff 0%,#ffe6dc 50%,#ffffff 100%);background-image:linear-gradient(270deg,#ffffff 0%,#ffe6dc 50%,#ffffff 100%)}
 .repair form{width:100%;margin:0 auto}
 .repair .fileInfo{font-size:3vw;line-height:5.2vw;color:#f94b4b}
-
-
-
+.formLine p{color: #627386}
+input::placeholder,textarea::placeholder{color: #9aa5b5}
+.formLine select{color: #627386;}
+.formLine .formLine-file {width: 25vw;height: 25vw;position: relative;}
+.formLine input.file {width: 25vw;height: 25vw;opacity: 0;position: absolute;top: 0;left: 0;z-index: 999;cursor: pointer;}
+.mIcon.add{background: url(/img/account/add.png) no-repeat;height: 25vw;display: block;    background-size: 25vw;}
+.form-upload-image{width: 25vw;height: 25vw;position: relative;float: left;margin: 0px 2.7vw 2.7vw 0px;cursor: pointer;border-radius: .53vw;border: solid .27vw #b8bfca}
+.uploadGoodsImages{overflow: hidden}
+.uploadGoodsImages>div{display: inline-block}
+.upload-img{width: 100%;height: 100%;}
+.mIcon.del:before {width: 5.3vw;height: 5.3vw;background-position: -90vw -7.5vw;position: absolute;top: -.8vw;right: -.8vw}
 }

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

@@ -4,21 +4,6 @@ li{list-style:none}
  * PC端
  */
 @media screen and (min-width:768px){
-    .navLayout {min-height: 410px;}
-    .crumbs{padding-left: 220px;padding-right: 20px;}
-    .crumbs .link{display: block;float: right;font-size: 14px;color: #E15616;text-decoration: underline;}
-    .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}
     .container{width: 100%;height: auto;background-color: #ffffff;box-sizing: border-box;padding:32px 225px;}
@@ -46,17 +31,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 .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/css/user-center/repair/form.css

@@ -4,21 +4,6 @@ li{list-style:none}
  * PC端
  */
 @media screen and (min-width:768px){
-    .navLayout {min-height: 410px;}
-    .crumbs{padding-left: 220px;padding-right: 20px;}
-    .crumbs .link{display: block;float: right;font-size: 14px;color: #E15616;text-decoration: underline;}
-    .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}
     .container{width: 100%;height: auto;background-color: #ffffff;box-sizing: border-box;padding:32px 225px;}
@@ -40,23 +25,14 @@ li{list-style:none}
     .container .formLine .btn.disabled{background-color: #999999;}
 
 
+
 }
 
 /**
 * 移动端
 */
 @media screen and (max-width:768px){
-.navLayout{background:#FFF;border-top:1px solid #F5F5F5;border-bottom:1px solid #F5F5F5;}
-.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/css/user-center/repair/list.css

@@ -4,21 +4,6 @@ li{list-style:none}
  * PC端
  */
 @media screen and (min-width:768px){
-    .navLayout {min-height: 410px;}
-    .crumbs{padding-left: 220px;padding-right: 20px;}
-    .crumbs .link{display: block;float: right;font-size: 14px;color: #E15616;text-decoration: underline;}
-    .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: 78px;box-sizing: border-box;padding: 20px;background-color: #FFF;box-shadow: 0px 3px 6px 0px rgba(0, 0, 0, 0.07);}
@@ -71,16 +56,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 .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}
 .header-bt{padding: 3.3vw}
 .search:nth-child(1){width: 93.4vw;height: 11.7vw;line-height: 11.7vw;border: .27vw solid rgba(184,191,202,.5);margin-bottom: 2.7vw;}
 .search input{height: -webkit-fill-available;width: 75vw;border: none;}

src/main/resources/static/css/user-center/setting/information.css

@@ -33,8 +33,8 @@ li{list-style:none}
 .formLine .business{height:auto;position:relative}
 .formLine .business input[type="text"] {width: 324px;display: block;float: left;margin-right: 15px;}
 .formLine .business a {display: block;float: left; width: 92px;height: 32px;line-height: 34px;font-size: 14px;color: #e15616;background-color: #ffe6dc;border-radius: 2px;border: solid 1px #e15616;text-align: center;}
-
-
+.formLine p{color: #627386}
+input::placeholder,textarea::placeholder{color: #9aa5b5}
 
 }
 
@@ -44,6 +44,7 @@ li{list-style:none}
 @media screen and (max-width:768px){
 body{width:100%;height:100%;background:#FFF url(/img/account/register.png) no-repeat center bottom;background-size:100% auto;background-attachment: fixed;}
 footer{display:none}
+.container{padding:3.2vw;font-size:3.4vw;color:#627386;}
 .registerClub{padding: 20px 0;}
 .registerShop{padding: 20px 0;}
 .selectAccount{width:100%;height:90vh;text-align:center;}
@@ -106,4 +107,8 @@ footer{display:none}
 .subLine .btn-upgrade {cursor: pointer;display: block;width: 93.4vw;height: 11.2vw;line-height: 50px;background-color: #e15616;border-radius: 0.2vw;text-align: center;font-size: 3.4vw;color: #FFF;float: left;margin-bottom: 2.8vw;}
 .subLine .btn-upgrade.none{border: 1px solid #E15616;background-color: #ffe6dc;box-shadow: 0px 3px 6px 0px rgba(249, 75, 75, 0.17);color: #e15616;}
 .subLine .btn-upgrade.disabled{background-color: #999999;}
+.container{padding:3.3vw}
+.title{color: #22272e;font-size: 3.7vw}
+.formLine p{color: #627386}
+input::placeholder,textarea::placeholder{color: #9aa5b5}
 }

src/main/resources/static/css/user-center/setting/password.css

@@ -27,11 +27,11 @@ li{list-style:none}
     .signAccount .title{height:8.6vw;line-height:8.6vw;font-size:3.4vw;color:#22272e;text-align:left;padding: 0 4vw;}
     .forget-form{padding:0;}
     .signAccount form{width:93.4vw;margin:0 auto;}
-    .subLine{margin-top:2vw;float: left;width: 100%;}
+    .subLine{width: 100%;}
     .container form{padding: 0 2.7vw}
     .formLine p{color: #627386}
      input::placeholder{color: #9aa5b5}
-    .right-header{    width: 100%;box-sizing: border-box;padding: 0 3.3vw;}
-    .right-header .header-tabs{width: 46.7vw;height: 9.6vw;background-color: #f0f3f7;border-radius: .53vw 0px 0px .53vw;;line-height: 9.6vw;font-size: 14px;text-align: center;color: #627386;float: left;cursor: pointer;}
+    .right-header{width:100%;box-sizing: border-box;padding:3.3vw;}
+    .right-header .header-tabs{width: 46.7vw;height: 9.6vw;background-color: #f0f3f7;border-radius: .53vw 0 0 .53vw;;line-height: 9.6vw;font-size:3.4vw;text-align: center;color: #627386;cursor: pointer;}
     .right-header .header-tabs.current{background-color: #e15616;color: #FFFFFF;}
 }

src/main/resources/static/css/user-center/setting/phone.css

@@ -31,7 +31,7 @@ li{list-style:none}
     .subLine{margin-top:2vw;float: left;width: 100%;}
     .header{width: 100%;box-sizing: border-box;padding: 2.7vw 0;background-color: #FFFFFF;}
     .header .header-p{width: 100%;height: 9.6vw;background-image: linear-gradient(270deg,rgba(255,255,255,0.1) 0%,rgba(255,86,11,0.1) 51%,rgba(255,255,255,0.1) 100%);line-height: 9.6vw;font-size: 3.1vw;color:#e15616;text-align: center;}
-    .container .title{color: #22272e;font-weight: bold;text-align: center;padding: 10.4vw 0}
+    .container .title{color: #22272e;font-weight: bold;text-align: center;padding: 10.4vw 0; font-size: 3.4vw;}
     .container form{padding: 0 2.7vw}
     .container .title span{color: #f94b4b}
     .formLine p{color: #627386}

src/main/resources/static/css/user-center/setting/upgrade.css

@@ -53,6 +53,44 @@ li{list-style:none}
 @media screen and (max-width:768px){
 body{width:100%;height:100%;background:#FFF url(/img/account/register.png) no-repeat center bottom;background-size:100% auto;background-attachment: fixed;}
 footer{display:none}
-
-
+.container{padding: 3.3vw}
+.container .title-tips {
+    margin-bottom: 4.3vw;
+    width: 100%;
+    height: 9.6vw;
+    background-image: linear-gradient(270deg,rgba(255,255,255,0.1) 0%,rgba(255,86,11,0.1) 51%,rgba(255,255,255,0.1) 100%);
+}
+.container .title-tips p {
+    width: 100%;
+    height:9.6vw;
+    font-family: Microsoft YaHei;
+    font-size: 3vw;
+    font-weight: normal;
+    font-stretch: normal;
+    line-height: 9.6vw;
+    color: #e15616;
+    text-align: center;
+}
+.container .title{color: #22272e;font-size: 3.7vw;}
+.formLine p{color: #627386}
+input::placeholder,textarea::placeholder{color: #9aa5b5}
+    .formLine .form-upload{width: 36vw;height: auto;float: left;margin-right: 5.3vw;}
+    .formLine .formLine-file{width: 36vw;height: 25vw;position: relative;}
+    .formLine .form-upload-tips{width: 5.3vw;height: 25vw;float: left;position: relative;}
+    .formLine .form-upload-tips .icon{width: 5.3vw;height: 5.3vw;float: left;background: url("/img/base/icon.png") no-repeat;display: block;margin-top: 10.7vw;}
+    .formLine .form-upload-tips .icon-wen{background-position: -22.4vw -38.4vw;cursor: pointer;}
+    .formLine .form-upload-tips .wen-tips{width:48.5vw;height:12.3vw;line-height: 12.3vw;text-align: center;color: #FFF;font-size: 3.4vw; background-color: #1890f9; position: absolute;bottom: -6.4vw;left: -.53vw;border-radius:.8vw;display: none;}
+    .formLine .form-upload-tips .wen-tips:before{content: ''; width: 0px;height: 0px;border-width: 2.1vw;border-style: solid;border-color: transparent transparent #1890f9 transparent;position: absolute;top: -4vw;left:1.3vw;}
+    .formLine .form-upload-tips:hover .wen-tips{display: block;}
+    .formLine .file{width:36vw;height:25vw;opacity: 0;position: absolute;top: 0;left: 0;z-index: 999;cursor: pointer;}
+    .formLine .formLine-file .icon{width: 36vw;height: 25vw;display: block;}
+    .formLine .formLine-file .file-biss{background: url("/img/account/icon-bisse.png") no-repeat;}
+    .formLine .formLine-file .file-door{background: url("/img/account/icon-door.png") no-repeat;}
+    .formLine .formLine-file .file-zizhi{background: url("/img/account/icon-zizhi.png") no-repeat;}
+    .formLine .form-upload-image{width: 36vw;height: 25vw;position: relative;}
+    .formLine .form-upload-image .upload-img{width: 36vw;height:25vw;display: block;}
+    .formLine .form-upload-image .icon{width: 4.2vw;height: 4.2vw;display: block;position: absolute;right: 0;top: 0;cursor: pointer;}
+    .formLine .business{height:auto;position:relative}
+    .formLine .form-upload-image .mIcon:before {width: 16px;height: 16px;background-position: -90vw -8.5vw;}
+    .formLine{overflow: hidden}
 }

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

@@ -78,6 +78,12 @@ var globalHead = new Vue({
             localStorage.removeItem('userInfo');
             this.loginStatus = false;
             window.location.href = "/index.html";
+        },
+        showGlobalMenu: function(){
+            $("#mGlobalMenu").show().find(".cShow").slideDown(500);
+        },
+        hideGlobalMenu: function(){
+            $("#mGlobalMenu").hide().find(".cShow").hide();
         }
     },
     created: function () {
@@ -161,8 +167,11 @@ $(function(){
     $('body').on("click", '.toLogin',function () {
         loginAert('<span>你还未登录</span><span>请登录后再进行购买</span>', '去登录');
     });
+    // 退出登录
     $('body').on("click", '.toLogOut',function () {
-        loginAert('<span>确定退出登录吗？</span>', '退出登录');
+        localStorage.removeItem('userInfo');
+        globalHead.loginStatus = false;
+        window.location.href = "/index.html";
     });
     // 置顶
     $('#scrollTop').on("click", '.toTop',function () {

src/main/resources/static/js/common/serviceapi/user.service.js

@@ -136,4 +136,10 @@ var UserApi = {
                 callback(res)
             });
         },
-};
+       Maintenance : function(params,callback) { //扫码微信绑定机构
+            Http.AjaxService({ url:'/pcCenter/applyMaintenance', type:'post', data:params, json:false})
+            .then(function(res){
+                callback(res)
+            });
+        },
+};

src/main/resources/static/js/common/serviceapi/utils.service.js

@@ -247,6 +247,18 @@ var PublicApi = {
                 callback(res)
             });
         },
+        markAsRead:function (params,callback) {//已读消息
+            Http.AjaxService({ url:'/user/markAsRead', type:'post', data:params, json:false})
+            .then(function(res){
+                callback(res)
+            });
+        },
+        deleteMessage:function (params,callback) {//删除消息
+            Http.AjaxService({ url:'/user/deleteMessage', type:'post', data:params, json:false})
+            .then(function(res){
+                callback(res)
+            });
+        },
 };
 
 

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

@@ -3,6 +3,7 @@ var isPC = ($(window).width()>768);
 var dashboard = new Vue({
     el:'#dashboard',
     data:{
+        isRequset:true,
         userId:'',
         homeData:'',
         formData:new FormData(),
@@ -21,6 +22,7 @@ var dashboard = new Vue({
              var _this = this;
              SupplierApi.homePageData({userId:_this.userId},function (res) {
                  if(res.code==0){
+                     _this.isRequset = false;
                      _this.homeData = res.data;
                      _this.goodImage = _this.homeData.user.image;
                      _this.shopinfo = res.data.shop;
@@ -39,6 +41,8 @@ var dashboard = new Vue({
                          _this.paytotalfeeData.push(item.orderAmount);
                      });
                      _this.EchartsCreated2d();
+                 }else {
+                     _this.isRequset = false;
                  }
              })
          },
@@ -182,6 +186,7 @@ var dashboard = new Vue({
              };
              // 使用刚指定的配置项和数据显示图表。
              myChart.setOption(option);
+             window.onresize = myChart.resize;//移动适配
          }
     },
     mounted:function () {

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

@@ -8,6 +8,9 @@ var helpSuggestion = new Vue({
         degree:'',
         isCheckedAll:false,
         messagesList:[],//新闻动态
+        check:false,
+        checklist:[],
+        msgId:'',
     },
     methods: {
         GetMyPcCenterInfo:function(){
@@ -21,36 +24,79 @@ var helpSuggestion = new Vue({
                 }
             })
         },
-        checkedAllFn :function(){
+        checkedItemFn:function(item){ //单选
             var _self = this;
-            _self.isCheckedAll = !_self.isCheckedAll;
-            _self.updateBothCheckBtn();
-        },
-        checkedItemFn :function(item){
-            var _self = this;
-            item.isCheck = !item.isCheck;
-            console.log(item)
-            _self.updateCheckAllBtn();
-        },
-        updateBothCheckBtn:function() {// 全选勾选
-            var _self = this;
-            _self.messagesList.forEach(function(item){
-                item.isCheck = _self.isCheckedAll ;
-         })
+                    if(event.target.checked){
+                         _self.checklist.push(item.messageID);
+                         _self.msgId = _self.checklist.toString()+','
+                    }else {
+                      _self.checklist.splice(_self.checklist.indexOf(item.messageID), 1);
+                      _self.msgId = _self.checklist.toString()+','
+                    }
+                    if(_self.checklist.length==_self.messagesList.length){
+                        _self.isCheckedAll=true;
+                    }else {
+                       _self.isCheckedAll=false;
+                    }
+
         },
-        updateCheckAllBtn:function() {// 全选勾选判断
+        checkedAllFn: function () { //全選
             var _self = this;
-            var goodsCheckedLength = 0,
-                messagesList = _self.messagesList;
-            _self.messagesList.forEach(function(item){
-                if(item.isCheck) { goodsCheckedLength++; }
-            });
-            _self.isCheckedAll = goodsCheckedLength === messagesList.length;
+            _self.isCheckedAll = !_self.isCheckedAll;
+                if (_self.isCheckedAll) {
+                    _self.checklist = [];
+                    _self.messagesList.forEach(function (item) {
+                            if(item.readFlag!=1){
+                                 item.check = true;
+                                 _self.checklist.push(item.messageID);
+                                 _self.msgId = _self.checklist.toString()+','
+                            }else {
+                                item.check = false;
+                            }
+                        })
+                }else{
+                     _self.messagesList.forEach(function(item){
+                          item.check = false;
+                    });
+                    _self.checklist = [];
+                    _self.msgId = ''
+                }
         },
-        deleteMessageFn: function(){//删除消息
-
+       deleteMessageFn: function(){//删除消息
+             var _this =this;
+             if(_this.messagesList==''){
+                 CAIMEI.Alert('暂无消息', '确定', false);
+             }else if(_this.checklist.length==0) {
+                 CAIMEI.Alert('未选择任何消息', '确定', false);
+             }else {
+                PublicApi.deleteMessage({messageIds:_this.msgId},function (res) {
+                    if (res.code==0){
+                      CAIMEI.dialog('刪除成功');
+                      location.reload();
+                    }else {
+                      CAIMEI.Alert(res.msg, '确定', false);
+                    }
+                })
+             }
         },
-        signMessageFn: function(){//标记为已读
+       signMessageFn: function(){//标记为已读
+           var _this =this;
+            console.log(_this.checklist);
+            console.log(_this.msgId);
+            if(_this.messagesList==''){
+             CAIMEI.Alert('暂无消息', '确定', false);
+            }else if(_this.checklist.length==0){
+              CAIMEI.Alert('未选择任何消息', '确定', false);
+            }else {
+                     PublicApi.markAsRead({messageIds:_this.msgId},function (res) {
+                    if(res.code==0){
+                     CAIMEI.dialog('已读成功');
+                     location.reload();
+                    }else {
+                     CAIMEI.Alert(res.msg, '确定', false);
+                    }
+                })
+            }
 
         },
         showBadge:function(n){//处理标签

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

@@ -5,41 +5,32 @@ var orderPage = new Vue({
         isRequset:true,
         isShwoAddModel:false,
         isDefaultFlag:false,
-        isDefaultChecked:false,
         userId: 0,
-        addressList:[],
-        ProvinceList:[],
-        cityArray:[],
-        townArray:[],
-        addressFrom: {
-            name:'',
-            province: '',
-            city: '',
-            town: ''
-        },
-        isAddType:'add',
         addressList:[],//收货地址
-        addressData:{},//初始化地址信息
-        hanldAddressData:{},//选择确定的地址信息
-        addAddressData:{//初始化地址信息
-            addressID:'',
-            allAddress:'',
-            userID: '',			//用户id ,只在新增收货地址时传
-            shouHuoRen: '',		//收货人
-            mobile:'',			//收货人手机
-            townID:'',			//区ID
-            address: '',	//地址
-            defaultFlag:0		//是否默认收货地址(0 不是默认,1 默认)
+        provinceOptions:[],
+        cityOptions:[],
+        townOptions:[],
+        addressForm: {
+            id: '',
+            name: '',
+            mobile: '',
+            townId: '',
+            cityId: '',
+            provinceId: '',
+            desc: '',
+            default: ''
         },
-        addressLength:0
-    },
-    filters: {
-
+        rule:{
+            name: '^[a-zA-Z\\u4e00-\\u9fa5]{2,}$',
+            mobile: '^\\d{6,12}$'
+        }
     },
-    computed: {
 
-    },
     methods: {
+        blurHandle: function(event) {
+            var el = event.currentTarget;
+            verifyHandle(el);
+        },
         GetQueryListData:function(){//查询d地址列表
             var _self = this;
             OrderApi.GetAddressList({userID:_self.userId,pageNum:1,pageSize:20},function (response) {
@@ -59,6 +50,61 @@ var orderPage = new Vue({
                 }
             })
         },
+        // 获取全部省份
+        getProvinceOptions: function(){
+            var _self = this;
+            PublicApi.GetProvince({},function(r){
+                if(r.code === 0 && r.data){
+                    _self.provinceOptions =r.data;
+                }else{
+                    CAIMEI.Alert(r.msg,'确定',false);
+                }
+            });
+        },
+        getCityOptions: function(provinceId,callback){
+            var _self = this;
+            if(provinceId && provinceId>0){
+                _self.cityOptions = [];
+                _self.townOptions = [];
+                _self.addressForm.cityId = '';
+                _self.addressForm.townId = '';
+                PublicApi.GetCity({ provinceId: provinceId },function(r){
+                    if(r.code === 0 && r.data){
+                        _self.cityOptions = r.data;
+                        if(callback){callback();}
+                    }else{
+                        CAIMEI.Alert(r.msg,'确定',false);
+                    }
+                });
+            }
+        },
+        getTownOptions: function(cityId, callback){
+            var _self = this;
+            if(cityId && cityId>0){
+                _self.townOptions = [];
+                _self.addressForm.townId = '';
+                PublicApi.GetTown({cityId: cityId},function(r){
+                    if(r.code === 0 && r.data){
+                        _self.townOptions = r.data;
+                        if(callback){callback();}
+                    }else{
+                        CAIMEI.Alert(r.msg,'确定',false);
+                    }
+                })
+            }
+        },
+        // 列表直接设为默认地址
+        setDefaultAddress: function(addressId){
+            var _self = this;
+            OrderApi.DefaultAddress({addressId:addressId,userId:_self.userId},function (r) {
+                if(r.code === 0 ){
+                    // 重新获取地址列表
+                    _self.GetQueryListData();
+                }else{
+                    CAIMEI.Alert(r.msg,'确定',false);
+                }
+            });
+        },
         deleteAddress :function(addressID){//列表删除单个地址
             var _self = this;
             CAIMEI.Modal('确定要删除该地址？','取消','确定',function () {
@@ -73,158 +119,88 @@ var orderPage = new Vue({
                 })
             });
         },
+        createAddress: function(){
+            this.isShwoAddModel = true;
+            this.addressForm.id = 0;
+            this.addressForm.name = '';
+            this.addressForm.mobile = '';
+            this.addressForm.default = false;
+            this.addressForm.desc = '';
+            this.addressForm.provinceId = '';
+            this.addressForm.cityId = '';
+            this.addressForm.townId = '';
+            if(!isPC){fixedBody();}
+        },
         editAddress :function(item) {//编辑地址
+            this.isShwoAddModel = true;
+            this.addressForm.id = item.addressID;
+            this.addressForm.name = item.shouHuoRen;
+            this.addressForm.mobile = item.mobile;
+            this.addressForm.default = (item.defaultFlag*1===1);
+            this.addressForm.desc = item.address;
+            this.addressForm.provinceId = item.provinceID;
             var _self = this;
-            if (item.defaultFlag == '1') {
-                _self.isDefaultFlag = true;
-            } else {
-                _self.isDefaultFlag = false;
-            }
-            _self.isAddType = 'edit';
-            _self.isShwoAddModel = true;
-            _self.addAddressData = item;
-            _self.addAddressData.allAddress = item.province + '' + item.city + '' + item.town;
-            _self.addressFrom.province = item.provinceID;
-            _self.addressFrom.city = item.cityID;
-            _self.addressFrom.town = item.townID;
-            _self.GetProvinceFn();
-            _self.ChangeGetcity();
-            _self.ChangeGetcTown();
+            this.getCityOptions(item.provinceID, function(){
+                _self.addressForm.cityId = item.cityID;
+                _self.getTownOptions(item.cityID,function(){
+                    _self.addressForm.townId = item.townID;
+                });
+            });
+            if(!isPC){fixedBody();}
+        },
+        hideAddressForm: function(){
+            this.isShwoAddModel = false;
+            if(!isPC){looseBody();}
         },
-        ConfirmAddressFn :function(){//保存地址
+        saveAddressForm: function(){
             var _self = this;
-            if(_self.addAddressData.townID == ""){
-                CAIMEI.dialog('请选择所在地区');
-                return;
-            };
-            if(_self.addAddressData.address == ""){
-                CAIMEI.dialog('请填写详细地址');
-                return;
-            };
-            if(_self.addAddressData.shouHuoRen == ""){
-                CAIMEI.dialog('请输入收货人姓名');
-                return;
-            };
-            if(_self.addAddressData.mobile == ""){
-                CAIMEI.dialog('请输入收货人手机号');
-                return;
-            };
-            if( _self.isAddType == 'add'){
-                var params = {
-                    userID:_self.userId  ,		//用户id ,只在新增收货地址时传
-                    shouHuoRen:_self.addAddressData.shouHuoRen ,//收货人
-                    townID:_self.addAddressData.townID,			//区ID
-                    address:_self.addAddressData.address,//地址
-                    mobile:_self.addAddressData.mobile,			//手机
-                    defaultFlag:_self.addAddressData.defaultFlag//是否默认收货地址(0 不是默认,1 默认)
+            var pass = verifyForm();
+            if (_self.isConDisabled) { return false; }
+            this.$nextTick(function() {
+                if (!pass) {return false;}
+                if(!_self.addressForm.townId){
+                    CAIMEI.dialog('请选择所在地区');
+                    return false;
                 };
-            }else{
+                _self.isConDisabled = true;
                 var params = {
-                    addressID:_self.addAddressData.addressID,//编辑保存地址ID
-                    userID:_self.userId  ,		//用户id ,只在新增收货地址时传
-                    shouHuoRen:_self.addAddressData.shouHuoRen ,//收货人
-                    townID:_self.addAddressData.townID,			//区ID
-                    address:_self.addAddressData.address,//地址
-                    mobile:_self.addAddressData.mobile,			//手机
-                    defaultFlag:_self.addAddressData.defaultFlag//是否默认收货地址(0 不是默认,1 默认)
+                    userID:_self.userId, //用户id ,只在新增收货地址时传
+                    shouHuoRen:_self.addressForm.name, //收货人
+                    mobile:_self.addressForm.mobile,   //手机
+                    townID:_self.addressForm.townId,   //区ID
+                    address:_self.addressForm.desc, //地址
+                    defaultFlag:_self.addressForm.default?1:0 //是否默认收货地址(0 不是默认,1 默认)
                 };
-            }
-            _self.isConDisabled = true;
-            OrderApi.AddSaveAddress(params,function(response){
-                if(response.code == 0){
-                    CAIMEI.dialog('保存成功',true,function () {
-                        _self.GetQueryListData();
-                        _self.isShwoAddModel = false;
-                        _self.isConDisabled = false;
-                    });
-                }else{
-                    CAIMEI.Alert(response.msg,'确定',false);
+                if(_self.addressForm.id){
+                    // 编辑
+                    params.addressID = _self.addressForm.id;//编辑保存地址ID
                 }
+                _self.saveAddress(params);
             });
         },
-        GetProvinceFn: function(){//获取全部省份
-            var _self = this;
-            PublicApi.GetProvince({},function(response){
-                if(response.code == 0){
-                    _self.ProvinceList =response.data;
-                }else{
-                    CAIMEI.Alert(response.msg,'确定',false);
-                }
-            })
-        },
-        ChangeProvince:function () {//选择省份
-            var _self = this;
-            _self.addressFrom.province = event.target.value;
-            if(_self.addressFrom.province==''){//省为请选择时市区初始化
-                _self.cityArray=[];
-                _self.townArray=[];
-                _self.addAddressData.townID=''
-            }else {
-                _self.ChangeGetcity();
-            }
-        },
-        ChangeGetcity:function(event){//加载市
+        saveAddress: function(params){
             var _self = this;
-            PublicApi.GetCity({ provinceId: _self.addressFrom.province },function(response){
-                if(response.code == 0 ){
-                    _self.cityArray = response.data;
-                    _self.addressFrom.city = event.target.value;
-                    if(_self.addressFrom.city==''){
-                        _self.townArray=[];
-                    }else {
-                        _self.ChangeGetcTown();
-                    }
+            OrderApi.AddSaveAddress(params,function(r){
+                if(r.code === 0){
+                    CAIMEI.dialog('保存成功');
+                    _self.isShwoAddModel = false;
+                    _self.isConDisabled = false;
+                    // 重新获取地址列表
+                    _self.GetQueryListData();
                 }else{
-                    CAIMEI.Alert(response.msg,'确定',false);
+                    CAIMEI.Alert(r.msg,'确定',false);
                 }
-            })
-        },
-        ChangeGetcTown:function(event){//选择地区
-            var _self = this;
-            PublicApi.GetTown({ cityId: _self.addressFrom.city },function(response){
-                if(response.code == 0 ){
-                    _self.townArray = response.data;
-                    _self.addAddressData.townID = event.target.value;
-                }else{
-                    CAIMEI.Alert(response.msg,'确定',false);
-                }
-            })
-        },
-        settingDefaultFlag :function(){//添加&&编辑 保存 设置默认地址按钮
-            var _self = this;
-            _self.isDefaultFlag=! _self.isDefaultFlag;
-            if(_self.isDefaultFlag){
-                _self.addAddressData.defaultFlag = '1';
-            }else{
-                _self.addAddressData.defaultFlag = '0';
-            }
-        },
-        ShowAddAddressFn :function(){//显示新增地址
-            var _self = this;
-            _self.isAddType = 'add';
-            _self.isShwoAddModel = true;
-            _self.addressData = {//初始化地址信息
-                    addressID:'',
-                    allAddress:'',
-                    userID: '',			//用户id ,只在新增收货地址时传
-                    shouHuoRen: '',		//收货人
-                    mobile:'',			//收货人手机
-                    townID:'',			//区ID
-                    address: '',	    //地址
-                    defaultFlag:0		//是否默认收货地址(0 不是默认,1 默认)
-            };
-            _self.GetProvinceFn();
-        },
-        CancelAddressFn:function(){
-            var _self = this;
-            _self.isShwoAddModel = false;
+            });
         }
     },
-    mounted: function () {
+    created: function() {
+        this.getProvinceOptions();
         if(globalUserData){
             this.userId = globalUserData.userId;
             this.GetQueryListData();
         }
+    },
+    mounted: function () {
         $('.navLayout').find('.navList').removeClass("on").find('.con').hide().find('a').removeClass("on");
         $('.navLayout').find('.navList').eq(0).addClass("on").find('.con').show().find('a').eq(2).addClass("on");
 

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

@@ -4,53 +4,99 @@ var helpSuggestion = new Vue({
     data: {
         btnLoading: false,
         isRequset:true,
-        userId: 0,
+        userId: '',
         degree:'',
         isCheckedAll:false,
         messagesList:[],//消息列表
+        check:false,
+        checklist:[],
+        msgId:'',
     },
     methods: {
         GetMyPcMymessageInfo:function(){
             var _self = this;
-            UserApi.GetMymessageList({userId:10689},function (response) {
+            UserApi.GetMymessageList({userId:_self.userId},function (response) {
                 if(response.code == 0){
                     var data = response.data;
-                    _self.messagesList = response.data
+                    _self.messagesList = response.data;
+
                     _self.isRequset = false;
                 }else{
                     CAIMEI.Alert(response.msg, '确定', false);
                 }
             })
         },
-        checkedAllFn :function(){
-            var _self = this;
-            _self.isCheckedAll = !_self.isCheckedAll;
-            _self.updateBothCheckBtn();
-        },
-        checkedItemFn :function(item){
-            var _self = this;
-            item.isCheck = !item.isCheck;
-            _self.updateCheckAllBtn();
-        },
-        updateBothCheckBtn:function() {// 全选勾选
+        checkedItemFn:function(item){ //单选
             var _self = this;
-            _self.messagesList.forEach(function(item){
-                item.isCheck = _self.isCheckedAll ;
-         })
+                    if(event.target.checked){
+                         _self.checklist.push(item.messageID);
+                         _self.msgId = _self.checklist.toString()+','
+                    }else {
+                      _self.checklist.splice(_self.checklist.indexOf(item.messageID), 1);
+                      _self.msgId = _self.checklist.toString()+','
+                    }
+                    if(_self.checklist.length==_self.messagesList.length){
+                        _self.isCheckedAll=true;
+                    }else {
+                       _self.isCheckedAll=false;
+                    }
+
         },
-        updateCheckAllBtn:function() {// 全选勾选判断
+          checkedAllFn: function () { //全選
             var _self = this;
-            var goodsCheckedLength = 0,
-                messagesList = _self.messagesList;
-            _self.messagesList.forEach(function(item){
-                if(item.isCheck) { goodsCheckedLength++; }
-            });
-            _self.isCheckedAll = goodsCheckedLength === messagesList.length;
+            _self.isCheckedAll = !_self.isCheckedAll;
+                if (_self.isCheckedAll) {
+                    _self.checklist = [];
+                    _self.messagesList.forEach(function (item) {
+                            if(item.readFlag!=1){
+                                 item.check = true;
+                                 _self.checklist.push(item.messageID);
+                                 _self.msgId = _self.checklist.toString()+','
+                            }else {
+                                item.check = false;
+                            }
+                        })
+                }else{
+                     _self.messagesList.forEach(function(item){
+                          item.check = false;
+                    });
+                    _self.checklist = [];
+                    _self.msgId = ''
+                }
         },
         deleteMessageFn: function(){//删除消息
-
+             var _this =this;
+             if(_this.messagesList==''){
+                 CAIMEI.Alert('暂无消息', '确定', false);
+             }else if(_this.checklist.length==0) {
+                 CAIMEI.Alert('未选择任何消息', '确定', false);
+             }else {
+                PublicApi.deleteMessage({messageIds:_this.msgId},function (res) {
+                    if (res.code==0){
+                      CAIMEI.dialog('刪除成功')
+                    }else {
+                      CAIMEI.Alert(res.msg, '确定', false);
+                    }
+                })
+             }
         },
         signMessageFn: function(){//标记为已读
+          var _this =this;
+            console.log(_this.checklist);
+            console.log(_this.msgId);
+            if(_this.messagesList==''){
+             CAIMEI.Alert('暂无消息', '确定', false);
+            }else if(_this.checklist.length==0){
+              CAIMEI.Alert('未选择任何消息', '确定', false);
+            }else {
+                     PublicApi.markAsRead({messageIds:_this.msgId},function (res) {
+                    if(res.code==0){
+                     CAIMEI.dialog('已读成功')
+                    }else {
+                     CAIMEI.Alert(res.msg, '确定', false);
+                    }
+                })
+            }
 
         },
         showBadge:function(n){//处理标签

src/main/resources/static/js/user-center/repair/repair.js

@@ -1,19 +1,43 @@
 var repairForm = new Vue({
     el: '#repairForm',
     data: {
-        postData: {
-            question: '',
-            linkman: '',
-            phone: '',
-            address: '',
-            name: '',
-            shopName: '',
-            image: ''
+        // postData: {
+        //     userId:'',
+        //     question: '',
+        //     linkman: '',
+        //     userMobile: '',
+        //     userContact:'',
+        //     userAddress:'',
+        //     name: '',
+        //     shopName: '',
+        //     image: '',
+        //
+        // },
+        postData:{
+            userId:'',
+            provinceName:'',
+            cityName:'',
+            townName:'',
+            userAddress:'',
+            userContact:'',
+            userMobile:'',
+            instrumentName:'',
+            problemDescription:'',
+            manufacturer:'',
+            instrumentImages:''
         },
+            townID:'',
+            provinceID: '',//省id
+            cityID: '',
         rule:{
             name: '^[a-zA-Z\\u4e00-\\u9fa5]{2,}$',
             phone: '^\\d{6,12}$'
-        }
+        },
+        provinceArray:[],
+        cityArray: [],//市
+        townArray: [],//区
+        productImagesList:[],
+        formData:new FormData(),
     },
     computed: {
 
@@ -26,14 +50,95 @@ var repairForm = new Vue({
         },
         // 提交数据
         submitData: function(){
-            alertInfo('提交数据');
+            var _self = this;
+            var pass = verifyForm();
+            if (_self.loginLoading) { return false; }
+            this.$nextTick(function() {
+                 if (!pass) {return false;}
+                  console.log(_self.postData)
+                 UserApi.Maintenance(_self.postData,function (res) {
+                        if(res.code==0){
+                         CAIMEI.dialog('申请成功')
+                        }else {
+                         CAIMEI.Alert(res.msg, '确定', false);
+                        }
+                 })
+            })
             console.log(JSON.stringify(this.postData));
-        }
+        },
+         province:function () {
+           var _this = this;
+           var donClass = '#cProvince';
+           var domProvince =  document.querySelector(donClass);
+           _this.postData.provinceName = domProvince.options[domProvince.selectedIndex].text;
+           _this.provinceID =event.target.value;
+            if(_this.provinceID==''){//省为请选择时市区初始化
+                _this.cityArray=[];
+                _this.townArray=[];
+                _this.postData.townName=''
+            }else {
+              _this.getcity();
+            }
+        },
+        uploadImageFn: function(event){//图片上传
+            var _this = this;
+            var inputDOM = _this.$refs.product;
+            var file = inputDOM.files;
+            _this.formData.append('file', file[0]);
+            PublicApi.uploadimg(_this.formData,function(response){
+               _this.productImagesList.push(response.data);
+               _this.postData.instrumentImages =_this.productImagesList.toString()+',';
+                event.target.value = '';
+            });
+        },
+         removeImagesFn: function(index){//删除图片
+            var _this = this;
+            _this.productImagesList.splice(index,1);
+            _this.postData.instrumentImages =_this.productImagesList.toString()+',';
+         },
+         getcity:function(event){//加载市
+           var _this = this;
+           var donClass = '#cityname';
+           var domCityname =  document.querySelector(donClass);
+           _this.postData.cityName = domCityname.options[domCityname.selectedIndex].text;
+            PublicApi.GetCity({ provinceId: _this.provinceID },function(response){
+                 if(response.code == 0 ){
+                    _this.cityArray = response.data;
+                     _this.cityID = event.target.value;
+                     if(_this.cityID==''){
+                           _this.townArray=[];
+                     }else {
+                         _this.getcTown();
+                     }
+                }
+            })
+        },
+         getcTown:function(event){
+            var _this = this;
+            var donClass = '#townname';
+           var domTownname =  document.querySelector(donClass);
+           _this.postData.townName = domTownname.options[domTownname.selectedIndex].text;
+            PublicApi.GetTown({cityId:_this.cityID},function(response){
+                if(response.code == 0 ){
+                    _this.townArray = response.data;
+                    _this.townID = event.target.value;
+                }else{
+                    CAIMEI.Alert(response.msg, '确定', false);
+                }
+            })
+        },
     },
     created: function () {
 
     },
     mounted: function () {
         var _self = this;
+        PublicApi.GetProvince({},function(response){ //省份
+            if(response.code == 0){
+                _self.provinceArray = response.data
+            }else{
+                CAIMEI.Alert(response.msg, '确定', false);
+            }
+        })
     }
 });

src/main/resources/templates/account/forget.html

@@ -15,7 +15,7 @@
 <div id="forGetPasswordPage" v-cloak>
     <div class="signAccount clear">
         <div class="right-header">
-            <div class="tabs">
+            <div class="tabs mf">
                 <div class="header-tabs" :class="{ current: tabCurrentIndex === 1 }" @click="checkedFn(1)">使用手机修改</div>
                 <div class="header-tabs" :class="{ current: tabCurrentIndex === 2 }" @click="checkedFn(2)">使用邮箱修改</div>
             </div>

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

@@ -16,7 +16,7 @@
                     <p>扫描关注</p>
                 </div>
             </li>
-            <li v-if="loginStatus">
+            <li v-if="loginStatus" id="mGlobalMenu" @click="hideGlobalMenu()">
                 <a class="cTab" href="javascript:void(0);" v-text="userData.userName"></a>
                 <div class="cShow" v-if="userIdentity == 4 || userIdentity == 2">
                     <a href="/user/dashboard.html">我的采美</a>
@@ -45,9 +45,8 @@
             </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 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>
+                <a v-if="loginStatus" @click="showGlobalMenu()" class="mUserIcon mIcon" href="javascript:void(0);" title="个人中心"></a>
+                <a v-else class="mUserIcon mIcon toLogin" href="javascript:void(0);" title="个人中心"></a>
             </div>
             <div class="searchBox" id="topSearch">
                 <div class="search">

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

@@ -21,6 +21,8 @@
         <div class="wrap clear">
             <!--左侧导航-->
             <template th:replace="supplier-center/components/tableft"></template>
+
+
             <div class="right">
                 <div class="information">
                     <div class="head">
@@ -30,7 +32,7 @@
                     </div>
                     <div class="info_main">
                         <div class="mainContent">
-                            <h3>{{shopinfo.sname}}</h3>
+                            <p>{{shopinfo.sname}}</p>
                               <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">

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

@@ -27,19 +27,19 @@
                     <div class="title">所有消息</div>
                     <div class="section">
                         <div class="section-top" v-if="isPC">
-                            <div class="cheacked" @click="checkedAllFn">
-                                <i class="icon mIcon" :class="isCheckedAll ? 'icon-gouxuan' : 'icon-weigouxuan'"></i>
+                            <div class="cheacked">
+                              <input type="checkbox" v-model="isCheckedAll" class="check" @click="checkedAllFn">
                                 <span>全选</span>
                             </div>
                             <div class="button">
-                                <a href="javascript:void(0);" class="btn" @class="deleteMessageFn">删除</a>
-                                <a href="javascript:void(0);" class="btn" @class="signMessageFn">标为已读</a>
+                                <a href="javascript:void(0);" class="btn" @click="deleteMessageFn">删除</a>
+                                <a href="javascript:void(0);" class="btn" @click="signMessageFn">标为已读</a>
                             </div>
                         </div>
                         <div class="section-content" v-if="messagesList.length > 0">
-                            <div class="new-list" v-for="(item, index) in messagesList" :key="index">
+                            <div class="new-list" v-for="(item, index) in messagesList" :key="index" :class="item.readFlag?'notclick':''">
                                 <div class="text">
-                                    <i class="icon mIcon" :class="item.isCheck?'icon-gouxuan' : 'icon-weigouxuan'" @click="checkedItemFn(item)"></i>
+                                 <input type="checkbox"  class="check" v-model="item.check" @change="checkedItemFn(item)" v-bind:disabled="item.readFlag?true:false"/>
                                     <p>{{item.content}}</p>
                                 </div>
                                 <div class="time">{{item.addTime}}</div>
@@ -52,13 +52,13 @@
                     </div>
                 </div>
                   <div class="section-top" v-if="!isPC">
-                    <div class="cheacked" @click="checkedAllFn">
-                        <i class="icon mIcon" :class="isCheckedAll ? 'icon-gouxuan' : 'icon-weigouxuan'"></i>
+                    <div class="cheacked">
+                     <input type="checkbox" class="check"  v-model="isCheckedAll" @click="checkedAllFn">
                         <span>全选</span>
                     </div>
-                    <div class="button">
-                        <a href="javascript:void(0);" class="btn" @class="deleteMessageFn">删除</a>
-                        <a href="javascript:void(0);" class="btn" @class="signMessageFn">标为已读</a>
+                    <div class="button" >
+                         <a href="javascript:void(0);" class="btn Read" @click="signMessageFn">标为已读</a>
+                         <a href="javascript:void(0);" class="btn" @click="deleteMessageFn">删除</a>
                     </div>
                  </div>
             </div>

src/main/resources/templates/supplier-center/order/logistics-add.html

@@ -99,7 +99,6 @@
                                 </div>
                                 <div class="upload-file" v-show="GoodsImagesList.length<5">
                                     <i class="icon mIcon add"></i>
-                                    <p class="add-text">添加图片</p>
                                     <input @change="uploadGoodsImagesFn" accept="image/png,image/jpeg,image/gif,image/jpg" class="input-file" name="file" ref="goodsImages"
                                            type="file"
                                            value="">

src/main/resources/templates/supplier-center/order/logistics.html

@@ -104,7 +104,6 @@
                                 </div>
                                 <div class="upload-file" v-show="GoodsImagesList.length<5">
                                     <i class="icon mIcon add"></i>
-                                    <p class="add-text">添加图片</p>
                                     <input ref="goodsImages" type="file" name="file" value="" class="input-file"
                                            accept="image/png,image/jpeg,image/gif,image/jpg"
                                            @change="uploadGoodsImagesFn">

src/main/resources/templates/supplier-center/shop/release.html

@@ -30,23 +30,20 @@
                 <div class="container shadow" @click.stop="touchmoveFn" >
                     <div class="release-stepbox">
                         <div class="stepSpan active">
-                            <p>基本信息</p>
                             <p><span>1</span></p>
-                            <p class="line"></p>
+                            <p>基本信息</p>
                         </div>
                         <div class="stepSpan" :class="activeNum == 1 || activeNum == 2 || activeNum == 3 ? 'active':''">
-                            <p>销售信息</p>
                             <p><span>2</span></p>
-                            <p class="line"></p>
+                            <p>销售信息</p>
                         </div>
                         <div class="stepSpan" :class="activeNum == 2 || activeNum == 3 ? 'active':''">
-                            <p>上传图片</p>
                             <p><span>3</span></p>
-                            <p class="line"></p>
+                            <p>上传图片</p>
                         </div>
                         <div class="stepSpan" :class="activeNum == 3 ? 'active':''">
-                            <p>服务项目</p>
                             <p><span>4</span></p>
+                            <p>服务项目</p>
                         </div>
                     </div>
                     <div class="release-container clear"  v-show="isRequest" :class="isRequest ? 'active' : ''" >
@@ -196,7 +193,7 @@
                                     <a href="/supplier/goods/example.html" target="_blank" class="p" v-if="isPC">查看示例></a>
                                 </div>
                             </div>
-                            <div class="release-from text" style="margin-bottom: 10px;">
+                            <div class="release-from text shili" style="margin-bottom: 10px;">
                                 <P class="text" style="line-height: 24px;">{{keywordText}}</P>
                                 <a href="/supplier/goods/example.html" target="_blank" class="p" v-if="!(isPC)">查看示例</a>
                             </div>

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

@@ -5,6 +5,7 @@
     <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/address/list.css(v=${version})}" rel="stylesheet" type="text/css">
 </head>
 <body>
@@ -24,10 +25,10 @@
             <div class="right">
                 <div class="order-header">
                     <div class="header-bt">
-                        <p>已保存<span>{{addressLength}}</span>条地址,还能保存 <span>{{20-addressLength}}</span>条地址</p>
+                        <p>已保存<span>{{addressList.length}}</span>条地址,还能保存 <span>{{20-(addressList.length)}}</span>条地址</p>
                     </div>
                     <div class="header-button">
-                        <a class="btn-server" href="javascript: void(0);" @click="ShowAddAddressFn">新增地址</a>
+                        <a class="btn-server" href="javascript: void(0);" @click="createAddress()">新增地址</a>
                     </div>
                 </div>
                 <!--loading-->
@@ -35,55 +36,53 @@
                     <img src="/img/base/loading.gif">
                 </div>
                 <div class="container clear" v-else>
-                    <div class="section address-none" v-if="isShwoAddModel">
-                        <div class="address-main clear">
-                            <div class="formLine">
-                                <div class="label"><p><em>*</em>联系地址：</p></div>
-                                <div class="form-input">
-                                    <select name="provinceID" id="cProvince" @change="ChangeProvince" v-model="addressFrom.province">
+                    <div class="section address-none" v-show="isShwoAddModel">
+                        <div class="addressWrap">
+                            <div class="form">
+                                <div class="formLine">
+                                    <p class="label"><em>*</em>收货人：</p>
+                                    <input type="text" v-model.trim="addressForm.name" placeholder="请输入收货人姓名" :rule="rule.name" maxlength="10" @blur="blurHandle($event)" needverify>
+                                    <i class="checked icon mIcon"></i>
+                                    <span class="errTips icon mIcon" tips="请输入正确的联系人姓名"></span>
+                                </div>
+                                <div class="formLine">
+                                    <p class="label"><em>*</em>联系方式：</p>
+                                    <input type="text" v-model.trim="addressForm.mobile" placeholder="请输入您的常用手机号" :rule="rule.mobile" maxlength="11" @blur="blurHandle($event)" needverify>
+                                    <i class="checked icon mIcon"></i>
+                                    <span class="errTips icon mIcon" tips="请输入有效电话号码"></span>
+                                </div>
+                                <div class="formLine">
+                                    <p class="label"><em>*</em>联系地址：</p>
+                                    <select name="province" v-model="addressForm.provinceId" @change="getCityOptions(addressForm.provinceId)">
                                         <option value="" >请选择</option>
-                                        <option v-for="(item ,index) in ProvinceList" :key="index" :value='item.provinceID'>{{item.name}}</option>
+                                        <option v-for="(item ,index) in provinceOptions" :key="index" :value='item.provinceID'>{{item.name}}</option>
                                     </select>
-                                    <select name="cityID" id="cCity" @change="ChangeGetcity($event)" v-model="addressFrom.city">
+                                    <select name="city" v-model="addressForm.cityId" @change="getTownOptions(addressForm.cityId)">
                                         <option value="" >请选择</option>
-                                        <option v-for="(item ,index) in cityArray" :key="index" :value="item.cityID">{{item.name}}</option>
+                                        <option v-for="(item ,index) in cityOptions" :key="index" :value="item.cityID">{{item.name}}</option>
                                     </select>
-                                    <select name="townID" id="cTown" @change="ChangeGetcTown($event)" v-model="addressFrom.town">
+                                    <select name="town" v-model="addressForm.townId">
                                         <option value="" >请选择</option>
-                                        <option v-for="(item ,index) in townArray" :key="index" :value="item.townID">{{item.name}}</option>
+                                        <option v-for="(item ,index) in townOptions" :key="index" :value="item.townID">{{item.name}}</option>
                                     </select>
+                                    <textarea v-model.trim="addressForm.desc" placeholder="建议您如实填写详细地址，例如：街道名称，门牌号码，楼层和房间号等信息"  @blur="blurHandle($event)" needverify></textarea>
+                                    <span class="errTips icon mIcon" tips="请输入正确的联系地址"></span>
                                 </div>
-                            </div>
-                            <div class="formLine">
-                                <div class="label tex"></div>
-                                <div class="form-input">
-                                    <textarea placeholder="建议您如实填写详细地址，例如：街道名称，门牌号码，楼层和房间号等信息"  v-model="addAddressData.address"></textarea>
-                                </div>
-                            </div>
-                            <div class="formLine">
-                                <div class="label"><p><em>*</em>收货人：</p></div>
-                                <div class="form-input">
-                                    <input type="text" v-model.trim="addAddressData.shouHuoRen" placeholder="请输入收货人姓名" maxlength="10" >
-                                </div>
-                            </div>
-                            <div class="formLine">
-                                <div class="label"><p><em>*</em>联系方式：</p></div>
-                                <div class="form-input">
-                                    <input type="text" v-model.trim="addAddressData.mobile" placeholder="请输入联系方式" maxlength="11" >
+                                <div class="btnBox">
+                                    <div class="group">
+                                        <p>
+                                            <label class="check"><input v-model="addressForm.default" name="default" type="checkbox">设为默认地址</label>
+                                        </p>
+                                        <p>
+                                            <a class="btn save"  href="javascript:void(0)" @click="saveAddressForm()">保存</a>
+                                            <a class="btn con"  href="javascript:void(0)" @click="hideAddressForm()">取消</a>
+                                        </p>
+                                    </div>
                                 </div>
                             </div>
                         </div>
-                        <div class="address-sub">
-                            <div class="checked" @click="settingDefaultFlag">
-                                <i class="icon mIcon" :class="isDefaultFlag?'icon-gouxuan':'icon-weigouxuan'"></i>
-                                <span>设为默认地址</span>
-                            </div>
-                            <div class="button">
-                                <a href="javascript:void(0);" class="btn btn-confirm" @click="ConfirmAddressFn">保存</a>
-                                <a href="javascript:void(0);" class="btn btn-cancel" @click="CancelAddressFn">取消</a>
-                            </div>
-                        </div>
                     </div>
+
                     <div class="section" v-if="addressList.length > 0">
                         <div class="list" v-for="(item, index) in addressList" :key="index">
                             <div class="list-left">
@@ -91,10 +90,13 @@
                                 <p><span class="label">联系方式:</span>{{item.mobile}}</p>
                                 <p><span class="label">收货地址:</span><span class="prov">{{item.province}}</span>{{item.city}}{{item.town}}{{item.address}}</p>
                             </div>
-                            <div class="list-right">
-                                <div class="list-defalut" v-if="item.defaultFlag == 1">
-                                    <i class="icon mIcon"></i>
-                                    <span class="span-s">默认地址</span>
+                            <div class="list-right  mfbt">
+                                <div class="list-defalut">
+                                    <template v-if="item.defaultFlag == 1">
+                                        <i class="icon mIcon"></i>
+                                        <span class="span-s">默认地址</span>
+                                    </template>
+                                    <a v-else @click="setDefaultAddress(item.addressID)" href="javascript:void(0)">设为默认地址</a>
                                 </div>
                                 <div class="list-button">
                                     <a class="list-btn ico" href="javascript:void(0)" @click.stop="deleteAddress(item.addressID)">

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

@@ -50,7 +50,6 @@
                 <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>

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

@@ -29,20 +29,20 @@
                 <div class="content clear">
                     <div class="title">所有消息</div>
                     <div class="section">
-                        <div class="section-top">
-                            <div class="cheacked" @click="checkedAllFn">
-                                <i class="icon mIcon" :class="isCheckedAll ? 'icon-gouxuan' : 'icon-weigouxuan'"></i>
+                        <div class="section-top" v-if="isPC">
+                            <div class="cheacked" >
+                            <input type="checkbox" v-model="isCheckedAll" class="check" @click="checkedAllFn">
                                 <span>全选</span>
                             </div>
                             <div class="button">
-                                <a href="javascript:void(0);" class="btn" @class="deleteMessageFn">删除</a>
-                                <a href="javascript:void(0);" class="btn" @class="signMessageFn">标为已读</a>
+                                <a href="javascript:void(0);" class="btn" @click="deleteMessageFn">删除</a>
+                                <a href="javascript:void(0);" class="btn" @click="signMessageFn">标为已读</a>
                             </div>
                         </div>
                         <div class="section-content" v-if="messagesList.length > 0">
-                            <div class="new-list" v-for="(item, index) in messagesList" :key="index">
+                            <div class="new-list" v-for="(item, index) in messagesList" :key="index" :class="item.readFlag?'notclick':''">
                                 <div class="text">
-                                    <i class="icon mIcon" :class="item.isCheck ? 'icon-gouxuan' : 'icon-weigouxuan'" @click="checkedItemFn(item)"></i>
+                                    <input type="checkbox"  class="check" v-model="item.check" @change="checkedItemFn(item)" v-bind:disabled="item.readFlag?true:false"/>
                                     <p>{{item.content}}</p>
                                 </div>
                                 <div class="time">{{item.addTime}}</div>
@@ -54,6 +54,16 @@
                         </div>
                     </div>
                 </div>
+                <div class="section-top" v-if="!isPC">
+                    <div class="cheacked" >
+                     <input type="checkbox" class="check"  @change="checkedAllFn" v-model="isCheckedAll">
+                        <span>全选</span>
+                    </div>
+                    <div class="button" >
+                         <a href="javascript:void(0);" class="btn Read" @click="signMessageFn">标为已读</a>
+                         <a href="javascript:void(0);" class="btn" @click="deleteMessageFn">删除</a>
+                    </div>
+                 </div>
             </div>
         </div>
     </div>

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

@@ -19,48 +19,67 @@
         <form>
             <div class="formLine">
                 <p><em>*</em>问题描述：</p>
-                <textarea  v-model.trim="postData.question" placeholder="请输入您的问题描述(不超过200字)…" maxlength="200" needverify></textarea>
+                <textarea  v-model.trim="postData.problemDescription" placeholder="请输入您的问题描述(不超过200字)…" maxlength="200" needverify></textarea>
                 <i class="checked icon mIcon"></i>
                 <span class="errTips icon mIcon" tips="请输入您的问题描述"></span>
             </div>
             <div class="formLine">
                 <p><em>*</em>联系人：</p>
-                <input type="text" v-model.trim="postData.linkman" placeholder="请输入联系人姓名" :rule="rule.name" maxlength="50" @blur="blurHandle($event)" needverify>
+                <input type="text" v-model.trim="postData.userContact" placeholder="请输入联系人姓名" :rule="rule.name" maxlength="50" @blur="blurHandle($event)" needverify>
                 <i class="checked icon mIcon"></i>
                 <span class="errTips icon mIcon" tips="请输入正确的联系人姓名"></span>
             </div>
             <div class="formLine">
                 <p><em>*</em>联系电话：</p>
-                <input type="text" v-model.trim="postData.phone" placeholder="请输入联系电话" :rule="rule.phone" maxlength="12" @blur="blurHandle($event)" needverify>
+                <input type="text" v-model.trim="postData.userMobile" placeholder="请输入联系电话" :rule="rule.phone" maxlength="12" @blur="blurHandle($event)" needverify>
                 <i class="checked icon mIcon"></i>
                 <span class="errTips icon mIcon" tips="请输入有效的联系电话"></span>
             </div>
             <div class="formLine">
                 <p><em>*</em>联系地址：</p>
                 <div class="address">
-                    <select><option value="">请选择</option></select>
-                    <select><option value="">请选择</option></select>
-                    <select><option value="">请选择</option></select>
-                    <textarea v-model.trim="postData.address" placeholder="建议您如实填写详细收货地址，例如：街道名称，门牌号码，楼层和房间号等信息"></textarea>
+                    <select id="cProvince" @change="province($event)">
+                        <option value="">请选择</option>
+                         <option v-for="item in provinceArray" :value="item.provinceID">{{item.name}}</option>
+                    </select>
+                    <select id="cityname" @change="getcity($event)">
+                        <option value="">请选择</option>
+                        <option v-for="(item ,index) in cityArray" :key="index" :value="item.cityID">{{item.name}}</option>
+                    </select>
+                    <select id="townname" @change="getcTown($event)">
+                        <option value="">请选择</option>
+                        <option v-for="(item ,index) in townArray" :key="index" :value="item.townID" >{{item.name}}</option>
+                    </select>
+                    <textarea v-model.trim="postData.userAddress" placeholder="建议您如实填写详细收货地址，例如：街道名称，门牌号码，楼层和房间号等信息"></textarea>
                 </div>
                 <i class="checked icon mIcon"></i>
                 <span class="errTips icon mIcon" tips="请输入正确的联系地址"></span>
             </div>
             <div class="formLine">
                 <p><em>*</em>仪器名称：</p>
-                <input type="text" v-model.trim="postData.name" placeholder="请输入仪器名称" :rule="rule.name" maxlength="50" @blur="blurHandle($event)" needverify>
+                <input type="text" v-model.trim="postData.instrumentName" placeholder="请输入仪器名称" :rule="rule.name" maxlength="50" @blur="blurHandle($event)" needverify>
                 <i class="checked icon mIcon"></i>
                 <span class="errTips icon mIcon" tips="请输入正确的仪器名称"></span>
             </div>
             <div class="formLine">
                 <p>生产厂家：</p>
-                <input type="text" v-model.trim="postData.shopName" placeholder="请输入生产厂家" :rule="rule.name" maxlength="50" @blur="blurHandle($event)">
+                <input type="text" v-model.trim="postData.manufacturer" placeholder="请输入生产厂家" :rule="rule.name" maxlength="50" @blur="blurHandle($event)">
                 <i class="checked icon mIcon"></i>
                 <span class="errTips icon mIcon" tips="请输入正确的公司名称"></span>
             </div>
             <div class="formLine">
                 <p>上传图片：</p>
-                <input type="file" v-model="postData.image">
+                <div class="uploadGoodsImages">
+                    <div class="form-upload-image"  v-for="(item, index) in productImagesList" :key="index">
+                        <img class="upload-img" :src="item" :data-image="item" alt="" id="product" @click="">
+                        <i class="icon mIcon del" @click="removeImagesFn(index)"></i>
+                    </div>
+                    <div class="formLine-file" v-show="productImagesList.length<5">
+                        <input ref="product" class="file" type="file" accept="image/png,image/jpeg,image/gif,image/jpg"  @change="uploadImageFn">
+                        <i class="icon mIcon add"></i>
+<!--                        <p class="add-text">添加图片</p>-->
+                    </div>
+                </div>
                 <span class="errTips icon mIcon"></span>
                 <p class="fileInfo">请尽量上传仪器全照或者仪器故障图片，方便您的维修事宜上传jpg/png格式照片，单个照片不能超过5M,最多不超过5张</p>
             </div>
@@ -74,6 +93,7 @@
 <!-- 引入底部 -->
 <template th:replace="components/footer"></template>
 <template th:replace="components/foot-link"></template>
+<script charset="utf-8" type="text/javascript" th:src="@{/js/common/serviceapi/user.service.js(v=${version})}"></script>
 <script charset="utf-8" type="text/javascript" th:src="@{/js/user-center/repair/repair.js(v=${version})}"></script>
 </body>
 </html>

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

@@ -23,7 +23,7 @@
             <!--左侧导航-->
             <template th:replace="user-center/components/tableft"></template>
             <div class="right">
-                <div class="right-header">
+                <div class="right-header mf">
                     <div class="header-tabs" :class="{ current: tabCurrentIndex === 1 }" @click="checkedFn(1)">使用手机修改</div>
                     <div class="header-tabs" :class="{ current: tabCurrentIndex === 2 }" @click="checkedFn(2)">使用邮箱修改</div>
                 </div>