From 4bd6696ea0858639ec7cf3cdedf707c7afaa7d2a Mon Sep 17 00:00:00 2001 From: chenkun <3289431190@qq.com> Date: Tue, 29 Oct 2024 23:31:05 +0800 Subject: [PATCH] . --- api/api.js | 18 ++ components/base/centerList.vue | 3 +- locale/en.json | 3 + locale/zh-Hans.json | 6 +- pages.json | 6 + pages/index/center2.vue | 7 + pages_order/center/helpFeedback.vue | 9 +- pages_order/components/order/myOrderList.vue | 133 +++++++++ pages_order/components/order/orderList.vue | 18 +- pages_order/order/myOrderDetail.vue | 418 +++++++++++++++++++++++++++ pages_order/order/myOrders.vue | 49 ++++ pages_order/order/orderDetail2.vue | 68 +++-- pages_order/order/pendingOrder.vue | 13 +- 13 files changed, 706 insertions(+), 45 deletions(-) create mode 100644 pages_order/components/order/myOrderList.vue create mode 100644 pages_order/order/myOrderDetail.vue create mode 100644 pages_order/order/myOrders.vue diff --git a/api/api.js b/api/api.js index 2e22f71..3c69dbc 100644 --- a/api/api.js +++ b/api/api.js @@ -143,6 +143,24 @@ const config = { method: 'POST', limit: 500, }, + // 我的订单列表 + myOrderlist: { + url: '/product/myOrderlist', + method: 'GET', + limit: 500, + }, + // 采购商根据订单id查询订单信息 + getMyOrderInfo: { + url: '/product/myOrderlist', + method: 'GET', + limit: 500, + }, + // 供应商根据挂单id查询挂单详情的接口 + getProductInfo: { + url: '/product/myOrderlist', + method: 'GET', + limit: 500, + }, } diff --git a/components/base/centerList.vue b/components/base/centerList.vue index 4ce8002..096439d 100644 --- a/components/base/centerList.vue +++ b/components/base/centerList.vue @@ -40,7 +40,8 @@ export default { item.text === '我的挂单' || item.englishText === 'myOrders' || item.text === '系统设置' || item.englishText === 'systemSettings' || item.text === '关于我们' || item.englishText === 'aboutUs' || - item.text === '帮助反馈' || item.englishText === 'helpFeedback' + item.text === '帮助反馈' || item.englishText === 'helpFeedback' || + item.text === '我的订单' || item.englishText === 'Myorder' ) { console.log("进入 " + item.text) uni.navigateTo({ diff --git a/locale/en.json b/locale/en.json index b04fe37..f8ac511 100644 --- a/locale/en.json +++ b/locale/en.json @@ -167,6 +167,7 @@ "spotTrading": "Spot Trading", "futuresTrading": "Futures Trading", "aluminumProducts": "Aluminum Products", + "specification": "specification【Al>96%】", "tentativeQuantity": "Tentative Qty (Tons)", "performanceDeposit": "Performance Bond", "priceQuantityPercentage": "(Price * Qty * 2%)", @@ -195,6 +196,8 @@ "supplierQuotation": "Supplier Quotation", "supplierOrder": "Supplier Listing", "myOrders": "My Listings", + "Myorder": "My order", + "OrderInfo": "Order Info", "payDeposit": "Pay Bond", "supplierBilLading": "Supplier bill of lading", "backOrderTitle": "Cancel pending order", diff --git a/locale/zh-Hans.json b/locale/zh-Hans.json index 1ad4e74..bd30fd3 100644 --- a/locale/zh-Hans.json +++ b/locale/zh-Hans.json @@ -103,7 +103,6 @@ "applicationReview": "申请审核", "registrationNotice": "注册须知", "serviceAgreementAndPrivacyTerms": "服务协议与隐私条款", - "and": "以及", "personalInfoProtectionGuideline": "个人信息保护指引", "applyForAvatarNickname": "申请获取你的头像、昵称", "confirmR": "确认", @@ -168,7 +167,8 @@ "orderList": "挂单列表", "spotTrading": "现货交易", "futuresTrading": "期货交易", - "aluminumProducts": "铝制品", + "aluminumProducts": "铝制品【Al>96%】", + "specification": "铝锭【Al>96%】", "tentativeQuantity": "暂定数量(吨)", "performanceDeposit": "履约保证金", "priceQuantityPercentage": "(单价*数量*{0}%)", @@ -198,6 +198,8 @@ "supplierBilLading": "供应商提单", "supplierOrder": "供应商挂单", "myOrders": "我的挂单", + "Myorder": "我的订单", + "OrderInfo": "订单详情", "payDeposit": "支付保证金", "backOrderTitle": "撤销挂单", "backOrderTitleConfirm": "确认撤单吗?撤单后数据不可恢复", diff --git a/pages.json b/pages.json index 84bf873..4ca9ce1 100644 --- a/pages.json +++ b/pages.json @@ -45,6 +45,12 @@ { "path": "auth/selectionIdentity" }, + { + "path": "order/myOrders" + }, + { + "path": "order/myOrderDetail" + }, { "path": "auth/registerShop" }, diff --git a/pages/index/center2.vue b/pages/index/center2.vue index cba9696..71ffc5d 100644 --- a/pages/index/center2.vue +++ b/pages/index/center2.vue @@ -70,6 +70,13 @@ export default { // 采购商 purchaserList: [ // this.$t('pages.index.index.companyProfile') + { + text: `${this.$t('other.Myorder')}`, + englishText: 'Myorder', + value: ">", + imgUrl: '/static/image/center/14.svg', + toPathUrl: '/pages_order/order/myOrders' + }, {text: `${this.$t('components.contactCustomerService')}`, englishText:'contactCustomerService',value: ">", imgUrl: '/static/image/center/13.svg'}, {text: `${this.$t('components.systemSettings')}`,englishText:'systemSettings', value: ">", imgUrl: '/static/image/center/12.svg', toPathUrl: '/pages_order/center/systemSet'}, {text: `${this.$t('components.helpFeedback')}`,englishText:'systemSettings', value: ">", imgUrl: '/static/image/center/12.svg', toPathUrl: '/pages_order/center/helpFeedback'}, diff --git a/pages_order/center/helpFeedback.vue b/pages_order/center/helpFeedback.vue index c2cc96a..1e31691 100644 --- a/pages_order/center/helpFeedback.vue +++ b/pages_order/center/helpFeedback.vue @@ -12,7 +12,8 @@ - + + {{ $t('components.screenshot') }} * @@ -52,10 +53,10 @@ + + + \ No newline at end of file diff --git a/pages_order/components/order/orderList.vue b/pages_order/components/order/orderList.vue index d04a1fc..4c443ef 100644 --- a/pages_order/components/order/orderList.vue +++ b/pages_order/components/order/orderList.vue @@ -82,9 +82,12 @@ export default { lookDetail(item, index) { // 交易平台的列表只用于展示，有撤单的说明是我的挂单，则可以查看详情 if (this.showBackOrder){ + // uni.navigateTo({ + // url: `/pages_order/order/orderDetail2?id`+item.id + // }) uni.navigateTo({ - url: `/pages_order/order/orderDetail2?id`+item.id - }) + url: `/pages_order/order/myOrderDetail?orderInfo=${encodeURIComponent(JSON.stringify(item))}` + }); } }, @@ -92,25 +95,22 @@ export default { backOrder(id) { let self = this uni.showModal({ - title: this.$t('other.backOrderTitle'), - content: this.$t('other.backOrderTitleConfirm'), + title: self.$t('other.backOrderTitle'), + content: self.$t('other.backOrderTitleConfirm'), success(e) { if(e.confirm){ self.$api('noShow', {id}, res => { if (res.code == 200) { uni.showToast({ - title: this.$t('other.backOrderSuccess'), + title: self.$t('other.backOrderSuccess'), icon: 'none' }) - self.getAddressList() + self.$emit("getList") } }) } } }) - uni.navigateTo({ - url: `/pages_order/order/backOrder?id=1` - }) }, } } diff --git a/pages_order/order/myOrderDetail.vue b/pages_order/order/myOrderDetail.vue new file mode 100644 index 0000000..b96d684 --- /dev/null +++ b/pages_order/order/myOrderDetail.vue @@ -0,0 +1,418 @@ + + + + + \ No newline at end of file diff --git a/pages_order/order/myOrders.vue b/pages_order/order/myOrders.vue new file mode 100644 index 0000000..9e5537f --- /dev/null +++ b/pages_order/order/myOrders.vue @@ -0,0 +1,49 @@ + + + + + \ No newline at end of file diff --git a/pages_order/order/orderDetail2.vue b/pages_order/order/orderDetail2.vue index b8ef825..ca50bcf 100644 --- a/pages_order/order/orderDetail2.vue +++ b/pages_order/order/orderDetail2.vue @@ -1,7 +1,7 @@