diff --git a/src/views/YB_APP/policyList.vue b/src/views/YB_APP/policyList.vue
index 6843a3ec0..59058ed7c 100644
--- a/src/views/YB_APP/policyList.vue
+++ b/src/views/YB_APP/policyList.vue
@@ -1,10 +1,11 @@
 <template>
   <div class="public_container">
     <!-- 最上方的搜索框 -->
-    <div style="position: relative">
+    <!-- <div style="position: relative">
       <van-search shape="round" v-model="findValue" placeholder="请输入保单号/客户身份证号/客户姓名" />
       <button class="searchButton" @click="keywordSearch(findValue)">搜索</button>
-    </div>
+    </div> -->
+    <!-- <button @click="showSideBar = !showSideBar">点击按钮</button> -->
     <!-- <div style="width:100%;height:1000px;background:rgba(0, 0, 0, 0.2);"></div> -->
 
     <!-- 右侧搜索按钮 -->
@@ -63,12 +64,17 @@
     </div>
     <van-popup v-model="showSideBar" position="right" style="width: 80%; height: 100%" :overlay-style="{ opacity: 0.7 }">
       <div class="state-content">
+        <div>
+          <p>条件查询</p>
+          <van-search v-model="conditionInquire" shape="round" placeholder="保单号/客户身份证号/客户姓名" left-icon=" " />
+        </div>
         <div>
           <p>承保日期</p>
-          <div class="underwriteDateClass">
-            <span class="underwriteDateSpan">{{ underwriteDate }}</span
-            ><img class="underwriteDateImg" @click="datechange" src="../../assets/YB_APP/images/date.png" />
-          </div>
+          <van-search show-action v-model="underwriteDate" shape="round" placeholder="右侧选择日期" left-icon=" ">
+            <template #action>
+              <img class="underwriteDateImg" @click="clickTime" src="../../assets/YB_APP/images/date.png" />
+            </template>
+          </van-search>
         </div>
         <div>
           <p>保单状态</p>
@@ -109,15 +115,23 @@
         <van-button class="m-btn-left" @click="reset">重置</van-button>
         <van-button class="m-btn-right" @click="submit">确定</van-button>
       </div>
-      <van-popup v-model="calendarShow" position="bottom">
-        <van-datetime-picker v-model="currentDate" type="year-month" title="选择日期" @cancel="handleCurrentDateCancel" @confirm="handleCurrentDateConfirm" />
+      <van-popup v-model="showPicker" position="bottom">
+        <van-datetime-picker
+          v-model="currentDate"
+          type="year-month"
+          title="选择年月"
+          :min-date="minDate"
+          :max-date="maxDate"
+          @confirm="timeSubmit"
+          @cancel="timeCancel"
+        />
       </van-popup>
     </van-popup>
   </div>
 </template>
 
 <script>
-import { Button, Search } from 'vant'
+import { Button, Search, DatetimePicker } from 'vant'
 import { ref } from 'vue'
 import utils from '@/assets/js/utils/date-utils'
 import { YBpolicyListAgent } from '@/api/YB_APP/index'
@@ -128,7 +142,8 @@ export default {
   name: 'policyList',
   components: {
     [Button.name]: Button,
-    [Search.name]: Search
+    [Search.name]: Search,
+    [DatetimePicker.name]: DatetimePicker
   },
   setup() {
     const value = ref('')
@@ -136,6 +151,7 @@ export default {
   },
   data() {
     return {
+      showPicker: false,
       findValue: '', // 上面搜索框的value
       policyListDTOList: [],
       filpolicyListDTOList: [], // 结合watch过滤后的卡片数据
@@ -166,18 +182,23 @@ export default {
       clickChangevisitSucceed: 0,
       clickChangevisitAccomplish: 0,
       calendarShow: false,
-      currentDate: new Date(),
+      // currentDate: new Date(),
       underwriteDate: '', // 承保日期的时间
+      conditionInquire: '', // 条件查询
       params: {
         signDate: '', // 日期
         otherNo: '', // 保单号
-        stateName: '', // 保单状态
+        state: '', // 保单状态
         bankChannel: '', // 渠道名称
         visitSuccess: '', // 回访成功
         visitFinish: '', // 回访完成
         pageSize: 10,
         pageNo: 0
       },
+
+      minDate: new Date(2020, 0, 1),
+      maxDate: new Date(2030, 11, 31),
+      currentDate: new Date(),
       loading: false,
       finished: false
     }
@@ -199,7 +220,7 @@ export default {
     this.YBpolicyListAgent()
     // 筛选按钮的点击事件
     window.appCallBack = this.appCallBack
-    this.underwriteDate = this.$route.query.date
+    // this.underwriteDate = this.$route.query.date
     // this.params.signDate = this.$route.query.date
   },
 
@@ -230,9 +251,6 @@ export default {
         })
       }, 500)
     },
