Commit 1b33ea5ec91198ea01af787c1fd1f164a139d1b1

Authored by wangfan
1 parent e1b08c24

seller

@@ -84,14 +84,15 @@ Page({ @@ -84,14 +84,15 @@ Page({
84 onShareAppMessage: function () { 84 onShareAppMessage: function () {
85 this.notice.close(); 85 this.notice.close();
86 var obj=this.data.bookInfo; 86 var obj=this.data.bookInfo;
87 - var path='b_detail?sellerid='+this.data.sellerid;  
88 - for (var key in obj){  
89 - path=path+'&'+key+'='+obj[key]  
90 - }  
91 - path=path+'&code=1' 87 + var path='/pages/customer/index?id='+this.data.bookInfo.id;
  88 + let nickname="";
  89 + try{
  90 + nickname='"'+util.cache('sellerInfo').seller_user.nickname+'"';
  91 + }catch(e){}
  92 + console.log(path);
92 return { 93 return {
93 - title: '恭喜订座成功,点击查看详情,及时通知用餐人员',  
94 - path: '/pages/book/'+path, 94 + title: nickname+'给你发送了一个订座信息,点击查看详情',
  95 + path: path,
95 success: function (res) { 96 success: function (res) {
96 console.log(res,666666) 97 console.log(res,666666)
97 }, 98 },
1 var util = require('../../utils/util.js') 1 var util = require('../../utils/util.js')
2 var uri=require('../../utils/uri.js') 2 var uri=require('../../utils/uri.js')
3 var bookOrder=require('../../utils/bookCommon.js') 3 var bookOrder=require('../../utils/bookCommon.js')
  4 +import App from '../../utils/api';
  5 +const {regeneratorRuntime} = global
4 Page({ 6 Page({
5 data:{ 7 data:{
6 isloading:false, 8 isloading:false,
@@ -13,15 +15,18 @@ Page({ @@ -13,15 +15,18 @@ Page({
13 var radio=750/util.getsystem().windowWidth; 15 var radio=750/util.getsystem().windowWidth;
14 var contentHeight=util.getsystem().windowHeight-Math.ceil(165/radio) 16 var contentHeight=util.getsystem().windowHeight-Math.ceil(165/radio)
15 this.setData({ 17 this.setData({
16 - sellerid:opt.sellerid ? opt.sellerid : util.cache('sellerid'), 18 + sellerid:opt.seller_id ? opt.seller_id : util.cache('sellerid'),
17 systemInfo:util.getsystem(), 19 systemInfo:util.getsystem(),
18 contentHeight:contentHeight, 20 contentHeight:contentHeight,
19 listHeight:contentHeight-Math.ceil(140/radio) 21 listHeight:contentHeight-Math.ceil(140/radio)
20 }) 22 })
21 - util.cache('sellerid',opt.sellerid) 23 + util.cache('sellerid',opt.seller_id)
  24 + util.cache('enter_params',opt)
22 console.log(this.data.sellerid) 25 console.log(this.data.sellerid)
23 util.setBarTitle('预定本'); 26 util.setBarTitle('预定本');
24 - 27 + App.Reserve.SellerInfo(opt).then(res=>{
  28 + util.cache('sellerInfo',res.data)
  29 + })
25 }, 30 },
26 onShow:function(){ 31 onShow:function(){
27 var that=this; 32 var that=this;
@@ -8,7 +8,6 @@ @@ -8,7 +8,6 @@
8 bindtap="switchTab" data-index="1">我的订座</view> 8 bindtap="switchTab" data-index="1">我的订座</view>
9 </view> 9 </view>
10 <block wx:for="{{list}}" wx:key="list.key" wx:for-item="parts" wx:for-index="tabindex"> 10 <block wx:for="{{list}}" wx:key="list.key" wx:for-item="parts" wx:for-index="tabindex">
11 - <text>{{parts.length}}</text>  
12 <block wx:if="{{parts.success.length>0 || parts.padding.length>0}}"> 11 <block wx:if="{{parts.success.length>0 || parts.padding.length>0}}">
13 <block wx:for="{{parts}}" wx:key="partskey" wx:for-item="part" wx:for-index="partIndex"> 12 <block wx:for="{{parts}}" wx:key="partskey" wx:for-item="part" wx:for-index="partIndex">
14 <view class="list-content" wx:if="{{tabindex==tabFlag && part.length>0}}"> 13 <view class="list-content" wx:if="{{tabindex==tabFlag && part.length>0}}">
@@ -30,7 +30,7 @@ @@ -30,7 +30,7 @@
30 "list": [] 30 "list": []
31 }, 31 },
32 "miniprogram": { 32 "miniprogram": {
33 - "current": 6, 33 + "current": 10,
34 "list": [ 34 "list": [
35 { 35 {
36 "id": 0, 36 "id": 0,
@@ -72,7 +72,7 @@ @@ -72,7 +72,7 @@
72 "id": 6, 72 "id": 6,
73 "name": "pages/customer/index", 73 "name": "pages/customer/index",
74 "pathName": "pages/customer/index", 74 "pathName": "pages/customer/index",
75 - "query": "id=67", 75 + "query": "id=68",
76 "scene": "1001" 76 "scene": "1001"
77 }, 77 },
78 { 78 {
@@ -94,6 +94,13 @@ @@ -94,6 +94,13 @@
94 "pathName": "pages/book/b_index", 94 "pathName": "pages/book/b_index",
95 "query": "", 95 "query": "",
96 "scene": "1001" 96 "scene": "1001"
  97 + },
  98 + {
  99 + "id": -1,
  100 + "name": "pages/customer/index 无产进列表",
  101 + "pathName": "pages/customer/index",
  102 + "query": "",
  103 + "scene": "1001"
97 } 104 }
98 ] 105 ]
99 } 106 }
@@ -31,4 +31,9 @@ export default { @@ -31,4 +31,9 @@ export default {
31 //订座详情页面----我愿意 31 //订座详情页面----我愿意
32 'App.Reserve.SetRelaSuccess':null, 32 'App.Reserve.SetRelaSuccess':null,
33 33
  34 + //定个座儿 获取商户信息
  35 + 'App.Reserve.SellerInfo':{
  36 + cachetime:3600,
  37 + }
  38 +
34 } 39 }