作者 wumengyu

评论回复加模板消息,优化首页时间,添加banner三种跳转,自动获取手机号,优化我的钱包背景图,优化订单状态和按钮的显示,我的主页添加默认背景色,金v图标,优化投诉页状态

@font-face {font-family: "iconfont";
src: url('//at.alicdn.com/t/font_961048_1lfcgmofki3.eot?t=1546996469479'); /* IE9 */
src: url('//at.alicdn.com/t/font_961048_1lfcgmofki3.eot?t=1546996469479#iefix') format('embedded-opentype'), /* IE6-IE8 */
url('data:application/x-font-woff2;charset=utf-8;base64,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') format('woff2'),
url('//at.alicdn.com/t/font_961048_1lfcgmofki3.woff?t=1546996469479') format('woff'),
url('//at.alicdn.com/t/font_961048_1lfcgmofki3.ttf?t=1546996469479') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+ */
url('//at.alicdn.com/t/font_961048_1lfcgmofki3.svg?t=1546996469479#iconfont') format('svg'); /* iOS 4.1- */
src: url('//at.alicdn.com/t/font_961048_jhdqmcwglhh.eot?t=1547874546810'); /* IE9 */
src: url('//at.alicdn.com/t/font_961048_jhdqmcwglhh.eot?t=1547874546810#iefix') format('embedded-opentype'), /* IE6-IE8 */
url('data:application/x-font-woff2;charset=utf-8;base64,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') format('woff2'),
url('//at.alicdn.com/t/font_961048_jhdqmcwglhh.woff?t=1547874546810') format('woff'),
url('//at.alicdn.com/t/font_961048_jhdqmcwglhh.ttf?t=1547874546810') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+ */
url('//at.alicdn.com/t/font_961048_jhdqmcwglhh.svg?t=1547874546810#iconfont') format('svg'); /* iOS 4.1- */
}
.iconfont {
... ... @@ -15,10 +15,22 @@
-moz-osx-font-smoothing: grayscale;
}
.icon-radio-checked:before {
content: "\e610";
}
.icon-shoucang1:before {
content: "\e60a";
}
.icon-xuanze:before {
content: "\e619";
}
.icon-vip:before {
content: "\e611";
}
.icon-zan1:before {
content: "\e64f";
}
... ... @@ -94,3 +106,8 @@
.icon-jian1:before {
content: "\e6d4";
}
.icon-xuanzezhuangtai-:before {
content: "\e678";
}
... ...
... ... @@ -77,7 +77,7 @@ Page({
this.setData({ content: e.detail.value });
},
//发送评论/回复
clickComment() {
clickComment(e) {
this.setData({ display: false });
if(this.data.content === '' ) {
wx.showToast({title:'请输入内容',icon:'none'})
... ... @@ -88,6 +88,7 @@ Page({
activeId:this.data.detail_id,
commonId: this.data.is_ask?0:this.data.commet_id,
content:this.data.content,
formId:e.detail.formId,
};
app.post(url,params,{}).then((res)=>{
console.log('提交评论',res);
... ... @@ -109,12 +110,13 @@ Page({
},
//回复
reply(e) {
console.log('回复', e);
const id = e.currentTarget.dataset.id;
this.setData({
display: !this.data.display,
is_ask:false,is_reply:true,
commet_id:id,content:'' ,
placeholder:'输入您的回复'
placeholder:'输入您的回复',
});
// wx.navigateTo({
// url: '/pages/comment/comment?is_reply=' + true
... ... @@ -231,7 +233,7 @@ Page({
"token": wx.getStorageSync('token')
};
app.post(url, params, {}).then((res) => {
console.log('获取详情', res, app.initTime(res.data.active.surplus));
// console.log('获取详情', res, app.initTime(res.data.active.surplus));
if (+res.code === 1) {
self.setData({
detail: res.data.active,
... ... @@ -242,6 +244,7 @@ Page({
commentList: res.data.common,
is_collect: res.data.is_collect,
count: res.data.count, // 留言板
is_send:res.data.is_send,//能否参加1:不能2:能
});
// (0全部,2待拼成,3人数不足未拼成,4已拼成,5已取消,6已完成,7已评价,8已拼成(活动未结束),9删除
const status = res.data.active.status;
... ... @@ -288,7 +291,7 @@ Page({
// console.log('surplus', this.data.detail.surplus);
// t = setTimeout(this.countDown, 1000);
const time = app.initTime(this.data.detail.surplus);
console.log('time', time);
// console.log('time', time);
obj = {
day: time[0].day,
hou: time[0].hou,
... ... @@ -349,38 +352,40 @@ Page({
confirmJoin(e) {
const self = this;
console.log('已参与人数',self.data.join_people.length);
if(self.data.join_people.length + self.data.num > self.data.detail.max) {
wx.showToast({title:'参加人数已超过剩余名额',icon:'none'})
}else if(self.data.join_people.length + self.data.num == self.data.detail.max){
wx.showToast({title:'名额已满',icon:'none'})
} else {
let url = '/portal/Active/join';
let params = {
token: wx.getStorageSync('token'),
number: self.data.num,
activeId: self.data.detail_id,
formId: e.detail.formId,
};
let header = {
"token": wx.getStorageSync('token')
};
app.post(url, params, {}).then((res) => {
console.log('确认拼活动', res);
if (+res.code === 1) {
// wx.showToast({title: '拼活动成功', icon: 'success'});
self.setData({is_showRelease_modal:true,order_id:+res.data.orderId,is_join:true});
self.getDetail();
}else if(+res.code === 0) { //参与失败按钮还是确认拼活动
self.setData({is_join:false});
}
})
if(+self.data.is_send === 2){ //可参与
if(self.data.join_people.length + self.data.num > self.data.detail.max) {
wx.showToast({title:'参加人数已超过剩余名额',icon:'none'})
}else if(self.data.join_people.length + self.data.num == self.data.detail.max){
wx.showToast({title:'名额已满',icon:'none'})
} else {
let url = '/portal/Active/join';
let params = {
token: wx.getStorageSync('token'),
number: self.data.num,
activeId: self.data.detail_id,
formId: e.detail.formId,
};
let header = {
"token": wx.getStorageSync('token')
};
app.post(url, params, {}).then((res) => {
console.log('确认拼活动', res);
if (+res.code === 1) {
// wx.showToast({title: '拼活动成功', icon: 'success'});
self.setData({is_showRelease_modal:true,order_id:+res.data.orderId,is_join:true});
self.getDetail();
}else if(+res.code === 0) { //参与失败按钮还是确认拼活动
self.setData({is_join:false});
}
})
}
}
},
/**
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
console.log('详情options', options);
// console.log('详情options', options);
this.setData({detail_id: +options.id ? +options.id : ''});
},
... ...
<!--pages/activity/detail/detail.wxml-->
<form bindsubmit="confirmJoin" bindreset="formReset" report-submit="true">
<view class="content">
<!--swiper-->
<view class="head">
<view class="position {{hidden_top?'hidden-active':'visible-active'}}">
<view class="left">
<!--<image src="../../../images/avatar@2x.png" class="user-avatar"></image>-->
<image src="{{detail.userPic}}" class="user-avatar"></image>
<text>{{detail.userName}}</text>
</view>
<view class="right">
<view class="collect" bindtap="collect">
<view class="iconfont icon-shoucang" wx:if="{{!is_collect}}"></view>
<view class="iconfont icon-shoucang2" wx:if="{{is_collect}}"></view>
<text>收藏</text>
</view>
<!--&lt;!&ndash;未收藏&ndash;&gt;-->
<!--<view class='collect_box' catchtap='sethits_yes' data-index='{{index}}' wx:if='{{items.is_hits==0}}'>-->
<!--<text class='iconfont icon-shoucang1 '></text>-->
<!--<text class="collect_word">收藏</text>-->
<!--</view>-->
<!--&lt;!&ndash;已收藏&ndash;&gt;-->
<!--<view class='collect_box active' catchtap='sethits_no' data-index='{{index}}' wx:else>-->
<!--<text class='iconfont icon-shoucang0 star2'></text>-->
<!--<text class="collect_word">收藏</text>-->
<!--</view>-->
<button class="share" open-type="share">
<view class="iconfont icon-fenxiang2"></view>
<text>分享</text>
</button>
</view>
</view>
<swiper indicator-dots="{{false}}" current="{{current}}" bindchange="swiperChange"
autoplay="{{true}}" interval="3000" duration="1000" style="height:{{img_heights[current_swiper]}}rpx;">
<block wx:for="{{detail.banner}}" wx:key="index">
<navigator url="{{item}}" hover-class="navigator-hover">
<swiper-item>
<image src="{{item}}" data-id='{{index}}' class="slide-image" mode="widthFix" bindload="imageLoad"/>
<!--<image src="http://pk86rwhci.bkt.clouddn.com/banner.png" class="slide-image"></image>-->
</swiper-item>
</navigator>
</block>
</swiper>
<view class="dots">
<block wx:for="{{detail.banner}}" wx:key="index" wx:for-index="idx">
<view class="dot{{idx == current_swiper ? ' active' : ''}}"></view>
</block>
<view class="content">
<!--swiper-->
<view class="head">
<view class="position {{hidden_top?'hidden-active':'visible-active'}}">
<view class="left">
<!--<image src="../../../images/avatar@2x.png" class="user-avatar"></image>-->
<image src="{{detail.userPic}}" class="user-avatar"></image>
<text>{{detail.userName}}</text>
</view>
</view>
<!--地点-->
<view class="area-box">
<view class="title-box">
<view class="title">{{detail.title}}</view>
<view class="over-time">
<text class='' wx:if="{{detail.time[0].day !== '00'}}">{{detail.time[0].day}}天{{detail.time[0].hou}}:{{detail.time[0].min}}:{{detail.time[0].sec}}</text>
<text class='' wx:else="">{{detail.time[0].hou}}:{{detail.time[0].min}}:{{detail.time[0].sec}}</text>
后停止拼餐
<view class="right">
<view class="collect" bindtap="collect">
<view class="iconfont icon-shoucang" wx:if="{{!is_collect}}"></view>
<view class="iconfont icon-shoucang2" wx:if="{{is_collect}}"></view>
<text>收藏</text>
</view>
<!--<view>-->
<!--<text class=''>{{detail.time[0].hou}}</text>-->
<!--<text>:</text>-->
<!--<text class=''>{{detail.time[0].min}}</text>-->
<!--<text>:</text>-->
<!--<text class=' '>{{detail.time[0].sec}}</text>-->
<!--&lt;!&ndash;未收藏&ndash;&gt;-->
<!--<view class='collect_box' catchtap='sethits_yes' data-index='{{index}}' wx:if='{{items.is_hits==0}}'>-->
<!--<text class='iconfont icon-shoucang1 '></text>-->
<!--<text class="collect_word">收藏</text>-->
<!--</view>-->
</view>
<view class="area-content">
<text>{{detail.content}}</text>
<!--&lt;!&ndash;已收藏&ndash;&gt;-->
<!--<view class='collect_box active' catchtap='sethits_no' data-index='{{index}}' wx:else>-->
<!--<text class='iconfont icon-shoucang0 star2'></text>-->
<!--<text class="collect_word">收藏</text>-->
<!--</view>-->
<button class="share" open-type="share">
<view class="iconfont icon-fenxiang2"></view>
<text>分享</text>
</button>
</view>
</view>
<swiper indicator-dots="{{false}}" current="{{current}}" bindchange="swiperChange"
autoplay="{{true}}" interval="3000" duration="1000"
style="height:{{img_heights[current_swiper]}}rpx;">
<block wx:for="{{detail.banner}}" wx:key="index">
<navigator url="{{item}}" hover-class="navigator-hover">
<swiper-item>
<image src="{{item}}" data-id='{{index}}' class="slide-image" mode="widthFix"
bindload="imageLoad"/>
<!--<image src="http://pk86rwhci.bkt.clouddn.com/banner.png" class="slide-image"></image>-->
</swiper-item>
</navigator>
</block>
</swiper>
<view class="dots">
<block wx:for="{{detail.banner}}" wx:key="index" wx:for-index="idx">
<view class="dot{{idx == current_swiper ? ' active' : ''}}"></view>
</block>
</view>
</view>
<!--详细时间-->
<view class="detail-box">
<text>类别:{{detail.selectName}}</text>
<text>时间:{{end_time}}</text>
<text>地点:{{detail.name}}</text>
<view class="position" bindtap="getNavigate">
<text class="address">地址:{{detail.address}}</text>
<text class="iconfont icon-location"></text>
<!--地点-->
<view class="area-box">
<view class="title-box">
<view class="title">{{detail.title}}</view>
<view class="over-time">
<text class='' wx:if="{{detail.time[0].day !== '00'}}">
{{detail.time[0].day}}天{{detail.time[0].hou}}:{{detail.time[0].min}}:{{detail.time[0].sec}}
</text>
<text class='' wx:else="">{{detail.time[0].hou}}:{{detail.time[0].min}}:{{detail.time[0].sec}}
</text>
后停止拼餐
</view>
<!--<view>-->
<!--<text class=''>{{detail.time[0].hou}}</text>-->
<!--<text>:</text>-->
<!--<text class=''>{{detail.time[0].min}}</text>-->
<!--<text>:</text>-->
<!--<text class=' '>{{detail.time[0].sec}}</text>-->
<!--</view>-->
</view>
<view class="area-content">
<text>{{detail.content}}</text>
</view>
</view>
<!--已加入人员-->
<view class="join-num">已加入人员</view>
<view class="people-list" wx:if="{{join_people.length>0}}">
<view class="people" wx:for="{{join_people}}" wx:key="index">
<view class="bg">
<image src="{{item.pic}}" class="people-img"></image>
</view>
<view class="people-num">
<view class="name">{{item.name}}</view>
<view class="num">({{item.number}})</view>
</view>
</view>
<!--详细时间-->
<view class="detail-box">
<text>类别:{{detail.selectName}}</text>
<text>时间:{{end_time}}</text>
<text>地点:{{detail.name}}</text>
<view class="position" bindtap="getNavigate">
<text class="address">地址:{{detail.address}}</text>
<text class="iconfont icon-location"></text>
</view>
</view>
<!--留言板 问一问-->
<view class="comment-box">
<view class="title-box">
<text class="comment-num">留言板 ({{count}})</text>
<view class="ask-btn" bindtap="ask">
<text class="iconfont icon-bianji"></text>
<text>问一问</text>
</view>
<!--已加入人员-->
<view class="join-num">已加入人员</view>
<view class="people-list" wx:if="{{join_people.length>0}}">
<view class="people" wx:for="{{join_people}}" wx:key="index">
<view class="bg">
<image src="{{item.pic}}" class="people-img"></image>
</view>
<view class="people-num">
<view class="name">{{item.name}}</view>
<view class="num">({{item.number}})</view>
</view>
</view>
</view>
<!--评论框-->
<view wx:if="{{display}}" class="comment {{display?'t-active':''}}">
<input
auto-focus="{{display}}"
focus="{{display}}"
value="{{content}}"
cursor-spacing="50"
maxlength="300"
bindblur="blur"
bindinput="inputComment"
bindconfirm="confirm"
show-confirm-bar="{{false}}"
placeholder="{{placeholder}}"/>
<!--留言板 问一问-->
<view class="comment-box">
<view class="title-box">
<text class="comment-num">留言板 ({{count}})</text>
<view class="ask-btn" bindtap="ask">
<text class="iconfont icon-bianji"></text>
<text>问一问</text>
</view>
</view>
<view class="send-box">
<text class="send" bindtap="clickComment">发送</text>
<!--评论框-->
<view wx:if="{{display}}" class="comment {{display?'t-active':''}}">
<form bindsubmit="clickComment" bindreset="formReset" report-submit="true">
<view class="common-box">
<input
auto-focus="{{display}}"
focus="{{display}}"
value="{{content}}"
cursor-spacing="50"
maxlength="300"
bindblur="blur"
bindinput="inputComment"
bindconfirm="confirm"
show-confirm-bar="{{false}}"
placeholder="{{placeholder}}"/>
<button class="send-box" form-type="submit">
<text class="send">发送</text>
</button>
</view>
</view>
</form>
</view>
<!--评论-->
<view class="comment-list-box">
<view class="comment-item" wx:for="{{commentList}}" wx:key="index" wx:for-item="comment">
<view class="top-content">
<view class="top-left">
<!--<image src="../../../images/avatar@2x.png" class="release-img"></image>-->
<image src="{{comment.userPic}}" class="release-img"></image>
<text>{{comment.userName}} {{comment.create_time}}</text>
</view>
<view class="top-right" bindtap="clickZan" data-id="{{comment.id}}" data-index="{{index}}">
<text>{{comment.prefect}}</text>
<text class="iconfont icon-zan" wx:if="{{!comment.is_prefect}}"></text>
<text class="iconfont icon-z-likeFill" wx:if="{{comment.is_prefect}}"></text>
</view>
<!--评论-->
<view class="comment-list-box">
<view class="comment-item" wx:for="{{commentList}}" wx:key="index" wx:for-item="comment">
<view class="top-content">
<view class="top-left">
<!--<image src="../../../images/avatar@2x.png" class="release-img"></image>-->
<image src="{{comment.userPic}}" class="release-img"></image>
<text>{{comment.userName}} {{comment.create_time}}</text>
</view>
<view class="comment-detail">
<view class="user-release">
<view class="release-comment">{{comment.content}}</view>
<text class="reply-btn" bindtap="reply" data-id="{{comment.id}}">回复</text>
</view>
<view class="user-reply" wx:if="{{comment.son.length>0}}">
<view class='triangle'></view>
<block wx:for="{{comment.son}}" wx:key="index">
<!--<view class="comment">-->
<!--<text class="reply-name">蚂蚁: </text>-->
<!--<text>{{item.content}}第一次拼餐,心里还是比较兴奋的,但是又担心拼友会比较无聊,但是没想到拼友和餐厅都非常好!</text>-->
<!--</view>-->
<view class="reply">
<text class="reply-name">{{detail.userName}}</text>
<text>回复</text>
<text class="reply-name">{{comment.userName}}:</text>
<text>{{item.content}}</text>
</view>
</block>
</view>
<view class="top-right" bindtap="clickZan" data-id="{{comment.id}}" data-index="{{index}}">
<text>{{comment.prefect}}</text>
<text class="iconfont icon-zan" wx:if="{{!comment.is_prefect}}"></text>
<text class="iconfont icon-z-likeFill" wx:if="{{comment.is_prefect}}"></text>
</view>
</view>
<view class="comment-detail">
<view class="user-release">
<view class="release-comment">{{comment.content}}</view>
<text class="reply-btn" bindtap="reply" data-id="{{comment.id}}">回复</text>
</view>
<view class="user-reply" wx:if="{{comment.son.length>0}}">
<view class='triangle'></view>
<block wx:for="{{comment.son}}" wx:key="index">
<!--<view class="comment">-->
<!--<text class="reply-name">蚂蚁: </text>-->
<!--<text>{{item.content}}第一次拼餐,心里还是比较兴奋的,但是又担心拼友会比较无聊,但是没想到拼友和餐厅都非常好!</text>-->
<!--</view>-->
<view class="reply">
<text class="reply-name">{{detail.userName}}</text>
<text>回复</text>
<text class="reply-name">{{comment.userName}}:</text>
<text>{{item.content}}</text>
</view>
</block>
</view>
</view>
</view>
</view>
</view>
<!--底部btn-->
<view class="bottom-btn" wx:if="{{!display}}">
<view class="add-btn">
<view class="input_box">
<view class="iconfont icon-jian {{num==1?'disable':''}}" bindtap='minusCount'></view>
<view class='item_cart_num'>{{num}}</view>
<view class='iconfont icon-jia1' bindtap='addCount'></view>
</view>
<!--底部btn-->
<view class="bottom-btn" wx:if="{{!display}}">
<view class="add-btn">
<view class="input_box">
<view class="iconfont icon-jian {{num==1?'disable':''}}" bindtap='minusCount'></view>
<view class='item_cart_num'>{{num}}</view>
<view class='iconfont icon-jia1' bindtap='addCount'></view>
</view>
<!--(0全部,2待处理,4已拼成,5已取消,6已完成-->
<button class="confirm-join-btn {{is_join || detail.status === 5 || detail.status === 6?'gray':''}}" form-type="submit">
<text wx:if="{{is_join}}">待拼成</text>
<text wx:if="{{!is_join && detail.status === 2}}">确认拼活动</text>
</view>
<form bindsubmit="confirmJoin" bindreset="formReset" report-submit="true">
<!-- // (0全部,2待拼成,3人数不足未拼成,4已拼成,5已取消,6已完成,7已评价,8已拼成(活动未结束),9删除-->
<button class="confirm-join-btn {{is_send === 1 && detail.status !== 8?'gray':''}}" form-type="submit">
<text wx:if="{{is_send === 1 && detail.status === 2}}">待拼成</text>
<text wx:if="{{is_send === 2 &&detail.status === 2}}">确认拼活动</text>
<text wx:if="{{detail.status === 3}}">未拼成</text>
<text wx:if="{{detail.status === 4}}">已拼成</text>
<text wx:if="{{detail.status === 5}}">已取消</text>
<text wx:if="{{detail.status === 6}}">已完成</text>
<text wx:if="{{detail.status === 6 || detail.status === 7}}">已完成</text>
<text wx:if="{{detail.status === 8}}">已拼成</text>
<text wx:if="{{detail.status === 9}}">已删除</text>
</button>
</view>
</form>
</view>
<!--参与成功弹框-->
<view class="modal" wx:if="{{is_showRelease_modal}}" catchtouchmove="disableScroll">
<image class="sorry-img" src="../../../images/success@2x.png"></image>
<view class="title">恭喜您拼活动成功</view>
<view class="view-btn" catchtap="goMyOrder">查看我的订单</view>
<view class="complete-btn" catchtap="goBack">完成</view>
</view>
<view class="modal_box" wx:if="{{is_showRelease_modal}}" bindtap="handleBackground"
catchtouchmove="disableScroll"></view>
<!--参与成功弹框-->
<view class="modal" wx:if="{{is_showRelease_modal}}" catchtouchmove="disableScroll">
<image class="sorry-img" src="../../../images/success@2x.png"></image>
<view class="title">恭喜您拼活动成功</view>
<view class="view-btn" catchtap="goMyOrder">查看我的订单</view>
<view class="complete-btn" catchtap="goBack">完成</view>
</view>
</form>
<view class="modal_box" wx:if="{{is_showRelease_modal}}" bindtap="handleBackground"
catchtouchmove="disableScroll"></view>
</view>
... ...
... ... @@ -453,6 +453,15 @@ swiper {
left:0;
z-index:20;
}
.comment form {
width: 100%;
}
.comment .common-box {
width:100%;
display: flex;
align-items: center;
justify-content: space-between;
}
.comment input {
border-radius: 50rpx;
width: 83.5%;
... ... @@ -468,7 +477,7 @@ swiper {
}
.t-active {
border-radius: 4rpx;
width: 91.5%;
width: 100%;
/*height: 300rpx;*/
/*background-color: #f2f2f2;*/
font-size: 26rpx;
... ... @@ -476,6 +485,9 @@ swiper {
display: flex;
justify-content: right;
align-items: right;
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
box-sizing: border-box;
}
.send-box .send {
... ... @@ -490,10 +502,16 @@ swiper {
text-align: center;
}
.send-box {
width: 100rpx;
height: 60rpx;
display: flex;
justify-content: flex-end;
margin-left: 10rpx;
margin-right:0;
padding: 0;
}
.send-box::after {
border:0;
}
.modal {
width: 73%;
... ...
... ... @@ -11,16 +11,16 @@ Component({
img_height = e.detail.height,
//宽高比
ratio = img_width / img_height;
console.log('图片组件',img_width, img_height);
// console.log('图片组件',e,img_width, img_height);
//计算的高度值
var viewHeight = 750 / ratio;
var img_height = viewHeight;
var img_heights = this.data.img_heights;
//把每一张图片的对应的高度记录到数组里
img_heights[e.target.dataset.id] = img_height;
this.setData({
img_heights: img_heights
})
// img_heights[e.target.dataset.id] = img_height;
// this.setData({
// img_heights: img_heights
// })
},
}
})
\ No newline at end of file
... ...
<view class="img-box" data-index="{{index}}">
<view class="img-border">
<image src="{{item.pic}}" mode="widthFix" data-id='{{index}}' style="height:{{img_heights[current_swiper]}}rpx;" bindload="imageLoad"></image>
<!--style="height:{{img_heights[current_swiper]}}rpx;"-->
<image src="{{item.pic}}" mode="widthFix" data-id='{{index}}' bindload="imageLoad"></image>
<view class="area">
<text class="name">{{item.title}}</text>
</view>
<!--<text>2018.4.28—4.30</text>-->
<view class="bottom">
<image src="{{item.userPic}}" class="avatar" mode="aspectFill"></image>
<text>{{item.time}}</text>
<text>{{item.listTime}}</text>
<!--<view>2018.4.28</view>-->
</view>
<view class="num">距最低人数{{item.people}}人</view>
... ...
... ... @@ -31,6 +31,7 @@
.num {
color: #666666;
font-size: 24rpx;
text-align: right;
}
.bottom {
display: flex;
... ... @@ -38,8 +39,8 @@
justify-content: space-between;
}
.img-box .bottom .avatar{
width: 30rpx;
height: 30rpx;
width: 40rpx;
height: 40rpx;
border-radius: 50%;
}
/*.bottom .avatar image {*/
... ...
... ... @@ -30,6 +30,10 @@ Page({
hasUserInfo: false,
canIUse: wx.canIUse('button.open-type.getUserInfo')
},
//banner跳转
navigator() {
// if() {}
},
//关闭金火柴勋章弹框
close() {
this.setData({show_gold_modal:false,show_normal_modal:false});
... ...
... ... @@ -20,10 +20,12 @@
autoplay="{{true}}" interval="3000" duration="1000">
<block wx:for="{{slide}}" wx:key="index">
<navigator url="{{item.link}}" hover-class="navigator-hover">
<!--<view class="navigator" bindtap="navigator">-->
<swiper-item>
<image src="{{item.pic}}" class="slide-image"/>
<!--<image src="http://pk86rwhci.bkt.clouddn.com/banner.png" class="slide-image"/>-->
</swiper-item>
<!--</view>-->
</navigator>
</block>
</swiper>
... ... @@ -99,7 +101,7 @@
<view class="fix pl5 pr5 box_bb" bindtap="goMealDetail" data-id="{{item.id}}">
<!--<navigator url="">-->
<image class="banner mt10 {{currentBannerIndex==index?'active':''}}" src="{{item.pic}}" mode="aspectFill" />
<text>{{item.title}} {{item.time}}</text>
<text>{{item.title}} {{item.listTime}}</text>
<!--</navigator>-->
</view>
</swiper-item>
... ...
... ... @@ -71,7 +71,7 @@ Page({
this.setData({ content: e.detail.value });
},
//发送评论/回复
clickComment() {
clickComment(e) {
this.setData({ display: false });
if(this.data.content === '' ) {
wx.showToast({title:'请输入内容',icon:'none'})
... ... @@ -82,6 +82,7 @@ Page({
activeId:this.data.detail_id,
commonId: this.data.is_ask?0:this.data.commet_id,
content:this.data.content,
formId:e.detail.formId,
};
app.post(url,params,{}).then((res)=>{
console.log('提交评论',res);
... ... @@ -236,6 +237,7 @@ Page({
commentList:res.data.common,
is_collect:res.data.is_collect,
count:res.data.count,
is_send:res.data.is_send,//能否参加1:不能2:能
});
// self.countDown();
... ... @@ -272,26 +274,28 @@ Page({
//确认拼餐
confirmJoin(e) {
const self = this;
let url = '/portal/Active/join';
let params = {
token: wx.getStorageSync('token'),
number: self.data.num,
activeId: self.data.detail_id,
formId: e.detail.formId,
};
let header = {
"token": wx.getStorageSync('token')
};
app.post(url, params, {}).then((res) => {
console.log('确认拼餐', res);
if (+res.code === 1) {
// wx.showToast({title:'拼餐成功',icon:'success'});
self.setData({is_showRelease_modal:true,order_id:+res.data.orderId,is_join:true});
self.getDetail();
}else if(+res.code === 0) { //参与失败按钮还是确认拼活动
self.setData({is_join:false});
}
})
if(+self.data.is_send === 2){ //1:不能参与2:可参与
let url = '/portal/Active/join';
let params = {
token: wx.getStorageSync('token'),
number: self.data.num,
activeId: self.data.detail_id,
formId: e.detail.formId,
};
let header = {
"token": wx.getStorageSync('token')
};
app.post(url, params, {}).then((res) => {
console.log('确认拼餐', res);
if (+res.code === 1) {
// wx.showToast({title:'拼餐成功',icon:'success'});
self.setData({is_showRelease_modal:true,order_id:+res.data.orderId,is_join:true});
self.getDetail();
}else if(+res.code === 0) { //参与失败按钮还是确认拼活动
self.setData({is_join:false});
}
})
}
},
timeFormat(param) { //小于10的格式化函数
return param < 10 ? '0' + param : param;
... ... @@ -313,7 +317,7 @@ Page({
// console.log('surplus', this.data.detail.surplus);
// t = setTimeout(this.countDown, 1000);
const time = app.initTime(this.data.detail.surplus);
console.log('time', time);
// console.log('time', time);
obj = {
day: time[0].day,
hou: time[0].hou,
... ...
<!--pages/activity/detail/detail.wxml-->
<form bindsubmit="confirmJoin" bindreset="formReset" report-submit="true">
<view class="content">
<!--swiper-->
<view class="head">
<view class="position {{hidden_top?'hidden-active':'visible-active'}}">
<view class="left">
<!--<image src="../../../images/avatar@2x.png" class="user-avatar"></image>-->
<image src="{{detail.userPic}}" class="user-avatar"></image>
<text>{{detail.userName}}</text>
</view>
<view class="right">
<view class="collect" bindtap="collect">
<view class="iconfont icon-shoucang" wx:if="{{!is_collect}}"></view>
<view class="iconfont icon-shoucang2" wx:if="{{is_collect}}"></view>
<text>收藏</text>
</view>
<!--&lt;!&ndash;未收藏&ndash;&gt;-->
<!--<view class='collect_box' catchtap='sethits_yes' data-index='{{index}}' wx:if='{{items.is_hits==0}}'>-->
<!--<text class='iconfont icon-shoucang1 '></text>-->
<!--<text class="collect_word">收藏</text>-->
<!--</view>-->
<!--&lt;!&ndash;已收藏&ndash;&gt;-->
<!--<view class='collect_box active' catchtap='sethits_no' data-index='{{index}}' wx:else>-->
<!--<text class='iconfont icon-shoucang0 star2'></text>-->
<!--<text class="collect_word">收藏</text>-->
<!--</view>-->
<button class="share" open-type="share">
<view class="iconfont icon-fenxiang2"></view>
<text>分享</text>
</button>
</view>
</view>
<swiper indicator-dots="{{false}}" current="{{current}}" bindchange="swiperChange" style="height:{{img_heights[current_swiper]}}rpx;"
autoplay="{{true}}" interval="3000" duration="1000">
<block wx:for="{{detail.banner}}" wx:key="index">
<navigator url="{{item}}" hover-class="navigator-hover">
<swiper-item>
<image src="{{item}}" data-id='{{index}}' class="slide-image" mode="widthFix" bindload="imageLoad"/>
<!--<image src="http://pk86rwhci.bkt.clouddn.com/banner.png" class="slide-image"></image>-->
</swiper-item>
</navigator>
</block>
</swiper>
<view class="dots">
<block wx:for="{{detail.banner}}" wx:key="index" wx:for-index="idx">
<view class="dot{{idx == current_swiper ? ' active' : ''}}"></view>
</block>
<view class="content">
<!--swiper-->
<view class="head">
<view class="position {{hidden_top?'hidden-active':'visible-active'}}">
<view class="left">
<!--<image src="../../../images/avatar@2x.png" class="user-avatar"></image>-->
<image src="{{detail.userPic}}" class="user-avatar"></image>
<text>{{detail.userName}}</text>
</view>
</view>
<!--地点-->
<view class="area-box">
<view class="title-box">
<view class="title">{{detail.title}}</view>
<view class="over-time">
<text class='' wx:if="{{detail.time[0].day !== '00'}}">{{detail.time[0].day}}天{{detail.time[0].hou}}:{{detail.time[0].min}}:{{detail.time[0].sec}}</text>
<text class='' wx:else="">{{detail.time[0].hou}}:{{detail.time[0].min}}:{{detail.time[0].sec}}</text>
后停止拼餐
<view class="right">
<view class="collect" bindtap="collect">
<view class="iconfont icon-shoucang" wx:if="{{!is_collect}}"></view>
<view class="iconfont icon-shoucang2" wx:if="{{is_collect}}"></view>
<text>收藏</text>
</view>
<!--<view>-->
<!--<text class=''>{{detail.time[0].hou}}</text>-->
<!--<text>:</text>-->
<!--<text class=''>{{detail.time[0].min}}</text>-->
<!--<text>:</text>-->
<!--<text class=' '>{{detail.time[0].sec}}</text>-->
<!--&lt;!&ndash;未收藏&ndash;&gt;-->
<!--<view class='collect_box' catchtap='sethits_yes' data-index='{{index}}' wx:if='{{items.is_hits==0}}'>-->
<!--<text class='iconfont icon-shoucang1 '></text>-->
<!--<text class="collect_word">收藏</text>-->
<!--</view>-->
<!--&lt;!&ndash;已收藏&ndash;&gt;-->
<!--<view class='collect_box active' catchtap='sethits_no' data-index='{{index}}' wx:else>-->
<!--<text class='iconfont icon-shoucang0 star2'></text>-->
<!--<text class="collect_word">收藏</text>-->
<!--</view>-->
<button class="share" open-type="share">
<view class="iconfont icon-fenxiang2"></view>
<text>分享</text>
</button>
</view>
<view class="area-content">
<text>{{detail.content}}</text>
<!--云峰山风景区坐落于密云水库北不老屯镇,燕落村北三公里,处于-->
<!--密云区东西两大风景区之间,东靠密云古北口 ──司马台长城──-->
<!--雾灵山风景区。-->
</view>
</view>
<swiper indicator-dots="{{false}}" current="{{current}}" bindchange="swiperChange"
style="height:{{img_heights[current_swiper]}}rpx;"
autoplay="{{true}}" interval="3000" duration="1000">
<block wx:for="{{detail.banner}}" wx:key="index">
<navigator url="{{item}}" hover-class="navigator-hover">
<swiper-item>
<image src="{{item}}" data-id='{{index}}' class="slide-image" mode="widthFix"
bindload="imageLoad"/>
<!--<image src="http://pk86rwhci.bkt.clouddn.com/banner.png" class="slide-image"></image>-->
</swiper-item>
</navigator>
</block>
</swiper>
<view class="dots">
<block wx:for="{{detail.banner}}" wx:key="index" wx:for-index="idx">
<view class="dot{{idx == current_swiper ? ' active' : ''}}"></view>
</block>
</view>
</view>
<!--详细时间-->
<view class="detail-box">
<text>时间:{{end_time}}</text>
<text>餐厅:{{detail.name}}</text><!--餐厅-->
<view class="position" bindtap="getNavigate">
<text class="address">地址:{{detail.address}}</text><!--地址:-->
<!--侨福芳草地B2 OPERA BOMBANA-->
<text class="iconfont icon-location"></text>
<!--地点-->
<view class="area-box">
<view class="title-box">
<view class="title">{{detail.title}}</view>
<view class="over-time">
<text class='' wx:if="{{detail.time[0].day !== '00'}}">
{{detail.time[0].day}}天{{detail.time[0].hou}}:{{detail.time[0].min}}:{{detail.time[0].sec}}
</text>
<text class='' wx:else="">{{detail.time[0].hou}}:{{detail.time[0].min}}:{{detail.time[0].sec}}</text>
后停止拼餐
</view>
<text>菜系:{{detail.selectName}}</text>
<!--意大利菜-->
<!--<view>-->
<!--<text class=''>{{detail.time[0].hou}}</text>-->
<!--<text>:</text>-->
<!--<text class=''>{{detail.time[0].min}}</text>-->
<!--<text>:</text>-->
<!--<text class=' '>{{detail.time[0].sec}}</text>-->
<!--</view>-->
</view>
<view class="area-content">
<text>{{detail.content}}</text>
<!--云峰山风景区坐落于密云水库北不老屯镇,燕落村北三公里,处于-->
<!--密云区东西两大风景区之间,东靠密云古北口 ──司马台长城──-->
<!--雾灵山风景区。-->
</view>
</view>
<!--已加入人员-->
<view class="join-num">已加入人员</view>
<view class="people-list" wx:if="{{join_people.length>0}}">
<view class="people" wx:for="{{join_people}}" wx:key="index">
<view class="bg">
<image src="{{item.pic}}" class="people-img"></image>
</view>
<view class="people-num">
<view class="name">{{item.name}}</view>
<view class="num">({{item.number}})</view>
</view>
</view>
<!--详细时间-->
<view class="detail-box">
<text>时间:{{end_time}}</text>
<text>餐厅:{{detail.name}}</text><!--餐厅-->
<view class="position" bindtap="getNavigate">
<text class="address">地址:{{detail.address}}</text><!--地址:-->
<!--侨福芳草地B2 OPERA BOMBANA-->
<text class="iconfont icon-location"></text>
</view>
<text>菜系:{{detail.selectName}}</text>
<!--意大利菜-->
</view>
<!--留言板 问一问-->
<view class="comment-box">
<view class="title-box">
<text class="comment-num">留言板 ({{count}})</text>
<view class="ask-btn" bindtap="ask">
<text class="iconfont icon-bianji"></text>
<text>问一问</text>
<!--<input type="text" class="ask-input" bindinput="ask" focus="{{focus}}"/>-->
</view>
<!--已加入人员-->
<view class="join-num">已加入人员</view>
<view class="people-list" wx:if="{{join_people.length>0}}">
<view class="people" wx:for="{{join_people}}" wx:key="index">
<view class="bg">
<image src="{{item.pic}}" class="people-img"></image>
</view>
<view class="people-num">
<view class="name">{{item.name}}</view>
<view class="num">({{item.number}})</view>
</view>
</view>
</view>
<!--评论框-->
<view wx:if="{{display}}" class="comment {{display?'t-active':''}}">
<input
<!--留言板 问一问-->
<view class="comment-box">
<view class="title-box">
<text class="comment-num">留言板 ({{count}})</text>
<view class="ask-btn" bindtap="ask">
<text class="iconfont icon-bianji"></text>
<text>问一问</text>
<!--<input type="text" class="ask-input" bindinput="ask" focus="{{focus}}"/>-->
</view>
</view>
auto-focus="{{display}}"
focus="{{display}}"
value="{{content}}"
cursor-spacing="50"
maxlength="300"
bindblur="blur"
bindinput="inputComment"
bindconfirm="confirm"
show-confirm-bar="{{false}}"
placeholder="{{placeholder}}"/>
<!--评论框-->
<view wx:if="{{display}}" class="comment {{display?'t-active':''}}">
<form bindsubmit="clickComment" bindreset="formReset" report-submit="true">
<view class="common-box">
<input
<view class="send-box">
<text class="send" bindtap="clickComment">发送</text>
auto-focus="{{display}}"
focus="{{display}}"
value="{{content}}"
cursor-spacing="50"
maxlength="300"
bindblur="blur"
bindinput="inputComment"
bindconfirm="confirm"
show-confirm-bar="{{false}}"
placeholder="{{placeholder}}"/>
<button class="send-box" form-type="submit">
<text class="send">发送</text>
</button>
</view>
</view>
</form>
</view>
<!--评论-->
<view class="comment-list-box">
<view class="comment-item" wx:for="{{commentList}}" wx:key="index" wx:for-item="comment">
<view class="top-content">
<view class="top-left">
<!--<image src="../../../images/avatar@2x.png" class="release-img"></image>-->
<image src="{{comment.userPic}}" class="release-img"></image>
<text>{{comment.userName}} {{comment.create_time}}</text>
</view>
<view class="top-right" bindtap="clickZan" data-id="{{comment.id}}" data-index="{{index}}">
<text>{{comment.prefect}}</text>
<text class="iconfont icon-zan" wx:if="{{!comment.is_prefect}}"></text>
<text class="iconfont icon-z-likeFill" wx:if="{{comment.is_prefect}}"></text>
</view>
<!--评论-->
<view class="comment-list-box">
<view class="comment-item" wx:for="{{commentList}}" wx:key="index" wx:for-item="comment">
<view class="top-content">
<view class="top-left">
<!--<image src="../../../images/avatar@2x.png" class="release-img"></image>-->
<image src="{{comment.userPic}}" class="release-img"></image>
<text>{{comment.userName}} {{comment.create_time}}</text>
</view>
<view class="top-right" bindtap="clickZan" data-id="{{comment.id}}" data-index="{{index}}">
<text>{{comment.prefect}}</text>
<text class="iconfont icon-zan" wx:if="{{!comment.is_prefect}}"></text>
<text class="iconfont icon-z-likeFill" wx:if="{{comment.is_prefect}}"></text>
</view>
<view class="comment-detail">
<view class="user-release">
<view class="release-comment">{{comment.content}}</view>
<text class="reply-btn" bindtap="reply" data-id="{{comment.id}}">回复</text>
</view>
<view class="user-reply" wx:if="{{comment.son.length>0}}">
<view class='triangle'></view>
<block wx:for="{{comment.son}}" wx:key="index">
<!--<view class="comment">-->
<!--<text class="reply-name">蚂蚁: </text>-->
<!--<text>{{item.content}}第一次拼餐,心里还是比较兴奋的,但是又担心拼友会比较无聊,但是没想到拼友和餐厅都非常好!</text>-->
<!--</view>-->
<view class="reply">
<text class="reply-name">{{detail.userName}}</text>
<text>回复</text>
<text class="reply-name">{{comment.userName}}:</text>
<text>{{item.content}}</text>
</view>
</block>
</view>
</view>
<view class="comment-detail">
<view class="user-release">
<view class="release-comment">{{comment.content}}</view>
<text class="reply-btn" bindtap="reply" data-id="{{comment.id}}">回复</text>
</view>
<view class="user-reply" wx:if="{{comment.son.length>0}}">
<view class='triangle'></view>
<block wx:for="{{comment.son}}" wx:key="index">
<!--<view class="comment">-->
<!--<text class="reply-name">蚂蚁: </text>-->
<!--<text>{{item.content}}第一次拼餐,心里还是比较兴奋的,但是又担心拼友会比较无聊,但是没想到拼友和餐厅都非常好!</text>-->
<!--</view>-->
<view class="reply">
<text class="reply-name">{{detail.userName}}</text>
<text>回复</text>
<text class="reply-name">{{comment.userName}}:</text>
<text>{{item.content}}</text>
</view>
</block>
</view>
</view>
</view>
</view>
</view>
<!--底部btn-->
<view class="bottom-btn" wx:if="{{!display}}">
<view class="add-btn">
<view class="input_box">
<view class="iconfont icon-jian {{num==1?'disable':''}}" bindtap='minusCount'></view>
<view class='item_cart_num'>{{num}}</view>
<view class='iconfont icon-jia1' bindtap='addCount'></view>
</view>
<!--底部btn-->
<view class="bottom-btn" wx:if="{{!display}}">
<view class="add-btn">
<view class="input_box">
<view class="iconfont icon-jian {{num==1?'disable':''}}" bindtap='minusCount'></view>
<view class='item_cart_num'>{{num}}</view>
<view class='iconfont icon-jia1' bindtap='addCount'></view>
</view>
<!--(0全部,2待处理,4已拼成,5已取消,6已完成-->
<button class="confirm-join-btn {{is_join || detail.status === 5 || detail.status === 6?'gray':''}}" form-type="submit">
<text wx:if="{{is_join}}">待拼成</text>
<text wx:if="{{!is_join && detail.status === 2}}">确认拼餐</text>
</view>
<form bindsubmit="confirmJoin" bindreset="formReset" report-submit="true">
<!--(0全部,2待拼成,3人数不足未拼成,4已拼成,5已取消,6已完成,7已评价,8已拼成(活动未结束),9删除-->
<button class="confirm-join-btn {{is_send === 1 && detail.status !== 8?'gray':''}}" form-type="submit">
<text wx:if="{{is_send === 1 && detail.status === 2}}">待拼成</text>
<text wx:if="{{is_send === 2 && detail.status === 2}}">确认拼活动</text>
<text wx:if="{{detail.status === 3}}">未拼成</text>
<text wx:if="{{detail.status === 4}}">已拼成</text>
<text wx:if="{{detail.status === 5}}">已取消</text>
<text wx:if="{{detail.status === 6}}">已完成</text>
<text wx:if="{{detail.status === 6 || detail.status === 7}}">已完成</text>
<text wx:if="{{detail.status === 8}}">已拼成</text>
<text wx:if="{{detail.status === 9}}">已删除</text>
</button>
<!--<view class="confirm-join-btn" bindtap="confirmJoin">-->
<!--<text>确认拼餐</text>-->
<!--</view>-->
</view>
</form>
<!--<view class="confirm-join-btn" bindtap="confirmJoin">-->
<!--<text>确认拼餐</text>-->
<!--</view>-->
</view>
<!--发布成功弹框-->
<view class="modal" wx:if="{{is_showRelease_modal}}" catchtouchmove="disableScroll">
<image class="sorry-img" src="../../../images/success@2x.png"></image>
<view class="title">恭喜您拼餐成功</view>
<view class="view-btn" catchtap="goMyRelease">查看我的订单</view>
<view class="complete-btn" catchtap="goBack">完成</view>
</view>
<view class="modal_box" wx:if="{{is_showRelease_modal}}" bindtap="handleBackground"
catchtouchmove="disableScroll"></view>
<!--发布成功弹框-->
<view class="modal" wx:if="{{is_showRelease_modal}}" catchtouchmove="disableScroll">
<image class="sorry-img" src="../../../images/success@2x.png"></image>
<view class="title">恭喜您拼餐成功</view>
<view class="view-btn" catchtap="goMyRelease">查看我的订单</view>
<view class="complete-btn" catchtap="goBack">完成</view>
</view>
</form>
<view class="modal_box" wx:if="{{is_showRelease_modal}}" bindtap="handleBackground"
catchtouchmove="disableScroll"></view>
</view>
... ...
... ... @@ -457,6 +457,15 @@ swiper {
left:0;
z-index:20;
}
.comment form {
width: 100%;
}
.comment .common-box {
width:100%;
display: flex;
align-items: center;
justify-content: space-between;
}
.comment input {
border-radius: 50rpx;
width: 83.5%;
... ... @@ -472,7 +481,7 @@ swiper {
}
.t-active {
border-radius: 4rpx;
width: 91.5%;
width: 100%;
/*height: 300rpx;*/
/*background-color: #f2f2f2;*/
font-size: 26rpx;
... ... @@ -480,6 +489,9 @@ swiper {
display: flex;
justify-content: right;
align-items: right;
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
box-sizing: border-box;
}
.send-box .send {
... ... @@ -494,10 +506,16 @@ swiper {
text-align: center;
}
.send-box {
width: 100rpx;
height: 60rpx;
display: flex;
justify-content: flex-end;
margin-left: 10rpx;
margin-right:0;
padding: 0;
}
.send-box::after {
border:0;
}
.modal {
width: 73%;
... ...
... ... @@ -57,9 +57,21 @@ Page({
},
//自动获取手机号
getPhoneNumber(e) {
console.log(e.detail.errMsg)
console.log(e.detail.iv)
console.log(e.detail.encryptedData)
// console.log(e.detail.errMsg)
// console.log(e.detail.iv)
// console.log(e.detail.encryptedData)
let url = '/portal/Member/getTel';
let params = {
token: wx.getStorageSync('token'),
encryptedData: e.detail.encryptedData,
iv:e.detail.iv,
};
app.post(url, params, {}).then((res) => {
console.log('自动获取手机号', res);
if (+res.code === 1) {
this.setData({phone_number:res.data,is_wrong_phone:false})
}
});
},
//输入国家
inputCountry(e) {
... ...
... ... @@ -27,7 +27,7 @@
<view class="flex-box">
<view class="title">手机号:</view>
<view class="phone-box">
<input type="number" bindinput="inputPhone" bindblur="blur"/>
<input type="number" bindinput="inputPhone" bindblur="blur" value="{{phone_number}}"/>
<button open-type="getPhoneNumber" bindgetphonenumber="getPhoneNumber" class="phone-btn">自动填写</button>
</view>
</view>
... ...
<!--pages/my/my-wallet/detail/detail.wxml-->
<view class="content">
<view class="section" style="height:{{screenHeight}}px">
<view class="section {{detail.type === 1?'change-bg':''}} {{detail.status === 6?'change-bg-end':''}}" style="height:{{screenHeight}}px">
<view class="detail">
<view class="bg">
<view class="head">
... ... @@ -35,7 +35,9 @@
</view>
<view class="code">
<view class="code-num"></view>
<view class="code-num">
<image src="../../../../images/wallet-code.png"></image>
</view>
</view>
</view>
... ...
... ... @@ -17,6 +17,12 @@
background-repeat: no-repeat;
/*background-size: 100%;*/
}
.change-bg {
background-image: url('http://pk86rwhci.bkt.clouddn.com/yellow-bg.png');
}
.change-bg-end {
background-image: url('http://pk86rwhci.bkt.clouddn.com/gray-bg.png');
}
.detail {
height: 100%;
padding:60rpx 40rpx 20rpx 40rpx;
... ... @@ -138,7 +144,11 @@
.detail .code .code-num {
width: 70%;
height: 136rpx;
border:1rpx solid #f2f2f2;
/*border:1rpx solid #f2f2f2;*/
}
.detail .code .code-num image {
width: 100%;
height: 100%;
}
.line {
width: 100%;
... ...
<!--pages/my/my-wallet/my-wallet.wxml-->
<view class="list-box">
<view class="bg">
<!--(0全部,2待处理,4已拼成,5已取消,6已完成)-->
<!-- // (0全部,2待拼成,3人数不足未拼成,4已拼成,5已取消,6已完成,7已评价,8已拼成(活动未结束),9删除-->
<view class="no-data" wx:if="{{list.length===0}}">钱包是空的~</view>
<view class="list-item {{item.type === 1?'change-bg':''}} {{item.status === 6?'change-bg-end':''}}"
wx:for="{{list}}" wx:key="index" data-id="{{item.id}}" bindtap="goDetail">
... ... @@ -19,7 +19,9 @@
<text>{{item.number}}人</text>
</view>
</view>
<view class="code"></view>
<view class="code">
<image src="../../../images/wallet-icon.png"></image>
</view>
<view class="name">{{item.type === 1?'活动票':'饭票'}}</view>
</view>
</view>
... ...
... ... @@ -77,9 +77,13 @@
.code {
width: 130rpx;
height: 180rpx;
border:1rpx solid #ccc;
/*border:1rpx solid #ccc;*/
margin-right: 24rpx;
}
.code image {
width: 100%;
height: 100%;
}
.name {
width:36rpx;
font-size: 32rpx;
... ...
<!--pages/my/my.wxml-->
<view class="head-box">
<view wx:if="{{isLogin}}" >
<view class="head" bindtap='uploadImg' style="">
<view class="head" bindtap='uploadImg'>
<!--背景图-->
<image class='banner_img' wx:if="{{images !== ''}}" src='{{images}}' mode="aspectFill"></image>
<image class='banner_img' wx:else="" src="{{user.bg_pic}}" mode="aspectFill"></image>
</view>
<!--<view class="margin">-->
<image src="{{user.pic}}" class="user-img"></image>
<view class="left">
<image src="{{user.pic}}" class="user-img"></image>
<!--type :1注册用户,2后台用户-->
<text class="iconfont icon-vip" wx:if="{{user.type === 2}}"></text>
<!--<image src="{{user.sex === 1?'../../images/man.png':'../../images/women.png'}}" class="sex-icon"></image>-->
<view class="left">
<view class="class-box">
<image src="../../images/jin@2x.png" wx:if="{{user.level === 1}}"></image>
<image src="../../images/yin@2x.png" wx:if="{{user.level === 2}}"></image>
... ...
... ... @@ -8,6 +8,13 @@
color: #ffffff;
font-size: 50rpx;
}
.icon-vip {
position: absolute;
top:51rpx;
left:163rpx;
color:#E1C8AF;
font-size:34rpx;
}
.login-box {
width: 100%;
height: 300rpx;
... ... @@ -27,6 +34,13 @@
.login-box button::after {
border:0;
}
.sex-icon {
position: absolute;
top:100rpx;
left:100rpx;
width: 40rpx;
height: 40rpx;
}
.head-box {
position: relative;
}
... ... @@ -49,6 +63,10 @@
-moz-filter: blur(2rpx);
-ms-filter: blur(2rpx);
filter: blur(2rpx);
background-color: #CCCCCC;
}
.gray-bg {
background-color: #CCCCCC;
}
.banner_img {
z-index:-1;
... ...
... ... @@ -155,7 +155,9 @@ Page({
*/
onLoad: function (options) {
console.log('options', options,JSON.parse(options.order_detail));
this.setData({order_id:+options.id?+options.id:'',order_detail:JSON.parse(options.order_detail)})
this.setData({order_id:+options.id?+options.id:'',
order_detail:JSON.parse(options.order_detail),
})
},
/**
... ...
... ... @@ -3,21 +3,22 @@
<view class="state-box">
<view class="line"></view>
<!--(0全部,2待处理,4已拼成,5已取消,6已完成)-->
<!-- // (0全部,2待拼成,3人数不足未拼成,4已拼成,5已取消,6已完成,7已评价,8已拼成(活动未结束),9删除-->
<view class="state1">
<view class="circle change"></view>
<text>已拍下</text>
</view>
<view class="state2">
<view class="circle {{order_detail.status === 4 ||order_detail.status === 5 ?'change':''}}"></view>
<!--{{detail.status === 4 ||detail.status === 5 || detail.status === 6||detail.status === 8?'change':''}}-->
<view class="circle change"></view>
<text wx:if="{{order_detail.status === 5}}">已取消</text>
<text wx:if="{{order_detail.status === 4}}">已拼成</text>
<text wx:if="{{order_detail.status === 2}}" class="{{order_detail.status === 2?'change-text':''}}">待拼成</text>
<text wx:if="{{order_detail.status === 4|| order_detail.status === 6 || order_detail.status === 7 || order_detail.status === 8}}">已拼成</text>
<text wx:if="{{order_detail.status === 2 || order_detail.status === 3}}" class="{{order_detail.status === 2?'change-text':''}}">待拼成</text>
</view>
<view class="state3">
<view class="circle {{order_detail.status === 6?'change':''}}"></view>
<text wx:if="{{order_detail.status === 6}}">已完成</text>
<text wx:if="{{order_detail.status === 4 || order_detail.status === 2 ||order_detail.status === 5}}" class="{{order_detail.status === 4 || order_detail.status === 2 ||order_detail.status === 5?'change-text':''}}">待完成</text>
<text wx:if="{{order_detail.status === 4 || order_detail.status === 2 ||order_detail.status === 5|| order_detail.status === 3 ||order_detail.status === 8}}" class="{{order_detail.status === 4 || order_detail.status === 2 ||order_detail.status === 5?'change-text':''}}">待完成</text>
</view>
</view>
... ... @@ -27,6 +28,7 @@
<view class="text">拼单发起者: </view>
<!--<image src="../../../images/avatar@2x.png"></image>-->
<image src="{{order_detail.userPic}}"></image>
<image src="{{order_detail.userSex === 1?'../../../images/man.png':'../../../images/women.png'}}" class="sex-icon"></image>
<view class="name text">{{order_detail.userName}}</view>
</view>
<text class="text">订单编号:{{order_detail.order_sn}}</text>
... ...
... ... @@ -9,6 +9,13 @@
margin-bottom: 34rpx;
margin-left: 10rpx;
}
.top .sex-icon {
position: absolute;
top:-6rpx;
left:152rpx;
width: 20rpx;
height: 20rpx;
}
.address {
padding: 28rpx 0 0 0;
}
... ...
... ... @@ -42,7 +42,7 @@ Page({
console.log('订单详情', res);
if (+res.code === 1) {
self.setData({
detail: res.data,
detail: res.data.list,
});
// console.log(this.data.this_week_test_info);
}
... ...
<!--pages/order/order-detail/order-detail.wxml-->
<view class="content">
<view class="complain" catchtap="goComplain"><text>去投诉</text></view>
<view class="state-box">
<view class="line"></view>
<!--(0全部,2待处理,4已拼成,5已取消,6已完成)-->
<!-- // (0全部,2待拼成,3人数不足未拼成,4已拼成,5已取消,6已完成,7已评价,8已拼成(活动未结束),9删除-->
<view class="state1">
<view class="circle change"></view>
<text>已拍下</text>
</view>
<view class="state2">
<view class="circle {{detail.status === 4 ||detail.status === 5 || detail.status === 6?'change':''}}"></view>
<!--{{detail.status === 4 ||detail.status === 5 || detail.status === 6||detail.status === 8?'change':''}}-->
<view class="circle change"></view>
<text wx:if="{{detail.status === 5}}">已取消</text>
<text wx:if="{{detail.status === 4 || detail.status === 6}}">已拼成</text>
<text wx:if="{{detail.status === 2}}" class="{{detail.status === 2?'change-text':''}}">待拼成</text>
<text wx:if="{{detail.status === 4 || detail.status === 6 || detail.status === 7 || detail.status === 8}}">已拼成</text>
<text wx:if="{{detail.status === 2 || detail.status === 3}}" class="{{detail.status === 2?'change-text':''}}">待拼成</text>
</view>
<view class="state3">
<view class="circle {{detail.status === 6?'change':''}}"></view>
<text wx:if="{{detail.status === 6}}">已完成</text>
<text wx:if="{{detail.status === 4 || detail.status === 2 ||detail.status === 5}}" class="{{detail.status === 4 || detail.status === 2 ||detail.status === 5?'change-text':''}}">待完成</text>
<text wx:if="{{detail.status === 4 || detail.status === 2 || detail.status === 3||detail.status === 5|| detail.status === 8}}" class="{{detail.status === 4 || detail.status === 2 ||detail.status === 5?'change-text':''}}">待完成</text>
</view>
</view>
... ... @@ -27,12 +26,14 @@
<view class="top">
<!--<image src="../../../images/avatar@2x.png"></image>-->
<image src="{{detail.userPic}}"></image>
<image src="{{detail.userSex === 1?'../../../images/man.png':'../../../images/women.png'}}" class="sex-icon"></image>
<text class="name">{{detail.userName}}</text>
</view>
<text class="address">{{detail.title}}</text>
<text class="time">{{detail.time}}</text>
</view>
<view class="complain" catchtap="goComplain"><text>去投诉</text></view>
<view class="order-detail">
<text>订单编号:{{detail.order_sn}}</text>
... ... @@ -40,8 +41,10 @@
</view>
<view class="bottom">
<text class="cancel-btn" wx:if="{{detail.status === 4 || detail.status === 2}}" bindtap="cancel">取消订单</text>
<text class="cancel-btn" wx:if="{{detail.status === 2}}">待拼成</text>
<!-- // (0全部,2待拼成,3人数不足未拼成,4已拼成,5已取消,6已完成,7已评价,8已拼成(活动未结束),9删除-->
<text class="cancel-btn" wx:if="{{detail.status === 4 || detail.status === 2|| detail.status === 8}}" bindtap="cancel">取消订单</text>
<text class="cancel-btn gray" wx:if="{{detail.status === 2}}">待拼成</text>
<text class="cancel-btn gray" wx:if="{{detail.status === 8}}">已拼成</text>
<text class="confirm-btn" wx:if="{{detail.status === 4}}" bindtap="confirm">完成</text>
</view>
</view>
... ...
... ... @@ -58,6 +58,7 @@
.order-info .top {
display: flex;
align-items: center;
position: relative;
}
.top image {
width: 40rpx;
... ... @@ -69,6 +70,13 @@
font-size: 22rpx;
color: #333333;
}
.top .sex-icon {
position: absolute;
top:-6rpx;
left:28rpx;
width: 20rpx;
height: 20rpx;
}
.address, .time {
font-size: 24rpx;
color: #666666;
... ... @@ -81,7 +89,7 @@
padding-bottom: 40rpx;
}
.order-detail {
margin-top: 108rpx;
/* margin-top: 58rpx; */
padding: 0 20rpx;
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
... ... @@ -92,7 +100,7 @@
.order-detail text {
font-size: 24rpx;
color: #666666;
margin-bottom: 42rpx;
margin-bottom: 30rpx;
}
.bottom {
width: 100%;
... ... @@ -111,23 +119,29 @@
background-color: #323232;
font-size: 30rpx;
}
.bottom .gray {
background-color: #CCCCCC;
color: #ffffff;
border:0;
}
.cancel-btn {
color: #999999;
border-right: 1rpx solid #E1C8AF;
}
.confirm-btn {
color: #E1C8AF;
border:0;
}
.complain {
z-index:10;
z-index:10;
padding: 0 20rpx;
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
box-sizing: border-box;
position: absolute;
right:20rpx;
top:10rpx;
margin-bottom:20rpx;
/* position: absolute; */
/* right:20rpx; */
/* top:10rpx; */
margin:20rpx 0;
}
.complain text {
width: 80rpx;
... ... @@ -135,8 +149,9 @@
line-height: 50rpx;
text-align:center;
font-size: 24rpx;
color: #E1C8AF;
background-color: #323232;
padding: 6rpx 10rpx;
/* color: #E1C8AF; */
color:#999999;
/* background-color: #323232; */
/* padding: 6rpx 10rpx; */
border-radius: 6rpx;
}
\ No newline at end of file
... ...
<!--pages/order/order.wxml-->
<view class='tab_box'>
<!--(0全部,2待处理,4已拼成,5已取消,6已完成)-->
<!--(0全部,2待拼成,3人数不足未拼成,4已拼成,5已取消,6已完成,7已评价,8已拼成(活动未结束),9删除-->
<view class="tab_item {{current==0?'active':''}}" data-current='0' bindtap='chargeTab'>全部</view>
<view class="tab_item {{current==2?'active':''}}" data-current='2' bindtap='chargeTab'>待处理</view>
<view class="tab_item {{current==4?'active':''}}" data-current='4' bindtap='chargeTab'>已拼成</view>
... ... @@ -17,22 +17,26 @@
<!--<image src="../../images/lishi@2x.png" class="thumb"></image>-->
<image src="{{item.pic}}" class="thumb" mode="aspectFill"></image>
<view class="lish-right">
<!--(0全部,2待拼成,3人数不足未拼成,4已拼成,5已取消,6已完成,7已评价,8已拼成(活动未结束),9删除-->
<view class="title-box">
<view class="title">{{item.title}}</view>
<text wx:if="{{item.status === 2}}" class="state">待拼成</text>
<text wx:if="{{item.status === 4}}" class="state">已拼成</text>
<text wx:if="{{item.status === 3}}" class="state">未拼成</text>
<text wx:if="{{item.status === 4 || item.status === 8}}" class="state">已拼成</text>
<text wx:if="{{item.status === 5}}" class="state">已取消</text>
<text wx:if="{{item.status === 6}}" class="state">已完成</text>
<text wx:if="{{item.status === 7}}" class="state">已评价</text>
</view>
<view class="time">{{item.time}}</view>
<view class="name-box">
<view class="name-left">
<!--<image src="../../images/avatar@2x.png" class="avatar"></image>-->
<image src="{{item.userPic}}" class="avatar"></image>
<image src="{{item.userSex === 1?'../../images/man.png':'../../images/women.png'}}" class="sex-icon"></image>
<text>{{item.userName}} 在{{item.address}}</text>
</view>
<view class="btn">
<text wx:if="{{item.status === 5 || item.status === 6}}" catchtap="cancel" data-id="{{item.id}}">删除</text>
<text wx:if="{{item.status === 5 || item.status === 6 || item.status === 3 || item.status === 7}}" catchtap="cancel" data-id="{{item.id}}">删除</text>
<text wx:if="{{item.status === 4}}" catchtap="complete" data-id="{{item.id}}">完成</text>
</view>
</view>
... ...
... ... @@ -29,6 +29,7 @@
left:0;
right:0;
background: #ffffff;
z-index:100;
}
.tab_item {
display: inline-block;
... ... @@ -113,10 +114,18 @@
align-items: center;
justify-content: flex-start;
flex:1;
position: relative;
}
.name-left text{
flex:1;
}
.name-left .sex-icon {
position: absolute;
top:-6rpx;
left:28rpx;
width: 20rpx;
height: 20rpx;
}
.lish-right .name-box .btn {
/* width:28%; */
color:#E2C8B1;
... ...