Merge remote-tracking branch 'origin/release-201817-yc' into release-201817-yc

components/mobile/base/addressEdit.vue

@@ -100,9 +100,8 @@
     watch: {
       'data': {
         handler: function (newVal) {
-          console.log(newVal)
           if (newVal) {
-            this.isActive = false
+            newVal.num === 1 ? this.isActive = true : this.isActive = false
             this.params = this.baseUtils.deepCopy(newVal)
           }
         },

components/mobile/base/addressView.vue

@@ -13,7 +13,12 @@
         </div>
       </div>
     </div>
-    <ul class="list-unstyled">
+    <div class="com-none-state" v-if="addressList.length === 0">
+      <img src="/images/mobile/@2x/empty-collect.png">
+      <p>抱歉，您还没有添加地址信息</p>
+      <nuxt-link to="/">返回首页</nuxt-link>
+    </div>
+    <ul class="list-unstyled" v-else>
       <li v-for="(item, index) in addressList">
         <div class="wrapper-line clearfix">
           <div class="name pull-left">{{isSend ? '发货地址：' : '收货地址：'}}</div>

components/store/home/CommodityList.vue

@@ -34,10 +34,10 @@
         <table class="goodslist" style="width: 955px;background:#fff;" >
           <thead>
           <tr>
-            <th width="189"><div>品牌/物料名称(类目)</div></th>
+            <th width="165"><div>品牌/物料名称(类目)</div></th>
             <th width="148"><div>型号/规格</div></th>
             <th width="114"><div>包装/生产日期</div></th>
-            <th width="100"><div>库存</div></th>
+            <th width="125"><div>库存</div></th>
             <!-- <th width="90">数量</th>
              <th width="90">香港交货<span style="font-size: 12px;">($)</span></th>
              <th width="100">大陆交货<span style="font-size: 12px;">(￥)</span></th>-->

pages/mobile/order/index.vue

@@ -6,12 +6,18 @@
       <div :class="activeType === 'comfirmed' ? 'active' : ''" @click="ChangeList('comfirmed')"><span>待发货</span></div>
       <div :class="activeType === 'inbound' ? 'active' : ''" @click="ChangeList('inbound')"><span>待收货</span></div>
     </div>
-    <div class="search-content search-content2" >
+    <div class="search-content search-content2" v-if="vendorType !== 'buyer'" >
       <input type="text" placeholder="订单号/产品信息/买家名字" v-model="keyword" @keyup.13="searchOrderlist">
       <span @click="searchOrderlist" >
           <i class="iconfont icon-sousuo"></i>
       </span>
     </div>
+    <div class="search-content search-content2" v-else >
+      <input type="text" placeholder="订单号/产品信息/商家名称" v-model="keyword" @keyup.13="searchOrderlist">
+      <span @click="searchOrderlist" >
+          <i class="iconfont icon-sousuo"></i>
+      </span>
+    </div>
     <ul class="order-list-wrap"  id="order-wrapper" v-show="orderList.length > 0">
       <li class="clearfix" v-for="item in orderList">
         <div class="orderNumber clearfix">

pages/mobile/user/index.vue

@@ -172,7 +172,6 @@
           if (this.storeStatus.uuid) {
             this.$router.push(url)
           } else {
-            // this.setRemindText('请前往PC端申请开店')
             if (this.applyStatus === 'PREPARE') {
               this.setRemindText('您的申请已提交，请耐心等待工作人员审核（2-3个工作日）')
             } else {
@@ -184,6 +183,8 @@
               }
             }
           }
+        } else if (url === '/mobile/user/address') {
+          this.$router.push(url)
         } else if (!this.user.data.enterprise.uu || this.user.data.enterprise.isVendor !== 313) {
           this.setRemindText('请点击【开店申请】完善信息')
         } else {