1

xuxueyang

2024-07-31 7e247648201b208cfb5a5901803f784b7dbda948

1

 App.vue

@@ -402,7 +402,9 @@
    .m-t-15 {

        margin-top: 30rpx;

    }



    .p-t-12{
        padding-top: 30rpx;
    }

    .m-t-icon {

        margin-top: 8rpx;

    }


 common/global.scss

@@ -227,8 +227,8 @@


                .curnums {

                    line-height: 60rpx;
                    margin-left: 12rpx;
                    margin-right: 12rpx;

                    padding-left: 20rpx;
                    padding-right: 20rpx;

                }

            }

        }


 pages/home/components/home-category.vue

@@ -32,8 +32,11 @@
  },
  methods: {
    toList(item){
                // uni.navigateTo({
                //   url:'/sub_pages/customer/trade/list?categoryId='+item.id
                // })
      uni.navigateTo({
        url:'/sub_pages/customer/trade/list?categoryId='+item.id
                    url: '/sub_pages/customer/trade/trade?categoryId=' + item.id
      })
    }
  },

 pages/home/supplier-home.vue

@@ -14,7 +14,8 @@
            </view>
            <view class="flex user-info" v-if="currentInfo&&(currentInfo.id)">
                <!-- 头像 -->
                <image class="user-icon" v-if="!currentInfo.picture" src='https://youzhen123.oss-cn-huhehaote.aliyuncs.com/WechatOwnerProperty/images/mrtx.png'
                <image class="user-icon" v-if="!currentInfo.picture"
                    src='https://youzhen123.oss-cn-huhehaote.aliyuncs.com/WechatOwnerProperty/images/mrtx.png'
                    mode="aspectFit"></image>
                <image class="user-icon" v-if="currentInfo.picture" :src="currentInfo.picture" mode="aspectFit"></image>

@@ -163,12 +164,12 @@
                    </view>
                    <view class="order-desc syst">售后理赔</view>
                </view>
            <!--     <view class="nav row margin-tb" @click="goto('/sub_pages/supplier/order-records/order-records',true)">
                <!-- <view class="nav row margin-tb" @click="printDeliveryOrder">
                    <view class="img-c">
                        <image class="icon margin-bottom order-icon kkjl"
                            src="/static/images/supplier/user/user-icon-kkjl.png" mode="scaleToFill" />
                    </view>
                    <view class="order-desc wbsp">扣款记录</view>
                    <view class="order-desc wbsp">测试蓝牙</view>
                </view> -->
            </view>
        </view>
@@ -216,7 +217,7 @@
        },
        created() {
            //公告
            this.$http.request('get', '/api/announcement/page', {
            this.$http.request('get', '/api/pub/announcement/list', {
                params: {
                    size: 5,
                    status: 'A'
@@ -258,6 +259,134 @@

        },
        methods: {
            printDeliveryOrder(item) {
                //蓝牙打印
                var that = this;
                wx.getBluetoothAdapterState({
                    success: (result) => {
                        console.log('b s', result)
                        console.log("蓝牙状态：\n" + result.errMsg)
                        if (result.adapterState.available) {
                            if (result.adapterState.discovering) {
                                that.blueSearchDeviceCheck()
                            } else {
                                that.blueSearchDevice()
                            }
                        } else {
                            //打开蓝牙
                            wx.openBluetoothAdapter({
                                success: function(res) {
                                    console.log("蓝牙已打开")
                                    that.blueSearchDevice()

                                },
                                fail: function(res) {
                                    console.log('res', res)
                                    that.$message.showToast('蓝牙未打开')
                                }
                            })

                        }
                    },
                    fail: (res) => {
                        console.log("蓝牙状态",res)
                        that.$message.showToast('获取蓝牙状态失败')

                    }
                })
            },
            blueSearchDevice() {
                var that = this;

                wx.startBluetoothDevicesDiscovery({
                    success: (res) => {
                        //打印调试日志
                        console.log("搜索设备返回" + JSON.stringify(res))
                        that.blueSearchDeviceCheck()

                    },
                    fail: (res) => {
                        console.log('error search', res)
                        that.$message.showToast('打开蓝牙搜索设备失败')

                    }
                })

            },
            blueSearchDeviceCheck() {
                let that = this
                wx.getBluetoothDevices({
                    success: (res) => {
                        var printDevice = undefined
                        for (var device of res.devices) {
                            if (device.name.indexOf('GP-M') >= 0) {
                                printDevice = device
                                // RSSI: -57
                                // advertisServiceUUIDs: Array(2)
                                // 0: "000018f0-0000-1000-8000-00805f9b34fb"
                                // 1: "e7810a71-73ae-499d-8c15-faa9aef0c3f2"
                                // length: 2
                                // nv_length: (...)
                                // __proto__: Array(0)
                                // deviceId: "89:E2:AF:33:46:2B"
                                // name: "GP-M322-5565_BLE"
                                break
                            } else {

                            }
                        }
                        if (!printDevice) {
                            that.$message.showToast('未找到可用打印机，请联系客服')
                            that.stopBluetoothDevicesDiscovery()

                        } else {
                            wx.createBLEConnection({
                                deviceId: printDevice.deviceId,
                                success: function(res) {
                                    // https: //blog.csdn.net/weixin_51375107/article/details/116009436
                                    console.log('连接设备返回:' + res.errMsg);
                                    that.$message.showToast('连接设备返回:' + res.errMsg)
                                    // escpos怎么来 →点击查看智谱清言的回答https://chatglm.cn/share/FEXaC

                                },
                                fail: function(res) {
                                    console.log('createBLEConnection fail',res)
                                    that.$message.showToast('连接打印机失败')
                                },
                                complete() {
                                    that.stopBluetoothDevicesDiscovery()

                                }
                            })
                        }
                        // res.devices.forEach((device, i) => {
                        //     console.log('device',
                        //         device)
                        //     // if (device.deviceId == that.data
                        //     //     .deviceId) {
                        //     //     console.log("物联网设备已找到")
                        //     //     that.$message.showToast(
                        //     //         '打印设备已找到')
                        //     //     return;
                        //     // }
                        // })
                    },
                    fail: (res) => {
                        console.log('getBluetoothDevices',
                            res)
                        that.$message.showToast('获取蓝牙设备失败')

                    }
                })
            },
            stopBluetoothDevicesDiscovery() {
                var that = this;
                wx.stopBluetoothDevicesDiscovery({
                    success: (res) => {
                        console.log("停止扫描设备")
                    },
                })
            },
            getTj() {
                // /api/supplier/delivery    
                

 pages/order/order-delivery-detail.vue

@@ -78,6 +78,9 @@
                    uni.navigateBack()
                }
            },
            printDeliveryOrder(item) {
                this.$message.showToast('敬请期待')
            }

        }
    }
@@ -125,7 +128,6 @@
                        </view>

                    </view>

                    <view class="line"></view>
                    <view class="delivery-form">
                        <view class="form-item">
@@ -138,6 +140,12 @@
                        </view>

                    </view>
                    <view class="line"></view>
                    <view class="buttons">
                        <view class="button button-1 m-r-0" @click="printDeliveryOrder(item)">打印</view>
                    </view>



                </view>
            </view>
@@ -192,6 +200,7 @@
            border-radius: 4rpx;
            border: 2rpx dashed #CECECE;
        }

        .order-sale-list {
            .order-sale-item {
                background-color: #fff;
@@ -270,12 +279,14 @@
                        color: #CF0000;
                    }
                }

                .form{
                    .form-item{
                        height: unset;
                        // min-height: ;
                    }
                }

                .delivery-form {
                    display: flex;
                    flex-wrap: wrap;

 pages/order/order-delivery.vue

@@ -69,6 +69,7 @@

                    <view class="line"></view>
                    <view class="buttons">

                        <view class="button button-1 m-r-10" v-if="item.status==='PENDING'"
                            @click="toDetail(item,'PENDING')">确认入位</view>
                        <view class="button button-0" @click="toDetail(item,'')">查看详情</view>
@@ -101,6 +102,8 @@
                this.query.status = options.status || ''
            }
            this.listApi = '/api/supplier/delivery/list/today'
            this.listApi = '/api/supplier/delivery/list'
			
            this.getList()

        },
@@ -130,7 +133,8 @@
                uni.navigateTo({
                    url: `/pages/order/order-delivery-detail?id=${item.id}&status=${status}`
                })
            }
            },
			
        }
    }
