Merge branch 'master' of http://gitea.bugtc.com/zhouyanli/property-manager-side

# Conflicts:
#	wuye-manager-uniapp/pages/index/index.vue

wuye-manager-uniapp/pageSubPack/inspection/inspection_main.vue

@@ -2,12 +2,12 @@
   <view class="page_padding">
     <view class="flex-1 flex-col flex inspection_main_box">
       <view class="info_box">
-        <view class="title_box flex flex-between">
+        <view class="title_box">
           <view class="title flex">
             <text class="line"></text>
             <text>{{ info.villageName }} - {{ info.taskName }}</text>
           </view>
-          <view class="inspection_status" style="flex: 100rpx"> <text>已巡检</text> </view>
+          <view class="inspection_status" style="width: 100rpx"> <text>已巡检</text> </view>
         </view>
         <view class="info">
           <view class="item">
@@ -67,7 +67,9 @@
             <view class="inspection_items">
               <view class="label">巡检结果：</view>
               <view class="desction_value">
-                <textarea class="my_textarea" disabled auto-height :value="ite.desition" />
+                <view class="my_textarea">
+                  {{ ite.desition }}
+                </view>
               </view>
             </view>
             <view class="inspection_items">
@@ -186,12 +188,16 @@ function handlePrivew(lists, index) {
     border-radius: 16rpx;
     background-color: #fff;
     .title_box {
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
       .title {
         font-weight: 550;
         font-size: 32rpx;
         color: #333333;
         min-height: 40rpx;
         line-height: 40rpx;
+
         .line {
           display: block;
           width: 6rpx;
@@ -271,6 +277,7 @@ function handlePrivew(lists, index) {
           overflow-y: auto; /* 超出滚动 */
 
           .my_textarea {
+            padding: 5rpx;
             min-height: 80rpx;
             font-weight: 400;
             font-size: 28rpx;
@@ -278,6 +285,7 @@ function handlePrivew(lists, index) {
             line-height: 36rpx;
             word-wrap: break-word; // 单词/中文自动换行
             word-break: break-all; // 长英文无空格强制截断换行
+            overflow: hidden;
           }
         }
       }

wuye-manager-uniapp/pageSubPack/inspection/toDays_inscpection.vue

@@ -314,6 +314,8 @@ onShow(() => {
         text-align: center;
         font-weight: 400;
         font-size: 28rpx;
+        border-radius: 25rpx;
+        background: #4d5dfa;
         color: #ffffff;
       }
     }

wuye-manager-uniapp/pageSubPack/ticket/hall.vue

@@ -80,7 +80,7 @@
               :key="index"
               :src="item"
               class="images"
-              @tap="handlePrivew(record.repairImageUrlList, index)"
+              @tap.stop="handlePrivew(record.repairImageUrlList, index)"
               mode="scaleToFill"
             ></image>
           </view>
@@ -159,12 +159,16 @@ function getlist() {
   isLoading.value = true
   getTicketHallList(queryParmas.value)
     .then(res => {
-      const list = res.rows.map(item => ({
+      const list = res.rows.map(item => {
+        const list = item.repairImageUrl ? item.repairImageUrl.split(',').filter(Boolean) : []
+        list.length = 3
+        const obj = {
           ...item,
-        repairImageUrlList: item.repairImageUrl
+          repairImageUrlList: list.filter(Boolean)
-          ? item.repairImageUrl.split(',').filter(Boolean)
+        }
-          : []
+        return obj
-      }))
+      })
+      console.log(list)
       if (queryParmas.value.pageNum === 1) {
         reportRecords.value = list
       } else {
@@ -385,7 +389,6 @@ function handlePrivew(items, index) {
   margin-bottom: 20rpx;
 }
 .card-title {
-  flex: 1;
   margin-right: 10rpx;
   font-size: 32rpx;
   color: #222222;

wuye-manager-uniapp/pageSubPack/ticket/myticket.vue

@@ -142,12 +142,16 @@ function getlist() {
   getUserTicketlist(queryParmas.value)
     .then(res => {
       total.value = res.total
-      const list = res.rows.map(item => ({
+
+      const list = res.rows.map(item => {
+        const list = item.repairImageUrl ? item.repairImageUrl.split(',').filter(Boolean) : []
+        list.length = 3
+        const obj = {
           ...item,
-        repairImageUrlList: item.repairImageUrl
+          repairImageUrlList: list.filter(Boolean)
-          ? item.repairImageUrl.split(',').filter(Boolean)
+        }
-          : []
+        return obj
-      }))
+      })
 
       if (queryParmas.value.pageNum === 1) {
         reportRecords.value = list

wuye-manager-uniapp/pages/index/index.vue

@@ -452,7 +452,7 @@ onLoad(() => {
     const hasShowGuide = uni.getStorageSync('hasShowGuide')
     uni.hideTabBar({ animation: false })
     uni.reLaunch({
-      url: hasShowGuide ? '/pageSubPack/loginSub/login?mode=pwd' : '/pages/guide/guide',
+      url: hasShowGuide ? '/pageSubPack/loginSub/pwd-login' : '/pages/guide/guide',
       animationType: 'none',
       animationDuration: 0
     })