陶杰
2024-11-01 c6f83537de95f3c5e591cd2eff90f1163f38f118
1.钱包
已修改11个文件
已添加1个文件
484 ■■■■■ 文件已修改
pages.json 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/home/supplier-home.vue 21 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/order/comment/order-comment.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/user/supplier-user.vue 41 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/user/user.scss 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
sub_pages/customer/self/member-center.vue 9 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
sub_pages/customer/setup/account-self.vue 281 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
sub_pages/customer/setup/setup.vue 15 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
sub_pages/customer/shop/shop.vue 26 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
sub_pages/supplier/wallet/wallet-billing-detail.vue 53 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
sub_pages/supplier/wallet/wallet-withdrao-deposit-record.vue 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
sub_pages/supplier/wallet/wallet-withdrao-deposit.vue 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages.json
@@ -435,6 +435,13 @@
                    }
                },
                {
                    "path": "setup/account-self",
                    "style": {
                        "navigationBarTitleText": "账户安全",
                        "enablePullDownRefresh": false
                    }
                },
                {
                    "path": "customer-info/customer-info",
                    "style": {
                        "navigationBarTitleText": "信息维护",
pages/home/supplier-home.vue
@@ -39,8 +39,25 @@
                <view class="name">
                    <view class="t1">
                        {{ (!!currentInfo.supplierDTO?(currentInfo.supplierDTO.name):"") || currentInfo.nickName || currentInfo.loginName || '-'}}<span
                            v-if="currentInfo.supplierDTO&&currentInfo.supplierDTO.status!=='P'">
                        <!-- {{ (!!currentInfo.supplierDTO?(currentInfo.supplierDTO.name):"") || currentInfo.nickName || currentInfo.loginName || '-'}} -->
                        <span v-if="currentInfo.partnerDTO && currentInfo.partnerDTO.name">
                            {{ currentInfo.partnerDTO.name }}
                        </span>
                        <span v-else-if="currentInfo.supplierDTO && currentInfo.supplierDTO.name">
                            {{ currentInfo.supplierDTO.name }}
                        </span>
                        <span v-else-if="currentInfo.customerDTO && currentInfo.customerDTO.name">
                            {{ currentInfo.customerDTO.name }}
                        </span>
                        <span v-else-if="currentInfo.nickName">
                            {{ currentInfo.nickName }}
                        </span>
                        <span v-else-if="currentInfo.loginName">
                            {{ currentInfo.loginName }}
                        </span>
                        <span v-else>-</span>
                        <span v-if="currentInfo.supplierDTO&&currentInfo.supplierDTO.status!=='P'">
                            ({{currentInfo.supplierDTO?currentInfo.supplierDTO.statusStr:''}})</span>
                        <span v-if="currentInfo.partnerDTO&&currentInfo.partnerDTO.status!=='P'">
                            ({{currentInfo.partnerDTO?currentInfo.partnerDTO.statusStr:''}})</span>
pages/order/comment/order-comment.vue
@@ -673,7 +673,7 @@
                                        匿名
                                </view>
                                <view  class="comment-content-div">
                                    <u--textarea v-model="item.comment" placeholder="请输入内容"  count></u--textarea>
                                    <u--textarea v-model="item.comment" placeholder="请输入内容"  count autoHeight  :height="150" ></u--textarea>
                                </view>
                                <view  class="comment-content-div">
                                    <view class="component-button-upload" @click="uploadIcon(item,'image')"></view>
pages/user/supplier-user.vue
@@ -36,9 +36,25 @@
                <view class="name" v-if="currentInfo.id">
                    <view class="t1">
                        {{
                        <!-- {{
              (!!currentInfo.partnerDTO ? (currentInfo.partnerDTO.name) : "") ||  (!!currentInfo.supplierDTO ? (currentInfo.supplierDTO.name) : "") || (!!currentInfo.customerDTO ? (currentInfo.customerDTO.name) : "") || currentInfo.nickName || currentInfo.loginName || '-'
            }}
            }} -->
                        <span v-if="currentInfo.partnerDTO && currentInfo.partnerDTO.name">
                            {{ currentInfo.partnerDTO.name }}
                        </span>
                        <span v-else-if="currentInfo.supplierDTO && currentInfo.supplierDTO.name">
                            {{ currentInfo.supplierDTO.name }}
                        </span>
                        <span v-else-if="currentInfo.customerDTO && currentInfo.customerDTO.name">
                            {{ currentInfo.customerDTO.name }}
                        </span>
                        <span v-else-if="currentInfo.nickName">
                            {{ currentInfo.nickName }}
                        </span>
                        <span v-else-if="currentInfo.loginName">
                            {{ currentInfo.loginName }}
                        </span>
                        <span v-else>-</span>
                        <span v-if="currentInfo.supplierDTO&&currentInfo.supplierDTO.status!=='P'">
                            ({{ currentInfo.supplierDTO ? currentInfo.supplierDTO.statusStr : '' }})</span>
                        <span v-if="currentInfo.partnerDTO&&currentInfo.partnerDTO.status!=='P'">
@@ -300,13 +316,13 @@
        </view>
        <!-- #endif -->
        <view class="user-utils m-20">
            <view class="user-util m-t-12 flex" v-if="selftype==='customer'||!selftype"
            <!-- <view class="user-util m-t-12 flex" v-if="selftype==='customer'||!selftype"
                @click="goto('/sub_pages/customer/customer-info/customer-info',true)">
                <view class="title">个人信息</view>
                <view class="right-icon">
                    <uni-icons type="right"></uni-icons>
                </view>
            </view>
            </view> -->
            <view class="user-util m-t-12 flex" v-if="selftype==='partner'||!selftype"
                @click="goto('/sub_pages/partner/partner-info/partner-info-personal',true)">
                <view class="title">个人资料</view>
@@ -363,8 +379,17 @@
                    <uni-icons type="right"></uni-icons>
                </view>
            </view>
            <!-- <view class="user-util m-t-12 flex" v-if="selftype==='supplier'||selftype==='partner'"
                @click="goto('/sub_pages/customer/setup/account-self',true)">
                <view class="title">账户安全</view>
                <view class="right-icon">
                    <uni-icons type="right"></uni-icons>
                </view>
            </view> -->
            <view class="user-util m-t-12 flex" @click="goto('/pages/user/user-pwd/user-pwd',true)">
            <view class="user-util m-t-12 flex"
             v-if="selftype==='supplier'||selftype==='partner'"
             @click="goto('/pages/user/user-pwd/user-pwd',true)">
                <view class="title">修改密码</view>
                <view class="right-icon">
                    <uni-icons type="right"></uni-icons>
@@ -377,7 +402,7 @@
                    <uni-icons type="right"></uni-icons>
                </view>
            </view> -->
            <view class="user-util m-t-12 flex" v-if="currentInfo&&currentInfo.id"
            <view class="user-util m-t-12 flex" v-if="currentInfo&&currentInfo.id &&(selftype==='supplier'||selftype==='partner') "
                @click="goto('/pages/user/user-bind-wx/user-bind-wx',true)">
                <view class="title">绑定当前微信</view>
                <view class="right-icon">
@@ -392,7 +417,9 @@
            </view> -->
            <!-- v-if="selftype==='customer'" -->
            <view class="user-util m-t-12 flex" @click="clearlogout">
            <view class="user-util m-t-12 flex"
              v-if="selftype==='supplier'||selftype==='partner'"
             @click="clearlogout">
                <view class="title">退出登录</view>
                <view class="right-icon">
                    <uni-icons type="right"></uni-icons>
pages/user/user.scss
@@ -152,6 +152,9 @@
        background: #FFFFFF;
        border-radius: 16rpx;
        padding: 22rpx 28rpx;
        .logout{
            justify-content: center;
        }
        .user-util{
            border-bottom: 2rpx solid #EEEEEE;
            .title{
@@ -161,6 +164,13 @@
                line-height: 44rpx;
                margin-bottom: 20rpx;
            }
            .title2{
                font-weight: 600;
                font-size: 32rpx;
                color: red;
                line-height: 44rpx;
                margin-bottom: 20rpx;
            }
            .name{
                font-size: 600;
                font-size: 28rpx;
sub_pages/customer/self/member-center.vue
@@ -88,10 +88,15 @@
                    <view class="right-line"></view>
                </view>
                <view class="m-t-12 desc-info">
                    每消费1元,即可获得1成长值。
                    <template v-if="bannerList[curIndex].point.growthValueDesc">
                        {{bannerList[curIndex].point.growthValueDesc}}
                    </template>
                    <template v-else>
                        <!-- 每消费1元,即可获得1成长值。
                    成长值将在订单交易完成后,根据实际交易金额进行赠送。
                    消费越多,获得的成长值越多,享受更高等级的会员权益。
                    快来参与消费,累积成长值,解锁更多专属福利吧!
                        快来参与消费,累积成长值,解锁更多专属福利吧! -->
                    </template>
                </view>
            </view>
            <view class="protocol" @click="goto('/pages/help/content?id=会员协议',false)">会员协议 <uni-icons type="right"
sub_pages/customer/setup/account-self.vue
对比新文件
@@ -0,0 +1,281 @@
<template>
    <view class="main-container user-container">
        <view class="user-utils m-20">
            <view class="user-util m-t-12 flex" @click="goto('/pages/user/user-pwd/user-pwd',true)">
                <view class="title">修改密码</view>
                <view class="right-icon">
                    <uni-icons type="right"></uni-icons>
                </view>
            </view>
            <view class="user-util m-t-12 flex" v-if="currentInfo&&currentInfo.id"
                @click="goto('/pages/user/user-bind-wx/user-bind-wx',true)">
                <view class="title">绑定当前微信</view>
                <view class="right-icon">
                    <uni-icons type="right"></uni-icons>
                </view>
            </view>
        </view>
    </view>
</template>
<script>
    export default {
        computed: {
        },
        data() {
            return {
                CustomBar: uni.getStorageSync('CustomBar'),
                StatusBar: uni.getStorageSync('StatusBar'),
                tcode: '',
                inviterName: '',
                // StatusBar:0,
                tel: '15974805814',
                tj: {},
                tj_order: {},
                cacheUserId: '',
                signToday: false
                // order_pendding_num: 0,
            };
        },
        // #ifndef PUB_CUSTOMER
        onShareAppMessage() {
            let that = this;
            var name = that.currentInfo.customerDTO && currentInfo.customerDTO.name || that.currentInfo.supplierDTO &&
                currentInfo.supplierDTO.name || that.currentInfo.partnerDTO && currentInfo.partnerDTO.name || ''
            var url =
                `/pages/login/supplier-login?shareId=${this.currentInfo&&this.currentInfo.id||''}&shareName=${name||''}`; //你的转发页面路径拼接参数
            return {
                title: "花满芫",
                path: url,
            }
        },
        onShareTimeline() {
            let that = this;
            var name = that.currentInfo.customerDTO && that.currentInfo.customerDTO.name || that.currentInfo.supplierDTO &&
                that.currentInfo.supplierDTO.name || that.currentInfo.partnerDTO && that.currentInfo.partnerDTO.name || ''
            var url =
                `/pages/login/supplier-login?shareId=${this.currentInfo&&this.currentInfo.id||''}&shareName=${name||''}`; //你的转发页面路径拼接参数
            return {
                title: "花满芫",
                path: url,
            }
        },
        // #endif
        // #ifdef PUB_CUSTOMER
        onShareAppMessage() {
            let that = this;
            var name = that.currentInfo.customerDTO && that.currentInfo.customerDTO.name || that.currentInfo.supplierDTO &&
                that.currentInfo.supplierDTO.name || that.currentInfo.partnerDTO && that.currentInfo.partnerDTO.name || ''
            var url =
                `/pages/home/home?shareId=${this.currentInfo&&this.currentInfo.id||''}&shareName=${name||''}`; //你的转发页面路径拼接参数
            return {
                title: "花满芫",
                path: url,
            }
        },
        onShareTimeline() {
            let that = this;
            var name = that.currentInfo.customerDTO && that.currentInfo.customerDTO.name || that.currentInfo.supplierDTO &&
                that.currentInfo.supplierDTO.name || that.currentInfo.partnerDTO && that.currentInfo.partnerDTO.name || ''
            var url =
                `/pages/home/home?shareId=${this.currentInfo&&this.currentInfo.id||''}&shareName=${name||''}`; //你的转发页面路径拼接参数
            return {
                title: "花满芫",
                path: url,
            }
        },
        // #endif
        onShow() {
            this.cacheUserId = ''
            this.getTj()
        },
        onLoad(options) {
            // const url = options.q ? decodeURIComponent(options.q) : '';
            // const urlcode = options.url && decodeURIComponent(options.url) || ''
            // #ifdef PUB_CUSTOMER
            if (options.partnerUserId) {
                this.bindPartnerUser(options.partnerUserId, options.partnerUserName)
            }
            // #endif
        },
        created() {
        },
        async onPullDownRefresh() {
            await this.$store.dispatch('getCurrentInfo')
            uni.stopPullDownRefresh()
        },
        methods: {
            async bindPartnerUser(userId, name) {
                // await this.$message.confirm(`确定要绑定${name}合伙人吗?`)
                //调用接口绑定
                this.$message.showLoading()
                const {
                    code,
                    data
                } = await this.$http.request('post', '/api/customer/bind/partner', {
                    data: {
                        partnerUserId: userId
                    }
                })
                this.$message.hideLoading()
                if (code == 0) {
                    this.$message.showToast(`绑定合伙人${name}成功`)
                    await this.$store.dispatch('getCurrentInfo')
                }
            },
            async scanPartnerCode() {
                //扫二维码确认
                let that = this
                uni.scanCode({
                    success: async function(res) {
                        console.log('条码内容:' + res.result);
                        if (!res.result) {
                            that.$message.showToast('未识别出合伙人信息,请用微信扫码打开')
                            return
                        }
                        var dto = undefined
                        try {
                            if (res.result && (res.result.startsWith('https://') || res.result.startsWith(
                                    'http://')) && res.result.indexOf(
                                    'partnerUserId') >= 0) {
                                var arr = res.result.split("?")[1].split("&")
                                dto = {}
                                for (var item of arr) {
                                    var tarr = item.split("=")
                                    // console.log('tarr',tarr)
                                    if (tarr[1]) {
                                        dto[tarr[0]] = tarr[1]
                                    }
                                }
                                dto['name'] = dto['partnerUserName'] || ''
                                dto['userId'] = dto['partnerUserId'] || ''
                                // console.log('tmp arr',arr,dto)
                            } else {
                                dto = JSON.parse(res.result)
                            }
                            if (!!dto['userId']) {
                                var partnerName = dto['name'] || ''
                                var partnerId = dto['userId'] || ''
                                that.bindPartnerUser(partnerId, partnerName)
                            } else {
                                that.$message.showToast('二维码格式不正确扫码失败')
                            }
                        } catch (e) {
                            console.log('e', e)
                            that.$message.showToast('二维码扫码错误')
                        }
                    },
                    fail() {
                        that.$message.showToast('扫码失败')
                    }
                });
            },
            toInfo() {
                var url = ''
                if (this.currentInfo.id) {
                    // #ifdef PUB_CUSTOMER
                    url = '/sub_pages/customer/customer-info/customer-info'
                    // #endif
                    // #ifdef PUB_PARTNER
                    url = '/sub_pages/partner/partner-info/partner-info'
                    // #endif
                    // #ifdef PUB_SUPPLIER
                    url = '/sub_pages/supplier/supplier-info/supplier-info'
                    // #endif
                    if (url) {
                        uni.navigateTo({
                            url: url
                        })
                    }
                }
            },
            getTj() {
                // /api/supplier/delivery
                if (this.currentInfo.id && this.currentInfo.id !== this.cacheUserId) {
                    this.cacheUserId = this.currentInfo.id
                    let that = this
                    setTimeout(() => {
                        // #ifdef PUB_CUSTOMER
                        this.$http.request('get', '/api/customer/center/tj', {}).then(res => {
                            if (res.code === 0) {
                                that.tj = res.data || {}
                            }
                        })
                        //获取待支付数目
                        this.$http.request('get', '/api/customer/order/statistics/count', {
                            params: {}
                        }).then(res => {
                            if (res.code === 0) {
                                // that.order_pendding_num = res.data || 0
                                that.tj_order = res.data || {}
                                // this.$forceUpdate()
                                console.log('tj_order', that.tj_order)
                            }
                        })
                        //判断有没有签到
                        let that = this
                        this.$http.request('get', '/api/customer/point/sign/sign/today', {}).then(res => {
                            if (res.data) {
                                that.signToday = true
                            }
                        })
                        // #endif
                    }, 200)
                }
            },
            async clearlogout() {
                await this.$message.confirm('是否退出登录?')
                this.$store.commit('updateLogin', false)
                uni.reLaunch({
                    url: '/pages/login/supplier-login'
                })
            },
            async callTel() {
                await this.$message.confirm('是否拨打客服电话')
                uni.makePhoneCall({
                    phoneNumber: this.tel //仅为示例
                });
            },
            toCustomerLogin() {
                uni.navigateTo({
                    url: '/pages/login/supplier-login'
                })
            },
        }
    }
</script>
<style lang="scss" scoped>
    @import "@/pages/user/user.scss";
</style>
<!-- #ifdef PUB_CUSTOMER -->
<style lang="scss" scoped>
    @import "@/pages/user/user-customer.scss";
</style>
sub_pages/customer/setup/setup.vue
@@ -9,6 +9,13 @@
                    <uni-icons type="right"></uni-icons>
                </view>
            </view>
            <view class="user-util m-t-12 flex" v-if="selftype==='customer'||!selftype"
                @click="goto('/sub_pages/customer/setup/account-self',true)">
                <view class="title">账户安全</view>
                <view class="right-icon">
                    <uni-icons type="right"></uni-icons>
                </view>
            </view>
            <view class="user-util m-t-12 flex" v-if="selftype==='customer'"
                @click="goto('/pages/help/content?id=隐私政策',false)" >
                <view class="title">隐私政策</view>
@@ -31,11 +38,11 @@
                </view>
            </view>
            <view class="user-util m-t-12 flex" @click="clearlogout">
                <view class="title">退出登录</view>
                <view class="right-icon">
            <view class="user-util m-t-12 flex logout" @click="clearlogout">
                <view class="title2">退出登录</view>
                <!-- <view class="right-icon">
                    <uni-icons type="right"></uni-icons>
                </view>
                </view> -->
            </view>
sub_pages/customer/shop/shop.vue
@@ -175,12 +175,12 @@
                            <u-col span="2">
                                <view style="display: flex; justify-content: flex-start; align-items: center;padding: 5rpx;">
                                    <u--image v-if="item.anonymityFalg==1 " :showLoading="true"
                                    src="https://youzhen123.oss-cn-huhehaote.aliyuncs.com/WechatOwnerProperty/images/mrtx.png" width="30px" height="30px"  shape="circle"></u--image>
                                    src="https://hmy-flower.oss-cn-shanghai.aliyuncs.com/95/95450acd98ff4245ab998809496ba6d5niming.png" width="30px" height="30px"  shape="circle"></u--image>
                                    <u--image v-else :showLoading="true" :src="item.customerCover" width="30px" height="30px"  shape="circle"></u--image>
                                </view>
                            </u-col>
                            <u-col span="10" style="font-size: 12px;">
                                <span v-if="item.anonymityFalg==1 " >匿名用户</span>
                                <span v-if="item.anonymityFalg==1 " >{{formatAnonymityName(item.customerName)}}</span>
                                <span v-else>{{item.customerName}}</span>
                            </u-col>
                        
@@ -208,10 +208,7 @@
                                        
                                        <!--       <image v-for="(commentImg,index2) of item.commentImagesList" :key="index2" :src="commentImg" class="comment-img" @click="previewImg(commentImg)"></image> -->
                        
                                        <u-grid
                                                :border="false"
                                                @click="click"
                                        >
                                        <u-grid :border="false" >
                                            <u-grid-item
                                                    v-for="(commentImg,index2) of item.commentImagesList"
                                                    :key="index2"
@@ -479,6 +476,15 @@
            }
        },
        methods: {
            formatAnonymityName(name) {
                if (name.length <= 1) {
                    return '**' + name + '**';
                } else {
                    const firstChar = name.charAt(0);
                    return '**' + firstChar + '**';
                }
            },
            
            async getCommentsStatis() {
                {
@@ -999,9 +1005,13 @@
            flex-wrap: wrap;
            .comment-img{
                margin:5rpx; 
                width:150rpx;;
                height:150rpx;
                width:170rpx;
                height:170rpx;
                border-radius: 10rpx;
                object-fit: contain;
            }
            .comment-img2{
                object-fit: cover; /* 或 contain */
            }
        }
        
sub_pages/supplier/wallet/wallet-billing-detail.vue
@@ -20,16 +20,6 @@
                        </u-cell>
                    </u-cell-group>
                            
                    <!-- <u-calendar
                        :show="calendarShow"
                        :minDate="minDate"
                        :maxDate="maxDate"
                        allowSameDay="true"
                        mode="range"
                        :defaultDate="[query.startDate,query.endDate]"
                        @confirm="confirm"
                        @close="close"
                    ></u-calendar> -->
                    <u-calendar
                        :show="calendarShow"
                        minDate="2024-07-01"
@@ -37,23 +27,42 @@
                        allowSameDay="true"
                        :monthNum="12"
                        mode="range"
                        :startText="startText"
                          :endText="endText"
                        :defaultDate="[query.startDate,query.endDate]"
                        @confirm="confirm"
                        @close="close"
                    ></u-calendar>
                    >
                    </u-calendar>
                </view>
                        
                <u-cell-group>
                    <u-cell
                        v-for="(item,index) in list " :key="index"
                    >
                        <image slot="icon" src="https://hmy-flower.oss-cn-shanghai.aliyuncs.com/dc/dc56da3413664c829b0be3c229672c88qianbi.png" class="image-icon"></image>
                        <view slot="title" class="f10">{{ item.typeName }}</view>
                    <!-- 收入 -->
                    <!-- https://hmy-flower.oss-cn-shanghai.aliyuncs.com/56/56abe8c4217a4f41a87cee6a82a36913billincome.png -->
                        <!-- 提现发起 -->
                        <!-- https://hmy-flower.oss-cn-shanghai.aliyuncs.com/47/4778ee2740904450a9d420305e9c940awithdrawstart.png -->
                        <!-- 提现成功 -->
                        <!-- https://hmy-flower.oss-cn-shanghai.aliyuncs.com/47/477032a3a4a3480ea71f0aad040f9047withdrawsucess.png -->
                        <!-- 提现失败 -->
                        <!-- https://hmy-flower.oss-cn-shanghai.aliyuncs.com/37/3721dfee31684221b3476e4182517699withdrawfail.png -->
                        <view  slot="icon">
                            <image v-if="item.type=='settlement' "  src="https://hmy-flower.oss-cn-shanghai.aliyuncs.com/56/56abe8c4217a4f41a87cee6a82a36913billincome.png" class="image-icon"></image>
                            <image v-else-if="item.type=='withdraw' && item.withdrawType=='start' "  src="https://hmy-flower.oss-cn-shanghai.aliyuncs.com/47/4778ee2740904450a9d420305e9c940awithdrawstart.png" class="image-icon"></image>
                            <image v-else-if="item.type=='withdraw' && item.withdrawType=='success' "  src="https://hmy-flower.oss-cn-shanghai.aliyuncs.com/47/477032a3a4a3480ea71f0aad040f9047withdrawsucess.png" class="image-icon"></image>
                            <image v-else-if="item.type=='withdraw' && item.withdrawType=='fail' "  src="https://hmy-flower.oss-cn-shanghai.aliyuncs.com/37/3721dfee31684221b3476e4182517699withdrawfail.png" class="image-icon"></image>
                            <image v-else  src="https://hmy-flower.oss-cn-shanghai.aliyuncs.com/56/56abe8c4217a4f41a87cee6a82a36913billincome.png" class="image-icon"></image>
                        </view>
                        <view slot="title" class="f10">{{ item.typeName }}<text v-if="item.withdrawType"> ({{item.withdrawTypeName}}) </text> </view>
                        <view slot="label" class="f10" >{{ getYyyyMmDdHh24Mi(item.createTime) }}</view>
                        <view slot="value" style="text-align: right;" class="f10">
                            <view>
                                <text v-if="item.method==='reduce' ">-</text>
                                {{ item.changeAmount }}
                                <text v-if="item.method==='reduce' && item.withdrawType !='success' " class="f-c-y">-{{ item.changeAmount }}</text>
                                <text v-else-if="item.method==='add' " class="f-c-r">+{{ item.changeAmount }}</text>
                                <text v-else></text>
                            </view>
                            <view>余额:{{ item.balance }}</view>
                        </view>
@@ -71,12 +80,14 @@
            return {
                calendarShow:false,
                calendarLabel:'',
                startText:"",
                endText:"",
                minDate: '',
                maxDate: '',
                query:{
                    startDate:"",
                    endDate:""
                },
                minDate: '',
                maxDate: '',
            };
        },
        
@@ -128,7 +139,7 @@
            async getPageList(){
                this.page.size=20
                this.listApi = '/v2/wallet-bill-record/page'
                this.listApi = '/v2/wallet-bill-record/pageByDesc'
                let ref=await this.getList()
                console.log(ref)
            },
@@ -148,6 +159,12 @@
<style lang="scss">
    .u-page{
        font-size: 14px;
        .f-c-y{
            color: #FEA850;
        }
        .f-c-r{
            color: red;
        }
        .f10{
            font-size: 14px;
sub_pages/supplier/wallet/wallet-withdrao-deposit-record.vue
@@ -33,7 +33,13 @@
                </view>    
                <u-cell-group>
                    <u-cell v-for="(item,index) in list " :key="index">
                        <image slot="icon" src="https://hmy-flower.oss-cn-shanghai.aliyuncs.com/dc/dc56da3413664c829b0be3c229672c88qianbi.png" class="image-icon"></image>
                        <!-- <image slot="icon" src="https://hmy-flower.oss-cn-shanghai.aliyuncs.com/dc/dc56da3413664c829b0be3c229672c88qianbi.png" class="image-icon"></image> -->
                        <view  slot="icon">
                            <image v-if="item.withdrawState=='start' "  src="https://hmy-flower.oss-cn-shanghai.aliyuncs.com/47/4778ee2740904450a9d420305e9c940awithdrawstart.png" class="image-icon"></image>
                            <image v-else-if="item.withdrawState=='success' "  src="https://hmy-flower.oss-cn-shanghai.aliyuncs.com/47/477032a3a4a3480ea71f0aad040f9047withdrawsucess.png" class="image-icon"></image>
                            <image v-else-if="item.withdrawState=='fail' "  src="https://hmy-flower.oss-cn-shanghai.aliyuncs.com/37/3721dfee31684221b3476e4182517699withdrawfail.png" class="image-icon"></image>
                            <image v-else  src="https://hmy-flower.oss-cn-shanghai.aliyuncs.com/dc/dc56da3413664c829b0be3c229672c88qianbi.png" class="image-icon"></image>
                        </view>
                        <view slot="title">
                            <text class="f10">提交:{{getYyyyMmDdHh24Mi(item.createTime)}}</text>
                            <text class="margin-lf-20 f10">¥{{item.amount}}</text>
sub_pages/supplier/wallet/wallet-withdrao-deposit.vue
@@ -80,6 +80,9 @@
        },
        methods: {
             submitWithdraw(){
                this.$message.showLoading()
                // 防止多次重复点击
                this.protocal=false
                // 判断输入的金额是否是数字,需要真正则表达式,两位小数点
                this.$refs.uForm.validate().then(async res => {
                    const resp = await this.$http.request('post', '/v2/withdraw-record', {
@@ -97,6 +100,8 @@
                }).catch(err => {
                    console.log(err)
                }).finally(() => {
                    this.$message.hideLoading()  // 关闭加载提示
                })
            },
@@ -107,9 +112,15 @@
                   if (!value) {
                       return callback(new Error('请输入提现金额'));
                   }
                   if (!decimalRegex.test(value)) {
                       return callback(new Error('提现金额必须是有效的数字(最多两位小数)'));
                   }
                   // 提现金额要大于0
                   if (value <= 0) {
                        return callback(new Error('提现金额必须大于0'));
                    }
                   if (value > this.wallet.withdrawableAmount) {
                        return callback(new Error('提现金额不能大于可提现金额'));
                    }