wxd / MShopWeApp

Commit 0d7ec584b8c13d35dfe325602bf9f60c8e3db207

Authored by abson
1 parent b780af08

4.26 oa测试返回

Inline Side-by-side
Showing 7 changed files with 600 additions and 224 deletions
components/diy_advertising/diy_advertising.wxml
  View file @0d7ec58
1 <wxs module="g_filter" src="../diy_notice/g_filter.wxs"></wxs> 1 <wxs module="g_filter" src="../diy_notice/g_filter.wxs"></wxs>
2 <!--上下两块--> 2 <!--上下两块-->
3 <block wx:if='{{object.style==0}}'> 3 <block wx:if='{{object.style==0}}'>
4 -<view class="zwp_s1" style="background-color: {{object.bg_color?object.bg_color:'none'}}">  
5 - <block wx:for="{{object.data}}" wx:key="{{index}}">  
6 - <view class='s1' style="padding: 0 {{object.two_side}}px">  
7 - <view class='s1_gk'>  
8 - <block wx:if="{{item.src==''}}">  
9 - <text>建议宽度640</text>  
10 - </block>  
11 - <block wx:if="{{item.src!=''}}">  
12 - <navigator url="{{item.wxapp_imgurl}}" class="s1_gk_a1"  
13 - wx:if="{{g_filter.has_char(item.wxapp_imgurl,'plugin')>=0}}"> 4 + <view class="zwp_s1" style="background-color: {{object.bg_color?object.bg_color:'none'}}">
  5 + <block wx:for="{{object.data}}" wx:key="{{index}}">
  6 + <view class='s1' style="padding: 0 {{object.two_side}}px">
  7 + <view class='s1_gk'>
  8 + <block wx:if="{{item.src==''}}">
  9 + <text>建议宽度640</text>
  10 + </block>
  11 + <block wx:if="{{item.src!=''}}">
  12 + <block wx:if="{{g_filter.has_char(item.wxapp_imgurl,'plugin')>=0}}">
  13 + <navigator url="{{item.wxapp_imgurl}}" class="s1_gk_a1">
14 <image src="{{item.src}}" mode="widthFix" lazy-load="true"></image> 14 <image src="{{item.src}}" mode="widthFix" lazy-load="true"></image>
15 - </navigator>  
16 - <view data-url="{{item.wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url" wx:else> 15 + </navigator>
  16 + </block>
  17 + <block wx:elif="{{item.AppId}}">
  18 + <navigator url="{{item.wxapp_imgurl}}" class="s1_gk_a1" target="miniProgram" app-id="{{item.AppId}}" path="{{item.wxapp_url}}">
17 <image src="{{item.src}}" mode="widthFix" lazy-load="true"></image> 19 <image src="{{item.src}}" mode="widthFix" lazy-load="true"></image>
18 - </view>  
19 - </block>  
20 - </view> 20 + </navigator>
  21 + </block>
  22 + <block wx:else>
  23 + <view data-url="{{item.wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url">
  24 + <image src="{{item.src}}" mode="widthFix" lazy-load="true"></image>
  25 + </view>
  26 + </block>
  27 + </block>
  28 + </view>
21 29
22 - </view>  
23 - </block>  
24 -</view> 30 + </view>
  31 + </block>
  32 + </view>
25 </block> 33 </block>
26 <view class="clear"></view> 34 <view class="clear"></view>
27 <!--一张图片--> 35 <!--一张图片-->
@@ -34,16 +42,24 @@ @@ -34,16 +42,24 @@
34 <text>建议宽度640</text> 42 <text>建议宽度640</text>
35 </block> 43 </block>
36 <block wx:if="{{item.src!=''}}"> 44 <block wx:if="{{item.src!=''}}">
37 - <navigator url="{{item.wxapp_imgurl}}" class="s1_gk_a1" wx:if="{{g_filter.has_char(item.wxapp_imgurl,'plugin')>=0}}">  
38 - <image src="{{item.src}}" mode="widthFix" lazy-load="true"></image>  
39 - </navigator> 45 + <block wx:if="{{g_filter.has_char(item.wxapp_imgurl,'plugin')>=0}}">
  46 + <navigator url="{{item.wxapp_imgurl}}" class="s1_gk_a1">
  47 + <image src="{{item.src}}" mode="widthFix" lazy-load="true"></image>
  48 + </navigator>
  49 + </block>
  50 + <block wx:elif="{{item.AppId}}">
  51 + <navigator class="s1_gk_a1" target="miniProgram" app-id="{{item.AppId}}" path="{{item.wxapp_url}}">
  52 + <image src="{{item.src}}" mode="widthFix" lazy-load="true"></image>
  53 + </navigator>
  54 + </block>
40 55
41 - <view data-url="{{item.wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url" wx:else>  
42 - <image src="{{item.src}}" mode="widthFix" lazy-load="true"></image>  
43 - </view> 56 + <block wx:else>
  57 + <view data-url="{{item.wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url">
  58 + <image src="{{item.src}}" mode="widthFix" lazy-load="true"></image>
  59 + </view>
  60 + </block>
44 61
45 </block> 62 </block>
46 -  
47 </view> 63 </view>
48 </view> 64 </view>
49 </block> 65 </block>
@@ -62,13 +78,30 @@ @@ -62,13 +78,30 @@
62 <text>300*300</text> 78 <text>300*300</text>
63 </block> 79 </block>
64 <block wx:if="{{item.src!=''}}"> 80 <block wx:if="{{item.src!=''}}">
65 - <navigator url="{{item.wxapp_imgurl}}" class="s1_gk_a1" wx:if="{{g_filter.has_char(item.wxapp_imgurl,'plugin')>=0}}"> 81 + <!-- <navigator url="{{item.wxapp_imgurl}}" class="s1_gk_a1" wx:if="{{g_filter.has_char(item.wxapp_imgurl,'plugin')>=0}}">
66 <image src="{{item.src}}" mode="widthFix" lazy-load="true"></image> 82 <image src="{{item.src}}" mode="widthFix" lazy-load="true"></image>
67 </navigator> 83 </navigator>
68 84
69 <view data-url="{{item.wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url" wx:else> 85 <view data-url="{{item.wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url" wx:else>
70 <image src="{{item.src}}" mode="widthFix" lazy-load="true"></image> 86 <image src="{{item.src}}" mode="widthFix" lazy-load="true"></image>
71 - </view> 87 + </view> -->
  88 +
  89 + <block wx:if="{{g_filter.has_char(item.wxapp_imgurl,'plugin')>=0}}">
  90 + <navigator url="{{item.wxapp_imgurl}}" class="s1_gk_a1">
  91 + <image src="{{item.src}}" mode="widthFix" lazy-load="true"></image>
  92 + </navigator>
  93 + </block>
  94 + <block wx:elif="{{item.AppId}}">
  95 + <navigator class="s1_gk_a1" target="miniProgram" app-id="{{item.AppId}}" path="{{item.wxapp_url}}">
  96 + <image src="{{item.src}}" mode="widthFix" lazy-load="true"></image>
  97 + </navigator>
  98 + </block>
  99 +
  100 + <block wx:else>
  101 + <view data-url="{{item.wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url">
  102 + <image src="{{item.src}}" mode="widthFix" lazy-load="true"></image>
  103 + </view>
  104 + </block>
72 105
73 106
74 </block> 107 </block>
@@ -80,8 +113,7 @@ @@ -80,8 +113,7 @@
80 </view> 113 </view>
81 <view class="clear"></view> 114 <view class="clear"></view>
82 <!--2行三列--> 115 <!--2行三列-->
83 -<view class='s4' wx:if='{{object.style==3}}'  
84 - style="padding:0 {{object.two_side}}px;display: flex; background-color:{{object.bg_color?object.bg_color:'none'}}"> 116 +<view class='s4' wx:if='{{object.style==3}}' style="padding:0 {{object.two_side}}px;display: flex; background-color:{{object.bg_color?object.bg_color:'none'}}">
85 117
86 <block wx:for="{{object.data}}" wx:key="{{index}}"> 118 <block wx:for="{{object.data}}" wx:key="{{index}}">
87 119
@@ -90,8 +122,29 @@ @@ -90,8 +122,29 @@
90 <text>200*200</text> 122 <text>200*200</text>
91 </block> 123 </block>
92 <block wx:if="{{item.src!=''}}"> 124 <block wx:if="{{item.src!=''}}">
93 - <navigator url="{{item.wxapp_imgurl}}" class="s1_gk_a1" wx:if="{{g_filter.has_char(item.wxapp_imgurl,'plugin')>=0}}"><image src="{{item.src}}" mode="widthFix" lazy-load="true"></image></navigator>  
94 - <view data-url="{{item.wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url" wx:else><image src="{{item.src}}" mode="widthFix" lazy-load="true"></image></view> 125 + <!-- <navigator url="{{item.wxapp_imgurl}}" class="s1_gk_a1" wx:if="{{g_filter.has_char(item.wxapp_imgurl,'plugin')>=0}}">
  126 + <image src="{{item.src}}" mode="widthFix" lazy-load="true"></image>
  127 + </navigator>
  128 + <view data-url="{{item.wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url" wx:else>
  129 + <image src="{{item.src}}" mode="widthFix" lazy-load="true"></image>
  130 + </view> -->
  131 +
  132 + <block wx:if="{{g_filter.has_char(item.wxapp_imgurl,'plugin')>=0}}">
  133 + <navigator url="{{item.wxapp_imgurl}}" class="s1_gk_a1">
  134 + <image src="{{item.src}}" mode="widthFix" lazy-load="true"></image>
  135 + </navigator>
  136 + </block>
  137 + <block wx:elif="{{item.AppId}}">
  138 + <navigator class="s1_gk_a1" target="miniProgram" app-id="{{item.AppId}}" path="{{item.wxapp_url}}">
  139 + <image src="{{item.src}}" mode="widthFix" lazy-load="true"></image>
  140 + </navigator>
  141 + </block>
  142 +
  143 + <block wx:else>
  144 + <view data-url="{{item.wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url">
  145 + <image src="{{item.src}}" mode="widthFix" lazy-load="true"></image>
  146 + </view>
  147 + </block>
