Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into zmr

pages/mine/index.vue

@@ -2,10 +2,10 @@
     <view class="mine">
         <view class="mine-top">
             <view class="top">
-				<u-avatar :src="userInfo.member_avatar" :size="110"></u-avatar>
+				<u-avatar  @click="toOtherPage('/mine/MineInfo')" :src="userInfo.member_avatar" :size="110"></u-avatar>
 				<view class="user-info">
 					<view class="info-left">
-						<view class="user-nickname" @click="toOtherPage('/mine/MineInfo')">{{ userInfo.member_nickname }}</view>
+						<view class="user-nickname">{{ userInfo.member_nickname }}</view>
 						<view class="user-medal" @click="toOtherPage('/mine/MedalIntroduction')">
 							<img src="/static/image/mine/13.png" />
 							<view class="rank-title">勋章</view>

pages/shop/index.vue

@@ -6,7 +6,9 @@
                 <text class="u-line-1">{{ area }}</text>
                 <image src="/static/image/shop/2.png"></image>
             </view>
-            <u-search placeholder="日照香炉生紫烟" v-model="keyword" :show-action="false" bg-color="#fff" border-color="#999999"></u-search>
+            <view @click="sousuo">
+                <u-search placeholder="日照香炉生紫烟" v-model="keyword" :show-action="false" bg-color="#fff" border-color="#999999" :disabled="true"></u-search>
+            </view>
             <image src="/static/image/shop/3.png" class="mnue" @click="toClassifyPage"></image>
         </view>
         <u-swiper :list="list" mode="dot" @click="clickImage"></u-swiper>
@@ -91,6 +93,12 @@ export default {
 		this.getGoodsRecommend();
 	},
 	methods: {
+        sousuo(){
+            // console.log(123)
+            this.$u.route({
+                url:"pageB/search/index"
+            })
+        },
 		getShopTopList() {
 			this.$u.api.getShopTopList().then((res)=>{
 				if (res.errCode == 0) {