update更新bug

xuxueyang

2024-07-29 bb21ccd19d8a96f3798c0fa180946569321844a9

update更新bug

 common/icons.scss

@@ -15,4 +15,6 @@
                width: 38rpx;
                height: 38rpx;
                background-size: 100% 100%;
                vertical-align: middle;
                display: inline-block;
            }

 mixin/mixin.js

@@ -53,6 +53,16 @@
        }
    },
    methods: {
        copyTxt(txt) {
            uni.setClipboardData({
                data: txt, //要被复制的内容
                success: () => { //复制成功的回调函数
                    uni.showToast({ //提示
                        title: '复制成功'
                    })
                }
            })
        },
        onChooseavatar(e) {
            let self = this;
            let {

 pages.json

@@ -98,25 +98,7 @@
                "navigationBarTitleText": "订单详情",

                "enablePullDownRefresh": false

            }

        }

        // #ifdef PUB_PARTNER	
        ,

        {

            "path": "sub_pages/partner/delivery/delivery",

            "style": {

                "navigationBarTitleText": "配送质检",

                "enablePullDownRefresh": true

            }

        },

        {

            "path": "sub_pages/partner/delivery/delivery-detail",

            "style": {

                "navigationBarTitleText": "质检详情",

                "enablePullDownRefresh": true

            }

        }

        // #endif

        , {

        }, {

            "path": "pages/help/content",

            "style": {

                "navigationBarTitleText": ""

@@ -217,6 +199,20 @@
                        "navigationBarTitleText": "加价配置",

                        "enablePullDownRefresh": true

                    }

                },

                {

                    "path": "delivery/delivery",

                    "style": {

                        "navigationBarTitleText": "配送质检",

                        "enablePullDownRefresh": true

                    }

                },

                {

                    "path": "delivery/delivery-detail",

                    "style": {

                        "navigationBarTitleText": "质检详情",

                        "enablePullDownRefresh": true

                    }

                }

                // #endif

            ]


 pages/order/order-detail.vue

@@ -24,16 +24,7 @@
            }
        },
        methods: {
            copyTxt(txt) {
                uni.setClipboardData({
                    data: txt, //要被复制的内容
                    success: () => { //复制成功的回调函数
                        uni.showToast({ //提示
                            title: '复制成功'
                        })
                    }
                })
            },
			
            async getDetail() {
                this.$message.showLoading()
                const {

 sub_pages/partner/delivery/delivery.vue

@@ -63,7 +63,7 @@
    },
    toDetail(item) {
      uni.navigateTo({
        url: `//sub_pages/partner/delivery/delivery-detail?id=${item.id}`
        url: `/sub_pages/partner/delivery/delivery-detail?id=${item.id}`
      })
    },
    async compelete(item) {

 sub_pages/supplier/order-sale/order-sale.vue

@@ -1,43 +1,54 @@
<template>
    <view class="list-container order-sale supplier">
        <view class="component-tab-container m-t-12">
<!--         <view class="component-tab-container m-t-12">
            <view class="tab-item" :class="[tabIndex==0?'cur':'']" @click="changeIndex(0)">本月</view>
            <view class="tab-item" :class="[tabIndex==1?'cur':'']" @click="changeIndex(1)">全部</view>
        </view>
        </view> -->
        <view class="p15" style="min-height: calc(100vh - 160rpx);">
            <no-data v-if="!list||list.length==0" style="width: 100%;"></no-data>
            <view v-for="(item,index) in list" :key="index" class="m-b-24 order-sale-list list-container">
                <view class="order-sale-item list-item">
                    <view class="title">{{item.title}}<span>A级</span></view>
                <view class="order-sale-item br-4 list-item bg-white">
                    <view class="title flex">
                        <view>售后单号:{{item.salesNo}}</view>
                        <view class="m-l-a m-r-0 status">审核状态：{{item.auditStatusStr}}</view>
                    </view>
                    <view class="line"></view>
                    <view class="form">
                        <view class="form-item">
                            <view class="label">理赔数量</view>
                            <view class="value">1</view>
                            <view class="label" @click="copyTxt(item.orderNo)">订单单号</view>
                            <view class="value">{{item.orderNo}}</view>
                        </view>
                        <view class="flex">
                            <view class="form-item flex1">
                                <view class="label">状态</view>
                                <view class="value">{{item.statusStr}}</view>
                            </view>
                            <view class="form-item flex1">
                                <view class="label">订单金额</view>
                                <view class="value">{{item.totalOrderAmount||0}}</view>
                            </view>
                        </view>
                        <view class="flex">
                            <view class="form-item">
                                <view class="label">收货人</view>
                                <view class="value">{{item.customer}}</view>
                        </view>
                        <view class="form-item">
                            <view class="label">买家ID</view>
                            <view class="value">1</view>
                                <view class="label">联系方式</view>
                                <view class="value">{{item.customerTel}}</view>
                            </view>
                        </view>
                        <view class="form-item">
                            <view class="label">平台支付</view>
                            <view class="value red">1</view>
                        </view>
                        <view class="form-item">
                            <view class="label">商家赔付</view>
                            <view class="value red">1</view>
                        </view>
                        <view class="form-item">
                            <view class="label">下单时间</view>
                            <view class="value">1</view>
                        </view>
                        <view class="form-item">
                            <view class="label">申请时间</view>
                            <view class="value">1</view>
                            <view class="label">提交人</view>
                                <view class="value">{{item.createName}}</view>
                        </view>
                        <view class="form-item width100">
                            <view class="label">申请原因</view>
                            <view class="value">1</view>
                            <view class="label">提交时间</view>
                                <view class="value">{{item.createTime}}</view>
                        </view>
                        <view class="form-item">
                            <view class="label">理由</view>
                            <view class="value">{{item.reason}}</view>
                        </view>
                    </view>
                </view>
@@ -58,7 +69,7 @@
            }
        },
        onLoad() {
            this.listApi = ''
            this.listApi = '/api/partner/sales/list'
            this.getList()

        },
@@ -102,7 +113,8 @@
            }

            .line {
                height: 2rpx solid #EEEEEE;
                min-height: 2rpx;
                background-color: #EEEEEE;
                margin-top: 16rpx;
                margin-bottom: 16rpx;
            }