95 </block> 148 </block>
96 </view> 149 </view>
97 150
@@ -100,8 +153,29 @@ @@ -100,8 +153,29 @@
100 <text>200*200</text> 153 <text>200*200</text>
101 </block> 154 </block>
102 <block wx:if="{{item.src!=''}}"> 155 <block wx:if="{{item.src!=''}}">
103 - <navigator url="{{item.wxapp_imgurl}}" class="s1_gk_a1" wx:if="{{g_filter.has_char(item.wxapp_imgurl,'plugin')>=0}}"><image src="{{item.src}}" mode="widthFix" lazy-load="true"></image></navigator>  
104 - <view data-url="{{item.wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url" wx:else><image src="{{item.src}}" mode="widthFix" lazy-load="true"></image></view> 156 + <!-- <navigator url="{{item.wxapp_imgurl}}" class="s1_gk_a1" wx:if="{{g_filter.has_char(item.wxapp_imgurl,'plugin')>=0}}">
  157 + <image src="{{item.src}}" mode="widthFix" lazy-load="true"></image>
  158 + </navigator>
  159 + <view data-url="{{item.wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url" wx:else>
  160 + <image src="{{item.src}}" mode="widthFix" lazy-load="true"></image>
  161 + </view> -->
  162 +
  163 + <block wx:if="{{g_filter.has_char(item.wxapp_imgurl,'plugin')>=0}}">
  164 + <navigator url="{{item.wxapp_imgurl}}" class="s1_gk_a1">
  165 + <image src="{{item.src}}" mode="widthFix" lazy-load="true"></image>
  166 + </navigator>
  167 + </block>
  168 + <block wx:elif="{{item.AppId}}">
  169 + <navigator class="s1_gk_a1" target="miniProgram" app-id="{{item.AppId}}" path="{{item.wxapp_url}}">
  170 + <image src="{{item.src}}" mode="widthFix" lazy-load="true"></image>
  171 + </navigator>
  172 + </block>
  173 +
  174 + <block wx:else>
  175 + <view data-url="{{item.wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url">
  176 + <image src="{{item.src}}" mode="widthFix" lazy-load="true"></image>
  177 + </view>
  178 + </block>
105 </block> 179 </block>
106 </view> 180 </view>
107 181
@@ -118,12 +192,21 @@ @@ -118,12 +192,21 @@
118 <text>300*300</text> 192 <text>300*300</text>
119 </block> 193 </block>
120 <block wx:if="{{object.data[0].src!=''}}"> 194 <block wx:if="{{object.data[0].src!=''}}">
121 - <navigator url="{{object.data[0].wxapp_imgurl}}" class="s1_gk_a1" wx:if="{{g_filter.has_char(object.data[0].wxapp_imgurl,'plugin')>=0}}">>  
122 - <image src="{{object.data[0].src}}" lazy-load="true"></image>  
123 - </navigator>  
124 - <view data-url="{{object.data[0].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url" wx:else>  
125 - <image src="{{object.data[0].src}}" lazy-load="true"></image>  
126 - </view> 195 + <block wx:if="{{g_filter.has_char(object.data[0].wxapp_imgurl,'plugin')>=0}}">
  196 + <navigator url="{{object.data[0].wxapp_imgurl}}" class="s1_gk_a1">
  197 + <image src="{{object.data[0].src}}" lazy-load="true"></image>
  198 + </navigator>
  199 + </block>
  200 + <block wx:elif="{{object.data[0].AppId}}">
  201 + <navigator target="miniProgram" app-id="{{object.data[0].AppId}}" path="{{object.data[0].wxapp_url}}" class="s1_gk_a1">
  202 + <image src="{{object.data[0].src}}" lazy-load="true"></image>
  203 + </navigator>
  204 + </block>
  205 + <block wx:else>
  206 + <view data-url="{{object.data[0].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url">
  207 + <image src="{{object.data[0].src}}" lazy-load="true"></image>
  208 + </view>
  209 + </block>
127 </block> 210 </block>
128 </view> 211 </view>
129 212
@@ -133,13 +216,29 @@ @@ -133,13 +216,29 @@
133 <text>300*150</text> 216 <text>300*150</text>
134 </block> 217 </block>
135 <block wx:if="{{object.data[1].src!=''}}"> 218 <block wx:if="{{object.data[1].src!=''}}">
136 - <navigator url="{{object.data[1].wxapp_imgurl}}" class="s1_gk_a1" wx:if="{{g_filter.has_char(object.data[1].wxapp_imgurl,'plugin')>=0}}">  
137 - <image src="{{object.data[1].src}}" lazy-load="true"></image> 219 + <!-- <navigator url="{{object.data[1].wxapp_imgurl}}" class="s1_gk_a1" wx:if="{{g_filter.has_char(object.data[1].wxapp_imgurl,'plugin')>=0}}">
  220 + <image src="{{object.data[1].src}}" lazy-load="true"></image>
138 </navigator> 221 </navigator>
139 222
140 <view data-url="{{object.data[1].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url" wx:else> 223 <view data-url="{{object.data[1].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url" wx:else>
141 <image src="{{object.data[1].src}}" lazy-load="true"></image> 224 <image src="{{object.data[1].src}}" lazy-load="true"></image>
142 - </view> 225 + </view> -->
  226 +
  227 + <block wx:if="{{g_filter.has_char(object.data[1].wxapp_imgurl,'plugin')>=0}}">
  228 + <navigator url="{{object.data[1].wxapp_imgurl}}" class="s1_gk_a1">
  229 + <image src="{{object.data[1].src}}" lazy-load="true"></image>
  230 + </navigator>
  231 + </block>
  232 + <block wx:elif="{{object.data[1].AppId}}">
  233 + <navigator target="miniProgram" app-id="{{object.data[1].AppId}}" path="{{object.data[1].wxapp_url}}" class="s1_gk_a1">
  234 + <image src="{{object.data[1].src}}" lazy-load="true"></image>
  235 + </navigator>
  236 + </block>
  237 + <block wx:else>
  238 + <view data-url="{{object.data[1].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url">
  239 + <image src="{{object.data[1].src}}" lazy-load="true"></image>
  240 + </view>
  241 + </block>
143 242
144 243
145 </block> 244 </block>
@@ -149,12 +248,29 @@ @@ -149,12 +248,29 @@
149 <text>300*150</text> 248 <text>300*150</text>
150 </block> 249 </block>
151 <block wx:if="{{object.data[2].src!=''}}"> 250 <block wx:if="{{object.data[2].src!=''}}">
152 - <navigator url="{{object.data[2].wxapp_imgurl}}" class="s1_gk_a1" wx:if="{{g_filter.has_char(object.data[2].wxapp_imgurl,'plugin')>=0}}"> 251 + <!-- <navigator url="{{object.data[2].wxapp_imgurl}}" class="s1_gk_a1" wx:if="{{g_filter.has_char(object.data[2].wxapp_imgurl,'plugin')>=0}}">
153 <image src="{{object.data[2].src}}" lazy-load="true"></image> 252 <image src="{{object.data[2].src}}" lazy-load="true"></image>
154 </navigator> 253 </navigator>
155 - <view data-url="{{object.data[2].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url" wx:else> 254 + <view data-url="{{object.data[2].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url" wx:else>
156 <image src="{{object.data[2].src}}" lazy-load="true"></image> 255 <image src="{{object.data[2].src}}" lazy-load="true"></image>
157 - </view> 256 + </view> -->
  257 +
  258 + <block wx:if="{{g_filter.has_char(object.data[2].wxapp_imgurl,'plugin')>=0}}">
  259 + <navigator url="{{object.data[2].wxapp_imgurl}}" class="s1_gk_a1">
  260 + <image src="{{object.data[2].src}}" lazy-load="true"></image>
  261 + </navigator>
  262 + </block>
  263 + <block wx:elif="{{object.data[2].AppId}}">
  264 + <navigator target="miniProgram" app-id="{{object.data[2].AppId}}" path="{{object.data[2].wxapp_url}}" class="s1_gk_a1">
  265 + <image src="{{object.data[2].src}}" lazy-load="true"></image>
  266 + </navigator>
  267 + </block>
  268 + <block wx:else>
  269 + <view data-url="{{object.data[2].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url">
  270 + <image src="{{object.data[2].src}}" lazy-load="true"></image>
  271 + </view>
  272 + </block>
  273 +
158 274
159 275
160 </block> 276 </block>
@@ -171,13 +287,28 @@ @@ -171,13 +287,28 @@
171 <text>200*200</text> 287 <text>200*200</text>
172 </block> 288 </block>
173 <block wx:if="{{object.data[0].src!=''}}"> 289 <block wx:if="{{object.data[0].src!=''}}">
174 - <navigator url="{{object.data[0].wxapp_imgurl}}" class="s1_gk_a1" wx:if="{{g_filter.has_char(object.data[0].wxapp_imgurl,'plugin')>=0}}">  
175 - <image src="{{object.data[0].src}}" lazy-load="true"></image> 290 + <!-- <navigator url="{{object.data[0].wxapp_imgurl}}" class="s1_gk_a1" wx:if="{{g_filter.has_char(object.data[0].wxapp_imgurl,'plugin')>=0}}">
  291 + <image src="{{object.data[0].src}}" lazy-load="true"></image>
176 </navigator> 292 </navigator>
177 293
178 <view data-url="{{object.data[0].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url" wx:else> 294 <view data-url="{{object.data[0].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url" wx:else>
179 <image src="{{object.data[0].src}}" lazy-load="true"></image> 295 <image src="{{object.data[0].src}}" lazy-load="true"></image>
180 - </view> 296 + </view> -->
  297 + <block wx:if="{{g_filter.has_char(object.data[0].wxapp_imgurl,'plugin')>=0}}">
  298 + <navigator url="{{object.data[0].wxapp_imgurl}}" class="s1_gk_a1">
  299 + <image src="{{object.data[0].src}}" lazy-load="true"></image>
  300 + </navigator>
  301 + </block>
  302 + <block wx:elif="{{object.data[0].AppId}}">
  303 + <navigator target="miniProgram" app-id="{{object.data[0].AppId}}" path="{{object.data[0].wxapp_url}}" class="s1_gk_a1">
  304 + <image src="{{object.data[0].src}}" lazy-load="true"></image>
  305 + </navigator>
  306 + </block>
  307 + <block wx:else>
  308 + <view data-url="{{object.data[0].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url">
  309 + <image src="{{object.data[0].src}}" lazy-load="true"></image>
  310 + </view>
  311 + </block>