-    datechange() {
-      this.calendarShow = true
-    },
     // 四个选择的状态
     warrantyState(val) {
       this.clickChangewarranty = val
@@ -274,11 +292,11 @@ export default {
           // that.filpolicyListDTOList = res.policyListDTOList
           // console.log(this.policyListDTOList, 'data里的policyListDTOList')
           // this.YBpolicyListAgent()
-          if (res.policyListDTOList && res.policyListDTOList.length == 0) {
+          if (res.policyListDTOList.length == 0) {
             this.finished = true
             this.loading = false
-            that.filpolicyListDTOList = []
-            console.log('111111111111111111111')
+            // that.filpolicyListDTOList = []
+            // console.log('111111111111111111111')
             // that.filpolicyListDTOList = res.policyListDTOList.policyListDTOList
           } else {
             that.filpolicyListDTOList = that.filpolicyListDTOList.concat(res.policyListDTOList)
@@ -291,16 +309,19 @@ export default {
             }
           }
         } else {
-          if (that.params.pageNo == 1) {
-            that.filpolicyListDTOList = []
-            console.log('33333333333333333333333333')
-          } else {
-            that.$toast(res.resultMessage)
-            this.finished = true
-            this.loading = false
-            // that.filpolicyListDTOList = []
-            console.log('44444444444444444444444444444')
-          }
+          that.$toast(res.resultMessage)
+          this.finished = true
+          this.loading = false
+          // if (that.params.pageNo == 1) {
+          //   that.filpolicyListDTOList = []
+          //   console.log('33333333333333333333333333')
+          // } else {
+          //   that.$toast(res.resultMessage)
+          //   this.finished = true
+          //   this.loading = false
+          //   // that.filpolicyListDTOList = []
+          //   console.log('44444444444444444444444444444')
+          // }
         }
       })
     },
@@ -318,29 +339,38 @@ export default {
       })
     },
     // 上方关键词搜索按钮
