merge limo to daylight

pages/setting/setting.vue

@@ -217,6 +217,7 @@
 
 <script>
 	import {logout} from '../../api/commonApi.js'
+	import {updateDeviceToken} from '../../api/notificationApi.js'
 	
 	export default {
 		data() {
@@ -251,19 +252,6 @@
 				single: "2021-04-3",
 				today: new Date(),
 				range: [],
-				selectData:[{
-						value: '1',
-						label: 'Corso'
-					},
-					{
-						value: '2',
-						label: 'Mauve',
-					},
-					{
-						value: '3',
-						label: 'Calmi',
-					}
-				],
 			}
 		},
 		onLoad() {
@@ -356,7 +344,7 @@
 			showDelegate() {
 				this.showMsgBox = true;
 			},
-			confirmLang(e){
+			async confirmLang(e){
 				uni.setLocale(e.value[0].code);
 				this.$i18n.locale = e.value[0].code;
 				this.lang = e.value[0].name;
@@ -378,6 +366,10 @@
 						// ignore
 					}
 				});
+				//这里加上接口，切换语言时 更新DeviceToken中的useLanguage字段
+				const useLanguage = e.value[0].code === 'en'? 0 : 1;
+				console.log(useLanguage);
+				await updateDeviceToken({userId : this.userData.userId,useLanguage});
 				// #endif
 				this.showPicker = false;
 			},