Skip to content

严立 / mini-shimao

Go to a project
Commit 027516c2 by zqm
Options

MM-年卡月卡列表

parent 73fcb671
Inline Side-by-side
Showing with 54 additions and 30 deletions
pages/mine/card/card.js
...@@ -94,13 +94,11 @@ Page({ ...@@ -94,13 +94,11 @@ Page({
return item.officeName == '儿童营地' return item.officeName == '儿童营地'
}) })
filterList.length = 1
that.setData({ that.setData({
passList: filterList passList: filterList
}) })
console.log(that.data.passList);
} }
}) })
......
pages/mine/card/card.wxml
...@@ -109,8 +109,11 @@ ...@@ -109,8 +109,11 @@
<text wx:else>{{item.personName}}</text> <text wx:else>{{item.personName}}</text>
</view> </view>
<view class="card-info-visible" data-index="{{index}}" bindtap="onShowPrivate"> <view class="card-info-visible" data-index="{{index}}" bindtap="onShowPrivate">
<image wx:if="{{true}}"></image> <!-- <image wx:if="{{true}}"></image>
<image wx:else></image> <image wx:else></image> -->
<image src="{{imageBase+'icon/eyes_close.png'}}" wx:if="{{item.privateStatus}}">
</image>
<image src="{{imageBase+'icon/eyes_open.png'}}" wx:else></image>
</view> </view>
</view> </view>
<view class="row align-c"> <view class="row align-c">
......
pages/mine/home/home.js
...@@ -62,7 +62,8 @@ Page({ ...@@ -62,7 +62,8 @@ Page({
isYearCard: true, isYearCard: true,
isMonthCard: false, isMonthCard: false,
authInfo: null, authInfo: null,
goodTypeCountData: {} goodTypeCountData: {},
enrollSubscribeData: {}
}, },
goQuestion: function () { goQuestion: function () {
wx.navigateTo({ wx.navigateTo({
...@@ -257,6 +258,21 @@ Page({ ...@@ -257,6 +258,21 @@ Page({
} }
}) })
}, },
//活动预约统计
getCountEnrollSubscribe() {
let that = this
App.wxRequest({
url: '/api/v1/activity/getCountEnrollSubscribe',
data: {},
success: function (res) {
console.log(res, '获取分类统计');
let data = res.data ? res.data : {}
that.setData({
enrollSubscribeData: data
})
}
})
},
setUserInfo: function () { setUserInfo: function () {
let funcUserInfo = wx.getStorageSync('userInfo') let funcUserInfo = wx.getStorageSync('userInfo')
...@@ -297,8 +313,8 @@ Page({ ...@@ -297,8 +313,8 @@ Page({
this.getWillUseOrders() this.getWillUseOrders()
this.getPermissions() this.getPermissions()
this.getIntegral() this.getIntegral()
this.getList()
this.getCountByGoodType() this.getCountByGoodType()
this.getCountEnrollSubscribe()
}, },
}) })
} else { } else {
...@@ -352,7 +368,13 @@ Page({ ...@@ -352,7 +368,13 @@ Page({
}) })
} }
}, },
// 点分类跳转订单
goOrderByclass(e) {
let type = e.currentTarget.dataset.type
wx.navigateTo({
url: '/pages/mine/order/order?goodType=' + type
})
},
//我的活动详情 //我的活动详情
activityDetail(e) { activityDetail(e) {
wx.navigateTo({ wx.navigateTo({
...@@ -454,7 +476,7 @@ Page({ ...@@ -454,7 +476,7 @@ Page({
// 二期代码 // 二期代码
onOrder: function () { onOrder: function () {
console.log('onOrder')
wx.navigateTo({ wx.navigateTo({
url: '/pages/mine/order/order' url: '/pages/mine/order/order'
}) })
......
pages/mine/home/home.wxml
...@@ -97,7 +97,7 @@ ...@@ -97,7 +97,7 @@
</view> </view>
<!-- 订单分类icno --> <!-- 订单分类icno -->
<view class="order-activity-icon-list row con-b"> <view class="order-activity-icon-list row con-b">
<view class="order-activity-icon-wrapper col align-c"> <view class="order-activity-icon-wrapper col align-c" data-type="3" bindtap="goOrderByclass">
<view class="order-activity-icon row con-c align-c"> <view class="order-activity-icon row con-c align-c">
<image src="{{imageResourcesBase+'mine/home/or_ticket.png'}}"></image> <image src="{{imageResourcesBase+'mine/home/or_ticket.png'}}"></image>
<view class="order-activity-badge {{ goodTypeCountData['1'] > 9 ? 'badge-widen' : ''}}" <view class="order-activity-badge {{ goodTypeCountData['1'] > 9 ? 'badge-widen' : ''}}"
...@@ -106,7 +106,7 @@ ...@@ -106,7 +106,7 @@
</view> </view>
<text>门票</text> <text>门票</text>
</view> </view>
<view class="order-activity-icon-wrapper col align-c"> <view class="order-activity-icon-wrapper col align-c" data-type="5" bindtap="goOrderByclass">
<view class="order-activity-icon row con-c align-c"> <view class="order-activity-icon row con-c align-c">
<image src="{{imageResourcesBase+'mine/home/or_food.png'}}"></image> <image src="{{imageResourcesBase+'mine/home/or_food.png'}}"></image>
<view class="order-activity-badge {{ goodTypeCountData['2'] > 9 ? 'badge-widen' : ''}}" <view class="order-activity-badge {{ goodTypeCountData['2'] > 9 ? 'badge-widen' : ''}}"
...@@ -115,7 +115,7 @@ ...@@ -115,7 +115,7 @@
</view> </view>
<text>餐饮</text> <text>餐饮</text>
</view> </view>
<view class="order-activity-icon-wrapper col align-c"> <view class="order-activity-icon-wrapper col align-c" data-type="3" bindtap="goOrderByclass">
<view class="order-activity-icon row con-c align-c"> <view class="order-activity-icon row con-c align-c">
<image src="{{imageResourcesBase+'mine/home/or_movice.png'}}"></image> <image src="{{imageResourcesBase+'mine/home/or_movice.png'}}"></image>
<view class="order-activity-badge {{ goodTypeCountData['3'] > 9 ? 'badge-widen' : ''}}" <view class="order-activity-badge {{ goodTypeCountData['3'] > 9 ? 'badge-widen' : ''}}"
...@@ -124,7 +124,7 @@ ...@@ -124,7 +124,7 @@
</view> </view>
<text>影票</text> <text>影票</text>
</view> </view>
<view class="order-activity-icon-wrapper col align-c"> <view class="order-activity-icon-wrapper col align-c" data-type="2" bindtap="goOrderByclass">
<view class="order-activity-icon row con-c align-c"> <view class="order-activity-icon row con-c align-c">
<image src="{{imageResourcesBase+'mine/home/or_spa.png'}}"></image> <image src="{{imageResourcesBase+'mine/home/or_spa.png'}}"></image>
<view class="order-activity-badge {{ goodTypeCountData['4'] > 9 ? 'badge-widen' : ''}}" <view class="order-activity-badge {{ goodTypeCountData['4'] > 9 ? 'badge-widen' : ''}}"
...@@ -133,7 +133,7 @@ ...@@ -133,7 +133,7 @@
</view> </view>
<text>SPA</text> <text>SPA</text>
</view> </view>
<view class="order-activity-icon-wrapper col align-c"> <view class="order-activity-icon-wrapper col align-c" data-type="4" bindtap="goOrderByclass">
<view class="order-activity-icon row con-c align-c"> <view class="order-activity-icon row con-c align-c">
<image src="{{imageResourcesBase+'mine/home/or_art.png'}}"></image> <image src="{{imageResourcesBase+'mine/home/or_art.png'}}"></image>
<view class="order-activity-badge {{ goodTypeCountData['5'] > 9 ? 'badge-widen' : ''}}" <view class="order-activity-badge {{ goodTypeCountData['5'] > 9 ? 'badge-widen' : ''}}"
...@@ -232,24 +232,24 @@ ...@@ -232,24 +232,24 @@
<view class="order-activity-icon-wrapper col align-c"> <view class="order-activity-icon-wrapper col align-c">
<view class="order-activity-icon row con-c align-c"> <view class="order-activity-icon row con-c align-c">
<image src="{{imageResourcesBase+'mine/home/yy_theme.png'}}"></image> <image src="{{imageResourcesBase+'mine/home/yy_theme.png'}}"></image>
<view class="order-activity-badge {{ badge > 9 ? 'badge-widen' : ''}}" wx:if="{{badge}}"> <view class="order-activity-badge {{ enrollSubscribeData.active > 9 ? 'badge-widen' : ''}}" wx:if="{{enrollSubscribeData.active}}">
{{badge}}</view> {{enrollSubscribeData.active}}</view>
</view> </view>
<text>主题活动</text> <text>主题活动</text>
</view> </view>
<view class="order-activity-icon-wrapper col align-c"> <view class="order-activity-icon-wrapper col align-c">
<view class="order-activity-icon row con-c align-c"> <view class="order-activity-icon row con-c align-c">
<image src="{{imageResourcesBase+'mine/home/yy_night.png'}}"></image> <image src="{{imageResourcesBase+'mine/home/yy_night.png'}}"></image>
<view class="order-activity-badge {{ badge > 9 ? 'badge-widen' : ''}}" wx:if="{{badge}}"> <view class="order-activity-badge {{ enrollSubscribeData.garden > 9 ? 'badge-widen' : ''}}" wx:if="{{enrollSubscribeData.garden}}">
{{badge}}</view> {{enrollSubscribeData.garden}}</view>
</view> </view>
<text>夜间入园预约</text> <text>夜间入园预约</text>
</view> </view>
<view class="order-activity-icon-wrapper col align-c"> <view class="order-activity-icon-wrapper col align-c">
<view class="order-activity-icon row con-c align-c"> <view class="order-activity-icon row con-c align-c">
<image src="{{imageResourcesBase+'mine/home/yy_house.png'}}"></image> <image src="{{imageResourcesBase+'mine/home/yy_house.png'}}"></image>
<view class="order-activity-badge {{ badge > 9 ? 'badge-widen' : ''}}" wx:if="{{badge}}"> <view class="order-activity-badge {{ enrollSubscribeData.scanHouse > 9 ? 'badge-widen' : ''}}" wx:if="{{enrollSubscribeData.scanHouse}}">
{{badge}}</view> {{enrollSubscribeData.scanHouse}}</view>
</view> </view>
<text>看房预约</text> <text>看房预约</text>
</view> </view>
......
pages/mine/order/order.js
...@@ -6,7 +6,6 @@ Page({ ...@@ -6,7 +6,6 @@ Page({
resourcesBase: App.globalData.appResourcesBase, resourcesBase: App.globalData.appResourcesBase,
option: {}, option: {},
orderTypeTitle: '全部分类', orderTypeTitle: '全部分类',
orderTypeHeight: 0, orderTypeHeight: 0,
orderType: [], orderType: [],
...@@ -38,10 +37,9 @@ Page({ ...@@ -38,10 +37,9 @@ Page({
}, },
onLoad: function (options) { onLoad: function (options) {
this.setData({ this.setData({
option: options option: options,
orderTypeActive: options.goodType != undefined ? 1 * options.goodType : 0
}) })
console.log('onload-----------');
// App.login({ // App.login({
// timeout: 0, // timeout: 0,
// success: (result) => { // success: (result) => {
...@@ -82,9 +80,8 @@ Page({ ...@@ -82,9 +80,8 @@ Page({
if (this.data.isFinished) return if (this.data.isFinished) return
let that = this; let that = this;
let funcName = this.data.orderType[this.data.orderTypeActive].value // let funcName = this.data.orderType[this.data.orderTypeActive].value
let funcValue = this.data.statusList[this.data.statusActive].value // let funcValue = this.data.statusList[this.data.statusActive].value
this.setData({ this.setData({
isLoading: true isLoading: true
}) })
...@@ -94,7 +91,7 @@ Page({ ...@@ -94,7 +91,7 @@ Page({
App.wxRequest({ App.wxRequest({
url: '/api/v1/order/getOrderList', url: '/api/v1/order/getOrderList',
data: { data: {
'goodType': this.data.orderType[this.data.orderTypeActive].value, 'goodType': this.data.orderTypeActive ? this.data.orderType[this.data.orderTypeActive].value : '',
'status': this.data.statusList[this.data.statusActive].value, 'status': this.data.statusList[this.data.statusActive].value,
'pageSize': 10, 'pageSize': 10,
'pageNo': this.data.orderPages, 'pageNo': this.data.orderPages,
...@@ -185,7 +182,7 @@ Page({ ...@@ -185,7 +182,7 @@ Page({
'type': 'good_type', 'type': 'good_type',
}, },
success: (response) => { success: (response) => {
console.log(response)
let funcResponse = response.data let funcResponse = response.data
let funcList = [{ let funcList = [{
'value': '', 'value': '',
...@@ -198,9 +195,13 @@ Page({ ...@@ -198,9 +195,13 @@ Page({
} }
funcList.push(funcItem) funcList.push(funcItem)
} }
let typeTitle = '全部分类' //
if (this.data.orderTypeActive) {
typeTitle = funcList[this.data.orderTypeActive].name
}
this.setData({ this.setData({
'orderType': funcList 'orderType': funcList,
orderTypeTitle: typeTitle
}) })
this.queryOrder() this.queryOrder()
......
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