Skip to content

dev / zhiliang-light-mp

Go to a project
Toggle navigation
Toggle navigation pinning
d784bd00 by simon
Options

no message

1 parent 38fe5e71
Inline Side-by-side
Showing 53 changed files with 1482 additions and 108 deletions
1 { 1 {
2 "pages": [ 2 "pages": [
3 "pages/user-center/user-center", 3 "pages/user-center/user-center",
4 "pages/gift-shop/gift-shop",
5 "pages/gift-detail/gift-detail",
6 "pages/scan-result/scan-result",
4 "pages/contact/contact", 7 "pages/contact/contact",
5 "pages/contact-table/contact-table", 8 "pages/contact-table/contact-table",
6 "pages/index/index", 9 "pages/index/index",
7 "pages/authorize/authorize", 10 "pages/authorize/authorize",
8 "pages/gift-shop/gift-shop",
9 "pages/register/register", 11 "pages/register/register",
10 "pages/scan-result/scan-result",
11 "pages/integral-detail/integral-detail", 12 "pages/integral-detail/integral-detail",
12 "pages/gift-detail/gift-detail",
13 "pages/address-management/address-management", 13 "pages/address-management/address-management",
14 "pages/address-edit/address-edit", 14 "pages/address-edit/address-edit",
15 "pages/my-qrcode/my-qrcode", 15 "pages/my-qrcode/my-qrcode",
...@@ -58,6 +58,9 @@ ...@@ -58,6 +58,9 @@
58 "authorize-comp": "../../component/authorize-comp/authorize-comp", 58 "authorize-comp": "../../component/authorize-comp/authorize-comp",
59 "common-tips-comp": "../../component/common-tips-comp/common-tips-comp", 59 "common-tips-comp": "../../component/common-tips-comp/common-tips-comp",
60 "sign-tips-comp": "../../component/sign-tips-comp/sign-tips-comp", 60 "sign-tips-comp": "../../component/sign-tips-comp/sign-tips-comp",
61 "gift-rank-tips-comp": "../../component/gift-rank-tips-comp/gift-rank-tips-comp",
62 "gift-sign-tips-comp": "../../component/gift-sign-tips-comp/gift-sign-tips-comp",
63 "order-submit-success-tips-comp": "../../component/order-submit-success-tips-comp/order-submit-success-tips-comp",
61 "van-popup": "../../ui/vant-weapp/popup/index" 64 "van-popup": "../../ui/vant-weapp/popup/index"
62 } 65 }
63 } 66 }
......
...@@ -30,6 +30,7 @@ $contentWidth:690px; ...@@ -30,6 +30,7 @@ $contentWidth:690px;
30 // text-align: center; 30 // text-align: center;
31 box-sizing: border-box; 31 box-sizing: border-box;
32 font-family: PingFangSC-Regular, -apple-system-font, Helvetica Neue, Helvetica, sans-serif, FZY3JW-GB1-0; 32 font-family: PingFangSC-Regular, -apple-system-font, Helvetica Neue, Helvetica, sans-serif, FZY3JW-GB1-0;
33
33 } 34 }
34 35
35 .app__width { 36 .app__width {
......
1 let app = getApp();
2 Component({
3 properties: {
4 // 这里定义了innerText属性，属性值可以在组件使用时指定
5 // cid 用户区分组件
6 cid: {
7 type: String,
8 value: '1',
9 },
10 innerTitle: {
11 type: String,
12 value: '',
13 },
14 innerText: {
15 type: String,
16 value: '',
17 },
18 innerButton: {
19 type: String,
20 value: '确定',
21 }
22 },
23 data: {
24 // 这里是一些组件内部数据
25 someData: {}
26 },
27 methods: {
28 // 这里是一个自定义方法
29 customMethod() {
30 this.triggerEvent('evtcomp', {
31 name: "_evt_custom"
32 })
33 },
34 // 隐藏蒙层
35 hideMask() {
36 this.triggerEvent('evtcomp', {
37 name: "_evt_hide_mask"
38 });
39 },
40 // 点击自定义按钮
41 onInnerButtonHandler() {
42 this.triggerEvent('evtcomp', {
43 name: "_evt_common_comp_button",
44 data: {
45 cid: this.properties.cid,
46 innerTitle: this.properties.innerTitle,
47 innerText: this.properties.innerText,
48 innerButton: this.properties.innerButton,
49 }
50 });
51 }
52 }
53 })
1 @import '../../assets/scss/mixins';
2 @import '../../assets/scss/utils';
3
4
5 .comp-item {
6 width: 650px;
7 // min-height: 496px;
8 border-radius: 10px;
9 background-color: #ffffff;
10 color: #333333;
11 font-size: 28px;
12 padding-bottom: 240px;
13
14 .cspace {
15 height: 76px;
16 }
17
18 .cont {
19 text-align: center;
20 width: 500px;
21 margin: 0 auto;
22
23 .tit {}
24
25 .tit1 {}
26
27 .tit2 {
28 margin-top: 12px;
29 color: #3680EB;
30 }
31
32 .tit3 {
33 margin-top: 12px;
34 font-size: 40px;
35 }
36
37 .prize {
38 width: 460px;
39 height: 276px;
40 }
41
42 .tips {
43 color: #999999;
44 font-size: 24px;
45 }
46
47 }
48
49 .btn {
50 @include cb(320px, 84px);
51 position: absolute;
52 left: 0;
53 right: 0;
54 bottom: 74px;
55 margin: 0 auto;
56 }
57
58 }
1 <view class="comp-item">
2 <view class="cspace"></view>
3 <view class="cont">
4 <view class="tit tit1">在190701-190714周期中</view>
5 <view class="tit tit2">推广积分排行第一名</view>
6 <view class="tit tit3">恭喜获得88元现金红包</view>
7 <!-- 红包 -->
8 <!-- <block>
9 <image class="prize" mode="aspectFit" src="../../image/prize/prize-red-package.png" />
10 <view></view>
11 <text class="tips">经后台审核通过后，红包将通过公众号消息或微信服务消息发放，届时请及时领取！</text>
12 </block> -->
13 <!-- 积分 -->
14 <block>
15 <image class="prize" mode="aspectFit" src="../../image/prize/prize-integral.png" />
16 <view></view>
17 <text class="tips">后台审核通过后，积分将会直接派送到您的账户上，可在积分明细中查看！</text>
18 </block>
19 </view>
20 <button class="btn" bindtap="hideMask">我知道了</button>
21 </view>
1 let app = getApp();
2 Component({
3 properties: {
4 // 这里定义了innerText属性，属性值可以在组件使用时指定
5 // cid 用户区分组件
6 cid: {
7 type: String,
8 value: '1',
9 },
10 innerTitle: {
11 type: String,
12 value: '',
13 },
14 innerText: {
15 type: String,
16 value: '',
17 },
18 innerButton: {
19 type: String,
20 value: '确定',
21 }
22 },
23 data: {
24 // 这里是一些组件内部数据
25 someData: {}
26 },
27 methods: {
28 // 这里是一个自定义方法
29 customMethod() {
30 this.triggerEvent('evtcomp', {
31 name: "_evt_custom"
32 })
33 },
34 // 隐藏蒙层
35 hideMask() {
36 this.triggerEvent('evtcomp', {
37 name: "_evt_hide_mask"
38 });
39 },
40 // 点击自定义按钮
41 onInnerButtonHandler() {
42 this.triggerEvent('evtcomp', {
43 name: "_evt_common_comp_button",
44 data: {
45 cid: this.properties.cid,
46 innerTitle: this.properties.innerTitle,
47 innerText: this.properties.innerText,
48 innerButton: this.properties.innerButton,
49 }
50 });
51 }
52 }
53 })
1 @import '../../assets/scss/mixins';
2 @import '../../assets/scss/utils';
3
4
5 .comp-item {
6 width: 650px;
7 // min-height: 496px;
8 border-radius: 10px;
9 background-color: #ffffff;
10 color: #333333;
11 font-size: 28px;
12 padding-bottom: 240px;
13
14 .cspace {
15 height: 76px;
16 }
17
18 .cont {
19 text-align: center;
20 width: 500px;
21 margin: 0 auto;
22
23 .tit {}
24
25 .tit1 {}
26
27 .tit2 {
28 margin-top: 20px;
29 color: #3680EB;
30 }
31
32 .tit3 {
33 // margin-top: 20px;
34 font-size: 40px;
35 }
36
37 .prize {
38 width: 460px;
39 height: 276px;
40 }
41
42 .tips {
43 color: #999999;
44 font-size: 24px;
45 }
46
47 }
48
49 .btn {
50 @include cb(320px, 84px);
51 position: absolute;
52 left: 0;
53 right: 0;
54 bottom: 74px;
55 margin: 0 auto;
56 }
57
58 }
1 <view class="comp-item">
2 <view class="cspace"></view>
3 <view class="cont">
4 <view class="tit tit3">恭喜获得88元现金红包</view>
5 <!-- 红包 -->
6 <block>
7 <image class="prize" mode="aspectFit" src="../../image/prize/prize-red-package.png" />
8 <view></view>
9 <text class="tips">现金红包已经快马加鞭给您派送\n请注意通知消息，并在24小时内领取哦~</text>
10 </block>
11 <!-- 积分 -->
12 <!-- <block>
13 <image class="prize" mode="aspectFit" src="../../image/prize/prize-integral.png" />
14 <view ></view>
15 <text class="tips">积分已派送到您的账户\n可在“积分明细”里查看</text>
16 </block> -->
17 </view>
18 <button class="btn" bindtap="hideMask">我知道了</button>
19 </view>
1 let app = getApp();
2 Component({
3 properties: {
4 // 这里定义了innerText属性，属性值可以在组件使用时指定
5 // cid 用户区分组件
6 cid: {
7 type: String,
8 value: '1',
9 },
10 innerTitle: {
11 type: String,
12 value: '',
13 },
14 innerText: {
15 type: String,
16 value: '',
17 },
18 innerButton: {
19 type: String,
20 value: '确定',
21 }
22 },
23 data: {
24 // 这里是一些组件内部数据
25 someData: {}
26 },
27 methods: {
28 // 这里是一个自定义方法
29 customMethod() {
30 this.triggerEvent('evtcomp', {
31 name: "_evt_custom"
32 })
33 },
34 // 隐藏蒙层
35 hideMask() {
36 this.triggerEvent('evtcomp', {
37 name: "_evt_hide_mask"
38 });
39 },
40 // 点击自定义按钮
41 onInnerButtonHandler() {
42 this.triggerEvent('evtcomp', {
43 name: "_evt_common_comp_button",
44 data: {
45 cid: this.properties.cid,
46 innerTitle: this.properties.innerTitle,
47 innerText: this.properties.innerText,
48 innerButton: this.properties.innerButton,
49 }
50 });
51 }
52 }
53 })
1 @import '../../assets/scss/mixins';
2 @import '../../assets/scss/utils';
3
4
5 .comp-item {
6 width: 650px;
7 min-height: 496px;
8 border-radius: 10px;
9 background-color: #ffffff;
10 font-size: 28px;
11 color: #333333;
12 padding-bottom: 60px;
13
14 .cspace {
15 height: 76px;
16 }
17
18 .cont {
19 text-align: center;
20 width: 520px;
21 margin: 0 auto;
22
23 .tit {
24 font-size: 40px;
25 color: #333333;
26 }
27
28 .prize {
29 margin: 58px auto 0;
30 width: 200px;
31 height: 200px;
32 border: solid 1px #f0f0f0;
33 border-radius: 8px;
34 @extend .fcc;
35
36 .image {
37 width: 172px;
38 height: 172px;
39 background-color: wheat;
40 }
41 }
42
43 .name {
44 margin-top: 20px;
45 }
46
47 .tips {
48 margin-top: 20px;
49 color: #999999;
50 font-size: 24px;
51 }
52 }
53
54 .btn {
55 @include cb(300px, 80px);
56 // position: absolute;
57 // left: 0;
58 // right: 0;
59 // bottom: 48px;
60 margin: 60px auto 0;
61 }
62
63 }
1 <view class="comp-item">
2 <view class="cspace"></view>
3 <view class="cont">
4 <view class="tit">订单提交成功！</view>
5 <view class="prize">
6 <image class="image" mode="aspectFit" />
7 </view>
8 <view class="name">某东购物卡200元</view>
9 <button class="btn" bindtap="onInnerButtonHandler">{{innerButton}}</button>
10 <view class="tips">您可以在“个人中心→我的订单”中查看物流进度</view>
11 </view>
12 </view>
...@@ -34,8 +34,7 @@ module.exports = { ...@@ -34,8 +34,7 @@ module.exports = {
34 sign: '/sign', // post 签到动作 用户注册接口 34 sign: '/sign', // post 签到动作 用户注册接口
35 sginRecord: '/sgin/record', // post 签到记录 用户注册接口 35 sginRecord: '/sgin/record', // post 签到记录 用户注册接口
36 36
37 provinceQuery: 'https://ow.go.qudone.com/warubiEyeCreamApi/app/store/province', // post 省 37 areaQuery: 'https://api.k.wxpai.cn/bizproxy/kdapi/area', // post 区域查询
38 cityQuery: 'https://ow.go.qudone.com/warubiEyeCreamApi/app/store/city', // post 省
39 38
40 uploadFile: '/kdapi/file/upload' //上传图片通用接口 39 uploadFile: '/kdapi/file/upload' //上传图片通用接口
41 } 40 }
......
...@@ -28,9 +28,9 @@ Page({ ...@@ -28,9 +28,9 @@ Page({
28 this.initData(); 28 this.initData();
29 }, 29 },
30 initData() { 30 initData() {
31 this.setData({ 31 // this.setData({
32 commonTipsCompVisible: true 32 // commonTipsCompVisible: false
33 }) 33 // })
34 }, 34 },
35 /** 35 /**
36 * 提交表单 36 * 提交表单
......
...@@ -2,6 +2,7 @@ let app = getApp(); ...@@ -2,6 +2,7 @@ let app = getApp();
2 Page({ 2 Page({
3 data: { 3 data: {
4 authorizeVisible: false, 4 authorizeVisible: false,
5 commonTipsCompVisible: true,
5 }, 6 },
6 onShareAppMessage() {}, 7 onShareAppMessage() {},
7 showAuth() { 8 showAuth() {
...@@ -21,7 +22,31 @@ Page({ ...@@ -21,7 +22,31 @@ Page({
21 */ 22 */
22 onAddressManagementHandler() { 23 onAddressManagementHandler() {
23 app.router.push({ 24 app.router.push({
24 path:"addressManagement" 25 path: "addressManagement"
25 }) 26 })
26 } 27 },
28 // 隐藏蒙层
29 hideMask() {
30 this.setData({
31 authorizeVisible: false,
32 commonTipsCompVisible: false,
33 })
34 },
35 // 子组件事件
36 evtcomp(evt) {
37 let {
38 name,
39 data
40 } = evt.detail;
41 switch (name) {
42
43 // 隐藏弹窗
44 case "_evt_common_comp_button":
45 this.hideMask();
46 break;
47
48 default:
49 break;
50 }
51 },
27 }) 52 })
......
...@@ -61,3 +61,6 @@ ...@@ -61,3 +61,6 @@
61 <van-popup show="{{ authorizeVisible }}" > 61 <van-popup show="{{ authorizeVisible }}" >
62 <authorize-comp bind:evtcomp="evtcomp"></authorize-comp> 62 <authorize-comp bind:evtcomp="evtcomp"></authorize-comp>
63 </van-popup> 63 </van-popup>
64 <van-popup show="{{ commonTipsCompVisible }}">
65 <common-tips-comp bind:evtcomp="evtcomp" inner-title="积分不足" inner-text="使用推广、签到功能\n可获取更多积分！" inner-button="我知道了"></common-tips-comp>
66 </van-popup>
......
...@@ -2,6 +2,7 @@ let app = getApp(); ...@@ -2,6 +2,7 @@ let app = getApp();
2 Page({ 2 Page({
3 data: { 3 data: {
4 authorizeVisible: false, 4 authorizeVisible: false,
5 orderSubmitSuccessTipsCompVisible: true,
5 productList: ["", "", ""] 6 productList: ["", "", ""]
6 }, 7 },
7 onShareAppMessage() {}, 8 onShareAppMessage() {},
...@@ -18,5 +19,29 @@ Page({ ...@@ -18,5 +19,29 @@ Page({
18 app.router.push({ 19 app.router.push({
19 path: "giftDetail" 20 path: "giftDetail"
20 }); 21 });
21 } 22 },
23 // 隐藏蒙层
24 hideMask() {
25 this.setData({
26 authorizeVisible: false,
27 orderSubmitSuccessTipsCompVisible: false,
28 })
29 },
30 // 子组件事件
31 evtcomp(evt) {
32 let {
33 name,
34 data
35 } = evt.detail;
36 switch (name) {
37
38 // 隐藏弹窗
39 case "_evt_common_comp_button":
40 this.hideMask();
41 break;
42
43 default:
44 break;
45 }
46 },
22 }) 47 })
......
...@@ -39,6 +39,9 @@ ...@@ -39,6 +39,9 @@
39 </view> 39 </view>
40 </view> 40 </view>
41 </view> 41 </view>
42 <van-popup show="{{ authorizeVisible }}" > 42 <van-popup show="{{ authorizeVisible }}">
43 <authorize-comp bind:evtcomp="evtcomp"></authorize-comp> 43 <authorize-comp bind:evtcomp="evtcomp"></authorize-comp>
44 </van-popup> 44 </van-popup>
45 <van-popup show="{{ orderSubmitSuccessTipsCompVisible }}">
46 <order-submit-success-tips-comp bind:evtcomp="evtcomp" inner-title="积分不足" inner-text="使用推广、签到功能\n可获取更多积分！" inner-button="我知道了"></order-submit-success-tips-comp>
47 </van-popup>
......
...@@ -2,6 +2,38 @@ let app = getApp(); ...@@ -2,6 +2,38 @@ let app = getApp();
2 Page({ 2 Page({
3 data: { 3 data: {
4 authorizeVisible: false, 4 authorizeVisible: false,
5 navIndex: 0,
6 navList: [{
7 t1: "全部",
8 t2: "",
9 index: 0,
10 },
11 {
12 t1: "300",
13 t2: "购买积分",
14 index: 1,
15 },
16 {
17 t1: "200",
18 t2: "推广积分",
19 index: 2,
20 },
21 {
22 t1: "50",
23 t2: "签到积分",
24 index: 3,
25 },
26 {
27 t1: "300",
28 t2: "奖励积分",
29 index: 4,
30 },
31 {
32 t1: "300",
33 t2: "兑换积分",
34 index: 5,
35 },
36 ],
5 }, 37 },
6 onShareAppMessage() {}, 38 onShareAppMessage() {},
7 showAuth() { 39 showAuth() {
......
1 { 1 {
2 "navigationBarTitleText": "more" 2 "navigationBarTitleText": "积分明细"
3 } 3 }
......
1 @import '../../assets/scss/mixins'; 1 @import '../../assets/scss/mixins';
2 @import '../../assets/scss/utils'; 2 @import '../../assets/scss/utils';
3 3
4 $contentWidth:690px;
5
4 .page { 6 .page {
7 padding-bottom: $pageBottom;
8
9
5 .bgc {} 10 .bgc {}
6 11
7 .bg {} 12 .bg {}
8 13
9 .main { 14 .main {
15
16 font-size: 28px;
17 color: #333333;
18
10 .top-space { 19 .top-space {
11 height: 0px; 20 height: 20px;
12 } 21 }
13 22
14 .content { 23 .content {
24
15 position: relative; 25 position: relative;
26 width: $contentWidth;
27 margin: 0 auto;
28
29 .func {
30 display: flex;
31 justify-content: space-between;
32 align-items: flex-end;
33
34 .info {
35 font-size: 32px;
36 color: #333333;
37
38 .t1 {
39 font-size: 72px;
40 color: #3680EB;
41 }
42 }
43
44 .sel {
45 font-size: 28px;
46 color: #3680EB;
47 padding: 4px 16px;
48 @extend .fcc;
49 background-color: rgba($color: #3680EB, $alpha: 0.05);
50 border-radius: 4px;
51 margin-bottom: 12px;
52
53 .icon {
54 width: 32px;
55 height: 32px;
56 margin: 8px;
57 }
58 }
59 }
60
61 // 标签
62 .tag {
63 position: relative;
64 display: flex;
65 justify-content: space-between;
66 margin: 18px auto 0;
67
68 &-item {
69 position: relative;
70 width: 94px;
71 height: 100px;
72
73 .ebg {
74 position: absolute;
75 left: 0;
76 right: 0;
77 top: 0;
78 margin: 0 auto;
79 width: 94px;
80 height: 114px;
81 }
82
83 .desc {
84 position: relative;
85 color: #999999;
86 width: 94px;
87 height: 100px;
88 @extend .fcc;
89 flex-wrap: wrap;
90
91 .t1 {
92 font-size: 28px;
93 }
94
95 .t2 {
96 font-size: 20px;
97 margin-top: -32px;
98 }
99 }
100
101 .act {
102 color: #FFFFFF;
103 }
104 }
105 }
106
107 // 标题
108 .tit {
109 width: $contentWidth;
110 height: 40px;
111 font-size: 20px;
112 color: #3680EB;
113 background: rgba($color: #3680EB, $alpha: 0.05);
114 // border-radius: 20px;
115 margin: 26px auto 0;
116 display: flex;
117
118 .tt {
119 height: 40px;
120 line-height: 40px;
121 }
122
123 .t1 {
124 margin-left: 30px;
125 }
126
127 .t2 {
128 margin-left: 152px;
129 }
130
131 .t3 {
132 margin-left: 112px;
133 }
134
135 .t4 {
136 margin-left: 148px;
137
138 }
139 }
140
141 // 积分
142 .integral {
143
144 // display: flex;
145 &-item {
146 display: flex;
147 justify-content: space-between;
148 border-bottom: solid 1px #dddddd;
149 $itemHeight: 104px;
150 height: $itemHeight;
151
152 .tt {
153 @extend .fcc;
154 }
155
156 .t1 {
157 width: 200px;
158 }
159
160 .t2 {
161 width: 152px;
162 }
163
164 .t3 {
165 flex: 1;
166 }
167
168 .t4 {
169 width: 100px;
170 color: #7ED321;
171 }
172
173 .minus {
174 color: #E62435;
175 }
176 }
177 }
16 } 178 }
17 } 179 }
18 } 180 }
......
...@@ -3,9 +3,47 @@ ...@@ -3,9 +3,47 @@
3 <view class="app__bg bg"></view> 3 <view class="app__bg bg"></view>
4 <view class="app__content main"> 4 <view class="app__content main">
5 <view class="top-space"></view> 5 <view class="top-space"></view>
6 <view class="content"></view> 6 <view class="content">
7 <view class="func">
8 <view class="info">
9 现有积分
10 <span class="t1">360</span>
11 分
12 </view>
13 <view class="sel">
14 <image class="icon" mode="aspectFit" src="../../image/icon/icon-calendar.png" />
15 时间筛选
16 </view>
17 </view>
18 <!-- 标签 -->
19 <view class="tag">
20 <view data-index="{{index}}" wx:for="{{navList}}" wx:key="{{index}}" class="tag-item">
21 <image wx:if="{{navIndex==index}}" class="ebg" mode="aspectFit" src="../../image/icon/icon-integral-tag.png" />
22 <view class="desc {{navIndex == index ? 'act' : ''}}">
23 <view class="t1">{{item.t1}}</view>
24 <view class="t2">{{item.t2}}</view>
25 </view>
26 </view>
27 </view>
28 <!-- 标题 -->
29 <view class="tit">
30 <view class="tt t1">时间</view>
31 <view class="tt t2">获取方式</view>
32 <view class="tt t3">积分</view>
33 <view class="tt t4 minus">积分</view>
34 </view>
35 <!-- 积分 -->
36 <view class="integral">
37 <view class="integral-item">
38 <view class="tt t1">2019.03.13</view>
39 <view class="tt t2">扫码获取</view>
40 <view class="tt t3">产品名称</view>
41 <view class="tt t4 minus">+1000</view>
42 </view>
43 </view>
44 </view>
7 </view> 45 </view>
8 </view> 46 </view>
9 <van-popup show="{{ authorizeVisible }}" > 47 <van-popup show="{{ authorizeVisible }}">
10 <authorize-comp bind:evtcomp="evtcomp"></authorize-comp> 48 <authorize-comp bind:evtcomp="evtcomp"></authorize-comp>
11 </van-popup> 49 </van-popup>
......
1 { 1 {
2 "navigationBarTitleText": "demo" 2 "navigationBarTitleText": "我的消息"
3 } 3 }
......
1 @import '../../assets/scss/mixins'; 1 @import '../../assets/scss/mixins';
2 @import '../../assets/scss/utils'; 2 @import '../../assets/scss/utils';
3 3
4 $contentWidth:690px;
5
4 .page { 6 .page {
5 .bgc {} 7 .bgc {}
8
9 .bg {}
6 10
7 .bg {} 11 .main {
12 font-size: 28px;
13 color: #333333;
14
15 .top-space {
16 height: 30px;
17 }
8 18
9 .main { 19 .content {
10 .top-space { 20 width: $contentWidth;
11 height: 0px; 21 margin: 0 auto;
22 position: relative;
23
24 .func {
25 display: flex;
26 justify-content: space-between;
27
28 &-item {
29 color: #3680EB;
12 } 30 }
13 31
14 .content { 32 &-item2 {
15 position: relative; 33 color: #E62435;
34 }
35 }
36
37 .news {
38 margin: 30px auto 0;
39
40 &-item {
41
42 .tit {
43 display: flex;
44 justify-content: space-between;
45 align-items: center;
46
47 &-item {
48 .t1 {
49 padding: 4px 12px;
50 display: inline-block;
51 background: #F8F8F8;
52 border-radius: 8px;
53 color: #3680EB;
54 }
55
56 // 删除
57 .t2 {
58 color: #E62435;
59 }
60 }
61 }
62
63 .desc {
64 margin: 16px auto 0;
65 color: #666666;
66 }
16 } 67 }
68 }
17 } 69 }
70 }
18 } 71 }
......
1 <view class="page"> 1 <view class="page">
2 <view class="app__bgc bgc"></view> 2 <view class="app__bgc bgc"></view>
3 <view class="app__bg bg"></view> 3 <view class="app__bg bg"></view>
4 <!-- <view class="app__top-shadow"></view> --> 4 <view class="app__content main">
5 <view class="app__content main"> 5 <view class="top-space"></view>
6 <view class="top-space"></view> 6 <view class="content">
7 <view class="content"></view> 7 <view class="func">
8 </view> 8 <view class="func-item ">全部标为已读</view>
9 <view class="func-item func-item2">删除已读消息</view>
10 </view>
11 <view class="news">
12 <view class="border news-item">
13 <view class="tit">
14 <view class="tit-item">订单消息</view>
15 <view class="tit-item">
16 <span class="t1">标记已读</span>
17 </view>
18 </view>
19 <view class="desc">您的订单 2357123413491 已通过审核！</view>
20 </view>
21 </view>
22 </view>
23 </view>
9 </view> 24 </view>
10 <van-popup show="{{ authorizeVisible }}" > 25 <van-popup show="{{ authorizeVisible }}">
11 <authorize-comp bind:evtcomp="evtcomp"></authorize-comp> 26 <authorize-comp bind:evtcomp="evtcomp"></authorize-comp>
12 </van-popup> 27 </van-popup>
......
1 import {
2 getBindtapData
3 } from '../../utils/util';
4
1 let app = getApp(); 5 let app = getApp();
2 Page({ 6 Page({
3 data: { 7 data: {
4 authorizeVisible: false, 8 authorizeVisible: false,
9 navIndex: 0
5 }, 10 },
6 onShareAppMessage() {}, 11 onShareAppMessage() {},
7 showAuth() { 12 showAuth() {
...@@ -9,5 +14,30 @@ Page({ ...@@ -9,5 +14,30 @@ Page({
9 authorizeVisible: true 14 authorizeVisible: true
10 }) 15 })
11 }, 16 },
12 onLoad(options) {} 17 onLoad(options) {
18 let {
19 navIndex
20 } = options;
21 console.log("navIndex:", navIndex);
22 if (navIndex) {
23 this.setData({
24 navIndex: navIndex
25 })
26 }
27 },
28 /**
29 * 选择导航
30 * @param {*} evt
31 */
32 onNavSelectHandler(evt) {
33 let navIndex = this.data.navIndex;
34 let curIndex = getBindtapData(evt, "index");
35 console.log("curIndex:", curIndex);
36 if (navIndex != curIndex) {
37 this.setData({
38 navIndex: curIndex
39 })
40 }
41 },
42
13 }) 43 })
......
1 { 1 {
2 "navigationBarTitleText": "more" 2 "navigationBarTitleText": "我的订单"
3 } 3 }
......
1 @import '../../assets/scss/mixins'; 1 @import '../../assets/scss/mixins';
2 @import '../../assets/scss/utils'; 2 @import '../../assets/scss/utils';
3 3
4 $contentWidth:690px;
5
4 .page { 6 .page {
7 padding-bottom: $pageBottom;
8
5 .bgc {} 9 .bgc {}
6 10
7 .bg {} 11 .bg {}
...@@ -13,6 +17,144 @@ ...@@ -13,6 +17,144 @@
13 17
14 .content { 18 .content {
15 position: relative; 19 position: relative;
20
21 // 导航
22 .nav {
23 display: flex;
24 justify-content: space-between;
25 align-items: center;
26 position: relative;
27 margin: 0 auto;
28 width: 750px;
29 @extend .bb;
30 padding: 0 30px;
31 background: #3680EB;
32 height: 100px;
33
34 &-item {
35 position: relative;
36 width: 20%;
37 @extend .fcc;
38 height: 100px;
39 // line-height: 100px;
40
41 .tit {
42 text-align: center;
43 font-size: 32px;
44 color: rgba($color: #FFFFFF, $alpha: 0.5);
45 }
46
47 .line {
48 position: absolute;
49 // margin: 12px auto 0;
50 left: 0;
51 right: 0;
52 bottom: 0;
53 margin: 0 auto;
54 width: 0px;
55 height: 6px;
56 border-radius: 4px;
57 background: #FFFFFF;
58 transition: width 0.2s ease;
59 align-self: flex-end;
60 }
61 }
62
63 &-item-act {
64 .tit {
65 color: rgba($color: #FFFFFF, $alpha: 1);
66 }
67
68 .line {
69 width: 60px;
70 }
71 }
72 }
73
74 // 卡片
75 .card {
76 width: $contentWidth;
77 margin: 20px auto 0;
78
79 &-item {
80 padding: 24px 30px 16px;
81 margin: 0 auto 20px;
82
83 .no {
84 font-size: 24px;
85 color: #999999;
86 }
87
88 .line {
89 width: 100%;
90 height: 2px;
91 background: #F0F0F0;
92 margin: 18px 0;
93 }
94
95 .cont {
96 display: flex;
97 height: 140px;
98
99 .prize {
100 @extend .fcc;
101 width: 140px;
102 height: 140px;
103 border: solid 1px #F0F0F0;
104 border-radius: 8px;
105
106 .image {
107 width: 120px;
108 height: 120px;
109 }
110 }
111
112 .detail {
113 // margin-left: 24px;
114 padding-left: 24px;
115 @extend .bb;
116 height: 140px;
117
118 display: flex;
119 flex-wrap: wrap;
120 align-content: space-between;
121
122 .t1 {
123 width: 100%;
124 font-size: 32px;
125 color: #333333;
126 }
127
128 .t2 {
129 font-size: 24px;
130 color: #999999;
131 }
132
133 .t3 {
134 font-size: 24px;
135 color: #3680EB;
136 }
137 }
138 }
139
140 .logistics {
141 font-size: 24px;
142 color: #333333;
143
144 &-item {
145 display: flex;
146 margin-bottom: 12px;
147
148 .label {
149 width: 120px;
150 }
151
152 .val {}
153 }
154 }
155
156 }
157 }
16 } 158 }
17 } 159 }
18 } 160 }
......
...@@ -3,9 +3,95 @@ ...@@ -3,9 +3,95 @@
3 <view class="app__bg bg"></view> 3 <view class="app__bg bg"></view>
4 <view class="app__content main"> 4 <view class="app__content main">
5 <view class="top-space"></view> 5 <view class="top-space"></view>
6 <view class="content"></view> 6 <view class="content">
7 <!-- 导航 -->
8 <view class="nav">
9 <view bindtap="onNavSelectHandler" data-index="0" class="nav-item {{navIndex == 0 ? 'nav-item-act':''}}">
10 <view class="tit">全部订单</view>
11 <view class="line"></view>
12 </view>
13 <view bindtap="onNavSelectHandler" data-index="1" class="nav-item {{navIndex == 1 ? 'nav-item-act':''}}">
14 <view class="tit">待审核</view>
15 <view class="line"></view>
16 </view>
17 <view bindtap="onNavSelectHandler" data-index="2" class="nav-item {{navIndex == 2 ? 'nav-item-act':''}}">
18 <view class="tit">已通过</view>
19 <view class="line"></view>
20 </view>
21 <view bindtap="onNavSelectHandler" data-index="3" class="nav-item {{navIndex == 3 ? 'nav-item-act':''}}">
22 <view class="tit">已发货</view>
23 <view class="line"></view>
24 </view>
25 <view bindtap="onNavSelectHandler" data-index="4" class="nav-item {{navIndex == 4 ? 'nav-item-act':''}}">
26 <view class="tit">未通过</view>
27 <view class="line"></view>
28 </view>
29 </view>
30 <!-- 卡片 -->
31 <view class="card">
32 <view class="border card-item">
33 <view class="no">订单编号：2357123413491</view>
34 <view class="line"></view>
35 <view class="cont">
36 <view class="prize">
37 <image class="image" mode="aspectFit" />
38 </view>
39 <view class="detail">
40 <view class="t1">某东购物卡200元</view>
41 <view class="t1 t2">消耗积分：1000分</view>
42 <view class="t1 t3">处理中</view>
43 </view>
44 </view>
45 <view class="line"></view>
46 <view class="logistics">
47 <view class="logistics-item">
48 <view class="label">收货地址</view>
49 <view class="val">深圳市龙岗区XXX路</view>
50 </view>
51 <view class="logistics-item">
52 <view class="label">物流公司</view>
53 <view class="val">待定</view>
54 </view>
55 <view class="logistics-item">
56 <view class="label">物流单号</view>
57 <view class="val">暂定</view>
58 </view>
59 </view>
60 </view>
61
62 <view class="border card-item">
63 <view class="no">订单编号：2357123413491</view>
64 <view class="line"></view>
65 <view class="cont">
66 <view class="prize">
67 <image class="image" mode="aspectFit" />
68 </view>
69 <view class="detail">
70 <view class="t1">某东购物卡200元</view>
71 <view class="t1 t2">消耗积分：1000分</view>
72 <view class="t1 t3">处理中</view>
73 </view>
74 </view>
75 <view class="line"></view>
76 <view class="logistics">
77 <view class="logistics-item">
78 <view class="label">收货地址</view>
79 <view class="val">深圳市龙岗区XXX路</view>
80 </view>
81 <view class="logistics-item">
82 <view class="label">物流公司</view>
83 <view class="val">待定</view>
84 </view>
85 <view class="logistics-item">
86 <view class="label">物流单号</view>
87 <view class="val">暂定</view>
88 </view>
89 </view>
90 </view>
91 </view>
92 </view>
7 </view> 93 </view>
8 </view> 94 </view>
9 <van-popup show="{{ authorizeVisible }}" > 95 <van-popup show="{{ authorizeVisible }}">
10 <authorize-comp bind:evtcomp="evtcomp"></authorize-comp> 96 <authorize-comp bind:evtcomp="evtcomp"></authorize-comp>
11 </van-popup> 97 </van-popup>
......
...@@ -2,6 +2,7 @@ let app = getApp(); ...@@ -2,6 +2,7 @@ let app = getApp();
2 Page({ 2 Page({
3 data: { 3 data: {
4 authorizeVisible: false, 4 authorizeVisible: false,
5 giftRankTipsCompVisible: true,
5 }, 6 },
6 onShareAppMessage() {}, 7 onShareAppMessage() {},
7 showAuth() { 8 showAuth() {
...@@ -9,5 +10,29 @@ Page({ ...@@ -9,5 +10,29 @@ Page({
9 authorizeVisible: true 10 authorizeVisible: true
10 }) 11 })
11 }, 12 },
12 onLoad(options) {} 13 onLoad(options) {},
14 // 隐藏蒙层
15 hideMask() {
16 this.setData({
17 authorizeVisible: false,
18 giftRankTipsCompVisible: false,
19 })
20 },
21 // 子组件事件
22 evtcomp(evt) {
23 let {
24 name,
25 data
26 } = evt.detail;
27 switch (name) {
28
29 // 隐藏弹窗
30 case "_evt_hide_mask":
31 this.hideMask();
32 break;
33
34 default:
35 break;
36 }
37 },
13 }) 38 })
......
1 { 1 {
2 "navigationBarTitleText": "more" 2 "navigationBarTitleText": "我的排行奖励"
3 } 3 }
......
1 @import '../../assets/scss/mixins'; 1 @import '../../assets/scss/mixins';
2 @import '../../assets/scss/utils'; 2 @import '../../assets/scss/utils';
3 3
4 $contentWidth:690px;
5
4 .page { 6 .page {
7
8
5 .bgc {} 9 .bgc {}
6 10
7 .bg {} 11 .bg {}
8 12
9 .main { 13 .main {
14 font-size: 28px;
15 color: #333333;
16
10 .top-space { 17 .top-space {
11 height: 0px; 18 height: 20px;
12 } 19 }
13 20
14 .content { 21 .content {
15 position: relative; 22 position: relative;
23
24 .gift {
25 width: $contentWidth;
26 margin: 0 auto 0;
27
28 &-item {
29 @extend .bb;
30 padding: 30px 0;
31 display: flex;
32 justify-content: space-between;
33 align-items: center;
34
35 .prize {
36 margin: 0 30px;
37
38 .image {
39 width: 120px;
40 height: 120px;
41 }
42 }
43
44 .cont {
45 position: relative;
46 height: 100%;
47 flex: 1;
48 display: flex;
49 flex-wrap: wrap;
50 align-content: space-between;
51
52 .t1 {
53 align-self: center;
54 padding: 4px 0;
55 }
56
57 .t2 {
58 font-size: 24px;
59 color: #999999;
60 }
61
62 .t3 {
63 font-size: 24px;
64 color: #3680EB;
65 }
66 }
67
68 .btn {
69 @include cb(120px, 60px);
70 margin-right: 20px;
71 }
72 }
73 }
16 } 74 }
17 } 75 }
18 } 76 }
......
...@@ -3,9 +3,37 @@ ...@@ -3,9 +3,37 @@
3 <view class="app__bg bg"></view> 3 <view class="app__bg bg"></view>
4 <view class="app__content main"> 4 <view class="app__content main">
5 <view class="top-space"></view> 5 <view class="top-space"></view>
6 <view class="content"></view> 6 <view class="content">
7 <view class="gift">
8 <view class="border gift-item">
9 <view class="prize">
10 <image class="image" mode="aspectFit" src="../../image/icon/icon-gift-red-package.png" />
11 </view>
12 <view class="cont">
13 <view class="t1">88元微信红包 1 个</view>
14 <view class="t1 t2">190701-190714</view>
15 <view class="t1 t3">推广积分排行第一名</view>
16 </view>
17 <view class="btn">领取</view>
18 </view>
19 <view class="border gift-item">
20 <view class="prize">
21 <image class="image" mode="aspectFit" src="../../image/icon/icon-gift-integral.png" />
22 </view>
23 <view class="cont">
24 <view class="t1">88元微信红包 1 个</view>
25 <view class="t1 t2">190701-190714</view>
26 <view class="t1 t3">推广积分排行第一名</view>
27 </view>
28 <view class="btn">领取</view>
29 </view>
30 </view>
31 </view>
7 </view> 32 </view>
8 </view> 33 </view>
9 <van-popup show="{{ authorizeVisible }}" > 34 <van-popup show="{{ authorizeVisible }}">
10 <authorize-comp bind:evtcomp="evtcomp"></authorize-comp> 35 <authorize-comp bind:evtcomp="evtcomp"></authorize-comp>
11 </van-popup> 36 </van-popup>
37 <van-popup show="{{ giftRankTipsCompVisible }}">
38 <gift-rank-tips-comp bind:evtcomp="evtcomp"></gift-rank-tips-comp>
39 </van-popup>
......
...@@ -33,6 +33,16 @@ Page({ ...@@ -33,6 +33,16 @@ Page({
33 } 33 }
34 }, 34 },
35 35
36 /**
37 * 排行榜奖励
38 * @param {*} evt
39 */
40 onRankGiftHandler(evt) {
41 app.router.push({
42 path: "rankGift"
43 })
44 },
45
36 // 滚动到底部 分页加载 46 // 滚动到底部 分页加载
37 onRankScrolltolower(e) { 47 onRankScrolltolower(e) {
38 48
......
...@@ -127,7 +127,7 @@ ...@@ -127,7 +127,7 @@
127 </view> 127 </view>
128 <!-- 我的奖励按钮 --> 128 <!-- 我的奖励按钮 -->
129 <view class="btn-wrap"> 129 <view class="btn-wrap">
130 <view class="btn"> 130 <view bindtap="onRankGiftHandler" class="btn">
131 <image class="integral" mode="aspectFit" src="../../image/icon/icon-rank-rewrad.png" /> 131 <image class="integral" mode="aspectFit" src="../../image/icon/icon-rank-rewrad.png" />
132 我的奖励 132 我的奖励
133 </view> 133 </view>
......
1 { 1 {
2 "navigationBarTitleText": "more" 2 "navigationBarTitleText": "获得积分"
3 } 3 }
......
...@@ -7,12 +7,71 @@ ...@@ -7,12 +7,71 @@
7 .bg {} 7 .bg {}
8 8
9 .main { 9 .main {
10 color: #333333;
11 font-size: 28px;
12
10 .top-space { 13 .top-space {
11 height: 0px; 14 height: 110px;
12 } 15 }
13 16
14 .content { 17 .content {
15 position: relative; 18 position: relative;
19
20 .scan {
21 height: 900px;
22
23 .result {
24 .tips {
25 display: inline-block;
26 width: 100%;
27 text-align: center;
28
29 .t1{
30 color: #057FF3;
31 }
32 }
33
34 .btn-wrap {
35 margin: 114px auto 0;
36
37 .btn {
38 @include cb(320px, 84px);
39 margin: 0 auto 40px;
40 }
41
42 .btn2 {
43 background: transparent;
44 border: solid 1px #3680EB;
45 color: #3680EB;
46 }
47 }
48 }
49
50 .success {
51 .tips1 {
52 font-size: 44px;
53 margin: 212px auto 0;
54 }
55
56 .tips2 {
57 margin-top: 10px;
58 font-size: 28px;
59 color: #999999;
60 }
61 }
62
63 .fail {
64 .tips1 {
65 font-size: 32px;
66 margin: 232px auto 0;
67 font-weight: bold;
68 }
69 }
70
71
72
73
74 }
16 } 75 }
17 } 76 }
18 } 77 }
......
...@@ -3,9 +3,31 @@ ...@@ -3,9 +3,31 @@
3 <view class="app__bg bg"></view> 3 <view class="app__bg bg"></view>
4 <view class="app__content main"> 4 <view class="app__content main">
5 <view class="top-space"></view> 5 <view class="top-space"></view>
6 <view class="content">scan-result</view> 6 <view class="content">
7 <view class="border scan">
8 <view wx:if="{{1>0}}" class="result success">
9 <text class="tips tips1">恭喜获得10积分!</text>
10 <view class="tips tips2">
11 账户共有
12 <span class="t1">350</span>
13 积分
14 </view>
15 <view class="btn-wrap">
16 <view class="btn">再扫一次</view>
17 <view class="btn btn2">查看我的积分</view>
18 </view>
19 </view>
20 <view wx:else class="result fail">
21 <text class="tips tips1">此产品码已被扫过！\n若有异常，请联系客服</text>
22 <view class="btn-wrap">
23 <view class="btn">再扫一次</view>
24 <view class="btn btn2">联系客服</view>
25 </view>
26 </view>
27 </view>
28 </view>
7 </view> 29 </view>
8 </view> 30 </view>
9 <van-popup show="{{ authorizeVisible }}" > 31 <van-popup show="{{ authorizeVisible }}">
10 <authorize-comp bind:evtcomp="evtcomp"></authorize-comp> 32 <authorize-comp bind:evtcomp="evtcomp"></authorize-comp>
11 </van-popup> 33 </van-popup>
......
1 { 1 {
2 "navigationBarTitleText": "demo" 2 "navigationBarTitleText": "签到记录"
3 } 3 }
......
1 @import '../../assets/scss/mixins'; 1 @import '../../assets/scss/mixins';
2 @import '../../assets/scss/utils'; 2 @import '../../assets/scss/utils';
3 3
4 $contentWidth:690px;
5
4 .page { 6 .page {
5 .bgc {} 7 .bgc {}
8
9 .bg {}
6 10
7 .bg {} 11 .main {
12 font-size: 28px;
13 color: #333333;
14
15 .top-space {
16 height: 0px;
17 }
8 18
9 .main { 19 .content {
10 .top-space { 20 position: relative;
11 height: 0px; 21 width: 690px;
22 margin: 0 auto;
23
24 .func {
25 @extend .fcc;
26 height: 80px;
27 border-bottom: solid 1px #DDDDDD;
28 font-size: 32px;
29 color: #3680EB;
30
31 .icon {
32 width: 32px;
33 height: 32px;
34 margin: 0 8px;
12 } 35 }
13 36
14 .content { 37 .arrow {
15 position: relative; 38 width: 12px;
39 height: 8px;
40 margin: 0 8px;
41 }
42 }
43
44 .sign {
45 &-item {
46 display: flex;
47 justify-content: space-between;
48 border-bottom: solid 1px #DDDDDD;
49 padding: 30px 0;
50
51 .date {
52 display: flex;
53 justify-items: center;
54 }
55
56 .desc {
57 display: flex;
58 justify-items: center;
59
60 .green {
61 margin: 0 4px;
62 color: #7ED321;
63 }
64
65 .red {
66 color: #FF7900;
67
68 }
69 }
16 } 70 }
71 }
17 } 72 }
73 }
18 } 74 }
......
1 <view class="page"> 1 <view class="page">
2 <view class="app__bgc bgc"></view> 2 <view class="app__bgc bgc"></view>
3 <view class="app__bg bg"></view> 3 <view class="app__bg bg"></view>
4 <!-- <view class="app__top-shadow"></view> --> 4 <!-- <view class="app__top-shadow"></view> -->
5 <view class="app__content main"> 5 <view class="app__content main">
6 <view class="top-space"></view> 6 <view class="top-space"></view>
7 <view class="content"></view> 7 <view class="content">
8 </view> 8 <view class="func">
9 <image class="icon" mode="aspectFit" src="../../image/icon/icon-sign-record.png" />
10 时间筛选
11 <image class="arrow" mode="aspectFit" src="../../image/icon/icon-filter-down-on.png" />
12 </view>
13 <view class="sign">
14 <view class="sign-item">
15 <view class="date">2019.03.13</view>
16 <view class="desc">
17 签到成功，获得
18 <span class="green red">1</span>
19 红包
20 </view>
21 </view>
22 </view>
23 </view>
24 </view>
9 </view> 25 </view>
10 <van-popup show="{{ authorizeVisible }}" > 26 <van-popup show="{{ authorizeVisible }}">
11 <authorize-comp bind:evtcomp="evtcomp"></authorize-comp> 27 <authorize-comp bind:evtcomp="evtcomp"></authorize-comp>
12 </van-popup> 28 </van-popup>
......
...@@ -8,8 +8,9 @@ Page({ ...@@ -8,8 +8,9 @@ Page({
8 authorizeVisible: false, 8 authorizeVisible: false,
9 commonTipsCompVisible: false, 9 commonTipsCompVisible: false,
10 signTipsCompVisible: false, 10 signTipsCompVisible: false,
11 innerTitle: "留言提交成功！", 11 giftSignTipsCompVisible: false,
12 innerText: "感谢您宝贵的意见\n我们将尽快回电或回复信息", 12 innerTitle: "",
13 innerText: "",
13 // innerButton: "", 14 // innerButton: "",
14 userInfo: {}, // 用户数据 15 userInfo: {}, // 用户数据
15 signInfo: [], // 签到数据 16 signInfo: [], // 签到数据
...@@ -65,6 +66,38 @@ Page({ ...@@ -65,6 +66,38 @@ Page({
65 }); 66 });
66 }, 67 },
67 68
69
70 /**
71 * 签到记录
72 */
73 onsignInRecordHandler(evt) {
74 app.router.push({
75 path: "signInRecord"
76 })
77 },
78
79 /**
80 * 积分详情
81 */
82 onIntegralDetailHandler(evt) {
83 app.router.push({
84 path: "integralDetail"
85 })
86 },
87
88 /**
89 * 我的订单
90 */
91 onMyOrderHandler(evt) {
92 let navIndex = getBindtapData(evt, "index");
93 app.router.push({
94 path: "myOrder",
95 query: {
96 navIndex: navIndex
97 }
98 })
99 },
100
68 /** 101 /**
69 * 我的二维码 102 * 我的二维码
70 */ 103 */
...@@ -84,6 +117,24 @@ Page({ ...@@ -84,6 +117,24 @@ Page({
84 }, 117 },
85 118
86 /** 119 /**
120 * 地址管理
121 */
122 onAddressHandler(evt) {
123 app.router.push({
124 path: "addressManagement"
125 })
126 },
127
128 /**
129 * 我的消息
130 */
131 onMyMessageHandler(evt) {
132 app.router.push({
133 path: "myMessage"
134 })
135 },
136
137 /**
87 * 点击联系我们 138 * 点击联系我们
88 */ 139 */
89 onContactUsHandler(evt) { 140 onContactUsHandler(evt) {
...@@ -149,7 +200,8 @@ Page({ ...@@ -149,7 +200,8 @@ Page({
149 this.setData({ 200 this.setData({
150 authorizeVisible: false, 201 authorizeVisible: false,
151 commonTipsCompVisible: false, 202 commonTipsCompVisible: false,
152 signTipsCompVisible: false 203 signTipsCompVisible: false,
204 giftSignTipsCompVisible: false
153 }) 205 })
154 }, 206 },
155 // 子组件事件 207 // 子组件事件
......
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
19 </view> 19 </view>
20 <!-- 右边栏 --> 20 <!-- 右边栏 -->
21 <view class="user-data"> 21 <view class="user-data">
22 <view class="wrap"> 22 <view bindtap="onIntegralDetailHandler" class="wrap">
23 <view class="t1">{{userInfo.memberPoints}}</view> 23 <view class="t1">{{userInfo.memberPoints}}</view>
24 <view class="t2">我的积分</view> 24 <view class="t2">我的积分</view>
25 </view> 25 </view>
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
39 <view class="border sign "> 39 <view class="border sign ">
40 <view class="tit"> 40 <view class="tit">
41 <view class="t1">连续签到7天赢现金红包</view> 41 <view class="t1">连续签到7天赢现金红包</view>
42 <view class="t2"> 42 <view bindtap="onsignInRecordHandler" class="t2">
43 <image class="icon" mode="aspectFit" src="../../image/icon/icon-sign-record.png" /> 43 <image class="icon" mode="aspectFit" src="../../image/icon/icon-sign-record.png" />
44 签到记录 44 签到记录
45 </view> 45 </view>
...@@ -61,31 +61,31 @@ ...@@ -61,31 +61,31 @@
61 </view> 61 </view>
62 <!-- 订单区 --> 62 <!-- 订单区 -->
63 <view class="border order "> 63 <view class="border order ">
64 <view class="order-item"> 64 <view bindtap="onMyOrderHandler" data-index="0" class="order-item">
65 <view class="icon-wrap"> 65 <view class="icon-wrap">
66 <image class="icon" mode="aspectFit" src="../../image/icon/icon-all-order.png" /> 66 <image class="icon" mode="aspectFit" src="../../image/icon/icon-all-order.png" />
67 </view> 67 </view>
68 <view class="txt">全部订单</view> 68 <view class="txt">全部订单</view>
69 </view> 69 </view>
70 <view class="order-item"> 70 <view bindtap="onMyOrderHandler" data-index="1" class="order-item">
71 <view class="icon-wrap"> 71 <view class="icon-wrap">
72 <image class="icon" mode="aspectFit" src="../../image/icon/icon-wait-review.png" /> 72 <image class="icon" mode="aspectFit" src="../../image/icon/icon-wait-review.png" />
73 </view> 73 </view>
74 <view class="txt">待审核</view> 74 <view class="txt">待审核</view>
75 </view> 75 </view>
76 <view class="order-item"> 76 <view bindtap="onMyOrderHandler" data-index="2" class="order-item">
77 <view class="icon-wrap"> 77 <view class="icon-wrap">
78 <image class="icon" mode="aspectFit" src="../../image/icon/icon-review-pass.png" /> 78 <image class="icon" mode="aspectFit" src="../../image/icon/icon-review-pass.png" />
79 </view> 79 </view>
80 <view class="txt">已通过</view> 80 <view class="txt">已通过</view>
81 </view> 81 </view>
82 <view class="order-item"> 82 <view bindtap="onMyOrderHandler" data-index="3" class="order-item">
83 <view class="icon-wrap"> 83 <view class="icon-wrap">
84 <image class="icon" mode="aspectFit" src="../../image/icon/icon-shipped.png" /> 84 <image class="icon" mode="aspectFit" src="../../image/icon/icon-shipped.png" />
85 </view> 85 </view>
86 <view class="txt">已发货</view> 86 <view class="txt">已发货</view>
87 </view> 87 </view>
88 <view class="order-item"> 88 <view bindtap="onMyOrderHandler" data-index="4" class="order-item">
89 <view class="icon-wrap"> 89 <view class="icon-wrap">
90 <image class="icon" mode="aspectFit" src="../../image/icon/icon-up-pass.png" /> 90 <image class="icon" mode="aspectFit" src="../../image/icon/icon-up-pass.png" />
91 </view> 91 </view>
...@@ -106,13 +106,13 @@ ...@@ -106,13 +106,13 @@
106 </view> 106 </view>
107 <view class="txt">积分排行</view> 107 <view class="txt">积分排行</view>
108 </view> 108 </view>
109 <view class="func-wrap-item"> 109 <view bindtap="onAddressHandler" class="func-wrap-item">
110 <view class="icon-wrap"> 110 <view class="icon-wrap">
111 <image class="icon" mode="aspectFit" src="../../image/icon/icon-my-address.png" /> 111 <image class="icon" mode="aspectFit" src="../../image/icon/icon-my-address.png" />
112 </view> 112 </view>
113 <view class="txt">我的地址</view> 113 <view class="txt">我的地址</view>
114 </view> 114 </view>
115 <view class="func-wrap-item"> 115 <view bindtap="onMyMessageHandler" class="func-wrap-item">
116 <view class="icon-wrap"> 116 <view class="icon-wrap">
117 <image class="icon" mode="aspectFit" src="../../image/icon/icon-my-message.png" /> 117 <image class="icon" mode="aspectFit" src="../../image/icon/icon-my-message.png" />
118 </view> 118 </view>
...@@ -139,3 +139,6 @@ ...@@ -139,3 +139,6 @@
139 <van-popup show="{{ signTipsCompVisible }}"> 139 <van-popup show="{{ signTipsCompVisible }}">
140 <sign-tips-comp bind:evtcomp="evtcomp"></sign-tips-comp> 140 <sign-tips-comp bind:evtcomp="evtcomp"></sign-tips-comp>
141 </van-popup> 141 </van-popup>
142 <van-popup show="{{ giftSignTipsCompVisible }}">
143 <gift-sign-tips-comp bind:evtcomp="evtcomp"></gift-sign-tips-comp>
144 </van-popup>
......
...@@ -36,10 +36,10 @@ Page({ ...@@ -36,10 +36,10 @@ Page({
36 ], 36 ],
37 maxImg: 1, // 上传数量 37 maxImg: 1, // 上传数量
38 files: [], // 上传文件列表 38 files: [], // 上传文件列表
39 // provinceId: "", 39 provinceId: "",
40 // cityId: "", 40 cityId: "",
41 // provinceList: [], 41 provinceList: [],
42 // cityList: [], 42 cityList: [],
43 // form end 43 // form end
44 }, 44 },
45 onShareAppMessage() {}, 45 onShareAppMessage() {},
...@@ -52,7 +52,7 @@ Page({ ...@@ -52,7 +52,7 @@ Page({
52 this.initData(); 52 this.initData();
53 }, 53 },
54 initData() { 54 initData() {
55 55 this.getProvince();
56 }, 56 },
57 57
58 /** 58 /**
...@@ -62,33 +62,58 @@ Page({ ...@@ -62,33 +62,58 @@ Page({
62 62
63 }, 63 },
64 64
65 // getProvince() { 65 getProvince() {
66 // return new Promise((resolve, reject) => { 66 return new Promise((resolve, reject) => {
67 // app.post({ 67 app.post({
68 // mode: "custom", 68 mode: "custom",
69 // url: app.api.provinceQuery 69 url: app.api.areaQuery,
70 // }).then((result) => { 70 data: {
71 // this.setData({ 71 parentId: ""
72 // provinceList: result 72 }
73 // }) 73 }).then((result) => {
74 // console.log("provinceList:",result); 74 this.setData({
75 // }) 75 provinceList: result
76 // }); 76 })
77 // }, 77 console.log("provinceList:", result);
78 // getCity() { 78 })
79 // return new Promise((resolve, reject) => { 79 });
80 // app.post({ 80 },
81 // url: app.api.cityQuery, 81
82 // data: { 82 getCity() {
83 // parentId: this.data.provinceId 83 return new Promise((resolve, reject) => {
84 // } 84 app.post({
85 // }).then((result) => { 85 mode: "custom",
86 // this.setData({ 86 url: app.api.areaQuery,
87 // cityList: result 87 data: {
88 // }) 88 parentId: this.data.provinceId
89 // }) 89 }
90 // }); 90 }).then((result) => {
91 // }, 91 this.setData({
92 cityList: result
93 })
94 console.log("city:", result);
95 })
96 });
97 },
98
99 bindPickerChangeProvince(e) {
100 let index = e.detail.value;
101 this.setData({
102 provinceIndex: index,
103 provinceId: this.data.provinceList[index].areaId,
104 cityList: [],
105 cityIndex: -1,
106 })
107 this.getCity();
108 },
109
110 bindPickerChangeCity(e) {
111 let index = e.detail.value;
112 this.setData({
113 cityIndex: index,
114 cityId: this.data.cityList[index].areaId,
115 })
116 },
92 117
93 /** 118 /**
94 * 参考 contact-table同名方法 119 * 参考 contact-table同名方法
......
...@@ -26,9 +26,13 @@ ...@@ -26,9 +26,13 @@
26 <view class="form-item"> 26 <view class="form-item">
27 <view class="label">区域</view> 27 <view class="label">区域</view>
28 <view class="cont address"> 28 <view class="cont address">
29 <view class="area">省份</view> 29 <picker class="area" bindchange="bindPickerChangeProvince" value="{{provinceIndex}}" range="{{provinceList}}" range-key="areaName">
30 {{provinceList[provinceIndex].areaName ? provinceList[provinceIndex].areaName : '省'}}
31 </picker>
30 <view class="line"></view> 32 <view class="line"></view>
31 <view class="area">城市</view> 33 <picker class="area" bindchange="bindPickerChangeCity" value="{{cityIndex}}" range="{{cityList}}" range-key="areaName">
34 {{cityList[cityIndex].areaName ? cityList[cityIndex].areaName : '市'}}
35 </picker>
32 </view> 36 </view>
33 </view> 37 </view>
34 <view class="form-item"> 38 <view class="form-item">
......