Showing
7 changed files
with
31 additions
and
13 deletions
| @@ -40,7 +40,12 @@ Component({ | @@ -40,7 +40,12 @@ Component({ | ||
| 40 | userinfo(e){ | 40 | userinfo(e){ |
| 41 | console.log('userinfo-share',e); | 41 | console.log('userinfo-share',e); |
| 42 | this.triggerEvent("userinfo",e.detail); | 42 | this.triggerEvent("userinfo",e.detail); |
| 43 | + }, | ||
| 44 | + share(e){ | ||
| 45 | + console.log('userinfo-share',e); | ||
| 46 | + this.triggerEvent("share",e.detail); | ||
| 43 | } | 47 | } |
| 48 | + | ||
| 44 | }, | 49 | }, |
| 45 | 50 | ||
| 46 | }) | 51 | }) |
| @@ -5,7 +5,7 @@ | @@ -5,7 +5,7 @@ | ||
| 5 | </userinfo> | 5 | </userinfo> |
| 6 | </block> | 6 | </block> |
| 7 | <block wx:else=""> | 7 | <block wx:else=""> |
| 8 | - <button class="button-none" open-type="share" data-id="{{share.id}}" catchtap="catchtap"> | 8 | + <button class="button-none" open-type="share" data-id="{{share.id}}" catchtap="share"> |
| 9 | <slot></slot> | 9 | <slot></slot> |
| 10 | </button> | 10 | </button> |
| 11 | </block> | 11 | </block> |
| @@ -3,7 +3,7 @@ | @@ -3,7 +3,7 @@ | ||
| 3 | <view class="page"> | 3 | <view class="page"> |
| 4 | <view class="card" style="margin-top: 42rpx; margin-bottom: 168rpx;"> | 4 | <view class="card" style="margin-top: 42rpx; margin-bottom: 168rpx;"> |
| 5 | <card seller="{{detail.seller}}" detail="{{detail}}"> | 5 | <card seller="{{detail.seller}}" detail="{{detail}}"> |
| 6 | - <view class="opt flex-rr"> | 6 | + <view class="opt flex-rr" slot="opt"> |
| 7 | <block wx:if="{{!detail.hasCanSuccess}}"> | 7 | <block wx:if="{{!detail.hasCanSuccess}}"> |
| 8 | <userinfo binduserinfo="userinfo"> | 8 | <userinfo binduserinfo="userinfo"> |
| 9 | <view class="opt-button">赴约</view> | 9 | <view class="opt-button">赴约</view> |
| @@ -13,6 +13,7 @@ Page({ | @@ -13,6 +13,7 @@ Page({ | ||
| 13 | total:0, | 13 | total:0, |
| 14 | }, | 14 | }, |
| 15 | ids:[], | 15 | ids:[], |
| 16 | + id:0, | ||
| 16 | 17 | ||
| 17 | /** | 18 | /** |
| 18 | * 生命周期函数--监听页面加载 | 19 | * 生命周期函数--监听页面加载 |
| @@ -56,7 +57,7 @@ Page({ | @@ -56,7 +57,7 @@ Page({ | ||
| 56 | }, | 57 | }, |
| 57 | getListData(fouce=false){ | 58 | getListData(fouce=false){ |
| 58 | App.Reserve.GetListFromScheAndRes({ | 59 | App.Reserve.GetListFromScheAndRes({ |
| 59 | - flag:this.data.tabFlag, | 60 | + flag:0, |
| 60 | openid:getApp().openid, | 61 | openid:getApp().openid, |
| 61 | },fouce).then(res => { | 62 | },fouce).then(res => { |
| 62 | let data=this.formatList(res.data); | 63 | let data=this.formatList(res.data); |
| @@ -104,14 +105,13 @@ Page({ | @@ -104,14 +105,13 @@ Page({ | ||
| 104 | us.init(); | 105 | us.init(); |
| 105 | }) | 106 | }) |
| 106 | }, | 107 | }, |
| 107 | - shareSetting(){ | ||
| 108 | - console.log('this.topicVal',this.topicVal) | ||
| 109 | - if(this.topicVal && this.data.detail.openid==getApp().openid){ | ||
| 110 | - App.Reserve.SetTopicFromShare({ | ||
| 111 | - rid:this.id, | ||
| 112 | - topic:this.topicVal | ||
| 113 | - }) | ||
| 114 | - } | 108 | + share(e){ |
| 109 | + this.id=e.target.id.replace('userinfo-share-',''); | ||
| 110 | + console.log('userinfo-share.share.id',this.id) | ||
| 111 | + }, | ||
| 112 | + shareSetting(e){ | ||
| 113 | + console.log('shareSetting',e) | ||
| 114 | + //this.data.detail.openid==getApp().openid | ||
| 115 | let nickname=""; | 115 | let nickname=""; |
| 116 | try{ | 116 | try{ |
| 117 | nickname=util.cache('userInfo').nickName; | 117 | nickname=util.cache('userInfo').nickName; |
| @@ -25,10 +25,11 @@ | @@ -25,10 +25,11 @@ | ||
| 25 | <view class="card"> | 25 | <view class="card"> |
| 26 | <card hasListShare | 26 | <card hasListShare |
| 27 | seller="{{detail.seller}}" detail="{{detail}}"> | 27 | seller="{{detail.seller}}" detail="{{detail}}"> |
| 28 | - <view slot="listshare"> | 28 | + <view slot="listshare" style="height:52rpx;line-height:52rpx;margin-top:4rpx;"> |
| 29 | <userinfo-share | 29 | <userinfo-share |
| 30 | id="userinfo-share-{{detail.id}}" | 30 | id="userinfo-share-{{detail.id}}" |
| 31 | binduserinfo="userinfo" | 31 | binduserinfo="userinfo" |
| 32 | + bindshare="share" | ||
| 32 | share="{{detail}}"> | 33 | share="{{detail}}"> |
| 33 | <view class="opt-button">{{detail.hasOwner?'邀请':'分享日程'}}</view> | 34 | <view class="opt-button">{{detail.hasOwner?'邀请':'分享日程'}}</view> |
| 34 | </userinfo-share> | 35 | </userinfo-share> |
| @@ -10,7 +10,10 @@ | @@ -10,7 +10,10 @@ | ||
| 10 | <view class="info">查看并编辑个人资料</view> | 10 | <view class="info">查看并编辑个人资料</view> |
| 11 | </view> | 11 | </view> |
| 12 | </view> | 12 | </view> |
| 13 | - <view class="shadow" ></view> | 13 | + <view class="shadow" > |
| 14 | + <view class="shadow-mask" ></view> | ||
| 15 | + </view> | ||
| 16 | + | ||
| 14 | <view class="list"> | 17 | <view class="list"> |
| 15 | <formids url="/pages/me/list"> | 18 | <formids url="/pages/me/list"> |
| 16 | <view class="item flex-lr"> | 19 | <view class="item flex-lr"> |
| @@ -3,6 +3,7 @@ | @@ -3,6 +3,7 @@ | ||
| 3 | width: 90%; | 3 | width: 90%; |
| 4 | margin: 0 5%; | 4 | margin: 0 5%; |
| 5 | color:#353535; | 5 | color:#353535; |
| 6 | + background-color: #ffffff; | ||
| 6 | } | 7 | } |
| 7 | image{ | 8 | image{ |
| 8 | width:100%; | 9 | width:100%; |
| @@ -20,6 +21,14 @@ image{ | @@ -20,6 +21,14 @@ image{ | ||
| 20 | width: 110%; | 21 | width: 110%; |
| 21 | box-shadow: 0 12rpx 14rpx 14rpx RGBA(231, 228, 228, 0.5); | 22 | box-shadow: 0 12rpx 14rpx 14rpx RGBA(231, 228, 228, 0.5); |
| 22 | margin-bottom: 98rpx; | 23 | margin-bottom: 98rpx; |
| 24 | + position: relative; | ||
| 25 | +} | ||
| 26 | +.shadow-mask{ | ||
| 27 | + position: relative; | ||
| 28 | + top:-7rpx; | ||
| 29 | + height: 20rpx; | ||
| 30 | + width: 110%; | ||
| 31 | + background-color: #ffffff; | ||
| 23 | } | 32 | } |
| 24 | .avatar{ | 33 | .avatar{ |
| 25 | width: 80rpx; | 34 | width: 80rpx; |
-
Please register or login to post a comment