xuxueyang
2024-08-29 b37bca8f7a6cdae798e74f14b51936e3a6a9637c
update 售后问题
已修改6个文件
155 ■■■■■ 文件已修改
manifest.json 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/login/supplier-login.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/order/order-detail.vue 113 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/order/order.vue 28 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
store/index.js 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
sub_pages/partner/delivery/delivery-detail.vue 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
manifest.json
@@ -49,7 +49,7 @@
    "quickapp" : {},
    /* 快应用特有相关 */
    "mp-weixin" : {
        "appid" : "wx1441324401626290",
        "appid" : "wx6d0ecc4e18710458",
        "setting" : {
            "urlCheck" : false,
            "es6" : true,
pages/login/supplier-login.vue
@@ -47,7 +47,7 @@
                    </view>
                    <view class="flex flex-wrap-normal" v-if="true">
                        <view :style="{'margin-top': '40rpx','margin-right': '12rpx','font-size':'24rpx'}"
                        <view :style="{'margin-top': '24rpx','margin-right': '12rpx','font-size':'24rpx'}"
                            @click="protocal=!protocal" class="component-radio" :class="[protocal?'cur':'']">
                        </view>
pages/order/order-detail.vue
@@ -168,11 +168,12 @@
                                    tmp.$message.showLoading()
                                    const {
                                        code
                                    } = await tmp.$http.request('get', '/api/customer/order/receive/confirm', {
                                        params: {
                                            id: tmp.id,
                                        }
                                    })
                                    } = await tmp.$http.request('get',
                                        '/api/customer/order/receive/confirm', {
                                            params: {
                                                id: tmp.id,
                                            }
                                        })
                                    tmp.$message.hideLoading()
                                    if (code === 0) {
                                        tmp.getDetail()
@@ -392,12 +393,13 @@
                })
                this.$message.hideLoading()
                if (code == 0) {
                    this.$message.showToast('提交成功')
                    this.showSales = false
                    this.$forceUpdate()
                    setTimeout(() => {
                        uni.navigateBack()
                    }, 1200)
                    await this.$message.showToast('提交成功')
                    uni.navigateBack()
                    // this.showSales = false
                    // this.$forceUpdate()
                    // setTimeout(() => {
                        // uni.navigateBack()
                    // }, 1200)
                }
            },
        },
@@ -432,59 +434,64 @@
                </view>
            </view>
        </view>
        <view class="flower-info m-b-20 m-t-12 br-4" v-for="(item,index) of list" :key="index">
            <view class="supplier-name ">
                <image class="icon-dp" src="/static/common/icon-dp.png"></image>
                {{ item.supplierName || ''}}
            </view>
            <view class="flex m-t-12">
                <radio v-if="showSales" disabled :checked="submitForm.orderItemId == item.id"></radio>
                <!-- @click="changeSalesOrderItem(item)" -->
                <!-- :checked="submitForm.orderItems.indexOf(item.id)>=0" -->
        <view v-for="(item,index) of list" :key="index">
            <view class="flower-info m-b-20 m-t-12 br-4" v-if="!showSales||showSales&&(submitForm.orderItemId == item.id)">
                <view class="supplier-name ">
                    <image class="icon-dp" src="/static/common/icon-dp.png"></image>
                    {{ item.supplierName || ''}}
                </view>
                <!-- submitForm.orderItemId:{{submitForm.orderItemId}} -->
                <!-- itemId:{{item.id}} -->
                <view class="flex m-t-12">
                    <!-- <radio v-if="showSales" disabled :checked="submitForm.orderItemId == item.id"></radio> -->
                    <!-- @click="changeSalesOrderItem(item)" -->
                    <!-- :checked="submitForm.orderItems.indexOf(item.id)>=0" -->
                <image class="flower-img img100 br-4 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.warehouseLocationCode || dto.warehouseLocationCode  || '-' }}
                    <image class="flower-img img100 br-4 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.warehouseLocationCode || dto.warehouseLocationCode  || '-' }}
                                </view>
                            </view>
                        <view class="each-item">
                            <view class="label">颜色</view>
                            <view class="value">{{ item.flowerColor || '-' }}</view>
                            <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>
                            <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 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 || '-' }}</view>
                        </view>
                        <view class="each-item">
                            <view class="label">总金额</view>
                            <view class="value t-red">¥{{ item.total || '-' }}</view>
                            </view>
                            <view class="each-item">
                                <view class="label">售价</view>
                                <view class="value">¥{{ item.price || '-' }}</view>
                            </view>
                            <view class="each-item">
                                <view class="label">总金额</view>
                                <view class="value t-red">¥{{ item.total || '-' }}</view>
                            </view>
                        </view>
                    </view>
                </view>
            </view>
            </view>
        </view>
        <view class="info-container bg-white br-4" v-if="!showSales">
            <view class="form-item">
