xt / xcx-book · Commits

Go to a project

Commit 49716b9448c5b10d2eb1fea25783411f8f108d4b

Authored by Yolanda
1 parent e8dd26e9
build: skipped

no message

Inline Side-by-side
Showing 42 changed files with 252 additions and 30 deletions
... ... @@ -164,7 +164,9 @@
},
"usingComponents": {
"layout": "/components/layout",
"page": "/components/2.0/common/page"
"page": "/components/2.0/common/page",
"menu":"/components/menu/menu",
"service":"/components/menu/service"
},
"debug": true,
"sitemapLocation": "sitemap.json"
... ...
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 white-font font26r" bindtap="showmenu">
<view>更多</view>
<view>服务</view>
</view>
<view class="menu-list flex-vr" style="justify-content: flex-end;align-items: flex-end;" hidden="{{menuhidden}}" bindtap="hidemenu">
<view class="menu-item menu-seller-item flex-rr">
<view class="gray-font font30r smooth">代驾</view>
<view class="menu-item-image menu-item-driving"></view>
</view>
<view class="menu-item menu-seller-item flex-rr">
<view class="gray-font font30r smooth">茶楼</view>
<view class="menu-item-image menu-item-teahouse"></view>
</view>
<view class="menu-item menu-seller-item flex-rr">
<view class="gray-font font30r smooth">沐足</view>
<view class="menu-item-image menu-item-foot"></view>
</view>
<view class="menu-item menu-seller-item flex-rr">
<view class="gray-font font30r smooth">洗浴</view>
<view class="menu-item-image menu-item-shower"></view>
</view>
<view class="menu-item menu-seller-item flex-rr" bindtap="hidemenu">
<view class="white-font font30r smooth">返回</view>
<view class="menu-item-image menu-item-back"></view>
</view>
<!-- <block wx:if="{{'pages/me/index'!=url}}">
<view class="menu-item menu-seller-item flex-rr" 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-rr" 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-rr" 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-rr" 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;
right: 40rpx;
bottom: 80rpx;
z-index: 10001;
border-radius: 50;
background: rgba(0,0,0,.8);
/* background: url(http://libpc.colorcun.com/navigator.png) center center no-repeat;
background-size: contain; */
line-height: 1.2;
}
.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-right: 40rpx;
padding-bottom: 50rpx;
box-sizing: border-box;
}
.menu-item{
height: 100rpx;
margin-bottom: 40rpx;
}
.menu-item-image{
width: 100rpx;
height: 100rpx;
margin-left: 20rpx;
border-radius: 50%;
}
.menu-item-driving{
background: url(http://libpc.colorcun.com/Driving.png) center center no-repeat;
background-size: contain;
}
.menu-item-teahouse{
background: url(http://libpc.colorcun.com/teahouse.png) center center no-repeat;
background-size: contain;
}
.menu-item-foot{
background: url(http://libpc.colorcun.com/foot.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-shower{
background: url(http://libpc.colorcun.com/shower.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
... ...
... ... @@ -177,7 +177,7 @@ Page({
name:'sms',
data:{
content:content,
path:'/index.html?id='+this.data.options.id+'&hasInvation=1&hasSellerShare=1',
path:'/index.html?id='+this.data.options.id+'&hasInvitation=1&hasSellerShare=1',
phoneNumberList:'+86'+this.detail.phone
},
... ...
... ... @@ -2,7 +2,6 @@
"navigationBarBackgroundColor": "#ffffff",
"navigationBarTextStyle": "black",
"navigationBarTitleText":"周到安排",
"backgroundTextStyle": "light",
"usingComponents": {
"network": "/components/network/network"
... ...
... ... @@ -3,3 +3,5 @@
<view style="height: calc(100vh - 64px);">
<chat></chat>
</view>
<menu></menu>
<service></service>
... ...
... ... @@ -24,4 +24,6 @@
<view class="add-cover flex-cc">
<view class="white-font font36r text-bold add-button flex-cc bg-blue-blue round" catchtap="add">新建联系人</view>
</view>
<menu></menu>
<service></service>
</page>
\ No newline at end of file
... ...
... ... @@ -16,4 +16,6 @@
</block>
</scroll-view>
<view class="card-used flex-cc bg-white gray-font font32r" bindtap="toused">查看卡券历史记录<view class="more" style="margin-left: 20rpx;"></view></view>
\ No newline at end of file
<view class="card-used flex-cc bg-white gray-font font32r" bindtap="toused">查看卡券历史记录<view class="more" style="margin-left: 20rpx;"></view></view>
<menu></menu>
<service></service>
\ No newline at end of file
... ...
... ... @@ -110,4 +110,7 @@
</view> -->
</view>
<as-phone id="as"></as-phone>
<menu></menu>
<service></service>
... ...
... ... @@ -17,4 +17,6 @@
</view>
</view>
<getpos bindpos="onpos" id="getpos" hasAllowFail></getpos>
<as-phone id="as"></as-phone>
\ No newline at end of file
<as-phone id="as"></as-phone>
<menu></menu>
<service></service>
\ No newline at end of file
... ...
... ... @@ -58,3 +58,5 @@
</block>
<getpos bindpos="onpos" id="getpos" hasAllowFail></getpos>
<as-phone id="as"></as-phone>
<menu></menu>
<service></service>
\ No newline at end of file
... ...
... ... @@ -156,4 +156,5 @@
</view>
</view>
</layout>
<menu></menu>
\ No newline at end of file
<menu></menu>
<service></service>
\ No newline at end of file
... ...
... ... @@ -61,4 +61,5 @@
<view class="view" style="height: 192rpx;"></view>
</block>
</view>
<menu></menu>
\ No newline at end of file
<menu></menu>
<service></service>
\ No newline at end of file
... ...
... ... @@ -64,3 +64,6 @@
body="确定要删除该常用预订信息吗？" header=""
cla="deletuser"
bindevent="deletuser"></confirm>
<menu></menu>
<service></service>
... ...
... ... @@ -12,4 +12,6 @@
<block wx:for="{{tabidx==0 ? list.use : list.over}}">
<coupon item="{{item}}" mark="used"></coupon>
</block>
</view>
\ No newline at end of file
</view>
<menu></menu>
<service></service>
\ No newline at end of file
... ...
... ... @@ -74,4 +74,6 @@
</view>
</view>
<view class="bg-blue-blue submit text-bold txt-36-h round flex align-center justify-center" bindtap="submit">发布评价</view>
</page>
\ No newline at end of file
</page>
<menu></menu>
<service></service>
\ No newline at end of file
... ...
... ... @@ -27,3 +27,5 @@
<view class="txt-28-h margin-top-lg">暂时没有评价哦</view>
</view>
</page>
<menu></menu>
<service></service>
... ...
... ... @@ -10,3 +10,5 @@
<view class="margin-top mylist">查看评价</view>
</navigator>
</view>
<menu></menu>
<service></service>
... ...
... ... @@ -9,3 +9,5 @@
<view wx:for="{{seller.activity}}" wx:key="seller.activity.key">{{index+1}}.{{item.desc}}</view>
</view>
</view>
<menu></menu>
<service></service>
\ No newline at end of file
... ...
... ... @@ -228,4 +228,5 @@
bindhide="discountHide"
bindshow="discountShow"></discount>
<share id="share" seller_id="{{seller.id}}" seller="{{seller}}" wx:if="{{seller.id}}"></share>
<menu></menu>
... ...
... ... @@ -36,4 +36,6 @@
</view>
</view>
<getpos bindpos="onpos" id="getpos" hasAllowFail></getpos>
<hasActivity bindevent="hasActivityEvent"></hasActivity>
\ No newline at end of file
<hasActivity bindevent="hasActivityEvent"></hasActivity>
<menu></menu>
<service></service>
\ No newline at end of file
... ...
<!--pages/reserve/findSeller.wxml-->
<nav id="nav">周到安排</nav>
<how bindevent="howEvent" hasPage findSellerData="{{findSellerData}}"></how>
<menu></menu>
<service></service>
... ...
... ... @@ -127,4 +127,5 @@
-->
<a2l bindshow="a2lshow" bindhide="a2lshow" key="INDEX" type="black20"></a2l>
<as-phone id="as"></as-phone>
<menu></menu>
\ No newline at end of file
<menu></menu>
<service></service>
\ No newline at end of file
... ...
... ... @@ -66,4 +66,6 @@
</view>
<getpos bindpos="onpos" id="getpos" hasAllowLoading="{{false}}"></getpos>
<as-phone id="as"></as-phone>
<search-how id="search-how" findSellerData="{{findSellerData}}" bindevent="howEvent"></search-how>
\ No newline at end of file
<search-how id="search-how" findSellerData="{{findSellerData}}" bindevent="howEvent"></search-how>
<menu></menu>
<service></service>
\ No newline at end of file
... ...
... ... @@ -92,4 +92,6 @@
</view>
</block>
<getpos bindpos="onpos" id="getpos" hasAllowFail hasAllowLoading="{{false}}"></getpos>
<as-phone id="as"></as-phone>
\ No newline at end of file
<as-phone id="as"></as-phone>
<menu></menu>
<service></service>
\ No newline at end of file
... ...
... ... @@ -142,4 +142,6 @@
></caixi>
<fb></fb>
<activity-enter hasInHome></activity-enter>
<as-phone id="as"></as-phone>
\ No newline at end of file
<as-phone id="as"></as-phone>
<menu></menu>
<service></service>
\ No newline at end of file
... ...
... ... @@ -100,4 +100,6 @@
</view>
<getpos bindpos="onpos" id="getpos" hasFailPop></getpos>
<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>
<service></service>
\ No newline at end of file
... ...
... ... @@ -16,3 +16,5 @@
</view>
<view class="save-button white-font flex-cc font32r Semibold" bindtap="save" style="bottom:{{buttonbottom}}px;">保存</view>
</page>
<menu></menu>
<service></service>
... ...
... ... @@ -35,4 +35,6 @@
<view class="reserve-button-cover {{seletroomlist.length>0?'bg-blue-blue':'bg-cccccc'}} flex justify-center align-center round" catchtap="complete">
<view class="reserve-button txt-36-h">选好了</view>
</view>
</page>
\ No newline at end of file
</page>
<menu></menu>
<service></service>
\ No newline at end of file
... ...
... ... @@ -17,20 +17,20 @@
<view class="view text-blue txt-24-h" style="margin-top: 4rpx;">我的位置</view>
</view>
</view>
<view class="view solid-bottom flex justify-around align-center" style="height: 110rpx;" bindtap="dispalySearchHow">
<!-- <view class="view solid-bottom flex justify-around align-center" style="height: 110rpx;" bindtap="dispalySearchHow">
<view class="flex-treble txt-36-h {{findSellerData.action=='auto' ? '' : 'text-bold'}}" style="color: {{findSellerData.action=='auto' ? '#999999' : '#353535'}};">{{findSellerData.action=='auto' ? '选择日期/时段/人数' : findSellerData.paramStr||'选择日期/时段/人数'}}</view>
<view class="more"></view>
</view>
<view class="view solid-bottom flex justify-around align-center"
</view> -->
<view class="view flex justify-around align-center"
bindtap="goPath" data-path="/pages/reserve/searchKeyword"
style="height: 110rpx;">
<view class="flex-treble txt-32-h text-gray">搜索餐厅/位置/关键词</view>
<view class="more"></view>
</view>
<view class="view flex justify-around align-center" style="height: 110rpx;" bindtap="displayFilter">
<!-- <view class="view flex justify-around align-center" style="height: 110rpx;" bindtap="displayFilter">
<view class="flex-treble txt-32-h {{consumeStr?'':'text-gray'}}">{{consumeStr||'人均消费'}}</view>
<view class="more"></view>
</view>
</view> -->
<view class="view flex justify-around align-center round bg-blue-blue text-bold"
bindtap="goPath" data-path="/pages/reserve/indexList"
style="height: 84rpx;">
... ... @@ -66,4 +66,5 @@
</view>
</view>
<as-phone id="as"></as-phone>
<menu></menu>
\ No newline at end of file
<menu></menu>
<service></service>
\ No newline at end of file
... ...
... ... @@ -12,7 +12,7 @@
width: calc(100% - 60rpx);
left:30rpx;
top:280rpx;
height: 558rpx;
height: 348rpx;
background: #FFFFFF;
box-shadow: 0px 0px 30rpx 0px #E5E5E5;
border-radius: 20rpx;
... ... @@ -35,8 +35,8 @@
}
.search{
width: calc(100% - 60rpx);
height: 558rpx;
background: #fff;
height: 348rpx;
background: #FFFFFF;
border-radius: 20rpx;
position: relative;
z-index: 2;
... ...
... ... @@ -70,4 +70,6 @@
</view>
</view>
<getpos bindpos="onpos" id="getpos" hasAllowFail></getpos>
<as-phone id="as"></as-phone>
\ No newline at end of file
<as-phone id="as"></as-phone>
<menu></menu>
<service></service>
\ No newline at end of file
... ...
... ... @@ -67,4 +67,6 @@
<view class="txt-36-h text-bold">提交预订</view>
</view>
</subscribe>
</page>
\ No newline at end of file
</page>
<menu></menu>
<service></service>
\ No newline at end of file
... ...
... ... @@ -145,5 +145,7 @@
</view>
<share id="share" pack="{{packs[activityId]}}" wx:if="{{packs[activityId].id}}"></share>
</block>
<menu></menu>
<service></service>
... ...
... ... @@ -95,4 +95,6 @@
</view>
</view>
</view>
<menu></menu>
<service></service>
... ...
... ... @@ -64,3 +64,5 @@
</view>
</view>
</view>
<menu></menu>
<service></service>
... ...
... ... @@ -24,4 +24,6 @@
</savefile>
</view>
</view>
<menu></menu>
<service></service>
... ...
... ... @@ -145,5 +145,6 @@
</view>
<share id="share" pack="{{packs[activityId]}}" wx:if="{{packs[activityId].id}}"></share>
</block>
<menu></menu>
... ...
... ... @@ -36,7 +36,7 @@
"minifyWXSS": true
},
"compileType": "miniprogram",
"libVersion": "2.15.0",
"libVersion": "2.17.3",
"appid": "wxd3dc4206c76f14fc",
"projectname": "c%E7%AB%AF%E9%A2%84%E5%AE%9A",
"isGameTourist": false,
... ...
... ... @@ -49,10 +49,9 @@
"query": ""
},
{
"id": 6,
"name": "pages/customer/index",
"pathName": "pages/customer/index",
"query": "id=58295&fromid=1111&hasInvitation=1",
"query": "id=199122&hasInvitation=1&hasSellerShare=1&uid=2891",
"scene": 1044,
"shareInfo": {
"groupName": "测试模拟群1",
... ...