181 312
182 </block> 313 </block>
183 </view> 314 </view>
@@ -186,13 +317,28 @@ @@ -186,13 +317,28 @@
186 <text>400*200</text> 317 <text>400*200</text>
187 </block> 318 </block>
188 <block wx:if="{{object.data[1].src!=''}}"> 319 <block wx:if="{{object.data[1].src!=''}}">
189 - <navigator url="{{object.data[1].wxapp_imgurl}}" class="s1_gk_a1" wx:if="{{g_filter.has_char(object.data[1].wxapp_imgurl,'plugin')>=0}}"> 320 + <!-- <navigator url="{{object.data[1].wxapp_imgurl}}" class="s1_gk_a1" wx:if="{{g_filter.has_char(object.data[1].wxapp_imgurl,'plugin')>=0}}">
190 <image src="{{object.data[1].src}}" lazy-load="true"></image> 321 <image src="{{object.data[1].src}}" lazy-load="true"></image>
191 </navigator> 322 </navigator>
192 323
193 <view data-url="{{object.data[1].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url" wx:else> 324 <view data-url="{{object.data[1].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url" wx:else>
194 <image src="{{object.data[1].src}}" lazy-load="true"></image> 325 <image src="{{object.data[1].src}}" lazy-load="true"></image>
195 - </view> 326 + </view> -->
  327 + <block wx:if="{{g_filter.has_char(object.data[1].wxapp_imgurl,'plugin')>=0}}">
  328 + <navigator url="{{object.data[1].wxapp_imgurl}}" class="s1_gk_a1">
  329 + <image src="{{object.data[1].src}}" lazy-load="true"></image>
  330 + </navigator>
  331 + </block>
  332 + <block wx:elif="{{object.data[1].AppId}}">
  333 + <navigator target="miniProgram" app-id="{{object.data[1].AppId}}" path="{{object.data[1].wxapp_url}}" class="s1_gk_a1">
  334 + <image src="{{object.data[1].src}}" lazy-load="true"></image>
  335 + </navigator>
  336 + </block>
  337 + <block wx:else>
  338 + <view data-url="{{object.data[1].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url">
  339 + <image src="{{object.data[1].src}}" lazy-load="true"></image>
  340 + </view>
  341 + </block>
196 342
197 </block> 343 </block>
198 </view> 344 </view>
@@ -204,13 +350,28 @@ @@ -204,13 +350,28 @@
204 <text>400*200</text> 350 <text>400*200</text>
205 </block> 351 </block>
206 <block wx:if="{{object.data[2].src!=''}}"> 352 <block wx:if="{{object.data[2].src!=''}}">
207 - <navigator url="{{object.data[2].wxapp_imgurl}}" class="s1_gk_a1" wx:if="{{g_filter.has_char(object.data[2].wxapp_imgurl,'plugin')>=0}}">  
208 - <image src="{{object.data[2].src}}" lazy-load="true"></image>  
209 - </navigator> 353 + <!-- <navigator url="{{object.data[2].wxapp_imgurl}}" class="s1_gk_a1" wx:if="{{g_filter.has_char(object.data[2].wxapp_imgurl,'plugin')>=0}}">
  354 + <image src="{{object.data[2].src}}" lazy-load="true"></image>
  355 + </navigator>
210 356
211 <view data-url="{{object.data[2].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url" wx:else> 357 <view data-url="{{object.data[2].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url" wx:else>
212 <image src="{{object.data[2].src}}" lazy-load="true"></image> 358 <image src="{{object.data[2].src}}" lazy-load="true"></image>
213 - </view> 359 + </view> -->
  360 + <block wx:if="{{g_filter.has_char(object.data[2].wxapp_imgurl,'plugin')>=0}}">
  361 + <navigator url="{{object.data[2].wxapp_imgurl}}" class="s1_gk_a1">
  362 + <image src="{{object.data[2].src}}" lazy-load="true"></image>
  363 + </navigator>
  364 + </block>
  365 + <block wx:elif="{{object.data[2].AppId}}">
  366 + <navigator target="miniProgram" app-id="{{object.data[2].AppId}}" path="{{object.data[2].wxapp_url}}" class="s1_gk_a1">
  367 + <image src="{{object.data[2].src}}" lazy-load="true"></image>
  368 + </navigator>
  369 + </block>
  370 + <block wx:else>
  371 + <view data-url="{{object.data[2].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url">
  372 + <image src="{{object.data[2].src}}" lazy-load="true"></image>
  373 + </view>
  374 + </block>
214 375
215 </block> 376 </block>
216 </view> 377 </view>
@@ -219,13 +380,28 @@ @@ -219,13 +380,28 @@
219 <text>200*200</text> 380 <text>200*200</text>
220 </block> 381 </block>
221 <block wx:if="{{object.data[3].src!=''}}"> 382 <block wx:if="{{object.data[3].src!=''}}">
222 - <navigator url="{{object.data[3].wxapp_imgurl}}" class="s1_gk_a1" wx:if="{{g_filter.has_char(object.data[3].wxapp_imgurl,'plugin')>=0}}"> 383 + <!-- <navigator url="{{object.data[3].wxapp_imgurl}}" class="s1_gk_a1" wx:if="{{g_filter.has_char(object.data[3].wxapp_imgurl,'plugin')>=0}}">
223 <image src="{{object.data[3].src}}" lazy-load="true"></image> 384 <image src="{{object.data[3].src}}" lazy-load="true"></image>
224 </navigator> 385 </navigator>
225 386
226 <view data-url="{{object.data[3].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url" wx:else> 387 <view data-url="{{object.data[3].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url" wx:else>
227 <image src="{{object.data[3].src}}" lazy-load="true"></image> 388 <image src="{{object.data[3].src}}" lazy-load="true"></image>
228 - </view> 389 + </view> -->
  390 + <block wx:if="{{g_filter.has_char(object.data[3].wxapp_imgurl,'plugin')>=0}}">
  391 + <navigator url="{{object.data[3].wxapp_imgurl}}" class="s1_gk_a1">
  392 + <image src="{{object.data[3].src}}" lazy-load="true"></image>
  393 + </navigator>
  394 + </block>
  395 + <block wx:elif="{{object.data[3].AppId}}">
  396 + <navigator target="miniProgram" app-id="{{object.data[3].AppId}}" path="{{object.data[3].wxapp_url}}" class="s1_gk_a1">
  397 + <image src="{{object.data[3].src}}" lazy-load="true"></image>
  398 + </navigator>
  399 + </block>
  400 + <block wx:else>
  401 + <view data-url="{{object.data[3].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url">
  402 + <image src="{{object.data[3].src}}" lazy-load="true"></image>
  403 + </view>
  404 + </block>
229 405
230 </block> 406 </block>
231 </view> 407 </view>
@@ -241,13 +417,28 @@ @@ -241,13 +417,28 @@
241 <text>300*150</text> 417 <text>300*150</text>
242 </block> 418 </block>
243 <block wx:if="{{object.data[0].src!=''}}"> 419 <block wx:if="{{object.data[0].src!=''}}">
244 - <navigator url="{{object.data[0].wxapp_imgurl}}" class="s1_gk_a1" wx:if="{{g_filter.has_char(object.data[0].wxapp_imgurl,'plugin')>=0}}"> 420 + <!-- <navigator url="{{object.data[0].wxapp_imgurl}}" class="s1_gk_a1" wx:if="{{g_filter.has_char(object.data[0].wxapp_imgurl,'plugin')>=0}}">
245 <image src="{{object.data[0].src}}" lazy-load="true"></image> 421 <image src="{{object.data[0].src}}" lazy-load="true"></image>
246 </navigator> 422 </navigator>
247 423
248 <view data-url="{{object.data[0].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url" wx:else> 424 <view data-url="{{object.data[0].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url" wx:else>
249 <image src="{{object.data[0].src}}" lazy-load="true"></image> 425 <image src="{{object.data[0].src}}" lazy-load="true"></image>
250 - </view> 426 + </view> -->
  427 + <block wx:if="{{g_filter.has_char(object.data[0].wxapp_imgurl,'plugin')>=0}}">
  428 + <navigator url="{{object.data[0].wxapp_imgurl}}" class="s1_gk_a1">
  429 + <image src="{{object.data[0].src}}" lazy-load="true"></image>
  430 + </navigator>
  431 + </block>
  432 + <block wx:elif="{{object.data[0].AppId}}">
  433 + <navigator target="miniProgram" app-id="{{object.data[0].AppId}}" path="{{object.data[0].wxapp_url}}" class="s1_gk_a1">
  434 + <image src="{{object.data[0].src}}" lazy-load="true"></image>
  435 + </navigator>
  436 + </block>
  437 + <block wx:else>
  438 + <view data-url="{{object.data[0].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url">
  439 + <image src="{{object.data[0].src}}" lazy-load="true"></image>
  440 + </view>
  441 + </block>
