Commit 34ec7ace authored by 朱国瑞's avatar 朱国瑞

完成页优化增加确定按钮

parent b27a1a5c
...@@ -15,5 +15,6 @@ export default { ...@@ -15,5 +15,6 @@ export default {
cameraText: "Camera not detected. Try again?", cameraText: "Camera not detected. Try again?",
cameraButtonText: "Try Again", cameraButtonText: "Try Again",
completeText2: "You have recorded", completeText2: "You have recorded",
completeButtonText: "Confirm",
} }
} }
...@@ -15,5 +15,6 @@ export default { ...@@ -15,5 +15,6 @@ export default {
cameraText : "Cámara no detectada. ¿Volver a Intentar otra vez?", cameraText : "Cámara no detectada. ¿Volver a Intentar otra vez?",
cameraButtonText : "Intentar otra vez", cameraButtonText : "Intentar otra vez",
completeText2: "Usted ha registrado", completeText2: "Usted ha registrado",
completeButtonText: "Determinar",
} }
} }
...@@ -16,5 +16,6 @@ export default { ...@@ -16,5 +16,6 @@ export default {
cameraText : "Caméra non détectée. Réessayer?", cameraText : "Caméra non détectée. Réessayer?",
cameraButtonText : "Réessayer", cameraButtonText : "Réessayer",
completeText2: "Vous avez enregistré", completeText2: "Vous avez enregistré",
completeButtonText: "C'est sûr.",
} }
} }
...@@ -12,5 +12,6 @@ export default { ...@@ -12,5 +12,6 @@ export default {
cameraText: "未识别到您的摄像头,是否重新识别?", cameraText: "未识别到您的摄像头,是否重新识别?",
cameraButtonText: "立即重识", cameraButtonText: "立即重识",
completeText2: "您已记录", completeText2: "您已记录",
completeButtonText: "确定",
} }
} }
...@@ -12,5 +12,6 @@ export default { ...@@ -12,5 +12,6 @@ export default {
cameraText: "未识别到您的摄像头,是否重新识别?", cameraText: "未识别到您的摄像头,是否重新识别?",
cameraButtonText: "立即重识", cameraButtonText: "立即重识",
completeText2: "您已记录", completeText2: "您已记录",
completeButtonText: "确定",
} }
} }
\ No newline at end of file
...@@ -15,6 +15,9 @@ ...@@ -15,6 +15,9 @@
<div class="record" v-if="finalBabyStatus != 3 && finalBabyStatus != -1"> <div class="record" v-if="finalBabyStatus != 3 && finalBabyStatus != -1">
<div>{{$t('strings.completeText2')}}: {{time}}s</div> <div>{{$t('strings.completeText2')}}: {{time}}s</div>
</div> </div>
<div class="bottom">
<light-button @click="goHome" :text="$t('strings.completeButtonText')"></light-button>
</div>
</div> </div>
</div> </div>
</div> </div>
...@@ -22,6 +25,7 @@ ...@@ -22,6 +25,7 @@
<script> <script>
import { calcAdapt, isMobile } from "../common/util"; import { calcAdapt, isMobile } from "../common/util";
import lightButton from "../components/lightButton.vue";
let calcs = calcAdapt(); let calcs = calcAdapt();
let scale; let scale;
...@@ -65,7 +69,16 @@ export default { ...@@ -65,7 +69,16 @@ export default {
_isMobile: false _isMobile: false
}; };
}, },
methods: {}, components: {
lightButton
},
methods: {
goHome() {
this.$router.push({
path: "/"
});
}
},
created() { created() {
this.$i18n.locale = "en"; this.$i18n.locale = "en";
let lang = localStorage.getItem("lang"); let lang = localStorage.getItem("lang");
...@@ -79,8 +92,8 @@ export default { ...@@ -79,8 +92,8 @@ export default {
let total = this.$route.query.total; let total = this.$route.query.total;
this.finalBabyStatus = finalBabyStatus; this.finalBabyStatus = finalBabyStatus;
this.lying = lying; this.lying = lying;
this.time = time; this.time = time || 0;
this.total = total; this.total = total || 0;
}, },
mounted() {} mounted() {}
}; };
...@@ -114,7 +127,7 @@ export default { ...@@ -114,7 +127,7 @@ export default {
.massage-complete-modal { .massage-complete-modal {
box-sizing: border-box; box-sizing: border-box;
width: 660px; width: 660px;
height: 620px; min-height: 620px;
padding: 80px 0 125px; padding: 80px 0 125px;
background: #fff; background: #fff;
display: flex; display: flex;
...@@ -199,7 +212,7 @@ export default { ...@@ -199,7 +212,7 @@ export default {
.massage-complete-modal { .massage-complete-modal {
box-sizing: border-box; box-sizing: border-box;
width: 8.8rem; width: 8.8rem;
height: 8.2667rem; min-height: 8.2667rem;
padding: 1.0667rem 0 1.6667rem; padding: 1.0667rem 0 1.6667rem;
background: #fff; background: #fff;
display: flex; display: flex;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment