xt / xcx-book · Commits

Go to a project

Commit 2bcf8bc677263dfb2039a8e846aac80a1671ddcc

Authored by liuxuqinfhp1220
1 parent b0a0d735

01.07修改

Inline Side-by-side
Showing 16 changed files with 72 additions and 54 deletions
... ... @@ -37,13 +37,13 @@ Component({
//console.log('findSellerData',this.data.ckdata)
let now=parseInt(new Date()/1000);
let nowHHII=util.unixtoTime(now,'HH:II')
let activeIndex=0
if(nowHHII>items[0].etime && nowHHII<=items[2].etime){//有效时间内计算
activeIndex=1
if(nowHHII>items[1].etime){
activeIndex=2
}
}
let activeIndex=1;
// if(nowHHII>items[0].etime && nowHHII<=items[2].etime){//有效时间内计算
// activeIndex=1
// if(nowHHII>items[1].etime){
// activeIndex=2
// }
// }
let dataset={
index:activeIndex,
val:items[activeIndex].id,
... ...
... ... @@ -12,7 +12,7 @@ module.exports = Behavior({
},
observers: {
'ckdata': function() {
this.checkedDefEvent()
this.checkedDefEvent();
}
},
methods: {
... ... @@ -46,7 +46,7 @@ module.exports = Behavior({
index = 3
val = this.data.items[index]
} else if (type == 'date') {
index = 0
index = 1
val = this.data.items[index]
}
ckdata = {index, val, type}
... ...
... ... @@ -12,7 +12,11 @@ Component({
findSellerData:{
type:Object,
value:null,
}
},
autoCon:{
type:Boolean,
value:false
}
},
/**
... ... @@ -28,11 +32,13 @@ Component({
this.setData({
hidden:!this.data.hasPage
})
setTimeout(()=>{
if(!this.data.findSellerData){
this.submit()
}
},300)
setTimeout(()=>{
if(!this.data.findSellerData){
this.submit()
}
},300)
},
observers: {
'findSellerData': function(findSellerData) {
... ... @@ -45,7 +51,7 @@ Component({
methods: {
paramEvent(e){
console.log('paramEvent',e.detail.type,e.detail)
this.params[e.detail.type]=e.detail
this.params[e.detail.type]=e.detail;
},
submit(){
console.log('this.params',this.params)
... ... @@ -59,6 +65,7 @@ Component({
if(this.params['dur'] && this.params['dur'].val>=0){
paramObj.daily=this.params['dur'].val
}
console.log('submit',this.params)
this.triggerEvent('event',{
params:this.params,
paramObj:paramObj,
... ...
... ... @@ -30,11 +30,11 @@
</view>
</view>
</view>
<view class="view flex align-center justify-between margin-top-sm reserve-view" catchtap="catchtap">
<view class="view flex align-center justify-between margin-top-sm reserve-view">
<view class="view rooms flex-treble flex" style="overflow-x: auto">
<block wx:for="{{sellerx.class}}" wx:key="seclass">
<view
bindtap="reserve" data-cid="{{item.id}}" data-cname="{{item.name}}"
data-cid="{{item.id}}" data-cname="{{item.name}}"
class="cu-tag round line-blue text-blue view">{{item.name}}</view>
</block>
<view class="cu-tag round line-white text-blue view cu-tag-end"></view>
... ...
... ... @@ -11,9 +11,9 @@
<view>1、包间状态会实时更新，目前该类型包间紧张，需帮忙抢订；</view>
<view>2、周到安排拥有全市包间资源，可为您推荐更多优质餐厅。</view>
</view>
<chatbot params="{{params}}">
<!-- <chatbot params="{{params}}">
<view class="button flex-cc">帮我<view class="qiang"></view>订</view>
</chatbot>
</chatbot> -->
</view>
</view>
</view>
... ...
... ... @@ -75,7 +75,7 @@ Component({
section:this.data.section,
room:this.data.roomlist[_target.index].name
}
this.selectComponent('#qiang').show(obj);
// this.selectComponent('#qiang').show(obj);
}else{
console.log('执行了选中包间类型');
if((this.data.seletroomlist && this.data.seletroomlist.length<3) || !this.data.seletroomlist){
... ...
... ... @@ -26,12 +26,15 @@
</block>
</block>
<block wx:else="">
<block wx:if="{{(item.isFull && item.isFull==1) || (item.isorderFull && item.isorderFull==1)}}">
<view class="room-full-qiang"></view>
<block wx:if="{{item.isFull && item.isFull==1}}">
<view class="room-select black-font font24r flex-cc gray">置满</view>
</block>
<block wx:if="{{item.isorderFull && item.isorderFull==1}}">
<view class="room-full black-font font24r">订满</view>
</block>
</block>
</view>
</block>
</block>
</view>
<qiang id="qiang"></qiang>
\ No newline at end of file
<!-- <qiang id="qiang"></qiang> -->
\ No newline at end of file
... ...
... ... @@ -81,14 +81,14 @@
class="view flex-treble big-but flex align-center justify-center txt-34-h solid line-blue round">
帮我推荐餐厅
</view>
<chatbot class="big-but view flex-treble align-center justify-center" params="{{chatbotParams}}">
<!-- <chatbot class="big-but view flex-treble align-center justify-center" params="{{chatbotParams}}">
<view class="view flex-treble big-but flex align-center justify-center txt-34-h solid line-blue round">
帮我
<image src="http://nosqn.colorcun.com/detail/qiang-2%403x.png"
style="width: 56rpx;height: 56rpx; margin: 0 6rpx;"></image>
订
</view>
</chatbot>
</chatbot> -->
</block>
<view class="view flex-treble big-but flex align-center justify-center txt-34-h solid line-blue round"
... ...
... ... @@ -114,6 +114,7 @@
</view>
</block>
</view>
<taocan sid="{{seller.id}}" wx:if="{{seller.id}}"></taocan>
<view class="view bg-white text-black padding-tb-lg margin-top-sm" wx:if="{{seller.room_image.length>0}}">
<view class="view padding-left-lg text-bold txt-40-h margin-bottom">参观包间</view>
<scroll-view class="text-cut margin-bottom-sm" scroll-x="true" bindscroll="scroll" style="width: 100%;">
... ... @@ -124,7 +125,6 @@
</block>
</scroll-view>
</view>
<taocan sid="{{seller.id}}" wx:if="{{seller.id}}"></taocan>
<view class="view bg-white text-black padding-tb-lg margin-top-sm" wx:if="{{seller.dishes.length>0}}">
<view class="view padding-left-lg text-bold txt-40-h margin-bottom">推荐菜品</view>
<scroll-view class="text-cut margin-bottom-sm"
... ...
... ... @@ -42,11 +42,11 @@
<view class="view flex flex-direction justify-center align-center empty-box margin-sm" wx:elif="{{hasFilterData}}">
<view class="view text-lg">未找到符合要求的餐厅</view>
<view class="view" style="margin-top: 16rpx;">修改或减少条件，获得更多餐厅</view>
<chatbot>
<!-- <chatbot>
<view style="margin-top: 80rpx;"
bindtap="setLoacl" data-val="39.684670,118.176300"
class="cu-btn round view text-def text-white bg-blue-blue">人工抢订</view>
</chatbot>
</chatbot> -->
</view>
<view class="view flex flex-direction justify-center align-center empty-box empty-box-move margin-sm"
wx:else="">
... ... @@ -75,11 +75,13 @@
</block>
<view style="height: 304rpx;"
class="view flex flex-direction justify-center align-center empty-box empty-box-move margin-sm">
<view class="view flex text-df tips align-center text-orange">
<!-- <view class="view flex text-df tips align-center text-orange">
<view class="view icon"></view>
<view class="view">往任意方向拖动地图，可查找不同范围的餐厅</view>
</view>
<view class="view text-lg margin-top-lg">已经滑到底啦</view>
</view> -->
<view class="view icon"></view>
<view class="view text-lg margin-top-sm">往任意方向拖动地图</view>
<view class="view text-24" style="margin-top: 16rpx;">可以查找更多餐厅</view>
</view>
<view class="view" style="height: 192rpx;"></view>
</scroll-view>
... ...
... ... @@ -65,10 +65,10 @@ page{
top:0;
left:0;
}
.empty-box-move .tips .icon{
.empty-box-move .icon{
background-image: url("http://nosqn.colorcun.com/2.0/home%20%289%29.png");
width:42rpx;
height:36rpx;
margin-left: 44rpx;
margin-right: 20rpx;
width:64rpx;
height:50rpx;
/* margin-left: 44rpx;
margin-right: 20rpx; */
}
\ No newline at end of file
... ...
... ... @@ -32,6 +32,7 @@ Page({
*/
eventChannel:null,
onLoad: async function (options) {
console.log(options)
/**
* lat=39.65273
* &lng=118.15813
... ...
... ... @@ -74,7 +74,7 @@ Page({
this.selectComponent('#search-how').show();
},
howEvent(e){
console.log('howEvent',e.detail)
console.log('howEvent555555',e.detail)
//this.eventChannel.emit('findSellerData',e.detail)
this.findSellerData=e.detail
this.setData({
... ...
... ... @@ -16,7 +16,7 @@
</view>
</view>
<view class="view solid-bottom flex justify-around align-center" style="height: 110rpx;" bindtap="dispalySearchHow">
<view class="flex-treble txt-36-h text-bold">{{findSellerData.paramStr||'周到安排（今天） 晚餐 4位'}}</view>
<view class="flex-treble txt-36-h {{findSellerData.paramStr ? 'text-bold' : ''}}" style="color: {{findSellerData.paramStr ? '#353535' : '#999999'}};">{{findSellerData.paramStr||'选择日期/时段/人数'}}</view>
<view class="more"></view>
</view>
<view class="view solid-bottom flex justify-around align-center"
... ... @@ -57,7 +57,7 @@
</view>
</view>
<view style="height: 150rpx;"></view>
<search-how id="search-how" findSellerData="{{findSellerData}}" bindevent="howEvent"></search-how>
<search-how id="search-how" findSellerData="{{findSellerData}}" autoCon="{{true}}" bindevent="howEvent"></search-how>
<location id="location" bindevent="locationEvent"></location>
<view class="view filter-mask" hidden="{{!hasFilter}}">
<view class="view filter">
... ...
... ... @@ -53,11 +53,11 @@
<view class="view card margin-top-sm padding-bottom-xs">
<view class="padding solid-bottom flex justify-between">
<view class="txt-30-h text-bold">订单信息</view>
<chatbot params="{{({act:'taocan',id:order_info.id,...order_tips})}}" wx:if="{{order_tips.optbut}}">
<!-- <chatbot params="{{({act:'taocan',id:order_info.id,...order_tips})}}" wx:if="{{order_tips.optbut}}">
<view class="text-df order-opt-but order-opt-but{{order_info.status}} flex align-center justify-center">
{{order_tips.optbut}}
</view>
</chatbot>
</chatbot> -->
</view>
<view class="view padding padding-lr-lg flex justify-between">
... ...
... ... @@ -2,25 +2,32 @@
"description": "项目配置文件。",
"setting": {
"urlCheck": true,
"scopeDataCheck": false,
"coverView": true,
"es6": true,
"enhance": false,
"postcss": true,
"compileHotReLoad": false,
"preloadBackgroundData": false,
"minified": true,
"autoAudits": false,
"newFeature": false,
"coverView": true,
"nodeModules": false,
"autoAudits": false,
"showShadowRootInWxmlPanel": true,
"scopeDataCheck": false,
"uglifyFileName": false,
"checkInvalidKey": true,
"checkSiteMap": true,
"uploadWithSourceMap": true,
"compileHotReLoad": false,
"useMultiFrameRuntime": false,
"useApiHook": true,
"babelSetting": {
"ignore": [],
"disablePlugins": [],
"outputPath": ""
},
"useIsolateContext": true,
"nodeModules": false,
"enhance": false,
"useCompilerModule": true,
"userConfirmedUseCompilerModuleSwitch": false,
"useMultiFrameRuntime": false,
"useApiHook": true,
"showShadowRootInWxmlPanel": true,
"packNpmManually": false,
"packNpmRelationList": [],
"minifyWXSS": true
... ... @@ -31,9 +38,7 @@
"projectname": "c%E7%AB%AF%E9%A2%84%E5%AE%9A",
"isGameTourist": false,
"simulatorType": "wechat",
"simulatorPluginLibVersion": {
"qywx_simulator_plugin": "1.2.0"
},
"simulatorPluginLibVersion": {},
"skeleton-config": {
"global": {
"loading": "chiaroscuro",
... ...