|
@@ -3,7 +3,7 @@ define(['$', 'template', 'IScroll', 'user', 'product', 'native', 'config', 'addr
|
|
var myDate = new Date();
|
|
var myDate = new Date();
|
|
var year = myDate.getFullYear();
|
|
var year = myDate.getFullYear();
|
|
var month = myDate.getMonth();
|
|
var month = myDate.getMonth();
|
|
- var BalancsView=false;
|
|
|
|
|
|
+ var BalancsView=true;
|
|
function back (event) {
|
|
function back (event) {
|
|
event.preventDefault();
|
|
event.preventDefault();
|
|
$(document).trigger('spa:navigate', {
|
|
$(document).trigger('spa:navigate', {
|
|
@@ -70,11 +70,25 @@ define(['$', 'template', 'IScroll', 'user', 'product', 'native', 'config', 'addr
|
|
end_time:endTime
|
|
end_time:endTime
|
|
},function(res){
|
|
},function(res){
|
|
var balanceLog = res.message;
|
|
var balanceLog = res.message;
|
|
- for(var i in balanceLog){
|
|
|
|
- if(balanceLog[i].amount>0 && balanceLog[i].memo!=="微信下订单" && balanceLog[i].memo!=="下订单"){
|
|
|
|
|
|
+ var j=0;
|
|
|
|
+
|
|
|
|
+ for(var i in balanceLog) {
|
|
|
|
+ console.log(i);
|
|
|
|
+ if (balanceLog[i].amount > 0 && balanceLog[i].memo !== "微信下订单" && balanceLog[i].memo !== "下订单") {
|
|
|
|
+ j++;
|
|
|
|
+ console.log('j=' + j);
|
|
|
|
+ console.log('i=' + i);
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+ if(j != 0){
|
|
|
|
+ BalancsView=false;
|
|
|
|
+ } else {
|
|
BalancsView=true;
|
|
BalancsView=true;
|
|
- }
|
|
|
|
}
|
|
}
|
|
|
|
+
|
|
|
|
+
|
|
console.log(BalancsView);
|
|
console.log(BalancsView);
|
|
if (!cachePageData.massage) {
|
|
if (!cachePageData.massage) {
|
|
var tpl = template('balanceLog/productDescScroll', {
|
|
var tpl = template('balanceLog/productDescScroll', {
|
|
@@ -97,12 +111,19 @@ define(['$', 'template', 'IScroll', 'user', 'product', 'native', 'config', 'addr
|
|
},function(res){
|
|
},function(res){
|
|
var balanceLog = res.message;
|
|
var balanceLog = res.message;
|
|
console.log(balanceLog);
|
|
console.log(balanceLog);
|
|
|
|
+ var j=0;
|
|
for(var i in balanceLog){
|
|
for(var i in balanceLog){
|
|
- if(balanceLog[i].memo=="微信下订单" || balanceLog[i].memo=="下订单" || balanceLog[i].amount<0 ){
|
|
|
|
- BalancsView=true;
|
|
|
|
- }
|
|
|
|
|
|
+ if(balanceLog[i].memo=="微信下订单" || balanceLog[i].memo=="下订单" || balanceLog[i].amount<0 ){
|
|
|
|
+ j++;
|
|
|
|
+ }
|
|
}
|
|
}
|
|
- console.log(BalancsView);
|
|
|
|
|
|
+
|
|
|
|
+ if(j != 0){
|
|
|
|
+ BalancsView=false;
|
|
|
|
+ }else {
|
|
|
|
+ BalancsView=true;
|
|
|
|
+ }
|
|
|
|
+
|
|
if (!cachePageData.massage) {
|
|
if (!cachePageData.massage) {
|
|
var tpl = template('balanceLog/orderContainer', {
|
|
var tpl = template('balanceLog/orderContainer', {
|
|
balanceLog: balanceLog,
|
|
balanceLog: balanceLog,
|
|
@@ -244,11 +265,19 @@ define(['$', 'template', 'IScroll', 'user', 'product', 'native', 'config', 'addr
|
|
}, function (res) {
|
|
}, function (res) {
|
|
if (res.success) {
|
|
if (res.success) {
|
|
var balanceLog = res.message;
|
|
var balanceLog = res.message;
|
|
|
|
+ var j = 0;
|
|
for(var i in balanceLog){
|
|
for(var i in balanceLog){
|
|
if(balanceLog[i].amount>0 && balanceLog[i].memo!=="微信下订单" && balanceLog[i].memo!=="下订单"){
|
|
if(balanceLog[i].amount>0 && balanceLog[i].memo!=="微信下订单" && balanceLog[i].memo!=="下订单"){
|
|
- BalancsView=true;
|
|
|
|
|
|
+ j++;
|
|
|
|
+ console.log('j='+j);
|
|
|
|
+ console.log('i='+i);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
+ if(j != 0){
|
|
|
|
+ BalancsView=false;
|
|
|
|
+ } else {
|
|
|
|
+ BalancsView=true;
|
|
|
|
+ }
|
|
|
|
|
|
if (!cachePageData.massage) {
|
|
if (!cachePageData.massage) {
|
|
var tpl = template('balanceLog/index', {
|
|
var tpl = template('balanceLog/index', {
|