bugfix_4.3

components/navBar/navigation.vue

@@ -33,6 +33,10 @@
 			scroll: {
 				default: 0,
 				type: Number
+			},
+			type: {
+				type: Boolean,
+				default: false
 			}
 		},
 		watch: {

pages/powerSetting/powerSetting.vue

@@ -2,8 +2,8 @@
 		<view class="power-setting-main">
 			<navBar :name="$t('权限设置')" bgColor="transparent"></navBar>
 			<view class="flex-row power-setting-head">
-				<image class="head-img" :src="headimg" mode="aspectFit"></image>
-				<view class="head-name">{{nickname}}</view>
+				<image class="head-img" :src="form.headimg"></image>
+				<view class="head-name">{{form.nickname}}</view>
 				<text class="head-email">{{form.email}}</text>
 			</view>
 			<view class="setting-card" style="margin-bottom: 20rpx;">
@@ -60,10 +60,10 @@
 		data() {
 			return {
 				isSet:"",
-				headimg: "",
-				nickname: "",
 				target_user_id:0,
 				form: {
+					headimg: "",
+					nickname: "",
 					car_sn: "",
 					email: "",
 					authority_list: [5]
@@ -83,7 +83,7 @@
 				return
 			}
 			this.form.email = options.email;
-			this.headimg = options.headimg;
+			this.form.headimg = options.headimg;
 			this.form.nickname = options.nickname;
 		},
 		methods: {
@@ -100,8 +100,8 @@
 					})
 					this.form.authority_list = data.data.authority
 					this.form.email = data.data.email
-					this.nickname = data.data.nickname
-					this.headimg = data.data.headimg
+					this.form.nickname = data.data.nickname
+					this.form.headimg = data.data.headimg
 				}
 			},
 			async delSubmit() {

utils/util.js

@@ -2,12 +2,7 @@ import dayjs from 'dayjs'
 import duration from 'dayjs/plugin/duration'
 dayjs.extend(duration);
 const systemInfo = uni.getSystemInfoSync();
-<<<<<<< HEAD
- const Language = (systemInfo.language == 'zh-CN' || systemInfo.language == 'zh_CN') ? 'zh' : 'en' // 'zh' | 'en'
-=======
-// const Language = systemInfo.language == 'zh_CN' ? 'zh' : 'en' // 'zh' | 'en'
-const Language = 'en' // 'zh' | 'en'
->>>>>>> xxq_test
+const Language = (systemInfo.language == 'zh-CN' || systemInfo.language == 'zh_CN') ? 'zh' : 'en' // 'zh' | 'en'
 const formatTime = (date) => {
 	const year = date.getFullYear();
 	const month = date.getMonth() + 1;