Skip to content

严立 / mini-shimao

Go to a project
Commit 99a0f99f by TengFengLian
Options

修复测试问题

parent fda4e712
Inline Side-by-side
Showing with 18 additions and 12 deletions
pages/activity-entry/activity-entry.js
...@@ -73,7 +73,11 @@ Page({ ...@@ -73,7 +73,11 @@ Page({
let funcFormInto = this.data.formInto let funcFormInto = this.data.formInto
let activityTime = this.data.activityTimes[this.data.activityIndex] let activityTime = this.data.activityTimes[this.data.activityIndex]
if (funcFormInto.quantity >= activityTime.residue*1) { if (0 == activityTime.enroll*1) {
this.setData({
errorQuantity: '该场次已报名过，请选择其他场次',
})
} else if (funcFormInto.quantity >= activityTime.residue*1) {
this.setData({ this.setData({
errorQuantity: '该场次剩余名额' + activityTime.residue + '人', errorQuantity: '该场次剩余名额' + activityTime.residue + '人',
}) })
...@@ -176,7 +180,7 @@ Page({ ...@@ -176,7 +180,7 @@ Page({
if (activityTime.residue*1 == 0) { if (activityTime.residue*1 == 0) {
this.setData({ this.setData({
isSubmit: false, isSubmit: false,
errorSession: '该场次已没剩余名额', errorSession: '',
}) })
return false return false
} else { } else {
......
pages/home/home.js
...@@ -260,7 +260,7 @@ Page({ ...@@ -260,7 +260,7 @@ Page({
url: '/api/v1/banner/getList', url: '/api/v1/banner/getList',
success: function(res) { success: function(res) {
that.setData({ that.setData({
banner: res.data banner: res.data.splice(0, 3)
}) })
} }
}) })
......
pages/hotelAccommodation/hotelAccommodation.js
...@@ -43,7 +43,7 @@ Page({ ...@@ -43,7 +43,7 @@ Page({
name: detail.name, name: detail.name,
mobile: detail.mobile, mobile: detail.mobile,
num: detail.num, num: detail.num,
time: detail.time, time: detail.time.substring(0,10) + ((detail.type == 0) ? ' 20:00-24:00' : ''),
}) })
}, },
......
pages/mine/mine.js
...@@ -7,8 +7,8 @@ Page({ ...@@ -7,8 +7,8 @@ Page({
* 页面的初始数据 * 页面的初始数据
*/ */
data: { data: {
mobile: '180****3535', mobile: '',
nickName: 'nickName', nickName: '',
avatarUrl: '/pages/mine/image/avatar.png', avatarUrl: '/pages/mine/image/avatar.png',
mask:false, mask:false,
type:1, //判断是否是认证的了 type:1, //判断是否是认证的了
...@@ -172,7 +172,7 @@ Page({ ...@@ -172,7 +172,7 @@ Page({
let obj = { let obj = {
title:title, title:title,
type: type, type: type,
time: item.subscribeDate, time: item.subscribeDate.substring(0,10) + ((type == 0) ? ' 20:00-24:00' : ''),
num: item.subscribeNum, num: item.subscribeNum,
url: url, url: url,
id: item.id, id: item.id,
......
pages/mine/mine.wxml
...@@ -60,7 +60,7 @@ ...@@ -60,7 +60,7 @@
<view class="my-activities" wx:if="{{activityList.length > 0}}"> <view class="my-activities" wx:if="{{activityList.length > 0}}">
<view class="my-activities-item" data-enrollid="{{item.enrollId}}" wx:for="{{activityList}}" wx:for-index="index" wx:for-item="item" wx:key="index" bindtap="activityDetail"> <view class="my-activities-item" data-enrollid="{{item.enrollId}}" wx:for="{{activityList}}" wx:for-index="index" wx:for-item="item" wx:key="index" bindtap="activityDetail">
<view class="my-activities-top"> <view class="my-activities-top">
{{item.time}} <text decode="{{true}}">&nbsp;&nbsp;{{item.time}}&nbsp;&nbsp;</text>
</view> </view>
<view class="my-activities-bottom"> <view class="my-activities-bottom">
<view class="my-activities-title">{{item.title}}</view> <view class="my-activities-title">{{item.title}}</view>
...@@ -73,7 +73,9 @@ ...@@ -73,7 +73,9 @@
<view class="my-activities" wx:if="{{appointmentList.length > 0}}"> <view class="my-activities" wx:if="{{appointmentList.length > 0}}">
<view class="my-activities-item" wx:for="{{appointmentList}}" wx:for-index="index" wx:for-item="item" wx:key="index"> <view class="my-activities-item" wx:for="{{appointmentList}}" wx:for-index="index" wx:for-item="item" wx:key="index">
<view class="my-activities-top"> <view class="my-activities-top">
{{item.time}} <view class="my-activities-top">
<text decode="{{true}}">&nbsp;&nbsp;{{item.time}}&nbsp;&nbsp;</text>
</view>
</view> </view>
<view class="my-activities-bottom"> <view class="my-activities-bottom">
<view class="my-activities-title">{{item.title}}</view> <view class="my-activities-title">{{item.title}}</view>
......
pages/mine/mine.wxss
...@@ -105,7 +105,7 @@ ...@@ -105,7 +105,7 @@
.my-activities-top{ .my-activities-top{
position: absolute; position: absolute;
top: 0; top: 0;
width: 350rpx; /* width: 350rpx; */
height: 60rpx; height: 60rpx;
background-color: rgb(2, 0, 2); background-color: rgb(2, 0, 2);
color: white; color: white;
......
pages/myAppointment/myAppointment.js
...@@ -121,7 +121,7 @@ Page({ ...@@ -121,7 +121,7 @@ Page({
let obj = { let obj = {
title:title, title:title,
type: type, type: type,
time: item.subscribeDate, time: item.subscribeDate.substring(0,10) + ((type == 0) ? ' 20:00-24:00' : ''),
num: item.subscribeNum, num: item.subscribeNum,
url: url, url: url,
id: item.id, id: item.id,
......
pages/notice/notice.js
...@@ -68,7 +68,7 @@ Page({ ...@@ -68,7 +68,7 @@ Page({
let count = that.data.notice.length let count = that.data.notice.length
var tmpArr = []; var tmpArr = [];
res.data.list.forEach(item => { res.data.list.forEach(item => {
var content = item.content.replace(/<img/gi, '<img style="max-width:100%;height:auto;display:block" ') var content = item.summary.replace(/<img/gi, '<img style="max-width:100%;height:auto;display:block" ')
.replace(/<section/g, '<div') .replace(/<section/g, '<div')
.replace(/\/section>/g, '\div>'); .replace(/\/section>/g, '\div>');
var tmpItem = { var tmpItem = {
......
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