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({ @@ -177,7 +177,8 @@ Page({
177 nickname=util.cache('userInfo').nickName; 177 nickname=util.cache('userInfo').nickName;
178 }catch(e){} 178 }catch(e){}
179 return { 179 return {
180 - title: (nickname||'')+'给你发了一个邀请，点击查看', 180 + //title: (nickname||'')+'给你发了一个邀请，点击查看',
  181 + title: '你收到一个邀请函，点击查看',
181 path: '/pages/customer/index?id='+this.id+'&fromid='+getApp().openid+'&invite_name='+nickname, 182 path: '/pages/customer/index?id='+this.id+'&fromid='+getApp().openid+'&invite_name='+nickname,
182 imageUrl:util.cgi('App.Reserve.MakePic&rid=')+this.id, 183 imageUrl:util.cgi('App.Reserve.MakePic&rid=')+this.id,
183 } 184 }
@@ -19,7 +19,8 @@ @@ -19,7 +19,8 @@
19 <userinfo-share 19 <userinfo-share
20 binduserinfo="userinfo" 20 binduserinfo="userinfo"
21 share="{{detail}}"> 21 share="{{detail}}">
22 - <view class="opt-button">分享日程</view> 22 + <!--<view class="opt-button">分享日程</view>-->
  23 + <view class="opt-button">发邀请函</view>
23 </userinfo-share> 24 </userinfo-share>
24 </block> 25 </block>
25 </view> 26 </view>
@@ -190,7 +190,8 @@ Page({ @@ -190,7 +190,8 @@ Page({
190 nickname=util.cache('userInfo').nickName; 190 nickname=util.cache('userInfo').nickName;
191 }catch(e){} 191 }catch(e){}
192 return { 192 return {
193 - title: (nickname||'')+'给你发了一个邀请，点击查看', 193 + //title: (nickname||'')+'给你发了一个邀请，点击查看',
  194 + title: '你收到一个邀请函，点击查看',
194 path: '/pages/customer/index?id='+this.id+'&fromid='+getApp().openid+'&invite_name='+nickname, 195 path: '/pages/customer/index?id='+this.id+'&fromid='+getApp().openid+'&invite_name='+nickname,
195 imageUrl:util.cgi('App.Reserve.MakePic&rid=')+this.id, 196 imageUrl:util.cgi('App.Reserve.MakePic&rid=')+this.id,
196 } 197 }
1 <!--pages/customer/detail_owner.wxml--> 1 <!--pages/customer/detail_owner.wxml-->
2 -<view class="page flex-vc">  
3 - <view class="invit-logo">  
4 - <image src="http://qn.colorcun.com/custom/lite-yd/image/invit-logo.png"></image>  
5 - </view>  
6 - <view class="avatar">  
7 - <image src="{{detail.customers[0].headimgurl}}"></image>  
8 - </view>  
9 - <view class="invit flex-cc">  
10 - <view style="margin-right: 20rpx;">{{detail.rnameStr}}</view>  
11 - <view>{{detail.eatStr}}</view>  
12 - </view>  
13 - <view class="hr-one"></view>  
14 - <view class="seller flex-vc">  
15 - <view class="title">餐厅</view>  
16 - <view class="content name">{{detail.seller.sellername}}</view>  
17 - <view class="title">包间</view>  
18 - <view class="content">{{detail.tableFirst}}{{detail.tableSubInfo}}</view>  
19 - <view class="title">时间</view>  
20 - <view class="content">{{detail.rdateStr}}</view>  
21 - <view class="title">地址</view>  
22 - <view class="content flex-ll" bindtap="lookLocation">  
23 - <image src="http://qn.colorcun.com/custom/lite-yd/image/invit-addr.png" class="invit-addr"></image>  
24 - <view>{{detail.seller.real_address||detail.seller.map_address}}</view> 2 +<nav hasHome backgroundColor="rgba(0,0,0,0)" color="#ffffff"></nav>
  3 +<view class="page">
  4 + <view class="flex-vc" style="position: relative;">
  5 + <view class="invit-logo">
  6 + <image src="http://qn.colorcun.com/custom/lite-yd/image/invit-logo.png"></image>
  7 + </view>
  8 + <!--
  9 + <view class="avatar">
  10 + <image src="{{detail.customers[0].headimgurl}}"></image>
  11 + </view>
  12 + <view class="invit flex-cc">
  13 + <view style="margin-right: 20rpx;">{{detail.rnameStr}}</view>
  14 + <view>{{detail.eatStr}}</view>
  15 + </view>
  16 + <view class="hr-one"></view>
  17 + -->
  18 + <view class="seller flex-vc">
  19 + <view class="title">餐厅</view>
  20 + <view class="content name">{{detail.seller.sellername}}</view>
  21 + <view class="title">包间</view>
  22 + <view class="content">{{detail.tableFirst}}{{detail.tableSubInfo}}</view>
  23 + <view class="title">时间</view>
  24 + <view class="content">{{detail.rdateStr}}</view>
  25 + <view class="title">地址</view>
  26 + <view class="content flex-ll" bindtap="lookLocation">
  27 + <image src="http://qn.colorcun.com/custom/lite-yd/image/invit-addr.png" class="invit-addr"></image>
  28 + <view>{{detail.seller.real_address||detail.seller.map_address}}</view>
  29 + </view>
  30 + </view>
  31 + <view class="opt flex-cc">
  32 + <button class="but button-none flex-vc" bindtap="lookLocation">一键导航</button>
  33 + <button class="but button-none flex-vc" open-type="share" >转发给同行人</button>
25 </view> 34 </view>
26 - </view>  
27 - <view class="opt flex-cc">  
28 - <view class="but">餐厅详情</view>  
29 - <view class="but" bindtap="lookLocation">一键导航</view>  
30 </view> 35 </view>
31 </view> 36 </view>
@@ -2,9 +2,15 @@ @@ -2,9 +2,15 @@
2 page{ 2 page{
3 color:#FFFFFF; 3 color:#FFFFFF;
4 background: url("http://qn.colorcun.com/custom/lite-yd/image/invit-bg.png") #353334; 4 background: url("http://qn.colorcun.com/custom/lite-yd/image/invit-bg.png") #353334;
  5 + background-size: 100%;
5 } 6 }
6 .page{ 7 .page{
7 - margin-top: 40rpx; 8 + overflow-y: auto;
  9 + position: fixed;
  10 + top:40rpx;
  11 + bottom: 0;
  12 + left:0;
  13 + right:0;
8 } 14 }
9 image{ 15 image{
10 width: 100%; 16 width: 100%;
@@ -35,7 +41,7 @@ image{ @@ -35,7 +41,7 @@ image{
35 width: 90%; 41 width: 90%;
36 } 42 }
37 .seller{ 43 .seller{
38 - 44 + margin-top: 150rpx;
39 } 45 }
40 .seller .title{ 46 .seller .title{
41 font-size: 26rpx; 47 font-size: 26rpx;
@@ -60,15 +66,14 @@ image{ @@ -60,15 +66,14 @@ image{
60 66
61 67
62 .opt{ 68 .opt{
63 - margin-bottom: 180rpx;  
64 margin-top: 52rpx; 69 margin-top: 52rpx;
65 } 70 }
66 .opt .but{ 71 .opt .but{
67 width: 330rpx; 72 width: 330rpx;
68 - height: 70rpx; 73 + height: 80rpx;
69 border: 2rpx solid #ECD9B7; 74 border: 2rpx solid #ECD9B7;
70 border-radius: 6rpx; 75 border-radius: 6rpx;
71 - line-height: 70rpx; 76 + line-height: 80rpx;
72 text-align: center; 77 text-align: center;
73 font-size: 30rpx; 78 font-size: 30rpx;
74 color:#ECD9B7; 79 color:#ECD9B7;
@@ -111,12 +111,13 @@ Page({ @@ -111,12 +111,13 @@ Page({
111 } catch (e) { 111 } catch (e) {
112 } 112 }
113 let obj={ 113 let obj={
114 - title: (nickname || '') + '给你发了一个邀请，点击查看', 114 + //title: (nickname || '') + '给你发了一个邀请，点击查看',
  115 + title: '你收到一个邀请函，点击查看',
115 path: '/pages/customer/index?id=' + this.id + '&fromid=' + getApp().openid + '&invite_name=' + nickname, 116 path: '/pages/customer/index?id=' + this.id + '&fromid=' + getApp().openid + '&invite_name=' + nickname,
116 imageUrl: util.cgi('App.Reserve.MakePic&rid=') + this.id, 117 imageUrl: util.cgi('App.Reserve.MakePic&rid=') + this.id,
117 } 118 }
118 if(hasInvitation){ 119 if(hasInvitation){
119 - obj.title=(nickname || '') + '给你发了一个邀请函，点击查看'; 120 + //obj.title=(nickname || '') + '给你发了一个邀请函，点击查看';
120 obj.path=obj.path+'&hasInvitation=1'; 121 obj.path=obj.path+'&hasInvitation=1';
121 } 122 }
122 return obj; 123 return obj;
@@ -14,6 +14,7 @@ @@ -14,6 +14,7 @@
14 </block> 14 </block>
15 </view> 15 </view>
16 <view class="flex-lr share-view"> 16 <view class="flex-lr share-view">
  17 + <!--
17 <userinfo-share wx:if="{{!detail.hasOvered}}" 18 <userinfo-share wx:if="{{!detail.hasOvered}}"
18 binduserinfo="userinfo" 19 binduserinfo="userinfo"
19 bindshare="share" 20 bindshare="share"
@@ -22,6 +23,7 @@ @@ -22,6 +23,7 @@
22 class="share-but-view"> 23 class="share-but-view">
23 <view class="share-but Regular">邀请朋友</view> 24 <view class="share-but Regular">邀请朋友</view>
24 </userinfo-share> 25 </userinfo-share>
  26 + -->
25 <userinfo-share wx:if="{{!detail.hasOvered}}" 27 <userinfo-share wx:if="{{!detail.hasOvered}}"
26 binduserinfo="userinfo" 28 binduserinfo="userinfo"
27 bindshare="share" 29 bindshare="share"
@@ -24,7 +24,7 @@ @@ -24,7 +24,7 @@
24 } 24 }
25 .share-but-view{ 25 .share-but-view{
26 display: block; 26 display: block;
27 - width: 49%; 27 + width: 100%;
28 border-right:2rpx solid #262628; 28 border-right:2rpx solid #262628;
29 height:60rpx; 29 height:60rpx;
30 line-height: 60rpx; 30 line-height: 60rpx;
@@ -39,8 +39,9 @@ @@ -39,8 +39,9 @@
39 line-height: 80rpx; 39 line-height: 80rpx;
40 font-size: 34rpx; 40 font-size: 34rpx;
41 border:2rpx solid #262628; 41 border:2rpx solid #262628;
42 - color:#262628; 42 + color:#fefefe;
43 width: 100%; 43 width: 100%;
  44 + background-color: #262628;
44 } 45 }
45 .share-but{ 46 .share-but{
46 width: 100%; 47 width: 100%;
@@ -85,7 +85,7 @@ Page({ @@ -85,7 +85,7 @@ Page({
85 url = '/pages/customer/detail_invitation'; 85 url = '/pages/customer/detail_invitation';
86 } 86 }
87 if (res.data.openid == opt.openid) { 87 if (res.data.openid == opt.openid) {
88 - url = '/pages/customer/detail_owner'; 88 + //url = '/pages/customer/detail_owner';
89 } 89 }
90 } 90 }
91 } 91 }
@@ -118,7 +118,8 @@ Page({ @@ -118,7 +118,8 @@ Page({
118 nickname=util.cache('userInfo').nickName; 118 nickname=util.cache('userInfo').nickName;
119 }catch(e){} 119 }catch(e){}
120 return { 120 return {
121 - title: (nickname||'')+'给你发了一个邀请，点击查看', 121 + //title: (nickname||'')+'给你发了一个邀请，点击查看',
  122 + title: '你收到一个邀请函，点击查看',
122 path: '/pages/customer/index?id='+this.id+'&fromid='+getApp().openid+'&invite_name='+nickname, 123 path: '/pages/customer/index?id='+this.id+'&fromid='+getApp().openid+'&invite_name='+nickname,
123 imageUrl:util.cgi('App.Reserve.MakePic&rid=')+this.id, 124 imageUrl:util.cgi('App.Reserve.MakePic&rid=')+this.id,
124 } 125 }
@@ -31,7 +31,8 @@ @@ -31,7 +31,8 @@
31 binduserinfo="userinfo" 31 binduserinfo="userinfo"
32 bindshare="share" 32 bindshare="share"
33 share="{{detail}}"> 33 share="{{detail}}">
34 - <view class="opt-button">{{detail.hasOwner?'邀请':'分享日程'}}</view> 34 + <!--<view class="opt-button">{{detail.hasOwner?'邀请':'分享日程'}}</view>-->
  35 + <view class="opt-button">发邀请函</view>
35 </userinfo-share> 36 </userinfo-share>
36 </view> 37 </view>
37 </card> 38 </card>