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>

pages/mine/changinfo.vue

@@ -175,7 +175,8 @@
 								icon: 'none'
 							});
 						}else{
-							that.userinfo.avatar = path.data.path
+							that.userinfo.avatar = path.data.image_url
+							that.userinfo.avatar_url = path.data.path
 							console.log(that.form)
 						}
 					}
@@ -199,11 +200,13 @@
 				uni.navigateBack({})
 			},
 			bcFn(){
+				console.log(this.userinfo)
 				request({
 					url:'user/save',
 					method:'POST',
 					data:{
 						avatar:this.userinfo.avatar,
+						avatar_url:this.userinfo.avatar_url,
 						sex:this.userinfo.sex,
 						name:this.userinfo.name,
 						mobile:this.userinfo.mobile,