Commit 0dec3253 authored by April's avatar April

Merge branch 'master' of http://120.77.240.215:9701/limeimei/sim

parents 3424cae6 1da095f3
Pipeline #2071 canceled with stages
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
<div> <div>
<div class="auth_center" v-if="type==0"> <div class="auth_center" v-if="type==0">
<img :src="info.photo" class="auth_img"> <img src="@/assets/head.png" class="auth_img">
<div class="auth_right"> <div class="auth_right">
<div>姓名:<span style="color: #666666;">{{info.name}}</span></div> <div>姓名:<span style="color: #666666;">{{info.name}}</span></div>
<div>性别:<span style="color: #666666;">{{info.sex}}</span></div> <div>性别:<span style="color: #666666;">{{info.sex}}</span></div>
...@@ -59,18 +59,18 @@ ...@@ -59,18 +59,18 @@
export default { export default {
data() { data() {
return { return {
info: {}, info: { name: '陈雨', nation: "汉", sex: '女', idnumber: '440514200004230010', address: '广东省汕头市潮南区' },
type: null, type: null,
} }
}, },
created() { created() {
var info = this.$route.params.info; // var info = this.$route.params.info;
if (info) { // if (info) {
info = JSON.parse(info); // info = JSON.parse(info);
this.info = info; // this.info = info;
} // }
this.type = this.$route.params.type this.type = this.$route.params.type
}, },
beforeRouteLeave(to, from, next) { beforeRouteLeave(to, from, next) {
......
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
<div class="auth_center" v-if="this.type===2"> <div class="auth_center" v-if="this.type===2">
<img src="@/assets/visitor/222.png" class="auth_img"> <img src="@/assets/head.png" class="auth_img">
<div class="auth_right"> <div class="auth_right">
<div>姓名:<span style="color: #666666;">{{info.name}}</span></div> <div>姓名:<span style="color: #666666;">{{info.name}}</span></div>
<div>身份证号:<span style="color: #666666;">{{info.idNo}}</span></div> <div>身份证号:<span style="color: #666666;">{{info.idNo}}</span></div>
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
</div> </div>
</div> </div>
<div class="auth_center" v-else> <div class="auth_center" v-else>
<img src="@/assets/visitor/222.png" class="auth_img"> <img src="@/assets/head.png" class="auth_img">
<div class="auth_right"> <div class="auth_right">
<div>姓名:<span style="color: #666666;">{{info.name}}</span></div> <div>姓名:<span style="color: #666666;">{{info.name}}</span></div>
<div>性别:<span style="color: #666666;">{{info.sex}}</span></div> <div>性别:<span style="color: #666666;">{{info.sex}}</span></div>
......
...@@ -66,7 +66,7 @@ ...@@ -66,7 +66,7 @@
name: "success", name: "success",
params: { params: {
info: JSON.stringify({ name: '陈雨', nation: "汉", sex: '女', idnumber: '440514200006230010', address: '广东省汕头市潮南区' }), info: JSON.stringify({ name: '陈雨', nation: "汉", sex: '女', idnumber: '440514200006230010', address: '广东省汕头市潮南区' }),
type: 0, type: 0,
}, },
}); });
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<div class="return_btn"><el-button v-show="this.type==0" @click="toBack">返回上一步</el-button></div> <div class="return_btn"><el-button v-show="this.type==0" @click="toBack">返回上一步</el-button></div>
<div class="card_left_c" @click="openCamera"> <div class="card_left_c" @click="openCamera">
<img :src="imgSrc" alt="" class="card_left_img2" v-if="imgSrc!=''"> <img src="@/assets/head.png" alt="" class="card_left_img2" v-if="imgSrc!=''">
<img src="@/assets/visitor/camera.png" alt="" class="card_left_img" v-else> <img src="@/assets/visitor/camera.png" alt="" class="card_left_img" v-else>
</div> </div>
<div class="card_item"><span class="card_item_span">姓名:</span> <div class="card_item"><span class="card_item_span">姓名:</span>
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<div class="card_left_c"> <div class="card_left_c">
<img :src="imgSrc" alt="" class="card_left_img" v-if="imgSrc!=''"> <img :src="imgSrc" alt="" class="card_left_img" v-if="imgSrc!=''">
<img src="@/assets/visitor/222.png" alt="" class="card_left_img" v-else> <img src="@/assets/head.png" alt="" class="card_left_img" v-else>
</div> </div>
<div class="card_item"><span class="card_item_span">姓名:</span> <div class="card_item"><span class="card_item_span">姓名:</span>
<el-input v-model="vform.name"></el-input> <el-input v-model="vform.name"></el-input>
......
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