xt / xcx-book · Commits

Go to a project

Commit 5dbbf3a50d99d51717f32e78ea8dbf7c04dcbf45

Authored by liuxuqing
1 parent 23532019
build: skipped

套餐提醒

Inline Side-by-side
Showing 24 changed files with 266 additions and 36 deletions
... ... @@ -312,3 +312,11 @@ image{
content: "";
display: block;
}
.notice{
width: 16rpx;
height: 16rpx;
border-radius: 50%;
background: #FA5151;
margin-bottom: 44rpx;
margin-left: -8rpx;
}
... ...
<!--components/2.0/pinglun/card.wxml-->
<wxs src="../../../utils/util.wxs" module="util" />
<view class="view flex align-center justify-center margin-bottom {{cla}}">
<view class="cu-avatar round lg" style="background-image: url('{{post.author_image}}')"></view>
<view class="cu-avatar round lg" style="background-image: url('{{post.isnoshow==1 ? 'http://nosqn.colorcun.com/noshow.jpg' : post.author_image}}');width: 72rpx;height: 72rpx;border-radius: 50%;" ></view>
<view class="flex-treble flex flex-direction margin-left-sm">
<view class="txt-24-h text-bold margin-bottom-sm">{{post.author}}</view>
<view class="txt-24-h text-bold margin-bottom-sm" style="margin-bottom: 10rpx;">{{post.isnoshow==1 ? '匿名用户' : post.author}}</view>
<stat value="{{post.grade}}" cla="card" disabled></stat>
</view>
<view class="text-gray txt-24-h {{hasStatus?'hasStatus status-'+post.status:''}}">{{util.unixtoTime(post.create_time,'YYYY-MM-DD')}}</view>
... ...
import util from '../../../utils/util';
import App from '../../../utils/api';
let systeminfo=wx.getSystemInfoSync();
let ratio=750/systeminfo.windowWidth,distance=systeminfo.windowHeight*ratio*0.3-78;
Component({
properties:{
pos:{
type:Object,
value:{
left:0,
top:distance,
right:0
}
},
},
data:{
shownotice:false,
},
attached(){
this.getautomenu();
},
methods:{
gotoList(e){
getApp().meListType=util.attr(e,'type')
wx.switchTab({
url:'/pages/me/list?type='+util.attr(e,'type')
})
},
getautomenu(){
console.log('tttttttt')
App.Foodset.GetUserFoodOrders({
status:2,//tabType,
openid: getApp().openid,
offset:1,
limit:1,
size:1,
}).then(res=>{
if(res.data.length>0){
this.setData({
shownotice:true
})
}
})
},
}
})
\ No newline at end of file
... ...
{
"component": true
}
\ No newline at end of file
... ...
<cover-view style="top:{{pos.top}}rpx;left:{{pos.left}}rpx;right:{{pos.right}}rpx;" class="notice-cover" bindtap="gotoList" data-type="5" wx:if="{{shownotice}}">
<cover-view class="taocan-notice flex-lr">
<cover-view class="font28r" style="color:#FA7268;font-weight: bold;">您有一个套餐券待使用</cover-view>
<cover-view class="notice-look font26r flex-cc">查看</cover-view>
</cover-view>
<cover-image src="http://nosqn.colorcun.com/nouse.jpg" class="taocan-image"></cover-image>
</cover-view>
... ...
@import "../../../app.wxss";
.notice-cover{
padding-top: 20rpx;
position: absolute;
z-index: 2;
}
.taocan-notice{
width: 100%;
height: 96rpx;
padding: 0 40rpx 28rpx 136rpx;
box-sizing: border-box;
border-radius: 20rpx 20rpx 0pt 0pt;
background: linear-gradient(to right, #FFF1EF , #E1ECF8);
}
.taocan-image{
width: 96rpx;
height: 80rpx;
position: absolute;
top: 0rpx;
left: 20rpx;
}
.notice-look{
width: 92rpx;
height: 48rpx;
border:2rpx solid #FA7268;
border-radius: 26rpx;
color: #FA7268;
}
\ No newline at end of file
... ...
... ... @@ -15,6 +15,7 @@ Page({
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
console.log(options,'uuuuu');
this.options=options
if(options.sid){
this.setData({
... ...
... ... @@ -12,7 +12,8 @@ Page({
hasManagerInvitation:false,
extraData:{
id:55214,
}
},
shownotice:false,
},
/**
* 生命周期函数--监听页面加载
... ... @@ -108,5 +109,20 @@ Page({
wx.switchTab({
url:'/pages/me/list?type='+util.attr(e,'type')
})
}
},
getautomenu(){
App.Foodset.GetUserFoodOrders({
status:2,//tabType,
openid: getApp().openid,
offset:1,
limit:1,
size:1,
}).then(res=>{
if(res.data.length>0){
this.setData({
shownotice:true
})
}
})
},
})
\ No newline at end of file
... ...
... ... @@ -63,6 +63,7 @@
<view class="item-name flex-ll">
<view class="taocan"></view>
<view>我的套餐</view>
<view class="notice" wx:if="{{shownotice==true}}"></view>
</view>
<view class="more"></view>
</view>
... ...
... ... @@ -25,6 +25,7 @@ Page({
offset:0,
limit:10,
hasMore:true,
shownotice:false,
/**
* 生命周期函数--监听页面加载
*/
... ... @@ -51,6 +52,9 @@ Page({
onShow: function () {
PubSub.emit('custom-tab-bar')
console.log('getApp().meListType',getApp().meListType)
if(getApp().meListType && getApp().meListType<5){
this.getautomenu();
}
if(!getApp().meListType) getApp().meListType=defTabType
if(this.data.list[this.tabType].length<1 || getApp().meListType!=this.tabType){
if(getApp().meListType!=this.tabType) {
... ... @@ -122,6 +126,21 @@ Page({
// }
})
},
getautomenu(){
App.Foodset.GetUserFoodOrders({
status:2,//tabType,
openid: getApp().openid,
offset:1,
limit:1,
size:1,
}).then(res=>{
if(res.data.length>0){
this.setData({
shownotice:true
})
}
})
},
formatList(list) {
if (list.length<1) return [];
if(this.tabType>4) return list;
... ...
... ... @@ -2,7 +2,10 @@
<nav>
<view class="view header-tabs flex align-end">
<view class="view item {{tabType<5?'active':''}} margin-right-lg" data-type="1" bindtap="switchType">我的订单</view>
<view class="view item {{tabType>4?'active':''}}" data-type="5" bindtap="switchType">我的套餐</view>
<view class="view item {{tabType>4?'active':''}} flex-ll" data-type="5" bindtap="switchType">
<view>我的套餐</view>
<view class="notice" wx:if="{{shownotice==true}}"></view>
</view>
</view>
</nav>
<view class="view tabs flex padding-lr-lg padding-top-xs justify-between padding-bottom-sm margin-bottom-sm" wx:if="{{tabType<5}}">
... ...
... ... @@ -48,6 +48,7 @@ Page({
},
files:[], //组件数据放入这里展示到页面上
hasAddFile:true,//出现上传加号
isnoshow:1, //是否匿名
},
/**
... ... @@ -200,10 +201,11 @@ Page({
text:this.text||'',
types:1,
grade:this.statVal,
isnoshow:this.data.isnoshow
}
App.User.SetComment(params).then(res=>{
if(res.ret!=200){
return util.toast(res.msg,'')
return util.toast(res.msg,'');
}
wx.redirectTo({
url:'./success?sellername='+this.options.sellername
... ... @@ -211,5 +213,10 @@ Page({
}).catch(e=>{
this.submitIng=false
})
}
},
setnoshow(){
this.setData({
isnoshow:!this.data.isnoshow
})
},
})
\ No newline at end of file
... ...
... ... @@ -23,7 +23,7 @@
<textarea
class="margin-top-lg text-df textarea"
bindinput="textareaInput"
placeholder="从包间环境、菜品口味、服务来评价餐厅，可以帮助更多想要订这家餐厅的人哦～"></textarea>
placeholder="从包间环境、菜品口味、服务来评价餐厅，可以帮助更多想要订这家餐厅的人哦～" placeholder-style="color:#999999;font-size:30rpx;"></textarea>
</view>
<scroll-view class="view"
scroll-into-view="{{scrollIntoView}}"
... ... @@ -66,6 +66,12 @@
<view id="scrollIntoView" class="qnupload" style="width: 0;"></view>
</scroll-view>
<view class="flex-ll reamrk-noshow">
<view class="remark-ratio flex-cc {{isnoshow==1 ? 'active' : 'border'}}" bindtap="setnoshow">
<image src="http://nosqn.colorcun.com/right.jpg" wx:if="isnoshow==1"></image>
</view>
<view class="black-font font30r" bindtap="setnoshow">匿名评价</view>
</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
... ...
... ... @@ -95,4 +95,24 @@
font-weight: 400;
color: #999999!important;
line-height: 42rpx;
}
.remark-ratio{
width: 36rpx;
height: 36rpx;
border-radius: 50%;
margin-right: 20rpx;
}
.remark-ratio.border{
border:2rpx solid #CCCCCC;
}
.remark-ratio.active{
background: linear-gradient(#FFC140,#FFA000);
}
.remark-ratio image{
width: 27rpx;
height: 18rpx;
}
.reamrk-noshow{
padding: 44rpx 40rpx 0;
box-sizing: border-box;
}
\ No newline at end of file
... ...
... ... @@ -11,6 +11,21 @@ Page({
sellers:[],
hasMore:true,
activity:null,
discountlist:[
{
name:'超值套餐',
slogan:'尝遍特色菜品 就选超值套餐'
},
{
name:'线下特惠',
slogan:'先预订再就餐 享受会员特惠'
},
{
name:'买单优惠',
slogan:'使用平台买单 多重优惠叠加'
},
],
tabidx:0,
},
sellers:[],
/**
... ... @@ -19,7 +34,10 @@ Page({
options:null,
onLoad: function (options) {
//latitude=34.215637&longitude=108.891264&scale=16&height=397
this.options=options
this.options=options;
this.setData({
tabidx:options.tabidx,
})
},
formatSellers(data){
let sellers=[];
... ... @@ -156,5 +174,11 @@ Page({
})
}
})
},
switchdiscount(e){
let tabidx=util.attr(e,'tabidx');
this.setData({
tabidx:tabidx,
})
}
})
\ No newline at end of file
... ...
... ... @@ -11,8 +11,14 @@
<view class="banner-image-bottom"></view>
</navigator>
</view>
<view class="flex-lr discount-list">
<view wx:for="{{discountlist}}" class="discount-item flex-vc" data-tabidx="{{index}}" bindtap="switchdiscount">
<view class="gray-deep-font font32r {{index==tabidx ? 'text-bold font-orange' : ''}}" style="line-height: 44rpx;margin-bottom: 14rpx;">{{item.name}}</view>
<view class="discount-border {{index==tabidx ? 'active' : ''}}"></view>
</view>
</view>
<view class="follow" style="margin-top: {{activity?96:32}}rpx;">
<view class="biaoyu">先预订再就餐 优惠又安心</view>
<view class="biaoyu">{{discountlist[tabidx].slogan}}</view>
<view class="seller" wx:for="{{sellers}}" wx:key="sellers.key"
bindtap="gotoDetail" data-sid="{{item.id}}" wx:if="{{item.hasFollow}}">
<sb-tr seller="{{item}}"
... ...
/* pages/reserve/discount.wxss */
@import "../../colorui/main.wxss";
page{
background-color: #F5F5F5;
}
... ... @@ -46,7 +47,7 @@ page{
text-align: center;
margin-left: calc(50% - 264rpx);
position: relative;
margin-bottom: 30rpx;
margin-bottom: 160rpx;
}
.biaoyu:after,.biaoyu:before{
content:"";
... ... @@ -63,4 +64,22 @@ page{
background-image: url("http://nosqn.colorcun.com/activity/ar.png");
right:0;
left: auto;
}
.discount-list{
width: 100%;
padding: 20rpx 60rpx 0;
box-sizing: border-box;
}
.discount-item{
padding-top: 20rpx;
}
.font-orange{
color: #F05522;
}
.discount-border{
width: 96rpx;
height: 6rpx;
}
.discount-border.active{
background: #F05522;
}
\ No newline at end of file
... ...
... ... @@ -8,6 +8,7 @@
"filter-group":"/components/2.0/filter/filter-group",
"seller-card":"/components/2.0/seller/card",
"chatbot":"/components/userinfo/chatbot",
"as-phone":"/components/2.0/dialog/phone"
"as-phone":"/components/2.0/dialog/phone",
"taocan-notice":"/components/2.0/taocan/notice"
}
}
\ No newline at end of file
... ...
... ... @@ -20,6 +20,7 @@
<image class="moveToLocation-image" src="http://nosqn.colorcun.com/2.0/home%20%2811%29.png"></image>
</view>
</view>
<taocan-notice></taocan-notice>
<view class="view content padding-top-xs" style="height: 70vh;">
<filter-group height="{{height}}"
id="filter-group"
... ...
... ... @@ -11,6 +11,11 @@ Page({
data: {
location:'获取中...',
hasFilter:false,//
taocanpos:{
top:193,
left:30,
right:30
}
},
/**
... ... @@ -109,17 +114,17 @@ Page({
this.position=e.detail.position
this.setData({
location:e.detail.isAddr?e.detail.address:e.detail.city.name,
IsSetActivityByFoods:false,
IsSetActivityByFoods:true,
sellers:[],
})
App.Customer.IsSetActivityByFoods({
pid:this.city.pid,
code:this.city.code,
}).then(res=>{
this.setData({
IsSetActivityByFoods:res.data,
})
})
// App.Customer.IsSetActivityByFoods({
// pid:this.city.pid,
// code:this.city.code,
// }).then(res=>{
// this.setData({
// IsSetActivityByFoods:res.data,
// })
// })
this.GetRecomList()
},
filterParams:null,
... ... @@ -146,12 +151,13 @@ Page({
}
},
goPath(e){
let path=util.attr(e,'path');
let path=util.attr(e,'path'),tabidx=util.attr(e,'tabidx');
wx.navigateTo({
url:util.http_build_query({
filter:this.filterParams?JSON.stringify(this.filterParams):null,
city:JSON.stringify(this.city),
hows:JSON.stringify(this.findSellerData),
tabidx:tabidx,
},path)
})
},
... ...
... ... @@ -7,6 +7,7 @@
"location":"/components/2.0/filter/location",
"filter":"/components/2.0/filter/filter",
"seller-card":"/components/2.0/seller/card",
"as-phone":"/components/2.0/dialog/phone"
"as-phone":"/components/2.0/dialog/phone",
"taocan-notice":"/components/2.0/taocan/notice"
}
}
\ No newline at end of file
... ...
<!--pages/reserve/home.wxml-->
<view class="view header">
<image src="http://nosqn.colorcun.com/search/s%20%281%29.png"
<image src="http://nosqn.colorcun.com/search/s%20%281%29.png"
style="z-index: 1"
mode="widthFix" class="bg-img"></image>
<taocan-notice pos="{{taocanpos}}"></taocan-notice>
</view>
<view class="view search margin-lr padding-top-0 padding-lr-lg padding-bottom-lg">
<view class="view solid-bottom flex justify-around align-center" style="height: 110rpx;">
... ... @@ -35,14 +36,13 @@
查找包间
</view>
</view>
<view wx:if="{{IsSetActivityByFoods}}" class="margin-top-lg padding-lr-lg padding-top-lg" bindtap="goPath"
data-path="/pages/reserve/discount">
<view wx:if="{{IsSetActivityByFoods}}" class="margin-top-lg padding-lr-lg padding-top-lg">
<view class="txt-40-h text-bold margin-bottom">精选特惠</view>
<view class="flex justify-center align-center">
<view class="view youhui-image image1" style=""></view>
<view class="flex justify-center align-center" >
<view class="view youhui-image image1" style="" data-tabidx="0" data-path="/pages/reserve/discount" bindtap="goPath"></view>
<view class="margin-left-xs">
<view class="view youhui-image image2"></view>
<view class="view youhui-image image3 margin-top-xs"></view>
<view class="view youhui-image image2" data-tabidx="1" data-path="/pages/reserve/discount" bindtap="goPath"></view>
<view class="view youhui-image image3 margin-top-xs" data-tabidx="2" data-path="/pages/reserve/discount" bindtap="goPath"></view>
</view>
</view>
</view>
... ...
... ... @@ -6,6 +6,7 @@
}
.bg-img{
width: 100%;
height: 604rpx;
}
.header:before{
width: calc(100% - 60rpx);
... ...
... ... @@ -76,12 +76,6 @@
}
},
"condition": {
"search": {
"list": []
},
"conversation": {
"list": []
},
"plugin": {
"list": []
},
... ... @@ -685,6 +679,18 @@
"pathName": "pack-book/pages/book/b_index",
"query": "seller_id=80&seller_openid=oGefL4qKBWIh5xwyg3LVfkMbDumA&manager_id=763&goPath=roomtype/roomtype",
"scene": null
},
{
"name": "booking/pack-book/pages/checkout/index",
"pathName": "booking/pack-book/pages/checkout/index",
"query": "rid=153180",
"scene": null
},
{
"name": "pack-checkout/pages/index",
"pathName": "pack-checkout/pages/index",
"query": "rid=153180&sid=1297",
"scene": null
}
]
}
... ...