</script>

 pages/order/order-detail.vue

@@ -326,9 +326,9 @@
                {{ item.supplierName }}
            </view>
            <view class="flex m-t-12">
                <radio :checked="submitForm.orderItems.indexOf(item.id)>=0" @click="changeSalesOrderItem(item)"></radio>
                <radio v-if="showSales" :checked="submitForm.orderItems.indexOf(item.id)>=0" @click="changeSalesOrderItem(item)"></radio>

                <image class="flower-img img100 m-r-6" :src="item.flowerCover" @click="previewImg(item.flowerCover)">
                <image class="flower-img img100 br-4 m-r-6" :src="item.flowerCover" @click="previewImg(item.flowerCover)">
                </image>
                <view class="flex1">
                    <view class=" flex">

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

@@ -74,7 +74,7 @@
                {{ item.supplierName }}
            </view>
            <view class="flex m-t-12 flex-wrap-normal">
                <image class="flower-img img100 m-r-6" :src="item.flowerCover" @click="previewImg(item.flowerCover)">
                <image class="flower-img img100 br-4 m-r-6" :src="item.flowerCover" @click="previewImg(item.flowerCover)">
                </image>
                <view class="flex1">
                    <view class=" flex">

 pages/order/order.vue

@@ -211,68 +211,116 @@
            </view>
        </view>
        <no-data v-if="!list||list.length===0" style="width: 100%;" class="m-t-12"></no-data>
        <view v-for="(item,index) in list" :key="index" class="m-t-12">
        <view v-for="(dto,index) in list" :key="index" class="m-t-12">
            <view class="order-item list-item">
                <view class="title flex">
                    <view>
                        订单：{{ item.orderNo }}
                        订单：{{ dto.orderNo }}
                    </view>
                    <view class="status t-red m-l-a m-r-0">￥{{ item.paymentAmount || item.totalAmount || '0'}}</view>
                    <view class="status t-red m-l-a m-r-0">￥{{ dto.paymentAmount || dto.totalAmount || '0'}}</view>
                </view>
                <view class="desc flex" v-if="!query.status">
                    <view class="label">
                        订单状态:
                    </view>
                    <view class="value">{{ item.statusBackendStr }}</view>
                    <view class="value">{{ dto.statusBackendStr }}</view>
                </view>
                <view class="desc flex">
                    <view class="label">
                        收货人:
                    </view>
                    <view class="value">{{ item.customer }}</view>
                    <view class="value">{{ dto.customer }}</view>
                </view>
                <view class="desc flex">
                    <view class="label">
                        收货人手机号码:
                    </view>
                    <view class="value">{{ item.customerTel }}</view>
                    <view class="value">{{ dto.customerTel }}</view>
                </view>
                <view class="desc flex">
                    <view class="label">
                        收货地址:
                    </view>
                    <view class="value">{{ item.customerAddress }}</view>
                    <view class="value">{{ dto.customerAddress }}</view>
                </view>
                <view class="desc flex" v-if="item.statusBackend!=='PENDING'">
                <view class="desc flex" v-if="dto.statusBackend!=='PENDING'">
                    <view class="label">
                        支付时间:
                    </view>
                    <view class="value">{{ item.paymentTime }}</view>
                    <view class="value">{{ dto.paymentTime }}</view>
                </view>
                <view class="flower-info m-b-5 m-t-12 br-4" v-for="(item,index) of dto.items" :key="index">
                    <view class="line-gray"></view>
					
                    <view class="supplier-name ">
                        <image class="icon-dp br-4" src="/static/common/icon-dp.png"></image>
                        {{ item.supplierName }}
                    </view>
                    <view class="flex m-t-12 flex-wrap-normal">
                        <image class="flower-img img100 m-r-6" :src="item.flowerCover" @click="previewImg(item.flowerCover)">
                        </image>
                        <view class="flex1">
                            <view class=" flex">
                                <view class="title"><span class="level">{{ item.flowerCategory }}</span><span
                                        class="level">{{ item.flowerLevelStr }}</span>{{ item.flowerName }}
                                </view>
                            </view>
                            <view class="each-list">
                                <view class="each-item">
                                    <view class="label">颜色</view>
                                    <view class="value">{{ item.flowerColor || '-' }}</view>
				
                                </view>
                                <view class="each-item">
                                    <view class="label">规格</view>
                                    <view class="value">{{ item.flowerUnit || '-' }}</view>
                                </view>
				
                                <view class="each-item">
                                    <view class="label">数量</view>
                                    <view class="value">{{ item.num || 0 }}</view>
				
                                </view>
                                <view class="each-item">
                                    <view class="label">售价</view>
                                    <view class="value">￥{{ item.price || 0 }}</view>
				
                                </view>
                                <view class="each-item">
                                    <view class="label">商品总金额</view>
                                    <view class="value">￥{{ item.total || 0 }}</view>
				
                                </view>
                            </view>
                        </view>
                    </view>
				
                </view>
                <view class="line-gray"></view>
                <view class="flex buttons">
                    <view class="button button-0 m-l-a m-r-15" v-if="item.statusBackend==='PENDING'"
                        @click="buttonClick(item,'cancelOrder')">取消订单</view>
                    <view class="button button-1 m-l-15 m-r-15" v-if="item.statusBackend==='PENDING'"
                        @click="buttonClick(item,'payAgain')">重新支付</view>

                    <view class="button button-0 m-l-a m-r-15" @click="buttonClick('refund')" v-if="item.couldRefund">
                <view class="flex buttons">
                    <view class="button button-0 m-l-a m-r-15" v-if="dto.statusBackend==='PENDING'"
                        @click="buttonClick(dto,'cancelOrder')">取消订单</view>
                    <view class="button button-1 m-l-15 m-r-15" v-if="dto.statusBackend==='PENDING'"
                        @click="buttonClick(dto,'payAgain')">重新支付</view>

                    <view class="button button-0 m-l-a m-r-15" @click="buttonClick(dto,'refund')" v-if="dto.couldRefund">
                        申请退款
                    </view>
                    <view class="button button-0 m-l-a m-r-15" @click="buttonClick('confirm')"
                        v-if="item.statusBackend ==='RECEIVE'"> 确认收货
                    <view class="button button-0 m-l-a m-r-15" @click="buttonClick(dto,'confirm')"
                        v-if="dto.statusBackend ==='RECEIVE'"> 确认收货
                    </view>

                    <view class="button button-1 m-l-a m-r-15" @click="toDetailSale(item)"
                        v-if=" item.statusBackend === 'EVALUATE'||item.statusBackend=='COMPLETED'"> 申请售后
                    <view class="button button-1 m-l-a m-r-15" @click="toDetailSale(dto)"
                        v-if="dto.statusBackend === 'EVALUATE'||item.statusBackend=='COMPLETED'"> 申请售后
                    </view>
                    <view class="button button-0 m-l-a m-r-15" @click="buttonClick(item,'evaluate')"
                        v-if=" item.statusBackend === 'EVALUATE'"> 评价
                    <view class="button button-0 m-l-a m-r-15" @click="buttonClick(dto,'evaluate')"
                        v-if="dto.statusBackend === 'EVALUATE'"> 评价
                    </view>



                    <view class="button button-1 m-l-15 m-r-0" @click="toDetail(item)">查看详情</view>
                    <view class="button button-1 m-l-a m-r-0" @click="toDetail(dto)">查看详情</view>
                </view>
            </view>