251 442
252 </block> 443 </block>
253 </view> 444 </view>
@@ -257,12 +448,27 @@ @@ -257,12 +448,27 @@
257 <text>300*300</text> 448 <text>300*300</text>
258 </block> 449 </block>
259 <block wx:if="{{object.data[1].src!=''}}"> 450 <block wx:if="{{object.data[1].src!=''}}">
260 - <navigator url="{{object.data[1].wxapp_imgurl}}" class="s1_gk_a1" wx:if="{{g_filter.has_char(object.data[1].wxapp_imgurl,'plugin')>=0}}"> 451 + <!-- <navigator url="{{object.data[1].wxapp_imgurl}}" class="s1_gk_a1" wx:if="{{g_filter.has_char(object.data[1].wxapp_imgurl,'plugin')>=0}}">
261 <image src="{{object.data[1].src}}" lazy-load="true"></image> 452 <image src="{{object.data[1].src}}" lazy-load="true"></image>
262 </navigator> 453 </navigator>
263 <view data-url="{{object.data[1].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url" wx:else> 454 <view data-url="{{object.data[1].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url" wx:else>
264 <image src="{{object.data[1].src}}" lazy-load="true"></image> 455 <image src="{{object.data[1].src}}" lazy-load="true"></image>
265 - </view> 456 + </view> -->
  457 + <block wx:if="{{g_filter.has_char(object.data[1].wxapp_imgurl,'plugin')>=0}}">
  458 + <navigator url="{{object.data[1].wxapp_imgurl}}" class="s1_gk_a1">
  459 + <image src="{{object.data[1].src}}" lazy-load="true"></image>
  460 + </navigator>
  461 + </block>
  462 + <block wx:elif="{{object.data[1].AppId}}">
  463 + <navigator target="miniProgram" app-id="{{object.data[1].AppId}}" path="{{object.data[1].wxapp_url}}" class="s1_gk_a1">
  464 + <image src="{{object.data[1].src}}" lazy-load="true"></image>
  465 + </navigator>
  466 + </block>
  467 + <block wx:else>
  468 + <view data-url="{{object.data[1].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url">
  469 + <image src="{{object.data[1].src}}" lazy-load="true"></image>
  470 + </view>
  471 + </block>
266 472
267 </block> 473 </block>
268 474
@@ -275,13 +481,28 @@ @@ -275,13 +481,28 @@
275 <text>300*300</text> 481 <text>300*300</text>
276 </block> 482 </block>
277 <block wx:if="{{object.data[2].src!=''}}"> 483 <block wx:if="{{object.data[2].src!=''}}">
278 - <navigator url="{{object.data[2].wxapp_imgurl}}" class="s1_gk_a1" wx:if="{{g_filter.has_char(object.data[2].wxapp_imgurl,'plugin')>=0}}">  
279 - <image src="{{object.data[2].src}}" lazy-load="true"></image> 484 + <!-- <navigator url="{{object.data[2].wxapp_imgurl}}" class="s1_gk_a1" wx:if="{{g_filter.has_char(object.data[2].wxapp_imgurl,'plugin')>=0}}">
  485 + <image src="{{object.data[2].src}}" lazy-load="true"></image>
280 </navigator> 486 </navigator>
281 487
282 <view data-url="{{object.data[2].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url" wx:else> 488 <view data-url="{{object.data[2].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url" wx:else>
283 <image src="{{object.data[2].src}}" lazy-load="true"></image> 489 <image src="{{object.data[2].src}}" lazy-load="true"></image>
284 - </view> 490 + </view> -->
  491 + <block wx:if="{{g_filter.has_char(object.data[2].wxapp_imgurl,'plugin')>=0}}">
  492 + <navigator url="{{object.data[2].wxapp_imgurl}}" class="s1_gk_a1">
  493 + <image src="{{object.data[2].src}}" lazy-load="true"></image>
  494 + </navigator>
  495 + </block>
  496 + <block wx:elif="{{object.data[2].AppId}}">
  497 + <navigator target="miniProgram" app-id="{{object.data[2].AppId}}" path="{{object.data[2].wxapp_url}}" class="s1_gk_a1">
  498 + <image src="{{object.data[2].src}}" lazy-load="true"></image>
  499 + </navigator>
  500 + </block>
  501 + <block wx:else>
  502 + <view data-url="{{object.data[2].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url">
  503 + <image src="{{object.data[2].src}}" lazy-load="true"></image>
  504 + </view>
  505 + </block>
285 506
286 </block> 507 </block>
287 </view> 508 </view>
@@ -290,13 +511,28 @@ @@ -290,13 +511,28 @@
290 <text>300*150</text> 511 <text>300*150</text>
291 </block> 512 </block>
292 <block wx:if="{{object.data[3].src!=''}}"> 513 <block wx:if="{{object.data[3].src!=''}}">
293 - <navigator url="{{object.data[3].wxapp_imgurl}}" class="s1_gk_a1" wx:if="{{g_filter.has_char(object.data[3].wxapp_imgurl,'plugin')>=0}}"> 514 + <!-- <navigator url="{{object.data[3].wxapp_imgurl}}" class="s1_gk_a1" wx:if="{{g_filter.has_char(object.data[3].wxapp_imgurl,'plugin')>=0}}">
294 <image src="{{object.data[3].src}}" lazy-load="true"></image> 515 <image src="{{object.data[3].src}}" lazy-load="true"></image>
295 </navigator> 516 </navigator>
296 517
297 <view data-url="{{object.data[3].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url" wx:else> 518 <view data-url="{{object.data[3].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url" wx:else>
298 <image src="{{object.data[3].src}}" lazy-load="true"></image> 519 <image src="{{object.data[3].src}}" lazy-load="true"></image>
299 - </view> 520 + </view> -->
  521 + <block wx:if="{{g_filter.has_char(object.data[3].wxapp_imgurl,'plugin')>=0}}">
  522 + <navigator url="{{object.data[3].wxapp_imgurl}}" class="s1_gk_a1">
  523 + <image src="{{object.data[3].src}}" lazy-load="true"></image>
  524 + </navigator>
  525 + </block>
  526 + <block wx:elif="{{object.data[3].AppId}}">
  527 + <navigator target="miniProgram" app-id="{{object.data[3].AppId}}" path="{{object.data[3].wxapp_url}}" class="s1_gk_a1">
  528 + <image src="{{object.data[3].src}}" lazy-load="true"></image>
  529 + </navigator>
  530 + </block>
  531 + <block wx:else>
  532 + <view data-url="{{object.data[3].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url">
  533 + <image src="{{object.data[3].src}}" lazy-load="true"></image>
  534 + </view>
  535 + </block>
300 536
301 </block> 537 </block>
302 </view> 538 </view>
@@ -314,13 +550,28 @@ @@ -314,13 +550,28 @@
314 <text>200*200</text> 550 <text>200*200</text>
315 </block> 551 </block>
316 <block wx:if="{{object.data[0].src!=''}}"> 552 <block wx:if="{{object.data[0].src!=''}}">
317 - <navigator url="{{object.data[0].wxapp_imgurl}}" class="s1_gk_a1" wx:if="{{g_filter.has_char(object.data[0].wxapp_imgurl,'plugin')>=0}}">  
318 - <image src="{{object.data[0].src}}" lazy-load="true"></image> 553 + <!-- <navigator url="{{object.data[0].wxapp_imgurl}}" class="s1_gk_a1" wx:if="{{g_filter.has_char(object.data[0].wxapp_imgurl,'plugin')>=0}}">
  554 + <image src="{{object.data[0].src}}" lazy-load="true"></image>
319 </navigator> 555 </navigator>
320 - 556 +
321 <view data-url="{{object.data[0].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url" wx:else> 557 <view data-url="{{object.data[0].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url" wx:else>
322 - <image src="{{object.data[0].src}}" lazy-load="true"></image>  
323 - </view> 558 + <image src="{{object.data[0].src}}" lazy-load="true"></image>
  559 + </view> -->
  560 + <block wx:if="{{g_filter.has_char(object.data[0].wxapp_imgurl,'plugin')>=0}}">
  561 + <navigator url="{{object.data[0].wxapp_imgurl}}" class="s1_gk_a1">
  562 + <image src="{{object.data[0].src}}" lazy-load="true"></image>
  563 + </navigator>
  564 + </block>
  565 + <block wx:elif="{{object.data[0].AppId}}">
  566 + <navigator target="miniProgram" app-id="{{object.data[0].AppId}}" path="{{object.data[0].wxapp_url}}" class="s1_gk_a1">
  567 + <image src="{{object.data[0].src}}" lazy-load="true"></image>
  568 + </navigator>
  569 + </block>
  570 + <block wx:else>
  571 + <view data-url="{{object.data[0].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url">
  572 + <image src="{{object.data[0].src}}" lazy-load="true"></image>
  573 + </view>
  574 + </block>
324 575
325 </block> 576 </block>
326 </view> 577 </view>
@@ -329,13 +580,28 @@ @@ -329,13 +580,28 @@
329 <text>200*200</text> 580 <text>200*200</text>
330 </block> 581 </block>
331 <block wx:if="{{object.data[1].src!=''}}"> 582 <block wx:if="{{object.data[1].src!=''}}">
332 - <navigator url="{{object.data[1].wxapp_imgurl}}" class="s1_gk_a1" wx:if="{{g_filter.has_char(object.data[1].wxapp_imgurl,'plugin')>=0}}"> 583 + <!-- <navigator url="{{object.data[1].wxapp_imgurl}}" class="s1_gk_a1" wx:if="{{g_filter.has_char(object.data[1].wxapp_imgurl,'plugin')>=0}}">
333 <image src="{{object.data[1].src}}" lazy-load="true"></image> 584 <image src="{{object.data[1].src}}" lazy-load="true"></image>
334 </navigator> 585 </navigator>
335 586
336 <view data-url="{{object.data[1].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url" wx:else> 587 <view data-url="{{object.data[1].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url" wx:else>
337 <image src="{{object.data[1].src}}" lazy-load="true"></image> 588 <image src="{{object.data[1].src}}" lazy-load="true"></image>
338 - </view> 589 + </view> -->
  590 + <block wx:if="{{g_filter.has_char(object.data[1].wxapp_imgurl,'plugin')>=0}}">
  591 + <navigator url="{{object.data[1].wxapp_imgurl}}" class="s1_gk_a1">
  592 + <image src="{{object.data[1].src}}" lazy-load="true"></image>
  593 + </navigator>
  594 + </block>
  595 + <block wx:elif="{{object.data[1].AppId}}">
  596 + <navigator target="miniProgram" app-id="{{object.data[1].AppId}}" path="{{object.data[1].wxapp_url}}" class="s1_gk_a1">
  597 + <image src="{{object.data[1].src}}" lazy-load="true"></image>
  598 + </navigator>
  599 + </block>
  600 + <block wx:else>
  601 + <view data-url="{{object.data[1].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url">
  602 + <image src="{{object.data[1].src}}" lazy-load="true"></image>
  603 + </view>
  604 + </block>
