From 6efe1a3b2009479a6d82de9609c2d2ae6fb67963 Mon Sep 17 00:00:00 2001
From: roy <x1027869635@gmail.com>
Date: Wed, 20 Oct 2021 15:34:02 +0800
Subject: [PATCH] feat: 出行人新增性别，选家长时提示

---
 src/App.vue                           |   3 +--
 src/component/Tabbar.vue              | 102 ------------------------------------------------------------------------------------------------------
 src/component/Tabbar2.vue             | 109 -------------------------------------------------------------------------------------------------------------
 src/component/Tabbar3.vue             |  96 ------------------------------------------------------------------------------------------------
 src/component/Tabbar4.vue             |   9 +++------
 src/router/index.js                   |   6 +++---
 src/views/PublicService/ServiceKQ.vue |   4 ++--
 src/views/Service/EditContact.vue     |  20 +++++++++++++++++---
 src/views/Service/SelectContact.vue   |  40 ++++++++++++++++++++++++++--------------
 9 files changed, 52 insertions(+), 337 deletions(-)
 delete mode 100644 src/component/Tabbar.vue
 delete mode 100644 src/component/Tabbar2.vue
 delete mode 100644 src/component/Tabbar3.vue

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 @@
 <template>
   <div id="app">
     <keep-alive>
-      <!--这里是会被缓存的组件-->
       <router-view v-if="this.$route.meta.keepAlive" />
     </keep-alive>
