xt / xcx-book · Commits

Go to a project

Commit 06f5e36041b6c9de3bfd04ebe54e93e0ed3b8d38

Authored by Yolanda
1 parent 346458b2
build: skipped

no message

Inline Side-by-side
Showing 7 changed files with 663 additions and 15 deletions
<wxs src="../../utils/util.wxs" module="util" />
<view class="card flex-ll bg-white {{mark}}" bindtap="todetail" data-id="{{item.aid}}">
<view class="flex-vl {{mark=='canuse' ? 'black-font' : 'gray-font'}} card-main {{mark}}" style="justify-content:space-between;">
<view class="flex-vl {{mark=='canuse' ? 'orange-font' : 'gray-font'}} card-main {{mark}}" style="justify-content:space-between;">
<view class="seller-info flex-ll">
<image class="seller-image"></image>
<image class="seller-image" src="{{item.seller_image}}"></image>
<view class="smooth font-siny font24r">{{item.sellername}}</view>
</view>
<view class="font34r font-bold">{{item.aname}}</view>
<view class="{{mark=='canuse' ? 'gray-deep-font' : 'gray-font'}} font24r smooth">有效时间：{{util.unixtoTime(item.stime,'YYYY.MM.DD')}}-{{util.unixtoTime(item.etime,'YYYY.MM.DD HH:II')}}</view>
<view class="{{mark=='canuse' ? 'orange-font' : 'gray-font'}} font24r smooth">有效时间:{{util.unixtoTime(item.stime,'YYYY.MM.DD HH:II')}}-{{util.unixtoTime(item.etime,'YYYY.MM.DD HH:II')}}</view>
</view>
<view class="flex-cc card-info font30r font-bold smooth" style="color:{{mark=='canuse' ? '#5EB2FF' : '#999999'}};">{{mark=='used' ? (item.status==1 ? '已使用' : '已过期') : '去使用'}}</view>
<view class="flex-cc card-info font30r font-bold smooth" style="color:{{mark=='canuse' ? '#F05522' : '#999999'}};">{{mark=='used' ? (item.status==1 ? '已使用' : '已过期') : '去使用'}}</view>
<view class="circle-pos flex-vl" style="justify-content:space-between;">
<view class="circle circle-bottom bg-white"></view>
<view class="circle circle-top bg-white"></view>
... ...
... ... @@ -9,7 +9,7 @@
position: relative;
}
.card.canuse{
background: rgba(87,160,255,.08);
background: #FFF0E5;
}
.card.used{
background: #F5F5F5;
... ... @@ -22,7 +22,7 @@
box-sizing: border-box;
}
.card-main.canuse{
border-right: 2rpx dashed #5EB2FF;
border-right: 2rpx dashed #F05522;
}
.card-main.used{
border-right: 2rpx dashed #CCCCCC;
... ... @@ -76,4 +76,7 @@
}
.circle-bottom{
border-radius: 0 0 12rpx 12rpx;
}
.orange-font{
color:#F05522;
}
\ No newline at end of file
... ...
... ... @@ -12,7 +12,7 @@
</view>
</view> -->
<block wx:for="{{list}}">
<coupon item="{{item}}" role="custom"></coupon>
<coupon item="{{item}}"></coupon>
</block>
</scroll-view>
... ...
... ... @@ -3,14 +3,14 @@
<view class="view bg-blue-img"></view>
<nav hasHome backgroundColor="rgba(0,0,0,0)" color="#ffffff"></nav>
<view class="view padding-lr padding-bottom-lg" style="position: relative">
<view class="text-white txt-40-h text-bold margin-top-sm">卡券{{statuslist[couponinfo.status].status}}</view>
<view class="text-white txt-40-h text-bold margin-top-sm">卡券{{statuslist[couponinfo.alias_status].status}}</view>
<view class="text-white txt-28-h margin-bottom-lg" style="margin-top: 6rpx;">感谢您的支持，请您按尽快来店就餐哦</view>
<view class="view flex flex-direction justify-center align-center margin-top-lg bg-white code-cover">
<view class="header view flex align-center" bindtap="clickSeller">
<view class="view avatar margin-right-sm" style="background-image: url('{{order_info.seller_image}}?imageView2/2/w/320')"></view>
<view class="view avatar margin-right-sm" style="background-image: url('{{couponinfo.seller_image}}?imageView2/2/w/320')"></view>
<view class="flex-treble" style="width: 450rpx;">
<view class="txt-32-h text-cut text-bold" style="margin-bottom: 2rpx;">{{couponinfo.sellername}}</view>
<view class="txt-24-h text-gray text-cut">{{couponinfo.real_address||couponinfo.address}}</view>
<view class="txt-24-h text-gray text-cut">{{couponinfo.address||couponinfo.map_address ? couponinfo.address||couponinfo.map_address : ''}}</view>
</view>
<view class="phone view"></view>
</view>
... ... @@ -41,7 +41,7 @@
<view class="dot"></view>
<view class="txt-30-h text-bold">有效期</view>
</view>
<view class="text-df">{{util.unixtoTime(couponinfo.stime,'YYYY.MM.DD')}}-{{util.unixtoTime(couponinfo.etime,'YYYY.MM.DD HH:II')}}</view>
<view class="text-df">{{util.unixtoTime(couponinfo.stime,'YYYY.MM.DD HH:II')}}-{{util.unixtoTime(couponinfo.etime,'YYYY.MM.DD HH:II')}}</view>
</view>
<view class="view padding block">
<view class="flex align-center margin-bottom-sm">
... ...
... ... @@ -31,12 +31,12 @@
<view class="money-title">红包</view>
</view>
</navigator>
<!-- <navigator url="./coupon" class="money-item">
<navigator url="./coupon" class="money-item">
<view class="flex-vc">
<view class="money-value">{{user.card}}</view>
<view class="money-value">{{user.customer_activity}}</view>
<view class="money-title">卡券</view>
</view>
</navigator> -->
</navigator>
</view>
<view class="block-rev">
<navigator url="/pages/me/list" open-type="switchTab">
... ...
... ... @@ -36,7 +36,7 @@
"minifyWXSS": true
},
"compileType": "miniprogram",
"libVersion": "2.14.1",
"libVersion": "2.15.0",
"appid": "wxd3dc4206c76f14fc",
"projectname": "c%E7%AB%AF%E9%A2%84%E5%AE%9A",
"isGameTourist": false,
... ...
{
"setting": {},
"condition": {
"plugin": {
"list": []
},
"game": {
"list": []
},
"gamePlugin": {
"list": []
},
"miniprogram": {
"list": [
{
"name": "预订本-商家1",
"pathName": "pack-book/pages/book/b_index",
"query": "seller_id=1001&seller_openid= oZc-q05hV2N-knHfpxKg5dDUp5vU&manager_id=20612",
"scene": 1001
},
{
"id": 1,
"name": "经营报表",
"pathName": "pages/report/r_index",
"query": ""
},
{
"id": -1,
"name": "经营中心",
"pathName": "pages/me/s_index",
"query": ""
},
{
"id": -1,
"name": "报表详情",
"pathName": "pages/report/r_detail",
"query": ""
},
{
"id": -1,
"name": "菜品列表",
"pathName": "pages/report/r_cook",
"query": ""
},
{
"id": -1,
"name": "时间选择",
"pathName": "pages/report/r_time",
"query": ""
},
{
"id": 6,
"name": "pages/customer/index",
"pathName": "pages/customer/index",
"query": "id=58295&fromid=1111&hasInvitation=1",
"scene": 1044,
"shareInfo": {
"groupName": "测试模拟群1",
"shareName": "8DEbIRpK4pa9mH_QY2vU4ZUKYPuI97WoQ4BQoFej-Q8@cr4dev",
"shareKey": "PZhnqMlY2TnRuHhATyGeSamVmBQUDXXr_WtjRSddeeFK17UAiOP-HNOdhxiEN7PFub5S1DjAeUl0IXOdW-VDqg~~"
}
},
{
"id": -1,
"name": "邀请设置页 pages/customer/invite",
"pathName": "pages/customer/invite",
"query": "id=64"
},
{
"name": "邀请进入 pages/customer/index",
"pathName": "pages/customer/index",
"query": "id= 162717&fromid=test&hasInvitation=1&hasSellerShare=1&tplid=1",
"scene": 1001
},
{
"id": -1,
"name": "pages/customer/index 无产进列表",
"pathName": "pages/customer/index",
"query": "",
"scene": "1001"
},
{
"id": 11,
"name": "pages/customer/remind",
"pathName": "pages/customer/remind",
"query": "id=21&rdate=153745200",
"scene": "1044",
"shareInfo": {
"groupName": "测试模拟群1",
"shareName": "8DEbIRpK4pa9mH_QY2vU4ZUKYPuI97WoQ4BQoFej-Q8@cr4dev",
"shareKey": "PZhnqMlY2TnRuHhATyGeSamVmBQUDXXr_WtjRSddeeFK17UAiOP-HNOdhxiEN7PFub5S1DjAeUl0IXOdW-VDqg~~"
}
},
{
"id": -1,
"name": "我的 pages/me/index",
"pathName": "pages/me/index",
"query": "",
"scene": "1044",
"shareInfo": {
"groupName": "测试模拟群1",
"shareName": "8DEbIRpK4pa9mH_QY2vU4ZUKYPuI97WoQ4BQoFej-Q8@cr4dev",
"shareKey": "PZhnqMlY2TnRuHhATyGeSamVmBQUDXXr_WtjRSddeeFK17UAiOP-HNOdhxiEN7PFub5S1DjAeUl0IXOdW-VDqg~~"
}
},
{
"id": -1,
"name": "预订本-添加预订",
"pathName": "pack-book/pages/book/b_addnew",
"query": "seller_id=1&seller_openid=o9pcQ0cbjRKnRWczcOJaaSRGP1lE&manager_id=500",
"scene": "1001"
},
{
"id": 15,
"name": "预订本详情",
"pathName": "pack-book/pages/book/b_detail",
"query": "id=1762",
"scene": "1001"
},
{
"id": 16,
"name": "预订本-发短信",
"pathName": "pack-book/pages/book/b_sms",
"query": "id=6541",
"scene": null
},
{
"id": 17,
"name": "预订本-编辑预订信息",
"pathName": "pack-book/pages/book/b_addnew",
"query": "id=2745",
"scene": 1001
},
{
"id": 17,
"name": "pages/reserve/index 在线订座",
"pathName": "pages/reserve/index",
"query": "a=b&c=d",
"scene": 1044,
"shareInfo": {
"groupName": "测试模拟群1",
"shareName": "8DEbIRpK4pa9mH_QY2vU4ZUKYPuI97WoQ4BQoFej-Q8@cr4dev",
"shareKey": "PZhnqMlY2TnRuHhATyGeSamVmBQUDXXr_WtjRSddeeFK17UAiOP-HNOdhxiEN7PFub5S1DjAeUl0IXOdW-VDqg~~"
}
},
{
"id": -1,
"name": "预订本-选择桌子",
"pathName": "pack-book/pages/book/b_desk",
"query": "rdate=1540339200-1540346400&tid=0&pnum=6&checked_tids=&rid=",
"scene": "1001"
},
{
"id": -1,
"name": "桌位",
"pathName": "pack-book/pages/book/b_setting",
"query": ""
},
{
"id": 21,
"name": "预订本-80商家",
"pathName": "pack-book/pages/book/b_index",
"query": "seller_id=80&seller_openid=oGefL4qKBWIh5xwyg3LVfkMbDumA&manager_id=763&goPath=b_addnew",
"scene": 1001
},
{
"id": -1,
"name": "pack-book/pages/book/setting/index 预订本-设置",
"pathName": "pack-book/pages/book/setting/index",
"query": "",
"scene": "1001"
},
{
"id": -1,
"name": "预订本-设置-短信管理",
"pathName": "pack-book/pages/book/setting/sms",
"query": "",
"scene": "1001"
},
{
"id": -1,
"name": "预订本-设置-短信充值",
"pathName": "pack-book/pages/book/setting/sms_buy",
"query": "",
"scene": "1001"
},
{
"id": 25,
"name": "pack-cookbook/pages/index",
"pathName": "pack-cookbook/pages/index",
"query": "rid=18599&oid=273&identity=1&sid=154",
"scene": 1001
},
{
"id": 26,
"name": "pack-book/pages/book/smsbatch/index",
"pathName": "pack-book/pages/book/smsbatch/index",
"query": "scene=seller_id%3D80",
"scene": "1011"
},
{
"id": -1,
"name": "pack-book/pages/book/smsbatch/update",
"pathName": "pack-book/pages/book/smsbatch/update",
"query": "seller_id=80"
},
{
"id": 28,
"name": "pack-book/pages/book/smsbatch/list",
"pathName": "pack-book/pages/book/smsbatch/list",
"query": "seller_id=80"
},
{
"id": -1,
"name": "pack-book/pages/book/smsbatch/detail",
"pathName": "pack-book/pages/book/smsbatch/detail",
"query": "id=5"
},
{
"id": 30,
"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": "pack-book/pages/book/smsbatch/index(普通)",
"pathName": "pack-book/pages/book/smsbatch/index",
"query": "seller_id=80",
"scene": "1011"
},
{
"id": 32,
"name": "pages/reserve/search",
"pathName": "pages/reserve/search",
"query": "",
"scene": 1001
},
{
"id": -1,
"name": "我的客户 pack-book/pages/book/crm/index ",
"pathName": "pack-book/pages/book/crm/index",
"query": "",
"scene": "1044",
"shareInfo": {
"groupName": "测试模拟群1",
"shareName": "8DEbIRpK4pa9mH_QY2vU4ZUKYPuI97WoQ4BQoFej-Q8@cr4dev",
"shareKey": "PZhnqMlY2TnRuHhATyGeSamVmBQUDXXr_WtjRSddeeFK17UAiOP-HNOdhxiEN7PFub5S1DjAeUl0IXOdW-VDqg~~"
}
},
{
"id": 34,
"name": "pack-cookbook/pages/cart",
"pathName": "pack-cookbook/pages/cart",
"query": "rid=1196&oid=2&identity=1",
"scene": "1001"
},
{
"id": 35,
"name": "pack-cookbook/pages/success",
"pathName": "pack-cookbook/pages/success",
"query": "rid=1196&oid=1&identity=1&hasSuccess=1",
"scene": 1001
},
{
"id": -1,
"name": "pack-cookbook/pages/remark",
"pathName": "pack-cookbook/pages/remark",
"query": ""
},
{
"id": -1,
"name": "pages/customer/index 1803 iphone动画",
"pathName": "pages/customer/detail_owner_invitation",
"query": "id=1803&fromid=1111&hasInvitation=1",
"scene": "1044",
"shareInfo": {
"groupName": "测试模拟群1",
"shareName": "8DEbIRpK4pa9mH_QY2vU4ZUKYPuI97WoQ4BQoFej-Q8@cr4dev",
"shareKey": "PZhnqMlY2TnRuHhATyGeSamVmBQUDXXr_WtjRSddeeFK17UAiOP-HNOdhxiEN7PFub5S1DjAeUl0IXOdW-VDqg~~"
}
},
{
"id": 38,
"name": "预订商家2",
"pathName": "pack-book/pages/book/b_index",
"query": "seller_id=1&manage_id=1902&seller_openid=oGefL4uTmdsQn214CFZTVlHAfhnQ",
"scene": "1001"
},
{
"id": 38,
"name": "pages/reserve/detail 在线订座 ",
"pathName": "pages/reserve/detail",
"query": "id=17421",
"scene": null
},
{
"id": 40,
"name": "邀请Ren pages/customer/index ",
"pathName": "pages/customer/detail_owner_invitation",
"query": "id= 45539&fromid=test&hasInvitation=1&hasSellerShare=1&tplid=1",
"scene": null
},
{
"id": -1,
"name": "我的收藏 pages/me/follow",
"pathName": "pages/me/follow",
"query": "",
"scene": null
},
{
"id": -1,
"name": "pages/manager-invitation/index",
"pathName": "pages/manager-invitation/index",
"query": "id=154",
"scene": null
},
{
"id": 43,
"name": "pages/manager-invitation/review",
"pathName": "pages/manager-invitation/review",
"query": "",
"scene": null
},
{
"id": 44,
"name": "pages/manager-invitation/editor",
"pathName": "pages/manager-invitation/editor",
"query": "tplid=1&rid=",
"scene": null
},
{
"id": 45,
"name": "pages/manager-invitation/display",
"pathName": "pages/manager-invitation/display",
"query": "rid=79&tplid=2&fromid=oB-xJ5KJC&hasSellerShare=1",
"scene": null
},
{
"id": -1,
"name": "pages/manager-invitation/setting/index",
"pathName": "pages/manager-invitation/setting/index",
"query": "",
"scene": null
},
{
"id": -1,
"name": "pages/manager-invitation/setting/sellers",
"pathName": "pages/manager-invitation/setting/sellers",
"query": "",
"scene": null
},
{
"id": -1,
"name": "pages/manager-invitation/setting/history",
"pathName": "pages/manager-invitation/setting/history",
"query": "",
"scene": null
},
{
"id": 49,
"name": "pack-book/pages/book/b_invitation",
"pathName": "pack-book/pages/book/b_invitation",
"query": "id=7243",
"scene": null
},
{
"id": -1,
"name": "pages/reserve/activity 在线订座 ",
"pathName": "pages/reserve/activity",
"query": "id=1",
"scene": null
},
{
"id": 51,
"name": "pages/reserve/discount 在线订座 ",
"pathName": "pages/reserve/discount",
"query": "latitude=34.215637&longitude=108.891264&scale=16&height=397",
"scene": null
},
{
"id": 53,
"name": "选择更多桌位",
"pathName": "pack-book/pages/book/b_desk",
"query": "rdate=1559617200-1559631600&tid=0&pnum=6&checked_tids=760,761&rid=",
"scene": null
},
{
"id": 54,
"name": "pages/reserve/share 在线订座 ",
"pathName": "pages/reserve/share",
"query": "id=1017&act=quanzi",
"scene": null
},
{
"id": 56,
"name": "测试组件",
"pathName": "pages/reserve/detail",
"query": "id=154",
"scene": null
},
{
"id": 56,
"name": "pages/customer/detail_owner",
"pathName": "pages/customer/detail_owner",
"query": "id=130650",
"scene": null
},
{
"id": 59,
"name": "pack-book/pages/roomtype/roomtype",
"pathName": "pack-book/pages/book/roomtype/roomtype",
"query": "seller_id=154",
"scene": null
},
{
"id": 59,
"name": "pack-book/pages/book/b_detail",
"pathName": "pack-book/pages/book/b_detail",
"query": "id=118236",
"scene": null
},
{
"id": -1,
"name": "pack-book/pages/book/b_reserve",
"pathName": "pack-book/pages/book/b_reserve",
"query": "",
"scene": null
},
{
"id": -1,
"name": "pages/customer/index?act=tobook",
"pathName": "pages/customer/index",
"query": "seller_id=80&seller_openid=oGefL4qKBWIh5xwyg3LVfkMbDumA&manager_id=763&rid=33354&act=tobook",
"scene": null
},
{
"id": 62,
"name": "pages/customer/list",
"pathName": "pages/customer/list",
"query": "hasRelaTip=1",
"scene": null
},
{
"id": 64,
"name": "pack-book/pages/book/b_addnew 桌位进入",
"pathName": "pack-book/pages/book/b_addnew",
"query": "hasQuick=1&tid=487&tname=%E5%A4%A7%E5%8E%85%E4%B8%80&pnum=4&ddate=1578132000-1578150000",
"scene": null
},
{
"id": 65,
"name": "pack-book/pages/book/online_update",
"pathName": "pack-book/pages/book/online_update",
"query": "id=52340",
"scene": null
},
{
"id": -1,
"name": "pages/customer/detail_owner_invitation",
"pathName": "pages/customer/detail_owner_invitation",
"query": "id=43762&hasInvitation=1&hasSellerShare=1&tplid=1",
"scene": null
},
{
"id": -1,
"name": "pack-book/pages/book/b_sms",
"pathName": "pack-book/pages/book/b_sms",
"query": "id=44178",
"scene": null
},
{
"id": -1,
"name": "新建内部预订",
"pathName": "pack-book/pages/book/b_addnew",
"query": "",
"scene": null
},
{
"id": -1,
"name": "pages/me/history",
"pathName": "pages/me/history",
"query": "",
"scene": null
},
{
"id": 70,
"name": "无参数 pack-book/pages/book/b_addnew",
"pathName": "pack-book/pages/book/b_addnew",
"query": "",
"scene": null
},
{
"id": -1,
"name": "pages/reserve/findSeller",
"pathName": "pages/reserve/findSeller",
"query": "",
"scene": null
},
{
"id": 73,
"name": "pages/customer/cancel",
"pathName": "pages/customer/cancel",
"query": "id=59102",
"scene": null
},
{
"id": 74,
"name": "pack-activity/pages/index",
"pathName": "pack-activity/pages/index",
"query": "id=2",
"scene": null
},
{
"id": -1,
"name": "pack-activity/pages/money",
"pathName": "pack-activity/pages/money",
"query": "",
"scene": null
},
{
"id": -1,
"name": "pack-activity/pages/kefu",
"pathName": "pack-activity/pages/kefu",
"query": "",
"scene": null
},
{
"id": -1,
"name": "pack-activity/pages/yuding",
"pathName": "pack-activity/pages/yuding",
"query": "id=9994&fromid=test&hasInvitation=1&hasSellerShare=1&tplid=1",
"scene": null
},
{
"id": -1,
"name": "pack-activity/pages/rule",
"pathName": "pack-activity/pages/rule",
"query": "id=1",
"scene": null
},
{
"id": 79,
"name": "pack-checkout/pages/index",
"pathName": "pack-checkout/pages/index",
"query": "rid=74368&sid=1001",
"scene": null
},
{
"id": 80,
"name": "pack-book/pages/checkout/index",
"pathName": "pack-book/pages/checkout/index",
"query": "rid=66717",
"scene": null
},
{
"id": 82,
"name": "pack-book/pages/checkout/invoice",
"pathName": "pack-book/pages/checkout/invoice",
"query": "rid=62346",
"scene": null
},
{
"id": -1,
"name": "pack-activity/pack/pack",
"pathName": "pack-activity/pack/pack",
"query": "",
"scene": null
},
{
"id": -1,
"name": "pack-activity/pack/list",
"pathName": "pack-activity/pack/list",
"query": "",
"scene": null
},
{
"id": -1,
"name": "pages/reserve/index_yy",
"pathName": "pages/reserve/index_yy",
"query": "id=71629&_hasSubscribeFail=1",
"scene": null
},
{
"id": 85,
"name": "pages/customer/welcome",
"pathName": "pages/customer/welcome",
"query": "id=104544",
"scene": null
},
{
"id": -1,
"name": "smscode 进入 /pages/customer/index",
"pathName": "pages/customer/index",
"query": "sms_code=0819107064",
"scene": null
},
{
"id": -1,
"name": "预定本 - 置满设置",
"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
},
{
"name": "pack-checkout/pages/use",
"pathName": "pack-checkout/pages/use",
"query": "seller_id=1297&seller_openid= oZc-q05hV2N-knHfpxKg5dDUp5vU&manager_id=20612",
"scene": null
},
{
"name": "pack-checkout/pages/use",
"pathName": "pack-checkout/pages/use",
"query": "scene=aid%3D9%26openid%3DoB-xJ5MEi2mTMrBTiYImD9cpGH6o",
"scene": null
},
{
"name": "pages/customer/detail_owner_invitation",
"pathName": "pages/customer/detail_owner_invitation",
"query": "id= 157347",
"scene": null
},
{
"name": "pages/customer/index",
"pathName": "pages/customer/index",
"query": "id=157589&tplid=1&fromid=oB-xJ5MEi2mTMrBTiYImD9cpGH6o&hasSellerShare=0&hasInvitation=1 ",
"scene": 1047
}
]
}
}
}
\ No newline at end of file
... ...