Commit 6927ef30be08fe3e283474d0b83839b11beec586
1 parent
6e0706a4
注释清理
Showing
3 changed files
with
1 additions
and
38 deletions
pages/cart/cart2_inte/cart2_inte.js
| @@ -161,19 +161,6 @@ Page({ | @@ -161,19 +161,6 @@ Page({ | ||
| 161 | 161 | ||
| 162 | } else { | 162 | } else { |
| 163 | this.getuser_addr(function (ie) { | 163 | this.getuser_addr(function (ie) { |
| 164 | - /*-- | ||
| 165 | - //地址切换要把包邮券清空 | ||
| 166 | - if( !th.data.user_addr || !ie || th.data.user_addr.address_id!=ie.address_id){ | ||
| 167 | - var using_quan=th.data.using_quan; | ||
| 168 | - for(var i in using_quan){ | ||
| 169 | - var item=using_quan[i]; | ||
| 170 | - if(item.isby==1){ | ||
| 171 | - var ob={},txt="using_quan["+i+"]";ob[txt]={}; | ||
| 172 | - th.setData(ob); | ||
| 173 | - } | ||
| 174 | - } | ||
| 175 | - | ||
| 176 | - }--*/ | ||
| 177 | 164 | ||
| 178 | //th.data.prom_goods_map={}; | 165 | //th.data.prom_goods_map={}; |
| 179 | //更换地址回来要重新调用计算价钱的接口 | 166 | //更换地址回来要重新调用计算价钱的接口 |
pages/team/team_ping/team_ping.js
| @@ -90,13 +90,6 @@ Page({ | @@ -90,13 +90,6 @@ Page({ | ||
| 90 | order_goods=null;//订单商品表 | 90 | order_goods=null;//订单商品表 |
| 91 | 91 | ||
| 92 | //获取订单表的信息根据活动user_id,pt_prom_id>0 AND pay_time>0 | 92 | //获取订单表的信息根据活动user_id,pt_prom_id>0 AND pay_time>0 |
| 93 | - /*--- | ||
| 94 | - await getApp().request.promiseGet("/api/weshop/order/page?"+where, { | ||
| 95 | - data: { is_pt:1,store_id: os.stoid, user_id: user_id, pageSize: 6, page: this.data.currentPage,} | ||
| 96 | - }).then(res => { | ||
| 97 | - order = res.data.data.pageData; | ||
| 98 | - this.data.currentPage++; | ||
| 99 | - })--*/ | ||
| 100 | 93 | ||
| 101 | await getApp().request.promiseGet("/api/weshop/order/pageTuan?"+where, { | 94 | await getApp().request.promiseGet("/api/weshop/order/pageTuan?"+where, { |
| 102 | data: { is_pt:1,store_id: os.stoid, user_id: user_id, pageSize: 6, page: this.data.currentPage,} | 95 | data: { is_pt:1,store_id: os.stoid, user_id: user_id, pageSize: 6, page: this.data.currentPage,} |
utils/filter.wxs
| @@ -82,24 +82,7 @@ var filters = { | @@ -82,24 +82,7 @@ var filters = { | ||
| 82 | } | 82 | } |
| 83 | }, | 83 | }, |
| 84 | 84 | ||
| 85 | - | ||
| 86 | - // show_default: function (value, placeholder, multiple) { | ||
| 87 | - // if(typeof value === 'number') { | ||
| 88 | - // if(isNaN(value) || value === 0) { | ||
| 89 | - // return placeholder || '0'; | ||
| 90 | - // } else { | ||
| 91 | - // if(multiple) { | ||
| 92 | - // return value / multiple; | ||
| 93 | - // } else { | ||
| 94 | - // return value; | ||
| 95 | - // } | ||
| 96 | - // }; | ||
| 97 | - // } else if(value === '' || value === undefined || value === null) { | ||
| 98 | - // return placeholder || '-'; | ||
| 99 | - // } else { | ||
| 100 | - // return value; | ||
| 101 | - // } | ||
| 102 | - // }, | 85 | + |
| 103 | show_default: function (value, placeholder, multiple) { | 86 | show_default: function (value, placeholder, multiple) { |
| 104 | if(typeof value === 'number') { | 87 | if(typeof value === 'number') { |
| 105 | if(isNaN(value)) { | 88 | if(isNaN(value)) { |