Merge pull request 'goods details store route 8.14' (#208) from zhy into master

Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/208

common/api/shop.js

@@ -192,7 +192,7 @@ export default {
 				});
 			},
 			// 商品搜索
-			ShopSearch({keyword,page = 1,order = 'goods_salenum'}){
+			ShopSearch({keyword, page = 1, order = 'goods_salenum'}){
 				return vm.$u.post('ShopSearch/search',{
 					keyword,page,order
 				})

pageB/sdetails/index.vue

@@ -19,7 +19,7 @@
 		</view>
         <view class="info">
             <view class="title u-line-2">
-                <text class="store-name">{{ goodsInfo.store_name }}</text>
+                <text class="store-name" @click="toStorePage(goodsInfo.store_id)">{{ goodsInfo.store_name }}</text>
 				<text class="goods-name">{{ goodsInfo.goods_name }}</text>
             </view>
             <view class="price-collect">
@@ -662,7 +662,12 @@ export default {
 					this.$u.toast(res.message);
 				}
 			})
-		}
+		},
+		toStorePage(id) {
+			this.$u.route('pageC/merchant/index', {
+				id: id
+			});
+		},
 	},
 }
 </script>

pageE/mine/MineConcerns.vue

@@ -2,7 +2,7 @@
 	<view class="concerns">
 		<view>
 			<u-tabs-swiper ref="uTabs" :list="list" :current="current" @change="tabsChange" :is-scroll="false"
-			 swiperWidth="750"></u-tabs-swiper>
+			 swiperWidth="750" active-color="#FF780F"></u-tabs-swiper>
 		</view>
 		<swiper :current="swiperCurrent" @transition="transition" @animationfinish="animationfinish"  style="width:750rpx" :style="{'height':height}">
 			<swiper-item class="swiper-item" >