正在显示
22 个修改的文件
包含
548 行增加
和
132 行删除
@@ -9539,10 +9539,9 @@ | @@ -9539,10 +9539,9 @@ | ||
9539 | "dev": true | 9539 | "dev": true |
9540 | }, | 9540 | }, |
9541 | "qs": { | 9541 | "qs": { |
9542 | - "version": "6.5.2", | ||
9543 | - "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz", | ||
9544 | - "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==", | ||
9545 | - "dev": true | 9542 | + "version": "6.9.4", |
9543 | + "resolved": "https://registry.npmjs.org/qs/-/qs-6.9.4.tgz", | ||
9544 | + "integrity": "sha512-A1kFqHekCTM7cz0udomYUoYNWjBebHm/5wzU/XqrBRBNWectVH0QIiN+NEcZ0Dte5hvzHwbr8+XQmguPhJ6WdQ==" | ||
9546 | }, | 9545 | }, |
9547 | "query-string": { | 9546 | "query-string": { |
9548 | "version": "4.3.4", | 9547 | "version": "4.3.4", |
@@ -9930,6 +9929,14 @@ | @@ -9930,6 +9929,14 @@ | ||
9930 | "tough-cookie": "~2.5.0", | 9929 | "tough-cookie": "~2.5.0", |
9931 | "tunnel-agent": "^0.6.0", | 9930 | "tunnel-agent": "^0.6.0", |
9932 | "uuid": "^3.3.2" | 9931 | "uuid": "^3.3.2" |
9932 | + }, | ||
9933 | + "dependencies": { | ||
9934 | + "qs": { | ||
9935 | + "version": "6.5.2", | ||
9936 | + "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz", | ||
9937 | + "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==", | ||
9938 | + "dev": true | ||
9939 | + } | ||
9933 | } | 9940 | } |
9934 | }, | 9941 | }, |
9935 | "request-promise-core": { | 9942 | "request-promise-core": { |
@@ -11,6 +11,7 @@ | @@ -11,6 +11,7 @@ | ||
11 | "axios": "^0.19.2", | 11 | "axios": "^0.19.2", |
12 | "core-js": "^2.6.5", | 12 | "core-js": "^2.6.5", |
13 | "element-ui": "^2.13.1", | 13 | "element-ui": "^2.13.1", |
14 | + "qs": "^6.9.4", | ||
14 | "vant": "^2.8.2", | 15 | "vant": "^2.8.2", |
15 | "vue": "^2.6.10", | 16 | "vue": "^2.6.10", |
16 | "vue-router": "^3.0.3", | 17 | "vue-router": "^3.0.3", |
hunlian/src/assets/13.png
0 → 100644
2.5 KB
@@ -8,6 +8,7 @@ | @@ -8,6 +8,7 @@ | ||
8 | 8 | ||
9 | <p>{{item.nickname}}</p> | 9 | <p>{{item.nickname}}</p> |
10 | <div class="block">{{item.about_me}}</div> | 10 | <div class="block">{{item.about_me}}</div> |
11 | + <!-- {{item.nickname}} --> | ||
11 | <!-- </div> --> | 12 | <!-- </div> --> |
12 | </router-link> | 13 | </router-link> |
13 | </div> | 14 | </div> |
@@ -40,7 +41,7 @@ export default { | @@ -40,7 +41,7 @@ export default { | ||
40 | this.$axios.post('api/Index/shouye', { | 41 | this.$axios.post('api/Index/shouye', { |
41 | city: '' | 42 | city: '' |
42 | }).then(res => { | 43 | }).then(res => { |
43 | - // this.msg=res.data.msg | 44 | + |
44 | that.arr = res.data | 45 | that.arr = res.data |
45 | console.log(res) | 46 | console.log(res) |
46 | 47 | ||
@@ -68,7 +69,7 @@ export default { | @@ -68,7 +69,7 @@ export default { | ||
68 | height:1.4rem; | 69 | height:1.4rem; |
69 | background:#fff; | 70 | background:#fff; |
70 | border-radius:.25rem; | 71 | border-radius:.25rem; |
71 | - margin:0rem 0.03rem 0.03rem 0.11rem; | 72 | + margin:0.1rem 0.03rem 0.03rem 0.11rem; |
72 | padding:5%; | 73 | padding:5%; |
73 | .details2{ | 74 | .details2{ |
74 | width:.4rem; | 75 | width:.4rem; |
@@ -4,7 +4,7 @@ | @@ -4,7 +4,7 @@ | ||
4 | <van-popup v-model="showHidden" round position="bottom" :style="{ height: '20%' }" close-on-click-overlay @hide="show" > | 4 | <van-popup v-model="showHidden" round position="bottom" :style="{ height: '20%' }" close-on-click-overlay @hide="show" > |
5 | <button class="btn" >相机</button> | 5 | <button class="btn" >相机</button> |
6 | <button class="btn" @click="go">相册</button> | 6 | <button class="btn" @click="go">相册</button> |
7 | - <button class="btn">取消</button> | 7 | + <button class="btn" @click="hide">取消</button> |
8 | 8 | ||
9 | </van-popup> | 9 | </van-popup> |
10 | 10 | ||
@@ -20,14 +20,18 @@ export default { | @@ -20,14 +20,18 @@ export default { | ||
20 | }, | 20 | }, |
21 | data () { | 21 | data () { |
22 | return { | 22 | return { |
23 | - showHidden:"" | 23 | + showHidden : '' |
24 | + | ||
24 | 25 | ||
25 | } | 26 | } |
26 | 27 | ||
27 | }, | 28 | }, |
28 | methods :{ | 29 | methods :{ |
29 | go () { | 30 | go () { |
30 | - this.$router.push("/photo"); | 31 | + this.$router.push('/myAlbum') |
32 | + }, | ||
33 | + hide () { | ||
34 | + this.showHidden = false | ||
31 | } | 35 | } |
32 | } | 36 | } |
33 | } | 37 | } |
@@ -4,6 +4,7 @@ import router from './router' | @@ -4,6 +4,7 @@ import router from './router' | ||
4 | import store from './store' | 4 | import store from './store' |
5 | import ElementUI from 'element-ui' | 5 | import ElementUI from 'element-ui' |
6 | import Axios from 'axios' | 6 | import Axios from 'axios' |
7 | +import qs from 'qs' | ||
7 | import 'element-ui/lib/theme-chalk/index.css' | 8 | import 'element-ui/lib/theme-chalk/index.css' |
8 | import './assets/font/iconfont.css' | 9 | import './assets/font/iconfont.css' |
9 | import './assets/style/reset.css' | 10 | import './assets/style/reset.css' |
@@ -14,30 +15,31 @@ import 'vant/lib/index.css' | @@ -14,30 +15,31 @@ import 'vant/lib/index.css' | ||
14 | Vue.config.productionTip = false | 15 | Vue.config.productionTip = false |
15 | Axios.defaults.baseURL = '/api/' | 16 | Axios.defaults.baseURL = '/api/' |
16 | Vue.prototype.$axios = Axios | 17 | Vue.prototype.$axios = Axios |
17 | -// let getCookie=funtion(cookie){ | ||
18 | -// let reg = /csrftoken=([\w]+)[;]?/g | ||
19 | -// return reg.exec(cookie)[1] | ||
20 | -// } | ||
21 | - | 18 | +Vue.prototype.$qs=qs |
22 | //添加请求拦截器,在请求头中加token | 19 | //添加请求拦截器,在请求头中加token |
23 | Axios.interceptors.request.use(function (config) { | 20 | Axios.interceptors.request.use(function (config) { |
24 | // 在发送请求之前做些什么 | 21 | // 在发送请求之前做些什么 |
25 | - config=>{ | ||
26 | - if(localStorage.getItem('Authorization')){ | ||
27 | - config.headers.Authorization=localstorage.getItem('Authorization'); | ||
28 | - } | ||
29 | - } | ||
30 | - return config | 22 | + // config=>{ |
23 | + config.headers = { | ||
24 | + 'Content-Type': 'application/x-www-form-urlencoded;charset=UTF-8' | ||
25 | + } | ||
26 | + // if(localStorage.getItem('Authorization')){ | ||
27 | + // config.headers = { | ||
28 | + // 'Authorization': localstorage.getItem('Authorization') | ||
29 | + // } | ||
30 | + // } | ||
31 | + // } | ||
32 | + return config; | ||
31 | }, function (error) { | 33 | }, function (error) { |
32 | // 对请求错误做些什么 | 34 | // 对请求错误做些什么 |
33 | return Promise.reject(error) | 35 | return Promise.reject(error) |
34 | - }); | 36 | + }) |
35 | //添加响应拦截器 | 37 | //添加响应拦截器 |
36 | Axios.interceptors.response.use(function(response){ | 38 | Axios.interceptors.response.use(function(response){ |
37 | - return response; | 39 | + return response |
38 | },function(erros){ | 40 | },function(erros){ |
39 | - return Promise.reject(error); | ||
40 | - }); | 41 | + return Promise.reject(error) |
42 | + }) | ||
41 | Vue.use(ElementUI) | 43 | Vue.use(ElementUI) |
42 | Vue.use(Vant) | 44 | Vue.use(Vant) |
43 | new Vue({ | 45 | new Vue({ |
@@ -3,7 +3,7 @@ | @@ -3,7 +3,7 @@ | ||
3 | <div class="header"> | 3 | <div class="header"> |
4 | <h2 @click="back1"><</h2><h1>心仪我的</h1> | 4 | <h2 @click="back1"><</h2><h1>心仪我的</h1> |
5 | </div> | 5 | </div> |
6 | - <router-link to='/xiangQing' class="details1" v-for="item in arr" :key="item.id"> | 6 | + <router-link to='/xiangQing' class="details1" v-for="item in arr" :key="item.id"> |
7 | <!-- <div class="details1" v-for="item in arr" :key="item.id" > --> | 7 | <!-- <div class="details1" v-for="item in arr" :key="item.id" > --> |
8 | <div class="details2"> | 8 | <div class="details2"> |
9 | <img :src="item.avatar" alt="" @click="goFangDa"> | 9 | <img :src="item.avatar" alt="" @click="goFangDa"> |
@@ -22,8 +22,13 @@ export default { | @@ -22,8 +22,13 @@ export default { | ||
22 | components: { | 22 | components: { |
23 | 23 | ||
24 | }, | 24 | }, |
25 | + data () { | ||
26 | + return { | ||
27 | + arr:[] | ||
28 | + } | ||
29 | + }, | ||
25 | mounted: function(){ | 30 | mounted: function(){ |
26 | - | 31 | + this.getData() |
27 | 32 | ||
28 | }, | 33 | }, |
29 | created () { | 34 | created () { |
@@ -35,17 +40,32 @@ export default { | @@ -35,17 +40,32 @@ export default { | ||
35 | }, | 40 | }, |
36 | back1 () { | 41 | back1 () { |
37 | this.$router.go(-1); | 42 | this.$router.go(-1); |
43 | + }, | ||
44 | + getData () { | ||
45 | + let that = this | ||
46 | + | ||
47 | + this.$axios.post('/api/Center/like_me', {}).then((res) => { | ||
48 | + that.arr = res.data | ||
49 | + console.log(res.data) | ||
50 | + }).catch((error) => { | ||
51 | + console.log(error) | ||
52 | + }) | ||
38 | } | 53 | } |
39 | } | 54 | } |
40 | } | 55 | } |
41 | </script> | 56 | </script> |
42 | <style lang="scss" scoped> | 57 | <style lang="scss" scoped> |
43 | - .home{ | 58 | + .home{ |
44 | width:100%; | 59 | width:100%; |
45 | - height:100%; | 60 | + // height:100%; |
46 | background:#11A7FC; | 61 | background:#11A7FC; |
47 | padding-top:10%; | 62 | padding-top:10%; |
48 | - padding-left:8%; | 63 | + padding-left:5%; |
64 | + flex-wrap:wrap; | ||
65 | + // min-height:0rem; | ||
66 | + overflow-y:scroll; | ||
67 | + display:flex; | ||
68 | + // flex: 1; | ||
49 | .header{ | 69 | .header{ |
50 | width:90%; | 70 | width:90%; |
51 | height:.3rem; | 71 | height:.3rem; |
@@ -55,12 +75,13 @@ export default { | @@ -55,12 +75,13 @@ export default { | ||
55 | font-size:.2rem; | 75 | font-size:.2rem; |
56 | line-height:.3rem; | 76 | line-height:.3rem; |
57 | color:#fff; | 77 | color:#fff; |
58 | - text-align:center; | 78 | + // text-align:center; |
79 | + margin-left:35%; | ||
59 | } | 80 | } |
60 | h2{ | 81 | h2{ |
61 | font-size:.2rem; | 82 | font-size:.2rem; |
62 | color:#fff; | 83 | color:#fff; |
63 | - margin-bottom:.5rem; | 84 | + // margin-bottom:.5rem; |
64 | line-height:.3rem; | 85 | line-height:.3rem; |
65 | float:left; | 86 | float:left; |
66 | } | 87 | } |
@@ -71,8 +92,9 @@ export default { | @@ -71,8 +92,9 @@ export default { | ||
71 | height:1.4rem; | 92 | height:1.4rem; |
72 | background:#fff; | 93 | background:#fff; |
73 | border-radius:.25rem; | 94 | border-radius:.25rem; |
74 | - margin:0rem 0.03rem 0.03rem 0.11rem; | 95 | + margin:0.04rem 0.08rem 0.03rem 0rem; |
75 | padding:5%; | 96 | padding:5%; |
97 | + display:block; | ||
76 | .details2{ | 98 | .details2{ |
77 | width:.4rem; | 99 | width:.4rem; |
78 | height:.4rem; | 100 | height:.4rem; |
@@ -3,7 +3,7 @@ | @@ -3,7 +3,7 @@ | ||
3 | <h2 @click="back"><</h2> | 3 | <h2 @click="back"><</h2> |
4 | <h1>择偶条件</h1> | 4 | <h1>择偶条件</h1> |
5 | <van-field | 5 | <van-field |
6 | - v-model="message" | 6 | + v-model="choose" |
7 | rows="6" | 7 | rows="6" |
8 | autosize | 8 | autosize |
9 | 9 | ||
@@ -11,6 +11,7 @@ | @@ -11,6 +11,7 @@ | ||
11 | maxlength="100" | 11 | maxlength="100" |
12 | placeholder="填写择偶条件,找到那个TA~" | 12 | placeholder="填写择偶条件,找到那个TA~" |
13 | show-word-limit | 13 | show-word-limit |
14 | + @input="getCondition" | ||
14 | /> | 15 | /> |
15 | <div class="btn" @click="go">下一步</div> | 16 | <div class="btn" @click="go">下一步</div> |
16 | </div> | 17 | </div> |
@@ -24,15 +25,28 @@ export default { | @@ -24,15 +25,28 @@ export default { | ||
24 | }, | 25 | }, |
25 | data () { | 26 | data () { |
26 | return { | 27 | return { |
27 | - message:'' | 28 | + choose: '' |
28 | } | 29 | } |
29 | }, | 30 | }, |
30 | - methods:{ | 31 | + methods: { |
31 | back () { | 32 | back () { |
32 | - this.$router.go(-1); | 33 | + this.$router.go(-1) |
33 | }, | 34 | }, |
34 | go () { | 35 | go () { |
35 | this.$router.push('photo') | 36 | this.$router.push('photo') |
37 | + }, | ||
38 | + getCondition () { | ||
39 | + let that = this | ||
40 | + let params = { | ||
41 | + 'choose': that.choose | ||
42 | + } | ||
43 | + that.$axios.post('/api/Register/register_is_fifth', params).then((res) => { | ||
44 | + that.choose = res.data | ||
45 | + console.log(that.choose) | ||
46 | + }).catch((err) => { | ||
47 | + console.log(err) | ||
48 | + }) | ||
49 | + | ||
36 | } | 50 | } |
37 | } | 51 | } |
38 | } | 52 | } |
@@ -4,7 +4,8 @@ | @@ -4,7 +4,8 @@ | ||
4 | <h2 @click="back1"><</h2><h1>详细资料</h1> | 4 | <h2 @click="back1"><</h2><h1>详细资料</h1> |
5 | </div> | 5 | </div> |
6 | <div class="nav"> | 6 | <div class="nav"> |
7 | - <img src="" alt=""> | 7 | + <img src="../assets/1.png" alt=""> |
8 | + <img src="../assets/13.png" alt="" class="img" @click="goPhoto"> | ||
8 | </div> | 9 | </div> |
9 | 10 | ||
10 | <div class="center"> | 11 | <div class="center"> |
@@ -99,6 +100,8 @@ export default { | @@ -99,6 +100,8 @@ export default { | ||
99 | value6:0, | 100 | value6:0, |
100 | value7:0, | 101 | value7:0, |
101 | value8:0, | 102 | value8:0, |
103 | + value9:0, | ||
104 | + value10:0, | ||
102 | option1: [ | 105 | option1: [ |
103 | { text: '不限', value: 0 }, | 106 | { text: '不限', value: 0 }, |
104 | { text: '男', value: 1 }, | 107 | { text: '男', value: 1 }, |
@@ -185,11 +188,15 @@ export default { | @@ -185,11 +188,15 @@ export default { | ||
185 | 188 | ||
186 | ], | 189 | ], |
187 | option9: [ | 190 | option9: [ |
191 | + { text: '北京', value: 0 } | ||
192 | + | ||
193 | + ], | ||
194 | + option10: [ | ||
188 | { text: '未婚', value: 0 }, | 195 | { text: '未婚', value: 0 }, |
189 | { text: '离异', value: 1 }, | 196 | { text: '离异', value: 1 }, |
190 | { text: '丧偶', value: 2 } | 197 | { text: '丧偶', value: 2 } |
191 | ], | 198 | ], |
192 | - option10: [ | 199 | + option11: [ |
193 | { text: '北京', value: 0 } | 200 | { text: '北京', value: 0 } |
194 | 201 | ||
195 | ], | 202 | ], |
@@ -202,6 +209,9 @@ export default { | @@ -202,6 +209,9 @@ export default { | ||
202 | }, | 209 | }, |
203 | goBu (){ | 210 | goBu (){ |
204 | this.$router.push('/introduction'); | 211 | this.$router.push('/introduction'); |
212 | + }, | ||
213 | + goPhoto () { | ||
214 | + this.$router.push('/photo'); | ||
205 | } | 215 | } |
206 | } | 216 | } |
207 | } | 217 | } |
@@ -236,11 +246,25 @@ export default { | @@ -236,11 +246,25 @@ export default { | ||
236 | } | 246 | } |
237 | .nav{ | 247 | .nav{ |
238 | width:22%; | 248 | width:22%; |
239 | - height:6%; | 249 | + height:7%; |
240 | border-radius:50%; | 250 | border-radius:50%; |
241 | - margin-left:33%; | 251 | + margin-left:35%; |
242 | background:#fff; | 252 | background:#fff; |
243 | margin-bottom:.2rem; | 253 | margin-bottom:.2rem; |
254 | + position:relative; | ||
255 | + img{ | ||
256 | + width:100%; | ||
257 | + height:100%; | ||
258 | + margin-bottom:.3rem; | ||
259 | + } | ||
260 | + .img{ | ||
261 | + width:.24rem; | ||
262 | + height:.24rem; | ||
263 | + position:absolute; | ||
264 | + right:0; | ||
265 | + top:75%; | ||
266 | + | ||
267 | + } | ||
244 | } | 268 | } |
245 | .center{ | 269 | .center{ |
246 | width:88%; | 270 | width:88%; |
@@ -302,7 +326,7 @@ export default { | @@ -302,7 +326,7 @@ export default { | ||
302 | color:#fff; | 326 | color:#fff; |
303 | .van-dropdown-item{ | 327 | .van-dropdown-item{ |
304 | height:.5rem; | 328 | height:.5rem; |
305 | - width:90%; | 329 | + width:80%; |
306 | font-size:.16rem; | 330 | font-size:.16rem; |
307 | background-color:#11A7FC; | 331 | background-color:#11A7FC; |
308 | background:red; | 332 | background:red; |
@@ -659,17 +683,20 @@ export default { | @@ -659,17 +683,20 @@ export default { | ||
659 | border:none; | 683 | border:none; |
660 | color:#fff; | 684 | color:#fff; |
661 | padding-left:4%; | 685 | padding-left:4%; |
686 | + border-bottom:1px solid #fff; | ||
662 | float:left; | 687 | float:left; |
663 | } | 688 | } |
664 | .el-dropdown-menu__item--divided:before{ | 689 | .el-dropdown-menu__item--divided:before{ |
665 | border: 1px solid #11A7FC; | 690 | border: 1px solid #11A7FC; |
666 | background-color:#11A7FC; | 691 | background-color:#11A7FC; |
692 | + border-bottom:1px solid #fff; | ||
667 | } | 693 | } |
668 | .van-dropdown-menu{ | 694 | .van-dropdown-menu{ |
669 | // width:20%; | 695 | // width:20%; |
670 | height:100%; | 696 | height:100%; |
671 | background-color:#11A7FC; | 697 | background-color:#11A7FC; |
672 | - border: 1px solid #11A7FC; | 698 | + // border: 1px solid #11A7FC; |
699 | + border-bottom:1px solid #fff; | ||
673 | // background:red; | 700 | // background:red; |
674 | 701 | ||
675 | color:#fff; | 702 | color:#fff; |
@@ -2,12 +2,13 @@ | @@ -2,12 +2,13 @@ | ||
2 | <div class="forget"> | 2 | <div class="forget"> |
3 | <h2 @click="back"><</h2> | 3 | <h2 @click="back"><</h2> |
4 | <h1>重置密码</h1> | 4 | <h1>重置密码</h1> |
5 | - <input type="tel" v-model=" phone" | 5 | + <input type="tel" v-model="mobile" |
6 | pattern="^1[3456789]\d{9}$" required placeholder="请输入手机号"><hr /> | 6 | pattern="^1[3456789]\d{9}$" required placeholder="请输入手机号"><hr /> |
7 | - <input type="number" placeholder="请输入验证码"><hr /> | ||
8 | - <input type="number" placeholder="请输入新密码"><hr /> | 7 | + |
8 | + <input type="number" v-model="newpassword" placeholder="请输入新密码"><hr /> | ||
9 | + <input type="number" placeholder="请输入验证码" ><hr /> | ||
9 | <p @click="goRegister">去注册</p> | 10 | <p @click="goRegister">去注册</p> |
10 | - <div class="footer" >保存</div> | 11 | + <div class="footer" @click="login">保存</div> |
11 | 12 | ||
12 | </div> | 13 | </div> |
13 | </template> | 14 | </template> |
@@ -20,7 +21,8 @@ export default { | @@ -20,7 +21,8 @@ export default { | ||
20 | }, | 21 | }, |
21 | data () { | 22 | data () { |
22 | return { | 23 | return { |
23 | - phone:'' | 24 | + mobile:'', |
25 | + newpassword:'' | ||
24 | } | 26 | } |
25 | }, | 27 | }, |
26 | methods: { | 28 | methods: { |
@@ -29,13 +31,28 @@ export default { | @@ -29,13 +31,28 @@ export default { | ||
29 | }, | 31 | }, |
30 | goRegister () { | 32 | goRegister () { |
31 | this.$router.push('/register'); | 33 | this.$router.push('/register'); |
34 | + }, | ||
35 | + login(){ | ||
36 | + var params={ | ||
37 | + 'mobile':this.mobile | ||
38 | + }; | ||
39 | + | ||
40 | + this.axios.post('/api/user/resetpwd',params).then((res)=>{ | ||
41 | + if(this.mobile=true){ | ||
42 | + localStorage.setItem('mobile',this.mobile); | ||
43 | + }else{ | ||
44 | + this.mobile=res.data | ||
45 | + } | ||
46 | + }).catch((error)=>{ | ||
47 | + console.log(error) | ||
48 | + }) | ||
32 | } | 49 | } |
33 | 50 | ||
34 | }, | 51 | }, |
35 | watch: { | 52 | watch: { |
36 | - ' phone': function (newValue, oldValue) { | ||
37 | - this.phone = newValue.replace(/[^\d]/g, '').substring(0, 11) | ||
38 | - } | 53 | + // ' phone': function (newValue, oldValue) { |
54 | + // this.phone = newValue.replace(/[^\d]/g, '').substring(0, 11) | ||
55 | + // } | ||
39 | } | 56 | } |
40 | 57 | ||
41 | } | 58 | } |
@@ -11,6 +11,7 @@ | @@ -11,6 +11,7 @@ | ||
11 | maxlength="100" | 11 | maxlength="100" |
12 | placeholder="介绍自己,讲述您的故事~" | 12 | placeholder="介绍自己,讲述您的故事~" |
13 | show-word-limit | 13 | show-word-limit |
14 | + @input="getIntroduction" | ||
14 | /> | 15 | /> |
15 | <div class="btn" @click="go">下一步</div> | 16 | <div class="btn" @click="go">下一步</div> |
16 | </div> | 17 | </div> |
@@ -24,16 +25,31 @@ export default { | @@ -24,16 +25,31 @@ export default { | ||
24 | }, | 25 | }, |
25 | data () { | 26 | data () { |
26 | return { | 27 | return { |
27 | - message:'' | 28 | + message: '' |
28 | } | 29 | } |
29 | }, | 30 | }, |
30 | methods:{ | 31 | methods:{ |
31 | back () { | 32 | back () { |
32 | - this.$router.go(-1); | 33 | + this.$router.go(-1) |
33 | }, | 34 | }, |
34 | go () { | 35 | go () { |
35 | this.$router.push('condition') | 36 | this.$router.push('condition') |
37 | + }, | ||
38 | + getIntroduction () { | ||
39 | + let that = this | ||
40 | + let params = { | ||
41 | + 'about_me': that.message | ||
42 | + } | ||
43 | + let qs = require('qs') | ||
44 | + let data = qs.stringify(params) | ||
45 | + that.$axios.post('/api/Register/register_is_fourth', data).then((res) => { | ||
46 | + that.message = res.data | ||
47 | + console.log(that.message) | ||
48 | + }).catch((err) => { | ||
49 | + console.log(err) | ||
50 | + }) | ||
36 | } | 51 | } |
52 | + | ||
37 | } | 53 | } |
38 | } | 54 | } |
39 | </script> | 55 | </script> |
@@ -23,9 +23,9 @@ | @@ -23,9 +23,9 @@ | ||
23 | </div> | 23 | </div> |
24 | </template> | 24 | </template> |
25 | <script> | 25 | <script> |
26 | -import { mapMutations } from 'vuex'; | 26 | +import { mapMutations } from 'vuex' |
27 | export default { | 27 | export default { |
28 | - name: 'home', | 28 | + name: 'register', |
29 | components: { | 29 | components: { |
30 | 30 | ||
31 | }, | 31 | }, |
@@ -40,14 +40,7 @@ export default { | @@ -40,14 +40,7 @@ export default { | ||
40 | } | 40 | } |
41 | }, | 41 | }, |
42 | mounted: function () { | 42 | mounted: function () { |
43 | - this.$axios({ | ||
44 | - method: 'post', | ||
45 | - url: '/login/index' | ||
46 | - }).then(r => { | ||
47 | - console.log(111) | ||
48 | - }).catch(e => { | ||
49 | - console.log(2222) | ||
50 | - }) | 43 | + |
51 | }, | 44 | }, |
52 | methods: { | 45 | methods: { |
53 | back1 () { | 46 | back1 () { |
@@ -62,16 +55,17 @@ export default { | @@ -62,16 +55,17 @@ export default { | ||
62 | }, | 55 | }, |
63 | ...mapMutations(['changeLogin']), | 56 | ...mapMutations(['changeLogin']), |
64 | goLoginSuccessful () { | 57 | goLoginSuccessful () { |
65 | - let _this = this | ||
66 | - if (this.loginForm.mebile === '' || this.loginForm.passeord === '') { | 58 | + this.$router.push('/loginSuccessful') |
59 | + let _this = this | ||
60 | + if (this.loginForm.mebile === '' || this.loginForm.passeord === '') { | ||
67 | alert('手机号和密码不能为空') | 61 | alert('手机号和密码不能为空') |
68 | - } else { | 62 | + } else { |
69 | _this.$axios({ | 63 | _this.$axios({ |
70 | method: 'post', | 64 | method: 'post', |
71 | - url: '/Login/login', | 65 | + url: 'api/Login/login', |
72 | data: _this.loginForm | 66 | data: _this.loginForm |
73 | }).then(res => { | 67 | }).then(res => { |
74 | - console.log('----') | 68 | + |
75 | console.log(res.data) | 69 | console.log(res.data) |
76 | _this.userToken = 'token' + res.data.data.body.token | 70 | _this.userToken = 'token' + res.data.data.body.token |
77 | _this.changeLogin({ Authorization: _this.userToken }) | 71 | _this.changeLogin({ Authorization: _this.userToken }) |
@@ -83,13 +77,9 @@ export default { | @@ -83,13 +77,9 @@ export default { | ||
83 | console.log(error) | 77 | console.log(error) |
84 | }) | 78 | }) |
85 | } | 79 | } |
86 | - | ||
87 | - } | ||
88 | - | 80 | + } |
81 | + } | ||
89 | } | 82 | } |
90 | - | ||
91 | - | ||
92 | -} | ||
93 | </script> | 83 | </script> |
94 | <style lang="scss" scoped> | 84 | <style lang="scss" scoped> |
95 | .register{ | 85 | .register{ |
@@ -6,8 +6,8 @@ | @@ -6,8 +6,8 @@ | ||
6 | <div class="header2"><p>名字</p><img src="../assets/6.png" alt=""><span>普通会员</span></div> | 6 | <div class="header2"><p>名字</p><img src="../assets/6.png" alt=""><span>普通会员</span></div> |
7 | </div> | 7 | </div> |
8 | <div class="num"> | 8 | <div class="num"> |
9 | - <li><p>0</p><span>我心仪</span></li> | ||
10 | - <li><p>0</p><span>心仪我</span></li> | 9 | + <li @click="goMeAdmire"><p>0</p><span>我心仪</span></li> |
10 | + <li @click="goAdminMe"><p>0</p><span>心仪我</span></li> | ||
11 | </div> | 11 | </div> |
12 | <div class="banner"> | 12 | <div class="banner"> |
13 | <div class="banner1"> | 13 | <div class="banner1"> |
@@ -64,6 +64,12 @@ export default { | @@ -64,6 +64,12 @@ export default { | ||
64 | }, | 64 | }, |
65 | goSeniorMember (){ | 65 | goSeniorMember (){ |
66 | this.$router.push('/seniorMember') | 66 | this.$router.push('/seniorMember') |
67 | + }, | ||
68 | + goMeAdmire () { | ||
69 | + this.$router.push('/meAdmire') | ||
70 | + }, | ||
71 | + goAdminMe () { | ||
72 | + this.$router.push('/admireMe') | ||
67 | } | 73 | } |
68 | } | 74 | } |
69 | } | 75 | } |
@@ -22,8 +22,13 @@ export default { | @@ -22,8 +22,13 @@ export default { | ||
22 | components: { | 22 | components: { |
23 | 23 | ||
24 | }, | 24 | }, |
25 | + data () { | ||
26 | + return { | ||
27 | + arr: [] | ||
28 | + } | ||
29 | + }, | ||
25 | mounted: function(){ | 30 | mounted: function(){ |
26 | - this.getData(); | 31 | + this.getData() |
27 | 32 | ||
28 | }, | 33 | }, |
29 | created () { | 34 | created () { |
@@ -32,7 +37,26 @@ export default { | @@ -32,7 +37,26 @@ export default { | ||
32 | methods : { | 37 | methods : { |
33 | back1 () { | 38 | back1 () { |
34 | this.$router.go(-1) | 39 | this.$router.go(-1) |
40 | + }, | ||
41 | + goFangDa () { | ||
42 | + this.$router.push('/fangDa') | ||
43 | + }, | ||
44 | + getData () { | ||
45 | + let that = this | ||
46 | + | ||
47 | + this.$axios.post('/api/Center/like',{ | ||
48 | + // headers: { | ||
49 | + // "Authorization": this.Cookies.get('token') | ||
50 | + // } | ||
51 | + }).then((res) => { | ||
52 | + that.arr = res.data | ||
53 | + console.log(res.data) | ||
54 | + }).catch((error) => { | ||
55 | + console.log(error) | ||
56 | + }) | ||
35 | } | 57 | } |
58 | + | ||
59 | + | ||
36 | } | 60 | } |
37 | 61 | ||
38 | } | 62 | } |
@@ -40,10 +64,15 @@ export default { | @@ -40,10 +64,15 @@ export default { | ||
40 | <style lang="scss" scoped> | 64 | <style lang="scss" scoped> |
41 | .home{ | 65 | .home{ |
42 | width:100%; | 66 | width:100%; |
43 | - height:100%; | 67 | + // height:100%; |
44 | background:#11A7FC; | 68 | background:#11A7FC; |
45 | padding-top:10%; | 69 | padding-top:10%; |
46 | padding-left:5%; | 70 | padding-left:5%; |
71 | + flex-wrap:wrap; | ||
72 | + // min-height:0rem; | ||
73 | + overflow-y:scroll; | ||
74 | + display:flex; | ||
75 | + // flex: 1; | ||
47 | .header{ | 76 | .header{ |
48 | width:90%; | 77 | width:90%; |
49 | height:.3rem; | 78 | height:.3rem; |
@@ -53,12 +82,13 @@ export default { | @@ -53,12 +82,13 @@ export default { | ||
53 | font-size:.2rem; | 82 | font-size:.2rem; |
54 | line-height:.3rem; | 83 | line-height:.3rem; |
55 | color:#fff; | 84 | color:#fff; |
56 | - text-align:center; | 85 | + // text-align:center; |
86 | + margin-left:35%; | ||
57 | } | 87 | } |
58 | h2{ | 88 | h2{ |
59 | font-size:.2rem; | 89 | font-size:.2rem; |
60 | color:#fff; | 90 | color:#fff; |
61 | - margin-bottom:.5rem; | 91 | + // margin-bottom:.5rem; |
62 | line-height:.3rem; | 92 | line-height:.3rem; |
63 | float:left; | 93 | float:left; |
64 | } | 94 | } |
@@ -69,8 +99,9 @@ export default { | @@ -69,8 +99,9 @@ export default { | ||
69 | height:1.4rem; | 99 | height:1.4rem; |
70 | background:#fff; | 100 | background:#fff; |
71 | border-radius:.25rem; | 101 | border-radius:.25rem; |
72 | - margin:0rem 0.03rem 0.03rem 0.11rem; | 102 | + margin:0.02rem 0.08rem 0.03rem 0rem; |
73 | padding:5%; | 103 | padding:5%; |
104 | + display:block; | ||
74 | .details2{ | 105 | .details2{ |
75 | width:.4rem; | 106 | width:.4rem; |
76 | height:.4rem; | 107 | height:.4rem; |
@@ -28,11 +28,23 @@ export default { | @@ -28,11 +28,23 @@ export default { | ||
28 | }, | 28 | }, |
29 | go () { | 29 | go () { |
30 | this.$router.push('/photoz') | 30 | this.$router.push('/photoz') |
31 | - } | ||
32 | - // add () { | 31 | + }, |
32 | + add () { | ||
33 | + let that=this | ||
34 | + let params={ | ||
35 | + 'fileList':that.fileList | ||
36 | + } | ||
37 | + that.$axios.post('/api/Center/photo_sel',params).then((res)=>{ | ||
38 | + | ||
39 | + this.fileList = res.data | ||
40 | + console.log(res) | ||
41 | + } | ||
33 | 42 | ||
34 | - // this.showHidden=true; | ||
35 | - // } | 43 | + ).catch((err)=>{ |
44 | + console.log(err) | ||
45 | + }) | ||
46 | + | ||
47 | + } | ||
36 | } | 48 | } |
37 | } | 49 | } |
38 | </script> | 50 | </script> |
@@ -3,15 +3,15 @@ | @@ -3,15 +3,15 @@ | ||
3 | <div class="header"> | 3 | <div class="header"> |
4 | <h2 @click="back1"><</h2><h1>我的资料</h1> | 4 | <h2 @click="back1"><</h2><h1>我的资料</h1> |
5 | </div> | 5 | </div> |
6 | - <div class="banner" @click="goMyAlbum"></div> | 6 | + <div class="banner" @click="goMyAlbum" ></div> |
7 | <p>点击修改头像</p> | 7 | <p>点击修改头像</p> |
8 | <div class="nav"> | 8 | <div class="nav"> |
9 | - <p>确保头像照片为本人清晰正脸照,一个良好的头像更能吸引到别人哦~</p> | 9 | + <span>确保头像照片为本人清晰正脸照,一个良好的头像更能吸引到别人哦~</span> |
10 | </div> | 10 | </div> |
11 | <div class="main"> | 11 | <div class="main"> |
12 | <div class="main1"> | 12 | <div class="main1"> |
13 | <div class="left">自我介绍</div> | 13 | <div class="left">自我介绍</div> |
14 | - <div class="right">去修改 ></div> | 14 | + <div class="right" @click="goIntroduction" >去修改> </div> |
15 | </div> | 15 | </div> |
16 | <div class="main2"> | 16 | <div class="main2"> |
17 | 在百忙之于还会想念着他心爱的女人那才是真正的好男人。被风吹到眼睛想你看到闪烁的路灯想你。 | 17 | 在百忙之于还会想念着他心爱的女人那才是真正的好男人。被风吹到眼睛想你看到闪烁的路灯想你。 |
@@ -20,7 +20,7 @@ | @@ -20,7 +20,7 @@ | ||
20 | <div class="data"> | 20 | <div class="data"> |
21 | <div class="data1"> | 21 | <div class="data1"> |
22 | <div class="left">详细资料</div> | 22 | <div class="left">详细资料</div> |
23 | - <div class="right">去修改></div> | 23 | + <div class="right" @click="goData">去修改></div> |
24 | </div> | 24 | </div> |
25 | <div class="data2"> | 25 | <div class="data2"> |
26 | <div class="x1">女</div><div class="x2">23岁</div> | 26 | <div class="x1">女</div><div class="x2">23岁</div> |
@@ -56,7 +56,7 @@ | @@ -56,7 +56,7 @@ | ||
56 | <div class="photo"> | 56 | <div class="photo"> |
57 | <div class="photo1"> | 57 | <div class="photo1"> |
58 | <div class="left">我的证件</div> | 58 | <div class="left">我的证件</div> |
59 | - <div class="right">去修改></div> | 59 | + <div class="right" @click="goPhotoz">去修改></div> |
60 | </div> | 60 | </div> |
61 | <div class="photo2"> | 61 | <div class="photo2"> |
62 | <li></li> | 62 | <li></li> |
@@ -68,7 +68,7 @@ | @@ -68,7 +68,7 @@ | ||
68 | <div class="footer"> | 68 | <div class="footer"> |
69 | <div class="footer1"> | 69 | <div class="footer1"> |
70 | <div class="left">择偶条件</div> | 70 | <div class="left">择偶条件</div> |
71 | - <div class="right">去修改></div> | 71 | + <div class="right" @click="goCondition">去修改></div> |
72 | </div> | 72 | </div> |
73 | <div class="footer2">年龄和我同岁或者比我小,在加拿大这边或者国内的愿意来加拿大生活的,性格内向和外向都好,偏内向的话,两个人一样,偏外向的话两个人互补,主要看感觉。</div> | 73 | <div class="footer2">年龄和我同岁或者比我小,在加拿大这边或者国内的愿意来加拿大生活的,性格内向和外向都好,偏内向的话,两个人一样,偏外向的话两个人互补,主要看感觉。</div> |
74 | </div> | 74 | </div> |
@@ -81,12 +81,82 @@ export default { | @@ -81,12 +81,82 @@ export default { | ||
81 | components: { | 81 | components: { |
82 | 82 | ||
83 | }, | 83 | }, |
84 | - methods:{ | 84 | + mounted: function () { |
85 | + // this. goIntroduction() | ||
86 | + }, | ||
87 | + methods: { | ||
85 | goMyAlbum () { | 88 | goMyAlbum () { |
86 | - this.$router.push('/myAlbum') | 89 | + this.$router.push('/myAlbum') |
87 | }, | 90 | }, |
88 | back1 () { | 91 | back1 () { |
89 | - this.$router.go(-1) | 92 | + this.$router.go(-1) |
93 | + }, | ||
94 | + goIntroduction () { | ||
95 | + let that = this | ||
96 | + let params = { | ||
97 | + about_me: that.about_me | ||
98 | + } | ||
99 | + that.$axios.post('/api/Center/up_about', params).then((res) =>{ | ||
100 | + that. about_me = res.data | ||
101 | + console.log(that. about_me) | ||
102 | + this.$router.push('/introduction') | ||
103 | + }).catch((err) =>{ | ||
104 | + console.log(err) | ||
105 | + }) | ||
106 | + | ||
107 | + }, | ||
108 | + goData () { | ||
109 | + let that= this | ||
110 | + let params = { | ||
111 | + sex: that.sex, | ||
112 | + age: that.age, | ||
113 | + born: that.born, | ||
114 | + star: that.star, | ||
115 | + minzu: that.minzu, | ||
116 | + height: that.height, | ||
117 | + weight: that.wieght, | ||
118 | + education: that.education, | ||
119 | + school: that.school, | ||
120 | + specialities: that.specialities, | ||
121 | + old_city: that.old_city, | ||
122 | + marriage: that.marriage, | ||
123 | + work_address: that.work_address, | ||
124 | + work: that.work, | ||
125 | + year_money: that.year_money, | ||
126 | + wechat: that.wechat | ||
127 | + } | ||
128 | + that.$axios.post('/api/Center/up_ziliao', params).then((res) => { | ||
129 | + that.sex = res.data | ||
130 | + console.log(that.sex) | ||
131 | + this.$router.push('/data') | ||
132 | + }).catch((err) => { | ||
133 | + console.log(err) | ||
134 | + }) | ||
135 | + | ||
136 | + }, | ||
137 | + goPhotoz () { | ||
138 | + let that = this | ||
139 | + let params = { | ||
140 | + card_zheng_avatar: that.card_zheng_avatar, | ||
141 | + card_fan_avatar: that.card_fan_avatar, | ||
142 | + card_school_avatar: that.card_school_avatar, | ||
143 | + card_marriage_avatar: that.card_marriage_avatar | ||
144 | + } | ||
145 | + that.$axios.post('/api/Center/user_card_up',params,{ | ||
146 | + headers: { | ||
147 | + 'token': 'e1a824615a889772dc554ab5a44e5f7c' | ||
148 | + } | ||
149 | + }).then((res) => { | ||
150 | + that.card_zheng_avatar = res.data | ||
151 | + this.$router.push('/photoz') | ||
152 | + console.log(that.card_zheng_avatar) | ||
153 | + }).catch((err) => { | ||
154 | + console.log(err) | ||
155 | + }) | ||
156 | + | ||
157 | + }, | ||
158 | + goCondition () { | ||
159 | + this.$router.push('/condition') | ||
90 | } | 160 | } |
91 | } | 161 | } |
92 | } | 162 | } |
@@ -94,7 +164,7 @@ export default { | @@ -94,7 +164,7 @@ export default { | ||
94 | <style lang="scss" scoped> | 164 | <style lang="scss" scoped> |
95 | .home{ | 165 | .home{ |
96 | width:100%; | 166 | width:100%; |
97 | - height:180%; | 167 | + height:185%; |
98 | background:#11A7FC; | 168 | background:#11A7FC; |
99 | padding-top:10%; | 169 | padding-top:10%; |
100 | // padding-left:5%; | 170 | // padding-left:5%; |
@@ -142,12 +212,13 @@ export default { | @@ -142,12 +212,13 @@ export default { | ||
142 | background:rgba(255,255,255,0.3); | 212 | background:rgba(255,255,255,0.3); |
143 | margin-left:5%; | 213 | margin-left:5%; |
144 | border-radius:.2rem; | 214 | border-radius:.2rem; |
145 | - p{ | 215 | + padding:0.2rem 0rem; |
216 | + span{ | ||
146 | color:#fff; | 217 | color:#fff; |
147 | font-size:.15rem; | 218 | font-size:.15rem; |
148 | - line-height:.2rem; | ||
149 | - margin:0px; | ||
150 | - padding:0px; | 219 | + line-height:.3rem; |
220 | + margin-left:.1rem; | ||
221 | + display:block; | ||
151 | 222 | ||
152 | } | 223 | } |
153 | } | 224 | } |
@@ -3,7 +3,7 @@ | @@ -3,7 +3,7 @@ | ||
3 | <h2 @click="back"><</h2> | 3 | <h2 @click="back"><</h2> |
4 | <p>支付</p> | 4 | <p>支付</p> |
5 | <span>¥100.00</span> | 5 | <span>¥100.00</span> |
6 | - <p>高级会员费</p> | 6 | + <span class="span">高级会员费</span> |
7 | <div class="nav"> | 7 | <div class="nav"> |
8 | <div class="nav1"><img src="../assets/8.png" alt=""><h4>微信支付</h4><div class="b1"></div></div> | 8 | <div class="nav1"><img src="../assets/8.png" alt=""><h4>微信支付</h4><div class="b1"></div></div> |
9 | <div class="nav2"><img src="../assets/9.png" alt=""><h4>支付宝支付</h4><div class="b2"></div></div> | 9 | <div class="nav2"><img src="../assets/9.png" alt=""><h4>支付宝支付</h4><div class="b2"></div></div> |
@@ -58,6 +58,14 @@ export default { | @@ -58,6 +58,14 @@ export default { | ||
58 | display:block; | 58 | display:block; |
59 | 59 | ||
60 | } | 60 | } |
61 | + .span{ | ||
62 | + font-size:.2rem; | ||
63 | + color:#fff; | ||
64 | + // line-height:.2rem; | ||
65 | + text-align:center; | ||
66 | + margin-top:.2rem; | ||
67 | + display:block; | ||
68 | + } | ||
61 | .nav{ | 69 | .nav{ |
62 | width:94%; | 70 | width:94%; |
63 | height:2rem; | 71 | height:2rem; |
@@ -2,13 +2,13 @@ | @@ -2,13 +2,13 @@ | ||
2 | <div class="introduction"> | 2 | <div class="introduction"> |
3 | <h2 @click="back"><</h2> | 3 | <h2 @click="back"><</h2> |
4 | <h1>上传相册</h1> | 4 | <h1>上传相册</h1> |
5 | - <van-uploader v-model="fileList" multiple :max-count="2" @click="add" upload-text="添加照片" /> | 5 | + <van-uploader v-model="fileList" multiple :max-count="6" @click="add" upload-text="添加照片" /> |
6 | <div class="btn" @click="go">下一步</div> | 6 | <div class="btn" @click="go">下一步</div> |
7 | <ShowHidden :isvisibleadd="showHidden"></ShowHidden> | 7 | <ShowHidden :isvisibleadd="showHidden"></ShowHidden> |
8 | </div> | 8 | </div> |
9 | </template> | 9 | </template> |
10 | <script> | 10 | <script> |
11 | -import ShowHidden from '../components/ShowHide.vue'; | 11 | +import ShowHidden from '../components/ShowHide.vue' |
12 | export default { | 12 | export default { |
13 | name: 'introduction', | 13 | name: 'introduction', |
14 | components: { | 14 | components: { |
@@ -16,21 +16,36 @@ export default { | @@ -16,21 +16,36 @@ export default { | ||
16 | }, | 16 | }, |
17 | data () { | 17 | data () { |
18 | return { | 18 | return { |
19 | - message:'', | ||
20 | - fileList:[], | 19 | + message: '', |
20 | + fileList: [], | ||
21 | showHidden:false | 21 | showHidden:false |
22 | } | 22 | } |
23 | }, | 23 | }, |
24 | methods:{ | 24 | methods:{ |
25 | back () { | 25 | back () { |
26 | - this.$router.go(-1); | 26 | + this.$router.go(-1) |
27 | }, | 27 | }, |
28 | go () { | 28 | go () { |
29 | this.$router.push('/photoz') | 29 | this.$router.push('/photoz') |
30 | }, | 30 | }, |
31 | add () { | 31 | add () { |
32 | + this. showHidden = true | ||
33 | + let that = this | ||
34 | + let params = { | ||
35 | + avatar1: that.fileList, | ||
36 | + avatar2: that.fileList, | ||
37 | + avatar3: that.fileList, | ||
38 | + avatar4: that.fileList, | ||
39 | + avatar5: that.fileList, | ||
40 | + avatar6: that.fileList | ||
32 | 41 | ||
33 | - this.showHidden=true; | 42 | + } |
43 | + that.$axios.post(' /api/Register/register_is_sixth', params).then((res) => { | ||
44 | + that.fileList = res.data | ||
45 | + console.log(that.fileList) | ||
46 | + }).catch((err) => { | ||
47 | + console.log(err) | ||
48 | + }) | ||
34 | } | 49 | } |
35 | } | 50 | } |
36 | } | 51 | } |
@@ -5,7 +5,7 @@ | @@ -5,7 +5,7 @@ | ||
5 | </div> | 5 | </div> |
6 | <p><span>*</span>身份证上传(正面)</p> | 6 | <p><span>*</span>身份证上传(正面)</p> |
7 | <div class="nav1"> | 7 | <div class="nav1"> |
8 | - <van-uploader v-model="fileList" multiple :max-count="1" upload-text="添加照片" preview-full-image/> | 8 | + <van-uploader v-model="fileList" multiple :max-count="1" upload-text="添加照片" preview-full-image preview-size="width:100%;height:100%;" /> |
9 | </div> | 9 | </div> |
10 | <p><span>*</span>身份证上传(反面)</p> | 10 | <p><span>*</span>身份证上传(反面)</p> |
11 | <div class="nav2"> | 11 | <div class="nav2"> |
@@ -19,7 +19,7 @@ | @@ -19,7 +19,7 @@ | ||
19 | <div class="nav2"> | 19 | <div class="nav2"> |
20 | <van-uploader v-model="fileList3" multiple :max-count="1" upload-text="添加照片" preview-full-image/> | 20 | <van-uploader v-model="fileList3" multiple :max-count="1" upload-text="添加照片" preview-full-image/> |
21 | </div> | 21 | </div> |
22 | - <button class="btn">提交</button> | 22 | + <button class="btn" @click="getSubmit">提交</button> |
23 | 23 | ||
24 | </div> | 24 | </div> |
25 | </template> | 25 | </template> |
@@ -35,16 +35,31 @@ export default { | @@ -35,16 +35,31 @@ export default { | ||
35 | fileList: [], | 35 | fileList: [], |
36 | fileList1: [], | 36 | fileList1: [], |
37 | fileList2: [], | 37 | fileList2: [], |
38 | - fileList3: [], | 38 | + fileList3: [] |
39 | } | 39 | } |
40 | }, | 40 | }, |
41 | + mounted: function () { | ||
42 | + // this.getSubmit() | ||
43 | + }, | ||
41 | methods: { | 44 | methods: { |
42 | - // afterRead(file) { | ||
43 | - // // 此时可以自行将文件上传至服务器 | ||
44 | - // console.log(file); | ||
45 | - // }, | ||
46 | - back1 () { | ||
47 | - this.$router.go(-1); | 45 | + back1 () { |
46 | + this.$router.go(-1) | ||
47 | + }, | ||
48 | + | ||
49 | + getSubmit () { | ||
50 | + let that = this | ||
51 | + let params = { | ||
52 | + card_zheng_avatar: that.fileList, | ||
53 | + card_fan_avatar: that.fileList1, | ||
54 | + card_school_avatar: that.fileList2, | ||
55 | + card_marriage_avata: that.fileList3 | ||
56 | + } | ||
57 | + that.$axios.post('/api/Register/register_is_seventh', params).then((res) => { | ||
58 | + that.card_zheng_avatar = res.data | ||
59 | + console.log(that.card_zheng_avatar) | ||
60 | + }).catch((err) => { | ||
61 | + console.log(err) | ||
62 | + }) | ||
48 | } | 63 | } |
49 | } | 64 | } |
50 | } | 65 | } |
@@ -97,7 +112,7 @@ export default { | @@ -97,7 +112,7 @@ export default { | ||
97 | align-items:center; | 112 | align-items:center; |
98 | border-radius:0.2rem; | 113 | border-radius:0.2rem; |
99 | margin-bottom:.4rem; | 114 | margin-bottom:.4rem; |
100 | - margin-left:3%; | 115 | + margin-left:0%; |
101 | } | 116 | } |
102 | .nav2{ | 117 | .nav2{ |
103 | width:90%; | 118 | width:90%; |
@@ -108,7 +123,7 @@ export default { | @@ -108,7 +123,7 @@ export default { | ||
108 | align-items:center; | 123 | align-items:center; |
109 | border-radius:0.2rem; | 124 | border-radius:0.2rem; |
110 | margin-bottom:.4rem; | 125 | margin-bottom:.4rem; |
111 | - margin-left:3%; | 126 | + |
112 | } | 127 | } |
113 | .btn{ | 128 | .btn{ |
114 | width:90%; | 129 | width:90%; |
@@ -12,15 +12,21 @@ | @@ -12,15 +12,21 @@ | ||
12 | <div class="header"> | 12 | <div class="header"> |
13 | <img src="../assets/01.png" alt=""> | 13 | <img src="../assets/01.png" alt=""> |
14 | </div> | 14 | </div> |
15 | - <div class="center" type="> | 15 | + <div class="center" type=" "> |
16 | <form action="" method="post" onsubmit="return checkForm(this)"> | 16 | <form action="" method="post" onsubmit="return checkForm(this)"> |
17 | - <input type="text" placeholder="请选择征婚城市" /><hr/> | ||
18 | - <input type="number" placeholder="请输入身份证号码" /><hr/> | ||
19 | - <input id="p_tel" type="text" name="p_tel" placeholder="请输入手机号"/><hr/> | 17 | + <input type="text" placeholder="请选择征婚城市" v-model="city" @change="getCity"/><hr/> |
18 | + <input type="number" placeholder="请输入身份证号码" v-model="cards" @change="getCheckCode"/><hr/> | ||
19 | + <input id="p_tel" type="text" name="p_tel" placeholder="请输入手机号" v-model="phone"/><hr/> | ||
20 | 20 | ||
21 | - <input id="p_cardid" type="text" name="p_cardid" placeholder="请输入验证码" /><hr/> | 21 | + <input id="p_cardid" type="text" name="p_cardid" placeholder="请输入验证码" /><hr/> |
22 | 22 | ||
23 | - <button type="submit" @click="goMi"> 设置密码</button> | 23 | + <div style="font-size: 0.2rem" @click='getCode' class="code2">{{codeFont}}({{60}})</div> |
24 | + <input type="password" name="password" id="p1" placeholder="请输入登录密码"><hr/> | ||
25 | + <p>密码需为8~20位数字 字母和符合的组合</p> | ||
26 | + <input type="password" name="password1" id="p2" placeholder="请再次输入密码"><hr> | ||
27 | + | ||
28 | + | ||
29 | + <button type="submit" @click="goMi">完善资料</button> | ||
24 | </form> | 30 | </form> |
25 | </div> | 31 | </div> |
26 | 32 | ||
@@ -35,15 +41,19 @@ export default { | @@ -35,15 +41,19 @@ export default { | ||
35 | }, | 41 | }, |
36 | data() { | 42 | data() { |
37 | return { | 43 | return { |
38 | - show: true | 44 | + show: true, |
45 | + city:'', | ||
46 | + cards:'', | ||
47 | + codeFont: '获取验证码', | ||
48 | + phone: '' | ||
39 | } | 49 | } |
40 | }, | 50 | }, |
41 | methods: { | 51 | methods: { |
42 | back1 () { | 52 | back1 () { |
43 | - this.$router.go(-1); | 53 | + this.$router.go(-1) |
44 | }, | 54 | }, |
45 | goMi () { | 55 | goMi () { |
46 | - this.$router.push('/sheZhi'); | 56 | + this.$router.push('/data') |
47 | }, | 57 | }, |
48 | checkForm () { | 58 | checkForm () { |
49 | var phone = document.getElementById('p_tel').value; | 59 | var phone = document.getElementById('p_tel').value; |
@@ -64,7 +74,93 @@ export default { | @@ -64,7 +74,93 @@ export default { | ||
64 | if(!(/^[1-9]{1}[0-9]{14}$|^[1-9]{1}[0-9]{16}([0-9]|[xX])$/.test(cardid))){ | 74 | if(!(/^[1-9]{1}[0-9]{14}$|^[1-9]{1}[0-9]{16}([0-9]|[xX])$/.test(cardid))){ |
65 | alert("身份证号有误,请重新输入");return false; | 75 | alert("身份证号有误,请重新输入");return false; |
66 | } | 76 | } |
67 | - } | 77 | + }, |
78 | + getCity(){ | ||
79 | + | ||
80 | + }, | ||
81 | + getCheckCode() { | ||
82 | + let that=this; | ||
83 | + let reg=/^[1-9]\d{5}(18|19|20)\d{2}((0[1-9])|(1[0-2]))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/; | ||
84 | + if(that.checkCode == ''){ | ||
85 | + if(reg.test(that.checkCode)){ | ||
86 | + this.$message({ | ||
87 | + title:"提示", | ||
88 | + message:"身份证正确", | ||
89 | + type:"success" | ||
90 | + }) | ||
91 | + return | ||
92 | + }else{ | ||
93 | + this.$message({ | ||
94 | + title:"提示", | ||
95 | + message:"身份证输入错误", | ||
96 | + type:"warning" | ||
97 | + }) | ||
98 | + return | ||
99 | + } | ||
100 | + let params = { | ||
101 | + 'cards': that.cards | ||
102 | + | ||
103 | + } | ||
104 | + let qs=require('qs') | ||
105 | + let data=qs.stringify(params) | ||
106 | + that.$axios.post('/api/Register/register_is_first',data).then( | ||
107 | + res=>{ | ||
108 | + console.log(res); | ||
109 | + let data=res.data.data; | ||
110 | + } | ||
111 | + ).catch(error=>{ | ||
112 | + console.log(error) | ||
113 | + }) | ||
114 | + } | ||
115 | + }, | ||
116 | + getCode () { | ||
117 | + let that = this | ||
118 | + let reg = /^1[1,3,4,5,6,7,8,9]\d{9}$/ | ||
119 | + if(that.codeFont=='获取验证码'||that.codeFont=='重新获取'){ | ||
120 | + if(!that.phone) { | ||
121 | + this.$message ({ | ||
122 | + message: '请输入手机号', | ||
123 | + type: 'warning' | ||
124 | + }) | ||
125 | + return | ||
126 | + }else if (!reg.test(that.phone)) { | ||
127 | + this.$message ({ | ||
128 | + message: '请输入合法的手机号', | ||
129 | + type: 'warning' | ||
130 | + }) | ||
131 | + return | ||
132 | + } | ||
133 | + let params = { | ||
134 | + mobile: that.phone, | ||
135 | + event: 'register' | ||
136 | + } | ||
137 | + let qs = require('qs') | ||
138 | + let data = qs.stringify(params) | ||
139 | + that.$axios.post('/api/sms/send',data).then(r=>{ | ||
140 | + console.log(r) | ||
141 | + if(r.data.code==1){ | ||
142 | + console.log('发送成功') | ||
143 | + let codeFont = that.codeFont | ||
144 | + let count = 3 | ||
145 | + that.codeFont = count + 's' | ||
146 | + let st= setInterval(function(){ | ||
147 | + if(count>0){ | ||
148 | + count-- | ||
149 | + that.codeFont = count + 's' | ||
150 | + }else { | ||
151 | + clearInterval(st) | ||
152 | + that.codeFont = '重新获取' | ||
153 | + } | ||
154 | + },1000) | ||
155 | + }else{ | ||
156 | + this.$message ({ | ||
157 | + message: r.data.msg, | ||
158 | + type: 'warning' | ||
159 | + }) | ||
160 | + } | ||
161 | + }).catch() | ||
162 | + } | ||
163 | + }, | ||
68 | } | 164 | } |
69 | } | 165 | } |
70 | </script> | 166 | </script> |
@@ -127,6 +223,60 @@ export default { | @@ -127,6 +223,60 @@ export default { | ||
127 | padding-left:4%; | 223 | padding-left:4%; |
128 | 224 | ||
129 | } | 225 | } |
226 | + #p_cardid{ | ||
227 | + position:relative; | ||
228 | + width:100%; | ||
229 | + height:.5rem; | ||
230 | + font-size:.2rem; | ||
231 | + display:block; | ||
232 | + background-color:#11A7FC; | ||
233 | + border:none; | ||
234 | + color:#fff; | ||
235 | + padding-left:4%; | ||
236 | + | ||
237 | + | ||
238 | + } | ||
239 | + .code2{ | ||
240 | + width:1.4rem; | ||
241 | + height:.4rem; | ||
242 | + | ||
243 | + font-size:.08rem; | ||
244 | + color:#fff; | ||
245 | + line-height:.4rem; | ||
246 | + position:absolute; | ||
247 | + right:.35rem; | ||
248 | + top:3.65rem; | ||
249 | + | ||
250 | + | ||
251 | + | ||
252 | + } | ||
253 | + input{ | ||
254 | + width:86%; | ||
255 | + height:.5rem; | ||
256 | + font-size:.2rem; | ||
257 | + display:block; | ||
258 | + background-color:#11A7FC; | ||
259 | + border:none; | ||
260 | + color:#fff; | ||
261 | + padding-left:4%; | ||
262 | + | ||
263 | + | ||
264 | + } | ||
265 | + hr{ | ||
266 | + color:#fff; | ||
267 | + opacity:.3; | ||
268 | + width:92%; | ||
269 | + } | ||
270 | + p{ | ||
271 | + color:#fff; | ||
272 | + font-size:.1rem; | ||
273 | + opacity:.4; | ||
274 | + margin-top:0.1rem; | ||
275 | + margin-right:.55rem; | ||
276 | + | ||
277 | + } | ||
278 | + | ||
279 | + | ||
130 | hr{ | 280 | hr{ |
131 | color:#fff; | 281 | color:#fff; |
132 | opacity:0.3; | 282 | opacity:0.3; |
@@ -138,6 +288,7 @@ export default { | @@ -138,6 +288,7 @@ export default { | ||
138 | border-radius:.2rem; | 288 | border-radius:.2rem; |
139 | color:#11A7FC; | 289 | color:#11A7FC; |
140 | font-weight:bold; | 290 | font-weight:bold; |
291 | + border:none; | ||
141 | } | 292 | } |
142 | } | 293 | } |
143 | } | 294 | } |
@@ -20,13 +20,19 @@ export default { | @@ -20,13 +20,19 @@ export default { | ||
20 | 20 | ||
21 | }, | 21 | }, |
22 | methods: { | 22 | methods: { |
23 | - goPay () { | ||
24 | 23 | ||
25 | - this.$router.push('/pay') | ||
26 | - }, | ||
27 | - goBack () { | 24 | + goBack () { |
28 | this.$router.go(-1) | 25 | this.$router.go(-1) |
29 | - } | 26 | + }, |
27 | + goPay () { | ||
28 | + this.$axios.post('/api/Center/center_vip',{}).then((res) => { | ||
29 | + this.data = res.data | ||
30 | + this.$router.push('/pay') | ||
31 | + console.log(this.data) | ||
32 | + }).catch((err) =>{ | ||
33 | + console.log(err) | ||
34 | + }) | ||
35 | + } | ||
30 | } | 36 | } |
31 | } | 37 | } |
32 | </script> | 38 | </script> |
-
请 注册 或 登录 后发表评论