xt / xcx-book · Commits

Go to a project

Commit 07f9f5ad9a890533d50668dd4e544ee58836a42c

Authored by vking
1 parent 9bd8fb7f
build: skipped

master-activity

Inline Side-by-side
Showing 17 changed files with 506 additions and 10 deletions
@@ -34,12 +34,21 @@ @@ -34,12 +34,21 @@
34 "pages/me/history", 34 "pages/me/history",
35 "pages/reserve/remark", 35 "pages/reserve/remark",
36 "pages/reserve/findSeller", 36 "pages/reserve/findSeller",
37 - "pages/customer/cancel",  
38 - "pack-activity/pages/index",  
39 - "pack-activity/pages/money" 37 + "pages/customer/cancel"
40 ], 38 ],
41 "subpackages": [ 39 "subpackages": [
42 { 40 {
  41 + "root": "pack-activity",
  42 + "name": "红包活动包",
  43 + "pages": [
  44 + "pages/index",
  45 + "pages/money",
  46 + "pages/kefu",
  47 + "pages/qiye",
  48 + "pages/yuding"
  49 + ]
  50 + },
  51 + {
43 "root": "pack-cookbook", 52 "root": "pack-cookbook",
44 "name": "提前点餐包", 53 "name": "提前点餐包",
45 "pages": [ 54 "pages": [
@@ -26,7 +26,7 @@ @@ -26,7 +26,7 @@
26 </view> 26 </view>
27 <navigator wx:else="" hover-class="navigator-hover" 27 <navigator wx:else="" hover-class="navigator-hover"
28 url="/pack-activity/pages/index?id={{activity.id}}" > 28 url="/pack-activity/pages/index?id={{activity.id}}" >
29 - <view class="mask-tips {{floclass}}"></view> 29 + <view class="mask-tips {{floclass}}" style="background-image: url({{activity.task.flo_url}})"></view>
30 </navigator> 30 </navigator>
31 </block> 31 </block>
32 32
@@ -130,7 +130,7 @@ @@ -130,7 +130,7 @@
130 position: fixed; 130 position: fixed;
131 left: 20rpx; 131 left: 20rpx;
132 bottom: 520rpx; 132 bottom: 520rpx;
133 - background-image: url("http://qn.colorcun.com/activity/images/fl.png"); 133 + /*background-image: url("http://qn.colorcun.com/activity/images/fl.png");*/
134 background-size: 100% 100%; 134 background-size: 100% 100%;
135 } 135 }
136 .mask-tips.detail_owner{ 136 .mask-tips.detail_owner{
@@ -92,7 +92,8 @@ Page({ @@ -92,7 +92,8 @@ Page({
92 let index=util.attr(e,'index') 92 let index=util.attr(e,'index')
93 let task=this.data.activity.list[index] 93 let task=this.data.activity.list[index]
94 let tid=task.id 94 let tid=task.id
95 - ,path=util.http_build_query({aid:this.data.activity.id,tid:tid},task.task_url||'demo') 95 + ,path=util.http_build_query({aid:this.data.activity.id,tid:tid},task.task_url||'/pack-activity/pages/yuding')
  96 + console.log(path)
96 if(task.status==0){ 97 if(task.status==0){
97 App.Task.SetTaskInfo({//领取任务 98 App.Task.SetTaskInfo({//领取任务
98 aid:this.data.activity.id, 99 aid:this.data.activity.id,
  1 +// pack-activity/pages/money.js
  2 +import util from '../../utils/util';
  3 +import App from '../../utils/api';
  4 +Page({
  5 +
  6 + /**
  7 + * 页面的初始数据
  8 + */
  9 + data: {
  10 +
  11 + },
  12 +
  13 + /**
  14 + * 生命周期函数--监听页面加载
  15 + */
  16 + onLoad: function (options) {
  17 + App.User.GetBalance().then(res=>{
  18 + this.setData({
  19 + user:res.data
  20 + })
  21 + })
  22 + App.User.GetConsume().then(res=>{
  23 + this.setData({
  24 + list:res.data
  25 + })
  26 + })
  27 + },
  28 +
  29 + /**
  30 + * 生命周期函数--监听页面初次渲染完成
  31 + */
  32 + onReady: function () {
  33 +
  34 + },
  35 +
  36 + /**
  37 + * 生命周期函数--监听页面显示
  38 + */
  39 + onShow: function () {
  40 +
  41 + },
  42 +
  43 + /**
  44 + * 生命周期函数--监听页面隐藏
  45 + */
  46 + onHide: function () {
  47 +
  48 + },
  49 +
  50 + /**
  51 + * 生命周期函数--监听页面卸载
  52 + */
  53 + onUnload: function () {
  54 +
  55 + },
  56 +
  57 + /**
  58 + * 页面相关事件处理函数--监听用户下拉动作
  59 + */
  60 + onPullDownRefresh: function () {
  61 +
  62 + },
  63 +
  64 + /**
  65 + * 页面上拉触底事件的处理函数
  66 + */
  67 + onReachBottom: function () {
  68 +
  69 + },
  70 +
  71 +})
  1 +<!--pack-activity/pages/money.wxml-->
  2 +<wxs src="../../utils/util.wxs" module="util" />
  3 +<nav hasHome>我的余额</nav>
  4 +<view class="pages">
  5 + <view class="pages-view">
  6 + <view class="money-block">
  7 + <view class="money-views-top">
  8 + <view class="txt">我的余额</view>
  9 + </view>
  10 + <view class="money-views flex-bc">
  11 + <view class="money-number">{{user.price}}</view>
  12 + <view class="money-dw">元</view>
  13 + </view>
  14 + <navigator url="/pages/reserve/index" open-type="switchTab" hover-class="other-navigator-hover">
  15 + <view class="yuding flex-cc">
  16 + <view class="icon"></view>
  17 + 去订包间
  18 + </view>
  19 + </navigator>
  20 + </view>
  21 + </view>
  22 + <view class="list-view" wx:if="{{list.length>0}}">
  23 + <view class="item" wx:for="{{list}}" wx:key="list">
  24 + <view class="flex-lr name">
  25 + <view>{{item.remark}}</view>
  26 + <view>{{item.type==1?'+':'-'}}{{item.consumeprice}}</view>
  27 + </view>
  28 + <view class="flex-lr date">
  29 + <view>{{util.unixtoTime(item.createtime,"MM-DD HH:II")}}</view>
  30 + <view>余额 {{item.currprice}}</view>
  31 + </view>
  32 + </view>
  33 + </view>
  34 +</view>
  1 +/* pack-activity/pages/money.wxss */
  2 +page{
  3 + background-color: #F5F5F5;
  4 +}
  5 +.pages{
  6 + /*background-image: url("http://qn.colorcun.com/activity/images/money-header.png");*/
  7 + background-image: url("http://qn.colorcun.com/activity/images/bg-black.png");
  8 + background-size: 100% auto;
  9 + background-repeat: no-repeat;
  10 + min-height: 500rpx;
  11 + padding-top: 80rpx;
  12 +}
  13 +.pages-view{
  14 + width: calc(100% - 40rpx);
  15 + margin-left: 20rpx;
  16 + height:340rpx;
  17 + background:#ffffff;
  18 + border-radius:20rpx;
  19 + box-sizing: border-box;
  20 + padding: 20rpx;
  21 +}
  22 +.money-block{
  23 + height:300rpx;
  24 + background:rgba(255,255,255,1);
  25 + border-radius:20rpx;
  26 + padding-top: 40rpx;
  27 + box-sizing: border-box;
  28 +}
  29 +.money-views-top{
  30 + width: 258rpx;
  31 + height: 40rpx;
  32 + font-size:28rpx;
  33 + margin-left: calc(50% - 126rpx);
  34 + text-align: center;
  35 + font-weight:500;
  36 + color:rgba(153,153,153,1);
  37 + line-height:40rpx;
  38 + position: relative;
  39 +}
  40 +.money-views-top:before{
  41 + position: absolute;
  42 + display: block;
  43 + content: "";
  44 + width: 100%;
  45 + height: 2rpx;
  46 + left:0;
  47 + top:19rpx;
  48 + background-color: #E0E0E0;
  49 +}
  50 +.money-views-top .txt{
  51 + width: 138rpx;
  52 + background-color: #ffffff;
  53 + left:60rpx;
  54 + position: absolute;
  55 +}
  56 +
  57 +.money-views{
  58 + height:100rpx;
  59 + font-size:72rpx;
  60 + font-weight:600;
  61 + color:#353535;
  62 + line-height:100rpx;
  63 + margin-top: 10rpx;
  64 +}
  65 +.money-dw{
  66 + width:32rpx;
  67 + height:44rpx;
  68 + font-size:32rpx;
  69 + font-weight:600;
  70 + color:#353535;
  71 + line-height:44rpx;
  72 + margin-left: 20rpx;
  73 +}
  74 +.list-view{
  75 + width: calc(100% - 40rpx);
  76 + margin-left: 20rpx;
  77 + background:rgba(255,255,255,1);
  78 + border-radius:20rpx;
  79 + box-sizing: border-box;
  80 + padding: 2rpx 40rpx 0;
  81 + margin-top: 20rpx;
  82 +}
  83 +.item{
  84 + height: 166rpx;
  85 + box-sizing: border-box;
  86 + border-bottom: 2rpx solid #F5F5F5;
  87 + line-height: 166rpx;
  88 + padding-top: 40rpx;
  89 +}
  90 +.item:last-child{
  91 + border-bottom-width: 0;
  92 +}
  93 +.item .name{
  94 + height:44rpx;
  95 + font-size:32rpx;
  96 + font-weight:500;
  97 + color:rgba(53,53,53,1);
  98 + line-height:44rpx;
  99 + box-sizing: border-box;
  100 +}
  101 +.item .date{
  102 + height:34rpx;
  103 + font-size:24rpx;
  104 + font-weight:500;
  105 + color:rgba(153,153,153,1);
  106 + line-height:34rpx;
  107 + margin-top: 10rpx;
  108 +}
  109 +
  110 +.yuding{
  111 + width:320rpx;
  112 + height:70rpx;
  113 + background:linear-gradient(360deg,rgba(192,163,105,1) 0%,rgba(252,210,167,1) 100%);
  114 + border-radius:35rpx;
  115 + font-size:32rpx;
  116 + font-family:PingFangSC-Semibold,PingFang SC;
  117 + font-weight:600;
  118 + color:rgba(123,81,42,1);
  119 + line-height:70rpx;
  120 + margin-left: calc(50% - 160rpx);
  121 + margin-top: 40rpx;
  122 +}
  123 +.yuding .icon{
  124 + background-size: 100% 100%;
  125 + width: 30rpx;
  126 + height: 30rpx;
  127 + background-image: url("http://qn.colorcun.com/activity/images/addr.png");
  128 + margin-right: 20rpx;
  129 +}
@@ -11,10 +11,12 @@ @@ -11,10 +11,12 @@
11 <view class="money-number">{{user.price}}</view> 11 <view class="money-number">{{user.price}}</view>
12 <view class="money-dw">元</view> 12 <view class="money-dw">元</view>
13 </view> 13 </view>
14 - <view class="yuding flex-cc">  
15 - <view class="icon"></view>  
16 - 去订包间  
17 - </view> 14 + <navigator url="/pages/reserve/index" open-type="switchTab" hover-class="other-navigator-hover">
  15 + <view class="yuding flex-cc">
  16 + <view class="icon"></view>
  17 + 去订包间
  18 + </view>
  19 + </navigator>
18 </view> 20 </view>
19 </view> 21 </view>
20 <view class="list-view" wx:if="{{list.length>0}}"> 22 <view class="list-view" wx:if="{{list.length>0}}">
  1 +// pack-activity/pages/money.js
  2 +import util from '../../utils/util';
  3 +import App from '../../utils/api';
  4 +Page({
  5 +
  6 + /**
  7 + * 页面的初始数据
  8 + */
  9 + data: {
  10 +
  11 + },
  12 +
  13 + /**
  14 + * 生命周期函数--监听页面加载
  15 + */
  16 + onLoad: function (options) {
  17 + App.User.GetBalance().then(res=>{
  18 + this.setData({
  19 + user:res.data
  20 + })
  21 + })
  22 + App.User.GetConsume().then(res=>{
  23 + this.setData({
  24 + list:res.data
  25 + })
  26 + })
  27 + },
  28 +
  29 + /**
  30 + * 生命周期函数--监听页面初次渲染完成
  31 + */
  32 + onReady: function () {
  33 +
  34 + },
  35 +
  36 + /**
  37 + * 生命周期函数--监听页面显示
  38 + */
  39 + onShow: function () {
  40 +
  41 + },
  42 +
  43 + /**
  44 + * 生命周期函数--监听页面隐藏
  45 + */
  46 + onHide: function () {
  47 +
  48 + },
  49 +
  50 + /**
  51 + * 生命周期函数--监听页面卸载
  52 + */
  53 + onUnload: function () {
  54 +
  55 + },
  56 +
  57 + /**
  58 + * 页面相关事件处理函数--监听用户下拉动作
  59 + */
  60 + onPullDownRefresh: function () {
  61 +
  62 + },
  63 +
  64 + /**
  65 + * 页面上拉触底事件的处理函数
  66 + */
  67 + onReachBottom: function () {
  68 +
  69 + },
  70 +
  71 +})
  1 +{
  2 + "backgroundTextStyle":"light",
  3 + "navigationBarBackgroundColor": "#fff",
  4 + "navigationBarTextStyle":"black",
  5 + "usingComponents": {
  6 + "nav":"/components/nav/nav"
  7 + }
  8 +}
  1 +<!--pack-activity/pages/money.wxml-->
  2 +<wxs src="../../utils/util.wxs" module="util" />
  3 +<nav hasHome>我的余额</nav>
  4 +<view class="pages">
  5 + <view class="pages-view">
  6 + <view class="money-block">
  7 + <view class="money-views-top">
  8 + <view class="txt">我的余额</view>
  9 + </view>
  10 + <view class="money-views flex-bc">
  11 + <view class="money-number">{{user.price}}</view>
  12 + <view class="money-dw">元</view>
  13 + </view>
  14 + <navigator url="/pages/reserve/index" open-type="switchTab" hover-class="other-navigator-hover">
  15 + <view class="yuding flex-cc">
  16 + <view class="icon"></view>
  17 + 去订包间
  18 + </view>
  19 + </navigator>
  20 + </view>
  21 + </view>
  22 + <view class="list-view" wx:if="{{list.length>0}}">
  23 + <view class="item" wx:for="{{list}}" wx:key="list">
  24 + <view class="flex-lr name">
  25 + <view>{{item.remark}}</view>
  26 + <view>{{item.type==1?'+':'-'}}{{item.consumeprice}}</view>
  27 + </view>
  28 + <view class="flex-lr date">
  29 + <view>{{util.unixtoTime(item.createtime,"MM-DD HH:II")}}</view>
  30 + <view>余额 {{item.currprice}}</view>
  31 + </view>
  32 + </view>
  33 + </view>
  34 +</view>
  1 +/* pack-activity/pages/money.wxss */
  2 +page{
  3 + background-color: #F5F5F5;
  4 +}
  5 +.pages{
  6 + /*background-image: url("http://qn.colorcun.com/activity/images/money-header.png");*/
  7 + background-image: url("http://qn.colorcun.com/activity/images/bg-black.png");
  8 + background-size: 100% auto;
  9 + background-repeat: no-repeat;
  10 + min-height: 500rpx;
  11 + padding-top: 80rpx;
  12 +}
  13 +.pages-view{
  14 + width: calc(100% - 40rpx);
  15 + margin-left: 20rpx;
  16 + height:340rpx;
  17 + background:#ffffff;
  18 + border-radius:20rpx;
  19 + box-sizing: border-box;
  20 + padding: 20rpx;
  21 +}
  22 +.money-block{
  23 + height:300rpx;
  24 + background:rgba(255,255,255,1);
  25 + border-radius:20rpx;
  26 + padding-top: 40rpx;
  27 + box-sizing: border-box;
  28 +}
  29 +.money-views-top{
  30 + width: 258rpx;
  31 + height: 40rpx;
  32 + font-size:28rpx;
  33 + margin-left: calc(50% - 126rpx);
  34 + text-align: center;
  35 + font-weight:500;
  36 + color:rgba(153,153,153,1);
  37 + line-height:40rpx;
  38 + position: relative;
  39 +}
  40 +.money-views-top:before{
  41 + position: absolute;
  42 + display: block;
  43 + content: "";
  44 + width: 100%;
  45 + height: 2rpx;
  46 + left:0;
  47 + top:19rpx;
  48 + background-color: #E0E0E0;
  49 +}
  50 +.money-views-top .txt{
  51 + width: 138rpx;
  52 + background-color: #ffffff;
  53 + left:60rpx;
  54 + position: absolute;
  55 +}
  56 +
  57 +.money-views{
  58 + height:100rpx;
  59 + font-size:72rpx;
  60 + font-weight:600;
  61 + color:#353535;
  62 + line-height:100rpx;
  63 + margin-top: 10rpx;
  64 +}
  65 +.money-dw{
  66 + width:32rpx;
  67 + height:44rpx;
  68 + font-size:32rpx;
  69 + font-weight:600;
  70 + color:#353535;
  71 + line-height:44rpx;
  72 + margin-left: 20rpx;
  73 +}
  74 +.list-view{
  75 + width: calc(100% - 40rpx);
  76 + margin-left: 20rpx;
  77 + background:rgba(255,255,255,1);
  78 + border-radius:20rpx;
  79 + box-sizing: border-box;
  80 + padding: 2rpx 40rpx 0;
  81 + margin-top: 20rpx;
  82 +}
  83 +.item{
  84 + height: 166rpx;
  85 + box-sizing: border-box;
  86 + border-bottom: 2rpx solid #F5F5F5;
  87 + line-height: 166rpx;
  88 + padding-top: 40rpx;
  89 +}
  90 +.item:last-child{
  91 + border-bottom-width: 0;
  92 +}
  93 +.item .name{
  94 + height:44rpx;
  95 + font-size:32rpx;
  96 + font-weight:500;
  97 + color:rgba(53,53,53,1);
  98 + line-height:44rpx;
  99 + box-sizing: border-box;
  100 +}
  101 +.item .date{
  102 + height:34rpx;
  103 + font-size:24rpx;
  104 + font-weight:500;
  105 + color:rgba(153,153,153,1);
  106 + line-height:34rpx;
  107 + margin-top: 10rpx;
  108 +}
  109 +
  110 +.yuding{
  111 + width:320rpx;
  112 + height:70rpx;
  113 + background:linear-gradient(360deg,rgba(192,163,105,1) 0%,rgba(252,210,167,1) 100%);
  114 + border-radius:35rpx;
  115 + font-size:32rpx;
  116 + font-family:PingFangSC-Semibold,PingFang SC;
  117 + font-weight:600;
  118 + color:rgba(123,81,42,1);
  119 + line-height:70rpx;
  120 + margin-left: calc(50% - 160rpx);
  121 + margin-top: 40rpx;
  122 +}
  123 +.yuding .icon{
  124 + background-size: 100% 100%;
  125 + width: 30rpx;
  126 + height: 30rpx;
  127 + background-image: url("http://qn.colorcun.com/activity/images/addr.png");
  128 + margin-right: 20rpx;
  129 +}
  1 +{
  2 + "backgroundTextStyle":"light",
  3 + "navigationBarBackgroundColor": "#fff",
  4 + "navigationBarTextStyle":"black",
  5 + "usingComponents": {
  6 + "nav":"/components/nav/nav"
  7 + }
  8 +}