master
lion 3 years ago
parent d5671a737e
commit 94058c5e5a

@ -8,7 +8,7 @@
<view class="box-card-content activityBox-content">
<view class="activityBox-row flex-row justify-between">
<text class="activityBox-title">{{list.name}}</text>
<view class="tag tag_green">
<view class="tag tag_green activityBox_btn">
<text>{{list.target_name}}</text>
</view>
</view>
@ -18,11 +18,11 @@
<text>活动时间{{list.start_time}}-{{list.end_time}}</text>
</view>
<view class="activityBox-row">
<!-- <view class="activityBox-row">
<text class="icon-huodongfangshi iconfont"></text>
<text>活动方式{{list.area_name}}</text>
</view>
</view> -->
<view class="activityBox-row">
<text class="icon-huodong iconfont"></text>
<text>活动地址{{list.address}}</text>
@ -54,7 +54,7 @@
:max="(type=='user'?list.person_max_count:list.team_max_count)" class="plus">
</u-number-box>
</u-form-item>
<view class="box-tips">
<view class="box-tips" v-if="type=='team'">
<text class="box-tips-txt"
v-if="type=='user'">每单限购{{list.person_max_count}}同一身份证当天限购1张</text>
<text class="box-tips-txt"

@ -17,7 +17,7 @@
<text class="activityBox-title">{{isUnde(item.name)}}</text>
</view>
<view class="activityBox-row flex-row justify-between">
<view class="tag tag_green">
<view class="tag tag_green activityBox_btn">
<text>{{isUnde(item.target_name)}}</text>
</view>
<view class="tag" :class="{activityBox_btn:item.isCanBook}">
@ -30,11 +30,11 @@
<text>活动时间{{isUnde(item.start_time)}}-{{getHm(item.end_time)}}</text>
</view>
<view class="activityBox-row">
<!-- <view class="activityBox-row">
<text class="icon-huodongfangshi iconfont"></text>
<text>活动方式{{isUnde(item.area_name)}}</text>
</view>
</view> -->
<view class="activityBox-row">
<text class="icon-huodong iconfont"></text>
<text>活动地址{{isUnde(item.address)}}</text>

@ -17,7 +17,7 @@
<view class="activityBox-content flex-col">
<view class="activityBox-row flex-row justify-between">
<text class="activityBox-title">{{isUnde(list.name)}}</text>
<view class="tag tag_green">
<view class="tag tag_green activityBox_btn">
<text>{{isUnde(list.target_name)}}</text>
</view>
</view>
@ -27,11 +27,11 @@
<text>活动时间{{isUnde(list.start_time)}}-{{isUnde(list.end_time)}}</text>
</view>
<view class="activityBox-row">
<!-- <view class="activityBox-row">
<text class="icon-huodongfangshi iconfont"></text>
<text>活动方式{{isUnde(list.area_name)}}</text>
</view>
</view> -->
<view class="activityBox-row">
<text class="icon-huodong iconfont"></text>
<text>活动地址{{isUnde(list.address)}}</text>

@ -12,7 +12,7 @@
<u-icon v-if="show.shownotice" size="16" name="arrow-up"></u-icon>
</view>
<view class="content_info" v-if="show.shownotice">
<rich-text :nodes="notice.content"></rich-text>
<rich-text style="text-indent: 2em;" :nodes="notice.content"></rich-text>
</view>
</view>
<view class="content_box">
@ -26,7 +26,7 @@
</view>
<view class="content_info" v-if="show.showask">
<rich-text :nodes="ask.content"></rich-text>
<rich-text style="text-indent: 2em;" :nodes="ask.content"></rich-text>
</view>
</view>
<view class="content_box">

@ -136,7 +136,7 @@
var that = this
this.timers = setInterval(function(){
that.loadInfo(that.optionid);
},1000)
},4000)
},
onHide() {

@ -153,7 +153,7 @@
var that = this
this.timer = setInterval(function(){
that.loadInfo(that.optionid);
},1000)
},4000)
},
onHide() {

@ -41,7 +41,7 @@
{{notice.name}}
</view>
<view class="mpopup-content" style="margin-top: 60rpx;">
<scroll-view scroll-y="true" :style="[{height:scrollheight}]">
<scroll-view scroll-y="true" style="line-height: 50rpx;font-size: 32rpx;text-indent: 2em;" :style="[{height:scrollheight}]">
<rich-text :nodes="notice.value"></rich-text>
</scroll-view>
@ -208,7 +208,10 @@
tag: "car_park_notice"
},
utilSuccess: function(res) {
that.notice = res;
that.notice = res;
that.notice.value = that.notice.value.replace(/\<p/gi,"<p class='richp'");
},
utilFail: function(res) {
uni.showToast({
@ -467,5 +470,8 @@
text-align: center;
line-height: 70rpx;
margin:30rpx auto;
}
.richp{
margin-bottom:10rpx
}
</style>

@ -85,7 +85,7 @@
bgColor="#FCF6E3" :min="minCount" :max="maxCount" class="plus">
</u-number-box>
</u-form-item>
<view class="box-tips">
<view class="box-tips" v-if="type=='team'">
<text class="box-tips-txt" v-if="type=='user'">{{maxCount}}1</text>
<text class="box-tips-txt"
v-if="type=='team'">{{minCount}}人以上可团体预约一个团体最多{{maxCount}}</text>
@ -257,7 +257,8 @@
<view class="mpopup-content" style="margin-top: 60rpx;">
<scroll-view scroll-y="true" :style="[{height:scrollheight}]">
<rich-text :nodes="currentNotice.content"></rich-text>
<!-- <rich-text :nodes="currentNotice.content"></rich-text> -->
<view class="htmls" style="line-height: 50rpx;text-indent: 2em;" v-html="currentNotice.content"></view>
</scroll-view>
<view style="margin-top: 40rpx;"></view>
@ -503,7 +504,8 @@
utilSuccess: function(res) {
console.log(res);
that.info = res;
that.notice[0].content = (that.type == 'user' ? res.person_notice : res.team_notice)
that.notice[0].content = (that.type == 'user' ? res.person_notice : res.team_notice)
that.notice[0].content = that.notice[0].content.replace(/\<p/gi,"<p class='richp'");
},
utilFail: function(res) {
@ -1078,7 +1080,7 @@
// }
.mpopup-content {
font-size: 32rpx;
text-indent: 2rem;
// text-indent: 2rem;
}
.box-card-content {}
@ -1115,5 +1117,8 @@
text-align: center;
line-height: 70rpx;
margin:30rpx auto;
}
.richp{
margin-bottom:10rpx;
}
</style>

Loading…
Cancel
Save