339 </block> 605 </block>
340 </view> 606 </view>
341 </view> 607 </view>
@@ -347,13 +613,29 @@ @@ -347,13 +613,29 @@
347 <text>200*200</text> 613 <text>200*200</text>
348 </block> 614 </block>
349 <block wx:if="{{object.data[2].src!=''}}"> 615 <block wx:if="{{object.data[2].src!=''}}">
350 - <navigator url="{{object.data[2].wxapp_imgurl}}" class="s1_gk_a1" wx:if="{{g_filter.has_char(object.data[2].wxapp_imgurl,'plugin')>=0}}"> 616 + <!-- <navigator url="{{object.data[2].wxapp_imgurl}}" class="s1_gk_a1" wx:if="{{g_filter.has_char(object.data[2].wxapp_imgurl,'plugin')>=0}}">
351 <image src="{{object.data[2].src}}" lazy-load="true"></image> 617 <image src="{{object.data[2].src}}" lazy-load="true"></image>
352 </navigator> 618 </navigator>
353 619
354 <view data-url="{{object.data[2].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url" wx:else> 620 <view data-url="{{object.data[2].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url" wx:else>
355 <image src="{{object.data[2].src}}" lazy-load="true"></image> 621 <image src="{{object.data[2].src}}" lazy-load="true"></image>
356 - </view> 622 + </view> -->
  623 +
  624 + <block wx:if="{{g_filter.has_char(object.data[2].wxapp_imgurl,'plugin')>=0}}">
  625 + <navigator url="{{object.data[2].wxapp_imgurl}}" class="s1_gk_a1">
  626 + <image src="{{object.data[2].src}}" lazy-load="true"></image>
  627 + </navigator>
  628 + </block>
  629 + <block wx:elif="{{object.data[2].AppId}}">
  630 + <navigator target="miniProgram" app-id="{{object.data[2].AppId}}" path="{{object.data[2].wxapp_url}}" class="s1_gk_a1">
  631 + <image src="{{object.data[2].src}}" lazy-load="true"></image>
  632 + </navigator>
  633 + </block>
  634 + <block wx:else>
  635 + <view data-url="{{object.data[2].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url">
  636 + <image src="{{object.data[2].src}}" lazy-load="true"></image>
  637 + </view>
  638 + </block>
357 639
358 640
359 </block> 641 </block>
@@ -363,13 +645,22 @@ @@ -363,13 +645,22 @@
363 <text>200*200</text> 645 <text>200*200</text>
364 </block> 646 </block>
365 <block wx:if="{{object.data[3].src!=''}}"> 647 <block wx:if="{{object.data[3].src!=''}}">
366 - <navigator url="{{object.data[3].wxapp_imgurl}}" class="s1_gk_a1" wx:if="{{g_filter.has_char(object.data[3].wxapp_imgurl,'plugin')>=0}}">  
367 - <image src="{{object.data[3].src}}" lazy-load="true"></image>  
368 - </navigator> 648 + <block wx:if="{{g_filter.has_char(object.data[3].wxapp_imgurl,'plugin')>=0}}">
  649 + <navigator url="{{object.data[3].wxapp_imgurl}}" class="s1_gk_a1">
  650 + <image src="{{object.data[3].src}}" lazy-load="true"></image>
  651 + </navigator>
  652 + </block>
  653 + <block wx:elif="{{object.data[3].AppId}}">
  654 + <navigator target="miniProgram" app-id="{{object.data[3].AppId}}" path="{{object.data[3].wxapp_url}}" class="s1_gk_a1">
  655 + <image src="{{object.data[3].src}}" lazy-load="true"></image>
  656 + </navigator>
  657 + </block>
  658 + <block wx:else>
  659 + <view data-url="{{object.data[3].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url">
  660 + <image src="{{object.data[3].src}}" lazy-load="true"></image>
  661 + </view>
  662 + </block>
369 663
370 - <view data-url="{{object.data[3].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url" wx:else>  
371 - <image src="{{object.data[3].src}}" lazy-load="true"></image>  
372 - </view>  
373 </block> 664 </block>
374 </view> 665 </view>
375 </view> 666 </view>
@@ -382,13 +673,21 @@ @@ -382,13 +673,21 @@
382 <text>200*420</text> 673 <text>200*420</text>
383 </block> 674 </block>
384 <block wx:if="{{object.data[4].src!=''}}"> 675 <block wx:if="{{object.data[4].src!=''}}">
385 - <navigator url="{{object.data[4].wxapp_imgurl}}" class="s1_gk_a1" wx:if="{{g_filter.has_char(object.data[4].wxapp_imgurl,'plugin')>=0}}">  
386 - <image src="{{object.data[4].src}}" style='height:492rpx' lazy-load="true"></image>  
387 - </navigator>  
388 -  
389 - <view data-url="{{object.data[4].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url" wx:else>  
390 - <image src="{{object.data[4].src}}" style='height:492rpx' lazy-load="true"></image>  
391 - </view> 676 + <block wx:if="{{g_filter.has_char(object.data[4].wxapp_imgurl,'plugin')>=0}}">
  677 + <navigator url="{{object.data[4].wxapp_imgurl}}" class="s1_gk_a1">
  678 + <image src="{{object.data[4].src}}" lazy-load="true"></image>
  679 + </navigator>
  680 + </block>
  681 + <block wx:elif="{{object.data[4].AppId}}">
  682 + <navigator target="miniProgram" app-id="{{object.data[4].AppId}}" path="{{object.data[4].wxapp_url}}" class="s1_gk_a1">
  683 + <image src="{{object.data[4].src}}" lazy-load="true"></image>
  684 + </navigator>
  685 + </block>
  686 + <block wx:else>
  687 + <view data-url="{{object.data[4].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url">
  688 + <image src="{{object.data[4].src}}" lazy-load="true"></image>
  689 + </view>
  690 + </block>
392 691
393 </block> 692 </block>
394 </view> 693 </view>
@@ -401,34 +700,36 @@ @@ -401,34 +700,36 @@
401 <block wx:if='{{object.style==4 && is_show}}'> 700 <block wx:if='{{object.style==4 && is_show}}'>
402 701
403 702
404 - <swiper class="swiper" circular="true" autoplay="{{autoplay}}" current="{{object.sw_index}}"  
405 - indicator-dots="true"  
406 - indicator-color="{{object.dot_color}}"  
407 - indicator-active-color="{{object.dot_color_act}}"  
408 - interval="{{object.swiper_time?object.swiper_time*1000:interval}}" duration="{{duration}}"  
409 - style="height:{{max_sw_height}}rpx" >  
410 - <block wx:for="{{object.data}}" wx:for-index="index" >  
411 - 703 + <swiper class="swiper" circular="true" autoplay="{{autoplay}}" current="{{object.sw_index}}" indicator-dots="true" indicator-color="{{object.dot_color}}" indicator-active-color="{{object.dot_color_act}}" interval="{{object.swiper_time?object.swiper_time*1000:interval}}" duration="{{duration}}" style="height:{{max_sw_height}}rpx">
  704 + <block wx:for="{{object.data}}" wx:for-index="index">
412 <block wx:if="{{(!item.begin_date || g_filter.beg_time(item.begin_date) ) && (!item.end_date || g_filter.end_time(item.end_date) )}}"> 705 <block wx:if="{{(!item.begin_date || g_filter.beg_time(item.begin_date) ) && (!item.end_date || g_filter.end_time(item.end_date) )}}">
413 - <navigator url="{{item.wxapp_imgurl}}" class="s1_gk_a1" style="height:{{max_sw_height}}rpx" wx:if="{{g_filter.has_char(item.wxapp_imgurl,'plugin')>=0}}">  
414 - <swiper-item>  
415 - <image src="{{item.src}}" bindload="imageLoad" data-index="{{index}}" class="slide-image" mode="widthFix" lazy-load="true"/>  
416 - <view class="title" wx:if="{{item.title}}">{{item.title}}</view>  
417 - </swiper-item>  
418 - </navigator> 706 + <block wx:if="{{g_filter.has_char(item.wxapp_imgurl,'plugin')>=0}}">
  707 + <navigator url="{{item.wxapp_imgurl}}" class="s1_gk_a1" style="height:{{max_sw_height}}rpx">
  708 + <swiper-item>
  709 + <image src="{{item.src}}" bindload="imageLoad" data-index="{{index}}" class="slide-image" mode="widthFix" lazy-load="true" />
  710 + <view class="title" wx:if="{{item.title}}">{{item.title}}</view>
  711 + </swiper-item>
  712 + </navigator>
  713 + </block>
419 714
420 - <view data-url="{{item.wxapp_imgurl}}" class="s1_gk_a1" style="height:{{max_sw_height}}rpx" bindtap="go_url" wx:else>  
421 - <swiper-item>  
422 - <image src="{{item.src}}" bindload="imageLoad" data-index="{{index}}" class="slide-image" mode="widthFix" lazy-load="true"/> 715 + <block wx:elif="{{item.AppId}}">
  716 + <navigator target="miniProgram" app-id="{{item.AppId}}" path="{{item.wxapp_url}}">
  717 + <swiper-item>
  718 + <image src="{{item.src}}" bindload="imageLoad" data-index="{{index}}" class="slide-image" mode="widthFix" lazy-load="true" />
423 <view class="title" wx:if="{{item.title}}">{{item.title}}</view> 719 <view class="title" wx:if="{{item.title}}">{{item.title}}</view>
424 - </swiper-item>  
425 - </view>  
426 - </block> 720 + </swiper-item>
  721 + </navigator>
  722 + </block>
427 723
  724 + <block wx:else>
  725 + <view data-url="{{item.wxapp_imgurl}}" class="s1_gk_a1" style="height:{{max_sw_height}}rpx" bindtap="go_url">
  726 + <swiper-item>
  727 + <image src="{{item.src}}" bindload="imageLoad" data-index="{{index}}" class="slide-image" mode="widthFix" lazy-load="true" />
  728 + <view class="title" wx:if="{{item.title}}">{{item.title}}</view>
  729 + </swiper-item>
  730 + </view>
  731 + </block>
  732 + </block>
428 </block> 733 </block>
429 </swiper> 734 </swiper>
430 -  
431 -  
432 -  
433 -  
434 -</block> 735 +</block>
435 \ No newline at end of file 736 \ No newline at end of file
components/diy_nav/diy_nav.wxml
  View file @0d7ec58