-    <!--这里是不会被缓存的组件-->
+    
     <router-view v-if="!this.$route.meta.keepAlive" />
   </div>
 </template>
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 @@
-<template>
-  <div id="tabbar">
-    <div class="tab" :class="active=='lecture'?'active':''" @click="handleLecture">
-      <img v-if="active=='lecture'" src="../assets/tabbar1/tab1_on.png" alt="">
-      <img v-else src="../assets/tabbar1/tab1_off.png" alt="">
-      <p>公益讲座</p>
-    </div>
-    <div class="center">
-      <img class="tip" src="../assets/tabbar1/tab2.png" alt="">
-      <wx-open-launch-weapp id="launch-btn" username="gh_c0f904a5ee0c" path="pages/index/index?type=zkedt">
-        <script type="text/wxtag-template">
-          <style>.mini_btn { width:500px;height:500px;background:transparent;border:0; }</style>
-            <button class="mini_btn"></button>
-          </script>
-      </wx-open-launch-weapp>
-    </div>
-    <div class="tab">
-      <div class="block"></div>
-      <p>志愿填报</p>
-    </div>
-    <div class="tab" :class="active=='center'?'active':''" @click="handleCenter">
-      <img v-if="active=='center'" src="../assets/tabbar1/tab3_on.png" alt="">
-      <img v-else src="../assets/tabbar1/tab3_off.png" alt="">
-      <p>个人中心</p>
-    </div>
-  </div>
-</template>
-<script>
-export default {
-  name:'Tabbar',
-  props:{
-    active:String
-  },
-  mounted(){
-    console.log(this.active)
-  },
-  methods:{
-    // 点击讲座
-    handleLecture(){
-      this.$router.push({name:'Lecture'})
-    },
-    // 点击个人中心
-    handleCenter(){
-      this.$router.push({name:'Home'})
-    }
-  }
-}
-</script>
-<style lang="scss">
-#tabbar {
-  position: fixed;
-  bottom: 0;
-  width: 100%;
-  height: 100px;
-  background: #fff;
-  display: flex;
-  justify-content: space-around;
-  padding-bottom: 40px;
-  .tab {
-    
-    padding: 18px;
-    img {
-      width: 52px;
-      display: block;
-      margin: 0 auto;
-    }
-    .block{
-      width: 52px;
-      height: 52px;
-    }
-    p {
-      font-size: 20px;
-      color: #999999;
-      text-align: center;
-    }
-    &.active{
-      p{
-        color: #5789FF;
-      }
-    }
-  }
-  .center {
-    width: 92px;
-    height: 92px;
-    padding: 30px;
-    background: transparent;
-    position: absolute;
-    top: -60px;
-    left: 299px;
-    overflow: hidden;
-    z-index: 1;
-    .tip {
-      width: 92px;
-      position: absolute;
-      top: 50%;
-      left: 50%;
-      transform: translate(-50%, -50%);
-      z-index: -1;
-    }
-  }
-}
-</style>
\ 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 @@
-<template>
-  <div id="tabbar">
-    <div class="tab" :class="active=='databook'?'active':''" @click="handleDataBook">
-      <img v-if="active=='databook'" src="../assets/tabbar2/tab1_on.png" alt="">
-      <img v-else src="../assets/tabbar2/tab1_off.png" alt="">
-      <p>数据宝典</p>
-    </div>
-    <div class="tab" :class="active=='careerplan'?'active':''" @click="handleCareerPlan">
-      <img v-if="active=='careerplan'" src="../assets/tabbar2/tab2_on.png" alt="">
-      <img v-else src="../assets/tabbar2/tab2_off.png" alt="">
-      <p>生涯规划</p>
-    </div>
-    <!-- <div class="tab" :class="active=='community'?'active':''" @click="handleCommunity">
-      <img v-if="active=='community'" src="../assets/tabbar2/tab3_on.png" alt="">
-      <img v-else src="../assets/tabbar2/tab3_off.png" alt="">
-      <p>社区</p>
-    </div> -->
-    <div class="tab" :class="active=='service'?'active':''" @click="handleService">
-      <img v-if="active=='service'" src="../assets/tabbar2/tab3_on.png" alt="">
-      <img v-else src="../assets/tabbar2/tab3_off.png" alt="">
-      <p>服务活动</p>
-    </div>
-    <div class="tab" :class="active=='center'?'active':''" @click="handleCenter">
-      <img v-if="active=='center'" src="../assets/tabbar2/tab4_on.png" alt="">
-      <img v-else src="../assets/tabbar2/tab4_off.png" alt="">
-      <p>个人中心</p>
-    </div>
-  </div>
-</template>
-<script>
-export default {
-  name: 'Tabbar2',
-  props: {
-    active: String
-  },
-  methods: {
-    handleDataBook () {
-      this.$router.push({ name: 'DataBook' })
-    },
-    handleCareerPlan () {
-      this.$router.push({ name: 'CareerPlan' })
-    },
-    handleCommunity () {
-      this.$router.push({ name: 'Community' })
-    },
-    handleService () {
-      this.$router.push({ name: 'Service' })
-    },
-    handleCenter(){
-      this.$router.push({ name: 'Home' })
-    }
-  }
-}
-</script>
-<style lang="scss" scoped>
-#tabbar {
-  position: fixed;
-  bottom: 0;
-  width: 100%;
-  height: 100px;
-  background: #fff;
-  display: flex;
-  justify-content: space-around;
-  padding-bottom: 40px;
-  z-index: 99;
-  .tab {
-    padding: 18px;
-    img {
-      width: 36px;
-      padding: 20px;
-      display: block;
-      margin: 0 auto;
-    }
-    .block {
-      width: 52px;
-      height: 52px;
-    }
-    p {
-      font-size: 20px;
-      color: #999999;
-      text-align: center;
-    }
-    &.active {
-      p {
-        color: #5789ff;
-      }
-    }
-  }
-  .center {
-    width: 92px;
-    height: 92px;
-    padding: 30px;
-    background: transparent;
-    position: absolute;
-    top: -60px;
-    left: 299px;
-    overflow: hidden;
-    z-index: 1;
-    .tip {
-      width: 92px;
-      position: absolute;
-      top: 50%;
-      left: 50%;
-      transform: translate(-50%, -50%);
-      z-index: -1;
-    }
-  }
-}
-</style>
\ 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 @@
-<template>
-  <div id="tabbar">
-    <div class="tab" :class="active=='ZZY'?'active':''" @click="handZZY">
-      <img v-if="active=='ZZY'" src="../assets/tabbar2/tab2_on.png" alt="">
-      <img v-else src="../assets/tabbar2/tab2_off.png" alt="">
-      <p>周周营</p>
-    </div>
-    <div class="tab" :class="active=='QXY'?'active':''" @click="handleQYX">
-      <img v-if="active=='QXY'" src="../assets/tabbar2/tab3_on.png" alt="">
-      <img v-else src="../assets/tabbar2/tab3_off.png" alt="">
-      <p>趣学院</p>
-    </div>
-    <div class="tab" :class="active=='center'?'active':''" @click="handleCenter">
-      <img v-if="active=='center'" src="../assets/tabbar2/tab4_on.png" alt="">
-      <img v-else src="../assets/tabbar2/tab4_off.png" alt="">
-      <p>我的</p>
-    </div>
-  </div>
-</template>
-<script>
-export default {
-  name: 'Tabbar3',
-  props: {
-    active: String
-  },
-  methods: {
-    handZZY () {
-      let publicName = sessionStorage.getItem('publicName');
-      this.$router.push({ name: 'Service' + publicName, query: { showTab: 'ZZY' } })
-    },
-    handleQYX () {
-      let publicName = sessionStorage.getItem('publicName');
-      this.$router.push({ name: 'Service' + publicName, query: { showTab: 'QXY' } })
-    },
-    handleCenter () {
-      let publicName = sessionStorage.getItem('publicName');
-      this.$router.push({ name: 'Home'+publicName })
-    }
-  }
-}
-</script>
-<style lang="scss" scoped>
-#tabbar {
-  position: fixed;
-  bottom: 0;
-  width: 100%;
-  height: 100px;
-  background: #fff;
-  display: flex;
-  justify-content: space-around;
-  padding-bottom: 40px;
-  z-index: 99;
-  .tab {
-    padding: 18px;
-    img {
-      width: 36px;
-      padding: 20px;
-      display: block;
-      margin: 0 auto;
-    }
-    .block {
-      width: 52px;
-      height: 52px;
-    }
-    p {
-      font-size: 20px;
-      color: #999999;
-      text-align: center;
-    }
-    &.active {
-      p {
-        color: #5789ff;
-      }
-    }
-  }
-  .center {
-    width: 92px;
-    height: 92px;
-    padding: 30px;
-    background: transparent;
-    position: absolute;
-    top: -60px;
-    left: 299px;
-    overflow: hidden;
-    z-index: 1;
-    .tip {
-      width: 92px;
-      position: absolute;
-      top: 50%;
-      left: 50%;
-      transform: translate(-50%, -50%);
-      z-index: -1;
-    }
-  }
-}
-</style>
\ 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 @@
       <van-cell-group>
         <van-field v-model="userTypeName" label="身份类型" readonly />
         <van-field v-model="travelerName" label="姓名" placeholder="需与证件姓名一致" />
