wxd / MShopWeApp

Commit 22160dd9884c3b3ba62b84ccce3cde232fb656eb

Authored by yvan.ni
1 parent 4a8c8991

plus价格显示的bug，以及节日有礼的弹窗的bug优化

Inline Side-by-side
Showing 6 changed files with 69 additions and 28 deletions
... ... @@ -13,7 +13,7 @@ App({
13 13 config2: null, //门店配置
14 14 code: null,
15 15 heigth:0,
16   - user_id: null,// 4379287,// null,// 5682068,
  16 + user_id: 9274245,// 4379287,// null,// 5682068,
17 17 buy_now:null,
18 18 picklist:null, //门店列表
19 19 wuliuprice: null, //物流价格表
... ... @@ -383,16 +383,16 @@ App({
383 383 },
384 384  
385 385 //------定时等待某个值,有值才进行运算--------
386   - waitfor:function(time,pop_value,func){
  386 + waitfor:function(page,key,pop_value,func){
387 387 var n=0;
388   - if(!time){
389   - time=setInterval(function(){
390   - console.log(time);n++;
  388 + if(!page.data[key]){
  389 + page.data[key]=setInterval(function(){
  390 + console.log(page.data[key]);n++;
391 391 if(pop_value) {
392   - clearInterval(time);
  392 + clearInterval(page.data[key]);
393 393 func();
394 394 }
395   - if(n>60) clearInterval(time);
  395 + if(n>15) clearInterval(page.data[key]);
396 396 },1000);
397 397 }
398 398 }
... ...
components/goods_list/g_filter.wxs
  View file @22160dd
... ... @@ -20,7 +20,9 @@ var g_filters = {
20 20 var min_name=null;
21 21 //---设置对应的价格名字----
22 22 for(var i=0;i<3;i++) {
23   - var vl=all_card[i];
  23 + var vl=all_card[i];
  24 + if(!vl) continue;
  25 +
24 26 if(vl['CorrPrice']=="Price1" && price1>0)
25 27 {
26 28 if(min_price==null) {
... ...
pages/goods/goodsInfo/g_filter.wxs
  View file @22160dd
... ... @@ -24,7 +24,8 @@ var g_filters = {
24 24 var min_name=null;
25 25 //---设置对应的价格名字----
26 26 for(var i=0;i<3;i++) {
27   - var vl=all_card[i];
  27 + var vl=all_card[i];
  28 + if(!vl) continue;
28 29 if(vl['CorrPrice']=="Price1" && price1>0)
29 30 {
30 31 if(min_price==null) {
... ...
pages/goods/goodsList/g_filter.wxs
  View file @22160dd
... ... @@ -11,17 +11,21 @@ var g_filters = {
11 11 var price1=parseFloat(goods['cardprice1']);
12 12 var price2=parseFloat(goods['cardprice2']);
13 13 var price3=parseFloat(goods['cardprice3']);
14   -
15   - if(!all_card){
  14 + if(!all_card){
16 15 if(type==0) return 0;
17 16 return "";
18   - }
19   -
  17 + }
  18 +
  19 + var arr=[];
  20 + var min_price= 0;
  21 + var min_name="";
  22 +
20 23 var min_price=null;
21 24 var min_name=null;
22 25 //---设置对应的价格名字----
23 26 for(var i=0;i<3;i++) {
24   - var vl=all_card[i];
  27 + var vl=all_card[i];
  28 + if(!vl) continue;
25 29 if(vl['CorrPrice']=="Price1" && price1>0)
26 30 {
27 31 if(min_price==null) {
... ... @@ -56,8 +60,23 @@ var g_filters = {
56 60 if(type==0) return 0;
57 61 return "";
58 62 }
59   -
60   - if(type==0) return min_price;
  63 +
  64 + //if(type==0) return arr.length;
  65 + //--进行排序,升序---
  66 + /*---
  67 + arr.sort(function(a,b){
  68 + if (a.price < b.price) {
  69 + return -1;
  70 + } else if (a.fee == b.fee) {
  71 + return 0;
  72 + } else {
  73 + return 1;
  74 + }
  75 + })--*/
  76 + //-- 获取最下价钱，和相应的卡的名称 --
  77 + //min_price=min.price;
  78 + //min_name=min.name;
  79 + if(type==0) return min_price.toFixed(2);
61 80 if(min_name.length>4 ) min_name=min_name.substring(0, 4);
62 81 return min_name;
63 82 },
... ...
pages/goods/search/g_filter.wxs
  View file @22160dd
... ... @@ -8,20 +8,24 @@ var g_filters = {
8 8  
9 9 //-- 判断,不是等级会员时候，要显示的最低等级价和名称 --
10 10 get_card_price:function(goods,all_card,type){
11   - var price1 = parseFloat(goods['cardprice1']);
12   - var price2 = parseFloat(goods['cardprice2']);
13   - var price3 = parseFloat(goods['cardprice3']);
14   -
15   - if(!all_card){
  11 + var price1=parseFloat(goods['cardprice1']);
  12 + var price2=parseFloat(goods['cardprice2']);
  13 + var price3=parseFloat(goods['cardprice3']);
  14 + if(!all_card){
16 15 if(type==0) return 0;
17 16 return "";
18   - }
19   -
  17 + }
  18 +
  19 + var arr=[];
  20 + var min_price= 0;
  21 + var min_name="";
  22 +
20 23 var min_price=null;
21 24 var min_name=null;
22 25 //---设置对应的价格名字----
23 26 for(var i=0;i<3;i++) {
24   - var vl=all_card[i];
  27 + var vl=all_card[i];
  28 + if(!vl) continue;
25 29 if(vl['CorrPrice']=="Price1" && price1>0)
26 30 {
27 31 if(min_price==null) {
... ... @@ -56,13 +60,27 @@ var g_filters = {
56 60 if(type==0) return 0;
57 61 return "";
58 62 }
59   -
60   - if(type==0) return min_price;
  63 +
  64 + //if(type==0) return arr.length;
  65 + //--进行排序,升序---
  66 + /*---
  67 + arr.sort(function(a,b){
  68 + if (a.price < b.price) {
  69 + return -1;
  70 + } else if (a.fee == b.fee) {
  71 + return 0;
  72 + } else {
  73 + return 1;
  74 + }
  75 + })--*/
  76 + //-- 获取最下价钱，和相应的卡的名称 --
  77 + //min_price=min.price;
  78 + //min_name=min.name;
  79 + if(type==0) return min_price.toFixed(2);
61 80 if(min_name.length>4 ) min_name=min_name.substring(0, 4);
62 81 return min_name;
63 82 },
64 83 }
65   -
66 84 module.exports = {
67 85 is_has_rank:g_filters.is_has_rank,
68 86 get_card_price:g_filters.get_card_price,
... ...
pages/index/index/index.js
  View file @22160dd
... ... @@ -167,6 +167,7 @@ Page({
167 167 this.data.is_timer = 0;
168 168 clearInterval(this.data.pt_timer);
169 169 clearInterval(this.data.w_holiday_pop);
  170 + this.data.w_holiday_pop=0;
170 171 },
171 172  
172 173 //同步初始加载
... ... @@ -787,7 +788,7 @@ Page({
787 788 //弹出节日有礼
788 789 check_holiday_pop:function(){
789 790 var th=this;
790   - getApp().waitfor(th.data.w_holiday_pop,th.data.holiday_image,function(){
  791 + getApp().waitfor(th,'w_holiday_pop',th.data.holiday_image,function(){
791 792 console.log(th.data.holiday_image);
792 793 th.setData({
793 794 new_image: th.data.holiday_image,
... ...