Merge branch 'pifa' of http://git.njrzwl.cn:3000/wangmingchuan/yanzong_qianduan into pifa

pages/user/index.vue

@@ -638,13 +638,22 @@
 							分销价
 						</view>
 					</view> -->
+<<<<<<< HEAD
+					<view class="serveIcon" @click="goJump('/pages/news1/MerchantSettlement')">
+=======
           <!-- <view class="serveIcon" @click="goJump('/pages/news1/MerchantSettlement')">
+>>>>>>> a71dcd33d8dd395e08331921a2b7e9003e60cdb2
 						<image :src="$picUrl+'/static/user/checkIn.png'" class="icons"></image>
 						<view class="serveInfo">
 							商家入驻
 						</view>
+<<<<<<< HEAD
+					</view>
+					<!-- <view class="serveIcon" @click="goJump('/pages/news/user/vip')" v-if="userInfo.user_type == 40">
+=======
 					</view> -->
           <!-- <view class="serveIcon" @click="goJump('/pages/news/user/vip')" v-if="userInfo.user_type == 40">
+>>>>>>> a71dcd33d8dd395e08331921a2b7e9003e60cdb2
 						<image :src="$picUrl+'/static/user/staff.png'" class="icons"></image>
 						<view class="serveInfo">
 							员工管理