pages/order/order.vue
@@ -100,7 +100,8 @@
                    url: '/pages/order/order-detail?id=' + item.id
                })
            },
            toDetailSale(dto, flower) {
            toDetailSaleInfo(dto, flower) {
                console.log('flower', dto, flower)
                uni.navigateTo({
                    url: '/pages/order/order-detail?showsales=1&id=' + dto.id + '&flowerId=' + flower.id
                })
@@ -130,7 +131,7 @@
                        var tryCallWx = false
                        // #ifdef MP
                        let tmp = this
                        if (wx.openBusinessView&&item.paymentTrId) {
                        if (wx.openBusinessView && item.paymentTrId) {
                            tryCallWx = true
                            wx.openBusinessView({
                                businessType: 'weappOrderConfirm',
@@ -145,11 +146,12 @@
                                    tmp.$message.showLoading()
                                    const {
                                        code
                                    } = await tmp.$http.request('get', '/api/customer/order/receive/confirm', {
                                        params: {
                                            id: item.id,
                                        }
                                    })
                                    } = await tmp.$http.request('get',
                                        '/api/customer/order/receive/confirm', {
                                            params: {
                                                id: item.id,
                                            }
                                        })
                                    tmp.$message.hideLoading()
                                    if (code === 0) {
                                        tmp.refreshList()
@@ -369,8 +371,8 @@
                    </view>
                    <view class="value">{{ dto.paymentTime || '-' }}</view>
                </view>
                <view class="flower-info m-b-5 m-t-8 br-4" v-for="(item,index) of dto.items" :key="index">
                    <view class="line-gray"></view>
                <view class="flower-info m-b-5 m-t-8 br-4" v-for="(item,j) of dto.items" :key="j">
                    <!-- <view class="line-gray"></view> -->
                    <view class="supplier-name ">
                        <image class="icon-dp br-4" src="/static/common/icon-dp.png"></image>
@@ -415,9 +417,11 @@
                            </view>
                        </view>
                    </view>
                    <view class="line-gray"></view>
                    <view class="flex buttons">
                        <view class="button button-1 m-l-a m-r-15" @click="toDetailSale(dto,item)"
                    <view class="line-gray" v-if="dto.statusBackend!=='COMPLETED'&&dto.statusBackend!=='SEND'&&dto.statusBackend=='RECEIVE'"></view>
                    <!-- dtoId:{{dto.id}} -->
                    <!-- flowerId:{{item.id}} -->
                    <view class="flex buttons" v-if="dto.statusBackend!=='COMPLETED'&&dto.statusBackend!=='SEND'&&dto.statusBackend=='RECEIVE'">
                        <view class="button button-1 m-l-a m-r-0" @click="toDetailSaleInfo(dto,item)"
                            v-if="dto.statusBackend === 'RECEIVE'"> 申请售后
                        </view>
                    </view>
store/index.js
@@ -31,7 +31,7 @@
            'follow': 0,
            'delivery': 0,
            'order': 0,
            'shopnum': 0
            'shopnum': 0,
        },
        defaultaddress: {}
    },
sub_pages/partner/delivery/delivery-detail.vue
@@ -44,6 +44,12 @@
                target_levels: [],
            };
        },
        async onShow() {
            if (this.sign['delivery']) {
                await this.$store.dispatch('sign_clear', 'delivery');
                this.refreshList()
            }
        },
        async onLoad(options) {
            this.id = options.id || ''
@@ -181,6 +187,8 @@
                this.$message.hideLoading()
                if (code === 0) {
                    this.$refs.popup_form.close()
                    await this.$store.dispatch('sign_add', 'delivery')
                    await this.$message.showToast('操作成功')
                    this.init()