Commit d0f060a4cd1ff6e3bbb669f3c30998ad03bf28cc

Authored by vking
1 parent 90a63d27

taocan

@@ -39,7 +39,8 @@ @@ -39,7 +39,8 @@
39 "pages/reserve/findSeller", 39 "pages/reserve/findSeller",
40 "pages/customer/cancel", 40 "pages/customer/cancel",
41 "pages/customer/welcome", 41 "pages/customer/welcome",
42 - "pages/taocan/index" 42 + "pages/taocan/index",
  43 + "pages/taocan/order"
43 ], 44 ],
44 "subpackages": [ 45 "subpackages": [
45 { 46 {
@@ -3852,9 +3852,13 @@ scroll-view.cu-steps .cu-item { @@ -3852,9 +3852,13 @@ scroll-view.cu-steps .cu-item {
3852 } 3852 }
3853 .txt-40-h{ 3853 .txt-40-h{
3854 font-size: 40rpx; 3854 font-size: 40rpx;
  3855 + height: 56rpx;
  3856 + line-height: 56rpx;
  3857 +}
  3858 +.txt-44-h{
  3859 + font-size: 44rpx;
3855 height: 60rpx; 3860 height: 60rpx;
3856 line-height: 60rpx; 3861 line-height: 60rpx;
3857 -  
3858 } 3862 }
3859 .txt-52-h{ 3863 .txt-52-h{
3860 font-size: 52rpx; 3864 font-size: 52rpx;
  1 +// components/2.0/taocan/subject.js
  2 +Component({
  3 + /**
  4 + * 组件的属性列表
  5 + */
  6 + properties: {
  7 + order:Object,
  8 + },
  9 +
  10 + /**
  11 + * 组件的初始数据
  12 + */
  13 + data: {
  14 +
  15 + },
  16 +
  17 + /**
  18 + * 组件的方法列表
  19 + */
  20 + methods: {
  21 +
  22 + }
  23 +})
  1 +{
  2 + "component": true,
  3 + "usingComponents": {}
  4 +}
  1 +<!--components/2.0/taocan/subject.wxml-->
  2 +<view class="view card padding-lg padding-top">
  3 + <view class="header view flex align-center">
  4 + <view class="view avatar margin-right-sm" style="background-image: url('{{order.seller.oooo}}')"></view>
  5 + <view class="flex-treble">
  6 + <view class="txt-32-h text-cut" style="margin-bottom: 2rpx;">123</view>
  7 + <view class="txt-24-h text-gray text-cut">地址</view>
  8 + </view>
  9 + <view class="phone view"></view>
  10 + </view>
  11 + <view class="view flex solid-bottom" style="padding-bottom: 36rpx;padding-top: 36rpx;">
  12 + <view class="thumb margin-right-lg"></view>
  13 + <view class="flex flex-direction justify-between">
  14 + <view class="flex align-center">
  15 + <view class="bg-white label txt-20-h">套餐名称</view>
  16 + <view class="txt-28-h margin-left-lg">套餐名称</view>
  17 + </view>
  18 + <view class="flex align-center">
  19 + <view class="bg-white label txt-20-h">套餐数量</view>
  20 + <view class="txt-28-h margin-left-lg">套餐名称</view>
  21 + </view>
  22 + <view class="flex align-center">
  23 + <view class="bg-white label txt-20-h">有效期限</view>
  24 + <view class="txt-28-h margin-left-lg">套餐名称</view>
  25 + </view>
  26 + <view class="flex align-center">
  27 + <view class="bg-white label txt-20-h">套餐价格</view>
  28 + <view class="txt-28-h margin-left-lg">套餐名称</view>
  29 + </view>
  30 + </view>
  31 + </view>
  32 + <slot></slot>
  33 +</view>
  34 +
  1 +/* components/2.0/taocan/subject.wxss */
  2 +@import "../../../colorui/main.wxss";
  3 +.card{
  4 + width: 100%;
  5 + background: #FFFFFF;
  6 + box-shadow: 0px 0px 30rpx 0px #E5E5E5;
  7 + border-radius: 20rpx;
  8 +}
  9 +.avatar{
  10 + width: 60rpx;
  11 + height: 60rpx;
  12 +
  13 +}
  14 +.phone{
  15 + width: 28rpx;
  16 + height: 35rpx;
  17 + background-image: url("http://nosqn.colorcun.com/taocan/1%20%2810%29.png");
  18 +}
  19 +.thumb{
  20 + width: 200rpx;
  21 + height: 200rpx;
  22 + background: #D8D8D8;
  23 + border-radius: 10rpx;
  24 +}
  25 +.label{
  26 + width: 100rpx;
  27 + height: 30rpx;
  28 + background: #F5F5F5!important;
  29 + text-align: center;
  30 +}
@@ -36,11 +36,9 @@ @@ -36,11 +36,9 @@
36 </block> 36 </block>
37 <block wx:else=""> 37 <block wx:else="">
38 <navigator wx:for="{{list[tabType]}}" wx:key="success.key" 38 <navigator wx:for="{{list[tabType]}}" wx:key="success.key"
39 - wx:for-item="detail" wx:for-index="dateIndex"  
40 - url="/pages/customer/{{detail.navigator}}?id={{detail.id}}">  
41 - <card  
42 - hasShowStatus bindevent="gotoDetail"  
43 - seller="{{detail.seller}}" detail="{{detail}}"></card> 39 + wx:for-item="order" wx:for-index="dateIndex"
  40 + url="/pages/taocan/order?id={{order.id}}">
  41 + <tcard order="{{order}}"></tcard>
44 </navigator> 42 </navigator>
45 </block> 43 </block>
46 <view class="view" style="height: 192rpx;"></view> 44 <view class="view" style="height: 192rpx;"></view>
@@ -19,7 +19,7 @@ @@ -19,7 +19,7 @@
19 <view class="view txt-40-h text-bold">招牌花开富贵六十人餐</view> 19 <view class="view txt-40-h text-bold">招牌花开富贵六十人餐</view>
20 <view class="view flex align-end"> 20 <view class="view flex align-end">
21 <view class="text-orange txt-28-h" style="margin-bottom: 4rpx;">¥</view> 21 <view class="text-orange txt-28-h" style="margin-bottom: 4rpx;">¥</view>
22 - <view class="text-orange txt-40-h margin-right-sm text-bold">123</view> 22 + <view class="text-orange txt-44-h margin-right-sm text-bold">123</view>
23 <view class="huaxian flex align-end"> 23 <view class="huaxian flex align-end">
24 <view class="txt-20-h" style="margin-bottom: 8rpx;">¥</view> 24 <view class="txt-20-h" style="margin-bottom: 8rpx;">¥</view>
25 <view class="txt-28-h" style="margin-bottom: 4rpx;">123</view> 25 <view class="txt-28-h" style="margin-bottom: 4rpx;">123</view>
  1 +// pages/taocan/detail.js
  2 +Page({
  3 +
  4 + /**
  5 + * 页面的初始数据
  6 + */
  7 + data: {
  8 +
  9 + },
  10 +
  11 + /**
  12 + * 生命周期函数--监听页面加载
  13 + */
  14 + onLoad: function (options) {
  15 +
  16 + },
  17 +
  18 + /**
  19 + * 生命周期函数--监听页面初次渲染完成
  20 + */
  21 + onReady: function () {
  22 +
  23 + },
  24 +
  25 + /**
  26 + * 生命周期函数--监听页面显示
  27 + */
  28 + onShow: function () {
  29 +
  30 + },
  31 +
  32 + /**
  33 + * 生命周期函数--监听页面隐藏
  34 + */
  35 + onHide: function () {
  36 +
  37 + },
  38 +
  39 + /**
  40 + * 生命周期函数--监听页面卸载
  41 + */
  42 + onUnload: function () {
  43 +
  44 + },
  45 +
  46 + /**
  47 + * 页面相关事件处理函数--监听用户下拉动作
  48 + */
  49 + onPullDownRefresh: function () {
  50 +
  51 + },
  52 +
  53 + /**
  54 + * 页面上拉触底事件的处理函数
  55 + */
  56 + onReachBottom: function () {
  57 +
  58 + },
  59 +
  60 + /**
  61 + * 用户点击右上角分享
  62 + */
  63 + onShareAppMessage: function () {
  64 +
  65 + }
  66 +})
  1 +{
  2 + "usingComponents": {
  3 + "nav":"/components/nav/nav",
  4 + "subject":"/components/2.0/taocan/subject"
  5 + }
  6 +}
  1 +<!--pages/taocan/detail.wxml-->
  2 +<view class="view bg-blue-img"></view>
  3 +<nav backgroundColor="rgba(0,0,0,0)" color="#ffffff"></nav>
  4 +<view class="view padding-lr padding-bottom-lg" style="position: relative">
  5 + <view class="text-white txt-40-h text-bold margin-top-sm">已退款</view>
  6 + <view class="text-white txt-28-h text-bold margin-bottom-lg" style="margin-top: 6rpx;">钱款已原路退还,请在微信账单查看呦</view>
  7 + <subject order="{{order}}">
  8 + <view class="view flex flex-direction justify-center align-center margin-top-lg">
  9 + <view class="Medium txt-28-h">券码:1111 1111 1111</view>
  10 + <image src="{{false?'':'http://nosqn.colorcun.com/taocan/1%20%2813%29.png'}}" mode="heightFix" style="height: 340rpx;"></image>
  11 + </view>
  12 + </subject>
  13 + <view class="view card flex margin-tb-sm padding-lg justify-between">
  14 + <view class="view text-bold txt-32-h">您还可以预订包间</view>
  15 + <view class="view bg-blue-blue round" style="padding: 8rpx 20rpx;">订包间</view>
  16 + </view>
  17 + <view class="view card">
  18 + <view class="txt-30-h padding solid-bottom text-bold">使用须知</view>
  19 + <view class="view padding block">
  20 + <view class="flex align-center margin-bottom-sm">
  21 + <view class="dot"></view>
  22 + <view class="txt-30-h text-bold">有效期</view>
  23 + </view>
  24 + <view class="text-df">123123</view>
  25 + </view>
  26 + <view class="view padding block">
  27 + <view class="flex align-center margin-bottom-sm">
  28 + <view class="dot"></view>
  29 + <view class="txt-30-h text-bold">使用时间</view>
  30 + </view>
  31 + <view class="text-df">123123</view>
  32 + </view>
  33 + <view class="view padding block padding-bottom-sm">
  34 + <view class="flex align-center margin-bottom-sm">
  35 + <view class="dot"></view>
  36 + <view class="txt-30-h text-bold">使用规则</view>
  37 + </view>
  38 + <view class="text-df" wx:if="{{hasShowRule}}">
  39 + <text>123123</text>
  40 + </view>
  41 + <view class="flex justify-center align-center rule margin-top-sm margin-bottom-sm" bindtap="toggleRule">
  42 + <view class="txt-28-h">{{hasShowRule?'收起':'展开更多'}}</view>
  43 + <view class="view icon {{hasShowRule?'show':''}}"></view>
  44 + </view>
  45 + </view>
  46 + </view>
  47 + <view class="view card margin-top-sm padding-bottom-xs">
  48 + <view class="padding solid-bottom flex justify-between">
  49 + <view class="txt-30-h text-bold">订单信息</view>
  50 + <view class="text-gray">退款进度</view>
  51 + </view>
  52 + <view class="view padding padding-lr-lg flex justify-between">
  53 + <view class="text-gray txt-28-h">商品总价</view>
  54 + <view class="txt-28-h">¥888.00</view>
  55 + </view>
  56 + <view class="view padding-bottom padding-lr-lg flex justify-between">
  57 + <view class="text-gray txt-28-h">实际付款</view>
  58 + <view class="txt-28-h">¥888.00</view>
  59 + </view>
  60 + <view class="view padding-bottom padding-lr-lg flex justify-between">
  61 + <view class="text-gray txt-28-h">交易快照</view>
  62 + <view class="view txt-28-h flex-treble flex align-center justify-end">
  63 + <view class="padding-right-sm">发生交易纠纷时,可作为判断依据</view>
  64 + <view class="more"></view>
  65 + </view>
  66 + </view>
  67 + <view class="view padding-bottom padding-lr-lg flex justify-between">
  68 + <view class="text-gray txt-28-h">订单编号</view>
  69 + <view class="txt-28-h">¥888.00</view>
  70 + </view>
  71 + <view class="view padding-bottom padding-lr-lg flex justify-between">
  72 + <view class="text-gray txt-28-h">下单时间</view>
  73 + <view class="txt-28-h">¥888.00</view>
  74 + </view>
  75 + <view class="view padding-bottom padding-lr-lg flex justify-between">
  76 + <view class="text-gray txt-28-h">退款时间</view>
  77 + <view class="txt-28-h">¥888.00</view>
  78 + </view>
  79 + </view>
  80 +</view>
  81 +
  1 +/* pages/taocan/detail.wxss */
  2 +@import "../../colorui/main.wxss";
  3 +.bg-blue-img{
  4 + height: 390rpx;
  5 + color:#ffffff;
  6 + position: fixed;
  7 + top:0;
  8 + width: 100%;
  9 + background-image: url("http://nosqn.colorcun.com/taocan/1%20%2825%29.png");
  10 +}
  11 +.card{
  12 + width: 100%;
  13 + background: #FFFFFF;
  14 + box-shadow: 0px 0px 30rpx 0px #E5E5E5;
  15 + border-radius: 20rpx;
  16 +}
  17 +.block .dot{
  18 + width: 8rpx;
  19 + height: 26rpx;
  20 + background: linear-gradient(180deg, #3BBFF5 0%, #57A0FF 100%);
  21 + margin-right: 20rpx;
  22 +}
  23 +.rule .icon{
  24 + width: 22rpx;
  25 + height: 12rpx;
  26 + margin-left: 20rpx;
  27 + background-image: url("http://nosqn.colorcun.com/taocan/1%20%285%29.png");
  28 +}
  29 +.rule .icon.show{
  30 + background-image: url("http://nosqn.colorcun.com/taocan/1%20%286%29.png");
  31 +}
@@ -726,6 +726,12 @@ @@ -726,6 +726,12 @@
726 "pathName": "pages/taocan/index", 726 "pathName": "pages/taocan/index",
727 "query": "sid=1&pid=1", 727 "query": "sid=1&pid=1",
728 "scene": null 728 "scene": null
  729 + },
  730 + {
  731 + "name": "pages/taocan/order",
  732 + "pathName": "pages/taocan/order",
  733 + "query": "id=1",
  734 + "scene": null
729 } 735 }
730 ] 736 ]
731 } 737 }