update:贷款

src/components/Loan/LoanCard2/index.vue

@@ -36,7 +36,7 @@ export default defineComponent({
               {props.min_amount}-{props.max_amount}
             </span>
             <span class="word19">
-              近七日年化&nbsp;{props.rate_lower}%-{props.rate_upper}%
+              近七日年化&nbsp;{props.rate_lower}%起
             </span>
           </div>
         </div>

src/components/Mine/Branch/branch.vue

@@ -79,7 +79,7 @@
     <!-- 底部操作 -->
     <div
       class="flex text-center py-3 text-gray-800 bg-branch-tab-bg rounded-b-2xl"
-      v-if="is_normal_work"
+      v-if="is_normal_work&&isUser"
     >
       <p class="w-1/2 border-r border-gray-200 mb-0" @click="handleClickChatWithClientManager">联系客服</p>
       <p class="w-1/2 mb-0" :class="isOpen ? 'text-app-blue' : 'text-gray-800'" @click="toCall">电话咨询</p>
@@ -89,7 +89,7 @@
 </template>
 
 <script lang="ts" setup>
-import { computed, defineComponent, PropType, ref } from 'vue'
+import { computed, defineComponent, onMounted, onUnmounted, PropType, reactive, ref } from 'vue'
 import Icon from "@/components/common/Icon.vue"
 import { transfterStrToDate } from '@/utils/transfer'
 import AddressService from '@/service/AddressService'
@@ -101,6 +101,15 @@ import { authCheck } from '@/utils/authCheck'
 import router from '@/router'
 import ShowCall from '@/components/showCall/index.vue'
 import { goToChatWithOutletRoboot } from '@/router/navigate'
+import { getUserMsg } from "@/utils/userMsg";
+import { eRole } from '@/types/roleType'
+
+
+const isUser = computed(()=>{
+  console.log('user',getUserMsg()?.role==eRole.user);
+  
+  return getUserMsg()?.role==eRole.user;
+})
 
 const addressService = new AddressService()
 

src/components/PopUpContent/LoanFilter/index.vue

@@ -7,7 +7,7 @@
       :selecteds="selectedBanks"
       :setSelecteds="setBanks"
     />
-    <div class="group-title mt-8">利率 (%)</div>
+    <div class="group-title mt-8">最低利率 (%)</div>
     <div class="section10 flex-row">
       <div class="mod5 flex-col">
         <div class="layer4 flex-row">
@@ -16,14 +16,13 @@
               v-model.number="min_"
               @blur="checkInterstValid"
               type="number"
-              placeholder="最低利率"
               class="bg-transparent w-full text-center"
             />
           </div>
           <div class="word25">%</div>
         </div>
       </div>
-      <div class="mod6 flex-col"></div>
+      <!-- <div class="mod6 flex-col"></div>
       <div class="mod7 flex-col">
         <div class="main12 flex-row">
           <div class="txt12">
@@ -37,7 +36,7 @@
           </div>
           <div class="word26">%</div>
         </div>
-      </div>
+      </div> -->
     </div>
     <div class="group-title mt-8">额度 (万元)</div>
     <div class="section10 flex-row">
@@ -76,7 +75,7 @@
       :selecteds="selectedTypes"
       :setSelecteds="setSelectedTypes"
     />
-    <div class="group-title mt-8">最长期限</div>
+    <div class="group-title mt-8">期限</div>
     <SelectList
       class="mt-5"
       :list="peridList"

src/service/LoanProductService/index.ts

@@ -42,11 +42,9 @@ export function queryBankList() {
 }
 
 export function queryDirectLoanReq(data: {
-  min_date: number
-  max_date: number
+  date: number
   bank_code: number
-  rate_upper: number
-  rate_lower: number
+  lower:number
   min_amount:number
   max_amount:number
   loan_type: number

src/service/LoanProductService/type.ts

@@ -4,6 +4,8 @@ export interface iLoanProdcutItem{
   created_at: number,
   features: string,
   guarantee_type: number,
+  rate:number,
+  date:number,
   inst_name: string,
   max_amount: number,
   max_date: number,

src/views/LoanDetail/index.vue

@@ -46,12 +46,12 @@ export default defineComponent({
     const uuid = ref('')
     const min_amount = ref(0)
     const max_amount = ref(0)
+    const rate = ref(0)
     const rate_lower = ref(0)
     const rate_upper = ref(0)
     const inst_name = ref('')
     const product_name = ref('')
-    const min_date = ref(0)
-    const max_date = ref(0)
+    const date = ref(0)
     const guarantee_type = ref(eGuaranteeType.credit)
     const products = ref('')
     const features = ref('')
@@ -84,12 +84,10 @@ export default defineComponent({
           const productItem = ret.data
           min_amount.value = productItem.min_amount
           max_amount.value = productItem.max_amount
-          rate_lower.value = productItem.rate_lower
-          rate_upper.value = productItem.rate_upper
+          rate.value = productItem.rate
           inst_name.value = productItem.inst_name
           product_name.value = productItem.product_name
-          min_date.value = productItem.min_date
-          max_date.value = productItem.max_date
+          date.value = productItem.date
           guarantee_type.value = productItem.guarantee_type
           products.value = productItem.products
           features.value = productItem.features
@@ -162,7 +160,6 @@ export default defineComponent({
                     min_amount={min_amount.value}
                     max_amount={max_amount.value}
                     rate_lower={rate_lower.value}
-                    rate_upper={rate_upper.value}
                     setRef={(el: HTMLElement) => {
                       applyEl.value = el;
                     }}
@@ -220,7 +217,7 @@ export default defineComponent({
               </div>
               <div class="flex text-sm text-gray-800 border-b border-product-detail-bg justify-between">
                 <span class="  w-100 align-center bg-product-detail-bg py-4 inline-block text-center">贷款利率</span>
-                <span class="  w-235 py-4 pr-5 inline-block break-words text-right">{rate_lower.value}%~{rate_upper.value}%</span>
+                <span class="  w-235 py-4 pr-5 inline-block break-words text-right">{rate.value}%起</span>
               </div>
               <div class="flex text-sm text-gray-800 border-b border-product-detail-bg justify-between">
                 <span class="  w-100 align-center bg-product-detail-bg py-4 inline-block text-center">贷款额度</span>
@@ -228,7 +225,7 @@ export default defineComponent({
               </div>
               <div class="flex text-sm text-gray-800 border-b border-product-detail-bg justify-between">
                 <span class="  w-100 align-center bg-product-detail-bg py-4 inline-block text-center">贷款期限</span>
-                <span class="  w-235 py-4 pr-5 inline-block break-words text-right">{min_date.value}个月~{max_date.value}个月</span>
+                <span class="  w-235 py-4 pr-5 inline-block break-words text-right">{date.value}年</span>
               </div>
               <div class="flex text-sm text-gray-800 border-b border-product-detail-bg justify-between">
                 <span class="  w-100 align-center bg-product-detail-bg py-4 inline-block text-center">担保方式</span>

src/views/LoanList/index.vue

@@ -85,7 +85,7 @@ import {
   queryBankList,
 } from "@/service/LoanProductService/index";
 import { simpleItemInfo } from "@/views/withMenu/Loan/types";
-import { iLoanProdcutItem } from "@/service/LoanProductService/type";
+import { eProductStatus, iLoanProdcutItem } from "@/service/LoanProductService/type";
 import { Skeleton, Toast } from "vant";
 import {
   loanSearchState,
@@ -107,10 +107,10 @@ export default defineComponent({
     const mode = ref(+useRoute().params.mode);
 
     onMounted(() => {
+      fetchBanks();
       /* 状态为空时获取list */
       if (loanSearchState.result.length == 0) {
         fetchList();
-        fetchBanks();
       }
     });
 
@@ -154,6 +154,7 @@ export default defineComponent({
         limit: LIST_SIZE,
         offset: offset.value,
         loan_type: mode.value,
+        product_status:eProductStatus.published
       }).then((ret) => {
         loading.value = false;
         if (ret.code === 200) {
@@ -198,10 +199,9 @@ export default defineComponent({
     return {
       show: false,
       peridList: [
-        { id: { min_date: 0, max_date: 3 }, name: "3个月内" },
-        { id: { min_date: 3, max_date: 6 }, name: "3-6个月" },
-        { id: { min_date: 6, max_date: 12 }, name: "6-12个月" },
-        { id: { min_date: 12, max_date: 360 }, name: "12个月以上" },
+        { id: { date:1 }, name: "1年" },
+        { id: { date:3 }, name: "3年" },
+        { id: { date:10 }, name: "10年" },
       ],
       typeList: [
         { id: { guarantee_type: 1 }, name: "信用" },
@@ -315,17 +315,11 @@ export default defineComponent({
     queryList() {
       this.loading = true;
       queryDirectLoanReq({
-        rate_lower: +this.reqParams.min! ? +this.reqParams.min! : 0,
-        rate_upper: +this.reqParams.max! ? +this.reqParams.max! : 1000,
+        lower:+this.reqParams.min!? +this.reqParams.min!:0,
         min_amount: +this.reqParams.min2! ? +this.reqParams.min2! : 0,
         max_amount: +this.reqParams.max2! ? +this.reqParams.max2! : 9999,
         bank_code: this.reqParams.selectedBanks[0],
-        max_date: this.reqParams.selectedPerids[0]
-          ? this.reqParams.selectedPerids[0].max_date
-          : undefined,
-        min_date: this.reqParams.selectedPerids[0]
-          ? this.reqParams.selectedPerids[0].min_date
-          : undefined,
+        date:this.reqParams.selectedPerids[0]?this.reqParams.selectedPerids[0].date:undefined,
         loan_type: this.mode,
         product_status: 4,
         guarantee_type: this.reqParams.selectedTypes[0]