Merge remote-tracking branch 'origin/dev' into dev

 <template>
 <template>
-  <el-dialog v-model="show" width="500" :title="languageFormat(language, '出行人信息', 'Travelers')" center append-to-body>
+  <el-dialog v-model="show" width="500" :title="languageFormat(language, '出行人信息', 'Travelers')" center
+             append-to-body>
     <el-button type="primary" plain @click="addPeopl">{{ languageFormat(language, "新增", "Add") }}</el-button>
     <el-button type="primary" plain @click="addPeopl">{{ languageFormat(language, "新增", "Add") }}</el-button>
     <el-radio-group v-model="personId">
     <el-radio-group v-model="personId">
       <div v-for="(it, index) in personList" :key="index" class="e_item">
       <div v-for="(it, index) in personList" :key="index" class="e_item">
@@ -26,7 +27,7 @@
   </el-dialog>
   </el-dialog>
 
 
 
 
-  <el-dialog v-model="showAdd" title="新增出行人" center append-to-body>
+  <el-dialog v-model="showAdd" :title="language ==0?'新增出行人':'Add traveler'" center append-to-body>
     <el-form
     <el-form
         ref="formRef" :model="form" label-width="100px" size="large"
         ref="formRef" :model="form" label-width="100px" size="large"
         style="margin: 80px"
         style="margin: 80px"
@@ -122,9 +123,9 @@ const submit = () => {
     if (valid) {
     if (valid) {
       aadSceneCustomer(form.value).then(res => {
       aadSceneCustomer(form.value).then(res => {
         if (res.data == -100) {
         if (res.data == -100) {
-          proxy.$modal.msgError('人员信息已存在')
+          proxy.$modal.msgError(language.value == 0 ? '人员信息已存在' : 'Person information already exists')
         } else if (res.data == -101) {
         } else if (res.data == -101) {
-          proxy.$modal.msgError('实名认证未通过')
+          proxy.$modal.msgError(language.value == 0 ? '实名认证未通过' : 'The real name authentication has not passed')
         } else {
         } else {
           proxy.$modal.msgSuccess(language.value == 0 ? '添加成功' : 'successfully added')
           proxy.$modal.msgSuccess(language.value == 0 ? '添加成功' : 'successfully added')
           showAdd.value = false
           showAdd.value = false

@@ -134,7 +134,13 @@
                 ]"
                 ]"
                 @click="selectSessionType(key)"
                 @click="selectSessionType(key)"
               >
               >
-                {{ key=='1000'?'日间场':'夜间场' }}
+                <span v-if="key=='1000'">{{
+                  language == 0 ? '日间场' : 'Day'
+                }}</span>
+                <span v-else>{{
+                  language == 0 ? '夜间场' : 'Night'
+                }}</span>
+<!--                {{ key=='1000'?'日间场':'夜间场' }}-->
               </div>
               </div>
             </div>
             </div>
           </div>
           </div>