Merge branch 'v2' of http://47.96.225.205:8888/r/hmy_farmer-main into remot...

xuxueyang

2024-09-11 e3c0ebbd9f9ee111f29be9f76979edd97f1d6f3a

Merge branch 'v2' of http://47.96.225.205:8888/r/hmy_farmer-main into remote-v2

 pages/order/order-detail.vue

@@ -14,6 +14,21 @@
                // #ifdef PUB_PARTNER
                type: 'partner',
                // #endif
                salesTypeDef:0,
                salesTypeList:[
                    {
                        label: '请选择售后类型',
                        value: '',
                    },
                    {
                        label: '换货',
                        value: 'barters',
                    },
                    {
                        label: '退货',
                        value: 'returns',
                    },
                ],
            };
        },
        onUnload() {
@@ -31,6 +46,7 @@
                    orderId: this.id,
                    // imageList: [],
                    videoList: [],
                    salesType:'',
                    reason: '',
                    // orderItems: [],
                    orderItemId: options.flowerId || '',
@@ -85,6 +101,9 @@
            }
        },
        methods: {
            salesTypeChange(e){
                this.submitForm.salesType = e.value
            },

            async getDetail() {
                this.$message.showLoading()
@@ -379,6 +398,10 @@
                    this.$message.showToast('售后数量需要大于0')
                    return
                }
                if (!this.submitForm.salesType) {
                    this.$message.showToast('未填写售后类型')
                    return
                }
                if (!this.submitForm.reason) {
                    this.$message.showToast('未填写理由')
                    return
@@ -647,6 +670,16 @@
                        class="form-input"></input>
                </view>
            </view>
			
            <view class="form-item">
                <view class="form-item-label require">
                    售后类型
                </view>
                <view class="form-item-value">
                    <um-dropdown @change="salesTypeChange" :defaultIndex="salesTypeDef" rangeKey="label" :optionList="salesTypeList" placeholder="售后类型"></um-dropdown>
                </view>
            </view>
			
            <view class="form-item">
                <view class="form-item-label require">
                    理由

 pages/order/order-sale/order-sale-detail.vue

@@ -155,6 +155,10 @@
                <view class="value">{{ dto.totalOrderAmount || '-' }}</view>
            </view> -->
            <view class="form-item">
                <view class="label">售后类型:</view>
                <view class="value">{{ dto.salesTypeStr || '-' }}</view>
            </view>
            <view class="form-item">
                <view class="label">理由:</view>
                <view class="value">{{ dto.reason || '-' }}</view>
            </view>

 pages/order/order-sale/order-sale.vue

@@ -90,6 +90,10 @@
                            <view class="value">{{item.createTime||'-'}}</view>
                        </view>
                        <view class="form-item">
                            <view class="label">售后类型</view>
                            <view class="value">{{item.salesTypeStr||'-'}}</view>
                        </view>
                        <view class="form-item">
                            <view class="label">理由</view>
                            <view class="value">{{item.reason||'-'}}</view>
                        </view>

 pages/user/address/address.vue

@@ -78,7 +78,7 @@
                            手机号
                        </view>
                        <view class="form-item-value">
                            <input v-model="submitForm.tel" placeholder="请输入收货人手机号" class="form-input"></input>
                            <input v-model="submitForm.tel" placeholder="请输入收货人手机号" class="form-input" @blur="validatePhoneNumber()" ></input>
                        </view>
                    </view>
                    <view class="form-item">
@@ -171,6 +171,16 @@
            };
        },
        methods: {
            validatePhoneNumber() {
					
                // 手机号码正则表达式，可以根据需要调整
                const phoneRegex = /^[1][3-9][0-9]{9}$/;
               if (!phoneRegex.test(this.submitForm['tel'])) {
                      this.$message.showToast('请填写正确手机号码')
                  }
			
            },
			
            addAddress() {
                delete this.submitForm.id
                this.submitForm['name'] = ''
@@ -393,6 +403,16 @@
                    this.$message.showToast('字段未填写完整')
                    return
                }
				
                // 手机号码正则表达式，可以根据需要调整
                 const phoneRegex = /^[1][3-9][0-9]{9}$/;
                if (!phoneRegex.test(this.submitForm['tel'])) {
                    this.$message.showToast('请填写正确手机号码')
                    return
                }
								
				
				
                this.$message.showLoading()
                const {
                    code

 sub_pages/customer/coupon/good-all.vue

@@ -158,7 +158,8 @@
                    },
                    {
                        name: '优惠券',
                        api: '/api/v2/coupon/app/activy/list',
                        // api: '/api/v2/coupon/app/activy/list',
                        api: '/api/v2/coupon/point/active/list',

                    },
                ],

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

@@ -8,10 +8,14 @@
            <view @click.stop="clickButton('delete')" class="button button-search-delete" style="margin-top: -1rpx;">

            </view>

        </view>

        <view class="top-buttons" v-if="type==='delete'">

            <view v-if="type === 'delete'"  class="button t-red " @click.stop="deleteSelected()">删除</view>

            <view v-if="type === 'delete'"  class="button " @click.stop="recoverSelected()">恢复</view>

		
        <view class="recycle-button"  v-if="type==='delete'">

        <view class="buttons" >

                <view v-if="type === 'delete'" class="button t-red"  @click.stop="deleteSelected()">删除</view>

                <view v-if="type === 'delete'" class="button"  @click.stop="recoverSelected()">恢复</view>

        </view>

        </view>

	
        <view class="p15" style="min-height: calc(100vh - 500rpx);">

            <no-data v-if="!list||list.length==0" style="width: 100%;"></no-data>

            

@@ -85,7 +89,7 @@
                        <view class="button" @click.stop="openValue(item,'stock')">库存</view>

                        <view class="button" @click.stop="toDetailAdd(item)">复制</view>



                        <view class="button t-red" @click.stop="buttonDelete(item)">删除</view>

                        <view v-if="type !== 'delete' && (item.status==='OFF' || item.status==='FORCE_OFF')  " class="button t-red" @click.stop="buttonDelete(item)">删除</view>



                    </view>

                </view>

@@ -575,5 +579,33 @@


            }

        }

		
        .recycle-button{

			
			
			
            min-height: 50rpx;

            background-color: #fff;

			
            .buttons {

                display: flex;

                justify-content: flex-end;

                background-color: #fff;

                padding: 22rpx 42rpx;

		
                .button {

                    margin: 0 auto;

                    width: 98rpx;

                    line-height: 48rpx;

                    border-radius: 24rpx;

                    border: 2rpx solid #CECECE;

                    text-align: center;

                    font-size: 24rpx;

                    color: #666666;

                    line-height: 34rpx;

                }

            }

        }

		
    }

</style>