From 159c101ea0660a415c00d0e3549b90e9e067df1a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BA=9E=E4=B8=9C=E6=97=AD?= <850374051@qq.com>
Date: Fri, 25 Oct 2024 14:03:32 +0800
Subject: [PATCH] =?UTF-8?q?task=20=E9=93=B6=E5=86=9C=E6=89=8B=E6=9C=BA?=
 =?UTF-8?q?=E7=AB=AF=E5=B7=A5=E4=BD=9C=E5=8F=B0=E9=A1=B6=E9=83=A8=E8=B4=A6?=
 =?UTF-8?q?=E5=A5=97=E6=89=80=E5=B1=9E=E5=88=87=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/yinnong/workbench.vue | 74 ++++++++++++++++++---------------
 1 file changed, 40 insertions(+), 34 deletions(-)

diff --git a/src/views/yinnong/workbench.vue b/src/views/yinnong/workbench.vue
index c51f1399..754c13e5 100644
--- a/src/views/yinnong/workbench.vue
+++ b/src/views/yinnong/workbench.vue
@@ -1,40 +1,43 @@
 <template>
     <div class="app-container">
-      <van-sticky>
-      <van-nav-bar
-        title=""
-      >
-        <template #left>
-            <van-icon name="location" color="3A80FB" size="16"/>
+<!--      <van-sticky>-->
+<!--      <van-nav-bar-->
+<!--        title=""-->
+<!--      >-->
+<!--        <template #left>-->
+      <div style="width: 96%;margin: 0 auto;display: flex;flex-direction: column;align-items: start;">
+          <div style="margin-top:.8vh;display: flex;align-items: center;padding: .8vh 1.6vh;background-color: rgba(255,255,255,.5);border-radius: 100vh;">
+            <van-icon name="location" color="#3A80FB" size="16"/>
             <p  style="color: #878787;margin-left: 5px" @click="selectDept">{{deptName}}</p>
-          <van-popup v-model="villageVisbile" round position="bottom" get-container="#app">
-            <van-cascader
-              v-model="villageValue"
-              title="请选择所在村"
-              :options="hcAreaInfoOption"
-              @close="hcAreaInfoClose"
-              @finish="hcAreaInfoFinish"
-              active-color="#1989fa"
-              :field-names="hcAreaInfoFieldName"
-            />
-          </van-popup>
-        </template>
-        <template #right>
-<!--          <van-icon name="wap-nav" color="#000" size="18"/>-->
-          <p  style="color: #878787;margin-left: 5px" @click="bookVisbile = true">{{bookName}}</p>
-          <van-popup v-model="bookVisbile" round position="bottom" get-container="#app">
-            <van-picker
-              title="请选择账套"
-              show-toolbar
-              :columns="bookList"
-              @confirm="onConfirmBook"
-              @cancel="onCancelBook"
-              value-key="bookName"
-            />
-          </van-popup>
-        </template>
-      </van-nav-bar>
-      </van-sticky>
+            <van-popup v-model="villageVisbile" round position="bottom" get-container="#app">
+              <van-cascader
+                v-model="villageValue"
+                title="请选择所在村"
+                :options="hcAreaInfoOption"
+                @close="hcAreaInfoClose"
+                @finish="hcAreaInfoFinish"
+                active-color="#1989fa"
+                :field-names="hcAreaInfoFieldName"
+              />
+            </van-popup>
+          </div>
+          <div style="margin-top:.8vh;padding: .8vh 1.6vh;background-color: rgba(255,255,255,.5);border-radius: 100vh;">
+            <p  style="color: #878787;margin-left: 5px" @click="bookVisbile = true">{{bookName}}</p>
+            <van-popup v-model="bookVisbile" round position="bottom" get-container="#app">
+              <van-picker
+                title="请选择账套"
+                show-toolbar
+                :columns="bookList"
+                @confirm="onConfirmBook"
+                @cancel="onCancelBook"
+                value-key="bookName"
+              />
+            </van-popup>
+          </div>
+      </div>
+<!--        </template>-->
+<!--      </van-nav-bar>-->
+<!--      </van-sticky>-->
       <van-swipe class="my-swipe" :autoplay="3000" indicator-color="white" style="width: 96%;margin: 2%;height:150px;border-radius: 6px;">
         <van-swipe-item v-for="(image,index) in images" :key="index">
           <img :src="image" style="width:100%;height: 150px"/>
@@ -315,6 +318,9 @@
     align-items: center;
     justify-content: center;
   }
+  >>> .van-nav-bar__left{
+    flex-direction: column;
+  }
   >>> .icon.all img{
     width: 80px;
     /* padding: 0; */