+        <van-cell title="性别">
+          <template #right-icon>
+            <van-radio-group v-model="gender" direction="horizontal" style="width:67%;">
+              <van-radio name="1">男</van-radio>
+              <van-radio name="2">女</van-radio>
+            </van-radio-group>
+          </template>
+        </van-cell>
         <van-field v-model="phone" label="手机号码" maxlength="11" placeholder="请填写手机号码" />
         <van-field v-model="travelerIdCard" label="身份证" maxlength="18" placeholder="请填写证件号码" />
       </van-cell-group>
@@ -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 @@
   <div id="selectContact">
     <div class="box">
       <template v-for="(item,index) in contactList">
-      <div class="contact_item" v-if="!hideParent&&item.userType!=1||item.userType==1" :key="index">
-        <van-icon class="edit" name="edit" @click="editContact(index)" />
-        <div class="info">
-          <p class="name">{{item.travelerName}}<span v-if="!item.travelerIdCard">需完善</span></p>
-          <p class="des">{{item.userType==1?'学生':'家长'}}·{{item.travelerMobile}}</p>
+        <div class="contact_item" v-if="!hideParent&&item.userType!=1||item.userType==1" :key="index">
+          <van-icon class="edit" name="edit" @click="editContact(index)" />
+          <div class="info">
+            <p class="name">{{item.travelerName}}<span v-if="!item.travelerIdCard||!item.gender">需完善</span></p>
+            <p class="des">{{item.userType==1?'学生':'家长'}}·{{item.travelerMobile}}</p>
+          </div>
+          <van-checkbox v-if="item.userType==1" class="checkbox" v-model="item.checked" shape="square"></van-checkbox>
+          <van-checkbox v-else class="checkbox" v-model="item.checked" @change="checkboxChange" shape="square"></van-checkbox>
         </div>
-        <van-checkbox class="checkbox" v-model="item.checked" shape="square"></van-checkbox>
-      </div>
       </template>
       <div class="add_btn" @click="showAddChildPopupGroup=true">
         <van-icon name="add-o" />
-        新增联系人
+        新增出行学生
       </div>
     </div>
     <van-button class="btn" type="primary" @click="selectContact">确定</van-button>
@@ -24,18 +25,19 @@
 </template>
 <script>
 import AddChildPopupGroup from '@/views/PublicHome/component/AddChildPopupGroup'
+import { Dialog } from 'vant';
 export default {
   data () {
     return {
-      limit:'',
-      hideParent:false,
+      limit: '',
+      hideParent: false,
       contactList: [],
       showAddChildPopupGroup: false
     }
   },
   mounted () {
     this.limit = this.$route.query.limit;
-    this.hideParent = this.$route.query.hideParent?true:false;
+    this.hideParent = this.$route.query.hideParent ? true : false;
     console.log(this.hideParent)
     this.getContactList()
   },
@@ -58,7 +60,8 @@ export default {
             travelerNum: userInfo?.centerNo,
             travelerIdCard: userInfo?.idCard,
             userType: 2,
-            travelerName: userInfo?.nickName
+            travelerName: userInfo?.nickName,
+            gender: userInfo?.gender,
           })
           this.contactList = contactList
         }
@@ -87,7 +90,7 @@ export default {
       let selectedArr = [];
       for (let i in contactList) {
         if (contactList[i]?.checked) {
-          if (!contactList[i].travelerIdCard&&!this.hideParent) {
+          if ((!contactList[i].travelerIdCard||!contactList[i].gender) && !this.hideParent) {
             this.$toast('请先完善您选择的联系人信息')
             return;
           } else {
@@ -99,7 +102,7 @@ export default {
           }
         }
       }
-      console.log(this.limit,selectedArr.length)
+      console.log(this.limit, selectedArr.length)
       if (this.limit && this.limit != selectedArr.length) {
         this.$toast(`请选择${this.limit}位联系人`)
         return;
@@ -107,6 +110,15 @@ export default {
       // console.log(selectedArr)
       sessionStorage.setItem('selectedContactArr', JSON.stringify(selectedArr))
       this.$router.back()
+    },
+    checkboxChange (e) {
+      if (e == true) {
+        Dialog.alert({
+          title: '温馨提示',
+          message: '活动参与主体为学生本人，请选择出行学生！未绑定学生，请新增出行学生进行添加。',
+          confirmButtonColor:'#3385FF'
+        })
+      }
     }
   },
   components: {
--
libgit2 0.21.0