xt / xcx-book · Commits

Go to a project

Commit e680a502f39ca77ae14cdd39291650769861b244

Authored by wangfan
1 parent 680d400c
build: skipped

fixbug year

Inline Side-by-side
Showing 6 changed files with 50 additions and 15 deletions
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 <view class="card"> 2 <view class="card">
3 <view class="seller flex-lr"> 3 <view class="seller flex-lr">
4 <view class="flex-ll"> 4 <view class="flex-ll">
5 - <view class="avatar"> 5 + <view class="avatar" wx:if="{{seller.seller_image}}">
6 <image src="{{seller.seller_image}}"></image> 6 <image src="{{seller.seller_image}}"></image>
7 </view> 7 </view>
8 <view class="name Medium">{{seller.sellername}}</view> 8 <view class="name Medium">{{seller.sellername}}</view>
@@ -14,6 +14,7 @@ @@ -14,6 +14,7 @@
14 height: 60rpx; 14 height: 60rpx;
15 min-width: 60rpx; 15 min-width: 60rpx;
16 border-radius: 50%; 16 border-radius: 50%;
  17 + margin-right: 20rpx;
17 } 18 }
18 .seller .more{ 19 .seller .more{
19 width: 14rpx; 20 width: 14rpx;
@@ -28,7 +29,6 @@ @@ -28,7 +29,6 @@
28 } 29 }
29 .seller .name{ 30 .seller .name{
30 font-size: 36rpx; 31 font-size: 36rpx;
31 - margin-left: 20rpx;  
32 color:#AD7644; 32 color:#AD7644;
33 } 33 }
34 34
@@ -114,12 +114,25 @@ Page({ @@ -114,12 +114,25 @@ Page({
114 }, 114 },
115 userinfo(){ 115 userinfo(){
116 if(!this.data.detail.hasCanSuccess){ 116 if(!this.data.detail.hasCanSuccess){
  117 + let userInfo=util.cache('userInfo');
  118 + if(userInfo){
  119 + userInfo=JSON.stringify({
  120 + openid: getApp().openid,
  121 + avatar: userInfo.avatarUrl,
  122 + nickname: userInfo.nickName,
  123 + gender: userInfo.gender
  124 + })
  125 + }
117 App.Reserve.SetRelaSuccess({ 126 App.Reserve.SetRelaSuccess({
118 rid:this.id, 127 rid:this.id,
119 openid:getApp().openid, 128 openid:getApp().openid,
120 is_agree:1, 129 is_agree:1,
  130 + userinfo:userInfo
121 }).then(res=>{ 131 }).then(res=>{
122 - this.getDetail(true); 132 + App.Reserve.Detail({
  133 + openid: getApp().openid,
  134 + rid: this.id
  135 + },'clear')
123 wx.navigateTo({ 136 wx.navigateTo({
124 //id={{detail.id}}&rdate={{detail.rdate}} 137 //id={{detail.id}}&rdate={{detail.rdate}}
125 url:'remind?id='+this.id+'&rdate='+this.data.detail.rdate, 138 url:'remind?id='+this.id+'&rdate='+this.data.detail.rdate,
@@ -132,14 +145,24 @@ Page({ @@ -132,14 +145,24 @@ Page({
132 } 145 }
133 }, 146 },
134 reserveCancel(){ 147 reserveCancel(){
135 - App.Reserve.SetRelaSuccess({  
136 - rid:this.id,  
137 - openid:getApp().openid,  
138 - cancel:'cancel',  
139 - is_agree:0  
140 - }).then(res=>{  
141 - this.getDetail(true); 148 + let userInfo = util.cache('userInfo');
  149 + if (userInfo) {
  150 + userInfo = JSON.stringify({
  151 + openid: getApp().openid,
  152 + avatar: userInfo.avatarUrl,
  153 + nickname: userInfo.nickName,
  154 + gender: userInfo.gender
142 }) 155 })
  156 + }
  157 + App.Reserve.SetRelaSuccess({
  158 + rid: this.id,
  159 + openid: getApp().openid,
  160 + cancel: 'cancel',
  161 + is_agree: 0,
  162 + userinfo: userInfo
  163 + }).then(res => {
  164 + this.getDetail(true);
  165 + })
143 }, 166 },
144 shareSetting(){ 167 shareSetting(){
145 console.log('this.topicVal',this.topicVal) 168 console.log('this.topicVal',this.topicVal)
@@ -159,4 +182,4 @@ Page({ @@ -159,4 +182,4 @@ Page({
159 imageUrl:util.cgi('App.Reserve.MakePic&rid=')+this.id, 182 imageUrl:util.cgi('App.Reserve.MakePic&rid=')+this.id,
160 } 183 }
161 } 184 }
162 -})  
  185 +})
@@ -79,11 +79,21 @@ Page({ @@ -79,11 +79,21 @@ Page({
79 } 79 }
80 }, 80 },
81 remind(){ 81 remind(){
  82 + let userInfo = util.cache('userInfo');
  83 + if (userInfo) {
  84 + userInfo = JSON.stringify({
  85 + openid: getApp().openid,
  86 + avatar: userInfo.avatarUrl,
  87 + nickname: userInfo.nickName,
  88 + gender: userInfo.gender
  89 + })
  90 + }
82 App.Reserve.SetRelaSuccess({ 91 App.Reserve.SetRelaSuccess({
83 rid:this.id, 92 rid:this.id,
84 openid:getApp().openid, 93 openid:getApp().openid,
85 remind_date:this.remind_date, 94 remind_date:this.remind_date,
86 - is_agree:1 95 + is_agree:1,
  96 + userinfo:userInfo,
87 }).then(res=>{ 97 }).then(res=>{
88 App.Reserve.Detail({ 98 App.Reserve.Detail({
89 openid: getApp().openid, 99 openid: getApp().openid,
@@ -30,7 +30,7 @@ @@ -30,7 +30,7 @@
30 "list": [] 30 "list": []
31 }, 31 },
32 "miniprogram": { 32 "miniprogram": {
33 - "current": 32, 33 + "current": 6,
34 "list": [ 34 "list": [
35 { 35 {
36 "id": 0, 36 "id": 0,
@@ -73,7 +73,7 @@ @@ -73,7 +73,7 @@
73 "id": 6, 73 "id": 6,
74 "name": "pages/customer/index", 74 "name": "pages/customer/index",
75 "pathName": "pages/customer/index", 75 "pathName": "pages/customer/index",
76 - "query": "id=84", 76 + "query": "id=1153",
77 "scene": "1044", 77 "scene": "1044",
78 "shareInfo": { 78 "shareInfo": {
79 "groupName": "测试模拟群1", 79 "groupName": "测试模拟群1",
@@ -32,7 +32,9 @@ export default { @@ -32,7 +32,9 @@ export default {
32 }, 32 },
33 33
34 //订座详情页面----我愿意 34 //订座详情页面----我愿意
35 - 'App.Reserve.SetRelaSuccess': null, 35 + 'App.Reserve.SetRelaSuccess': {
  36 + silence: false,
  37 + },
36 38
37 //定个座儿 获取商户信息 39 //定个座儿 获取商户信息
38 'App.Reserve.SellerInfo': { 40 'App.Reserve.SellerInfo': {