fix bug

xuxueyang

2024-08-02 1b78e33e0d0340f3d45f87160abcb0f13f013774

fix bug

 sub_pages/customer/self/collect.vue

@@ -229,7 +229,7 @@
        <view class="trade-list-container">
            <view class="trade-info-container flex" :class="[dto.status!=='UP'?'OFF':'']" v-for="(dto,index) of list"
                :key="index">
                <image class="img img100 br-4 m-r-10"  :class="[!dto.stock?'':'']" :src="dto.url||dto.cover" @click.stop="toDetail(dto)"></image>
                <image class="img img100 br-4 m-r-10"  :class="[!dto.stock?'component-stock-zero':'']" :src="dto.url||dto.cover" @click.stop="toDetail(dto)"></image>
                <view class="flex1">
                    <view class="flex" @click.stop="toDetail(dto)">
                        <view class="title">

 sub_pages/customer/self/history.vue

@@ -191,7 +191,7 @@
        <view class="trade-list-container">
            <view class="trade-info-container flex"   :class="[dto.status!=='UP'?'OFF':'']"
            v-for="(dto,index) of list" :key="index">
                <image class="img img100 br-4 m-r-10"  :class="[!dto.stock?'':'']" :src="dto.url||dto.cover" @click.stop="toDetail(dto)"></image>
                <image class="img img100 br-4 m-r-10"  :class="[!dto.stock?'component-stock-zero':'']" :src="dto.url||dto.cover" @click.stop="toDetail(dto)"></image>
                <view class="flex1">
                    <view class="flex" @click.stop="toDetail(dto)">
                        <view class="title">

 sub_pages/customer/shopping/shopping.vue

@@ -28,7 +28,8 @@
                        <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" :class="[!dto.stock?'component-stock-zero-tmp':'']" :src="dto.url||dto.cover"></image>
                                <image class="img img100 m-r-6 br-4" :class="[!dto.stock?'component-stock-zero':'']"
                                    :src="dto.url||dto.cover"></image>
                                <view class="flex1">
                                    <view class="title" @click.stop="toDetail(dto)"><span class="m-r-5"
                                            style="display: inline-block;">{{dto.categoryStr||''}}</span><span
@@ -99,7 +100,7 @@
        },
        onShow() {
            // if (this.sign['shopping']) {
				

            // }
            this.init()
        },
@@ -157,18 +158,21 @@
                        flowers: arr,
                    }
                })
                this.$message.hideLoading()
                if (code === 0) {
                    this.$storage.setItem('_cache_shopping_dto', JSON.stringify(data))
                    uni.navigateTo({
                        url: '/sub_pages/customer/shopping/confirm'
                    })
                }
                let that = this
                setTimeout(() => {
                    that.$message.hideLoading()
                    if (code === 0) {
                        that.$storage.setItem('_cache_shopping_dto', JSON.stringify(data))
                        uni.navigateTo({
                            url: '/sub_pages/customer/shopping/confirm'
                        })
                    }
                }, 300)
            },
            async clickSwipeButton(item, check) {
                //删除商品，重新加载数据？
                if (check) {
                    await this.$message.confirm('是否删除商品')					
                    await this.$message.confirm('是否删除商品')

                }


 sub_pages/customer/trade/list.vue

@@ -59,7 +59,7 @@


            <view class="component-shop-item flex" v-for="(item,index) of list" :key="index">

                <view class="img" @click.stop="toDetail(item)">

                    <image class="img img100" :class="[!item.stock?'component-stock-zero-tmp':'']" :src="item.cover">

                    <image class="img img100" :class="[!item.stock?'component-stock-zero':'']" :src="item.cover">

                    </image>

                    <view class="level">

                        {{item.levelStr||''}}


 sub_pages/customer/trade/trade.vue

@@ -39,7 +39,7 @@
                            @click.stop="toDetailList(item)">

                            <view class="m-r-10">

                                <!-- @click.stop="previewImg(item.imageUrl)" -->

                                <image :src="item.imageUrl"   :class="[!item.stock?'component-stock-zero':'']"
                                <image :src="item.imageUrl"   :class="[!item.stock?'':'']"
                                mode="scaleToFill" class="cover" :lazy-load="true">

                                </image>

                            </view>


 sub_pages/partner/delivery/delivery-detail.vue

@@ -189,10 +189,10 @@
                        </view>
                    </view>
                </view>
                <view class="line-gray">
                <view class="line-gray" v-if="dto.satus == 'ARRIVED'">

                </view>
                <view class="buttons">
                <view class="buttons" v-if="dto.satus == 'ARRIVED'">
                    <view class="button text-center" v-for="button of check_status" :key="button.value"
                        @click.stop="clickCheck(item,button.value)">{{ button.label }}
                    </view>

 sub_pages/partner/delivery/delivery.vue

@@ -8,6 +8,7 @@
                    stationName: '',
                    statusStr: '',
                    status: '',
                    warehouseLocationCode: '',
                },
                show_select_station: false,
                show_select_status: false,
