需求调整

components/applyPurchase/ApplyInfo.vue

@@ -62,7 +62,7 @@
               <div :title="purchaseMan.produceDate" class="item">
                 <span>生产日期：</span>{{purchaseMan.produceDate || '-'}}</div>
               <div :title="purchaseMan.needquantity" class="item">
-                <span>采购数量：</span>{{purchaseMan.needquantity || '-'}}</div>
+                <span>采购数量(PCS)：</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>

components/applyPurchase/BatchPublish.vue

@@ -12,7 +12,7 @@
           <!--</label>全选-->
           <!--</th>-->
           <th width="615">产品信息</th>
-          <th width="95">采购数量</th>
+          <th width="95">采购数量(PCS)</th>
           <th width="114">生产日期</th>
           <th width="136"><i class="red-text">*</i>截止时间</th>
           <th width="186">操作</th>

components/applyPurchase/PublishApply.vue

@@ -79,7 +79,7 @@
           </div>
           <div class="form-item">
             <span>
-              采购数量：
+              采购数量(PCS)：
             </span>
             <input type="text" class="form-control" :class="{'error': !validObj.amount}" v-model="applyObj.amount" @blur="checkAmount" @input="onAmountInput" />
           </div>
@@ -573,12 +573,12 @@
         }
         >div {
           text-align: left;
-          margin-left: 14px;
+          margin-left: 3px;
           .form-item {
             margin-bottom: 3px;
             position: relative;
             span {
-              width: 80px;
+              width: 107px;
               text-align: right;
               display: inline-block;
               i {

components/main/Nav.vue

@@ -7,27 +7,32 @@
       <nuxt-link :to="'/'" class="item" exact>
         <span>首&nbsp;&nbsp;页</span>
       </nuxt-link>
+      <nuxt-link to="/applyPurchase" class="item">
+        <span>询价求购</span>
+        <img class="new-animate" src="/images/all/banner-cuxiao03.png" alt="">
+      </nuxt-link>
       <nuxt-link to="/supplier" class="item">
         <span>供应商</span>
       </nuxt-link>
+      <a class="item expand-item">
+        <span>店铺
+          <i class="iconfont icon-arrow-down"></i>
+          <i class="iconfont icon-arrow-up"></i>
+        </span>
+        <ul class="expand-list">
+          <li>
+            <nuxt-link to="/provider/factories">原厂专区</nuxt-link>
+          </li>
+          <li>
+            <nuxt-link to="/provider/home">代理经销</nuxt-link>
+          </li>
+          <li>
+            <nuxt-link target="_blank" :to="{ name: 'store-uuid', params: { uuid: '33069557578d44e69bd91ad12d28a8d4' } }">库存寄售</nuxt-link>
+          </li>
+        </ul>
+      </a>
       <nuxt-link to="/product/brand/brandList/ABC" class="item">
-        <span>品牌中心</span>
-      </nuxt-link>
-      <nuxt-link to="/provider/factories" class="item">
-        <span>原厂专区</span>
-      </nuxt-link>
-      <nuxt-link to="/provider/home" class="item">
-        <span>代理经销</span>
-      </nuxt-link>
-     <!-- <nuxt-link to="/product/original" class="item">
-        <span>热卖推荐</span>
-      </nuxt-link>-->
-      <nuxt-link target="_blank" :to="{ name: 'store-uuid', params: { uuid: '33069557578d44e69bd91ad12d28a8d4' } }" class="item">
-        <span>库存寄售</span>
-      </nuxt-link>
-      <nuxt-link to="/applyPurchase" class="item">
-        <span>求购询价</span>
-        <img class="new-animate" src="/images/all/banner-cuxiao03.png" alt="">
+        <span>品牌墙</span>
       </nuxt-link>
       <nuxt-link to="/news" class="item">
         <span>优软快讯</span>
@@ -54,14 +59,17 @@
       display: inline-block;
       height: $nav-height;
       line-height: $nav-height;
-      margin: 0 15px;
+      width: 126px;
+      text-align: center;
+      margin: 0;
+      vertical-align: middle;
       color: $black-light;
 
       > span {
         padding: 5px 2px;
       }
 
-      &.nuxt-link-active, &:hover {
+      &.nuxt-link-active:not(.expand-item), &:not(.expand-item):hover {
         > span {
           color: #5078cb;
           border-bottom: #5078cb 3px solid;
@@ -69,6 +77,49 @@
         }
       }
 
+      &.expand-item {
+        position: relative;
+        .expand-list {
+          z-index: 10;
+          position: absolute;
+          left: 30px;
+          background: #fff;
+          width: 66px;
+          border-radius: 2px;
+          display: none;
+          li {
+            height: 20px;
+            line-height: 20px;
+            text-align: center;
+            a {
+              font-size: 12px;
+              color: #666;
+            }
+            &:hover {
+              background: #5078cb;
+              a {
+                color: #fff;
+              }
+            }
+          }
+        }
+        .icon-arrow-up {
+          display: none;
+        }
+        &:hover {
+          color: #2147f9;
+          .expand-list {
+            display: block;
+          }
+          .icon-arrow-up {
+            display: inline-block;
+          }
+          .icon-arrow-down {
+            display: none;
+          }
+        }
+      }
+
       &.item-first {
         width: 200px;
         margin: 0;

components/mobile/Home.vue

@@ -44,7 +44,7 @@
         <li>
           <nuxt-link to="/mobile/brand/brandCenter/A">
             <img src="/images/mobile/@2x/home/brand.png" alt="">
-            <span>品牌中心</span>
+            <span>品牌墙</span>
           </nuxt-link>
         </li>
       </ul>

components/mobile/applyPurchase/SayPrice.vue

@@ -17,7 +17,7 @@
             规格：<span>{{purchaseDetail.spec || '-'}}</span>
           </div>
           <div class="content-line">
-            采购数量：<span>{{purchaseDetail.needquantity || '-'}}</span>
+            采购数量(PCS)：<span>{{purchaseDetail.needquantity || '-'}}</span>
           </div>
           <div class="content-line">
             币种：<span>{{purchaseDetail.custCurrency || '不限'}}</span>

components/mobile/applyPurchase/SayPriceInfo.vue

@@ -18,7 +18,7 @@
               规格：<span>{{purchaseDetail.spec || '-'}}</span>
             </div>
             <div class="content-line">
-              采购数量：<span>{{purchaseDetail.needquantity || '-'}}</span>
+              采购数量(PCS)：<span>{{purchaseDetail.needquantity || '-'}}</span>
             </div>
             <div class="content-line">
               币种：<span>{{purchaseDetail.custCurrency || '不限'}}</span>
@@ -84,7 +84,7 @@
               规格：<span>{{purchaseDetail.spec || '-'}}</span>
             </div>
             <div class="content-line">
-              采购数量：<span>{{purchaseDetail.needquantity || '-'}}</span>
+              采购数量(PCS)：<span>{{purchaseDetail.needquantity || '-'}}</span>
             </div>
             <div class="content-line">
               币种：<span>{{purchaseDetail.custCurrency || '不限'}}</span>

components/mobile/applyPurchase/SeekList.vue

@@ -25,7 +25,7 @@
               <span>{{item.spec || '-'}}</span>
             </div>
             <div>
-              采购数量：
+              采购数量(PCS)：
               <span>{{item.needQty || item.needquantity || '-'}}</span>
             </div>
             <div>

components/supplier/details.vue

@@ -109,7 +109,7 @@
             <input type="text" class="form-control" v-model="applyObj.produceDate"/>
           </li>
           <li class="form-item">
-            <span>采购数量：</span>
+            <span>采购数量(PCS)：</span>
             <input type="number" class="form-control" v-model="applyObj.amount" :class="{'error': !validObj.amount}"/>
           </li>
         </ul>

components/supplier/resource.vue

@@ -155,7 +155,7 @@
             <input type="text" class="form-control" v-model="applyObj.produceDate"/>
           </li>
           <li class="form-item">
-            <span>采购数量：</span>
+            <span>采购数量(PCS)：</span>
             <input type="number" class="form-control" v-model="applyObj.amount" :class="{'error': !validObj.amount}"/>
           </li>
         </ul>

pages/mobile/user/index.vue

@@ -115,6 +115,7 @@
             <div class="text">
               {{item.pcmpcode}}
             </div>
+            <img v-if="item.addProductPerson" class="person-flag" src="/images/mobile/product/personalMaterial.png" alt="">
           </div>
           <div class="content">
             <div class="fl">
@@ -1215,6 +1216,11 @@
           background-image: url('/images/mobile/@2x/standed.png')
         }
       }
+      .person-flag {
+        width: .55rem;
+        position: absolute;
+        right: 0;
+      }
       .text {
         float: left;
         width: 6.3rem;