Merge remote-tracking branch 'origin/release-201843-wangcz' into release-201843-wangcz

components/applyPurchase/SayPrice.vue

@@ -61,7 +61,7 @@
           </template>
           <div class="content-line">
             <div class="form-item form-left">
-              <span><i>*</i>交期34：</span>
+              <span><i>*</i>交期：</span>
               <input type="number" class="form-control" placeholder="天数" @input="onLeadtimeInput" @blur="onLeadtimeBlur" v-model="sayPriceObj.leadtime">
             </div>
             <div class="form-item form-right">

components/default/RightBar.vue

@@ -402,7 +402,7 @@ i {
 .right-bar ul li .sidebar-menu {
   position: absolute;
   display: block;
-  right: 0;
+  right: -5px;
   top: 0;
   width: 100px;
   line-height: 38px;

components/error/error.vue

@@ -17,23 +17,23 @@
         <div class="infotext" v-if="title==='店铺' || title==='器件' || title==='物料名称'">您可以逛逛：
           <nuxt-link :to="{ path: '/'}">商城首页</nuxt-link>
           <span>|</span>
-          <nuxt-link :to="{ path: '/provider/factories'}">原厂专区</nuxt-link>
+          <nuxt-link :to="{ path: '/eCommerce/home/factory'}">原厂专区</nuxt-link>
           <span>|</span>
-          <nuxt-link :to="{ path: '/provider/home'}">代理经销</nuxt-link>
+          <nuxt-link :to="{ path: '/eCommerce/home/origin'}">代理经销</nuxt-link>
         </div>
 
         <div class="infotext" v-else-if="title==='品牌'">您可以逛逛：
           <nuxt-link :to="{ path: '/'}">商城首页</nuxt-link>
           <span>|</span>
-          <nuxt-link :to="{ path: '/product/brand/brandList/ABC'}">品牌中心</nuxt-link>
+          <nuxt-link :to="{ path: '/eCommerce/home/brand/?initial=A'}">品牌中心</nuxt-link>
           <span>|</span>
-          <nuxt-link :to="{ path: '/provider/factories'}">原厂专区</nuxt-link>
+          <nuxt-link :to="{ path: '/eCommerce/home/factory'}">原厂专区</nuxt-link>
         </div>
 
         <div class="infotext" v-else-if="title==='产品'">您可以逛逛：
           <nuxt-link :to="{ path: '/'}">商城首页</nuxt-link>
           <span>|</span>
-          <nuxt-link :to="{ path: '/provider/home'}">代理经销</nuxt-link>
+          <nuxt-link :to="{ path: '/eCommerce/home/origin'}">代理经销</nuxt-link>
           <span>|</span>
           <nuxt-link :to="{ name: 'store-uuid', params: { uuid: '33069557578d44e69bd91ad12d28a8d4' }}">库存寄售</nuxt-link>
         </div>

components/mobile/applyPurchase/SayPriceInfo.vue

@@ -26,9 +26,6 @@
               <div class="content-line">
                 采购数量(PCS)：<span>{{purchaseDetail.needquantity || '-'}}</span>
               </div>
-              <div class="content-line">
-                税率%：<span>{{purchaseDetail.taxrate || '-'}}</span>
-              </div>
              <!-- <div class="content-line">
                 币种：<span>{{purchaseDetail.custCurrency || '不限'}}</span>
               </div>-->
@@ -99,6 +96,9 @@
                   交期(天)：<span>{{item.leadtime}}</span>
                 </div>
               </template>
+              <div class="content-line date">
+                税率%：<span>{{item.taxrate | '-'}}</span>
+              </div>
               <div class="content-line date">
                 报价时间：<span>{{item.offerTime | date}}</span>
               </div>

components/mobile/applyPurchase/SeekList.vue

@@ -57,10 +57,6 @@
                 采购数量(PCS)：
                 <span>{{item.needQty || '-'}}</span>
               </div>
-              <div class="content">
-                税率%：
-                <span>{{item.taxrate || '-'}}</span>
-              </div>
             </template>
             <div class="content">
               截止日期：

pages/mobile/center/user/supplier/index.vue

@@ -2,7 +2,7 @@
   <div class="modal-wrapper-bg">
     <div class="mobile-customer-btob"  style="background: #f1f3f6" id="mobile-customer-btob">
       <div class="search-content mi-search-content">
-        <input type="text" v-model="filterParams.keyword" @keyup.13="onFilter" placeholder="输入企业名称、营业执照号、申请人或审核人">
+        <input type="text" v-model="filterParams.keyword" @keyup.13="onFilter" placeholder="企业名称/营业执照号/申请人/审核人">
         <span @click="onFilter"><i class="iconfont icon-sousuo"></i></span>
       </div>
       <div class="customer-btob-wrapper">
@@ -14,7 +14,7 @@
               <div class="list-item"><span>联系人：</span>{{item.vendorUser.userName}}</div>
               <div class="list-item"><span>供应商电话：</span>{{item.vendorUser.userTel}}</div>
               <div class="list-item"><span>采购对接人：</span>
-                <span class="wrap-text">{{item.saleContacts ? item.saleContacts.toString() : '待分配'}}</span>
+                <span class="wrap-text">{{item.saleContacts && item.saleContacts.length > 0 ? item.saleContacts.toString() : '待分配'}}</span>
               </div>
             </div>
             <div class="customer-btob-wrapper-bottom clearfix">
@@ -25,7 +25,7 @@
         </div>
         <empty-status
           v-else
-          :text="'暂无对应的单据'"
+          :text="'暂无对应的供应商信息！'"
           :showLink="false"
         ></empty-status>
       </div>

pages/mobile/center/vendor/customer/index.vue

@@ -24,7 +24,7 @@
               <div class="list-item"><span>客户联系人：</span>{{item.myUser.userName}}</div>
               <div class="list-item"><span>客户电话：</span>{{item.myUser.userTel}}</div>
               <div class="list-item"><span>业务对接人：</span>
-                <span class="wrap-text">{{item.purchaseContacts ? item.purchaseContacts.toString() : '-'}}</span>
+                <span class="wrap-text">{{item.purchaseContacts && item.purchaseContacts.length > 0 ? item.purchaseContacts.toString() : '-'}}</span>
               </div>
             </div>
             <div class="customer-btob-wrapper-bottom clearfix">
@@ -35,7 +35,7 @@
         </div>
         <empty-status
           v-else
-          :text="'暂无对应的单据'"
+          :text="'暂无对应的客户信息！'"
           :showLink="false"
         ></empty-status>
       </div>

pages/mobile/center/vendor/customer/vendorPerformanceAssess.vue

@@ -12,7 +12,7 @@
         </div>
       </div>
       <div class="search-content mi-search-content">
-        <input type="text" v-model="filterParams.keyword" @keyup.13="onFilter" placeholder="请输入企业名称搜索">
+        <input type="text" v-model="filterParams.keyword" @keyup.13="onFilter" placeholder="请输入考核单号搜索">
         <span @click="onFilter"><i class="iconfont icon-sousuo"></i></span>
       </div>
       <div class="customer-btob-wrapper">
@@ -29,7 +29,7 @@
         </div>
         <empty-status
           v-else
-          :text="'暂无对应的单据'"
+          :text="'暂无对应的信息！'"
           :showLink="false"
         ></empty-status>
       </div>

yarn.lock

@@ -194,7 +194,7 @@ array-filter@~0.0.0:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/array-filter/-/array-filter-0.0.1.tgz#7da8cf2e26628ed732803581fd21f67cacd2eeec"
 
-array-find-index@^1.0.1:
+array-find-index@^1.0.1, array-find-index@^1.0.2:
   version "1.0.2"
   resolved "http://registry.npm.taobao.org/array-find-index/download/array-find-index-1.0.2.tgz#df010aa1287e164bbda6f9723b0a96a1ec4187a1"
 
@@ -4453,6 +4453,14 @@ minizlib@^1.1.0:
   dependencies:
     minipass "^2.2.1"
 
+mint-ui@^2.2.13:
+  version "2.2.13"
+  resolved "https://registry.yarnpkg.com/mint-ui/-/mint-ui-2.2.13.tgz#856a2cba9608c6ecf21f0e521ce89ed8ddfe33d3"
+  dependencies:
+    array-find-index "^1.0.2"
+    raf.js "0.0.4"
+    vue-lazyload "^1.0.1"
+
 mississippi@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/mississippi/-/mississippi-2.0.0.tgz#3442a508fafc28500486feea99409676e4ee5a6f"
@@ -5895,6 +5903,10 @@ querystring@0.2.0, querystring@^0.2.0:
   version "0.2.0"
   resolved "http://registry.npm.taobao.org/querystring/download/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620"
 
+raf.js@0.0.4:
+  version "0.0.4"
+  resolved "https://registry.yarnpkg.com/raf.js/-/raf.js-0.0.4.tgz#f15af445d241b27fa7131a57450b67ef9c402fec"
+
 randomatic@^1.1.3:
   version "1.1.7"
   resolved "http://registry.npm.taobao.org/randomatic/download/randomatic-1.1.7.tgz#c7abe9cc8b87c0baa876b19fde83fd464797e38c"
@@ -7293,6 +7305,10 @@ vue-hot-reload-api@^2.2.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/vue-hot-reload-api/-/vue-hot-reload-api-2.3.0.tgz#97976142405d13d8efae154749e88c4e358cf926"
 
+vue-lazyload@^1.0.1:
+  version "1.2.6"
+  resolved "https://registry.yarnpkg.com/vue-lazyload/-/vue-lazyload-1.2.6.tgz#baa04c172d52a812608eb12c7a6bfb14f5c91079"
+
 vue-loader@13.7.0:
   version "13.7.0"
   resolved "https://registry.yarnpkg.com/vue-loader/-/vue-loader-13.7.0.tgz#4d6a35b169c2a0a488842fb95c85052105fa9729"