-    keywordSearch(value) {
-      console.log(value, '点击搜索了')
-      // this.filpolicyListDTOList = this.policyListDTOList.filter((p) => {
-      //   return p.policyNo.indexOf(value) !== -1
-      // })
-      this.params.pageNo = 0
-      this.params.otherNo = value
-      this.YBpolicyListAgent()
-      // console.log(value,'我是value');
-      // console.log(this.riskCode,'我是this.riskCode');
-    },
+    // keywordSearch(value) {
+    //   console.log(value, '点击搜索了')
+    //   // this.filpolicyListDTOList = this.policyListDTOList.filter((p) => {
+    //   //   return p.policyNo.indexOf(value) !== -1
+    //   // })
+    //   // this.params.pageNo = 0
+    //   this.clickChangewarranty = 0
+    //   this.clickChangechannel = 0
+    //   this.clickChangevisitSucceed = 0
+    //   this.clickChangevisitAccomplish = 0
+    //   this.underwriteDate = ''
+    //   this.params.pageNo = 0
+    //   this.params.otherNo = value
+    //   this.filpolicyListDTOList = []
+    //   this.YBpolicyListAgent()
+    //   // console.log(value,'我是value');
+    //   // console.log(this.riskCode,'我是this.riskCode');
+    // },
     reset() {
       // 筛选的重置操作
       // 全部按钮选中; list全部匹配(点击全部的时候可以通过匹配规则匹配到所有的产品)
       // this.isActive = [true, false, false, false, false]
       // this.list = this.proList
       // this.showSideBar = false
+      this.currentDate = new Date()
       this.clickChangewarranty = 0
       this.clickChangechannel = 0
       this.clickChangevisitSucceed = 0
       this.clickChangevisitAccomplish = 0
       this.underwriteDate = ''
-      this.params.pageNo = 1
+      this.conditionInquire = ''
+      this.params.pageNo = 0
     },
     submit() {
       // 筛选的确定操作
@@ -354,17 +384,12 @@ export default {
       this.showSideBar = false
       this.params.pageNo = 0
       this.params.signDate = this.underwriteDate
+      this.params.otherNo = this.conditionInquire
       // this.params.signDate = '2022-09'
-      console.log(this.params.signDate)
-      console.log(this.clickChangewarranty, '123321')
-      this.params.stateName = this.list1[this.clickChangewarranty].id
-      console.log(this.params.stateName)
+      this.params.state = this.list1[this.clickChangewarranty].id
       this.params.bankChannel = this.list1[this.clickChangechannel].id
-      console.log(this.params.bankChannel)
       this.params.visitSuccess = this.list1[this.clickChangevisitSucceed].id
-      console.log(this.params.visitSuccess)
       this.params.visitFinish = this.list1[this.clickChangevisitAccomplish].id
-      console.log(this.params.visitFinish)
       this.YBpolicyListAgent()
       this.$toast.loading({
         duration: 15000, // 持续展示 toast
@@ -382,12 +407,24 @@ export default {
       //   }
       // })
     },
-    handleCurrentDateCancel() {
-      this.calendarShow = false
+    // 查询里的图片出来时间
+    clickTime() {
+      this.showPicker = true
     },
-    handleCurrentDateConfirm(e) {
-      this.calendarShow = false
-      this.underwriteDate = utils.formatDate(e, 'yyyy-MM')
+    // 时间里的确认按钮
+    timeSubmit() {
+      // this.params.renewalDate = this.currentDate
+      let yearNum = this.currentDate.getFullYear()
+      let monthNum = this.currentDate.getMonth() + 1
+      if (monthNum < 10) {
+        monthNum = '0' + monthNum
+      }
+      this.underwriteDate = yearNum + '-' + monthNum
+      this.showPicker = false
+    },
+    // 时间里的取消按钮
+    timeCancel() {
+      this.showPicker = false
     }
   }
 
@@ -630,18 +667,18 @@ export default {
   margin-left: 10px;
 }
 .underwriteDateImg {
-  height: 16px;
-  align-items: center;
-  position: absolute;
-  right: 10px;
-  top: 7px;
+  height: 20px;
+  // align-items: center;
+  // right: 10px;
+  margin-top: 10px;
+  // top: 7px;
 }
 .chooseMessage {
   display: flex;
   flex-wrap: wrap;
 }
-/deep/ .van-icon-clear {
-  margin-right: 46px;
-  // background-color:blue ;
-}
+// /deep/ .van-icon-clear {
+//   margin-right: 46px;
+//   // background-color:blue ;
+// }
 </style>
diff --git a/src/views/YB_APP/renewalDetail.vue b/src/views/YB_APP/renewalDetail.vue
index 40a3d2000..0e1672992 100644
--- a/src/views/YB_APP/renewalDetail.vue
+++ b/src/views/YB_APP/renewalDetail.vue
@@ -36,11 +36,11 @@
         <van-cell title="转账银行" :value="ybOrderDTOList.bankCode" />
         <van-cell title="转账帐号" :value="ybOrderDTOList.bankAccNo" />
         <van-cell title="交费次数" :value="ybOrderDTOList.payTimes" />
-        <van-cell title="扣款失败原因" :value="ybOrderDTOList.defeateCause" v-if="changestate == 3" />
+        <van-cell title="扣款失败原因" :value="ybOrderDTOList.defaultReson" v-if="changestate == 3" />
         <van-cell title="应交日" :value="ybOrderDTOList.payToDate" />
         <van-cell title="归属网点" :value="ybOrderDTOList.netWorkName" />
         <van-cell title="归属地市" :value="ybOrderDTOList.city" />
-        <van-cell title="保单生效日" :value="ybOrderDTOList.chargeDate" />
+        <van-cell title="保单生效日" :value="ybOrderDTOList.cvalidate" />
         <van-cell title="归属指标" :value="ybOrderDTOList.rnewIndex" />
       </van-cell-group>
     </div>
@@ -70,9 +70,9 @@ export default {
   components: {},
   data() {
     return {
-      ybOrderDTOList: '',
+      ybOrderDTOList: {},
       policyNo: {},
-      changestate: 2,
+      changestate: '',
       show: false
     }
   },
diff --git a/src/views/YB_APP/renewalList.vue b/src/views/YB_APP/renewalList.vue
index 7ec123a07..a4d37179b 100644
--- a/src/views/YB_APP/renewalList.vue
+++ b/src/views/YB_APP/renewalList.vue
@@ -73,7 +73,7 @@
                 <span>所属渠道</span><span>{{ item.policySource }}</span>
               </p>
               <p>
-                <span v-if="active == 3">终止原因</span><span>{{ item.contState }}</span>
+                <span v-if="active == 3">终止原因</span><span>{{ item.terminateReason }}</span>
               </p>
               <p>
                 <span>金额/元</span><span class="redword">{{ item.money }}</span>
@@ -109,7 +109,7 @@ import { Button, Search } from 'vant'
 import { ref } from 'vue'
 import { getYBRenewalsList } from '@/api/YB_APP/index'
 import utils from '@/assets/js/utils/date-utils'
-import warterMark from "@/assets/js/utils/warterMark.js"
+import warterMark from '@/assets/js/utils/warterMark.js'
 import { getAgentInfo } from '@/api/ebiz/my/my.js'
 export default {
   name: 'renewalList',
@@ -137,7 +137,7 @@ export default {
         // idNo: '', // 身份证号
         // payToDate: '', // 时间
         state: '', // 状态
-        otherNo: '' ,// 搜索条件
+        otherNo: '' // 搜索条件
         // userModel: {
         //   id: 'Y0000001'
         // }
@@ -160,8 +160,8 @@ export default {
     console.log(this.minDate, 1111)
     let yearNum = new Date().getFullYear()
     let monthNum = new Date().getMonth() + 1
-    if(monthNum < 10){
-            monthNum = '0' + monthNum
+    if (monthNum < 10) {
+      monthNum = '0' + monthNum
     }
     this.calendarValue = yearNum + '-' + monthNum
     this.getYBRenewalsList()
@@ -169,11 +169,11 @@ export default {
   },
   methods: {
     // 水印
-    getAgentInfo(){
-      getAgentInfo({}).then(res=>{
-        if(res.result == 0){
+    getAgentInfo() {
+      getAgentInfo({}).then((res) => {
+        if (res.result == 0) {
           console.log('123')
-          warterMark.set(res.name+res.jobNo,"")
+          warterMark.set(res.name + res.jobNo, '')
         }
       })
     },
@@ -202,7 +202,7 @@ export default {
       this.$jump({
         flag: 'h5',
         extra: {
-          url: location.origin + '/#/YB_APP/renewalDetail?contNo='+data.contNo+'&payFlag='+data.payFlag+'&payToDate='+data.payToDate
+          url: location.origin + '/#/YB_APP/renewalDetail?contNo=' + data.contNo + '&payFlag=' + data.payFlag + '&payToDate=' + data.payToDate
         },
         routerInfo: {
           path: `/YB_APP/renewalDetail?contNo=${data.contNo}&payFlag=${data.payFlag}+&payToDate=${data.payToDate}`
@@ -279,7 +279,7 @@ export default {
   line-height: 50px;
 }
 /deep/ .van-icon-clear {
-  margin-right:46px;
+  margin-right: 46px;
   // background-color:blue ;
 }
 .beMonthLeft {