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

xuxueyang

2024-09-26 4b68b41822b8da02c9a9ceba3bc6e30d4445d324

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

 pages/home/home.vue

@@ -77,11 +77,22 @@


        <uni-popup ref="coupon_home" type="center" border-radius="10px 10px 0 0">

            <view class="coupon-container" style="width: 690rpx;">

                <view class="coupont-item all">

                    <!-- <view class="flex container img100"> -->

                    <!-- <view class="flex container img100"    :style="{ backgroundImage: `url(${dto_home_coupon.imageUrl})`, backgroundSize: 'cover', backgroundPosition: 'center', backgroundRepeat: 'no-repeat' }"> -->

                    <view class="flex container img100"    :style="{ backgroundImage: `url(${dto_home_coupon.imageUrl})`, backgroundSize: 'contain', backgroundPosition: 'center', backgroundRepeat: 'no-repeat' }">

                        <!-- <view class="flex container img100"    :style="{ backgroundImage: `url(${dto_home_coupon.imageUrl})`, backgroundSize: '100%', backgroundPosition: 'center', backgroundRepeat: 'no-repeat' }"> -->

                <view v-if="dto_home_coupon.imageUrl"  class="coupont-item all" style="display: flex; justify-content: center; align-items: center; height: 100vh;">

                    <view   @click="getCoupon(dto_home_coupon)"

                        :style="{ 
                            backgroundImage: `url(${dto_home_coupon.imageUrl})`, 
                            backgroundSize: 'contain', 
                            backgroundPosition: 'center', 
                            backgroundRepeat: 'no-repeat' ,

                            width: '600px',           // 设置宽度

                            height: '600px'           // 设置高度

                        }">

                    </view>

                </view>

				
                <view class="coupont-item all" v-else>

                    <view class="flex container img100">

						
                        <view class="info-price">

                            <view class="price1">

                                {{dto_home_coupon.maxDiscountAmount?(`${dto_home_coupon.maxDiscountAmount}折`):(`￥${dto_home_coupon.couponDiscountValue}`)}}


 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;

                // }