@@ -3,13 +3,21 @@ @@ -3,13 +3,21 @@
3 <block wx:if="{{object.style==1}}"> 3 <block wx:if="{{object.style==1}}">
4 <view class="{{object.seticon==1?'big':object.seticon==2?'big_one_two':'big_border_three'}}"> 4 <view class="{{object.seticon==1?'big':object.seticon==2?'big_one_two':'big_border_three'}}">
5 <block wx:for="{{nav_list}}"> 5 <block wx:for="{{nav_list}}">
6 - <navigator style="width:{{100/nav_list.length}}%;" url="{{item.wxapp_url}}" class="s1_gk_a1"  
7 - wx:if="{{g_filter.has_char(item.wxapp_url,'plugin')>=0}}">  
8 - <include src="diy_nav_part1.wxml" />  
9 - </navigator>  
10 - <view style="width:{{100/nav_list.length}}%;" data-url="{{item.wxapp_url}}" class="s1_gk_a1" bindtap="go_url" wx:else>  
11 - <include src="diy_nav_part1.wxml" />  
12 - </view> 6 + <block wx:if="{{g_filter.has_char(item.wxapp_url,'plugin')>=0}}">
  7 + <navigator style="width:{{100/nav_list.length}}%;" url="{{item.wxapp_url}}" class="s1_gk_a1">
  8 + <include src="diy_nav_part1.wxml" />
  9 + </navigator>
  10 + </block>
  11 + <block wx:elif="{{item.AppId}}">
  12 + <navigator style="width:{{100/nav_list.length}}%;" target="miniProgram" app-id="{{item.AppId}}" path="{{item.wxapp_url}}">
  13 + <include src="diy_nav_part1.wxml" />
  14 + </navigator>
  15 + </block>
  16 + <block wx:else>
  17 + <view style="width:{{100/nav_list.length}}%;" data-url="{{item.wxapp_url}}" class="s1_gk_a1" bindtap="go_url">
  18 + <include src="diy_nav_part1.wxml" />
  19 + </view>
  20 + </block>
13 </block> 21 </block>
14 </view> 22 </view>
15 </block> 23 </block>
@@ -18,14 +26,21 @@ @@ -18,14 +26,21 @@
18 <view class="big_two"> 26 <view class="big_two">
19 <!-- 图片一 --> 27 <!-- 图片一 -->
20 <block wx:for="{{nav_list}}"> 28 <block wx:for="{{nav_list}}">
21 - <navigator data-url="{{item.wxapp_url}}" class="s1_gk_a1" bindtap="go_url"  
22 - wx:if="{{g_filter.has_char(item.wxapp_url,'plugin')>=0}}">  
23 - <include src="diy_nav_part2.wxml" />  
24 - </navigator>  
25 - <view data-url="{{item.wxapp_url}}" class="s1_gk_a1" bindtap="go_url" wx:else>  
26 - <include src="diy_nav_part2.wxml" />  
27 - </view> 29 + <block wx:if="{{g_filter.has_char(item.wxapp_url,'plugin')>=0}}">
  30 + <navigator data-url="{{item.wxapp_url}}" class="s1_gk_a1" bindtap="go_url">
  31 + <include src="diy_nav_part2.wxml" />
  32 + </navigator>
  33 + </block>
  34 + <block wx:elif="{{item.AppId}}">
  35 + <navigator target="miniProgram" app-id="{{item.AppId}}" path="{{item.wxapp_url}}">
  36 + <include src="diy_nav_part2.wxml" />
  37 + </navigator>
  38 + </block>
  39 + <block wx:else>
  40 + <view data-url="{{item.wxapp_url}}" class="s1_gk_a1" bindtap="go_url">
  41 + <include src="diy_nav_part2.wxml" />
  42 + </view>
  43 + </block>
28 </block> 44 </block>
29 </view> 45 </view>
30 -</block>  
31 - 46 +</block>
32 \ No newline at end of file 47 \ No newline at end of file
components/diy_picMax/diy_picMax.wxml
  View file @0d7ec58
@@ -35,7 +35,6 @@ @@ -35,7 +35,6 @@
35 </navigator> 35 </navigator>
36 </block> 36 </block>
37 <block wx:else> 37 <block wx:else>
38 -  
39 <image bindtap='gopage' wx:if="{{item.wxapp_url}}" data-url="{{item.wxapp_url}}" src="{{item.src}}" mode="widthFix" style="display: block;"></image> 38 <image bindtap='gopage' wx:if="{{item.wxapp_url}}" data-url="{{item.wxapp_url}}" src="{{item.src}}" mode="widthFix" style="display: block;"></image>
40 <image bindtap='previewImage' wx:else data-src="{{item.src}}" src="{{item.src}}" style="display: block;" mode="widthFix"></image> 39 <image bindtap='previewImage' wx:else data-src="{{item.src}}" src="{{item.src}}" style="display: block;" mode="widthFix"></image>
41 </block> 40 </block>
pages/cart/cart2/cart2.js
  View file @0d7ec58
