Merge remote-tracking branch 'remote-v2/master-2.0' into master-2.0

xuxueyang

2024-09-26 4b68b41822b8da02c9a9ceba3bc6e30d4445d324

 sub_pages/supplier/flower-manage/flower-add.vue

@@ -122,19 +122,19 @@
         <view class="form-item ">

            <view class="label required">库存</view>

            <view class="m-l-a m-r-0 flex">

               <!-- <input v-model="dto.stock" placeholder="请输入数字" type="number" class="text-right m-t-15"></input> -->
					
               <u-input v-model="dto.stock" placeholder="请输入数字" type="number"  class="text-right m-t-15" />
						
               <!-- <input v-model="dto.stock" placeholder="请输入数字" type="number" class="text-right m-t-15"></input> -->



               <u-input v-model="dto.stock" placeholder="请输入数字" type="number"  class="text-right m-t-15" />



            </view>

         </view>

         <view class="form-item ">

         <!-- <view class="form-item ">

            <view class="label">限购数量</view>

            <view class="m-l-a m-r-0 flex">

               <input v-model="dto.limited" placeholder="请输入数字" type="number"

                  style="margin-top: 16px;text-align: right;"></input>

            </view>

         </view>

         </view> -->



         <view class="line-gray-big"></view>



@@ -674,13 +674,12 @@
               this.$message.showToast('商品库存格式错误，需要大于0')

               return

            }





            if (this.dto.limited && this.dto.limited !== '' && (!Number(this.dto.limited) || Number(this.dto

                  .limited) <= 0)) {

               this.$message.showToast('商品限购数量格式错误');

               return;

            }

				
			
            // if ( this.dto.limited && this.dto.limited !== '' && (!Number(this.dto.limited) || Number(this.dto.limited) <= 0)) {

            //     this.$message.showToast('商品限购数量格式错误');

            //     return;

            // }