@@ -333,6 +381,7 @@
                    background: #20613D;
                    text-align: center;
                    border-radius: 30rpx;
                    min-width: 80rpx;

                }

@@ -348,6 +397,85 @@
                    border: 2rpx solid #20613D;
                }
            }
            .flower-info {
                padding: 0rpx;
			
                background: #FFFFFF;
                border-radius: 8rpx;
			
                .supplier-name {
                    border-bottom: 2rpx solid #EEEEEE;
                    font-weight: 600;
                    font-size: 28rpx;
                    color: #000000;
                    padding-bottom: 10rpx;
                    line-height: 40rpx;
			
                    .icon-dp {
                        width: 27rpx;
                        height: 27rpx;
                        display: inline-block;
                        vertical-align: middle;
                    }
                }
			
                .title {
                    font-weight: 600;
                    font-size: 28rpx;
                    color: #000000;
                    line-height: 40rpx;
			
                    .level {
                        font-weight: 400;
                        font-size: 28rpx;
                        color: #20613D;
                        line-height: 40rpx;
                        margin-right: 20rpx;
                    }
                }
			
                .flower-img {
                    width: 128rpx;
                    height: 118rpx;
                    min-width: 128rpx;
                    min-height: 118rpx;
                }
			
                .each-list {
                    display: flex;
                    flex-wrap: wrap;
                    margin-top: 6rpx;
			
                    .each-item {
                        min-width: 40%;
                        max-width: 50%;
                        text-align: center;
                        margin-left: 0rpx;
                        margin-right: auto;
                        display: flex;
			
                        .label {
                            font-weight: 400;
                            font-size: 24rpx;
                            color: #666666;
                            text-align: left;
                            padding-right: 10rpx;
                        }
			
                        .label::after {
                            content: ": "
                        }
			
                        .value {
                            font-weight: 400;
                            font-size: 24rpx;
                            color: #666666;
                        }
                    }
                }
			
            }
			

        }


 pages/user/address/address.vue

