Merge branch 'refs/heads/master' into develop

@@ -33,7 +33,9 @@ const xianyu = {
   closeNavRightItem() {
 
     if (this.isAliApp && window.WindVane) {
-      window.WindVane.call('WVIdleFishApi', 'setHideNavigatorRightItem', {},()=>{},()=>{})
+      window.WindVane.call('WVIdleFishApi', 'setHideNavigatorRightItem', {},()=>{
+      },()=>{
+      })
     }
   },
 
@@ -47,12 +49,16 @@ const xianyu = {
     window._xianyuShare = () => {
       this.setXianyuShare(shareParam, handler);
     }
-    // console.log('this.isAliApp && window.WindVane', this.isAliApp , window.WindVane);
-    if (this.isAliApp && window.WindVane) {
-      window.WindVane.call('WVIdleFishApi', 'setNavigatorRightItem', {
+    // xianyu android bug: title必传切不能为空字符串，icon才能展示
+    // xianyu ios bug: 图片按钮无法隐藏 TOTO ali修复
+    const param =  {
       title: '∙∙∙', // 按钮名称
+      icon: this.isAndroid ? ' http://cdn.yoho.cn/xianyu/share-btn.png': '',
       func: '_xianyuShare' // func: 'test' //点击调用函数 注意调用的函数必须挂载在window上
-      }, function(data) {
+    }
+    // console.log('this.isAliApp && window.WindVane', this.isAliApp , window.WindVane);
+    if (this.isAliApp && window.WindVane) {
+      window.WindVane.call('WVIdleFishApi', 'setNavigatorRightItem',param, function(data) {
           console.log('setNavigatorRightItem success：',data);
       }, function(e) {
           console.log('setNavigatorRightItem error：',e);

@@ -18,7 +18,7 @@
           <div class="price-status">
             <span class="price">￥{{ goodsInfo.goodPrice }}</span>
           </div>
-          <p class="item-name"><span>【{{ goodsInfo.typeTag }}】</span>
+          <p class="item-name"><span v-if="goodsInfo.typeTag">【{{ goodsInfo.typeTag }}】</span>
             {{ goodsInfo.productName }}
           </p>
         </div>

@@ -95,7 +95,7 @@
                        @hide="onSizeSelectSheetHide"
                        @select="onSelectTradeProduct"
                        @add="onRequestSize"/>
-    <detail-useage-tips></detail-useage-tips>
+    <!-- <detail-useage-tips></detail-useage-tips> -->
   </div>
 </template>
 
@@ -118,7 +118,7 @@ import TopList from './components/top-list';
 import SquareImg from './components/square-img';
 import stateShortCutsMixins from './mixins';
 import trackingMixins from './tracking-mixins';
-import DetailUseageTips from './components/detail-useage-tips';
+// import DetailUseageTips from './components/detail-useage-tips';
 
 import VideoPlayer from '@/components/video-player';
 
@@ -129,7 +129,7 @@ export default {
   name: 'ProductDetail',
   mixins: [stateShortCutsMixins, trackingMixins],
   components: {
-    DetailUseageTips,
+    // DetailUseageTips,
     SizeSelectSheet,
     ActivityListSheet,
     SizeRequestSheet,

@@ -7,8 +7,8 @@
         <image-format
           :class="product.status === 100 ? 'dim-imge' : 'second-image'"
           :src="product.secondhand_image"
-          :width="180"
-          :height="180"/>
+          :width="360"
+          :height="360"/>
         <div v-if="product.status === 100" class="dim-out"></div>
       </div>
 

@@ -19,8 +19,8 @@
               :lazy="false"
               alt="图片加载失败"
               :src="item"
-              :width="375"
-              :height="375"
+              :width="750"
+              :height="750"
             />
             <div class="pole-dot-area"></div>
           </cube-slide-item>
@@ -51,8 +51,8 @@
             class="image"
             :alt="info.image"
             :src="info.image"
-            :width="70"
-            :height="70"
+            :width="140"
+            :height="140"
           />
           <div class="middle" @click="'productId'">
             <p class="name ellipsis">{{ info.productName }}</p>

@@ -11,7 +11,7 @@
       <SecondList ref="second" :list="skupList.list" :yasParams="yasParams"></SecondList>
     </LayoutScroll>
 
-    <UfoNoItem class="empty" :tip="`暂无数据`" v-else></UfoNoItem>
+    <UfoNoItem v-if="isShowEmpty" class="empty" :tip="`暂无数据`"></UfoNoItem>
   </LayoutApp>
 </template>
 
@@ -43,7 +43,7 @@ export default {
     };
   },
   computed: {
-    ...mapState(['skupList', 'isMore'])
+    ...mapState(['skupList', 'isMore', 'isShowEmpty'])
   },
   methods: {
     ...mapActions(['fetchSecondSkupList']),

@@ -34,7 +34,7 @@ export default function() {
           }
         }
       },
-      errorData(state) {
+      showEmpty(state) {
         state.isShowEmpty = true;
       }
     },
@@ -55,8 +55,11 @@ export default function() {
           let data = result.data;
 
           commit('addList', { data, isReset });
+          if (data && !data.total) {
+            commit('showEmpty');
+          }
         } else {
-          commit('errorData');
+          commit('showEmpty');
         }
         return result.data || [];
       },

 {
   "name": "xianyu-ufo-app-web",
-  "version": "1.1.2",
+  "version": "1.1.5",
   "private": true,
   "description": "Xianyu Project With Express",
   "repository": {