Merge remote-tracking branch 'origin/master'

k94314517

2024-12-06 3ac695aaee5aab01d8cb39a56388c2740913dbec

 h5/pages/staff/meetingSubOrder.vue

@@ -40,7 +40,7 @@
               <text>会议内容</text>

            </view>

            <view class="line">

               <u-textarea border="none" v-model="param.content" count :maxlength="300" placeholder="请输入会议内容"

               <u-textarea border="none" autoHeight v-model="param.content" count :maxlength="300" placeholder="请输入会议内容"

                  placeholder-class="placeholder9" class="label" />

            </view>

         </view>

@@ -88,7 +88,7 @@
               <text>备注</text>

            </view>

            <view class="line">

               <textarea v-model="param.remark" :maxlength="-1" placeholder="请输入" placeholder-class="placeholder9"

               <u-textarea  border="none" autoHeight v-model="param.remark" :maxlength="-1" placeholder="请输入" placeholder-class="placeholder9"

                  class="label" />

            </view>

         </view>

@@ -306,13 +306,12 @@


         .line {

            display: flex;



            .label {

               flex: 1;

               display: flex;

               flex-wrap: wrap;

               align-items: center;



				
               .service_item {

                  height: 64rpx;

                  line-height: 64rpx;

@@ -330,8 +329,6 @@
            }

         }

      }



      padding-bottom: 100rpx;

   }



   .empty {

@@ -351,7 +348,7 @@
      border-radius: 36rpx;

      font-size: 30rpx;

      color: #ffffff;

      margin-top: 20rpx;

      margin-top: 40rpx;

   }



   .star {