miniprogram / match-west-road · 提交

转到一个项目

作者 wumengyu
提交 6d944836fff446b2dc3d73d58744587e13a24891 1 个父辈 0824c874

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

内嵌 并排对比
正在显示 32 个修改的文件 包含 644 行增加 和 458 行删除
1 @font-face {font-family: "iconfont"; 1 @font-face {font-family: "iconfont";
2 - src: url('//at.alicdn.com/t/font_961048_1lfcgmofki3.eot?t=1546996469479'); /* IE9 */  
3 - src: url('//at.alicdn.com/t/font_961048_1lfcgmofki3.eot?t=1546996469479#iefix') format('embedded-opentype'), /* IE6-IE8 */  
4 - url('data:application/x-font-woff2;charset=utf-8;base64,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') format('woff2'),  
5 - url('//at.alicdn.com/t/font_961048_1lfcgmofki3.woff?t=1546996469479') format('woff'),  
6 - url('//at.alicdn.com/t/font_961048_1lfcgmofki3.ttf?t=1546996469479') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+ */  
7 - url('//at.alicdn.com/t/font_961048_1lfcgmofki3.svg?t=1546996469479#iconfont') format('svg'); /* iOS 4.1- */ 2 + src: url('//at.alicdn.com/t/font_961048_jhdqmcwglhh.eot?t=1547874546810'); /* IE9 */
  3 + src: url('//at.alicdn.com/t/font_961048_jhdqmcwglhh.eot?t=1547874546810#iefix') format('embedded-opentype'), /* IE6-IE8 */
  4 + url('data:application/x-font-woff2;charset=utf-8;base64,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') format('woff2'),
  5 + url('//at.alicdn.com/t/font_961048_jhdqmcwglhh.woff?t=1547874546810') format('woff'),
  6 + url('//at.alicdn.com/t/font_961048_jhdqmcwglhh.ttf?t=1547874546810') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+ */
  7 + url('//at.alicdn.com/t/font_961048_jhdqmcwglhh.svg?t=1547874546810#iconfont') format('svg'); /* iOS 4.1- */
8 } 8 }
9 9
10 .iconfont { 10 .iconfont {
@@ -15,10 +15,22 @@ @@ -15,10 +15,22 @@
15 -moz-osx-font-smoothing: grayscale; 15 -moz-osx-font-smoothing: grayscale;
16 } 16 }
17 17
  18 +.icon-radio-checked:before {
  19 + content: "\e610";
  20 +}
  21 +
18 .icon-shoucang1:before { 22 .icon-shoucang1:before {
19 content: "\e60a"; 23 content: "\e60a";
20 } 24 }
21 25
  26 +.icon-xuanze:before {
  27 + content: "\e619";
  28 +}
  29 +
  30 +.icon-vip:before {
  31 + content: "\e611";
  32 +}
  33 +
22 .icon-zan1:before { 34 .icon-zan1:before {
23 content: "\e64f"; 35 content: "\e64f";
24 } 36 }
@@ -94,3 +106,8 @@ @@ -94,3 +106,8 @@
94 .icon-jian1:before { 106 .icon-jian1:before {
95 content: "\e6d4"; 107 content: "\e6d4";
96 } 108 }
  109 +
  110 +.icon-xuanzezhuangtai-:before {
  111 + content: "\e678";
  112 +}
  113 +
