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

fcad4bc4 · Zhang Xiaojie · 6c80e250 · 6af286cd · fcad4bc4 · fcad4bc4
Commit fcad4bc4 authored Oct 21, 2021 by Zhang Xiaojie
Showing with 33 additions and 22 deletions

index.html public/index.html +1 -1

index.vue src/components/HotNews/index.vue +19 -18

branch.vue src/components/Mine/Branch/branch.vue +1 -0

index.vue src/components/NavBar/index.vue +12 -3

No files found.
--- a/public/index.html
+++ b/public/index.html
@@ -4,7 +4,7 @@
 <head>
  <meta charset="utf-8">
  <meta http-equiv="X-UA-Compatible" content="IE=edge">
-  <meta name="viewport" content="width=device-width,initial-scale=1.0">
+  <meta name="viewport" content="width=device-width,initial-scale=1.0, user-scalable=no, maximum-scale=1.0">
  <!-- <meta name="viewport" content="width=device-width; initial-scale=1; maximum-scale=1; minimum-scale=1; user-scalable=no;"> -->

  <link rel="icon" href="<%= BASE_URL %>favicon.ico">

--- a/src/components/HotNews/index.vue
+++ b/src/components/HotNews/index.vue
@@ -9,15 +9,11 @@
          <span class="word24">{{ $format(info?.created_at, 'YYYY-MM-DD') }}</span>
        </div>
      </div>
-      <div class="box2 flex-col ml-4 flex-shrink-0">
-        <img
-          class="pic3"
-          referrerpolicy="no-referrer"
-          :src="url"
-        />
+      <div class="box2 ml-4 flex-shrink-0">
+        <img class="w-full h-full" :src="url" alt="">
      </div>
    </div>
-    <div class="wrap23 flex-col"></div>
+    <!-- <div class="wrap23 flex-col"></div> -->
  </div>
 </template>
 <script lang="ts">
@@ -32,7 +28,6 @@ export default defineComponent({
  setup(props) {
    const url = ref('')
    url.value = getImageSrcFromFileHash((props.info as {file_name: string})?.file_name)
-    
    return {
      url
    }
@@ -47,12 +42,12 @@ export default defineComponent({
 }

 .box1 {
-  z-index: auto;
+  /* z-index: auto; */
  height: 88px;
 }

 .info8 {
-  z-index: 205;
+  /* z-index: 205; */
  display: block;
  overflow-wrap: break-word;
  color: rgba(27, 31, 55, 1);
@@ -67,7 +62,7 @@ export default defineComponent({
 }

 .info10 {
-  z-index: 205;
+  /* z-index: 205; */
  display: block;
  overflow-wrap: break-word;
  color: rgba(141, 146, 175, 1);
@@ -83,14 +78,14 @@ export default defineComponent({
 }

 .layer4 {
-  z-index: auto;
+  /* z-index: auto; */
  height: 25px;
  margin-top: 13px;
  justify-content: space-between;
 }

 .info9 {
-  z-index: 206;
+  /* z-index: 206; */
  height: 25px;
  display: block;
  overflow-wrap: break-word;
@@ -104,7 +99,7 @@ export default defineComponent({
 }

 .word24 {
-  z-index: 207;
+  /* z-index: 207; */
  height: 25px;
  display: block;
  overflow-wrap: break-word;
@@ -118,19 +113,25 @@ export default defineComponent({
 }

 .box2 {
-  z-index: 209;
-  position: relative;
+  /* z-index: 209; */
+  /* position: relative; */
+  width: 80px;
  height: 80px;
  border-radius: 20px;
  overflow: hidden;
-  background: url(https://lanhu.oss-cn-beijing.aliyuncs.com/SketchPngd7b6ced5c00064ccb38620d2a9de003cbd2e2688ac377f17fc74f6fba4dadd11) -1px
-    0px no-repeat;
+  /* background: url(https://lanhu.oss-cn-beijing.aliyuncs.com/SketchPngd7b6ced5c00064ccb38620d2a9de003cbd2e2688ac377f17fc74f6fba4dadd11) -1px
+    0px no-repeat; */
+  background: #f00;
  margin-top: 3px;
 }

 .pic3 {
  width: 80px;
  height: 80px;
+  /* position: absolute;
+  z-index: 210;
+  top: 0;
+  left: 0; */
 }

 .wrap23 {

--- a/src/components/Mine/Branch/branch.vue
+++ b/src/components/Mine/Branch/branch.vue
@@ -226,6 +226,7 @@ const hidden = (v: boolean) => {


 const handleClickNagigate = () => {
+  console.log(`${props.longitude},${props.latitude}`, 'show lola');
  new jsBridge().bridge_navigate(`${props.longitude},${props.latitude}`, () => {
    show.value = false;
  })

--- a/src/components/NavBar/index.vue
+++ b/src/components/NavBar/index.vue
@@ -40,7 +40,16 @@
      v-if="occupyPosition"
    ></div>
  </div>
-  <div v-else>
+  <div v-else class="navbar w-full">
+    <div
+      class="h-full theBar flex items-end px-5 justify-center relative"
+      style="background:rgb(237,237,237); "
+      v-bind="$attrs"
+      :style="{
+        'height': heightOfNotch + 'px',
+      }"
+      v-if="isBangs"
+    ></div>
    <div :style="{
      'height': heightOfNotch + 'px'
    }" v-if="isBangs"></div>
@@ -89,7 +98,7 @@ export default defineComponent({
      default: false
    }
  },
-  mounted(){
+  mounted() {
    console.log(document.documentElement.clientWidth, window.screen.width, 'show width');
    console.log(window.devicePixelRatio, 'show window.devicePixelRatio');
  },
@@ -99,7 +108,7 @@ export default defineComponent({
    },
    heightOfNotch() { // 刘海屏的刘海高度 单位px
      return notchHeight.value / window.devicePixelRatio;
-      // return 103;
+      return 103;
    }
  }
 });