供应商

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

@@ -19,11 +19,11 @@ li{list-style:none}
     .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;}
     .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%;height: 36px;float: left;box-sizing: border-box;}
-    .content .section .section-content .new-list .text{width: 600px;line-height: 36px;white-space: nowrap;text-overflow: ellipsis;overflow: hidden;word-break: break-all;float: left;}
+    .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;}
+    .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;}
 }
 
@@ -31,7 +31,27 @@ li{list-style:none}
 * 移动端
 */
 @media screen and (max-width:768px){
-
+    .content .empty{box-sizing:border-box;padding:100px 0;text-align:center;color:#4A4F58;line-height:30px;font-size:16px;background-color:#FFF;}
+    .content .empty img{width:180px;height:180px;}
+    .content .empty a{color:#E15616;}
+    .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 .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;}
+    .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}
 
 }
 

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

@@ -42,35 +42,34 @@
     .crumbs {font-size: 3.4vw;color: #22272e}
     .userinfo {padding: 1.3vw 5.3vw;background: #fff;box-shadow: 0 .8vw 1.6vw 0 rgba(0, 0, 0, 0.07);}
     .info {height: 13vw;line-height: 13vw;font-size: 3.4vw;color: #22272e;overflow: hidden}
-    .comback {width: 22.4vw;height: 7.2vw;background-color: #ffe6dc;border-radius: .53vw;border: solid .27vw #e15616;float: right;line-height: 7.2vw;margin-top: 2.7vw;cursor: pointer;color: #e15616;}
+    .comback {width: 22.4vw;height: 7.2vw;background-color: #ffe6dc;border-radius: 4.8vw;border: solid .27vw #e15616;float: right;line-height: 7.2vw;margin-top: 2.7vw;cursor: pointer;color: #e15616;}
     .userinfo .user p {display: inline-block;color: #627386;margin: 0 6.7vw 2.7vw 0;}
     .userinfo .user p span {color: #22272e;}
     .address {margin-bottom: 4vw;color: #627386;}
     .address span {color: #22272e;}
-    .protitle {color: #22272e;font-size: 16px;padding: 15px 20px;}
+    .protitle {color: #22272e;font-size: 3.4vw;padding: 2.7vw 5.3vw;}
     .product ul li {list-style: none;display: inline-block;}
-    .product-title li {width: 11%;text-align: center;}
-    .product-title li:nth-child(1) {width: 50%;text-align: left;}
-    .product {padding: 0 21px;background: #fff;overflow: hidden;padding-bottom: 30px;box-shadow: 0px 3px 6px 0px rgba(0, 0, 0, 0.07)}
-    .product-title {height: 56px;line-height: 56px;color: #627386;border-bottom: solid 1px #e2e7ef}
-    .product-info li {width: 100%;padding: 15px 0}
-    .product-img h3 {display: inline-block;width: 300px;margin-left: 10px;font-size: 16px;letter-spacing: 1px;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-info li div.product-img {width: 50%;text-align: left}
-    .product-img img {width: 70px;height: 70px;border: solid 1px #e2e7ef;}
-    .product-info li div {display: inline-block;width: 11%;text-align: center;color: #627386}
-    .record-time {color: #9aa5b5;font-size: 12px;padding-top: 5px}
+    .product-title li {color: #9aa5b5;position: relative;top: 26vw;width: 21vw}
+    .product-title li:nth-child(1) {width: 100%;text-align: left;top: 0;}
+    .product {padding: 0 5.3vw;background: #fff;overflow: hidden;padding-bottom: 5.3vw;box-shadow: 0px .8vw 1.6vw 0px rgba(0, 0, 0, 0.07)}
+    .product-title {height: 5.3vw;line-height: 5.3vw;position: relative;width: 100%}
+    .product-info li {width: 100%;padding-top: 2.7vw;height: 37vw}
+    .product-img h3 {display: inline-block;width: 40vw;margin-left: 2.7vw;font-size:3.4vw;letter-spacing: .2vw;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-info li div.product-img {width: 100%;text-align: left;top: 0}
+    .product-img img {width: 18.7vw; height: 18.7vw;border: solid .27vw #e2e7ef;top: 0;}
+    .product-info li div {color: #22272e;display: inline-block;top: 11.6vw;width: 21vw;position: relative}
+    .record-time {font-size: 3.1vw;padding-top: 2.7vw}
     .img-remark span {color: #627386;}
     .img-remark ul {display: inline-block;}
-    .img-remark li {display: inline-block;width: 50px;height: 50px;margin-left: 10px;}
-    .img-remark{margin: 30px 0;}
+    .img-remark li {display: inline-block;width: 13.3vw;height: 13.3vw;margin-left: 2.7vw;}
+    .img-remark{margin: 2.7vw 0;}
     .img-remark li img {width: 100%;height: 100%;}
     .remark {color: #627386;}
     .remark span {color: #22272e;}
-    .record-button {float: right;padding: 20px}
-    .record-button button {width: 90px;height: 36px;line-height: 36PX;background-color: #ffe6dc;border-radius: 2px;border: solid 1px #e15616;text-align: center;color: #e15616;margin-left: 10px;cursor: pointer;}
     .logis{background: #fff}
-    .delivery-logis-title{color: #22272e;font-size: 16px;padding: 15px 20px;}
-    .logistics-info{background: #fff;padding: 15px 20px;color: #627386;box-shadow: 0px 3px 6px 0px rgba(0, 0, 0, 0.07);}
-    .logistics-info div{margin-right: 65px;display: inline-block;line-height: 24px}
-    .logistics-record{display: inline-block;width: 100%;color: #333;font-size: 16px;margin: 10px 15px}
+    .delivery-logis-title{color: #22272e;font-size: 3.4vw;padding: 0 5.3vw}
+    .logistics-info{background: #fff;padding: 2.7vw 5.3vw;color: #627386;box-shadow: 0px .8vw 1.6vw 0px rgba(0, 0, 0, 0.07);}
+    .logistics-info div{margin-right: 17vw;display: inline-block;line-height: 6.4vw}
+    .logistics-record{display: inline-block;width: 100%;color: #333;font-size: 3.4vw;margin: 2.7vw 4vw}
+    .record-product{    background: #fff; margin-top: 2.7vw}
 }

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

@@ -419,7 +419,7 @@
     .product-title li {
             display: inline-block;
         list-style: none;
-        color: #627386;
+        color: #9aa5b5;
         position: relative;
         top: 26vw;
         width: 21vw
@@ -442,7 +442,7 @@
 
     .pro-information li div {
            display: inline-block;
-        color: #627386;
+        color: #22272e;
         top: 11.6vw;
         width: 21vw;
         position: relative
@@ -455,8 +455,8 @@
     }
 
     .product-img img {
-        width: 70px;
-        height: 70px;
+            width: 18.7vw;
+            height: 18.7vw;
         border: solid 1px #e2e7ef;
     }
 
@@ -584,12 +584,6 @@
         background-position: -84px -144px;
         cursor: pointer;
     }
-    .form-upload-tips .icon-wen:before {
-        width: 20px;
-        height: 20px;
-        background-position: -84px -144px;
-        cursor: pointer;
-    }
     .wen-tips {
         width: 300px;
         height: 47px;

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

@@ -48,62 +48,77 @@
     .address span { color: #22272e; }
     .protitle {
         color: #22272e;
-        font-size: 16px;
-        padding: 15px
+            font-size: 3.4vw;
+        padding: 6vw 5.3vw 4vw 4vw;
     }
     .product ul li{
         list-style: none;
         display: inline-block;
     }
     .product-title li {
-        width: 19%;
-        text-align: center;
+            color: #9aa5b5;
+        position: relative;
+        top: 26vw;
+        width: 21vw;
     }
 
     .product-title li:nth-child(1) {
-        /*width: 50%;*/
+        width: 100%;
         text-align: left;
+            top: 0
     }
     .product{
         padding: 0 4vw;
         background: #fff;
         overflow: hidden;
     }
+    .record-product{    background: #fff; margin-top: 2.7vw}
     .product-title{
-        height: 56px;
-        line-height: 56px;
-        color: #627386;
-        border-bottom: solid 1px #e2e7ef
+            height: 5.3vw;
+        line-height: 5.3vw;
+        position: relative;
+        width: 100%
     }
     .product-info li{
-        width: 100%;
-        padding: 10px 0
+           width: 100%;
+        padding-top: 2.7vw;
+        height: 36vw
     }
     .product-img h3{
-        display: inline-block;
-        width: 300px;
+            display: inline-block;
+        width: 40vw;
         margin-left: 10px;
-        font-size: 16px;
-        letter-spacing: 1px
+        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-info li div.product-img{
-        width: 50%;
-        text-align: left
+        width: 100%;
+        text-align: left;
+        top: 0;
     }
     .product-img img{
-        width: 70px;
-        height: 70px;
-        border: solid 1px #e2e7ef;
+        width: 15vw;
+        height: 15vw;
+        border: solid .27vw #e2e7ef;
     }
     .product-info li div{
-        display: inline-block;
-        width: 11%;
-        text-align: center
+       display: inline-block;
+        color: #22272e;
+        top: 11.6vw;
+        width: 21vw;
+        position: relative
     }
     .record-time{
         color: #9aa5b5;
-        font-size: 12px;
-        padding: 15px 0
+        font-size: 3.1vw;
+        padding: 4vw 0
     }
     .img-remark span{
         color: #627386;
@@ -113,8 +128,8 @@
     }
     .img-remark li {
         display: inline-block;
-        width: 50px;
-        height: 50px;
+        width: 13.9vw;
+        height: 13.9vw;
         margin-left: 10px;
     }
     .img-remark li img{
@@ -130,17 +145,17 @@
     }
     .record-button{
         float: right;
-        padding: 20px
+        padding: 5.3vw 0
     }
     .record-button button{
-        width: 90px;
-        height: 36px;
-        line-height: 36PX;
+        width: 22.4vw;
+        height:9.6vw;
+        line-height: 9.6vw;
         background-color: #ffe6dc;
-        border-radius: 2px;
-        border: solid 1px #e15616;
+        border-radius: .53vw;
+        border: solid .27vw #e15616;
         text-align: center;
         color: #e15616;
-        margin-left: 10px;
+        margin-left: 2.7vw;
     }
 }

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

@@ -29,5 +29,7 @@ li{list-style:none}
     .forget-form{padding:0;}
     .signAccount form{width:93.4vw;margin:0 auto;}
     .subLine{margin-top:2vw;float: left;width: 100%;}
-
+    .container form{padding: 0 2.7vw}
+    .formLine p{color: #627386}
+     input::placeholder{color: #9aa5b5}
 }

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

@@ -31,5 +31,11 @@ li{list-style:none}
     .forget-form{padding:0;}
     .signAccount form{width:93.4vw;margin:0 auto;}
     .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 form{padding: 0 2.7vw}
+    .container .title span{color: #f94b4b}
+    .formLine p{color: #627386}
+    input::placeholder{color: #9aa5b5}
 }

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

@@ -55,3 +55,57 @@
   .icon.add:before { width: 25px;height: 25px;background-position: -168px -374px; position: relative; top: 15px; right: -15px}
   }
 
+
+
+/*移动*/
+ @media screen and (max-width:768px) {
+   .head-top{padding: 3.4vw;background: #fff;}
+   .head-top form div{margin-top: 2.7vw}
+   .order-border{width: 93.4vw;height: 11.8vw;line-height: 11.8vw;border: 1px solid #b8bfca;font-size: 3.4vw;}
+   .order-border span{color: #627386;padding-left: 2.7vw}
+   .Buyer{color: #9aa5b5;height: -webkit-fill-available;border: 0;width: 70vw}
+   input::placeholder{color: #9aa5b5}
+   .state{width: 93.4vw;height: 11.7vw;line-height: 11.7vw;padding-left: 1.3vw;border: 1px solid #b8bfca}
+   #newBtn>div{width: 40vw;height: 11.2vw;line-height: 11.2vw;text-align: center;display: inline-block;margin-left: 4vw;}
+   #newBtn>.query-btn{border: .27vw solid #e15616;background: #e15616;color: #fff;}
+   #newBtn>.addBrand{border: .27vw solid #e15616;background: #ffe6dc;color: #e15616;}
+  .brand-list .list{margin-top: 2.7vw;background: #fff;padding: 3.3vw;}
+  .brand-title li{display: inline-block;color: #9aa5b5;line-height: 8vw;font-size: 2.5vw;width: 21%;}
+  .brand-title li:last-child{float: right;}
+  .brand-logo{width: 17vw;height:17vw;float: left;line-height: 17vw;}
+  .brand-logo img{width: 100%;height: 100%;}
+  .brand-name{width:78%;float: right;font-size: 3.4vw;}
+  .brand-name .proname{color: #22272e;font-size: 3.4vw;overflow: hidden;text-overflow: ellipsis;width: 40vw;white-space: nowrap;vertical-align: middle;display: inline-block}
+  .brand-name span:nth-child(2){display: inline-block;width: 30vw;text-align: center}
+  .brand-description{color: #9aa5b5;font-size: 2.6vw;margin: 1.7vw 0;}
+  .brand-name .font-red{color: #f94b4b;}
+  .brand-name .font-blue{color: #1890f9;}
+  .brand-name .font-red{color: #f94b4b;}
+  .brand-edit{width: 22.4vw;height: 7.2vw;line-height: 7.2vw;color: #1890f9;border: 1px solid #1890f9;border-radius: 4.8vw;text-align: center;float: right;margin-top: 2.7vw;}
+  .brand-time{float: left}
+  .button{overflow: hidden}
+  .text-des{white-space: nowrap;vertical-align: middle;display: inline-block; overflow: hidden;text-overflow: ellipsis;width: 65vw;}
+
+  .bg-brand{position: fixed;background: rgba(34,39,46, 0.3); top: 0;left: 0; width: 100%;height: 100%;z-index: 1000}
+  .add-brand-box{ width: 338px; height: 350px;background-color: #ffffff;box-shadow: 0px 3px 6px 0px rgba(0, 0, 0, 0.16); border-radius: 2px;
+    border: solid 1px #efefef;position: absolute;left: 0;top: 0;right: 0;bottom: 0;margin: auto}
+  .modal-header{height: 42px; line-height: 42px;border: solid 1px #efefef;background-color: #f8f8f8;padding-left: 20px;color: #333333}
+  .close-modalForm{text-align: center;float: right;width: 30px;cursor: pointer}
+  .brand-content{padding: 10px 10px;color: #22272e}
+  .required{color: red}
+  .brand-name input{width: 210px;height: 36px;background-color: #ffffff; border-radius: 2px;border: solid 1px #b8bfca;padding-left: 10px}
+  .img-box{ width: 56px;height: 56px;background-color: #ffffff;border-radius: 2px;border: solid 1px #b8bfca;display: inline-block; position: relative;}
+  .img-box img{width: 100%;height: 100%; }
+  .brand-img{margin: 10px 0;}
+  .add-pic{ width: 56px;height: 56px;position: absolute;top: 50%;left: 50%;transform: translate(-50%,-50%);border-radius: 2px;opacity: 0;cursor: pointer}
+  .brand-content .label{width: 81px;text-align: right; display: inline-block;}
+  .font-color{color: #e15616;}
+  .tishiyu{font-size: 12px;text-align: right; margin-top: 5px}
+  .brand-description span{vertical-align: top; }
+  .miaoshu{background-color: #ffffff;width: 220px;height: 78px;border-radius: 2px; border: 1px solid #EFEFEF; padding: 5px;resize: none}
+  .box-btn{float: right}
+  .box-btn div{display: inline-block;width: 68px;height: 32px;line-height: 32px;text-align: center;background-color: #ffffff;border-radius: 2px;border: solid 1px #b8bfca;
+   margin-right: 10px;color: #22272e; cursor: pointer;}
+  .box-btn .btn-cancel{background-color: #e15616;color: #fff; border: 1px solid #e15616;}
+  .icon.add:before { width: 25px;height: 25px;background-position: -168px -374px; position: relative; top: 15px; right: -15px}
+ }

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

@@ -45,4 +45,44 @@
 }
 
 /*移动端*/
-@media screen and (max-width:768px) {}
+@media screen and (max-width:768px) {
+  .head-top{height: 10vw;padding: 0 3.3vw;line-height: 10vw;}
+  .head-top div{display: inline-block}
+  .head-top .title-text{color: #22272e;}
+  .head-top .title-text span{color: #627386;}
+  .banner-title{vertical-align: middle;overflow: hidden;text-overflow: ellipsis;width: 200px;color: #22272e;font-size: 3.4vw;font-weight: bold;white-space: nowrap}
+  .advertisement-pic{width: 20vw;height: 20vw}
+  .operate div{width: 22.4vw;height:9.6vw;background-color: #e0f1ff;border-radius: 4.8vw;border: solid 1px #1890f9;line-height: 9.6vw;text-align: center;color: #1890f9;cursor: pointer;display: inline-block;margin-right: 2.7vw;}
+  .title-list{padding-top: 2.7vw;background: #fff;padding-left: 3.3vw;color: #9aa5b5}
+  .shopBanner ul  .title-color{color: #9aa5b5;}
+  .title-list span{display: inline-block;width: 23%}
+  .shopBanner ul{background: #fff;margin-bottom: 1.3vw;padding: 0 3.3vw 3.3vw;overflow: hidden}
+  .shopBanner ul li{list-style: none;display: inline-block;padding-top: 10px;color: #22272e;width: 75%;float: left}
+  .shopBanner ul li:nth-child(1){}
+  .shopBanner ul li>p:nth-child(2){padding: 2.7vw 0}
+  .addHomepage{width: 93.4vw;height: 11.2vw;line-height: 11.2vw;background: #e15616;color: #fff;text-align: center;margin: 2.7vw auto}
+  .shopBanner ul li.operate{float: right; width: auto;padding: 0 }
+  .operate .operate-delete{background: #ffd8d8;color: #f94b4b;border: 1px solid #f94b4b}
+  .bgFrom{position: fixed; background: rgba(34,39,46, 0.3);top: 0;left: 0; width: 100%;height: 100%;z-index: 1000;opacity: 0}
+  .bgFrom.show{opacity: 1}
+  .modalForm{ width: 74.7vw;height:fit-content;background-color: #ffffff;box-shadow: 0px .8vw 1.6vw 0px rgba(0, 0, 0, 0.16);border-radius: 2.7vw;
+    border: solid .27vw #efefef; position: absolute;left: 0;top: 0;right: 0;bottom: 0; margin: auto }
+  .modal-header{height: 10.96vw;border: solid 1px #efefef; line-height:10.9vw;padding: 0 16px;color: #22272e;}
+  .mIcon.close{float: right; cursor: pointer;}
+  .mIcon.close:before{width: 5.3vw;height: 5.3vw;background-position: -33.3vw .53vw}
+  .modal-div span{color: #22272e;display: inline-block;}
+  .modal-div input{width: 54vw;height: 8.8vw;line-height:8.8vw;border-radius: .27vw;border: solid .27vw #b8bfca;margin-bottom: 4vw;
+  color: #9aa5b5;padding-left: 1.3vw;display: inline-block;}
+  .modal-content{padding: 2.7vw}
+  input::placeholder{color: #9aa5b5;font-size: 3vw}
+  .upimg { width: 13vw;height: 13vw;background-color: #ffffff;border-radius: .53vw; border: solid .27vw #b8bfca; display: inline-block; position: relative;}
+  .mIcon.add:before {width: 5vw;height: 5vw;background-position: -9.6vw -62vw;position: relative;top: 4vw;right: -4vw;}
+  .add-pic {width: 13vw;height: 13vw;position: absolute;top: 50%; left: 50%;transform: translate(-50%,-50%); border-radius: .53vw;opacity: 0;cursor: pointer;}
+  .upimg img {width: 100%; height: 100%;}
+  .red{color: red}
+  .upload-img .up{ vertical-align: baseline; height: 60px;display: inline-block}
+  .colorstyle{color: #e15616}
+  .saveBtn{ text-align: center;float: right;width: 66.6vw;height: 9.9vw; background-color: #e15616; border-radius: .53vw;line-height: 9.9vw;
+    color: #ffffff;cursor: pointer;margin: 2.7vw 0}
+  .Note{float: left;font-size: 2.2vw;}
+}

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

@@ -20,11 +20,11 @@ li{list-style:none}
     .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;}
     .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%;height: 36px;float: left;box-sizing: border-box;}
-    .content .section .section-content .new-list .text{width: 600px;line-height: 36px;white-space: nowrap;text-overflow: ellipsis;overflow: hidden;word-break: break-all;float: left;}
+    .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;}
+    .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;}
 }
 

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

@@ -28,5 +28,7 @@ li{list-style:none}
     .forget-form{padding:0;}
     .signAccount form{width:93.4vw;margin:0 auto;}
     .subLine{margin-top:2vw;float: left;width: 100%;}
-
+    .container form{padding: 0 2.7vw}
+    .formLine p{color: #627386}
+     input::placeholder{color: #9aa5b5}
 }

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

@@ -29,5 +29,12 @@ li{list-style:none}
     .forget-form{padding:0;}
     .signAccount form{width:93.4vw;margin:0 auto;}
     .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 form{padding: 0 2.7vw}
+    .container .title span{color: #f94b4b}
+    .formLine p{color: #627386}
+     input::placeholder{color: #9aa5b5}
 
 }

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

@@ -211,6 +211,10 @@ var SupplierApi = {
                 callback(res);
             });
         },
-
-
+         GetMymessageList : function(params,callback) {//个人中心消息列表
+            Http.AjaxService({ url:'/user/messageList', type:'get', data:params, json:true})
+            .then(function(res){
+                callback(res);
+            });
+        },
 };

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

@@ -4,7 +4,7 @@ var helpSuggestion = new Vue({
     data: {
         btnLoading: false,
         isRequset:false,
-        shopID: 0,
+        userID: 0,
         degree:'',
         isCheckedAll:false,
         messagesList:[],//新闻动态
@@ -12,7 +12,7 @@ var helpSuggestion = new Vue({
     methods: {
         GetMyPcCenterInfo:function(){
             var _self = this;
-           UserApi.GetMymessageList({userId:_self.userId},function (response) {
+           SupplierApi.GetMymessageList({userId:_self.userID},function (response) {
                 if(response.code == 0){
                     _self.messagesList = response.data;
                     _self.isRequset = false;
@@ -29,6 +29,7 @@ var helpSuggestion = new Vue({
         checkedItemFn :function(item){
             var _self = this;
             item.isCheck = !item.isCheck;
+            console.log(item)
             _self.updateCheckAllBtn();
         },
         updateBothCheckBtn:function() {// 全选勾选
@@ -64,7 +65,7 @@ var helpSuggestion = new Vue({
     },
     mounted: function () {
         if(globalUserData){
-            this.shopID = globalUserData.shopId;
+            this.userID = globalUserData.userId;
             this.GetMyPcCenterInfo();
         }
     }

src/main/resources/static/js/supplier-center/shop/brand.js

@@ -22,7 +22,9 @@ var Brandgoods =new Vue({
         listRecord: 0,
         bgflag:false,
         logoShow:false,
-        iconflag:true
+        iconflag:true,
+        noMore:false,
+        isRequset:false
     },
      computed: {
         pageTotal: function () {
@@ -155,6 +157,35 @@ var Brandgoods =new Vue({
               _self.params.userID = globalUserData.userId;
               _self.brandobj.userID = globalUserData.userId;
             }
-        _self.BrandList()
+        _self.BrandList();
+
+           if(!isPC){
+            //移动端上垃加载更多
+            $(window).on('scroll', function(){
+                var scrollTop = $(this).scrollTop();
+                var scrollHeight = $(document).height();
+                var windowHeight = window.innerHeight;
+                if (scrollTop + windowHeight >= scrollHeight) {
+                    //此处是滚动条到底部时候触发的事件，在这里写要加载的数据，或者是拉动滚动条的操作
+                    var totalPage = Math.ceil(_self.listRecord / _self.params.pageSize)?Math.ceil(_self.listRecord / _self.params.pageSize):1;
+                    var next = _self.params.pageNum+1;
+                    if(next <= totalPage){
+                        if (_self.requestFlag){
+                            _self.params.pageNum = next;
+                            if (_self.isRequset) {
+                                // 获取列表数据
+                                _self.MyOrderList();
+                            }
+                        }
+                        _self.requestFlag = false;
+                    }else{
+                        //到底了
+                        _self.noMore = true;
+                        $('footer').removeClass("noneImportant");
+                    }
+                }
+            });
+        }
     }
+
 })

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

@@ -12,9 +12,10 @@ var helpSuggestion = new Vue({
     methods: {
         GetMyPcMymessageInfo:function(){
             var _self = this;
-            UserApi.GetMymessageList({userId:_self.userId},function (response) {
+            UserApi.GetMymessageList({userId:10689},function (response) {
                 if(response.code == 0){
                     var data = response.data;
+                    _self.messagesList = response.data
                     _self.isRequset = false;
                 }else{
                     CAIMEI.Alert(response.msg, '确定', false);

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

@@ -71,13 +71,13 @@
                     <p>商品数据</p>
                      <ul>
                          <li class="icon confirm mIcon">
-                             <a href="">全部商品<span>{{homeData.allNum}}</span></a>
+                             <a href="/supplier/goods.html">全部商品<span>{{homeData.allNum}}</span></a>
                          </li>
                           <li class="icon other confirm mIcon">
-                              <a>已上架<span>{{homeData.upNum}}</span></a>
+                              <a href="/supplier/goods.html">已上架<span>{{homeData.upNum}}</span></a>
                          </li>
                          <li class="icon down confirm mIcon">
-                             <a>已下架<span>{{homeData.downNum}}</span></a>
+                             <a href="/supplier/goods.html">已下架<span>{{homeData.downNum}}</span></a>
                          </li>
                      </ul>
                 </div>

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

@@ -26,7 +26,7 @@
                 <div class="content clear">
                     <div class="title">所有消息</div>
                     <div class="section">
-                        <div class="section-top">
+                        <div class="section-top" v-if="isPC">
                             <div class="cheacked" @click="checkedAllFn">
                                 <i class="icon mIcon" :class="isCheckedAll ? 'icon-gouxuan' : 'icon-weigouxuan'"></i>
                                 <span>全选</span>
@@ -39,8 +39,8 @@
                         <div class="section-content" v-if="messagesList.length > 0">
                             <div class="new-list" v-for="(item, index) in messagesList" :key="index">
                                 <div class="text">
-                                    <i class="icon mIcon" :class="item.isCheck ? 'icon-gouxuan' : 'icon-weigouxuan'" @click="checkedItemFn(item)"></i>
-                                    <p>{{item.title}}</p>
+                                    <i class="icon mIcon" :class="item.isCheck?'icon-gouxuan' : 'icon-weigouxuan'" @click="checkedItemFn(item)"></i>
+                                    <p>{{item.content}}</p>
                                 </div>
                                 <div class="time">{{item.addTime}}</div>
                             </div>
@@ -51,8 +51,19 @@
                         </div>
                     </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>
+                        <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>
+                 </div>
             </div>
         </div>
+
     </div>
     <!--loading-->
     <div v-else class="loading">

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

@@ -13,7 +13,7 @@
 
 <!-- 我的采美 -->
 <div id="logisticsDetail">
-    <div class="navLayout">
+    <div class="navLayout" v-cloak="">
         <div class="crumbs" v-if="isPC">
             <span>我的交易</span>
             <span>&gt;</span>
@@ -43,7 +43,7 @@
                     <p class="address">收货地址：<span>{{userInfo.address}}</span></p>
                 </div>
                 <div class="record-product">
-                    <div class="protitle">发货记录</div>
+                    <div class="protitle">发货信息</div>
                     <div class="product" >
                         <ul class="product-title">
                             <li>商品信息</li>
@@ -83,7 +83,7 @@
                      <div class="logis">
                             <div class="delivery-logis-title">物流信息</div>
                             <div class="logistics-info" v-for="logis in listData.logisticsInformationList">
-                                <div class="logistics-time">物流时间：{{logis.updateDate}}}</div>
+                                <div class="logistics-time">物流时间：{{logis.updateDate}}</div>
                                 <div class="logistics-company">物流公司：{{logis.logisticsCompanyName}}</div>
                                 <div class="logistics-number">物流单号：{{logis.nu}}</div>
                             </div>

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

@@ -14,7 +14,7 @@
 <!-- 重置密码 -->
 <div id="passwordPage" v-cloak>
     <div class="navLayout" th:object="${pageInfo}">
-        <div class="crumbs">
+        <div class="crumbs" v-if="isPC">
             <span>账户设置</span>
             <span>&gt;</span>
             <span>重置密码</span>

src/main/resources/templates/supplier-center/setting/phone.html

@@ -14,7 +14,7 @@
 <!-- 修改资料 -->
 <div id="phonePage" v-cloak>
     <div class="navLayout" th:object="${pageInfo}">
-        <div class="crumbs">
+        <div class="crumbs" v-if="isPC">
             <span>账户设置</span>
             <span>&gt;</span>
             <span>更换手机号</span>

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

@@ -14,7 +14,7 @@
 <!-- 我的采美 -->
 <div id="Brandgoods">
     <div class="navLayout" v-cloak="">
-        <div class="crumbs">
+        <div class="crumbs" v-if="isPC">
             <span>我的店铺</span>
             <span>&gt;</span>
             <span>品牌管理</span>
@@ -41,7 +41,7 @@
                             </div>
                     </form>
                 </div>
-                <div class="brand-list">
+                <div class="brand-list" v-if="isPC">
                     <ul class="brand-title">
                         <li>品牌名称</li>
                         <li>品牌logo</li>
@@ -74,6 +74,45 @@
                             </li>
                         </ul>
                     </div>
+                </div>
+                <div class="brand-list" v-else>
+                    <div class="list" v-for="item in brandlist">
+                         <ul class="brand-title">
+                            <li>品牌LOGO：</li>
+                            <li>品牌名称：</li>
+                            <li>状态：</li>
+                         </ul>
+                         <div style="overflow: hidden">
+                              <div class="brand-logo">
+                                <img :src="item.logo" v-if="item.logo!=''&&item.logo!=null">
+                                <span v-else>暂无</span>
+                              </div>
+                             <div class="brand-name">
+                                <p>
+                                    <span class="proname">{{item.name}}</span>
+                                    <span class="font-red"  v-if="item.status ==0">待审核</span>
+                                    <span class="font-blue" v-if="item.status ==1">审核通过</span>
+                                    <span class="font-red" v-if="item.status ==2">审核未通过 <br>原因：{{item.auditNote}}</span>
+                               </p>
+                                <p class="brand-description" >品牌描述：</p>
+                                <p>
+                                    <span v-if="item.description ==''|| item.description==null">暂无</span>
+                                    <span v-else class="text-des">{{item.description}}</span>
+                                </p>
+                             </div>
+
+                         </div>
+                           <div class="button">
+                                 <div class="brand-time">
+                                     <p class="brand-description">提交时间：</p>
+                                    <p>{{item.createDate}}</p>
+                                 </div>
+                                 <div  class="brand-edit">
+                                     <span v-if="item.status != 1" @click="editBrand(item)">编辑</span>
+                                     <span v-else>无</span>
+                                 </div>
+                             </div>
+                    </div>
                 </div>
                      <div v-if="(!isPC) && noMore" class="noMore">---- 没有更多了 ----</div>
                      <div class="pageWrap clear" v-if="isPC && pageTotal>1">

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

@@ -13,8 +13,8 @@
 
 <!-- 我的采美 -->
 <div id="decoration">
-    <div class="navLayout" >
-        <div class="crumbs">
+    <div class="navLayout" v-cloak>
+        <div class="crumbs" v-if="isPC">
             <span>我的店铺</span>
             <span>&gt;</span>
             <span>装扮主页</span>
@@ -25,9 +25,9 @@
             <div class="right">
                 <div class="head-top">
                     <div class="title-text">主页广告设置<span>（主页广告图最多可上传4张图）</span></div>
-                    <div class="addHomepage" @click="addpictures">添加主页广告图</div>
+                    <div class="addHomepage" @click="addpictures" v-if="isPC">添加主页广告图</div>
                 </div>
-                <div class="content">
+                <div class="content" v-if="isPC">
                     <ul class="title-list">
                         <li>图片</li>
                         <li>标题</li>
@@ -48,15 +48,39 @@
                         </ul>
                     </div>
                 </div>
+                <div class="content" v-else>
+                    <div class="shopBanner">
+                        <ul v-for="item in list">
+                            <div class="title-list">
+                                <span>图片：</span>
+                                <span>标题：</span>
+                            </div>
+                           <li style="width: 25%"><img :src="item.image" class="advertisement-pic"/></li>
+                            <li>
+                                <p class="banner-title">{{item.title}}</p>
+                                <p class="title-color">链接：</p>
+                                <p style="color: #1890f9;text-decoration: underline">{{item.link}}</p>
+                            </li>
+                            <li style="width: 100%">
+                                 <p class="title-color" >说明：</p>
+                                 <p style="font-weight: bold">{{item.info}}</p>
+                            </li>
+                            <li class="operate">
+                                  <div class="operate-edit" @click="editpictures(item)">编辑</div>
+                                  <div class="operate-delete" @click="deletepictures(item)">删除</div>
+                            </li>
+                        </ul>
+                         <div class="addHomepage" @click="addpictures">添加主页广告图</div>
+                    </div>
+                </div>
             </div>
 
-
         </div>
            <div class="bgFrom" :class="bgflag?'show':''" v-if="bgflag">
                 <div class="modalForm">
                     <div class="modal-header">
                         <span class="shou-address add-main-image">{{name}}</span>
-                        <span class="icon close" @click="close"></span>
+                        <span class="icon mIcon close" @click="close"></span>
                     </div>
                     <div class="modal-content">
                         <div class="modal-div">

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

@@ -43,7 +43,7 @@
                             <div class="new-list" v-for="(item, index) in messagesList" :key="index">
                                 <div class="text">
                                     <i class="icon mIcon" :class="item.isCheck ? 'icon-gouxuan' : 'icon-weigouxuan'" @click="checkedItemFn(item)"></i>
-                                    <p>{{item.title}}</p>
+                                    <p>{{item.content}}</p>
                                 </div>
                                 <div class="time">{{item.addTime}}</div>
                             </div>

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

@@ -14,7 +14,7 @@
 <!-- 修改资料 -->
 <div id="phonePage" v-cloak>
     <div class="navLayout" th:object="${pageInfo}">
-        <div class="crumbs">
+        <div class="crumbs" v-if="isPC">
             <span>账户设置</span>
             <span>&gt;</span>
             <span>更换手机号</span>