xt / xcx-book · Commits

Go to a project

Commit e8dd26e9921b12e50e95489a154d4c51a9c6ec72

Authored by Yolanda
1 parent 53097e32
build: skipped

tab修改

Inline Side-by-side
Showing 38 changed files with 461 additions and 69 deletions
@@ -17,6 +17,31 @@ Array.prototype.remove = function(val) { @@ -17,6 +17,31 @@ Array.prototype.remove = function(val) {
17 } 17 }
18 }; 18 };
19 //import log from 'utils/realTimeLog' 19 //import log from 'utils/realTimeLog'
  20 + // "tabBar": {
  21 + // "custom": true,
  22 + // "color": "#999999",
  23 + // "selectedColor": "#C0A369",
  24 + // "backgroundColor": "#262628",
  25 + // "borderStyle": "black",
  26 + // "list": [
  27 + // {
  28 + // "pagePath": "pages/reserve/index",
  29 + // "text": "附近"
  30 + // },
  31 + // {
  32 + // "pagePath": "pages/reserve/search",
  33 + // "text": "搜索"
  34 + // },
  35 + // {
  36 + // "pagePath": "pages/me/list",
  37 + // "text": "订单"
  38 + // },
  39 + // {
  40 + // "pagePath": "pages/me/index",
  41 + // "text": "我的"
  42 + // }
  43 + // ]
  44 + // },
