【优化】样式统一

pages/myTask-verification/components/CheckInfo.vue

@@ -130,7 +130,11 @@ export default {
             this.clockInInfo = res.data;
             // 添加这行，向父组件发送打卡信息
             this.$emit("update-clock-info", this.clockInInfo);
-            if (this.clockInInfo.dkdd && this.clockInInfo.pzxx.length) {
+            if (
+              this.clockInInfo.dkdd &&
+              this.clockInInfo.pzxx &&
+              this.clockInInfo.pzxx.length
+            ) {
               getImageInfo({
                 ids: res.data.pzxx,
               }).then((res) => {
@@ -560,7 +564,7 @@ export default {
 }
 
 .preview-section {
-  height: 400rpx;
+  height: 540rpx;
   margin-top: 30rpx;
   width: 100%;
   display: flex;

pages/myTask-verification/components/FinanceInfo.vue

@@ -64,14 +64,12 @@ export default {
     };
   },
   mounted() {
-    console.log("接收到的任务信息：", this.taskInfo);
     this.getFinanceInfo();
   },
   methods: {
     getFinanceInfo() {
       getFinanceInfoApi({
         kqId: this.taskInfo.kqId,
-        
       }).then((res) => {
         if (res.code === 0 && res.data && res.data.length > 0) {
           this.financeInfo = res.data;
@@ -91,6 +89,7 @@ export default {
     background-color: #fff;
     border-radius: 10rpx;
     padding: 20rpx;
+    box-shadow: 0 4rpx 10rpx rgba(0, 0, 0, 0.1);
 
     .info-row {
       display: flex;
@@ -110,7 +109,7 @@ export default {
       }
 
       .value {
-        color: #333;
+        color: #000;
         font-size: 28rpx;
       }
     }

pages/myTask-verification/components/StorageInfo.vue

@@ -46,7 +46,12 @@
       <view class="info-row">
         <text class="label">库区图:</text>
 
-        <image class="storage-image" :src="kqxx.resid" mode="aspectFit" />
+        <image
+          @click="handleImageClick(kqxx.resid)"
+          class="storage-image"
+          :src="kqxx.resid"
+          mode="aspectFit"
+        />
       </view>
     </view>
     <!-- margin预留空间不生效, 添加空的view元素 -->
@@ -73,16 +78,22 @@ export default {
   },
   async mounted() {
     this.qyxzList = await getDictOptions(DICT_TYPE.SYSTEM_QYXZ);
-   
-    this.getStorageInfo();
-
 
+    this.getStorageInfo();
   },
 
   methods: {
     filterXZ(value) {
       return this.qyxzList.find((item) => item.value == value)?.label;
     },
+
+    // 图片预览
+    handleImageClick(url) {
+      uni.previewImage({
+        urls: [url],
+      });
+    },
+
     getStorageInfo() {
       getKqxxByKqId({
         kqId: this.taskInfo.kqId,
@@ -114,6 +125,7 @@ export default {
     background-color: #fff;
     border-radius: 10rpx;
     padding: 20rpx;
+    box-shadow: 0 4rpx 10rpx rgba(0, 0, 0, 0.1);
 
     .info-row {
       display: flex;
@@ -128,7 +140,7 @@ export default {
       }
 
       .value {
-        color: #333;
+        color: #000;
         font-size: 28rpx;
       }
     }

pages/myTask-verification/components/WarehouseInfo.vue

@@ -268,6 +268,8 @@ export default {
       padding: 20rpx;
       margin-bottom: 20rpx;
       display: flex;
+      // 阴影
+      box-shadow: 0 4rpx 10rpx rgba(0, 0, 0, 0.1);
 
       .warehouse-icon {
         width: 50rpx;
@@ -300,6 +302,8 @@ export default {
           justify-content: space-between;
           margin-bottom: 10rpx;
           flex-wrap: wrap;
+          font-size: 30rpx;
+
           .warehouse-name-container {
             display: flex;
             align-items: center;
@@ -307,13 +311,13 @@ export default {
 
           .label {
             color: #666;
-            font-size: 28rpx;
+            font-size: 30rpx;
             margin-right: 10rpx;
           }
 
           .value {
             color: #333;
-            font-size: 28rpx;
+            font-size: 30rpx;
             margin-right: 30rpx;
           }
 

pages/myTask-verification/myTaskLayout.vue

@@ -126,6 +126,10 @@ export default {
     if (options.taskInfo) {
       try {
         this.taskInfo = JSON.parse(decodeURIComponent(options.taskInfo));
+
+        uni.setNavigationBarTitle({
+          title: this.taskInfo.kqmc || "我的任务",
+        });
         // console.log("接收到的任务信息：", this.taskInfo);
       } catch (error) {
         console.error("解析任务信息失败：", error);
@@ -202,7 +206,7 @@ export default {
     },
     // 判断是否为小程序
     isMiniProgram() {
-      console.log(uni.getSystemInfoSync().platform);
+      // console.log(uni.getSystemInfoSync().platform);
 
       return uni.getLaunchOptionsSync().query.miniProgram;
     },
@@ -292,7 +296,8 @@ export default {
   height: 88rpx;
   background-color: #cfddfc;
 
-  border-bottom: 1rpx solid #eee;
+  // border-bottom: 1rpx solid #eee;
+  background-color: #cfddfc;
 }
 
 .tab-item {
@@ -300,13 +305,16 @@ export default {
   display: flex;
   align-items: center;
   justify-content: center;
-  font-size: 28rpx;
+  padding: 20rpx 0;
+  font-size: 35rpx;
   color: #333;
   position: relative;
+  font-weight: 400;
 
   &.active {
-    color: #2979ff;
-    font-weight: bold;
+    color: #000;
+    position: relative;
+    font-weight: 500;
 
     &::after {
       content: "";
@@ -314,9 +322,9 @@ export default {
       bottom: 0;
       left: 50%;
       transform: translateX(-50%);
-      width: 40rpx;
-      height: 4rpx;
-      background-color: #2979ff;
+      width: 150rpx;
+      height: 10rpx;
+      background-color: #4185fa;
     }
   }
 }

pages/taskList-verification/components/myTaskList.vue

@@ -1,9 +1,9 @@
 <template>
   <view class="my-task-container">
     <!-- 任务列表 -->
-    <scroll-view 
-      scroll-y 
-      @scrolltolower="loadMore" 
+    <scroll-view
+      scroll-y
+      @scrolltolower="loadMore"
       class="task-list"
       refresher-enabled
       :refresher-triggered="isRefreshing"
@@ -33,6 +33,7 @@
               <text class="warehouse-address">库区地址: {{ item.jtdz }}</text>
             </view>
           </view>
+          <view class="divider"></view>
           <view class="task-status">
             <text>通过数量: {{ item.hytgNum || "0" }}</text>
             <text>不通过数量: {{ item.hybtgNum || "0" }}</text>
@@ -101,8 +102,6 @@ export default {
     },
 
     async getTaskList() {
-      console.log("那你倒是触发啊");
-
       if (this.loading || !this.hasMore) return;
       try {
         this.loading = true;
@@ -156,7 +155,7 @@ export default {
       // 将对象转为 URL 参数
       const params = encodeURIComponent(
         JSON.stringify({
-          // name: item.name,
+          kqmc: item.kqmc,
           // address: item.address,
           // roomCount: item.roomCount,
           // status: item.status,
@@ -235,10 +234,12 @@ export default {
 }
 
 .task-item {
-  background-color: #fff;
+  // background-color: #;
+  background: linear-gradient(#fff 0%, #fff 80%, #f4f6fb 100%);
   border-radius: 12rpx;
   padding: 30rpx;
   margin-bottom: 20rpx;
+  box-shadow: 0 10rpx 10rpx rgba(0, 0, 0, 0.1);
 }
 
 .warehouse-info {
@@ -249,7 +250,7 @@ export default {
 
     text {
       margin-left: 16rpx;
-      font-size: 28rpx;
+      font-size: 35rpx;
     }
   }
 }
@@ -352,4 +353,11 @@ export default {
     }
   }
 }
+
+.divider {
+  height: 1rpx; /* 分割线的高度 */
+  background-color: rgba(117, 117, 117, 0.1); /* 分割线的颜色 */
+  margin: 10rpx 0; /* 分割线的上下间距 */
+  width: 100%; /* 分割线的宽度 */
+}
 </style>

pages/taskList-verification/components/taskList.vue

@@ -6,7 +6,7 @@
         {{ isAllSelected ? "取消全选" : "全选" }}
       </button>
       <button class="filter-btn" type="primary" @click="confirmSelection">
-        确认选择
+        确认领取
       </button>
       <!-- <button class="filter-btn" type="primary" @click="showAreaPicker">
         筛选
@@ -86,6 +86,7 @@
               <text class="warehouse-address">库区地址: {{ item.jtdz }}</text>
             </view>
           </view>
+          <view class="divider"></view>
           <view class="task-status">
             <text>核验仓房数量: {{ item.hyNum || "-" }}</text>
             <text>核验状态: {{ statusflutter(item.hyState) }}</text>
@@ -432,20 +433,22 @@ export default {
 }
 
 .task-item {
-  background-color: #fff;
+  background: linear-gradient(#fff 0%, #fff 80%, #f4f6fb 100%);
   border-radius: 12rpx;
-  padding: 20rpx;
+  padding: 30rpx;
   margin-bottom: 20rpx;
+  box-shadow: 0 10rpx 10rpx rgba(0, 0, 0, 0.1);
 }
 
 .warehouse-info {
   .info-row {
     display: flex;
     align-items: center;
-    margin-bottom: 10rpx;
+    margin-bottom: 20rpx;
 
     text {
       margin-left: 10rpx;
+      font-size: 35rpx;
     }
   }
 }
@@ -567,4 +570,11 @@ export default {
     }
   }
 }
+
+.divider {
+  height: 1rpx; /* 分割线的高度 */
+  background-color: rgba(117, 117, 117, 0.1); /* 分割线的颜色 */
+  margin: 10rpx 0; /* 分割线的上下间距 */
+  width: 100%; /* 分割线的宽度 */
+}
 </style>

pages/taskList-verification/taskListLayout.vue

@@ -10,6 +10,7 @@
         :class="{ active: currentTab === 0 }"
         @click="switchTab(0)"
       >
+      <text class="iconfont icon-mrenwuliebiao" :style="{ color: currentTab === 0 ? '#1d5fdf' : '748498' }"></text>
         <text>任务列表</text>
       </view>
       <view
@@ -17,6 +18,7 @@
         :class="{ active: currentTab === 1 }"
         @click="switchTab(1)"
       >
+      <text class="iconfont icon-woderenwu" :style="{ color: currentTab === 1 ? '#1d5fdf' : '748498' }"></text>
         <text>我的任务</text>
       </view>
       <view
@@ -24,6 +26,7 @@
         :class="{ active: currentTab === 2 }"
         @click="switchTab(2)"
       >
+      <text class="iconfont icon-xitongshezhi" :style="{ color: currentTab === 2 ? '#1d5fdf' : '748498' }"></text>
         <text>系统设置</text>
       </view>
     </view>
@@ -54,8 +57,6 @@ export default {
   onShow() {
     if (this.currentTab === 1) {
       this.$nextTick(() => {
-        console.log(this.$refs.myTaskList, "看看");
-
         this.$refs.myTaskList.initTaskList();
       });
       // this.$refs.myTaskList && this.$refs.myTaskList.onShow();

pages/warehouse-detail-verification/warehouseDetail.vue

@@ -45,11 +45,20 @@
                 v-for="(item, index) in warhouseList"
                 :key="index"
               >
-                <view class="info-item">
-                  <text class="label">仓房名称:</text>
+                <view class="info-item info-item-name">
+                  <image
+                    src="../../static/icons/warehouse-ico.png"
+                    mode="widthFix"
+                  ></image>
+                  <text class="label">
+                    <!-- <text class="iconfont icon-cangfangmingcheng"></text> -->
+                    <!-- <image src="/static/icons/warehouse-ico.png" alt="" /> -->
+
+                    仓房名称:</text
+                  >
                   <text class="value">{{ item.cfmc }}</text>
                 </view>
-                <view class="info-row">
+                <view class="info-row info-item-row">
                   <view class="info-item">
                     <text class="label">仓房类型:</text>
                     <text class="value">{{ filterLX(item.cflx) || "-" }}</text>
@@ -59,7 +68,7 @@
                     <text class="value">{{ filterZT(item.cazt) || "-" }}</text>
                   </view>
                 </view>
-                <view class="info-row">
+                <view class="info-row info-item-row">
                   <view class="info-item">
                     <text class="label">设计仓容:</text>
                     <text class="value">{{ item.sjcr + "吨" }}</text>
@@ -71,11 +80,13 @@
                     }}</text>
                   </view>
                 </view>
-                <view class="info-row">
+                <view class="info-row info-item-row">
                   <view class="info-item">
                     <text class="label">租仓参考价:</text>
                     <text class="value">{{ item.zcckj || "-" }} 元/月</text>
                   </view>
+                </view>
+                <view class="info-row info-item-row">
                   <view class="info-item">
                     <text class="label">委托保管参考价:</text>
                     <text class="value">{{ item.wbgcj || "-" }} 元/吨/月</text>
@@ -135,6 +146,7 @@
               <view class="info-row-cang">
                 <text class="label">附件</text>
                 <image
+                  @click="previewImage(kqxx.resid)"
                   class="storage-image"
                   :src="kqxx.resid"
                   mode="aspectFit"
@@ -174,20 +186,34 @@ export default {
     const eventChannel = this.getOpenerEventChannel();
     eventChannel.on("acceptData", (data) => {
       const taskInfo = JSON.parse(data.taskInfo);
+
+      console.log(taskInfo, "taskInfo??");
+
+      uni.setNavigationBarTitle({
+        title: taskInfo.kqmc || "库区信息",
+      });
+
       this.taskInfo = taskInfo;
+      uni.showLoading({
+        title: "加载中...",
+      });
       getCaxxByKqId({
         kqId: taskInfo.kqId,
         listType: 1,
-      }).then((res) => {
-        if (res.code === 0) {
-          this.warhouseList = res.data;
-        } else {
-          uni.showToast({
-            title: res.msg || "获取任务列表失败",
-            icon: "none",
-          });
-        }
-      });
+      })
+        .then((res) => {
+          if (res.code === 0) {
+            this.warhouseList = res.data;
+          } else {
+            uni.showToast({
+              title: res.msg || "获取任务列表失败",
+              icon: "none",
+            });
+          }
+        })
+        .finally(() => {
+          uni.hideLoading();
+        });
 
       getKqxxByKqId({
         kqId: taskInfo.kqId,
@@ -197,7 +223,7 @@ export default {
       });
     });
   },
-  async mounted() { 
+  async mounted() {
     // dictData("system_qyxz").then((res) => {
     //   this.qyxzList = res.data;
     // });
@@ -216,21 +242,44 @@ export default {
       return this.ztlxList.find((item) => item.value == value)?.label;
     },
 
+    previewImage(url) {
+      if (!url) {
+        uni.showToast({
+          title: "暂无附件",
+          icon: "none",
+        });
+        return;
+      }
+
+      uni.previewImage({
+        urls: [url],
+      });
+    },
+
     search() {
+      // 加载
+      uni.showLoading({
+        title: "加载中...",
+      });
+
       getCaxxByKqId({
         cfmc: this.searchValue,
         listType: 1,
         kqId: this.taskInfo.kqId,
-      }).then((res) => {
-        if (res.code === 0) {
-          this.warhouseList = res.data;
-        } else {
-          uni.showToast({
-            title: res.msg || "获取任务列表失败",
-            icon: "none",
-          });
-        }
-      });
+      })
+        .then((res) => {
+          if (res.code === 0) {
+            this.warhouseList = res.data;
+          } else {
+            uni.showToast({
+              title: res.msg || "获取任务列表失败",
+              icon: "none",
+            });
+          }
+        })
+        .finally(() => {
+          uni.hideLoading();
+        });
     },
     switchTab(index) {
       this.currentTab = index;
@@ -304,12 +353,14 @@ export default {
     flex: 1;
     text-align: center;
     padding: 20rpx 0;
-    font-size: 28rpx;
+    font-size: 35rpx;
     color: #333;
+    font-weight: 400;
 
     &.active {
-      color: #2979ff;
+      color: #000;
       position: relative;
+      font-weight: 500;
 
       &::after {
         content: "";
@@ -317,9 +368,9 @@ export default {
         bottom: 0;
         left: 50%;
         transform: translateX(-50%);
-        width: 120rpx;
-        height: 4rpx;
-        background-color: #2979ff;
+        width: 190rpx;
+        height: 10rpx;
+        background-color: #4185fa;
       }
     }
   }
@@ -377,6 +428,7 @@ export default {
   padding: 20rpx;
   border-radius: 8rpx;
   margin-bottom: 20rpx;
+  box-shadow: 0 4rpx 10rpx rgba(0, 0, 0, 0.1);
 }
 
 .info-row {
@@ -387,16 +439,51 @@ export default {
 
 .info-item {
   flex: 1;
+  display: flex;
+  align-items: center;
+  // 文字不换行
+  // white-space: nowrap;
+  // overflow: hidden;
+  // text-overflow: ellipsis;
+
+  image {
+    width: 50rpx;
+    height: 50rpx;
+    margin-right: 10rpx;
+  }
 
   .label {
+    white-space: nowrap;
     color: #666;
-    font-size: 26rpx;
+    font-size: 30rpx;
     margin-right: 10rpx;
   }
 
   .value {
-    color: #333;
-    font-size: 26rpx;
+    color: #666;
+    font-size: 30rpx;
+  }
+}
+
+.info-item-row {
+  display: flex;
+  align-items: start;
+  .info-item {
+    display: flex;
+    align-items: start;
+    padding-right: 10rpx;
+    box-sizing: border-box;
+  }
+}
+
+.info-item-name {
+  color: #000 !important;
+  font-weight: 500 !important;
+  .label {
+    color: #000 !important;
+  }
+  .value {
+    color: #000 !important;
   }
 }
 
@@ -423,7 +510,7 @@ export default {
     }
 
     .value {
-      color: #333;
+      color: #000;
       font-size: 28rpx;
     }
 

static/iconfont.css

@@ -1,8 +1,8 @@
 @font-face {
   font-family: "iconfont"; /* Project id 4818032 */
-  src: url('iconfont.woff2?t=1739771470876') format('woff2'),
-       url('iconfont.woff?t=1739771470876') format('woff'),
-       url('iconfont.ttf?t=1739771470876') format('truetype');
+  src: url('iconfont.woff2?t=1740447040797') format('woff2'),
+       url('iconfont.woff?t=1740447040797') format('woff'),
+       url('iconfont.ttf?t=1740447040797') format('truetype');
 }
 
 .iconfont {
@@ -13,6 +13,18 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-woderenwu:before {
+  content: "\e649";
+}
+
+.icon-mrenwuliebiao:before {
+  content: "\e690";
+}
+
+.icon-xitongshezhi:before {
+  content: "\e601";
+}
+
 .icon-huoweika:before {
   content: "\e754";
 }