diff --git a/pages/firstBill/index.js b/pages/firstBill/index.js index 50f99db..99c15f7 100644 --- a/pages/firstBill/index.js +++ b/pages/firstBill/index.js @@ -4963,48 +4963,7 @@ Page({ refreshabel: true }) } - // } else { - - // } - }).exec() - return - wx.createSelectorQuery() - .select("#sticky") - .fields({ - scrollOffset: true, - size: true, - }, (e) => { - console.log('e', e); - // that.setData({ - // outerScroll: true - - // }) - }) - - return true }, - handleInnerScroll (e) { - // console.log('handleInnerScroll', e); - let that = this - wx.createSelectorQuery() - .selectViewport("#sticky") - .scrollOffset((e) => { - console.log('e', e); - // if (e.changedTouches[0].pageY < 0) { - // that.setData({ - // innerScroll: true - - // }) - // } else { - // that.setData({ - // innerScroll: false - // }) - // } - - }) - - return false - } }); \ No newline at end of file diff --git a/pages/firstBill/index.wxml b/pages/firstBill/index.wxml index eaff4f5..ffe7d27 100644 --- a/pages/firstBill/index.wxml +++ b/pages/firstBill/index.wxml @@ -3,7 +3,7 @@ 伯才供应链 --> - + {{searchCityParamStorage.name == '' ? '全国' : searchCityParamStorage.shortName}} @@ -62,23 +62,7 @@ {{item.name}} - - - - @@ -251,18 +235,6 @@ - - - - - - diff --git a/pages/listSharePage/index.js b/pages/listSharePage/index.js index 7072ffc..191ea10 100644 --- a/pages/listSharePage/index.js +++ b/pages/listSharePage/index.js @@ -2110,7 +2110,7 @@ Page({ currentJobDrawer: that.data.currentJobDrawer, checkedList: that.data.checkedList, }); - console.log('that.data.recordList',that.data.recordList); + console.log('that.data.recordList', that.data.recordList); }) }); }, @@ -2147,8 +2147,8 @@ Page({ if (this.data.checkedList.length > 0) { let str = ""; this.data.checkedList.forEach((item, index) => { - console.log(item.jobDesp); - str += item.jobDesp + (this.data.userInfo.agencyStatus == 1 ? (this.data.userInfo.noticeEndStr ? this.data.userInfo.noticeEndStr : "详情咨询:" + this.data.userInfo.tel) : "详情咨询:" + (this.data.serviceInfo.userName || "") + (this.data.serviceInfo.workPhone || "-")) + (index < this.data.checkedList.length - 1 ? "\n\n\n" : ""); + // console.log(item.jobInfoWithoutReturnFee); + str += (item.jobInfoWithoutReturnFee || '暂无详单') + (this.data.userInfo.agencyStatus == 1 ? (this.data.userInfo.noticeEndStr ? this.data.userInfo.noticeEndStr : "详情咨询:" + this.data.userInfo.tel) : "详情咨询:" + (this.data.serviceInfo.userName || "") + (this.data.serviceInfo.workPhone || "-")) + (index < this.data.checkedList.length - 1 ? "\n\n\n" : ""); }); wx.setClipboardData({ data: str, @@ -2605,18 +2605,18 @@ Page({ .boundingClientRect() .exec(function (res) { res.forEach((item) => { - if(that.data.recordList.length > 0){ - item.forEach((element, index) => { - if (element.width > 200) { - // that.data.recordList[index].isTagShow = true; - var age = "recordList[" + index + "].isTagShow"; - that.setData({ - [age]: true, - }); - } - }); + if (that.data.recordList.length > 0) { + item.forEach((element, index) => { + if (element.width > 200) { + // that.data.recordList[index].isTagShow = true; + var age = "recordList[" + index + "].isTagShow"; + that.setData({ + [age]: true, + }); + } + }); } - + }); // if(){