diff --git a/apis/trade.js b/apis/trade.js index a5e2e40..5c7bdc5 100644 --- a/apis/trade.js +++ b/apis/trade.js @@ -19,5 +19,34 @@ export function gettradingHallList(data) { }, { hideLoading: true } ) +} +// 我的报价 +export function getMyreplyList(data) { + return http.get( + { + url: '/base-paper-trading/get/my-reply-list', + data + }, + { hideLoading: true } + ) +} +// 提交报价 +export function updataEnquiryReply(data) { + return http.post({ + url: '/base-paper-trading/update/enquiry-reply', + data + }) +} +// 获取报价详情 +export function enquiryReplyDetail(data) { + return http.get( + { + url: '/base-paper-trading/get/enquiry-reply-detail/'+data, + }, + { hideLoading: true } + ) } + + + diff --git a/pages/client-detail/basic-information.vue b/pages/client-detail/basic-information.vue index 8159c24..1b2924e 100644 --- a/pages/client-detail/basic-information.vue +++ b/pages/client-detail/basic-information.vue @@ -292,7 +292,7 @@ export default { flex-direction: row; justify-content: space-between; height: 88rpx; - line-height: 88rpx; + line-height: 88rpx; border-bottom: 2rpx solid #dddddd; padding: 0rpx 32rpx; diff --git a/pages/my-offer/index.vue b/pages/my-offer/index.vue index a9ef9fa..7965e1c 100644 --- a/pages/my-offer/index.vue +++ b/pages/my-offer/index.vue @@ -8,28 +8,26 @@ - + 广州民族印刷有限公司 - {{controlItems[items.orderStatus -1] }} + {{ controlItems[items.orderStatus - 1] }} - - - - - + + {{ item.brandName }}{{ item.categoryName }} - {{ item.categoryName }}/{{ item.brandName }}/{{ item.gramWeight }}g/{{ item.length }}*{{ item.width }}/{{item.pieceQuantity }}张 + {{ item.categoryName }}/{{ item.brandName }}/ + {{ item.gramWeight }}g/{{ item.length }}*{{ item.width }}/{{ item.pieceQuantity }}张 - - 三分钟前 + 三分钟前 + ¥{{ items.totalOfferPrice }} @@ -40,10 +38,10 @@ @@ -162,7 +159,7 @@ export default { .list-title-line { line-height: 88rpx; padding-left: 48rpx; - background: #FFFFFF; + background: #ffffff; } .my-offer-title { width: 100%; @@ -193,7 +190,7 @@ export default { .list-info-line { padding-left: 48rpx; line-height: 70rpx; - background: #FFFFFF; + background: #ffffff; } .list-info-contant { margin-left: 48rpx; @@ -224,13 +221,14 @@ export default { display: flex; } .list-bottom-contant { - line-height: 70rpx; + align-items: center; padding-left: 48rpx; - width: 750rpx; height: 80rpx; - background: #FFFFFF; + background: #ffffff; + display: flex; + justify-content: space-between; } - .list-time{ + .list-time { font-family: PingFangSC-Regular; font-size: 26rpx; color: #888888; @@ -239,4 +237,4 @@ export default { font-weight: 400; } } - + diff --git a/pages/quotation-details/index.vue b/pages/quotation-details/index.vue index b29b623..61ea7a4 100644 --- a/pages/quotation-details/index.vue +++ b/pages/quotation-details/index.vue @@ -78,6 +78,7 @@ import { back, go2 } from '@/utils/hook.js' import qnHeader from '@/components/qn-header/qn-header.vue' import uGap from '@/components/u-gap/u-gap.vue' +import { enquiryReplyDetail } from '@/apis/trade.js' export default { components: { qnHeader, @@ -92,6 +93,16 @@ export default { }, methods: { back, + // 获取详情 + getDetail(id){ + this.enquiryReplyDetail(id) + .then(({ list, total }) => { + this.$refs.orderRef.loadSuccess({ list, total }) + }) + .catch(() => { + this.$refs.orderRef.loadFail() + }) + }, // 商品操作按钮 commodityModify(item) { console.log(111) diff --git a/pages/submit-quotation/index.vue b/pages/submit-quotation/index.vue index dd4bf34..dfaa92c 100644 --- a/pages/submit-quotation/index.vue +++ b/pages/submit-quotation/index.vue @@ -1,673 +1,721 @@ - - - - - diff --git a/pages/trade/index.vue b/pages/trade/index.vue index f0288c8..bbdf05c 100644 --- a/pages/trade/index.vue +++ b/pages/trade/index.vue @@ -28,7 +28,7 @@ import notLogged from '@/components/not-logged/not-logged.vue' import scrollList from '@/components/scroll-list/scroll-list.vue' import quotationList from './quotationList.vue' import orderList from './orderList.vue' -import { getEnterpriseList, gettradingHallList } from '@/apis/trade' +import { gettradingHallList } from '@/apis/trade' export default { components: { notLogged, scrollList, quotationList, orderList }, data() { diff --git a/pages/trade/orderList.vue b/pages/trade/orderList.vue index e1deb0d..d1d539a 100644 --- a/pages/trade/orderList.vue +++ b/pages/trade/orderList.vue @@ -1,233 +1,238 @@ - - - - - + + + + + diff --git a/pages/trade/quotationList.vue b/pages/trade/quotationList.vue index 2131d85..5ee410f 100644 --- a/pages/trade/quotationList.vue +++ b/pages/trade/quotationList.vue @@ -52,7 +52,7 @@