Merge branch 'feature/3.0.0-推广员' of http://gogs.1hhd.com/1hjz-3N/1hjz-h5 into feature/3.0.0-推广员

* 'feature/3.0.0-推广员' of http://gogs.1hhd.com/1hjz-3N/1hjz-h5:
  测试分享
  分组图片更新

# Conflicts:
#	src/models/wxShare.js

src/models/wxShare.js

@@ -39,7 +39,7 @@ Vue.prototype.wxShare = function(params) {
             //获取“分享给朋友”按钮点击状态及自定义分享内容接口
             wx.onMenuShareAppMessage({
                 // 分享给朋友
-                title: '【一号家政】', // 分享标题
+                title: shareConfig.title, // 分享标题
                 desc: shareConfig.desc, // 分享描述
                 link: shareConfig.url+urlParams, // 分享链接 默认以当前链接
                 imgUrl: shareConfig.img, // 分享图标

src/view/goods-classify.vue

@@ -23,7 +23,9 @@
 							<a style="display:block" :href="'/mall/web/vgoods/detail/' + goods.goodsNo + '?uniqueId='+ uniqueId">
 								<div class="item f-flex">
 									<a :href="'/mall/web/vgoods/detail/' + goods.goodsNo + '?uniqueId='+ uniqueId" class="list-img-box">
-										<img :src=" imghost + goods.bannerImgs" class="thumb" />
+										<img v-if="goods.goodsTitleImg!=''" :src=" imghost + goods.goodsTitleImg" class="thumb"/>
+										<img v-else-if="goods.showImg!=''" :src=" imghost + goods.showImg" class="thumb"/>
+										<img v-else :src=" imghost + goods.bannerImgs" class="thumb"/>
 									</a>
 									<div class="info f-flex">
 										<div class="info-box">
@@ -215,12 +217,12 @@ export default {
                 this.listHeight.push(height);
             }
         },
-        /*selectMenu(index, event) {        
-				if(event && !event._constructed) {          
-					return ;        
-				}        
-				let foodList = this.$refs.foodWrapper.getElementsByClassName("food-list-hook");        
-				let el = foodList[index];        
+        /*selectMenu(index, event) {
+				if(event && !event._constructed) {
+					return ;
+				}
+				let foodList = this.$refs.foodWrapper.getElementsByClassName("food-list-hook");
+				let el = foodList[index];
 				this.foodsScroll.scrollToElement(el,300)
 			},*/
         selectMenu(index, event) {
@@ -491,4 +493,4 @@ export default {
         }
     }
 }
-</style>
+</style>