tangning 2 年之前
父节点
当前提交
2afa2ea793
共有 2 个文件被更改,包括 4 次插入4 次删除
  1. 3 3
      src/views/detail/index.vue
  2. 1 1
      src/views/home/list.vue

+ 3 - 3
src/views/detail/index.vue

@@ -7,7 +7,7 @@
         <van-button v-if="detailData.repairerVo?.status == 30" size="small" @click="goRoute(`/repair/${id}`)" color="#00B3EC" type="primary" >查看报价</van-button>
         <van-button v-if="detailData.repairerVo?.status == 30" size="small" @click="goRoute(`/repair/${id}`)" color="#00B3EC" type="primary" >查看报价</van-button>
         <van-button v-if="detailData.repairerVo?.status == 80 || detailData.repairerVo?.status == 40" size="small" @click="goRoute(`/payment/${id}`)" color="#00B3EC" type="primary" >支付</van-button>
         <van-button v-if="detailData.repairerVo?.status == 80 || detailData.repairerVo?.status == 40" size="small" @click="goRoute(`/payment/${id}`)" color="#00B3EC" type="primary" >支付</van-button>
         <van-button v-if="detailData.repairerVo?.status  > 80 && detailData.repairerVo?.commentStatus == 0" size="small" @click="goRoute(`/evaluate/${id}`)" color="#00B3EC" type="primary" >评价</van-button>
         <van-button v-if="detailData.repairerVo?.status  > 80 && detailData.repairerVo?.commentStatus == 0" size="small" @click="goRoute(`/evaluate/${id}`)" color="#00B3EC" type="primary" >评价</van-button>
-        <van-button v-if="detailData.repairerVo?.status  > 80 && detailData.applyInvoice == 0 && detailData.repairerVo.warrantyType != 0" size="small" @click="goRoute(`/invoice/${id}`)" color="#00B3EC" type="primary" >申请开票</van-button>
+        <van-button v-if="detailData.repairerVo?.status  > 80 && detailData.applyInvoice == 0 && detailData.repairerVo.warrantyType != 0 && detailData.repairerVo.warrantyType != 2" size="small" @click="goRoute(`/invoice/${id}`)" color="#00B3EC" type="primary" >申请开票</van-button>
       </div>
       </div>
       <transition-group name="van-fade">
       <transition-group name="van-fade">
         <!-- <div v-show="stepShow">Slide Right</div> -->
         <!-- <div v-show="stepShow">Slide Right</div> -->
@@ -78,14 +78,14 @@
             <span>{{ item.name }}</span>
             <span>{{ item.name }}</span>
             <span>¥{{ item.discount ==0 ?item.price:item.priceDiscount }} x{{ item.count }}</span>
             <span>¥{{ item.discount ==0 ?item.price:item.priceDiscount }} x{{ item.count }}</span>
           </div>
           </div>
-          <div class="item" v-if="detailData.repairerVo.warrantyType == 0">
+          <div class="item" v-if="detailData.repairerVo.warrantyType == 0 || detailData.repairerVo.warrantyType == 2">
             <span>保内维修</span>
             <span>保内维修</span>
             <span>¥ -{{ priceCount(detailData?.priceList || []) }}</span>
             <span>¥ -{{ priceCount(detailData?.priceList || []) }}</span>
           </div>
           </div>
         </div>
         </div>
         <div class="cell" style="border: none">
         <div class="cell" style="border: none">
           <span>维修费用</span>
           <span>维修费用</span>
-          <span>¥{{ detailData.repairerVo.warrantyType == 0?'0.00':priceCount(detailData?.priceList || []) }}</span>
+          <span>¥{{ (detailData.repairerVo.warrantyType == 0 || detailData.repairerVo.warrantyType == 2)?'0.00':priceCount(detailData?.priceList || []) }}</span>
         </div>
         </div>
       </div>
       </div>
     </div>
     </div>

+ 1 - 1
src/views/home/list.vue

@@ -24,7 +24,7 @@
             <van-button v-if="item.status == 30" @click.stop="goRoute(`repair/${item.repairId}`)" color="#00B3EC" plain hairline size="small">查看报价</van-button>
             <van-button v-if="item.status == 30" @click.stop="goRoute(`repair/${item.repairId}`)" color="#00B3EC" plain hairline size="small">查看报价</van-button>
             <van-button v-if="item.status == 80 || item.status == 40" @click.stop="goRoute(`payment/${item.repairId}`)" color="#00B3EC" hairline size="small">支付</van-button>
             <van-button v-if="item.status == 80 || item.status == 40" @click.stop="goRoute(`payment/${item.repairId}`)" color="#00B3EC" hairline size="small">支付</van-button>
             <van-button v-if="item.status > 80 && item.commentStatus == 0" @click.stop="goRoute(`evaluate/${item.repairId}`)" color="#00B3EC" plain hairline size="small">评价</van-button>
             <van-button v-if="item.status > 80 && item.commentStatus == 0" @click.stop="goRoute(`evaluate/${item.repairId}`)" color="#00B3EC" plain hairline size="small">评价</van-button>
-            <van-button v-if="item.status > 80 && item.invoiceStatus == 0 && item.warrantyType != 0" @click.stop="goRoute(`invoice/${item.repairId}`)" color="#00B3EC" hairline size="small">申请开票</van-button>
+            <van-button v-if="item.status > 80 && item.invoiceStatus == 0 && item.warrantyType != 0 && item.warrantyType != 2" @click.stop="goRoute(`invoice/${item.repairId}`)" color="#00B3EC" hairline size="small">申请开票</van-button>
           </div>
           </div>
         </div>
         </div>
       </div>
       </div>