xt / xcx-book · Commits

Go to a project

Commit 37e6a2aa58719cbf521ef768fb1f28344267158f

Authored by vking
1 parent 07f9f5ad
build: skipped

master-activity

Inline Side-by-side
Showing 8 changed files with 94 additions and 283 deletions
@@ -37,8 +37,8 @@ Component({ @@ -37,8 +37,8 @@ Component({
37 methods: { 37 methods: {
38 onpos(e){ 38 onpos(e){
39 let location=e.detail 39 let location=e.detail
40 - location.latitude=39.6242016100  
41 - location.longitude=118.1174469000 40 + //location.latitude=39.6242016100
  41 + //location.longitude=118.1174469000
42 //console.log('hasActivity',location); 42 //console.log('hasActivity',location);
43 if(location.latitude && location.longitude){ 43 if(location.latitude && location.longitude){
44 TSPOS.latitude.push(location.latitude) 44 TSPOS.latitude.push(location.latitude)
@@ -14,16 +14,7 @@ Page({ @@ -14,16 +14,7 @@ Page({
14 * 生命周期函数--监听页面加载 14 * 生命周期函数--监听页面加载
15 */ 15 */
16 onLoad: function (options) { 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 - }) 17 +
27 }, 18 },
28 19
29 /** 20 /**
@@ -67,5 +58,4 @@ Page({ @@ -67,5 +58,4 @@ Page({
67 onReachBottom: function () { 58 onReachBottom: function () {
68 59
69 }, 60 },
70 -  
71 }) 61 })
1 <!--pack-activity/pages/money.wxml--> 1 <!--pack-activity/pages/money.wxml-->
2 <wxs src="../../utils/util.wxs" module="util" /> 2 <wxs src="../../utils/util.wxs" module="util" />
3 -<nav hasHome>我的余额</nav> 3 +<nav hasHome>关注公众号</nav>
4 <view class="pages"> 4 <view class="pages">
5 <view class="pages-view"> 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> 6 + <view class="text">进入客服消息后，点击右下角快捷图片，长 按图片关注【周到安排】</view>
  7 + <image src="http://qn.colorcun.com/activity/images/kefux.png" mode="widthFix" style="width: 100%;"></image>
21 </view> 8 </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> 9 +</view>
  10 +<view class="bottom">
  11 + <view class="bottom-view flex-vc">
  12 + <button class="button-love" open-type="contact"
  13 + send-message-title="周到安排"
  14 + send-message-img="http://qn.colorcun.com/activity/images/kefu.jpg"
  15 + show-message-card>去客服页面关注</button>
  16 + <view class="tips">关注公众号，及时获取订包间专属优惠信息</view>
33 </view> 17 </view>
34 </view> 18 </view>
1 /* pack-activity/pages/money.wxss */ 1 /* pack-activity/pages/money.wxss */
2 page{ 2 page{
3 - background-color: #F5F5F5; 3 + background-color: #ffffff;
4 } 4 }
5 .pages{ 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"); 6 + background-image: url("http://qn.colorcun.com/activity/images/money-header.png");
8 background-size: 100% auto; 7 background-size: 100% auto;
9 background-repeat: no-repeat; 8 background-repeat: no-repeat;
10 min-height: 500rpx; 9 min-height: 500rpx;
@@ -17,113 +16,41 @@ page{ @@ -17,113 +16,41 @@ page{
17 background:#ffffff; 16 background:#ffffff;
18 border-radius:20rpx; 17 border-radius:20rpx;
19 box-sizing: border-box; 18 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; 19 + padding: 40rpx 20rpx;
49 } 20 }
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; 21 +.text{
  22 + padding: 0 30rpx;
68 font-size:32rpx; 23 font-size:32rpx;
69 font-weight:600; 24 font-weight:600;
70 - color:#353535; 25 + color:rgba(53,53,53,1);
71 line-height:44rpx; 26 line-height:44rpx;
72 - margin-left: 20rpx; 27 + margin-bottom: 80rpx;
73 } 28 }
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; 29 +.bottom{
  30 + position: fixed;
  31 + bottom: 0;
  32 + height: 220rpx;
  33 + width: 100%;
89 } 34 }
90 -.item:last-child{  
91 - border-bottom-width: 0; 35 +.bottom-view{
  36 + width: 100%;
92 } 37 }
93 -.item .name{  
94 - height:44rpx; 38 +.button-love{
  39 + width:674rpx;
  40 + height:80rpx;
  41 + background:linear-gradient(360deg,rgba(220,44,75,1) 0%,rgba(244,143,161,1) 100%);
  42 + border-radius:40rpx;
95 font-size:32rpx; 43 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; 44 + font-weight:600;
  45 + color:rgba(255,255,255,1);
  46 + line-height:80rpx;
  47 + letter-spacing:1rpx;
  48 +}
  49 +.tips{
  50 + margin-top: 24rpx;
  51 + height:36rpx;
  52 + font-size:26rpx;
104 font-weight:500; 53 font-weight:500;
105 color:rgba(153,153,153,1); 54 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; 55 + line-height:36rpx;
129 } 56 }
@@ -14,16 +14,7 @@ Page({ @@ -14,16 +14,7 @@ Page({
14 * 生命周期函数--监听页面加载 14 * 生命周期函数--监听页面加载
15 */ 15 */
16 onLoad: function (options) { 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 - }) 17 +
27 }, 18 },
28 19
29 /** 20 /**
@@ -67,5 +58,4 @@ Page({ @@ -67,5 +58,4 @@ Page({
67 onReachBottom: function () { 58 onReachBottom: function () {
68 59
69 }, 60 },
70 -  
71 }) 61 })
1 <!--pack-activity/pages/money.wxml--> 1 <!--pack-activity/pages/money.wxml-->
2 <wxs src="../../utils/util.wxs" module="util" /> 2 <wxs src="../../utils/util.wxs" module="util" />
3 -<nav hasHome>我的余额</nav> 3 +<nav hasHome>添加企业微信</nav>
4 <view class="pages"> 4 <view class="pages">
5 <view class="pages-view"> 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> 6 + <view class="text">【周到安排】已为您分配专属客服，订包间相关的任何问题，都可以撩我</view>
  7 + <image src="http://qn.colorcun.com/activity/images/kefux.png" mode="widthFix" style="width: 100%;"></image>
21 </view> 8 </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> 9 +</view>
  10 +<view class="bottom">
  11 + <view class="bottom-view flex-vc">
  12 + <button class="button-love" open-type="contact"
  13 + send-message-title="周到安排"
  14 + send-message-img="http://qn.colorcun.com/activity/images/kefu.jpg"
  15 + show-message-card>去客服页面关注</button>
  16 + <view class="tips">添加企业微信，及时获知红包领取详情</view>
33 </view> 17 </view>
34 </view> 18 </view>
1 /* pack-activity/pages/money.wxss */ 1 /* pack-activity/pages/money.wxss */
2 page{ 2 page{
3 - background-color: #F5F5F5; 3 + background-color: #ffffff;
4 } 4 }
5 .pages{ 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"); 6 + background-image: url("http://qn.colorcun.com/activity/images/money-header.png");
8 background-size: 100% auto; 7 background-size: 100% auto;
9 background-repeat: no-repeat; 8 background-repeat: no-repeat;
10 min-height: 500rpx; 9 min-height: 500rpx;
@@ -17,113 +16,41 @@ page{ @@ -17,113 +16,41 @@ page{
17 background:#ffffff; 16 background:#ffffff;
18 border-radius:20rpx; 17 border-radius:20rpx;
19 box-sizing: border-box; 18 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; 19 + padding: 40rpx 20rpx;
49 } 20 }
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; 21 +.text{
  22 + padding: 0 30rpx;
68 font-size:32rpx; 23 font-size:32rpx;
69 font-weight:600; 24 font-weight:600;
70 - color:#353535; 25 + color:rgba(53,53,53,1);
71 line-height:44rpx; 26 line-height:44rpx;
72 - margin-left: 20rpx; 27 + margin-bottom: 80rpx;
73 } 28 }
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; 29 +.bottom{
  30 + position: fixed;
  31 + bottom: 0;
  32 + height: 220rpx;
  33 + width: 100%;
89 } 34 }
90 -.item:last-child{  
91 - border-bottom-width: 0; 35 +.bottom-view{
  36 + width: 100%;
92 } 37 }
93 -.item .name{  
94 - height:44rpx; 38 +.button-love{
  39 + width:674rpx;
  40 + height:80rpx;
  41 + background:linear-gradient(360deg,rgba(220,44,75,1) 0%,rgba(244,143,161,1) 100%);
  42 + border-radius:40rpx;
95 font-size:32rpx; 43 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; 44 + font-weight:600;
  45 + color:rgba(255,255,255,1);
  46 + line-height:80rpx;
  47 + letter-spacing:1rpx;
  48 +}
  49 +.tips{
  50 + margin-top: 24rpx;
  51 + height:36rpx;
  52 + font-size:26rpx;
104 font-weight:500; 53 font-weight:500;
105 color:rgba(153,153,153,1); 54 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; 55 + line-height:36rpx;
129 } 56 }
@@ -29,7 +29,9 @@ @@ -29,7 +29,9 @@
29 "projectname": "c%E7%AB%AF%E9%A2%84%E5%AE%9A", 29 "projectname": "c%E7%AB%AF%E9%A2%84%E5%AE%9A",
30 "isGameTourist": false, 30 "isGameTourist": false,
31 "simulatorType": "wechat", 31 "simulatorType": "wechat",
32 - "simulatorPluginLibVersion": {}, 32 + "simulatorPluginLibVersion": {
  33 + "qywx_simulator_plugin": "2.4.0"
  34 + },
33 "condition": { 35 "condition": {
34 "search": { 36 "search": {
35 "current": -1, 37 "current": -1,
@@ -616,6 +618,13 @@ @@ -616,6 +618,13 @@
616 "pathName": "pages/customer/detail_owner", 618 "pathName": "pages/customer/detail_owner",
617 "query": "id=59113", 619 "query": "id=59113",
618 "scene": null 620 "scene": null
  621 + },
  622 + {
  623 + "id": -1,
  624 + "name": "pack-activity/pages/kefu",
  625 + "pathName": "pack-activity/pages/kefu",
  626 + "query": "",
  627 + "scene": null
619 } 628 }
620 ] 629 ]
621 } 630 }