zhengjinyi 2 rokov pred
rodič
commit
74eb8d8b49

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

@@ -14,17 +14,17 @@
     .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: 20%;text-align: center;}
-    .product-title li:nth-child(1) {width: 46%;text-align: left}
+    .product-title li {display: inline-block;list-style: none;color: #627386;width: 15%;text-align: center;}
+    .product-title li:nth-child(1) {width: 40%;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:20%;text-align: center;color: #627386;}
+    .pro-information li div {display: inline-block;width:15%;text-align: center;color: #627386;}
      .pro-information li div:last-child{width: 12%}
-    .pro-information li div.product-img {width: 46%;text-align: left;position: relative;}
+    .pro-information li div.product-img {width: 40%;text-align: left;position: relative;}
     .product-img .tips{width: 40px;height: 20px;border-radius: 2px;font-size: 12px;line-height: 20px;text-align: center;display: block;position: absolute;top: 0;left: 0;color: #FFFFFF; background-image: linear-gradient(214deg, #ff4500 0%, #ff5800 53%, #ff4367 100%);}
     .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}
+    .product-img h3 {display: inline-block;width: 286px;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}
     .info-title {color: #22272e;font-size: 16px;padding: 15px;}
     .title-name {color: #22272e;margin-bottom: 20px}
     .title-time {float: right;color: #9aa5b5;}

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

@@ -11,13 +11,13 @@
     .record-product {margin-top: 20px;}
     .protitle {color: #22272e;font-size: 16px;padding: 15px 20px;}
     .product ul li {list-style: none;display: inline-block;}
-    .product-title li {width: 10%;text-align: center;}
-    .product-title li:nth-child(1) {width: 45%;text-align: left;}
+    .product-title li {width: 11%;text-align: center;}
+    .product-title li:nth-child(1) {width: 42%;text-align: left;}
     .product {padding: 0 21px;background: #fff;overflow: hidden;padding-bottom: 30px;box-shadow: 0px 3px 6px 0px rgba(0, 0, 0, 0.07)}
     .product-title {height: 56px;line-height: 56px;color: #627386;border-bottom: solid 1px #e2e7ef}
     .product-info li {width: 100%;padding: 15px 0}
     .product-img h3 {display: inline-block;width: 300px;margin-left: 10px;font-size: 16px;letter-spacing: 1px;color: #22272e;vertical-align: middle;word-break: break-all;overflow: hidden;text-overflow: ellipsis;display: -webkit-inline-box;-webkit-line-clamp: 2;-webkit-box-orient: vertical}
-    .product-info li div.product-img {width: 50%;text-align: left}
+    .product-info li div.product-img {width: 42%;text-align: left}
     .product-img img {width: 70px;height: 70px;border: solid 1px #e2e7ef;}
     .product-info li div {display: inline-block;width: 11%;text-align: center;color: #627386}
     .record-time {color: #9aa5b5;font-size: 12px;padding-top: 5px}

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

@@ -12,12 +12,12 @@
     .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: 10%;text-align: center;}
-    .product-title li:nth-child(1) {width: 45%;text-align: left}
+    .product-title li {display: inline-block;list-style: none;color: #627386;width: 11%;text-align: center;}
+    .product-title li:nth-child(1) {width: 42%;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;position: relative;}
+    .pro-information li div.product-img {width: 42%;text-align: left;position: relative;}
     .product-img .tips{width: 40px;height: 20px;border-radius: 2px;font-size: 12px;line-height: 20px;text-align: center;display: block;position: absolute;top: 0;left: 0;color: #FFFFFF; background-image: linear-gradient(214deg, #ff4500 0%, #ff5800 53%, #ff4367 100%);}
     .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}

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

@@ -13,14 +13,14 @@
     .protitle {color: #22272e;font-size: 16px;padding: 15px 20px; }
     .product ul li {list-style: none;display: inline-block; }
     .product-title li {width: 11%;text-align: center;}
-    .product-title li:nth-child(1) {width: 50%;text-align: left; }
+    .product-title li:nth-child(1) {width: 42%;text-align: left; }
     .product {padding: 0 20px;background: #fff;overflow: hidden;box-shadow: 0px 3px 6px 0px rgba(0, 0, 0, 0.07); }
     .product-title {height: 56px;line-height: 56px;color: #627386;border-bottom: solid 1px #e2e7ef}
     .product-info li {width: 100%;padding: 15px 0}
     .product-img{position: relative;}
     .product-img .tips{width: 40px;height: 20px;border-radius: 2px;font-size: 12px;line-height: 20px;text-align: center;display: block;position: absolute;top: 0;left: 0;color: #FFFFFF; background-image: linear-gradient(214deg, #ff4500 0%, #ff5800 53%, #ff4367 100%);}
     .product-img h3 {display: inline-block;width: 300px;margin-left: 10px;font-size: 16px;vertical-align: middle;word-break: break-all;overflow: hidden;text-overflow: ellipsis;display: -webkit-inline-box;-webkit-line-clamp: 2;-webkit-box-orient: vertical}
-    .product-info li div.product-img {width: 50%;text-align: left}
+    .product-info li div.product-img {width: 42%;text-align: left}
     .product-img img {width: 70px;height: 70px;border: solid 1px #e2e7ef;}
     .product-info li div {display: inline-block;width: 11%;text-align: center}
     .record-time {color: #9aa5b5;font-size: 12px;padding-top: 5px;}

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

@@ -44,6 +44,7 @@
                         <div class="product" v-for="r in results">
                             <ul class="product-title">
                                 <li>商品信息</li>
+                                <li>购买规格</li>
                                 <li>购买数量</li>
                                 <li>已发数量</li>
                                 <li>未发数量</li>
@@ -56,6 +57,7 @@
 <!--                                        <span class="tips" v-if="order.productType==2||order.productType==1">赠品</span>-->
                                         <h3>{{order.productName}}</h3>
                                     </div>
+                                    <div>{{order.unit}}</div>
                                     <div>{{order.buyNum}}</div>
                                     <div>{{order.shipmentsNum}}</div>
                                     <div>{{order.notShippedNum}}</div>

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

@@ -49,6 +49,7 @@
                     <div class="product" >
                         <ul class="product-title">
                             <li>商品信息</li>
+                            <li>规格</li>
                             <li>单价</li>
                             <li>数量</li>
                             <li>总价</li>
@@ -60,6 +61,7 @@
                                     <img :src="pro.image"/>
                                     <h3>{{pro.name}}</h3>
                                 </div>
+                                <div>¥{{pro.productUnit}}</div>
                                 <div>¥{{pro.price}}</div>
                                 <div>{{pro.num}}</div>
                                 <div>¥{{pro.totalAmount}}</div>

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

@@ -60,7 +60,7 @@
 <!--                                    <span class="tips" v-if="order.productType==2||order.productType==1">赠品</span>-->
                                     <h3>{{order.productName}}</h3>
                                 </div>
-                                <div>{{order.productUnit}}</div>
+                                <div>{{order.unit}}</div>
                                 <div>{{order.buyNum}}</div>
                                 <div>{{order.shipmentsNum}}</div>
                                 <div>{{order.notShippedNum}}</div>

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

@@ -56,7 +56,7 @@
 <!--                                    <span class="tips" v-if="order.productType==2||order.productType==1">赠品</span>-->
                                     <h3>{{order.productName}}</h3>
                                 </div>
-                                <div>{{order.productUnit}}</div>
+                                <div>{{order.unit}}</div>
                                 <div>{{order.buyNum}}</div>
                                 <div>{{order.shipmentsNum}}</div>
                                 <div>{{order.notShippedNum}}</div>