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

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

@@ -46,6 +46,7 @@ footer .footTop{display:none;}
 @media screen and (max-width:768px){
 body{background:#FFF}
 footer{display:none}
+.loginForm .showPwd{display:none;}
 .loginForm{padding-top:4vw;text-align:center;background:#FFF url(/img/account/login_m.png) no-repeat center 25vw;background-size:57vw 43.2vw}
 .loginForm h1{color:#22272e;font-size:6.4vw;font-weight:bold;line-height:10vw}
 .loginForm h2{font-size:3.1vw;font-weight:normal;line-height:5.4vw;color:#627386}
@@ -54,17 +55,13 @@ footer{display:none}
 .loginForm input{height:11.2vw;line-height:6vw;padding: 2.6vw 0;box-sizing: border-box;}
 .loginForm .checked{top:3.6vw;right:3.6vw;}
 .loginForm .forget{text-align:right;color:#4a4f58;font-size:3.4vw;line-height:3.4vw;margin-bottom:4.8vw}
-.loginForm .submit .btn,.loginForm .submit .weChat{display:inline-block;box-sizing:border-box;width:100%;height:11.2vw;line-height:11.2vw;background-color:#ffe6dc;border-radius:2px;border:solid 1px #e15616;text-align:center;color:#e15616;font-size:3.4vw;margin-bottom:4.8vw}
-.loginForm .submit button.btn{background-color:#e15616;color:#FFF;margin-bottom:4.8vw}
-.loginForm .showPwd{display:none;}
+.loginForm .submit{line-height:11.2vw;font-size:3.4vw;text-align:center;color:#22272e;}
+.loginForm .submit .btn{display:inline-block;box-sizing:border-box;width:100%;height:11.2vw;border:solid 1px #b8bfca;border-radius:2px;margin-bottom:4.8vw}
+.loginForm .submit button.btn{border-color:#e15616;background:#e15616;color:#FFF;}
+.loginForm .submit .weChat{display:block;margin:6vw auto;width:50vw;color:#627386;line-height:8vw}
+.loginForm .submit .weChat span{display:inline-block;width:100%}
+.loginForm .submit .weChat .mIcon:before{width:12vw;height:12vw;background-position:0 -77.8vw}
 
-.loginForm .submit .weChat{
-    background: #00bc0c;
-    border-color: #00bc0c;
-    text-align:center;
-    overflow: hidden;
-}
-.loginForm .submit .weChat img{height:100%}
 
 
 }

src/main/resources/static/css/article/article.css

@@ -93,9 +93,9 @@ dl,dd,dt{zoom:1}
 	.content .new-list{width:100%;background:#fff}
 	.content .row:nth-last-child(1){border-bottom:0}
 	.new-list .row{position:relative;display:table;width:800px;height:150px;margin:0 30px;padding:30px 0;border-bottom:solid 1px #ededed}
-	.row .new-img{position:absolute;width:210px;height:150px;margin-right:20px}
+	.row .new-img{position:absolute;width:210px;height:150px;margin-right:20px;background:#FFF url(/img/base/placeholder.png) no-repeat center center;}
 	.row .campaign{position:absolute;top:35px;left:5px;width:56px;height:24px;line-height:24px;font-size:16px;color:#fff;text-align:center;border-radius:2px;background-color:#e15616;opacity:.7;z-index:99}
-	.row .new-img img{width:206px;height:146px;background:#FFF url(/img/base/placeholder.png) no-repeat center center;background-size:80%}
+	.row .new-img img{width:100%;height:100%;background-color:#FFF;background-size:80%}
 	.row .new-img img:hover{border:solid 2px #e15616;opacity:0.8}
 	.row .new-img img.none:hover{border:none;opacity:1;cursor:default}
 	.row .new-blurb{padding-left:230px;min-height:150px;margin-top:-5px;overflow:hidden}

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

@@ -154,17 +154,17 @@ iframe{width:320px !important;height: 280px !important}
 .baseTopNav .navBox li>div a:hover{background:#FEF6F3;color:#E15616}
 .baseTopNav .classifyBox{display:none;position:absolute;left:50%;top:44px;z-index:990;transform:translateX(-50%);box-shadow:0 3px 6px rgba(45,48,54,.2);}
 /* 分类 */
-.classifyBox{width:1184px;margin:0 auto;box-sizing:border-box;padding:8px 30px;background:#FFF;border-radius:0 0 2px 2px}
+.classifyBox{width:1184px;margin:0 auto;box-sizing:border-box;padding:8px 16px;background:#FFF;border-radius:0 0 2px 2px}
 .classifyBox .clsTab{height:56px;line-height:56px;white-space:nowrap;border-bottom:1px solid #FFE6DC}
-.classifyBox .clsTab a{display:inline-block;cursor:default;height:100%;padding:0 25px;font-size:16px;font-weight:bold;color:#2D3036;border-bottom:1px solid transparent}
+.classifyBox .clsTab a{display:inline-block;cursor:default;height:100%;padding:0 10px 0 10px;font-size:16px;font-weight:bold;color:#2D3036;border-bottom:1px solid transparent;margin-right: 30px}
 .classifyBox .clsTab a:hover,.classifyBox .clsTab a.on{color:#E15616;border-color:#E15616}
 .classifyBox .clsCon{padding:10px 0}
 .classifyBox .line{position:relative;padding-left:100px;line-height:32px}
 .classifyBox .line:after{content:'';position:absolute;left:100px;top:0;border-right:1px solid #FFE6DC;height:100%}
 .classifyBox .lft{position:absolute;top:0;left:0;width:100px;color:#000}
-.classifyBox .lft a{display:inline-block;width:100%;line-height:24px;padding:10px;box-sizing:border-box}
+.classifyBox .lft a{display:inline-block;width:100%;line-height:24px;padding:10px;box-sizing:border-box;color: #627386;}
 .classifyBox .rgt{color:#666;padding:6px 0 6px 6px;position:relative}
-.classifyBox .rgt a{display:inline-block;height:32px;line-height:32px;padding:0 22px;cursor:pointer;color:#666}
+.classifyBox .rgt a{display:inline-block;height:32px;line-height:32px;padding:0 22px;cursor:pointer;color: #627386;}
 .classifyBox .rgt a.on,.classifyBox .clsCon .rgt a:hover{color:#e15616;background:#fbe7de}
 .classifyBox .line:hover .rgt:after,.classifyBox .line.on .rgt:after{content:'';position:absolute;left:0;top:0;z-index:1;border-right:1px solid #E15616;height:100%}
 .classifyBox .line:hover .lft a,.classifyBox .line.on .lft a{color:#E15616}
@@ -286,7 +286,7 @@ iframe{width:320px !important;height: 280px !important}
 .priceTag .close{background:#E15616;color:#fff;border-radius:2px;cursor:pointer;display:inline-block;padding:0 20px;height:30px;line-height:30px;font-style:normal;}
 .priceTag .promotion{font-size:14px;line-height:30px;padding:8px 15px;width:320px;}
 .priceTag .promotion p{text-align:left;clear:both;}
-.priceTag .promotion p>em{color:#E15616;font-style:normal}
+.priceTag .promotion p>em{color:#E15616;font-style:normal;cursor: pointer;}
 .priceTag .promotion .p{display:block;height:40px;padding:10px 0 10px 50px;position:relative;line-height:20px;}
 .priceTag .promotion .p img{width:40px;height:40px;position:absolute;left:0;top:10px}
 .priceTag .promotion .p span{display:block;text-overflow:ellipsis;overflow:hidden;white-space:nowrap}

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

@@ -8,7 +8,7 @@ body{width:100%;min-height:100%;font-size:14px;color:#4A4F58;background:#F5F5F5;
 a{text-decoration:none;color:#4A4F58;}
 a:focus{text-decoration:none;outline:none;}
 a:hover{color:#E15616;}
-img{border:none;vertical-align:middle;}
+img{border:none;vertical-align:middle;max-width:100%;}
 button{border:none;outline:none;}
 input{outline:none;box-shadow:none;}
 pre{white-space:pre-wrap;}

src/main/resources/static/css/flea-market/form.css

@@ -76,7 +76,7 @@ body{background: #fff}
      .gosecond {color: #1683E1;border-right: 1px solid #F2F2F2;}
      .close {position: absolute;right: 0;top: 0;width: 40px;height: 40px;line-height: 40px;text-align: center;cursor: pointer;font-size: 24px;}
      .bjmain .title{width: -webkit-fill-available;color: #627386;padding: 15px;display: inline-block;border: solid 1px #e2e7ef;font-size: 14px}
-     .unlogin-label{height: 26px;color:#9aa5b5}
+     .unlogin-label{height: 26px;color:#627386}
  }
 
 /*移动端*
@@ -96,41 +96,39 @@ body{background: #fff}
      .secondradio div.buy {width: 39.2vw;}
      .mIcon.select:before {background-position: -75.5vw -8.8vw;width: 5.3vw;height: 4.8vw;position: absolute;bottom: 0;right: 0;transition: none;}
      .mIcon.buy:before {left: 34vw;}
-     .secondradio {margin-bottom: 15px;}
-     .linqi_text {width: 425px;height: 45px;background-color: #1890f9;box-shadow: 0px 3px 6px 0px rgba(24, 144, 249, 0.17);text-align: center;line-height: 45px;color: #ffffff;margin: auto}
-     .jiaobiao {width: 0;height: 0;border-left: 10px solid transparent;border-right: 10px solid transparent;top: 20.8vw;right: 50%;border-bottom: 10px solid #1890f9;position: absolute}
-     #shoplogo {height: 36px;border-radius: 2px;padding-left: 10px;width: 508px;border: solid 1px #b8bfca;color: #9aa5b5}
-     #shoplogoTwo {height: 36px;margin-top: 2.7vw;}
-     .login-form input[type="text"] {width: 100% !important;height: 9.6vw;background-color: #ffffff;border-radius: .53vw;border: solid 1px #b8bfca;padding-left: 2.7vw;color: #22272e;box-sizing: border-box}
+     .secondradio {margin-bottom:4vw;}
+     .linqi_text {width: 100%;height:9.6vw;background-color: #1890f9;box-shadow: 0px .8vw 1.3vw 0px rgba(24, 144, 249, 0.17);text-align: center;line-height: 9.6vw;color: #ffffff;margin: auto;font-size: 3.2vw;}
+     .jiaobiao {width: 0;height: 0;border-left: 2.7vw solid transparent;border-right: 2.7vw solid transparent;top: 20.8vw;right: 50%;border-bottom: 2.7vw solid #1890f9;position: absolute}
+     #shoplogoTwo {height:9.6vw;margin-top: 2.7vw;}
+     .login-form input[type="text"] {width: 100% !important;height: 9.6vw;background-color: #ffffff;border-radius: .53vw;border: solid .27vw #b8bfca;padding-left: 2.7vw;color: #22272e;box-sizing: border-box}
      input[type="text"]::placeholder, textarea::placeholder {color: #9aa5b5;;}
-     .shrink-spacing {margin: 20px 0;position: relative;}
+     .shrink-spacing {margin: 5.3vw 0;position: relative;}
      .red-color {color: #f94b4b;}
-     .address-input {width: 28.5vw;height: 10.7vw;background-color: #ffffff;border-radius: .53vw;border: solid 1px #b8bfca;padding-left: 6.7vw;color: #9aa5b5}
+     .address-input {width: 28.5vw;height: 10.7vw;background-color: #ffffff;border-radius: .53vw;border: solid .27vw #b8bfca;padding-left: 6.7vw;color: #9aa5b5}
      .address-item i{position: relative;}
      .address-input.city {margin: 0 2.6vw;}
      .border-grey {width: 100%;height: 56.3vw;background-color: #ffffff;border-radius: .53vw;border: solid .27vw #b8bfca;margin-top: 5.3vw;resize: none;padding: 2.7vw;box-sizing: border-box}
      #description {margin-top: 0;}
      .upload-file {position: relative;float: left;margin: 2.7vw 2.7vw 2.7vw 0px;cursor: pointer;width: 21.3vw;height: 21.3vw;border-radius: .53vw;border: solid .27vw #b8bfca}
-     .input-file {width: 80px;height: 80px;opacity: 0;cursor: pointer;position: absolute;}
-     .upload-img {width: 100%;height: 100%;display: block;border-radius: 2px;}
-     .add-text {font-size: 12px;color: #333330;opacity: 0.5;position: absolute;top: 60%;right: 13px}
+     .input-file {width: 21.3vw;height: 21.3vw;opacity: 0;cursor: pointer;position: absolute;}
+     .upload-img {width: 100%;height: 100%;display: block;border-radius: .53vw;}
+     .add-text {font-size: 3.2vw;color: #333330;opacity: 0.5;position: absolute;top: 60%;right:3.3vw}
      .release-main-container {overflow: hidden;}
      #uploadGoodsImages {width: 100%;overflow: auto;}
      .mIcon.add:before {width: 6.7vw;height: 6.7vw;background-position: -8.8vw -61vw;position: absolute;top: 4.5vw;right: 7.2vw}
      .mIcon.del:before {width: 5.3vw;height: 5.3vw;background-position: -89.6vw -7.7vw;position: absolute;top: -1vw;right: -.8vw}
      .form-upload-tips .icon-wen:before {width: 5.3vw;height: 6.3vw;background-position: -76.5vw 0px;cursor: pointer;}
-     .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: -4vw;left: 27.2vw;}
-     .form-upload-tips {width: 5.3vw;float: left;margin-top: 10px;}
+     .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: 27.2vw;}
+     .form-upload-tips {width: 5.3vw;float: left;margin-top: 2.7vw;}
      .wen-tips {width: 100%;height: 12.5vw;line-height: 6.4vw;text-align: center;color: #FFF;font-size: 2.7vw;background-color: #1890f9;box-shadow: 0 .8vw 1.6vw 0 rgba(24, 144, 249, 0.17);position: absolute;right: 0;border-radius: .8vw;display: none;}
      .form-upload-tips:hover .wen-tips {display: block;}
-     #word-limit {position: absolute;right: 0;bottom: 10px;font-size: 12px;color: #9aa5b5}
-     .unlogin-item {margin-top: 20px;}
+     #word-limit {position: absolute;right: 2.7vw;bottom: 2.7vw;font-size: 3.2vw;color: #9aa5b5}
      .textarea-wrapper {letter-spacing: .4vw;line-height: 6.4vw;color: #627386;position: relative;width: 100%;font-size: 3.2vw}
-     .BtnAll {margin-top: 30px;width: 100%;overflow: hidden}
+     .BtnAll {margin-top: 8vw;width: 100%;overflow: hidden}
      .BtnAll button {width: 100%;height: 15vw;border-radius: .53vw;line-height: 15vw;text-align: center;font-size: 4.5vw;cursor: pointer;margin-bottom: 2.7vw;box-sizing: border-box;}
      .Read {border: solid .27vw #e15616;background-color: #ffe6dc;color: #e15616;}
      #btn-submit {background-color: #e15616;color: #fff;}
-     input[type=checkbox] {margin: 1.27vw 7px 0px -14px;}
+     input[type=checkbox] {margin: 1.27vw 7px 0px -3.4vw;width: 3.5vw;height: 3.5vw;line-height: 3.5vw}
      select {appearance: none;-moz-appearance: none;-webkit-appearance: none;}
      .mIcon.selected:before {width: 6.7vw;height: 6.7vw;background-position: -49vw 2.4vw;position: absolute;right: -27vw}
      .mIcon.province:before {right: -26.4vw;}
@@ -138,7 +136,7 @@ body{background: #fff}
 
      /**/
      .select {position: relative;display: block;width: 100%;color: #9aa5b5;vertical-align: middle;text-align: left;height: 9.6vw;user-select: none}
-     .select .placeholder {position: relative;display: block;padding-left: 10px;border-radius: 2px;cursor: pointer;border: solid 1px #b8bfca;height: 36px;line-height: 36px}
+     .select .placeholder {position: relative;display: block;padding-left: 2.7vw;border-radius: .53vw;cursor: pointer;border: solid .27vw #b8bfca;height:9.6vw;line-height: 9.6vw}
      .select.is-open .placeholder:after {content: '\f077';}
      .select.is-open ul {display: block;}
      .select.select--white .placeholder {background: #fff;color: #999;}
@@ -151,12 +149,12 @@ body{background: #fff}
      .thebj {position: fixed;left: 0;top: 0;bottom: 0;width: 100%;height: 100%;background-color: rgba(0, 0, 0, .5);z-index: 999999;opacity: 0;}
      .thebj.show {opacity: 1;}
      .theresult {position: absolute;right: 14%;top: 30%;width: 63.7vw;background-color: #fff;border-radius: .53vw;padding: 2.7vw;}
-     .theresult span{padding: 5px 0;border-bottom: 1px solid #e2e7ef;width: 100%;display: block;color: #627386}
+     .theresult span{padding: 1.3vw 0;border-bottom: .27vw solid #e2e7ef;width: 100%;display: block;color: #627386}
      .theresult p {font-size: 3.7vw;color: #22272e;line-height: 6.7vw;padding: 2vw 2vw}
      .paybtn {width: 100%;}
      .paybtn span {display: block;text-align: center;font-size: 3.7vw;cursor: pointer;}
      .paybtn .cancel {margin: 2.7vw 0;width: 100%;height: 9.9vw;background: rgba(225, 86, 22, 1);color: #fff;line-height: 9.9vw;border-radius: .53vw}
-     .paybtn .thegopay {border: 1px solid #E0E0E0;height: 8.5vw;line-height: 8.5vw;border-radius: .53vw;color: #333333;padding: 0 1.3vw 0 1.3vw}
+     .paybtn .thegopay {border: .27vw solid #E0E0E0;height: 8.5vw;line-height: 8.5vw;border-radius: .53vw;color: #333333;padding: 0 1.3vw 0 1.3vw}
      .gosecond {color: #1683E1;border-right: .27vw solid #F2F2F2;}
      .close {position: absolute;right: 0;top: 0;width: 10.7vw;height: 10.7vw;line-height: 10.7vw;text-align: center;cursor: pointer;font-size: 6.4vw;}
     .brand.mIcon:before{

src/main/resources/static/css/flea-market/secondDetail.css

@@ -2,12 +2,12 @@
 @media screen and (min-width:768px) {
     .recommendBox{margin-bottom:16px;overflow: hidden;}
     .recommendBox .hd{font-size:16px;color:#4A4F58;font-weight:bold;padding:16px 32px}
-    #productRecommend{padding:10px;background: #fff}
-    #productRecommend li{float:left;width:153px !important;height:205px;overflow:hidden;list-style: none;}
+    #productRecommend{padding:16px;background: #fff}
+    #productRecommend li{float:left;width:167px;height:205px;overflow:hidden;list-style: none;}
     #productRecommend li .item{width:153px;height:205px;margin:0 auto;line-height:22px}
     #productRecommend li .item a{display:block;width:100%;height:100%;color:#93979F}
     #productRecommend li .item a:hover{color:#E15616}
-    #productRecommend li .item img{display:block;width:100%;height:100%}
+    #productRecommend li .item img{display:block;width:150px;height:153px;border: solid 1px #e2e7ef}
     #productRecommend li .item span{max-height:44px;overflow:hidden;text-overflow:ellipsis;display:-webkit-box;-webkit-line-clamp:2;-webkit-box-orient:vertical;}
     #productRecommend .swiper-wrapper{height:205px;}
     #productRecommend .swiper-pagination{width:100%;height:14px;z-index:1;text-align:center;font-size:0;}
@@ -90,10 +90,10 @@
     #imgShown{width: 100%; height: 100vw;position: relative;background: #fff}
     .preview-info{box-sizing: border-box;padding: 0 3.3vw;overflow: hidden;background: #fff}
     .preview-info-main{box-sizing: border-box;padding: 2.8vw;font-size: 3.4vw;line-height: 7.5vw;color: #93979F;background: #f3f7fe;border-radius: 2px;position: relative;margin: 3.5vw 0;overflow: hidden}
-    .preview-info .preview-info-main .info {width: 100%;height: 30px;float: left;margin-bottom: 5px;line-height: 30px;}
-    .preview-info .preview-info-main .info .label {width: 70px;height: 30px;float: left;display: block;font-size: 14px;line-height: 30px;text-align: right;color: #999;}
-    .preview-info .preview-info-main .info p {float: left;height: 100%;padding-left: 20px;}
-    .preview-info-title{font-size: 16px;color: #22272e;padding-top: 15px}
+    .preview-info .preview-info-main .info {width: 100%;height: 8vw;float: left;margin-bottom: 1.3vw;line-height: 8vw;}
+    .preview-info .preview-info-main .info .label {width: 18.7vw;height: 8vw;float: left;display: block;font-size: 3.4vw;line-height: 8vw;text-align: right;color: #9aa5b5;}
+    .preview-info .preview-info-main .info p {float: left;height: 100%;padding-left: 5.3vw;color: #22272e;}
+    .preview-info-title{font-size: 3.6vw;color: #22272e;padding-top: 4vw;position: relative}
     .ercode{padding: 2.8vw;}
     .ercode img{width: 100%;height: 100%;}
     .main{margin-top: 5vw;padding: 2.8vw;background: #fff}
@@ -101,10 +101,10 @@
     .Disclaimer P{line-height: 6.4vw;}
     .contentHtml div{margin-top: 2.7vw;}
     .contentHtml img{width: 100%;}
-    .info-p.name{color: #22272e;font-size: 5.6vw;}
-    .infotag {font-size:  0.4vw;width: 11.6vw;height: 4.8vw;line-height:  4.8vw;text-align: center;display: inline-block;border-radius: .48vw;flex: auto;margin: 0 1.72vw}
-    .infotag.news {border: solid 1px #f94b4b;color: #f94b4b;background-color: #fadbdb}
-    .infotag.brand {border: solid 1px #f9a24b;color: #f9a24b;background-color: #faefdb;}
+    .info-p.name{color: #22272e;font-size: 4.2vw;}
+    .infotag {font-size:  3vw;padding:0 2.7vw;height: 4.8vw;line-height:  4.8vw;text-align: center;display: inline-block;border-radius: .48vw;flex: auto;margin: 0 1.72vw}
+    .infotag.news {border: solid .27vw #f94b4b;color: #f94b4b;background-color: #fadbdb}
+    .infotag.brand {border: solid .27vw #f9a24b;color: #f9a24b;background-color: #faefdb;}
     .infotag.sold {border: solid .27vw #9aa5b5;color: #9aa5b5;background-color: #e3ebf7;}
     .infotag.other {border: solid .27vw #1890f9;color: #1890f9;background-color: #e3ebf7;}
     .Disclaimer{background: #fef6f3;border-radius: 2.7vw;padding: 2.7vw;}
@@ -113,5 +113,12 @@
     .fave-text{color: #f94b4b;font-weight: bold;}
     .fave-text .big{font-size: 3.7vw;}
     .loginWithParam {color: #FC4444;font-size: 3.2vw;cursor: pointer;}
-
+    .yishou_img {width: 14%;position: absolute;top: 2vw;right: 0;transform: translate(-9%, 7%);z-index: 1;}
+    .recommendBox{margin-top:2vw;width:100%;background:#FFF}
+.recommendBox .hd{font-size:3.4vw;color:#E15621;font-weight:bold;padding:2.7vw;text-align:center}
+#productRecommend{width:100%;height:50vw;overflow:hidden;position:relative;box-sizing:border-box;padding:0 2.4vw}
+#productRecommend li{width:29.2vw!important;height:41.8vw;overflow:hidden;text-align:center;background:none}
+#productRecommend li .item{position:relative;zoom:1;vertical-align:middle;overflow:hidden;width:26.8vw;height:41.8vw;font-size:3.4vw}
+#productRecommend li .item img{display:block;width:100%;height:26.8vw}
+#productRecommend li .item span {color: #93979F;overflow: hidden;text-overflow: ellipsis;display: -webkit-box;-webkit-line-clamp: 2;-webkit-box-orient: vertical;margin-top: 2.6vw;}
 }

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

@@ -6,6 +6,7 @@ li{list-style:none;}
 /* 轮播 */
 #swiper-container{width:100%;height:510px;min-width:1184px;overflow:hidden;position:relative}
 #swiper-container .swiper-wrapper{position:relative;height:100%;z-index:0}
+#swiper-container .tempWrap{margin:0 auto;}
 #swiper-container .swiper-wrapper li{position:relative;zoom:1;vertical-align:middle;width:100%;overflow:hidden}
 #swiper-container .swiper-wrapper img{width:auto;height:510px;display:block;margin-left:50%;-o-transform:translateX(-50%);-ms-transform:translateX(-50%);-moz-transform:translateX(-50%);-webkit-transform:translateX(-50%);transform:translateX(-50%)}
 #swiper-container .swiper-button-prev,#swiper-container .swiper-button-next{position:absolute;top:50%;margin-top:-34px;display:block;width:44px;height:68px;line-height:68px;background:rgba(255,230,220,.2);color:#FFF;font-size:40px;text-align:center;border-radius:2px}

src/main/resources/static/css/product/detail.pc.css

@@ -17,13 +17,13 @@ li{list-style:none;}
 .productBox .zoomImage{display:none;overflow:hidden;position:absolute;right:-466px;top:0;width:452px;height:452px;border:1px solid #e4e4e4;z-index:9999;background:#FFF}
 .productBox .zoomImage img{width:950px;height:950px;margin-right:10px;display:block}
 
-.productBox .detailBox .crumbs{height:28px;line-height:28px;font-size:14px;overflow:hidden;color:#93979F;padding:0;}
-.productBox .detailBox .crumbs a{color:#93979F}
+.productBox .detailBox .crumbs{height:28px;line-height:28px;font-size:14px;overflow:hidden;color:#9aa5b5;padding:0;}
+.productBox .detailBox .crumbs a{color:#9aa5b5}
 .productBox .detailBox .crumbs a:hover{color:#E15616}
 .productBox .detailBox .title{font-size:18px;font-weight:bold;line-height:24px;padding:5px 0;color:#4A4F58}
 .productBox .detailBox .tags{padding:2px 0}
-.productBox .detailBox .tags span{display:inline-block;line-height:16px;padding: 3px 6px;font-size:12px;color: #999999;border-radius:2px;margin-right:10px;border: 1px solid #EDEDED;}
-.productBox .detailBox .detail{box-sizing:border-box;padding:14px 20px;font-size:14px;color:#93979f;background:#f3f7fe;border-radius:2px;margin:10px 0;position:relative;}
+.productBox .detailBox .tags span{display:inline-block;line-height:16px;padding: 3px 6px;font-size:12px;color: #9aa5b5;border-radius:2px;margin-right:10px;border: 1px solid #e2e7ef;}
+.productBox .detailBox .detail{box-sizing:border-box;padding:14px 20px;font-size:14px;color:#9aa5b5;background:#f3f7fe;border-radius:2px;margin:10px 0;position:relative;}
 .productBox .detailBox .detail hr{border:none;border-top:1px dashed #F9DDD0;margin:12px 0}
 .productBox .detailBox .row{padding:3px 0 3px 80px;line-height:24px;position:relative;}
 .productBox .detailBox .row .l{display:inline-block;min-width:60px;height:24px;text-align:justify;vertical-align:top;margin-left:-80px;}
@@ -68,17 +68,17 @@ li{list-style:none;}
 #productRecommend li .item a:hover img{border: solid 1px #e15616;}
 #productRecommend li .item img{display:block;width:153px;height:153px;border:solid 1px #e2e7ef;}
 #productRecommend li .item span{max-height:44px;padding-top:4px;overflow:hidden;text-overflow:ellipsis;display:-webkit-box;-webkit-line-clamp:2;-webkit-box-orient:vertical;}
-#productRecommend .swiper-wrapper{height:205px;overflow:hidden;background:url(/img/base/placeholder.png) repeat-x center;background-size:166px;}
+#productRecommend .swiper-wrapper{height:205px;overflow:hidden;background:url(/img/base/placeholder.png) repeat-x center;background-size:162px;}
 #productRecommend .swiper-pagination{width:100%;height:14px;z-index:1;text-align:center;font-size:0;}
 #productRecommend .swiper-pagination span{display:inline-block;width:14px;height:4px;border:5px solid transparent;cursor:pointer;opacity:.2;}
 #productRecommend .swiper-pagination span:before{content:"";display:inline-block;width:100%;height:4px;background:#E15616;border-radius:2px}
 #productRecommend .swiper-pagination span.on{width:28px;opacity:1;}
 
 .wrap>.productInfo{float:left;box-sizing:border-box;padding:0 16px;width:884px;background:#FFF;}
-.productInfo .tabTit{height:40px;line-height:40px;border-bottom:1px solid #E15621;font-size:16px;color:#333333}
+.productInfo .tabTit{height:40px;line-height:40px;border-bottom:1px solid #ffe6dc;font-size:16px;color:#333333}
 .productInfo .tabTit span{display:inline-block;box-sizing:border-box;min-width:130px;text-align:center;height:100%;padding:0 32px;cursor:pointer}
 .productInfo .tabTit span:hover{color:#E15621}
-.productInfo .tabTit span.on,.productInfo .tabTit span.on:hover{background:#E15621;color:#FFF}
+.productInfo .tabTit span.on,.productInfo .tabTit span.on:hover{background:#ffe6dc;color:#e15616;font-weight: bold;}
 .productInfo .tabCon{padding:16px 0;text-align:center}
 .productInfo .tabCon img{max-width:100%;}
 .productInfo .tabCon table{width:100%;text-align:left}
@@ -88,16 +88,16 @@ li{list-style:none;}
 .productInfo .comment{color:#93979F;padding:40px 0;margin-right: 30px; position: relative}
 
 .wrap>.rgt{float:right;width:284px}
-.wrap>.rgt .hd{height:40px;line-height:40px;padding:0 16px;font-size:18px;color:#fff;font-weight:bold;background:rgba(255,156,71,1)}
+.wrap>.rgt .hd{height:40px;line-height:40px;padding:0 16px;font-size:16px;color:#e15616;font-weight:bold;background:#ffe6dc}
 .shopBox{margin-bottom:16px;background:#FFF}
 .shopBox .bd{padding:15px}
 .shopBox .bd .name{line-height:20px;padding: 10px 0;font-weight:bold;color:#4A4F58;font-size:14px;border-bottom:1px solid #F7F7F7;position: relative}
 .shopBox .bd .tit{line-height:30px;font-weight:bold;color:#4A4F58;font-size:14px}
-.shopBox .bd .con{line-height:20px;color:#666;font-size:12px;margin-bottom:12px}
-.shopBox .bd .btn{display:block;width:100%;height:36px;line-height:36px;text-align:center;box-sizing:border-box;border-radius:2px;border:1px solid #E15616;font-size:14px;color:#fff;margin-top:12px;background: rgba(225,86,22,1)}
+.shopBox .bd .con{line-height:20px;color:#627386;font-size:12px;margin-bottom:12px}
+.shopBox .bd .btn{display:block;width:100%;height:36px;line-height:36px;text-align:center;box-sizing:border-box;border-radius:2px;font-size:14px;color:#e15616;margin-top:12px;background: #fef6f3}
 .wrap>.rgt .contact{background:#FFF}
-.wrap>.rgt .contact .bd{padding:15px;line-height:24px;font-size:12px;color:#4A4F58;margin-bottom: 12px}
-.wrap>.rgt .contact .bd div:nth-child(1){font-weight: bold;font-size: 14px;}
+.wrap>.rgt .contact .bd{padding:15px;line-height:24px;font-size:12px;color:#627386;margin-bottom: 12px}
+.wrap>.rgt .contact .bd div:nth-child(1){font-weight: bold;font-size: 14px;color: #4a4f58;}
 .wrap>.rgt .contact .bd div{margin-bottom: 12px}
 
 .row img{width:12px;height:12px;display:inline-block;margin:-3px 5px}

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

@@ -29,9 +29,9 @@
      .product p {font-size: 16px;font-weight: normal;font-stretch: normal;line-height: 21px;letter-spacing: 0px;color: #22272e;padding: 10px 22px;}
      .product ul {height: 50px;line-height: 80px;background-color: #ffffff;box-shadow: 0px 3px 6px 0px rgba(0, 0, 0, 0.07);padding: 15px;}
      .product li {display: inline-block;margin-right: 20px;width: 110px;text-align: center;color: #333333;position: relative;cursor: pointer;}
-     .icon.confirm:before {width: 34px;height: 35px;background-position:-159px -415px;position: absolute;right: 53px;}
-     .icon.other:before {background-position: -197px -415px;}
-    .icon.down:before{background-position: -234px -415px;}
+     .icon.confirm:before {width: 34px;height: 35px;background-position:-159px -414px;position: absolute;right: 53px;}
+     .icon.other:before {background-position: -197px -414px;}
+    .icon.down:before{background-position: -234px -414px;}
      .rank_top p {font-size: 16px;color: #22272e;display: inline-block;}
      .rank_top span {color: #627386;font-size: 16px;}
      .sales-ranke ul li {display: inline-block;width: 10%;}

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

@@ -50,7 +50,8 @@
     .defineBtn button{width: 90px;height: 36px;line-height: 36px;text-align: center;color: #fff;background-color: #e15616;border-radius: 2px;border: solid 1px #e15616;cursor: pointer;margin-right: 15px}
     .defineBtn{overflow: hidden;padding: 20px;}
     .defineBtn>div{float: right;}
-    .icon.companyBtn:before{width: 20px;height: 25px;background-position: -238px -249px}
+    .icon.add-company:before{width: 20px;height: 25px;background-position: -307px -511px}
+     .icon.sub-company:before{width: 20px;height: 25px;background-position: -337px -511px}
 }
 
 /*移动*/

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

@@ -50,10 +50,10 @@ div{box-sizing: border-box;}
 .release-from .release-input.upload{height: 78px;}
 .release-from .release-input.upload.image{height: auto;width: 500px;}
 .release-from .release-input.Editor{width: 600px;min-height: 540px;margin: 0;}
-.release-from  .upload-file{width: 76px;height: 76px;border: 1px solid #EBEBEB;border-radius: 2px;position: relative;float: left;margin-right: 10px;margin-bottom: 10px;cursor: pointer;}
-.release-from  .upload-file .icon-del{width: 16px;height: 16px;display: block;background: url("/img/base/icon.png") no-repeat;background-position: -175px -300px;position: absolute;right: -8px;top: -8px;cursor: pointer;}
-.release-from  .upload-file .icon-add{display: block;width:26px ;height: 26px;background: url("/img/base/icon.png") no-repeat;background-position: -168px -374px;position: absolute;top: 0;left: 0;right: 0;bottom: 0;margin: auto;}
-.release-from  .upload-file .input-file{width: 76px;height: 76px;opacity:0;cursor: pointer;}
+.release-from  .upload-file{width: 90px;height: 90px;border-radius: 2px;position: relative;float: left;margin-right: 10px;margin-bottom: 10px;cursor: pointer;}
+.release-from  .upload-file .icon-del:before{width: 16px;height: 16px;cursor: pointer;    background-position: -117px -140px;position: absolute;top: 0;right: 0}
+.release-from  .upload-file .icon-add{width:100% ;height: 100%;background: url("/img/account/icon-addimg.svg");display: block}
+.release-from  .upload-file .input-file{width: 90px;height: 90px;opacity: 0;cursor: pointer;position: absolute;top: 0}
 .release-from  .upload-file .upload-img{width: 100%;height: 100%;display: block;border-radius: 2px;}
 .release-from .release-input .input.tags{width: 390px;}
 .release-from .release-input .add-btn{width: 90px;height: 34px;border-radius: 2px;border: 1px solid #e15616;background:#ffe6dc;float: left;margin-left: 15px;text-align: center;line-height: 34px;font-size: 14px;color:#e15616 ;cursor: pointer;}
@@ -67,7 +67,7 @@ div{box-sizing: border-box;}
 .release-from .select-main{padding: 0 10px;cursor: pointer;width: 155px;height: 36px;border: 1px solid #b8bfca;border-radius: 2px;line-height: 32px;color: #333;font-size: 14px;margin-right: 15px;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: #9aa5b5;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: 135px;height: 36px;line-height: 36px;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;}

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

@@ -46,7 +46,7 @@ li{list-style:none}
     .user-content .section .user-main .tabs-left .item a .icon.icon-2:before{width: 24px;height: 24px;background-position: -35px -516px;}
     .user-content .section .user-main .tabs-left .item a .icon.icon-3:before{width: 24px;height: 24px;background-position: -69px -516px;}
     .user-content .section .user-main .tabs-left .item a .icon.icon-4:before{width: 24px;height: 24px;background-position: -102px -516px;}
-    .user-content .section .user-main .tabs-left .item a .icon.icon-5:before{width: 24px;height: 24px;background-position: -136px -516px;}
+    .user-content .section .user-main .tabs-left .item a .icon.icon-5:before{width: 24px;height: 24px;background-position: -136px -515px;}
     .user-content .section .user-main .tabs-left .item a .p{display:block;font-size: 14px;color: #22272e;text-align: center;line-height: 20px;margin-top: 3px;}
     .user-content .section .user-main .tabs-right{float: right;line-height: 60px;font-size: 14px;color: #22272e;}
     .user-content .section .user-main .tabs-right a{display: block;float: right;padding-right: 16px;position: relative}
@@ -104,7 +104,8 @@ li{list-style:none}
     .user-header .message{position:absolute;right:0;top:5vw}
     .user-header .message .mIcon{position:absolute;right:0;top:0}
     .user-header .message .mIcon:before{width:8vw;height:8vw;background-position:-16.5vw -60.3vw}
-    .user-header .message .ellipse{padding:.6vw;border-radius:3.1vw;font-size:3.1vw;background-color:#f55c5c;color:#FFF;font-style:normal;position:absolute;right:4vw;top:-1vw;transform:scale(.7)}
+    .user-header .message .ellipse,.user-header .message .circular{padding:.6vw;border-radius:3.1vw;font-size:3.1vw;background-color:#f55c5c;color:#FFF;font-style:normal;position:absolute;right:4vw;top:-1vw;transform:scale(.7)}
+    .user-header .message .circular{padding:0 1vw;}
     .user-content{width:100%;margin:0 auto 2.4vw auto;background:#FFF}
     .user-content .user-main .tabs-left{box-sizing:border-box;width:100vw;padding:.7vw 6vw 4vw 6vw}
     .user-content .user-main .tabs-left .item{width:20.8vw;height:8.4vw;line-height:8.4vw;text-align:center;border-radius:4.2vw;border:1px solid #b8bfca;font-size:3.3vw;color:#627386;margin:3.3vw 4vw 0 4vw;position:relative}

src/main/resources/static/img/account/icon-addimg.svg

@@ -0,0 +1,13 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="90" height="90" viewBox="0 0 90 90">
+  <g id="组_5796" data-name="组 5796" transform="translate(-819 -341)">
+    <g id="矩形_4466" data-name="矩形 4466" transform="translate(819 341)" fill="none" stroke="#b8bfca" stroke-width="1">
+      <rect width="90" height="90" rx="2" stroke="none"/>
+      <rect x="0.5" y="0.5" width="89" height="89" rx="1.5" fill="none"/>
+    </g>
+    <text id="添加图片" transform="translate(840 405.04)" fill="#9aa5b5" font-size="12" font-family="PingFangSC-Regular, PingFangSC"><tspan x="0" y="0">添加图片</tspan></text>
+    <g id="组_5763" data-name="组 5763" transform="translate(5 6)">
+      <rect id="矩形_5635" data-name="矩形 5635" width="3" height="21" rx="1.5" transform="translate(858 357)" fill="#b8bfca"/>
+      <rect id="矩形_5636" data-name="矩形 5636" width="3" height="21" rx="1.5" transform="translate(870 366) rotate(90)" fill="#b8bfca"/>
+    </g>
+  </g>
+</svg>

src/main/resources/static/js/account/login.js

@@ -121,18 +121,6 @@ var loginPage = new Vue({
                 });
             }
         },
-        /*weChatAutoLogin: function(){
-            if (this.isWeChat && Number(getBaseCookie("weChatAutoLogin"))!==1) {
-                // 微信浏览器自动授权登录
-                var urlForWeChat = 'https://www.caimei365.com/we_chat/redirect_uri.html';
-                $.get(spiServer+'/user/authorizationLink?redirectUri='+urlForWeChat, function(r){
-                    if(r.code===0 && r.data){
-                        setBaseCookie("weChatAutoLogin", 1);
-                        window.location.href = r.data;
-                    }
-                });
-            }
-        },*/
         toNormalLogin: function(){
             this.qrCodeLogin = false;
         },

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

@@ -12,15 +12,16 @@ if(localStorage.getItem('userInfo')){
     GLOBAL_USER_IDENTITY = globalUserData.userIdentity*1;
     GLOBAL_SHOP_ID = globalUserData.shopId*1;
 } else {
-    if(Number(getBaseCookie("weChatAutoLogin"))!==1){
+    var weChatLoginFlag = (Number(getBaseCookie("weChatAutoLogin"))===1 || Number(getBaseCookie("weChatAutoLogin"))===2);
+    if(!weChatLoginFlag){
         var userAgent = navigator.userAgent.toLowerCase();
         if (userAgent.match(/MicroMessenger/i)) {
             // 微信浏览器自动授权登录
             var urlForWeChat = 'https://www.caimei365.com/we_chat/redirect_uri.html';
             $.get(spiServer+'/user/authorizationLink?mode=1&redirectUri='+urlForWeChat, function(r){
                 if(r.code===0 && r.data){
-                    setBaseCookie("loginBeforePath", window.location.href);
                     setBaseCookie("weChatAutoLogin", 1);
+                    setBeforeUrl();
                     window.location.href = r.data;
                 }
             });
@@ -197,7 +198,7 @@ $(function(){
                     text: btnTxt,
                     btnClass: 'btn-confirm-login',
                     action: function(){
-                        setBaseCookie("loginBeforePath", window.location.href);
+                        setBeforeUrl();
                         window.location.href = '/login.html';
                     }
                 },
@@ -211,7 +212,7 @@ $(function(){
     // 去登录弹窗
     $('body').on("click", '.toLogin',function () {
         //loginAert('<span>你还未登录</span><span>请登录后再进行购买</span>', '去登录');
-        setBaseCookie("loginBeforePath", window.location.href);
+        setBeforeUrl();
         window.location.href = '/login.html';
     });
     // 退出登录
@@ -325,6 +326,24 @@ $(function(){
     });
 
 });
+/*function uuid() {
+    var s = [];
+    var hexDigits = "0123456789abcdef";
+    for (var i = 0; i < 36; i++) {
+        s[i] = hexDigits.substr(Math.floor(Math.random() * 0x10), 1);
+    }
+    s[14] = "4";  // bits 12-15 of the time_hi_and_version field to 0010
+    s[19] = hexDigits.substr((s[19] & 0x3) | 0x8, 1);  // bits 6-7 of the clock_seq_hi_and_reserved to 01
+    s[8] = s[13] = s[18] = s[23] = "-";
+    return s.join("");
+}*/
+function setBeforeUrl(){
+    var baseUrl = window.location.href;
+    var flag = baseUrl.indexOf('/login.html')>0 || baseUrl.indexOf('/register.html')>0 || baseUrl.indexOf('/we_chat/redirect_uri.html')>0;
+    if(!flag){
+        setBaseCookie("loginBeforePath", baseUrl);
+    }
+}
 // 公共方法
 function setBaseCookie(cname,cvalue,exdays){
     if (exdays) {
@@ -563,7 +582,6 @@ function setProductPrice(productList, productIds, userId, callback){
                     }
                 });
             });
-            console.log(productList)
         }
         return callback();
     }).fail(function(){
@@ -580,7 +598,7 @@ function toBeforePath(){
     window.location.href = '/index.html';
 }
 function toLogin() {//去登录
-    setBaseCookie("loginBeforePath", window.location.href);
+    setBeforeUrl();
     window.location.href = '/login.html';
 }
 function  upgrade () { //升级会员

src/main/resources/static/js/flea-market/secondDetail.js

@@ -124,29 +124,56 @@ var fleaMarket = new Vue({
         this.id = $("#productId").val();
     },
     mounted: function () {
-     var _this = this;
-        _this.InfoData();
-         SecondApi.ProductRecommend({productId:_this.id},function (res) {
+     var _self = this;
+        _self.InfoData();
+         SecondApi.ProductRecommend({productId:_self.id},function (res) {
             if(res.code==0){
               console.log(res)
                if(res.data.length > 0){
-                       _this.recommdeImage = res.data;
-                       _this.recommde =true;
+                       _self.recommdeImage = res.data;
+                       _self.recommde =true;
                     }else {
-                       _this.recommde =false;
+                       _self.recommde =false;
                     }
                     if(res.data.length<7){
                         var length = 7-res.data.length;
-                        _this.recommdeindex = length;
+                        _self.recommdeindex = length;
                     }else {
                         var remainderres=res.data.length%7;
-                         _this.recommdeindex= 7-remainderres;
-                        console.log(_this.recommdeindex)
+                         _self.recommdeindex= 7-remainderres;
+                        console.log(_self.recommdeindex)
                     }
+                    self.recommendPage = isPC ? Math.ceil(res.data.length / 7) : Math.ceil(res.data.length / 3);
+                        setTimeout(function(){
+                            if (isPC) {
+                                $('#productRecommend').slide({
+                                    mainCell:".swiper-wrapper"
+                                    ,titCell:".swiper-pagination span"
+                                    ,effect: "leftLoop"
+                                    ,interTime: 3000
+                                    ,autoPlay: true
+                                    ,scroll:7
+                                    ,vis:7
+                                    ,trigger: "mouseover"
+                                });
+                            } else {
+                                var swiper = new Swiper('#productRecommend', {
+                                    slidesPerView: 3,
+                                    spaceBetween: 0,
+                                    autoplay: {
+                                        delay: 3000,
+                                        disableOnInteraction: false
+                                    },
+                                    pagination: {
+                                        el: '.swiper-pagination'
+                                    }
+                                });
+                            }
+                        },500);
 
             }
         });
-        SecondApi.ProductCount({productId: _this.id},function (res) {
+        SecondApi.ProductCount({productId: _self.id},function (res) {
             if(res.code==0){
                 console.log(res)
             }else {
@@ -154,30 +181,30 @@ var fleaMarket = new Vue({
             }
         });
         //相關推薦輪播
-        var mySwiper = new Swiper('#productRecommend',{
-                slidesPerView: 7,
-                spaceBetween: 12,
-                slidesPerGroup: 7,
-                autoplay: {
-                    delay:10000,
-                    disableOnInteraction: false,//是否禁止autoplay。默认为true：停止。
-                },
-                loop: false,
-                observer: true, //修改swiper自己或子元素时，自动初始化swiper
-                observeParents: true, //修改swiper的父元素时，自动初始化swiper
-                pagination: {
-                    el: '.swiper-pagination',
-                    clickable: true,
-                },
-                on:{
-                    init:function() {
-                        var length = this.slides.length;
-                        if(length < 8) {
-                            this.autoplay.stop();
-                        }
-                    }
-                }
-       })
+       //  var mySwiper = new Swiper('#productRecommend',{
+       //          slidesPerView: 7,
+       //          spaceBetween: 12,
+       //          slidesPerGroup: 7,
+       //          autoplay: {
+       //              delay:10000,
+       //              disableOnInteraction: false,//是否禁止autoplay。默认为true：停止。
+       //          },
+       //          loop: false,
+       //          observer: true, //修改swiper自己或子元素时，自动初始化swiper
+       //          observeParents: true, //修改swiper的父元素时，自动初始化swiper
+       //          pagination: {
+       //              el: '.swiper-pagination',
+       //              clickable: true,
+       //          },
+       //          on:{
+       //              init:function() {
+       //                  var length = this.slides.length;
+       //                  if(length < 8) {
+       //                      this.autoplay.stop();
+       //                  }
+       //              }
+       //          }
+       // })
 
     }
 

src/main/resources/static/js/index.js

@@ -8,7 +8,7 @@ var homeData = new Vue({
         pageFloors: [],
         advertising: [],
         asideNav: [],
-        productIdArr:[],
+        productIdArr:[]
     },
     methods: {
         getBanners: function(){
@@ -16,40 +16,43 @@ var homeData = new Vue({
             $.getJSON("/home/banner").done(function (r) {
                 if (r.code === 0 && r.data) {
                     _self.images = r.data;
-                    setTimeout(function(){
-                        if (isPC) {
-                            $('#swiper-container').slide({
-                                mainCell:".swiper-wrapper"
-                                ,titCell:".swiper-pagination span"
-                                ,effect: "leftLoop"
-                                ,prevCell:".swiper-button-prev"
-		                        ,nextCell:".swiper-button-next"
-                                ,interTime: 2000
-                                ,autoPlay: true
-                                ,autoPage: false
-                                ,trigger: "mouseover"
-                            });
-                        } else {
-                            var swiper = new Swiper('#swiper-container', {
-                                loop : true,
-                                autoplay: {
-                                    delay: 2000,
-                                    disableOnInteraction: false
-                                },
-                                navigation: {
-                                    nextEl: '.swiper-button-next',
-                                    prevEl: '.swiper-button-prev'
-                                },
-                                pagination: {
-                                    el: '.swiper-pagination',
-                                    clickable :true
-                                }
-                            });
-                        }
-                    },500);
+                    _self.swiperNanner();
                 }
             });
         },
+        swiperNanner: function(){
+            setTimeout(function(){
+                if (isPC) {
+                    $('#swiper-container').slide({
+                        mainCell:".swiper-wrapper"
+                        ,titCell:".swiper-pagination span"
+                        ,effect: "leftLoop"
+                        ,prevCell:".swiper-button-prev"
+                        ,nextCell:".swiper-button-next"
+                        ,interTime: 2000
+                        ,autoPlay: true
+                        ,autoPage: false
+                        ,trigger: "mouseover"
+                    });
+                } else {
+                    var swiper = new Swiper('#swiper-container', {
+                        loop : true,
+                        autoplay: {
+                            delay: 2000,
+                            disableOnInteraction: false
+                        },
+                        navigation: {
+                            nextEl: '.swiper-button-next',
+                            prevEl: '.swiper-button-prev'
+                        },
+                        pagination: {
+                            el: '.swiper-pagination',
+                            clickable :true
+                        }
+                    });
+                }
+            },500);
+        },
         getRecommends: function(){
             var _self = this;
             $.getJSON("/home/recommend").done(function (r) {
@@ -85,19 +88,16 @@ var homeData = new Vue({
                         }
                     },500);
                     // 获取价格
-                    // if(_self.userId && _self.userId>0){
-                        var productIdArr = [];
-                        _self.recommends.map(function (item) {
-                            // 0公开价格 1不公开价格 2仅对会员机构公开
-                            if (item.priceFlag !== 1) {
-                                productIdArr.push(item.id)
-                            }
-                        });
-                        setProductPrice(_self.recommends, productIdArr.join(","), _self.userId, function () {
-                            _self.$forceUpdate();
-                        });
-                        console.log(_self.recommends)
-                    // }
+                    var productIdArr = [];
+                    _self.recommends.map(function (item) {
+                        // 0公开价格 1不公开价格 2仅对会员机构公开
+                        if (item.priceFlag !== 1) {
+                            productIdArr.push(item.id)
+                        }
+                    });
+                    setProductPrice(_self.recommends, productIdArr.join(","), _self.userId, function () {
+                        _self.$forceUpdate();
+                    });
                 }
             });
         },

src/main/resources/static/js/product/detail.js

@@ -152,7 +152,7 @@ var productDetail = new Vue({
             }
         },
         toLogin: function() {
-            setBaseCookie("loginBeforePath", window.location.href);
+            setBeforeUrl();
             window.location.href = '/login.html';
         },
 		addShopCart: function(){ //加入购物车

src/main/resources/static/js/supplier/index.js

@@ -31,11 +31,7 @@ var supplierHome = new Vue({
             var _self = this;
             $.getJSON(spiServer + "/supplier/home/images",{supplierId: this.params.id}).done(function (r) {
                 if (r.code === 0 && r.data) {
-                if (r.data!=''||r.data.length>0){
-                     _self.supplierBanner = r.data;
-                }else {
-                     _self.supplierBanner.push('/img/supplier/banner.jpg');
-                }
+                   _self.supplierBanner = r.data;
                     _self.supplierBanner = r.data;
                     setTimeout(function(){
                         if (isPC) {

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

@@ -38,7 +38,9 @@
                     <a v-if="isPC" class="btn" href="/register.html">免费注册</a>
                     <button class="btn" type="button" @click="loginSubmit()">登录</button>
                     <a v-if="!isPC" class="btn" href="/register.html">免费注册</a>
-                    <a v-if="!isPC" class="weChat" @click="weChatLogin()" href="javascript:void(0);"><img src="/img/base/wechat_login.png" alt="微信公众号授权登录"></a>
+                    <a v-if="!isPC && isWeChat" class="weChat" @click="weChatLogin()" href="javascript:void(0);">
+                        <span>微信授权登录</span><i class="mIcon"></i>
+                    </a>
                 </div>
                 <a v-if="isPC" href="javascript:void(0);" class="codeBtn icon" @click="toQrCodeLogin()"></a>
             </form>

src/main/resources/templates/flea-market/detail.html

@@ -47,7 +47,7 @@
                 <div class="preview-info-title">
                     <span class="hoverBrand"  >
                     <p class="info-p brandName" v-show="bnameShow" style="color: #999999">品牌：{{detail.brandName}}</p>
-                    <span class="Brand" style="padding: 15px" v-on:mouseover="changeActive($event)" v-on:mouseout="removeActive($event)" v-show="Showlogo"><img src="/img/flea-market/logo.png"/> </span>
+                    <span class="Brand" v-if="isPC" style="padding: 15px" v-on:mouseover="changeActive($event)" v-on:mouseout="removeActive($event)" v-show="Showlogo"><img src="/img/flea-market/logo.png"/> </span>
                     </span>
                      <p class="info-p name">{{detail.name}}</p>
                     <div class="brandMain" v-on:mouseover="changeActive($event)" v-on:mouseout="removeActive($event)" v-show="isShow" v-if="detail.brandInfo!=null||detail.brandInfo !=''"><div class="zheng-graphics"></div>{{detail.brandInfo}}</div>
@@ -120,14 +120,14 @@
             </div>
         </div>
             <!--  相关推荐 -->
-     <div class="recommendBox" v-if="recommde">
+    <div class="recommendBox" v-if="recommde">
             <div class="hd">相关推荐</div>
             <div id="productRecommend" class="swiper-container">
                 <ul class="swiper-wrapper" v-cloak>
-                    <li class="swiper-slide" v-for="p in recommdeImage">
+                    <li class="swiper-slide mfc" v-for="p in recommdeImage">
                         <div class="item">
-                            <a class="image" :href="'/product-'+p.id+'.html'" target="_blank">
-                                <img :src="p.image" :alt="p.name">
+                            <a class="image" :href="'/product-'+p.productID+'.html'" target="_blank">
+                                <img :src="p.mainImage" :alt="p.name">
                                 <span v-html="p.name"></span>
                             </a>
                         </div>
@@ -137,13 +137,12 @@
                             <a href="javascript:0" class="image">
                                 <img src="/img/base/placeholder.png" alt="">
                             </a>
-                     </div>
-                </li>
+                       </div>
+                    </li>
                 </ul>
-<!--                <div v-show="recommendPage>1" class="swiper-pagination mfc"><span v-if="isPC" v-for="i in recommendPage"></span></div>-->
+                <div class="swiper-pagination mfc"><span v-if="isPC" v-for="i in recommendPage"></span></div>
             </div>
         </div>
-
      <div class="main">
         <div class="title">商品详情</div>
         <div class="mainContent">

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

@@ -75,15 +75,15 @@
                                 <option value="0">请选择</option>
                                     <option :key="kdIndex" :name='kd.label' :value="kd.value" v-for="(kd,kdIndex) in kdlist">{{kd.label}}</option>
                                 </select>
-                                <button @click="addBtn()" class="add-company companyBtn"v-if="index==0">+</button>
-                                <button @click="subBtn(item)" class="add-company companyBtn" v-else>-</button>
+                                <button @click="addBtn()" class="add-company companyBtn"v-if="index==0"></button>
+                                <button @click="subBtn(item)" class="sub-company companyBtn icon" v-else>-</button>
                             </div>
                             <div class="logist-right">
                                 <div :key="numIndex" v-for="(num,numIndex) in item.numList">
                                     <i class="red">*</i>
                                     物流编号：
                                     <input class="logistics-order-number company" oninput="value=value.replace(/[^\d]/g,'')" placeholder="请输入物流编号" type="text" v-model="num.number">
-                                    <button @click="addNum(item,numIndex)" class="add-number companyBtn" v-if="numIndex==0">+</button>
+                                    <button @click="addNum(item,numIndex)" class="add-number companyBtn" v-if="numIndex==0"></button>
                                     <button @click="reduceBtn(item)" class="add-number companyBtn" v-else>-</button>
                                 </div>
                             </div>

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

@@ -78,7 +78,7 @@
                                     </option>
                                 </select>
                                 <button class="add-company companyBtn icon" @click="addBtn()" v-if="index==0"></button>
-                                <button class="add-company companyBtn" @click="subBtn(item)" v-else>-</button>
+                                <button class="sub-company companyBtn icon" @click="subBtn(item)" v-else></button>
                             </div>
                             <div class="logist-right">
                                 <div v-for="(num,numIndex) in item.numList" :key="numIndex">
@@ -86,10 +86,10 @@
                                     物流编号：
                                     <input type="text" v-model="num.number" class="logistics-order-number company"
                                            oninput="value=value.replace(/[^\d]/g,'')" placeholder="请输入物流编号">
-                                    <button class="add-number companyBtn icon" @click="addNum(item,numIndex)"
+                                    <button class="add-company companyBtn icon" @click="addNum(item,numIndex)"
                                             v-if="numIndex==0">
                                     </button>
-                                    <button class="add-number companyBtn" v-else @click="reduceBtn(item)">-</button>
+                                    <button class="sub-company companyBtn icon" v-else @click="reduceBtn(item)"></button>
                                 </div>
                             </div>
                         </div>

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

@@ -378,7 +378,7 @@
                                          @dragend="dragend(item)"
                                     >
                                         <img :data-original='item' :src="item" :id="'uploadGoodsImages'+ index" :data-image="item" alt="" class="upload-img" @click="showViewerImageFn(index)">
-                                        <i class="icon-del mIcon" @click="removeGoodsImagesFn(index)"></i>
+                                        <i class="icon-del mIcon icon" @click="removeGoodsImagesFn(index)"></i>
                                     </div>
                                     <div class="upload-file" v-show="GoodsImagesList.length<5">
                                         <i class="icon-add mIcon"></i>
@@ -389,9 +389,11 @@
                                 <div class="release-tips" v-show="vShow_GoodsImages">{{fromMessage}}</div>
                             </div>
                             <div class="release-from text imgText" style="margin-bottom: 10px;">
-                                <P class="text" style="line-height: 24px;">最多上传<span class="em">5张</span>图片，可拖动图片改变位置,第一张默认为产品主图；</P>
-                                <P class="text" style="line-height: 24px;">仅支持<span class="em">JPG、GIF、JPEG</span>和<span class="em">BMP</span>格式，建议图片<span class="em">分辨率在750*750以上，</span></P>
-                                <P class="text" style="line-height: 24px;"><span class="em">每张图小于5M</span>；图片请避免全文字，否则有可能审核不通过</P>
+                                <P class="text" style="line-height: 24px;">最多上传<span class="em">5张</span>图片，可拖动图片改变位置,第一张默认为产品主图；仅支持
+                                <span class="em">JPG、GIF、JPEG</span>和<span class="em">BMP</span>格式，建议图片<span class="em">分辨率在750*750以上，</span>
+                                <span class="em">每张图小于5M</span>；图片请避免全文字，否则有可能审核不通过</P>
+<!--                                <P class="text" style="line-height: 24px;">仅支持<span class="em">JPG、GIF、JPEG</span>和<span class="em">BMP</span>格式，建议图片<span class="em">分辨率在750*750以上，</span></P>-->
+<!--                                <P class="text" style="line-height: 24px;"><span class="em">每张图小于5M</span>；图片请避免全文字，否则有可能审核不通过</P>-->
                             </div>
                             <div class="release-from clear" style="margin-top: 30px;">
                                 <div class="release-label"><span class="star">*</span>商品详情:</div>

src/main/resources/templates/supplier/index.html

@@ -16,9 +16,16 @@
         <!--首页图片轮播-->
         <div id="supplierBanner" class="swiper-container">
             <ul class="swiper-wrapper">
+            <template v-if="supplierBanner.length>0">
                 <li class="swiper-slide mfc" v-for="imgUrl in supplierBanner">
                     <img :src="imgUrl">
                 </li>
+            </template>
+            <template v-else>
+                 <li class="swiper-slide mfc">
+                    <img src="/img/supplier/banner.jpg">
+                </li>
+            </template>
             </ul>
             <div class="swiper-pagination mfc"><span v-if="isPC" v-for="i in supplierBanner.length"></span></div>
             <a class="swiper-button-prev" href="javascript:void(0)"></a>
@@ -157,31 +164,34 @@
                     <p><span class="l">满意度</span>：<span><i v-for="i in 5" class="icon mIcon heart"></i></span></p>
                     <p th:if="not${#strings.isEmpty(supplier.businessScopeArr)}"><span class="l">经营范围</span>：<span><em class="tag" th:each="bus: ${supplier.businessScopeArr}" th:text="${bus}"></em></span></p>
                 </div>
-                <div class="part" th:if="not${#strings.isEmpty(supplier.info)}">
+                <div class="part" >
                     <div class="title">公司介绍</div>
-                    <div class="cont" th:utext="${supplier.info}"></div>
+                    <div class="cont" th:utext="${supplier.info}" th:if="not${#strings.isEmpty(supplier.info)}"></div>
+                    <div class="cont" th:if="${#strings.isEmpty(supplier.info)}">暂无</div>
                 </div>
-                <div class="part" th:if="not${#strings.isEmpty(supplier.productDesc)}">
+                <div class="part">
                     <div class="title">主打系列产品说明</div>
-                    <div class="cont" th:utext="${supplier.productDesc}"></div>
+                    <div class="cont" th:utext="${supplier.productDesc}" th:if="not${#strings.isEmpty(supplier.productDesc)}"></div>
+                    <div class="cont" th:if="${#strings.isEmpty(supplier.productDesc)}">暂无</div>
                 </div>
                 <div class="part">
                     <div class="title">营业执照</div>
                     <div class="photo">
-                        <a th:href="${supplier.businessLicense}" target="_blank">
+                        <a th:href="${supplier.businessLicense}" target="_blank" >
                             <img th:src="${supplier.businessLicense}">
                         </a>
                     </div>
                 </div>
-                <div class="part" th:if="not${#strings.isEmpty(supplier.taxCertificate)}">
+                <div class="part" >
                     <div class="title">公司资质</div>
                     <div class="photo">
-                        <a th:href="${supplier.taxCertificate}" target="_blank">
+                        <a th:href="${supplier.taxCertificate}" target="_blank" th:if="not${#strings.isEmpty(supplier.taxCertificate)}">
                             <img th:src="${supplier.taxCertificate}">
                         </a>
+                         <div th:if="${#strings.isEmpty(supplier.taxCertificate)}">暂无</div>
                     </div>
                 </div>
-                <div class="part" th:if="not${#strings.isEmpty(supplier.license)}">
+                <div class="part" >
                     <div class="title">授权牌照</div>
                     <div class="photo">
                         <a th:href="${supplier.license}" target="_blank">

src/main/resources/templates/supplier/list.html

@@ -37,7 +37,9 @@
                 </h5>
                 <p>满意度：<span><i v-for="i in 5" class="icon mIcon heart"></i></span></p>
                 <p>所在地区：<span v-text="shop.address"></span></p>
-                <p>经营范围：<span v-if="shop.businessScope"><em v-for="scop in shop.businessScope.split('/')" class="tag" v-text="scop"></em></span></p>
+                <p>经营范围：
+                <span v-if="shop.businessScope!=''"><em v-for="scop in shop.businessScope.split('/')" class="tag" v-text="scop"></em></span>
+                <span v-else>暂无</span></p>
             </div>
             <div class="right">
                 <ul class="products clear mfc">

src/main/resources/templates/we_chat/redirect_uri.html

@@ -14,10 +14,11 @@
     var wx_mode = Number(getBaseCookie("weChatAutoLogin"))===1 ? 1 : 2;
     var wx_code = getUrlParam('code');
     var wx_state = getUrlParam('state');
+    var userData = '';
     $.get(spiServer+'/user/authorizationLogin?code='+wx_code+'&state='+wx_state+'&mode='+wx_mode, function(r){
         if(r.code===0){
             console.log(r.data);
-            var userData = {
+            userData = {
                 account: r.data.account,
                 email: r.data.email,
                 phone: r.data.bindMobile,
@@ -32,26 +33,28 @@
                 token: r.data.token
             };
             localStorage.setItem('userInfo',JSON.stringify(userData));
-            toPage();
+            tobeforePage();
         }else{
             if (wx_mode===2 && r.code===-4){
                 //微信绑定页面
                 window.location.href = '/bind.html';
+            }else if (wx_mode===1) {
+                tobeforePage();
             }else{
                 CAIMEI.Alert(r.msg,'确定',true, function(){
-                    toPage();
+                    tobeforePage();
                 });
             }
         }
     });
-    function toPage(){
+    function tobeforePage(){
         var loginBeforePath = getBaseCookie("loginBeforePath");
         if (loginBeforePath && loginBeforePath!='undefined' && loginBeforePath.indexOf('.html')>0) {
             delBaseCookie("loginBeforePath");
             window.location.href = loginBeforePath;
-        } else if (userData.userIdentity*1 === 3) {
+        } else if (userData && userData.userIdentity*1 === 3) {
             location.href = '/supplier/dashboard.html';
-        } else if (userData.userIdentity*1 === 2 || userData.userIdentity*1 === 4) {
+        } else if (userData && (userData.userIdentity*1 === 2 || userData.userIdentity*1 === 4)) {
             location.href = '/user/dashboard.html';
         } else {
             location.href="/index.html";