xt / xcx-book · Commits

Go to a project

Commit 8cb7d1fec3f61c547e788ea1f4322f150fdb3072

Authored by wangfan
1 parent d777cb35
build: skipped

ui fix

Inline Side-by-side
Showing 10 changed files with 183 additions and 2 deletions
@@ -21,6 +21,7 @@ @@ -21,6 +21,7 @@
21 "pages/book/setting/index", 21 "pages/book/setting/index",
22 "pages/book/setting/sms", 22 "pages/book/setting/sms",
23 "pages/book/setting/sms_buy", 23 "pages/book/setting/sms_buy",
  24 + "pages/book/crm/index",
24 "pages/book/smsbatch/index", 25 "pages/book/smsbatch/index",
25 "pages/book/smsbatch/update", 26 "pages/book/smsbatch/update",
26 "pages/book/smsbatch/detail", 27 "pages/book/smsbatch/detail",
1 <formids bindtap="detail"> 1 <formids bindtap="detail">
2 - <view class="book-list-tds flex-lr font30r black-font"> 2 + <view class="book-list-tds flex-lr font30r black-font reserve-status-{{vitem.status}}">
3 <view class="book-list-td flex-vc"> 3 <view class="book-list-td flex-vc">
4 <view class="Medium" style="font-size: 30rpx; width: 100%;text-align: left;max-height:40px;overflow:hidden;">{{vitem.name}}</view> 4 <view class="Medium" style="font-size: 30rpx; width: 100%;text-align: left;max-height:40px;overflow:hidden;">{{vitem.name}}</view>
5 <view class="Medium" style="font-size: 28rpx;width: 100%;text-align: left" wx:if="{{vitem.table_ids.length>1}}">等{{vitem.table_ids.length}}桌</view> 5 <view class="Medium" style="font-size: 28rpx;width: 100%;text-align: left" wx:if="{{vitem.table_ids.length>1}}">等{{vitem.table_ids.length}}桌</view>
@@ -13,4 +13,10 @@ @@ -13,4 +13,10 @@
13 .book-list-info{ 13 .book-list-info{
14 width:100%; 14 width:100%;
15 line-height:1.2; 15 line-height:1.2;
  16 +}
  17 +.reserve-status-4{
  18 + color:#999999;
  19 +}
  20 +.reserve-status-4 .green-font{
  21 + color:#999999;
16 } 22 }
@@ -9,6 +9,9 @@ @@ -9,6 +9,9 @@
9 <view class="gray-deep-font font30r">用餐人数</view> 9 <view class="gray-deep-font font30r">用餐人数</view>
10 <view class="black-font font34r">{{bookInfo.pnum_str||bookInfo.pnum}}人</view> 10 <view class="black-font font34r">{{bookInfo.pnum_str||bookInfo.pnum}}人</view>
11 </view> 11 </view>
  12 + <view class="reserve-status-tip">
  13 + <image src="http://qn.colorcun.com/custom/lite-yd/image/reserve-status-{{bookInfo.status}}.png"></image>
  14 + </view>