@@ -30,13 +31,13 @@
                    type: 'DELIVERY_ORDER_STATUS'
                }
            }).then(res => {
                var data = res.data||[]
                var data = res.data || []
                this.status_columns = [data || []]
                this.status_columns[0].unshift({
                    label: '全部',
                    value: ''
                })
                console.log('status_columns',this.status_columns)
                console.log('status_columns', this.status_columns)
            })

        },
@@ -83,8 +84,9 @@
                if (code === 0) {
                    this.$message.showToast('完成成功')
                    let tmp = this
                    setTimeout(() => {
                        tmp.refreshList()
                    setTimeout(async () => {
                        await tmp.refreshList()
                        tmp.$forceUpdate()
                    }, 200)
                }
            }
@@ -104,6 +106,16 @@
                    </u-input>
                </view>
            </view>
            <view class="search-container m-t-12 flex">
                <view class="flex1 input">
                    <u-input placeholder="请输入货位号" v-model="query.warehouseLocationCode">
                        <template slot="suffix">
                            <uni-icons color="#20613D" type="search" size="24" @tap="buttonSearchFlow"></uni-icons>
                        </template>
                    </u-input>
                </view>
            </view>

            <view class="component-filter-container p20 bg-white">
                <view class="flex1" @click="show_select_status=true">
                    配送单状态:{{ query.statusStr || '全部' }}
@@ -130,6 +142,10 @@
                            <view class="form-item-label">集货站</view>
                            <view class="form-item-value">{{ item.stationName || '-' }}</view>
                        </view>
                        <view class="form-item flex1">
                            <view class="form-item-label">货位号</view>
                            <view class="form-item-value">{{ item.warehouseLocationCode || '-' }}</view>
                        </view>

                    </view>
                    <view class="flex">
@@ -148,10 +164,13 @@
                    </view>


                    <view class="line-gray" v-if="item.status==='ARRIVED'"></view>
                    <view class="flex buttons" v-if="item.status==='ARRIVED'">
                        <view class="button button-0 m-l-a m-r-0" @click="toDetail(item)">前往质检</view>
                        <view class="button button-1 m-l-15 m-r-0" @click="compelete(item)">质检完成</view>
                    <view class="line-gray"></view>
                    <view class="flex buttons">
                        <view class="button button-1 m-l-15 m-r-0" v-if="item.status==='ARRIVED'"
                            @click="compelete(item)">质检完成</view>
                        <view class="button button-0 m-l-a m-r-0" @click="toDetail(item)">
                            {{item.status==='ARRIVED'?'前往质检':'查看详情'}}</view>

                    </view>
                </view>
            </view>

 sub_pages/supplier/print/print-list.vue

@@ -227,19 +227,19 @@
                } else if (platform == "android") {
                    // uni.getDeviceInfo().platform = "android"
                    console.log(uni.getDeviceInfo()) //这里是拿到安卓的系统版本名 如：Android 9
                    systemVersion = 10
                    try {
                        var s = '' + (uni.getDeviceInfo().system || '')
                        console.log('输出系统版本号', s.substring(s.length - (
                                s.length -
                                8), s.length - (s.length - 8) +
                            1)) //这里为了获取到系统的版本号，如 9
                        systemVersion = s.substring(s.length - (s.length -
                            8), s.length - (s.length - 8) + 1)
                    } catch (e) {
                        that.$message.showToast('获取系统版本错误，版本号：' + s)
                        systemVersion = 10
                    }
                    var systemVersion = 10
                    // try {
                    //     var s = '' + (uni.getDeviceInfo().system || '')
                    //     console.log('输出系统版本号', s.substring(s.length - (
                    //             s.length -
                    //             8), s.length - (s.length - 8) +
                    //         1)) //这里为了获取到系统的版本号，如 9
                    //     systemVersion = s.substring(s.length - (s.length -
                    //         8), s.length - (s.length - 8) + 1)
                    // } catch (e) {
                    //     that.$message.showToast('获取系统版本错误，版本号：' + s)
                    //     systemVersion = 10
                    // }
                    if (systemVersion > 5) {
                        wx.getSetting({
                            success: function(res) {
@@ -300,7 +300,7 @@
                                        }
                                    }
                                    // 数据赋值 关闭刷新
                                    that.list = devices
                                    that.list = devices || []
                                    that.isScanning = false

                                    wx.hideLoading()
@@ -308,7 +308,7 @@
                                },
                                fail(e) {
                                    that.$message.showToast('获取蓝牙设备出错：' + (e || ''))
								

                                }
                            })
                        }, 3000) //到这里 都是三秒后执行的内容