@@ -77,7 +77,7 @@ Page({ @@ -77,7 +77,7 @@ Page({
77 this.setData({ content: e.detail.value }); 77 this.setData({ content: e.detail.value });
78 }, 78 },
79 //发送评论/回复 79 //发送评论/回复
80 - clickComment() { 80 + clickComment(e) {
81 this.setData({ display: false }); 81 this.setData({ display: false });
82 if(this.data.content === '' ) { 82 if(this.data.content === '' ) {
83 wx.showToast({title:'请输入内容',icon:'none'}) 83 wx.showToast({title:'请输入内容',icon:'none'})
@@ -88,6 +88,7 @@ Page({ @@ -88,6 +88,7 @@ Page({
88 activeId:this.data.detail_id, 88 activeId:this.data.detail_id,
89 commonId: this.data.is_ask?0:this.data.commet_id, 89 commonId: this.data.is_ask?0:this.data.commet_id,
90 content:this.data.content, 90 content:this.data.content,
  91 + formId:e.detail.formId,
91 }; 92 };
92 app.post(url,params,{}).then((res)=>{ 93 app.post(url,params,{}).then((res)=>{
93 console.log('提交评论',res); 94 console.log('提交评论',res);
@@ -109,12 +110,13 @@ Page({ @@ -109,12 +110,13 @@ Page({
109 }, 110 },
110 //回复 111 //回复
111 reply(e) { 112 reply(e) {
  113 + console.log('回复', e);
112 const id = e.currentTarget.dataset.id; 114 const id = e.currentTarget.dataset.id;
113 this.setData({ 115 this.setData({
114 display: !this.data.display, 116 display: !this.data.display,
115 is_ask:false,is_reply:true, 117 is_ask:false,is_reply:true,
116 commet_id:id,content:'' , 118 commet_id:id,content:'' ,
117 - placeholder:'输入您的回复' 119 + placeholder:'输入您的回复',
118 }); 120 });
119 // wx.navigateTo({ 121 // wx.navigateTo({
120 // url: '/pages/comment/comment?is_reply=' + true 122 // url: '/pages/comment/comment?is_reply=' + true
@@ -231,7 +233,7 @@ Page({ @@ -231,7 +233,7 @@ Page({
231 "token": wx.getStorageSync('token') 233 "token": wx.getStorageSync('token')
232 }; 234 };
233 app.post(url, params, {}).then((res) => { 235 app.post(url, params, {}).then((res) => {
234 - console.log('获取详情', res, app.initTime(res.data.active.surplus)); 236 + // console.log('获取详情', res, app.initTime(res.data.active.surplus));
235 if (+res.code === 1) { 237 if (+res.code === 1) {
236 self.setData({ 238 self.setData({
237 detail: res.data.active, 239 detail: res.data.active,
@@ -242,6 +244,7 @@ Page({ @@ -242,6 +244,7 @@ Page({
242 commentList: res.data.common, 244 commentList: res.data.common,
243 is_collect: res.data.is_collect, 245 is_collect: res.data.is_collect,
244 count: res.data.count, // 留言板 246 count: res.data.count, // 留言板
  247 + is_send:res.data.is_send,//能否参加1：不能2：能
245 }); 248 });
246 // （0全部，2待拼成，3人数不足未拼成,4已拼成，5已取消，6已完成，7已评价，8已拼成（活动未结束）,9删除 249 // （0全部，2待拼成，3人数不足未拼成,4已拼成，5已取消，6已完成，7已评价，8已拼成（活动未结束）,9删除
247 const status = res.data.active.status; 250 const status = res.data.active.status;
@@ -288,7 +291,7 @@ Page({ @@ -288,7 +291,7 @@ Page({
288 // console.log('surplus', this.data.detail.surplus); 291 // console.log('surplus', this.data.detail.surplus);
289 // t = setTimeout(this.countDown, 1000); 292 // t = setTimeout(this.countDown, 1000);
290 const time = app.initTime(this.data.detail.surplus); 293 const time = app.initTime(this.data.detail.surplus);
291 - console.log('time', time); 294 + // console.log('time', time);
292 obj = { 295 obj = {
293 day: time[0].day, 296 day: time[0].day,
294 hou: time[0].hou, 297 hou: time[0].hou,
@@ -349,38 +352,40 @@ Page({ @@ -349,38 +352,40 @@ Page({
349 confirmJoin(e) { 352 confirmJoin(e) {
350 const self = this; 353 const self = this;
351 console.log('已参与人数',self.data.join_people.length); 354 console.log('已参与人数',self.data.join_people.length);
352 - if(self.data.join_people.length + self.data.num > self.data.detail.max) {  
353 - wx.showToast({title:'参加人数已超过剩余名额',icon:'none'})  
354 - }else if(self.data.join_people.length + self.data.num == self.data.detail.max){  
355 - wx.showToast({title:'名额已满',icon:'none'})  
356 - } else {  
357 - let url = '/portal/Active/join';  
358 - let params = {  
359 - token: wx.getStorageSync('token'),  
360 - number: self.data.num,  
361 - activeId: self.data.detail_id,  
362 - formId: e.detail.formId,  
363 - };  
364 - let header = {  
365 - "token": wx.getStorageSync('token')  
366 - };  
367 - app.post(url, params, {}).then((res) => {  
368 - console.log('确认拼活动', res);  
369 - if (+res.code === 1) {  
370 - // wx.showToast({title: '拼活动成功', icon: 'success'});  
371 - self.setData({is_showRelease_modal:true,order_id:+res.data.orderId,is_join:true});  
372 - self.getDetail();  
373 - }else if(+res.code === 0) { //参与失败按钮还是确认拼活动  
374 - self.setData({is_join:false});  
375 - }  
376 - }) 355 + if(+self.data.is_send === 2){ //可参与
  356 + if(self.data.join_people.length + self.data.num > self.data.detail.max) {
  357 + wx.showToast({title:'参加人数已超过剩余名额',icon:'none'})
  358 + }else if(self.data.join_people.length + self.data.num == self.data.detail.max){
  359 + wx.showToast({title:'名额已满',icon:'none'})
  360 + } else {
  361 + let url = '/portal/Active/join';
  362 + let params = {
  363 + token: wx.getStorageSync('token'),
  364 + number: self.data.num,
  365 + activeId: self.data.detail_id,
  366 + formId: e.detail.formId,
  367 + };
  368 + let header = {
  369 + "token": wx.getStorageSync('token')
  370 + };
  371 + app.post(url, params, {}).then((res) => {
  372 + console.log('确认拼活动', res);
  373 + if (+res.code === 1) {
  374 + // wx.showToast({title: '拼活动成功', icon: 'success'});
  375 + self.setData({is_showRelease_modal:true,order_id:+res.data.orderId,is_join:true});
  376 + self.getDetail();
  377 + }else if(+res.code === 0) { //参与失败按钮还是确认拼活动
  378 + self.setData({is_join:false});
  379 + }
  380 + })
  381 + }
377 } 382 }
378 }, 383 },
379 /** 384 /**
380 * 生命周期函数--监听页面加载 385 * 生命周期函数--监听页面加载
381 */ 386 */
382 onLoad: function (options) { 387 onLoad: function (options) {
383 - console.log('详情options', options); 388 + // console.log('详情options', options);
384 this.setData({detail_id: +options.id ? +options.id : ''}); 389 this.setData({detail_id: +options.id ? +options.id : ''});
385 }, 390 },
386 391
1 <!--pages/activity/detail/detail.wxml--> 1 <!--pages/activity/detail/detail.wxml-->
2 -<form bindsubmit="confirmJoin" bindreset="formReset" report-submit="true">  
3 - <view class="content">  
4 - <!--swiper-->  
5 - <view class="head">  
6 - <view class="position {{hidden_top?'hidden-active':'visible-active'}}">  
7 - <view class="left">  
8 - <!--<image src="../../../images/avatar@2x.png" class="user-avatar"></image>-->  
9 - <image src="{{detail.userPic}}" class="user-avatar"></image>  
10 - <text>{{detail.userName}}</text>  
11 - </view>  
12 - <view class="right">  
13 - <view class="collect" bindtap="collect">  
14 - <view class="iconfont icon-shoucang" wx:if="{{!is_collect}}"></view>  
15 - <view class="iconfont icon-shoucang2" wx:if="{{is_collect}}"></view>  
16 - <text>收藏</text>  
17 - </view>  
18 - <!--&lt;!&ndash;未收藏&ndash;&gt;-->  
19 - <!--<view class='collect_box' catchtap='sethits_yes' data-index='{{index}}' wx:if='{{items.is_hits==0}}'>-->  
20 - <!--<text class='iconfont icon-shoucang1 '></text>-->  
21 - <!--<text class="collect_word">收藏</text>-->  
22 - <!--</view>-->  
23 - <!--&lt;!&ndash;已收藏&ndash;&gt;-->  
24 - <!--<view class='collect_box active' catchtap='sethits_no' data-index='{{index}}' wx:else>-->  
25 - <!--<text class='iconfont icon-shoucang0 star2'></text>-->  
26 - <!--<text class="collect_word">收藏</text>-->  
27 - <!--</view>-->  
28 - <button class="share" open-type="share">  
29 - <view class="iconfont icon-fenxiang2"></view>  
30 - <text>分享</text>  
31 - </button>  
32 - </view>  
33 - </view>  
34 - <swiper indicator-dots="{{false}}" current="{{current}}" bindchange="swiperChange"  
35 - autoplay="{{true}}" interval="3000" duration="1000" style="height:{{img_heights[current_swiper]}}rpx;">  
36 - <block wx:for="{{detail.banner}}" wx:key="index">  
37 - <navigator url="{{item}}" hover-class="navigator-hover">  
38 - <swiper-item>  
39 - <image src="{{item}}" data-id='{{index}}' class="slide-image" mode="widthFix" bindload="imageLoad"/>  
40 - <!--<image src="http://pk86rwhci.bkt.clouddn.com/banner.png" class="slide-image"></image>-->  
41 - </swiper-item>  
42 - </navigator>  
43 - </block>  
44 - </swiper>  
45 - <view class="dots">  
46 - <block wx:for="{{detail.banner}}" wx:key="index" wx:for-index="idx">  
47 - <view class="dot{{idx == current_swiper ? ' active' : ''}}"></view>  
48 - </block> 2 +<view class="content">
  3 + <!--swiper-->
  4 + <view class="head">
  5 + <view class="position {{hidden_top?'hidden-active':'visible-active'}}">
  6 + <view class="left">
  7 + <!--<image src="../../../images/avatar@2x.png" class="user-avatar"></image>-->
  8 + <image src="{{detail.userPic}}" class="user-avatar"></image>
  9 + <text>{{detail.userName}}</text>
49 </view> 10 </view>
50 - </view>  
51 -  
52 - <!--地点-->  
53 - <view class="area-box">  
54 - <view class="title-box">  
55 - <view class="title">{{detail.title}}</view>  
56 - <view class="over-time">  
57 - <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>  
58 - <text class='' wx:else="">{{detail.time[0].hou}}:{{detail.time[0].min}}:{{detail.time[0].sec}}</text>  
59 - 后停止拼餐 11 + <view class="right">
  12 + <view class="collect" bindtap="collect">
  13 + <view class="iconfont icon-shoucang" wx:if="{{!is_collect}}"></view>
  14 + <view class="iconfont icon-shoucang2" wx:if="{{is_collect}}"></view>
  15 + <text>收藏</text>
60 </view> 16 </view>
61 - <!--<view>-->  
62 - <!--<text class=''>{{detail.time[0].hou}}</text>-->  
63 - <!--<text>:</text>-->  
64 - <!--<text class=''>{{detail.time[0].min}}</text>-->  
65 - <!--<text>:</text>-->  
66 - <!--<text class=' '>{{detail.time[0].sec}}</text>--> 17 + <!--&lt;!&ndash;未收藏&ndash;&gt;-->
  18 + <!--<view class='collect_box' catchtap='sethits_yes' data-index='{{index}}' wx:if='{{items.is_hits==0}}'>-->
  19 + <!--<text class='iconfont icon-shoucang1 '></text>-->
  20 + <!--<text class="collect_word">收藏</text>-->
67 <!--</view>--> 21 <!--</view>-->
68 - </view>  
69 - <view class="area-content">  
70 - <text>{{detail.content}}</text> 22 + <!--&lt;!&ndash;已收藏&ndash;&gt;-->
  23 + <!--<view class='collect_box active' catchtap='sethits_no' data-index='{{index}}' wx:else>-->
  24 + <!--<text class='iconfont icon-shoucang0 star2'></text>-->
  25 + <!--<text class="collect_word">收藏</text>-->
  26 + <!--</view>-->
  27 + <button class="share" open-type="share">
  28 + <view class="iconfont icon-fenxiang2"></view>
  29 + <text>分享</text>
  30 + </button>
71 </view> 31 </view>
72 </view> 32 </view>
  33 + <swiper indicator-dots="{{false}}" current="{{current}}" bindchange="swiperChange"
  34 + autoplay="{{true}}" interval="3000" duration="1000"
  35 + style="height:{{img_heights[current_swiper]}}rpx;">
  36 + <block wx:for="{{detail.banner}}" wx:key="index">
  37 + <navigator url="{{item}}" hover-class="navigator-hover">
  38 + <swiper-item>
  39 + <image src="{{item}}" data-id='{{index}}' class="slide-image" mode="widthFix"
  40 + bindload="imageLoad"/>
  41 + <!--<image src="http://pk86rwhci.bkt.clouddn.com/banner.png" class="slide-image"></image>-->
  42 + </swiper-item>
  43 + </navigator>
  44 + </block>
  45 + </swiper>
  46 + <view class="dots">
  47 + <block wx:for="{{detail.banner}}" wx:key="index" wx:for-index="idx">
  48 + <view class="dot{{idx == current_swiper ? ' active' : ''}}"></view>
  49 + </block>
  50 + </view>
  51 + </view>
73 52
74 - <!--详细时间-->  
75 - <view class="detail-box">  
76 - <text>类别：{{detail.selectName}}</text>  
77 - <text>时间：{{end_time}}</text>  
78 - <text>地点：{{detail.name}}</text>  
79 - <view class="position" bindtap="getNavigate">  
80 - <text class="address">地址：{{detail.address}}</text>  
81 - <text class="iconfont icon-location"></text> 53 + <!--地点-->
  54 + <view class="area-box">
  55 + <view class="title-box">
  56 + <view class="title">{{detail.title}}</view>
  57 + <view class="over-time">
  58 + <text class='' wx:if="{{detail.time[0].day !== '00'}}">
  59 + {{detail.time[0].day}}天{{detail.time[0].hou}}:{{detail.time[0].min}}:{{detail.time[0].sec}}
  60 + </text>
  61 + <text class='' wx:else="">{{detail.time[0].hou}}:{{detail.time[0].min}}:{{detail.time[0].sec}}
  62 + </text>
  63 + 后停止拼餐
82 </view> 64 </view>
  65 + <!--<view>-->
  66 + <!--<text class=''>{{detail.time[0].hou}}</text>-->
  67 + <!--<text>:</text>-->
  68 + <!--<text class=''>{{detail.time[0].min}}</text>-->
  69 + <!--<text>:</text>-->
  70 + <!--<text class=' '>{{detail.time[0].sec}}</text>-->
  71 + <!--</view>-->
  72 + </view>
  73 + <view class="area-content">
  74 + <text>{{detail.content}}</text>
83 </view> 75 </view>
  76 + </view>
84 77
85 - <!--已加入人员-->  
86 - <view class="join-num">已加入人员</view>  
87 - <view class="people-list" wx:if="{{join_people.length>0}}">  
88 - <view class="people" wx:for="{{join_people}}" wx:key="index">  
89 - <view class="bg">  
90 - <image src="{{item.pic}}" class="people-img"></image>  
91 - </view>  
92 - <view class="people-num">  
93 - <view class="name">{{item.name}}</view>  
94 - <view class="num">({{item.number}})</view>  
95 - </view>  
96 - </view> 78 + <!--详细时间-->
  79 + <view class="detail-box">
  80 + <text>类别：{{detail.selectName}}</text>
  81 + <text>时间：{{end_time}}</text>
  82 + <text>地点：{{detail.name}}</text>
  83 + <view class="position" bindtap="getNavigate">
  84 + <text class="address">地址：{{detail.address}}</text>
  85 + <text class="iconfont icon-location"></text>
97 </view> 86 </view>
  87 + </view>
98 88
99 - <!--留言板 问一问-->  
100 - <view class="comment-box">  
101 - <view class="title-box">  
102 - <text class="comment-num">留言板 ({{count}})</text>  
103 - <view class="ask-btn" bindtap="ask">  
104 - <text class="iconfont icon-bianji"></text>  
105 - <text>问一问</text>  
106 - </view> 89 + <!--已加入人员-->
  90 + <view class="join-num">已加入人员</view>
  91 + <view class="people-list" wx:if="{{join_people.length>0}}">
  92 + <view class="people" wx:for="{{join_people}}" wx:key="index">
  93 + <view class="bg">
  94 + <image src="{{item.pic}}" class="people-img"></image>
107 </view> 95 </view>
  96 + <view class="people-num">
  97 + <view class="name">{{item.name}}</view>
  98 + <view class="num">({{item.number}})</view>
  99 + </view>
  100 + </view>
  101 + </view>
108 102
109 - <!--评论框-->  
110 - <view wx:if="{{display}}" class="comment {{display?'t-active':''}}">  
111 - <input  
112 -  
113 - auto-focus="{{display}}"  
114 - focus="{{display}}"  
115 - value="{{content}}"  
116 - cursor-spacing="50"  
117 - maxlength="300"  
118 - bindblur="blur"  
119 - bindinput="inputComment"  
120 - bindconfirm="confirm"  
121 - show-confirm-bar="{{false}}"  
122 - placeholder="{{placeholder}}"/> 103 + <!--留言板 问一问-->
  104 + <view class="comment-box">
  105 + <view class="title-box">
  106 + <text class="comment-num">留言板 ({{count}})</text>
  107 + <view class="ask-btn" bindtap="ask">
  108 + <text class="iconfont icon-bianji"></text>
  109 + <text>问一问</text>
  110 + </view>
  111 + </view>
123 112
124 - <view class="send-box">  
125 - <text class="send" bindtap="clickComment">发送</text> 113 + <!--评论框-->
  114 + <view wx:if="{{display}}" class="comment {{display?'t-active':''}}">
  115 + <form bindsubmit="clickComment" bindreset="formReset" report-submit="true">
  116 + <view class="common-box">
  117 + <input
  118 + auto-focus="{{display}}"
  119 + focus="{{display}}"
  120 + value="{{content}}"
  121 + cursor-spacing="50"
  122 + maxlength="300"
  123 + bindblur="blur"
  124 + bindinput="inputComment"
  125 + bindconfirm="confirm"
  126 + show-confirm-bar="{{false}}"
  127 + placeholder="{{placeholder}}"/>
  128 + <button class="send-box" form-type="submit">
  129 + <text class="send">发送</text>
  130 + </button>
126 </view> 131 </view>
127 - </view> 132 + </form>
  133 + </view>
128 134
129 - <!--评论-->  
130 - <view class="comment-list-box">  
131 - <view class="comment-item" wx:for="{{commentList}}" wx:key="index" wx:for-item="comment">  
132 - <view class="top-content">  
133 - <view class="top-left">  
134 - <!--<image src="../../../images/avatar@2x.png" class="release-img"></image>-->  
135 - <image src="{{comment.userPic}}" class="release-img"></image>  
136 - <text>{{comment.userName}} {{comment.create_time}}</text>  
137 - </view>  
138 - <view class="top-right" bindtap="clickZan" data-id="{{comment.id}}" data-index="{{index}}">  
139 - <text>{{comment.prefect}}</text>  
140 - <text class="iconfont icon-zan" wx:if="{{!comment.is_prefect}}"></text>  
141 - <text class="iconfont icon-z-likeFill" wx:if="{{comment.is_prefect}}"></text>  
142 - </view> 135 + <!--评论-->
  136 + <view class="comment-list-box">
  137 + <view class="comment-item" wx:for="{{commentList}}" wx:key="index" wx:for-item="comment">
  138 + <view class="top-content">
  139 + <view class="top-left">
  140 + <!--<image src="../../../images/avatar@2x.png" class="release-img"></image>-->
  141 + <image src="{{comment.userPic}}" class="release-img"></image>
  142 + <text>{{comment.userName}} {{comment.create_time}}</text>
143 </view> 143 </view>
144 - <view class="comment-detail">  
145 - <view class="user-release">  
146 - <view class="release-comment">{{comment.content}}</view>  
147 - <text class="reply-btn" bindtap="reply" data-id="{{comment.id}}">回复</text>  
148 - </view>  
149 - <view class="user-reply" wx:if="{{comment.son.length>0}}">  
150 - <view class='triangle'></view>  
151 - <block wx:for="{{comment.son}}" wx:key="index">  
152 - <!--<view class="comment">-->  
153 - <!--<text class="reply-name">蚂蚁： </text>-->  
154 - <!--<text>{{item.content}}第一次拼餐，心里还是比较兴奋的，但是又担心拼友会比较无聊，但是没想到拼友和餐厅都非常好！</text>-->  
155 - <!--</view>-->  
156 - <view class="reply">  
157 - <text class="reply-name">{{detail.userName}}</text>  
158 - <text>回复</text>  
159 - <text class="reply-name">{{comment.userName}}：</text>  
160 - <text>{{item.content}}</text>  
161 - </view>  
162 - </block>  
163 - </view> 144 + <view class="top-right" bindtap="clickZan" data-id="{{comment.id}}" data-index="{{index}}">
  145 + <text>{{comment.prefect}}</text>
  146 + <text class="iconfont icon-zan" wx:if="{{!comment.is_prefect}}"></text>
  147 + <text class="iconfont icon-z-likeFill" wx:if="{{comment.is_prefect}}"></text>
  148 + </view>
  149 + </view>
  150 + <view class="comment-detail">
  151 + <view class="user-release">
  152 + <view class="release-comment">{{comment.content}}</view>
  153 + <text class="reply-btn" bindtap="reply" data-id="{{comment.id}}">回复</text>
  154 + </view>
  155 + <view class="user-reply" wx:if="{{comment.son.length>0}}">
  156 + <view class='triangle'></view>
  157 + <block wx:for="{{comment.son}}" wx:key="index">
  158 + <!--<view class="comment">-->
  159 + <!--<text class="reply-name">蚂蚁： </text>-->
  160 + <!--<text>{{item.content}}第一次拼餐，心里还是比较兴奋的，但是又担心拼友会比较无聊，但是没想到拼友和餐厅都非常好！</text>-->
  161 + <!--</view>-->
  162 + <view class="reply">
  163 + <text class="reply-name">{{detail.userName}}</text>
  164 + <text>回复</text>
  165 + <text class="reply-name">{{comment.userName}}：</text>
  166 + <text>{{item.content}}</text>
  167 + </view>
  168 + </block>
164 </view> 169 </view>
165 </view> 170 </view>
166 </view> 171 </view>
167 </view> 172 </view>
  173 + </view>
168 174
169 - <!--底部btn-->  
170 - <view class="bottom-btn" wx:if="{{!display}}">  
171 - <view class="add-btn">  
172 - <view class="input_box">  
173 - <view class="iconfont icon-jian {{num==1?'disable':''}}" bindtap='minusCount'></view>  
174 - <view class='item_cart_num'>{{num}}</view>  
175 - <view class='iconfont icon-jia1' bindtap='addCount'></view>  
176 - </view> 175 + <!--底部btn-->
  176 + <view class="bottom-btn" wx:if="{{!display}}">
  177 + <view class="add-btn">
  178 + <view class="input_box">
  179 + <view class="iconfont icon-jian {{num==1?'disable':''}}" bindtap='minusCount'></view>
  180 + <view class='item_cart_num'>{{num}}</view>
  181 + <view class='iconfont icon-jia1' bindtap='addCount'></view>
177 </view> 182 </view>
178 - <!--（0全部，2待处理，4已拼成，5已取消，6已完成-->  
179 - <button class="confirm-join-btn {{is_join || detail.status === 5 || detail.status === 6?'gray':''}}" form-type="submit">  
180 - <text wx:if="{{is_join}}">待拼成</text>  
181 - <text wx:if="{{!is_join && detail.status === 2}}">确认拼活动</text> 183 + </view>
  184 + <form bindsubmit="confirmJoin" bindreset="formReset" report-submit="true">
  185 + <!-- // （0全部，2待拼成，3人数不足未拼成,4已拼成，5已取消，6已完成，7已评价，8已拼成（活动未结束）,9删除-->
  186 + <button class="confirm-join-btn {{is_send === 1 && detail.status !== 8?'gray':''}}" form-type="submit">
  187 + <text wx:if="{{is_send === 1 && detail.status === 2}}">待拼成</text>
  188 + <text wx:if="{{is_send === 2 &&detail.status === 2}}">确认拼活动</text>
  189 + <text wx:if="{{detail.status === 3}}">未拼成</text>
  190 + <text wx:if="{{detail.status === 4}}">已拼成</text>
182 <text wx:if="{{detail.status === 5}}">已取消</text> 191 <text wx:if="{{detail.status === 5}}">已取消</text>
183 - <text wx:if="{{detail.status === 6}}">已完成</text> 192 + <text wx:if="{{detail.status === 6 || detail.status === 7}}">已完成</text>
  193 + <text wx:if="{{detail.status === 8}}">已拼成</text>
  194 + <text wx:if="{{detail.status === 9}}">已删除</text>
184 </button> 195 </button>
185 - </view> 196 + </form>
  197 + </view>
186 198
187 - <!--参与成功弹框-->  
188 - <view class="modal" wx:if="{{is_showRelease_modal}}" catchtouchmove="disableScroll">  
189 - <image class="sorry-img" src="../../../images/success@2x.png"></image>  
190 - <view class="title">恭喜您拼活动成功</view>  
191 - <view class="view-btn" catchtap="goMyOrder">查看我的订单</view>  
192 - <view class="complete-btn" catchtap="goBack">完成</view>  
193 - </view>  
194 - <view class="modal_box" wx:if="{{is_showRelease_modal}}" bindtap="handleBackground"  
195 - catchtouchmove="disableScroll"></view> 199 + <!--参与成功弹框-->
  200 + <view class="modal" wx:if="{{is_showRelease_modal}}" catchtouchmove="disableScroll">
  201 + <image class="sorry-img" src="../../../images/success@2x.png"></image>
  202 + <view class="title">恭喜您拼活动成功</view>
  203 + <view class="view-btn" catchtap="goMyOrder">查看我的订单</view>
  204 + <view class="complete-btn" catchtap="goBack">完成</view>
196 </view> 205 </view>
197 -</form> 206 + <view class="modal_box" wx:if="{{is_showRelease_modal}}" bindtap="handleBackground"
  207 + catchtouchmove="disableScroll"></view>
  208 +</view>
@@ -453,6 +453,15 @@ swiper { @@ -453,6 +453,15 @@ swiper {
453 left:0; 453 left:0;
454 z-index:20; 454 z-index:20;
455 } 455 }
  456 +.comment form {
  457 + width: 100%;
  458 +}
  459 +.comment .common-box {
  460 + width:100%;
  461 + display: flex;
  462 + align-items: center;
  463 + justify-content: space-between;
  464 +}
456 .comment input { 465 .comment input {
457 border-radius: 50rpx; 466 border-radius: 50rpx;
458 width: 83.5%; 467 width: 83.5%;
@@ -468,7 +477,7 @@ swiper { @@ -468,7 +477,7 @@ swiper {
468 } 477 }
469 .t-active { 478 .t-active {
470 border-radius: 4rpx; 479 border-radius: 4rpx;
471 - width: 91.5%; 480 + width: 100%;
472 /*height: 300rpx;*/ 481 /*height: 300rpx;*/
473 /*background-color: #f2f2f2;*/ 482 /*background-color: #f2f2f2;*/
474 font-size: 26rpx; 483 font-size: 26rpx;
@@ -476,6 +485,9 @@ swiper { @@ -476,6 +485,9 @@ swiper {
476 display: flex; 485 display: flex;
477 justify-content: right; 486 justify-content: right;
478 align-items: right; 487 align-items: right;
  488 + -webkit-box-sizing: border-box;
  489 + -moz-box-sizing: border-box;
  490 + box-sizing: border-box;
479 } 491 }
480 492
481 .send-box .send { 493 .send-box .send {
@@ -490,10 +502,16 @@ swiper { @@ -490,10 +502,16 @@ swiper {
490 text-align: center; 502 text-align: center;
491 } 503 }
492 .send-box { 504 .send-box {
  505 + width: 100rpx;
493 height: 60rpx; 506 height: 60rpx;
494 display: flex; 507 display: flex;
495 justify-content: flex-end; 508 justify-content: flex-end;
496 margin-left: 10rpx; 509 margin-left: 10rpx;
  510 + margin-right:0;
  511 + padding: 0;
  512 +}
  513 +.send-box::after {
  514 + border:0;
497 } 515 }
498 .modal { 516 .modal {
499 width: 73%; 517 width: 73%;
@@ -11,16 +11,16 @@ Component({ @@ -11,16 +11,16 @@ Component({
11 img_height = e.detail.height, 11 img_height = e.detail.height,
12 //宽高比 12 //宽高比
13 ratio = img_width / img_height; 13 ratio = img_width / img_height;
14 - console.log('图片组件',img_width, img_height); 14 + // console.log('图片组件',e,img_width, img_height);
15 //计算的高度值 15 //计算的高度值
16 var viewHeight = 750 / ratio; 16 var viewHeight = 750 / ratio;
17 var img_height = viewHeight; 17 var img_height = viewHeight;
18 var img_heights = this.data.img_heights; 18 var img_heights = this.data.img_heights;
19 //把每一张图片的对应的高度记录到数组里 19 //把每一张图片的对应的高度记录到数组里
20 - img_heights[e.target.dataset.id] = img_height;  
21 - this.setData({  
22 - img_heights: img_heights  
23 - }) 20 + // img_heights[e.target.dataset.id] = img_height;
  21 + // this.setData({
  22 + // img_heights: img_heights
  23 + // })
24 }, 24 },
25 } 25 }
26 }) 26 })
1 <view class="img-box" data-index="{{index}}"> 1 <view class="img-box" data-index="{{index}}">
2 <view class="img-border"> 2 <view class="img-border">
3 - <image src="{{item.pic}}" mode="widthFix" data-id='{{index}}' style="height:{{img_heights[current_swiper]}}rpx;" bindload="imageLoad"></image> 3 + <!--style="height:{{img_heights[current_swiper]}}rpx;"-->
  4 + <image src="{{item.pic}}" mode="widthFix" data-id='{{index}}' bindload="imageLoad"></image>
4 <view class="area"> 5 <view class="area">
5 <text class="name">{{item.title}}</text> 6 <text class="name">{{item.title}}</text>
6 </view> 7 </view>
7 <!--<text>2018.4.28—4.30</text>--> 8 <!--<text>2018.4.28—4.30</text>-->
8 <view class="bottom"> 9 <view class="bottom">
9 <image src="{{item.userPic}}" class="avatar" mode="aspectFill"></image> 10 <image src="{{item.userPic}}" class="avatar" mode="aspectFill"></image>
10 - <text>{{item.time}}</text> 11 + <text>{{item.listTime}}</text>
11 <!--<view>2018.4.28</view>--> 12 <!--<view>2018.4.28</view>-->
12 </view> 13 </view>
13 <view class="num">距最低人数{{item.people}}人</view> 14 <view class="num">距最低人数{{item.people}}人</view>
@@ -31,6 +31,7 @@ @@ -31,6 +31,7 @@
31 .num { 31 .num {
32 color: #666666; 32 color: #666666;
33 font-size: 24rpx; 33 font-size: 24rpx;
  34 + text-align: right;
34 } 35 }
35 .bottom { 36 .bottom {
36 display: flex; 37 display: flex;
@@ -38,8 +39,8 @@ @@ -38,8 +39,8 @@
38 justify-content: space-between; 39 justify-content: space-between;
39 } 40 }
40 .img-box .bottom .avatar{ 41 .img-box .bottom .avatar{
41 - width: 30rpx;  
42 - height: 30rpx; 42 + width: 40rpx;
  43 + height: 40rpx;
43 border-radius: 50%; 44 border-radius: 50%;
44 } 45 }
45 /*.bottom .avatar image {*/ 46 /*.bottom .avatar image {*/
@@ -30,6 +30,10 @@ Page({ @@ -30,6 +30,10 @@ Page({
30 hasUserInfo: false, 30 hasUserInfo: false,
31 canIUse: wx.canIUse('button.open-type.getUserInfo') 31 canIUse: wx.canIUse('button.open-type.getUserInfo')
32 }, 32 },
  33 + //banner跳转
  34 + navigator() {
  35 + // if() {}
  36 + },
33 //关闭金火柴勋章弹框 37 //关闭金火柴勋章弹框
34 close() { 38 close() {
35 this.setData({show_gold_modal:false,show_normal_modal:false}); 39 this.setData({show_gold_modal:false,show_normal_modal:false});
@@ -20,10 +20,12 @@ @@ -20,10 +20,12 @@
20 autoplay="{{true}}" interval="3000" duration="1000"> 20 autoplay="{{true}}" interval="3000" duration="1000">
21 <block wx:for="{{slide}}" wx:key="index"> 21 <block wx:for="{{slide}}" wx:key="index">
22 <navigator url="{{item.link}}" hover-class="navigator-hover"> 22 <navigator url="{{item.link}}" hover-class="navigator-hover">
  23 + <!--<view class="navigator" bindtap="navigator">-->
23 <swiper-item> 24 <swiper-item>
24 <image src="{{item.pic}}" class="slide-image"/> 25 <image src="{{item.pic}}" class="slide-image"/>
25 <!--<image src="http://pk86rwhci.bkt.clouddn.com/banner.png" class="slide-image"/>--> 26 <!--<image src="http://pk86rwhci.bkt.clouddn.com/banner.png" class="slide-image"/>-->
26 </swiper-item> 27 </swiper-item>
  28 + <!--</view>-->
27 </navigator> 29 </navigator>
28 </block> 30 </block>
29 </swiper> 31 </swiper>
@@ -99,7 +101,7 @@ @@ -99,7 +101,7 @@
99 <view class="fix pl5 pr5 box_bb" bindtap="goMealDetail" data-id="{{item.id}}"> 101 <view class="fix pl5 pr5 box_bb" bindtap="goMealDetail" data-id="{{item.id}}">
100 <!--<navigator url="">--> 102 <!--<navigator url="">-->
101 <image class="banner mt10 {{currentBannerIndex==index?'active':''}}" src="{{item.pic}}" mode="aspectFill" /> 103 <image class="banner mt10 {{currentBannerIndex==index?'active':''}}" src="{{item.pic}}" mode="aspectFill" />
102 - <text>{{item.title}} {{item.time}}</text> 104 + <text>{{item.title}} {{item.listTime}}</text>
103 <!--</navigator>--> 105 <!--</navigator>-->
104 </view> 106 </view>
105 </swiper-item> 107 </swiper-item>
@@ -71,7 +71,7 @@ Page({ @@ -71,7 +71,7 @@ Page({
71 this.setData({ content: e.detail.value }); 71 this.setData({ content: e.detail.value });
72 }, 72 },
73 //发送评论/回复 73 //发送评论/回复
74 - clickComment() { 74 + clickComment(e) {
75 this.setData({ display: false }); 75 this.setData({ display: false });
76 if(this.data.content === '' ) { 76 if(this.data.content === '' ) {
77 wx.showToast({title:'请输入内容',icon:'none'}) 77 wx.showToast({title:'请输入内容',icon:'none'})
@@ -82,6 +82,7 @@ Page({ @@ -82,6 +82,7 @@ Page({
82 activeId:this.data.detail_id, 82 activeId:this.data.detail_id,
83 commonId: this.data.is_ask?0:this.data.commet_id, 83 commonId: this.data.is_ask?0:this.data.commet_id,
84 content:this.data.content, 84 content:this.data.content,
  85 + formId:e.detail.formId,
85 }; 86 };
86 app.post(url,params,{}).then((res)=>{ 87 app.post(url,params,{}).then((res)=>{
87 console.log('提交评论',res); 88 console.log('提交评论',res);
@@ -236,6 +237,7 @@ Page({ @@ -236,6 +237,7 @@ Page({
236 commentList:res.data.common, 237 commentList:res.data.common,
237 is_collect:res.data.is_collect, 238 is_collect:res.data.is_collect,
238 count:res.data.count, 239 count:res.data.count,
  240 + is_send:res.data.is_send,//能否参加1：不能2：能
239 }); 241 });
240 // self.countDown(); 242 // self.countDown();
241 243
@@ -272,26 +274,28 @@ Page({ @@ -272,26 +274,28 @@ Page({
272 //确认拼餐 274 //确认拼餐
273 confirmJoin(e) { 275 confirmJoin(e) {
274 const self = this; 276 const self = this;
275 - let url = '/portal/Active/join';  
276 - let params = {  
277 - token: wx.getStorageSync('token'),  
278 - number: self.data.num,  
279 - activeId: self.data.detail_id,  
280 - formId: e.detail.formId,  
281 - };  
282 - let header = {  
283 - "token": wx.getStorageSync('token')  
284 - };  
285 - app.post(url, params, {}).then((res) => {  
286 - console.log('确认拼餐', res);  
287 - if (+res.code === 1) {  
288 - // wx.showToast({title:'拼餐成功',icon:'success'});  
289 - self.setData({is_showRelease_modal:true,order_id:+res.data.orderId,is_join:true});  
290 - self.getDetail();  
291 - }else if(+res.code === 0) { //参与失败按钮还是确认拼活动  
292 - self.setData({is_join:false});  
293 - }  
294 - }) 277 + if(+self.data.is_send === 2){ //1:不能参与2：可参与
  278 + let url = '/portal/Active/join';
  279 + let params = {
  280 + token: wx.getStorageSync('token'),
  281 + number: self.data.num,
  282 + activeId: self.data.detail_id,
  283 + formId: e.detail.formId,
  284 + };
  285 + let header = {
  286 + "token": wx.getStorageSync('token')
  287 + };
  288 + app.post(url, params, {}).then((res) => {
  289 + console.log('确认拼餐', res);
  290 + if (+res.code === 1) {
  291 + // wx.showToast({title:'拼餐成功',icon:'success'});
  292 + self.setData({is_showRelease_modal:true,order_id:+res.data.orderId,is_join:true});
  293 + self.getDetail();
  294 + }else if(+res.code === 0) { //参与失败按钮还是确认拼活动
  295 + self.setData({is_join:false});
  296 + }
  297 + })
  298 + }
295 }, 299 },
296 timeFormat(param) { //小于10的格式化函数 300 timeFormat(param) { //小于10的格式化函数
297 return param < 10 ? '0' + param : param; 301 return param < 10 ? '0' + param : param;
@@ -313,7 +317,7 @@ Page({ @@ -313,7 +317,7 @@ Page({
313 // console.log('surplus', this.data.detail.surplus); 317 // console.log('surplus', this.data.detail.surplus);
314 // t = setTimeout(this.countDown, 1000); 318 // t = setTimeout(this.countDown, 1000);
315 const time = app.initTime(this.data.detail.surplus); 319 const time = app.initTime(this.data.detail.surplus);
316 - console.log('time', time); 320 + // console.log('time', time);
317 obj = { 321 obj = {
318 day: time[0].day, 322 day: time[0].day,
319 hou: time[0].hou, 323 hou: time[0].hou,
1 <!--pages/activity/detail/detail.wxml--> 1 <!--pages/activity/detail/detail.wxml-->
2 -<form bindsubmit="confirmJoin" bindreset="formReset" report-submit="true">  
3 - <view class="content">  
4 - <!--swiper-->  
5 - <view class="head">  
6 - <view class="position {{hidden_top?'hidden-active':'visible-active'}}">  
7 - <view class="left">  
8 - <!--<image src="../../../images/avatar@2x.png" class="user-avatar"></image>-->  
9 - <image src="{{detail.userPic}}" class="user-avatar"></image>  
10 - <text>{{detail.userName}}</text>  
11 - </view>  
12 - <view class="right">  
13 - <view class="collect" bindtap="collect">  
14 - <view class="iconfont icon-shoucang" wx:if="{{!is_collect}}"></view>  
15 - <view class="iconfont icon-shoucang2" wx:if="{{is_collect}}"></view>  
16 - <text>收藏</text>  
17 - </view>  
18 - <!--&lt;!&ndash;未收藏&ndash;&gt;-->  
19 - <!--<view class='collect_box' catchtap='sethits_yes' data-index='{{index}}' wx:if='{{items.is_hits==0}}'>-->  
20 - <!--<text class='iconfont icon-shoucang1 '></text>-->  
21 - <!--<text class="collect_word">收藏</text>-->  
22 - <!--</view>-->  
23 - <!--&lt;!&ndash;已收藏&ndash;&gt;-->  
24 - <!--<view class='collect_box active' catchtap='sethits_no' data-index='{{index}}' wx:else>-->  
25 - <!--<text class='iconfont icon-shoucang0 star2'></text>-->  
26 - <!--<text class="collect_word">收藏</text>-->  
27 - <!--</view>-->  
28 - <button class="share" open-type="share">  
29 - <view class="iconfont icon-fenxiang2"></view>  
30 - <text>分享</text>  
31 - </button>  
32 - </view>  
33 - </view>  
34 - <swiper indicator-dots="{{false}}" current="{{current}}" bindchange="swiperChange" style="height:{{img_heights[current_swiper]}}rpx;"  
35 - autoplay="{{true}}" interval="3000" duration="1000">  
36 - <block wx:for="{{detail.banner}}" wx:key="index">  
37 - <navigator url="{{item}}" hover-class="navigator-hover">  
38 - <swiper-item>  
39 - <image src="{{item}}" data-id='{{index}}' class="slide-image" mode="widthFix" bindload="imageLoad"/>  
40 - <!--<image src="http://pk86rwhci.bkt.clouddn.com/banner.png" class="slide-image"></image>-->  
41 - </swiper-item>  
42 - </navigator>  
43 - </block>  
44 - </swiper>  
45 - <view class="dots">  
46 - <block wx:for="{{detail.banner}}" wx:key="index" wx:for-index="idx">  
47 - <view class="dot{{idx == current_swiper ? ' active' : ''}}"></view>  
48 - </block> 2 +<view class="content">
  3 + <!--swiper-->
  4 + <view class="head">
  5 + <view class="position {{hidden_top?'hidden-active':'visible-active'}}">
  6 + <view class="left">
  7 + <!--<image src="../../../images/avatar@2x.png" class="user-avatar"></image>-->
  8 + <image src="{{detail.userPic}}" class="user-avatar"></image>
  9 + <text>{{detail.userName}}</text>
49 </view> 10 </view>
50 - </view>  
51 -  
52 - <!--地点-->  
53 - <view class="area-box">  
54 - <view class="title-box">  
55 - <view class="title">{{detail.title}}</view>  
56 - <view class="over-time">  
57 - <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>  
58 - <text class='' wx:else="">{{detail.time[0].hou}}:{{detail.time[0].min}}:{{detail.time[0].sec}}</text>  
59 - 后停止拼餐 11 + <view class="right">
  12 + <view class="collect" bindtap="collect">
  13 + <view class="iconfont icon-shoucang" wx:if="{{!is_collect}}"></view>
  14 + <view class="iconfont icon-shoucang2" wx:if="{{is_collect}}"></view>
  15 + <text>收藏</text>
60 </view> 16 </view>
61 - <!--<view>-->  
62 - <!--<text class=''>{{detail.time[0].hou}}</text>-->  
63 - <!--<text>:</text>-->  
64 - <!--<text class=''>{{detail.time[0].min}}</text>-->  
65 - <!--<text>:</text>-->  
66 - <!--<text class=' '>{{detail.time[0].sec}}</text>--> 17 + <!--&lt;!&ndash;未收藏&ndash;&gt;-->
  18 + <!--<view class='collect_box' catchtap='sethits_yes' data-index='{{index}}' wx:if='{{items.is_hits==0}}'>-->
  19 + <!--<text class='iconfont icon-shoucang1 '></text>-->
  20 + <!--<text class="collect_word">收藏</text>-->
67 <!--</view>--> 21 <!--</view>-->
  22 + <!--&lt;!&ndash;已收藏&ndash;&gt;-->
  23 + <!--<view class='collect_box active' catchtap='sethits_no' data-index='{{index}}' wx:else>-->
  24 + <!--<text class='iconfont icon-shoucang0 star2'></text>-->
  25 + <!--<text class="collect_word">收藏</text>-->
  26 + <!--</view>-->
  27 + <button class="share" open-type="share">
  28 + <view class="iconfont icon-fenxiang2"></view>
  29 + <text>分享</text>
  30 + </button>
68 </view> 31 </view>
69 - <view class="area-content">  
70 - <text>{{detail.content}}</text>  
71 - <!--云峰山风景区坐落于密云水库北不老屯镇，燕落村北三公里，处于-->  
72 - <!--密云区东西两大风景区之间，东靠密云古北口 ──司马台长城──-->  
73 - <!--雾灵山风景区。-->  
74 - </view>  
75 </view> 32 </view>
  33 + <swiper indicator-dots="{{false}}" current="{{current}}" bindchange="swiperChange"
  34 + style="height:{{img_heights[current_swiper]}}rpx;"
  35 + autoplay="{{true}}" interval="3000" duration="1000">
  36 + <block wx:for="{{detail.banner}}" wx:key="index">
  37 + <navigator url="{{item}}" hover-class="navigator-hover">
  38 + <swiper-item>
  39 + <image src="{{item}}" data-id='{{index}}' class="slide-image" mode="widthFix"
  40 + bindload="imageLoad"/>
  41 + <!--<image src="http://pk86rwhci.bkt.clouddn.com/banner.png" class="slide-image"></image>-->
  42 + </swiper-item>
  43 + </navigator>
  44 + </block>
  45 + </swiper>
  46 + <view class="dots">
  47 + <block wx:for="{{detail.banner}}" wx:key="index" wx:for-index="idx">
  48 + <view class="dot{{idx == current_swiper ? ' active' : ''}}"></view>
  49 + </block>
  50 + </view>
  51 + </view>
76 52
77 - <!--详细时间-->  
78 - <view class="detail-box">  
79 - <text>时间：{{end_time}}</text>  
80 - <text>餐厅：{{detail.name}}</text><!--餐厅-->  
81 - <view class="position" bindtap="getNavigate">  
82 - <text class="address">地址：{{detail.address}}</text><!--地址：-->  
83 - <!--侨福芳草地B2 OPERA BOMBANA-->  
84 - <text class="iconfont icon-location"></text> 53 + <!--地点-->
  54 + <view class="area-box">
  55 + <view class="title-box">
  56 + <view class="title">{{detail.title}}</view>
  57 + <view class="over-time">
  58 + <text class='' wx:if="{{detail.time[0].day !== '00'}}">
  59 + {{detail.time[0].day}}天{{detail.time[0].hou}}:{{detail.time[0].min}}:{{detail.time[0].sec}}
  60 + </text>
  61 + <text class='' wx:else="">{{detail.time[0].hou}}:{{detail.time[0].min}}:{{detail.time[0].sec}}</text>
  62 + 后停止拼餐
85 </view> 63 </view>
86 - <text>菜系：{{detail.selectName}}</text>  
87 - <!--意大利菜--> 64 + <!--<view>-->
  65 + <!--<text class=''>{{detail.time[0].hou}}</text>-->
  66 + <!--<text>:</text>-->
  67 + <!--<text class=''>{{detail.time[0].min}}</text>-->
  68 + <!--<text>:</text>-->
  69 + <!--<text class=' '>{{detail.time[0].sec}}</text>-->
  70 + <!--</view>-->
  71 + </view>
  72 + <view class="area-content">
  73 + <text>{{detail.content}}</text>
  74 + <!--云峰山风景区坐落于密云水库北不老屯镇，燕落村北三公里，处于-->
  75 + <!--密云区东西两大风景区之间，东靠密云古北口 ──司马台长城──-->
  76 + <!--雾灵山风景区。-->
88 </view> 77 </view>
  78 + </view>
89 79
90 - <!--已加入人员-->  
91 - <view class="join-num">已加入人员</view>  
92 - <view class="people-list" wx:if="{{join_people.length>0}}">  
93 - <view class="people" wx:for="{{join_people}}" wx:key="index">  
94 - <view class="bg">  
95 - <image src="{{item.pic}}" class="people-img"></image>  
96 - </view>  
97 - <view class="people-num">  
98 - <view class="name">{{item.name}}</view>  
99 - <view class="num">({{item.number}})</view>  
100 - </view>  
101 - </view> 80 + <!--详细时间-->
  81 + <view class="detail-box">
  82 + <text>时间：{{end_time}}</text>
  83 + <text>餐厅：{{detail.name}}</text><!--餐厅-->
  84 + <view class="position" bindtap="getNavigate">
  85 + <text class="address">地址：{{detail.address}}</text><!--地址：-->
  86 + <!--侨福芳草地B2 OPERA BOMBANA-->
  87 + <text class="iconfont icon-location"></text>
102 </view> 88 </view>
  89 + <text>菜系：{{detail.selectName}}</text>
  90 + <!--意大利菜-->
  91 + </view>
103 92
104 - <!--留言板 问一问-->  
105 - <view class="comment-box">  
106 - <view class="title-box">  
107 - <text class="comment-num">留言板 ({{count}})</text>  
108 - <view class="ask-btn" bindtap="ask">  
109 - <text class="iconfont icon-bianji"></text>  
110 - <text>问一问</text>  
111 - <!--<input type="text" class="ask-input" bindinput="ask" focus="{{focus}}"/>-->  
112 - </view> 93 + <!--已加入人员-->
  94 + <view class="join-num">已加入人员</view>
  95 + <view class="people-list" wx:if="{{join_people.length>0}}">
  96 + <view class="people" wx:for="{{join_people}}" wx:key="index">
  97 + <view class="bg">
  98 + <image src="{{item.pic}}" class="people-img"></image>
113 </view> 99 </view>
  100 + <view class="people-num">
  101 + <view class="name">{{item.name}}</view>
  102 + <view class="num">({{item.number}})</view>
  103 + </view>
  104 + </view>
  105 + </view>
114 106
115 - <!--评论框-->  
116 - <view wx:if="{{display}}" class="comment {{display?'t-active':''}}">  
117 - <input 107 + <!--留言板 问一问-->
  108 + <view class="comment-box">
  109 + <view class="title-box">
  110 + <text class="comment-num">留言板 ({{count}})</text>
  111 + <view class="ask-btn" bindtap="ask">
  112 + <text class="iconfont icon-bianji"></text>
  113 + <text>问一问</text>
  114 + <!--<input type="text" class="ask-input" bindinput="ask" focus="{{focus}}"/>-->
  115 + </view>
  116 + </view>
118 117
119 - auto-focus="{{display}}"  
120 - focus="{{display}}"  
121 - value="{{content}}"  
122 - cursor-spacing="50"  
123 - maxlength="300"  
124 - bindblur="blur"  
125 - bindinput="inputComment"  
126 - bindconfirm="confirm"  
127 - show-confirm-bar="{{false}}"  
128 - placeholder="{{placeholder}}"/> 118 + <!--评论框-->
  119 + <view wx:if="{{display}}" class="comment {{display?'t-active':''}}">
  120 + <form bindsubmit="clickComment" bindreset="formReset" report-submit="true">
  121 + <view class="common-box">
  122 + <input
129 123
130 - <view class="send-box">  
131 - <text class="send" bindtap="clickComment">发送</text> 124 + auto-focus="{{display}}"
  125 + focus="{{display}}"
  126 + value="{{content}}"
  127 + cursor-spacing="50"
  128 + maxlength="300"
  129 + bindblur="blur"
  130 + bindinput="inputComment"
  131 + bindconfirm="confirm"
  132 + show-confirm-bar="{{false}}"
  133 + placeholder="{{placeholder}}"/>
  134 + <button class="send-box" form-type="submit">
  135 + <text class="send">发送</text>
  136 + </button>
132 </view> 137 </view>
133 - </view> 138 + </form>
  139 + </view>
134 140
135 - <!--评论-->  
136 - <view class="comment-list-box">  
137 - <view class="comment-item" wx:for="{{commentList}}" wx:key="index" wx:for-item="comment">  
138 - <view class="top-content">  
139 - <view class="top-left">  
140 - <!--<image src="../../../images/avatar@2x.png" class="release-img"></image>-->  
141 - <image src="{{comment.userPic}}" class="release-img"></image>  
142 - <text>{{comment.userName}} {{comment.create_time}}</text>  
143 - </view>  
144 - <view class="top-right" bindtap="clickZan" data-id="{{comment.id}}" data-index="{{index}}">  
145 - <text>{{comment.prefect}}</text>  
146 - <text class="iconfont icon-zan" wx:if="{{!comment.is_prefect}}"></text>  
147 - <text class="iconfont icon-z-likeFill" wx:if="{{comment.is_prefect}}"></text>  
148 - </view> 141 + <!--评论-->
  142 + <view class="comment-list-box">
  143 + <view class="comment-item" wx:for="{{commentList}}" wx:key="index" wx:for-item="comment">
  144 + <view class="top-content">
  145 + <view class="top-left">
  146 + <!--<image src="../../../images/avatar@2x.png" class="release-img"></image>-->
  147 + <image src="{{comment.userPic}}" class="release-img"></image>
  148 + <text>{{comment.userName}} {{comment.create_time}}</text>
  149 + </view>
  150 + <view class="top-right" bindtap="clickZan" data-id="{{comment.id}}" data-index="{{index}}">
  151 + <text>{{comment.prefect}}</text>
  152 + <text class="iconfont icon-zan" wx:if="{{!comment.is_prefect}}"></text>
  153 + <text class="iconfont icon-z-likeFill" wx:if="{{comment.is_prefect}}"></text>
149 </view> 154 </view>
150 - <view class="comment-detail">  
151 - <view class="user-release">  
152 - <view class="release-comment">{{comment.content}}</view>  
153 - <text class="reply-btn" bindtap="reply" data-id="{{comment.id}}">回复</text>  
154 - </view>  
155 - <view class="user-reply" wx:if="{{comment.son.length>0}}">  
156 - <view class='triangle'></view>  
157 - <block wx:for="{{comment.son}}" wx:key="index">  
158 - <!--<view class="comment">-->  
159 - <!--<text class="reply-name">蚂蚁： </text>-->  
160 - <!--<text>{{item.content}}第一次拼餐，心里还是比较兴奋的，但是又担心拼友会比较无聊，但是没想到拼友和餐厅都非常好！</text>-->  
161 - <!--</view>-->  
162 - <view class="reply">  
163 - <text class="reply-name">{{detail.userName}}</text>  
164 - <text>回复</text>  
165 - <text class="reply-name">{{comment.userName}}：</text>  
166 - <text>{{item.content}}</text>  
167 - </view>  
168 - </block>  
169 - </view> 155 + </view>
  156 + <view class="comment-detail">
  157 + <view class="user-release">
  158 + <view class="release-comment">{{comment.content}}</view>
  159 + <text class="reply-btn" bindtap="reply" data-id="{{comment.id}}">回复</text>
  160 + </view>
  161 + <view class="user-reply" wx:if="{{comment.son.length>0}}">
  162 + <view class='triangle'></view>
  163 + <block wx:for="{{comment.son}}" wx:key="index">
  164 + <!--<view class="comment">-->
  165 + <!--<text class="reply-name">蚂蚁： </text>-->
  166 + <!--<text>{{item.content}}第一次拼餐，心里还是比较兴奋的，但是又担心拼友会比较无聊，但是没想到拼友和餐厅都非常好！</text>-->
  167 + <!--</view>-->
  168 + <view class="reply">
  169 + <text class="reply-name">{{detail.userName}}</text>
  170 + <text>回复</text>
  171 + <text class="reply-name">{{comment.userName}}：</text>
  172 + <text>{{item.content}}</text>
  173 + </view>
  174 + </block>
170 </view> 175 </view>
171 </view> 176 </view>
172 </view> 177 </view>
173 </view> 178 </view>
  179 + </view>
174 180
175 - <!--底部btn-->  
176 - <view class="bottom-btn" wx:if="{{!display}}">  
177 - <view class="add-btn">  
178 - <view class="input_box">  
179 - <view class="iconfont icon-jian {{num==1?'disable':''}}" bindtap='minusCount'></view>  
180 - <view class='item_cart_num'>{{num}}</view>  
181 - <view class='iconfont icon-jia1' bindtap='addCount'></view>  
182 - </view> 181 + <!--底部btn-->
  182 + <view class="bottom-btn" wx:if="{{!display}}">
  183 + <view class="add-btn">
  184 + <view class="input_box">
  185 + <view class="iconfont icon-jian {{num==1?'disable':''}}" bindtap='minusCount'></view>
  186 + <view class='item_cart_num'>{{num}}</view>
  187 + <view class='iconfont icon-jia1' bindtap='addCount'></view>
183 </view> 188 </view>
184 - <!--（0全部，2待处理，4已拼成，5已取消，6已完成-->  
185 - <button class="confirm-join-btn {{is_join || detail.status === 5 || detail.status === 6?'gray':''}}" form-type="submit">  
186 - <text wx:if="{{is_join}}">待拼成</text>  
187 - <text wx:if="{{!is_join && detail.status === 2}}">确认拼餐</text> 189 + </view>
  190 + <form bindsubmit="confirmJoin" bindreset="formReset" report-submit="true">
  191 + <!--（0全部，2待拼成，3人数不足未拼成,4已拼成，5已取消，6已完成，7已评价，8已拼成（活动未结束）,9删除-->
  192 + <button class="confirm-join-btn {{is_send === 1 && detail.status !== 8?'gray':''}}" form-type="submit">
  193 + <text wx:if="{{is_send === 1 && detail.status === 2}}">待拼成</text>
  194 + <text wx:if="{{is_send === 2 && detail.status === 2}}">确认拼活动</text>
  195 + <text wx:if="{{detail.status === 3}}">未拼成</text>
  196 + <text wx:if="{{detail.status === 4}}">已拼成</text>
188 <text wx:if="{{detail.status === 5}}">已取消</text> 197 <text wx:if="{{detail.status === 5}}">已取消</text>
189 - <text wx:if="{{detail.status === 6}}">已完成</text> 198 + <text wx:if="{{detail.status === 6 || detail.status === 7}}">已完成</text>
  199 + <text wx:if="{{detail.status === 8}}">已拼成</text>
  200 + <text wx:if="{{detail.status === 9}}">已删除</text>
190 </button> 201 </button>
191 - <!--<view class="confirm-join-btn" bindtap="confirmJoin">-->  
192 - <!--<text>确认拼餐</text>-->  
193 - <!--</view>-->  
194 - </view> 202 + </form>
  203 + <!--<view class="confirm-join-btn" bindtap="confirmJoin">-->
  204 + <!--<text>确认拼餐</text>-->
  205 + <!--</view>-->
  206 + </view>
195 207
196 - <!--发布成功弹框-->  
197 - <view class="modal" wx:if="{{is_showRelease_modal}}" catchtouchmove="disableScroll">  
198 - <image class="sorry-img" src="../../../images/success@2x.png"></image>  
199 - <view class="title">恭喜您拼餐成功</view>  
200 - <view class="view-btn" catchtap="goMyRelease">查看我的订单</view>  
201 - <view class="complete-btn" catchtap="goBack">完成</view>  
202 - </view>  
203 - <view class="modal_box" wx:if="{{is_showRelease_modal}}" bindtap="handleBackground"  
204 - catchtouchmove="disableScroll"></view> 208 + <!--发布成功弹框-->
  209 + <view class="modal" wx:if="{{is_showRelease_modal}}" catchtouchmove="disableScroll">
  210 + <image class="sorry-img" src="../../../images/success@2x.png"></image>
  211 + <view class="title">恭喜您拼餐成功</view>
  212 + <view class="view-btn" catchtap="goMyRelease">查看我的订单</view>
  213 + <view class="complete-btn" catchtap="goBack">完成</view>
205 </view> 214 </view>
206 -</form> 215 + <view class="modal_box" wx:if="{{is_showRelease_modal}}" bindtap="handleBackground"
  216 + catchtouchmove="disableScroll"></view>
  217 +</view>
@@ -457,6 +457,15 @@ swiper { @@ -457,6 +457,15 @@ swiper {
457 left:0; 457 left:0;
458 z-index:20; 458 z-index:20;
459 } 459 }
  460 +.comment form {
  461 + width: 100%;
  462 +}
  463 +.comment .common-box {
  464 + width:100%;
  465 + display: flex;
  466 + align-items: center;
  467 + justify-content: space-between;
  468 +}
460 .comment input { 469 .comment input {
461 border-radius: 50rpx; 470 border-radius: 50rpx;
462 width: 83.5%; 471 width: 83.5%;
@@ -472,7 +481,7 @@ swiper { @@ -472,7 +481,7 @@ swiper {
472 } 481 }
473 .t-active { 482 .t-active {
474 border-radius: 4rpx; 483 border-radius: 4rpx;
475 - width: 91.5%; 484 + width: 100%;
476 /*height: 300rpx;*/ 485 /*height: 300rpx;*/
477 /*background-color: #f2f2f2;*/ 486 /*background-color: #f2f2f2;*/
478 font-size: 26rpx; 487 font-size: 26rpx;
@@ -480,6 +489,9 @@ swiper { @@ -480,6 +489,9 @@ swiper {
480 display: flex; 489 display: flex;
481 justify-content: right; 490 justify-content: right;
482 align-items: right; 491 align-items: right;
  492 + -webkit-box-sizing: border-box;
  493 + -moz-box-sizing: border-box;
  494 + box-sizing: border-box;
483 } 495 }
484 496
485 .send-box .send { 497 .send-box .send {
@@ -494,10 +506,16 @@ swiper { @@ -494,10 +506,16 @@ swiper {
494 text-align: center; 506 text-align: center;
495 } 507 }
496 .send-box { 508 .send-box {
  509 + width: 100rpx;
497 height: 60rpx; 510 height: 60rpx;
498 display: flex; 511 display: flex;
499 justify-content: flex-end; 512 justify-content: flex-end;
500 margin-left: 10rpx; 513 margin-left: 10rpx;
  514 + margin-right:0;
  515 + padding: 0;
  516 +}
  517 +.send-box::after {
  518 + border:0;
501 } 519 }
502 .modal { 520 .modal {
503 width: 73%; 521 width: 73%;
@@ -57,9 +57,21 @@ Page({ @@ -57,9 +57,21 @@ Page({
57 }, 57 },
58 //自动获取手机号 58 //自动获取手机号
59 getPhoneNumber(e) { 59 getPhoneNumber(e) {
60 - console.log(e.detail.errMsg)  
61 - console.log(e.detail.iv)  
62 - console.log(e.detail.encryptedData) 60 + // console.log(e.detail.errMsg)
  61 + // console.log(e.detail.iv)
  62 + // console.log(e.detail.encryptedData)
  63 + let url = '/portal/Member/getTel';
  64 + let params = {
  65 + token: wx.getStorageSync('token'),
  66 + encryptedData: e.detail.encryptedData,
  67 + iv:e.detail.iv,
  68 + };
  69 + app.post(url, params, {}).then((res) => {
  70 + console.log('自动获取手机号', res);
  71 + if (+res.code === 1) {
  72 + this.setData({phone_number:res.data,is_wrong_phone:false})
  73 + }
  74 + });
63 }, 75 },
64 //输入国家 76 //输入国家
65 inputCountry(e) { 77 inputCountry(e) {
@@ -27,7 +27,7 @@ @@ -27,7 +27,7 @@
27 <view class="flex-box"> 27 <view class="flex-box">
28 <view class="title">手机号:</view> 28 <view class="title">手机号:</view>
29 <view class="phone-box"> 29 <view class="phone-box">
30 - <input type="number" bindinput="inputPhone" bindblur="blur"/> 30 + <input type="number" bindinput="inputPhone" bindblur="blur" value="{{phone_number}}"/>
31 <button open-type="getPhoneNumber" bindgetphonenumber="getPhoneNumber" class="phone-btn">自动填写</button> 31 <button open-type="getPhoneNumber" bindgetphonenumber="getPhoneNumber" class="phone-btn">自动填写</button>
32 </view> 32 </view>
33 </view> 33 </view>
1 <!--pages/my/my-wallet/detail/detail.wxml--> 1 <!--pages/my/my-wallet/detail/detail.wxml-->
2 <view class="content"> 2 <view class="content">
3 - <view class="section" style="height:{{screenHeight}}px"> 3 + <view class="section {{detail.type === 1?'change-bg':''}} {{detail.status === 6?'change-bg-end':''}}" style="height:{{screenHeight}}px">
4 <view class="detail"> 4 <view class="detail">
5 <view class="bg"> 5 <view class="bg">
6 <view class="head"> 6 <view class="head">
@@ -35,7 +35,9 @@ @@ -35,7 +35,9 @@
35 </view> 35 </view>
36 36
37 <view class="code"> 37 <view class="code">
38 - <view class="code-num"></view> 38 + <view class="code-num">
  39 + <image src="../../../../images/wallet-code.png"></image>
  40 + </view>
39 </view> 41 </view>
40 </view> 42 </view>
41 43
@@ -17,6 +17,12 @@ @@ -17,6 +17,12 @@
17 background-repeat: no-repeat; 17 background-repeat: no-repeat;
18 /*background-size: 100%;*/ 18 /*background-size: 100%;*/
19 } 19 }
  20 +.change-bg {
  21 + background-image: url('http://pk86rwhci.bkt.clouddn.com/yellow-bg.png');
  22 +}
  23 +.change-bg-end {
  24 + background-image: url('http://pk86rwhci.bkt.clouddn.com/gray-bg.png');
  25 +}
20 .detail { 26 .detail {
21 height: 100%; 27 height: 100%;
22 padding:60rpx 40rpx 20rpx 40rpx; 28 padding:60rpx 40rpx 20rpx 40rpx;
@@ -138,7 +144,11 @@ @@ -138,7 +144,11 @@
138 .detail .code .code-num { 144 .detail .code .code-num {
139 width: 70%; 145 width: 70%;
140 height: 136rpx; 146 height: 136rpx;
141 - border:1rpx solid #f2f2f2; 147 + /*border:1rpx solid #f2f2f2;*/
  148 +}
  149 +.detail .code .code-num image {
  150 + width: 100%;
  151 + height: 100%;
142 } 152 }
143 .line { 153 .line {
144 width: 100%; 154 width: 100%;
1 <!--pages/my/my-wallet/my-wallet.wxml--> 1 <!--pages/my/my-wallet/my-wallet.wxml-->
2 <view class="list-box"> 2 <view class="list-box">
3 <view class="bg"> 3 <view class="bg">
4 - <!--（0全部，2待处理，4已拼成，5已取消，6已完成）--> 4 + <!-- // （0全部，2待拼成，3人数不足未拼成,4已拼成，5已取消，6已完成，7已评价，8已拼成（活动未结束）,9删除-->
5 <view class="no-data" wx:if="{{list.length===0}}">钱包是空的~</view> 5 <view class="no-data" wx:if="{{list.length===0}}">钱包是空的~</view>
6 <view class="list-item {{item.type === 1?'change-bg':''}} {{item.status === 6?'change-bg-end':''}}" 6 <view class="list-item {{item.type === 1?'change-bg':''}} {{item.status === 6?'change-bg-end':''}}"
7 wx:for="{{list}}" wx:key="index" data-id="{{item.id}}" bindtap="goDetail"> 7 wx:for="{{list}}" wx:key="index" data-id="{{item.id}}" bindtap="goDetail">
@@ -19,7 +19,9 @@ @@ -19,7 +19,9 @@
19 <text>{{item.number}}人</text> 19 <text>{{item.number}}人</text>
20 </view> 20 </view>
21 </view> 21 </view>
22 - <view class="code"></view> 22 + <view class="code">
  23 + <image src="../../../images/wallet-icon.png"></image>
  24 + </view>
23 <view class="name">{{item.type === 1?'活动票':'饭票'}}</view> 25 <view class="name">{{item.type === 1?'活动票':'饭票'}}</view>
24 </view> 26 </view>
25 </view> 27 </view>
@@ -77,9 +77,13 @@ @@ -77,9 +77,13 @@
77 .code { 77 .code {
78 width: 130rpx; 78 width: 130rpx;
79 height: 180rpx; 79 height: 180rpx;
80 - border:1rpx solid #ccc; 80 + /*border:1rpx solid #ccc;*/
81 margin-right: 24rpx; 81 margin-right: 24rpx;
82 } 82 }
  83 +.code image {
  84 + width: 100%;
  85 + height: 100%;
  86 +}
83 .name { 87 .name {
84 width:36rpx; 88 width:36rpx;
85 font-size: 32rpx; 89 font-size: 32rpx;
1 <!--pages/my/my.wxml--> 1 <!--pages/my/my.wxml-->
2 <view class="head-box"> 2 <view class="head-box">
3 <view wx:if="{{isLogin}}" > 3 <view wx:if="{{isLogin}}" >
4 - <view class="head" bindtap='uploadImg' style=""> 4 + <view class="head" bindtap='uploadImg'>
  5 + <!--背景图-->
5 <image class='banner_img' wx:if="{{images !== ''}}" src='{{images}}' mode="aspectFill"></image> 6 <image class='banner_img' wx:if="{{images !== ''}}" src='{{images}}' mode="aspectFill"></image>
6 <image class='banner_img' wx:else="" src="{{user.bg_pic}}" mode="aspectFill"></image> 7 <image class='banner_img' wx:else="" src="{{user.bg_pic}}" mode="aspectFill"></image>
7 </view> 8 </view>
8 <!--<view class="margin">--> 9 <!--<view class="margin">-->
9 - <image src="{{user.pic}}" class="user-img"></image>  
10 - <view class="left"> 10 + <image src="{{user.pic}}" class="user-img"></image>
  11 + <!--type ：1注册用户，2后台用户-->
  12 + <text class="iconfont icon-vip" wx:if="{{user.type === 2}}"></text>
  13 + <!--<image src="{{user.sex === 1?'../../images/man.png':'../../images/women.png'}}" class="sex-icon"></image>-->
  14 + <view class="left">
11 <view class="class-box"> 15 <view class="class-box">
12 <image src="../../images/jin@2x.png" wx:if="{{user.level === 1}}"></image> 16 <image src="../../images/jin@2x.png" wx:if="{{user.level === 1}}"></image>
13 <image src="../../images/yin@2x.png" wx:if="{{user.level === 2}}"></image> 17 <image src="../../images/yin@2x.png" wx:if="{{user.level === 2}}"></image>
@@ -8,6 +8,13 @@ @@ -8,6 +8,13 @@
8 color: #ffffff; 8 color: #ffffff;
9 font-size: 50rpx; 9 font-size: 50rpx;
10 } 10 }
  11 +.icon-vip {
  12 + position: absolute;
  13 + top:51rpx;
  14 + left:163rpx;
  15 + color:#E1C8AF;
  16 + font-size:34rpx;
  17 +}
11 .login-box { 18 .login-box {
12 width: 100%; 19 width: 100%;
13 height: 300rpx; 20 height: 300rpx;
@@ -27,6 +34,13 @@ @@ -27,6 +34,13 @@
27 .login-box button::after { 34 .login-box button::after {
28 border:0; 35 border:0;
29 } 36 }
  37 +.sex-icon {
  38 + position: absolute;
  39 + top:100rpx;
  40 + left:100rpx;
  41 + width: 40rpx;
  42 + height: 40rpx;
  43 +}
30 .head-box { 44 .head-box {
31 position: relative; 45 position: relative;
32 } 46 }
@@ -49,6 +63,10 @@ @@ -49,6 +63,10 @@
49 -moz-filter: blur(2rpx); 63 -moz-filter: blur(2rpx);
50 -ms-filter: blur(2rpx); 64 -ms-filter: blur(2rpx);
51 filter: blur(2rpx); 65 filter: blur(2rpx);
  66 + background-color: #CCCCCC;
  67 +}
  68 +.gray-bg {
  69 + background-color: #CCCCCC;
52 } 70 }
53 .banner_img { 71 .banner_img {
54 z-index:-1; 72 z-index:-1;
@@ -155,7 +155,9 @@ Page({ @@ -155,7 +155,9 @@ Page({
155 */ 155 */
156 onLoad: function (options) { 156 onLoad: function (options) {
157 console.log('options', options,JSON.parse(options.order_detail)); 157 console.log('options', options,JSON.parse(options.order_detail));
158 - this.setData({order_id:+options.id?+options.id:'',order_detail:JSON.parse(options.order_detail)}) 158 + this.setData({order_id:+options.id?+options.id:'',
  159 + order_detail:JSON.parse(options.order_detail),
  160 + })
159 }, 161 },
160 162
161 /** 163 /**
@@ -3,21 +3,22 @@ @@ -3,21 +3,22 @@
3 <view class="state-box"> 3 <view class="state-box">
4 4
5 <view class="line"></view> 5 <view class="line"></view>
6 - <!--（0全部，2待处理，4已拼成，5已取消，6已完成）--> 6 + <!-- // （0全部，2待拼成，3人数不足未拼成,4已拼成，5已取消，6已完成，7已评价，8已拼成（活动未结束）,9删除-->
7 <view class="state1"> 7 <view class="state1">
8 <view class="circle change"></view> 8 <view class="circle change"></view>
9 <text>已拍下</text> 9 <text>已拍下</text>
10 </view> 10 </view>
11 <view class="state2"> 11 <view class="state2">
12 - <view class="circle {{order_detail.status === 4 ||order_detail.status === 5 ?'change':''}}"></view> 12 + <!--{{detail.status === 4 ||detail.status === 5 || detail.status === 6||detail.status === 8?'change':''}}-->
  13 + <view class="circle change"></view>
13 <text wx:if="{{order_detail.status === 5}}">已取消</text> 14 <text wx:if="{{order_detail.status === 5}}">已取消</text>
14 - <text wx:if="{{order_detail.status === 4}}">已拼成</text>  
15 - <text wx:if="{{order_detail.status === 2}}" class="{{order_detail.status === 2?'change-text':''}}">待拼成</text> 15 + <text wx:if="{{order_detail.status === 4|| order_detail.status === 6 || order_detail.status === 7 || order_detail.status === 8}}">已拼成</text>
  16 + <text wx:if="{{order_detail.status === 2 || order_detail.status === 3}}" class="{{order_detail.status === 2?'change-text':''}}">待拼成</text>
16 </view> 17 </view>
17 <view class="state3"> 18 <view class="state3">
18 <view class="circle {{order_detail.status === 6?'change':''}}"></view> 19 <view class="circle {{order_detail.status === 6?'change':''}}"></view>
19 <text wx:if="{{order_detail.status === 6}}">已完成</text> 20 <text wx:if="{{order_detail.status === 6}}">已完成</text>
20 - <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> 21 + <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>
21 </view> 22 </view>
22 </view> 23 </view>
23 24
@@ -27,6 +28,7 @@ @@ -27,6 +28,7 @@
27 <view class="text">拼单发起者: </view> 28 <view class="text">拼单发起者: </view>
28 <!--<image src="../../../images/avatar@2x.png"></image>--> 29 <!--<image src="../../../images/avatar@2x.png"></image>-->
29 <image src="{{order_detail.userPic}}"></image> 30 <image src="{{order_detail.userPic}}"></image>
  31 + <image src="{{order_detail.userSex === 1?'../../../images/man.png':'../../../images/women.png'}}" class="sex-icon"></image>
30 <view class="name text">{{order_detail.userName}}</view> 32 <view class="name text">{{order_detail.userName}}</view>
31 </view> 33 </view>
32 <text class="text">订单编号：{{order_detail.order_sn}}</text> 34 <text class="text">订单编号：{{order_detail.order_sn}}</text>
@@ -9,6 +9,13 @@ @@ -9,6 +9,13 @@
9 margin-bottom: 34rpx; 9 margin-bottom: 34rpx;
10 margin-left: 10rpx; 10 margin-left: 10rpx;
11 } 11 }
  12 +.top .sex-icon {
  13 + position: absolute;
  14 + top:-6rpx;
  15 + left:152rpx;
  16 + width: 20rpx;
  17 + height: 20rpx;
  18 +}
12 .address { 19 .address {
13 padding: 28rpx 0 0 0; 20 padding: 28rpx 0 0 0;
14 } 21 }
@@ -42,7 +42,7 @@ Page({ @@ -42,7 +42,7 @@ Page({
42 console.log('订单详情', res); 42 console.log('订单详情', res);
43 if (+res.code === 1) { 43 if (+res.code === 1) {
44 self.setData({ 44 self.setData({
45 - detail: res.data, 45 + detail: res.data.list,
46 }); 46 });
47 // console.log(this.data.this_week_test_info); 47 // console.log(this.data.this_week_test_info);
48 } 48 }
1 <!--pages/order/order-detail/order-detail.wxml--> 1 <!--pages/order/order-detail/order-detail.wxml-->
2 <view class="content"> 2 <view class="content">
3 - <view class="complain" catchtap="goComplain"><text>去投诉</text></view>  
4 -  
5 <view class="state-box"> 3 <view class="state-box">
6 4
7 <view class="line"></view> 5 <view class="line"></view>
8 - <!--（0全部，2待处理，4已拼成，5已取消，6已完成）--> 6 + <!-- // （0全部，2待拼成，3人数不足未拼成,4已拼成，5已取消，6已完成，7已评价，8已拼成（活动未结束）,9删除-->
9 <view class="state1"> 7 <view class="state1">
10 <view class="circle change"></view> 8 <view class="circle change"></view>
11 <text>已拍下</text> 9 <text>已拍下</text>
12 </view> 10 </view>
13 <view class="state2"> 11 <view class="state2">
14 - <view class="circle {{detail.status === 4 ||detail.status === 5 || detail.status === 6?'change':''}}"></view> 12 + <!--{{detail.status === 4 ||detail.status === 5 || detail.status === 6||detail.status === 8?'change':''}}-->
  13 + <view class="circle change"></view>
15 <text wx:if="{{detail.status === 5}}">已取消</text> 14 <text wx:if="{{detail.status === 5}}">已取消</text>
16 - <text wx:if="{{detail.status === 4 || detail.status === 6}}">已拼成</text>  
17 - <text wx:if="{{detail.status === 2}}" class="{{detail.status === 2?'change-text':''}}">待拼成</text> 15 + <text wx:if="{{detail.status === 4 || detail.status === 6 || detail.status === 7 || detail.status === 8}}">已拼成</text>
  16 + <text wx:if="{{detail.status === 2 || detail.status === 3}}" class="{{detail.status === 2?'change-text':''}}">待拼成</text>
18 </view> 17 </view>
19 <view class="state3"> 18 <view class="state3">
20 <view class="circle {{detail.status === 6?'change':''}}"></view> 19 <view class="circle {{detail.status === 6?'change':''}}"></view>
21 <text wx:if="{{detail.status === 6}}">已完成</text> 20 <text wx:if="{{detail.status === 6}}">已完成</text>
22 - <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> 21 + <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>
23 </view> 22 </view>
24 </view> 23 </view>
25 24
@@ -27,12 +26,14 @@ @@ -27,12 +26,14 @@
27 <view class="top"> 26 <view class="top">
28 <!--<image src="../../../images/avatar@2x.png"></image>--> 27 <!--<image src="../../../images/avatar@2x.png"></image>-->
29 <image src="{{detail.userPic}}"></image> 28 <image src="{{detail.userPic}}"></image>
  29 + <image src="{{detail.userSex === 1?'../../../images/man.png':'../../../images/women.png'}}" class="sex-icon"></image>
30 <text class="name">{{detail.userName}}</text> 30 <text class="name">{{detail.userName}}</text>
31 </view> 31 </view>
32 <text class="address">{{detail.title}}</text> 32 <text class="address">{{detail.title}}</text>
33 <text class="time">{{detail.time}}</text> 33 <text class="time">{{detail.time}}</text>
34 </view> 34 </view>
35 35
  36 + <view class="complain" catchtap="goComplain"><text>去投诉</text></view>
36 37
37 <view class="order-detail"> 38 <view class="order-detail">
38 <text>订单编号：{{detail.order_sn}}</text> 39 <text>订单编号：{{detail.order_sn}}</text>
@@ -40,8 +41,10 @@ @@ -40,8 +41,10 @@
40 </view> 41 </view>
41 42
42 <view class="bottom"> 43 <view class="bottom">
43 - <text class="cancel-btn" wx:if="{{detail.status === 4 || detail.status === 2}}" bindtap="cancel">取消订单</text>  
44 - <text class="cancel-btn" wx:if="{{detail.status === 2}}">待拼成</text> 44 + <!-- // （0全部，2待拼成，3人数不足未拼成,4已拼成，5已取消，6已完成，7已评价，8已拼成（活动未结束）,9删除-->
  45 + <text class="cancel-btn" wx:if="{{detail.status === 4 || detail.status === 2|| detail.status === 8}}" bindtap="cancel">取消订单</text>
  46 + <text class="cancel-btn gray" wx:if="{{detail.status === 2}}">待拼成</text>
  47 + <text class="cancel-btn gray" wx:if="{{detail.status === 8}}">已拼成</text>
45 <text class="confirm-btn" wx:if="{{detail.status === 4}}" bindtap="confirm">完成</text> 48 <text class="confirm-btn" wx:if="{{detail.status === 4}}" bindtap="confirm">完成</text>
46 </view> 49 </view>
47 </view> 50 </view>
@@ -58,6 +58,7 @@ @@ -58,6 +58,7 @@
58 .order-info .top { 58 .order-info .top {
59 display: flex; 59 display: flex;
60 align-items: center; 60 align-items: center;
  61 + position: relative;
61 } 62 }
62 .top image { 63 .top image {
63 width: 40rpx; 64 width: 40rpx;
@@ -69,6 +70,13 @@ @@ -69,6 +70,13 @@
69 font-size: 22rpx; 70 font-size: 22rpx;
70 color: #333333; 71 color: #333333;
71 } 72 }
  73 +.top .sex-icon {
  74 + position: absolute;
  75 + top:-6rpx;
  76 + left:28rpx;
  77 + width: 20rpx;
  78 + height: 20rpx;
  79 +}
72 .address, .time { 80 .address, .time {
73 font-size: 24rpx; 81 font-size: 24rpx;
74 color: #666666; 82 color: #666666;
@@ -81,7 +89,7 @@ @@ -81,7 +89,7 @@
81 padding-bottom: 40rpx; 89 padding-bottom: 40rpx;
82 } 90 }
83 .order-detail { 91 .order-detail {
84 - margin-top: 108rpx; 92 + /* margin-top: 58rpx; */
85 padding: 0 20rpx; 93 padding: 0 20rpx;
86 -webkit-box-sizing: border-box; 94 -webkit-box-sizing: border-box;
87 -moz-box-sizing: border-box; 95 -moz-box-sizing: border-box;
@@ -92,7 +100,7 @@ @@ -92,7 +100,7 @@
92 .order-detail text { 100 .order-detail text {
93 font-size: 24rpx; 101 font-size: 24rpx;
94 color: #666666; 102 color: #666666;
95 - margin-bottom: 42rpx; 103 + margin-bottom: 30rpx;
96 } 104 }
97 .bottom { 105 .bottom {
98 width: 100%; 106 width: 100%;
@@ -111,23 +119,29 @@ @@ -111,23 +119,29 @@
111 background-color: #323232; 119 background-color: #323232;
112 font-size: 30rpx; 120 font-size: 30rpx;
113 } 121 }
  122 +.bottom .gray {
  123 + background-color: #CCCCCC;
  124 + color: #ffffff;
  125 + border:0;
  126 +}
114 .cancel-btn { 127 .cancel-btn {
115 color: #999999; 128 color: #999999;
116 border-right: 1rpx solid #E1C8AF; 129 border-right: 1rpx solid #E1C8AF;
117 } 130 }
118 .confirm-btn { 131 .confirm-btn {
119 color: #E1C8AF; 132 color: #E1C8AF;
  133 + border:0;
120 } 134 }
121 .complain { 135 .complain {
122 - z-index:10; 136 + z-index:10;
123 padding: 0 20rpx; 137 padding: 0 20rpx;
124 -webkit-box-sizing: border-box; 138 -webkit-box-sizing: border-box;
125 -moz-box-sizing: border-box; 139 -moz-box-sizing: border-box;
126 box-sizing: border-box; 140 box-sizing: border-box;
127 - position: absolute;  
128 - right:20rpx;  
129 - top:10rpx;  
130 - margin-bottom:20rpx; 141 + /* position: absolute; */
  142 + /* right:20rpx; */
  143 + /* top:10rpx; */
  144 + margin:20rpx 0;
131 } 145 }
132 .complain text { 146 .complain text {
133 width: 80rpx; 147 width: 80rpx;
@@ -135,8 +149,9 @@ @@ -135,8 +149,9 @@
135 line-height: 50rpx; 149 line-height: 50rpx;
136 text-align:center; 150 text-align:center;
137 font-size: 24rpx; 151 font-size: 24rpx;
138 - color: #E1C8AF;  
139 - background-color: #323232;  
140 - padding: 6rpx 10rpx; 152 + /* color: #E1C8AF; */
  153 + color:#999999;
  154 + /* background-color: #323232; */
  155 + /* padding: 6rpx 10rpx; */
141 border-radius: 6rpx; 156 border-radius: 6rpx;
142 } 157 }
1 <!--pages/order/order.wxml--> 1 <!--pages/order/order.wxml-->
2 <view class='tab_box'> 2 <view class='tab_box'>
3 - <!--（0全部，2待处理，4已拼成，5已取消，6已完成）--> 3 + <!--（0全部，2待拼成，3人数不足未拼成,4已拼成，5已取消，6已完成，7已评价，8已拼成（活动未结束）,9删除-->
4 <view class="tab_item {{current==0?'active':''}}" data-current='0' bindtap='chargeTab'>全部</view> 4 <view class="tab_item {{current==0?'active':''}}" data-current='0' bindtap='chargeTab'>全部</view>
5 <view class="tab_item {{current==2?'active':''}}" data-current='2' bindtap='chargeTab'>待处理</view> 5 <view class="tab_item {{current==2?'active':''}}" data-current='2' bindtap='chargeTab'>待处理</view>
6 <view class="tab_item {{current==4?'active':''}}" data-current='4' bindtap='chargeTab'>已拼成</view> 6 <view class="tab_item {{current==4?'active':''}}" data-current='4' bindtap='chargeTab'>已拼成</view>
@@ -17,22 +17,26 @@ @@ -17,22 +17,26 @@
17 <!--<image src="../../images/lishi@2x.png" class="thumb"></image>--> 17 <!--<image src="../../images/lishi@2x.png" class="thumb"></image>-->
18 <image src="{{item.pic}}" class="thumb" mode="aspectFill"></image> 18 <image src="{{item.pic}}" class="thumb" mode="aspectFill"></image>
19 <view class="lish-right"> 19 <view class="lish-right">
  20 + <!--（0全部，2待拼成，3人数不足未拼成,4已拼成，5已取消，6已完成，7已评价，8已拼成（活动未结束）,9删除-->
20 <view class="title-box"> 21 <view class="title-box">
21 <view class="title">{{item.title}}</view> 22 <view class="title">{{item.title}}</view>
22 <text wx:if="{{item.status === 2}}" class="state">待拼成</text> 23 <text wx:if="{{item.status === 2}}" class="state">待拼成</text>
23 - <text wx:if="{{item.status === 4}}" class="state">已拼成</text> 24 + <text wx:if="{{item.status === 3}}" class="state">未拼成</text>
  25 + <text wx:if="{{item.status === 4 || item.status === 8}}" class="state">已拼成</text>
24 <text wx:if="{{item.status === 5}}" class="state">已取消</text> 26 <text wx:if="{{item.status === 5}}" class="state">已取消</text>
25 <text wx:if="{{item.status === 6}}" class="state">已完成</text> 27 <text wx:if="{{item.status === 6}}" class="state">已完成</text>
  28 + <text wx:if="{{item.status === 7}}" class="state">已评价</text>
26 </view> 29 </view>
27 <view class="time">{{item.time}}</view> 30 <view class="time">{{item.time}}</view>
28 <view class="name-box"> 31 <view class="name-box">
29 <view class="name-left"> 32 <view class="name-left">
30 <!--<image src="../../images/avatar@2x.png" class="avatar"></image>--> 33 <!--<image src="../../images/avatar@2x.png" class="avatar"></image>-->
31 <image src="{{item.userPic}}" class="avatar"></image> 34 <image src="{{item.userPic}}" class="avatar"></image>
  35 + <image src="{{item.userSex === 1?'../../images/man.png':'../../images/women.png'}}" class="sex-icon"></image>
32 <text>{{item.userName}} 在{{item.address}}</text> 36 <text>{{item.userName}} 在{{item.address}}</text>
33 </view> 37 </view>
34 <view class="btn"> 38 <view class="btn">
35 - <text wx:if="{{item.status === 5 || item.status === 6}}" catchtap="cancel" data-id="{{item.id}}">删除</text> 39 + <text wx:if="{{item.status === 5 || item.status === 6 || item.status === 3 || item.status === 7}}" catchtap="cancel" data-id="{{item.id}}">删除</text>
36 <text wx:if="{{item.status === 4}}" catchtap="complete" data-id="{{item.id}}">完成</text> 40 <text wx:if="{{item.status === 4}}" catchtap="complete" data-id="{{item.id}}">完成</text>
37 </view> 41 </view>
38 </view> 42 </view>
@@ -29,6 +29,7 @@ @@ -29,6 +29,7 @@
29 left:0; 29 left:0;
30 right:0; 30 right:0;
31 background: #ffffff; 31 background: #ffffff;
  32 + z-index:100;
32 } 33 }
33 .tab_item { 34 .tab_item {
34 display: inline-block; 35 display: inline-block;
@@ -113,10 +114,18 @@ @@ -113,10 +114,18 @@
113 align-items: center; 114 align-items: center;
114 justify-content: flex-start; 115 justify-content: flex-start;
115 flex:1; 116 flex:1;
  117 + position: relative;
116 } 118 }
117 .name-left text{ 119 .name-left text{
118 flex:1; 120 flex:1;
119 } 121 }
  122 +.name-left .sex-icon {
  123 + position: absolute;
  124 + top:-6rpx;
  125 + left:28rpx;
  126 + width: 20rpx;
  127 + height: 20rpx;
  128 +}
120 .lish-right .name-box .btn { 129 .lish-right .name-box .btn {
121 /* width:28%; */ 130 /* width:28%; */
122 color:#E2C8B1; 131 color:#E2C8B1;