From df117412ecd35f99f98aab83821d87036255e914 Mon Sep 17 00:00:00 2001 From: wangsongsole Date: Tue, 1 Nov 2022 13:51:12 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=E5=8D=A1=E5=AF=86=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=EF=BC=8C=E5=9C=A8=E8=AE=A2=E5=8D=95=E8=AF=A6=E6=83=85=E4=B8=AD?= =?UTF-8?q?=EF=BC=8C=E4=B8=8D=E5=B1=95=E7=A4=BA=E5=85=85=E5=80=BC=E8=B4=A6?= =?UTF-8?q?=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/order/more/more.js | 443 +++++++++++++++++++---------------- 1 file changed, 235 insertions(+), 208 deletions(-) diff --git a/src/pages/order/more/more.js b/src/pages/order/more/more.js index da93503b..e042e95b 100644 --- a/src/pages/order/more/more.js +++ b/src/pages/order/more/more.js @@ -1,242 +1,269 @@ -import ReactDOM from 'react-dom'; -import React, { Component } from 'react'; -import { HashRouter as Router, Route, Link } from "react-router-dom"; +import ReactDOM from "react-dom" +import React, { Component } from "react" +import { HashRouter as Router, Route, Link } from "react-router-dom" import "../../../assets/comm.css" -import {getQueryString} from "../../../assets/comm.js" +import { getQueryString } from "../../../assets/comm.js" import "./more.less" -import {Notify,Pop} from "zent" +import { Notify, Pop } from "zent" import TabPage from "../../../components/tabPage/main.js" import Grid from "../../../components/gird/main.js" -import {getOrderDetails,handelResponse,getOrderLog} from "../../../assets/api.js" -import ReactJson from 'react-json-view' +import { + getOrderDetails, + handelResponse, + getOrderLog +} from "../../../assets/api.js" +import ReactJson from "react-json-view" import moment from "moment" const Column = [ { - title: '创建时间', - name: 'time', - prop:'time', + title: "创建时间", + name: "time", + prop: "time", type: "slot", - width:'20%' - },{ - title: '操作描述', - name: 'message', - prop:'message', - type: "normal", - width:'20%' + width: "20%" }, { - title: '详情', - name: 'opearo', + title: "操作描述", + name: "message", + prop: "message", + type: "normal", + width: "20%" + }, + { + title: "详情", + name: "opearo", type: "slot", - prop:'opearo', - width:'50%' + prop: "opearo", + width: "50%" } -]; +] -export default class order extends React.Component{ - constructor(props){ +export default class order extends React.Component { + constructor(props) { super(props) - this.state={ - tabList:[{title:"详情"},{title:"日志"}], - tabactive:0, - orderDetailLog_data:[], - orderDetail_data:{}, - tableHeight:500, - page:1, - orderNo:'', - limit:10, - total:0, + this.state = { + tabList: [{ title: "详情" }, { title: "日志" }], + tabactive: 0, + orderDetailLog_data: [], + orderDetail_data: {}, + tableHeight: 500, + page: 1, + orderNo: "", + limit: 10, + total: 0 } } - tabFn(index){ - this.setState({tabactive:index}); - let activerou=[]; - if(index==0){ - activerou=[{items:[ + tabFn(index) { + this.setState({ tabactive: index }) + let activerou = [] + if (index == 0) { + activerou = [ { - "path": "/order-list", - "name": "订单管理" - }, - { - "path": "/order-addetails", - "name": "订单详情" + items: [ + { + path: "/order-list", + name: "订单管理" + }, + { + path: "/order-addetails", + name: "订单详情" + } + ] } - ]}] - }else{ - - activerou=[{items:[ + ] + } else { + activerou = [ { - "path": "/order-list", - "name": "订单管理" - }, - { - "path": "/order-addetails", - "name": "订单日志" + items: [ + { + path: "/order-list", + name: "订单管理" + }, + { + path: "/order-addetails", + name: "订单日志" + } + ] } - ]}] + ] } - sessionStorage.setItem('breaknav',JSON.stringify(activerou)); - this.getOrderLogFn(); - - } - selection(){ - + sessionStorage.setItem("breaknav", JSON.stringify(activerou)) + this.getOrderLogFn() } + selection() {} //获取订单日志 - getOrderLogFn(){ - let _self=this; - let {page,limit,orderNo}=this.state; - let data={ + getOrderLogFn() { + let _self = this + let { page, limit, orderNo } = this.state + let data = { page, limit } - getOrderLog(orderNo,data).then(res=>{ - handelResponse(res,(response,msg)=>{ - const orderDetailLog_data=response.data; - _self.setState({orderDetailLog_data,total:response.total}); - },(err)=>{ - Notify.error(err) - }) - }).catch(err=>{ - - }); + getOrderLog(orderNo, data) + .then((res) => { + handelResponse( + res, + (response, msg) => { + const orderDetailLog_data = response.data + _self.setState({ orderDetailLog_data, total: response.total }) + }, + (err) => { + Notify.error(err) + } + ) + }) + .catch((err) => {}) } //获取详情信息 - getDetails(data){ - let _self=this; - getOrderDetails(data).then(res=>{ - handelResponse(res,(response,msg)=>{ - const orderDetail_data=response; - _self.setState({orderDetail_data}); - },(err)=>{ - Notify.error(err) - }) - }).catch(err=>{ - - }); - } - //page - pageChange(e){ - this.setState({page:e}); - setTimeout(() => { - this.getOrderLogFn(); - }, 0); - - } - //limit - countChange(e){ - this.setState({page:1,limit:e}); - setTimeout(() => { - this.getOrderLogFn(); - }, 0); - } - componentWillMount(){ - let href=window.location.href; - let strindex = href.lastIndexOf("\="); - let orderNo = href.substr(strindex + 1, href.length); - this.setState({orderNo}); - this.getDetails(orderNo); - this.setState({tableHeight:window.innerHeight-430}); - } - - render(){ - let orderDetail_data=this.state.orderDetail_data; - return( -
- - { - this.state.tabactive==0?(
    -
  • - 订单号 - {orderDetail_data.order_number} -
    • -
  • - 创建时间 - {orderDetail_data.create_time} -
    • -
  • - 商品名称 - {orderDetail_data.product_name} -
    • -
  • - 映射商品 - {orderDetail_data.map_product_name} -
    • -
  • - 官方价 - {orderDetail_data.official_price} -
    • -
  • - 成本价 - {orderDetail_data.cost_price} -
    • -
  • - 合同价 - {orderDetail_data.contract_price} -
    • -
  • - 购买数量 - {orderDetail_data.num} -
    • -
  • - 总计 - {(orderDetail_data.num*orderDetail_data.contract_price).toFixed(4)} -
    • -
  • - 充值账号 - {orderDetail_data.account} -
    • - -
  • - 状态 - {orderDetail_data.status_text} -
    • -
):( -
- { - this.countChange(e) - } - } - countbarVisible={false} - isSwitch={false} - pageChange={(e)=>{ - this.pageChange(e) - - }} - - checkChange ={this.selection.bind(this)} - ComponentHandler={(com,rowData)=>{ - - if(com == "time") - { - return
{moment.unix(rowData.time).format("YYYY-MM-DD HH:mm:ss")}
+ getDetails(data) { + let _self = this + getOrderDetails(data) + .then((res) => { + handelResponse( + res, + (response, msg) => { + console.log(response) + _self.setState({ orderDetail_data: response }) + }, + (err) => { + Notify.error(err) } - if(com == "opearo") - { - return
- { - rowData.data? :- - } - -
- } - - }} - /> -
) - } - + }) + .catch((err) => {}) + } + //page + pageChange(e) { + this.setState({ page: e }) + setTimeout(() => { + this.getOrderLogFn() + }, 0) + } + //limit + countChange(e) { + this.setState({ page: 1, limit: e }) + setTimeout(() => { + this.getOrderLogFn() + }, 0) + } + componentWillMount() { + let href = window.location.href + let strindex = href.lastIndexOf("=") + let orderNo = href.substr(strindex + 1, href.length) + this.setState({ orderNo }) + this.getDetails(orderNo) + this.setState({ tableHeight: window.innerHeight - 430 }) + } + + render() { + let orderDetail_data = this.state.orderDetail_data + return ( +
+ + {this.state.tabactive == 0 ? ( +
    +
  • + 订单号 + {orderDetail_data.order_number} +
    • +
  • + 创建时间 + {orderDetail_data.create_time} +
    • +
  • + 商品名称 + {orderDetail_data.product_name} +
    • +
  • + 映射商品 + {orderDetail_data.map_product_name} +
    • +
  • + 官方价 + {orderDetail_data.official_price} +
    • +
  • + 成本价 + {orderDetail_data.cost_price} +
    • +
  • + 合同价 + {orderDetail_data.contract_price} +
    • +
  • + 购买数量 + {orderDetail_data.num} +
    • +
  • + 总计 + + {( + orderDetail_data.num * orderDetail_data.contract_price + ).toFixed(4)} + +
    • + {orderDetail_data.product?.product_type === 1 ? ( +
  • + 充值账号 + {orderDetail_data.account} +
    • + ) : null} + +
  • + 状态 + {orderDetail_data.status_text} +
    • +
+ ) : ( +
+ { + this.countChange(e) + }} + countbarVisible={false} + isSwitch={false} + pageChange={(e) => { + this.pageChange(e) + }} + checkChange={this.selection.bind(this)} + ComponentHandler={(com, rowData) => { + if (com == "time") { + return ( +
+ {moment + .unix(rowData.time) + .format("YYYY-MM-DD HH:mm:ss")} +
+ ) + } + if (com == "opearo") { + return ( +
+ {rowData.data ? ( + + ) : ( + - + )} +
+ ) + } + }} + /> +
+ )}
) } -} \ No newline at end of file +} From f43f8337030612dc962c83d448324c809732f214 Mon Sep 17 00:00:00 2001 From: wangsongsole Date: Tue, 1 Nov 2022 14:00:56 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E3=80=90=E5=90=8E?= =?UTF-8?q?=E5=8F=B0=E3=80=91=E5=85=85=E5=80=BC=E5=A4=B1=E8=B4=A5=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=EF=BC=8C=E4=B8=8D=E5=B1=95=E7=A4=BA=E6=94=B9=E4=B8=BA?= =?UTF-8?q?=E6=88=90=E5=8A=9Fbutton=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/order/list/list.js | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/pages/order/list/list.js b/src/pages/order/list/list.js index 4187f7ad..856658b6 100644 --- a/src/pages/order/list/list.js +++ b/src/pages/order/list/list.js @@ -765,11 +765,6 @@ export default class orderlist extends React.Component { ) : null} {rowData.status == 3 && rowData.pay_status == 2 ? ( <> - this.changeSuccessFn(e, rowData)}> - 改为成功 -