1，语言设定移动

2，支付确认消息追加

src/components/pages/nav.vue

@@ -13,7 +13,13 @@
                 <span @click="logoutF">{{$t("nav.signOut")}}</span>
             </div>
             -->
+            <div class="navOut" v-if="out">
+                <span @click="toogleLanguage" class="text">{{$t('login.language')}}：{{languages}}</span>
+            </div>
         </div>
+        <van-popup v-model="languageShow" round position="bottom" :style="{ height: '40%' }">
+            <van-picker show-toolbar title="选择语言" :columns="languagecolumns" @confirm="languageConfirm" @cancel="languageCancel" />
+        </van-popup>
     </div>
 </template>
 
@@ -37,7 +43,27 @@ export default {
         },
     },
     data() {
-        return {};
+        return {
+            languageShow:false,
+            languagecolumns:[
+                { text: '简体中文', value: 0 },
+                { text: '日本語', value: 1 },
+            ],
+        };
+    },
+    computed:{
+        languages(){
+            let text='';
+            let language=this.$store.state.user.language;
+            if(language=='zh'){
+                text='简体中文'
+            }
+            if(language=='ja'){
+                text='日本語'
+            }
+            console.log(language)
+            return text;
+        }
     },
     methods: {
         goBack() {
@@ -48,6 +74,23 @@ export default {
                 this.$router.back();
             }
         },
+        toogleLanguage(){
+            this.languageShow = true;
+        },
+        languageConfirm(value){
+            let text='';
+            if(value.value==0){
+                text='zh'
+            }else{
+                text='ja'
+            }
+            this.$store.commit("user/SET_LANGUAGE", text);
+            this.languageCancel();
+            location.reload();
+        },
+        languageCancel(){
+            this.languageShow = false;
+        },
         logoutF() {
             this.$dialog
                 .confirm({

src/lang/ja.js

@@ -86,8 +86,8 @@ export default {
         none: 'データなし',
         noneName: 'ニックネームはまだ設定されていません',
         paymentMethod: '支払い方法を選択してください',
-        paymentSuccess: '支払い完了'
-
+        paymentSuccess: '支払い完了',
+        confirmPaying: '支払い確認中・・・',
     },
     news: {
         title: 'お知らせ',

src/lang/zh.js

@@ -86,8 +86,8 @@ export default {
     none:'暂无数据',
     noneName:'暂未设置昵称',
     paymentMethod:'请选择支付方式',
-    paymentSuccess:'支付成功'
-    
+    paymentSuccess:'支付成功',
+    confirmPaying:'支付确认中・・・',
   },
   news:{
     title:'消息',

src/views/home/pages/confirmOrder/confirmOrder.vue

@@ -6,7 +6,7 @@
             <div class="content">
                 <div class="userBox">
                     <span>{{userData.name}}</span>
-                    <span>{{userData.phone}}</span>
+                    <!--<span>{{userData.phone}}</span>-->
                 </div>
                 <div class="cell" v-for="item,index in confirmList" :key="index">
                     <div class="top">

src/views/home/pages/linePay/cancel.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="container">
-    <span style="font-size : small;display: inline-block;">支払確認中・・・</span>
+    <span style="font-size : small;display: inline-block;">{{$t('confirmOrder.confirmPaying')}}</span>
     <vue-loading type="spin" color="#333" :size="{ width: '50px', height: '50px' }"></vue-loading>
   </div>
 </template>

src/views/home/pages/linePay/confirm.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="container">
-    <span style="font-size : small;display: inline-block;">支払確認中・・・</span>
+    <span style="font-size : small;display: inline-block;">{{$t('confirmOrder.confirmPaying')}}</span>
     <vue-loading type="spin" color="#333" :size="{ width: '50px', height: '50px' }"></vue-loading>
   </div>
 </template>