v2 customer view

@@ -36,12 +36,15 @@ Component({
   methods: {
   methods: {
     init(){
     init(){
         if(this.data.detail && this.data.detail.rdate){
         if(this.data.detail && this.data.detail.rdate){
-            let masterMan=(this.data.detail.rname||'')+' ('
-                +this.data.detail.phone
-                    .replace(/([\d]{2}).*([\d]{4})/,function($0,$1,$2){
-                        return $1+'*'+$2
-                    })
-                +')';
+            let masterMan=(this.data.detail.rname||'');
+            if(this.data.detail.phone){
+                masterMan+=' （'+
+                    this.data.detail.phone
+                        .replace(/([\d]{2}).*([\d]{4})/,function($0,$1,$2){
+                            return $1+'*'+$2
+                        })
+                    +'）';
+            }
             this.setData({
             this.setData({
                 rdateStr:util.unixtoTime(this.data.detail.rdate,'MM月DD日 HH:II'),
                 rdateStr:util.unixtoTime(this.data.detail.rdate,'MM月DD日 HH:II'),
                 tableSubInfo:(this.data.detail.tableFirst||'')+' '+(this.data.detail.tableSubInfo||''),
                 tableSubInfo:(this.data.detail.tableFirst||'')+' '+(this.data.detail.tableSubInfo||''),

@@ -38,7 +38,7 @@
             {{masterMan}}
             {{masterMan}}
         </view>
         </view>
     </view>
     </view>
-    <view class="seller opt">
+    <view>
         <slot></slot>
         <slot></slot>
     </view>
     </view>
 </view>
 </view>

@@ -55,10 +55,10 @@ Page({
     },
     },
 
 
     /**
     /**
-     * 页面相关事件处理函数--监听用户下拉动作
+     * 用户点击右上角分享
      */
      */
-    onPullDownRefresh: function () {
-
+    onShareAppMessage: function () {
+        return this.shareSetting();
     },
     },
     getDetail(fouce=false){
     getDetail(fouce=false){
         App.Reserve.Detail({
         App.Reserve.Detail({
@@ -120,9 +120,9 @@ Page({
                 this.getDetail(true);
                 this.getDetail(true);
             })
             })
         }else{
         }else{
-            wx.navigateTo({
-                url:'invite?id='+this.id,
-            });
+            // wx.navigateTo({
+            //     url:'invite?id='+this.id,
+            // });
         }
         }
     },
     },
     reserveCancel(){
     reserveCancel(){
@@ -133,5 +133,22 @@ Page({
         }).then(res=>{
         }).then(res=>{
             this.getDetail(true);
             this.getDetail(true);
         })
         })
+    },
+    shareSetting(){
+        console.log('this.topicVal',this.topicVal)
+        if(this.topicVal && this.data.detail.openid==getApp().openid){
+            App.Reserve.SetTopicFromShare({
+                rid:this.id,
+                topic:this.topicVal
+            })
+        }
+        let nickname="";
+        try{
+            nickname=util.cache('userInfo').nickName;
+        }catch(e){}
+        return {
+            title: nickname+'给你发了一个邀请，点击查看',
+            path: '/pages/customer/index?id='+this.id+'&fromid='+getApp().openid+'&invite_name='+nickname,
+        }
     }
     }
 })
 })

@@ -7,6 +7,7 @@
     "manager": "/components/manager/manager",
     "manager": "/components/manager/manager",
     "nav":"/components/nav/nav",
     "nav":"/components/nav/nav",
     "card":"/components/seller-card/seller-card",
     "card":"/components/seller-card/seller-card",
-    "formids":"/components/formids/formids"
+    "formids":"/components/formids/formids",
+    "userinfo-share": "/components/userinfo/share"
   }
   }
 }
 }

@@ -16,9 +16,12 @@
                     <formids url="./remind?id={{detail.id}}&rdate={{detail.rdate}}">
                     <formids url="./remind?id={{detail.id}}&rdate={{detail.rdate}}">
                         <view class="opt-button">提醒</view>
                         <view class="opt-button">提醒</view>
                     </formids>
                     </formids>
-                    <userinfo binduserinfo="userinfo">
+                    <userinfo-share
+                            binduserinfo="userinfo"
+                            bindshare="share"
+                            share="{{detail}}">
                         <view class="opt-button">分享日程</view>
                         <view class="opt-button">分享日程</view>
-                    </userinfo>
+                    </userinfo-share>
                 </block>
                 </block>
             </view>
             </view>
         </card>
         </card>

@@ -130,7 +130,11 @@
   font-size: 30rpx;
   font-size: 30rpx;
   margin-top: 26rpx;
   margin-top: 26rpx;
 }
 }
-
+.opt{
+  padding: 0 36rpx 36rpx;
+  height: 50rpx;
+  line-height: 50rpx;
+}
 .opt .opt-button{
 .opt .opt-button{
   width: 120rpx;
   width: 120rpx;
   height: 40rpx;
   height: 40rpx;