From 17ab047a533ab31953b74f6464e75f60005e6275 Mon Sep 17 00:00:00 2001 From: xpz2018 <107107461@qq.com> Date: Fri, 19 Mar 2021 16:41:30 +0800 Subject: [PATCH] no message --- pages/agent/ability/index.js | 3 + pages/agent/agent-item/index.wxml | 20 ++-- pages/agent/edit/index.js | 9 +- pages/agent/edit/index.wxml | 5 +- pages/agent/factory-fragment/index.js | 7 +- pages/agent/factory-fragment/index.wxml | 1 + pages/agent/factory/index.js | 7 +- pages/agent/factory/index.wxml | 27 ++++- pages/agent/order/index.js | 3 + pages/article/detail/index.js | 3 + pages/article/hot-index/index.js | 3 + pages/article/list/index.js | 3 + pages/article/newInfo/index.wxml | 9 +- pages/article/point-index/index.js | 3 + pages/article/price-detail/index.js | 3 + pages/article/price-index/index.js | 3 + pages/article/queue-detail/index.js | 3 + pages/article/queue-index/index.js | 3 + pages/bank/bill/index.js | 3 + pages/bidding/index/index.js | 3 + pages/goods/ablility/index.js | 3 + pages/goods/index/index.js | 3 + pages/mall/price-index/index.js | 3 + pages/message/index/index.js | 3 + pages/morder/index/index.js | 3 + pages/order/index/index.js | 3 + pages/purchase/ability/index.js | 3 + pages/shop/bidding/index.js | 3 + pages/shop/bill/index.js | 3 + pages/shop/detail/index.js | 3 + pages/shop/order/index.js | 3 + pages/withdrawal/vcheckout/index.wxml | 11 +- project.config.json | 148 ++++++++++++------------ 33 files changed, 210 insertions(+), 103 deletions(-) diff --git a/pages/agent/ability/index.js b/pages/agent/ability/index.js index 28afd54..2bf0770 100644 --- a/pages/agent/ability/index.js +++ b/pages/agent/ability/index.js @@ -28,6 +28,9 @@ Page({ }, // 下拉刷新... onRefreshList: function () { + if (this.data.requesting) { + return + } this.setData({ orderList: [], ['form.pageNum']: 1, diff --git a/pages/agent/agent-item/index.wxml b/pages/agent/agent-item/index.wxml index abf4e01..7334a36 100644 --- a/pages/agent/agent-item/index.wxml +++ b/pages/agent/agent-item/index.wxml @@ -16,15 +16,15 @@ 昨日排队：{{item.yesterdayTotalQuantity}}辆 昨日排队：-- - - + + 代卖费： {{formate.formatePrice2(item.proxypaySurcharge, kg)}} - - + + 纸厂账期： {{item.foreignPaybackIntever}}天 - + @@ -36,7 +36,7 @@ {{cateItem.categoryName}} {{priceItem(cateItem, kg)}} - (已含补贴{{formate.formatePrice2(cateItem.unitPrice, kg)}}) + (已含补贴{{formate.formatePrice2(cateItem.publicSubsidies, kg)}}) 暂无报价 @@ -78,14 +78,14 @@ function priceItem(item, kg) { if(kg){ - if(item.uprice && Number(item.uprice) > 0){ - let price = parseFloat(item.unitPrice) + parseFloat(item.uprice) + if(item.publicSubsidies && Number(item.publicSubsidies) > 0){ + let price = parseFloat(item.unitPrice) + parseFloat(item.publicSubsidies) return (parseFloat(price)).toFixed(3) + '元/KG' } return (parseFloat(item.unitPrice)).toFixed(3) + '元/KG' } else { - if(item.uprice && Number(item.uprice) > 0){ - let price = parseFloat(item.unitPrice) + parseFloat(item.uprice) + if(item.publicSubsidies && Number(item.publicSubsidies) > 0){ + let price = parseFloat(item.unitPrice) + parseFloat(item.publicSubsidies) return (parseFloat(price) * 1000).toFixed(1) + '元/吨' } return (parseFloat(item.unitPrice) * 1000).toFixed(1) + '元/吨' diff --git a/pages/agent/edit/index.js b/pages/agent/edit/index.js index fc7a285..830d770 100644 --- a/pages/agent/edit/index.js +++ b/pages/agent/edit/index.js @@ -68,6 +68,9 @@ Page({ } if(!util.isEmpty(element.unitPrice)){ var unitPrice = math.times(element.unitPrice, 1000) + if(element.uPrice && Number(element.uPrice) > 0){ + unitPrice = math.times(math.plus(element.unitPrice, element.uPrice), 1000) + } this.data.cateList.push({value: element.categoryId, text: element.categoryName + '(预估单价：' + unitPrice + '元/吨)'}) } } @@ -207,12 +210,16 @@ Page({ const element = this.data.factoryDetail.paperCategoryList[index] if(element.categoryId == detail.value){ this.data.form.unitPrice = element.unitPrice + if(element.uPrice && Number(element.uPrice) > 0){ + this.data.form.uPrice = element.uPrice + this.data.form.unitPrice = math.plus(element.unitPrice, element.uPrice) + } this.data.cateName = element.categoryName break } } this.data.form.paperCategoryId = detail.value - this.setData({ ['form.unitPrice']: this.data.form.unitPrice, cateName: this.data.cateName }) + this.setData({ ['form.unitPrice']: this.data.form.unitPrice, ['form.uPrice']: this.data.form.uPrice, cateName: this.data.cateName }) } }, onEvent: function (message) { diff --git a/pages/agent/edit/index.wxml b/pages/agent/edit/index.wxml index 08c2bae..575cd56 100644 --- a/pages/agent/edit/index.wxml +++ b/pages/agent/edit/index.wxml @@ -37,7 +37,10 @@ 预估单价(元/吨)： - {{formate.formatePrice(form.unitPrice)}} + + {{formate.formatePrice(form.unitPrice)}} + (已含补贴{{formate.formatePrice2(form.uPrice, 0)}}) + 预估重量(吨)： diff --git a/pages/agent/factory-fragment/index.js b/pages/agent/factory-fragment/index.js index ffdb059..a0e51f4 100644 --- a/pages/agent/factory-fragment/index.js +++ b/pages/agent/factory-fragment/index.js @@ -29,13 +29,14 @@ Component({ pageNum: 1, listType: 0 }, + triggered: false, firstShow: false, hasActivity: false }, lifetimes: { // 生命周期函数，可以为函数，或一个在methods段中定义的方法名 attached: function () { - this.setData({ height: app.globalData.fragmentHeight - 90, kg: app.globalData.kg }) + if(app.globalData.userInfo){ hasActivity().then(result => { this.setData({ hasActivity: result.data }) @@ -46,6 +47,7 @@ Component({ methods: { onRestart: function(){ if (!this.data.firstShow) { + this.setData({ height: app.globalData.fragmentHeight - 90, kg: app.globalData.kg }) this.fetchRegionList() this.fetchPapersList() } @@ -74,6 +76,9 @@ Component({ }, // 下拉刷新... onRefreshList: function () { + if (this.data.requesting) { + return + } this.setData({ orderList: [], tabIndex: this.data.tabIndex, diff --git a/pages/agent/factory-fragment/index.wxml b/pages/agent/factory-fragment/index.wxml index 54462f2..e0e9433 100644 --- a/pages/agent/factory-fragment/index.wxml +++ b/pages/agent/factory-fragment/index.wxml @@ -7,6 +7,7 @@ + + + + function priceItem(item, kg) { + if(kg){ + if(item.uPrice && Number(item.uPrice) > 0){ + let price = parseFloat(item.unitPrice) + parseFloat(item.uPrice) + return (parseFloat(price)).toFixed(3) + '元/KG' + } + return (parseFloat(item.unitPrice)).toFixed(3) + '元/KG' + } else { + if(item.uPrice && Number(item.uPrice) > 0){ + let price = parseFloat(item.unitPrice) + parseFloat(item.uPrice) + return (parseFloat(price) * 1000).toFixed(1) + '元/吨' + } + return (parseFloat(item.unitPrice) * 1000).toFixed(1) + '元/吨' + } + } + module.exports = priceItem; + \ No newline at end of file diff --git a/pages/agent/order/index.js b/pages/agent/order/index.js index 93b9958..e3735ef 100644 --- a/pages/agent/order/index.js +++ b/pages/agent/order/index.js @@ -48,6 +48,9 @@ Page({ } }, onRefreshList: function () { + if (this.data.requesting) { + return + } this.setData({ orderList: [], ['form.status']: this.data.form.status, diff --git a/pages/article/detail/index.js b/pages/article/detail/index.js index fb7a9e0..f626b92 100644 --- a/pages/article/detail/index.js +++ b/pages/article/detail/index.js @@ -52,6 +52,9 @@ Page({ } }, onRefreshList: function () { + if (this.data.requesting) { + return + } this.setData({ commentList: [], ['form.pageNum']: 1, diff --git a/pages/article/hot-index/index.js b/pages/article/hot-index/index.js index 59910fc..cb2ecee 100644 --- a/pages/article/hot-index/index.js +++ b/pages/article/hot-index/index.js @@ -83,6 +83,9 @@ Component({ }, //*************************************************momentList************************************************// onRefreshList: function () { + if (this.data.requesting) { + return + } this.setData({ momentList: [], factoryList: [], diff --git a/pages/article/list/index.js b/pages/article/list/index.js index aeae4b2..7519a29 100644 --- a/pages/article/list/index.js +++ b/pages/article/list/index.js @@ -35,6 +35,9 @@ Page({ } }, onRefreshList: function () { + if (this.data.requesting) { + return + } this.setData({ messageList: [], tabIndex: this.data.tabIndex, diff --git a/pages/article/newInfo/index.wxml b/pages/article/newInfo/index.wxml index ffab277..9ea2d42 100644 --- a/pages/article/newInfo/index.wxml +++ b/pages/article/newInfo/index.wxml @@ -36,7 +36,9 @@ 纸厂名称 - 价格涨跌 + + 价格涨跌 + 纸厂排队 最近扣点 @@ -50,13 +52,12 @@ 可前往纸厂列表添加关注 添加关注 - {{item.shortName}} - {{item.biggestFloatPrice*1000||0}} + {{item.biggestFloatPrice*1000 || 0}} {{item.yesterdayTotalQuantity || 0}}辆 {{item.minimumDeductionPoint || 0}}% @@ -75,7 +76,7 @@ 最近扣点 操作 - + {{cell.categoryName|| '---'}} {{cell.unitPrice*1000|| 0}} {{cell.floatPrice*1000|| 0}} diff --git a/pages/article/point-index/index.js b/pages/article/point-index/index.js index d7d48b8..153d6ca 100644 --- a/pages/article/point-index/index.js +++ b/pages/article/point-index/index.js @@ -57,6 +57,9 @@ Component({ this.setData({ requesting: false }) return } + if (this.data.requesting) { + return + } this.setData({ momentList: [], ['form.pageNum']: 1, finished: false }) this.fetchMomentList() }, diff --git a/pages/article/price-detail/index.js b/pages/article/price-detail/index.js index f0d20cb..729ffb5 100644 --- a/pages/article/price-detail/index.js +++ b/pages/article/price-detail/index.js @@ -38,6 +38,9 @@ Page({ }, // 下拉刷新... onRefreshList: function () { + if (this.data.requesting) { + return + } this.setData({ orderList: [], ['form.pageNum']: 1, diff --git a/pages/article/price-index/index.js b/pages/article/price-index/index.js index 83453fa..f1f46fb 100644 --- a/pages/article/price-index/index.js +++ b/pages/article/price-index/index.js @@ -47,6 +47,9 @@ Component({ }, //*************************************************momentList************************************************// onRefreshList: function () { + if (this.data.requesting) { + return + } this.setData({ momentList: [], ['form.pageNum']: 1, diff --git a/pages/article/queue-detail/index.js b/pages/article/queue-detail/index.js index 4d8e91c..2ec4cac 100644 --- a/pages/article/queue-detail/index.js +++ b/pages/article/queue-detail/index.js @@ -22,6 +22,9 @@ Page({ }, // 下拉刷新... onRefreshList: function () { + if (this.data.requesting) { + return + } this.setData({ orderList: [], ['form.pageNum']: 1, diff --git a/pages/article/queue-index/index.js b/pages/article/queue-index/index.js index d4c7177..136e516 100644 --- a/pages/article/queue-index/index.js +++ b/pages/article/queue-index/index.js @@ -45,6 +45,9 @@ Component({ }, //*************************************************momentList************************************************// onRefreshList: function () { + if (this.data.requesting) { + return + } this.setData({ momentList: [], ['form.pageNum']: 1, finished: false }) this.fetchMomentList() }, diff --git a/pages/bank/bill/index.js b/pages/bank/bill/index.js index b7bcf77..cd52c99 100644 --- a/pages/bank/bill/index.js +++ b/pages/bank/bill/index.js @@ -23,6 +23,9 @@ Page({ this.fetchBillList() }, onRefreshList: function () { + if (this.data.requesting) { + return + } this.setData({ orderList: [], ['form.pageNum']: 1, diff --git a/pages/bidding/index/index.js b/pages/bidding/index/index.js index a9b507c..f1418a0 100644 --- a/pages/bidding/index/index.js +++ b/pages/bidding/index/index.js @@ -44,6 +44,9 @@ Page({ }, onRefreshList: function () { + if (this.data.requesting) { + return + } this.setData({ orderList: [], ['form.pageNum']: 1, diff --git a/pages/goods/ablility/index.js b/pages/goods/ablility/index.js index f3f9039..ffa9749 100644 --- a/pages/goods/ablility/index.js +++ b/pages/goods/ablility/index.js @@ -75,6 +75,9 @@ Page({ }, // 下拉刷新... onRefreshList: function () { + if (this.data.requesting) { + return + } this.setData({ orderList: [], ['form.pageNum']: 1, diff --git a/pages/goods/index/index.js b/pages/goods/index/index.js index 1e9fb55..f190175 100644 --- a/pages/goods/index/index.js +++ b/pages/goods/index/index.js @@ -53,6 +53,9 @@ Page({ } }, onRefreshList: function () { + if (this.data.requesting) { + return + } this.setData({ orderList: [], ['form.firstCategoryId']: this.data.form.firstCategoryId, diff --git a/pages/mall/price-index/index.js b/pages/mall/price-index/index.js index 810efbf..d84be2d 100644 --- a/pages/mall/price-index/index.js +++ b/pages/mall/price-index/index.js @@ -37,6 +37,9 @@ Page({ }, // 下拉刷新... onRefreshList: function () { + if (this.data.requesting) { + return + } this.setData({ orderList: [], ['form.pageNum']: 1, diff --git a/pages/message/index/index.js b/pages/message/index/index.js index eae7680..6814fe0 100644 --- a/pages/message/index/index.js +++ b/pages/message/index/index.js @@ -39,6 +39,9 @@ Page({ } }, onRefreshList: function () { + if (this.data.requesting) { + return + } this.setData({ messageList: [], tabIndex: this.data.tabIndex, diff --git a/pages/morder/index/index.js b/pages/morder/index/index.js index 225ee3f..33d20b6 100644 --- a/pages/morder/index/index.js +++ b/pages/morder/index/index.js @@ -63,6 +63,9 @@ Page({ } }, onRefreshList: function () { + if (this.data.requesting) { + return + } this.setData({ orderList: [], ['form.status']: this.data.form.status, diff --git a/pages/order/index/index.js b/pages/order/index/index.js index ba2a7de..1686da6 100644 --- a/pages/order/index/index.js +++ b/pages/order/index/index.js @@ -56,6 +56,9 @@ Component({ } }, onRefreshList: function () { + if (this.data.requesting) { + return + } this.setData({ orderList: [], ['form.status']: this.data.form.status, diff --git a/pages/purchase/ability/index.js b/pages/purchase/ability/index.js index 322a393..12ddf24 100644 --- a/pages/purchase/ability/index.js +++ b/pages/purchase/ability/index.js @@ -44,6 +44,9 @@ Page({ }, // 下拉刷新... onRefreshList: function () { + if (this.data.requesting) { + return + } this.setData({ orderList: [], ['form.pageNum']: 1, diff --git a/pages/shop/bidding/index.js b/pages/shop/bidding/index.js index cd9977f..d2950c6 100644 --- a/pages/shop/bidding/index.js +++ b/pages/shop/bidding/index.js @@ -42,6 +42,9 @@ Page({ } }, onRefreshList: function () { + if (this.data.requesting) { + return + } this.setData({ orderList: [], ['form.status']: this.data.form.status, diff --git a/pages/shop/bill/index.js b/pages/shop/bill/index.js index 938d025..25b4673 100644 --- a/pages/shop/bill/index.js +++ b/pages/shop/bill/index.js @@ -30,6 +30,9 @@ Page({ this.fetchBillList() }, onRefreshList: function () { + if (this.data.requesting) { + return + } this.setData({ orderList: [], ['form.pageNum']: 1, diff --git a/pages/shop/detail/index.js b/pages/shop/detail/index.js index e8d2949..75deecd 100644 --- a/pages/shop/detail/index.js +++ b/pages/shop/detail/index.js @@ -66,6 +66,9 @@ Page({ this.setData({ requesting: false }) return } + if (this.data.requesting) { + return + } this.setData({ orderList: [], tabIndex: this.data.tabIndex, diff --git a/pages/shop/order/index.js b/pages/shop/order/index.js index cc2a9bb..5169da0 100644 --- a/pages/shop/order/index.js +++ b/pages/shop/order/index.js @@ -45,6 +45,9 @@ Page({ } }, onRefreshList: function () { + if (this.data.requesting) { + return + } this.setData({ orderList: [], ['form.status']: this.data.form.status, diff --git a/pages/withdrawal/vcheckout/index.wxml b/pages/withdrawal/vcheckout/index.wxml index 133326d..745820a 100644 --- a/pages/withdrawal/vcheckout/index.wxml +++ b/pages/withdrawal/vcheckout/index.wxml @@ -8,22 +8,23 @@ 提现申请后T+1个工作日到账（周六、周日及节假日顺延到工作日），如有疑问请联系客服400-6881-001 - + {{chooseBankCard.cardName}} - - + + 提现金额 + ￥ 全部提现 - + diff --git a/project.config.json b/project.config.json index c2b69e5..034faa3 100644 --- a/project.config.json +++ b/project.config.json @@ -1,76 +1,76 @@ { - "description": "项目配置文件", - "packOptions": { - "ignore": [] - }, - "setting": { - "urlCheck": true, - "es6": true, - "enhance": true, - "postcss": true, - "preloadBackgroundData": false, - "minified": true, - "newFeature": true, - "coverView": true, - "nodeModules": false, - "autoAudits": false, - "showShadowRootInWxmlPanel": true, - "scopeDataCheck": false, - "uglifyFileName": true, - "checkInvalidKey": true, - "checkSiteMap": true, - "uploadWithSourceMap": true, - "compileHotReLoad": false, - "useMultiFrameRuntime": true, - "useApiHook": true, - "useApiHostProcess": true, - "babelSetting": { - "ignore": [], - "disablePlugins": [], - "outputPath": "" - }, - "enableEngineNative": false, - "bundle": false, - "useIsolateContext": true, - "useCompilerModule": true, - "userConfirmedUseCompilerModuleSwitch": true, - "userConfirmedBundleSwitch": false, - "packNpmManually": false, - "packNpmRelationList": [], - "minifyWXSS": true - }, - "compileType": "miniprogram", - "libVersion": "2.14.4", - "appid": "wx7a4a8415e6821108", - "projectname": "zhitongbao-mini", - "debugOptions": { - "hidedInDevtools": [] - }, - "isGameTourist": false, - "simulatorType": "wechat", - "simulatorPluginLibVersion": {}, - "scripts": { - "beforeCompile": "" - }, - "condition": { - "plugin": { - "list": [] - }, - "game": { - "list": [] - }, - "gamePlugin": { - "list": [] - }, - "miniprogram": { - "list": [ - { - "name": "pages/login/index", - "pathName": "pages/login/index", - "query": "", - "scene": 1047 - } - ] - } - } + "description": "项目配置文件", + "packOptions": { + "ignore": [] + }, + "setting": { + "urlCheck": false, + "es6": true, + "enhance": true, + "postcss": true, + "preloadBackgroundData": false, + "minified": true, + "newFeature": true, + "coverView": true, + "nodeModules": false, + "autoAudits": false, + "showShadowRootInWxmlPanel": true, + "scopeDataCheck": false, + "uglifyFileName": true, + "checkInvalidKey": true, + "checkSiteMap": true, + "uploadWithSourceMap": true, + "compileHotReLoad": false, + "useMultiFrameRuntime": true, + "useApiHook": true, + "useApiHostProcess": true, + "babelSetting": { + "ignore": [], + "disablePlugins": [], + "outputPath": "" + }, + "enableEngineNative": false, + "bundle": false, + "useIsolateContext": true, + "useCompilerModule": true, + "userConfirmedUseCompilerModuleSwitch": true, + "userConfirmedBundleSwitch": false, + "packNpmManually": false, + "packNpmRelationList": [], + "minifyWXSS": true + }, + "compileType": "miniprogram", + "libVersion": "2.16.0", + "appid": "wx7a4a8415e6821108", + "projectname": "zhitongbao-mini", + "debugOptions": { + "hidedInDevtools": [] + }, + "isGameTourist": false, + "simulatorType": "wechat", + "simulatorPluginLibVersion": {}, + "scripts": { + "beforeCompile": "" + }, + "condition": { + "plugin": { + "list": [] + }, + "game": { + "list": [] + }, + "gamePlugin": { + "list": [] + }, + "miniprogram": { + "list": [ + { + "name": "pages/login/index", + "pathName": "pages/login/index", + "query": "", + "scene": 1047 + } + ] + } + } } \ No newline at end of file