Merge branch 'developerB' of D:\xuwei_dev\caimei-caimei365-www with conflicts.

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

@@ -105,7 +105,7 @@
 
     .infotag {
         font-size: 10px;
-        width: 58px;
+           padding: 0 12px;
         height: 22px;
         line-height: 22px;
         text-align: center;
@@ -263,6 +263,8 @@
         color: #666;
         text-decoration: none;
     }
+    .vsi{visibility:hidden;
+    }
 }
 
 /* 移动端*/

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

@@ -21,8 +21,8 @@
      .perfect {width: 64px;height: 22px;background-color: #627386;border-radius: 2px;color: #ffffff;font-size: 12px;line-height: 22px;text-align: center;display: inline-block;cursor: pointer}
      .ziliao {font-size: 14px;color: #22272e;}
      .ziliao span {color: #f94b4b;}
-     .message {float: right;width: 30px;height: 30px;cursor: pointer;}
-     .msg_num {width: 20px;height: 20px;line-height: 20px;display: block;background: red;border-radius: 50%;color: #fff;font-size: 10px;text-align: center;position: relative;top: 10px;right: 9px;}
+     .message {float: right;width: 30px;height: 30px;cursor: pointer;margin-right: 10px}
+     .msg_num {width: 20px;height: 20px;line-height: 20px;display: block;background: red;border-radius: 50%;color: #fff;font-size: 10px;text-align: center;position: relative;top: 10px;right: -15px;}
      .icon.msg:before {width: 25px;height: 25px;background-position: -240px -371px}
      .product {margin: 20px 0;}
      .product p {font-size: 16px;font-weight: normal;font-stretch: normal;line-height: 21px;letter-spacing: 0px;color: #22272e;padding: 10px;}

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

@@ -14,11 +14,13 @@
     .red {color: #f94b4b;}
     .product {background: #fff;padding: 10px 15px;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: 17%;text-align: center;}
+    .product-title li {display: inline-block;list-style: none;color: #627386;width: 20%;text-align: center;}
     .product-title li:nth-child(1) {width: 46%;text-align: left}
+    .product-title li:last-child{width: 12%}
     .pro-information li {list-style: none;}
     .pro-information li {width: 100%;padding: 10px 0;}
-    .pro-information li div {display: inline-block;width: 17%;text-align: center;color: #627386;}
+    .pro-information li div {display: inline-block;width:20%;text-align: center;color: #627386;}
+     .pro-information li div:last-child{width: 12%}
     .pro-information li div.product-img {width: 46%;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}
@@ -33,8 +35,9 @@
     .order-item.pay span {color: #e15616;}
     .sett-re {margin-top: 20px}
     .sett-re div:nth-child(1) {color: #22272e;font-size: 16px;padding: 15px}
-    .sett-re div:nth-child(2) {background: #fff;height: 60px;line-height: 60px;padding-left: 15px;color: #22272e}
+    .sett-re div:nth-child(2) {background: #fff;height: 72px;line-height: 72px;padding-left: 15px;color: #22272e}
     .sett-re div:nth-child(2) p {display: inline-block;margin-right: 15px}
+    .NoText{color: #627386}
 }
 
 

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

@@ -1,390 +1,73 @@
 @media screen and (min-width:768px) {
-.pageWrap{width: 986px}
-  .crumbs{
-    font-size: 16px;
-    color: #22272e
-}
-.right{
-    width: 968px;
-    float: right;
-}
-.new-s-item>form{
-    overflow: hidden;
-    background: #fff;
-    padding: 10px 10px 17px 10px;
-    box-shadow: 0px 3px 6px 0px
-		rgba(0, 0, 0, 0.07);
-}
-.new-s-item>form>div{
-  float: left;
-  height: 40px;
-  margin: 10px 20px 0 20px;
-  font-size: 12px;
-  color: #627386;
-  line-height: 40px;
-  position: relative;
-}
-.new-s-item>form>label{
-    float: left;
-    margin: 10px 20px 0 20px;
-    font-size: 12px;
-    color: #627386;
-}
-.Buyer{
-    width: 168px;
-	height: 36px;
-	background-color: #ffffff;
-	border-radius: 2px;
-	border: solid 1px #b8bfca;
-	padding-left: 10px;
-	cursor: pointer;
-}
-.state{
-    width: 168px;
-    height: 36px;
-    background-color: #ffffff;
-    border-radius: 2px;
-    border: solid 1px #b8bfca;
-    padding-left: 10px;
-    color: #627386;
-    cursor: pointer;
-}
-input::placeholder{
-    color: #627386;
-    font-size: 12px;
-}
-.query-btn{
-    width: 90px;
-	height: 36px;
-	background-color: #e15616;
-	border-radius: 2px;
-	text-align: center;
-	line-height: 36px;
-	color: #ffffff;
-    margin: 15px 10px 0 0;
-    cursor: pointer;
-    float: right;
-}
-.supplier-main{
-    margin-top: 10px;
-    background: #fff;
-    padding-top: 15px;
-}
-.order-content{
-   padding: 10px 20px;
-   overflow: hidden
-}
-.order-title{
-    background-color: #ffffff;
-    padding: 10px 20px;
-    overflow: hidden;
-}
-.title-name{
-    float: left;
-    color: #22272e;
-
-}
-.title-time{
-    float: right;
-    color: #9aa5b5;
-}
-.order-item{
-    display: flex;
-}
-.order-item p{
-    display: inline-block;
-    color: #627386;
-    width: 25%;
-    margin-bottom: 20px
-}
-.red{
-    color: #f94b4b;
-}
-.order-botton{
-    width: 100%;
-    overflow: hidden;
-    height: 60px;
-    line-height: 60px;
-}
-.order-botton div{
-    float: right;
-}
-.order-botton a{
-    width: 90px;
-	height: 36px;
-	background-color: #ffe6dc;
-	border-radius: 2px;
-	border: solid 1px #e15616;
-	text-align: center;
-	line-height: 36px;
-	color: #e15616;
-	display: inline-block;
-	margin-right: 16px;
-}
-.order-product .product-img{
-    width: 100px;
-	height: 100px;
-	border: solid 1px #e2e7ef;
-	float: left;
-}
-.product-info .num{
-    margin-right: 80px;
-}
-.order-product .product-img img{
-    width: 100%;
-    height: 100%;
-}
-.order-product .product-info{
-    float: right;
-    width: 87%;
-}
-.order-product{
-    overflow: hidden;
-    margin-bottom: 10px
-}
-.product-info p{
-    color: #627386;
-    margin-top: 7px;
-}
-.userinfo{
-	background-color: #f0f3f7;
-	box-shadow: 0px 3px 6px 0px
-		rgba(0, 0, 0, 0.07);
-    padding: 10px 20px;
-    color: #627386;
-}
-.userinfo p{
-    display: inline-block;
-    margin: 10px 55px 10px 0;
-}
-.userinfo .blcak{
-    color: #22272e;
-}
+.pageWrap{width: 986px}  .crumbs{font-size: 16px;color: #22272e}
+.new-s-item>form{overflow: hidden;background: #fff;padding: 10px 10px 17px 10px;box-shadow: 0px 3px 6px 0px rgba(0, 0, 0, 0.07);}
+.new-s-item>form>div{float: left;height: 40px;margin: 10px 20px 0 20px;font-size: 12px;color: #627386;line-height: 40px;position: relative;}
+.new-s-item>form>label{float: left;margin: 10px 20px 0 20px;font-size: 12px;color: #627386;}
+.Buyer{width: 168px;height: 36px;background-color: #ffffff;border-radius: 2px;border: solid 1px #b8bfca;padding-left: 10px;cursor: pointer;}
+.state{width: 168px;height: 36px;background-color: #ffffff;border-radius: 2px;border: solid 1px #b8bfca;padding-left: 10px;color: #627386;cursor: pointer;}
+input::placeholder{color: #9aa5b5;font-size: 12px;}
+.query-btn{width: 90px;height: 36px;background-color: #e15616;border-radius: 2px;text-align: center;line-height: 36px;color: #ffffff;margin: 15px 10px 0 0;cursor: pointer;float: right;}
+.supplier-main{margin-top: 10px;background: #fff;padding-top: 15px;}
+.order-content{padding: 10px 20px;overflow: hidden}
+.order-title{background-color: #ffffff;padding: 10px 20px;overflow: hidden;}
+.title-name{float: left;color: #22272e;}
+.title-time{float: right;color: #9aa5b5;}
+.order-item{display: flex;}
+.order-item p{display: inline-block;color: #627386;width: 25%;margin-bottom: 20px}
+.order-item.pay p span{color: #e15616}
+.red{color: #f94b4b;}
+.order-botton{width: 100%;overflow: hidden;height: 60px;line-height: 60px;}
+.order-botton div{float: right;}
+.order-botton a{width: 90px;height: 36px;background-color: #ffe6dc;border-radius: 2px;border: solid 1px #e15616;text-align: center;line-height: 36px;color: #e15616;display: inline-block;margin-right: 16px;}
+.order-product .product-img{width: 100px;height: 100px;border: solid 1px #e2e7ef;float: left;}
+.product-info .num{margin-right: 80px;}
+.order-product .product-img img{width: 100%;height: 100%;}
+.order-product .product-info{float: right;width: 87%;}
+.order-product{overflow: hidden;margin-bottom: 10px}
+.product-info p{color: #627386;margin-top: 7px;}
+.userinfo{background-color: #f0f3f7;box-shadow: 0px 3px 6px 0px rgba(0, 0, 0, 0.07);padding: 10px 20px;color: #627386;}
+.userinfo p{display: inline-block;margin: 10px 55px 10px 0;}
+.userinfo .blcak{color: #22272e;}
 }
 
 /*移动*/
 @media screen and (max-width:768px) {
-    .wrap_tittle {
-    height: 10.6vw;
-    line-height: 10.6vw;
-    background: #fff;
-    padding: 0 2.7vw;
-    font-size: 3.4vw;
-    color: #22272e;
-    border-bottom: solid .27vw #e2e7ef;
-}
-.mIcon.wrap_tittle:before {
-    width: 6.7vw;
-    height: 6.7vw;
-    background-position: -50.7vw -51.5vw;
-    position: absolute;
-    top: 28vw;
-    }
-    .mIcon.open:before {
-    width: 10.6vw;
-    height: 11.2vw;
-    float: right;
-    background-position: -48.8vw 2.7vw;
-    }
-.right{
-    width: 100%;
-}
-.new-s-item>form{
-    overflow: hidden;
-    background: #fff;
-    padding: 2.7vw 2.7vw 4.5vw 2.7vw;
-    box-shadow: 0px .8vw 1.6vw 0px rgba(0, 0, 0, 0.07)
-}
-.new-s-item>form>div{
-    font-size: 3.4vw;
-    color: #627386;
-    width: 93.4vw;
-    margin-bottom: 2.6vw;
-    display: inline-block
-}
-.new-s-item>form>div.order-border{
-    border: 1px solid #b8bfca;
-}
-.new-s-item>form>div.order-border span{
-     padding-left: 2.7vw;
-}
-.new-s-item>form>label{
-    float: left;
-    margin-bottom: 2.6vw;
-    font-size: 3.4vw;
-    color: #627386;
-    border: 1px solid #b8bfca;
-    height: 11.8vw;
-    padding-left: 2.7vw;
-    line-height: 11.8vw
-}
-.Buyer{
-    height: 11.8vw;
-    background-color: #ffffff;
-    border-radius: .53vw;
-    border: 0;
-    cursor: pointer;
-    width: 72vw
-}
-.state{
-    width: 93.4vw;
-    height: 11.7vw;
-    background-color: #ffffff;
-    border-radius: .53vw;
-    border: solid .27vw #b8bfca;
-    padding-left: 2.7vw;
-    color: #627386;
-    cursor: pointer;
-    margin-top: 2.6vw
-}
-/*select::-ms-expand { display: none; }*/
-/*select {*/
-/*    appearance:none;*/
-/*    -moz-appearance:none;*/
-/*    -webkit-appearance:none;*/
-/* }*/
-input::placeholder{
-    color: #9aa5b5;
-}
-.query-btn{
-    width: 35.3vw;
-    height: 11.2vw;
-    background-color: #ffe6dc;
-    border-radius: .53vw;
-    text-align: center;
-    line-height: 11.2vw;
-    color: #e15616;
-    margin: 2.7vw 29.3vw;
-    cursor: pointer;
-    border: .27vw solid #e15616
-}
-.supplier-main{
-    margin-top: 2.7vw;
-    background: #fff;
-    padding-top: 2.7vw;
-    position: relative
-}
-.order-content{
-   padding: 1.3vw 5.3vw;
-   overflow: hidden
-}
-.order-title{
-    background-color: #ffffff;
-    padding: 0 5.3vw;
-    overflow: hidden;
-    font-size: 3.7vw;
-}
-.title-name{
-    color: #e15616;
-    margin-bottom: 3.8vw;
-}
-.title-time{
-    color: #9aa5b5;
-    margin-bottom:3.8vw;
-}
-.order-item{
-overflow:hidden ;
-}
-.order-item p{
-    margin-bottom: 5.3VW;
-    width: 50%;
-    float: left;
-}
-.order-item.pay span{
-    color: #e15616;
-}
-.red{
-    color: #f94b4b;
-}
-.order-botton{
-    width: 100%;
-    overflow: hidden;
-    height: 16vw;
-    line-height: 16vw;
-}
-.order-botton div{
-    float: right;
-}
-.order-botton a{
-   margin-left: 2.7vw;
-    width: 22.4vw;
-    height: 9.6vw;
-    background-color: #ffe6dc;
-    border-radius: .53vw;
-    border: solid 1px #e15616;
-    text-align: center;
-    line-height: 9.6vw;
-    color: #e15616;
-    display: inline-block
-}
-.order-botton .deatil{
-    border: 1px solid #1890f9;
-    line-height: 7.2vw;
-    right: 5.7vw;
-    position: absolute;
-    top: 10vw;
-    width: 22.4vw;
-    height: 7.2vw;
-    border-radius: 3.6vw;
-    color: #1890f9;
-    background: #e0f1ff
-}
-.order-product .product-img{
-    width: 28VW;
-    height: 28VW;
-	border: solid 1px #e2e7ef;
-	float: left;
-}
-.product-info .num:nth-child(1){
-    float: left;
-}
-.product-info .num:nth-child(2){
-    float: right;
-}
-.order-product .product-img img{
-    width: 100%;
-    height: 100%;
-}
-.order-product .product-info{
-    float: right;
-    width: 65%;
-}
-.order-product{
-    overflow: hidden;
-    margin-bottom: 1.9vw;
-}
-.product-info p{
-    color: #627386;
-    margin-top: 7px;
-    overflow: hidden;
-}
-.userinfo{
-	background-color: #f0f3f7;
-	box-shadow: 0px 3px 6px 0px
-		rgba(0, 0, 0, 0.07);
-    padding: 10px 20px;
-    color: #627386;
-}
-.product-info h3{
-    font-size: 3.7VW;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-}
-.userinfo p{
-    display: inline-block;
-    margin-bottom: 2.7vw;
-}
-.username p:nth-child(1){
-    width: 100%;
-}
-.username p:nth-child(2){
-    float: left;
-}
-.username p:nth-child(3){
-    float: right;
-}
-.userinfo .blcak{
-    color: #22272e;
-}
+    .wrap_tittle {height: 10.6vw;line-height: 10.6vw;background: #fff;padding: 0 2.7vw;font-size: 3.4vw;color: #22272e;border-bottom: solid .27vw #e2e7ef;}
+.mIcon.wrap_tittle:before {width: 6.7vw;height: 6.7vw;background-position: -50.7vw -51.5vw;position: absolute;top: 28vw;}  .mIcon.open:before {width: 10.6vw;height: 11.2vw;float: right;background-position: -48.8vw 2.7vw;}
+.right{width: 100%;}  .new-s-item>form{overflow: hidden;background: #fff;padding: 2.7vw 2.7vw 4.5vw 2.7vw;box-shadow: 0px .8vw 1.6vw 0px rgba(0, 0, 0, 0.07)}
+.new-s-item>form>div{font-size: 3.4vw;color: #627386;width: 93.4vw;margin-bottom: 2.6vw;display: inline-block}
+.new-s-item>form>div.order-border{border: 1px solid #b8bfca;}
+.new-s-item>form>div.order-border span{padding-left: 2.7vw;}
+.new-s-item>form>label{float: left;margin-bottom: 2.6vw;font-size: 3.4vw;color: #627386;border: 1px solid #b8bfca;height: 11.8vw;padding-left: 2.7vw;line-height: 11.8vw}
+.Buyer{height: 11.8vw;background-color: #ffffff;border-radius: .53vw;border: 0;cursor: pointer;width: 72vw}
+.state{width: 93.4vw;height: 11.7vw;background-color: #ffffff;border-radius: .53vw;border: solid .27vw #b8bfca;padding-left: 2.7vw;color: #627386;cursor: pointer;margin-top: 2.6vw}
+input::placeholder{color: #9aa5b5;}
+.query-btn{width: 35.3vw;height: 11.2vw;background-color: #ffe6dc;border-radius: .53vw;text-align: center;line-height: 11.2vw;color: #e15616;margin: 2.7vw 29.3vw;cursor: pointer;border: .27vw solid #e15616}
+.supplier-main{margin-top: 2.7vw;background: #fff;padding-top: 2.7vw;position: relative}
+.order-content{padding: 1.3vw 5.3vw;overflow: hidden}
+.order-title{background-color: #ffffff;padding: 0 5.3vw;overflow: hidden;font-size: 3.7vw;}
+.title-name{color: #e15616;margin-bottom: 3.8vw;}
+.title-time{color: #9aa5b5;margin-bottom:3.8vw;}
+.order-item{overflow:hidden ;}
+.order-item p{margin-bottom: 5.3VW;width: 50%;float: left;}
+.order-item.pay span{color: #e15616;}
+.red{color: #f94b4b;}
+.order-botton{width: 100%;overflow: hidden;height: 16vw;line-height: 16vw;}
+.order-botton div{float: right;}
+.order-botton a{margin-left: 2.7vw;width: 22.4vw;height: 9.6vw;background-color: #ffe6dc;border-radius: .53vw;border: solid 1px #e15616;text-align: center;line-height: 9.6vw;color: #e15616;display: inline-block}
+.order-botton .deatil{border: 1px solid #1890f9;line-height: 7.2vw;right: 5.7vw;position: absolute;top: 10vw;width: 22.4vw;height: 7.2vw;border-radius: 3.6vw;color: #1890f9;background: #e0f1ff}
+.order-product .product-img{width: 28VW;height: 28VW;border: solid 1px #e2e7ef;float: left;}
+.product-info .num:nth-child(1){float: left;}
+.product-info .num:nth-child(2){float: right;}
+.order-product .product-img img{width: 100%;height: 100%;}
+.order-product .product-info{float: right;width: 65%;}
+.order-product{overflow: hidden;margin-bottom: 1.9vw;}
+.product-info p{color: #627386;margin-top: 7px;overflow: hidden;}
+.userinfo{background-color: #f0f3f7;box-shadow: 0px 3px 6px 0px rgba(0, 0, 0, 0.07);padding: 10px 20px;color: #627386;}
+.product-info h3{font-size: 3.7VW;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;}
+.userinfo p{display: inline-block;margin-bottom: 2.7vw;}
+.username p:nth-child(1){width: 100%;}
+.username p:nth-child(2){float: left;}
+.username p:nth-child(3){float: right;}
+.userinfo .blcak{color: #22272e;}
 }

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

@@ -1,6 +1,6 @@
 @media screen and (min-width:768px) {
     .sales-list {width: 1056px;margin: 0 auto;}
-    #saleslist {background: #fff;}
+    #saleslist {background: #fff;height: 980px}
     .sales-list > .sales-list-title {width: 100%;height: 120px;line-height: 120px;text-align: center;font-size: 32px;color: #22272e;}
     .sales-list > .sales-list-cantent {width: 96%;background: #fff;margin: 0 auto;border-left: 1px solid #b8bfca;border-top: 1px solid #b8bfca;border-bottom: 1px solid #b8bfca;}
     .sales-list > .sales-list-cantent > .number-time,

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

@@ -10,7 +10,7 @@
    #newBtn{float: right;margin: 0}
    .query-btn{ width: 90px; height: 36px; background-color: #e15616;border-radius: 2px;text-align: center;color: #fff;line-height: 36px;cursor: pointer}
    .main-content{padding: 0 20px 30px 20px;background: #fff; margin-top: 10px;box-shadow: 0px 3px 6px 0px rgba(0, 0, 0, 0.07)}
-   .main-title{height: 55px;line-height: 55px;border-bottom: solid 1px #e2e7ef;}
+   .main-title{height: 55px;line-height: 55px;border-bottom: solid 1px #e2e7ef;color: #627386;}
    .main-title li{list-style: none;display: inline-block;width: 10%; text-align: center}
    .main-title li.samewidth{width: 15%;}
    .main-title li:nth-child(4){width: 20%}

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

@@ -11,7 +11,9 @@
    .container{background: #fff;box-shadow: 0px 3px 6px 5px rgba(34, 39, 46, 0.07); padding-top: 19px}
    .container .forget-form{width: 500px; margin: 0 auto;padding: 20px 0}
    .formLine select[name="cityID"]{margin: 0 14px}
-   .formLine p{color: #627386;}
+   .formLine p{color: #627386;padding-left: 12px}
+   .formLine.rightTxt p{padding-left: 17px;}
+   .formLine p em{margin: 0}
    input[type="text"]::placeholder,textarea::placeholder{color: #9aa5b5;}
    .formLine .diyBox.second{width: 111px}
    .formLine .business .diyBox {margin-right: 14px}
@@ -44,8 +46,8 @@
    .formLine .addbusiness a {display: block;float: left; width: 92px;height: 32px;line-height: 34px;font-size: 14px;color: #e15616;background-color: #ffe6dc;border-radius: 2px;border: solid 1px #e15616;text-align: center;}
    .supplierConfirm{width: 100%;height: 100%;position: fixed;top:0;left:0;z-index: 999;background: rgba(0,0,0,.3);}
    .formLine.info textarea{margin: 0px}
-   .header{ width: 100%; background-image: linear-gradient(270deg,rgba(255,255,255,0.1) 0%,rgba(255,86,11,0.1) 51%,rgba(255,255,255,0.1) 100%);}
-    .header .header-p{height: 60px; line-height: 26px; font-size: 12px;color: #e15616; text-align: center;margin: auto;width: 355px}
+   .header{ width: 100%;height: 60px; background-image: linear-gradient(270deg,rgba(255,255,255,0.1) 0%,rgba(255,86,11,0.1) 51%,rgba(255,255,255,0.1) 100%);}
+   .header .header-p{height: 34px; line-height: 18px; font-size: 12px;color: #e15616; text-align: center;margin: auto;width: 355px;padding-top: 12px}
    }
 
 

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

@@ -6,10 +6,10 @@
   .state {width: 168px;height: 36px;background-color: #ffffff;border-radius: 2px;border: solid 1px #b8bfca;padding-left: 10px;color: #627386;cursor: pointer;}
   input::placeholder{color: #9aa5b5;font-size: 12px;}
   textarea::placeholder{color: #9aa5b5;}
-  #newBtn div{height: 36px;border-radius: 2px;display: inline-block;text-align: center;margin-left: 10px;cursor: pointer}
+  #newBtn div{height: 36px;line-height:36px;border-radius: 2px;display: inline-block;text-align: center;margin-left: 10px;cursor: pointer}
   #newBtn{float: right}
   .query-btn{background-color: #e15616;color: #fff;width: 90px;border: 1px solid #e15616}
-  .addBrand{border: solid 1px #e15616;width: 128px;color: #e15616;}
+  .addBrand{border: solid 1px #e15616;width: 128px;color: #e15616;background: #ffe6dc}
   .brand-list{padding:0 20px 30px 20px; background: #fff; margin-top: 10px;box-shadow: 0px 3px 6px 0px rgba(0, 0, 0, 0.07);}
   .brand-title li{list-style: none;display: inline-block;color: #627386;width: 11%;text-align: center}
   .brand-title li:first-child{text-align: left}
@@ -24,7 +24,7 @@
   .tbody li:nth-child(3){width: 15%}
   .tbody li:nth-child(4){width: 30%}
   .tbody li:nth-child(5){width: 15%}
-  .tbody li:last-child{width: 52px;height: 24px;background-color: #ffe6dc; border-radius: 2px;border: solid 1px #e15616;margin-left: 60px;color: #e15616;cursor: pointer}
+  .tbody li:last-child{width: 52px;height: 24px;background-color: #ffe6dc; border-radius: 2px;border: solid 1px #e15616;margin-left: 92px;color: #e15616;cursor: pointer}
   .tbody ul{height: 100px;line-height: 100px;margin-bottom: 10px}
   .brand-logo img{width: 80px;height: 80px}
   .brand-name h3{font-size: 12px}

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

@@ -21,7 +21,7 @@ li{list-style: none}
   .goods-main .goods-table ul li:nth-child(3),.goods-main .goods-table ul li:nth-child(4){width: 20%}
   .goods-main .goods-table ul li:last-child{width: 23%;position: relative}
   .tbody ul li{height: 96px;font-size: 12px;}
-  .tbody ul{overflow: inherit;padding: 0 20px;position: relative;}
+  .tbody ul{overflow: hidden;padding: 0 20px;position: relative;}
   .tbodyle ul li:nth-child(2){width: 25%;}
   .tbody ul li:nth-child(3),.goods-main .goods-table ul li:nth-child(3){ width: 16%}
   .tbody ul li:last-child{width: 20%}
@@ -34,7 +34,7 @@ li{list-style: none}
   .goods-main  .tbody .good-info img{width: 80px;height: 80px;margin-top: 8px}
   .tbody ul li .good-classFly,.tbody ul li .good-price,.tbody ul li .status{position: relative;top: 50%;left: 50%;transform: translate(-50%, -50%);width: fit-content;}
   .goods-main  .tbody .good-name{margin-left: 8px;vertical-align: middle;word-break: break-all;overflow: hidden;text-overflow: ellipsis;display: -webkit-inline-box;-webkit-line-clamp: 2;-webkit-box-orient: vertical;width: 112px}
-  .goods-main  .tbody .good-handle{padding: 0 7px;line-height: 40px;position: absolute;width: 180px;top: 0;left: 0;right: 0;bottom: 0;margin: auto;height: fit-content}
+  .goods-main  .tbody .good-handle{padding: 0 7px;line-height: 35px;position: absolute;width: 180px;top: 0;left: 0;right: 0;bottom: 0;margin: auto;height: fit-content}
   .goods-main  .tbody .btn{width: 52px;height: 24px;background-color: #ffe6dc;border-radius: 2px;border: solid 1px #e15616;display: inline-block;line-height: 24px;color: #e15616;}
   .goods-main .tbody .success,.goods-main .tbody .danger{width: 88px}
   .goods-main .tbody .primary{width: 62px}

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

@@ -39,7 +39,7 @@ div{box-sizing: border-box;}
 .release-from .release-input .release-param{width:100%;height: auto;padding: 0 10px;border: 1px solid #EFEFEF;float: left;margin-bottom: 10px;border-radius: 2px;position: relative;}
 .release-from .release-input .release-param .param-input{width: 100%;height: 36px;border: none;font-size: 13px;line-height: 36px;}
 .release-from .release-input .release-param .param-input:first-child{border-bottom: 1px solid #EFEFEF;}
-.release-from .release-input .release-param .del-btn{display: block;line-height: 64px;color: #FF0000;font-size: 14px;position: absolute;top: 0;right: -40px;}
+.release-from .release-input .release-param .del-btn{display: block;line-height: 64px;color: #FF0000;font-size: 14px;position: absolute;    top: -18px;right: 0px;}
 .release-from .release-input .release-opt{width: 100%;height: 155px;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: 25px;left: 0;}
 .release-from .release-input .textarea{width: 420px;height: 150px;position: relative;padding: 10px;overflow: hidden;}
 .release-from .release-input .textarea .limit-text{position: absolute;right: 15px;bottom: 10px;line-height: 30px;font-size:13px ;color: #D0D0D0;}
@@ -60,7 +60,7 @@ div{box-sizing: border-box;}
 .release-from .release-input .add-btn.active{background-color: #ffe6dc;color: #e15616;}
 .release-from .release-tips{width: 100%;color: #FF0000;float: left;}
 .release-from.text{height: auto;}
-.release-from .text{width: 303px;line-height: 32px;font-size: 12px;color: #e15616;margin-top: 8px;}
+.release-from .text{width: 303px;line-height: 32px;font-size: 12px;color: #e15616;}
 .release-from .tags-main{width: 100%;height: auto;}
 .release-from .tags-main .item-tags{padding: 0 10px;line-height: 28px;background: #FFF3E5;text-align: center;font-size:14px;color:  #333333;margin: 5px;border-radius: 2px;float: left;position: relative;}
 .release-from .tags-main .item-tags .del-tags{width: 16px;height: 16px;display: block;background: url("/img/base/icon.png") no-repeat;background-position: -175px -300px;position: absolute;right: -5px;top: -5px;cursor: pointer;}
@@ -110,7 +110,7 @@ input[type="radio"]{opacity:0;}
 .popup-layer .popup-content .popup-from .popup-p{width: 240px;height: 32px;font-size: 14px;color: #333;padding: 0 10px;float: left;}
 .popup-layer .popup-content .popup-from .popup-textarea{height: 78px;float: left;margin-left: 10px;border-radius: 2px;}
 .popup-layer .popup-content .popup-from textarea{width: 100%;height: 100%;font-size: 12px;resize:none;border: 1px solid #EFEFEF;padding: 5px;}
-.popup-layer .popup-content .popup-from  .poze{width: 40px;height: 30px;text-align: center;font-size: 14px;position: absolute;right: 0;top: 0;padding: 0 10px;}
+.popup-layer .popup-content .popup-from  .poze{width: 40px;height: 30px;text-align: center;font-size: 14px;position: absolute;right: 0;top: 0;}
 .popup-layer .popup-content .popup-tips{color: #FF0000;float: left;margin-left: 10px;}
 .popup-layer .popup-content .popup-from .popup-upload{height: 48px;float: left;margin-left: 10px;}
 .popup-layer .popup-content .popup-from  .upload-file{width: 48px;height: 48px;border: 1px solid #EFEFEF;border-radius: 2px;position: relative;cursor: pointer;}
@@ -129,6 +129,12 @@ input[type="radio"]{opacity:0;}
 input::placeholder{color: #9aa5b5}
 .release-from.shili .text{width: 100%;color: #627386}
 .imgText .text{width: 100%;color: #627386}
+.release-from .release-label.rightTxt{padding-left: 6px}
+.icon.del-btn:before{
+    width: 20px;
+    background-position: -114px -140px;
+    height: 20px
+}
 }
 
 /*移动*/

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

@@ -217,4 +217,10 @@ var SupplierApi = {
                 callback(res);
             });
         },
+        salesList : function(params,callback) {//售货清单
+            Http.AjaxService({ url:'/supplier/salesList', type:'get', data:params, json:true})
+            .then(function(res){
+                callback(res);
+            });
+        },
 };

src/main/resources/static/js/supplier-center/order/detail.js

@@ -16,14 +16,15 @@ var seeDetail = new Vue({
             if(res.code==0){
                 _this.order = res.data.shopOrder
                 _this.userInfo = res.data.shopOrder.userInfo;
-                _this.orderList =res.data.shopOrder.orderProductList
-                if(res.data.payShopRecord==''){
-                _this.payflag = false;
-                 _this.payShopRecord = [];
-                }else {
-                _this.payflag = true;
-                 _this.payShopRecord = res.data.payShopRecord;
-                }
+                _this.orderList =res.data.shopOrder.orderProductList;
+                _this.payShopRecord = res.data.payShopRecord;
+                // if(res.data.payShopRecord==''){
+                // _this.payflag = false;
+                //  _this.payShopRecord = [];
+                // }else {
+                // _this.payflag = true;
+                //  _this.payShopRecord = res.data.payShopRecord;
+                // }
             }
          })
         },

src/main/resources/static/js/supplier-center/order/orderlist.js

@@ -69,9 +69,8 @@ var orderList = new Vue({
        var _this = this;
         SupplierApi.MyOrderList(_this.params,function (res) {
             if(res.code==0){
-                 console.log(res)
+                  _this.isRequset = false;
                  if(res.data.results.length > 0){
-                     _this.isRequset = false;
                      _this.results = res.data.results;
                      _this.listRecord = res.data.totalRecord;
                  }else {

src/main/resources/static/js/supplier-center/order/saleslist.js

@@ -11,6 +11,14 @@ var saleslist = new Vue({
         }
     },
     mounted:function () {
-     this.shopOrderId=CAIMEI.getUrlParam('shopOrderID');
+     var _this = this;
+     _this.shopOrderId=CAIMEI.getUrlParam('shopOrderID');
+     SupplierApi.salesList({shopOrderId:_this.shopOrderId},function (res) {
+         if(res.code==0){
+            console.log(res)
+         }else {
+          CAIMEI.Alert(res.msg,'确定')
+         }
+     })
     }
 })

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

@@ -68,9 +68,9 @@
                         </p>
                         <div class="tag">
                            <span class="infotag news" v-if="detail.sold==0&&detail.newAdded==1">最新</span>
-                           <span class="infotag brand" v-if="detail.brandName==null&&detail.brandName==''">{{detail.brandName}}</span>
+                           <span class="infotag brand" v-if="detail.brandName!=null&&detail.brandName!=''">{{detail.brandName}}</span>
                            <span class="infotag sold" v-if="detail.sold==1&&detail.newAdded==1||detail.sold==1&&detail.newAdded==0">已售</span>
-                           <span class="infotag other" v-if="detail.brandID==161&&detail.brandName!=''">{{detail.brandName}}</span>
+                           <span class="infotag other" v-if="detail.brandID==161&&detail.brandName!=''&&detail.brandName!=null">{{detail.brandName}}</span>
                          </div>
                     </div>
                      <div class="info " v-if="HandType">

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

@@ -43,7 +43,7 @@
                 <div class="ItemInfo">
                     <div class="tag">
                         <span class="infotag news" v-if="item.sold==0&&item.newAdded==1">最新</span>
-                        <span class="infotag brand" v-if="item.brandName==null&&item.brandName==''">{{item.brandName}}</span>
+                        <span class="infotag brand" v-if="item.brandName!=null&&item.brandName!=''">{{item.brandName}}</span>
                         <span class="infotag sold" v-if="item.sold==1&&item.newAdded==1||item.sold==1&&item.newAdded==0">已售</span>
                         <span class="infotag other" v-if="item.brandID==161&&item.brandName!=''&&item.brandName!=null">{{item.brandName}}</span>
                     </div>

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

@@ -42,7 +42,7 @@
                     <div class="no-delivery-record" v-if="isShow">
                         <img src="/img/order/kon.png" v-if="isPC">
                         <img src="/img/order/H5kon.png" V-else>
-                        <p>此订单还没有发货记录，快去<span>补充</span>他吧</p>
+                        <p>此订单还没有发货记录，快去<span>补充</span>它吧</p>
                     </div>
                     <div class="product" v-for="r in results">
                         <ul class="product-title">

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

@@ -58,9 +58,9 @@
                                     <img :src="pro.productImage"/>
                                     <h3>{{pro.aliasName}}</h3>
                                 </div>
-                                <div>{{pro.price}}</div>
+                                <div>￥{{pro.price}}</div>
                                 <div>{{pro.num}}({{pro.presentNum}})</div>
-                                <div>{{pro.totalAmount}}</div>
+                                <div>￥{{pro.totalAmount}}</div>
                             </li>
                         </ul>
                     </div>
@@ -98,9 +98,14 @@
                     </div>
                     <div class="sett-re">
                         <div>结算记录</div>
-                         <div v-if="payflag" v-for="pay in payShopRecord">
-                             <p>{{pay.status}}.结算时间：{{pay.payTime}}</p>
-                             <p>结算金额：¥{{pay.payAmount}}</p>
+                        <div  v-if="payShopRecord !=''">
+                             <div v-for="pay in payShopRecord">
+                                 <p>{{pay.status}}.结算时间：{{pay.payTime}}</p>
+                                 <p>结算金额：¥{{pay.payAmount}}</p>
+                             </div>
+                         </div>
+                         <div v-else>
+                            <p class="NoText">暂无结算记录</p>
                          </div>
                     </div>
                 </div>

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

@@ -50,76 +50,82 @@
                             <img src="/img/base/loading.gif">
                         </div>
                         <template v-else>
-                         <div class="supplier-main order" v-for="(order,index) in results" :key="index">
-                            <div class="order-title" >
-                                <div class="title-name">
-                                    <p>订单编号(标识)：{{order.shopOrderNo}}</p>
-                                </div>
-                                <div class="title-time">
-                                    <p>下单时间：{{order.orderTime}}</p>
-                                </div>
-                            </div>
-                            <div class="order-content">
-                                <div class="order-item pay">
-                                    <p>结算状态：&nbsp;
-                                        <span v-if="order.payStatus==1||order.payStatus==null"> 待结算</span>
-                                        <span v-if="order.payStatus==2"> 部分结算</span>
-                                        <span v-if="order.payStatus==3"> 已结算</span>
-                                    </p>
-                                    <p>发货状态：&nbsp;
-                                        <span v-if="order.sendOutStatus==1">待发货</span>
-                                        <span v-if="order.sendOutStatus==null">未发货</span>
-                                        <span v-if="order.sendOutStatus==2">部分发货</span>
-                                        <span v-if="order.sendOutStatus==3">已发货</span>
-                                    </p>
-                                </div>
-                                <div class="order-item">
-                                    <p>商品金额：<span class="red">￥{{order.productAmount.toFixed(2)}}</span> </p>
-                                    <p>结算商品金额：<span class="red">￥{{order.shopProductAmount.toFixed(2)}}</span> </p>
-                                    <p>结算税费：<span class="red">￥{{order.shopTaxFee.toFixed(2)}}</span> </p>
-                                    <p>结算运费：<span class="red">￥{{order.shopPostFee.toFixed(2)}}</span> </p>
-                                </div>
-                                <div class="order-item">
-                                    <p>总结算金额：<span class="red">￥{{order.shouldPayShopAmount.toFixed(2)}}</span> </p>
-                                    <p>已结算金额：<span class="red">￥{{order.payedShopAmount.toFixed(2)}}</span> </p>
-                                </div>
-                                <div class="order-product" v-for="proitem in order.orderProductList">
-                                    <div class="product-img">
-                                        <img :src="proitem.productImage"/>
+                        <div  v-if="results.length>0">
+                             <div class="supplier-main order" v-for="(order,index) in results" :key="index">
+                                <div class="order-title" >
+                                    <div class="title-name">
+                                        <p>订单编号(标识)：{{order.shopOrderNo}}</p>
+                                    </div>
+                                    <div class="title-time">
+                                        <p>下单时间：{{order.orderTime}}</p>
                                     </div>
-                                    <div class="product-info">
-                                        <h3>{{proitem.name}}</h3>
-                                        <p>
-                                        <span class="num" >数量：&nbsp;{{proitem.num}}</span>
-                                        <span class="num">已发货：&nbsp;{{proitem.shipmentsNum}}</span>
-                                        <span class="num" v-if="order.returnedNum!=null&&order.returnedNum!=0">已退/已取消：&nbsp;{{proitem.actualCancelNum}}</span>
+                                </div>
+                                <div class="order-content">
+                                    <div class="order-item pay">
+                                        <p>结算状态：&nbsp;
+                                            <span v-if="order.payStatus==1||order.payStatus==null"> 待结算</span>
+                                            <span v-if="order.payStatus==2"> 部分结算</span>
+                                            <span v-if="order.payStatus==3"> 已结算</span>
+                                        </p>
+                                        <p>发货状态：&nbsp;
+                                            <span v-if="order.sendOutStatus==1">待发货</span>
+                                            <span v-if="order.sendOutStatus==null">未发货</span>
+                                            <span v-if="order.sendOutStatus==2">部分发货</span>
+                                            <span v-if="order.sendOutStatus==3">已发货</span>
                                         </p>
-                                        <p >单价：&nbsp;<span>￥{{proitem.price.toFixed(2)}}</span> </p>
-                                        <p>合计：&nbsp;<span class="red">￥{{proitem.totalAmount.toFixed(2)}}</span> </p>
                                     </div>
+                                    <div class="order-item">
+                                        <p>商品金额：<span class="red">￥{{order.productAmount.toFixed(2)}}</span> </p>
+                                        <p>结算商品金额：<span class="red">￥{{order.shopProductAmount.toFixed(2)}}</span> </p>
+                                        <p>结算税费：<span class="red">￥{{order.shopTaxFee.toFixed(2)}}</span> </p>
+                                        <p>结算运费：<span class="red">￥{{order.shopPostFee.toFixed(2)}}</span> </p>
+                                    </div>
+                                    <div class="order-item">
+                                        <p>总结算金额：<span class="red">￥{{order.shouldPayShopAmount.toFixed(2)}}</span> </p>
+                                        <p>已结算金额：<span class="red">￥{{order.payedShopAmount.toFixed(2)}}</span> </p>
+                                    </div>
+                                    <div class="order-product" v-for="proitem in order.orderProductList">
+                                        <div class="product-img">
+                                            <img :src="proitem.productImage"/>
+                                        </div>
+                                        <div class="product-info">
+                                            <h3>{{proitem.name}}</h3>
+                                            <p>
+                                            <span class="num" >数量：&nbsp;{{proitem.num}}</span>
+                                            <span class="num">已发货：&nbsp;{{proitem.shipmentsNum}}</span>
+                                            <span class="num" v-if="order.returnedNum!=null&&order.returnedNum!=0">已退/已取消：&nbsp;{{proitem.actualCancelNum}}</span>
+                                            </p>
+                                            <p >单价：&nbsp;<span>￥{{proitem.price.toFixed(2)}}</span> </p>
+                                            <p>合计：&nbsp;<span class="red">￥{{proitem.totalAmount.toFixed(2)}}</span> </p>
+                                        </div>
 
-                                </div>
-                                <div class="order-botton">
-                                   <div>
-                                        <a class="btn" href="javascript: void(0);" v-if="order.sendOutStatus!=3" :value="order.shopOrderID" @click="delivery(order.shopOrderID)">发货</a>
-                                        <a class="btn" href="javascript: void(0);" @click="record(order.shopOrderID)">发货记录</a>
-                                        <a class="btn" href="javascript: void(0);" @click="Checklist(order.shopOrderID)" target="_blank">售货清单</a>
-                                        <a class="btn deatil" href="javascript: void(0);" @click="seedetail(order.shopOrderID)" >查看详情</a>
-                                   </div>
+                                    </div>
+                                    <div class="order-botton">
+                                       <div>
+                                            <a class="btn" href="javascript: void(0);" v-if="order.sendOutStatus!=3" :value="order.shopOrderID" @click="delivery(order.shopOrderID)">发货</a>
+                                            <a class="btn" href="javascript: void(0);" @click="record(order.shopOrderID)">发货记录</a>
+                                            <a class="btn" href="javascript: void(0);" @click="Checklist(order.shopOrderID)" target="_blank">售货清单</a>
+                                            <a class="btn deatil" href="javascript: void(0);" @click="seedetail(order.shopOrderID)" >查看详情</a>
+                                       </div>
 
+                                    </div>
                                 </div>
+                                 <div class="userinfo" >
+                                        <div class="username">
+                                             <p>买家名称：<span class="blcak">{{order.userInfo.name}}</span> </p>
+                                             <p >收货人：<span class="blcak">{{order.userInfo.shouHuoRen}}</span> </p>
+                                             <p >联系方式：<span class="blcak">{{order.userInfo.mobile}}</span> </p>
+                                        </div>
+                                        <div class="address">
+                                            <p >收货地址：&nbsp;&nbsp;<span class="blcak">{{order.userInfo.address}}</span> </p>
+                                        </div>
+                                 </div>
                             </div>
-                             <div class="userinfo" >
-                                    <div class="username">
-                                         <p>买家名称：<span class="blcak">{{order.userInfo.name}}</span> </p>
-                                         <p >收货人：<span class="blcak">{{order.userInfo.shouHuoRen}}</span> </p>
-                                         <p >联系方式：<span class="blcak">{{order.userInfo.mobile}}</span> </p>
-                                    </div>
-                                    <div class="address">
-                                        <p >收货地址：&nbsp;&nbsp;<span class="blcak">{{order.userInfo.address}}</span> </p>
-                                    </div>
-                             </div>
                         </div>
+                            <div v-else class="empty">
+                                <img src="/img/common/empty.png">
+                                <div class="msg"><p>暂无数据</p></div>
+                            </div>
                          </template>
                     </div>
 

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

@@ -46,7 +46,7 @@
                                 <i class="checked icon mIcon"></i>
                                 <span class="errTips icon mIcon" tips="请输入公司名称"></span>
                             </div>
-                            <div class="formLine" >
+                            <div class="formLine rightTxt" >
                                 <p>公司简称：</p>
                                 <input  class="massageBtn"  type="text" v-model.trim="params.sname"  placeholder="请与营业执照的注册名称保持一致"  maxlength="10" >
                                 <span class="errTips"></span>
@@ -75,18 +75,18 @@
                                 <i class="checked icon mIcon"></i>
                                 <span class="errTips icon mIcon" tips="请输入正确的联系人姓名"></span>
                             </div>
-                            <div class="formLine">
+                            <div class="formLine rightTxt">
                                 <p>邮箱(<span>邮箱可用作登录账号，请使用公司邮箱或法人邮箱</span>)：</p>
                                 <input type="text" v-model.trim="params.email" placeholder="请输入邮箱地址" maxlength="40">
                                 <span class="errTips"></span>
                             </div>
-                            <div class="formLine">
+                            <div class="formLine rightTxt">
                                 <p>固定电话：</p>
                                 <input class="massageBtn"  type="text" v-model.trim="params.contractPhone" placeholder="请在号码前加区" :rule="rule.phone" onkeyup="if(isNaN(value))execCommand('undo')"maxlength="11" >
                                 <i class="checked icon mIcon"></i>
                                 <span class="errTips"></span>
                             </div>
-                            <div class="formLine">
+                            <div class="formLine rightTxt">
                                 <p>传真：</p>
                                 <input class="massageBtn"  type="text" v-model.trim="params.fax" placeholder="请输入公司传真号" onkeyup="if(isNaN(value))execCommand('undo')">
                                 <i class="checked icon mIcon"></i>

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

@@ -248,7 +248,7 @@
                         </div>
                     </div>
                 </div>
-                <div  class="empty">
+                <div  class="empty" v-else>
                     <img src="/img/common/empty.png">
                     <div class="msg"><p>您还未发布任何商品快去<a href="/supplier/release.html">发布</a>吧</p></div>
                 </div>

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

@@ -183,11 +183,11 @@
                                 <div class="release-tips" v-show="vShow_Unit">{{fromMessage}}</div>
                             </div>
                             <div class="release-from clear">
-                                <div class="release-label">商品编码:</div>
+                                <div class="release-label rightTxt">商品编码:</div>
                                 <div class="release-input"><input class="input" v-model="releaseParams.productCode" type="text" placeholder="建议输入品牌关键词"></div>
                             </div>
                             <div class="release-from none clear">
-                                <div class="release-label">搜索关键词:</div>
+                                <div class="release-label rightTxt">搜索关键词:</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" v-if="isPC">查看示例></a>
@@ -198,12 +198,12 @@
                                 <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>
+                                <div class="release-label rightTxt">相关参数:</div>
                                 <div class="release-input clear">
                                     <div class="release-param" v-for="(item, index) in paramKeyList" :key="index">
                                         <input class="param-input" v-model="paramKeyList[index].paramsName" type="text" placeholder="参数名称" maxlength="10">
                                         <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>
+                                        <a href="javascript: void(0);" class="del-btn icon" v-show="index>0" @click="removeParamsFn"></a>
                                     </div>
                                     <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>
@@ -286,7 +286,7 @@
                                 </div>
                             </div>
                             <div class="release-from clear">
-                                <div class="release-label">结算价:</div>
+                                <div class="release-label rightTxt">结算价:</div>
                                 <div class="release-input">
                                     <input class="input price" v-model="releaseParams.costPrice" maxlength="40" type="number" placeholder="请输入商品结算价">
                                     <span class="unit">{{releaseParams.unit}}</span>