Administrator hace 4 años
padre
commit
1d6c157a1c

+ 9 - 2
src/main/resources/static/css/flea-market/form.css

@@ -480,10 +480,9 @@ body{background: #fff}
          margin-top: -150px;
          margin-left: -243px;
          width: 400px;
-         /*padding: 15px 15px 0;*/
          background-color: #fff;
          border-radius: 2px;
-         height: 215px
+         height: 230px
      }
 
      .theresult p:nth-child(1) {
@@ -546,6 +545,14 @@ body{background: #fff}
          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
+     }
  }
 
 /*移动端*

+ 2 - 0
src/main/resources/static/css/flea-market/list.css

@@ -162,6 +162,7 @@
         text-overflow: ellipsis;
         white-space: nowrap;
         margin: 8px 0;
+        display: block;
     }
 
     .shijian {
@@ -388,6 +389,7 @@
         letter-spacing: 1px;
         font-size: 4vw;
         margin: 1.2vw 0;
+        display: block;
     }
     .shijian {
         font-size: 3.46vw;

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

@@ -1,657 +1,112 @@
 @media screen and (min-width:768px) {
-    .crumbs {
-        font-size: 16px;
-        color: #22272e
-    }
-    .userinfo {
-        padding: 5px 20px;
-        background: #fff;
-        box-shadow: 0px 3px 6px 0px rgba(0, 0, 0, 0.07);
-    }
-
-    .info {
-        height: 56px;
-        line-height: 56px;
-        border-bottom: solid 1px #e2e7ef;
-        font-size: 16px;
-        color: #22272e;
-        overflow: hidden
-    }
-
-    .comback {
-        width: 90px;
-        height: 36px;
-        background-color: #ffe6dc;
-        border-radius: 2px;
-        border: solid 1px #e15616;
-        float: right;
-        line-height: 36px;
-        margin-top: 10px;
-        cursor: pointer;
-        color: #e15616;
-    }
-
-    .userinfo .user p {
-        display: inline-block;
-        color: #627386;
-        margin: 15px 45px 15px 0px;
-    }
-
-    .userinfo .user p span {
-        color: #22272e;
-    }
-
-    .address {
-        margin-bottom: 15px;
-        color: #627386;
-    }
-
-    .address span {
-        color: #22272e;
-    }
-    .product-info {
-        margin-top: 20px;
-        box-shadow: 0px 3px 6px 0px
-		rgba(0, 0, 0, 0.07);
-    }
-
-    .price {
-        overflow: hidden;
-    }
-
-    .protitle {
-        color: #22272e;
-        font-size: 16px;
-        padding: 15px;
-    }
-    .product {
-        background: #fff;
-        padding: 10px 20px;
-        box-shadow: 0px 3px 6px 0px rgba(0, 0, 0, 0.07);
-    }
-
-    .product-title {
-        border-bottom: solid 1px #e2e7ef;
-        height: 54px;
-        line-height: 54px
-    }
-
-    .product-title li {
-        display: inline-block;
-        list-style: none;
-        color: #627386;
-        width: 11%;
-        text-align: center;
-
-    }
-
-    .product-title li:nth-child(1) {
-        width: 50%;
-        text-align: left
-    }
-     .pro-information li {
-        list-style: none;
-    }
-
-    .pro-information li {
-        width: 100%;
-        padding: 10px 0;
-    }
-
-    .pro-information li div {
-        display: inline-block;
-        width: 11%;
-        text-align: center;
-        color: #627386;
-    }
-
-    .pro-information li div.product-img {
-        width: 50%;
-        text-align: left;
-    }
-
-    .product-img img {
-        width: 70px;
-        height: 70px;
-        border: solid 1px #e2e7ef;
-    }
-
-    .product-img h3 {
-        display: inline-block;
-        width: 300px;
-        margin-left: 10px;
-        font-size: 16px;
-        color: #22272e;
-        vertical-align: middle;
-        word-break: break-all;
-        overflow: hidden;
-        text-overflow: ellipsis;
-        display: -webkit-inline-box;
-        -webkit-line-clamp: 2;
-        -webkit-box-orient: vertical
-    }
-    .add-logistics{
-       height: auto;
-        background-color: #ffffff;
-        box-shadow: 0px 3px 6px 0px
-            rgba(0, 0, 0, 0.07);
-        margin-top: 20px;
-        padding: 20px;
-        color: #627386;
-    }
-    .company-number{
-        display: flex;
-        width: 100%;
-    }
-    .logist-right>div{
-        margin-top: 5px;
-    }
-    .company-number>div{
-        width: 49%;
-        display: inline-block;
-        margin: 2px 0;
-        flex: 2;
-    }
-    .company{
-        width: 210px;
-        height: 36px;
-        background-color: #ffffff;
-        border-radius: 2px;
-        border: solid 1px #b8bfca;
-        color: #627386;
-        padding-left: 10px;
-        cursor: pointer;
-    }
-    input::placeholder,textarea::placeholder {
-        color: #627386;
-        font-size: 12px;
-    }
-    textarea::placeholder {
-        color: #9aa5b5;
-    }
-    .red{
-        color: #f94b4b;
-    }
-    .companyBtn{
-        width: 36px;
-        height: 36px;
-        background-color: #ffffff;
-        border-radius: 2px;
-        border: solid 1px #b8bfca;
-        margin-left: 8px;
-        cursor: pointer;
-        font-size: 18px
-    }
-    .icon.add:before {
-        width: 25px;
-        height: 25px;
-        background-position: -168px -374px;
-        position: absolute;
-        top: 17px;
-        right: 29px;
-    }
-    .add-text {
-        font-size: 12px;
-        color: #333330;
-        opacity: 0.5;
-        position: absolute;
-        top: 60%;
-        right: 13px;
-    }
-    .upload-file{
-        position: relative;
-        float: left;
-        margin: 10px 10px 10px 0px;
-        cursor: pointer;
-        width: 80px;
-        height: 80px;
-        border-radius: 2px;
-        border: solid 1px #b8bfca
-    }
-    .input-file{
-        width: 80px;
-        height: 80px;
-        opacity: 0;
-        cursor: pointer;
-        position: absolute
-    }
-    #uploadGoodsImages{
-        overflow: hidden;
-        float: left;
-        width: 90%
-    }
-    .release-from{
-        overflow: hidden;
-    }
-    .red-color{
-        float: left;
-        height: 80px;
-        line-height: 80px;
-        width: 85px;
-    }
-    .upload-file img{
-        width: 100%;
-        height: 100%;
-    }
-    .icon.del:before {
-        width: 20px;
-        height: 20px;
-        background-position: -116px -138px;
-        position: absolute;
-        top: -3px;
-        right: -3px;
-    }
-    .form-upload-tips .icon-wen:before {
-        width: 20px;
-        height: 20px;
-        background-position: -84px -144px;
-        cursor: pointer;
-    }
-    .form-upload-tips .icon-wen:before {
-        width: 20px;
-        height: 20px;
-        background-position: -84px -144px;
-        cursor: pointer;
-    }
-    .wen-tips {
-        width: 300px;
-        height: 47px;
-        background-color: #1890f9;
-        box-shadow: 0px 3px 6px 0px rgba(24, 144, 249, 0.17);
-        color: #fff;
-        position: absolute;
-        left: inherit;
-        font-size: 12px;
-        text-align: center;
-        line-height: 47px;
-        top: 33px;
-        display: none;
-    }
-    .form-upload-tips{
-        float: left;
-        position: relative;
-    }
-    .form-upload-tips .wen-tips:before {
-        content: '';
-        width: 0px;
-        height: 0px;
-        border-width: 8px;
-        border-style: solid;
-        border-color: transparent transparent #1890f9 transparent;
-        position: absolute;
-        top: -15px;
-        left:5px;
-     }
-      .form-upload-tips:hover .wen-tips {
-         display: block;
-     }
-     .remarks textarea{
-        width: 496px;
-        height: 114px;
-        background-color: #ffffff;
-        border-radius: 2px;
-        border: solid 1px #b8bfca;
-        resize: none;
-        padding: 10px;
-        color: #9aa5b5;
-     }
-     .remarks{
-        margin-top: 25px;
-        position: relative;
-     }
-     .remarks .rema{
-        height: 114px;
-        line-height: 114px;
-        display: inline-block;
-        float: left;
-        width: 85px;
-        text-align: center
-     }
-     .size-num {
-         position: absolute;
-         right: 350px;
-         top: 109px;
-         color: #9aa5b5
-     }
-     .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;
-     }
+    .crumbs {font-size: 16px;color: #22272e}
+    .userinfo {padding: 5px 20px;background: #fff;box-shadow: 0px 3px 6px 0px rgba(0, 0, 0, 0.07);}
+    .info {height: 56px;line-height: 56px;border-bottom: solid 1px #e2e7ef;font-size: 16px;color: #22272e;overflow: hidden}
+    .comback {width: 90px;height: 36px;background-color: #ffe6dc;border-radius: 2px;border: solid 1px #e15616;float: right;line-height: 36px;margin-top: 10px;cursor: pointer;color: #e15616;}
+    .userinfo .user p {display: inline-block;color: #627386;margin: 15px 45px 15px 0px;}
+    .userinfo .user p span {color: #22272e;}
+    .address {margin-bottom: 15px;color: #627386;}
+    .address span {color: #22272e;}
+    .product-info {margin-top: 20px;box-shadow: 0px 3px 6px 0px rgba(0, 0, 0, 0.07);}
+    .price {overflow: hidden;}
+    .protitle {color: #22272e;font-size: 16px;padding: 15px;}
+    .product {background: #fff;padding: 10px 20px;box-shadow: 0px 3px 6px 0px rgba(0, 0, 0, 0.07);}
+    .product-title {border-bottom: solid 1px #e2e7ef;height: 54px;line-height: 54px}
+    .product-title li {display: inline-block;list-style: none;color: #627386;width: 11%;text-align: center;}
+    .product-title li:nth-child(1) {width: 50%;text-align: left}
+    .pro-information li {list-style: none;}
+    .pro-information li {width: 100%;padding: 10px 0;}
+    .pro-information li div {display: inline-block;width: 11%;text-align: center;color: #627386;}
+    .pro-information li div.product-img {width: 50%;text-align: left;}
+    .product-img img {width: 70px;height: 70px;border: solid 1px #e2e7ef;}
+    .product-img h3 {display: inline-block;width: 300px;margin-left: 10px;font-size: 16px;color: #22272e;vertical-align: middle;word-break: break-all;overflow: hidden;text-overflow: ellipsis;display: -webkit-inline-box;-webkit-line-clamp: 2;-webkit-box-orient: vertical}
+    .add-logistics{height: auto;background-color: #ffffff;box-shadow: 0px 3px 6px 0px rgba(0, 0, 0, 0.07);margin-top: 20px;padding: 20px;color: #627386;}
+    .company-number{display: flex;width: 100%;}
+    .logist-right>div{margin-top: 5px;}
+    .company-number>div{width: 49%;display: inline-block;margin: 2px 0;flex: 2;}
+    .company{width: 210px;height: 36px;background-color: #ffffff;border-radius: 2px;border: solid 1px #b8bfca;color: #627386;padding-left: 10px;cursor: pointer;}
+    input::placeholder,textarea::placeholder {color: #627386;font-size: 12px;}
+    textarea::placeholder {color: #9aa5b5;}
+    .red{color: #f94b4b;}
+    .companyBtn{width: 36px;height: 36px;background-color: #ffffff;border-radius: 2px;border: solid 1px #b8bfca;margin-left: 8px;cursor: pointer;font-size: 18px}
+    .icon.add:before {width: 25px;height: 25px;background-position: -168px -374px;position: absolute;top: 17px;right: 29px;}
+    .add-text {font-size: 12px;color: #333330;opacity: 0.5;position: absolute;top: 60%;right: 13px;}
+    .upload-file{position: relative;float: left;margin: 10px 10px 10px 0px;cursor: pointer;width: 80px;height: 80px;border-radius: 2px;border: solid 1px #b8bfca}
+    .input-file{width: 80px;height: 80px;opacity: 0;cursor: pointer;position: absolute}
+    #uploadGoodsImages{overflow: hidden;float: left;width: 90%}
+    .release-from{overflow: hidden;}
+    .red-color{float: left;height: 80px;line-height: 80px;width: 85px;}
+    .upload-file img{width: 100%;height: 100%;}
+    .icon.del:before {width: 20px;height: 20px;background-position: -116px -138px;position: absolute;top: -3px;right: -3px;}
+    .form-upload-tips .icon-wen:before {width: 20px;height: 20px;background-position: -84px -144px;cursor: pointer;}
+    .form-upload-tips .icon-wen:before {width: 20px;height: 20px;background-position: -84px -144px;cursor: pointer;}
+    .wen-tips {width: 300px;height: 47px;background-color: #1890f9;box-shadow: 0px 3px 6px 0px rgba(24, 144, 249, 0.17);color: #fff;position: absolute;left: inherit;font-size: 12px;text-align: center;line-height: 47px;top: 33px;display: none;}
+    .form-upload-tips{float: left;position: relative;}
+    .form-upload-tips .wen-tips:before {content: '';width: 0px;height: 0px;border-width: 8px;border-style: solid;border-color: transparent transparent #1890f9 transparent;position: absolute;top: -15px;left:5px;}
+    .form-upload-tips:hover .wen-tips {display: block;}
+    .remarks textarea{width: 496px;height: 114px;background-color: #ffffff;border-radius: 2px;border: solid 1px #b8bfca;resize: none;padding: 10px;color: #9aa5b5;}
+    .remarks{margin-top: 25px;position: relative;}
+    .remarks .rema{height: 114px;line-height: 114px;display: inline-block;float: left;width: 85px;text-align: center}
+    .size-num {position: absolute;right: 350px;top: 109px;color: #9aa5b5}
+    .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;}
 
 }
 
 /*移动*/
 @media screen and (max-width:768px) {
-.crumbs {
-        font-size:3.4vw;
-        color: #22272e
-    }
-    .userinfo {
-        padding: 1.3vw 5.3vw;
-        background: #fff;
-        box-shadow: 0 .8vw 1.6vw 0 rgba(0, 0, 0, 0.07);
-    }
-
-    .info {
-        height: 13vw;
-        line-height: 13vw;
-        font-size: 3.4vw;
-        color: #22272e;
-        overflow: hidden
-    }
-
-    .comback {
-        width: 22.4vw;
-    height: 7.2vw;
-    background-color: #ffe6dc;
-    border-radius: 4.8vw;
-    border: solid .27vw #e15616;
-    float: right;
-    line-height: 7.2vw;
-    margin-top: 2.7vw;
-    cursor: pointer;
-    color: #e15616;
-    }
-
-    .userinfo .user p {
-        display: inline-block;
-        color: #627386;
-        margin: 0 6.7vw 2.7vw 0;
-    }
+    .crumbs {font-size:3.4vw;color: #22272e}
+    .userinfo {padding: 1.3vw 5.3vw;background: #fff;box-shadow: 0 .8vw 1.6vw 0 rgba(0, 0, 0, 0.07);}
+    .info {height: 13vw;line-height: 13vw;font-size: 3.4vw;color: #22272e;overflow: hidden}
+    .comback {width: 22.4vw;height: 7.2vw;background-color: #ffe6dc;border-radius: 4.8vw;border: solid .27vw #e15616;float: right;line-height: 7.2vw;margin-top: 2.7vw;cursor: pointer;color: #e15616;}
+    .userinfo .user p {display: inline-block;color: #627386;margin: 0 6.7vw 2.7vw 0;}
     .userinfo .user p:nth-child(1){width: 100%}
-    .userinfo .user p span {
-        color: #22272e;
-    }
-
-    .address {
-        margin-bottom: 4vw;
-        color: #627386;
-    }
-
-    .address span {
-        color: #22272e;
-    }
-    .product-info {
-        box-shadow: 0px .8vw 1.6vw 0px
-		rgba(0, 0, 0, 0.07);
-		    background: #fff;
-    margin-top: 2.7vw
-    }
-
-    .price {
-        overflow: hidden;
-    }
-
-    .protitle {
-        color: #22272e;
-        font-size: 3.4vw;
-        padding: 2.7vw 5.3vw;
-    }
-    .product {
-        background: #fff;
-        padding: 2.7vw 5.3vw;
-        box-shadow: 0px 3px 6px 0px rgba(0, 0, 0, 0.07);
-        height: 50vw
-    }
-
-    .product-title {
-           height: 5.3vw;
-        line-height: 5.3vw;
-        position: relative;
-        width: 100%
-    }
-
-    .product-title li {
-            display: inline-block;
-        list-style: none;
-        color: #9aa5b5;
-        position: relative;
-        top: 26vw;
-        width: 21vw
-
-    }
-
-    .product-title li:nth-child(1) {
-        width: 100%;
-        text-align: left;
-        top: 0;
-    }
-     .pro-information li {
-        list-style: none;
-    }
-
-    .pro-information li {
-        width: 100%;
-        padding: 10px 0;
-    }
-
-    .pro-information li div {
-           display: inline-block;
-        color: #22272e;
-        top: 11.6vw;
-        width: 21vw;
-        position: relative
-    }
-
-    .pro-information li div.product-img {
-            width: 100%;
-            text-align: left;
-            top: 0
-    }
-
-    .product-img img {
-            width: 18.7vw;
-            height: 18.7vw;
-        border: solid 1px #e2e7ef;
-    }
-
-    .product-img h3 {
-        display: inline-block;
-            width: 40vw;
-        margin-left: 10px;
-        font-size: 3.4VW;
-        color: #22272e;
-        vertical-align: middle;
-        word-break: break-all;
-        overflow: hidden;
-        text-overflow: ellipsis;
-        display: -webkit-inline-box;
-        -webkit-line-clamp: 2;
-        -webkit-box-orient: vertical
-    }
-    .add-logistics{
-       height: auto;
-        background-color: #ffffff;
-        box-shadow: 0px 3px 6px 0px
-            rgba(0, 0, 0, 0.07);
-        margin-top: 2.7vw;
-        padding: 20px;
-        color: #627386;
-    }
-    .company-number{
-        width: 100%;
-    }
-    .logist-right>div{
-        margin-top: 5px;
-    }
-    .company-number>div{
-        margin: 4vw 0;
-    }
+    .userinfo .user p span {color: #22272e;}
+    .address {margin-bottom: 4vw;color: #627386;}
+    .address span {color: #22272e;}
+    .product-info {box-shadow: 0px .8vw 1.6vw 0px rgba(0, 0, 0, 0.07);background: #fff;margin-top: 2.7vw}
+    .price {overflow: hidden;}
+    .protitle {color: #22272e;font-size: 3.4vw;padding: 2.7vw 5.3vw;}
+    .product {background: #fff;padding: 2.7vw 5.3vw;box-shadow: 0px 3px 6px 0px rgba(0, 0, 0, 0.07);height: 50vw}
+    .product-title {height: 5.3vw;line-height: 5.3vw;position: relative;width: 100%}
+    .product-title li {display: inline-block;list-style: none;color: #9aa5b5;position: relative;top: 26vw;width: 21vw}
+    .product-title li:nth-child(1) {width: 100%;text-align: left;top: 0;}
+    .pro-information li {list-style: none;}
+    .pro-information li {width: 100%;padding: 10px 0;}
+    .pro-information li div {display: inline-block;color: #22272e;top: 11.6vw;width: 21vw;position: relative}
+    .pro-information li div.product-img {width: 100%;text-align: left;top: 0}
+    .product-img img {width: 18.7vw;height: 18.7vw;border: solid 1px #e2e7ef;}
+    .product-img h3 {display: inline-block;width: 40vw;margin-left: 10px;font-size: 3.4VW;color: #22272e;vertical-align: middle;word-break: break-all;overflow: hidden;text-overflow: ellipsis;display: -webkit-inline-box;-webkit-line-clamp: 2;-webkit-box-orient: vertical}
+    .add-logistics{height: auto;background-color: #ffffff;box-shadow: 0px 3px 6px 0px rgba(0, 0, 0, 0.07);margin-top: 2.7vw;padding: 20px;color: #627386;}
+    .company-number{width: 100%;}
+    .logist-right>div{margin-top: 5px;}
+    .company-number>div{margin: 4vw 0;}
     .logistics-order-number.company{width: 72vw}
-    .company{
-            width: 75vw;
-        height: 11.8vw;
-        background-color: #ffffff;
-        border-radius: .53vw;
-        border: solid 1px #b8bfca;
-        color: #9aa5b5;
-        padding-left: 2.7vw;
-        margin-top: 2.7vw
-    }
-    input::placeholder,textarea::placeholder {
-        color: #9aa5b5;
-        font-size: 12px;
-    }
-    textarea::placeholder {
-        color: #9aa5b5;
-    }
-    .red{
-        color: #f94b4b;
-    }
-    .companyBtn{
-            width: 11.8vw;
-        height: 11.8vw;
-        background-color: #ffffff;
-        border-radius: .53vw;
-        border: solid 1px #b8bfca;
-        margin-left: .53vw;
-        cursor: pointer;
-        font-size: 4.8vw;
-        color: #b8bfca;
-    }
-    .mIcon.add:before {
-             width: 8vw;
-    height: 8vw;
-    background-position: -9.2vw -61.3vw;
-    position: absolute;
-    top: 5.5vw;
-    right: 8vw
-    }
-    .add-text {
-           font-size: 3.6vw;
-        color: #333330;
-        opacity: 0.5;
-        position: absolute;
-        top: 60%;
-        right: 5.3vw
-    }
-    .upload-file{
-        position: relative;
-        float: left;
-        margin: 0 2.7vw 2.7vw 0px;
-        cursor: pointer;
-        width: 23vw;
-        height: 23vw;
-        border-radius: .53vw;
-        border: solid .27vw #b8bfca
-    }
-    .input-file{
-           width: 23vw;
-        height:23vw;
-        opacity: 0;
-        cursor: pointer;
-        position: absolute
-    }
-    #uploadGoodsImages{
-        overflow: hidden;
-        float: left;
-        width: 90%;
-       margin-top: 2.7vw
-    }
-    .release-from{
-        overflow: hidden;
-    }
-    .upload-file img{
-        width: 100%;
-        height: 100%;
-    }
-    .mIcon.del:before {
-           width: 5.3vw;
-        height: 5.3vw;
-        background-position: -90vw -7.5vw;
-        position: absolute;
-        top: -.8vw;
-        right: -.8vw
-    }
-    .form-upload-tips .icon-wen:before {
-        width: 20px;
-        height: 20px;
-        background-position: -84px -144px;
-        cursor: pointer;
-    }
-    .wen-tips {
-        width: 300px;
-        height: 47px;
-        background-color: #1890f9;
-        box-shadow: 0px 3px 6px 0px rgba(24, 144, 249, 0.17);
-        color: #fff;
-        position: absolute;
-        left: inherit;
-        font-size: 12px;
-        text-align: center;
-        line-height: 47px;
-        top: 33px;
-        display: none;
-    }
-    .form-upload-tips{
-        float: left;
-        position: relative;
-    }
-    .form-upload-tips .wen-tips:before {
-        content: '';
-        width: 0px;
-        height: 0px;
-        border-width: 8px;
-        border-style: solid;
-        border-color: transparent transparent #1890f9 transparent;
-        position: absolute;
-        top: -15px;
-        left:5px;
-     }
-      .form-upload-tips:hover .wen-tips {
-         display: block;
-     }
-     .remarks textarea{
-        width: 83.4vw;
-        height: 42.4vw;
-        background-color: #ffffff;
-        border-radius: .53vw;
-        border: solid 1px #b8bfca;
-        resize: none;
-        padding: 2.7vw;
-        color: #9aa5b5;
-     }
-     .remarks{position: relative}
-     .remarks .rema{
-        line-height:10.7vw ;
-     }
-     .size-num {
-         position: absolute;
-        right: 2.7vw;
-        top: 52vw;
-        color: #9aa5b5
-     }
-     .defineBtn button{
-        width: 100%;
-        height: 11.2vw;
-        line-height: 11.2vw;
-        text-align: center;
-        color: #fff;
-        background-color: #e15616;
-        border-radius: .53vw;
-        border: solid .27vw #e15616;
-        cursor: pointer;
-        margin-bottom: 2.7vw
-     }
-     .defineBtn button:nth-child(2){background:#ffe6dc;color: #e15616 }
-     .defineBtn{
-        overflow: hidden;
-           margin-top: 4vw
-     }
+    .company{width: 75vw;height: 11.8vw;background-color: #ffffff;border-radius: .53vw;border: solid 1px #b8bfca;color: #9aa5b5;padding-left: 2.7vw;margin-top: 2.7vw}
+    input::placeholder,textarea::placeholder {color: #9aa5b5;font-size: 12px;}
+    textarea::placeholder {color: #9aa5b5;}
+    .red{color: #f94b4b;}
+    .companyBtn{width: 11.8vw;height: 11.8vw;background-color: #ffffff;border-radius: .53vw;border: solid 1px #b8bfca;margin-left: .53vw;cursor: pointer;font-size: 4.8vw;color: #b8bfca;}
+    .mIcon.add:before {width: 8vw;height: 8vw;background-position: -8.2vw -60.3vw;position: absolute;top: 5.5vw;right: 8vw}
+    .add-text {font-size: 3.6vw;color: #333330;opacity: 0.5;position: absolute;top: 60%;right: 4.3vw}
+    .upload-file{position: relative;float: left;margin: 0 2.7vw 2.7vw 0px;cursor: pointer;width: 23vw;height: 23vw;border-radius: .53vw;border: solid .27vw #b8bfca}
+    .input-file{width: 23vw;height:23vw;opacity: 0;cursor: pointer;position: absolute}
+    #uploadGoodsImages{overflow: hidden;float: left;width: 90%;margin-top: 2.7vw}
+    .release-from{overflow: hidden;}
+    .upload-file img{width: 100%;height: 100%;}
+    .mIcon.del:before {width: 5.3vw;height: 5.3vw;background-position: -90vw -7.5vw;position: absolute;top: -.8vw;right: -.8vw}
+    .form-upload-tips .icon-wen:before {width: 20px;height: 20px;background-position: -84px -144px;cursor: pointer;}
+    .wen-tips {width: 300px;height: 47px;background-color: #1890f9;box-shadow: 0px 3px 6px 0px rgba(24, 144, 249, 0.17);color: #fff;position: absolute;left: inherit;font-size: 12px;text-align: center;line-height: 47px;top: 33px;display: none;}
+    .form-upload-tips{float: left;position: relative;}
+    .form-upload-tips .wen-tips:before {content: '';width: 0px;height: 0px;border-width: 8px;border-style: solid;border-color: transparent transparent #1890f9 transparent;position: absolute;top: -15px;left:5px;}
+    .form-upload-tips:hover .wen-tips {display: block;}
+    .remarks textarea{width: 83.4vw;height: 42.4vw;background-color: #ffffff;border-radius: .53vw;border: solid 1px #b8bfca;resize: none;padding: 2.7vw;color: #9aa5b5;}
+    .remarks{position: relative}
+    .remarks .rema{line-height:10.7vw ;}
+    .size-num {position: absolute;right: 2.7vw;top: 52vw;color: #9aa5b5}
+    .defineBtn button{width: 100%;height: 11.2vw;line-height: 11.2vw;text-align: center;color: #fff;background-color: #e15616;border-radius: .53vw;border: solid .27vw #e15616;cursor: pointer;margin-bottom: 2.7vw}
+    .defineBtn button:nth-child(2){background:#ffe6dc;color: #e15616 }
+    .defineBtn{overflow: hidden;margin-top: 4vw}
 
 }

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

@@ -158,4 +158,8 @@
         color: #e15616;
         margin-left: 2.7vw;
     }
+     .no-delivery-record {width: 100%;height:90vw;background-color: #ffffff;position: relative;}
+    .no-delivery-record img {width:48vw;position: absolute;top: 0;left: 50%;transform: translate(-50%,50%)}
+    .no-delivery-record p{position: absolute;top: 65%;left: 24%;font-size: 3.2vw;color: #4a4f58}
+    .no-delivery-record span{color: #e15616;}
 }

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

@@ -38,7 +38,7 @@
   .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}
+   .brandlogo-name input{width: 210px;height: 36px;background-color: #ffffff; border-radius: 2px;border: solid 1px #b8bfca;padding-left: 10px}
   .img-box{ width: 56px;height: 56px;background-color: #ffffff;border-radius: 2px;border: solid 1px #b8bfca;display: inline-block; position: relative;}
   .img-box img{width: 100%;height: 100%; }
   .brand-img{margin: 10px 0;}

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

@@ -67,7 +67,7 @@
   .bgFrom.show{opacity: 1}
   .modalForm{ width: 74.7vw;height:fit-content;background-color: #ffffff;box-shadow: 0px .8vw 1.6vw 0px rgba(0, 0, 0, 0.16);border-radius: 2.7vw;
     border: solid .27vw #efefef; position: absolute;left: 0;top: 0;right: 0;bottom: 0; margin: auto }
-  .modal-header{height: 10.96vw;border: solid 1px #efefef; line-height:10.9vw;padding: 0 16px;color: #22272e;}
+  .modal-header{height: 10.96vw;border-bottom: solid 1px #efefef; line-height:10.9vw;padding: 0 16px;color: #22272e;}
   .mIcon.close{float: right; cursor: pointer;}
   .mIcon.close:before{width: 5.3vw;height: 5.3vw;background-position: -33.3vw .53vw}
   .modal-div span{color: #22272e;display: inline-block;}

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

@@ -6,6 +6,7 @@ input[type="number"]{
     -moz-appearance: textfield;
 }
 div{box-sizing: border-box;}
+@media screen and (min-width:768px) {
 .container{width: 100%;height: auto;box-sizing: border-box;background-color: #FFFFFF;padding: 0 16px;}
 .release-stepbox{width: 100%;height: 70px;padding: 10px 100px;box-sizing: border-box;}
 .release-stepbox .stepSpan{float: left;width:94px;padding: 0 15px;margin-right: 80px;position: relative;}
@@ -104,7 +105,7 @@ input[type="radio"]{opacity:0;}
 .popup-layer.edit{height: 153px;}
 .popup-layer .popup-title{padding: 0 80px 0 20px;height: 42px;line-height: 42px;border-bottom: 1px solid #eee;font-size: 14px;color: #333;overflow: hidden;background-color: #F8F8F8;border-radius: 2px 2px 0 0;position: relative;}
 .popup-title .popup-close{width: 16px;height: 16px;display: block;position: absolute;right: 10px;top: 13px;background-position: 1px -40px;cursor: pointer;}
-.popup-layer .popup-content{padding: 16px;}
+.popup-layer .popup-content{padding: 13px;}
 .popup-layer .popup-content .popup-from{height: auto;color: #999999;line-height: 32px;position: relative;}
 .popup-layer .popup-content .popup-from input{width: 260px;height: 32px;border: 1px solid #EFEFEF;font-size: 14px;color: #333;padding: 0 10px;margin-left: 10px;box-sizing: border-box;}
 .popup-layer .popup-content .popup-from span{display: inline-block;height: 32px;font-size: 14px;color: #999;float: left;}
@@ -127,3 +128,91 @@ input[type="radio"]{opacity:0;}
 .ck-content {min-height: 500px;}
 .footTop{height: 100px;}
 .baseHeadCenter .keyword{height: 40px;line-height: 40px;}
+}
+
+/*移动*/
+
+@media screen and (max-width:768px) {
+.container .release-stepbox{height: 17.6vw;}
+.container .release-stepbox>div{float: left;margin-left: 7.5vw;top: 9.3vw;position: relative;}
+.release-stepbox .stepSpan p{color: #9aa5b5}
+.release-stepbox .stepSpan.active p {color: #E15616;}
+.release-stepbox .stepSpan.active p span {background: #E15616;}
+.release-stepbox .stepSpan p span{display: inline-block;width: 5.3vw;height: 5.3vw;font-size: 3.2vw;text-align: center;line-height: 5.3vw;background: #9aa5b5;color: #FFFFFF;border-radius: 10.6vw;position: absolute;top: -6.4vw;right: 5vw}
+.release-container{background: #fff;padding: 3.3vw;}
+.release-from .release-label{height:8.3vw;color: #627386;}
+.release-from .release-label span {color: #FF0000;}
+.release-from .release-input .input{width: -webkit-fill-available; border: .27vw solid rgba(184,191,202,.5);border-radius: .27vw;padding-left: 2.7vw;height: 11.8vw}
+ input::placeholder{color: #9aa5b5;}
+.release-from{margin-bottom: 4vw;line-height: 8.5vw}
+.release-from .text{line-height: 6.4vw;color: #e15616;width: 87vw;margin: auto;font-size: 3.1vw}
+.release-from .select-main .select{border: .27vw solid rgba(184,191,202,.5);height: 11.7vw;width: -webkit-fill-available;margin-bottom: 2.7vw;padding-left: 2.7vw;color: #9aa5b5;}
+.release-from .release-input .input.tags{width: 52vw;height: 11.7vw;}
+.release-from .release-input .add-btn{width: 33.4vw;border-radius: .53vw;border: .27vw solid #e15616;display: inline-block;margin-left:2.7vw;text-align: center;line-height: 11.7vw;background-color: #ffe6dc;color: #e15616;}
+.release-from .release-input .input.keyword{margin-bottom: 2.7vw;}
+.release-from .p{width: 22.4vw;height: 7.2vw;line-height: 7.2vw;text-align: center;font-size: 12px;color: #e15616;border: .27vw solid #e15616;background: #ffe6dc;display: block;border-radius: 4.8vw;margin: 2.7vw auto;}
+.release-from .release-input .release-param{width: 100%;height: auto;border: 1px solid rgba(184,191,202,.5);margin-bottom: 2.7vw;}
+.release-from .release-input .release-param .param-input:first-child {border-bottom: 1px solid #f0f3f7;}
+.release-from .release-input .release-param .param-input{width: -webkit-fill-available;border-radius: .27vw;padding-left: 2.7vw;height: 11.8vw;border: none;}
+.release-from .release-input .add{width: 22.4vw;height: 7.2vw;line-height: 7.2vw;text-align: center;font-size: 12px;color: #e15616;border: .27vw solid #e15616;background: #ffe6dc;display: block;border-radius: 4.8vw;margin: 2.7vw auto;}
+.release-from .from-button .btn.next{width: 100%;height: 11.2vw;line-height: 11.2vw;text-align: center;color: #fff;background: #e15616;display: block;}
+.release-from .release-tips {width: 100%;color: #FF0000;}
+.popup.active {opacity: 1;}
+.popup {width: 100%;height: 100%;background: rgba(0,0,0,0.3);position: fixed;top: 0;left: 0;z-index: 999;opacity: 0;}
+.popup-layer {width:74.7vw;height: 98.8vw;position: absolute;top: 0;left: 0;bottom: 0;right: 0;margin: auto;background: #fff;border-radius: 1vw;z-index: 1000;}
+.popup-layer .popup-title {padding-left: 4vw;height: 10.5vw;line-height:10.5vw;border-bottom: .27vw solid #e2e7ef;font-size: 3.4vw;color: #22272e;overflow: hidden;border-radius: 2px 2px 0 0;position: relative;}
+.popup-title .popup-close {width: 25px;height: 26px;display: block;position: relative;right: -240px;top: -38px}
+.popup-layer .popup-content {padding: 2.7VW;}
+.popup-layer .popup-content .popup-from {height: auto;color: #999999;line-height: 8.5vw;position: relative;}
+.popup-layer .popup-content .popup-from span {display: inline-block;height: 8.5vw;font-size: 3vw;color: #22272e;float: left}  .popup-layer .popup-content .popup-from .popup-upload {height: 13vw;float: left;margin-left: 2.7vw;}
+.popup-layer .popup-content .popup-from .upload-file {width:13vw;height: 13vw;border: .27vw solid #EFEFEF;border-radius:.53vw;position: relative;cursor: pointer;}
+.popup-layer .popup-content .popup-from .upload-file .input-file {width: 13vw;height: 13vw;opacity: 0;cursor: pointer;margin-left: 0;padding: 0;}
+.popup-layer .popup-content .popup-from .popup-p{width: 49.8vw;height: 8.8vw;border: .27vw solid #b8bfca;display: inline-block;padding-left: 1.7vw}  .popup-textarea textarea{width: 47vw;height: 16vw;padding: 2.7vw;border: .27vw solid #b8bfca;resize: none;font-size: 3vw;}
+textarea::placeholder{color: #9aa5b5}  .popup-button{padding: 10px;}
+.popup-button div{height: 9.9vw;line-height: 9.9vw;text-align: center;margin-bottom: 2.7vw;}
+.popup-button div.btn-confim{color: #fff;background: #e15616;}
+.popup-button div.btn-cancel{color: #9aa5b5;border: .27vw solid #b8bfca;}
+.mIcon.icon-add:before {width: 5vw;height: 5vw;background-position: -9.6vw -62vw;position: relative;top: 3vw;right: -4vw;}
+.mIcon.popup-close:before{top: 1.9vw;width: 5.3vw;height: 5.3vw;background-position: -34vw 0px;right: 2.7vw;position: absolute}
+.release-from .release-input .yang{width: 8vw;position: absolute;left: 0;top: 0;line-height:13vw;text-align: center}
+.release-from .release-input .input.price{padding-left: 7vw}
+.release-from .release-input{position: relative}
+/*销售信息*/
+input[type="radio"]{opacity:0;}
+.release-from .release-input .release-props{width: 100%;height: 36px;}
+.release-from .release-input .release-props .release-radio{    width: 26.7vw;height: 11.2vw;margin-right: 2.7vw;line-height: 11.2vw;box-sizing: border-box;font-size: 3.4vw;text-align: center;display: inline-block}
+/*.release-from .release-input .release-props .release-radio.second{width:100px;}*/
+.release-from .release-input .release-props .release-radio input{display:none}
+.release-from .release-input .release-props .release-radio i{display:block;font-style:normal;cursor:pointer;width:100%;height:100%;position:relative;overflow:hidden;border-radius:2px;background:#FFF;border:.27vw solid #b8bfca;color:#627386;}
+.release-from .release-input .release-props .release-radio i:before{position:absolute;right:0;bottom:0;display:none;width:5.3vw;height:5.3vw;background-position:-75.7vw -8.5vw}
+.release-from .release-input .release-props .release-radio input:checked + i{border-color:#e15616;color:#e15616}
+.release-from .release-input .release-props .release-radio input:checked + i:before{display:block}
+.release-from .release-input .release-province{width: 100%;height: auto;margin-top: 5.3vw;}
+.release-from .release-input .release-province .province-item{line-height:8vw;padding: 0 2.7vw;text-align: center;font-size: 3.2vw;color: #627386;background: #F0F3F7;border-radius: .27vw;display: block;margin: 0 .27vw .27vw 0;float: left;}
+.release-from .release-input .release-province .province-item.active{background: #e15616;color: #FFF;}
+.release-from .release-input .tax{color: #627386;float: left;}
+.release-from .secondbtn {width: 100%;padding: 2.7vw 0;text-align: center;}
+.release-from .secondbtn .btn {box-sizing: border-box;width:40vw;height: 11.2vw;border-radius:.53vw;display: block;line-height:11.2vw;text-align: center;display: inline-block;margin: 0 1.3vw;}
+.release-from .secondbtn .btn.next{width: 40vw;display: inline-block;}
+.release-from .secondbtn .btn.next {background-color: #e15616;color: #fff;}
+.release-from .secondbtn .btn.prev {border: .27vw solid #e15616;background-color: #ffe6dc;color: #e15616;}
+.release-from .release-input .tax .mg{display: block;width: 54vw;height: 11.7vw;line-height: 11.7vw;border: .27vw solid #b8bfca;color: #22272e;padding-left: 2.7vw;}
+.release-from .release-input .edit-btn{width: 30.4vw;height: 11.7vw;line-height: 11.7vw;text-align: center;color: #e15616;background: #ffe6dc;border: .27vw solid #e15616;float: left;margin-top: 8vw;margin-left: 2.7vw}
+.popup-layer .popup-content .popup-from input{height: 8.8vw;width: 55.5vw;padding-left: 2.7vw;border: .27vw solid #b8bfca}
+.popup-layer .popup-content .popup-from .poze{width: 40px;text-align: center;font-size: 3.4vw;position: absolute;right: 0;top: 0;height: -webkit-fill-available}
+.popup-layer.edit{height: 62.3vw;}
+.release-from .release-input.upload.image{width: 100%;}
+.release-from .upload-file {width: 26vw;height: 26vw;border: .27vw solid #EBEBEB;border-radius: .53vw;position: relative;float: left;margin-right: 2.7vw;margin-bottom: 2.7vw;cursor: pointer;}
+.release-from .upload-file .input-file {width: 26vw;height: 26vw;opacity: 0;cursor: pointer;}
+.release-from .upload-file .upload-img {width: 100%;height: 100%;display: block;border-radius:.53vw;}
+.mIcon.icon-del:before{width: 5.3vw;height: 5.3vw;background-position: -89.8vw -7.6vw;position: absolute;top: -.8vw;right: -.8vw}
+.mIcon.icon-add:before{width: 8vw;height: 8vw;background-position: -8.2vw -60.3vw;position: absolute;top: 5.5vw;right: 9vw}
+.add-text {font-size: 3.6vw;color: #333330;opacity: 0.5;position: absolute;top: 61%;right: 5.3vw;}
+.release-from.text p .em {color: #e15616;}
+.imgText .text{color: #627386;font-size: 3vw;}
+.ck-editor__main p{height: 42.4vw;}
+.release-from .last  .btn{width: 25.2vw}
+.release-from .secondbtn .btn.next{width: 25.2vw}
+.release-from .tags-main .item-tags {padding: 0 2.7vw;line-height: 8vw;background: #ffe6dc;text-align: center;font-size: 3.2vw;color: #e15616;margin: 1.3vw;border-radius: .53vw;float: left;position: relative;}
+.mIcon.del-tags:before{width: 4.3vw;height: 4.3vw;background-position: -26.4vw -9vw;position: absolute;top: -2vw;}
+}

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

@@ -81,11 +81,19 @@ li{list-style:none}
 .navLayout .navList.on .tab:before{top:4vw;transform:rotate(270deg);color:#e15616}
 .navLayout .navList.on .tab{color:#e15616}
 .navLayout .navList .con a.on{color:#e15616;background-color:#ffe6dc}
-.navLayout .right{width:70.5vw}
-
-
-
-
-
+.header-bt{padding: 3.3vw}
+.search:nth-child(1){width: 93.4vw;height: 11.7vw;line-height: 11.7vw;border: .27vw solid rgba(184,191,202,.5);margin-bottom: 2.7vw;}
+.search input{height: -webkit-fill-available;width: 75vw;border: none;}
+.header-search>div .label{color: #627386;margin-left: 1.7vw;line-height: 8vw}
+input::placeholder{color: #627386}
+.search .select{height: 11.7vw;width:100%;border: none;color: #627386;border: .27vw solid rgba(184,191,202,.5)}
+.btn-server{width: 35.3vw;height: 11.2vw;line-height: 11.2vw;text-align: center;color: #e15616;border: .27vw solid #e15616;background: #ffe6dc;margin:2.7vw auto;display: block;}
+#orderDate .search-input{display: inline-block;}
+#orderDate{position: relative}
+.search-input input{width:39vw;height: 11.8vw;line-height: 11.8vw;padding-left: 2.7vw;border: .27vw solid rgba(184,191,202,.5);color: #627386;}
+.order-header .header-bt .search-time .search-main .line{margin:0 1.4vw;display: inline-block;height: 11.2vw;line-height: 11.2vw;}
+.mIcon.time:before{width: 20px;height: 20px;position: absolute;background-position: -352px -231px;right: 15px;top: 13px;}
+.search-time{margin-bottom: 2.7vw}
+.jindu .label{display: block}
 }
 

BIN
src/main/resources/static/img/base/icon_m.png


BIN
src/main/resources/static/img/order/H5kon.png


+ 1 - 1
src/main/resources/static/js/flea-market/form.js

@@ -343,7 +343,7 @@ var fleaMarketForm = new Vue({
         },
         gopay:function(){
             var _this = this;
-            window.location.href = '';
+            window.location.href = '/pay/caimei-paycash.html?pageType=1&&type=confirm&productID='+_this.playid;
             _this.vShow_secondBj = false;
         },
          scrollIntoView: function(){

+ 5 - 3
src/main/resources/static/js/supplier-center/order/logistics-add.js

@@ -130,9 +130,11 @@ var addlogistics = new Vue({
         if(res.code==0){
             _self.userInfo = res.data.userInfo;
             _self.logisticsBatch = res.data.logisticsBatch;
-            _self.params.remark =_self.logisticsBatch.remark
-            _self.GoodsImagesList =  _self.logisticsBatch.remarkImages;
-            _self.params.remarkImage = _self.GoodsImagesList.toString()+'##';
+            _self.params.remark =_self.logisticsBatch.remark;
+            if( _self.logisticsBatch.remarkImages!=null&& _self.logisticsBatch.remarkImages!=''){
+                 _self.GoodsImagesList =  _self.logisticsBatch.remarkImages;
+                 _self.params.remarkImage = _self.GoodsImagesList.toString()+'##';
+            }
             _self.orderList = res.data.logisticsBatch.logisticsRecordList;
             console.log( _self.params.remarkImage)
         }

+ 22 - 1
src/main/resources/static/js/user-center/repair/list.js

@@ -19,7 +19,8 @@ var orderPage = new Vue({
             startTime:'',
             endTime:'',
             pageNum:1,
-            pageSize:10
+            pageSize:10,
+            beginTime:'',
         },
         listRecord: 0,
         pageInput: '1',
@@ -139,6 +140,26 @@ var orderPage = new Vue({
         console.log(this.listQuery.orderState)
         $('.navLayout').find('.navList').removeClass("on").find('.con').hide().find('a').removeClass("on");
         $('.navLayout').find('.navList').eq(0).addClass("on").find('.con').show().find('a').eq(1).addClass("on");
+        var _self = this;
+         var startDate = getDateStr(new Date(), -365), endDate = getDateStr(new Date(),0);
+         $('#orderDate').dateRangePicker({
+            language: 'cn',
+            startDate: startDate,
+            endDate: endDate,
+            format: 'YYYY-MM-DD',
+            autoClose: isPC,
+            showShortcuts:false,
+            isNowrap:false,
+            getValue: function() {
+                if (_self.listQuery.beginTime && _self.listQuery.endTime) {
+                    return _self.listQuery.beginTime+' to '+_self.listQuery.endTime;
+                } else {return '';}
+            },
+            setValue: function(s,s1,s2) {
+                _self.listQuery.beginTime = s1;
+                _self.listQuery.endTime = s2;
+            }
+        });
 
     }
 });

+ 1 - 1
src/main/resources/templates/flea-market/form.html

@@ -186,7 +186,7 @@
 
              <div class="secondBj thebj"   v-show="vShow_secondBj" :class="vShow_secondBj?'show':''">
                     <div class="bjmain theresult">
-                        <span>提示</span>
+                        <span class="title">提示</span>
                         <p>发布二手商品,采美需要收取您每个商品100元的展示费,展示期为6个月</br>
                             支付完成后,商品会在1-2个工作日内进行审核,审核通过后,商品会立即上线</p>
                         <div class="paybtn">

+ 2 - 4
src/main/resources/templates/supplier-center/order/delivery-record.html

@@ -21,9 +21,6 @@
             <span>&gt;</span>
             <span>发货记录</span>
         </div>
-<!--        <div v-else class="wrap_tittle mIcon" @click="opentittle">-->
-<!--            <i class="mIcon open"></i><span style="margin-left: 25px;">发货</span>-->
-<!--        </div>-->
         <div class="wrap clear">
             <!--左侧面包屑-->
             <template th:replace="supplier-center/components/tableft"></template>
@@ -43,7 +40,8 @@
                 <div class="record-product">
                     <div class="protitle">发货记录</div>
                     <div class="no-delivery-record" v-if="isShow">
-                        <img src="/img/order/kon.png">
+                        <img src="/img/order/kon.png" v-if="isPC">
+                        <img src="/img/order/H5kon.png" V-else>
                         <p>此订单还没有发货记录,快去<span>补充</span>他吧</p>
                     </div>
                     <div class="product" v-for="r in results">

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

@@ -4,6 +4,7 @@
 <head>
     <title>采美365网-中国美业全方位线上交易服务互动平台,做美业,上采美</title>
     <template th:replace="components/head-link"></template>
+
     <link th:href="@{/css/base/center.css(v=${version})}" rel="stylesheet" type="text/css">
     <link th:href="@{/css/supplier-center/shop/release.css(v=${version})}" rel="stylesheet" type="text/css">
 
@@ -100,24 +101,24 @@
                             </div>
                             <div class="popup" v-show="isAddBrand" :class="isAddBrand ? 'active':''">
                                 <div class="popup-layer bran">
-                                    <div class="popup-title"> <p>提交品牌</p> <i class="popup-close layui-layer-ico"  @click="hideAddBrandPopup"></i></div>
+                                    <div class="popup-title"> <p>提交品牌</p> <i class="popup-close layui-layer-ico mIcon "  @click="hideAddBrandPopup"></i></div>
                                     <div class="popup-content">
-                                        <div class="popup-from clear"><span>商品品牌:</span><p class="popup-p">{{releaseParams.brandName}}</p></div>
+                                        <div class="popup-from clear"><span>商品品牌</span><p class="popup-p">{{releaseParams.brandName}}</p></div>
                                         <div class="popup-from clear" style="margin-top: 10px">
-                                            <span>品牌logo:</span>
+                                            <span>品牌logo</span>
                                             <div class="popup-upload">
                                                 <div class="upload-file" v-if="brandImage!=''">
                                                     <img :src="brandImage" alt="" class="upload-img">
                                                     <i class="icon-del" @click="removeBrandImageFn"></i>
                                                 </div>
                                                 <div class="upload-file" v-else>
-                                                    <i class="icon-add"></i>
+                                                    <i class="icon-add mIcon "></i>
                                                     <input ref="brandImage" type="file" name="file" value="" class="input-file" accept="image/png,image/jpeg,image/gif,image/jpg"  @change="uploadBrandImagesFn">
                                                 </div>
                                             </div>
                                         </div>
                                         <div class="popup-from clear" style="margin-top: 10px">
-                                            <span>品牌描述:</span>
+                                            <span>品牌描述</span>
                                             <div class="popup-textarea">
                                                 <textarea name="" v-model="brandTextarea" cols="30" rows="10" maxlength="200" placeholder="请描述品牌信息,不超过200字"></textarea>
                                             </div>
@@ -175,7 +176,7 @@
                             <div class="release-from clear" v-show="tagsList.length>0">
                                 <div class="tags-main">
                                     <div class="item-tags" v-for="(item, index) in tagsList" :key="index">
-                                        {{item.tag}}<i class="del-tags" @click="removeTags(index)"></i>
+                                        {{item.tag}}<i class="del-tags mIcon" @click="removeTags(index)"></i>
                                     </div>
                                 </div>
                             </div>
@@ -192,11 +193,12 @@
                                 <div class="release-label">搜索关键词:</div>
                                 <div class="release-input">
                                     <input  v-for="(item, index) in searchKeyList" :key="index" class="input keyword" type="text" :placeholder="item.placeholder" v-model="searchKeyList[index].value" maxlength="16">
-                                    <a href="/supplier/goods/example.html" target="_blank" class="p">查看示例></a>
+                                    <a href="/supplier/goods/example.html" target="_blank" class="p" v-if="isPC">查看示例></a>
                                 </div>
                             </div>
                             <div class="release-from text" style="margin-bottom: 10px;">
                                 <P class="text" style="line-height: 24px;">{{keywordText}}</P>
+                                <a href="/supplier/goods/example.html" target="_blank" class="p" v-if="!(isPC)">查看示例</a>
                             </div>
                             <div class="release-from clear">
                                 <div class="release-label">相关参数:</div>
@@ -206,7 +208,8 @@
                                         <input class="param-input" v-model="paramKeyList[index].paramsContent" type="text" placeholder="参数信息" maxlength="50">
                                         <a href="javascript: void(0);" class="del-btn" v-show="index>0" @click="removeParamsFn">删除</a>
                                     </div>
-                                    <a href="javascript: void(0);" class="add" @click="addParamsFn">添加参数<span>+</span></a>
+                                    <a href="javascript: void(0);" class="add" @click="addParamsFn" v-if="isPC">添加参数<span>+</span></a>
+                                     <a href="javascript: void(0);" class="add" @click="addParamsFn" V-else>添加参数</a>
                                 </div>
                             </div>
                             <div class="release-from clear">
@@ -265,16 +268,16 @@
                             <div class="release-from clear" v-show="releaseParams.invoiceType != '3' && releaseParams.includedTax == 0 && releaseParams.taxPoint>0">
                                 <div class="release-input">
                                     <span class="tax" :style="{color:'#FF0000'}">*</span>
-                                    <span class="tax">税率:<span class="mg">{{releaseParams.taxPoint}}%</span></span>
+                                    <span class="tax">税率<span class="mg">{{releaseParams.taxPoint}}%</span></span>
                                     <a href="javascript: void(0);" class="edit-btn" v-show="releaseParams.includedTax == 0" @click="taxPonitEdit">修改</a>
                                 </div>
                                 <div class="release-tips" v-show="vShow_Price1">{{fromMessage}}</div>
                             </div>
                             <div class="popup" v-show="isTaxPonitEditPopup" :class="isTaxPonitEditPopup?'active':''">
                                 <div class="popup-layer edit">
-                                    <div class="popup-title"> <p>修改税率</p> <i class="popup-close layui-layer-ico" @click="hideTaxPonitEditPopup"></i></div>
+                                    <div class="popup-title"> <p>修改税率</p> <i class="popup-close layui-layer-ico mIcon" @click="hideTaxPonitEditPopup"></i></div>
                                     <div class="popup-content">
-                                        <div class="popup-from"><span>税率:</span>
+                                        <div class="popup-from"><span>税率</span>
                                             <input type="number" v-model="releaseParams.taxPoint" maxlength="4" @ placeholder="请输入税率" @focus="blur_taxPoint"><span class="poze">%</span>
                                         </div>
                                         <div class="popup-tips" v-show="vShow_taxPoint">{{fromMessage}}</div>
@@ -357,7 +360,7 @@
                                 <div class="release-tips" v-show="vShow_isProvince">{{fromMessage}}</div>
                             </div>
                             <div class="release-from clear">
-                                <div class="from-button">
+                                <div class="from-button secondbtn">
                                     <a href="javascript: void(0);" class="btn prev" @click="PrevStep">上一步</a>
                                     <a href="javascript: void(0);" class="btn next" @click="NextStep1">下一步</a>
                                 </div>
@@ -374,16 +377,17 @@
                                          @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" @click="removeGoodsImagesFn(index)"></i>
+                                        <i class="icon-del mIcon" @click="removeGoodsImagesFn(index)"></i>
                                     </div>
                                     <div class="upload-file" v-show="GoodsImagesList.length<5">
-                                        <i class="icon-add"></i>
+                                        <i class="icon-add mIcon"></i>
+                                        <p class="add-text" v-if="!(isPC)">添加图片</p>
                                         <input ref="goodsImages" type="file" name="file" value="" class="input-file" accept="image/png,image/jpeg,image/gif,image/jpg"  @change="uploadGoodsImagesFn">
                                     </div>
                                 </div>
                                 <div class="release-tips" v-show="vShow_GoodsImages">{{fromMessage}}</div>
                             </div>
-                            <div class="release-from text" style="margin-bottom: 10px;">
+                            <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>
@@ -394,12 +398,12 @@
                                     <textarea  class="textarea" id="detailInfoEditor" v-html="releaseParams.detailInfo"></textarea >
                                 </div>
                             </div>
-                            <div class="release-from text" style="margin-bottom: 10px;">
+                            <div class="release-from text imgText" style="margin-bottom: 10px;">
                                 <P class="text" style="line-height: 24px;">建议图文并茂并按照<span class="em">产品介绍>产品功效>操作流程>效果分享>疗程建议>注意事项>产品证书</span>的顺序进行描述;</P>
                                 <P class="text" style="line-height: 24px;">上传图片时,对每张图都填写关键词描述,有利于商品的曝光。</P>
                             </div>
                             <div class="release-from clear">
-                                <div class="from-button">
+                                <div class="from-button secondbtn">
                                     <a href="javascript: void(0);" class="btn prev" @click="PrevStep">上一步</a>
                                     <a href="javascript: void(0);" class="btn next" @click="NextStep2">下一步</a>
                                 </div>
@@ -419,7 +423,7 @@
                                 </div>
                             </div>
                             <div class="release-from clear">
-                                <div class="from-button last">
+                                <div class="from-button last secondbtn">
                                     <a href="javascript: void(0);" class="btn prev" @click="PrevStep">上一步</a>
                                     <a href="javascript: void(0);" class="btn next" @click="addReleaseGoodSubmitFn">提交</a>
                                     <a href="javascript: void(0);" class="btn next"  @click="addReleasePeview">预览商品</a>

+ 11 - 7
src/main/resources/templates/user-center/repair/list.html

@@ -4,7 +4,9 @@
 <head>
     <title>采美365网-中国美业全方位线上交易服务互动平台,做美业,上采美</title>
     <template th:replace="components/head-link"></template>
+     <link th:href="@{/css/base/center.css(v=${version})}" rel="stylesheet" type="text/css">
     <link th:href="@{/css/user-center/repair/list.css(v=${version})}" rel="stylesheet" type="text/css">
+    <link href="/lib/datapicker/daterangepicker.css" rel="stylesheet">
 </head>
 <body>
 <!-- 引用头部 -->
@@ -25,25 +27,25 @@
                     <div class="header-bt">
                         <div class="header-search">
                             <div class="search">
-                                <span class="label">关键词:</span>
+                                <span class="label">关键词</span>
                                 <input type="text" v-model="listQuery.searchNo" placeholder="输入订单编号进行搜索" class="search-input">
                             </div>
                             <div class="search-time">
-                                <span class="label">提交日期:</span>
-                                <div class="search-main">
+                                <span class="label">提交日期</span>
+                                <div class="search-main" id="orderDate">
                                     <div class="search-input">
                                         <input type="text" v-model="listQuery.beginTime" placeholder="订单开始时间" class="input">
-                                        <i class="icon mIcon"></i>
+                                        <i class="icon mIcon time"></i>
                                     </div>
                                     <span class="line">至</span>
                                     <div class="search-input">
                                         <input type="text" v-model="listQuery.endTime" placeholder="订单结束时间" class="input">
-                                        <i class="icon mIcon"></i>
+                                        <i class="icon mIcon time"></i>
                                     </div>
                                 </div>
                             </div>
-                            <div class="search">
-                                <span class="label">维修进度:</span>
+                            <div class="search jindu">
+                                <span class="label">维修进度</span>
                                 <select class="select" name="provinceID" @change="selectStatusFn">
                                     <option value="" >请选择</option>
                                     <option v-for="(item ,index) in StatusList" :key="index" :value='item.provinceID' >{{item.name}}</option>
@@ -115,6 +117,8 @@
 <!-- 引入底部 -->
 <template th:replace="components/footer"></template>
 <template th:replace="components/foot-link"></template>
+<script charset="utf-8" type="text/javascript" src="/lib/datapicker/moment.min.js"></script>
+<script charset="utf-8" type="text/javascript" src="/lib/datapicker/jquery.daterangepicker.js"></script>
 <script charset="utf-8" type="text/javascript" th:src="@{/js/common/serviceapi/repair.service.js(v=${version})}"></script>
 <script charset="utf-8" type="text/javascript" th:src="@{/js/user-center/repair/list.js(v=${version})}"></script>
 </body>