1.优化详情页2.恢复全部时间筛选

src/components/ebiz/billingDetail/tableDetail2.vue

@@ -125,7 +125,7 @@ export default {
     // 查看详情 跳转至详情页面
     look(num) {
       this.$emit('fro-child', num);
-      console.log(num);
+      // console.log(num);
       // this.$router.push({
       //   path: '/policyDetails',
       //   query: {

src/views/ebiz/billingDetail/billingDetail.vue

@@ -127,7 +127,7 @@
         <div style="margin-top: 10px">
           <div>时间</div>
           <div class="button_times">
-            <!-- <van-button size="small" :class="dialogForm.dateFlag === 'all' ? 'checked' : ''" @click="typeCheck('all')">全部</van-button> -->
+            <van-button size="small" :class="dialogForm.dateFlag === 'all' ? 'checked' : ''" @click="typeCheck('all')">全部</van-button>
             <van-button size="small" :class="dialogForm.dateFlag === 'm' ? 'checked' : ''" @click="typeCheck('m')">按月份查询</van-button>
             <van-button size="small" :class="dialogForm.dateFlag === 'y' ? 'checked' : ''" @click="typeCheck('y')">按时间范围查询</van-button>
           </div>
@@ -247,13 +247,17 @@
         @child-colse="closeHebao"
       ></generateImg>
     </div>
-    <div class="xiangqing" v-if="xiangqingShow" >
+    <van-popup v-model="xiangqingShow" position="right" :style="{ width: '100%', height: '100%' }">
       <policyDetails
+        v-if="xiangqingShow"
         :orderNo="orderNo"
         @child-back="closeDetails"
       >
       </policyDetails>
-    </div>
+    </van-popup>
+    <!-- <div class="xiangqing" v-if="xiangqingShow" >
+      
+    </div> -->
   </div>
 </template>
 
@@ -465,7 +469,9 @@ export default {
       this.outOrderType = this.dialogForm.outOrderType
       this.dateFlag = this.dialogForm.dateFlag
       this.show = false
-      this.titleText = this.dialogForm.startDate.toString() + '~' + this.dialogForm.endDate.toString()
+      if(this.dateFlag == 'y') {
+        this.titleText = this.dialogForm.startDate.toString() + '~' + this.dialogForm.endDate.toString()
+      }
       this.outOrderTypeChange()
       this.queryOutOrderListFunc()
     },
@@ -482,7 +488,7 @@ export default {
         this.dialogForm.endDate = ''
       }
       if(this.firstTime == true) {
-        this.dialogForm.dateFlag = 'all'
+        this.dialogForm.dateFlag = 'm'
         this.firstTime = false
       }
       // console.log(this.dialogForm.dateFlag);
@@ -742,9 +748,9 @@ export default {
     },
     typeCheck(e) {
       this.dialogForm.dateFlag = e
-      // if(e == 'all') {
+      if(e == 'all') {
-      //   this.titleText = '全部'
+        this.titleText = '全部'
-      // }
+      }
       if(e == 'm') {
         this.overlayShow = true
         this.titleText = this.monthValue

src/views/ebiz/billingDetail/policyDetails.vue

@@ -21,13 +21,12 @@
           </div>
         </van-collapse-item>
         <van-collapse-item title="主险" name="2">
-          <p class="list" v-show="policyData.mainRiskNameList != []" v-for="(item, index) in policyData.mainRiskNameList" :key="index">{{ item }}</p>
+          <p class="list" v-show="mainShow" v-for="(item, index) in policyData.mainRiskNameList" :key="index">{{ item }}</p>
-          <p class="list" v-show="policyData.mainRiskNameList == []">暂无主险信息</p>
+          <p class="list" v-show="mainShow == false">暂无主险信息</p>
         </van-collapse-item>
-        <!-- subRiskNameList -->
         <van-collapse-item title="附加险" name="3">
-          <p class="list" v-show="policyData.subRiskNameList.length >= 1" v-for="(itemm, index) in policyData.subRiskNameList" :key="index">{{ itemm }}</p>
+          <p class="list" v-show="subRiskShow" v-for="(itemm, index) in policyData.subRiskNameList" :key="index">{{ itemm }}</p>
-          <p class="list" v-show="policyData.subRiskNameList.length == 0" >暂无附加险信息</p>
+          <p class="list" v-show="subRiskShow == false" >暂无附加险信息</p>
         </van-collapse-item>
       </van-collapse>
       <div class="bottom">
@@ -57,22 +56,42 @@ export default {
     return {
         currentDate: '',
         // orderNo: '',
-        activeName: ['1'],
+        activeName: ['1','2','3'],
         policyData: {},
+        mainShow: false,
+        subRiskShow: false,
     }
   },
   created() {
-      console.log(this.orderNo);
+    console.log(this.orderNo);
-      this.getpolicyInfo();
+    this.getpolicyInfo();
   },
   mounted() {
+    // console.log(this.orderNo);
+    // this.getpolicyInfo();
   },
   methods: {
       getpolicyInfo() {
-          queryOutOrderDetail({
+        this.$toast.loading({
+          duration: 0, // 持续展示 toast
+          forbidClick: true, // 禁用背景点击
+          loadingType: 'spinner',
+          message: '加载中……'
+        })
+        queryOutOrderDetail({
             orderNo: this.orderNo, 
         }).then((res) => {
             this.policyData = res.content;
+            if(this.policyData.mainRiskNameList == []) {
+              this.mainShow = false
+            } else {
+              this.mainShow = true
+            }
+            if(this.policyData.subRiskNameList.length == 0) {
+              this.subRiskShow = false
+            } else {
+              this.subRiskShow =  true
+            }
         })
       },
       goback() {
@@ -133,5 +152,9 @@ export default {
     text-align: center;
   }
 }
-
+::v-deep .van-cell__right-icon {
+    margin-left: 1.33333vw;
+    color: #969799;
+    display: none;
+}
 </style>

src/views/ebiz/generateImg/generateImg.vue

@@ -18,7 +18,7 @@
       <van-button square type="danger" size="large" @click="downLoadImagesFunc" v-no-more-click="1000"> 下载 </van-button>
     </div>
     <div class="close" @click="close()">
-      <van-icon name="cross" size="30" color="#fff" />
+      <van-icon name="cross" size="38" color="#fff" />
     </div>
   </div>
 </template>