fix: 修改冲突

CHANGELOG.md

@@ -2,6 +2,15 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [1.0.0-B.6](https://git.1000my.com/project-shenyangk11/sy_k11_H_base_daoshi_vue_ts/compare/v1.0.0-B.5...v1.0.0-B.6) (2023-05-12)
+
+
+### Bug Fixes
+
+* 🧩 搜索新增敬请期待 ([daf5296](https://git.1000my.com/project-shenyangk11/sy_k11_H_base_daoshi_vue_ts/commit/daf5296bdea35807ce7bad7e6f6ef098fa600078))
+* 修改冲突 ([77421f9](https://git.1000my.com/project-shenyangk11/sy_k11_H_base_daoshi_vue_ts/commit/77421f927a95ebabb7467c08ab0a38b707157ae1))
+* 修改页面问题 ([710d582](https://git.1000my.com/project-shenyangk11/sy_k11_H_base_daoshi_vue_ts/commit/710d582dd75264c722ad47c486a394c888a1de91))
+
 ## [1.0.0-B.5](https://git.1000my.com/project-shenyangk11/sy_k11_H_base_daoshi_vue_ts/compare/v1.0.0-B.4...v1.0.0-B.5) (2023-05-12)
 
 

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "vue_cli_ts",
-  "version": "1.0.0-B.5",
+  "version": "1.0.0-B.6",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "vue_cli_ts",
-      "version": "1.0.0-B.5",
+      "version": "1.0.0-B.6",
       "dependencies": {
         "@better-scroll/core": "^2.5.0",
         "@better-scroll/observe-image": "^2.5.0",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue_cli_ts",
-  "version": "1.0.0-B.5",
+  "version": "1.0.0-B.6",
   "private": true,
   "scripts": {
     "serve": "vue-cli-service serve",

src/components/PlateInput/PlateInput.vue

@@ -4,7 +4,10 @@
       <div
         v-for="(item, index) of renderInputLength"
         :key="item"
-        :class="{ active: index === list.length && list.length <= 7, space: searchMethod === '车位' }"
+        :class="{
+          active: (index === list.length && list.length < 7) || (isEnergy && list.length === 7 && index === PLATE_LENGTH - 1),
+          space: searchMethod === '车位'
+        }"
         class="input"
         @click="handleEnergy"
       >

src/components/Search/Hot.vue

@@ -1,7 +1,7 @@
 <template>
-  <div v-if="list.length" class="hot-container">
+  <div class="hot-container">
     <div class="title">{{ $t('hot') }}</div>
-    <ScrollView class="myScoll" :list="list" :pull-up="false">
+    <ScrollView v-if="list.length" class="myScoll" :list="list" :pull-up="false">
       <div class="shop_list">
         <div v-for="item in list" :key="item.shopCode" class="shop_item" @click="show(item)">
           <div class="top">
@@ -17,6 +17,9 @@
         </div>
       </div>
     </ScrollView>
+    <div v-else>
+      <img src="@/assets/images/empty.png" alt="" />
+    </div>
   </div>
 </template>
 

src/components/Search/Result.vue

@@ -16,7 +16,7 @@
         </div>
       </div>
     </ScrollView>
-    <img v-else class="empty" src="@/assets/images/nodata.svg" alt="" />
+    <img v-else class="empty" src="@/assets/images/empty.png" alt="" />
   </div>
 </template>
 
@@ -110,8 +110,9 @@ function show(item: Shop) {
       }
     }
   }
+
   .empty {
-    margin-left: 45px;
+    margin-left: -65px;
   }
 }
 </style>

src/composables/useHandleScreen.ts

@@ -68,11 +68,11 @@ export const useHandleScreen = (callback: () => void) => {
         await sleepToIndex()
         callback()
       }
-      await sleepToWallpaper()
-      if (window.android) {
-        window.android.goScreenSave() //进入屏保
+      if (totalTime.value[1] !== -1) {
+        await sleepToWallpaper()
+        callback()
       }
-      callback()
+      window?.android?.goScreenSave() //进入屏保
     }, DELAY_CHECK_TIME)
   }