fe / yoho-shop-manage · Commits

Go to a project

Authored by lin
Commit 7bd449fe4c2e8990885be93cf8bc22becf72d045 1 parent 780dd659

调整页面显示

Inline Side-by-side
Showing 2 changed files with 51 additions and 45 deletions
@@ -57,20 +57,20 @@ @@ -57,20 +57,20 @@
57 <div class="select-container"> 57 <div class="select-container">
58 <Input v-model.trim="filters.orderCode.model" :placeholder="filters.orderCode.label" /> 58 <Input v-model.trim="filters.orderCode.model" :placeholder="filters.orderCode.label" />
59 </div> 59 </div>
60 - <div class="select-container">  
61 - <Select v-model.trim="filters.clearingType.model" :placeholder="filters.clearingType.label">  
62 - <Option v-for="option in filters.clearingType.options" :key="option.value" :value="option.value">{{  
63 - option.label  
64 - }}</Option>  
65 - </Select>  
66 - </div>  
67 - <div class="select-container">  
68 - <Select v-model.trim="filters.subClearingType.model" :placeholder="filters.subClearingType.label">  
69 - <Option v-for="option in filters.subClearingType.options" :key="option.value" :value="option.value">{{  
70 - option.label  
71 - }}</Option>  
72 - </Select>  
73 - </div> 60 +<!-- <div class="select-container">-->
  61 +<!-- <Select v-model.trim="filters.clearingType.model" :placeholder="filters.clearingType.label">-->
  62 +<!-- <Option v-for="option in filters.clearingType.options" :key="option.value" :value="option.value">{{-->
  63 +<!-- option.label-->
  64 +<!-- }}</Option>-->
  65 +<!-- </Select>-->
  66 +<!-- </div>-->
  67 +<!-- <div class="select-container">-->
  68 +<!-- <Select v-model.trim="filters.subClearingType.model" :placeholder="filters.subClearingType.label">-->
  69 +<!-- <Option v-for="option in filters.subClearingType.options" :key="option.value" :value="option.value">{{-->
  70 +<!-- option.label-->
  71 +<!-- }}</Option>-->
  72 +<!-- </Select>-->
  73 +<!-- </div>-->
74 <div class="select-container"> 74 <div class="select-container">
75 <Select v-model.trim="filters.withdrawStatus.model" :placeholder="filters.withdrawStatus.label"> 75 <Select v-model.trim="filters.withdrawStatus.model" :placeholder="filters.withdrawStatus.label">
76 <Option v-for="option in filters.withdrawStatus.options" :key="option.value" :value="option.value">{{ 76 <Option v-for="option in filters.withdrawStatus.options" :key="option.value" :value="option.value">{{
@@ -81,7 +81,7 @@ @@ -81,7 +81,7 @@
81 <div class="select-container"> 81 <div class="select-container">
82 <Button type="primary" @click="search">查询</Button> 82 <Button type="primary" @click="search">查询</Button>
83 <Button type="primary" @click="reset">全部</Button> 83 <Button type="primary" @click="reset">全部</Button>
84 - <Button>导出</Button> 84 +<!-- <Button>导出</Button>-->
85 </div> 85 </div>
86 </filter-item> 86 </filter-item>
87 </layout-filter> 87 </layout-filter>
@@ -99,10 +99,10 @@ export default function() { @@ -99,10 +99,10 @@ export default function() {
99 }, 99 },
100 { 100 {
101 title: '结算时间', 101 title: '结算时间',
102 - key: 'createTime', 102 + key: 'clearingTime',
103 align: 'center', 103 align: 'center',
104 render(h, params) { 104 render(h, params) {
105 - const time = moment.unix(params.row.createTime); 105 + const time = moment.unix(params.row.clearingTime);
106 return ( 106 return (
107 <div> 107 <div>
108 <div>{time.format('YYYY/MM/DD')}</div> 108 <div>{time.format('YYYY/MM/DD')}</div>
@@ -125,7 +125,7 @@ export default function() { @@ -125,7 +125,7 @@ export default function() {
125 }, 125 },
126 { 126 {
127 title: '商家实收（元）', 127 title: '商家实收（元）',
128 - key: 'amount', 128 + key: 'realIncome',
129 }, 129 },
130 { 130 {
131 title: '提现状态', 131 title: '提现状态',
@@ -142,51 +142,57 @@ export default function() { @@ -142,51 +142,57 @@ export default function() {
142 }, 142 },
143 { 143 {
144 title: '提现申请日期', 144 title: '提现申请日期',
145 - key: 'applyTime', 145 + key: 'withdrawTime',
146 align: 'center', 146 align: 'center',
147 render(h, params) { 147 render(h, params) {
148 - const applyTime = moment.unix(params.row.applyTime); 148 + if (!params.row.withdrawTime){
  149 + return ""
  150 + }
  151 + const withdrawTime = moment.unix(params.row.withdrawTime);
149 return ( 152 return (
150 <div> 153 <div>
151 - <div>{applyTime.format('YYYY/MM/DD')}</div>  
152 - <div>{applyTime.format('HH:mm:ss')}</div> 154 + <div>{withdrawTime.format('YYYY/MM/DD')}</div>
  155 + <div>{withdrawTime.format('HH:mm:ss')}</div>
153 </div> 156 </div>
154 ); 157 );
155 }, 158 },
156 }, 159 },
157 { 160 {
158 title: '提现成功日期', 161 title: '提现成功日期',
159 - key: 'applySuccessTime', 162 + key: 'withdrawSuccessTime',
160 align: 'center', 163 align: 'center',
161 render(h, params) { 164 render(h, params) {
162 - const appSuTime = moment.unix(params.row.applySuccessTime); 165 + if (!params.row.withdrawSuccessTime){
  166 + return ""
  167 + }
  168 + const withdrawSuccessTime = moment.unix(params.row.withdrawSuccessTime);
163 return ( 169 return (
164 <div> 170 <div>
165 - <div>{appSuTime.format('YYYY/MM/DD')}</div>  
166 - <div>{appSuTime.format('HH:mm:ss')}</div> 171 + <div>{withdrawSuccessTime.format('YYYY/MM/DD')}</div>
  172 + <div>{withdrawSuccessTime.format('HH:mm:ss')}</div>
167 </div> 173 </div>
168 ); 174 );
169 }, 175 },
170 }, 176 },
171 - {  
172 - title: '操作',  
173 - key: 'action',  
174 - width: 180,  
175 - align: 'center',  
176 - render: (h, params) => {  
177 - const row = params.row;  
178 - return (  
179 - <div>  
180 - <div class="cell-action-row">  
181 - <i-button type="primary" size="small" onClick={() => this.getDetailById(row.id)}>  
182 - 查看明细  
183 - </i-button>  
184 - </div>  
185 - </div>  
186 - );  
187 - },  
188 - className: 'action-column',  
189 - }, 177 + // {
  178 + // title: '操作',
  179 + // key: 'action',
  180 + // width: 180,
  181 + // align: 'center',
  182 + // render: (h, params) => {
  183 + // const row = params.row;
  184 + // return (
  185 + // <div>
  186 + // <div class="cell-action-row">
  187 + // <i-button type="primary" size="small" onClick={() => this.getDetailById(row.id)}>
  188 + // 查看明细
  189 + // </i-button>
  190 + // </div>
  191 + // </div>
  192 + // );
  193 + // },
  194 + // className: 'action-column',
  195 + // },
190 ], 196 ],
191 tableData: [], 197 tableData: [],
192 pageData: { 198 pageData: {