|
|
@@ -51,17 +51,6 @@
|
|
|
},
|
|
|
{
|
|
|
label:'总流量',
|
|
|
-<<<<<<< HEAD
|
|
|
- value:data.data_totalamount?data.data_totalamount + 'KB':0 + 'KB'
|
|
|
- },
|
|
|
- {
|
|
|
- label:'使用流量',
|
|
|
- value:data.data_useamount?data.data_useamount + 'KB':0 + 'KB'
|
|
|
- },
|
|
|
- {
|
|
|
- label:'剩余流量',
|
|
|
- value:data.data_remainamount?data.data_totalamount + 'KB':0 + 'KB'
|
|
|
-=======
|
|
|
value:data.data_totalamount ? data.data_totalamount + 'KB' : '0.0KB'
|
|
|
},
|
|
|
{
|
|
|
@@ -71,7 +60,6 @@
|
|
|
{
|
|
|
label:'剩余流量',
|
|
|
value:data.data_remainamount ? data.data_remainamount + 'KB' : '0.0KB'
|
|
|
->>>>>>> xiaoqin
|
|
|
},
|
|
|
{
|
|
|
label:'激活日期',
|
|
|
@@ -79,11 +67,7 @@
|
|
|
},
|
|
|
{
|
|
|
label:'余额',
|
|
|
-<<<<<<< HEAD
|
|
|
value:data.balance? data.balance + '元' : 0 + '元'
|
|
|
-=======
|
|
|
- value:data.balance ? data.balance + '元' : ''
|
|
|
->>>>>>> xiaoqin
|
|
|
},
|
|
|
{
|
|
|
label:'状态',
|
