From 9be5dd01e01c53e54eb10de4c1dfa5fd0bb6e1c6 Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期二, 24 九月 2024 15:55:45 +0800
Subject: [PATCH] 1.合伙人-工作台-首页-头像变形调整
---
pages/order/order-detail.vue | 307 ++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 245 insertions(+), 62 deletions(-)
diff --git a/pages/order/order-detail.vue b/pages/order/order-detail.vue
index 589f663..0f1af96 100644
--- a/pages/order/order-detail.vue
+++ b/pages/order/order-detail.vue
@@ -14,6 +14,8 @@
// #ifdef PUB_PARTNER
type: 'partner',
// #endif
+ salesTypeDef: 0,
+ salesTypeList: [],
};
},
onUnload() {
@@ -31,6 +33,7 @@
orderId: this.id,
// imageList: [],
videoList: [],
+ salesType: '',
reason: '',
// orderItems: [],
orderItemId: options.flowerId || '',
@@ -39,8 +42,9 @@
}
this.showSales = options.showsales && true || false
+ if (this.dto.statusBackend === 'PENDING' || this.dto.status === 'PENDING') {
- if (this.dto.statusBackend === 'PENDING') {
+
this.timer = setInterval(() => {
//倒计时
var nowdate = new Date().getTime() - 1000 * 60 * 5
@@ -83,8 +87,76 @@
}
+
+ this.$http.request('get', '/api/code/value', {
+ params: {
+ type: 'after_sale_type'
+ }
+ }).then(res => {
+ var data = res.data;
+
+ let tmpData = data.map(item => ({
+ value: item.value,
+ label: item.label
+ }));
+
+ // 将 '全部' 选项插入到 tmpData 的开头
+ this.salesTypeList = tmpData;
+ this.salesTypeList.unshift({
+ label: '全部',
+ value: ''
+ });
+
+ })
+
},
methods: {
+
+ openbrand(item) {
+ //也要判断一下是否重复进入
+ //判断堆栈，如果是店铺，就直接返回
+ //或者是：从商铺到列表再到详情，再到商铺，这种也不行
+ const pages = getCurrentPages();
+ console.log('toShopping', pages)
+ if (pages && pages.length >= 2) {
+ if (pages[pages.length - 2].route === "sub_pages/customer/shop/shop") {
+ uni.navigateBack()
+ return
+ }
+ }
+ if (pages && pages.length >= 3) {
+ if (pages[pages.length - 3].route === "sub_pages/customer/shop/shop" &&
+ pages[pages.length - 2].route === "sub_pages/customer/trade/list"
+ ) {
+ uni.navigateBack({
+ delta: 2
+ })
+ return
+ }
+ }
+
+ if (pages.length >= 10) {
+ //直接强制购物车
+ uni.reLaunch({
+ url: '/sub_pages/customer/shop/shop?id=' + (item.supplierId || '')
+ })
+ } else {
+ uni.navigateTo({
+ url: '/sub_pages/customer/shop/shop?id=' + (item.supplierId || '')
+ })
+ }
+
+ },
+
+ toFlowerDetail(item) {
+ console.log(item)
+ uni.navigateTo({
+ url: `/sub_pages/customer/trade/detail?id=${item.flowerId}`
+ })
+ },
+ salesTypeChange(e) {
+ this.submitForm.salesType = e.value
+ },
async getDetail() {
this.$message.showLoading()
@@ -101,8 +173,29 @@
if (code === 0) {
this.dto = {
...this.dto,
- ...data
+ ...data,
+ // pointGoodsList: [{
+ // name: '1',
+ // num: 1,
+ // description: 'descriptiondescriptiondescriptiondescriptiondescription'
+ // }]
}
+ if (this.dto.statusBackend === 'PENDING') {
+ //先判断要不要字节变成已取消
+ var nowdate = new Date().getTime() - 1000 * 60 * 5
+ var diff = new Date(this.dto.createTime).getTime() - nowdate
+
+ if (diff <= 2000 && true) {
+ //超过了5分钟
+ this.dto.statusBackend = 'CANCEL'
+ this.dto.statusBackendStr = '已取消'
+ this.dto.status = 'CANCEL'
+ this.dto.statusStr = '已取消'
+ this.dto.bctime = ''
+ this.$forceUpdate()
+ }
+ }
+
}
},
async callTel() {
@@ -168,14 +261,16 @@
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()
+ tmp.$store.dispatch('getCurrentInfo')
}
},
fail(e) {
@@ -222,6 +317,7 @@
id: this.id,
}
})
+
this.$message.hideLoading()
if (code === 0) {
//微信接口
@@ -372,6 +468,10 @@
this.$message.showToast('售后数量需要大于0')
return
}
+ if (!this.submitForm.salesType) {
+ this.$message.showToast('未填写售后类型')
+ return
+ }
if (!this.submitForm.reason) {
this.$message.showToast('未填写理由')
return
@@ -392,12 +492,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,60 +533,67 @@
</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 " @click.stop="openbrand(item)">
+ <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" @click.stop="toFlowerDetail(item)">
+ <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">
<view class="label">订单编号:</view>
@@ -501,7 +609,7 @@
</view>
<view class="form-item">
<view class="label">下单日期:</view>
- <view class="value">{{ dto.paymentTime || '-' }}</view>
+ <view class="value">{{ dto.createTime || '-' }}</view>
</view>
<view class="form-item" v-if="dto.cancelTime&&(dto.status==='CANCEL'||dto.status==='REFUND')">
<view class="label">取消时间:</view>
@@ -547,11 +655,29 @@
</view>
</view>
<view class="info-container bg-white br-4 m-t-12" v-if="!showSales">
- <view class="form-item">
- <view class="label">订单金额:</view>
- <view class="value">{{ dto.totalAmount || '-' }}</view>
+ <view class="form-item flex">
+ <view class="label">商品金额:</view>
+ <view class="value m-l-a m-r-0 text-right">+{{ dto.flowerAmount || '0' }}</view>
</view>
- <view class="form-item">
+ <view class="form-item flex">
+ <view class="label">运费:</view>
+ <view class="value m-l-a m-r-0 text-right">+{{ dto.transportFee || '0' }}</view>
+ </view>
+ <view class="form-item flex">
+ <view class="label">打包费:</view>
+ <view class="value m-l-a m-r-0 text-right">+{{ dto.packingFee || '0' }}</view>
+ </view>
+ <view class="form-item flex t-red">
+ <view class="label">优惠:</view>
+ <view class="value m-l-a m-r-0 text-right">-{{ dto.memberCouponAmount || '0' }}</view>
+ </view>
+ <view class="form-item flex t-red">
+ <view class="label">实际支付:</view>
+ <view class="value m-l-a m-r-0 text-right">￥{{ dto.paymentAmount || '0' }}</view>
+ </view>
+
+
+ <!-- <view class="form-item">
<view class="label">支付金额:</view>
<view class="value">{{ dto.paymentAmount || '-' }}</view>
</view>
@@ -559,10 +685,56 @@
<view class="label">商品金额:</view>
<view class="value">{{ dto.flowerAmount || '-' }}</view>
</view>
+
<view class="form-item">
- <view class="label">运费:</view>
- <view class="value">{{ dto.transportFee || '-' }}</view>
+ <view class="label">折扣类型:</view>
+ <view class="value">{{ dto.memberDiscountTypeStr || '-' }}</view>
</view>
+ <view class="form-item">
+ <view class="label">优惠金额（每扎）:</view>
+ <view class="value">￥{{ dto.memberDiscountAmount || '-' }}</view>
+ </view>
+ <view class="form-item">
+ <view class="label">优惠券:</view>
+ <view class="value">{{ dto.memberCouponName || '-' }}</view>
+ </view> -->
+ <!-- <view class="form-item">
+ <view class="label">优惠金额:</view>
+ <view class="value">{{ dto.memberCouponAmount || '-' }}</view>
+ </view> -->
+ </view>
+ <view class="info-container bg-white br-4 m-t-12"
+ v-if="!showSales&& dto.pointGoodsList&& dto.pointGoodsList.length>0">
+ <view v-for="(item,j) of dto.pointGoodsList" :key="j" class="m-b-12">
+ <view class="flower-info br-4">
+ <view class="flex flex-wrap-normal">
+ <image class="flower-img img100 br-4 m-r-6" :src="item.cover" @click="previewImg(item.cover)">
+ </image>
+ <view class="flex1">
+ <view class=" flex">
+ <view class="title">
+ {{ item.name || ''}}
+ </view>
+ </view>
+ <view class="each-list" style="display: contents;">
+ <view class="each-item">
+ <view class="label">数量</view>
+ <view class="value">{{ item.num || 0 }}</view>
+
+ </view>
+ <view class="each-item" style="min-width: unset;max-width: unset;">
+ <view class="label" style="min-width: 55rpx;">描述</view>
+ <view class="value" style="word-break: break-all;text-align: left;">
+ {{ item.description || '-' }}
+ </view>
+ </view>
+ </view>
+ </view>
+ </view>
+
+ </view>
+ </view>
+
</view>
@@ -599,6 +771,17 @@
class="form-input"></input>
</view>
</view>
+
+ <view class="form-item">
+ <view class="form-item-label require">
+ 售后类型
+ </view>
+ <view class="form-item-value">
+ <um-dropdown @change="salesTypeChange" :defaultIndex="salesTypeDef" rangeKey="label"
+ :optionList="salesTypeList" placeholder="售后类型"></um-dropdown>
+ </view>
+ </view>
+
<view class="form-item">
<view class="form-item-label require">
理由
--
Gitblit v1.9.3