Browse Source

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

zhengjinyi 4 năm trước cách đây
mục cha
commit
e2268d3b91

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

@@ -32,4 +32,7 @@ li{list-style:none}
     .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 .header-tabs.current{background-color: #e15616;color: #FFFFFF;}
 }

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

@@ -35,7 +35,7 @@
   .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}
+  .icon.close-modalForm::before{cursor: pointer;width: 20px;height: 20px;background-position: -315px 1px;position: absolute;right: 13px;top: 10px}
   .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}
@@ -64,7 +64,7 @@
    .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}
+   input::placeholder,textarea::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;}
@@ -74,10 +74,9 @@
   .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-description{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;}
@@ -85,27 +84,25 @@
   .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;
+  .add-brand-box{ width: 74.7vw; height: fit-content;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}
+   .modal-header{height: 10.5vw; line-height: 10.5vw;border-bottom: solid .27vw #e2e7ef;padding-left: 5.3vw;color: #22272e}
+  .mIcon.close-modalForm:before{cursor: pointer;    top: 1.9vw;cursor: pointer;width: 5.3vw;height: 5.3vw;background-position: -34vw 0px;right: 2.7vw;position: absolute;}
+  .brand-content{padding:2.7vw;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;}
+  .brand-name input{width: 46vw;height: 8.8vw;background-color: #ffffff;border-radius: .53vw;border: solid .27vw #b8bfca;padding-left: 2.7vw;display: inline-block}
+  .img-box{ width: 13vw;height: 13vw;background-color: #ffffff;border-radius: 2px;border: solid .27vw #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;}
+  .add-pic{ width:13vw;height: 13vw;position: absolute;top: 50%;left: 50%;transform: translate(-50%,-50%);border-radius: .53vw;opacity: 0;cursor: pointer}
+  .brand-content .label{width: 18.6vw;text-align: right; display: inline-block;font-size: 3vw}
   .font-color{color: #e15616;}
-  .tishiyu{font-size: 12px;text-align: right; margin-top: 5px}
+  .tishiyu{font-size:2.2vw;text-align: right; margin-top: 1.3vw}
   .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}
+  .miaoshu{width: 46.4vw;height: 16vw;border-radius: .53vw;border: 1px solid #b8bfca;padding: 1.3vw;resize: none;display: inline-block;font-size: 3vw}
+  .box-btn{padding: 2.7vw;}
+  .box-btn div{display: inline-block;width: 100%;height: 9.9vw;line-height: 9.9vw;text-align: center;background-color: #e15616;border-radius: .53vw;border: solid 1px #e15616;margin-bottom: 2.7vw;color: #fff;cursor: pointer}
+  .box-btn .btn-cancel{background-color: #fff;color: #9aa5b5; border: 1px solid #b8bfca;}
+  .mIcon.add:before {width: 6.7vw;height: 6.7vw;background-position: -8.8vw -61.3vw;position: relative;top: 4vw;right: -4vw}
  }

+ 32 - 89
src/main/resources/static/css/supplier-center/shop/goods.css

@@ -31,94 +31,37 @@ li{list-style: none}
   .checkbox .icon-weigouxuan:before{ width: 16px;height: 16px; background-position: -332px -32px;}
   .checkbox .icon-gouxuan:before{width: 16px; height: 16px;background-position: -210px 0px}
   .goods-main  .tbody .good-info{display: inline-block}
-  .goods-main  .tbody .good-info img{
-    width: 80px;
-    height: 80px;
-    margin-top: 8px
-}
-.tbody ul li .good-classFly,.tbody ul li .good-price,.tbody ul li .status{
-    line-height: 90px ;
-}
- .goods-main  .tbody .good-name{
-    margin-left: 8px;
-    vertical-align: middle;
-    word-break: break-all;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    display: -webkit-inline-box;
-    -webkit-line-clamp: 2;
-    -webkit-box-orient: vertical;
-    width: 112px
-}
- .goods-main  .tbody .good-handle{
-   padding: 0 7px;
-    line-height: 40px;
-    position: absolute;
-    width: 180px;
-    top: 0;
-    left: 0;
-    right: 0;
-    bottom: 0;
-    margin: auto;
-    height: fit-content
-}
-.goods-main  .tbody .btn{
-    width: 52px;
-    height: 24px;
-    background-color: #ffe6dc;
-    border-radius: 2px;
-    border: solid 1px #e15616;
-    display: inline-block;
-    line-height: 24px;
-    color: #e15616;
-}
-.goods-main .tbody .success,.goods-main .tbody .danger{width: 88px}
-.goods-main .tbody .primary{width: 62px}
-.goods-container .good-footer{
-    width: 100%;
-    height: 56px;
-    float: left;
-    padding: 10px 0;
-}
-.goods-container .good-footer .footer-left{
-    float: left;
-    margin-left: 20px
-}
-.goods-container .good-footer .checkbox {
-       line-height: 36px;
-}
-.goods-container .good-footer .checkbox .box{
-    line-height: 40px;
-    float: left;
-}
-.goods-container .good-footer .checkbox span{
-    display: inline-block;
-    float: left;
-    margin-left: 10px;
-}
+  .goods-main  .tbody .good-info img{width: 80px;height: 80px;margin-top: 8px}
+  .tbody ul li .good-classFly,.tbody ul li .good-price,.tbody ul li .status{line-height: 90px ;}
+  .goods-main  .tbody .good-name{margin-left: 8px;vertical-align: middle;word-break: break-all;overflow: hidden;text-overflow: ellipsis;display: -webkit-inline-box;-webkit-line-clamp: 2;-webkit-box-orient: vertical;width: 112px}
+  .goods-main  .tbody .good-handle{padding: 0 7px;line-height: 40px;position: absolute;width: 180px;top: 0;left: 0;right: 0;bottom: 0;margin: auto;height: fit-content}
+  .goods-main  .tbody .btn{width: 52px;height: 24px;background-color: #ffe6dc;border-radius: 2px;border: solid 1px #e15616;display: inline-block;line-height: 24px;color: #e15616;}
+  .goods-main .tbody .success,.goods-main .tbody .danger{width: 88px}
+  .goods-main .tbody .primary{width: 62px}
+  .goods-container .good-footer{width: 100%;height: 56px;float: left;padding: 10px 0;}
+  .goods-container .good-footer .footer-left{float: left;margin-left: 20px}
+  .goods-container .good-footer .checkbox {line-height: 36px;}
+  .goods-container .good-footer .checkbox .box{line-height: 40px;float: left;}
+  .goods-container .good-footer .checkbox span{display: inline-block;float: left;margin-left: 10px;}
+  .goods-container .good-footer .footer-right{float: right;}
+  .goods-container .good-footer .footer-right .btn{width: 90px;height: 36px;display: block;line-height: 36px;text-align: center;font-size: 14px;border-radius: 2px;margin-right: 30px;color: #FFF;}
+  .goods-container .good-footer .footer-right .btn.icon-weigouxuan{border: solid 1px #9aa5b5;color: #22272e;opacity: .5;}
+  .goods-container .good-footer .footer-right .btn.icon-gouxuan{background-color: #e15616;}
+  .bg-gouxuan{background-color: #f0f3f7;}
+  }
 
-.goods-container .good-footer .footer-right{
-    float: right;
-}
-.goods-container .good-footer .footer-right .btn{
-    width: 90px;
-    height: 36px;
-    display: block;
-    line-height: 36px;
-    text-align: center;
-    font-size: 14px;
-    border-radius: 2px;
-    margin-right: 30px;
-    color: #FFF;
+/*移动*/
+ @media screen and (max-width:768px) {
+   .head-top{padding: 3.4vw;background: #fff;}
+   .head-top form div{margin-top: 2.7vw;color: #627386;}
+   .order-border{width: 93.4vw;height: 11.8vw;line-height: 11.8vw;border: 1px solid #b8bfca;font-size: 3.4vw;}
+   .form-row.low{width: 93.4vw;height: 11.8vw;line-height: 11.8vw;border: 1px solid #b8bfca;font-size: 3.4vw;}
+   .form-row.low span{color: #627386;padding-left: 2.7vw;}
+   .form-row .Buyer{color: #9aa5b5;height: -webkit-fill-available;border: 0;width: 70vw}
+   input::placeholder,textarea::placeholder{color: #9aa5b5}
+   .state{width: 93.4vw;height: 11.7vw;line-height: 11.7vw;padding-left: 1.3vw;border: 1px solid #b8bfca;color: #627386;margin-top: 1.3vw;}
+   .form-row.fenlei .state{width: 29.5vw;margin-left:.8vw;}
+   .form-row.fenlei span{display: block;}
+   #newBtn .query-btn{border: 1px solid #e15616;width: 35.3vw;height: 11.2vw;line-height: 11.2vw;text-align: center;color: #e15616;background: #ffe6dc;margin: auto}
 
-}
-.goods-container .good-footer .footer-right .btn.icon-weigouxuan{
-    border: solid 1px #9aa5b5;
-    color: #22272e;
-    opacity: .5;
-}
-.goods-container .good-footer .footer-right .btn.icon-gouxuan{
-    background-color: #e15616;
-}
-.bg-gouxuan{background-color: #f0f3f7;}
-  }
+ }

+ 38 - 26
src/main/resources/static/css/user-center/dashboard.css

@@ -5,30 +5,29 @@ li{list-style:none}
  */
 @media screen and (min-width:768px){
     /*个人中心右侧*/
-    .user-header{width: 100%;height: 120px;box-sizing: border-box;padding: 20px;background-color: #FFF;box-shadow: 0px 3px 6px 0px rgba(0, 0, 0, 0.07);}
-    .user-header .header-ml{width: 50%;height:80px;float: left;}
-    .user-header .header-ml .logo{width: 110px;height:78px;float: left;border: 1px solid #f5f5f5;border-radius: 2px;margin-right: 8px;position: relative;cursor: pointer;}
-    .user-header .header-ml .logo .logo-file{width: 110px;height: 78px;position: relative;outline: none;opacity: 0;position: absolute;top: 0;left: 0;cursor: pointer;}
-    .user-header .header-ml .logo .file{width: 110px;height: 78px;display:block;background: url("/img/account/icon-noneimg.png") center center no-repeat;}
-    .user-header .header-ml .logo img{width: 110px;height:78px;display: block;border-radius: 2px;}
-    .user-header .header-ml .account{float: left;box-sizing: border-box;padding: 5px 0;}
-    .user-header .header-ml .account .name{width: 100%;height: 36px;float: left;margin-bottom: 10px;}
-    .user-header .header-ml .account .name span{line-height: 36px;font-size: 18px;font-weight: bold;color: #22272e;display: inline-block;float: left;}
-    .user-header .header-ml .account .name a{margin-left: 30px;width: 118px;height: 34px;border: 1px solid #E15616;border-radius: 2px;background-color: #ffe6dc;color: #E15616;display: block;line-height: 34px;text-align: center;float: left;}
-    .user-header .header-ml .account .msg{width:100%;font-size: 14px;line-height: 26px;color: #22272e;margin-top: 20px;}
-    .user-header .header-ml .account .msg span{color: #22272e;display: inline-block;float: left;margin-right: 8px;}
-    .user-header .header-ml .account .msg .red{color: #f94b4b;font-style: normal;margin: 0 5px;}
-    .user-header .header-ml .account .msg a{display: inline-block;width: 64px;height: 22px;float: left;line-height: 22px;color: #FFFFFF;font-size:12px;text-align: center; background-image: linear-gradient(225deg,#61686f 0%,#313a43 100%);border-radius: 2px;}
-    .user-header .header-mr{height:80px;float: right;}
-    .user-header .header-mr .message{width: 100%;float: right;height: 28px;}
-    .user-header .header-mr .message a{width: 28px;height: 28px;float: right;display: block;position: relative;}
-    .user-header .header-mr .message .icon{width: 28px;height: 28px;float: right;display: block;position: relative;}
-    .user-header .header-mr .message .icon:before{width: 28px;height: 28px;background-position: -240px -370px}
-    .user-header .header-mr .message .icon span{display: block;width: 20px;height: 20px;background-image: linear-gradient(90deg,#ff5353 0%,#ff2424 100%);position: absolute;top: -9px;left: -9px;font-style: normal;font-size: 12px;color: #f94b4b;line-height: 20px;text-align: center;border-radius: 50%;color: #fff;}
-    .user-header .header-mr .message .icon span.ellipse{width: 30px;height: 20px;border-radius: 10px;line-height: 20px;left: -22px;}
-    .user-header .header-mr .money {width: 100%;height: 52px;line-height: 52px;font-size: 16px;}
-    .user-header .header-mr .money span{color: #e15616;}
-    .user-content{width: 100%;height: auto;margin-top: 10px;}
+    .user-header{width:100%;height:120px;box-sizing:border-box;padding:20px;background-color:#FFF;box-shadow:0px 3px 6px 0px rgba(0,0,0,0.07);position:relative}
+    .user-header .logo{width:110px;height:78px;float:left;border:1px solid #f5f5f5;border-radius:2px;margin-right:8px;position:relative;cursor:pointer}
+    .user-header .logo .logo-file{width:110px;height:78px;position:relative;outline:none;opacity:0;position:absolute;top:0;left:0;cursor:pointer}
+    .user-header .logo .file{display:block;width:110px;height:78px;line-height:78px;text-align:center}
+    .user-header .logo .file:before{width:40px;height:40px;background-position:-161px -367px;vertical-align:middle}
+    .user-header .logo img{width:110px;height:78px;display:block;border-radius:2px}
+    .user-header .account{float:left;box-sizing:border-box;padding:5px 0}
+    .user-header .account .name{width:100%;height:36px;float:left;margin-bottom:10px}
+    .user-header .account .name span{line-height:36px;font-size:18px;font-weight:bold;color:#22272e;display:inline-block;float:left}
+    .user-header .account .name a{margin-left:30px;width:118px;height:34px;border:1px solid #E15616;border-radius:2px;background-color:#ffe6dc;color:#E15616;display:block;line-height:34px;text-align:center;float:left}
+    .user-header .account .msg{width:100%;font-size:14px;line-height:26px;color:#22272e;margin-top:20px}
+    .user-header .account .msg em{color:#22272e;display:inline-block;margin-right:8px}
+    .user-header .account .msg .red{color:#f94b4b;font-style:normal;margin:0 5px}
+    .user-header .account .msg a{display:inline-block;width:64px;height:22px;line-height:22px;color:#FFFFFF;font-size:12px;text-align:center;background-image:linear-gradient(225deg,#61686f 0%,#313a43 100%);border-radius:2px}
+    .user-header .account .money{position:absolute;right:15px;bottom:20px;font-size:16px}
+    .user-header .account .money em{color:#e15616;font-style:normal;}
+    .user-header .message{position:absolute;height:28px;right:15px;top:20px}
+    .user-header .message a{width:28px;height:28px;float:right;display:block;position:relative}
+    .user-header .message .icon{width:28px;height:28px;float:right;display:block;position:relative}
+    .user-header .message .icon:before{width:28px;height:28px;background-position:-240px -370px}
+    .user-header .message .icon span{display:block;width:20px;height:20px;background-image:linear-gradient(90deg,#ff5353 0%,#ff2424 100%);position:absolute;top:-9px;left:-9px;font-style:normal;font-size:12px;color:#f94b4b;line-height:20px;text-align:center;border-radius:50%;color:#fff}
+    .user-header .message .icon span.ellipse{width:30px;height:20px;border-radius:10px;line-height:20px;left:-22px}
+    .user-content{width:100%;height:auto;margin-top:10px}
     .user-content .title{width: 100%;height: 44px;line-height: 44px;font-size: 16px;text-align: left;color: #22272e;}
     .user-content .title a{display: block;float: right;position: relative;padding-right: 36px;position: relative;}
     .user-content .title a .icon{display: block;width: 18px;height: 18px;position: absolute;top: 5px;right: 10px;}
@@ -89,8 +88,21 @@ li{list-style:none}
 * 移动端
 */
 @media screen and (max-width:768px){
-
-
+    .user-header{box-sizing:border-box;width:100%;height:33.9vw;padding:2.7vw;background:#fff;box-shadow:0 .8vw 1.6vw 0 rgba(0,0,0,0.07);position:relative}
+    .user-header .logo{width:26.7vw;height:19.4vw;border:solid 1px #f5f5f5;margin-right:2.7vw;position:relative}
+    .user-header .logo .logo-file{width:26.7vw;height:19.4vw;outline:none;opacity:0;position:absolute;top:0;left:0}
+    .user-header .logo .file{position:absolute;top:5vw;left:9vw;width:9vw;height:9vw}
+    .user-header .logo .file:before{width:9vw;height:9vw;background-position:-7.5vw -60.3vw}
+    .user-header .account{width:64vw;height:19.4vw;box-sizing:border-box;color:#9aa5b5;font-size:3.1vw;line-height:6.4vw;position:relative}
+    .user-header .account .name{font-size:3.7vw;color:#22272e}
+    .user-header .account em{font-style:normal;color:#e15616}
+    .user-header .account .name a,.user-header .account .msg a{display:inline-block;height:5.4vw;line-height:5.4vw;padding:0 2vw;color:#FFF;border-radius:2px;margin-left:2vw}
+    .user-header .account .name a{background-color:#e15616}
+    .user-header .account .msg a{background-color:#313a43}
+    .user-header .message{position:absolute;right:0;top:5vw}
+    .user-header .message .mIcon{position:absolute;right:0;top:0}
+    .user-header .message .mIcon:before{width:8vw;height:8vw;background-position:-16.5vw -60.3vw}
+    .user-header .message .ellipse{display:inline-block;padding:.3vw;border-radius:2vw;font-size:2.8vw;background-color:#f55c5c;color:#FFF;font-style:normal;position:absolute;right:4vw;top:-1vw}
 
 
 

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

@@ -31,4 +31,7 @@ li{list-style:none}
     .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 .header-tabs.current{background-color: #e15616;color: #FFFFFF;}
 }

+ 30 - 2
src/main/resources/static/js/supplier-center/shop/goods.js

@@ -29,7 +29,8 @@ var myGoods = new Vue({
         classificationThreeList:[],
         productsList:[],
         checkList:[],
-        isCheckedAll:false
+        isCheckedAll:false,
+        noMore:false,
     },
     computed: {
         pageTotal: function () {
@@ -104,7 +105,6 @@ var myGoods = new Vue({
         GetFistClassFn: function(){//获取一级分类菜单
             var _this = this;
             PublicApi.GetFirstClassFication({},function (response) {
-            console.log(response)
                 if(response.data.length>0){
                      _this.classificationFirstList = response.data;
                 }else {
@@ -372,6 +372,34 @@ var myGoods = new Vue({
         }
         _this.GetMyproductDataInfo();
         _this.GetFistClassFn();
+
+            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.listQuery.pageSize)?Math.ceil(_self.listRecord / _self.listQuery.pageSize):1;
+                    var next = _self.listQuery.pageNum+1;
+                    if(next <= totalPage){
+                        if (_self.requestFlag){
+                            _self.listQuery.pageNum = next;
+                            if (_self.isRequset) {
+                                // 获取列表数据
+                                _self.MyOrderList();
+                            }
+                        }
+                        _self.requestFlag = false;
+                    }else{
+                        //到底了
+                        _self.noMore = true;
+                        $('footer').removeClass("noneImportant");
+                    }
+                }
+            });
+        }
     }
 });
 

+ 1 - 1
src/main/resources/templates/supplier-center/order/settlement.html

@@ -17,7 +17,7 @@
          <div class="crumbs">
             <span>我的店铺</span>
             <span>&gt;</span>
-            <span>品牌管理</span>
+            <span>结算管理</span>
         </div>
         <div class="wrap clear">
              <!--左侧面包屑-->

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

@@ -10,10 +10,10 @@
 <body>
 <!-- 引用头部 -->
 <template th:replace="components/header"></template>
-    <h1></h1>
+<h1></h1>
 <!-- 我的采美 -->
 <div id="Brandgoods">
-    <div class="navLayout" v-cloak="">
+    <div class="navLayout" v-cloak>
         <div class="crumbs" v-if="isPC">
             <span>我的店铺</span>
             <span>&gt;</span>
@@ -25,7 +25,10 @@
             <div class="right">
                 <div class="head-top">
                     <form action="">
-                        <div class='order-border'><span>品牌名称:</span><input type="text" id="name-buyer" v-model="params.name" class="Buyer" placeholder="请输入买家名称"> </div>
+                        <div class='order-border'>
+                            <span>品牌名称:</span>
+                            <input type="text" id="name-buyer" v-model="params.name" class="Buyer" placeholder="请输入买家名称">
+                        </div>
                         <div>
                             状态:
                             <select name="" id="settlement-status" class="state" @change="getstatus($event)">
@@ -34,11 +37,11 @@
                                 <option value="1">审核通过</option>
                                 <option value="2">审核未通过</option>
                             </select>
-                            </div>
-                            <div id="newBtn">
-                                <div class="query-btn" @click="queryBrand">搜索</div>
-                                <div class="addBrand" @click="newBrand">提交新品牌</div>
-                            </div>
+                        </div>
+                        <div id="newBtn">
+                            <div class="query-btn" @click="queryBrand">搜索</div>
+                            <div class="addBrand" @click="newBrand">提交新品牌</div>
+                        </div>
                     </form>
                 </div>
                 <div class="brand-list" v-if="isPC">
@@ -58,7 +61,7 @@
                                 <span v-else>暂无</span>
                             </li>
                             <li class="brand-status">
-                                <span class="font-red"  v-if="item.status ==0">待审核</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>
                             </li>
@@ -68,7 +71,7 @@
 
                             </li>
                             <li class="brand-time">{{item.createDate}}</li>
-                            <li class="brand-edit" >
+                            <li class="brand-edit">
                                 <span v-if="item.status != 1" @click="editBrand(item)">编辑</span>
                                 <span v-else>无</span>
                             </li>
@@ -77,99 +80,104 @@
                 </div>
                 <div class="brand-list" v-else>
                     <div class="list" v-for="item in brandlist">
-                         <ul class="brand-title">
+                        <ul class="brand-title">
                             <li>品牌LOGO:</li>
                             <li>品牌名称:</li>
                             <li>状态:</li>
-                         </ul>
-                         <div style="overflow: hidden">
-                              <div class="brand-logo">
+                        </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">
+                            </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-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>
+                                <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 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">
-                            <a v-if="params.pageNum>1" class="prev" @click="toPagination(params.pageNum*1-1)" href="javascript:void(0);"></a>
-                            <template v-for="n in showPageBtn">
-                                <a v-if="n" :class="{'on':(n==params.pageNum)}" @click="toPagination(n)" href="javascript:void(0);" v-text="n"></a>
-                                <span v-else>···</span>
-                            </template>
-                            <a v-if="params.pageNum<pageTotal" class="next" @click="toPagination(params.pageNum*1+1)" href="javascript:void(0);"></a>
-                            <span>共<b v-text="pageTotal>1?pageTotal:1"></b>页</span>
-                            <span>跳至</span>
-                            <input v-model="pageInput" @blur="checkNum()"/>
-                            <span>页</span>&nbsp;
-                            <a class="btn" href="javascript:void(0);" @click="toPagination(pageInput)">点击跳转</a>
-                     </div>
+                <div v-if="(!isPC) && noMore" class="noMore">---- 没有更多了 ----</div>
+                <div class="pageWrap clear" v-if="isPC && pageTotal>1">
+                    <a v-if="params.pageNum>1" class="prev" @click="toPagination(params.pageNum*1-1)"
+                       href="javascript:void(0);"></a>
+                    <template v-for="n in showPageBtn">
+                        <a v-if="n" :class="{'on':(n==params.pageNum)}" @click="toPagination(n)"
+                           href="javascript:void(0);" v-text="n"></a>
+                        <span v-else>···</span>
+                    </template>
+                    <a v-if="params.pageNum<pageTotal" class="next" @click="toPagination(params.pageNum*1+1)"
+                       href="javascript:void(0);"></a>
+                    <span>共<b v-text="pageTotal>1?pageTotal:1"></b>页</span>
+                    <span>跳至</span>
+                    <input v-model="pageInput" @blur="checkNum()"/>
+                    <span>页</span>&nbsp;
+                    <a class="btn" href="javascript:void(0);" @click="toPagination(pageInput)">点击跳转</a>
+                </div>
             </div>
         </div>
-         <div class="bg-brand" v-show="bgflag">
-             <div class="add-brand-box">
-                    <div class="modal-header">
-                        <span class="shou-address">{{title}}</span>
-                        <span class="close-modalForm" @click="closebg">x</span>
+        <div class="bg-brand" v-show="bgflag">
+            <div class="add-brand-box">
+                <div class="modal-header">
+                    <span class="shou-address">{{title}}</span>
+                    <span class="close-modalForm mIcon icon" @click="closebg"></span>
+                </div>
+                <div class="brand-content">
+                    <div class="brand-name">
+                        <span class="label"><em class="required">*</em> 品牌名称:</span>
+                        <input type="text" v-model="brandobj.name" placeholder="请输入品牌名称"/>
                     </div>
-                    <div class="brand-content">
-                        <div class="brand-name">
-                            <span class="label"><em class="required">*</em> 品牌名称:</span>
-                            <input type="text" v-model="brandobj.name" placeholder="请输入品牌名称"/>
-                        </div>
-                        <div class="brand-img">
-                            <span class="label">品牌logo:</span>
-                            <div class="img-box upimg">
-                                <img class="center" :src="brandobj.logo" v-if="logoShow">
-                                <i class="icon mIcon add" v-if="iconflag"></i>
-                                <input type="file" ref="goodslogo" class="add-pic"  id="uploadfile" accept="image/*" @change="uploadlogo"/>
-                              </div>
-                            <p class="tishiyu">请上传<span class="font-color">jpg/png</span>格式的图片,大小不超过<span>5M</span> </p>
-                         </div>
-                        <div class="brand-description">
-                            <span class="label">品牌描述:</span>
-                             <textarea rows="" cols="" class="miaoshu" v-model="brandobj.description" placeholder="请描述品牌信息,不超过200字" maxlength="200" ></textarea>
+                    <div class="brand-img">
+                        <span class="label">品牌logo:</span>
+                        <div class="img-box upimg">
+                            <img class="center" :src="brandobj.logo" v-if="logoShow">
+                            <i class="icon mIcon add" v-if="iconflag"></i>
+                            <input type="file" ref="goodslogo" class="add-pic" id="uploadfile" accept="image/*"
+                                   @change="uploadlogo"/>
                         </div>
+                        <p class="tishiyu">请上传<span class="font-color">jpg/png</span>格式的图片,大小不超过<span>5M</span></p>
+                    </div>
+                    <div class="brand-description">
+                        <span class="label">品牌描述:</span>
+                        <textarea rows="" cols="" class="miaoshu" v-model="brandobj.description"
+                                  placeholder="请描述品牌信息,不超过200字" maxlength="200"></textarea>
                     </div>
-                     <div class="box-btn">
-                         <div class="btn-submit" @click="submit">提交</div>
-                          <div class="btn-cancel" @click="closebg">取消</div>
-                     </div>
                 </div>
-             </div>
-         </div>
-
+                <div class="box-btn">
+                    <div class="btn-submit" @click="submit">提交</div>
+                    <div class="btn-cancel" @click="closebg">取消</div>
+                </div>
+            </div>
+        </div>
     </div>
+
+</div>
 </div>
 
 <!-- 引入底部 -->
 <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/supplier.service.js(v=${version})}"></script>
+<script charset="utf-8" type="text/javascript"
+        th:src="@{/js/common/serviceapi/supplier.service.js(v=${version})}"></script>
 <script charset="utf-8" type="text/javascript" th:src="@{/js/supplier-center/shop/brand.js(v=${version})}"></script>
 </body>
 </html>

+ 10 - 10
src/main/resources/templates/supplier-center/shop/goods.html

@@ -14,7 +14,7 @@
 <!-- 我的采美 -->
 <div id="myGoods">
     <div class="navLayout goods-container" v-show="isRequest" :class="isRequest ? 'active' : ''">
-        <div class="crumbs">
+        <div class="crumbs" v-if="isPC">
             <span>我的店铺</span>
             <span>&gt;</span>
             <span>我的商品</span>
@@ -25,12 +25,12 @@
             <div class="right">
                 <div class="head-top">
                     <form action="">
-                        <div class='form-row'>
+                        <div class='form-row low'>
                             <span>商品货号:</span>
                             <input type="text" id="name-buyer" v-model="listQuery.productCode" class="Buyer"
                                    placeholder="请输入商品货号" maxlength="20">
                         </div>
-                        <div class="form-row">
+                        <div class="form-row low">
                             <span>商品名称:</span>
                             <input class="Buyer" v-model="listQuery.name" type="text" maxlength="25"
                                    placeholder="请输入商品名称">
@@ -55,18 +55,18 @@
                                 <option value="0">否</option>
                             </select>
                         </div>
-                        <div class="form-row">
-                            分类:
-                            <select name="" class="state" @change="ChangeClassificationFirst($event)">
+                        <div class="form-row fenlei">
+                            <span class="">分类:</span>
+                            <select name="" class="state " @change="ChangeClassificationFirst($event)">
                                 <option value="">全部</option>
                                 <option v-for="x in classificationFirstList" :value="x.bigTypeID">{{x.name}}</option>
                             </select>
-                            <select name="" class="state" @change="ChangeClassificationTwo($event)">
-                                <option value="">请选择二级分类</option>
+                            <select name="" class="state " @change="ChangeClassificationTwo($event)">
+                                <option value="">二级分类</option>
                                 <option v-for="x in classificationTwoList" :value="x.smallTypeID">{{x.name}}</option>
                             </select>
-                            <select name="" class="state" @change="ChangeClassificationThree($event)">
-                                <option value="">请选择三级分类</option>
+                            <select name="" class="state " @change="ChangeClassificationThree($event)">
+                                <option value="">三级分类</option>
                                 <option v-for="x in classificationThreeList" :value="x.tinyTypeID">{{x.name}}</option>
                             </select>
                         </div>

+ 16 - 20
src/main/resources/templates/user-center/dashboard.html

@@ -26,27 +26,23 @@
                     <img src="/img/base/loading.gif">
                 </div>
                 <template v-else>
-                    <div class="user-header">
-                        <div class="header-ml">
-                            <div class="logo">
-                                <input ref="clubUseLogo"  class="logo-file" type="file" accept="image/png,image/jpeg,image/gif,image/jpg"  @change="uploadUserPuploadAvatar">
-                                <i class="file" v-if="userInfo.image == null"></i>
-                                <img v-else :src="userInfo.image == null ? '' : userInfo.image" alt="">
-                            </div>
-                            <div class="account">
-                                <div class="name"><span>{{userInfo.name}}</span><a href="/user/setting/upgrade.html" v-if="userInfo.userIdentity === 4">去升级会员机构</a></div>
-                                <div class="msg"><span>资料完整度:<em class="red">{{degree}}</em></span><a href="/user/setting/information.html">立即完善</a></div>
-                            </div>
+                    <div class="user-header mfbt">
+                        <div class="logo">
+                            <input ref="clubUseLogo"  class="logo-file" type="file" accept="image/png,image/jpeg,image/gif,image/jpg"  @change="uploadUserPuploadAvatar">
+                            <i class="file icon mIcon" v-if="userInfo.image == null"></i>
+                            <img v-else :src="userInfo.image == null ? '' : userInfo.image" alt="">
                         </div>
-                        <div class="header-mr">
-                            <div class="message">
-                                <a href="/user/message/list.html">
-                                    <i class="icon mIcon">
-                                        <span  v-if="unReadMessageCount>0" :class="[unReadMessageCount < 10 ? 'circular':'ellipse']">{{unReadMessageCount == 99 ? '99+' : unReadMessageCount}}</span>
-                                    </i>
-                                </a>
-                            </div>
-                            <div class="money">余额: <span>{{toFixedFn(userInfo.ableUserMoney)}}</span> 元</div>
+                        <div class="account">
+                            <div class="name"><span>{{userInfo.name}}</span><a href="/user/setting/upgrade.html" v-if="userInfo.userIdentity === 4">去升级会员机构</a></div>
+                            <div class="money">余额: <em>{{toFixedFn(userInfo.ableUserMoney)}}</em> 元</div>
+                            <div class="msg"><span>资料完整度:<em class="red">{{degree}}</em></span><a href="/user/setting/information.html">立即完善</a></div>
+                        </div>
+                        <div class="message">
+                            <a href="/user/message/list.html">
+                                <i class="icon mIcon">
+                                    <span  v-if="unReadMessageCount>0" :class="[unReadMessageCount < 10 ? 'circular':'ellipse']">{{unReadMessageCount == 99 ? '99+' : unReadMessageCount}}</span>
+                                </i>
+                            </a>
                         </div>
                     </div>
                     <div class="user-content clear">