20 App({ 45 App({
21 openid:"", 46 openid:"",
22 system:{}, 47 system:{},
@@ -136,31 +136,6 @@ @@ -136,31 +136,6 @@
136 "request": 10000, 136 "request": 10000,
137 "downloadFile": 10000 137 "downloadFile": 10000
138 }, 138 },
139 - "tabBar": {  
140 - "custom": true,  
141 - "color": "#999999",  
142 - "selectedColor": "#C0A369",  
143 - "backgroundColor": "#262628",  
144 - "borderStyle": "black",  
145 - "list": [  
146 - {  
147 - "pagePath": "pages/reserve/index",  
148 - "text": "附近"  
149 - },  
150 - {  
151 - "pagePath": "pages/reserve/search",  
152 - "text": "搜索"  
153 - },  
154 - {  
155 - "pagePath": "pages/me/list",  
156 - "text": "订单"  
157 - },  
158 - {  
159 - "pagePath": "pages/me/index",  
160 - "text": "我的"  
161 - }  
162 - ]  
163 - },  
164 "plugins": { 139 "plugins": {
165 "bmCalendar": { 140 "bmCalendar": {
166 "version": "1.2.1", 141 "version": "1.2.1",
@@ -28,7 +28,7 @@ Component({ @@ -28,7 +28,7 @@ Component({
28 methods:{ 28 methods:{
29 gotoList(e){ 29 gotoList(e){
30 getApp().meListType=util.attr(e,'type') 30 getApp().meListType=util.attr(e,'type')
31 - wx.switchTab({ 31 + wx.redirectTo({
32 url:'/pages/me/list?type='+util.attr(e,'type') 32 url:'/pages/me/list?type='+util.attr(e,'type')
33 }) 33 })
34 }, 34 },
  1 +Component({
  2 + data:{
  3 + menuhidden:true,
  4 + url:'pages/reserve/index',
  5 + },
  6 + attached: function() {
  7 + this.setStatus();
  8 + },
  9 + methods:{
  10 + showmenu(){
  11 + this.setData({
  12 + menuhidden:false
  13 + })
  14 + },
  15 + hidemenu(){
  16 + this.setData({
  17 + menuhidden:true
  18 + })
  19 + },
  20 + topage(e){
  21 + let url=e.currentTarget.dataset.path;
  22 + wx.redirectTo({
  23 + url:url
  24 + })
  25 + },
  26 + setStatus(){
  27 + let pages = getCurrentPages();
  28 + let p = pages[pages.length - 1];
  29 + console.log('custom-tab-bar.setStatus',p.route)
  30 + this.setData({
  31 + url:p.route,
  32 + })
  33 + },
  34 + }
  35 +})
  1 +<view class="menu flex-vc" bindtap="showmenu"></view>
  2 +<view class="menu-list flex-vl" style="justify-content: flex-end;" hidden="{{menuhidden}}" bindtap="hidemenu">
  3 + <view class="menu-item menu-seller-item flex-ll" bindtap="hidemenu">
  4 + <view class="menu-item-image menu-item-back"></view>
  5 + <view class="white-font font30r smooth">返回</view>
  6 + </view>
  7 + <block wx:if="{{'pages/me/index'!=url}}">
  8 + <view class="menu-item menu-seller-item flex-ll" bindtap="topage" data-path="/pages/me/index">
  9 + <view class="menu-item-image menu-item-me"></view>
  10 + <view class="white-font font30r smooth">我的</view>
  11 + </view>
  12 + </block>
  13 + <block wx:if="{{'pages/me/list'!=url}}">
  14 + <view class="menu-item menu-seller-item flex-ll" bindtap="topage" data-path="/pages/me/list">
  15 + <view class="menu-item-image menu-item-order"></view>
  16 + <view class="white-font font30r smooth">订单</view>
  17 + </view>
  18 + </block>
  19 + <block wx:if="{{'pages/reserve/search'!=url}}">
  20 + <view class="menu-item menu-seller-item flex-ll" bindtap="topage" data-path="/pages/reserve/search">
  21 + <view class="menu-item-image menu-item-search"></view>
  22 + <view class="white-font font30r smooth" bindtap="">搜索</view>
  23 + </view>
  24 + </block>
  25 + <block wx:if="{{'pages/reserve/index'!=url}}">
  26 + <view class="menu-item menu-seller-item flex-ll" bindtap="topage" data-path="/pages/reserve/index">
  27 + <view class="menu-item-image menu-item-nearby"></view>
  28 + <view class="white-font font30r smooth" bindtap="">附近</view>
  29 + </view>
  30 + </block>
  31 +
  32 +</view>
  1 +@import '../../app.wxss';
  2 +.menu{
  3 + width: 100rpx;
  4 + height: 100rpx;
  5 + border-radius: 50%;
  6 + position: fixed;
  7 + left: 40rpx;
  8 + bottom: 80rpx;
  9 + z-index: 10001;
  10 + border-radius: 50;
  11 + background: url(http://libpc.colorcun.com/navigator.png) center center no-repeat;
  12 + background-size: contain;
  13 +}
  14 +.menu image{
  15 + width: 34rpx;
  16 + height: 34rpx;
  17 + margin-bottom: 10rpx;
  18 +}
  19 +.menu-list{
  20 + position: fixed;
  21 + left: 0;
  22 + right: 0;
  23 + top: 0;
  24 + bottom: 0;
  25 + background: rgba(0,0,0,.69);
  26 + z-index: 10001;
  27 + padding-left: 40rpx;
  28 + padding-bottom: 50rpx;
  29 + box-sizing: border-box;
  30 +}
  31 +.menu-item{
  32 + height: 100rpx;
  33 + margin-bottom: 40rpx;
  34 +}
  35 +.menu-item-image{
  36 + width: 100rpx;
  37 + height: 100rpx;
  38 + margin-right: 20rpx;
  39 + border-radius: 50%;
  40 +}
  41 +.menu-item-search{
  42 + background: url(http://libpc.colorcun.com/search.png) center center no-repeat;
  43 + background-size: contain;
  44 +}
  45 +.menu-item-order{
  46 + background: url(http://libpc.colorcun.com/order.png) center center no-repeat;
  47 + background-size: contain;
  48 +}
  49 +.menu-item-me{
  50 + background: url(http://libpc.colorcun.com/me.png) center center no-repeat;
  51 + background-size: contain;
  52 +}
  53 +.menu-item-back{
  54 + background: url(http://nosqn.colorcun.com/menu-back.png) center center no-repeat;
  55 + background-size: contain;
  56 +}
  57 +.menu-item-nearby{
  58 + background: url(http://libpc.colorcun.com/nearby.png) center center no-repeat;
  59 + background-size: contain;
  60 +}
  61 +.click-icon{
  62 + width: 12rpx;
  63 + height: 12rpx;
  64 + border-top: 2rpx solid #FFFFFF;
  65 + border-right: 2rpx solid #FFFFFF;
  66 + transform: rotate(45deg);
  67 + margin-left: -6rpx;
  68 +}
  69 +.gray-font{
  70 + color: #999999;
  71 +}
@@ -83,7 +83,31 @@ Component({ @@ -83,7 +83,31 @@ Component({
83 desc: '用于完善会员资料', // 声明获取用户个人信息后的用途，后续会展示在弹窗中，请谨慎填写 83 desc: '用于完善会员资料', // 声明获取用户个人信息后的用途，后续会展示在弹窗中，请谨慎填写
84 success: (res) => { 84 success: (res) => {
85 console.log(res,'nnnnnnnnn') 85 console.log(res,'nnnnnnnnn')
86 - } 86 + var userInfo = res.userInfo //avatarUrl nickName gender;
  87 + console.log('getUserInfo:ok', e.detail)
  88 + util.cache('userInfo', userInfo);
  89 + App.Reserve.AddUser({
  90 + openid: getApp().openid,
  91 + avatar: userInfo.avatarUrl,
  92 + nickname: userInfo.nickName,
  93 + gender: userInfo.gender
  94 + })
  95 + getApp()._getOpenid();
  96 + this.triggerEvent("userinfo", userInfo);
  97 + },
  98 + fail:()=>{
  99 + wx.showModal({
  100 + title: '授权提示',
  101 + content: '您点击了拒绝授权,将无法正常显示个人信息,点击确定重新获取授权',
  102 + confirmColor: '#199095',
  103 + cancelColor: '#999',
  104 + success: function (res) {
  105 + if (res.confirm) {
  106 + util.setting();
  107 + }
  108 + }
  109 + })
  110 + }
87 }) 111 })
88 } 112 }
89 } 113 }
1 <block wx:if="{{!userinfo}}"> 1 <block wx:if="{{!userinfo}}">
2 - <button bindgetuserinfo="getUserInfoSuccess" open-type="getUserInfo" class="button-none" catchtap="catchtap"> 2 + <!-- <button bindgetuserinfo="getUserInfoSuccess" open-type="getUserInfo" class="button-none" catchtap="catchtap">
3 <slot></slot> 3 <slot></slot>
4 - </button>  
5 - <!-- <view bindtap="getuserinfo"> 4 + </button> -->
  5 + <view bindtap="getuserinfo">
6 <slot></slot> 6 <slot></slot>
7 - </view> --> 7 + </view>
8 </block> 8 </block>
9 <block wx:else=""> 9 <block wx:else="">
10 <formids bindclick="setUserInfoSuccess" catchtap="catchtap" style="width: 100%;"> 10 <formids bindclick="setUserInfoSuccess" catchtap="catchtap" style="width: 100%;">
@@ -36,9 +36,10 @@ Component({ @@ -36,9 +36,10 @@ Component({
36 bottom:(res.windowHeight-res.safeArea.bottom)*ratio, 36 bottom:(res.windowHeight-res.safeArea.bottom)*ratio,
37 }) 37 })
38 console.log('custom-tab-bar.attached') 38 console.log('custom-tab-bar.attached')
39 - PubSub.on('custom-tab-bar',()=>{  
40 - this.setStatus()  
41 - }) 39 + this.setStatus()
  40 + // PubSub.on('custom-tab-bar',()=>{
  41 + // this.setStatus()
  42 + // })
42 }, 43 },
43 detached: function() { 44 detached: function() {
44 // 在组件实例被从页面节点树移除时执行 45 // 在组件实例被从页面节点树移除时执行
@@ -63,7 +64,7 @@ Component({ @@ -63,7 +64,7 @@ Component({
63 }, 64 },
64 redirectTo(e){ 65 redirectTo(e){
65 let url= util.attr(e, 'url'); 66 let url= util.attr(e, 'url');
66 - wx.switchTab({ 67 + wx.redirectTo({
67 url: '/'+url, 68 url: '/'+url,
68 }) 69 })
69 }, 70 },
@@ -11,7 +11,7 @@ @@ -11,7 +11,7 @@
11 <view class="money-number">{{user.balance.price||0}}</view> 11 <view class="money-number">{{user.balance.price||0}}</view>
12 <view class="money-dw">元</view> 12 <view class="money-dw">元</view>
13 </view> 13 </view>
14 - <navigator url="/pages/reserve/index" open-type="switchTab" hover-class="other-navigator-hover"> 14 + <navigator url="/pages/reserve/index" open-type="redirect" hover-class="other-navigator-hover">
15 <view class="yuding flex-cc"> 15 <view class="yuding flex-cc">
16 <view class="icon"></view> 16 <view class="icon"></view>
17 去订包间 17 去订包间
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 <nav hasHome>订包间</nav> 2 <nav hasHome>订包间</nav>
3 <view class="pages"> 3 <view class="pages">
4 <image src="http://nosqn.colorcun.com/activity/images/yuding.png" style="width: 100%;" mode="widthFix"></image> 4 <image src="http://nosqn.colorcun.com/activity/images/yuding.png" style="width: 100%;" mode="widthFix"></image>
5 - <navigator url="/pages/reserve/index" open-type="switchTab" hover-class="other-navigator-hover"> 5 + <navigator url="/pages/reserve/index" open-type="redirect" hover-class="other-navigator-hover">
6 <view class="content flex-cc"> 6 <view class="content flex-cc">
7 <view class="share-but"> 7 <view class="share-but">
8 <button class="button-none">去订包间</button> 8 <button class="button-none">去订包间</button>
@@ -398,7 +398,7 @@ Page({ @@ -398,7 +398,7 @@ Page({
398 } 398 }
399 }, 399 },
400 gotoHome(){ 400 gotoHome(){
401 - wx.switchTab({ 401 + wx.redirectTo({
402 url: '/pages/reserve/index' 402 url: '/pages/reserve/index'
403 }) 403 })
404 }, 404 },
@@ -51,7 +51,7 @@ @@ -51,7 +51,7 @@
51 <view class="font34r smooth flex-cc font-bold" style="width:140rpx;color:#ECC88F;margin: 0 auto;" bindtap="secondbook">再次预订</view> 51 <view class="font34r smooth flex-cc font-bold" style="width:140rpx;color:#ECC88F;margin: 0 auto;" bindtap="secondbook">再次预订</view>
52 </view> --> 52 </view> -->
53 <scroll-view class="last-bg" style="padding-top: {{statusBarHeight+titleBarHeight}}px;line-height: 1.4;height:{{height}}px;" scroll-y> 53 <scroll-view class="last-bg" style="padding-top: {{statusBarHeight+titleBarHeight}}px;line-height: 1.4;height:{{height}}px;" scroll-y>
54 - <view class="last-book-title"></view> 54 + <!-- <view class="last-book-title"></view> -->
55 <view class="last-staff-info flex-lr"> 55 <view class="last-staff-info flex-lr">
56 <view class="last-staff-image" style="background: url({{staffinfo.photo}}) center center no-repeat;background-size: 100% auto;"></view> 56 <view class="last-staff-image" style="background: url({{staffinfo.photo}}) center center no-repeat;background-size: 100% auto;"></view>
57 <view class="last-staff-detail flex-vr" style="align-items: flex-end;"> 57 <view class="last-staff-detail flex-vr" style="align-items: flex-end;">
@@ -302,7 +302,7 @@ Page({ @@ -302,7 +302,7 @@ Page({
302 } 302 }
303 if('animationfinish'==e.type){ 303 if('animationfinish'==e.type){
304 if(this.hasGoto){ 304 if(this.hasGoto){
305 - wx.switchTab({ 305 + wx.redirectTo({
306 url: '/pages/reserve/index' 306 url: '/pages/reserve/index'
307 }) 307 })
308 return; 308 return;
@@ -26,7 +26,8 @@ Page({ @@ -26,7 +26,8 @@ Page({
26 hasOwner: true,//是否为发起人 26 hasOwner: true,//是否为发起人
27 animation: 'animation', 27 animation: 'animation',
28 couponhidden:true, 28 couponhidden:true,
29 - getcoupon:false 29 + getcoupon:false,
  30 + menuhidden:true,
30 }, 31 },
31 id: null, 32 id: null,
32 msgTpl:'', 33 msgTpl:'',
@@ -77,7 +78,7 @@ Page({ @@ -77,7 +78,7 @@ Page({
77 this.setData({ 78 this.setData({
78 statusBarHeight: pt, 79 statusBarHeight: pt,
79 titleBarHeight: h, 80 titleBarHeight: h,
80 - height: systemInfo.windowHeight-90/(750/systemInfo.windowWidth) 81 + height: systemInfo.windowHeight
81 }) 82 })
82 this.getDetail(getCurrentPages().length==1); 83 this.getDetail(getCurrentPages().length==1);
83 }, 84 },
@@ -487,4 +488,22 @@ Page({ @@ -487,4 +488,22 @@ Page({
487 }) 488 })
488 } 489 }
489 }, 490 },
  491 + showmenu(){
  492 + this.setData({
  493 + menuhidden:false
  494 + })
  495 + },
  496 + hidemenu(){
  497 + this.setData({
  498 + menuhidden:true
  499 + })
  500 + },
  501 + noopen(e){
  502 + let mark=e.currentTarget.dataset.mark;
  503 + wx.showToast({
  504 + title:'该商家未开通'+(mark=='buy' ? '提前点餐' : '在线买单'),
  505 + duration:2000,
  506 + mask:true
  507 + })
  508 + },
490 }) 509 })
@@ -68,7 +68,7 @@ @@ -68,7 +68,7 @@
68 <view class="font34r smooth flex-cc font-bold" style="width:140rpx;color:#ECC88F;margin: 0 auto;" bindtap="secondbook">再次预订</view> 68 <view class="font34r smooth flex-cc font-bold" style="width:140rpx;color:#ECC88F;margin: 0 auto;" bindtap="secondbook">再次预订</view>
69 </view> --> 69 </view> -->
70 <scroll-view class="last-bg" style="padding-top: {{statusBarHeight+titleBarHeight}}px;line-height: 1.4;height:{{height}}px;" scroll-y> 70 <scroll-view class="last-bg" style="padding-top: {{statusBarHeight+titleBarHeight}}px;line-height: 1.4;height:{{height}}px;" scroll-y>
71 - <view class="last-book-title"></view> 71 + <!-- <view class="last-book-title"></view> -->
72 <view class="last-staff-info flex-lr"> 72 <view class="last-staff-info flex-lr">
73 <view class="last-staff-image" style="background: url({{staffinfo.photo}}) center center no-repeat;background-size: 100% auto;"></view> 73 <view class="last-staff-image" style="background: url({{staffinfo.photo}}) center center no-repeat;background-size: 100% auto;"></view>
74 <view class="last-staff-detail flex-vr" style="align-items: flex-end;"> 74 <view class="last-staff-detail flex-vr" style="align-items: flex-end;">
@@ -119,7 +119,7 @@ @@ -119,7 +119,7 @@
119 <view style="height:40rpx;"></view> 119 <view style="height:40rpx;"></view>
120 </scroll-view> 120 </scroll-view>
121 <!-- wx:if="{{detail.seller.is_open_order==1 && !detail.hasOvered && !detail.hasCancel}}" --> 121 <!-- wx:if="{{detail.seller.is_open_order==1 && !detail.hasOvered && !detail.hasCancel}}" -->
122 - <view class="last-bottom flex-lr"> 122 + <!-- <view class="last-bottom flex-lr">
123 <view class="booking-button last-buts-text flex-cc font30r" bindtap="secondbook" style="width:{{detail.seller.is_open_order==1 && !detail.hasOvered && !detail.hasCancel ? (detail && detail.seller.isopen_md==1 ? 33.33 : 50) : 100}}%;"> 123 <view class="booking-button last-buts-text flex-cc font30r" bindtap="secondbook" style="width:{{detail.seller.is_open_order==1 && !detail.hasOvered && !detail.hasCancel ? (detail && detail.seller.isopen_md==1 ? 33.33 : 50) : 100}}%;">
124 <image src="http://sellershare.colorcun.com/yuding.png" class="icon" style="width: 32rpx;height: 32rpx;"></image> 124 <image src="http://sellershare.colorcun.com/yuding.png" class="icon" style="width: 32rpx;height: 32rpx;"></image>
125 再次预订 125 再次预订
@@ -138,7 +138,7 @@ @@ -138,7 +138,7 @@
138 </view> 138 </view>
139 </userinfo> 139 </userinfo>
140 </block> 140 </block>
141 - </view> 141 + </view> -->
142 <showModal id="showModal" confirmText="知道了" bindshowModal="showModal" cla="checkout"></showModal> 142 <showModal id="showModal" confirmText="知道了" bindshowModal="showModal" cla="checkout"></showModal>
143 <!-- <view bindtap="sendmsg">测试发送短信息</view> --> 143 <!-- <view bindtap="sendmsg">测试发送短信息</view> -->
144 </block> 144 </block>
@@ -163,6 +163,48 @@ @@ -163,6 +163,48 @@
163 </block> 163 </block>
164 164
165 </block> 165 </block>
  166 +<view class="menu" wx:if="{{detail && detail.type==0 && detail.channel==2}}" bindtap="showmenu"></view>
  167 +<view class="menu-list flex-vl" style="justify-content: flex-end;" wx:if="{{detail && detail.type==0 && detail.channel==2}}" hidden="{{menuhidden}}" catchtap="hidemenu">
  168 + <view class="menu-item menu-seller-item flex-ll" catchtap="secondbook">
  169 + <view class="menu-item-image" style="background: url({{detail.seller.seller_image}}) center center no-repeat;background-size: cover;"></view>
  170 + <view class="white-font font30r smooth">{{seller.name}}</view>
  171 + <view class="click-icon"></view>
  172 + </view>
  173 + <view class="menu-item menu-seller-item flex-ll" bindtap="secondbook">
  174 + <view class="menu-item-image menu-item-book"></view>
  175 + <view class="white-font font30r smooth">再次预订</view>
  176 + </view>
  177 + <block wx:if="{{detail.seller.is_open_order==1 && !detail.hasOvered && !detail.hasCancel}}">
  178 + <block wx:if="{{detail && detail.seller.is_open_order==1}}">
  179 + <view class="menu-item menu-seller-item flex-ll" bindtap="cookbook">
  180 + <view class="menu-item-image menu-item-buy"></view>
  181 + <view class="white-font font30r smooth">提前点餐</view>
  182 + </view>
  183 + </block>
  184 + <block wx:else>
  185 + <view class="menu-item menu-seller-item flex-ll" bindtap="noopen" data-mark="buy">
  186 + <view class="menu-item-image menu-item-buy-nouse"></view>
  187 + <view class="gray-font font30r smooth">提前点餐</view>
  188 + </view>
  189 + </block>
  190 + <block wx:if="{{detail && detail.seller.isopen_md==1}}">
  191 + <view class="menu-item menu-seller-item flex-ll" bindtap="checkout">
  192 + <view class="menu-item-image menu-item-check"></view>
  193 + <view class="white-font font30r smooth">在线买单</view>
  194 + </view>
  195 + </block>
  196 + <block wx:else>
  197 + <view class="menu-item menu-seller-item flex-ll" bindtap="noopen" data-mark="checkout">
  198 + <view class="menu-item-image menu-item-check-nouse"></view>
  199 + <view class="gray-font font30r smooth">在线买单</view>
  200 + </view>
  201 + </block>
  202 + </block>
  203 + <view class="menu-item menu-seller-item flex-ll" bindtap="hidemenu">
  204 + <view class="menu-item-image menu-item-back"></view>
  205 + <view class="white-font font30r smooth">返回</view>
  206 + </view>
  207 +</view>
166 <view class="bottom flex-lr" wx:if="{{!detail.hasOvered && !detail.hasCancel && detail.channel!=2}}"> 208 <view class="bottom flex-lr" wx:if="{{!detail.hasOvered && !detail.hasCancel && detail.channel!=2}}">
167 209
168 <view bindtap="gotoHome" class="dingbaojian flex-vc"> 210 <view bindtap="gotoHome" class="dingbaojian flex-vc">
@@ -271,3 +271,133 @@ image{ @@ -271,3 +271,133 @@ image{
271 background: transparent; 271 background: transparent;
272 padding: 30rpx 0; 272 padding: 30rpx 0;
273 } 273 }
  274 +.menu{
  275 + width: 100rpx;
  276 + height: 100rpx;
  277 + border-radius: 50%;
  278 + position: fixed;
  279 + left: 40rpx;
  280 + bottom: 80rpx;
  281 + background: url(http://nosqn.colorcun.com/invite_menu.png) center center no-repeat;
  282 + background-size: contain;
  283 +}
  284 +.menu-list{
  285 + position: fixed;
  286 + left: 0;
  287 + right: 0;
  288 + top: 0;
  289 + bottom: 0;
  290 + background: rgba(0,0,0,.69);
  291 + z-index: 100;
  292 + padding-left: 40rpx;
  293 + padding-bottom: 40rpx;
  294 + box-sizing: border-box;
  295 +}
  296 +.menu-item{
  297 + height: 100rpx;
  298 + margin-bottom: 40rpx;
  299 +}
  300 +.menu-item-image{
  301 + width: 100rpx;
  302 + height: 100rpx;
  303 + margin-right: 20rpx;
  304 + border-radius: 50%;
  305 +}
  306 +/* .menu-item-book{
  307 + width: 100rpx;
  308 + height: 100rpx;
  309 + border-radius: 50%;
  310 + position: fixed;
  311 + left: 40rpx;
  312 + bottom: 80rpx;
  313 + background: url(http://nosqn.colorcun.com/invite_menu.png) center center no-repeat;
  314 + background-size: contain;
  315 +} */
  316 +.menu-list{
  317 + position: fixed;
  318 + left: 0;
  319 + right: 0;
  320 + top: 0;
  321 + bottom: 0;
  322 + background: rgba(0,0,0,.69);
  323 + z-index: 100;
  324 + padding-left: 40rpx;
  325 + padding-bottom: 40rpx;
  326 + box-sizing: border-box;
  327 +}
  328 +.menu-item{
  329 + height: 100rpx;
  330 + margin-bottom: 40rpx;
  331 +}
  332 +.menu-item-image{
  333 + width: 100rpx;
  334 + height: 100rpx;
  335 + margin-right: 20rpx;
  336 + border-radius: 50%;
  337 +}
  338 +.menu-item-book{
  339 + background: url(http://nosqn.colorcun.com/menu-book.png) center center no-repeat;
  340 + background-size: contain;
  341 +}
  342 +.menu-item-buy{
  343 + background: url(http://nosqn.colorcun.com/menu-buy.png) center center no-repeat;
  344 + background-size: contain;
  345 +}
  346 +.menu-item-buy-nouse{
  347 + background: url(http://nosqn.colorcun.com/menu-buy-nouse.png) center center no-repeat;
  348 + background-size: contain;
  349 +}
  350 +.menu-item-check{
  351 + background: url(http://nosqn.colorcun.com/menu-check.png) center center no-repeat;
  352 + background-size: contain;
  353 +}
  354 +.menu-item-check-nouse{
  355 + background: url(http://nosqn.colorcun.com/menu-check-nouse.png) center center no-repeat;
  356 + background-size: contain;
  357 +}
  358 +.menu-item-back{
  359 + background: url(http://nosqn.colorcun.com/menu-back.png) center center no-repeat;
  360 + background-size: contain;
  361 +}
  362 +.click-icon{
  363 + width: 12rpx;
  364 + height: 12rpx;
  365 + border-top: 2rpx solid #FFFFFF;
  366 + border-right: 2rpx solid #FFFFFF;
  367 + transform: rotate(45deg);
  368 + margin-left: -6rpx;
  369 +}
  370 +.gray-font{
  371 + color: #999999;
  372 +}
  373 +.menu-item-buy{
  374 + background: url(http://nosqn.colorcun.com/menu-buy.png) center center no-repeat;
  375 + background-size: contain;
  376 +}
  377 +.menu-item-buy-nouse{
  378 + background: url(http://nosqn.colorcun.com/menu-buy-nouse.png) center center no-repeat;
  379 + background-size: contain;
  380 +}
  381 +.menu-item-check{
  382 + background: url(http://nosqn.colorcun.com/menu-check.png) center center no-repeat;
  383 + background-size: contain;
  384 +}
  385 +.menu-item-check-nouse{
  386 + background: url(http://nosqn.colorcun.com/menu-check-nouse.png) center center no-repeat;
  387 + background-size: contain;
  388 +}
  389 +.menu-item-back{
  390 + background: url(http://nosqn.colorcun.com/menu-back.png) center center no-repeat;
  391 + background-size: contain;
  392 +}
  393 +.click-icon{
  394 + width: 12rpx;
  395 + height: 12rpx;
  396 + border-top: 2rpx solid #FFFFFF;
  397 + border-right: 2rpx solid #FFFFFF;
  398 + transform: rotate(45deg);
  399 + margin-left: -6rpx;
  400 +}
  401 +.gray-font{
  402 + color: #999999;
  403 +}
@@ -55,7 +55,7 @@ Page({ @@ -55,7 +55,7 @@ Page({
55 }) 55 })
56 } 56 }
57 if(opt.act=='order'){ 57 if(opt.act=='order'){
58 - return wx.switchTab({ 58 + return wx.redirectTo({
59 url:'../me/list' 59 url:'../me/list'
60 }) 60 })
61 } 61 }
@@ -124,6 +124,17 @@ Page({ @@ -124,6 +124,17 @@ Page({
124 openid: opt.openid, 124 openid: opt.openid,
125 fromid: opt.fromid ? opt.fromid : '' 125 fromid: opt.fromid ? opt.fromid : ''
126 }) 126 })
  127 + if(opt.uid && opt.uid!=''){
  128 + App.Activity.SetRelation({
  129 + uid:opt.uid
  130 + })
  131 + App.Activity.SetIntegral({
  132 + uid:opt.uid,
  133 + type:0,
  134 + rid:opt.id
  135 + })
  136 + }
  137 +
127 if (!res.data.openid) {//无预订人 138 if (!res.data.openid) {//无预订人
128 url = '/pages/customer/detail_owner'; 139 url = '/pages/customer/detail_owner';
129 if (opt.hasInvitation == 1) { 140 if (opt.hasInvitation == 1) {
@@ -179,7 +190,7 @@ Page({ @@ -179,7 +190,7 @@ Page({
179 if (red.url.indexOf('me/list') > 0 190 if (red.url.indexOf('me/list') > 0
180 || red.url.indexOf('reserve/search') > 0 191 || red.url.indexOf('reserve/search') > 0
181 || red.url.indexOf('reserve/index') > 0) { 192 || red.url.indexOf('reserve/index') > 0) {
182 - wx.switchTab(red); 193 + wx.redirectTo(red);
183 } else { 194 } else {
184 wx.redirectTo(red); 195 wx.redirectTo(red);
185 } 196 }
@@ -4,8 +4,13 @@ @@ -4,8 +4,13 @@
4 <view class="wecode"> 4 <view class="wecode">
5 <image src="{{qrcode}}" mode="aspectFit"></image> 5 <image src="{{qrcode}}" mode="aspectFit"></image>
6 </view> 6 </view>
7 - <view class="last-yellow-font font48r act-operate">1.点击“保存图片”按钮</view>  
8 - <view class="last-yellow-font font48r act-operate">2.打开微信扫一扫</view>  
9 - <view class="last-yellow-font font48r act-operate">3.选择相册该图片识别</view> 7 + <view class="last-yellow-font font40r act-operate">步骤：</view>
  8 + <view class="last-yellow-font font40r act-operate">1、点击“保存图片”按钮</view>
  9 + <view class="last-yellow-font font40r act-operate">2、打开微信扫一扫</view>
  10 + <view class="last-yellow-font font40r act-operate flex-ll">
  11 + <view>3、选择右下角相册图标</view>
  12 + <image src="http://nosqn.colorcun.com/picture.png" style="width: 80rpx;height: 80rpx;margin-left: 20rpx;"></image>
  13 + </view>
  14 + <view class="last-yellow-font font40r act-operate" style="margin-bottom: 60rpx;">4、选择保存的二维码图片</view>
10 <view class="save-button flex-cc last-yellow-font font36r font-bold" bindtap='saveimage'>保存图片</view> 15 <view class="save-button flex-cc last-yellow-font font36r font-bold" bindtap='saveimage'>保存图片</view>
11 </view> 16 </view>
@@ -4,8 +4,10 @@ @@ -4,8 +4,10 @@
4 overflow-y: scroll; 4 overflow-y: scroll;
5 background: url(http://sellershare.colorcun.com/last-bg.png) center center no-repeat; 5 background: url(http://sellershare.colorcun.com/last-bg.png) center center no-repeat;
6 background-size: 100% 100%; 6 background-size: 100% 100%;
7 - padding-bottom: 10rpx; 7 + padding-bottom: 200rpx;
8 position: relative; 8 position: relative;
  9 + padding-left: 100rpx;
  10 + padding-right: 60rpx;
9 } 11 }
10 .last-yellow-font{ 12 .last-yellow-font{
11 color: #BA9953; 13 color: #BA9953;
@@ -23,8 +25,10 @@ @@ -23,8 +25,10 @@
23 height: 520rpx; 25 height: 520rpx;
24 } 26 }
25 .act-operate{ 27 .act-operate{
  28 + width: 100%;
26 line-height: 1.4; 29 line-height: 1.4;
27 margin-bottom: 20rpx; 30 margin-bottom: 20rpx;
  31 + font-size:46rpx;
28 } 32 }
29 .save-button{ 33 .save-button{
30 width: 440rpx; 34 width: 440rpx;
@@ -69,7 +69,7 @@ Page({ @@ -69,7 +69,7 @@ Page({
69 console.log('launchAppError',e) 69 console.log('launchAppError',e)
70 }, 70 },
71 gotoHome(e){ 71 gotoHome(e){
72 - wx.switchTab({ 72 + wx.redirectTo({
73 url:'/pages/reserve/index', 73 url:'/pages/reserve/index',
74 fail:res=>{ 74 fail:res=>{
75 console.log('gotoHome.fail',res) 75 console.log('gotoHome.fail',res)
@@ -172,7 +172,7 @@ Page({ @@ -172,7 +172,7 @@ Page({
172 } 172 }
173 if('animationfinish'==e.type){ 173 if('animationfinish'==e.type){
174 if(this.hasGoto && (e.detail.current+1)==this.data.rsl.length){ 174 if(this.hasGoto && (e.detail.current+1)==this.data.rsl.length){
175 - wx.switchTab({ 175 + wx.redirectTo({
176 url: '/pages/reserve/index' 176 url: '/pages/reserve/index'
177 }) 177 })
178 return; 178 return;
@@ -109,7 +109,7 @@ Page({ @@ -109,7 +109,7 @@ Page({
109 }, 109 },
110 gotoList(e){ 110 gotoList(e){
111 getApp().meListType=util.attr(e,'type') 111 getApp().meListType=util.attr(e,'type')
112 - wx.switchTab({ 112 + wx.redirectTo({
113 url:'/pages/me/list?type='+util.attr(e,'type') 113 url:'/pages/me/list?type='+util.attr(e,'type')
114 }) 114 })
115 }, 115 },
@@ -4,6 +4,7 @@ @@ -4,6 +4,7 @@
4 "navigationBarTitleText":"我的", 4 "navigationBarTitleText":"我的",
5 "usingComponents": { 5 "usingComponents": {
6 "nav":"/components/nav/nav", 6 "nav":"/components/nav/nav",
7 - "formids":"/components/formids/formids" 7 + "formids":"/components/formids/formids",
  8 + "menu":"/components/menu/menu"
8 } 9 }
9 } 10 }
@@ -39,7 +39,7 @@ @@ -39,7 +39,7 @@
39 </navigator> 39 </navigator>
40 </view> 40 </view>
41 <view class="block-rev"> 41 <view class="block-rev">
42 - <navigator url="/pages/me/list" open-type="switchTab"> 42 + <navigator url="/pages/me/list" open-type="redirect">
43 <view class="title flex-lr"> 43 <view class="title flex-lr">
44 <view >我的订单</view> 44 <view >我的订单</view>
45 <view class="more"></view> 45 <view class="more"></view>
@@ -155,4 +155,5 @@ @@ -155,4 +155,5 @@
155 --> 155 -->
156 </view> 156 </view>
157 </view> 157 </view>
158 -</layout>  
  158 +</layout>
  159 +<menu></menu>
@@ -11,6 +11,7 @@ @@ -11,6 +11,7 @@
11 "as-phone":"/components/actionSheet/phone", 11 "as-phone":"/components/actionSheet/phone",
12 "card-bak":"/components/seller-card/seller-card", 12 "card-bak":"/components/seller-card/seller-card",
13 "card":"/components/2.0/reserve/card", 13 "card":"/components/2.0/reserve/card",
14 - "subject":"/components/2.0/taocan/subject" 14 + "subject":"/components/2.0/taocan/subject",
  15 + "menu":"/components/menu/menu"
15 } 16 }
16 } 17 }
@@ -60,4 +60,5 @@ @@ -60,4 +60,5 @@
60 </view> 60 </view>
61 <view class="view" style="height: 192rpx;"></view> 61 <view class="view" style="height: 192rpx;"></view>
62 </block> 62 </block>
63 -</view>  
  63 +</view>
  64 +<menu></menu>
@@ -9,6 +9,7 @@ @@ -9,6 +9,7 @@
9 "seller-card":"/components/2.0/seller/card", 9 "seller-card":"/components/2.0/seller/card",
10 "chatbot":"/components/userinfo/chatbot", 10 "chatbot":"/components/userinfo/chatbot",
11 "as-phone":"/components/2.0/dialog/phone", 11 "as-phone":"/components/2.0/dialog/phone",
12 - "taocan-notice":"/components/2.0/taocan/notice" 12 + "taocan-notice":"/components/2.0/taocan/notice",
  13 + "menu":"/components/menu/menu"
13 } 14 }
14 } 15 }
@@ -27,7 +27,7 @@ @@ -27,7 +27,7 @@
27 </view> 27 </view>
28 <view class="moveToLocationView"> 28 <view class="moveToLocationView">
29 <view bindtap="switchpage" class="view moveToLocation flex-vc" style="top: -140rpx;"> 29 <view bindtap="switchpage" class="view moveToLocation flex-vc" style="top: -140rpx;">
30 - <image class="moveToLocation-image" src="http://nosqn.colorcun.com/menu.png" style="width: 32rpx;height: 26rpx;margin-bottom: 8rpx;"></image> 30 + <image class="moveToLocation-image" src="http://libpc.colorcun.com/map.png" style="width: 34rpx;height: 32rpx;margin-bottom: 8rpx;"></image>
31 <view style="color: #42A5FF;font-size: 20rpx;">地图</view> 31 <view style="color: #42A5FF;font-size: 20rpx;">地图</view>
32 </view> 32 </view>
33 </view> 33 </view>
@@ -126,4 +126,5 @@ @@ -126,4 +126,5 @@
126 <filter id="filter" bindevent="filterEvent"></filter> 126 <filter id="filter" bindevent="filterEvent"></filter>
127 --> 127 -->
128 <a2l bindshow="a2lshow" bindhide="a2lshow" key="INDEX" type="black20"></a2l> 128 <a2l bindshow="a2lshow" bindhide="a2lshow" key="INDEX" type="black20"></a2l>
129 -<as-phone id="as"></as-phone>  
  129 +<as-phone id="as"></as-phone>
  130 +<menu></menu>
@@ -414,7 +414,7 @@ Page({ @@ -414,7 +414,7 @@ Page({
414 } 414 }
415 if('animationfinish'==e.type){ 415 if('animationfinish'==e.type){
416 if(this.hasGoto){ 416 if(this.hasGoto){
417 - wx.switchTab({ 417 + wx.redirectTo({
418 url: '/pages/reserve/index' 418 url: '/pages/reserve/index'
419 }) 419 })
420 return; 420 return;
@@ -330,7 +330,7 @@ Page({ @@ -330,7 +330,7 @@ Page({
330 } 330 }
331 if('animationfinish'==e.type){ 331 if('animationfinish'==e.type){
332 if(this.hasGoto){ 332 if(this.hasGoto){
333 - wx.switchTab({ 333 + wx.redirectTo({
334 url: '/pages/reserve/index' 334 url: '/pages/reserve/index'
335 }) 335 })
336 return; 336 return;
@@ -72,7 +72,7 @@ Page({ @@ -72,7 +72,7 @@ Page({
72 } 72 }
73 }, 73 },
74 switchpage(){ 74 switchpage(){
75 - wx.switchTab({ 75 + wx.redirectTo({
76 url: './index' 76 url: './index'
77 }) 77 })
78 }, 78 },
@@ -8,6 +8,7 @@ @@ -8,6 +8,7 @@
8 "filter":"/components/2.0/filter/filter", 8 "filter":"/components/2.0/filter/filter",
9 "seller-card":"/components/2.0/seller/card", 9 "seller-card":"/components/2.0/seller/card",
10 "as-phone":"/components/2.0/dialog/phone", 10 "as-phone":"/components/2.0/dialog/phone",
11 - "taocan-notice":"/components/2.0/taocan/notice" 11 + "taocan-notice":"/components/2.0/taocan/notice",
  12 + "menu":"/components/menu/menu"
12 } 13 }
13 } 14 }
1 <!--pages/reserve/home.wxml--> 1 <!--pages/reserve/home.wxml-->
  2 +<!-- <nav backgroundColor="rgba(0,0,0,0)" color="#ffffff" place="{{false}}"></nav> -->
2 <view class="view header"> 3 <view class="view header">
3 <image src="http://nosqn.colorcun.com/search/s%20%281%29.png" 4 <image src="http://nosqn.colorcun.com/search/s%20%281%29.png"
4 style="z-index: 1" 5 style="z-index: 1"
@@ -64,4 +65,5 @@ @@ -64,4 +65,5 @@
64 <filter id="filter" bindevent="filterEvent" cla="bottom-search"></filter> 65 <filter id="filter" bindevent="filterEvent" cla="bottom-search"></filter>
65 </view> 66 </view>
66 </view> 67 </view>
67 -<as-phone id="as"></as-phone>  
  68 +<as-phone id="as"></as-phone>
  69 +<menu></menu>
@@ -287,7 +287,7 @@ Page({ @@ -287,7 +287,7 @@ Page({
287 } 287 }
288 if('animationfinish'==e.type){ 288 if('animationfinish'==e.type){
289 if(this.hasGoto && (e.detail.current+1)==this.data.rsl.length){ 289 if(this.hasGoto && (e.detail.current+1)==this.data.rsl.length){
290 - wx.switchTab({ 290 + wx.redirectTo({
291 url: '/pages/reserve/index' 291 url: '/pages/reserve/index'
292 }) 292 })
293 return; 293 return;
@@ -594,6 +594,14 @@ export default { @@ -594,6 +594,14 @@ export default {
594 'App.Photo.getSellerPhotoById':null, 594 'App.Photo.getSellerPhotoById':null,
595 'App.Contact.UploadCustomerMedia':{ 595 'App.Contact.UploadCustomerMedia':{
596 openid:'openid' 596 openid:'openid'
  597 + },
  598 + //绑定客户经理关系
  599 + 'App.Activity.SetRelation':{
  600 + openid:'openid'
  601 + },
  602 + //客户经理积分设置
  603 + 'App.Activity.SetIntegral':{
  604 + openid:'openid'
597 } 605 }
598 606
599 } 607 }
@@ -636,7 +636,7 @@ @@ -636,7 +636,7 @@
636 { 636 {
637 "name": "pages/customer/index", 637 "name": "pages/customer/index",
638 "pathName": "pages/customer/index", 638 "pathName": "pages/customer/index",
639 - "query": "id=178777&hasSellerShare=1&hasInvitation=1&uid=311", 639 + "query": "id=196368&hasSellerShare=1&hasInvitation=1&uid=20202",
640 "scene": 1047 640 "scene": 1047
641 }, 641 },
642 { 642 {