diff --git a/src/assets/js/utils/data-dictionary.js b/src/assets/js/utils/data-dictionary.js
index 23650935f..e996d51f3 100644
--- a/src/assets/js/utils/data-dictionary.js
+++ b/src/assets/js/utils/data-dictionary.js
@@ -1948,7 +1948,15 @@ export default {
     {
       id: '58',
       text: '待客户付款'
-    }
+    },
+    {
+      id: '59',
+      text: '团险卡单投保人信息保存成功'
+    },
+    {
+      id: '60',
+      text: '团险卡单被保人信息保存成功'
+    },
   ],
   contState: [
     {
diff --git a/src/views/ebiz/cardList/CardTotreasure.vue b/src/views/ebiz/cardList/CardTotreasure.vue
index 67f84852d..a2f4f4dde 100644
--- a/src/views/ebiz/cardList/CardTotreasure.vue
+++ b/src/views/ebiz/cardList/CardTotreasure.vue
@@ -51,16 +51,20 @@
                 <div>
                   <span>投保人：{{ orderItem.appantName }}</span>
                 </div>
-                <div>
+                <div v-if="orderItem.insuredName">
                   <span>被保人：{{ orderItem.insuredName }}</span>
                 </div>
                 <div class="flex justify-content-s">
                   <span>订单状态：{{ orderItem.orderStatus | statusFormat }}</span>
                   <div v-if="orderItem.isCanPay && (orderItem.orderStatus == '02' || orderItem.orderStatus == '19' || orderItem.orderStatus == '55')">
-                    <van-button round @click="goPay(orderItem.orderNo)" size="small" class="mr5" type="danger" v-no-more-click="1000">去支付</van-button>
+                    <van-button round @click="goPay(orderItem.orderNo)" size="mini" class="mr5" type="danger" v-no-more-click="1000">去支付</van-button>
                   </div>
                   <div v-if="canRevoke[orderItem.orderStatus]">
-                    <van-button round @click="revokeOrder(orderItem)" size="small" class="mr5" type="danger">撤单</van-button>
+                    <van-button round @click="revokeOrder(orderItem)" size="mini" class="mr5" type="danger">撤单</van-button>
+                  </div>
+                  <!-- isGroupCard 1 团险标识   判断该订单是否可编辑 59 团险卡单投保人信息保存成功 60 团险卡单被保人信息保存成功-->
+                  <div v-if="orderItem.isGroupCard == '1' && (orderItem.orderStatus == '59' ||orderItem.orderStatus == '60')">
+                    <van-button round @click="editOrder(orderItem)" size="mini" class="mr5" type="danger">编辑</van-button>
                   </div>
                 </div>
               </div>
@@ -320,6 +324,21 @@ export default {
           this.revokeOrderNo = order.orderNo
         })
     },
+    //编辑
+    editOrder(order){
+      let cardOrderNo = order.orderNo
+      let url =`/cardList/GroupInsuredList?cardOrderNo=${cardOrderNo}`
+      this.$jump({
+        flag: 'h5',
+        extra: {
+          url: location.origin + `/#`+ url,
+          forbidSwipeBack: 1
+        },
+        routerInfo: {
+          path: url
+        }
+      }) 
+    },
     beforeClose(action, done) {
       this.captchaMaped ? done() : done(false)
     },
