diff --git a/packageA/pages/quan_list/filter.wxs b/packageA/pages/quan_list/filter.wxs index 5051751..72e70c5 100644 --- a/packageA/pages/quan_list/filter.wxs +++ b/packageA/pages/quan_list/filter.wxs @@ -11,13 +11,16 @@ function get_guige(color,spece){ return ""; } -function get_color(index){ - var i=index%3; +function get_color(index,list){ + var i=index+1; + var count=list.length; + var str="purple"; + i=index%count; switch(i){ - case 0: return "red"; - case 1: return "blue"; - case 2: return "purple"; + case 1: str="red"; + case 2: str="blue"; } + return str; } module.exports = { diff --git a/packageA/pages/quan_list/quan_list.wxml b/packageA/pages/quan_list/quan_list.wxml index 3c2473d..f702d52 100644 --- a/packageA/pages/quan_list/quan_list.wxml +++ b/packageA/pages/quan_list/quan_list.wxml @@ -10,7 +10,7 @@ - + {{filters.toFix(item.money,2)}} 满{{filters.toFix(item.condition,2)}}可用 diff --git a/pages/store/index.js b/pages/store/index.js index 90e5d09..6738480 100644 --- a/pages/store/index.js +++ b/pages/store/index.js @@ -81,6 +81,11 @@ Page({ if(th.data.cat_id){ dd.category_id=th.data.cat_id; } + if(th.data.lat){ + dd.lat=th.data.lat; + dd.lon=th.data.lon; + } + wx.showLoading(); //----------获取门店--------- diff --git a/pages/user/my_service/i_service.wxml b/pages/user/my_service/i_service.wxml index f49713a..1c80c7c 100644 --- a/pages/user/my_service/i_service.wxml +++ b/pages/user/my_service/i_service.wxml @@ -98,6 +98,5 @@ - - \ No newline at end of file + \ No newline at end of file