wxd / MShopWeApp

Commit 3f2e4f6474c1a22bde29e3fde8f5316f6d530713

Authored by yvan.ni
1 parent c196f1e0

过滤器，不使用数组排序，手机不兼容

Inline Side-by-side
Showing 4 changed files with 143 additions and 81 deletions
components/goods_list/g_filter.wxs
  View file @3f2e4f6
@@ -14,38 +14,48 @@ var g_filters = { @@ -14,38 +14,48 @@ var g_filters = {
14 if(!all_card){ 14 if(!all_card){
15 if(type==0) return 0; 15 if(type==0) return 0;
16 return ""; 16 return "";
17 - }  
18 -  
19 - var arr=[];  
20 - var min_price= 0;  
21 - var min_name=""; 17 + }
  18 +
  19 + var min_price=null;
  20 + var min_name=null;
22 //---设置对应的价格名字---- 21 //---设置对应的价格名字----
23 for(var i=0;i<3;i++) { 22 for(var i=0;i<3;i++) {
24 - var vl=all_card[i]; 23 + var vl=all_card[i];
25 if(vl['CorrPrice']=="Price1" && price1>0) 24 if(vl['CorrPrice']=="Price1" && price1>0)
26 - arr.push({'price':price1, 'name':vl['CardName']}); 25 + {
  26 + if(min_price==null) {
  27 + min_price=price1;min_name=vl['CardName'];
  28 + }
  29 + else if(price1<min_price) {
  30 + min_price=price1;min_name=vl['CardName'];
  31 + }
  32 + }
27 if(vl['CorrPrice']=="Price2" && price2>0) 33 if(vl['CorrPrice']=="Price2" && price2>0)
28 - arr.push({'price':price2, 'name':vl['CardName']}); 34 + {
  35 + if(min_price==null) {
  36 + min_price=price2;min_name=vl['CardName'];
  37 + }
  38 + else if(price2<min_price) {
  39 + min_price=price2;min_name=vl['CardName'];
  40 + }
  41 + }
  42 +
29 if(vl['CorrPrice']=="Price3" && price3>0) 43 if(vl['CorrPrice']=="Price3" && price3>0)
30 - arr.push({'price':price3, 'name':vl['CardName']}); 44 + {
  45 + if(min_price==null) {
  46 + min_price=price3;min_name=vl['CardName'];
  47 + }
  48 + else if(price3<min_price) {
  49 + min_price=price3;min_name=vl['CardName'];
  50 + }
  51 + }
  52 +
31 } 53 }
32 - if(arr.length==0){ 54 + if(min_price==null){
33 if(type==0) return 0; 55 if(type==0) return 0;
34 return ""; 56 return "";
35 } 57 }
36 - //--进行排序,升序---  
37 - arr.sort(function(a,b){  
38 - if (a.price < b.price) {  
39 - return -1;  
40 - } else if (a.fee == b.fee) {  
41 - return 0;  
42 - } else {  
43 - return 1;  
44 - }  
45 - })  
46 - //-- 获取最下价钱，和相应的卡的名称 --  
47 - min_price=arr[0].price;  
48 - min_name=arr[0].name; 58 +
49 if(type==0) return min_price; 59 if(type==0) return min_price;
50 if(min_name.length>4 ) min_name=min_name.substring(0, 4); 60 if(min_name.length>4 ) min_name=min_name.substring(0, 4);
51 return min_name; 61 return min_name;
pages/goods/goodsInfo/g_filter.wxs
  View file @3f2e4f6
@@ -18,22 +18,51 @@ var g_filters = { @@ -18,22 +18,51 @@ var g_filters = {
18 18
19 var arr=[]; 19 var arr=[];
20 var min_price= 0; 20 var min_price= 0;
21 - var min_name=""; 21 + var min_name="";
  22 +
  23 + var min_price=null;
  24 + var min_name=null;
22 //---设置对应的价格名字---- 25 //---设置对应的价格名字----
23 for(var i=0;i<3;i++) { 26 for(var i=0;i<3;i++) {
24 - var vl=all_card[i]; 27 + var vl=all_card[i];
25 if(vl['CorrPrice']=="Price1" && price1>0) 28 if(vl['CorrPrice']=="Price1" && price1>0)
26 - arr.push({'price':price1, 'name':vl['CardName']}); 29 + {
  30 + if(min_price==null) {
  31 + min_price=price1;min_name=vl['CardName'];
  32 + }
  33 + else if(price1<min_price) {
  34 + min_price=price1;min_name=vl['CardName'];
  35 + }
  36 + }
27 if(vl['CorrPrice']=="Price2" && price2>0) 37 if(vl['CorrPrice']=="Price2" && price2>0)
28 - arr.push({'price':price2, 'name':vl['CardName']}); 38 + {
  39 + if(min_price==null) {
  40 + min_price=price2;min_name=vl['CardName'];
  41 + }
  42 + else if(price2<min_price) {
  43 + min_price=price2;min_name=vl['CardName'];
  44 + }
  45 + }
  46 +
29 if(vl['CorrPrice']=="Price3" && price3>0) 47 if(vl['CorrPrice']=="Price3" && price3>0)
30 - arr.push({'price':price3, 'name':vl['CardName']}); 48 + {
  49 + if(min_price==null) {
  50 + min_price=price3;min_name=vl['CardName'];
  51 + }
  52 + else if(price3<min_price) {
  53 + min_price=price3;min_name=vl['CardName'];
  54 + }
  55 + }
  56 +
31 } 57 }
32 - if(arr.length==0){ 58 + if(min_price==null){
33 if(type==0) return 0; 59 if(type==0) return 0;
34 return ""; 60 return "";
35 } 61 }
  62 +
  63 + //if(type==0) return arr.length;
36 //--进行排序,升序--- 64 //--进行排序,升序---
  65 + /*---
37 arr.sort(function(a,b){ 66 arr.sort(function(a,b){
38 if (a.price < b.price) { 67 if (a.price < b.price) {
39 return -1; 68 return -1;
@@ -42,12 +71,12 @@ var g_filters = { @@ -42,12 +71,12 @@ var g_filters = {
42 } else { 71 } else {
43 return 1; 72 return 1;
44 } 73 }
45 - }) 74 + })--*/
46 //-- 获取最下价钱，和相应的卡的名称 -- 75 //-- 获取最下价钱，和相应的卡的名称 --
47 - min_price=arr[0].price;  
48 - min_name=arr[0].name; 76 + //min_price=min.price;
  77 + //min_name=min.name;
49 if(type==0) return min_price; 78 if(type==0) return min_price;
50 - if(min_name.length>5 ) min_name=min_name.substring(0, 5); 79 + if(min_name.length>4 ) min_name=min_name.substring(0, 4);
51 return min_name; 80 return min_name;
52 }, 81 },
53 } 82 }
pages/goods/goodsList/g_filter.wxs
  View file @3f2e4f6
