From aa8f66823519a0f346cae7f07074140d3a2bc0ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E9=98=81=E8=BE=89?= Date: Wed, 26 Jan 2022 10:03:50 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/add-paper/index.vue | 38 +- pages/mall/index.vue | 2 +- pages/message/system-message.vue | 204 ++-- pages/submit-quotation/index.vue | 1658 +++++++++++++++--------------- static/imgs/mall/edit.png | Bin 0 -> 1030 bytes 5 files changed, 994 insertions(+), 908 deletions(-) create mode 100644 static/imgs/mall/edit.png diff --git a/pages/add-paper/index.vue b/pages/add-paper/index.vue index 8eb31c0..624bd5c 100644 --- a/pages/add-paper/index.vue +++ b/pages/add-paper/index.vue @@ -96,7 +96,7 @@ 纸品售价{{ index + 1 }} - 删除 + 删除 @@ -128,7 +128,7 @@ 库存单位: - {{ item.stockUnit === '1' ? '张' : '吨' }} + {{ item.stockUnit === 1 ? '张' : '吨' }} @@ -146,7 +146,7 @@ text="right" placeholder="请输入账期售价" > - 元/{{ item.stockUnit === '1' ? '张' : '吨' }} + 元/{{ item.stockUnit === 1 ? '张' : '吨' }} @@ -163,7 +163,7 @@ text="right" placeholder="请输入纸品库存" > - {{ item.stockUnit === '1' ? '张' : '吨' }} + {{ item.stockUnit === 1 ? '张' : '吨' }} @@ -181,7 +181,7 @@ :maxlength="9999999999" placeholder="请输入最低起送量" > - {{ item.stockUnit === '1' ? '张' : '吨' }} + {{ item.stockUnit === 1 ? '张' : '吨' }} @@ -334,15 +334,25 @@ export default { searchList: [ { name: '张', - id: '1' + id: 1 }, { name: '吨', - id: '2' + id: 2 } ], paperList: [], - skuList: [], + skuList: [ + { + isPromoting: 1, + listPrice: null, + minimum: null, + stock: null, + stockUnit: 2, + weight: null, + categoryName: null + } + ], imgList: [], priceIndex: 0, eidtFor: 0, @@ -418,7 +428,8 @@ export default { var params = { name: 'text', extname: 'text', - url: res.imgList[i] + url: res.imgList[i], + pathUrl: res.imgList[i], } this.imgList.push(params) } @@ -433,7 +444,7 @@ export default { listPrice: null, minimum: null, stock: null, - stockUnit: '2', + stockUnit: 2, weight: null, categoryName: null }) @@ -473,6 +484,13 @@ export default { console.log(this.imgList) }, uploadPrice() { + if(this.skuList.length === 0){ + uni.showToast({ + title: '请添加纸品售价', + icon: 'none' + }) + return + } for (let i = 0; i < validateFields.length; i++) { if (this.form[validateFields[i]] === null || this.form[validateFields[i]] === '') { uni.showToast({ diff --git a/pages/mall/index.vue b/pages/mall/index.vue index 098de0b..ffa6620 100644 --- a/pages/mall/index.vue +++ b/pages/mall/index.vue @@ -117,7 +117,7 @@ export default { pageSize: 10, storeId: null, name: null, - supplierId: this.$store.state.supplierInfo.supplierId + supplierId: this.$store.state.supplierInfo.supplierId, }, listData: [], logo: 'https://qncloud.oss-cn-shenzhen.aliyuncs.com/ztb_pic/testPic.jfif', diff --git a/pages/message/system-message.vue b/pages/message/system-message.vue index 673b363..ae813be 100644 --- a/pages/message/system-message.vue +++ b/pages/message/system-message.vue @@ -1,116 +1,144 @@ + diff --git a/static/imgs/mall/edit.png b/static/imgs/mall/edit.png new file mode 100644 index 0000000000000000000000000000000000000000..d080a1279fe3fd5d7830025f97ec5342db60b9a1 GIT binary patch literal 1030 zcmV+h1o``kP)Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@ z1ONa40RR91AfN*P1ONa40RR91AOHXW0IY^$^8f$?a7jc#R9Fe+S4(IVK@fetNj8Bb zCZLgk3Vtwtau5YC5k$eyK@XznK@mj|&x%171I{5J__=uVrUpesCEhd#MFc?v6D3gy z1Vu0eF(Htc&*oFUp4o1DXLgsJxEIMl?^N}t-m9vv?pa{5KdNK_@T3OQ*awAmY(l#O zs7DuC)$c+Wr6G`#1|)Ebur(pDF(h#pp86H)w`#&l3l*Z^(4=^tnRom`Pvcm#~+VQ^1P_<65q=oNnY1axZBIEhFdtV!Uz~}lXK&_1~-r1d@c!~j&ydIVe^hppcrstU6ZK5L!)wUtg>=Oh({nF_!KIU zk|rFLvM>NcztZWOa%5jDoiSp|qBL$4D%2Qt$~^)zkO{JW0~WGX!t+7rWrbnkTDC z;sn*e`+34ERI%w35q$S?i#X||;V z+{@mLK28B}Jzki=9JbTo2Hy}ciFw?|4esn*kEgzK?pqFNVC}m;j`DhLOq3fT^1d$B zJk567{sbPQT@713Ea(jf>?G(%f;aO0CSTayrTGbrVh;^f`I8m82|nO1%#s6ev*E@W z*Js6mYa6*!pf3->Rv$!Rf?4g#0(6y>Y^G|!3vM`fnUQlxU>4iV1m^u6E~rVXyTWB@ zAyK{If^se*=k9VXM+rRQY1V@+nTazz Date: Wed, 26 Jan 2022 10:10:39 +0800 Subject: [PATCH 2/4] bug --- apis/trade.js | 38 +- .../packingStationItem.vue | 2 +- pages/add-paper/index.vue | 1469 +++++++++-------- pages/add-record/index.vue | 547 +++--- pages/client-detail/base-paper-deals.vue | 4 +- pages/client-detail/basic-information.vue | 6 +- pages/client-detail/equipment-information.vue | 18 +- pages/client-detail/index.vue | 2 +- pages/client-detail/lv-select.vue | 6 +- pages/contract-manage/index.vue | 2 +- pages/credit-order-list/index.vue | 6 +- pages/follow-up-records/index.vue | 2 +- pages/mall/index.vue | 2 +- pages/message/platform-message.vue | 200 ++- pages/my-offer/index.vue | 444 ++--- pages/quotation-details/index.vue | 1172 ++++++------- pages/submit-quotation/index.vue | 134 +- pages/trade/orderList.vue | 4 +- pages/trade/quotationList.vue | 4 +- 19 files changed, 2037 insertions(+), 2025 deletions(-) diff --git a/apis/trade.js b/apis/trade.js index 5ed1afb..afb5e10 100644 --- a/apis/trade.js +++ b/apis/trade.js @@ -19,9 +19,9 @@ export function gettradingHallList(data) { }, { hideLoading: true } ) -} -// 我的报价 -export function getMyreplyList(data) { +} +// 我的报价 +export function getMyReplyList(data) { return http.get( { url: '/base-paper-trading/get/my-reply-list', @@ -29,24 +29,24 @@ export function getMyreplyList(data) { }, { hideLoading: true } ) -} -// 提交报价 -export function updataEnquiryReply(data) { +} +// 提交报价 +export function updateEnquiryReply(data) { return http.post({ - url: '/base-paper-trading/update/enquiry-reply?userId='+data.userId, + url: '/base-paper-trading/update/enquiry-reply?userId=' + data.userId, data }) -} -// 获取报价详情 +} +// 获取报价详情 export function enquiryReplyDetail(data) { return http.get( { - url: '/base-paper-trading/get/enquiry-reply-detail/'+data, + url: '/base-paper-trading/get/enquiry-reply-detail/' + data }, { hideLoading: true } ) -} -// 消息列表 +} +// 消息列表 export function systemMessageList(data) { return http.get( { @@ -55,19 +55,11 @@ export function systemMessageList(data) { }, { hideLoading: true } ) -} -// 系统消息已读 +} +// 系统消息已读 export function systemRead(data) { return http.post({ url: '/base-paper-trading/set/message-read', data }) -} - - - - - - - - +} diff --git a/components/bussiness-components/packingStationItem.vue b/components/bussiness-components/packingStationItem.vue index 2b389c3..0bd63f1 100644 --- a/components/bussiness-components/packingStationItem.vue +++ b/components/bussiness-components/packingStationItem.vue @@ -134,7 +134,7 @@ export default { .info { width: 750rpx; padding: 30rpx 32rpx 48rpx; - border-bottom: 2rpx solid #dddddd; + border-bottom: 2rpx solid rgba(221, 221, 221, 0.5); display: flex; flex-direction: row; align-items: flex-start; diff --git a/pages/add-paper/index.vue b/pages/add-paper/index.vue index 8eb31c0..7786180 100644 --- a/pages/add-paper/index.vue +++ b/pages/add-paper/index.vue @@ -1,296 +1,306 @@ + diff --git a/pages/add-record/index.vue b/pages/add-record/index.vue index 36a30ef..e5d0f9b 100644 --- a/pages/add-record/index.vue +++ b/pages/add-record/index.vue @@ -1,290 +1,287 @@ + diff --git a/pages/client-detail/base-paper-deals.vue b/pages/client-detail/base-paper-deals.vue index 0203ac0..1e46fa5 100644 --- a/pages/client-detail/base-paper-deals.vue +++ b/pages/client-detail/base-paper-deals.vue @@ -191,7 +191,7 @@ export default { align-items: center; height: 88rpx; background: #ffffff; - border-bottom: 2rpx solid #dddddd; + border-bottom: 2rpx solid rgba(221, 221, 221, 0.5); padding: 0rpx 32rpx; .left-title { font-size: 30rpx; @@ -213,7 +213,7 @@ export default { align-items: center; height: 148rpx; background: #ffffff; - border-bottom: 2rpx solid #dddddd; + border-bottom: 2rpx solid rgba(221, 221, 221, 0.5); padding: 0rpx 32rpx; .image { width: 100rpx; diff --git a/pages/client-detail/basic-information.vue b/pages/client-detail/basic-information.vue index 524bc3a..3d54287 100644 --- a/pages/client-detail/basic-information.vue +++ b/pages/client-detail/basic-information.vue @@ -294,7 +294,7 @@ export default { justify-content: space-between; height: 88rpx; line-height: 88rpx; - border-bottom: 2rpx solid #dddddd; + border-bottom: 2rpx solid rgba(221, 221, 221, 0.5); padding: 0rpx 32rpx; .left-text { @@ -393,7 +393,7 @@ export default { height: 80rpx; line-height: 80rpx; background: #ffffff; - border-top: 2rpx solid #dddddd; + border-top: 2rpx solid rgba(221, 221, 221, 0.5); padding: 0rpx 32rpx; .icon { @@ -421,7 +421,7 @@ export default { height: 80rpx; line-height: 80rpx; background: #ffffff; - border-top: 2rpx solid #dddddd; + border-top: 2rpx solid rgba(221, 221, 221, 0.5); padding: 0rpx 32rpx; font-size: 28rpx; color: #007aff; diff --git a/pages/client-detail/equipment-information.vue b/pages/client-detail/equipment-information.vue index ee95823..4971dd0 100644 --- a/pages/client-detail/equipment-information.vue +++ b/pages/client-detail/equipment-information.vue @@ -125,15 +125,15 @@ export default { emptyText: '暂无设备信息~', background: '#F7F8FA', disabled: false, - emptyImage: '/static/imgs/order/order-empty.png' + emptyImage: '/static/imgs/order/order-empty.png' }, seemoreFlag: 0, params: { asc: '', desc: '', duration: '3', - customerEnterpriseId: this.$store.state.supplierInfo.id || null, // 客户企业ID默认为空,传值时网关获取当前用户关联企业id失效、 - // customerEnterpriseId: '651107734133018624', + customerEnterpriseId: this.$store.state.supplierInfo.id || null // 客户企业ID默认为空,传值时网关获取当前用户关联企业id失效、 + // customerEnterpriseId: '651107734133018624', }, pagination: { pageNum: 0, // 初始会执行一次下拉加载 @@ -180,10 +180,10 @@ export default { .then((res) => { // console.log('设备信息', res.records) if (res) { - res.records.forEach((el) => { - el.collapse = false - el.isShowSelect = false - }) + res.records.forEach((el) => { + el.collapse = false + el.isShowSelect = false + }) if (this.pagination.pageNum == 1) { this.list = res.records } else { @@ -309,8 +309,8 @@ export default { } } .content { - border-bottom: 2rpx solid #dddddd; - border-top: 2rpx solid #dddddd; + border-bottom: 2rpx solid rgba(221, 221, 221, 0.5); + border-top: 2rpx solid rgba(221, 221, 221, 0.5); .info { display: flex; flex-direction: row; diff --git a/pages/client-detail/index.vue b/pages/client-detail/index.vue index 698b29d..d8afb64 100644 --- a/pages/client-detail/index.vue +++ b/pages/client-detail/index.vue @@ -215,7 +215,7 @@ export default { align-items: center; height: 96rpx; background: #ffffff; - border-top: 2rpx solid #dddddd; + border-top: 2rpx solid rgba(221, 221, 221, 0.5); .cancel-text { flex-grow: 1; flex-shrink: 1; diff --git a/pages/client-detail/lv-select.vue b/pages/client-detail/lv-select.vue index 5f5bbf0..86b288d 100644 --- a/pages/client-detail/lv-select.vue +++ b/pages/client-detail/lv-select.vue @@ -186,7 +186,7 @@ box-sizing: border-box; } .unishadow{ - box-shadow: 0rpx 1rpx 5rpx #DDDDDD; + box-shadow: 0rpx 1rpx 5rpx rgba(221,221,221,0.5); } .uni-search-form{ position: relative; @@ -247,7 +247,7 @@ width: 75%; // 下拉框宽度 background-color: #FFFFFF; border-radius: 6px; - box-shadow: #DDDDDD 4px 4px 8px, #DDDDDD -4px -4px 8px; + box-shadow: rgba(221,221,221,0.5) 4px 4px 8px, rgba(221,221,221,0.5) -4px -4px 8px; z-index: 999; } .uni-combox__selector-scroll { @@ -282,7 +282,7 @@ color: #808080; } .uni-combox__selector-item:hover { - background-color: #DDDDDD; + background-color: rgba(221,221,221,0.5); } .uni-combox__selector-empty:last-child, .uni-combox__selector-item:last-child { diff --git a/pages/contract-manage/index.vue b/pages/contract-manage/index.vue index cbd2cef..1e4115f 100644 --- a/pages/contract-manage/index.vue +++ b/pages/contract-manage/index.vue @@ -251,7 +251,7 @@ export default { .footer { width: 750rpx; padding: 24rpx 32rpx; - border-top: 1px solid #dddddd; + border-top: 1px solid rgba(221, 221, 221, 0.5); } } diff --git a/pages/credit-order-list/index.vue b/pages/credit-order-list/index.vue index 2f6cd5d..da05d78 100644 --- a/pages/credit-order-list/index.vue +++ b/pages/credit-order-list/index.vue @@ -34,7 +34,7 @@ class="order-item flex-row-center-start" v-for="(order, index) in item.orderItmes" :key="order.productId" - :style="{ borderTop: index == 0 ? '' : '1px solid #dddddd' }" + :style="{ borderTop: index == 0 ? '' : '1px solid rgba(221,221,221,0.5)' }" > @@ -184,12 +184,12 @@ export default { margin-bottom: 20rpx; .header { padding: 24rpx 32rpx; - border-bottom: 1px solid #dddddd; + border-bottom: 1px solid rgba(221, 221, 221, 0.5); } .content { padding: 0 32rpx; width: 750rpx; - border-bottom: 1px solid #dddddd; + border-bottom: 1px solid rgba(221, 221, 221, 0.5); .order-item { width: 686rpx; padding: 24rpx 0; diff --git a/pages/follow-up-records/index.vue b/pages/follow-up-records/index.vue index 5946918..c08c34e 100644 --- a/pages/follow-up-records/index.vue +++ b/pages/follow-up-records/index.vue @@ -213,7 +213,7 @@ export default { justify-content: center; padding-top: 20rpx; background: #ffffff; - // border-top: 2rpx solid #dddddd; + // border-top: 2rpx solid rgba(221,221,221,0.5); // padding: 0rpx 32rpx; font-size: 28rpx; color: #007aff; diff --git a/pages/mall/index.vue b/pages/mall/index.vue index 098de0b..ceb9427 100644 --- a/pages/mall/index.vue +++ b/pages/mall/index.vue @@ -339,7 +339,7 @@ export default { } .content { background: #ffffff; - border-bottom: 2rpx solid #dddddd; + border-bottom: 2rpx solid rgba(221, 221, 221, 0.5); display: flex; flex-direction: row; padding: 24rpx 0rpx 24rpx 32rpx; diff --git a/pages/message/platform-message.vue b/pages/message/platform-message.vue index 03f234e..9e1b78d 100644 --- a/pages/message/platform-message.vue +++ b/pages/message/platform-message.vue @@ -1,113 +1,111 @@ diff --git a/pages/my-offer/index.vue b/pages/my-offer/index.vue index 442287f..7a5964e 100644 --- a/pages/my-offer/index.vue +++ b/pages/my-offer/index.vue @@ -1,237 +1,239 @@ + diff --git a/pages/quotation-details/index.vue b/pages/quotation-details/index.vue index d7ef22e..4fd7930 100644 --- a/pages/quotation-details/index.vue +++ b/pages/quotation-details/index.vue @@ -1,79 +1,79 @@ + diff --git a/pages/submit-quotation/index.vue b/pages/submit-quotation/index.vue index 0f03fb7..0dc461f 100644 --- a/pages/submit-quotation/index.vue +++ b/pages/submit-quotation/index.vue @@ -11,15 +11,15 @@ 交货要求 询价客户: - {{ upDataObj.belongEnterpriseName }} + {{ upDataObj.belongEnterpriseName }} 交货区域: - {{ upDataObj.deliveryArea }} + {{ upDataObj.deliveryArea }} 交货时间: - {{ upDataObj.deliveryDay }} + {{ upDataObj.deliveryDay }} @@ -28,33 +28,33 @@ {{ upDataObj.enquiryValidTimeSplit[0] }} - : + : {{ upDataObj.enquiryValidTimeSplit[1] }} - : + : {{ upDataObj.enquiryValidTimeSplit[2] }} - - - + + + {{ items.paperName }} | {{ items.gramWeight }}g | {{ items.length }}*{{ items.width }} | {{ items.quantity }}张 - + - 重量(吨): - {{ items.weight }} + 重量(吨): + {{ items.weight }} - 单价(元/吨): - + 单价(元/吨): + {{ items.unitFee }} - 小计(元): - {{ items.totalPrice }} + 小计(元): + {{ items.totalPrice }} - - + + - + - 其他费用: - ¥ {{ upDataObj.otherFee }} + 其他费用: + ¥ {{ upDataObj.otherFee }} - 合计: - ¥ {{ upDataObj.totalAllPrice }} + 合计: + ¥ {{ upDataObj.totalAllPrice }} - + - 有效时间: - {{ upDataObj.enquiryValidTime }} + 有效时间: + {{ upDataObj.enquiryValidTime }} - 设置 + 设置 - - 报价备注 + + 报价备注 - + - - + + + 提交报价 + + + @@ -170,7 +174,7 @@ > @@ -175,7 +175,7 @@ export default { margin-bottom: 0px; background: #ffffff; .list-border { - border-bottom: 2rpx solid #dddddd; + border-bottom: 2rpx solid rgba(221, 221, 221, 0.5); } .list-title-line { width: 750rpx; diff --git a/pages/trade/quotationList.vue b/pages/trade/quotationList.vue index 210ef61..60bd43a 100644 --- a/pages/trade/quotationList.vue +++ b/pages/trade/quotationList.vue @@ -200,8 +200,8 @@ export default { .quotation-list { margin-bottom: 0rpx; .list-border { - // border-top: 1px solid #dddddd; - border-bottom: 2rpx solid #dddddd; + // border-top: 1px solid rgba(221,221,221,0.5); + border-bottom: 2rpx solid rgba(221, 221, 221, 0.5); } .list-title-line { line-height: 88rpx; From a7b5252f9d61100af476d03ee74a5ac7274adb88 Mon Sep 17 00:00:00 2001 From: dengxiongfei Date: Wed, 26 Jan 2022 10:43:31 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E6=8A=A5=E4=BB=B7bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/submit-quotation/index.vue | 50 ++++++++++++++++++++++---------- 1 file changed, 34 insertions(+), 16 deletions(-) diff --git a/pages/submit-quotation/index.vue b/pages/submit-quotation/index.vue index 672cb1e..a342d7c 100644 --- a/pages/submit-quotation/index.vue +++ b/pages/submit-quotation/index.vue @@ -7,17 +7,32 @@ + + 交货要求 + + 询价客户: + {{ upDataObj.belongEnterpriseName }} + + + 交货区域: + {{ upDataObj.deliveryArea }} + + + 交货时间: + {{ upDataObj.deliveryDay }} + + 报价截止 {{ hour }} - : + : {{ min }} - : + : {{ second }} @@ -37,10 +52,12 @@ 重量(吨): {{ items.weight }} - + 单价(元/吨): - - {{ items.unitFee }} + + + {{ items.unitFee }} + - + 小计(元): {{ items.totalPrice }} - - + + 备注信息: + {{ items.remark }} @@ -81,7 +99,7 @@ 报价备注 - + @@ -230,8 +248,7 @@ export default { months.push(i + '小时') } return { - value: '', - value1: '', + quotationRemark: '', vModelValue: '', indicatorStyle: `height: 50px;`, visible: true, @@ -474,6 +491,7 @@ export default { } } var params = { + remark: this.quotationRemark, // 报价备注 ...this.upDataObj, userId: this.$store.state.userInfo.userId } @@ -557,13 +575,14 @@ export default { box-shadow: 0rpx 2rpx 12rpx 0rpx rgba(100, 101, 102, 0.12); display: flex; justify-content: center; + align-items: center; .submit-text { font-family: PingFangSC-Medium; font-size: 28rpx; color: rgba(0, 0, 0, 0.5); letter-spacing: 0; font-weight: 500; - margin-top: 22rpx; + // margin-top: 22rpx; width: 130rpx; } .submit-time { @@ -571,7 +590,7 @@ export default { height: 40rpx; background: #ee0a24; border-radius: 8rpx; - margin-top: 20rpx; + // margin-top: 20rpx; text-align: center; } .submit-time-text { @@ -591,7 +610,7 @@ export default { text-align: center; line-height: 32rpx; font-weight: 400; - margin-top: 20rpx; + // margin: 0 6rpx; } } .submit-content { @@ -618,7 +637,7 @@ export default { } .submit-content-body { line-height: 68rpx; - padding-left: 32rpx; + padding: 0 32rpx; .submit-content-body-title { font-family: PingFangSC-Regular; font-size: 28rpx; @@ -633,7 +652,6 @@ export default { letter-spacing: 0; font-weight: 400; float: right; - margin-right: 32rpx; } .submit-content-body-input { margin-right: 32rpx; From 9a388e62c2f50583a049185126fad3e4cda13e16 Mon Sep 17 00:00:00 2001 From: dengxiongfei Date: Wed, 26 Jan 2022 11:01:04 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BC=9A=E5=91=98=20=E9=80=80=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/client-detail/basic-information.vue | 2 +- pages/follow-up-records/index.vue | 10 +++++++--- pages/mine/index.vue | 13 ++++++------- pages/setting/index.vue | 20 +++++++++++++++++++- 4 files changed, 33 insertions(+), 12 deletions(-) diff --git a/pages/client-detail/basic-information.vue b/pages/client-detail/basic-information.vue index 7c706d8..8c0266b 100644 --- a/pages/client-detail/basic-information.vue +++ b/pages/client-detail/basic-information.vue @@ -251,7 +251,7 @@ export default { }, methods: { gotoTap() { - go2('follow-up-records') + go2('follow-up-records', { customerEnterpriseId: this.info.id }) }, getBaseInfo() { getBaseInfo({ customerId: this.customerId }).then((res) => { diff --git a/pages/follow-up-records/index.vue b/pages/follow-up-records/index.vue index c08c34e..acea003 100644 --- a/pages/follow-up-records/index.vue +++ b/pages/follow-up-records/index.vue @@ -77,7 +77,7 @@ export default { params: { asc: '', desc: '', - customerEnterpriseId: [this.$store.state.supplierInfo.id], + customerEnterpriseId: null, mallSupplierId: this.$store.state.supplierInfo.supplierId || null // enterpriseIds : ['651107734133018624'], // mallSupplierId : '670334117090562048', @@ -99,8 +99,12 @@ export default { }) }, onShow() { - console.log('onShow') - this.getList() + this.downCallback() + }, + onLoad(option) { + if (option.customerEnterpriseId) { + this.params.customerEnterpriseId = option.customerEnterpriseId + } }, methods: { back, diff --git a/pages/mine/index.vue b/pages/mine/index.vue index 982e5ac..cfa2262 100644 --- a/pages/mine/index.vue +++ b/pages/mine/index.vue @@ -49,7 +49,7 @@ 立即开通会员 尊享特权 - 开通会员 + {{ isVip ? '续费会员' : '开通会员' }} @@ -126,14 +126,13 @@ --> - mine client-credit enterprise-info