@@ -129,7 +129,9 @@
    // import qqmapwx from '@/plugins/qqmap-wx-jssdk.min.js';
    // const lockey = 'VUHBZ-2AMLP-B7AD7-VUQZ7-D4TW5-MFFVN'; //使用在腾讯位置服务申请的key
    // const chooseLocation = requirePlugin('chooseLocation');

    import {
        mapState
    } from 'vuex'
    export default {
        async onPullDownRefresh() {
            this.page.current = 0
@@ -186,7 +188,14 @@
                    this.submitForm.province = ''
                    this.submitForm.city = ''
                    this.submitForm.region = ''
                    if (e.detail.value.length <= 3) {
                    if (e.detail.value.length == 2) {
                        if (!!e.detail.value[0])
                            this.submitForm.province = e.detail.value[0].value
                        if (!!e.detail.value[0])
                            this.submitForm.city = e.detail.value[0].value
                        if (!!e.detail.value[1])
                            this.submitForm.region = e.detail.value[1].value
                    } else if (e.detail.value.length <= 3) {
                        if (!!e.detail.value[0])
                            this.submitForm.province = e.detail.value[0].value
                        if (!!e.detail.value[1])
@@ -209,9 +218,13 @@
                }
            },
            async init_area() {
                if (this.regionDataPlus && this.regionDataPlus.length > 0) {
                const res = await this.$http.request('get', '/api/pub/china/area/json')
                this.regionDataPlus = res.data && JSON.parse(res.data.replaceAll('code', 'value').replaceAll('name',
                    this.regionDataPlus = res.data && JSON.parse(res.data.replaceAll('code', 'value').replaceAll(
                        'name',
                    'text')) || []
                }

            },
            chooseLocation() {
                //前往接口挑选位置
@@ -347,8 +360,10 @@
                    this.$message.hideLoading()
                } else {
                    this.submitForm = {
                        name: this.currentInfo && this.currentInfo.nickName || '',
                        tel: this.currentInfo && this.currentInfo.tel || '',
                        // name: this.currentInfo && this.currentInfo.nickName || '',
                        // tel: this.currentInfo && this.currentInfo.tel || '',
                        name: '',
                        tel: '',
                        address: '',
                        isDefault: false,
                        province: '',

 store/index.js

@@ -414,8 +414,57 @@
            })
            if (res.content && res.confirm) {
                var t = res.content
                if (!isNaN(parseInt(t)) && t > 0) {
                if (!isNaN(parseInt(t)) && t >= 0) {
                    if ((t) === 0) {
                    message.showLoading()
                        const resp = await http.request('get', '/api/customer/flower/cart/delete', {
                            params: {
                                id: data.id,
                            }
                        })
                        message.hideLoading()
                        if (resp && resp.code === 0) {
                            message.showToast('操作成功')
                            dispatch('sign_add', 'shopping')
                            return {
                                code: 0,
                                data: 0
                            }
                        }
                    } else {
                        if (parseInt(t) <= 0) {

                        } else {
                            //提示没有库存
                            if (!data.stock) {
                                message.showToast('没有库存了，更新失败')

                                return {
                                    code: 1,
                                    data: parseInt(t)
                                }
                            } else {
                                if (data.stock == 0) {
                                    message.showToast('库存为0，更新失败')

                                    return {
                                        code: 1,
                                        data: parseInt(t)
                                    }
                                } else if (data.stock > 0 && data.stock < (
                                        parseInt(t))) {
                                    message.showToast('超过库存，更新失败')

                                    return {
                                        code: 1,
                                        data: parseInt(t)
                                    }
                                }
                            }
                            // console.log('data',)
                        }
                        message.showLoading()

                    const resp = await http.request('post', '/api/customer/flower/cart/change-num', {
                        data: {
                            id: data.id,
@@ -427,19 +476,26 @@
                    if (resp && resp.code === 0) {
                        message.showToast('添加购物车成功')
                        dispatch('sign_add', 'shopping')
                        return resp
                    } else {

                            return {
                                code: 0,
                                data: parseInt(t)
                    }
                    return resp
                        }
                    }

                    // return {
                    //     code: 1,
                    //     data: 0
                    // }
                } else {
                    console.log('res.content', res.content)
                    message.showToast('输入数目需要大于0')
                }
            }

            return {
                code: 1,
                data: {}
                data: 0
            }
        },
        countShopping: async function({

 sub_pages/customer/customer-info/customer-info.vue

@@ -65,8 +65,7 @@
        </view>
      </view>

      <view class="flex p20" style="padding-top: 0rpx;padding-bottom: 10rpx"
            v-if="dto.cover">
            <view class="flex p20" style="padding-top: 0rpx;padding-bottom: 10rpx" v-if="dto.cover">
        <view class="m-t-12 m-r-10">
          <image class="banner-img" :src="dto.cover" @click.stop="previewImg(dto.cover)">

@@ -155,7 +154,14 @@
        this.dto.province = ''
        this.dto.city = ''
        this.dto.region = ''
        if (e.detail.value.length <= 3) {
                    if (e.detail.value.length == 2) {
                        if (!!e.detail.value[0])
                            this.dto.province = e.detail.value[0].value
                        if (!!e.detail.value[0])
                            this.dto.city = e.detail.value[0].value
                        if (!!e.detail.value[1])
                            this.dto.region = e.detail.value[1].value
                    } else if (e.detail.value.length <= 3) {
          if (!!e.detail.value[0])
            this.dto.province = e.detail.value[0].value
          if (!!e.detail.value[1])

 sub_pages/customer/self/collect.vue

@@ -69,8 +69,15 @@
            async submitShopping(dto) {
                //提交到购物车中
                // this.$message.showLoading()
                await this.$store.dispatch('submitShopping', dto);
                // this.$message.hideLoading()
                const {
                    code,
                    data
                } = await this.$store.dispatch('submitShopping', dto);
                if (code == 0) {
                    dto.shopnum = data || 0
                    this.$forceUpdate()
                }
            },
            select_level(e) {
                this.level_show = false
@@ -85,6 +92,67 @@
                this.query.column = e.value[0].value
                this.refreshList()

            },
            async updateItemNum(item) {
                const res = await this.$message.confirm('', {
                    editable: true,
                    title: '请输入想要购买的数量'
                })
                if (res.content && res.confirm) {
                    // 发送请求
                    var t = parseInt(res.content)
                    if (isNaN(t) || t < 0) {
                        this.$message.showToast('数目需要大于等于0')

                    } else {
                        if (!item.stock || t > item.stock) {
                            this.$message.showToast('库存不足无法修改')
                            return
                        }
                        this.addnum(item, (t - item.shopnum))

                    }
                } else {

                }
            },
            async addnum(item, addnum) {
                if (!this.currentInfo.id) {
                    await this.$message.confirm('请前往登录')
                    uni.navigateTo({
                        url: '/pages/user/supplier-user'
                    })
                    return
                }
                if (!item.shopnum) {
                    item.shopnum = 0
                }
                if (!item.stock) {
                    item.stock = 0
                }
                if (item.shopnum + addnum > item.stock) {
                    this.$message.showToast('库存不足，无法修改')
                    return
                }
                if (item.shopnum + addnum >= 0) {

                } else {
                    return
                }
                this.$message.showLoading()
                const {
                    code
                } = await this.$http.request('post', '/api/customer/flower/cart/change-num', {
                    data: {
                        id: item.id,
                        num: addnum
                    }
                })
                this.$message.hideLoading()
                if (code === 0) {
                    item.shopnum += addnum
                    this.$forceUpdate()
                }
            },
        }
    }
@@ -123,11 +191,10 @@
            @cancel="order_show=false"></u-picker>

        <view class="trade-list-container">
            <view class="trade-info-container flex" v-for="(dto,index) of list" :key="index"
                @click.stop="toDetail(dto)">
                <image class="img img100 br-4 m-r-10" :src="dto.url||dto.cover"></image>
            <view class="trade-info-container flex" v-for="(dto,index) of list" :key="index">
                <image class="img img100 br-4 m-r-10" :src="dto.url||dto.cover" @click.stop="toDetail(dto)"></image>
                <view class="flex1">
                    <view class="flex">
                    <view class="flex" @click.stop="toDetail(dto)">
                        <view class="title">
                            <span class="m-r-5" style="display: inline-block;"
                                v-if="dto.categoryStr">{{dto.categoryStr||''}}</span>
@@ -140,13 +207,23 @@
                        </view>
                    </view>
                    <view class="flex">
                        <view class="desc m-t-12 flex">
                        <view class="desc p-t-12 flex" @click.stop="toDetail(dto)">
                            <view class="m-r-15">剩余:{{ dto.stock || 0 }}</view>
                            <view class="m-r-15">颜色:{{ dto.color || '-' }}</view>
                        </view>
                        <view class="button-icons flex m-l-a m-r-0 m-t-20" v-if="dto.status=='UP'">
                            <view class="m-r-0 gwc" @click.stop="submitShopping(dto)">
                            <view class="m-r-0 gwc" @click.stop="submitShopping(dto)" v-if="!dto.shopnum">
                                + 购物车
                            </view>
                            <view class="m-r-0 flex" v-if="dto.shopnum">
                                <uni-icons v-if="dto.shopnum&&dto.shopnum>=1" type="minus" size="32"
                                    @click.stop="addnum(dto,-1)"></uni-icons>
                                <view class="curnums" @click.stop="updateItemNum(dto)"
                                    v-if="dto.shopnum&&dto.shopnum>=1">
                                    {{ dto.shopnum }}
                                </view>
                                <uni-icons v-if="!dto.shopnum||dto.shopnum<=99" type="plus-filled" size="32"
                                    @click.stop="addnum(dto,1)"></uni-icons>
                            </view>
                        </view>
                    </view>
@@ -237,8 +314,8 @@
                line-height: 40rpx;

                .curnums {
                    margin-left: 10rpx;
                    margin-right: 10rpx;
                    padding-left: 20rpx;
                    padding-right: 20rpx;
                }
            }


 sub_pages/customer/self/history.vue

@@ -69,7 +69,12 @@
            async submitShopping(dto) {
                //提交到购物车中
                // this.$message.showLoading()
                await this.$store.dispatch('submitShopping', dto);
                const res = await this.$store.dispatch('submitShopping', dto);
                console.log('res',res)
                if (res&&res.code == 0){
                    dto.shopnum = res.data || 0
                    this.$forceUpdate()
                }
                // this.$message.hideLoading()
            },
            select_level(e) {
@@ -85,6 +90,67 @@
                this.query.column = e.value[0].value
                this.refreshList()

            },
            async updateItemNum(item) {
                const res = await this.$message.confirm('', {
                    editable: true,
                    title: '请输入想要购买的数量'
                })
                if (res.content && res.confirm) {
                    // 发送请求
                    var t = parseInt(res.content)
                    if (isNaN(t) || t < 0) {
                        this.$message.showToast('数目需要大于等于0')
						
                    } else {
                        if(!item.stock || t>item.stock){
                            this.$message.showToast('库存不足无法修改')
                            return
                        }
                        this.addnum(item, (t - item.shopnum))
						
                    }
                } else {

                }
            },
            async addnum(item, addnum) {
                if (!this.currentInfo.id) {
                    await this.$message.confirm('请前往登录')
                    uni.navigateTo({
                        url: '/pages/user/supplier-user'
                    })
                    return
                }
                if (!item.shopnum) {
                    item.shopnum = 0
                }
                if (!item.stock) {
                    item.stock = 0
                }
                if (item.shopnum + addnum > item.stock) {
                    this.$message.showToast('库存不足，无法修改')
                    return
                }
                if (item.shopnum + addnum >= 0) {

                } else {
                    return
                }
                this.$message.showLoading()
                const {
                    code
                } = await this.$http.request('post', '/api/customer/flower/cart/change-num', {
                    data: {
                        id: item.id,
                        num: addnum
                    }
                })
                this.$message.hideLoading()
                if (code === 0) {
                    item.shopnum += addnum
                    this.$forceUpdate()
                }
            },
        }
    }
@@ -124,10 +190,10 @@

        <view class="trade-list-container">
            <view class="trade-info-container flex" v-for="(dto,index) of list" :key="index"
                @click.stop="toDetail(dto)">
                <image class="img img100 br-4 m-r-10" :src="dto.url||dto.cover"></image>
                >
                <image class="img img100 br-4 m-r-10" :src="dto.url||dto.cover" @click.stop="toDetail(dto)"></image>
                <view class="flex1">
                    <view class="flex">
                    <view class="flex" @click.stop="toDetail(dto)">
                        <view class="title">
                            <span class="m-r-5" style="display: inline-block;"
                                v-if="dto.categoryStr">{{dto.categoryStr||''}}</span>
@@ -140,14 +206,24 @@
                        </view>
                    </view>
                    <view class="flex">
                        <view class="desc m-t-12 flex">
                        <view class="desc p-t-12 flex" @click.stop="toDetail(dto)">
                            <view class="m-r-15">剩余:{{ dto.stock || 0 }}</view>
                            <view class="m-r-15">颜色:{{ dto.color || '-' }}</view>
                        </view>
                        <view class="button-icons flex m-l-a m-r-0 m-t-20" v-if="dto.status=='UP'">
                            <view class="m-r-0 gwc" @click.stop="submitShopping(dto)">
                            <view class="m-r-0 gwc" @click.stop="submitShopping(dto)" v-if="!dto.shopnum">
                                + 购物车
                            </view>
                            <view class="m-r-0 flex" v-if="dto.shopnum">
                                <uni-icons v-if="dto.shopnum&&dto.shopnum>=1" type="minus" size="32"
                                    @click.stop="addnum(dto,-1)"></uni-icons>
                                <view class="curnums" @click.stop="updateItemNum(dto)" v-if="dto.shopnum&&dto.shopnum>=1">
                                    {{ dto.shopnum }}
                                </view>
                                <uni-icons v-if="!dto.shopnum||dto.shopnum<=999" type="plus-filled" size="32"
                                    @click.stop="addnum(dto,1)"></uni-icons>
                            </view>

                        </view>
                    </view>
                </view>
@@ -182,6 +258,7 @@
                line-height: 70rpx !important;
            }
        }

        .trade-list-container {
            min-height: calc(100vh - 300rpx);
            overflow-y: scroll;
@@ -190,6 +267,7 @@
            padding: 20rpx;
            
        }

        .trade-info-container {
            background-color: #fff;
            border-radius: 20rpx;
@@ -237,8 +315,8 @@
                line-height: 40rpx;

                .curnums {
                    margin-left: 10rpx;
                    margin-right: 10rpx;
                    padding-left: 20rpx;
                    padding-right: 20rpx;
                }
            }


 sub_pages/customer/shop/shop.vue

@@ -82,8 +82,7 @@
                <view class="component-shop-item flex" v-for="(item,index) of list" :key="index"

                    @click.stop="toDetail(item)">

                    <view class="img">

                        <image class="img img100"

                            :src="item.cover" lazy-load>

                        <image class="img img100" :src="item.cover" lazy-load>

                        </image>

                        <view class="level">

                            {{item.levelStr||''}}

@@ -120,7 +119,9 @@
                            <view class="icons flex">

                                <uni-icons v-if="item.shopnum&&item.shopnum>=1" type="minus" size="32"

                                    @click.stop="addnum(item,-1)"></uni-icons>

                                <view class="curnums" v-if="item.shopnum&&item.shopnum>=1">{{ item.shopnum }}</view>

                                <view class="curnums" @click="updateItemNum(item)" v-if="item.shopnum&&item.shopnum>=1">

                                    {{ item.shopnum }}

                                </view>

                                <uni-icons v-if="!item.shopnum||item.shopnum<=99" type="plus-filled" size="32"

                                    @click.stop="addnum(item,1)"></uni-icons>

                            </view>

@@ -210,6 +211,7 @@
            }

        },

        methods: {



            async getDetail() {

                {

                    this.$message.showLoading()

@@ -280,7 +282,8 @@
                    if(!this.catgoryTree){

                        this.$message.showLoading()

                        const {

                            code,data

                            code,

                            data

                        } = await this.$http.request('get', `/api/customer/flower/category/tree`, {

                            data: {

                                supplierId: this.dto.supplierId || this.dto.id

@@ -308,7 +311,29 @@
            buttonSearchFlow() {



            },

            async updateItemNum(item) {

                const res = await this.$message.confirm('', {

                    editable: true,

                    title: '请输入想要购买的数量'

                })

                if (res.content && res.confirm) {

                    // 发送请求

                    var t = parseInt(res.content)

                    if (isNaN(t) || t < 0) {

                        this.$message.showToast('数目需要大于等于0')



                    } else {

                        if (!item.stock || t > item.stock) {

                            this.$message.showToast('库存不足无法修改')

                            return

                        }

                        this.addnum(item, (t - item.shopnum))



                    }

                } else {



                }

            },

            async addnum(item, addnum) {

                if (!this.currentInfo.id) {

                    await this.$message.confirm('请前往登录')

@@ -324,7 +349,7 @@
                    item.stock = 0
                }
                if (item.shopnum + addnum > item.stock) {
                    this.$message.showToast('库存不足，无法添加')
                    this.$message.showToast('库存不足，无法修改')

                    return
                }

                if (item.shopnum + addnum >= 0) {

@@ -335,7 +360,7 @@
                this.$message.showLoading()

                const {

                    code

                } = await http.request('post', '/api/customer/flower/cart/change-num', {

                } = await this.$http.request('post', '/api/customer/flower/cart/change-num', {

                    data: {

                        id: item.id,

                        num: addnum

@@ -378,10 +403,12 @@
                    padding-left: 20rpx;

                }

            }



            .brand-info-1{

                // padding: 40rpx 30rpx;

                

            }



            .brand-info-3 {

                padding: 40rpx 30rpx;




 sub_pages/customer/shopping/confirm.vue

@@ -126,7 +126,9 @@
                }

                if (!this.address.id) {
                    this.$message.showToast('请选择收货地址')
                    this.$message.showToast('请选择收货地址',{
                        duration: 2000
                    })
                    return
                }
                this.dto.addressId = this.address.id
@@ -170,9 +172,11 @@
                                            await tmp.$store.dispatch('sign_add', 'shopping')
                                            uni.navigateBack()
                                        },
                                        fail(err) {
                                        async fail(err) {
                                            console.error('pay fail', err)
                                            tmp.$message.showToast('支付失败')
                                            await tmp.$store.dispatch('sign_add', 'shopping')
                                            uni.navigateBack()
                                        }
                                    })

@@ -338,6 +342,8 @@
            background-color: #ffffff;
            left: 0rpx;
            padding: 20rpx;
            z-index: 99;
            z-index: 11;
            right: 0rpx;
            bottom: 0rpx;
        }
@@ -435,6 +441,7 @@
                    margin-right: auto;
                    max-width: 32%;
                    width: 130rpx;
                    min-width: 130rpx;

                    .title {
                        font-weight: 400;

 sub_pages/customer/shopping/shopping.vue

@@ -25,7 +25,7 @@
                <view v-for="(dto,j) of item.flowerList" :key="j">
                    <u-divider v-if="j>0"></u-divider>
                    <u-swipe-action>
                        <u-swipe-action-item :options="options1" @click="(e)=>{clickSwipeButton(dto)}">
                        <u-swipe-action-item :options="options1" @click="(e)=>{clickSwipeButton(dto,true)}">
                            <view class="item-each flex">
                                <radio :checked="ids.indexOf(dto.id)>=0" @click="changeItem(dto,'flower')"></radio>
                                <image class="img img100 m-r-6 br-4" :src="dto.url||dto.cover"></image>
@@ -46,7 +46,7 @@
                                        <view class="button-icons flex m-l-a m-r-0">
                                            <uni-icons v-if="dto.num&&dto.num>=1" type="minus" size="32"
                                                @click.stop="addnum(dto,-1)"></uni-icons>
                                            <view class="curnums" v-if="dto.num&&dto.num>=1">{{ dto.num }}</view>
                                            <view class="curnums" @click.stop="updateItemNum(dto)" v-if="dto.num&&dto.num>=1">{{ dto.num }}</view>
                                            <uni-icons type="plus-filled" size="32"
                                                @click.stop="addnum(dto,1)"></uni-icons>
                                        </view>
@@ -104,6 +104,10 @@
        mounted() {
            this.init()
        },
        async onPullDownRefresh(){
            await this.init()
            uni.stopPullDownRefresh()
        },
        computed: {
            totalprice() {

@@ -146,7 +150,7 @@
                const {
                    code,
                    data
                } = await http.request('post', '/api/customer/flower/order/confirm/info', {
                } = await this.$http.request('post', '/api/customer/flower/order/confirm/info', {
                    data: {
                        flowers: arr,
                    }
@@ -159,13 +163,18 @@
                    })
                }
            },
            async clickSwipeButton(item) {
            async clickSwipeButton(item,check) {
                //删除商品，重新加载数据？
                if(check){
                    this.$message.confirm('是否删除商品')
                    return
					
                }

                this.$message.showLoading()
                const {
                    code
                } = await http.request('get', '/api/customer/flower/cart/delete', {
                } = await this.$http.request('get', '/api/customer/flower/cart/delete', {
                    params: {
                        id: item.id,
                    }
@@ -289,23 +298,47 @@

                }
            },
            async updateItemNum(item) {
                const res = await this.$message.confirm('', {
                    editable: true,
                    title: '请输入想要购买的数量'
                })
                if (res.content && res.confirm) {
                    // 发送请求
                    var t = parseInt(res.content)
                    if (isNaN(t) || t < 0) {
                        this.$message.showToast('数目需要大于等于0')
			
                    } else {
                        if (!item.stock || t > item.stock) {
                            this.$message.showToast('库存不足无法修改')
                            return
                        }
                        this.addnum(item, (t - item.num))
			
                    }
                } else {
			
                }
            },
            async addnum(dto, addnum) {
                if (dto.num + addnum >= 0) {

                } else {
                    console.log('addnum',dto,addnum)
                    return
                }
                if (!dto.stock) {
                    dto.stock = 0
                }
                if (dto.num + addnum > dto.stock) {
                    this.$message.showToast('库存不足，无法添加')
                    this.$message.showToast('库存不足，无法修改')
                    return
                }
                this.$message.showLoading()
                const {
                    code
                } = await http.request('post', '/api/customer/flower/cart/change-num', {
                } = await this.$http.request('post', '/api/customer/flower/cart/change-num', {
                    data: {
                        id: dto.id,
                        num: addnum
@@ -316,12 +349,17 @@
                    dto.num += addnum
                    if (dto.num < 1) {
                        //id删除清空，并且
                        await this.clickSwipeButton(dto)
                        await this.clickSwipeButton(dto,false)
                        // await this.init()
                    }
                    this.$forceUpdate()
                }
            },
            async init() {
				
                this.ids = []
                this.checkall = false
				
                if (!this.currentInfo.id) {
                    this.$message.showToast('请先登录')
                    return
@@ -364,6 +402,7 @@
            padding: 20rpx;
            right: 0rpx;
            bottom: 160rpx;
            z-index: 11;
        }

        .shopping-item {
@@ -417,8 +456,8 @@
                line-height: 40rpx;

                .curnums {
                    margin-left: 10rpx;
                    margin-right: 10rpx;
                    padding-left: 20rpx;
                    padding-right: 20rpx;
                }
            }
        }

 sub_pages/customer/trade/detail.vue

@@ -39,9 +39,19 @@
                    <image src="../../../static/common/icon-kf.png" class="icon-kf m-l-15 img100"></image>



                </view>

                <view class="m-r-0 gwc" @click="submitShopping(dto)">

                <view class="m-r-0 gwc" @click="submitShopping(dto)" v-if="!dto.shopnum">

                    + 购物车

                </view>

                <view class="m-r-0 button-icons flex" v-if="dto.shopnum">

                    <uni-icons v-if="dto.shopnum&&dto.shopnum>=1" type="minus" size="32"

                        @click.stop="addnum(dto,-1)"></uni-icons>

                    <view class="curnums" @click.stop="updateItemNum(dto)" v-if="dto.shopnum&&dto.shopnum>=1">

                        {{ dto.shopnum }}

                    </view>

                    <uni-icons v-if="!dto.shopnum||dto.shopnum<=99" type="plus-filled" size="32"

                        @click.stop="addnum(dto,1)"></uni-icons>

                </view>



            </view>

        </view>

        <view class="line">

@@ -138,6 +148,9 @@
                shopnum: 0,

            }

        },

        onShow() {

            this.refreshShopNum()

        },

        onLoad(options) {

            this.id = options.id || ''

            if (this.id) {

@@ -146,6 +159,69 @@
            this.refreshShopNum()

        },

        methods: {

            async updateItemNum(item) {

                const res = await this.$message.confirm('', {

                    editable: true,

                    title: '请输入想要购买的数量'

                })

                if (res.content && res.confirm) {

                    // 发送请求

                    var t = parseInt(res.content)

                    if (isNaN(t) || t < 0) {

                        this.$message.showToast('数目需要大于等于0')



                    } else {

                        if (!item.stock || t > item.stock) {

                            this.$message.showToast('库存不足无法修改')

                            return

                        }

                        this.addnum(item, (t - item.shopnum))



                    }

                } else {



                }

            },

            async addnum(item, addnum) {

                if (!this.currentInfo.id) {

                    await this.$message.confirm('请前往登录')

                    uni.navigateTo({

                        url: '/pages/user/supplier-user'

                    })

                    return

                }

                if (!item.shopnum) {

                    item.shopnum = 0

                }

                if (!item.stock) {

                    item.stock = 0

                }

                if (item.shopnum + addnum > item.stock) {

                    this.$message.showToast('库存不足，无法修改')

                    return

                }

                if (item.shopnum + addnum >= 0) {



                } else {

                    return

                }

                this.$message.showLoading()

                const {

                    code

                } = await this.$http.request('post', '/api/customer/flower/cart/change-num', {

                    data: {

                        id: item.id,

                        num: addnum

                    }

                })

                this.$message.hideLoading()

                if (code === 0) {

                    item.shopnum += addnum
                    this.refreshShopNum()

                    this.$forceUpdate()

                }

            },



            async refreshShopNum() {

                this.shopnum = await this.$store.dispatch('countShopping');

            },

@@ -180,11 +256,14 @@
                //提交到购物车中

                // this.$message.showLoading()

                const {

                    code

                    code,

                    data

                } = await this.$store.dispatch('submitShopping', dto);

                // this.$message.hideLoading()

                if (code == 0) {

                    dto.shopnum = data || 0

                    this.refreshShopNum()

                    this.$forceUpdate()



                }

            },

@@ -255,6 +334,15 @@
                }

            }



            .button-icons {

                line-height: 40rpx;



                .curnums {

                    padding-left: 20rpx;

                    padding-right: 20rpx;

                }

            }



            .desc {

                font-weight: 400;

                font-size: 28rpx;


 sub_pages/customer/trade/list.vue

@@ -238,6 +238,9 @@
            await this.getList('post')

            uni.stopPullDownRefresh()

        },

        onShow(){
            this.refreshShopNum()
        },

        methods: {
            async refreshShopNum() {
                this.shoptotal = await this.$store.dispatch('countShopping');
@@ -339,7 +342,7 @@
                    item.shopnum = 0
                }

                if (item.shopnum + addnum > item.stock) {

                    this.$message.showToast('库存不足，无法添加')

                    this.$message.showToast('库存不足，无法修改')

                    return

                }

                

@@ -351,7 +354,7 @@
                this.$message.showLoading()

                const {

                    code

                } = await http.request('post', '/api/customer/flower/cart/change-num', {

                } = await this.$http.request('post', '/api/customer/flower/cart/change-num', {

                    data: {

                        id: item.id,

                        num: addnum


 sub_pages/customer/trade/trade.vue

@@ -122,8 +122,8 @@
                uni.stopPullDownRefresh()

            })

        },

        async onLoad() {



        async onLoad(options) {

            let selectId = options.categoryId || ''

            //加载分类

            this.$message.showLoading()

            this.$http.request('get', '/api/customer/flower/category/tree', {}).then(res => {

@@ -131,9 +131,20 @@
                var data = res.data

                this.list = data || []

                if (this.list.length > 0) {

                    if (selectId) {

                        for (var item of this.list) {

                            if (item.id == selectId) {

                                this.query.categoryId = item.id || ''

                                this.currentCategory = item

                                break

                            }

                        }

                    } else {

                    this.query.categoryId = this.list[0].id || ''

                    this.currentCategory = this.list[0] || {}

                }



                }

            })

        },

        methods: {


 sub_pages/partner/partner-info/partner-info.vue

@@ -199,7 +199,15 @@
                    this.dto.province = ''
                    this.dto.city = ''
                    this.dto.region = ''
                    if (e.detail.value.length <= 3) {
                    if (e.detail.value.length == 2) {
                        if (!!e.detail.value[0])
                            this.dto.province = e.detail.value[0].value
                        if (!!e.detail.value[0])
                            this.dto.city = e.detail.value[0].value
                        if (!!e.detail.value[1])
                            this.dto.region = e.detail.value[1].value
                    }
                    else if(e.detail.value.length <= 3) {
                        if (!!e.detail.value[0])
                            this.dto.province = e.detail.value[0].value
                        if (!!e.detail.value[1])

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

@@ -197,8 +197,8 @@
                <view v-for="(item,i) in dto.params" :key="i" class="m-t-20">

                    <view class="title topic-font" style="font-size: 40rpx;font-weight: 600;">{{item.name}}</view>

                    <view class="m-t-12 flex value-items">

                        <view class="value-item" @click="updateValue(item,each)" :class="[item.value===each?'cur':'']"

                            v-for="(each, j) in item.values" :key="j">

                        <view class="value-item" @click="updateValue(item,each)"

                            :class="[item.value.indexOf(each)>=0?'cur':'']" v-for="(each, j) in item.values" :key="j">

                            {{each || '-'}}

                        </view>

                    </view>

@@ -338,10 +338,15 @@


        methods: {

            updateValue(item, value) {

                item.value = value

                this.$set(item, 'value', value)

                if (item.value.indexOf(value) >= 0) {

                    item.value.splice(item.value.indexOf(value), 1)

                } else {

                    item.value.push(value)

                }

                // item.value = value

                // this.$set(item, 'value', value)

                this.$forceUpdate()

                console.log('updateValue')

                // console.log('updateValue')

            },

            async updateSearch(search) {

                this.columns_categorys_search = search || ''

@@ -496,6 +501,14 @@
                    if (res.code == 0) {

                        // this.columns_params = res.data || []

                        this.dto.params = res.data || []

                        for (var k of this.dto.params) {

                            if (!k.value) {

                                k.value = []

                            } else {

                                k.value = k.value.split(',') || []

                            }

                        }
                        // console.log('init params',this.dto.params)

                    }

                }



@@ -524,6 +537,16 @@
                    if (!this.dto.bannerList) {

                        this.dto.bannerList = []

                    }

                    if(this.dto.params){
                        for (var k of this.dto.params) {
                            if (!k.value) {
                                k.value = []
                            } else {
                                k.value = k.value.split(',') || []
                            }
                        }
                    }
					
                    // if (this.dto.category) {

                    //     await this.refresh_category()

                    // }

@@ -557,9 +580,9 @@
                    this.$message.showToast('商品价格不能小于等于0')

                    return

                }

                tmp = parseFloat(this.dto.stock)

                if (isNaN(tmp) || ('' + tmp.toFixed(0)) !== ('' + this.dto.stock) || tmp < 0) {

                    this.$message.showToast('商品库存格式错误，需要大于等于0')

                tmp = parseInt(this.dto.stock)

                if (isNaN(tmp) || ('' + tmp.toFixed(0)) !== ('' + this.dto.stock) || tmp <= 0) {

                    this.$message.showToast('商品库存格式错误，需要大于0')

                    return

                }



@@ -569,12 +592,13 @@
                        return

                    }

                }

				
                if (this.dto.params.length < 1) {

                    this.$message.showToast('商品参数详情未设置')

                    return

                } else {

                    for (var item of this.dto.params) {

                        if (!item.value) {

                        if (item.value.length < 1) {

                            this.$message.showToast('存在商品参数详情未设置')

                            return

                        }

@@ -597,10 +621,11 @@


                // this.$message.showToast('1')

                // return

                var dto = {

                    ...this.dto,

                    // applicationDate: this.$util.toDate(new Date()),

                    // applicantId: this.currentInfo.id

                var dto = JSON.parse(JSON.stringify(this.dto))
                if(dto.params){
                    for(var k of dto.params){
                        k.value = k.value.join(",")
                    }
                }

                this.$message.showLoading()

                const re = await this.$http.request('post', `/api/supplier/flower/list/${this.id?'edit':'new'}`, {

@@ -707,7 +732,7 @@
                    var strs = []

                    for (var i of this.dto.params) {

                        if (i.value) {

                            strs.push(i.value)

                            strs.push(i.value.join(","))

                        }

                    }

                    return strs.join(',')


 sub_pages/supplier/supplier-info/supplier-info.vue

@@ -311,7 +311,14 @@
                    this.dto.province = ''

                    this.dto.city = ''

                    this.dto.region = ''

                    if (e.detail.value.length <= 3) {

                    if (e.detail.value.length == 2) {

                        if (!!e.detail.value[0])

                            this.dto.province = e.detail.value[0].value

                        if (!!e.detail.value[0])

                            this.dto.city = e.detail.value[0].value

                        if (!!e.detail.value[1])

                            this.dto.region = e.detail.value[1].value

                    }else if(e.detail.value.length <= 3) {

                        if (!!e.detail.value[0])

                            this.dto.province = e.detail.value[0].value

                        if (!!e.detail.value[1])