fixbug year

@@ -2,7 +2,7 @@
 <view class="card">
     <view class="seller flex-lr">
         <view class="flex-ll">
-            <view class="avatar">
+            <view class="avatar" wx:if="{{seller.seller_image}}">
                 <image src="{{seller.seller_image}}"></image>
             </view>
             <view class="name Medium">{{seller.sellername}}</view>

@@ -14,6 +14,7 @@
   height: 60rpx;
   min-width: 60rpx;
   border-radius: 50%;
+  margin-right: 20rpx;
 }
 .seller .more{
   width: 14rpx;
@@ -28,7 +29,6 @@
 }
 .seller .name{
   font-size: 36rpx;
-  margin-left: 20rpx;
   color:#AD7644;
 }
 

@@ -114,12 +114,25 @@ Page({
     },
     userinfo(){
         if(!this.data.detail.hasCanSuccess){
+            let userInfo=util.cache('userInfo');
+            if(userInfo){
+              userInfo=JSON.stringify({
+                openid: getApp().openid,
+                avatar: userInfo.avatarUrl,
+                nickname: userInfo.nickName,
+                gender: userInfo.gender
+              })
+            }
             App.Reserve.SetRelaSuccess({
                 rid:this.id,
                 openid:getApp().openid,
                 is_agree:1,
+                userinfo:userInfo
             }).then(res=>{
-                this.getDetail(true);
+              App.Reserve.Detail({
+                openid: getApp().openid,
+                rid: this.id
+              },'clear')
                 wx.navigateTo({
                     //id={{detail.id}}&rdate={{detail.rdate}}
                     url:'remind?id='+this.id+'&rdate='+this.data.detail.rdate,
@@ -132,14 +145,24 @@ Page({
         }
     },
     reserveCancel(){
-        App.Reserve.SetRelaSuccess({
-            rid:this.id,
-            openid:getApp().openid,
-            cancel:'cancel',
-            is_agree:0
-        }).then(res=>{
-            this.getDetail(true);
+      let userInfo = util.cache('userInfo');
+      if (userInfo) {
+        userInfo = JSON.stringify({
+          openid: getApp().openid,
+          avatar: userInfo.avatarUrl,
+          nickname: userInfo.nickName,
+          gender: userInfo.gender
         })
+      }
+      App.Reserve.SetRelaSuccess({
+        rid: this.id,
+        openid: getApp().openid,
+        cancel: 'cancel',
+        is_agree: 0,
+        userinfo: userInfo
+      }).then(res => {
+        this.getDetail(true);
+      })
     },
     shareSetting(){
         console.log('this.topicVal',this.topicVal)
@@ -159,4 +182,4 @@ Page({
             imageUrl:util.cgi('App.Reserve.MakePic&rid=')+this.id,
         }
     }
-})
\ No newline at end of file
+})

@@ -79,11 +79,21 @@ Page({
       }
     },
     remind(){
+      let userInfo = util.cache('userInfo');
+      if (userInfo) {
+        userInfo = JSON.stringify({
+          openid: getApp().openid,
+          avatar: userInfo.avatarUrl,
+          nickname: userInfo.nickName,
+          gender: userInfo.gender
+        })
+      }
         App.Reserve.SetRelaSuccess({
             rid:this.id,
             openid:getApp().openid,
             remind_date:this.remind_date,
-            is_agree:1
+            is_agree:1,
+          userinfo:userInfo,
         }).then(res=>{
             App.Reserve.Detail({
                 openid: getApp().openid,

@@ -30,7 +30,7 @@
 			"list": []
 		},
 		"miniprogram": {
-			"current": 32,
+			"current": 6,
 			"list": [
 				{
 					"id": 0,
@@ -73,7 +73,7 @@
 					"id": 6,
 					"name": "pages/customer/index",
 					"pathName": "pages/customer/index",
-					"query": "id=84",
+					"query": "id=1153",
 					"scene": "1044",
 					"shareInfo": {
 						"groupName": "测试模拟群1",

@@ -32,7 +32,9 @@ export default {
   },
 
   //订座详情页面----我愿意
-  'App.Reserve.SetRelaSuccess': null,
+  'App.Reserve.SetRelaSuccess': {
+    silence: false,
+  },
 
   //定个座儿 获取商户信息
   'App.Reserve.SellerInfo': {