@@ -11,41 +11,52 @@ var g_filters = { @@ -11,41 +11,52 @@ var g_filters = {
11 var price1=parseInt(goods['cardprice1']); 11 var price1=parseInt(goods['cardprice1']);
12 var price2=parseInt(goods['cardprice2']); 12 var price2=parseInt(goods['cardprice2']);
13 var price3=parseInt(goods['cardprice3']); 13 var price3=parseInt(goods['cardprice3']);
14 - if(!all_card){ 14 +
  15 + if(!all_card){
15 if(type==0) return 0; 16 if(type==0) return 0;
16 return ""; 17 return "";
17 - }  
18 -  
19 - var arr=[];  
20 - var min_price= 0;  
21 - var min_name=""; 18 + }
  19 +
  20 + var min_price=null;
  21 + var min_name=null;
22 //---设置对应的价格名字---- 22 //---设置对应的价格名字----
23 for(var i=0;i<3;i++) { 23 for(var i=0;i<3;i++) {
24 - var vl=all_card[i]; 24 + var vl=all_card[i];
25 if(vl['CorrPrice']=="Price1" && price1>0) 25 if(vl['CorrPrice']=="Price1" && price1>0)
26 - arr.push({'price':price1, 'name':vl['CardName']}); 26 + {
  27 + if(min_price==null) {
  28 + min_price=price1;min_name=vl['CardName'];
  29 + }
  30 + else if(price1<min_price) {
  31 + min_price=price1;min_name=vl['CardName'];
  32 + }
  33 + }
27 if(vl['CorrPrice']=="Price2" && price2>0) 34 if(vl['CorrPrice']=="Price2" && price2>0)
28 - arr.push({'price':price2, 'name':vl['CardName']}); 35 + {
  36 + if(min_price==null) {
  37 + min_price=price2;min_name=vl['CardName'];
  38 + }
  39 + else if(price2<min_price) {
  40 + min_price=price2;min_name=vl['CardName'];
  41 + }
  42 + }
  43 +
29 if(vl['CorrPrice']=="Price3" && price3>0) 44 if(vl['CorrPrice']=="Price3" && price3>0)
30 - arr.push({'price':price3, 'name':vl['CardName']}); 45 + {
  46 + if(min_price==null) {
  47 + min_price=price3;min_name=vl['CardName'];
  48 + }
  49 + else if(price3<min_price) {
  50 + min_price=price3;min_name=vl['CardName'];
  51 + }
  52 + }
  53 +
31 } 54 }
32 - if(arr.length==0){ 55 + if(min_price==null){
33 if(type==0) return 0; 56 if(type==0) return 0;
34 return ""; 57 return "";
35 } 58 }
36 - //--进行排序,升序---  
37 - arr.sort(function(a,b){  
38 - if (a.price < b.price) {  
39 - return -1;  
40 - } else if (a.fee == b.fee) {  
41 - return 0;  
42 - } else {  
43 - return 1;  
44 - }  
45 - })  
46 - //-- 获取最下价钱，和相应的卡的名称 --  
47 - min_price=arr[0].price;  
48 - min_name=arr[0].name; 59 +
49 if(type==0) return min_price; 60 if(type==0) return min_price;
50 if(min_name.length>4 ) min_name=min_name.substring(0, 4); 61 if(min_name.length>4 ) min_name=min_name.substring(0, 4);
51 return min_name; 62 return min_name;
pages/goods/search/g_filter.wxs
  View file @3f2e4f6
@@ -11,46 +11,58 @@ var g_filters = { @@ -11,46 +11,58 @@ var g_filters = {
11 var price1=parseInt(goods['cardprice1']); 11 var price1=parseInt(goods['cardprice1']);
12 var price2=parseInt(goods['cardprice2']); 12 var price2=parseInt(goods['cardprice2']);
13 var price3=parseInt(goods['cardprice3']); 13 var price3=parseInt(goods['cardprice3']);
14 - if(!all_card){ 14 +
  15 + if(!all_card){
15 if(type==0) return 0; 16 if(type==0) return 0;
16 return ""; 17 return "";
17 - }  
18 -  
19 - var arr=[];  
20 - var min_price= 0;  
21 - var min_name=""; 18 + }
  19 +
  20 + var min_price=null;
  21 + var min_name=null;
22 //---设置对应的价格名字---- 22 //---设置对应的价格名字----
23 for(var i=0;i<3;i++) { 23 for(var i=0;i<3;i++) {
24 - var vl=all_card[i]; 24 + var vl=all_card[i];
25 if(vl['CorrPrice']=="Price1" && price1>0) 25 if(vl['CorrPrice']=="Price1" && price1>0)
26 - arr.push({'price':price1, 'name':vl['CardName']}); 26 + {
  27 + if(min_price==null) {
  28 + min_price=price1;min_name=vl['CardName'];
  29 + }
  30 + else if(price1<min_price) {
  31 + min_price=price1;min_name=vl['CardName'];
  32 + }
  33 + }
27 if(vl['CorrPrice']=="Price2" && price2>0) 34 if(vl['CorrPrice']=="Price2" && price2>0)
28 - arr.push({'price':price2, 'name':vl['CardName']}); 35 + {
  36 + if(min_price==null) {
  37 + min_price=price2;min_name=vl['CardName'];
  38 + }
  39 + else if(price2<min_price) {
  40 + min_price=price2;min_name=vl['CardName'];
  41 + }
  42 + }
  43 +
29 if(vl['CorrPrice']=="Price3" && price3>0) 44 if(vl['CorrPrice']=="Price3" && price3>0)
30 - arr.push({'price':price3, 'name':vl['CardName']}); 45 + {
  46 + if(min_price==null) {
  47 + min_price=price3;min_name=vl['CardName'];
  48 + }
  49 + else if(price3<min_price) {
  50 + min_price=price3;min_name=vl['CardName'];
  51 + }
  52 + }
  53 +
31 } 54 }
32 - if(arr.length==0){ 55 + if(min_price==null){
33 if(type==0) return 0; 56 if(type==0) return 0;
34 return ""; 57 return "";
35 } 58 }
36 - //--进行排序,升序---  
37 - arr.sort(function(a,b){  
38 - if (a.price < b.price) {  
39 - return -1;  
40 - } else if (a.fee == b.fee) {  
41 - return 0;  
42 - } else {  
43 - return 1;  
44 - }  
45 - })  
46 - //-- 获取最下价钱，和相应的卡的名称 --  
47 - min_price=arr[0].price;  
48 - min_name=arr[0].name; 59 +
49 if(type==0) return min_price; 60 if(type==0) return min_price;
50 if(min_name.length>4 ) min_name=min_name.substring(0, 4); 61 if(min_name.length>4 ) min_name=min_name.substring(0, 4);
51 return min_name; 62 return min_name;
52 }, 63 },
53 } 64 }
  65 +
54 module.exports = { 66 module.exports = {
55 is_has_rank:g_filters.is_has_rank, 67 is_has_rank:g_filters.is_has_rank,
56 get_card_price:g_filters.get_card_price, 68 get_card_price:g_filters.get_card_price,