wxd / MShopWeApp

Commit 66ee6a59f85ed73b361da0c9549c99e56a400347

Authored by 后端开发-许程
2 parents 21959205 4dc79d9b

Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into dev

Inline Side-by-side
Showing 1 changed file with 17 additions and 17 deletions
utils/LoadMore.js
  View file @66ee6a5
... ... @@ -65,7 +65,6 @@ var e = function() {
65 65 console.log('loadmore');
66 66 console.log(t.data.data.pageData);
67 67 console.log(c );
68   -
69 68  
70 69 //如果已经的第二页的时候，就是把数据加入数组
71 70 if (c !=undefined && c.data[l]) {
... ... @@ -74,35 +73,36 @@ var e = function() {
74 73 f = "" != d ? c.data[l][d] : c.data[l], [].push.apply(f, i), g = c.data[l];
75 74 } else g = t.data.data.pageData;
76 75  
77   -
  76 +
78 77 //格式化
79 78 var glist="";
80   - for (var ij = 0; ij < g.length; ij++) {
  79 +
  80 + for (var ii = 0; ii < g.length; ii++) {
81 81 //if(g[i].prom_type == 1 || g[i].prom_type == 2 || g[i].prom_type == 6) {
82   - if (g[ij].prom_type == 1) {
83   - glist += g[ij].goods_id+",";
  82 + if (g[ii].prom_type == 1) {
  83 + glist += g[ii].goods_id+",";
84 84 }
85   - if (g[ij].original_img!=undefined){
86   - if (g[ij].original_img.indexOf(oo.imghost)==-1)
87   - g[ij].original_img = oo.imghost + g[ij].original_img;
  85 + if (g[ii].original_img!=undefined){
  86 + if (g[ii].original_img.indexOf(oo.imghost)==-1)
  87 + g[ii].original_img = oo.imghost + g[ii].original_img;
88 88 }
89 89  
90   - if (g[ij].add_time != undefined){
91   - var tx = g[ij].add_time + "";
  90 + if (g[ii].add_time != undefined){
  91 + var tx = g[ii].add_time + "";
92 92 if (tx.indexOf('-') == -1) {
93   - g[ij].add_time = ut.formatTime(g[i].add_time, 'yyyy-MM-dd hh:mm:ss');
  93 + g[ii].add_time = ut.formatTime(g[ii].add_time, 'yyyy-MM-dd hh:mm:ss');
94 94 }
95 95 }
96 96 if (rurl.indexOf('comment/page')!=-1){
97 97 console.log('comment/page');
98   - console.log(g[ij].img);
99   - var tx1 = g[ij].img;
  98 + console.log(g[ii].img);
  99 + var tx1 = g[ii].img;
100 100  
101 101 if (tx1 != "" && tx1 != null && ut.isString(tx1)){
102 102 var arr = ut.unserialize(tx1);
103   - g[ij].img=arr;
  103 + g[ii].img=arr;
104 104 } else if (!ut.isArray(tx1)){
105   - g[ij].img="";
  105 + g[ii].img="";
106 106 }
107 107 }
108 108 }
... ... @@ -110,13 +110,13 @@ var e = function() {
110 110  
111 111 //没有活动，就不用调用接口
112 112 if (glist==""){
113   - //c.setData(a({}, l, g));
  113 + c.setData(a({}, l, g));
114 114 if ("function" == typeof e && (n = e(t)), !1 === n) return !1;
115 115 i && 0 != i.length || (s.data.goodsLoadFinishFlag = !0, u && o.showWarning("加载完啦", null, 500, !1));
116 116 return false;
117 117 }
118 118  
119   - // c.setData(a({}, l, g));
  119 + c.setData(a({}, l, g));
120 120 if ("function" == typeof e && (n = e(t)), !1 === n) return !1;
121 121 i && 0 != i.length || (s.data.goodsLoadFinishFlag = !0, u && o.showWarning("加载完啦", null, 500, !1));
122 122  
... ...