Merge remote-tracking branch 'origin/master'

pages/mobile/center/vendor/productdetails.vue

@@ -164,12 +164,16 @@
     computed: {
       GetchooseItem() {
         this.chooseItem = deepCopy(this.$store.state.product.brand.onSaleDetails.data)
+        this.chooseItem.storeInfoOms = this.chooseItem.storeid === '33069557578d44e69bd91ad12d28a8d4' ? '寄售' : '自营'
       },
       storeInfoStore() {
         return this.$store.state.option.storeStatus.data
       },
       ShowShopshelfOff() {
-        return this.storeInfoStore.storeName && (this.storeInfoStore.storeName.indexOf('优软测试二') > -1 || this.storeInfoStore.storeName.indexOf('优软商城') > -1) || ''
+        if (this.storeInfoStore.storeName) {
+          return this.storeInfoStore.storeName.indexOf('优软测试二') > -1 || this.storeInfoStore.storeName.indexOf('优软商城') > -1
+        }
+        return false
       }
     },
     methods: {