Merge branch 'master' of http://git.luyuan.tk/luyuan/demingshangjia into xbx

manifest.json

@@ -16,6 +16,13 @@
             "autoclose" : true,
             "delay" : 0
         },
+        "safearea" : {
+            //安全区域配置，仅iOS平台生效
+            "bottom" : {
+                // 底部安全区域配置
+                "offset" : "none" // 底部安全区域偏移，"none"表示不空出安全区域，"auto"自动计算空出安全区域，默认值为"none"
+            }
+        },
         /* 模块配置 */
         "modules" : {
             "Push" : {},

pages/user/index.vue

@@ -23,10 +23,11 @@
 			<text>骑手投诉</text>
 			<image src="/static/image/user/1.png"></image>
 		</view>
-		<view class="nav" @click="loginout()">
+		<view class="nav" @click="is_loginout = true">
 			<text>退出登录</text>
 			<image src="/static/image/user/1.png"></image>
 		</view>
+        <u-modal v-model="is_loginout" show-confirm-button show-cancel-button :content="content" @confirm="loginOut"></u-modal>
 		<u-toast ref="uToast" />
     </view>
 </template>
@@ -36,6 +37,8 @@ export default {
 	data() {
 		return {
 			info:{},
+            is_loginout: false,
+            content: "是否退出登录？",
 			num:0
 		}
 	},
@@ -46,9 +49,9 @@ export default {
 	},
 	methods: {
 		// 退出登陆
-		loginout(){
+		loginOut(){
 			uni.clearStorage();
-			this.imService.disconnect()
+			this.imService.disconnect();
 			this.$refs.uToast.show({
 				title: "退出登陆成功！",
 				type: 'success'

pages/user/myinfo.vue

@@ -23,7 +23,7 @@
 			<text>内容管理</text>
 			<image src="/static/image/user/1.png"></image>
 		</view>
-		<view class="nav" @click="loginout()">
+		<view class="nav" @click="is_loginout = true">
 			<text>退出登录</text>
 			<image src="/static/image/user/1.png"></image>
 		</view>
@@ -50,6 +50,7 @@
 				<image src="../../static/image/index/close.png" class="off" @click="close"></image>
 			</view>
 		</u-popup>
+        <u-modal v-model="is_loginout" show-confirm-button show-cancel-button :content="content" @confirm="loginOut"></u-modal>
 		<u-toast ref="uToast" />
     </view>
 </template>
@@ -59,6 +60,8 @@ export default {
 	data() {
 		return {
 			publishstate:false,
+            is_loginout: false,
+            content: "是否退出登录?",
 			info:{},
 		}
 	},
@@ -88,7 +91,6 @@ export default {
 			uni.reLaunch({
 				url:"../login/login"
 			})
-			
 		},
 		// 获取个人信息
 		getmyinfo(){