@@ -413,13 +432,29 @@ export default {
         let currentTime = '',
           compareTime = '',
           orderObj = {
-            riskName: orderItem.insuredDTOs[0].riskDTOLst[0].riskName,
+            riskName: '',
             orderNo: orderItem.orderInfoDTO.orderNo,
             prtNo: orderItem.orderInfoDTO.prtNo,
             appantName: orderItem.appntDTO.name,
-            insuredName: orderItem.insuredDTOs[0].name,
+            insuredName: '',
             orderStatus: orderItem.orderInfoDTO.orderStatus,
-            appntMobile: orderItem.appntDTO.mobile
+            appntMobile: orderItem.appntDTO.mobile,
+            isGroupCard: orderItem.orderInfoDTO.isGroupCard
+          }
+          // 团险产品团险产品显示多个被保人姓名
+          if(orderItem.insuredDTOs.length == 1){
+            orderObj.riskName = orderItem.insuredDTOs[0].riskDTOLst[0].riskName
+            orderObj.insuredName = orderItem.insuredDTOs[0].name
+          }else if((orderItem.insuredDTOs.length > 1)){
+            orderObj.riskName = orderItem.insuredDTOs[0].riskDTOLst[0].riskName
+            orderObj.insuredName = ''
+            orderItem.insuredDTOs.forEach((item, index) => {
+              if(index == orderItem.insuredDTOs.length -1){
+                orderObj.insuredName += item.name
+              }else{
+                orderObj.insuredName += item.name+'/'
+              }           
+            })
           }
         let dateToday = new Date()
         dateToday.setHours(0)
diff --git a/src/views/ebiz/cardList/GroupAppntInfo.vue b/src/views/ebiz/cardList/GroupAppntInfo.vue
index 2bd6bf164..8d7f12a47 100644
--- a/src/views/ebiz/cardList/GroupAppntInfo.vue
+++ b/src/views/ebiz/cardList/GroupAppntInfo.vue
@@ -198,7 +198,7 @@ import OccupationPicker from '@/components/ebiz/occipation/OccupationPicker'
 import CustomerPicker from '@/components/ebiz/customer/CustomerPicker'
 import DataDictionary from '@/assets/js/utils/data-dictionary'
 import areaList from '@/assets/js/utils/areaForSale'
-import { saveOrUpdateGroupCard } from '@/api/ebiz/cardList/cardList.js'
+import { saveOrUpdateGroupCard,cardOrderDetail } from '@/api/ebiz/cardList/cardList.js'
 import utilsAge from '@/assets/js/utils/age'
 import getAreaName from '@/assets/js/utils/getAreaNameForSale'
 import IdentityCardScan from '@/components/ebiz/sale/IdentityCardScan'
@@ -237,6 +237,7 @@ export default {
   },
   data() {
     return {
+      cardOrderNo:'',
       averageAnnualIncomeFlag: false, // 20210730 年收入不展示且默认为0 核心对年收入有非空校验
       idLimit: false, //截止日期是否可编辑
       certiexpiredateRequired: true, //证件截止日期是否需要校验
@@ -366,12 +367,36 @@ export default {
     this.userInfo.homeName = getAreaName([{ code: 450000 }, { code: 450100 }, { code: 450101 }]) //家庭地址
   },
   mounted() {
+    let that = this
     // 2516--除万福卡，投保人、被保险人年收入，默认为0，允许修改
     if (this.itemProductDTOS.productCode != 'GFRS_M0032') {
       this.userInfo.averageAnnualIncome = '0'
     }
     // 筛选按钮的点击事件
     window.appCallBack = this.appCallBack
+    if (this.$route.query.cardOrderNo) {
+      this.cardOrderNo = this.$route.query.cardOrderNo
+      //根据后台数据来展示
+      let cardInfoDTO = {
+        orderNo: this.cardOrderNo
+      }
+      cardOrderDetail(cardInfoDTO).then(res => {
+        if (res.result == '0') {
+          Object.assign(that.userInfo,res.orderDTO.appntDTO)
+          that.userInfo.effectiveDateType = that.userInfo.effectiveDateType == 'true'?true:false
+          that.userInfo.certiexpiredate = that.userInfo.effectiveDateType == 'true'?'':that.userInfo.certiexpiredate
+          that.userInfo.homeName = getAreaName([
+            { code: that.userInfo.homeProvince },
+            { code: that.userInfo.homeCity },
+            { code: that.userInfo.homeArea }
+          ])
+          if (this.userInfo.birthday) {
+            let age = utilsAge.getAge(this.userInfo.birthday, new Date())
+            this.effectiveDateTypeAble = !(age >= 45)
+          }
+        }
+      })
+    }
   },
   methods: {
     //长期状态改变时
@@ -794,7 +819,8 @@ export default {
         orderDTO: {
           orderInfoDTO: {
             bnfFlag: '0',
-            supportBank: '0'
+            supportBank: '0',
+            orderNo: this.cardOrderNo
           },
           appntDTO: this.userInfo,
         },
diff --git a/src/views/ebiz/cardList/GroupCheckInfo.vue b/src/views/ebiz/cardList/GroupCheckInfo.vue
index 8dd396eda..faca8cc0e 100644
--- a/src/views/ebiz/cardList/GroupCheckInfo.vue
+++ b/src/views/ebiz/cardList/GroupCheckInfo.vue
@@ -57,7 +57,7 @@
 
 <script>
 import { Field, GoodsAction, GoodsActionIcon, GoodsActionButton, Icon ,Collapse, CollapseItem} from 'vant'
-import { getOrderDetail, information, underWrite } from '@/api/ebiz/sale/sale'
+import {cardOrderDetail } from '@/api/ebiz/cardList/cardList.js'
 import getAreaName from '@/assets/js/utils/getAreaNameForSale'
 import afterDate from '@/assets/js/utils/getAfterDate.js'
 import utilsAge from '@/assets/js/utils/age'
@@ -73,13 +73,6 @@ export default {
     [CollapseItem.name]: CollapseItem,
     [Icon.name]: Icon
   },
-  computed: {
-    orderDTO: {
-      get() {
-        return JSON.parse(sessionStorage.orderDetail)
-      }
-    }
-  },
   data() {
     return {
       activeNames: [], //折叠面板
@@ -92,21 +85,26 @@ export default {
     }
   },
   created() {
-    this.appntInfo = this.orderDTO.appntDTO
-    this.appntInfo.homeName = getAreaName([{ code: this.appntInfo.homeProvince }, { code: this.appntInfo.homeCity }, { code: this.appntInfo.homeArea }])
-    this.insuredInfo = this.orderDTO.insuredDTOs
-    this.insuredInfo.forEach(item => {
-       item.homeName = getAreaName([{ code: item.homeProvince }, { code: item.homeCity }, { code: item.homeArea }])
-    //    if (item.birthday) {
-    //         let age = utilsAge.getAge(item.birthday, new Date())
-    //         if (age <= 17) {
-    //             item.isLessEighteen = false  //是否小于18周岁（不含）
-    //         } else {
-    //             item.isLessEighteen = true  //是否小于18周岁（不含）
-    //         }
-    //    }
+    if (this.$route.query.cardOrderNo) {
+      this.cardOrderNo = this.$route.query.cardOrderNo
+    }
+    //根据后台数据来展示
+    let cardInfoDTO = {
+      orderNo: this.cardOrderNo
+    }
+    cardOrderDetail(cardInfoDTO).then(res => {
+      if (res.result == '0') {
+        this.appntInfo = res.orderDTO.appntDTO
+        this.appntInfo.homeName = getAreaName([{ code: this.appntInfo.homeProvince }, { code: this.appntInfo.homeCity }, { code: this.appntInfo.homeArea }])
+        this.insuredInfo = res.orderDTO.insuredDTOs
+        this.insuredInfo.forEach(item => {
+          item.homeName = getAreaName([{ code: item.homeProvince }, { code: item.homeCity }, { code: item.homeArea }])
+        })
+        this.riskDTO = res.orderDTO.insuredDTOs[0].riskDTOLst[0]
+      }
     })
     
+    
     // let insuYear = (this.riskDTO = this.orderDTO.insuredDTOs[0].riskDTOLst[0])
     // if (this.riskDTO.dutyLst && this.riskDTO.dutyLst.length > 0) {
     //   this.riskDTO.dutyLst.forEach(val => {
diff --git a/src/views/ebiz/cardList/GroupInsuredInfo.vue b/src/views/ebiz/cardList/GroupInsuredInfo.vue
index 4461e6fb4..26d185500 100644
--- a/src/views/ebiz/cardList/GroupInsuredInfo.vue
+++ b/src/views/ebiz/cardList/GroupInsuredInfo.vue
@@ -589,6 +589,10 @@ export default {
               that.proSchemeCode = that.insuredInfo.riskDTOLst[0].proSchemeCode
               that.allPrice = that.insuredInfo.riskDTOLst[0].prem
               that.trialList = that.insuredInfo.riskDTOLst
+              if (this.insuredInfo.birthday) {
+                let age = utilsAge.getAge(this.insuredInfo.birthday, new Date())
+                this.effectiveDateTypeAbleInsured = !(age >= 45)
+              }
             }
           })
         } else {
@@ -601,7 +605,11 @@ export default {
               { code: this.insuredInfo.homeCity },
               { code: this.insuredInfo.homeArea }
             ])
-            that.insuredInfo.medical = '0' 
+            that.insuredInfo.medical = '0'
+            if (this.insuredInfo.birthday) {
+              let age = utilsAge.getAge(this.insuredInfo.birthday, new Date())
+              this.effectiveDateTypeAbleInsured = !(age >= 45)
+            }
           }
         }
       }
diff --git a/src/views/ebiz/cardList/GroupInsuredList.vue b/src/views/ebiz/cardList/GroupInsuredList.vue
index 9d03006a2..932747110 100644
--- a/src/views/ebiz/cardList/GroupInsuredList.vue
+++ b/src/views/ebiz/cardList/GroupInsuredList.vue
@@ -117,6 +117,7 @@ export default {
       if (res.result == '0') {
         if (res.orderDTO.insuredDTOs.length > 0) {
           this.chooseList = res.orderDTO.insuredDTOs
+          this.allPrice = res.orderDTO.orderInfoDTO.orderAmount 
           this.chooseList.forEach(v => {
             relation.forEach(r => {
               if (r.id == v.relationToAppnt) {