Merge branch 'fix'

pages/mobile/user/index.vue

@@ -30,9 +30,9 @@
       <li :class="{active: activeType == 'store'}" @click="activeType = 'store'">店铺关注</li>
     </ul>
     <ul class="switch-list" v-if="userType !== 'buyer'">
-      <li :class="{active: activeType == 'oppor', noshop: !shopuuid}"   @click="activeType = 'oppor'">我的商机</li>
-      <li :class="{active: activeType == 'provider', noshop: !shopuuid}"  @click="activeType = 'provider'">产品管理</li>
-      <li :class="{active: activeType == 'mystore'}"  @click="activeType = 'mystore'" v-if="shopuuid">我的店铺</li>
+      <li :class="{active: activeType == 'oppor', noshop: !shopuuid.uuid}"   @click="activeType = 'oppor'">我的商机</li>
+      <li :class="{active: activeType == 'provider', noshop: !shopuuid.uuid}"  @click="activeType = 'provider'">产品管理</li>
+      <li :class="{active: activeType == 'mystore'}"  @click="activeType = 'mystore'" v-if="shopuuid.uuid">我的店铺</li>
     </ul>
     <!-- 买家中心 我的求购 -->
     <div v-if="activeType == 'seek' || activeType == 'oppor'">
@@ -130,8 +130,8 @@
               <div class="linetext">单位：PCS</div>
             </div>
             <div class="fr" :class="providerType == 'enterprise' && item.batchCount > 0 ? '' : 'addtop'" >
-              <div class="look" v-if="item.batchCount && providerType == 'enterprise'" @click="lookProductitem(item.id, item)">查看产品</div>
-              <div class="add" v-if="providerType == 'enterprise'" @click="addProtoperson(item)">加入个人产品</div>
+              <div class="look" v-if="item.batchCount && providerType == 'enterprise'" @click="lookProductitem(item.id, item)" :class="{noadd: item.addProductPerson}">查看产品</div>
+              <div class="add" v-if="providerType == 'enterprise' && !item.addProductPerson" @click="addProtoperson(item)">加入个人产品</div>
               <div class="delete" v-if="providerType == 'person'" @click="deleteProvider(item.id, index)">删除</div>
             </div>
           </div>
@@ -143,7 +143,8 @@
               {{item.code}}
             </div>
             <div class="pms">
-              {{(storeInfo.uuid != 'undefind' && item.storeid == storeInfo.uuid && storeInfo.storeName.indexOf('优软测试二') < 0 && storeInfo.storeName.indexOf('优软商城') < 0) ? '自营' : '寄售'}}
+              <!--{{(storeInfo.uuid != 'undefind' && item.storeid == storeInfo.uuid && storeInfo.storeName.indexOf('优软测试二') < 0 && storeInfo.storeName.indexOf('优软商城') < 0) ? '自营' : '寄售'}}-->
+              {{(shopuuid.uuid != 'undefind' && item.storeid == shopuuid.uuid && shopuuid.storeName.indexOf('优软测试二') < 0 && shopuuid.storeName.indexOf('优软商城') < 0) ? '自营' : '寄售'}}
             </div>
           </div>
           <div class="middle">
@@ -291,7 +292,7 @@
                   <div class="fl">
                     <div class="name">
                       <div class="pms">
-                        {{(storeInfo.uuid != 'undefind' && item.storeid == storeInfo.uuid && storeInfo.storeName.indexOf('优软测试二') < 0 && storeInfo.storeName.indexOf('优软商城') < 0) ? '自营' : '寄售'}}</div>
+                        {{(shopuuid.uuid != 'undefind' && item.storeid == shopuuid.uuid && shopuuid.storeName.indexOf('优软测试二') < 0 && shopuuid.storeName.indexOf('优软商城') < 0) ? '自营' : '寄售'}}</div>
                       </div>
                   </div>
                   <div class="fr">
@@ -444,8 +445,7 @@
             })
           } else if (val === 'mystore') {
             if (this.$store.state.option.storeStatus.data.uuid) {
-              console.log(this.$store.state.option.storeStatus.data.uuid)
-              this.$router.push(`/mobile/shop/${this.shopuuid}`)
+              this.$router.push(`/mobile/shop/${this.shopuuid.uuid}`)
             }
           }
         }
@@ -845,7 +845,7 @@
         }
       },
       shopuuid() {
-        return this.$store.state.option.storeStatus.data.uuid
+        return this.$store.state.option.storeStatus.data
       }
     }
   }
@@ -1264,6 +1264,10 @@
             background: #0067e7;
             color: #fff;
           }
+          &.noadd {
+            margin-bottom: 0px;
+            margin-top: 0.3rem;
+          }
           &.add{
             background: #fff;
             color: #0067e7;