Browse Source

版本 1.6.31 拼团购顺道捎入口移至首页;

release
ZhaoTongYao 4 years ago
parent
commit
7f90511bf5
  1. 35
      pages/heartNew/heartNew.js
  2. 4
      pages/heartNew/heartNew.wxml
  3. 3
      pages/heartNew/heartNew.wxss
  4. 20
      pages/indexNew/indexNew.js
  5. 6
      pages/indexNew/indexNew.wxml
  6. 24
      pages/indexNew/indexNew.wxss
  7. 2
      pages/toRegister/toRegister.js

35
pages/heartNew/heartNew.js

@ -365,11 +365,12 @@ Page({
getImgUrl: res.data[0] getImgUrl: res.data[0]
}) })
}) })
api.getImgUrl("5").then(function (res) { // 2021.03.31 拼团购顺道捎移至首页
that.setData({ // api.getImgUrl("5").then(function (res) {
tabRightList: res.data // that.setData({
}) // tabRightList: res.data
}) // })
// })
}, },
/** /**
* 页面上拉触底事件的处理函数 * 页面上拉触底事件的处理函数
@ -497,18 +498,18 @@ Page({
}) })
}, },
//跳转 // 跳转 拼团购顺道捎 入口移至首页
toJumpPage (e) { // toJumpPage (e) {
if (e.currentTarget.dataset.code == 'ptg') { // if (e.currentTarget.dataset.code == 'ptg') {
wx.navigateTo({ // wx.navigateTo({
url: `/subpages/heart/pages/groupBuyList/groupBuyList?title=${e.currentTarget.dataset.title}` // url: `/subpages/heart/pages/groupBuyList/groupBuyList?title=${e.currentTarget.dataset.title}`
}) // })
} else if (e.currentTarget.dataset.code == 'sds') { // } else if (e.currentTarget.dataset.code == 'sds') {
wx.navigateTo({ // wx.navigateTo({
url: `/subpages/heart/pages/dropByList/dropByList?title=${e.currentTarget.dataset.title}` // url: `/subpages/heart/pages/dropByList/dropByList?title=${e.currentTarget.dataset.title}`
}) // })
} // }
}, // },
//选择志愿者标签筛选 //选择志愿者标签筛选
changeTag (e) { changeTag (e) {
if (this.data.isLoading) { if (this.data.isLoading) {

4
pages/heartNew/heartNew.wxml

@ -53,12 +53,12 @@
</view> </view>
</view> </view>
</view> </view>
<view class="tab-right"> <!-- <view class="tab-right">
<view class="tab" wx:for="{{tabRightList}}" wx:key="index" data-title="{{item.remark}}" data-code="{{item.imgCode}}" bindtap="toJumpPage"> <view class="tab" wx:for="{{tabRightList}}" wx:key="index" data-title="{{item.remark}}" data-code="{{item.imgCode}}" bindtap="toJumpPage">
<image src="{{item.imgUrl}}"/> <image src="{{item.imgUrl}}"/>
<view class="tab-text"></view> <view class="tab-text"></view>
</view> </view>
</view> </view> -->
<view class="tab-all"> <view class="tab-all">
<view class="tab-bar {{tabFixed ? 'tab-bar-fixed' : ''}}" style="margin-top: {{tabFixed ? statusHeight + navigationHeight : '278r'}}px"> <view class="tab-bar {{tabFixed ? 'tab-bar-fixed' : ''}}" style="margin-top: {{tabFixed ? statusHeight + navigationHeight : '278r'}}px">
<view class="tab tab0 {{selectedTab === 'tab0' ? 'select' : ''}}" data-tab="tab0" bindtap="tabBarChange"> <view class="tab tab0 {{selectedTab === 'tab0' ? 'select' : ''}}" data-tab="tab0" bindtap="tabBarChange">

3
pages/heartNew/heartNew.wxss

@ -290,6 +290,7 @@ button:last-child {
/* banner end */ /* banner end */
/* 拼团购/顺道捎 右侧按钮
.tab-right { .tab-right {
position: fixed; position: fixed;
right: 0; right: 0;
@ -311,7 +312,7 @@ button:last-child {
top: 26rpx; top: 26rpx;
color: white; color: white;
font-size: 34rpx; font-size: 34rpx;
} } */
.tab-all { .tab-all {
position: absolute; position: absolute;
width: 100%; width: 100%;

20
pages/indexNew/indexNew.js

@ -85,6 +85,7 @@ Page({
jmjs: {}, jmjs: {},
sxjs: {}, sxjs: {},
shouye: {}, shouye: {},
tabRightList: [], //拼团购和顺道捎
}, },
onShow: function () { onShow: function () {
if (wx.getStorageSync("token") != "" && wx.getStorageSync("token") != undefined && wx.getStorageSync("token") != null) { if (wx.getStorageSync("token") != "" && wx.getStorageSync("token") != undefined && wx.getStorageSync("token") != null) {
@ -163,6 +164,11 @@ Page({
}) })
} }
}) })
api.getImgUrl("5").then(res => {
this.setData({
tabRightList: res.data
})
})
}, },
// 获取默认网格 // 获取默认网格
getResidentConfig (){ getResidentConfig (){
@ -781,5 +787,17 @@ Page({
reject(false) reject(false)
}) })
}) })
} },
//拼团购/顺道捎 跳转 2021.03.31
toJumpPage (e) {
if (e.currentTarget.dataset.code == 'ptg') {
wx.navigateTo({
url: `/subpages/heart/pages/groupBuyList/groupBuyList?title=${e.currentTarget.dataset.title}`
})
} else if (e.currentTarget.dataset.code == 'sds') {
wx.navigateTo({
url: `/subpages/heart/pages/dropByList/dropByList?title=${e.currentTarget.dataset.title}`
})
}
},
}) })

6
pages/indexNew/indexNew.wxml

@ -49,6 +49,12 @@
</swiper-item> </swiper-item>
</swiper> </swiper>
</view> </view>
<view class="tab-right">
<view class="tab" wx:for="{{tabRightList}}" wx:key="index" data-title="{{item.remark}}" data-code="{{item.imgCode}}" bindtap="toJumpPage">
<image src="{{item.imgUrl}}"/>
<view class="tab-text"></view>
</view>
</view>
<!-- 通知 --> <!-- 通知 -->
<!-- <view class="notice"> <!-- <view class="notice">
<view class="left"> <view class="left">

24
pages/indexNew/indexNew.wxss

@ -663,3 +663,27 @@ page {
font-size: 36rpx; font-size: 36rpx;
color: #04BCA0; color: #04BCA0;
} }
/* 拼团购顺道捎按钮 start */
.tab-right {
position: fixed;
top: 320rpx;
right: 0;
z-index: 9999;
display: flex;
flex-direction: column;
}
.tab-right image {
width: 160rpx;
height: 102rpx;
}
.tab-right .tab {
position: relative;
}
.tab-right .tab .tab-text {
position: absolute;
left: 40rpx;
top: 26rpx;
color: white;
font-size: 34rpx;
}
/* 拼团购顺道捎按钮 end */

2
pages/toRegister/toRegister.js

@ -21,7 +21,7 @@ Page({
// } // }
// }) // })
let that = this let that = this
const versionNum = "1.6.30" const versionNum = "1.6.31"
api.getScanSwitch(versionNum).then(function (res) { api.getScanSwitch(versionNum).then(function (res) {
console.log(res.data) console.log(res.data)
let state = res.data.scanFlag let state = res.data.scanFlag

Loading…
Cancel
Save