Commit bbae317028a25686c41d7cd04cc94f6ebcd9a1d3
1 parent
d39b815d
OA的提测
Showing
9 changed files
with
163 additions
and
89 deletions
app.js
| @@ -115,6 +115,14 @@ App({ | @@ -115,6 +115,14 @@ App({ | ||
| 115 | } else { | 115 | } else { |
| 116 | app.globalData.userInfo = user; | 116 | app.globalData.userInfo = user; |
| 117 | app.globalData.user_id = user.user_id; | 117 | app.globalData.user_id = user.user_id; |
| 118 | + | ||
| 119 | + //调用接口判断是不是会员 | ||
| 120 | + app.promiseGet("/api/weshop/shoppingGuide/get/" + os.stoid + "/" + user.user_id, {}).then(res => { | ||
| 121 | + if (res.data.code == 0) { | ||
| 122 | + getApp().globalData.guide_id = res.data.data.id; | ||
| 123 | + } | ||
| 124 | + }) | ||
| 125 | + | ||
| 118 | } | 126 | } |
| 119 | wx.setStorageSync("userinfo", user); | 127 | wx.setStorageSync("userinfo", user); |
| 120 | } else { | 128 | } else { |
| @@ -474,6 +482,7 @@ App({ | @@ -474,6 +482,7 @@ App({ | ||
| 474 | "/pages/goods/categoryList/categoryList?type=1", | 482 | "/pages/goods/categoryList/categoryList?type=1", |
| 475 | "/pages/cart/cart/cart", "/pages/user/index/index", | 483 | "/pages/cart/cart/cart", "/pages/user/index/index", |
| 476 | "/pages/distribution/distribution"]; | 484 | "/pages/distribution/distribution"]; |
| 485 | + | ||
| 477 | if (arr_tabbar.indexOf(url) != -1) { | 486 | if (arr_tabbar.indexOf(url) != -1) { |
| 478 | if (url.indexOf("categoryList?type=1") != -1) this.globalData.cat_type = 1; | 487 | if (url.indexOf("categoryList?type=1") != -1) this.globalData.cat_type = 1; |
| 479 | if (url.indexOf("categoryList?type=2") != -1) this.globalData.cat_type = 2; | 488 | if (url.indexOf("categoryList?type=2") != -1) this.globalData.cat_type = 2; |
pages/goods/categoryList/categoryList.js
| @@ -604,7 +604,7 @@ Page({ | @@ -604,7 +604,7 @@ Page({ | ||
| 604 | } | 604 | } |
| 605 | 605 | ||
| 606 | //进行排序，只有是默认排序的时候，才按首字母排序 | 606 | //进行排序，只有是默认排序的时候，才按首字母排序 |
| 607 | - if(parseInt(s.data.is_used_share)!=0) continue; | 607 | + // if(parseInt(s.data.is_used_share)!=0) continue; |
| 608 | 608 | ||
| 609 | if (arr.length>0){ | 609 | if (arr.length>0){ |
| 610 | var find = 0; | 610 | var find = 0; |
| @@ -625,14 +625,14 @@ Page({ | @@ -625,14 +625,14 @@ Page({ | ||
| 625 | arr.push(item); | 625 | arr.push(item); |
| 626 | } | 626 | } |
| 627 | } | 627 | } |
| 628 | - if(parseInt(s.data.is_used_share)==0){ | ||
| 629 | - arr.sort(compare("zm")); | ||
| 630 | - }else{ | ||
| 631 | - var ob={array:dda}; | ||
| 632 | - arr.push(ob); | ||
| 633 | - } | 628 | + // if(parseInt(s.data.is_used_share)==0){ |
| 629 | + // arr.sort(compare("zm")); | ||
| 630 | + // }else{ | ||
| 631 | + // var ob={array:dda}; | ||
| 632 | + // arr.push(ob); | ||
| 633 | + // } | ||
| 634 | 634 | ||
| 635 | - | 635 | + arr.sort(compare("zm")); |
| 636 | 636 | ||
| 637 | s.setData({ groups: arr }); | 637 | s.setData({ groups: arr }); |
| 638 | //console.log(s.data.groups) | 638 | //console.log(s.data.groups) |
pages/goods/categoryList/categoryList.wxml
| @@ -82,6 +82,9 @@ | @@ -82,6 +82,9 @@ | ||
| 82 | </scroll-view> | 82 | </scroll-view> |
| 83 | 83 | ||
| 84 | <view class="nav box box-tb my-nav" catchtouchmove="touchmove" catchtouchend="touchend" > | 84 | <view class="nav box box-tb my-nav" catchtouchmove="touchmove" catchtouchend="touchend" > |
| 85 | +<!-- <image src="/images/up.png" style="width:36rpx;height:36rpx;margin-right:10rpx;"></image> --> | ||
| 86 | + <!-- <icon color="icon-close" color="#000" size="30" type="icon-shangjiantou" style=""></icon> --> | ||
| 87 | + <view class="iconfont icon-shangjiantou"></view> | ||
| 85 | <view bindtap="tabLetter" data-index="{{item.zm}}" wx:for="{{groups}}" | 88 | <view bindtap="tabLetter" data-index="{{item.zm}}" wx:for="{{groups}}" |
| 86 | class="flex box box-align-center box-pack-center letter"> | 89 | class="flex box box-align-center box-pack-center letter"> |
| 87 | <text class="letter-text {{selected == item.zm ? 'letter-actived' : ''}}" wx:if="{{item.zm}}">{{item.zm}}</text> | 90 | <text class="letter-text {{selected == item.zm ? 'letter-actived' : ''}}" wx:if="{{item.zm}}">{{item.zm}}</text> |
| @@ -226,7 +229,7 @@ | @@ -226,7 +229,7 @@ | ||
| 226 | </view> | 229 | </view> |
| 227 | </block> | 230 | </block> |
| 228 | <!-- 品牌 --> | 231 | <!-- 品牌 --> |
| 229 | - <block wx:if="{{select_classify_on==220&&is_show_pp}}"> | 232 | +<!-- <block wx:if="{{select_classify_on==220&&is_show_pp}}"> |
| 230 | 233 | ||
| 231 | <view class="classify_name fs28 flex-space-between"> | 234 | <view class="classify_name fs28 flex-space-between"> |
| 232 | <view>{{classify_name}}</view> | 235 | <view>{{classify_name}}</view> |
| @@ -246,7 +249,36 @@ | @@ -246,7 +249,36 @@ | ||
| 246 | 249 | ||
| 247 | </block> | 250 | </block> |
| 248 | </view> | 251 | </view> |
| 249 | - </block> | 252 | + </block> --> |
| 253 | + <block wx:if="{{select_classify_on==220&&is_show_pp}}"> | ||
| 254 | + <scroll-view scroll-y="true" class="fenlei-list" | ||
| 255 | + style="height: 100%;padding-bottom:100rpx;" scroll-into-view="{{scrollIntoView}}"> | ||
| 256 | + <view class="classify_name fs28 flex-space-between"> | ||
| 257 | + <view>{{classify_name}}</view> | ||
| 258 | + </view> | ||
| 259 | + <block wx:for="{{groups}}" wx:for-item="brand_list" wx:for-index="pidx"> | ||
| 260 | + <view id="{{brand_list.zm}}" class="group-name">{{brand_list.zm}}</view> | ||
| 261 | + <view class="classify_content-frame flex flex-wrap"> | ||
| 262 | + <view class="brand_img_frame "wx:for="{{brand_list.array}}" wx:for-item="user" wx:for-index="idx" bindtap="go_brand" data-bid="{{user.id}}" > | ||
| 263 | + <view class="t-c"> | ||
| 264 | + <image class="brand_img" src="{{user.logo}}" data-pix="{{pidx}}" data-idx="{{idx}}" data-errorimg="groups[{{pidx}}].array[{{idx}}].logo" binderror="bind_bnerr_pp"></image> | ||
| 265 | + <view class="brand_img_name ellipsis-1 fs24">{{user.name}}2</view> | ||
| 266 | + </view> | ||
| 267 | + </view> | ||
| 268 | + </view> | ||
| 269 | + </block> | ||
| 270 | + </scroll-view> | ||
| 271 | + <view class="nav box box-tb my-nav" style="top:140rpx;" catchtouchmove="touchmove" catchtouchend="touchend" > | ||
| 272 | + <view class="iconfont icon-shangjiantou"></view> | ||
| 273 | + <view bindtap="tabLetter" data-index="{{item.zm}}" wx:for="{{groups}}" | ||
| 274 | + class="flex box box-align-center box-pack-center letter"> | ||
| 275 | + <text class="letter-text {{selected == item.zm ? 'letter-actived' : ''}}" wx:if="{{item.zm}}">{{item.zm}}</text> | ||
| 276 | + </view> | ||
| 277 | + </view> | ||
| 278 | + </block> | ||
| 279 | + | ||
| 280 | + | ||
| 281 | + | ||
| 250 | 282 | ||
| 251 | <!-- 卡项 --> | 283 | <!-- 卡项 --> |
| 252 | <!-- <block wx:if="{{select_classify_on==220&&is_show_xm}}"> --> | 284 | <!-- <block wx:if="{{select_classify_on==220&&is_show_xm}}"> --> |
| @@ -462,7 +494,7 @@ | @@ -462,7 +494,7 @@ | ||
| 462 | 494 | ||
| 463 | 495 | ||
| 464 | <!-- 品牌 --> | 496 | <!-- 品牌 --> |
| 465 | - <block wx:if="{{select_classify_on==220&&is_show_pp}}"> | 497 | +<!-- <block wx:if="{{select_classify_on==220&&is_show_pp}}"> |
| 466 | 498 | ||
| 467 | <view class="classify_name fs28 flex-space-between"> | 499 | <view class="classify_name fs28 flex-space-between"> |
| 468 | <view>{{classify_name}}</view> | 500 | <view>{{classify_name}}</view> |
| @@ -478,11 +510,40 @@ | @@ -478,11 +510,40 @@ | ||
| 478 | <view class="brand_img_name ellipsis-1 fs24">{{user.name}}</view> | 510 | <view class="brand_img_name ellipsis-1 fs24">{{user.name}}</view> |
| 479 | </view> | 511 | </view> |
| 480 | </view> | 512 | </view> |
| 481 | - | ||
| 482 | - | ||
| 483 | </block> | 513 | </block> |
| 484 | </view> | 514 | </view> |
| 485 | - </block> | 515 | + </block> --> |
| 516 | + | ||
| 517 | + <!-- 品牌 --> | ||
| 518 | + <block wx:if="{{select_classify_on==220&&is_show_pp}}"> | ||
| 519 | + <scroll-view scroll-y="true" class="fenlei-list" | ||
| 520 | + style="height: 100%;padding-bottom:100rpx;" scroll-into-view="{{scrollIntoView}}"> | ||
| 521 | + <view class="classify_name fs28 flex-space-between"> | ||
| 522 | + <view>{{classify_name}}</view> | ||
| 523 | + </view> | ||
| 524 | + <block wx:for="{{groups}}" wx:for-item="brand_list" wx:for-index="pidx"> | ||
| 525 | + <view id="{{brand_list.zm}}" class="group-name">{{brand_list.zm}}</view> | ||
| 526 | + <view class="classify_content-frame flex flex-wrap"> | ||
| 527 | + <view class="brand_img_frame "wx:for="{{brand_list.array}}" wx:for-item="user" wx:for-index="idx" bindtap="go_brand" data-bid="{{user.id}}" > | ||
| 528 | + <view class="t-c"> | ||
| 529 | + <image class="brand_img" src="{{user.logo}}" data-pix="{{pidx}}" data-idx="{{idx}}" data-errorimg="groups[{{pidx}}].array[{{idx}}].logo" binderror="bind_bnerr_pp"></image> | ||
| 530 | + <view class="brand_img_name ellipsis-1 fs24">{{user.name}}</view> | ||
| 531 | + </view> | ||
| 532 | + </view> | ||
| 533 | + </view> | ||
| 534 | + </block> | ||
| 535 | + </scroll-view> | ||
| 536 | + <view class="nav box box-tb my-nav" style="top:140rpx;" catchtouchmove="touchmove" catchtouchend="touchend" > | ||
| 537 | + <!-- <image src="/images/up.png" style="width:36rpx;height:36rpx;margin-right:10rpx;"></image> --> | ||
| 538 | + <view class="iconfont icon-shangjiantou"></view> | ||
| 539 | + <view bindtap="tabLetter" data-index="{{item.zm}}" wx:for="{{groups}}" | ||
| 540 | + class="flex box box-align-center box-pack-center letter"> | ||
| 541 | + <text class="letter-text {{selected == item.zm ? 'letter-actived' : ''}}" wx:if="{{item.zm}}">{{item.zm}}</text> | ||
| 542 | + </view> | ||
| 543 | + </view> | ||
| 544 | + </block> | ||
| 545 | + | ||
| 546 | + | ||
| 486 | 547 | ||
| 487 | 548 | ||
| 488 | <!-- 卡项 --> | 549 | <!-- 卡项 --> |
pages/goods/categoryList/categoryList.wxss
| @@ -329,6 +329,15 @@ width: 60%; | @@ -329,6 +329,15 @@ width: 60%; | ||
| 329 | flex-wrap:wrap; | 329 | flex-wrap:wrap; |
| 330 | overflow-y:scroll; | 330 | overflow-y:scroll; |
| 331 | } | 331 | } |
| 332 | + | ||
| 333 | + .classify_content-frame2{ | ||
| 334 | + box-sizing: border-box; | ||
| 335 | + width: 100%; | ||
| 336 | + padding: 0 12rpx; | ||
| 337 | + flex-wrap:wrap; | ||
| 338 | + } | ||
| 339 | + | ||
| 340 | + | ||
| 332 | .country_img-frame{ | 341 | .country_img-frame{ |
| 333 | width: 48%; | 342 | width: 48%; |
| 334 | height: 140rpx; | 343 | height: 140rpx; |
pages/goods/goodsList/goodsList.js
| @@ -462,8 +462,8 @@ Page({ | @@ -462,8 +462,8 @@ Page({ | ||
| 462 | 462 | ||
| 463 | go_url:function (e) { | 463 | go_url:function (e) { |
| 464 | var url = e.currentTarget.dataset.url; | 464 | var url = e.currentTarget.dataset.url; |
| 465 | - var rq_data = JSON.stringify(this.data.rq_data); | ||
| 466 | - url += `&o=${rq_data}`; | 465 | + //var rq_data = JSON.stringify(this.data.rq_data); |
| 466 | + //url += `&o=${rq_data}`; | ||
| 467 | // console.log('url!!!=======<<<<', url); | 467 | // console.log('url!!!=======<<<<', url); |
| 468 | getApp().goto(url); | 468 | getApp().goto(url); |
| 469 | } | 469 | } |
pages/index/index/full_screen.js
| @@ -13,14 +13,18 @@ | @@ -13,14 +13,18 @@ | ||
| 13 | getApp().promiseGet("/api/weshop/ad/page?pid=1001&store_id=" + stoid,{ | 13 | getApp().promiseGet("/api/weshop/ad/page?pid=1001&store_id=" + stoid,{ |
| 14 | data: { enabled: 1 } | 14 | data: { enabled: 1 } |
| 15 | }).then(res=>{ | 15 | }).then(res=>{ |
| 16 | + | ||
| 16 | //判断是不是有全屏广告 | 17 | //判断是不是有全屏广告 |
| 18 | + // res.data.data.pageData[0].show_type=1 | ||
| 17 | if(res.data.code==0 && res.data.data.pageData && res.data.data.pageData.length>0){ | 19 | if(res.data.code==0 && res.data.data.pageData && res.data.data.pageData.length>0){ |
| 18 | getApp().globalData.full_screen=res.data.data.pageData[0]; | 20 | getApp().globalData.full_screen=res.data.data.pageData[0]; |
| 19 | th.setData({ | 21 | th.setData({ |
| 20 | is_full_screen_show:1, | 22 | is_full_screen_show:1, |
| 21 | full_ad:res.data.data.pageData[0], | 23 | full_ad:res.data.data.pageData[0], |
| 24 | + sec_show: res.data.data.pageData[0].show_second || 3 | ||
| 22 | }) | 25 | }) |
| 23 | - //--定时关闭-- | 26 | + //--定时关闭-- |
| 27 | + console.log(th.data.sec_show) | ||
| 24 | th.data.full_screen=setInterval(function(){ | 28 | th.data.full_screen=setInterval(function(){ |
| 25 | if(!th.data.sec_show) { | 29 | if(!th.data.sec_show) { |
| 26 | clearInterval(th.data.full_screen); | 30 | clearInterval(th.data.full_screen); |
| @@ -30,6 +34,10 @@ | @@ -30,6 +34,10 @@ | ||
| 30 | th.data.sec_show--; | 34 | th.data.sec_show--; |
| 31 | th.setData({sec_show:th.data.sec_show}); | 35 | th.setData({sec_show:th.data.sec_show}); |
| 32 | },1000) | 36 | },1000) |
| 37 | + | ||
| 38 | + if(res.data.data.pageData[0].show_type==1){ | ||
| 39 | + clearInterval(th.data.full_screen); | ||
| 40 | + } | ||
| 33 | }else{ | 41 | }else{ |
| 34 | getApp().globalData.full_screen=true; | 42 | getApp().globalData.full_screen=true; |
| 35 | } | 43 | } |
pages/index/index/index.wxml
| 1 | -<!-- <view hidden="{{f_hidden}}" class="full_screen" style="background-color: #fff;"></view> --> | ||
| 2 | -<!-- <full_screen id="full_screen"></full_screen> --> | ||
| 3 | 1 | ||
| 4 | -<!-- 全屏控制 --> | ||
| 5 | -<view wx:if="{{is_full_screen_show}}" class="full_screen" bindtap="go_full_ad" style="background-image: url('{{url+full_ad.ad_code}}');"> | ||
| 6 | - <view catchtap="close_full_screen" class="skip_box">跳过 <text>{{sec_show}}</text></view> | 2 | + <!-- 全屏控制 --> |
| 3 | +<view wx:if="{{is_full_screen_show && full_ad && full_ad.show_type==0}}" class="full_screen" bindtap="go_full_ad" style="background-image: url('{{url+full_ad.ad_code}}');"> | ||
| 4 | + <view catchtap="close_full_screen" class="skip_box">跳过 <text>{{sec_show}}</text></view> | ||
| 7 | </view> | 5 | </view> |
| 8 | 6 | ||
| 7 | + <!-- 居中弹窗广告 --> | ||
| 8 | +<view wx:if="{{is_full_screen_show && full_ad && full_ad.show_type==1}}" class="full_screen full_img_main" catchtap="close_full_screen"> | ||
| 9 | + <icon catchtap="close_full_screen" color="#fff" size="30" type="cancel" style="margin-bottom:40rpx;align-self: flex-end;margin-right:30rpx;"></icon> | ||
| 10 | + <image bindtap="go_full_ad" src="{{url+full_ad.ad_code}}" style="width:615rpx;" mode="widthFix"></image> | ||
| 11 | + <!-- <image catchtap="close_full_screen" src="/images/close.png" style="width:72rpx;height:72rpx;margin-top:30rpx;"></image> --> | ||
| 12 | +</view> | ||
| 13 | + | ||
| 14 | + | ||
| 9 | <!--普通界面--> | 15 | <!--普通界面--> |
| 10 | <wxs module="filter" src="../../../utils/filter.wxs"></wxs> | 16 | <wxs module="filter" src="../../../utils/filter.wxs"></wxs> |
| 11 | 17 | ||
| @@ -27,10 +33,6 @@ | @@ -27,10 +33,6 @@ | ||
| 27 | <view class="search-box flex-center white"> | 33 | <view class="search-box flex-center white"> |
| 28 | <view class="classify-frame t-c" bindtap="go_cate"> | 34 | <view class="classify-frame t-c" bindtap="go_cate"> |
| 29 | <image class="classify-img" src="{{url}}/miniapp/images/classify.png"></image> | 35 | <image class="classify-img" src="{{url}}/miniapp/images/classify.png"></image> |
| 30 | - <!-- <view class="fs20">分类</view> --> | ||
| 31 | - <!-- <view class="fs20">分类 | ||
| 32 | - <text class="white fs22">类</text> | ||
| 33 | - </view> --> | ||
| 34 | </view> | 36 | </view> |
| 35 | <view class="search-inner"> | 37 | <view class="search-inner"> |
| 36 | <view class="search-img"> | 38 | <view class="search-img"> |
| @@ -40,7 +42,6 @@ | @@ -40,7 +42,6 @@ | ||
| 40 | </view> | 42 | </view> |
| 41 | <view class="classify-frame t-c" bindtap="getScancode"> | 43 | <view class="classify-frame t-c" bindtap="getScancode"> |
| 42 | <image class="classify-img" src="{{url}}/miniapp/images/scanning.png"></image> | 44 | <image class="classify-img" src="{{url}}/miniapp/images/scanning.png"></image> |
| 43 | - <!-- <view class="fs20">扫一扫</view> --> | ||
| 44 | </view> | 45 | </view> |
| 45 | </view> | 46 | </view> |
| 46 | </view> | 47 | </view> |
| @@ -59,33 +60,8 @@ | @@ -59,33 +60,8 @@ | ||
| 59 | </swiper-item> | 60 | </swiper-item> |
| 60 | </swiper> | 61 | </swiper> |
| 61 | 62 | ||
| 62 | - <!-- <view class="flex-center-around translation abs"> | ||
| 63 | - <view class="circle spot" wx:for="{{banner}}" wx:key="{{index}}" style="background-color:{{index==banner_index?'#fff':'rgba(255,255,255,.5)'}}"> | ||
| 64 | - </view> | ||
| 65 | - </view> --> | ||
| 66 | </view> | 63 | </view> |
| 67 | - <!-- <view class="pd-view" wx:else></view> --> | ||
| 68 | - | ||
| 69 | - <!-- <view class="flex-center-around {{banner==null?'mar-top':'mar-tops'}}"> | ||
| 70 | - <view class="flex-vertical"> | ||
| 71 | - <image class="xc-hook" src="{{url}}/miniapp/images/index/youxuan.png"> | ||
| 72 | - </image> | ||
| 73 | - <text bindtap='go_test' class="yellow-co fs26 margin-left" data-url="../../../packageA/pages/prom_list/prom_list">人工优先</text> | ||
| 74 | - </view> | ||
| 75 | - | ||
| 76 | - | ||
| 77 | - <view class="flex-vertical"> | ||
| 78 | - <image class="xc-hook" src="{{url}}/miniapp/images/index/zhengpin.png"> | ||
| 79 | - </image> | ||
| 80 | - <text class="yellow-co fs26 margin-left">正品保证</text> | ||
| 81 | - </view> | ||
| 82 | - | ||
| 83 | - <view class="flex-vertical"> | ||
| 84 | - <image class="xc-hook" src="{{url}}/miniapp/images/index/shouhou.png"> | ||
| 85 | - </image> | ||
| 86 | - <text class="yellow-co fs26 margin-left">售后无忧</text> | ||
| 87 | - </view> | ||
| 88 | - </view> --> | 64 | + |
| 89 | 65 | ||
| 90 | <!---导航--> | 66 | <!---导航--> |
| 91 | <view class="venues_box"> | 67 | <view class="venues_box"> |
| @@ -153,9 +129,6 @@ | @@ -153,9 +129,6 @@ | ||
| 153 | </swiper> | 129 | </swiper> |
| 154 | </block> | 130 | </block> |
| 155 | 131 | ||
| 156 | - <!-- <view class="split-line"></view> --> | ||
| 157 | - | ||
| 158 | - | ||
| 159 | <!--秒杀--> | 132 | <!--秒杀--> |
| 160 | <view class="seckill" wx:if="{{saleGoods!=null && saleGoods.length!=0 }}"> | 133 | <view class="seckill" wx:if="{{saleGoods!=null && saleGoods.length!=0 }}"> |
| 161 | <navigator url="/pages/activity/seckill_list/seckill_list" hover-class="none"> | 134 | <navigator url="/pages/activity/seckill_list/seckill_list" hover-class="none"> |
| @@ -185,17 +158,13 @@ | @@ -185,17 +158,13 @@ | ||
| 185 | <!-- <view class="red-co mar-top10 is_seckill_height"> --> | 158 | <!-- <view class="red-co mar-top10 is_seckill_height"> --> |
| 186 | <view class="co-red mar-top10"> | 159 | <view class="co-red mar-top10"> |
| 187 | <text class="fs20">￥</text>{{aitem.price}} | 160 | <text class="fs20">￥</text>{{aitem.price}} |
| 188 | -<!-- <text class="un_line">￥{{aitem.shop_price}}</text>--> | ||
| 189 | </view> | 161 | </view> |
| 190 | </navigator> | 162 | </navigator> |
| 191 | 163 | ||
| 192 | 164 | ||
| 193 | </swiper-item> | 165 | </swiper-item> |
| 194 | </swiper> | 166 | </swiper> |
| 195 | - <!-- <view class="flex-center-around translation"> | ||
| 196 | - <view class="circle spot" wx:for="{{saleGoods}}" wx:key="{{index}}" style="background:{{index==flash_index?'#fff':'#999'}}"> | ||
| 197 | - </view> | ||
| 198 | - </view> --> | 167 | + |
| 199 | </view> | 168 | </view> |
| 200 | </view> | 169 | </view> |
| 201 | 170 | ||
| @@ -364,10 +333,6 @@ | @@ -364,10 +333,6 @@ | ||
| 364 | </swiper-item> | 333 | </swiper-item> |
| 365 | </swiper> | 334 | </swiper> |
| 366 | 335 | ||
| 367 | - <!-- <view class="flex-center-around translations abs"> | ||
| 368 | - <view class="circle spot" wx:for="{{pindGoods}}" wx:key="{{index}}" style="background:{{index==pt_index?'#fff':'#999'}}"> | ||
| 369 | - </view> | ||
| 370 | - </view> --> | ||
| 371 | </view> | 336 | </view> |
| 372 | </view> | 337 | </view> |
| 373 | 338 | ||
| @@ -392,13 +357,6 @@ | @@ -392,13 +357,6 @@ | ||
| 392 | </view> | 357 | </view> |
| 393 | </view> | 358 | </view> |
| 394 | 359 | ||
| 395 | - <!-- 英文标题 --> | ||
| 396 | - <!-- <view class="english flex-center"> | ||
| 397 | - <view class="silk"></view> | ||
| 398 | - <view class="esh five-level-word">GOOD HOT THING</view> | ||
| 399 | - <view class="silk"></view> | ||
| 400 | - </view> --> | ||
| 401 | - | ||
| 402 | </view> | 360 | </view> |
| 403 | <!-- 商品列表组件 --> | 361 | <!-- 商品列表组件 --> |
| 404 | <goods_recommend id="goods_list"></goods_recommend> | 362 | <goods_recommend id="goods_list"></goods_recommend> |
| @@ -434,17 +392,7 @@ | @@ -434,17 +392,7 @@ | ||
| 434 | </block> | 392 | </block> |
| 435 | </view> | 393 | </view> |
| 436 | <!-- 撑开层 --> | 394 | <!-- 撑开层 --> |
| 437 | - <view> | ||
| 438 | - <!-- 关注层的撑开 --> | ||
| 439 | - <!-- <view wx:if="{{is_gz_h5 && is_ok_h5}}" style="height: 84px"></view> --> | ||
| 440 | - <!-- <block wx:for="{{template_arr}}" > | ||
| 441 | - <block wx:if="{{item.content.is_top==1 && item.ename=='searchbox'}}"> | ||
| 442 | - <view wx:if="{{item.content.style==1}}" style="height: 115rpx;"></view> | ||
| 443 | - <view wx:if="{{item.content.style==2}}" style="height: 89rpx;"></view> | ||
| 444 | - </block> | ||
| 445 | - <view wx:if="{{item.content.is_top==1 && item.ename=='store_select'}}" style="height: 100rpx;"></view> | ||
| 446 | - </block> --> | ||
| 447 | - </view> | 395 | + <view></view> |
| 448 | 396 | ||
| 449 | <block wx:for="{{template_arr}}" wx:key="{{index}}"> | 397 | <block wx:for="{{template_arr}}" wx:key="{{index}}"> |
| 450 | <view> | 398 | <view> |
| @@ -536,11 +484,7 @@ | @@ -536,11 +484,7 @@ | ||
| 536 | </view> | 484 | </view> |
| 537 | 485 | ||
| 538 | </block> | 486 | </block> |
| 539 | - | ||
| 540 | - <!-- 直播 --> | ||
| 541 | - <!-- <block wx:if="{{item.ename=='nav'}}"> --> | ||
| 542 | - | ||
| 543 | - | 487 | + |
| 544 | <!-- 技术支持 --> | 488 | <!-- 技术支持 --> |
| 545 | <view class="logo-container t-c"> | 489 | <view class="logo-container t-c"> |
| 546 | <view class="flex ai_c fs24 jc-center pdv20 white"><image src="{{url + 'miniapp/images/luckDraw/logo.png?v=3'}}" class="logo" lazy-load></image>提供技术支持</view> | 490 | <view class="flex ai_c fs24 jc-center pdv20 white"><image src="{{url + 'miniapp/images/luckDraw/logo.png?v=3'}}" class="logo" lazy-load></image>提供技术支持</view> |
pages/index/index/index.wxss
| @@ -1215,3 +1215,22 @@ page { | @@ -1215,3 +1215,22 @@ page { | ||
| 1215 | background-color: #ccc; | 1215 | background-color: #ccc; |
| 1216 | } | 1216 | } |
| 1217 | 1217 | ||
| 1218 | + | ||
| 1219 | +/* 居中广告 */ | ||
| 1220 | +.full_img_main{ | ||
| 1221 | + display: flex; | ||
| 1222 | + align-items: center; | ||
| 1223 | + justify-content: center; | ||
| 1224 | + flex-direction: column; | ||
| 1225 | +} | ||
| 1226 | + | ||
| 1227 | +.full_img_close{ | ||
| 1228 | + width: 80rpx; | ||
| 1229 | + height: 80rpx; | ||
| 1230 | + border-radius: 100%; | ||
| 1231 | + border: 2rpx solid #000; | ||
| 1232 | + background-color: #fff; | ||
| 1233 | + display: flex; | ||
| 1234 | + align-items: center; | ||
| 1235 | + justify-items: center; | ||
| 1236 | +} |
pages/togoin/togoin.js
| @@ -122,6 +122,14 @@ Page({ | @@ -122,6 +122,14 @@ Page({ | ||
| 122 | //把会员的信息存在内存 | 122 | //把会员的信息存在内存 |
| 123 | wx.setStorageSync("userinfo",e.data.data); | 123 | wx.setStorageSync("userinfo",e.data.data); |
| 124 | 124 | ||
| 125 | + //调用接口判断是不是会员 | ||
| 126 | + app.promiseGet("/api/weshop/shoppingGuide/get/" + os.stoid + "/" + user.user_id, {}).then(res => { | ||
| 127 | + if (res.data.code == 0) { | ||
| 128 | + getApp().globalData.guide_id = res.data.data.id; | ||
| 129 | + } | ||
| 130 | + }) | ||
| 131 | + | ||
| 132 | + | ||
| 125 | setTimeout(function () { | 133 | setTimeout(function () { |
| 126 | getApp().globalData.login_back=1; | 134 | getApp().globalData.login_back=1; |
| 127 | wx.navigateBack({ delta: 1}) //返回上一页 | 135 | wx.navigateBack({ delta: 1}) //返回上一页 |
| @@ -258,7 +266,15 @@ Page({ | @@ -258,7 +266,15 @@ Page({ | ||
| 258 | getApp().globalData.login_back=1; | 266 | getApp().globalData.login_back=1; |
| 259 | wx.setStorageSync("userinfo",e.data.data); | 267 | wx.setStorageSync("userinfo",e.data.data); |
| 260 | wx.setStorageSync("isAuth", !0), app.globalData.userInfo = e.data.data, app.globalData.userInfo.head_pic = t.getFullUrl(app.globalData.userInfo.head_pic); | 268 | wx.setStorageSync("isAuth", !0), app.globalData.userInfo = e.data.data, app.globalData.userInfo.head_pic = t.getFullUrl(app.globalData.userInfo.head_pic); |
| 261 | - wx.navigateBack({ delta: 1}) | 269 | + |
| 270 | + //调用接口判断是不是会员 | ||
| 271 | + app.promiseGet("/api/weshop/shoppingGuide/get/" + os.stoid + "/" + e.data.data.user_id, {}).then(res => { | ||
| 272 | + if (res.data.code == 0) { | ||
| 273 | + getApp().globalData.guide_id = res.data.data.id; | ||
| 274 | + } | ||
| 275 | + }) | ||
| 276 | + | ||
| 277 | + wx.navigateBack({ delta: 1}) | ||
| 262 | 278 | ||
| 263 | }, | 279 | }, |
| 264 | failStatus: function (t) { | 280 | failStatus: function (t) { |
| @@ -321,6 +337,14 @@ Page({ | @@ -321,6 +337,14 @@ Page({ | ||
| 321 | //把会员的信息存在内存 | 337 | //把会员的信息存在内存 |
| 322 | wx.setStorageSync("userinfo",e.data.data); | 338 | wx.setStorageSync("userinfo",e.data.data); |
| 323 | 339 | ||
| 340 | + //调用接口判断是不是会员 | ||
| 341 | + app.promiseGet("/api/weshop/shoppingGuide/get/" + os.stoid + "/" + e.data.data.user_id, {}).then(res => { | ||
| 342 | + if (res.data.code == 0) { | ||
| 343 | + getApp().globalData.guide_id = res.data.data.id; | ||
| 344 | + } | ||
| 345 | + }) | ||
| 346 | + | ||
| 347 | + | ||
| 324 | setTimeout(function () { | 348 | setTimeout(function () { |
| 325 | getApp().globalData.login_back=1; | 349 | getApp().globalData.login_back=1; |
| 326 | wx.navigateBack({ delta: 1}) //返回上一页 | 350 | wx.navigateBack({ delta: 1}) //返回上一页 |