Skip to content

严立 / mini-shimao

Go to a project
Commit 120ad213 by 严立
Options

准正式版本

parent a6ac5827
Inline Side-by-side
Showing with 263 additions and 98 deletions
app.js
...@@ -58,7 +58,6 @@ App({ ...@@ -58,7 +58,6 @@ App({
}).then((response) => { }).then((response) => {
let funcData = response.data let funcData = response.data
this.globalData.appStatus = Boolean(Number(funcData[0].value)) this.globalData.appStatus = Boolean(Number(funcData[0].value))
console.log(this.globalData.appStatus)
}).catch(() => {}) }).catch(() => {})
}, },
......
pages/club/information/information.js
...@@ -6,6 +6,7 @@ Page({ ...@@ -6,6 +6,7 @@ Page({
clubInfo: {}, clubInfo: {},
clubActivity: [], clubActivity: [],
activityTypeTag: [],
enterClubIdList: [], enterClubIdList: [],
enterClubStateList: [], enterClubStateList: [],
examineRemark: '', examineRemark: '',
...@@ -32,7 +33,7 @@ Page({ ...@@ -32,7 +33,7 @@ Page({
}, },
}) })
this.queryEnterClubList() this.queryEnterClubList()
this.queryActivity() this.setActivityTypeTag()
}, },
onShow: function () { onShow: function () {
...@@ -54,6 +55,34 @@ Page({ ...@@ -54,6 +55,34 @@ Page({
onReload: function () { onReload: function () {
console.log('onReload') console.log('onReload')
this.queryEnterClubList() this.queryEnterClubList()
wx.emit({
event: {
'type': 'onReload',
'receivePage': 'pages/club/home/home',
}
})
},
setActivityTypeTag: function () {
App.request({
url: 'v1/common/getSmTags',
params: {
'types': 2
}
}).then((response) => {
let funcData = response.data
let funcList = []
for (let i = 0, l = funcData.length; i < l; i++) {
funcList.push({
'text': funcData[i].name,
'value': funcData[i].tagId,
})
}
this.setData({
activityTypeTag: funcList,
})
this.queryActivity()
})
}, },
/** /**
...@@ -153,10 +182,11 @@ Page({ ...@@ -153,10 +182,11 @@ Page({
'priceDiscount': funcData[i].price, // 活动价 'priceDiscount': funcData[i].price, // 活动价
'priceDiscountText':  App.modular.utils.formatAmount(funcData[i].price), 'priceDiscountText':  App.modular.utils.formatAmount(funcData[i].price),
'tagIds': funcData[i].tagIds, 'tagIds': funcData[i].tagIds,
'tagNames': funcData[i].tagNames, 'tagNames': [],
'date': funcData[i].activeDate.replace(/月/g, '.').replace(/日/g, '') + ' ' + funcData[i].activeTime, 'date': funcData[i].activeDate.replace(/月/g, '.').replace(/日/g, '') + ' ' + funcData[i].activeTime,
'priceType': 1, 'priceType': 1,
} }
funcItem.tagNames = this.insertActivityTypeTag(funcItem.tagIds)
funcList.push(funcItem) funcList.push(funcItem)
} }
...@@ -170,6 +200,21 @@ Page({ ...@@ -170,6 +200,21 @@ Page({
}, },
/** /**
* 插入活动标签
* @function
* @param {array} - funcIgnoreTag
* @returns
*/
insertActivityTypeTag: function (funcInsertTag) {
let funcRemainTag = []
let funcActivityTypeTag = this.data.activityTypeTag
for (let i = 0, l = funcActivityTypeTag.length; i < l; i++) {
if (funcInsertTag.includes(funcActivityTypeTag[i].value)) funcRemainTag.push(funcActivityTypeTag[i].text)
}
return funcRemainTag
},
/**
* 更多俱乐部活动 * 更多俱乐部活动
* @function * @function
* @param {object} - funcEvent * @param {object} - funcEvent
......
pages/club/information/information.wxml
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
<view class="card-item-info"> <view class="card-item-info">
<view class="card-item-info-title row cb ac"> <view class="card-item-info-title row cb ac">
<text>{{item.title}}</text> <text>{{item.title}}</text>
<text class="tag-blue" wx:if="{{tagNames}}">{{item.tagNames}}</text> <text class="tag-blue" wx:if="{{item.tagNames.length}}">{{item.tagNames[0]}}</text>
</view> </view>
<view class="card-item-info-time row ac"> <view class="card-item-info-time row ac">
<image class="icon_32" src="{{imageBase + 'icon/clock-2.png'}}"></image> <image class="icon_32" src="{{imageBase + 'icon/clock-2.png'}}"></image>
...@@ -47,14 +47,14 @@ ...@@ -47,14 +47,14 @@
<block wx:if="{{item.priceType === 1}}"> <block wx:if="{{item.priceType === 1}}">
<text class="discount-mark">活动价</text> <text class="discount-mark">活动价</text>
<text>{{item.priceDiscountText === '0.00' ? '免费' : '¥ ' + item.priceDiscountText}}</text> <text>{{item.priceDiscountText === '0.00' ? '免费' : '¥ ' + item.priceDiscountText}}</text>
<text>{{item.priceText === '0.00' ? '免费' : '￥' + item.priceText}}</text> <text class="text-delete">{{item.priceText === '0.00' ? '免费' : '￥' + item.priceText}}</text>
</block> </block>
<!-- 业主价 --> <!-- 业主价 -->
<block wx:if="{{item.priceType === 2}}"> <block wx:if="{{item.priceType === 2}}">
<text class="owner-mark">业主价</text> <text class="owner-mark">业主价</text>
<text>{{item.priceSpecialText === '0.00' ? '免费' : '￥' + item.priceSpecialText}}</text> <text>{{item.priceSpecialText === '0.00' ? '免费' : '￥' + item.priceSpecialText}}</text>
<text>{{item.priceText === '0.00' ? '免费' : '￥' + item.priceText}}</text> <text class="text-delete">{{item.priceText === '0.00' ? '免费' : '￥' + item.priceText}}</text>
</block> </block>
<!-- 普通价 --> <!-- 普通价 -->
......
pages/club/member/member.js
...@@ -74,7 +74,7 @@ Page({ ...@@ -74,7 +74,7 @@ Page({
let funcItem = { let funcItem = {
'name': funcData[i].name, 'name': funcData[i].name,
'avatar': funcData[i].headImg, 'avatar': funcData[i].headImg,
'wx': funcData[i].wxAccountImg, 'wx': funcData[i].wxAccountImg.replace('http://', 'https://'),
} }
funcList.push(funcItem) funcList.push(funcItem)
} }
...@@ -96,7 +96,6 @@ Page({ ...@@ -96,7 +96,6 @@ Page({
isWritePhotosAlbum: function () { isWritePhotosAlbum: function () {
wx.getSetting({ wx.getSetting({
success: (response) => { success: (response) => {
console.log('isWritePhotosAlbum', response)
if (response.authSetting['scope.writePhotosAlbum'] || response.authSetting['scope.writePhotosAlbum'] === undefined) { if (response.authSetting['scope.writePhotosAlbum'] || response.authSetting['scope.writePhotosAlbum'] === undefined) {
this.setData({ isWritePhotosAlbum: true }) this.setData({ isWritePhotosAlbum: true })
} }
......
pages/commodity/menu-food/menu-food.wxml
...@@ -23,7 +23,6 @@ ...@@ -23,7 +23,6 @@
<view class="item-img"> <view class="item-img">
<!-- 暂时屏蔽图片下载 --> <!-- 暂时屏蔽图片下载 -->
<image src="{{itemCommodity.cover}}" mode="aspectFill"></image> <image src="{{itemCommodity.cover}}" mode="aspectFill"></image>
<!-- <image src="" mode="aspectFill"></image> -->
</view> </view>
<view class="item-info"> <view class="item-info">
<view class="item-info-title">{{itemCommodity.name}}</view> <view class="item-info-title">{{itemCommodity.name}}</view>
......
pages/login/image/login1.png → pages/login/image/logo.png
pages/login/image/login1.png

10.6 KB | W: | H:

pages/login/image/logo.png

10.6 KB | W: | H:

pages/login/image/login1.png
pages/login/image/logo.png
pages/login/image/login1.png
pages/login/image/logo.png
  • 2-up
  • Swipe
  • Onion skin
pages/login/login.wxml
<m-nav titleText="" scrollHeight="{{navScroll}}" styleIndex="{{2}}" isOccupy="{{false}}"></m-nav> <m-nav titleText="" scrollHeight="{{navScroll}}" styleIndex="{{2}}" isOccupy="{{false}}"></m-nav>
<view class="container"> <view class="container">
<view style="height:{{height}}px;overflow:hidden;"> <image class="login-bgi" src="{{resourcesBase + 'bgi/bgi-99.png'}}"></image>
<image class="bgClass" src="http://upload.miaomiao-bao.com/97b52202008201410189925.png"></image> <view class="logo row cc">
<view class="imgContainer"> <image src="./image/logo.png"></image>
<image class="titleImg" src="./image/login1.png"></image>
<image class="contentImg" src="./image/login.png"></image>
</view> </view>
<view class="btn-contanier"> <view class="slogan column cc ac">
<button class="loginBtn" hidden="{{islogin}}" open-type="getUserInfo" bindgetuserinfo="userInfoHandler">微信授权登录</button> <text class="font_normal_26">在奇幻秘境遇见未知的惊喜</text>
<view class="isloginBtn loginBtn" hidden="{{!islogin}}"> <text class="font_normal_26">邂逅森林奇境</text>
<view style="margin-right:10rpx;">已授权</view> <text class="font_normal_26">享受诗意人生</text>
<l-icon name="success" color="rgba(255,255,255,1);" size="28" />
</view> </view>
<button class="loginBtn" hidden="{{isphone}}" open-type="getPhoneNumber" bindgetphonenumber="userPhoneHandler">绑定手机号</button> <view class="login-operation">
<view class="isloginBtn loginBtn" hidden="{{!isphone}}"> <button class="login-operation-authorization" hidden="{{islogin}}" open-type="getUserInfo" bindgetuserinfo="userInfoHandler"></button>
<view style="margin-right:10rpx;">已绑定手机号</view> <view class="login-operation-authorization-complete row cc ac" hidden="{{!islogin}}">
<l-icon name="success" color="rgba(255,255,255,1);" size="28" /> <view>已授权</view>
<image class="icon_32" src="{{imageBase + 'icon/tick-3.png'}}"></image>
</view> </view>
<button class="login-operation-authorization" hidden="{{isphone}}" open-type="getPhoneNumber" bindgetphonenumber="userPhoneHandler">绑定手机号</button>
<view class="login-operation-authorization-complete row cc ac" hidden="{{!isphone}}">
<view>已绑定手机号</view>
<image class="icon_32" src="{{imageBase + 'icon/tick-3.png'}}"></image>
</view> </view>
</view> </view>
</view> </view>
\ No newline at end of file
pages/login/login.wxss
/* pages/login/login.wxss */ .container {
height: 100vh;
.all { overflow: hidden;
height: 100%;
} }
.content { .login-bgi {
z-index: -1;
position: absolute;
top: 0;
left: 0;
width: 750rpx; width: 750rpx;
position: relative;
/* overflow: hidden; */
}
.bgClass {
height: 1624rpx; height: 1624rpx;
width: 750rpx;
z-index: -1;
} }
.imgContainer { .logo {
width: 750rpx; width: 750rpx;
position: absolute; margin: 326rpx 0 0 0;
top: 326rpx;
display: flex;
flex-direction: column;
align-items: center;
} }
.titleImg { .logo > image {
width: 528rpx; width: 528rpx;
height: 230rpx; height: 230rpx;
left: 112rpx; }
margin-bottom: 26rpx;
.slogan {
margin: 104rpx 0 0 0;
}
.slogan > text {
margin: 36rpx 0 0 0;
letter-spacing: 12rpx;
color: #FFFFFF;
} }
.contentImg { .contentImg {
...@@ -43,28 +43,35 @@ ...@@ -43,28 +43,35 @@
margin-bottom: 32rpx; margin-bottom: 32rpx;
} }
.btn-contanier { .login-operation {
width: 558rpx;
position: absolute;
bottom: 80rpx;
left: 96rpx; left: 96rpx;
/* margin-top: 176rpx; */ bottom: 80rpx;
position: absolute;
width: 558rpx;
} }
.loginBtn { .login-operation-authorization {
width: 558rpx; width: 558rpx;
height: 96rpx; height: 96rpx;
background: rgba(134, 197, 225, 1); margin-bottom: 44rpx;
border-radius: 4rpx; border-radius: 4px;
background: #86C5E1;
line-height: 96rpx; line-height: 96rpx;
text-align: center; text-align: center;
color: rgba(255, 255, 255, 1);
margin-bottom: 44rpx;
font-size: 32rpx; font-size: 32rpx;
color: #FFFFFF;
} }
.isloginBtn { .login-operation-authorization-complete {
background-color: rgb(200, 225, 236); width: 558rpx;
display: flex; height: 96rpx;
justify-content: center; margin-bottom: 44rpx;
border-radius: 4px;
background: #C8E1EC;
line-height: 96rpx;
text-align: center;
font-size: 32rpx;
color: #FFFFFF;
} }
pages/mall/goods/goods.wxss
...@@ -10,12 +10,14 @@ ...@@ -10,12 +10,14 @@
background: #fff; background: #fff;
} }
.banner-swiper, .banner-swiper-item, .banner-swiper-image { .banner-swiper,
.banner-swiper-item,
.banner-swiper-image {
position: absolute; position: absolute;
top: 0 !important; top: 0 !important;
left: 0 !important; left: 0 !important;
width: 750rpx; width: 750rpx;
height: 774rpx; height: 800rpx;
} }
.banner-swiper-point { .banner-swiper-point {
...@@ -27,7 +29,7 @@ ...@@ -27,7 +29,7 @@
.banner-wave { .banner-wave {
z-index: 1; z-index: 1;
position: relative; position: relative;
top: 714rpx; top: 744rpx;
left: 0; left: 0;
width: 750rpx; width: 750rpx;
height: 60rpx; height: 60rpx;
......
pages/mall/home/home.wxml
...@@ -108,7 +108,7 @@ ...@@ -108,7 +108,7 @@
</view> </view>
</block> </block>
</view> </view>
<view class="routine_list_nothing row cc ac" wx:if="{{recommendList['0'].length === 0 && recommendList['1'].length === 0}}"> <view class="routine_list_nothing row cc ac" wx:if="{{recommendList['0'].length === 0 && recommendList['1'].length === 0 || goodsAllList.length === 0}}">
<text class="font_bold_38 color_secondary">暂无商品</text> <text class="font_bold_38 color_secondary">暂无商品</text>
</view> </view>
</view> </view>
......
pages/mall/home/home.wxss
...@@ -216,6 +216,7 @@ ...@@ -216,6 +216,7 @@
/* 商品列表 */ /* 商品列表 */
.routine_list_nothing { .routine_list_nothing {
width: 750rpx; width: 750rpx;
height: 558rpx;
flex-grow: 1; flex-grow: 1;
} }
......
pages/mine/appointment-detail/appointment-detail.js
...@@ -163,8 +163,7 @@ Page({ ...@@ -163,8 +163,7 @@ Page({
// 再次下单 // 再次下单
onOrderAgain: function () { onOrderAgain: function () {
let funcShopInfoBuffer = App.getShopInfo(this.data.shopInfo.id) if (this.data.orderInfo.goodsType === -3) {
if (funcShopInfoBuffer.appId === 0) {
wx.navigateTo({ url: '/pages/club/home/home' }) wx.navigateTo({ url: '/pages/club/home/home' })
} else { } else {
wx.navigateTo({ url: '/pages/play/activity/activity' }) wx.navigateTo({ url: '/pages/play/activity/activity' })
......
pages/mine/club/club.js
...@@ -12,6 +12,7 @@ Page({ ...@@ -12,6 +12,7 @@ Page({
pageSize: 5, pageSize: 5,
adminInfo: {}, adminInfo: {},
isWritePhotosAlbum: false,
winAdminInfo: false, winAdminInfo: false,
...@@ -22,6 +23,7 @@ Page({ ...@@ -22,6 +23,7 @@ Page({
onLoad: function (options) { onLoad: function (options) {
this.queryClubEnter() this.queryClubEnter()
this.queryClubAuditTotal() this.queryClubAuditTotal()
this.isWritePhotosAlbum()
}, },
onReload: function () { onReload: function () {
...@@ -60,7 +62,7 @@ Page({ ...@@ -60,7 +62,7 @@ Page({
'memberId': funcData[i].memberId, 'memberId': funcData[i].memberId,
'state': Number(funcData[i].state), 'state': Number(funcData[i].state),
'date': App.modular.miment(funcData[i].date + ' 00:00:00').format('YYYY.MM.DD'), 'date': App.modular.miment(funcData[i].date + ' 00:00:00').format('YYYY.MM.DD'),
'adminWx': funcData[i].creatorImg, 'adminWx': funcData[i].creatorImg.replace('http://', 'https://'),
'remark': funcData[i].remarks, 'remark': funcData[i].remarks,
'isOwner': Number(funcData[i].owner) === 0 ? false : true 'isOwner': Number(funcData[i].owner) === 0 ? false : true
} }
...@@ -317,12 +319,33 @@ Page({ ...@@ -317,12 +319,33 @@ Page({
}, },
/** /**
* 检查相册保存状态
* @function
* @param
* @returns
*/
isWritePhotosAlbum: function () {
wx.getSetting({
success: (response) => {
if (response.authSetting['scope.writePhotosAlbum'] || response.authSetting['scope.writePhotosAlbum'] === undefined) {
this.setData({ isWritePhotosAlbum: true })
}
if (response.authSetting['scope.writePhotosAlbum'] === false) {
this.setData({ isWritePhotosAlbum: false })
}
}
})
},
/**
* 保存俱乐部管理员信息 * 保存俱乐部管理员信息
* @function * @function
* @param * @param
* @returns * @returns
*/ */
onSaveAdminWx: function () { onSaveAdminWx: function () {
if (this.data.isWritePhotosAlbum) {
wx.downloadFile({ wx.downloadFile({
url: this.data.adminInfo.wx, url: this.data.adminInfo.wx,
success: (result) => { success: (result) => {
...@@ -338,6 +361,9 @@ Page({ ...@@ -338,6 +361,9 @@ Page({
}) })
}, },
fail: (error) => { fail: (error) => {
this.setData({
isWritePhotosAlbum: false,
})
App.ui.showToast({ App.ui.showToast({
iconType: 'error', iconType: 'error',
title: '保存失败', title: '保存失败',
...@@ -352,6 +378,20 @@ Page({ ...@@ -352,6 +378,20 @@ Page({
}) })
} }
}) })
} else {
wx.openSetting({
success: (response) => {
if (response.authSetting['scope.writePhotosAlbum']) {
this.setData({ isWritePhotosAlbum: true })
this.onGetClubAdminInfo(funcEvent)
} else {
this.setData({ isWritePhotosAlbum: false })
App.ui.showToast({ iconType: 'error', title: '相册授权失败', })
}
},
fail: (response) => {}
})
}
}, },
onDialogClose: function () { onDialogClose: function () {
......
pages/mine/club/club.wxml
...@@ -141,7 +141,7 @@ ...@@ -141,7 +141,7 @@
<view class="member-admin row cc ac" hidden="{{!winAdminInfo}}"> <view class="member-admin row cc ac" hidden="{{!winAdminInfo}}">
<view class="member_admin_info col cc ac"> <view class="member_admin_info col cc ac">
<text>管理员微信</text> <text>管理员微信</text>
<image src="{{adminInfo.wx}}" bindlongpress="onSaveAdminWx"></image> <image src="{{adminInfo.wx}}" bindtap="onSaveAdminWx"></image>
<text>【长按保存二维码】</text> <text>【长按保存二维码】</text>
<button class="row cc ac" bindtap="onDialogClose">我知道了</button> <button class="row cc ac" bindtap="onDialogClose">我知道了</button>
</view> </view>
......
pages/mine/order/order.js
...@@ -519,6 +519,10 @@ Page({ ...@@ -519,6 +519,10 @@ Page({
onOrderAgain: function (event) { onOrderAgain: function (event) {
let funcItem = event.currentTarget.dataset.item let funcItem = event.currentTarget.dataset.item
console.log(funcItem) console.log(funcItem)
if (funcItem.commodityType === -3) {
wx.navigateTo({ url: '/pages/club/home/home' })
return
}
let funcUrl = '' let funcUrl = ''
App.setShopInfo(funcItem.shopAppId, funcItem.commodityType) App.setShopInfo(funcItem.shopAppId, funcItem.commodityType)
......
pages/mine/question/question.js
let App = getApp() let App = getApp()
Page({ Page({
data: { data: {
imageBase: App.globalData.appImageBase,
resourcesBase: App.globalData.appResourcesBase,
title: '客服中心', title: '客服中心',
inputHidden: true, inputHidden: true,
commonProblems: [], commonProblems: [],
......
pages/mine/question/question.wxml
...@@ -52,7 +52,7 @@ ...@@ -52,7 +52,7 @@
<view class="column cc ac"> <view class="column cc ac">
<image class="service_phone_content" src="./image/service-phone.png"></image> <image class="service_phone_content" src="./image/service-phone.png"></image>
<view class="service_phone_close row cc ac" bindtap="onServicephoneClose"> <view class="service_phone_close row cc ac" bindtap="onServicephoneClose">
<image src="{{imageBase + '/icon/close-1.png'}}"></image> <image src="{{imageBase + 'icon/close-1.png'}}"></image>
</view> </view>
</view> </view>
</view> </view>
......
pages/pay/order-comment/order-comment.js
...@@ -18,7 +18,9 @@ Page({ ...@@ -18,7 +18,9 @@ Page({
amount: '', amount: '',
commodity: [] commodity: []
}, },
fileResults: []
goodsQuantity: 0,
fileResults: [],
}, },
onLoad: function (options) { onLoad: function (options) {
console.log(options) console.log(options)
...@@ -81,6 +83,7 @@ Page({ ...@@ -81,6 +83,7 @@ Page({
funcOrderInfo.shopInfo = shopFilter[0] funcOrderInfo.shopInfo = shopFilter[0]
// 添加订单商品列表 // 添加订单商品列表
let funcCommodity = funcResponse.smOrderDetails let funcCommodity = funcResponse.smOrderDetails
let funcGoodsQuantity = 0
for (let i = 0, l = funcCommodity.length; i < l; i++) { for (let i = 0, l = funcCommodity.length; i < l; i++) {
let funcCommodityItem = { let funcCommodityItem = {
'cover': funcCommodity[i].imgUrl, 'cover': funcCommodity[i].imgUrl,
...@@ -90,6 +93,7 @@ Page({ ...@@ -90,6 +93,7 @@ Page({
'state': Number(funcCommodity[i].status), // 状态 'state': Number(funcCommodity[i].status), // 状态
'codeId': funcCommodity[i].volumeId, // 券码 'codeId': funcCommodity[i].volumeId, // 券码
} }
funcGoodsQuantity = funcGoodsQuantity + funcCommodityItem.quantity
funcOrderInfo.commodity.push(funcCommodityItem) funcOrderInfo.commodity.push(funcCommodityItem)
} }
// 倒计时 // 倒计时
...@@ -120,7 +124,8 @@ Page({ ...@@ -120,7 +124,8 @@ Page({
}, 1000) }, 1000)
} }
this.setData({ this.setData({
orderInfo: funcOrderInfo orderInfo: funcOrderInfo,
goodsQuantity: funcGoodsQuantity
}) })
// 判断是否自动展示二维码 // 判断是否自动展示二维码
...@@ -203,9 +208,27 @@ Page({ ...@@ -203,9 +208,27 @@ Page({
*/ */
eventImageAdd: function (event) { eventImageAdd: function (event) {
let that = this let that = this
let imgUrls = event.detail.current let imgUrls = event.detail.current
// if (!/[.jpg|.jpeg|.png|.bmp]+$/.test(imgUrls[0].url)) {
// App.ui.showToast({
// iconType: 'error',
// title: '请上传图片格式',
// })
// console.log(this.data.imgUrls)
// let funcImgUrls = this.data.imgUrls
// for (let i = 0, l = funcImgUrls.length; i < l; i++) {
// if (funcImgUrls[i] === funcImgUrls) {
// funcImgUrls.splice(i, 1)
// this.setData({
// imgUrls: funcImgUrls,
// })
// }
// }
// return
// }
let urlArr = [] let urlArr = []
imgUrls.forEach(item => { imgUrls.forEach(item => {
urlArr.push(item.url) urlArr.push(item.url)
......
pages/pay/order-detail/order-detail.js
...@@ -135,6 +135,11 @@ Page({ ...@@ -135,6 +135,11 @@ Page({
// 再次下单 // 再次下单
onOrderAgain: function (event) { onOrderAgain: function (event) {
if (this.data.orderInfo.goodsType === -3) {
wx.navigateTo({ url: '/pages/club/home/home' })
return
}
let funcItem = this.data.orderInfo let funcItem = this.data.orderInfo
funcItem.shopAppId = wx.getStorageSync('shopInfoBuffer').appId funcItem.shopAppId = wx.getStorageSync('shopInfoBuffer').appId
......
pages/play/activity/activity.js
...@@ -10,6 +10,7 @@ Page({ ...@@ -10,6 +10,7 @@ Page({
pageIndex: 1, pageIndex: 1,
activity: [], activity: [],
activityTypeTag: [],
selectedActivity: [], selectedActivity: [],
other: [], other: [],
selectedOther: [], selectedOther: [],
...@@ -35,9 +36,37 @@ Page({ ...@@ -35,9 +36,37 @@ Page({
}) })
} }
this.setActivityTypeTag()
this.queryTab() this.queryTab()
},
/**
* 设置电影类型标签
* @function
* @param {object} - funcEvent
* @returns
*/
setActivityTypeTag: function () {
App.request({
url: 'v1/common/getSmTags',
params: {
'types': 2
}
}).then((response) => {
let funcData = response.data
let funcList = []
for (let i = 0, l = funcData.length; i < l; i++) {
funcList.push({
'text': funcData[i].name,
'value': funcData[i].tagId,
})
}
this.setData({
activityTypeTag: funcList,
})
this.queryActivityLately() this.queryActivityLately()
this.queryActivityExpire() this.queryActivityExpire()
})
}, },
queryTab: function () { queryTab: function () {
...@@ -88,13 +117,14 @@ Page({ ...@@ -88,13 +117,14 @@ Page({
'describe': funcData[i].summary, 'describe': funcData[i].summary,
'beginDate': funcData[i].activeDate.split('-')[0], 'beginDate': funcData[i].activeDate.split('-')[0],
'tagIds': funcData[i].tagIds, 'tagIds': funcData[i].tagIds,
'tagNames': funcData[i].tagNames, 'tagNames': [],
'price': funcData[i].visitorPrice, // 普通价 'price': funcData[i].visitorPrice, // 普通价
'priceText': App.modular.utils.formatAmount(funcData[i].visitorPrice), // 普通价文本格式 'priceText': App.modular.utils.formatAmount(funcData[i].visitorPrice), // 普通价文本格式
'priceSpecial': funcData[i].ownerPrice, // 业主价 'priceSpecial': funcData[i].ownerPrice, // 业主价
'priceSpecialText': App.modular.utils.formatAmount(funcData[i].ownerPrice), // 业主价文本格式 'priceSpecialText': App.modular.utils.formatAmount(funcData[i].ownerPrice), // 业主价文本格式
'priceType': 1, 'priceType': 1,
} }
funcItem.tagNames = this.insertActivityTypeTag(funcItem.tagIds)
funcList.push(funcItem) funcList.push(funcItem)
} }
...@@ -223,6 +253,21 @@ Page({ ...@@ -223,6 +253,21 @@ Page({
} }
}, },
/**
* 插入活动标签
* @function
* @param {array} - funcIgnoreTag
* @returns
*/
insertActivityTypeTag: function (funcInsertTag) {
let funcRemainTag = []
let funcActivityTypeTag = this.data.activityTypeTag
for (let i = 0, l = funcActivityTypeTag.length; i < l; i++) {
if (funcInsertTag.includes(funcActivityTypeTag[i].value)) funcRemainTag.push(funcActivityTypeTag[i].text)
}
return funcRemainTag
},
eventTabChange: function (funcEvent) { eventTabChange: function (funcEvent) {
let funcItem = funcEvent.detail let funcItem = funcEvent.detail
this.setData({ this.setData({
......
pages/play/activity/activity.wxss
...@@ -112,7 +112,7 @@ ...@@ -112,7 +112,7 @@
text-align: center; text-align: center;
font-size: 18rpx; font-size: 18rpx;
font-weight: 500; font-weight: 500;
line-height: 32rpx; line-height: 26rpx;
color: #86c5e1; color: #86c5e1;
} }
......
pages/play/home/home.js
...@@ -24,17 +24,11 @@ Page({ ...@@ -24,17 +24,11 @@ Page({
touristRoutePageSize: 10, touristRoutePageSize: 10,
}, },
onShow: function () { onLoad: function () {
this.setData({ appStatus: App.globalData.appStatus }) this.setData({ appStatus: App.globalData.appStatus })
this.queryActivity() this.queryActivity()
this.queryMovie() this.queryMovie()
this.queryClub() this.queryClub()
this.setData({
pageNo: 1,
pageSize: 10,
touristRouteList: [],
})
this.routeList() this.routeList()
}, },
...@@ -286,10 +280,8 @@ Page({ ...@@ -286,10 +280,8 @@ Page({
funcList.push(funcItem) funcList.push(funcItem)
} }
let funcTouristRouteList = this.data.touristRouteList
funcTouristRouteList = funcTouristRouteList.concat(funcList)
this.setData({ this.setData({
touristRouteList: funcTouristRouteList touristRouteList: this.data.touristRoutePageNo === 1 ? funcList : this.data.touristRouteList.concat(funcList)
}) })
}, },
fail: (err) => { fail: (err) => {
......
pages/play/home/home.wxml
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
<view class="recent_activities_item_wrap"> <view class="recent_activities_item_wrap">
<image class="recent_activities_item_cover" mode="aspectFill" src="{{item.banner}}"></image> <image class="recent_activities_item_cover" mode="aspectFill" src="{{item.banner}}"></image>
<view class="recent_activities_item_name row ac"> <view class="recent_activities_item_name row ac">
<text class="font_bold_54 color_regular overflow_point_2">{{item.name}}</text> <text class="font_bold_42 color_regular overflow_point_2">{{item.name}}</text>
</view> </view>
<view class="recent_activities_item_date row ac"> <view class="recent_activities_item_date row ac">
<text class="recent_activities_item_time font_normal_30 color_cancel">{{item.timeDate + item.timePeriod}}</text> <text class="recent_activities_item_time font_normal_30 color_cancel">{{item.timeDate + item.timePeriod}}</text>
......
pages/play/home/home.wxss
...@@ -117,7 +117,7 @@ ...@@ -117,7 +117,7 @@
} }
.recent_activities_item_date { .recent_activities_item_date {
margin: 30rpx 0 0 0; margin: 24rpx 0 0 0;
} }
.item-nothing { .item-nothing {
......
pages/play/movie-detail/movie-detail.wxss
...@@ -7,7 +7,6 @@ page { ...@@ -7,7 +7,6 @@ page {
position: relative; position: relative;
width: 750rpx; width: 750rpx;
height: 814rpx; height: 814rpx;
background-color: #ccc;
} }
.banner-swiper, .banner-swiper,
...@@ -17,7 +16,7 @@ page { ...@@ -17,7 +16,7 @@ page {
top: 0 !important; top: 0 !important;
left: 0 !important; left: 0 !important;
width: 750rpx; width: 750rpx;
height: 800rpx; height: 814rpx;
} }
.banner-swiper-point { .banner-swiper-point {
position: relative; position: relative;
...@@ -26,7 +25,7 @@ page { ...@@ -26,7 +25,7 @@ page {
} }
.banner-wave { .banner-wave {
position: absolute; position: absolute;
top: 754rpx; top: 760rpx;
left: 0; left: 0;
width: 750rpx; width: 750rpx;
height: 60rpx; height: 60rpx;
......
pages/play/point-detail/point-detail.wxss
...@@ -30,7 +30,7 @@ page { ...@@ -30,7 +30,7 @@ page {
.banner-swiper-item, .banner-swiper-item,
.banner-swiper-image { .banner-swiper-image {
width: 750rpx; width: 750rpx;
height: 880rpx; height: 792rpx;
} }
.banner-swiper-point { .banner-swiper-point {
......
pages/play/service-detail/service-detail.wxss
...@@ -10,7 +10,9 @@ ...@@ -10,7 +10,9 @@
background: #fff; background: #fff;
} }
.banner-swiper, .banner-swiper-item, .banner-swiper-image { .banner-swiper,
.banner-swiper-item,
.banner-swiper-image {
position: absolute; position: absolute;
top: 0 !important; top: 0 !important;
left: 0 !important; left: 0 !important;
...@@ -27,7 +29,7 @@ ...@@ -27,7 +29,7 @@
.banner-wave { .banner-wave {
z-index: 1; z-index: 1;
position: relative; position: relative;
top: 740rpx; top: 750rpx;
left: 0; left: 0;
width: 750rpx; width: 750rpx;
height: 60rpx; height: 60rpx;
...@@ -721,6 +723,7 @@ ...@@ -721,6 +723,7 @@
width: 670rpx; width: 670rpx;
max-height: 132rpx; max-height: 132rpx;
margin-top: 32rpx; margin-top: 32rpx;
word-break: break-all;
font-size: 26rpx; font-size: 26rpx;
font-weight: 400; font-weight: 400;
line-height: 44rpx; line-height: 44rpx;
...@@ -735,6 +738,7 @@ ...@@ -735,6 +738,7 @@
width: 670rpx; width: 670rpx;
min-height: 132rpx; min-height: 132rpx;
margin-top: 32rpx; margin-top: 32rpx;
word-break: break-all;
font-size: 26rpx; font-size: 26rpx;
font-weight: 400; font-weight: 400;
line-height: 44rpx; line-height: 44rpx;
......
pages/play/service-sell/service-sell.wxss
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
top: 0 !important; top: 0 !important;
left: 0 !important; left: 0 !important;
width: 750rpx; width: 750rpx;
height: 800rpx; height: 792rpx;
} }
.banner-swiper-point { .banner-swiper-point {
......
pages/play/strategy-detail/strategy-detail.wxss
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
top: 0 !important; top: 0 !important;
left: 0 !important; left: 0 !important;
width: 750rpx; width: 750rpx;
height: 870rpx; height: 862rpx;
} }
.banner-swiper-point { .banner-swiper-point {
......
utils/extend/api.js
...@@ -22,7 +22,6 @@ function emit (wxObject) { ...@@ -22,7 +22,6 @@ function emit (wxObject) {
return return
} }
let funcPageList = getCurrentPages() let funcPageList = getCurrentPages()
console.log(funcPageList)
let funcReceivePagePath = object.event.receivePage let funcReceivePagePath = object.event.receivePage
if (funcPageList.length > 1) { if (funcPageList.length > 1) {
for (let i = funcPageList.length - 1; 0 <= i; i--) { for (let i = funcPageList.length - 1; 0 <= i; i--) {
......
wxss/samcss-theme.wxss
...@@ -48,3 +48,7 @@ ...@@ -48,3 +48,7 @@
.font_bolder_42 { font-size: 42rpx; font-weight: 900; line-height: 58rpx; } .font_bolder_42 { font-size: 42rpx; font-weight: 900; line-height: 58rpx; }
.font_bolder_50 { font-size: 50rpx; font-weight: 900; line-height: 72rpx; } .font_bolder_50 { font-size: 50rpx; font-weight: 900; line-height: 72rpx; }
.font_bolder_54 { font-size: 54rpx; font-weight: 900; line-height: 76rpx; } .font_bolder_54 { font-size: 54rpx; font-weight: 900; line-height: 76rpx; }
.text-delete {
text-decoration: line-through;
}
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment