diff --git a/api/order.js b/api/order.js index 825e27c..cd9933d 100644 --- a/api/order.js +++ b/api/order.js @@ -103,3 +103,39 @@ export function getMiniProgramSignUrl(data) { data, }); } + +// 售后申请 +export function afterSaleApply(data) { + return request({ + url: "/order/afterApply", + method: "post", + data, + }); +} + +// 售后订单详情 +export function afterSaleDetail(data) { + return request({ + url: "/order/getAfterDetail", + method: "get", + data, + }); +} + +// 撤销售后申请 +export function cancelAfterSale(data) { + return request({ + url: "/order/cancelAfterApply", + method: "post", + data, + }); +} + +// 寄回商品反馈 +export function returnGoodsFeedback(data) { + return request({ + url: "/order/sendGoodsBack", + method: "post", + data, + }); +} diff --git a/pages/mine/mine.vue b/pages/mine/mine.vue index 83d75a7..f20f964 100644 --- a/pages/mine/mine.vue +++ b/pages/mine/mine.vue @@ -70,34 +70,47 @@ - - - - 商家入驻 + + 入驻信任桥 + + + + + + 商家入驻 + 获取更多客户与订单机会 + + 申请 - + + - - - - - 企业/品牌入驻 + + + + + + 企业/品牌入驻 + 助您打造专属品牌馆 + + + 申请 - + - + 服务工具 @@ -396,14 +409,14 @@ export default { jumpEnter(type) { // 商家入驻 if (type === "merchant") { - uni.navigateTo({ - url: '/pages/merchant_settlement/merchant_settlement', - }) - // this.openShow = true; + // uni.navigateTo({ + // url: '/pages/rwa_package/merchant_settlement/merchant_settlement.vue', + // }) + this.openShow = true; } else if (type === "brand") { // 企业/品牌入驻 // uni.navigateTo({ - // url:'/pages/brand_settlement/brand_settlement', + // url: '/pages/brand_settlement/brand_settlement', // }) this.brandShow = true; } @@ -566,6 +579,37 @@ export default { .mine_top_comm_warp { margin-top: 30rpx; + + .settled_list { + width: 100%; + box-sizing: border-box; + + .enter_item { + width: 100%; + margin-top: 10rpx; + padding: 12rpx 0; + box-sizing: border-box; + + .enter_item_cell { + display: flex; + + .u-transition { + margin-top: 5rpx; + } + + .enter_item_text { + margin-left: 10rpx; + + .enter_remark { + font-size: 24rpx; + color: #999999; + margin-top: 10rpx; + } + } + + } + } + } } /* 内容公共 end */ diff --git a/pages/mine_package/mine_order/after-sales/index.vue b/pages/mine_package/mine_order/after-sales/index.vue index c556e33..e943bcd 100644 --- a/pages/mine_package/mine_order/after-sales/index.vue +++ b/pages/mine_package/mine_order/after-sales/index.vue @@ -1,15 +1,86 @@ - - - + + + + \ No newline at end of file diff --git a/pages/mine_package/mine_order/after-sales/refund-popu.vue b/pages/mine_package/mine_order/after-sales/refund-popu.vue new file mode 100644 index 0000000..280f066 --- /dev/null +++ b/pages/mine_package/mine_order/after-sales/refund-popu.vue @@ -0,0 +1,411 @@ + + + diff --git a/pages/mine_package/mine_order/components/salesStatus.vue b/pages/mine_package/mine_order/components/salesStatus.vue new file mode 100644 index 0000000..c8a34b8 --- /dev/null +++ b/pages/mine_package/mine_order/components/salesStatus.vue @@ -0,0 +1,56 @@ + + + + + diff --git a/pages/mine_package/mine_order/emun/index.js b/pages/mine_package/mine_order/emun/index.js new file mode 100644 index 0000000..071a6f0 --- /dev/null +++ b/pages/mine_package/mine_order/emun/index.js @@ -0,0 +1,33 @@ +export const RETURN_REASON = { + 1: "我不想买了", + 2: "下错单了", + 3: "商家未发货", + 4: "商品质量问题", + 5: "商品实物与描述不符", + 6: "商家发错货", + 7: "假冒品牌", + 8: "配件破损", + 9: "主商品破损", + 10: "协商一致退款", + 11: "少件(少配件)", + 12: "其他", +} + +export const RETURN_REASON_LIST = [ + { id: 1, name: '我不想买了' }, + { id: 2, name: '下错单了' }, + { id: 3, name: '商家未发货' }, + { id: 4, name: '商品质量问题' }, + { id: 5, name: '商品实物与描述不符' }, + { id: 6, name: '商家发错货' }, + { id: 7, name: '假冒品牌' }, + { id: 8, name: '配件破损' }, + { id: 9, name: '主商品破损' }, + { id: 10, name: '协商一致退款' }, + { id: 11, name: '少件(少配件)' }, + { id: 12, name: '其他' }, +] + + + + \ No newline at end of file diff --git a/pages/mine_package/mine_order/mine_order.vue b/pages/mine_package/mine_order/mine_order.vue index e605bb3..d3e39b4 100644 --- a/pages/mine_package/mine_order/mine_order.vue +++ b/pages/mine_package/mine_order/mine_order.vue @@ -1,904 +1,1115 @@ - - - - - + + + + + diff --git a/pages/rwa_package/dongjian/check.vue b/pages/rwa_package/dongjian/check.vue index 3532b08..149c969 100644 --- a/pages/rwa_package/dongjian/check.vue +++ b/pages/rwa_package/dongjian/check.vue @@ -6,13 +6,12 @@ - 消费型合伙人协议 + {{ obj.contractName }} - - {{item.text}} + + {{ item.text }} - {{item.value}} + {{ item.value }} @@ -20,13 +19,13 @@ 合同签约人信息 - - {{item.text}} - {{item.value}} + + {{ item.text }} + {{ item.value }} - + 下载合同 @@ -41,45 +40,45 @@ import { getUserInfo } from '@/api/auth.js'; import Header from '@/components/common/header.vue'; import TopSafe from '@/components/common/top-safe.nvue' import ContractItem from './components/contract-item.vue' -import { getContractList,fileUrls } from '@/api/contract.js' +import { getContractList, fileUrls } from '@/api/contract.js' import func from '@/utils/func.js'; export default { - components: { Header,TopSafe,ContractItem }, + components: { Header, TopSafe, ContractItem }, data() { return { - dataList:[ - {text:'合同状态',value:'签约完成'}, - {text:'合同编号',value:'69485222011627525'}, - {text:'发起方',value:'信任桥(深圳)网络科技有限公司'}, - {text:'发起时间',value:'2025-08-11 12:00:00'}, - {text:'完成结束时间',value:'2025-08-11 12:00:00'}, + dataList: [ + { text: '合同状态', value: '签约完成' }, + { text: '合同编号', value: '' }, + { text: '发起方', value: '信任桥(深圳)网络科技有限公司' }, + { text: '发起时间', value: '' }, + { text: '完成结束时间', value: '' }, ], - bottomList:[ - {text:'签约人',value:'信任桥会员 章三'}, - {text:'状态',value:'已签署'}, - {text:'时间',value:'2025-08-11 12:00:00'}, + bottomList: [ + { text: '签约人', value: '信任桥会员 章三' }, + { text: '状态', value: '已签署' }, + { text: '时间', value: '2025-08-11 12:00:00' }, ], - obj:null, - url:'' + obj: null, + url: '' }; }, onLoad(option) { - this.init(); + this.init(); }, methods: { - init(){ + init() { this.isSignContract() }, - getfileUrls(){ + getfileUrls() { let params = { - businessType:'FLOW', - businessIds:[this.obj.flowId] + businessType: 'FLOW', + businessIds: [this.obj.flowId] } - fileUrls(params).then(res=>{ - if(res.bizcode == 100){ + fileUrls(params).then(res => { + if (res.bizcode == 100) { this.url = res.data.fileUrls[0].url; - }else{ + } else { this.$refs.uToastRef.show({ type: 'error', message: res.msg, @@ -87,21 +86,24 @@ export default { } }) }, - isSignContract(){ - - getContractList().then(res=>{ - if(res.bizcode == 100){ + isSignContract() { + + getContractList().then(res => { + if (res.bizcode == 100) { this.obj = JSON.parse(JSON.stringify(res.data[0])); - this.obj.time = func.formatDate(new Date(res.data[0].signatureTime),2); - this.obj.details.startTime = func.formatDate(new Date(res.data[0].details.startTime),2); - this.obj.details.endTime = func.formatDate(new Date(res.data[0].details.endTime),2); - this.dataList[2].value = this.obj.flowId; + this.obj.time = func.formatDate(new Date(res.data[0].signatureTime), 2); + this.obj.details.startTime = func.formatDate(new Date(res.data[0].details.startTime), 2); + this.obj.details.endTime = func.formatDate(new Date(res.data[0].details.endTime), 2); + // this.dataList[2].value = this.obj.flowId; + + this.dataList[0].value = this.obj.state ? '已签署' : '未签署'; + this.dataList[1].value = this.obj.flowId; this.dataList[3].value = this.obj.details.startTime; this.dataList[4].value = this.obj.details.endTime; this.bottomList[0].value = this.obj.signatureName; this.bottomList[2].value = this.obj.time; this.getfileUrls(); - }else{ + } else { this.$refs.uToastRef.show({ type: 'error', message: res.msg, @@ -109,84 +111,115 @@ export default { } }) }, - onOpen(){ - // window.open(this.obj.contractName,'_blank') - window.open(this.url,'_blank') - } + onOpen() { + // #ifdef APP-PLUS + uni.downloadFile({ + url: this.url, + success: (res) => { + if (res.statusCode === 200) { + uni.saveFile({ + tempFilePath: res.tempFilePath, + success: (res) => { + uni.openDocument({ + filePath: res.savedFilePath, + success: (res) => { + console.log('打开文档成功') + } + }) + } + }) + } + } + }) + // #endif + // #ifdef H5 + window.open(this.url, '_blank') + // #endif + }, + } } diff --git a/pages/rwa_package/rwa/rwa.vue b/pages/rwa_package/rwa/rwa.vue index 5003e5b..6eaba12 100644 --- a/pages/rwa_package/rwa/rwa.vue +++ b/pages/rwa_package/rwa/rwa.vue @@ -20,7 +20,7 @@ - 提现 + 行权兑换 diff --git a/utils/request.js b/utils/request.js index c0445f3..867215b 100644 --- a/utils/request.js +++ b/utils/request.js @@ -87,7 +87,7 @@ function request(options) { } } else { uni.showToast({ - title: data.msg, + title: data.msg || "系统错误,请稍后再试", icon: 'none', // 可选 success/loading/none duration: 2000, // 持续时长,单位ms });