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

wuye-manager-uniapp/components/filePicker/filePicker.vue

@@ -211,7 +211,9 @@ function preview(index) {
 .image-list {
   display: grid;
   grid-template-columns: repeat(3, 1fr);
-  gap: 20rpx;
+}
+.image-list > .image-item:not(:last-child) {
+  margin-right: 20rpx;
 }
 
 .image-item {

wuye-manager-uniapp/pageSubPack/complaint/Details_handle.vue

@@ -223,7 +223,10 @@ function handleSelecthouse() {
       .imgbox {
         display: grid;
         grid-template-columns: repeat(4, 1fr);
-        gap: 20rpx;
+        & > .img:not(:last-child) {
+          margin-right: 20rpx;
+        }
+
         .img {
           width: 132rpx;
           height: 132rpx;

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

@@ -358,7 +358,9 @@ function previewImages(images, currentIndex) {
       .showimagegrid {
         display: grid;
         grid-template-columns: repeat(3, 1fr);
-        gap: 20rpx;
+        & > .img:not(:last-child) {
+          margin-right: 20rpx;
+        }
         width: 100%;
         .img {
           width: 160rpx;

wuye-manager-uniapp/pageSubPack/instrument/addreplacement.vue

@@ -24,6 +24,7 @@
         </view>
       </uni-forms-item>
       <uni-forms-item label="房屋号">
+        <!-- #ifndef APP-IOS -->
         <uni-easyinput
           :inputBorder="false"
           @tap="handleClick"
@@ -36,6 +37,22 @@
             <uni-icons type="forward" color="#737373"></uni-icons>
           </template>
         </uni-easyinput>
+        <!-- #endif -->
+        <!-- #ifdef APP-IOS -->
+        <view @tap="handleClick" style="width: 100%">
+          <uni-easyinput
+            :inputBorder="false"
+            disabled
+            v-model="houseName"
+            placeholderStyle="color: #999999"
+            placeholder="请选择安装房屋"
+          >
+            <template #right>
+              <uni-icons type="forward" color="#737373"></uni-icons>
+            </template>
+          </uni-easyinput>
+        </view>
+        <!-- #endif -->
       </uni-forms-item>
     </uni-forms>
 

wuye-manager-uniapp/pageSubPack/report-record/report-record.vue

@@ -313,7 +313,7 @@ onReady(() => {
   color: #999;
   border: 2rpx solid #999;
   border-radius: 198rpx;
-  margin: 0 16rpx 0 0
+  margin: 0 16rpx 0 0;
 }
 
 .type-tab-item.active {
@@ -376,9 +376,11 @@ onReady(() => {
 /* 类型标签组 */
 .tag-group {
   display: flex;
-  gap: 15rpx;
   margin-bottom: 20rpx;
 }
+.tag-group > .tag-item:not(:last-child) {
+  margin-right: 15rpx;
+}
 
 .tag-item {
   padding: 6rpx 20rpx;

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

@@ -287,7 +287,9 @@ function handlePrivew(imgs) {
   /* background-color: #fff; */
   margin: 20rpx 0;
   justify-content: flex-start;
-  gap: 20rpx;
+}
+.type-tabs > .type-tab-item:not(:last-child) {
+  margin-right: 20rpx;
 }
 
 .type-tab-item {
@@ -387,9 +389,11 @@ function handlePrivew(imgs) {
 /* 类型标签组 */
 .tag-group {
   display: flex;
-  gap: 20rpx;
   margin-bottom: 20rpx;
 }
+.tag-group > .tag-item:not(:last-child) {
+  margin-right: 20rpx;
+}
 
 .tag-item {
   width: 112rpx;
@@ -417,11 +421,13 @@ function handlePrivew(imgs) {
 .card-image {
   display: grid;
   grid-template-columns: repeat(3, 1fr);
-  gap: 20rpx;
   min-width: 186rpx;
   min-height: 104rpx;
   margin-bottom: 20rpx;
 }
+.card-image > .images:not(:last-child) {
+  margin-right: 20rpx;
+}
 .images {
   width: 186rpx;
   height: 104rpx;

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

@@ -286,7 +286,9 @@ function handlePrivew(imgs) {
   /* background-color: #fff; */
   margin: 20rpx 0;
   justify-content: flex-start;
-  gap: 20rpx;
+}
+.type-tabs > .type-tab-item:not(:last-child) {
+  margin-right: 20rpx;
 }
 
 .type-tab-item {
@@ -384,10 +386,11 @@ function handlePrivew(imgs) {
 /* 类型标签组 */
 .tag-group {
   display: flex;
-  gap: 20rpx;
   margin-bottom: 20rpx;
 }
-
+.tag-group > .tag-item:not(:last-child) {
+  margin-right: 20rpx;
+}
 .tag-item {
   width: 112rpx;
   height: 42rpx;
@@ -414,14 +417,15 @@ function handlePrivew(imgs) {
 .card-image {
   display: grid;
   grid-template-columns: repeat(3, 1fr);
-  gap: 20rpx;
   min-width: 186rpx;
   min-height: 104rpx;
   margin-bottom: 20rpx;
 }
+
 .images {
   width: 186rpx;
   height: 104rpx;
+  margin-right: 20rpx;
 }
 
 /* 底部信息 */

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

@@ -103,9 +103,9 @@ function handleSelecthouse() {
     .imageboxs {
       display: grid;
       grid-template-columns: repeat(4, 1fr);
-      gap: 20rpx;
       .images {
         width: 160rpx;
+        margin-right: 20rpx;
         height: 160rpx;
         border-radius: 0rpx;
       }

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

@@ -81,12 +81,7 @@
         </view>
       </view>
 
-      <view
+      <view class="info" v-if="currentStep >= 2">
-        class="info"
-        v-if="
-          (currentStep >= 2 && prevPath === 'hall') || (currentStep >= 2 && prevPath === 'myticket')
-        "
-      >
         <view class="info_title">
           <text>维修信息</text>
         </view>
@@ -195,8 +190,12 @@ const repairImageUrl = ref([])
 
 onLoad(options => {
   queryParams.value.id = options.id
-  Showbtn.value = JSON.parse(options.showbtn)
+  if (options.showbtn) {
-  prevPath.value = options.path
+    Showbtn.value = JSON.parse(options.showbtn)
+  } else {
+    // 从通知那里 跳转过来 展示 维修完成
+    Showbtn.value = true
+  }
 })
 onShow(() => {
   getTicketById()

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

@@ -251,7 +251,9 @@ function handlePrivew(imgs) {
   /* background-color: #fff; */
   margin: 20rpx 0;
   justify-content: flex-start;
-  gap: 20rpx;
+}
+.type-tabs > .type-tab-item:not(:last-child) {
+  margin-right: 20rpx;
 }
 
 .type-tab-item {
@@ -348,9 +350,11 @@ function handlePrivew(imgs) {
 /* 类型标签组 */
 .tag-group {
   display: flex;
-  gap: 20rpx;
   margin-bottom: 20rpx;
 }
+.tag-group > .tag-item:not(:last-child) {
+  margin-right: 20rpx;
+}
 
 .tag-item {
   width: 112rpx;
@@ -378,7 +382,6 @@ function handlePrivew(imgs) {
 .card-image {
   display: grid;
   grid-template-columns: repeat(3, 1fr);
-  gap: 20rpx;
   min-width: 186rpx;
   min-height: 104rpx;
   margin-bottom: 20rpx;
@@ -386,6 +389,7 @@ function handlePrivew(imgs) {
 .images {
   width: 186rpx;
   height: 104rpx;
+  margin-right: 20rpx;
 }
 
 /* 底部信息 */

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

@@ -121,9 +121,10 @@ const onItemClick = item => {
 .user-info {
   display: flex;
   flex-direction: column;
-  gap: 8rpx;
 }
-
+.user-info > .user-name:not(:last-child) {
+  margin-right: 8rpx;
+}
 .user-name {
   font-size: 36rpx;
   font-weight: 600;