@@ -610,22 +610,32 @@
                            wx.showToast({
                                title: '已打印第' + currentPrint + '张',
                            })
                            if (currentPrint == printNum) {
                                that.looptime = 0
                                that.lastData = 0
                                that.currentTime = 1
                                that.isReceiptSend = false
                                that.isLabelSend = false
                                that.currentPrint = 1
                            // if (currentPrint == printNum) {
                            that.looptime = 0
                            that.lastData = 0
                            that.currentTime = 1
                            that.isReceiptSend = false
                            that.isLabelSend = false
                            that.currentPrint = 1
                            try {
                                wx.closeBLEConnection({
                                    deviceId: that.deviceId,
                                    success: function(res) {
                                        console.log("关闭蓝牙成功")
                                    },
                                })
                            } catch (e) {

                            } else {
                                currentPrint++

                                that.currentPrint = currentPrint
                                that.currentTime = 1

                                that.Send(buff)
                            }

                            // } else {
                            //     currentPrint++

                            //     that.currentPrint = currentPrint
                            //     that.currentTime = 1

                            //     that.Send(buff)
                            // }
                        }
                    }
                })

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

@@ -119,23 +119,24 @@
                            v-for="(item, index) in shTypeList" :key="index" :label="item.name" :name="item.name">

                        </u-radio>

                    </u-radio-group> -->

<!--                    <view>-->

<!--                        <radio :checked="dto.idcardType==='身份证'" @click="()=>{-->

<!--                            dto.idcardType='身份证';-->

<!--                            $forceUpdate()-->

<!--                        }">-->

<!--                        </radio>身份证-->

<!--                    </view>-->

<!--                    <view class="m-l-10">-->

<!--                        <radio :checked="dto.idcardType==='营业执照'" @click="()=>{-->

<!--                            dto.idcardType='营业执照';-->

<!--                            $forceUpdate()-->

<!--                        }">-->

<!--                        </radio>营业执照-->

<!--                    </view>-->

          <evan-radio-group v-model="dto.idcardType">

            <evan-radio v-for="item in shTypeList" :key="item.value" :label="item.value">{{item.label}}</evan-radio>

          </evan-radio-group>

                    <!--                    <view>-->

                    <!--                        <radio :checked="dto.idcardType==='身份证'" @click="()=>{-->

                    <!--                            dto.idcardType='身份证';-->

                    <!--                            $forceUpdate()-->

                    <!--                        }">-->

                    <!--                        </radio>身份证-->

                    <!--                    </view>-->

                    <!--                    <view class="m-l-10">-->

                    <!--                        <radio :checked="dto.idcardType==='营业执照'" @click="()=>{-->

                    <!--                            dto.idcardType='营业执照';-->

                    <!--                            $forceUpdate()-->

                    <!--                        }">-->

                    <!--                        </radio>营业执照-->

                    <!--                    </view>-->

                    <evan-radio-group v-model="dto.idcardType">

                        <evan-radio v-for="item in shTypeList" :key="item.value"

                            :label="item.value">{{item.label}}</evan-radio>

                    </evan-radio-group>

                </view>

            </view>

            <view class="form-item bottom-border-no before-line m-t-20 p-b-20" v-if="dto.idcardType=='1'">

@@ -208,15 +209,15 @@
    import {

        mapState

    } from 'vuex'

  import EvanRadio from "../components/evan-radio/evan-radio.vue";

  import EvanRadioGroup from "../components/evan-radio-group/evan-radio-group.vue";

    import EvanRadio from "../components/evan-radio/evan-radio.vue";

    import EvanRadioGroup from "../components/evan-radio-group/evan-radio-group.vue";



    export default {



    components:{

      EvanRadioGroup,

      EvanRadio

    },

        components: {

            EvanRadioGroup,

            EvanRadio

        },



        data() {

            return {

@@ -422,6 +423,9 @@
                    } else if (typeof this.dto.idCards == 'string') {

                        this.dto.idCards = JSON.parse(this.dto.idCards)

                    }

                    if (!this.dto.idcardType) {

                        this.dto.idcardType = '1'

                    }

                    this.dto.userId = this.currentInfo.id



                }

@@ -479,8 +483,10 @@
                }

                if (this.dto.idcardType == '2' && this.dto.pictures.length == 0) {

                    this.$message.showToast(`营业执照信息未填写`)

                    return

                }

                    return
					
                }
				
                await this.$message.confirm(`是否确定提交/修改店铺信息`)





@@ -648,12 +654,13 @@
        background-color: rgb(254, 243, 243);

    }



  /deep/ {

    .evan-radio-group {

      display: flex;

    }

    .evan-radio {

      margin-right: 12rpx;

    }

  }

</style>

    /deep/ {

        .evan-radio-group {

            display: flex;

        }



        .evan-radio {

            margin-right: 12rpx;

        }

    }

</style>