12 <view class="flex-lr order-detail"> 15 <view class="flex-lr order-detail">
13 <view class="gray-deep-font font30r">预定座位</view> 16 <view class="gray-deep-font font30r">预定座位</view>
14 <view class="black-font font34r">{{tables.length}}个</view> 17 <view class="black-font font34r">{{tables.length}}个</view>
@@ -121,3 +121,14 @@ view{ @@ -121,3 +121,14 @@ view{
121 .notice-button-border view:last-child{ 121 .notice-button-border view:last-child{
122 border-right-width: 0; 122 border-right-width: 0;
123 } 123 }
  124 +.reserve-status-tip{
  125 + position: absolute;
  126 + top:300rpx;
  127 + right:200rpx;
  128 + width: 82rpx;
  129 + height: 52rpx;
  130 +}
  131 +.reserve-status-tip image{
  132 + width: 100%;
  133 + height: 100%;
  134 +}
  1 +// pages/book/setting/index.js
  2 +import util from '../../../utils/util';
  3 +import App from '../../../utils/api';
  4 +const {regeneratorRuntime} = global
  5 +Page({
  6 +
  7 + /**
  8 + * 页面的初始数据
  9 + */
  10 + data: {
  11 +
  12 + },
  13 +
  14 + /**
  15 + * 生命周期函数--监听页面加载
  16 + */
  17 + enter_params:{},
  18 + onLoad: function (options) {
  19 + this.enter_params=util.cache('enter_params');
  20 + App.Reserve.SellerInfo(this.enter_params).then(res=>{
  21 + this.setData({
  22 + seller:res.data.seller,
  23 + user:res.data.seller_user
  24 + })
  25 + })
  26 + },
  27 +
  28 + /**
  29 + * 生命周期函数--监听页面初次渲染完成
  30 + */
  31 + onReady: function () {
  32 +
  33 + },
  34 +
  35 + /**
  36 + * 生命周期函数--监听页面显示
  37 + */
  38 + onShow: function () {
  39 + App.Reserve.SmsInfo({seller_id:this.enter_params.seller_id}).then(res=>{
  40 + if(res.ret==404){
  41 + res.data={
  42 + last_num:100,
  43 + meals:[
  44 + {id:1,total:550,price_ave:0.09,price_old:50,price:50,discount:0},
  45 + {id:2,total:1200,price_ave:0.083,price_old:100,price:100,discount:0},
  46 + {id:3,total:3650,price_ave:0.082,price_old:328,price:300,discount:9.1},
  47 + ],
  48 + };
  49 + }
  50 + this.setData({
  51 + sms:res.data,
  52 + })
  53 + })
  54 + },
  55 +
  56 + /**
  57 + * 生命周期函数--监听页面隐藏
  58 + */
  59 + onHide: function () {
  60 +
  61 + },
  62 +})
  1 +{
  2 + "backgroundTextStyle":"light",
  3 + "navigationBarBackgroundColor": "#fff",
  4 + "navigationBarTextStyle":"light",
  5 + "usingComponents": {
  6 + "nav":"/components/nav/nav",
  7 + "tabBar":"/components/book/tabBar/tabBar",
  8 + "formids":"/components/formids/formids"
  9 + }
  10 +}
  1 +<!--pages/book/setting/index.wxml-->
  2 +<nav id="nav" backgroundColor="#199095" color="#fefefe">我的客户</nav>
  3 +<view class="page">
  4 + <formids url="/pages/book/setting/sms">
  5 + <view class="row flex-lr">
  6 + <view>短信管理</view>
  7 + <view class="flex-rr">
  8 + <view class="right lastNum">剩余{{sms.last_num||0}}条</view>
  9 + <view class="more"></view>
  10 + </view>
  11 + </view>
  12 + </formids>
  13 + <formids url="/pages/book/smsbatch/index">
  14 + <view class="row flex-lr" style="padding-top: 34rpx;">
  15 + <view>短信营销</view>
  16 + <view class="flex-rr">
  17 + <view class="more"></view>
  18 + </view>
  19 + </view>
  20 + </formids>
  21 + <formids url="/pages/book/crm/index">
  22 + <view class="row flex-lr" style="padding-top: 34rpx;">
  23 + <view>我的客户</view>
  24 + <view class="flex-rr">
  25 + <view class="more"></view>
  26 + </view>
  27 + </view>
  28 + </formids>
  29 + <formids url="/pages/customer/index?islove=customer">
  30 + <view class="row flex-lr" style="padding-top: 34rpx;">
  31 + <view>切换到顾客模式</view>
  32 + <view class="flex-rr">
  33 + <view class="more"></view>
  34 + </view>
  35 + </view>
  36 + </formids>
  37 +</view>
  38 +<tabBar></tabBar>
  1 +/* pages/book/setting/index.wxss */
  2 +/*
  3 +http://qn.colorcun.com/custom/lite-yd/image/icon-zk.png
  4 +http://qn.colorcun.com/custom/lite-yd/image/icon-cz.png
  5 +*/
  6 +.header{
  7 + height: 302rpx;
  8 + background-color: #199095;
  9 + margin-top: -2rpx;
  10 +}
  11 +.header .info{
  12 + color:#FEFEFE;
  13 + width: 90%;
  14 + padding-top: 86rpx;
  15 + margin: 0 auto;
  16 +}
  17 +.header .info .nick{
  18 + font-size: 44rpx;
  19 + font-weight: bold;
  20 + margin-bottom: 28rpx;
  21 +}
  22 +.header .info .seller{
  23 + font-size: 34rpx;
  24 +}
  25 +.page{
  26 + width: 90%;
  27 + margin: 0 auto;
  28 + color: #353535;
  29 + padding-top: 34rpx;
  30 +}
  31 +.row{
  32 + font-size: 34rpx;
  33 + height: 106rpx;
  34 + border-bottom: 2rpx solid #F1F0F4;
  35 +}
  36 +.row .right{
  37 + font-size: 30rpx;
  38 + color:#999999;
  39 +}
  40 +.row .more{
  41 + margin-left: 20rpx;
  42 +}
@@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
3 <view class="header"> 3 <view class="header">
4 <view class="info"> 4 <view class="info">
5 <view class="nick">{{user.nickname}}</view> 5 <view class="nick">{{user.nickname}}</view>
6 - <view class="seller Medium">{{seller.sellername}} | {{user.role_name}}</view> 6 + <view class="seller Medium">{{seller.sellername}} | {{user.role_name||''}}</view>
7 </view> 7 </view>
8 </view> 8 </view>
9 <view class="page"> 9 <view class="page">
@@ -24,6 +24,14 @@ @@ -24,6 +24,14 @@
24 </view> 24 </view>
25 </view> 25 </view>
26 </formids> 26 </formids>
  27 + <formids url="/pages/book/crm/index">
  28 + <view class="row flex-lr" style="padding-top: 34rpx;">
  29 + <view>我的客户</view>
  30 + <view class="flex-rr">
  31 + <view class="more"></view>
  32 + </view>
  33 + </view>
  34 + </formids>
27 <formids url="/pages/customer/index?islove=customer"> 35 <formids url="/pages/customer/index?islove=customer">
28 <view class="row flex-lr" style="padding-top: 34rpx;"> 36 <view class="row flex-lr" style="padding-top: 34rpx;">
29 <view>切换到顾客模式</view> 37 <view>切换到顾客模式</view>