update 细节和订单确认收货（提示支付和确认收货的人，需要同一个openid）

xuxueyang

2024-09-24 2c095c287031ef764ef983002174f57cb630e5d5

update 细节和订单确认收货（提示支付和确认收货的人，需要同一个openid）

 pages/order/order-detail.vue

@@ -111,7 +111,7 @@

        },
        methods: {
			

            openbrand(item) {
                //也要判断一下是否重复进入
                //判断堆栈，如果是店铺，就直接返回
@@ -134,7 +134,7 @@
                        return
                    }
                }
			 

                if (pages.length >= 10) {
                    //直接强制购物车
                    uni.reLaunch({
@@ -145,9 +145,9 @@
                        url: '/sub_pages/customer/shop/shop?id=' + (item.supplierId || '')
                    })
                }
		 
         },
			

            },

            toFlowerDetail(item) {
                console.log(item)
                uni.navigateTo({
@@ -253,28 +253,37 @@
                                extraData: {
                                    // merchant_id: '',
                                    // merchant_trade_no: '',
                                    merchant_id: '1661512517',
                                    merchant_trade_no: tmp.id || '',
                                    // merchant_id: '1661512517',
                                    // merchant_trade_no: tmp.id || '',
                                    transaction_id: tmp.dto && tmp.dto.paymentTrId || ''
                                },
                                async success(info) {
                                    console.log('info', info)
                                    //dosomething
                                    // 发送请求
                                    tmp.$message.showLoading()
                                    const {
                                        code
                                    } = await tmp.$http.request('get',
                                        '/api/customer/order/receive/confirm', {
                                            params: {
                                                id: tmp.id,
                                            }
                                        })
                                    tmp.$message.hideLoading()
                                    if (code === 0) {
                                        tmp.getDetail()
                                        tmp.$store.dispatch('getCurrentInfo')
                                    if (info.extraData && info.extraData.status === 'fail') {
                                        tmp.$message.showToast('支付和确认收货需要是同一微信号，请联系实际支付人登录确认')
										
                                    } else if (info.extraData && info.extraData.status === 'cancel') {

                                    } else {
                                        tmp.$message.showLoading()
                                        const {
                                            code
                                        } = await tmp.$http.request('get',
                                            '/api/customer/order/receive/confirm', {
                                                params: {
                                                    id: tmp.id,
                                                }
                                            })
                                        tmp.$message.hideLoading()
                                        if (code === 0) {
                                            tmp.getDetail()
                                            tmp.$store.dispatch('getCurrentInfo')
                                        }

                                    }

                                },
                                fail(e) {
                                    //dosomething

 pages/order/order.vue

@@ -93,8 +93,8 @@
            uni.stopPullDownRefresh()
        },
        methods: {
			
			


            openbrand(item) {
                console.log(item)
                //也要判断一下是否重复进入
@@ -118,7 +118,7 @@
                        return
                    }
                }
			

                if (pages.length >= 10) {
                    //直接强制购物车
                    uni.reLaunch({
@@ -129,7 +129,7 @@
                        url: '/sub_pages/customer/shop/shop?id=' + (item.supplierId || '')
                    })
                }
			

            },
            toFlowerDetail(item) {
                uni.navigateTo({
@@ -166,8 +166,8 @@
                    url: '/pages/order/order-detail?id=' + item.id
                })
            },
			
            async copyOrder(item){

            async copyOrder(item) {
                console.log(item)
                await this.$message.confirm('是否确定再来一单')
                // 发送请求
@@ -184,13 +184,13 @@
                this.$message.hideLoading()
                if (code === 0) {
                    //微信接口
                    if(msg&&msg!=""){
                    if (msg && msg != "") {
                        this.$message.showToast(msg)
                    }
				

                }
            },
			

            toDetailSaleInfo(dto, flower) {
                console.log('flower', dto, flower)
                uni.navigateTo({
@@ -234,29 +234,37 @@
                                extraData: {
                                    // merchant_id: '1230000109',
                                    // merchant_trade_no: '1234323JKHDFE1243252',
                                    merchant_id: '1661512517',
                                    merchant_trade_no: item.orderId || item.id || '',
                                    // merchant_id: '1661512517',
                                    // merchant_trade_no: item.orderId || item.id || '',
                                    transaction_id: item.paymentTrId
                                },
                                async success(info) {
                                    console.log('确认收货 info success', info)
                                    //dosomething
                                    // 发送请求
                                    tmp.$message.showLoading()
                                    const {
                                        code
                                    } = await tmp.$http.request('get',
                                        '/api/customer/order/receive/confirm', {
                                            params: {
                                                id: item.id,
                                            }
                                        })
                                    tmp.$message.hideLoading()
                                    if (code === 0) {
                                        tmp.refreshList()
                                        //刷新积分
                                        tmp.$store.dispatch('getCurrentInfo')
                                        tmp.$message.showToast('收货成功')
                                    if (info.extraData && info.extraData.status === 'fail') {
                                        tmp.$message.showToast('支付和确认收货需要是同一微信号，请联系实际支付人登录确认')
                                    } else if (info.extraData && info.extraData.status === 'cancel') {

                                    } else {


                                        // 发送请求
                                        tmp.$message.showLoading()
                                        const {
                                            code
                                        } = await tmp.$http.request('get',
                                            '/api/customer/order/receive/confirm', {
                                                params: {
                                                    id: item.id,
                                                }
                                            })
                                        tmp.$message.hideLoading()
                                        if (code === 0) {
                                            tmp.refreshList()
                                            //刷新积分
                                            tmp.$store.dispatch('getCurrentInfo')
                                            tmp.$message.showToast('收货成功')
                                        }
                                    }
                                },
                                fail(e) {
@@ -478,17 +486,17 @@
                <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 " @click.stop="openbrand(item)" >
                    <view class="supplier-name " @click.stop="openbrand(item)">
                        <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" >
                    <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" @click.stop="toFlowerDetail(item)"> -->
                        <view class="flex1" @click.stop="toDetail(dto)">
							

                            <view class=" flex">
                                <view class="title flex flex1">
                                    <!-- <span class="level">{{ item.flowerCategory }}</span> -->