pay

@@ -143,4 +143,12 @@ Page({
     }).show();
     }).show();
     App.PushMsg.SendUrgeMsg({rid:this.data.checkout.rid})
     App.PushMsg.SendUrgeMsg({rid:this.data.checkout.rid})
   },
   },
+  pay(){
+    App.PayOnline.CombineTransactions().then(res=>{
+      res.data.timeStamp+=""
+      wx.requestPayment({
+        ...res.data,
+      })
+    })
+  },
 })
 })

@@ -80,7 +80,7 @@
                 <view class="list-name">备注信息</view>
                 <view class="list-name">备注信息</view>
                 <view class="list-val">{{checkout.remark}}</view>
                 <view class="list-val">{{checkout.remark}}</view>
             </view>
             </view>
-            <view class="checkout-get" bindtap="">立即支付{{checkout.price-user.price>0?checkout.price-user.price:0}}元</view>
+            <view class="checkout-get" bindtap="pay">立即支付{{checkout.price-user.price>0?checkout.price-user.price:0}}元</view>
         </view>
         </view>
         <view class="money-tips">注：消费清单，离店时请到前台索要；</view>
         <view class="money-tips">注：消费清单，离店时请到前台索要；</view>
     </block>
     </block>

@@ -25,12 +25,15 @@
                         <card hasListShare bindevent="gotoDetail"
                         <card hasListShare bindevent="gotoDetail"
                               seller="{{detail.seller}}" detail="{{detail}}">
                               seller="{{detail.seller}}" detail="{{detail}}">
                             <view slot="listshare" style="height:52rpx;line-height:52rpx;margin-top:4rpx;">
                             <view slot="listshare" style="height:52rpx;line-height:52rpx;margin-top:4rpx;">
-                                <userinfo wx:if="{{detail.hasOwner}}"
-                                        data-id="{{detail.id}}"
-                                        binduserinfo="gotoDetailHan">
-                                    <!--<view class="opt-button">{{detail.hasOwner?'邀请':'分享日程'}}</view>-->
-                                    <view class="opt-button">邀请同行好友</view>
-                                </userinfo>
+                                <view class="flex-rr" wx:if="{{detail.hasOwner}}">
+                                    <userinfo
+                                              data-id="{{detail.id}}"
+                                              binduserinfo="gotoDetailHan">
+                                        <!--<view class="opt-button">{{detail.hasOwner?'邀请':'分享日程'}}</view>-->
+                                        <view class="opt-button">邀请同行好友</view>
+                                    </userinfo>
+                                    <navigator url="/pack-checkout/pages/index?rid={{detail.id}}&sid={{detail.seller.id}}"><view class="opt-button">提前买单</view></navigator>
+                                </view>
                                 <userinfo-share wx:else="{{}}"
                                 <userinfo-share wx:else="{{}}"
                                                 id="userinfo-share-{{detail.id}}"
                                                 id="userinfo-share-{{detail.id}}"
                                                 binduserinfo="userinfo"
                                                 binduserinfo="userinfo"

@@ -69,6 +69,7 @@ Page({
   hasOnLoad:false,
   hasOnLoad:false,
   hasGetLocation:false,//定位信息
   hasGetLocation:false,//定位信息
   hasAppHide:false,//app切至后台
   hasAppHide:false,//app切至后台
+  param:{},
   onLoad: async function (options) {
   onLoad: async function (options) {
     this.reportTime=new Date()
     this.reportTime=new Date()
 
 
@@ -690,6 +691,7 @@ Page({
       return;
       return;
     }
     }
     let i=e.detail.current
     let i=e.detail.current
+    if(typeof this.data.markers[i]=='undefined') return;
     this.activeSellerID=this.data.markers[i].id
     this.activeSellerID=this.data.markers[i].id
     console.log('bindtransition',this.sellersNow,e.detail.current,this.sellersNow[e.detail.current],this.activeSellerID);
     console.log('bindtransition',this.sellersNow,e.detail.current,this.sellersNow[e.detail.current],this.activeSellerID);
     // this.activeSellerID=this.sellersNow[i];
     // this.activeSellerID=this.sellersNow[i];

@@ -97,7 +97,7 @@
 					"id": 6,
 					"id": 6,
 					"name": "pages/customer/index",
 					"name": "pages/customer/index",
 					"pathName": "pages/customer/index",
 					"pathName": "pages/customer/index",
-					"query": "id=58295&fromid=1111&hasInvitation=2",
+					"query": "id=58295&fromid=1111&hasInvitation=1",
 					"scene": 1044,
 					"scene": 1044,
 					"shareInfo": {
 					"shareInfo": {
 						"groupName": "测试模拟群1",
 						"groupName": "测试模拟群1",

@@ -466,4 +466,8 @@ export default {
   },
   },
   //催促消息
   //催促消息
   'App.PushMsg.SendUrgeMsg':null,
   'App.PushMsg.SendUrgeMsg':null,
+  //构造支付参数
+  'App.PayOnline.CombineTransactions':{
+    openid:'openid',
+  },
 }
 }