Merge branch 'dev' of gitlab.33.cn:chenqikuai/fns_front_2 into dev

src/components/Loan/LoanCard2/index.vue

+<script lang="tsx">
+import { defineComponent } from "vue";
+
+export default defineComponent({
+  setup() {
+    return () => (
+      <div class="group2 flex-col">
+        <button class="bd12 flex-col" onClick={() => {}}>
+          <span class="txt9">立即申请</span>
+        </button>
+        <div class="bd13 flex-col w-full">
+          <div class="layer12 flex-col w-full">
+            <span class="word18">借款额度（万元）</span>
+            <span class="txt10">1.0-1,000.0</span>
+            <span class="word19">近七日年化&nbsp;3.85%-4.25%</span>
+          </div>
+        </div>
+      </div>
+    );
+  },
+});
+</script>
+<style lang="less" scoped>
+.group2 {
+  z-index: 11;
+  height: 197px;
+  border-radius: 20px;
+  background-color: rgba(255, 255, 255, 1);
+  box-shadow: inset 0px 1px 3px 0px rgba(255, 255, 255, 0.5);
+  width: 335px;
+  justify-content: flex-end;
+  padding-bottom: 24px;
+  align-items: center;
+  position: absolute;
+  left: 20px;
+  top: 222px;
+  .bd12 {
+    z-index: 12;
+    height: 40px;
+    border-radius: 20px;
+    background-color: rgba(62, 79, 175, 1);
+    box-shadow: 0px 2px 8px 0px rgba(62, 79, 175, 0.4);
+    width: 201px;
+    justify-content: center;
+    align-items: flex-start;
+    padding-left: 69px;
+    .txt9 {
+      z-index: 13;
+      width: 56px;
+      display: block;
+      overflow-wrap: break-word;
+      color: rgba(255, 255, 255, 1);
+      font-size: 14px;
+      font-family: PingFangSC-Semibold;
+      white-space: nowrap;
+      line-height: 20px;
+      text-align: center;
+    }
+  }
+  .bd13 {
+    z-index: 14;
+    height: 177px;
+    border-radius: 20px;
+    border-width: 1px;
+    border: 1px solid rgba(200, 183, 123, 1);
+    width: 316px;
+    justify-content: flex-start;
+    padding-top: 10px;
+    align-items: center;
+    position: absolute;
+    left: 10px;
+    top: 10px;
+    .layer12 {
+      z-index: auto;
+      height: 103px;
+      .word18 {
+        z-index: 17;
+        display: block;
+        overflow-wrap: break-word;
+        color: rgba(141, 146, 175, 1);
+        font-size: 14px;
+        font-family: PingFangSC-Medium;
+        white-space: nowrap;
+        line-height: 20px;
+        text-align: center;
+        align-self: flex-end;
+        margin: 0 auto;
+      }
+      .txt10 {
+        z-index: 15;
+        display: block;
+        overflow-wrap: break-word;
+        color: rgba(27, 31, 55, 1);
+        font-size: 40px;
+        font-family: DINAlternate-Bold;
+        white-space: nowrap;
+        line-height: 47px;
+        text-align: center;
+        margin-top: 19px;
+      }
+      .word19 {
+        z-index: 16;
+        display: block;
+        overflow-wrap: break-word;
+        color: rgba(141, 146, 175, 1);
+        font-size: 12px;
+        font-family: PingFangSC-Regular;
+        white-space: nowrap;
+        line-height: 17px;
+        text-align: center;
+        align-self: flex-start;
+        margin: 0 auto;
+      }
+    }
+  }
+}
+</style>
\ No newline at end of file

src/components/NavBar/index.vue

@@ -20,7 +20,14 @@
           name="icon-fanhui"
           class="absolute left-0"
           size="18"
-          color="#343640"
+          :color="iconColor"
+        />
+        <icon
+          v-if="showSecondIcon"
+          name="icon-kefu"
+          class="absolute left-11"
+          size="18"
+          :color="iconColor"
         />
         <div>{{ title }}</div>
       </div>
@@ -46,6 +53,14 @@ export default defineComponent({
       type: Boolean,
       default: true,
     },
+    iconColor: {
+      type: String,
+      default: "#343640",
+    },
+    showSecondIcon: {
+      type: Boolean,
+      default: false,
+    },
   },
 });
 </script>

src/router/index.ts

@@ -46,6 +46,11 @@ const routes: Array<RouteRecordRaw> = [
     name: 'LoanList',
     component: ()=>import("@/views/LoanList/index.vue")
   },
+  {
+    path: '/loanDetail',
+    name: 'LoanDetail',
+    component: ()=>import("@/views/LoanDetail/index.vue")
+  },
   // {
   //   path: '/fnsList',
   //   name: 'FnsList',