save

src/components/PopUp/index.vue

@@ -2,7 +2,7 @@
   <Popup
     v-model:show="visible"
     position="right"
-    style="height: 100vh; width: 86%"
+    style="height: 100vh; width: 86%;"
   >
     <div class="flex flex-col h-full">
       <div class="mx-5 flex items-center justify-center relative mt-2.5">
@@ -12,11 +12,11 @@
           class="absolute left-0"
           @click="clickClose"
         />
-        <div class="title">{{ title || "此处是标题" }}</div>
+        <div class="title">{{ title || '此处是标题' }}</div>
       </div>
       <div class="flex-grow overflow-hidden">
         <div class="h-full overflow-auto px-5">
-          <slot />
+          <slot></slot>
         </div>
       </div>
       <div class="flex">
@@ -44,17 +44,18 @@
   </Popup>
 </template>
 <script lang="ts">
-import  { defineComponent } from "vue";
-import { Popup } from "vant";
-import Icon from "@/components/common/Icon.vue";
+import { defineComponent } from 'vue'
+import { Popup } from 'vant'
+import Icon from '@/components/common/Icon.vue'
 export default defineComponent({
+  emits: ['clickLeft', 'clickRight'],
   components: {
     Popup,
     Icon,
   },
   props: {
-    leftBtnName: { type: String, default: "重置" },
-    rightBtnName: { type: String, default: "完成" },
+    leftBtnName: { type: String, default: '重置' },
+    rightBtnName: { type: String, default: '完成' },
     leftBtnActive: {
       type: Boolean,
       default: true,
@@ -72,20 +73,20 @@ export default defineComponent({
   },
   methods: {
     clickClose(): void {
-      this.setShow(false);
+      this.setShow(false)
     },
   },
   computed: {
     visible: {
       get(): boolean | undefined {
-        return this.show;
+        return this.show
       },
       set(v: boolean): void {
-        this.setShow(false);
+        this.setShow(false)
       },
     },
   },
-});
+})
 </script>
 <style lang="less" scoped>
 .btn {
@@ -107,4 +108,4 @@ export default defineComponent({
   font-weight: 600;
   color: #1b1f37;
 }
-</style>
\ No newline at end of file
+</style>

src/main.ts

@@ -11,7 +11,6 @@ import {
   Toast,
   Popover,
 } from 'vant'
-import '@/assets/styles/style.less'
 import { Quasar } from 'quasar'
 import quasarConfig from './plugins/quasar-config'
 import '@/assets/styles/style.less'

src/views/ActivityList/index.vue

 <template>
-  <nav-bar title="精彩活动" :style="{ 'background':'#0081F7','color':'white'}" iconColor="white"/>
+  <nav-bar title="精彩活动" :style="{ 'background':'#0081F7 !important','color':'white'}" iconColor="white"/>
   <img src="../../assets/img/activity_bg.png" class="w-full -mt-16">
   <div class=" p-5">
-  <card v-for="activity in activityList" :key="activity" 
+  <card v-for="activity in activityList" :key="activity.id" 
         :activity="activity"
         @click="$router.push('ActivityDetail')" />
   </div>

src/views/LoanList/index.vue

@@ -2,18 +2,13 @@
   <div class="page">
     <NavBar title="全部功能" />
     <div class="layer1 flex-col">
-      <GroupTitle
-        class="mt-4"
-        title="贷款精选"
-        iconName="icon-shaixuan"
-        @filter="showFilter"
-      />
+      <GroupTitle class="mt-4" title="贷款精选" iconName="icon-shaixuan" @filter="showFilter" />
     </div>
     <LoanCard v-for="n in 10" :key="n" class="mt-2.5" />
     <PopUp
       title="筛选"
       :show="show"
-      :setShow="(v) => (show = v)"
+      :setShow="setShow"
       @clickLeft="clickReset"
       @clickRight="clickConfirm"
     >
@@ -36,7 +31,7 @@
     </PopUp>
   </div>
 </template>
-<script>
+<script lang="ts">
 import NavBar from "@/components/NavBar/index.vue";
 import GroupTitle from "@/components/GroupTitle/index.vue";
 import PopUp from "@/components/PopUp/index.vue";
@@ -102,6 +97,9 @@ export default defineComponent({
     };
   },
   methods: {
+    setShow(v: boolean) {
+      this.show = v;
+    },
     showFilter() {
       this.show = true;
       this.selectedBanks = this.reqParams.selectedBanks;