xt / xcx-book · Commits

Go to a project

Commit 0770bbcd46d721c472902d3e043177f0edae0535

Authored by wangfan
1 parent 5d8c8a40
build: skipped

fenbao

Inline Side-by-side
Showing 7 changed files with 192 additions and 537 deletions
/**app.wxss**/
@import "icon.wxss";
.hidden {
display: none;
}
page {
font-size: 16px;
line-height: 150%;
font-family: 'PingFang SC','sans-serif','Helvetica Neue','Helvetica','Arial';
height: 100%;
}
.section{ margin-left:4%;margin-right:4%; width:92%;}
.sectionA{ margin-left:8%;margin-right:8%; width:84%; overflow: hidden; }
.sectionW{margin-left:2%;margin-right:2%;width:96%;overflow: hidden;}
.section_p{ padding-left:4%;padding-right:4%; width:92%; overflow: hidden; }
.white{
color: #fff;
}
.green{
color: #22ab39;
}
.black{
color: #000;
}
.gray{
color:#666;
}
.liggray{
color:#9E9A9A;
}
.bg{
background-color:#efeef3;
}
.bg_green{
background-color: #1AAD19;
}
.bg_liggreen{
background-color: #ECF8EE;
}
.bg_red{
background-color: #E14553;
}
.bg_gray{
background-color: #f3f3f3;
}
.bg_white{
background-color: white;
}
.bg_blue{
background-color: #EEF2FB;
}
.bg_pink{
background-color: #FEEFF0;
}
.bg_ligblack{
background-color: #4C4E4F;
}
.mtop10{
margin-top: 10px;
}
.mtop12{
margin-top: 12px;
}
.mtop15{
margin-top: 15px;
}
.mtop20{
margin-top: 20px;
}
.mtop25{
margin-top: 25px;
}
.mtop30{
margin-top: 30px;
}
.mbottom5{
margin-bottom:5px;
}
.mbottom10{
margin-bottom: 10px;
}
.mbottom15{
margin-bottom: 15px;
}
.mbottom20{
margin-bottom: 20px;
}
.mbottom30{
margin-bottom: 30px;
}
.ptop5{
padding-top:5px;
}
.pbottom5{
padding-bottom:5px;
}
.ptop8{
padding-top:8px;
}
.pbottom8{
padding-bottom:8px;
}
.ptop10{
padding-top:10px;
}
.pbottom10{
padding-bottom:10px;
}
.ptop12{
padding-top:12px;
}
.pbottom12{
padding-bottom:12px;
}
.ptop13{
padding-top:13px;
}
.pbottom13{
padding-bottom:13px;
}
.ptop15{
padding-top:15px;
}
.pbottom15{
padding-bottom:15px;
}
.ptop18{
padding-top:18px;
}
.pbottom18{
padding-bottom:18px;
}
.ptop20{
padding-top:20px;
}
.pbottom20{
padding-bottom:20px;
}
.mleft{
margin-left:4%;
}
.mleft6{
margin-left:6px;
}
.mleft10{
margin-left: 10px;
}
.mleft14{
margin-left: 14px;
height: 60px;
}
.mleft16{
margin-left: 16px;
}
.mright20{
margin-right: 20px;
}
.strong,.bold{
font-weight: bold;
}
.overflow{
overflow:hidden;
}
.textoverflow{
display: block;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
}
.fsize11{
font-size: 22rpx;
height:11px;
line-height:11px;
}
.fsize12{
font-size: 24rpx;
}
.fsize13{
font-size: 26rpx;
}
.fsize14{
font-size: 28rpx;
}
.fsize15{
font-size: 30rpx;
}
.fsize16{
font-size: 32rpx;
}
.fsize17{
font-size: 34rpx;
}
.fsize18{
font-size: 36rpx;
}
.fsize20{
font-size: 40rpx;
}
.fsize24{
font-size: 48rpx;
}
.black-font{
color:#353535;
}
.white-font{
color:#fff;
}
.gray-light-font{
color:#999;
}
.gray-deenpen-font{
color:#666;
}
.hr-one{
background: #efeef3;
height: 2rpx;
width:auto;
}
.nowrap{white-space:nowrap;}
/*水平方向左右分布*/
.flex-lr{
display: flex;
... ... @@ -232,29 +8,13 @@ page {
-webkit-flex-direction: row;
}
.flex-ll{
display: flex;
display: -webkit-flex;
flex-direction:row;
justfy-content: flex-start;
align-items: center;
-webkit-flex-direction: row;
}
.flex-ll-top{
display: flex;
display: -webkit-flex;
flex-direction:row;
-webkit-flex-direction: row;
}
.flex-ll-bottom{
display: flex;
display: -webkit-flex;
flex-direction:row;
justify-content: flex-start;
align-items: center;
flex-direction: row;
-webkit-flex-direction: row;
justfy-content: flex-end;
align-items: flex-end;
}
.flex-rr{
display: flex;
display: -webkit-flex;
... ... @@ -281,15 +41,14 @@ page {
flex-direction: column;
-webkit-flex-direction: column;
}
/*垂直方向居右分布*/
.flex-vr{
display: flex;
display: -webkit-flex;
justify-content: flex-end;
align-items: center;
flex-direction: column;
-webkit-flex-direction: column;
}
display: flex;
display: -webkit-flex;
justify-content: flex-end;
align-items: center;
flex-direction: column;
-webkit-flex-direction: column;
}
/*水平方向居中分布*/
.flex-cc{
display: flex;
... ... @@ -316,239 +75,194 @@ page {
align-content: flex-start;
flex-flow:wrap;
}
.div-v-center {
-webkit-transform: translateY(-50%);
-moz-transform: translateY(-50%);
-ms-transform: translateY(-50%);
-o-transform: translateY(-50%);
transform: translateY(-50%);
}
.div-h-center {
-webkit-transform: translateX(-50%);
-moz-transform: translateX(-50%);
-ms-transform: translateX(-50%);
-o-transform: translateX(-50%);
transform: translateX(-50%);
}
.t-align-c{
text-align: center;
.font34r{
font-size:34rpx;
}
.t-align-r{
text-align: right;
.font28r{
font-size:28rpx;
}
.t-align-j{
text-align: justify;
.font30r{
font-size:30rpx;
}
.displaysan{
word-break:break-all;
text-overflow:ellipsis;
display:-webkit-box;
-webkit-box-orient:vertical;
-webkit-line-clamp:2;
overflow:hidden;
.font32r{
font-size:32rpx;
}
.linethrough{
text-decoration:line-through
.font26r{
font-size:26rpx;
}
image{
background-color: #f4f4f4;
background-repeat: no-repeat;
background-size: 68px 24px;
background-position: center;
}
.opacity{
opacity: 0.4;
}
.opacity2{
opacity: 0.2;
}
.avater{width:50px;height:50px;border-radius:50%;}
.fixed{position:fixed}
.inline{
display:inline-block;
}
.width{
width:50%;
}
.width100{
width:100%;
.font24r{
font-size:24rpx;
}
.height100{
height:100px;
}
/*点餐人数 选择口味*/
.choose{
height:32px;
}
.choose .normal{
width:76px;
height:30px;
line-height:30px;
text-align:center;
color:#E14553;
border:1px solid #FB848F;
border-radius:15px;
}
.mleft30{
margin-left:30px;
}
.mleft50{
margin-left:50px;
}
.choose .active{
background-color:#F93E85;
color:#fff;
}
.beginorder{
width:67%;
margin:0 16.5%;
height:40px;
line-height:40px;
border-radius:8px;
bottom:40px;
}
/* 会员卡样式调整 */
.cardSection{ margin: 0 auto; width:84%; overflow: hidden; }
.cardBox {
width: 100%;
background: #EFEEF3;
padding: 30rpx 0;
.font38r{
font-size:38rpx;
}
.innerBox {
position: relative;
width: 84%; height: 0;
padding-top: 48%;
.font40r{
font-size:40rpx;
}
.cardTitle {
position: absolute;
top:15rpx;
.font44r{
font-size:44rpx;
}
.cardInfo {
position: absolute;
bottom:26rpx;
.font20r{
font-size:20rpx;
}
.fsizeTitle{
font-size: 30rpx;
.black-font{
color:#353535;
}
.fsizeInfo {
font-size: 26rpx;
.white-font{
color:#fff;
}
.rightsArea {
padding-top: 25rpx;
.green-font{
color:#199095;
}
.imageSize {
width: 44rpx;
height: 44rpx;
overflow: hidden;
margin-right: 15rpx;
float: left;
}
.rightsTitle {
margin: 0 5%;
margin-bottom: 50rpx;
.flex-rc{
display:flex;
display: -webkit-flex;
justify-content:center;
align-items:center;
}
.infoSize {
color: #060606;
font-size: 30rpx;
.flex-rs{
display:flex;
display: -webkit-flex;
justify-content:flex-start;
align-items:center;
flex-direction: row;
flex-wrap:wrap;
}
.rightsItem {
margin-bottom: 35rpx;
height: 100%;
.flex-cmc{
display:flex;
display: -webkit-flex;
justify-content:center;
align-items:center;
flex-direction: column;
}
.itemInfo {
flex: 1;
.flex-re{
display:flex;
display: -webkit-flex;
justify-content:flex-end;
}
.orderSize {
width: 222rpx;
height: 71rpx;
line-height: 71rpx;
font-size: 30rpx;
.default-setting{
color:#999;
font-size:38rpx;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
}
.disabledSize {
bottom: 80rpx;
margin: 0 100rpx;
.cut{
width:100%;
height:20rpx;
}
.btnArea {
width: 100%;
display: flex;
justify-content: center;
position: absolute;
bottom: 80rpx;
.smooth{
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
}
.page {
height: 100%;
button::after{
border:0;
}
.fwhite {
color: #fff;
.font-bold{
font-weight:bold;
}
.fgray {
color: #efedec;
.font-more{
overflow:hidden;
text-overflow:ellipsis;
white-space:nowrap;
}
.b-radius{border-radius:6px;}
.bradius8{border-radius:8px;}
.bradius50{border-radius:50%;}
.smooth{
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
.font-more-two{
display: -webkit-box;
-webkit-box-orient: vertical;
-webkit-line-clamp: 2;
overflow: hidden;
}
image{
display:block;
background:transparent;
}
button:after{
border:0;
.gray-font{
color:#999;
}
button{
.gray-deep-font{
color:#666;
}
.icon12-22{
width:12rpx;
height:22rpx;
background:transparent;
}
.button-hover {
background-color: transparent;
.bg_white{
background:#fff;
}
.food-clear-num{
height:20px;
position:absolute;
right:0;
}
.food-clear-content{
height:100%;
font-size:22rpx;
padding:0 10rpx;
background:rgba(216,30,6,.9);
line-height:40rpx;
}
.food-clear-angel{
width:14rpx;
height:36rpx;
position:relative;
left:1rpx;
}
.angel-reat{
width:12px;
height:100%;
overflow:hidden;
position:relative;
.bg_green{
background:#199095;
}
.common-angle {
width: 0;
height: 0;
border-top: 12px solid transparent;
border-right: 12px solid rgba(216,30,6,.9);
border-bottom: 12px solid transparent;
position:absolute;
.bg_gray{
background:#efeef3;
}
.top-angel{
top:-12px;
left:2px;
.font-siny{
font-weight:300;
}
.bottom-angel{
bottom:-12px;
left:2px;
.cut{
width:100%;
height:20rpx;
}
.border-right{
border-right:1px solid #efeef3;
}
.font-bold,.Semibold{
font-weight:bold;
font-weight:bold;
}
.Medium{
font-weight: 400;
}
.button-none {
display: inline-block;
padding-left: 0;
padding-right: 0;
box-sizing: border-box;
font-size: inherit;
text-align: center;
text-decoration: none;
line-height: 100%;
-webkit-tap-highlight-color: transparent;
color: inherit;
width:100%;
border-radius: 0;
background-color: transparent;
overflow: visible;
}
.button-none:before,.button-none:after{
border-width: 0;
}
.navigator-hover{
background:none;
}
.more{
width: 12rpx;
height: 22rpx;
background-image: url("http://qn.colorcun.com/custom/lite-yd/image/click.png");
background-size: 100%;
min-width: 12rpx;
}
.mask{
background-color: rgba(20,20,20,0.5);
position: fixed;
top:0;
right: 0;
bottom: 0;
left: 0;
z-index: 9999;
}
.flex-tb{
display: flex;
display: -webkit-flex;
justify-content: space-between;
align-items:flex-start;
flex-direction: column ;
-webkit-flex-direction: column ;
}
.flex-bl{
display: flex;
display: -webkit-flex;
justify-content: flex-end;
align-items:flex-start;
flex-direction: column ;
-webkit-flex-direction: column ;
}
\ No newline at end of file
... ...
.icon,.icon-s,.icon-m,.icon-l{
background-repeat: no-repeat;
height: 16px;
width:16px;
display: block;
margin: 5px;
background-size: 100%; background-repeat: no-repeat;
}
.icon-jiantou{
width:8px;
height:13px;
margin:0;
margin-left:5px;
}
.icon-12{
height: 12px;
width: 12px;
}
.icon14{
height: 14px;
width: 14px;
}
.icon15{
height: 15px;
width: 15px;
}
.subtractCook{
height: 3px;
width: 15px;
}
.icon-s{
height: 18px;
width:18px;
}
.icon24{
height: 24px;
width:24px;
}
.icon28{
height: 28px;
width:28px;
}
.icon-ml{
height: 26px;
width:26px;
}
.icon-l{
height: 32px;
width:32px;
}
.icon64{
height: 64px;
width:64px;
}
.icon-membercard{
background: url(http://qn.colorcun.com/wechat/app/images/icon_card.jpg);
background-size: 100%; background-repeat: no-repeat;
height:100%;
}
... ... @@ -64,7 +64,7 @@ Page({
})
util.cache('islove','book');
wx.reLaunch({
url:util.http_build_query(res.data,'/pages/book/b_index')
url:util.http_build_query(res.data,'/pack-book/pages/book/b_index')
})
}else{
this.setData({
... ...
... ... @@ -25,7 +25,7 @@
</view>
</view>
</formids>
<formids url="/pages/book/crm/index">
<formids url="/pack-book/pages/book/crm/index">
<view class="row flex-lr" style="padding-top: 34rpx;">
<view>我的客户</view>
<view class="flex-rr">
... ...
... ... @@ -67,7 +67,7 @@ Page({
})
util.cache('islove','book');
wx.reLaunch({
url:util.http_build_query(res.data,'/pages/book/b_index')
url:util.http_build_query(res.data,'/pack-book/pages/book/b_index')
})
}else{
this.setData({
... ...
... ... @@ -36,7 +36,7 @@
{
"id": 0,
"name": "预定本-商家1",
"pathName": "pages/book/b_index",
"pathName": "pack-book/pages/book/b_index",
"query": "seller_id=1&seller_openid=o9pcQ0cbjRKnRWczcOJaaSRGP1lE&manager_id=500",
"scene": "1001"
},
... ... @@ -105,7 +105,7 @@
{
"id": 11,
"name": "录入订座信息 b_info",
"pathName": "pages/book/b_info",
"pathName": "pack-book/pages/book/b_info",
"query": "year=2018&date=08-23&time=18:30",
"scene": "1001"
},
... ... @@ -148,28 +148,28 @@
{
"id": -1,
"name": "预定本-添加预定",
"pathName": "pages/book/b_addnew",
"pathName": "pack-book/pages/book/b_addnew",
"query": "seller_id=1&seller_openid=o9pcQ0cbjRKnRWczcOJaaSRGP1lE&manager_id=500",
"scene": "1001"
},
{
"id": 15,
"name": "预定本详情",
"pathName": "pages/book/b_detail",
"pathName": "pack-book/pages/book/b_detail",
"query": "id=1762",
"scene": "1001"
},
{
"id": 16,
"name": "预定本-发短信",
"pathName": "pages/book/b_sms",
"pathName": "pack-book/pages/book/b_sms",
"query": "id=6541",
"scene": null
},
{
"id": 17,
"name": "预定本-编辑预定信息",
"pathName": "pages/book/b_addnew",
"pathName": "pack-book/pages/book/b_addnew",
"query": "id=2745",
"scene": 1001
},
... ... @@ -188,41 +188,41 @@
{
"id": -1,
"name": "预定本-选择桌子",
"pathName": "pages/book/b_desk",
"pathName": "pack-book/pages/book/b_desk",
"query": "rdate=1540339200-1540346400&tid=0&pnum=6&checked_tids=&rid=",
"scene": "1001"
},
{
"id": -1,
"name": "桌位",
"pathName": "pages/book/b_setting",
"pathName": "pack-book/pages/book/b_setting",
"query": ""
},
{
"id": 21,
"name": "预定本-80商家",
"pathName": "pages/book/b_index",
"pathName": "pack-book/pages/book/b_index",
"query": "seller_id=80&seller_openid=oGefL4qKBWIh5xwyg3LVfkMbDumA&manager_id=762",
"scene": "1001"
},
{
"id": -1,
"name": "预定本-设置",
"pathName": "pages/book/setting/index",
"pathName": "pack-book/pages/book/setting/index",
"query": "",
"scene": "1001"
},
{
"id": -1,
"name": "预定本-设置-短信管理",
"pathName": "pages/book/setting/sms",
"pathName": "pack-book/pages/book/setting/sms",
"query": "",
"scene": "1001"
},
{
"id": -1,
"name": "预定本-设置-短信充值",
"pathName": "pages/book/setting/sms_buy",
"pathName": "pack-book/pages/book/setting/sms_buy",
"query": "",
"scene": "1001"
},
... ... @@ -235,40 +235,40 @@
},
{
"id": 26,
"name": "pages/book/smsbatch/index",
"pathName": "pages/book/smsbatch/index",
"name": "pack-book/pages/book/smsbatch/index",
"pathName": "pack-book/pages/book/smsbatch/index",
"query": "scene=seller_id%3D80",
"scene": "1011"
},
{
"id": -1,
"name": "pages/book/smsbatch/update",
"pathName": "pages/book/smsbatch/update",
"name": "pack-book/pages/book/smsbatch/update",
"pathName": "pack-book/pages/book/smsbatch/update",
"query": "seller_id=80"
},
{
"id": 28,
"name": "pages/book/smsbatch/list",
"pathName": "pages/book/smsbatch/list",
"name": "pack-book/pages/book/smsbatch/list",
"pathName": "pack-book/pages/book/smsbatch/list",
"query": "seller_id=80"
},
{
"id": -1,
"name": "pages/book/smsbatch/detail",
"pathName": "pages/book/smsbatch/detail",
"name": "pack-book/pages/book/smsbatch/detail",
"pathName": "pack-book/pages/book/smsbatch/detail",
"query": "id=5"
},
{
"id": 30,
"name": "pages/book/smsbatch/result",
"pathName": "pages/book/smsbatch/result",
"name": "pack-book/pages/book/smsbatch/result",
"pathName": "pack-book/pages/book/smsbatch/result",
"query": "seller_id=&id=6&total=10",
"scene": "1001"
},
{
"id": 31,
"name": "pages/book/smsbatch/index(普通)",
"pathName": "pages/book/smsbatch/index",
"name": "pack-book/pages/book/smsbatch/index(普通)",
"pathName": "pack-book/pages/book/smsbatch/index",
"query": "seller_id=80",
"scene": "1011"
},
... ... @@ -281,8 +281,8 @@
},
{
"id": -1,
"name": "我的客户 pages/book/crm/index ",
"pathName": "pages/book/crm/index",
"name": "我的客户 pack-book/pages/book/crm/index ",
"pathName": "pack-book/pages/book/crm/index",
"query": "",
"scene": "1044",
"shareInfo": {
... ... @@ -326,7 +326,7 @@
{
"id": 38,
"name": "预定商家2",
"pathName": "pages/book/b_index",
"pathName": "pack-book/pages/book/b_index",
"query": "seller_id=1&manage_id=1902&seller_openid=oGefL4uTmdsQn214CFZTVlHAfhnQ",
"scene": "1001"
},
... ... @@ -402,8 +402,8 @@
},
{
"id": 49,
"name": "pages/book/b_invitation",
"pathName": "pages/book/b_invitation",
"name": "pack-book/pages/book/b_invitation",
"pathName": "pack-book/pages/book/b_invitation",
"query": "id=7243",
"scene": null
},
... ...