@@ -110,10 +122,11 @@
            .form {
                display: flex;
                flex-wrap: wrap;

                .form-item {
                    flex: 1;
                    min-width: 40%;
                    max-width: 50%;
                    // min-width: 40%;
                    // max-width: 50%;

                    .label {
                        font-weight: 400;

 sub_pages/supplier/order-settlement/order-settlement.vue

@@ -1,60 +1,75 @@
<template>
    <view class="list-container order-settlement supplier">
    <view class="list-container order-sale supplier">
        <view class="component-tab-container m-t-12">
            <view class="tab-item" :class="[tabIndex==0?'cur':'']" @click="changeIndex(0)">今日</view>
            <view class="tab-item" :class="[tabIndex==0?'cur':'']" @click="changeIndex(0)">本月</view>
            <view class="tab-item" :class="[tabIndex==1?'cur':'']" @click="changeIndex(1)">全部</view>
        </view>

        <view class="p15" style="min-height: calc(100vh - 160rpx);">
            <no-data v-if="!list||list.length==0" style="width: 100%;"></no-data>
            <view v-for="(item,index) in list" :key="index" class="m-b-24 order-settlement-list list-container">
                <view class="order-settlement-item list-item">
            <view v-for="(item,index) in list" :key="index" class="m-b-24 order-sale-list list-container">
                <view class="order-sale-item br-4 list-item bg-white">
                    <view class="title flex">
                        <image class="icon-date m-r-6 m-t-2" src="@/static/common/icon-date.png"></image>
                        <view>{{item.title}}</view>
                        <view class="status m-l-a m-r-0">已结算</view>
                        <view class="title">
                            <image src="/static/common/icon-date.png" class="icon-date m-r-10 image"></image>
                            转账日期:{{item.createTime}}
                        </view>
                        <!-- <view class="m-l-a m-r-0 status">审核状态：{{item.auditStatusStr}}</view> -->
                    </view>
                    <view class="line"></view>
                    <view class="form">
                        <view class="flex">
                            <view class="form-item flex1">
                                <view class="label">结算单价/均价</view>
                                <view class="value">￥{{item.price||'0.00'}}</view>
                            </view>
                            <view class="form-item flex1">
                                <view class="label">商品数量</view>
                                <view class="value">{{item.flowerNum||0}}</view>
                            </view>
                        </view>
                        <view class="flex">
                        <view class="form-item">
                            <view class="label">均价</view>
                            <view class="value">￥32.00</view>
                                <view class="label">订单数量</view>
                                <view class="value">{{item.orderNum}}</view>
                        </view>
                        <view class="form-item">
                            <view class="label">买家</view>
                            <view class="value">1位</view>
                                <view class="label">买家数量</view>
                                <view class="value">{{item.customerNum}}</view>
                        </view>
                        <view class="form-item">
                            <view class="label">数量</view>
                            <view class="value red">1扎</view>
                        </view>
                        <view class="form-item">
                            <view class="label">商家赔付</view>
                            <view class="value red">1</view>
                        </view>
                        <view class="flex">
                        <view class="form-item">
                            <view class="label">服务费</view>
                            <view class="value">￥32.00</view>
                                <view class="value">{{item.serviceFee}}</view>
                        </view>
                        <view class="form-item">
                            <view class="label">理赔</view>
                            <view class="value">￥32.00</view>
                                <view class="label">售后理赔</view>
                                <view class="value">{{item.salesFee}}</view>
                            </view>
                        </view>
                        <view class="flex">
                            <view class="form-item">
                                <view class="label">质检扣款</view>
                                <view class="value">{{item.checkFee}}</view>
                        </view>
                        <view class="form-item">
                            <view class="label">运费</view>
                            <view class="value">￥32.00</view>
                                <view class="label">集货站运费</view>
                                <view class="value">{{item.stationFee}}</view>
                            </view>
                        </view>
                    </view>

                    <view class="line"></view>
                    <view class="form">
                    <view class="flex">
                        <view class="flex1 tj">
                            <view class="label">交易合计：</view>
                            <view class="value">￥32.00</view>
                            <view class="form-item">
                                <view class="label title-bold">交易合计</view>
                                <view class="value t-red">￥{{item.totalAmount||0}}</view>
                        </view>
                        <view class="flex1 tj text-right">
                            <view class="label">结算金额：</view>
                            <view class="value">￥32.00</view>
                            <view class="form-item">
                                <view class="label title-bold">结算金额</view>
                                <view class="value t-red">￥{{item.settlementAmount||0}}</view>
                            </view>
                        </view>
                    </view>
                </view>
@@ -72,10 +87,19 @@
        data() {
            return {
                tabIndex: 0,
                query:{
                    startDateStr:'',
                    endDateStr:'',
                }
            }
        },
        onLoad() {
            this.listApi = '/api/supplier/delivery/list/today'
            var currentMonthStr = this.$util.toDate(new Date())
            this.query.startDateStr = currentMonthStr
            var lastMonthDate = new Date(new Date(currentMonthStr).getTime() - 3600_000*24*10)
            this.query.endDateStr = this.$util.toDate(lastMonthDate)
			
            this.listApi = '/api/partner/settlement/list'
            this.getList()

        },
@@ -93,13 +117,17 @@
                if (this.tabIndex !== index) {
                    this.tabIndex = index
                    // 刷新 query
                    if (index == 0) {
                        this.listApi = '/api/supplier/delivery/list/today'
                    }
                    if (index == 1) {
                        this.listApi = '/api/supplier/delivery/list'
                    if(index===0){
                        var currentMonthStr = this.$util.toDate(new Date())
                        this.query.startDateStr = currentMonthStr
                        var lastMonthDate = new Date(new Date(currentMonthStr).getTime() - 3600_000*24*10)
                        this.query.endDateStr = this.$util.toDate(lastMonthDate)
                    }else{
                        this.query.startDateStr = ''
                        this.query.endDateStr = ''
                    }
                    this.refreshList()
					
                }
            },
            toDetail(item) {
@@ -112,62 +140,33 @@
</script>

<style lang="scss" scope>
    .order-settlement-list {
        .order-settlement-item {
    .order-sale-list {
        .order-sale-item {
            margin-bottom: 20rpx;
            padding: 28rpx;
            padding: 22rpx;

            .title {
                font-weight: 600;
                font-size: 28rpx;
                color: #000000;
                line-height: 40rpx;

                .status {
                    font-weight: 400;
                    font-size: 28rpx;
                    color: #20613D;
                    line-height: 40rpx;
                }

                .status.red {
                    color: #CF0000;
                }

                .status.green {
                    color: var(--topiccolor);
                }
            }

            .line {
                height: 2rpx solid #EEEEEE;
                min-height: 2rpx;
                background-color: #EEEEEE;
                margin-top: 16rpx;
                margin-bottom: 16rpx;
            }

            .tj {
                .label {
                    font-weight: 600;
                    font-size: 28rpx;
                    color: #000000;
                    line-height: 40rpx;
                }

                .value {
                    font-weight: 400;
                    font-size: 28rpx;
                    color: #CF0000;
                    line-height: 40rpx;
                }
            }

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

                .form-item {
                    flex: 1;
                    min-width: 26%;
                    max-width: 33%;
                    // min-width: 40%;
                    // max-width: 50%;

                    .label {
                        font-weight: 400;
@@ -196,7 +195,9 @@
                    }
                }


                .form-item.width100 {
                    max-width: unset;
                }
            }
        }
    }