验收修改

components/applyPurchase/ApplyInfo.vue

@@ -39,15 +39,15 @@
           </div>
           <div class="il-item il-center">
             <div class="il-box-large il-box">
-              <div :title="purchaseMan.inbrand" class="fl item"><span>类目：</span><div class="content">{{purchaseMan.inbrand || '-'}}</div></div>
+              <div :title="purchaseMan.prodTitle" class="fl item"><span>类目：</span><div class="content">{{purchaseMan.prodTitle || '-'}}</div></div>
               <div :title="purchaseMan.cmpCode" class="fl item"><span>型号：</span><div class="content">{{purchaseMan.cmpCode || '-'}}</div></div>
               <div :title="purchaseMan.inbrand" class="fl item bottom"><span>品牌：</span><div class="content">{{purchaseMan.inbrand || '-'}}</div></div>
-              <div :title="purchaseMan.cmpCode" class="fl item bottom"><span>规格：</span><div class="content">{{purchaseMan.spec || '-'}}</div></div>
+              <div :title="purchaseMan.spec" class="fl item bottom"><span>规格：</span><div class="content">{{purchaseMan.spec || '-'}}</div></div>
             </div>
             <div class="il-box-small il-box">
-              <div :title="purchaseMan.cmpCode" class="item"><span>封装：</span>{{purchaseMan.encapsulation || '-'}}</div>
-              <div :title="purchaseMan.cmpCode" class="item"><span>采购数量：</span>{{purchaseMan.needquantity || '-'}}</div>
-              <div :title="purchaseMan.cmpCode" class="item"><span>单价预算：</span>{{purchaseMan.unitPrice ? (purchaseMan.currency == 'RMB' ? '￥' : '$') + purchaseMan.unitPrice : '-'}}</div>
+              <div :title="purchaseMan.encapsulation" class="item"><span>封装：</span>{{purchaseMan.encapsulation || '-'}}</div>
+              <div :title="purchaseMan.needquantity" class="item"><span>采购数量：</span>{{purchaseMan.needquantity || '-'}}</div>
+              <div :title="purchaseMan.unitPrice ? (purchaseMan.currency == 'RMB' ? '￥' : '$') + purchaseMan.unitPrice : '-'" class="item"><span>单价预算：</span>{{purchaseMan.unitPrice ? (purchaseMan.currency == 'RMB' ? '￥' : '$') + purchaseMan.unitPrice : '-'}}</div>
             </div>
           </div>
           <div class="il-item number-content"><img src="/images/applyPurchase/hot-fire.png" alt="" v-if="purchaseMan.offerAmount > 10"><span :style="purchaseMan.offerAmount > 10 ? 'color: #ff9a00': ''">{{purchaseMan.offerAmount || 0}}</span>&nbsp;条</div>
@@ -377,6 +377,9 @@
               .il-box {
                 display: inline-block;
                 float: left;
+                span {
+                  color: #999;
+                }
               }
               .il-box-large {
                 width: 570px;
@@ -407,14 +410,6 @@
                   color: #020202;
                   width: 121px;
                   margin-bottom: 16px;
-                  span {
-                    color: #666;
-                  }
-                  &:first-child {
-                    span {
-                      color: #999;
-                    }
-                  }
                 }
               }
             }

components/applyPurchase/BatchPublish.vue

@@ -90,7 +90,7 @@
         <tr class="spot-goods" v-if="item.showSpotGoods">
           <td colspan="8">
             <div class="spot-goods-body">
-              <div class="spot-goods-title">商城现货（998）</div>
+              <div class="spot-goods-title">商城现货（{{spotGoodsData.length || 0}}）</div>
               <table>
                 <thead>
                 <tr>
@@ -1098,6 +1098,7 @@
                   .pi-title {
                     display: inline-block;
                     text-align: right;
+                    color: #999;
                     .red-text {
                       margin-right: 3px;
                     }
@@ -1261,20 +1262,21 @@
                                   background: #d7d5d5;
                                 }
                                 &:first-child {
-                                  left: 10px;
+                                  left: -7px;
                                 }
                                 &:last-child {
-                                  right: 10px;
+                                  right: -7px;
                                 }
                               }
                               input {
-                                width: 46px;
+                                width: 81px;
                                 height: 26.1px;
                                 text-align: center;
                                 line-height: normal;
                                 vertical-align: middle;
                                 outline: none;
                                 border: 1px solid #d1d0d0;
+                                padding: 0 5px;
                               }
                             }
                           }

pages/applyPurchase/result.vue

@@ -11,12 +11,12 @@
     <div class="container" v-else>
       <p>发布求购</p>
       <img src="/images/applyPurchase/batch-error.png" alt="">
-      <h1>上传失败</h1>
+      <h1>发布失败</h1>
       <h2>请完善产品信息</h2>
       <div class="footer1">立刻
         <label>
           <input type="file" @change="upload" accept="*.xls, *.xlsx">
-          <a>重新上传</a>
+          <a>重新发布</a>
         </label>
       </div>
       <div class="footer2">返回 <nuxt-link to="/">商城首页</nuxt-link> | <nuxt-link to="/applyPurchase">求购首页</nuxt-link></div>