diff --git a/pages.json b/pages.json index 651f1b5..be22234 100644 --- a/pages.json +++ b/pages.json @@ -467,6 +467,14 @@ "navigationBarTitleText": "呼叫和短信入口", "navigationStyle": "custom" } + }, + { + "path" : "shipinjiaocheng/shipinjiaocheng", + "style" : + { + "navigationBarTitleText" : "视频教程", + "navigationStyle": "custom" + } } ] } diff --git a/pages/common/shipinjiaocheng/shipinjiaocheng.vue b/pages/common/shipinjiaocheng/shipinjiaocheng.vue new file mode 100644 index 0000000..3b93f68 --- /dev/null +++ b/pages/common/shipinjiaocheng/shipinjiaocheng.vue @@ -0,0 +1,80 @@ + + + + + diff --git a/pages/index/index.nvue b/pages/index/index.nvue index e5ce6e6..cb58293 100644 --- a/pages/index/index.nvue +++ b/pages/index/index.nvue @@ -76,7 +76,7 @@ - + @@ -105,11 +105,11 @@ - + src="/static/image/index/shipinjiaocheng-banner.png" mode="widthFix" + @click="util.goPage(`/pages/common/shipinjiaocheng/shipinjiaocheng`)"> + @@ -559,15 +559,6 @@ const openVip = () => { goRechargePage() } -/** - * 点击视频教程 - * @param item - */ -const clickVideoHelp = (item) => { - const url = item.url - util.goPage(`/pages/common/webview/webview?url=${encodeURIComponent(url)}&title=${item.text}`) -} - /** * 点击公告 */ diff --git a/pages/shopping/taobao/add-shopping-order/add-shopping-order.vue b/pages/shopping/taobao/add-shopping-order/add-shopping-order.vue index 62de94d..cb454aa 100644 --- a/pages/shopping/taobao/add-shopping-order/add-shopping-order.vue +++ b/pages/shopping/taobao/add-shopping-order/add-shopping-order.vue @@ -237,20 +237,14 @@ - + class="flex-justify-between item" style="align-items: flex-start;" @click="onClickItemInfo(item)"> + {{ item.label }} - {{ - order.userName + ' ' + - "86-" + order.phone + ',' + - order.address - }} - @@ -268,6 +262,28 @@ + + + + + + + + + + + + + + + + + + + @@ -308,6 +324,18 @@ + + + + + + + + + + + 查看 - {{ item.label }} - + {{ item.label }} + + + 订单信息 + + + + + *点击切换商品长按可上传自定义图片* @@ -685,6 +724,49 @@ const clickRandomDate = () => { } }; +/** + * 选择店铺头像并转换为本地持久化路径 (并清理旧图) + */ +const chooseShopImg = () => { + // 记录旧图路径用于清理 + const oldImagePath = order.value.shopImg; + + uni.chooseImage({ + count: 1, + sizeType: ['original', 'compressed'], + sourceType: ['album', 'camera'], + success: (res) => { + const tempFilePath = res.tempFilePaths[0]; + uni.showLoading({ title: '处理图片中...' }); + + // 将新图保存为持久化文件 + uni.saveFile({ + tempFilePath: tempFilePath, + success: (saveRes) => { + // 1. 设置新图片路径 + order.value.shopImg = saveRes.savedFilePath; + + // 2. 如果旧图是本地持久化文件,则物理删除它 + if (oldImagePath && (oldImagePath.includes('_doc') || oldImagePath.includes('store_') || oldImagePath.includes('at_'))) { + uni.removeSavedFile({ + filePath: oldImagePath, + success: () => console.log('旧店铺头像已清理:', oldImagePath), + fail: (err) => console.error('旧店铺头像清理失败:', err) + }); + } + }, + fail: (err) => { + console.error('保存头像失败:', err); + order.value.shopImg = tempFilePath; + }, + complete: () => { + uni.hideLoading(); + } + }); + } + }); +} + /** * 选择图片并转换为本地持久化路径 (并清理旧图) */ @@ -1306,11 +1388,24 @@ watch(() => order.value?.orderInfo, (newInfo) => { } } + .upload-avatar { + width: 70rpx; + height: 70rpx; + border-radius: 8rpx; + margin-right: 12rpx; + background-color: #D8D8D8; + display: flex; + align-items: center; + justify-content: center; + } + &.product-card { background-color: #FFFFFF; padding: 32rpx; .shop-name-box { + + .shop-name { font-size: 28rpx; color: #00032A; diff --git a/pages/shopping/taobao/json/order.json b/pages/shopping/taobao/json/order.json index 655481e..578171a 100644 --- a/pages/shopping/taobao/json/order.json +++ b/pages/shopping/taobao/json/order.json @@ -351,11 +351,15 @@ "id": "202605110007", "orderType": "shopping", "shopName": "优衣库官方旗舰店", + "shopImg": "", "statusType": "refunding", "statusDesc": "平台支持退款", "shopType": "taobao", "refundMoney": "199.00", "refundIcon": 1, + "address": "上海市浦东新区汤臣一品", + "userName": "张三", + "phone": "13812345678", "productImgUrl": "/static/image/shopping/taobao/detail/refund/product1.png", "goodsList": [ { @@ -375,31 +379,78 @@ "label": "退款原因", "key": "refundReason", "value": "七天无理由退货", - "type": "text" + "type": "text", + "isCurrentFilter4": true }, { "label": "退款金额", "key": "refunMoney", "value": "", - "type": "digit" + "type": "digit", + "isCurrentFilter4": true }, { "label": "退款完结", "key": "refunTime", "value": "", - "type": "time" + "type": "time", + "isCurrentFilter4": true }, { "label": "申请时间", "key": "applyTime", "value": "", - "type": "time" + "type": "time", + "isCurrentFilter4": true }, { "label": "退款编号", "key": "refundId", "value": "", + "type": "number", + "isCurrentFilter4": true + }, + { + "label": "成交时间", + "key": "tradeTime", + "value": "", + "type": "time" + }, + { + "label": "付款时间", + "key": "paymentTime", + "value": "", + "type": "time" + }, + { + "label": "创建时间", + "key": "createTime", + "value": "", + "type": "time" + }, + { + "label": "支付宝交易号", + "key": "alipayOrderId", + "value": "2026030223656325698545232", "type": "number" + }, + { + "label": "交易快照", + "key": "transactionSnapshot", + "value": "发生交易争议时,可作为判断依据", + "type": "text" + }, + { + "label": "收货信息", + "key": "shippingInfo", + "value": "", + "type": "address" + }, + { + "label": "支付方式", + "key": "paymentMethod", + "value": "支付宝支付", + "type": "text" } ], "statusDesc1": "退回支付宝", diff --git a/pages/shopping/taobao/list-index.vue b/pages/shopping/taobao/list-index.vue index 6ad9442..15e75f6 100644 --- a/pages/shopping/taobao/list-index.vue +++ b/pages/shopping/taobao/list-index.vue @@ -561,7 +561,7 @@ const goDetail = (item) => { if (item.orderType === 'waimai') { util.goPage(`/pages/shopping/taobao/shangou-order-detail/shangou-order-detail?id=${item.id}`) } else { - util.goPage(`/pages/shopping/taobao/shopping-order-detail/shopping-order-detail?id=${item.id}`) + util.goPage(`/pages/shopping/taobao/shopping-order-detail/shopping-order-detail?id=${item.id}¤tFilter=${currentFilter.value}`) } } diff --git a/pages/shopping/taobao/shopping-order-detail/shopping-order-detail.vue b/pages/shopping/taobao/shopping-order-detail/shopping-order-detail.vue index 21681aa..2452573 100644 --- a/pages/shopping/taobao/shopping-order-detail/shopping-order-detail.vue +++ b/pages/shopping/taobao/shopping-order-detail/shopping-order-detail.vue @@ -8,7 +8,7 @@ - - + + {{ order.statusType == 'wait_recv' && !order.isSignFor ? '运输中' : '已签收' }} - {{ order.statusDesc2 }} + + + {{ order.statusType == 'refunding' ? order.userName + ' ' + "86-" + order.phone + ' 送至 ' + + order.address : order.statusDesc2 }} {{ order.address }} - + {{ order.address }} @@ -65,7 +71,7 @@ - @@ -82,7 +88,21 @@ - + + + + + {{ order.shopName }} + + + 进店逛逛 + + + + + @@ -90,7 +110,8 @@ - + @@ -125,6 +146,13 @@ x{{ item?.count }} + + + 退款成功 + {{ order.statusDesc }} + + + @@ -135,7 +163,8 @@ }} - + 商品总价 共{{ getGoodsTotalCount(order.goodsList) }}件 @@ -146,7 +175,7 @@ {{ getGoodsTotalPrice(order.goodsList).split('.')[1] }} - + @@ -180,7 +209,8 @@ {{ Number(order.totalPrice).toFixed(2).split('.')[0] }}. {{ Number(order.totalPrice).toFixed(2).split('.')[1] }} - @@ -188,6 +218,7 @@ {{ item.label }} @@ -228,7 +259,7 @@ - + 退款成功 @@ -255,6 +286,7 @@ + @@ -271,7 +303,7 @@ 协商历史 查看 - {{ item.label }} {{ item.value }} - {{ btn.name }} + {{ btn.name }} @@ -436,6 +468,15 @@ const btnList = { name: "加入购物车", isPrimary: false } + ], + "refunding": [ + { + name: "申请售后", + isPrimary: false + }, { + name: "加入购物车", + isPrimary: true + } ] } @@ -553,6 +594,28 @@ const bottomBtnList = { ] }, "refunding": { + icons: [ + { + icon: 'kefu', + name: '卖家' + }, + ], + btns: [ + { + name: '删除订单', + isPrimary: false + }, + { + name: '加入购物车', + isPrimary: false + }, + { + name: '钱款去向', + isPrimary: true + } + ] + }, + "refunding2": { icons: [ { icon: 'kefu', @@ -596,6 +659,7 @@ let order = ref(null) const currentId = ref(null); let countdownTimer = null; +const currentFilter = ref(-1) const loadOrderDetail = () => { if (!currentId.value) return; @@ -674,6 +738,7 @@ const initCountdown = () => { onLoad((options) => { if (options?.id) { currentId.value = options.id; + currentFilter.value = options.currentFilter } }) @@ -835,6 +900,16 @@ onUnmounted(() => { font-weight: 600; margin: 0 4rpx; } + + &.refunding-style { + padding-bottom: 24rpx; + border-bottom: 0.5px solid #D8D8D8 !important; + + .refund-shop { + background-color: #D8D8D8; + border-radius: 8rpx; + } + } } .goods-list { @@ -1350,6 +1425,34 @@ onUnmounted(() => { line-height: 28rpx; } } + +.refunding-desc { + display: flex; + align-items: center; + justify-content: space-between; + height: 64rpx; + background-color: #F4F5F7; + line-height: 64rpx; + padding: 0 12rpx; + border-radius: 12rpx; + margin-bottom: 6rpx; + margin-top: 16rpx; + + .label { + font-weight: 500; + font-size: 26rpx; + color: #1A1A1A; + line-height: 24rpx; + } + + .value { + font-size: 26rpx; + color: #7C8495; + line-height: 24rpx; + margin-left: 6rpx; + } + +}