diff --git a/apis/enquiryListApi.js b/apis/enquiryListApi.js new file mode 100644 index 0000000..d1876d0 --- /dev/null +++ b/apis/enquiryListApi.js @@ -0,0 +1,29 @@ +import http from '../utils/http/index.js' +// 获取获取询价结果列表 +export function getEnquiryOrder(data) { + return http.get( + { + url: '/base-paper-trading/get/enquiry-order/result-list', + data + }, + { + hideLoading: true + } + ) +} +/** + * 询价单去下单 + * swagger:https://api-ops-yyt-test.qniao.cn//base-paper-trading/swagger-ui/index.html?urls.primaryName=CustomerApi#/%E5%8E%9F%E7%BA%B8%E8%AE%A2%E5%8D%95/createCustomerOrderByEnquiryUsingPOST + * + */ +export function createByEnquiry(data) { + return http.post( + { + url: '/base-paper-trading/buyer/paper/goods/reserve/by-enquiry', + data + }, + { + isEncrypt: true + } + ) +} diff --git a/apis/orderApi.js b/apis/orderApi.js index 470932f..20ae694 100644 --- a/apis/orderApi.js +++ b/apis/orderApi.js @@ -137,3 +137,25 @@ export function getReciptCode(data) { data }) } + +/** + * 供应商获取合同列表 + * @param {object} data signDate enterpriseId type + */ +export function getContractList(data) { + return http.get({ + url: '/base-paper-trading/supplier/get/contract-list', + data + }) +} + +/** + * 获取已签署合同企业列表 + * @param {object} data enterpriseId + */ +export function getCooperationList(data) { + return http.get({ + url: '/base-paper-trading/supplier/get/contract-enterprise-list', + data + }) +} diff --git a/components/qn-data-picker/qn-data-picker.vue b/components/qn-data-picker/qn-data-picker.vue index 4de83d5..f163247 100644 --- a/components/qn-data-picker/qn-data-picker.vue +++ b/components/qn-data-picker/qn-data-picker.vue @@ -375,6 +375,7 @@ export default { } .selected-item { + width: 100%; flex-direction: row; padding: 0 1px; /* #ifndef APP-NVUE */ diff --git a/components/qn-datetime-picker/qn-datetime-picker.vue b/components/qn-datetime-picker/qn-datetime-picker.vue index 0161c73..28aae21 100644 --- a/components/qn-datetime-picker/qn-datetime-picker.vue +++ b/components/qn-datetime-picker/qn-datetime-picker.vue @@ -776,6 +776,7 @@ export default { background-color: #fff; color: #666; font-size: 14px; + width: 100%; } .uni-date-x--border { diff --git a/pages.json b/pages.json index c695016..056a30a 100644 --- a/pages.json +++ b/pages.json @@ -118,7 +118,23 @@ { "path": "pages/add-address-manage/index", "style": { - "navigationBarTitleText": "地址管理", + "navigationBarTitleText": "添加地址", + "enablePullDownRefresh": false, + "navigationStyle": "custom" + } + }, + { + "path": "pages/contract-manage/index", + "style": { + "navigationBarTitleText": "合同管理", + "enablePullDownRefresh": false, + "navigationStyle": "custom" + } + }, + { + "path": "pages/enquiry-list/index", + "style": { + "navigationBarTitleText": "询价列表", "enablePullDownRefresh": false, "navigationStyle": "custom" } diff --git a/pages/cart/index.vue b/pages/cart/index.vue index 5723a50..3904620 100644 --- a/pages/cart/index.vue +++ b/pages/cart/index.vue @@ -37,7 +37,7 @@ 预估重量:{{ subItem.weight }}吨 ¥{{ subItem.price }} - + @@ -431,6 +431,10 @@ export default { } } .footer-box { + position: fixed; + bottom: 0; + left: 0; + right: 0; .check-text { font-size: 24rpx; color: #333333; diff --git a/pages/contract-manage/index.vue b/pages/contract-manage/index.vue new file mode 100644 index 0000000..bd4e016 --- /dev/null +++ b/pages/contract-manage/index.vue @@ -0,0 +1,257 @@ + + + + + diff --git a/pages/enquiry-list/index.vue b/pages/enquiry-list/index.vue new file mode 100644 index 0000000..d5c5460 --- /dev/null +++ b/pages/enquiry-list/index.vue @@ -0,0 +1,337 @@ + + + + + diff --git a/pages/mall/index.vue b/pages/mall/index.vue index b7adb75..68c7cd1 100644 --- a/pages/mall/index.vue +++ b/pages/mall/index.vue @@ -30,7 +30,12 @@ - + diff --git a/pages/mine/index.vue b/pages/mine/index.vue index 839d857..883538c 100644 --- a/pages/mine/index.vue +++ b/pages/mine/index.vue @@ -73,7 +73,7 @@ 询价结果 - + 合同管理 @@ -81,9 +81,13 @@ 验厂申请 - + + + + 地址管理 diff --git a/pages/page-view/index.vue b/pages/page-view/index.vue index 6d0076e..1a25aed 100644 --- a/pages/page-view/index.vue +++ b/pages/page-view/index.vue @@ -48,12 +48,12 @@ export default { go2('fs-credit', { ...this.params }, true) } // 订单合同签署成功 - if (data.type == 'zzgSupplierTCSignSuccess') { + if (data.type == 'ybkClientTCSignSuccess') { go2('order-detail', { orderId: data.data.orderId }, true) } // 签约成功 if (data.type == 'signSuccess') { - // go2('paper-mall-order-detail', { id: data.orderId }, true) + // go2('order-detail', { id: data.orderId }, true) } // 实名认证成功 if (data.type == 'certificatedSuccess') { diff --git a/pages/paper-details/index.vue b/pages/paper-details/index.vue index f7cb2b3..31d6cf0 100644 --- a/pages/paper-details/index.vue +++ b/pages/paper-details/index.vue @@ -156,8 +156,8 @@ const validateFields = [ label: '纸品克重' }, { - value: 'pieceQuantity', - label: '购买数量' + value: 'buyTon', + label: '购买重量' } ] export default { @@ -263,7 +263,6 @@ export default { // 查询店铺纸品详情 queryData() { getPaperDetail(this.params).then((res) => { - console.log('店铺纸品详情', res) if (res) { this.info = res if (!this.info.imgList || this.info.imgList.length == 0) { diff --git a/static/imgs/.DS_Store b/static/imgs/.DS_Store index ac42259..48fc33d 100644 Binary files a/static/imgs/.DS_Store and b/static/imgs/.DS_Store differ diff --git a/utils/hook.js b/utils/hook.js index e3a2309..49a6943 100644 --- a/utils/hook.js +++ b/utils/hook.js @@ -169,6 +169,7 @@ export function uploadVideo(sourceType = ['album', 'camera'], compressed = true) maxDuration: 30, success: (res) => { const tempFilePath = res.tempFilePath + console.log('video size:', res, res.size) if (res.size && res.size > 1024 * 1024 * 10) { reject('视频大小不能超过10M') } else {