Merge remote-tracking branch 'origin/master'

renkang

2025-01-03 ccf28d1fed1aa2e5437dbe64b5133ba1cbde6ec7

 h5/pages/workOrder/edit.vue

@@ -51,7 +51,7 @@
                  <u-icon class="close" size="20" name="close-circle-fill" color="red"

                     @click="fileDel('fileList', i)"></u-icon>

                  <image v-if="item.type == 0" :src="item.fileurlFull" mode="widthFix"></image>

                  <video v-if="item.type == 1" :src="item.fileurlFull" :controls="false"></video>

                  <video v-if="item.type == 1" :show-center-play-btn="false" :src="item.fileurlFull" :controls="false"></video>

               </view>

            </view>

         </view>

@@ -116,7 +116,7 @@
            showCate2: false,

            areaType: [

               [{

                     name: '室内装修',

                     name: '室内维修',

                     id: 0

                  },

                  {

@@ -432,6 +432,9 @@
               right: -20rpx;

               top: -20rpx;

               z-index: 9999;

               background-color: #fff;
               border-radius: 50%;
               overflow: hidden;

            }



            image {