Skip to content

Commit

Permalink
log
Browse files Browse the repository at this point in the history
  • Loading branch information
stardustlxx committed May 24, 2017
1 parent b92f2fa commit b5046d8
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 9 deletions.
6 changes: 3 additions & 3 deletions lib/commonInc.js
Original file line number Diff line number Diff line change
Expand Up @@ -119,9 +119,9 @@ function getQResultTitle(texts, title, firstTitle, order) {
}
var titleTotal = lastTitleIdx - firstTitleIdx + 1; // 显示标题总个数

logDebug("title=" + title + " titleIndex=" + titleIndex + " titleTotal="
+ titleTotal + " yPre=" + yPre + " y=" + y + " texts.length="
+ texts.length);
logDebug("title=" + title + " titleIndex=" + titleIndex + " titleTotal=" +
titleTotal + " firstTitleIdx=" + firstTitleIdx + " yPre=" + yPre + " y=" + y +
" texts.length=" + texts.length);
var qrTitle = new QResultTitle(title, titleIndex, titleTotal);
return qrTitle;
}
Expand Down
10 changes: 6 additions & 4 deletions lib/sales.js
Original file line number Diff line number Diff line change
Expand Up @@ -916,11 +916,13 @@ function getDetSizheadTitle(order) {
var qrTitle2 = getQResultTitle(texts, "操作", "#", order);// 结束标题 操作
for (var j = qrTitle1.index + 1; j < qrTitle2.index; j++) {
var width = texts[j].rect().size.width;
if (width > 5) {// 忽略隐藏标题
var title = texts[j].name();
var title = texts[j].name();
if (width > 10) {// 忽略隐藏标题
if (!isNull(title) && isDefined(title)) {
colX[title] = getX(texts[j]);
}
}else {
logDebug('title='+title+' idx='+j+' width='+width+' 跳过');
}
}

Expand Down Expand Up @@ -956,13 +958,13 @@ function getDetSizheadTitle(order) {
// }
// }
// }
debugObject(ret, "ret");
debugObject(ret, "getDetSizheadTitle ret");
return ret;
}

/**
* 加载挂单
*
*
* @param i 下标,从0开始
*/
function loadHangBill(i) {
Expand Down
4 changes: 2 additions & 2 deletions testcase/shopIn/shopIn.js
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ function ts140001() {
conditionQuery(keys);
var qr = getQR();
var outExp = qr.data[0];
tapFirstText();
tapLine();
var expData = getQRDet().data;
tapReturn();

Expand Down Expand Up @@ -620,4 +620,4 @@ function ts140031() {
qr = getQR();
ret = isAnd(ret, qr.data.length == 1);
return ret;
}
}

0 comments on commit b5046d8

Please sign in to comment.