Merge commit '95a62be1' into dev

@@ -48,9 +48,11 @@
                     <span v-if="language == 0">剩余房间数:{{ canOrderNum }}</span>
                     <span v-if="language == 0">剩余房间数:{{ canOrderNum }}</span>
                     <span v-else>{{ canOrderNum }} Remaining rooms</span>
                     <span v-else>{{ canOrderNum }} Remaining rooms</span>
                   </div>
                   </div>
+                  <div class="tip" v-if="language==1">If you need to make a hotel reservation, please fill in the full names of all required persons when booking the hotel. (For two or more people, please use ',')</div>
+
                 </el-form-item>
                 </el-form-item>
-                <el-form-item v-for="(n,index) in form.roomNum" :key="index" :label="language==1?`Name${index+1}`:`入住人${index+1}`" required>
-                  <el-input v-model="rzUserArr[index]" :placeholder="language==0?'每间填一位住客姓名':'Each room fill in one name of the guest'"/>
+                <el-form-item v-for="(n,index) in form.roomNum" :key="index" :label="language==1?`Room${index+1}`:`入住人${index+1}`" required>
+                  <el-input v-model="rzUserArr[index]" :placeholder="language==0?'请完整填写该房间所有的入住人姓名，以“,”符号分隔':'please fill in the name of the actual check-in person'"/>
                 </el-form-item>
                 </el-form-item>
                 <el-form-item :label="language==0?'预计到店':'Expected check-in'" required>
                 <el-form-item :label="language==0?'预计到店':'Expected check-in'" required>
                   <el-select v-model="form.ddDate"
                   <el-select v-model="form.ddDate"

@@ -80,7 +80,7 @@ const startCheckSuccessListener = (orderSn, actId) => {
         clearInterval(timer);
         clearInterval(timer);
         timer = null;
         timer = null;
       });
       });
-  }, 3000);
+  }, 1500);
 };
 };
 
 
 const detail = reactive({
 const detail = reactive({
@@ -352,7 +352,7 @@ detail.fetchData();
           >
           >
             <div>{{ it.name }}</div>
             <div>{{ it.name }}</div>
             <div class="idcard">
             <div class="idcard">
-              {{ languageFormat(language, "身份证", "ID number") }}：{{
+              {{ languageFormat(language, "证件号", "ID number") }}：{{
                 it.idCard
                 it.idCard
               }}
               }}
             </div>
             </div>

@@ -68,7 +68,7 @@ audience.fetchData();
         >
         >
           <div class="name">{{ it.name }}</div>
           <div class="name">{{ it.name }}</div>
           <div class="idcard">
           <div class="idcard">
-            {{ languageFormat(language, "身份证", "Identity Card") }}：{{
+            {{ languageFormat(language, "证件号", "Identity Card") }}：{{
               it.idCard
               it.idCard
             }}
             }}
           </div>
           </div>