From 903a49368c0085acbee483ccd8da7db10a67b454 Mon Sep 17 00:00:00 2001 From: dengxiongfei Date: Tue, 25 Jan 2022 21:23:27 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BA=B8=E5=95=86=E5=9F=8Ebug=E3=80=81?= =?UTF-8?q?=E6=8A=A5=E4=BB=B7bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/client-credit/index.vue | 8 ++++++-- pages/guarantee-agreement/index.vue | 5 +++-- pages/mall/index.vue | 18 +----------------- pages/submit-quotation/index.vue | 8 ++++---- pages/trade/index.vue | 9 --------- pages/trade/quotationList.vue | 6 +++--- utils/hook.js | 2 +- 7 files changed, 18 insertions(+), 38 deletions(-) diff --git a/pages/client-credit/index.vue b/pages/client-credit/index.vue index 05f4460..bd9a2de 100644 --- a/pages/client-credit/index.vue +++ b/pages/client-credit/index.vue @@ -88,7 +88,8 @@ export default { creditType: null, searchList: [], supplierList: [], - hasCreditList: [] + hasCreditList: [], + isFinishedContract: false // 是否该账户与企业签署过担保协议 } }, onLoad(option) { @@ -160,7 +161,8 @@ export default { enterpriseId: this.form.enterpriseId, enterpriseName: target.enterpriseName, legalPersonName: target.legalPerson, - mallSupplierId: this.form.supplierId + mallSupplierId: this.form.supplierId, + isFinishedContract: this.isFinishedContract }) } }, @@ -189,8 +191,10 @@ export default { if (res) { res.hasCredit && this.hasCreditList.push('month') res.hasFeisuanCredit && this.hasCreditList.push('fs') + this.isFinishedContract = res.isFinishedContract } else { this.hasCreditList = [] + this.isFinishedContract = false } }) } diff --git a/pages/guarantee-agreement/index.vue b/pages/guarantee-agreement/index.vue index 6b7ce9e..38793c4 100644 --- a/pages/guarantee-agreement/index.vue +++ b/pages/guarantee-agreement/index.vue @@ -109,6 +109,7 @@ export default { * @value {String} enterpriseName * @value {String} legalPersonName * @value {String} mallSupplierId + * @value {String} isFinishedContract 是否签署过担保协议 */ params: null } @@ -160,7 +161,7 @@ export default { return } // 校验是否已签署担保协议 - if (target.supplier.isFinishedContract) { + if (this.isFinishedContract) { uni.showToast({ title: '您已签署过担保协议，即将跳转', icon: 'none', @@ -174,7 +175,7 @@ export default { } // 校验是否实名认证 if (target.fddEnterpriseStatus === fddEnterpriseStatus.CERTIFIED_SUCCESS) { - getGuaranteeContract({ mallSupplierId: this.params.mallSupplierId }).then((res) => { + getGuaranteeContract({ mallSupplierId: this.params.mallSupplierId, customerEnterpriseId: this.params.enterpriseId }).then((res) => { if (res) { // #ifdef APP-PLUS go2('page-view', { title: '签约担保协议', url: encodeURIComponent(res), params: this.params }) diff --git a/pages/mall/index.vue b/pages/mall/index.vue index b995eff..098de0b 100644 --- a/pages/mall/index.vue +++ b/pages/mall/index.vue @@ -256,23 +256,7 @@ export default { }) }, // 分享 - shareTap() { - uni.share({ - provider: 'weixin', - scene: 'WXSceneSession', - type: 0, - href: 'http://uniapp.dcloud.io/', - title: 'uni-app分享', - summary: '我正在使用HBuilderX开发uni-app，赶紧跟我一起来体验！', - imageUrl: 'https://bjetxgzv.cdn.bspapp.com/VKCEYUGU-uni-app-doc/d8590190-4f28-11eb-b680-7980c8a877b8.png', - success: function (res) { - console.log('success:' + JSON.stringify(res)) - }, - fail: function (err) { - console.log('fail:' + JSON.stringify(err)) - } - }) - } + shareTap() {} } } diff --git a/pages/submit-quotation/index.vue b/pages/submit-quotation/index.vue index 1df4d14..77d5d1f 100644 --- a/pages/submit-quotation/index.vue +++ b/pages/submit-quotation/index.vue @@ -100,7 +100,7 @@ - + @@ -219,7 +219,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 { updataEnquiryReply, enquiryReplyDetail } from '@/apis/trade' +import { updateEnquiryReply, enquiryReplyDetail } from '@/apis/trade' export default { components: { @@ -429,13 +429,13 @@ export default { } }, //提交报价 - updataQuery() { + updateQuery() { var params = { ...this.upDataObj, userId: this.$store.state.userInfo.userId } return new Promise((resolve, reject) => { - updataEnquiryReply(params) + updateEnquiryReply(params) .then((res) => { if (res) { uni.showToast({ diff --git a/pages/trade/index.vue b/pages/trade/index.vue index b87c05d..7eea2d3 100644 --- a/pages/trade/index.vue +++ b/pages/trade/index.vue @@ -43,7 +43,6 @@ 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 { gettradingHallList } from '@/apis/trade' export default { components: { notLogged, scrollList, quotationList, orderList }, data() { @@ -55,9 +54,6 @@ export default { refresh: false } }, - mounted() { - // this.getQuotationQurty() - }, onShow() { this.refresh = !this.refresh }, @@ -68,11 +64,6 @@ export default { // 标题选项卡点击事件 controlChange(value) { this.current = value - // if (value === '0') { - // this.getQuotationQurty() - // } else { - // this.getTradingQurty() - // } } } } diff --git a/pages/trade/quotationList.vue b/pages/trade/quotationList.vue index e064be9..210ef61 100644 --- a/pages/trade/quotationList.vue +++ b/pages/trade/quotationList.vue @@ -22,9 +22,9 @@ > - {{ subItem.brandName }} + {{ subItem.paperName }} - {{ subItem.categoryName }}/{{ subItem.paperName }}/{{ subItem.gramWeight }}g/{{ subItem.length }}*{{ subItem.width }}/{{ subItem.quantity }}张 + {{ subItem.brandName }}/{{ subItem.categoryName }}/{{ subItem.gramWeight }}g/{{ subItem.length }}*{{ subItem.width }}/{{ subItem.quantity }}张 @@ -32,7 +32,7 @@ 交货时间： - {{ item.deliveryDay }}天 + {{ item.deliveryDay }} 交货区域： diff --git a/utils/hook.js b/utils/hook.js index 8c3b62e..73ded35 100644 --- a/utils/hook.js +++ b/utils/hook.js @@ -20,7 +20,7 @@ export function tab2(tabPage) { * @return {null} */ export function back() { - if (getCurrentPages().length > 1) { + if (getCurrentPages().length > 0) { uni.navigateBack({ delta: 1 })