Merge branch 'master'

pages/index/mine.vue

@@ -17,7 +17,7 @@
 						<image src="/static/image/mine/edit.png" mode=""></image>
 					</view>
 					<view class="minemp">
-						<view  class="mineid">ID：{{userinfo.id}}</view>
+						<view  class="mineid">ID：{{userinfo.sn}}</view>
 						<!-- <view class="mp" @click="gomymp">{{$t('auth')}}</view> -->
 						<!-- <view v-if="!isopenid" class="mp" @click="gomyauth">{{$t('auth')}}</view> -->
 					</view>
@@ -80,7 +80,7 @@
 			
 		</view>
 		<!-- 联系客服弹框 -->
-		<u-popup :show="show" :round="20" mode="center"  @close="close">
+		<u-popup :show="show" :round="20" mode="center"  @close="close" :closeable="true">
 			<view class="popupcontent">
 				<image class="log1" src="/static/image/mine/kefu.png"></image>
 				<view class="title">{{$t('mine.kfphone')}}</view>