@@ -173,7 +173,7 @@ Page({ @@ -173,7 +173,7 @@ Page({
173 is_no_by: {}, 173 is_no_by: {},
174 is_by: {}, 174 is_by: {},
175 send_gf: {}, 175 send_gf: {},
176 - send_lb:{}, 176 + send_lb: {},
177 }) 177 })
178 }, 178 },
179 179
@@ -453,7 +453,7 @@ Page({ @@ -453,7 +453,7 @@ Page({
453 453
454 //要把优惠活动加入,prom_goods_map中,赠品不要运算 454 //要把优惠活动加入,prom_goods_map中,赠品不要运算
455 if (item1.prom_type == 3 && item1.is_gift != 1) { 455 if (item1.prom_type == 3 && item1.is_gift != 1) {
456 - th.check_is_youhui(item1.goods_id, item1.pick_id); 456 + // th.check_is_youhui(item1.goods_id, item1.pick_id);
457 await th.add_prom_goods_map(item1); 457 await th.add_prom_goods_map(item1);
458 } 458 }
459 459
@@ -916,7 +916,7 @@ Page({ @@ -916,7 +916,7 @@ Page({
916 t.data.data.prom_id = gg.prom_id; 916 t.data.data.prom_id = gg.prom_id;
917 t.data.data.prom_type = 3; 917 t.data.data.prom_type = 3;
918 //如果是优惠活动，就要调用活动，计算价格 918 //如果是优惠活动，就要调用活动，计算价格
919 - th.check_is_youhui(gg.goods_id,gg.pick_id); 919 + // th.check_is_youhui(gg.goods_id, gg.pick_id);
920 th.buy_now_prom_goods(gg.prom_id, t.data.data, function (data) { 920 th.buy_now_prom_goods(gg.prom_id, t.data.data, function (data) {
921 //判断一下购买商品的数量是不是超过 921 //判断一下购买商品的数量是不是超过
922 if (data.gift_goods_id && (!data.zp_mode || parseInt(data.zp_mode) == 0)) { 922 if (data.gift_goods_id && (!data.zp_mode || parseInt(data.zp_mode) == 0)) {
@@ -1213,7 +1213,8 @@ Page({ @@ -1213,7 +1213,8 @@ Page({
1213 item_map.s_intValue = get_data.intValue; 1213 item_map.s_intValue = get_data.intValue;
1214 item_map.s_coupon_id = get_data.coupon_id; 1214 item_map.s_coupon_id = get_data.coupon_id;
1215 item_map.s_coupon_num = get_data.coupon_num; 1215 item_map.s_coupon_num = get_data.coupon_num;
1216 - 1216 + item_map.lbtitle = get_data.lbtitle;
  1217 + item_map.zxlbtitle = get_data.zxlbtitle;
1217 1218
1218 if (get_data.gift_id && parseInt(get_data.zp_mode) != 1 1219 if (get_data.gift_id && parseInt(get_data.zp_mode) != 1
1219 && get_data.zp_num * item_map.bs <= get_data.limit_num 1220 && get_data.zp_num * item_map.bs <= get_data.limit_num
@@ -1364,22 +1365,22 @@ Page({ @@ -1364,22 +1365,22 @@ Page({
1364 if (item_map.s_libao) { 1365 if (item_map.s_libao) {
1365 if (!cart_item.s_libao) { 1366 if (!cart_item.s_libao) {
1366 cart_item.s_libao = item_map.s_libao + ""; 1367 cart_item.s_libao = item_map.s_libao + "";
1367 - cart_item.g_lb_num = [{ 'l_id': item_map.s_libao, "num": item_map.s_lb_num }]; 1368 + cart_item.g_lb_num = [{ 'l_id': item_map.s_libao, "num": item_map.s_lb_num, 'lbtitle': item_map.lbtitle }];
1368 } 1369 }
1369 else { 1370 else {
1370 cart_item.s_libao += "," + item_map.s_libao; 1371 cart_item.s_libao += "," + item_map.s_libao;
1371 - cart_item.g_lb_num.push({ 'l_id': item_map.s_libao, "num": item_map.s_lb_num }) 1372 + cart_item.g_lb_num.push({ 'l_id': item_map.s_libao, "num": item_map.s_lb_num, 'lbtitle': item_map.lbtitle })
1372 } 1373 }
1373 } 1374 }
1374 1375
1375 if (item_map.zx_libao) { 1376 if (item_map.zx_libao) {
1376 if (!cart_item.zx_libao) { 1377 if (!cart_item.zx_libao) {
1377 cart_item.zx_libao = item_map.zx_libao + ""; 1378 cart_item.zx_libao = item_map.zx_libao + "";
1378 - cart_item.g_zxlb_num = [{ 'l_id': item_map.zx_libao, "num": item_map.zx_lb_num }]; 1379 + cart_item.g_zxlb_num = [{ 'l_id': item_map.zx_libao, "num": item_map.zx_lb_num, 'zxlbtitle': item_map.zxlbtitle }];
1379 } 1380 }
1380 else { 1381 else {
1381 cart_item.zx_libao += "," + item_map.zx_libao; 1382 cart_item.zx_libao += "," + item_map.zx_libao;
1382 - cart_item.g_zxlb_num.push({ 'l_id': item_map.zx_libao, "num": item_map.zx_lb_num }) 1383 + cart_item.g_zxlb_num.push({ 'l_id': item_map.zx_libao, "num": item_map.zx_lb_num, 'zxlbtitle': item_map.zxlbtitle })
1383 } 1384 }
1384 } 1385 }
1385 } 1386 }
@@ -1390,7 +1391,7 @@ Page({ @@ -1390,7 +1391,7 @@ Page({
1390 var arr = Object.keys(send_gf); 1391 var arr = Object.keys(send_gf);
1391 var arr2 = Object.keys(th.data.send_gf); 1392 var arr2 = Object.keys(th.data.send_gf);
1392 if (arr2.length > 0) return false; 1393 if (arr2.length > 0) return false;
1393 - 1394 + th.calclate_lbNum(c_arr);
1394 if (arr.length > 0) { 1395 if (arr.length > 0) {
1395 th.setData({ send_gf: send_gf }) 1396 th.setData({ send_gf: send_gf })
1396 } else { 1397 } else {
@@ -1398,6 +1399,60 @@ Page({ @@ -1398,6 +1399,60 @@ Page({
1398 } 1399 }
1399 1400
1400 }, 1401 },
  1402 + calclate_lbNum(r_data) {
  1403 + let send_lb = this.data.send_lb;
  1404 + //g_lb_num我的礼包 g_zxlb_num专享礼包
  1405 + r_data.forEach(r_d => {
  1406 + let arr = [];
  1407 + if (r_d.g_zxlb_num.length > 0) {
  1408 + let g_lb = r_d.g_zxlb_num;
  1409 + for (let i = 0; i < g_lb.length; i++) {
  1410 + let item = g_lb[i];
  1411 + let new_lb = g_lb.filter(lb => {
  1412 + return item.l_id === lb.l_id;
  1413 + });
  1414 + if (new_lb.length == 1) {
  1415 + arr.push(item);
  1416 + } else {
  1417 + item.num = new_lb.reduce((pre, next) => {
  1418 + return pre + next.num;
  1419 + }, 0);
  1420 + arr.push(item);
  1421 + g_lb = g_lb.filter(ii => {
  1422 + return ii.l_id !== item.l_id;
  1423 + });
  1424 + }
  1425 + send_lb[r_d.pickup_id] = arr;
  1426 + }
  1427 + }
  1428 + if (r_d.g_lb_num.length > 0) {
  1429 + let zx_lb = r_d.g_lb_num;
  1430 + for (let i = 0; i < zx_lb.length; i++) {
  1431 + let item = zx_lb[i];
  1432 + item.flag = 1;
  1433 + let new_lb = zx_lb.filter(lb => {
  1434 + return item.l_id === lb.l_id;
  1435 + });
  1436 + if (new_lb.length == 1) {
  1437 + arr.push(item);
  1438 + } else {
  1439 + item.num = new_lb.reduce((pre, next) => {
  1440 + return pre + next.num;
  1441 + }, 0);
  1442 + arr.push(item);
  1443 + zx_lb = zx_lb.filter(ii => {
  1444 + return ii.l_id !== item.l_id;
  1445 + });
  1446 + }
  1447 + send_lb[r_d.pickup_id] = arr;
  1448 + }
  1449 + }
  1450 + })
  1451 + this.setData({
  1452 + send_lb,
  1453 + })
  1454 +
  1455 + },
1401 1456
1402 //-------------------计算订单价格------------------- 1457 //-------------------计算订单价格-------------------
1403 calculatePrice: function (t, s) { 1458 calculatePrice: function (t, s) {
@@ -4099,7 +4154,8 @@ Page({ @@ -4099,7 +4154,8 @@ Page({
4099 } 4154 }
4100 arr.s_libao = get_data.libao; 4155 arr.s_libao = get_data.libao;
4101 arr.s_lb_num = get_data.lb_num; 4156 arr.s_lb_num = get_data.lb_num;
4102 - 4157 + arr.lbtitle = get_data.lbtitle;
  4158 + arr.zxlbtitle = get_data.zxlbtitle;
4103 arr.zx_libao = get_data.zxlibao; 4159 arr.zx_libao = get_data.zxlibao;
4104 arr.zx_lb_num = get_data.zxlb_num; 4160 arr.zx_lb_num = get_data.zxlb_num;
4105 4161
@@ -4195,7 +4251,6 @@ Page({ @@ -4195,7 +4251,6 @@ Page({
4195 ob.is_xz_yh = prom.is_xz_yh; 4251 ob.is_xz_yh = prom.is_xz_yh;
4196 ob.goods = new Array(); 4252 ob.goods = new Array();
4197 ob.goods.push({ goods_id: item.goods_id, goods_price: item.goods_price, goods_num: item.goods_num }); 4253 ob.goods.push({ goods_id: item.goods_id, goods_price: item.goods_price, goods_num: item.goods_num });
4198 -  
4199 var obj = {}; 4254 var obj = {};
4200 obj[item.prom_id] = ob; 4255 obj[item.prom_id] = ob;
4201 map[pickid] = obj; 4256 map[pickid] = obj;
@@ -4203,87 +4258,78 @@ Page({ @@ -4203,87 +4258,78 @@ Page({
4203 } 4258 }
4204 }, 4259 },
4205 //---检查有没有优惠活动--- 4260 //---检查有没有优惠活动---
4206 - check_is_youhui: function (gid, pick_id) {  
4207 - let th = this;  
4208 - let user_id = getApp().globalData.user_id;  
4209 - let send_lb = th.data.send_lb;  
4210 - if (!user_id) user_id = 0;  
4211 - //调用接口判断订单优惠，  
4212 - getApp().request.get("/api/weshop/goods/getGoodsPromList/" + os.stoid + "/" + gid + "/0" + "/" + user_id, {  
4213 - success: function (res) {  
4214 - if (res.data.code == 0 && res.data.data) {  
4215 - let r_data = res.data.data.promGoodsLists.filter(lb => {  
4216 - return lb.lb_id ?? lb.zxlb_id;  
4217 - });  
4218 - r_data.forEach(item => {  
4219 - if (send_lb[pick_id]) {  
4220 - for (let i = 0; i < send_lb[pick_id].length; i++) {  
4221 - let sends = send_lb[pick_id][i]; 4261 + check_is_youhui: function (r_data, pick_id) {
  4262 + let send_lb = this.data.send_lb;
  4263 + let lodash = null;
  4264 + r_data.forEach(item => {
  4265 + if (send_lb[pick_id]) {
  4266 + for (let i = 0; i < send_lb[pick_id].length; i++) {
  4267 + let sends = send_lb[pick_id][i];
  4268 + if (item.lb_id) {
  4269 + if (sends.id === item.lb_id) {
  4270 + sends['num']++;
  4271 + } else {
  4272 + let send_arr1 = send_lb[pick_id].filter(ii => ii.id === item.lb_id);
  4273 + if (send_arr1.length == 0) {
4222 if (item.lb_id) { 4274 if (item.lb_id) {
4223 - if (sends.id === item.lb_id) {  
4224 - sends['num']++;  
4225 - } else {  
4226 - let send_arr1 = send_lb[pick_id].filter(ii=>ii.id === item.lb_id);  
4227 - if (send_arr1.length == 0) {  
4228 - if (item.lb_id) {  
4229 - let ob = {};  
4230 - ob.num = 1;  
4231 - ob.title = item.lbtitle;  
4232 - ob.id = item.lb_id;  
4233 - send_lb[pick_id].push(ob);  
4234 - break;  
4235 - }  
4236 - }  
4237 -  
4238 - }  
4239 - }  
4240 - if (item.zxlb_id) {  
4241 - if (sends.id === item.zxlb_id) {  
4242 - sends['num']++;  
4243 - } else {  
4244 - let send_arr = send_lb[pick_id].filter(ii=>ii.id === item.zxlb_id);  
4245 - if (send_arr.length == 0) {  
4246 - if (item.zxlb_id) {  
4247 - let ob = {};  
4248 - ob.num = 1;  
4249 - ob.flag = 1;  
4250 - ob.title = item.zxlbtitle;  
4251 - ob.id = item.zxlb_id;  
4252 - send_lb[pick_id].push(ob);  
4253 - break;  
4254 - }  
4255 - }  
4256 - } 4275 + let ob = {};
  4276 + ob.num = 1;
  4277 + ob.title = item.lbtitle;
  4278 + ob.id = item.lb_id;
  4279 + lodash.push(ob);
  4280 + // break;
4257 } 4281 }
4258 } 4282 }
4259 4283
  4284 + }
  4285 + }
  4286 + if (item.zxlb_id) {
  4287 + if (sends.id === item.zxlb_id) {
  4288 + sends['num']++;
4260 } else { 4289 } else {
4261 - let arr = new Array();  
4262 - if (item.lb_id) {  
4263 - let ob = {};  
4264 - ob.num = 1;  
4265 - ob.title = item.lbtitle;  
4266 - ob.id = item.lb_id;  
4267 - arr.push(ob);  
4268 - }  
4269 - if (item.zxlb_id) {  
4270 - let ob = {};  
4271 - ob.num = 1;  
4272 - ob.flag = 1;  
4273 - ob.title = item.zxlbtitle;  
4274 - ob.id = item.zxlb_id;  
4275 - arr.push(ob); 4290 + let send_arr = send_lb[pick_id].filter(ii => ii.id === item.zxlb_id);
  4291 + if (send_arr.length == 0) {
  4292 + if (item.zxlb_id) {
  4293 + let ob = {};
  4294 + ob.num = 1;
  4295 + ob.flag = 1;
  4296 + ob.title = item.zxlbtitle;
  4297 + ob.id = item.zxlb_id;
  4298 + lodash.push(ob);
  4299 + // break;
  4300 + }
4276 } 4301 }
4277 - send_lb[pick_id] = arr;  
4278 } 4302 }
4279 - })  
4280 - th.setData({  
4281 - send_lb,  
4282 - }) 4303 + }
  4304 + }
4283 4305
  4306 + } else {
  4307 + let arr = new Array();
  4308 + if (item.lb_id) {
  4309 + let ob = {};
  4310 + ob.num = 1;
  4311 + ob.title = item.lbtitle;
  4312 + ob.id = item.lb_id;
  4313 + arr.push(ob);
  4314 + }
  4315 + if (item.zxlb_id) {
  4316 + let ob = {};
  4317 + ob.num = 1;
  4318 + ob.flag = 1;
  4319 + ob.title = item.zxlbtitle;
  4320 + ob.id = item.zxlb_id;
  4321 + arr.push(ob);
4284 } 4322 }
  4323 + send_lb[pick_id] = arr;
  4324 + lodash = JSON.parse(JSON.stringify(send_lb[pick_id]));
4285 } 4325 }
4286 }) 4326 })
  4327 + send_lb[pick_id] = lodash;
  4328 + th.setData({
  4329 + send_lb,
  4330 + })
  4331 +
  4332 +
4287 }, 4333 },
4288 4334
4289 //计算立即购买赠品的物流费用 4335 //计算立即购买赠品的物流费用
pages/cart/cart2/cart2.wxml
  View file @0d7ec58
@@ -182,7 +182,7 @@ @@ -182,7 +182,7 @@
182 <block wx:for="{{send_lb[item.pickup_id]}}" wx:key="id" wx:for-item="send"> 182 <block wx:for="{{send_lb[item.pickup_id]}}" wx:key="id" wx:for-item="send">
183 <view class="coupon-mes flex jc_sb" style="margin: 10rpx 0; padding-right: 35rpx" data-id="{{send.id}}" data-flag="{{send.flag}}" bindtap="viewLbDetails"> 183 <view class="coupon-mes flex jc_sb" style="margin: 10rpx 0; padding-right: 35rpx" data-id="{{send.id}}" data-flag="{{send.flag}}" bindtap="viewLbDetails">
184 <view class="flex ai_c"> 184 <view class="flex ai_c">
185 - <view class="circle1">赠</view>{{send.title}} 185 + <view class="circle1">赠</view>{{send.zxlbtitle?send.zxlbtitle:send.lbtitle}}
186 <!-- <view class="circle1" wx:if="{{item.zxlb_id>0}}">赠</view>{{item.zxlbtitle}} --> 186 <!-- <view class="circle1" wx:if="{{item.zxlb_id>0}}">赠</view>{{item.zxlbtitle}} -->
187 </view> 187 </view>
188 <view class="flex ai_c"> 188 <view class="flex ai_c">
@@ -359,18 +359,28 @@ @@ -359,18 +359,28 @@
359 </view> 359 </view>
360 360
361 <!-- 有送礼包 --> 361 <!-- 有送礼包 -->
362 - <view wx:if="{{send_lb[bn_pick]}}">  
363 - <block wx:for="{{send_lb[bn_pick]}}" wx:key="id" wx:for-item="send">  
364 - <view class="coupon-mes flex jc_sb" style="margin: 10rpx 0; padding-right: 35rpx" data-id="{{send.id}}" data-flag="{{send.flag}}" bindtap="viewLbDetails"> 362 + <view wx:if="{{bn_goods.s_libao}}">
  363 + <view class="coupon-mes flex jc_sb" style="margin: 10rpx 0; padding-right: 35rpx" data-id="{{bn_goods.s_libao}}" bindtap="viewLbDetails">
365 <view class="flex ai_c"> 364 <view class="flex ai_c">
366 - <view class="circle1">赠</view>{{send.title}} 365 + <view class="circle1">赠</view>{{bn_goods.lbtitle}}
367 <!-- <view class="circle1" wx:if="{{item.zxlb_id>0}}">赠</view>{{item.zxlbtitle}} --> 366 <!-- <view class="circle1" wx:if="{{item.zxlb_id>0}}">赠</view>{{item.zxlbtitle}} -->
368 </view> 367 </view>
369 <view class="flex ai_c"> 368 <view class="flex ai_c">
370 - x{{send.num}}<text class="bg_jj"></text> 369 + x{{bn_goods.s_lb_num}}<text class="bg_jj"></text>
  370 + </view>
  371 + </view>
  372 + </view>
  373 + <!-- 有送专享礼包 -->
  374 + <view wx:if="{{bn_goods.zx_libao}}">
  375 + <view class="coupon-mes flex jc_sb" style="margin: 10rpx 0; padding-right: 35rpx" data-id="{{bn_goods.zx_libao}}" data-flag="1" bindtap="viewLbDetails">
  376 + <view class="flex ai_c">
  377 + <view class="circle1">赠</view>{{bn_goods.zxlbtitle}}
  378 + <!-- <view class="circle1" wx:if="{{item.zxlb_id>0}}">赠</view>{{item.zxlbtitle}} -->
  379 + </view>
  380 + <view class="flex ai_c">
  381 + x{{bn_goods.zx_lb_num}}<text class="bg_jj"></text>
371 </view> 382 </view>
372 </view> 383 </view>
373 - </block>  
374 </view> 384 </view>
375 385
376 386
pages/giftpack/buygiftpack/giftpackbuy.wxml
  View file @0d7ec58
  1 +<wxs module="filter" src="../../../utils/filter.wxs"></wxs>
1 <view class="top_img" style="background-color: {{ad_data?ad_data.bgcolor:'rgb(250, 120, 88)'}};"> 2 <view class="top_img" style="background-color: {{ad_data?ad_data.bgcolor:'rgb(250, 120, 88)'}};">
2 <block wx:if="{{ad_data}}"> 3 <block wx:if="{{ad_data}}">
3 <view class="top_img"> 4 <view class="top_img">
@@ -20,7 +21,7 @@ @@ -20,7 +21,7 @@
20 <a class="top_title_blacktext" bindtap="redirectTo" data-url="/pages/giftpack/mygiftpack/mygiftpack">我的礼包</a> 21 <a class="top_title_blacktext" bindtap="redirectTo" data-url="/pages/giftpack/mygiftpack/mygiftpack">我的礼包</a>
21 </view> 22 </view>
22 </view> 23 </view>
23 - <block wx:for="{{wareCard}}" wx:for-item="items" wx:for-index="index" wx:key="index"> 24 + <block wx:for="{{wareCard}}" wx:if="{{now > filter.gettimestamp(items.starTime) || (items.is_show && now > items.show_time)}}" wx:for-item="items" wx:for-index="index" wx:key="index">
24 <view class="content_box"> 25 <view class="content_box">
25 <view class="content_box_ware" bindtap="navigateTo" data-url="/pages/giftpack/giftpacklist/giftpacklist?isBuy=1&lbId={{items.lbId}}&orderSn=''"> 26 <view class="content_box_ware" bindtap="navigateTo" data-url="/pages/giftpack/giftpacklist/giftpacklist?isBuy=1&lbId={{items.lbId}}&orderSn=''">
26 <view class="content_box_img"> 27 <view class="content_box_img">
@@ -48,8 +49,11 @@ @@ -48,8 +49,11 @@
48 <view class="content_ware_price"> 49 <view class="content_ware_price">
49 <text class="ellipsis-1">{{"零售价:￥"+items.giftPosPrice}}</text> 50 <text class="ellipsis-1">{{"零售价:￥"+items.giftPosPrice}}</text>
50 </view> 51 </view>
51 - <view class="content_ware_time">  
52 - <text class="ellipsis-1">{{"活动结束时间:"+items.endTime}}</text> 52 + <view wx:if="{{items.is_show && now < filter.gettimestamp(items.starTime)}}" class="content_ware_time">
  53 + <text class="ellipsis-1">{{"活动开始时间："+items.starTime}}</text>
  54 + </view>
  55 + <view wx:else class="content_ware_time">
  56 + <text class="ellipsis-1">{{"活动结束时间："+items.endTime}}</text>
53 </view> 57 </view>
54 </view> 58 </view>
55 </view> 59 </view>
@@ -57,7 +61,7 @@ @@ -57,7 +61,7 @@
57 <view class="box_button_remark"> 61 <view class="box_button_remark">
58 <text>{{"已售:"+items.giftQty+"件"}}</text> 62 <text>{{"已售:"+items.giftQty+"件"}}</text>
59 </view> 63 </view>
60 - <block wx:if="{{now > item.starTime}}"> 64 + <block wx:if="{{now > filter.gettimestamp(items.starTime)}}">
61 <view class="flex-vertical"> 65 <view class="flex-vertical">
62 <block wx:if="{{items.payMoney>0 && items.payIntegral>0}}"> 66 <block wx:if="{{items.payMoney>0 && items.payIntegral>0}}">
63 <block wx:if="{{items.payMoney>0}}"> 67 <block wx:if="{{items.payMoney>0}}">
@@ -91,8 +95,8 @@ @@ -91,8 +95,8 @@
91 </view> 95 </view>
92 </block> 96 </block>
93 <block wx:else> 97 <block wx:else>
94 - <view class="flex-vertical">  
95 - <view >活动还未开始</view> 98 + <view class="flex-vertical" style="color: #666;">
  99 + <button class="box_button_dui box_button_buy" style="background-color: #666;">活动还未开始</button>
96 </view> 100 </view>
97 </block> 101 </block>
98 </view> 102 </view>
pages/user/index/filter.wxs
  View file @0d7ec58
@@ -8,7 +8,7 @@ var is_close = function (name,c_list) { @@ -8,7 +8,7 @@ var is_close = function (name,c_list) {
8 map['我的权益']="5"; 8 map['我的权益']="5";
9 map['联系客服']="6"; 9 map['联系客服']="6";
10 map['收藏夹']="7"; 10 map['收藏夹']="7";
11 - map['附近门店']="8"; 11 + map['我的地址']="8";
12 map['收入卡包']="9"; 12 map['收入卡包']="9";
13 map['专享礼包']="10"; 13 map['专享礼包']="10";
14 map['我的服务']="12"; 14 map['我的服务']="12";
@@ -19,6 +19,7 @@ var is_close = function (name,c_list) { @@ -19,6 +19,7 @@ var is_close = function (name,c_list) {
19 map['幸运大转盘']="17"; 19 map['幸运大转盘']="17";
20 map['幸运购']="18"; 20 map['幸运购']="18";
21 map['AI测肤']="20"; 21 map['AI测肤']="20";
  22 + map['附近门店']="21";
22 var index=map[name]; 23 var index=map[name];
23 24
24 //我的权益要判断5，和11 25 //我的权益要判断5，和11