From cc9ffe02479be4828fa9954faa48e04d7f5c4bab Mon Sep 17 00:00:00 2001 From: xpz2018 <107107461@qq.com> Date: Sat, 20 Mar 2021 14:01:50 +0800 Subject: [PATCH] no message --- pages/agent/agent-item/index.wxml | 4 +-- pages/agent/edit/index.js | 8 +++-- pages/agent/factory/index.wxml | 4 +-- pages/article/allNewInfo/index.js | 47 +++++++++----------------- pages/article/allNewInfo/index.wxml | 47 ++++++++++++++------------ pages/article/newInfo/index.wxml | 52 +++++++++++++++-------------- pages/article/newInfo/index.wxss | 21 +++++------- pages/formate.wxs | 9 ++++- 8 files changed, 93 insertions(+), 99 deletions(-) diff --git a/pages/agent/agent-item/index.wxml b/pages/agent/agent-item/index.wxml index 7334a36..a6bcc93 100644 --- a/pages/agent/agent-item/index.wxml +++ b/pages/agent/agent-item/index.wxml @@ -79,13 +79,13 @@ function priceItem(item, kg) { if(kg){ if(item.publicSubsidies && Number(item.publicSubsidies) > 0){ - let price = parseFloat(item.unitPrice) + parseFloat(item.publicSubsidies) + var price = parseFloat(item.unitPrice) + parseFloat(item.publicSubsidies) return (parseFloat(price)).toFixed(3) + '元/KG' } return (parseFloat(item.unitPrice)).toFixed(3) + '元/KG' } else { if(item.publicSubsidies && Number(item.publicSubsidies) > 0){ - let price = parseFloat(item.unitPrice) + parseFloat(item.publicSubsidies) + var 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 eea0a96..70bb970 100644 --- a/pages/agent/edit/index.js +++ b/pages/agent/edit/index.js @@ -53,7 +53,6 @@ Page({ //异常回调 }) getFactoryPriceDetail(options.id).then(result => { - //成功回调 this.data.cateList = [] if(result.data.paperCategoryList && result.data.paperCategoryList.length){ for (let index = 0; index < result.data.paperCategoryList.length; index++) { @@ -62,7 +61,12 @@ Page({ if(options.unitPrice){ this.data.form.unitPrice = Number(options.unitPrice) } else { - this.data.form.unitPrice = element.unitPrice + if(element.publicSubsidies && Number(element.publicSubsidies) > 0){ + this.data.form.publicSubsidies = element.publicSubsidies + this.data.form.unitPrice = math.plus(element.unitPrice, element.publicSubsidies) + } else { + this.data.form.unitPrice = element.unitPrice + } } this.data.cateName = element.categoryName } diff --git a/pages/agent/factory/index.wxml b/pages/agent/factory/index.wxml index 7881f51..d5ac5e9 100644 --- a/pages/agent/factory/index.wxml +++ b/pages/agent/factory/index.wxml @@ -182,13 +182,13 @@ function priceItem(item, kg) { if(kg){ if(item.publicSubsidies && Number(item.publicSubsidies) > 0){ - let price = parseFloat(item.unitPrice) + parseFloat(item.publicSubsidies) + var price = parseFloat(item.unitPrice) + parseFloat(item.publicSubsidies) return (parseFloat(price)).toFixed(3) + '元/KG' } return (parseFloat(item.unitPrice)).toFixed(3) + '元/KG' } else { if(item.publicSubsidies && Number(item.publicSubsidies) > 0){ - let price = parseFloat(item.unitPrice) + parseFloat(item.publicSubsidies) + var price = parseFloat(item.unitPrice) + parseFloat(item.publicSubsidies) return (parseFloat(price) * 1000).toFixed(1) + '元/吨' } return (parseFloat(item.unitPrice) * 1000).toFixed(1) + '元/吨' diff --git a/pages/article/allNewInfo/index.js b/pages/article/allNewInfo/index.js index c9e802c..fda6852 100644 --- a/pages/article/allNewInfo/index.js +++ b/pages/article/allNewInfo/index.js @@ -1,8 +1,6 @@ const util = require('../../../utils/util') const app = getApp() -import { - getPaperMillOfInformationList -} from "../../api/ztb" +import { getPaperMillOfInformationList } from "../../api/ztb" Page({ @@ -10,7 +8,7 @@ Page({ * 页面的初始数据 */ data: { - height: app.globalData.safeFragmentHeight - 190, + height: app.globalData.fragmentHeight - 80, safeBottom: app.globalData.safeBottom, orderList: [], tableSgin: null, @@ -30,11 +28,9 @@ Page({ this.setData({ StatusBar: app.globalData.StatusBar || 40, CustomBar: app.globalData.CustomBar || (app.globalData.isIos ? 64 : 80), + height: app.globalData.fragmentHeight - 80 }) - this.getPaperMillOfInformationListFct({ - queryWay: 1 - }) - + this.getPaperMillOfInformationListFct({ queryWay: 1 }) }, toPage: function (e) { if (e.currentTarget.id == 'toqb') { @@ -53,49 +49,36 @@ Page({ changeTable: function (e) { var a = e.currentTarget.id if (e.currentTarget.id === this.data.tableSgin) { - this.setData({ - tableSgin: null - }) + this.setData({ tableSgin: null }) } else { - this.setData({ - tableSgin: e.currentTarget.id - }) + this.setData({ tableSgin: e.currentTarget.id }) } }, getPaperMillOfInformationListFct(model) { - this.setData({ - loading: true - }) + this.setData({ loading: true }) + wx.showLoading({ title: '加载中' }) getPaperMillOfInformationList(model).then(res => { - this.setData({ - orderList: res.data - }) - this.setData({ - loading: false - }) + this.setData({ orderList: res.data, loading: false }) + wx.hideLoading() + }).catch((e) => { + wx.hideLoading() }) }, changeSort:function(){ if(this.data.pximg=='/assets/info/px-mr.png'){ - this.setData({ - pximg:'/assets/info/px-sx.png' - }) + this.setData({ pximg:'/assets/info/px-sx.png' }) this.data.querFrom.priceSort=1 this.getPaperMillOfInformationListFct(this.data.querFrom) return } if(this.data.pximg=='/assets/info/px-sx.png'){ - this.setData({ - pximg:'/assets/info/px-jx.png' - }) + this.setData({ pximg:'/assets/info/px-jx.png' }) this.data.querFrom.priceSort=0 this.getPaperMillOfInformationListFct(this.data.querFrom) return } if(this.data.pximg=='/assets/info/px-jx.png'){ - this.setData({ - pximg:'/assets/info/px-mr.png' - }) + this.setData({ pximg:'/assets/info/px-mr.png' }) this.data.querFrom.priceSort=0 this.getPaperMillOfInformationListFct(this.data.querFrom) return diff --git a/pages/article/allNewInfo/index.wxml b/pages/article/allNewInfo/index.wxml index 61fbf4f..96c48ce 100644 --- a/pages/article/allNewInfo/index.wxml +++ b/pages/article/allNewInfo/index.wxml @@ -3,17 +3,16 @@ 全部纸厂 - - - - 纸厂名称 - 价格涨跌 + + 纸厂名称 + + 价格涨跌 + 纸厂排队 - 最近扣点 - + 最近扣点 - +