xt / xcx-book · Commits

Go to a project

Commit c35fad00d86367e93ae57c640610b272b68313bb

Authored by wangfan
1 parent 7ab6d606
build: skipped

ui fix

Inline Side-by-side
Showing 11 changed files with 61 additions and 42 deletions
... ... @@ -177,7 +177,8 @@ Page({
nickname=util.cache('userInfo').nickName;
}catch(e){}
return {
title: (nickname||'')+'给你发了一个邀请，点击查看',
//title: (nickname||'')+'给你发了一个邀请，点击查看',
title: '你收到一个邀请函，点击查看',
path: '/pages/customer/index?id='+this.id+'&fromid='+getApp().openid+'&invite_name='+nickname,
imageUrl:util.cgi('App.Reserve.MakePic&rid=')+this.id,
}
... ...
... ... @@ -19,7 +19,8 @@
<userinfo-share
binduserinfo="userinfo"
share="{{detail}}">
<view class="opt-button">分享日程</view>
<!--<view class="opt-button">分享日程</view>-->
<view class="opt-button">发邀请函</view>
</userinfo-share>
</block>
</view>
... ...
... ... @@ -190,7 +190,8 @@ Page({
nickname=util.cache('userInfo').nickName;
}catch(e){}
return {
title: (nickname||'')+'给你发了一个邀请，点击查看',
//title: (nickname||'')+'给你发了一个邀请，点击查看',
title: '你收到一个邀请函，点击查看',
path: '/pages/customer/index?id='+this.id+'&fromid='+getApp().openid+'&invite_name='+nickname,
imageUrl:util.cgi('App.Reserve.MakePic&rid=')+this.id,
}
... ...
<!--pages/customer/detail_owner.wxml-->
<view class="page flex-vc">
<view class="invit-logo">
<image src="http://qn.colorcun.com/custom/lite-yd/image/invit-logo.png"></image>
</view>
<view class="avatar">
<image src="{{detail.customers[0].headimgurl}}"></image>
</view>
<view class="invit flex-cc">
<view style="margin-right: 20rpx;">{{detail.rnameStr}}</view>
<view>{{detail.eatStr}}</view>
</view>
<view class="hr-one"></view>
<view class="seller flex-vc">
<view class="title">餐厅</view>
<view class="content name">{{detail.seller.sellername}}</view>
<view class="title">包间</view>
<view class="content">{{detail.tableFirst}}{{detail.tableSubInfo}}</view>
<view class="title">时间</view>
<view class="content">{{detail.rdateStr}}</view>
<view class="title">地址</view>
<view class="content flex-ll" bindtap="lookLocation">
<image src="http://qn.colorcun.com/custom/lite-yd/image/invit-addr.png" class="invit-addr"></image>
<view>{{detail.seller.real_address||detail.seller.map_address}}</view>
<nav hasHome backgroundColor="rgba(0,0,0,0)" color="#ffffff"></nav>
<view class="page">
<view class="flex-vc" style="position: relative;">
<view class="invit-logo">
<image src="http://qn.colorcun.com/custom/lite-yd/image/invit-logo.png"></image>
</view>
<!--
<view class="avatar">
<image src="{{detail.customers[0].headimgurl}}"></image>
</view>
<view class="invit flex-cc">
<view style="margin-right: 20rpx;">{{detail.rnameStr}}</view>
<view>{{detail.eatStr}}</view>
</view>
<view class="hr-one"></view>
-->
<view class="seller flex-vc">
<view class="title">餐厅</view>
<view class="content name">{{detail.seller.sellername}}</view>
<view class="title">包间</view>
<view class="content">{{detail.tableFirst}}{{detail.tableSubInfo}}</view>
<view class="title">时间</view>
<view class="content">{{detail.rdateStr}}</view>
<view class="title">地址</view>
<view class="content flex-ll" bindtap="lookLocation">
<image src="http://qn.colorcun.com/custom/lite-yd/image/invit-addr.png" class="invit-addr"></image>
<view>{{detail.seller.real_address||detail.seller.map_address}}</view>
</view>
</view>
<view class="opt flex-cc">
<button class="but button-none flex-vc" bindtap="lookLocation">一键导航</button>
<button class="but button-none flex-vc" open-type="share" >转发给同行人</button>
</view>
</view>
<view class="opt flex-cc">
<view class="but">餐厅详情</view>
<view class="but" bindtap="lookLocation">一键导航</view>
</view>
</view>
... ...
... ... @@ -2,9 +2,15 @@
page{
color:#FFFFFF;
background: url("http://qn.colorcun.com/custom/lite-yd/image/invit-bg.png") #353334;
background-size: 100%;
}
.page{
margin-top: 40rpx;
overflow-y: auto;
position: fixed;
top:40rpx;
bottom: 0;
left:0;
right:0;
}
image{
width: 100%;
... ... @@ -35,7 +41,7 @@ image{
width: 90%;
}
.seller{
margin-top: 150rpx;
}
.seller .title{
font-size: 26rpx;
... ... @@ -60,15 +66,14 @@ image{
.opt{
margin-bottom: 180rpx;
margin-top: 52rpx;
}
.opt .but{
width: 330rpx;
height: 70rpx;
height: 80rpx;
border: 2rpx solid #ECD9B7;
border-radius: 6rpx;
line-height: 70rpx;
line-height: 80rpx;
text-align: center;
font-size: 30rpx;
color:#ECD9B7;
... ...
... ... @@ -111,12 +111,13 @@ Page({
} catch (e) {
}
let obj={
title: (nickname || '') + '给你发了一个邀请，点击查看',
//title: (nickname || '') + '给你发了一个邀请，点击查看',
title: '你收到一个邀请函，点击查看',
path: '/pages/customer/index?id=' + this.id + '&fromid=' + getApp().openid + '&invite_name=' + nickname,
imageUrl: util.cgi('App.Reserve.MakePic&rid=') + this.id,
}
if(hasInvitation){
obj.title=(nickname || '') + '给你发了一个邀请函，点击查看';
//obj.title=(nickname || '') + '给你发了一个邀请函，点击查看';
obj.path=obj.path+'&hasInvitation=1';
}
return obj;
... ...
... ... @@ -14,6 +14,7 @@
</block>
</view>
<view class="flex-lr share-view">
<!--
<userinfo-share wx:if="{{!detail.hasOvered}}"
binduserinfo="userinfo"
bindshare="share"
... ... @@ -22,6 +23,7 @@
class="share-but-view">
<view class="share-but Regular">邀请朋友</view>
</userinfo-share>
-->
<userinfo-share wx:if="{{!detail.hasOvered}}"
binduserinfo="userinfo"
bindshare="share"
... ...
... ... @@ -24,7 +24,7 @@
}
.share-but-view{
display: block;
width: 49%;
width: 100%;
border-right:2rpx solid #262628;
height:60rpx;
line-height: 60rpx;
... ... @@ -39,8 +39,9 @@
line-height: 80rpx;
font-size: 34rpx;
border:2rpx solid #262628;
color:#262628;
color:#fefefe;
width: 100%;
background-color: #262628;
}
.share-but{
width: 100%;
... ...
... ... @@ -85,7 +85,7 @@ Page({
url = '/pages/customer/detail_invitation';
}
if (res.data.openid == opt.openid) {
url = '/pages/customer/detail_owner';
//url = '/pages/customer/detail_owner';
}
}
}
... ...
... ... @@ -118,7 +118,8 @@ Page({
nickname=util.cache('userInfo').nickName;
}catch(e){}
return {
title: (nickname||'')+'给你发了一个邀请，点击查看',
//title: (nickname||'')+'给你发了一个邀请，点击查看',
title: '你收到一个邀请函，点击查看',
path: '/pages/customer/index?id='+this.id+'&fromid='+getApp().openid+'&invite_name='+nickname,
imageUrl:util.cgi('App.Reserve.MakePic&rid=')+this.id,
}
... ...
... ... @@ -31,7 +31,8 @@
binduserinfo="userinfo"
bindshare="share"
share="{{detail}}">
<view class="opt-button">{{detail.hasOwner?'邀请':'分享日程'}}</view>
<!--<view class="opt-button">{{detail.hasOwner?'邀请':'分享日程'}}</view>-->
<view class="opt-button">发邀请函</view>
</userinfo-share>
</view>
</card>
... ...