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) {
}
};
//import log from 'utils/realTimeLog'
// "tabBar": {
// "custom": true,
// "color": "#999999",
// "selectedColor": "#C0A369",
// "backgroundColor": "#262628",
// "borderStyle": "black",
// "list": [
// {
// "pagePath": "pages/reserve/index",
// "text": "附近"
// },
// {
// "pagePath": "pages/reserve/search",
// "text": "搜索"
// },
// {
// "pagePath": "pages/me/list",
// "text": "订单"
// },
// {
// "pagePath": "pages/me/index",
// "text": "我的"
// }
// ]
// },
App({
openid:"",
system:{},
... ...
... ... @@ -136,31 +136,6 @@
"request": 10000,
"downloadFile": 10000
},
"tabBar": {
"custom": true,
"color": "#999999",
"selectedColor": "#C0A369",
"backgroundColor": "#262628",
"borderStyle": "black",
"list": [
{
"pagePath": "pages/reserve/index",
"text": "附近"
},
{
"pagePath": "pages/reserve/search",
"text": "搜索"
},
{
"pagePath": "pages/me/list",
"text": "订单"
},
{
"pagePath": "pages/me/index",
"text": "我的"
}
]
},
"plugins": {
"bmCalendar": {
"version": "1.2.1",
... ...
... ... @@ -28,7 +28,7 @@ Component({
methods:{
gotoList(e){
getApp().meListType=util.attr(e,'type')
wx.switchTab({
wx.redirectTo({
url:'/pages/me/list?type='+util.attr(e,'type')
})
},
... ...
Component({
data:{
menuhidden:true,
url:'pages/reserve/index',
},
attached: function() {
this.setStatus();
},
methods:{
showmenu(){
this.setData({
menuhidden:false
})
},
hidemenu(){
this.setData({
menuhidden:true
})
},
topage(e){
let url=e.currentTarget.dataset.path;
wx.redirectTo({
url:url
})
},
setStatus(){
let pages = getCurrentPages();
let p = pages[pages.length - 1];
console.log('custom-tab-bar.setStatus',p.route)
this.setData({
url:p.route,
})
},
}
})
\ No newline at end of file
... ...
{}
\ No newline at end of file
... ...
<view class="menu flex-vc" bindtap="showmenu"></view>
<view class="menu-list flex-vl" style="justify-content: flex-end;" hidden="{{menuhidden}}" bindtap="hidemenu">
<view class="menu-item menu-seller-item flex-ll" bindtap="hidemenu">
<view class="menu-item-image menu-item-back"></view>
<view class="white-font font30r smooth">返回</view>
</view>
<block wx:if="{{'pages/me/index'!=url}}">
<view class="menu-item menu-seller-item flex-ll" bindtap="topage" data-path="/pages/me/index">
<view class="menu-item-image menu-item-me"></view>
<view class="white-font font30r smooth">我的</view>
</view>
</block>
<block wx:if="{{'pages/me/list'!=url}}">
<view class="menu-item menu-seller-item flex-ll" bindtap="topage" data-path="/pages/me/list">
<view class="menu-item-image menu-item-order"></view>
<view class="white-font font30r smooth">订单</view>
</view>
</block>
<block wx:if="{{'pages/reserve/search'!=url}}">
<view class="menu-item menu-seller-item flex-ll" bindtap="topage" data-path="/pages/reserve/search">
<view class="menu-item-image menu-item-search"></view>
<view class="white-font font30r smooth" bindtap="">搜索</view>
</view>
</block>
<block wx:if="{{'pages/reserve/index'!=url}}">
<view class="menu-item menu-seller-item flex-ll" bindtap="topage" data-path="/pages/reserve/index">
<view class="menu-item-image menu-item-nearby"></view>
<view class="white-font font30r smooth" bindtap="">附近</view>
</view>
</block>
</view>
\ No newline at end of file
... ...
@import '../../app.wxss';
.menu{
width: 100rpx;
height: 100rpx;
border-radius: 50%;
position: fixed;
left: 40rpx;
bottom: 80rpx;
z-index: 10001;
border-radius: 50;
background: url(http://libpc.colorcun.com/navigator.png) center center no-repeat;
background-size: contain;
}
.menu image{
width: 34rpx;
height: 34rpx;
margin-bottom: 10rpx;
}
.menu-list{
position: fixed;
left: 0;
right: 0;
top: 0;
bottom: 0;
background: rgba(0,0,0,.69);
z-index: 10001;
padding-left: 40rpx;
padding-bottom: 50rpx;
box-sizing: border-box;
}
.menu-item{
height: 100rpx;
margin-bottom: 40rpx;
}
.menu-item-image{
width: 100rpx;
height: 100rpx;
margin-right: 20rpx;
border-radius: 50%;
}
.menu-item-search{
background: url(http://libpc.colorcun.com/search.png) center center no-repeat;
background-size: contain;
}
.menu-item-order{
background: url(http://libpc.colorcun.com/order.png) center center no-repeat;
background-size: contain;
}
.menu-item-me{
background: url(http://libpc.colorcun.com/me.png) center center no-repeat;
background-size: contain;
}
.menu-item-back{
background: url(http://nosqn.colorcun.com/menu-back.png) center center no-repeat;
background-size: contain;
}
.menu-item-nearby{
background: url(http://libpc.colorcun.com/nearby.png) center center no-repeat;
background-size: contain;
}
.click-icon{
width: 12rpx;
height: 12rpx;
border-top: 2rpx solid #FFFFFF;
border-right: 2rpx solid #FFFFFF;
transform: rotate(45deg);
margin-left: -6rpx;
}
.gray-font{
color: #999999;
}
\ No newline at end of file
... ...
... ... @@ -83,7 +83,31 @@ Component({
desc: '用于完善会员资料', // 声明获取用户个人信息后的用途，后续会展示在弹窗中，请谨慎填写
success: (res) => {
console.log(res,'nnnnnnnnn')
}
var userInfo = res.userInfo //avatarUrl nickName gender;
console.log('getUserInfo:ok', e.detail)
util.cache('userInfo', userInfo);
App.Reserve.AddUser({
openid: getApp().openid,
avatar: userInfo.avatarUrl,
nickname: userInfo.nickName,
gender: userInfo.gender
})
getApp()._getOpenid();
this.triggerEvent("userinfo", userInfo);
},
fail:()=>{
wx.showModal({
title: '授权提示',
content: '您点击了拒绝授权,将无法正常显示个人信息,点击确定重新获取授权',
confirmColor: '#199095',
cancelColor: '#999',
success: function (res) {
if (res.confirm) {
util.setting();
}
}
})
}
})
}
}
... ...
<block wx:if="{{!userinfo}}">
<button bindgetuserinfo="getUserInfoSuccess" open-type="getUserInfo" class="button-none" catchtap="catchtap">
<!-- <button bindgetuserinfo="getUserInfoSuccess" open-type="getUserInfo" class="button-none" catchtap="catchtap">
<slot></slot>
</button>
<!-- <view bindtap="getuserinfo">
</button> -->
<view bindtap="getuserinfo">
<slot></slot>
</view> -->
</view>
</block>
<block wx:else="">
<formids bindclick="setUserInfoSuccess" catchtap="catchtap" style="width: 100%;">
... ...
... ... @@ -36,9 +36,10 @@ Component({
bottom:(res.windowHeight-res.safeArea.bottom)*ratio,
})
console.log('custom-tab-bar.attached')
PubSub.on('custom-tab-bar',()=>{
this.setStatus()
})
this.setStatus()
// PubSub.on('custom-tab-bar',()=>{
// this.setStatus()
// })
},
detached: function() {
// 在组件实例被从页面节点树移除时执行
... ... @@ -63,7 +64,7 @@ Component({
},
redirectTo(e){
let url= util.attr(e, 'url');
wx.switchTab({
wx.redirectTo({
url: '/'+url,
})
},
... ...
... ... @@ -11,7 +11,7 @@
<view class="money-number">{{user.balance.price||0}}</view>
<view class="money-dw">元</view>
</view>
<navigator url="/pages/reserve/index" open-type="switchTab" hover-class="other-navigator-hover">
<navigator url="/pages/reserve/index" open-type="redirect" hover-class="other-navigator-hover">
<view class="yuding flex-cc">
<view class="icon"></view>
去订包间
... ...
... ... @@ -2,7 +2,7 @@
<nav hasHome>订包间</nav>
<view class="pages">
<image src="http://nosqn.colorcun.com/activity/images/yuding.png" style="width: 100%;" mode="widthFix"></image>
<navigator url="/pages/reserve/index" open-type="switchTab" hover-class="other-navigator-hover">
<navigator url="/pages/reserve/index" open-type="redirect" hover-class="other-navigator-hover">
<view class="content flex-cc">
<view class="share-but">
<button class="button-none">去订包间</button>
... ...
... ... @@ -398,7 +398,7 @@ Page({
}
},
gotoHome(){
wx.switchTab({
wx.redirectTo({
url: '/pages/reserve/index'
})
},
... ...
... ... @@ -51,7 +51,7 @@
<view class="font34r smooth flex-cc font-bold" style="width:140rpx;color:#ECC88F;margin: 0 auto;" bindtap="secondbook">再次预订</view>
</view> -->
<scroll-view class="last-bg" style="padding-top: {{statusBarHeight+titleBarHeight}}px;line-height: 1.4;height:{{height}}px;" scroll-y>
<view class="last-book-title"></view>
<!-- <view class="last-book-title"></view> -->
<view class="last-staff-info flex-lr">
<view class="last-staff-image" style="background: url({{staffinfo.photo}}) center center no-repeat;background-size: 100% auto;"></view>
<view class="last-staff-detail flex-vr" style="align-items: flex-end;">
... ...
... ... @@ -302,7 +302,7 @@ Page({
}
if('animationfinish'==e.type){
if(this.hasGoto){
wx.switchTab({
wx.redirectTo({
url: '/pages/reserve/index'
})
return;
... ...
... ... @@ -26,7 +26,8 @@ Page({
hasOwner: true,//是否为发起人
animation: 'animation',
couponhidden:true,
getcoupon:false
getcoupon:false,
menuhidden:true,
},
id: null,
msgTpl:'',
... ... @@ -77,7 +78,7 @@ Page({
this.setData({
statusBarHeight: pt,
titleBarHeight: h,
height: systemInfo.windowHeight-90/(750/systemInfo.windowWidth)
height: systemInfo.windowHeight
})
this.getDetail(getCurrentPages().length==1);
},
... ... @@ -487,4 +488,22 @@ Page({
})
}
},
showmenu(){
this.setData({
menuhidden:false
})
},
hidemenu(){
this.setData({
menuhidden:true
})
},
noopen(e){
let mark=e.currentTarget.dataset.mark;
wx.showToast({
title:'该商家未开通'+(mark=='buy' ? '提前点餐' : '在线买单'),
duration:2000,
mask:true
})
},
})
... ...
... ... @@ -68,7 +68,7 @@
<view class="font34r smooth flex-cc font-bold" style="width:140rpx;color:#ECC88F;margin: 0 auto;" bindtap="secondbook">再次预订</view>
</view> -->
<scroll-view class="last-bg" style="padding-top: {{statusBarHeight+titleBarHeight}}px;line-height: 1.4;height:{{height}}px;" scroll-y>
<view class="last-book-title"></view>
<!-- <view class="last-book-title"></view> -->
<view class="last-staff-info flex-lr">
<view class="last-staff-image" style="background: url({{staffinfo.photo}}) center center no-repeat;background-size: 100% auto;"></view>
<view class="last-staff-detail flex-vr" style="align-items: flex-end;">
... ... @@ -119,7 +119,7 @@
<view style="height:40rpx;"></view>
</scroll-view>
<!-- wx:if="{{detail.seller.is_open_order==1 && !detail.hasOvered && !detail.hasCancel}}" -->
<view class="last-bottom flex-lr">
<!-- <view class="last-bottom flex-lr">
<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}}%;">
<image src="http://sellershare.colorcun.com/yuding.png" class="icon" style="width: 32rpx;height: 32rpx;"></image>
再次预订
... ... @@ -138,7 +138,7 @@
</view>
</userinfo>
</block>
</view>
</view> -->
<showModal id="showModal" confirmText="知道了" bindshowModal="showModal" cla="checkout"></showModal>
<!-- <view bindtap="sendmsg">测试发送短信息</view> -->
</block>
... ... @@ -163,6 +163,48 @@
</block>
</block>
<view class="menu" wx:if="{{detail && detail.type==0 && detail.channel==2}}" bindtap="showmenu"></view>
<view class="menu-list flex-vl" style="justify-content: flex-end;" wx:if="{{detail && detail.type==0 && detail.channel==2}}" hidden="{{menuhidden}}" catchtap="hidemenu">
<view class="menu-item menu-seller-item flex-ll" catchtap="secondbook">
<view class="menu-item-image" style="background: url({{detail.seller.seller_image}}) center center no-repeat;background-size: cover;"></view>
<view class="white-font font30r smooth">{{seller.name}}</view>
<view class="click-icon"></view>
</view>
<view class="menu-item menu-seller-item flex-ll" bindtap="secondbook">
<view class="menu-item-image menu-item-book"></view>
<view class="white-font font30r smooth">再次预订</view>
</view>
<block wx:if="{{detail.seller.is_open_order==1 && !detail.hasOvered && !detail.hasCancel}}">
<block wx:if="{{detail && detail.seller.is_open_order==1}}">
<view class="menu-item menu-seller-item flex-ll" bindtap="cookbook">
<view class="menu-item-image menu-item-buy"></view>
<view class="white-font font30r smooth">提前点餐</view>
</view>
</block>
<block wx:else>
<view class="menu-item menu-seller-item flex-ll" bindtap="noopen" data-mark="buy">
<view class="menu-item-image menu-item-buy-nouse"></view>
<view class="gray-font font30r smooth">提前点餐</view>
</view>
</block>
<block wx:if="{{detail && detail.seller.isopen_md==1}}">
<view class="menu-item menu-seller-item flex-ll" bindtap="checkout">
<view class="menu-item-image menu-item-check"></view>
<view class="white-font font30r smooth">在线买单</view>
</view>
</block>
<block wx:else>
<view class="menu-item menu-seller-item flex-ll" bindtap="noopen" data-mark="checkout">
<view class="menu-item-image menu-item-check-nouse"></view>
<view class="gray-font font30r smooth">在线买单</view>
</view>
</block>
</block>
<view class="menu-item menu-seller-item flex-ll" bindtap="hidemenu">
<view class="menu-item-image menu-item-back"></view>
<view class="white-font font30r smooth">返回</view>
</view>
</view>
<view class="bottom flex-lr" wx:if="{{!detail.hasOvered && !detail.hasCancel && detail.channel!=2}}">
<view bindtap="gotoHome" class="dingbaojian flex-vc">
... ...
... ... @@ -271,3 +271,133 @@ image{
background: transparent;
padding: 30rpx 0;
}
.menu{
width: 100rpx;
height: 100rpx;
border-radius: 50%;
position: fixed;
left: 40rpx;
bottom: 80rpx;
background: url(http://nosqn.colorcun.com/invite_menu.png) center center no-repeat;
background-size: contain;
}
.menu-list{
position: fixed;
left: 0;
right: 0;
top: 0;
bottom: 0;
background: rgba(0,0,0,.69);
z-index: 100;
padding-left: 40rpx;
padding-bottom: 40rpx;
box-sizing: border-box;
}
.menu-item{
height: 100rpx;
margin-bottom: 40rpx;
}
.menu-item-image{
width: 100rpx;
height: 100rpx;
margin-right: 20rpx;
border-radius: 50%;
}
/* .menu-item-book{
width: 100rpx;
height: 100rpx;
border-radius: 50%;
position: fixed;
left: 40rpx;
bottom: 80rpx;
background: url(http://nosqn.colorcun.com/invite_menu.png) center center no-repeat;
background-size: contain;
} */
.menu-list{
position: fixed;
left: 0;
right: 0;
top: 0;
bottom: 0;
background: rgba(0,0,0,.69);
z-index: 100;
padding-left: 40rpx;
padding-bottom: 40rpx;
box-sizing: border-box;
}
.menu-item{
height: 100rpx;
margin-bottom: 40rpx;
}
.menu-item-image{
width: 100rpx;
height: 100rpx;
margin-right: 20rpx;
border-radius: 50%;
}
.menu-item-book{
background: url(http://nosqn.colorcun.com/menu-book.png) center center no-repeat;
background-size: contain;
}
.menu-item-buy{
background: url(http://nosqn.colorcun.com/menu-buy.png) center center no-repeat;
background-size: contain;
}
.menu-item-buy-nouse{
background: url(http://nosqn.colorcun.com/menu-buy-nouse.png) center center no-repeat;
background-size: contain;
}
.menu-item-check{
background: url(http://nosqn.colorcun.com/menu-check.png) center center no-repeat;
background-size: contain;
}
.menu-item-check-nouse{
background: url(http://nosqn.colorcun.com/menu-check-nouse.png) center center no-repeat;
background-size: contain;
}
.menu-item-back{
background: url(http://nosqn.colorcun.com/menu-back.png) center center no-repeat;
background-size: contain;
}
.click-icon{
width: 12rpx;
height: 12rpx;
border-top: 2rpx solid #FFFFFF;
border-right: 2rpx solid #FFFFFF;
transform: rotate(45deg);
margin-left: -6rpx;
}
.gray-font{
color: #999999;
}
.menu-item-buy{
background: url(http://nosqn.colorcun.com/menu-buy.png) center center no-repeat;
background-size: contain;
}
.menu-item-buy-nouse{
background: url(http://nosqn.colorcun.com/menu-buy-nouse.png) center center no-repeat;
background-size: contain;
}
.menu-item-check{
background: url(http://nosqn.colorcun.com/menu-check.png) center center no-repeat;
background-size: contain;
}
.menu-item-check-nouse{
background: url(http://nosqn.colorcun.com/menu-check-nouse.png) center center no-repeat;
background-size: contain;
}
.menu-item-back{
background: url(http://nosqn.colorcun.com/menu-back.png) center center no-repeat;
background-size: contain;
}
.click-icon{
width: 12rpx;
height: 12rpx;
border-top: 2rpx solid #FFFFFF;
border-right: 2rpx solid #FFFFFF;
transform: rotate(45deg);
margin-left: -6rpx;
}
.gray-font{
color: #999999;
}
... ...
... ... @@ -55,7 +55,7 @@ Page({
})
}
if(opt.act=='order'){
return wx.switchTab({
return wx.redirectTo({
url:'../me/list'
})
}
... ... @@ -124,6 +124,17 @@ Page({
openid: opt.openid,
fromid: opt.fromid ? opt.fromid : ''
})
if(opt.uid && opt.uid!=''){
App.Activity.SetRelation({
uid:opt.uid
})
App.Activity.SetIntegral({
uid:opt.uid,
type:0,
rid:opt.id
})
}
if (!res.data.openid) {//无预订人
url = '/pages/customer/detail_owner';
if (opt.hasInvitation == 1) {
... ... @@ -179,7 +190,7 @@ Page({
if (red.url.indexOf('me/list') > 0
|| red.url.indexOf('reserve/search') > 0
|| red.url.indexOf('reserve/index') > 0) {
wx.switchTab(red);
wx.redirectTo(red);
} else {
wx.redirectTo(red);
}
... ...
... ... @@ -4,8 +4,13 @@
<view class="wecode">
<image src="{{qrcode}}" mode="aspectFit"></image>
</view>
<view class="last-yellow-font font48r act-operate">1.点击“保存图片”按钮</view>
<view class="last-yellow-font font48r act-operate">2.打开微信扫一扫</view>
<view class="last-yellow-font font48r act-operate">3.选择相册该图片识别</view>
<view class="last-yellow-font font40r act-operate">步骤：</view>
<view class="last-yellow-font font40r act-operate">1、点击“保存图片”按钮</view>
<view class="last-yellow-font font40r act-operate">2、打开微信扫一扫</view>
<view class="last-yellow-font font40r act-operate flex-ll">
<view>3、选择右下角相册图标</view>
<image src="http://nosqn.colorcun.com/picture.png" style="width: 80rpx;height: 80rpx;margin-left: 20rpx;"></image>
</view>
<view class="last-yellow-font font40r act-operate" style="margin-bottom: 60rpx;">4、选择保存的二维码图片</view>
<view class="save-button flex-cc last-yellow-font font36r font-bold" bindtap='saveimage'>保存图片</view>
</view>
\ No newline at end of file
... ...
... ... @@ -4,8 +4,10 @@
overflow-y: scroll;
background: url(http://sellershare.colorcun.com/last-bg.png) center center no-repeat;
background-size: 100% 100%;
padding-bottom: 10rpx;
padding-bottom: 200rpx;
position: relative;
padding-left: 100rpx;
padding-right: 60rpx;
}
.last-yellow-font{
color: #BA9953;
... ... @@ -23,8 +25,10 @@
height: 520rpx;
}
.act-operate{
width: 100%;
line-height: 1.4;
margin-bottom: 20rpx;
font-size:46rpx;
}
.save-button{
width: 440rpx;
... ...
... ... @@ -69,7 +69,7 @@ Page({
console.log('launchAppError',e)
},
gotoHome(e){
wx.switchTab({
wx.redirectTo({
url:'/pages/reserve/index',
fail:res=>{
console.log('gotoHome.fail',res)
... ...
... ... @@ -172,7 +172,7 @@ Page({
}
if('animationfinish'==e.type){
if(this.hasGoto && (e.detail.current+1)==this.data.rsl.length){
wx.switchTab({
wx.redirectTo({
url: '/pages/reserve/index'
})
return;
... ...
... ... @@ -109,7 +109,7 @@ Page({
},
gotoList(e){
getApp().meListType=util.attr(e,'type')
wx.switchTab({
wx.redirectTo({
url:'/pages/me/list?type='+util.attr(e,'type')
})
},
... ...
... ... @@ -4,6 +4,7 @@
"navigationBarTitleText":"我的",
"usingComponents": {
"nav":"/components/nav/nav",
"formids":"/components/formids/formids"
"formids":"/components/formids/formids",
"menu":"/components/menu/menu"
}
}
\ No newline at end of file
... ...
... ... @@ -39,7 +39,7 @@
</navigator>
</view>
<view class="block-rev">
<navigator url="/pages/me/list" open-type="switchTab">
<navigator url="/pages/me/list" open-type="redirect">
<view class="title flex-lr">
<view >我的订单</view>
<view class="more"></view>
... ... @@ -155,4 +155,5 @@
-->
</view>
</view>
</layout>
\ No newline at end of file
</layout>
<menu></menu>
\ No newline at end of file
... ...
... ... @@ -11,6 +11,7 @@
"as-phone":"/components/actionSheet/phone",
"card-bak":"/components/seller-card/seller-card",
"card":"/components/2.0/reserve/card",
"subject":"/components/2.0/taocan/subject"
"subject":"/components/2.0/taocan/subject",
"menu":"/components/menu/menu"
}
}
\ No newline at end of file
... ...
... ... @@ -60,4 +60,5 @@
</view>
<view class="view" style="height: 192rpx;"></view>
</block>
</view>
\ No newline at end of file
</view>
<menu></menu>
\ No newline at end of file
... ...
... ... @@ -9,6 +9,7 @@
"seller-card":"/components/2.0/seller/card",
"chatbot":"/components/userinfo/chatbot",
"as-phone":"/components/2.0/dialog/phone",
"taocan-notice":"/components/2.0/taocan/notice"
"taocan-notice":"/components/2.0/taocan/notice",
"menu":"/components/menu/menu"
}
}
\ No newline at end of file
... ...
... ... @@ -27,7 +27,7 @@
</view>
<view class="moveToLocationView">
<view bindtap="switchpage" class="view moveToLocation flex-vc" style="top: -140rpx;">
<image class="moveToLocation-image" src="http://nosqn.colorcun.com/menu.png" style="width: 32rpx;height: 26rpx;margin-bottom: 8rpx;"></image>
<image class="moveToLocation-image" src="http://libpc.colorcun.com/map.png" style="width: 34rpx;height: 32rpx;margin-bottom: 8rpx;"></image>
<view style="color: #42A5FF;font-size: 20rpx;">地图</view>
</view>
</view>
... ... @@ -126,4 +126,5 @@
<filter id="filter" bindevent="filterEvent"></filter>
-->
<a2l bindshow="a2lshow" bindhide="a2lshow" key="INDEX" type="black20"></a2l>
<as-phone id="as"></as-phone>
\ No newline at end of file
<as-phone id="as"></as-phone>
<menu></menu>
\ No newline at end of file
... ...
... ... @@ -414,7 +414,7 @@ Page({
}
if('animationfinish'==e.type){
if(this.hasGoto){
wx.switchTab({
wx.redirectTo({
url: '/pages/reserve/index'
})
return;
... ...
... ... @@ -330,7 +330,7 @@ Page({
}
if('animationfinish'==e.type){
if(this.hasGoto){
wx.switchTab({
wx.redirectTo({
url: '/pages/reserve/index'
})
return;
... ...
... ... @@ -72,7 +72,7 @@ Page({
}
},
switchpage(){
wx.switchTab({
wx.redirectTo({
url: './index'
})
},
... ...
... ... @@ -8,6 +8,7 @@
"filter":"/components/2.0/filter/filter",
"seller-card":"/components/2.0/seller/card",
"as-phone":"/components/2.0/dialog/phone",
"taocan-notice":"/components/2.0/taocan/notice"
"taocan-notice":"/components/2.0/taocan/notice",
"menu":"/components/menu/menu"
}
}
\ No newline at end of file
... ...
<!--pages/reserve/home.wxml-->
<!-- <nav backgroundColor="rgba(0,0,0,0)" color="#ffffff" place="{{false}}"></nav> -->
<view class="view header">
<image src="http://nosqn.colorcun.com/search/s%20%281%29.png"
style="z-index: 1"
... ... @@ -64,4 +65,5 @@
<filter id="filter" bindevent="filterEvent" cla="bottom-search"></filter>
</view>
</view>
<as-phone id="as"></as-phone>
\ No newline at end of file
<as-phone id="as"></as-phone>
<menu></menu>
\ No newline at end of file
... ...
... ... @@ -287,7 +287,7 @@ Page({
}
if('animationfinish'==e.type){
if(this.hasGoto && (e.detail.current+1)==this.data.rsl.length){
wx.switchTab({
wx.redirectTo({
url: '/pages/reserve/index'
})
return;
... ...
... ... @@ -594,6 +594,14 @@ export default {
'App.Photo.getSellerPhotoById':null,
'App.Contact.UploadCustomerMedia':{
openid:'openid'
},
//绑定客户经理关系
'App.Activity.SetRelation':{
openid:'openid'
},
//客户经理积分设置
'App.Activity.SetIntegral':{
openid:'openid'
}
}
\ No newline at end of file
... ...
... ... @@ -636,7 +636,7 @@
{
"name": "pages/customer/index",
"pathName": "pages/customer/index",
"query": "id=178777&hasSellerShare=1&hasInvitation=1&uid=311",
"query": "id=196368&hasSellerShare=1&hasInvitation=1&uid=20202",
"scene": 1047
},
{
... ...