diff --git a/src/App.vue b/src/App.vue
index dee4133..9297d08 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,10 +1,9 @@
-
-
+
diff --git a/src/component/Tabbar.vue b/src/component/Tabbar.vue
deleted file mode 100644
index cf11a2b..0000000
--- a/src/component/Tabbar.vue
+++ /dev/null
@@ -1,102 +0,0 @@
-
-
-
-

-

-
公益讲座
-
-
-

-
-
-
-
-
-
-

-

-
个人中心
-
-
-
-
-
\ No newline at end of file
diff --git a/src/component/Tabbar2.vue b/src/component/Tabbar2.vue
deleted file mode 100644
index 7fa6866..0000000
--- a/src/component/Tabbar2.vue
+++ /dev/null
@@ -1,109 +0,0 @@
-
-
-
-

-

-
数据宝典
-
-
-

-

-
生涯规划
-
-
-
-

-

-
服务活动
-
-
-

-

-
个人中心
-
-
-
-
-
\ No newline at end of file
diff --git a/src/component/Tabbar3.vue b/src/component/Tabbar3.vue
deleted file mode 100644
index 22c37c5..0000000
--- a/src/component/Tabbar3.vue
+++ /dev/null
@@ -1,96 +0,0 @@
-
-
-
-

-

-
周周营
-
-
-

-

-
趣学院
-
-
-

-

-
我的
-
-
-
-
-
\ No newline at end of file
diff --git a/src/component/Tabbar4.vue b/src/component/Tabbar4.vue
index fa3884c..ea7e16f 100644
--- a/src/component/Tabbar4.vue
+++ b/src/component/Tabbar4.vue
@@ -25,16 +25,13 @@ export default {
},
methods: {
handZZY () {
- let publicName = sessionStorage.getItem('publicName');
- this.$router.push({ name: 'Service' + publicName, query: { showTab: 'ZZY' } })
+ this.$router.push({ name: 'ServiceKQ', query: { showTab: 'ZZY' } })
},
handleKQ () {
- let publicName = sessionStorage.getItem('publicName');
- this.$router.push({ name: 'Service' + publicName, query: { showTab: 'KQ' } })
+ this.$router.push({ name: 'ServiceKQ', query: { showTab: 'KQ' } })
},
handleCenter () {
- let publicName = sessionStorage.getItem('publicName');
- this.$router.push({ name: 'Home'+publicName })
+ this.$router.push({ name: 'HomeKQ' })
}
}
}
diff --git a/src/router/index.js b/src/router/index.js
index b04156c..54a6141 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -195,7 +195,7 @@ const routes = [{
name: 'SelectContact',
component: SelectContact,
meta: {
- title: '选择联系人'
+ title: '选择出行人'
}
},
{
@@ -203,7 +203,7 @@ const routes = [{
name: 'EditContact',
component: EditContact,
meta: {
- title: '修改联系人'
+ title: '修改出行人'
}
},
{
@@ -224,7 +224,7 @@ const routes = [{
},
]
const router = new VueRouter({
- mode: 'history',
+ mode: 'hash',
// base: process.env.BASE_URL+'/center',
base: process.env.BASE_URL,
routes
diff --git a/src/views/PublicService/ServiceKQ.vue b/src/views/PublicService/ServiceKQ.vue
index 8f68bfb..82b4c13 100644
--- a/src/views/PublicService/ServiceKQ.vue
+++ b/src/views/PublicService/ServiceKQ.vue
@@ -24,13 +24,13 @@ export default {
// sessionStorage.setItem('prePage', 'Service' + this.publicName);
// sessionStorage.setItem('unionId', 'oJPmPuLaAx2x2DaRGfCFeYuLWzLU');
const sUserAgent = window.navigator.userAgent.toLowerCase()
- alert(sUserAgent)
+ // alert(sUserAgent)
console.log(sUserAgent)
const dtdreamweb = sUserAgent.indexOf("dtdreamweb") > -1
const miniprogram = sUserAgent.indexOf("miniprogram") > -1 && sUserAgent.indexOf("alipay") > -1
if (dtdreamweb) {
alert('浙里办')
- // window.location.href = `https://puser.zjzwfw.gov.cn/sso/mobile.do?action=oauth&scope=1&servicecode=hswsy`;
+ window.location.href = `https://puser.zjzwfw.gov.cn/sso/mobile.do?action=oauth&scope=1&servicecode=hswsy`;
}
if (miniprogram) {
diff --git a/src/views/Service/EditContact.vue b/src/views/Service/EditContact.vue
index 2f37f03..0c64949 100644
--- a/src/views/Service/EditContact.vue
+++ b/src/views/Service/EditContact.vue
@@ -4,6 +4,14 @@
+
+
+
+ 男
+ 女
+
+
+
@@ -18,9 +26,10 @@ export default {
return {
id: '',
userType: '',
- userTypeName:'',
+ userTypeName: '',
travelerName: '',
phone: '',
+ gender: '',
travelerIdCard: '',
travelerNum: ''
}
@@ -45,6 +54,10 @@ export default {
methods: {
// 确认
addContact () {
+ if (!this.gender) {
+ this.$toast('请选择性别')
+ return;
+ }
if (!this.phone) {
this.$toast('请输入手机号')
return;
@@ -66,7 +79,8 @@ export default {
contactsName: this.travelerName,
contactsMobile: this.phone,
contactsIdCard: this.travelerIdCard,
- contactsType: this.userType
+ contactsType: this.userType,
+ gender:Number(this.gender)
}
this.$toast.loading({
message: '加载中',
@@ -77,7 +91,7 @@ export default {
this.$toast.clear()
if (res.data.code == 200) {
this.$toast.success('完善成功')
- this.$router.back()
+ this.$router.back()
} else {
this.$toast.fail(res.message)
}
diff --git a/src/views/Service/SelectContact.vue b/src/views/Service/SelectContact.vue
index 6dbeb0a..01a9733 100644
--- a/src/views/Service/SelectContact.vue
+++ b/src/views/Service/SelectContact.vue
@@ -2,18 +2,19 @@