Commit 797977054b50979dba829d9184a24e496d4723b2
Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into dev
Showing
5 changed files
with
56 additions
and
56 deletions
components/diy_advertising/diy_advertising.wxml
| ... | ... | @@ -11,10 +11,10 @@ |
| 11 | 11 | <block wx:if="{{item.src!=''}}"> |
| 12 | 12 | <navigator url="{{item.wxapp_imgurl}}" class="s1_gk_a1" |
| 13 | 13 | wx:if="{{g_filter.has_char(item.wxapp_imgurl,'plugin')>=0}}"> |
| 14 | - <image src="{{item.src}}" mode="widthFix"></image> | |
| 14 | + <image src="{{item.src}}" mode="widthFix" lazy-load="true"></image> | |
| 15 | 15 | </navigator> |
| 16 | 16 | <view data-url="{{item.wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url" wx:else> |
| 17 | - <image src="{{item.src}}" mode="widthFix"></image> | |
| 17 | + <image src="{{item.src}}" mode="widthFix" lazy-load="true"></image> | |
| 18 | 18 | </view> |
| 19 | 19 | </block> |
| 20 | 20 | </view> |
| ... | ... | @@ -35,11 +35,11 @@ |
| 35 | 35 | </block> |
| 36 | 36 | <block wx:if="{{item.src!=''}}"> |
| 37 | 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"></image> | |
| 38 | + <image src="{{item.src}}" mode="widthFix" lazy-load="true"></image> | |
| 39 | 39 | </navigator> |
| 40 | 40 | |
| 41 | 41 | <view data-url="{{item.wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url" wx:else> |
| 42 | - <image src="{{item.src}}" mode="widthFix"></image> | |
| 42 | + <image src="{{item.src}}" mode="widthFix" lazy-load="true"></image> | |
| 43 | 43 | </view> |
| 44 | 44 | |
| 45 | 45 | </block> |
| ... | ... | @@ -63,11 +63,11 @@ |
| 63 | 63 | </block> |
| 64 | 64 | <block wx:if="{{item.src!=''}}"> |
| 65 | 65 | <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"></image> | |
| 66 | + <image src="{{item.src}}" mode="widthFix" lazy-load="true"></image> | |
| 67 | 67 | </navigator> |
| 68 | 68 | |
| 69 | 69 | <view data-url="{{item.wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url" wx:else> |
| 70 | - <image src="{{item.src}}" mode="widthFix"></image> | |
| 70 | + <image src="{{item.src}}" mode="widthFix" lazy-load="true"></image> | |
| 71 | 71 | </view> |
| 72 | 72 | |
| 73 | 73 | |
| ... | ... | @@ -90,8 +90,8 @@ |
| 90 | 90 | <text>200*200</text> |
| 91 | 91 | </block> |
| 92 | 92 | <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" ></image></navigator> | |
| 94 | - <view data-url="{{item.wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url" wx:else><image src="{{item.src}}" mode="widthFix"></image></view> | |
| 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> | |
| 95 | 95 | </block> |
| 96 | 96 | </view> |
| 97 | 97 | |
| ... | ... | @@ -100,8 +100,8 @@ |
| 100 | 100 | <text>200*200</text> |
| 101 | 101 | </block> |
| 102 | 102 | <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"></image></navigator> | |
| 104 | - <view data-url="{{item.wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url" wx:else><image src="{{item.src}}" mode="widthFix"></image></view> | |
| 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> | |
| 105 | 105 | </block> |
| 106 | 106 | </view> |
| 107 | 107 | |
| ... | ... | @@ -119,10 +119,10 @@ |
| 119 | 119 | </block> |
| 120 | 120 | <block wx:if="{{object.data[0].src!=''}}"> |
| 121 | 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}}"></image> | |
| 122 | + <image src="{{object.data[0].src}}" lazy-load="true"></image> | |
| 123 | 123 | </navigator> |
| 124 | 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}}"></image> | |
| 125 | + <image src="{{object.data[0].src}}" lazy-load="true"></image> | |
| 126 | 126 | </view> |
| 127 | 127 | </block> |
| 128 | 128 | </view> |
| ... | ... | @@ -134,11 +134,11 @@ |
| 134 | 134 | </block> |
| 135 | 135 | <block wx:if="{{object.data[1].src!=''}}"> |
| 136 | 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}}"></image> | |
| 137 | + <image src="{{object.data[1].src}}" lazy-load="true"></image> | |
| 138 | 138 | </navigator> |
| 139 | 139 | |
| 140 | 140 | <view data-url="{{object.data[1].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url" wx:else> |
| 141 | - <image src="{{object.data[1].src}}"></image> | |
| 141 | + <image src="{{object.data[1].src}}" lazy-load="true"></image> | |
| 142 | 142 | </view> |
| 143 | 143 | |
| 144 | 144 | |
| ... | ... | @@ -150,10 +150,10 @@ |
| 150 | 150 | </block> |
| 151 | 151 | <block wx:if="{{object.data[2].src!=''}}"> |
| 152 | 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}}"> |
| 153 | - <image src="{{object.data[2].src}}"></image> | |
| 153 | + <image src="{{object.data[2].src}}" lazy-load="true"></image> | |
| 154 | 154 | </navigator> |
| 155 | 155 | <view data-url="{{object.data[2].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url" wx:else> |
| 156 | - <image src="{{object.data[2].src}}"></image> | |
| 156 | + <image src="{{object.data[2].src}}" lazy-load="true"></image> | |
| 157 | 157 | </view> |
| 158 | 158 | |
| 159 | 159 | |
| ... | ... | @@ -172,11 +172,11 @@ |
| 172 | 172 | </block> |
| 173 | 173 | <block wx:if="{{object.data[0].src!=''}}"> |
| 174 | 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}}"></image> | |
| 175 | + <image src="{{object.data[0].src}}" lazy-load="true"></image> | |
| 176 | 176 | </navigator> |
| 177 | 177 | |
| 178 | 178 | <view data-url="{{object.data[0].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url" wx:else> |
| 179 | - <image src="{{object.data[0].src}}"></image> | |
| 179 | + <image src="{{object.data[0].src}}" lazy-load="true"></image> | |
| 180 | 180 | </view> |
| 181 | 181 | |
| 182 | 182 | </block> |
| ... | ... | @@ -187,11 +187,11 @@ |
| 187 | 187 | </block> |
| 188 | 188 | <block wx:if="{{object.data[1].src!=''}}"> |
| 189 | 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}}"> |
| 190 | - <image src="{{object.data[1].src}}"></image> | |
| 190 | + <image src="{{object.data[1].src}}" lazy-load="true"></image> | |
| 191 | 191 | </navigator> |
| 192 | 192 | |
| 193 | 193 | <view data-url="{{object.data[1].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url" wx:else> |
| 194 | - <image src="{{object.data[1].src}}"></image> | |
| 194 | + <image src="{{object.data[1].src}}" lazy-load="true"></image> | |
| 195 | 195 | </view> |
| 196 | 196 | |
| 197 | 197 | </block> |
| ... | ... | @@ -205,11 +205,11 @@ |
| 205 | 205 | </block> |
| 206 | 206 | <block wx:if="{{object.data[2].src!=''}}"> |
| 207 | 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}}"></image> | |
| 208 | + <image src="{{object.data[2].src}}" lazy-load="true"></image> | |
| 209 | 209 | </navigator> |
| 210 | 210 | |
| 211 | 211 | <view data-url="{{object.data[2].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url" wx:else> |
| 212 | - <image src="{{object.data[2].src}}"></image> | |
| 212 | + <image src="{{object.data[2].src}}" lazy-load="true"></image> | |
| 213 | 213 | </view> |
| 214 | 214 | |
| 215 | 215 | </block> |
| ... | ... | @@ -220,11 +220,11 @@ |
| 220 | 220 | </block> |
| 221 | 221 | <block wx:if="{{object.data[3].src!=''}}"> |
| 222 | 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}}"> |
| 223 | - <image src="{{object.data[3].src}}"></image> | |
| 223 | + <image src="{{object.data[3].src}}" lazy-load="true"></image> | |
| 224 | 224 | </navigator> |
| 225 | 225 | |
| 226 | 226 | <view data-url="{{object.data[3].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url" wx:else> |
| 227 | - <image src="{{object.data[3].src}}"></image> | |
| 227 | + <image src="{{object.data[3].src}}" lazy-load="true"></image> | |
| 228 | 228 | </view> |
| 229 | 229 | |
| 230 | 230 | </block> |
| ... | ... | @@ -242,11 +242,11 @@ |
| 242 | 242 | </block> |
| 243 | 243 | <block wx:if="{{object.data[0].src!=''}}"> |
| 244 | 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}}"> |
| 245 | - <image src="{{object.data[0].src}}"></image> | |
| 245 | + <image src="{{object.data[0].src}}" lazy-load="true"></image> | |
| 246 | 246 | </navigator> |
| 247 | 247 | |
| 248 | 248 | <view data-url="{{object.data[0].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url" wx:else> |
| 249 | - <image src="{{object.data[0].src}}"></image> | |
| 249 | + <image src="{{object.data[0].src}}" lazy-load="true"></image> | |
| 250 | 250 | </view> |
| 251 | 251 | |
| 252 | 252 | </block> |
| ... | ... | @@ -258,10 +258,10 @@ |
| 258 | 258 | </block> |
| 259 | 259 | <block wx:if="{{object.data[1].src!=''}}"> |
| 260 | 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}}"> |
| 261 | - <image src="{{object.data[1].src}}"></image> | |
| 261 | + <image src="{{object.data[1].src}}" lazy-load="true"></image> | |
| 262 | 262 | </navigator> |
| 263 | 263 | <view data-url="{{object.data[1].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url" wx:else> |
| 264 | - <image src="{{object.data[1].src}}"></image> | |
| 264 | + <image src="{{object.data[1].src}}" lazy-load="true"></image> | |
| 265 | 265 | </view> |
| 266 | 266 | |
| 267 | 267 | </block> |
| ... | ... | @@ -276,11 +276,11 @@ |
| 276 | 276 | </block> |
| 277 | 277 | <block wx:if="{{object.data[2].src!=''}}"> |
| 278 | 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}}"></image> | |
| 279 | + <image src="{{object.data[2].src}}" lazy-load="true"></image> | |
| 280 | 280 | </navigator> |
| 281 | 281 | |
| 282 | 282 | <view data-url="{{object.data[2].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url" wx:else> |
| 283 | - <image src="{{object.data[2].src}}"></image> | |
| 283 | + <image src="{{object.data[2].src}}" lazy-load="true"></image> | |
| 284 | 284 | </view> |
| 285 | 285 | |
| 286 | 286 | </block> |
| ... | ... | @@ -291,11 +291,11 @@ |
| 291 | 291 | </block> |
| 292 | 292 | <block wx:if="{{object.data[3].src!=''}}"> |
| 293 | 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}}"> |
| 294 | - <image src="{{object.data[3].src}}"></image> | |
| 294 | + <image src="{{object.data[3].src}}" lazy-load="true"></image> | |
| 295 | 295 | </navigator> |
| 296 | 296 | |
| 297 | 297 | <view data-url="{{object.data[3].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url" wx:else> |
| 298 | - <image src="{{object.data[3].src}}"></image> | |
| 298 | + <image src="{{object.data[3].src}}" lazy-load="true"></image> | |
| 299 | 299 | </view> |
| 300 | 300 | |
| 301 | 301 | </block> |
| ... | ... | @@ -315,11 +315,11 @@ |
| 315 | 315 | </block> |
| 316 | 316 | <block wx:if="{{object.data[0].src!=''}}"> |
| 317 | 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}}" ></image> | |
| 318 | + <image src="{{object.data[0].src}}" lazy-load="true"></image> | |
| 319 | 319 | </navigator> |
| 320 | 320 | |
| 321 | 321 | <view data-url="{{object.data[0].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url" wx:else> |
| 322 | - <image src="{{object.data[0].src}}" ></image> | |
| 322 | + <image src="{{object.data[0].src}}" lazy-load="true"></image> | |
| 323 | 323 | </view> |
| 324 | 324 | |
| 325 | 325 | </block> |
| ... | ... | @@ -330,11 +330,11 @@ |
| 330 | 330 | </block> |
| 331 | 331 | <block wx:if="{{object.data[1].src!=''}}"> |
| 332 | 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}}"> |
| 333 | - <image src="{{object.data[1].src}}" ></image> | |
| 333 | + <image src="{{object.data[1].src}}" lazy-load="true"></image> | |
| 334 | 334 | </navigator> |
| 335 | 335 | |
| 336 | 336 | <view data-url="{{object.data[1].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url" wx:else> |
| 337 | - <image src="{{object.data[1].src}}" ></image> | |
| 337 | + <image src="{{object.data[1].src}}" lazy-load="true"></image> | |
| 338 | 338 | </view> |
| 339 | 339 | </block> |
| 340 | 340 | </view> |
| ... | ... | @@ -348,11 +348,11 @@ |
| 348 | 348 | </block> |
| 349 | 349 | <block wx:if="{{object.data[2].src!=''}}"> |
| 350 | 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}}"> |
| 351 | - <image src="{{object.data[2].src}}" ></image> | |
| 351 | + <image src="{{object.data[2].src}}" lazy-load="true"></image> | |
| 352 | 352 | </navigator> |
| 353 | 353 | |
| 354 | 354 | <view data-url="{{object.data[2].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url" wx:else> |
| 355 | - <image src="{{object.data[2].src}}" ></image> | |
| 355 | + <image src="{{object.data[2].src}}" lazy-load="true"></image> | |
| 356 | 356 | </view> |
| 357 | 357 | |
| 358 | 358 | |
| ... | ... | @@ -364,11 +364,11 @@ |
| 364 | 364 | </block> |
| 365 | 365 | <block wx:if="{{object.data[3].src!=''}}"> |
| 366 | 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}}" ></image> | |
| 367 | + <image src="{{object.data[3].src}}" lazy-load="true"></image> | |
| 368 | 368 | </navigator> |
| 369 | 369 | |
| 370 | 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}}" ></image> | |
| 371 | + <image src="{{object.data[3].src}}" lazy-load="true"></image> | |
| 372 | 372 | </view> |
| 373 | 373 | </block> |
| 374 | 374 | </view> |
| ... | ... | @@ -383,11 +383,11 @@ |
| 383 | 383 | </block> |
| 384 | 384 | <block wx:if="{{object.data[4].src!=''}}"> |
| 385 | 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'></image> | |
| 386 | + <image src="{{object.data[4].src}}" style='height:492rpx' lazy-load="true"></image> | |
| 387 | 387 | </navigator> |
| 388 | 388 | |
| 389 | 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'></image> | |
| 390 | + <image src="{{object.data[4].src}}" style='height:492rpx' lazy-load="true"></image> | |
| 391 | 391 | </view> |
| 392 | 392 | |
| 393 | 393 | </block> |
| ... | ... | @@ -411,14 +411,14 @@ |
| 411 | 411 | |
| 412 | 412 | <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}}"> |
| 413 | 413 | <swiper-item> |
| 414 | - <image src="{{item.src}}" bindload="imageLoad" data-index="{{index}}" class="slide-image" mode="widthFix" /> | |
| 414 | + <image src="{{item.src}}" bindload="imageLoad" data-index="{{index}}" class="slide-image" mode="widthFix" lazy-load="true"/> | |
| 415 | 415 | <view class="title" wx:if="{{title}}">{{item.title}}</view> |
| 416 | 416 | </swiper-item> |
| 417 | 417 | </navigator> |
| 418 | 418 | |
| 419 | 419 | <view data-url="{{item.wxapp_imgurl}}" class="s1_gk_a1" style="height:{{max_sw_height}}rpx" bindtap="go_url" wx:else> |
| 420 | 420 | <swiper-item> |
| 421 | - <image src="{{item.src}}" bindload="imageLoad" data-index="{{index}}" class="slide-image" mode="widthFix" /> | |
| 421 | + <image src="{{item.src}}" bindload="imageLoad" data-index="{{index}}" class="slide-image" mode="widthFix" lazy-load="true"/> | |
| 422 | 422 | <view class="title" wx:if="{{title}}">{{item.title}}</view> |
| 423 | 423 | </swiper-item> |
| 424 | 424 | </view> | ... | ... |
components/diy_goodsGroup/diy_goodsGroup.js
| ... | ... | @@ -260,6 +260,7 @@ Component({ |
| 260 | 260 | //---卡的初始化---- |
| 261 | 261 | card_init: function() { |
| 262 | 262 | var th = this,os=getApp().globalData.setting; |
| 263 | + if(!getApp().globalData.user_id) return false; | |
| 263 | 264 | getApp().request.get("/api/weshop/users/get/" + os.stoid + "/" + getApp().globalData.user_id, { |
| 264 | 265 | isShowLoading:false, |
| 265 | 266 | success: function(e) { |
| ... | ... | @@ -389,12 +390,12 @@ Component({ |
| 389 | 390 | //--- 设置 --- |
| 390 | 391 | set_good:async function(goods){ |
| 391 | 392 | var now=ut.gettimestamp(); |
| 392 | - var th=this; | |
| 393 | - for(var i in goods){ | |
| 393 | + var th=this; | |
| 394 | + if(!goods || goods.length==0) return false; | |
| 395 | + for(var i in goods){ | |
| 394 | 396 | var val=goods[i]; |
| 395 | 397 | var item = {}; |
| 396 | 398 | var prom_id = null; |
| 397 | - console.log(val.goodsid); | |
| 398 | 399 | //app.request.promiseGet("/api/weshop/goods/get/" + os.stoid + "/" + val.goods_id, {}).then(res => { |
| 399 | 400 | |
| 400 | 401 | item.goods_name = val.goods_name; |
| ... | ... | @@ -422,7 +423,7 @@ Component({ |
| 422 | 423 | url = "/api/ms/flash_sale/get/" + os.stoid + "/" + prom_id; |
| 423 | 424 | } |
| 424 | 425 | |
| 425 | - if(url!=null){ | |
| 426 | + if(url!=null && url!=''){ | |
| 426 | 427 | await getApp().request.promiseGet(url, {}).then(res => { |
| 427 | 428 | var prom =null; |
| 428 | 429 | if(res && res.data) res.data.data; | ... | ... |
components/diy_goodsGroup/diy_goodsGroup.wxml
| ... | ... | @@ -19,7 +19,7 @@ |
| 19 | 19 | <view class='zs_top rel'> |
| 20 | 20 | <image class='zs_t_img' src="{{item.goods_img}}" |
| 21 | 21 | data-errorimg="goods_array[{{index}}].goods_img" |
| 22 | - binderror="bind_bnerr3" | |
| 22 | + binderror="bind_bnerr3" lazy-load="true" | |
| 23 | 23 | ></image> |
| 24 | 24 | |
| 25 | 25 | <block wx:if="{{object.goodicon==3}}"> |
| ... | ... | @@ -166,7 +166,7 @@ |
| 166 | 166 | <view class="zs_goods_ban"> |
| 167 | 167 | <view class='zs_goods_2l'> |
| 168 | 168 | <view class='zs_top_2l rel'> |
| 169 | - <image class='zs_t_img_2l' src="{{item.goods_img}}" data-errorimg="goods_array[{{index}}].goods_img" | |
| 169 | + <image class='zs_t_img_2l' src="{{item.goods_img}}" data-errorimg="goods_array[{{index}}].goods_img" lazy-load="true" | |
| 170 | 170 | binderror="bind_bnerr3"></image> |
| 171 | 171 | <block wx:if="{{object.goodicon==3}}"> |
| 172 | 172 | <image class='{{g_filter.get_class(object.column,object.position)}}' |
| ... | ... | @@ -313,7 +313,7 @@ |
| 313 | 313 | <view class="zs_goods_san"> |
| 314 | 314 | <view class='zs_goods_3l {{g_filter.get_border_type(object.big_order_type)}}'> |
| 315 | 315 | <view class='zs_top_3l rel'> |
| 316 | - <image class='zs_t_img_3l' src="{{item.goods_img}}" data-errorimg="goods_array[{{index}}].goods_img" | |
| 316 | + <image class='zs_t_img_3l' src="{{item.goods_img}}" data-errorimg="goods_array[{{index}}].goods_img" lazy-load="true" | |
| 317 | 317 | binderror="bind_bnerr3"></image> |
| 318 | 318 | <block wx:if="{{object.goodicon==3}}"> |
| 319 | 319 | <image class='{{g_filter.get_class(object.column,object.position)}}' |
| ... | ... | @@ -459,7 +459,7 @@ |
| 459 | 459 | <view class='zs_top_x'> |
| 460 | 460 | <!--<image class='zs_t_img_x'></image>--> |
| 461 | 461 | <block> |
| 462 | - <image class='zs_t_img_x' src="{{item.goods_img}}" data-errorimg="goods_array[{{index}}].goods_img" | |
| 462 | + <image class='zs_t_img_x' src="{{item.goods_img}}" data-errorimg="goods_array[{{index}}].goods_img" lazy-load="true" | |
| 463 | 463 | binderror="bind_bnerr3" mode="widthFix" style='max-height:290rpx'></image> |
| 464 | 464 | </block> |
| 465 | 465 | |
| ... | ... | @@ -628,7 +628,7 @@ |
| 628 | 628 | <view class='one'> |
| 629 | 629 | <view class='sp_top'> |
| 630 | 630 | <view class='s_img' style="position: relative;"> |
| 631 | - <image src="{{aitem.goods_img}}" data-errorimg="goods_array[{{index}}][{{aind}}].goods_img" binderror="bind_bnerr3"></image> | |
| 631 | + <image src="{{aitem.goods_img}}" data-errorimg="goods_array[{{index}}][{{aind}}].goods_img" binderror="bind_bnerr3" lazy-load="true"></image> | |
| 632 | 632 | |
| 633 | 633 | <block wx:if="{{object.goodicon==3}}"> |
| 634 | 634 | <image class='{{g_filter.get_class(object.column,object.position)}}' | ... | ... |
pages/togoin/togoin.js
utils/auth.js
| ... | ... | @@ -221,9 +221,7 @@ module.exports = { |
| 221 | 221 | var a = wx.getStorageSync("wx_user_info"); |
| 222 | 222 | var userInfo = a.userInfo; |
| 223 | 223 | if (userInfo==undefined){ |
| 224 | - //判断本地是数据是否正确 | |
| 225 | - if(n.globalData.wxapp_buy_obj && n.globalData.wxapp_buy_obj.isbuy==1 && n.globalData.wxapp_buy_obj.isout==0 ) n.goto("/pages/togoin/togoin"); | |
| 226 | - | |
| 224 | + n.goto("/pages/togoin/togoin"); | |
| 227 | 225 | }else{ |
| 228 | 226 | a && void 0 != a ? (n.globalData.wechatUser = a, o.login(t, a, e)) : o.goGetUserInfo(); |
| 229 | 227 | } | ... | ... |