Merge branch 'release' into dev

src/views/mobile/pages/audit_activity/sales_point_inspection/examine/inspectionTask/index.vue

@@ -6,9 +6,17 @@
       @click-left="router.back()">
     </van-nav-bar>
     <div class="content">
-      <p class="title">稽查任务:</p>
+      <!-- <p class="title">稽查任务:</p> -->
       <!-- 终端名称 -->
       <div class="terminal-wrap">
+        <div class="terminal-name">
+          <span>终端名称：</span>
+          <van-field v-model="form.storeName"
+            placeholder="请输入终端名"
+            @change="handleStoreNameChange"
+            class="store-name-input" />
+        </div>
+        <div class="img-info">
           <div>
             <van-image fit="scale-down"
               width="2.25rem"
@@ -17,17 +25,14 @@
               @click="previewStoreImage"></van-image>
           </div>
           <div class="terminal-info">
-          <div class="terminal-name">
-            <span>终端名称：</span>
-            <van-field v-model="form.storeName"
-              placeholder="请输入终端名"
-              @change="handleStoreNameChange" />
-          </div>
+
             <p>终端编码：P0500052306</p>
             <p>经销商：秦皇岛红朗森商贸有限公司</p>
             <p>地址：河北省秦皇岛市海港区北环路街道秦皇岛冻结附录</p>
           </div>
         </div>
+
+      </div>
       <!-- 地址 -->
       <div class="location-wrap">
         <van-icon name="location-o"
@@ -473,13 +478,8 @@ const deleteLongTimePictureArr = async (file, { name, index }) => {
         border-radius: 10px;
         box-shadow: 0 0 10px rgba(0, 0, 0, 0.1);
         display: flex;
-        gap: 20px;
-
-        .terminal-info {
-          flex: 1;
-          display: flex;
         flex-direction: column;
-          justify-content: space-between;
+        gap: 20px;
 
         .terminal-name {
           color: black;
@@ -490,21 +490,41 @@ const deleteLongTimePictureArr = async (file, { name, index }) => {
 
           span {
             display: inline-block;
-              width: 120px;
+            width: 100px;
           }
 
           .van-cell {
             padding: 0;
           }
+
+          .store-name-input {
+            ::v-deep(input) {
+              border-bottom: 1px solid gray;
+            }
+          }
         }
 
+        .img-info {
+          display: flex;
+          gap: 20px;
+
+          .terminal-info {
+            flex: 1;
+            display: flex;
+            flex-direction: column;
+            justify-content: flex-start;
+
             p {
               font-size: 14px;
-            margin: 0;
+              margin: 5px;
               color: #a1a1a1;
+
+              &:first-child {
+                margin-top: 0;
+              }
+            }
           }
         }
-
 
       }
 

src/views/mobile/pages/audit_activity/sales_point_inspection/examine/taskList.vue

@@ -50,29 +50,21 @@
       position="right"
       class="wrap">
       <van-nav-bar title="筛选条件" />
-      <van-field type="text"
-        label="任务名称"
-        label-align="left"
-        label-width="1.5rem"
-        placeholder="请输入">
+      <van-field type="text">
         <template #input>
           <van-search v-model="query.storeName"
-            placeholder="请输入勤策终端编码/名称"
+            placeholder="输入搜索的勤策终端编码/名称"
             @update:model-value="search"
             class="search-bar" />
         </template>
       </van-field>
       <!-- 日期区间 -->
-      <van-field type="text"
-        label="任务日期"
-        label-align="left"
-        label-width="1.5rem"
-        placeholder="请输入">
+      <van-field type="text">
         <template #input>
           <el-date-picker v-model="query.operDate"
             type="date"
             value-format="YYYY-MM-DD"
-            placeholder="选择日期"
+            placeholder="输入搜索的日期"
             @change="getInspectionTaskListFn" />
         </template>
       </van-field>
@@ -266,6 +258,7 @@ const deleteFn = async (item, index) => {
         align-items: center;
 
         .search-bar {
+          width: 100%;
           padding: 0;
         }