wxd / MShopWeApp

Commit 990e2bab36b7bc5e8c4a8b4aaeb6d666d2d1927b

Authored by 后端研发-苏明海
2 parents b9e65043 ecb59c26

Merge branch 'test' into 'qa' 

Test

See merge request !669
Inline Side-by-side
Showing 4 changed files with 15 additions and 8 deletions
packageA/pages/quan_list/filter.wxs
  View file @990e2ba
... ... @@ -11,13 +11,16 @@ function get_guige(color,spece){
11 11 return "";
12 12 }
13 13  
14   -function get_color(index){
15   - var i=index%3;
  14 +function get_color(index,list){
  15 + var i=index+1;
  16 + var count=list.length;
  17 + var str="purple";
  18 + i=index%count;
16 19 switch(i){
17   - case 0: return "red";
18   - case 1: return "blue";
19   - case 2: return "purple";
  20 + case 1: str="red";
  21 + case 2: str="blue";
20 22 }
  23 + return str;
21 24 }
22 25  
23 26 module.exports = {
... ...
packageA/pages/quan_list/quan_list.wxml
  View file @990e2ba
... ... @@ -10,7 +10,7 @@
10 10 <view class="content">
11 11 <view bindtap="go_detail" data-ind="{{index}}" class="quan_item flex fs30" wx:for="{{dataList}}">
12 12 <!-- 左边 -->
13   - <view class="left {{tool.get_color(index)}} flex ai-center jc-center co-w">
  13 + <view class="left {{tool.get_color(index,dataList)}} flex ai-center jc-center co-w">
14 14 <view class="t-c">
15 15 <view class="fs40"><text class="fs24">￥</text>{{filters.toFix(item.money,2)}}</view>
16 16 <view>满{{filters.toFix(item.condition,2)}}可用</view>
... ...
pages/store/index.js
  View file @990e2ba
... ... @@ -81,6 +81,11 @@ Page({
81 81 if(th.data.cat_id){
82 82 dd.category_id=th.data.cat_id;
83 83 }
  84 + if(th.data.lat){
  85 + dd.lat=th.data.lat;
  86 + dd.lon=th.data.lon;
  87 + }
  88 +
84 89  
85 90 wx.showLoading();
86 91 //----------获取门店---------
... ...
pages/user/my_service/i_service.wxml
  View file @990e2ba
... ... @@ -98,6 +98,5 @@
98 98 <warn id="warn"></warn>
99 99 <my_confirm id="my_confirm"></my_confirm>
100 100  
101   -
102 101 <!-- 批量预约图标 -->
103   -<view class="icon-container" bindtap="goto" data-url="/packageA/pages/my_service2/appment_main"><text class="iconfont icon-plyy"></text></view>
104 102 \ No newline at end of file
  103 +<!-- <view class="icon-container" bindtap="goto" data-url="/packageA/pages/my_service2/appment_main"><text class="iconfont icon-plyy"></text></view> -->
105 104 \ No newline at end of file
... ...