合并分支 'Branch_jsk' 到 'master'
end 查看合并请求 !7
正在显示
8 个修改的文件
包含
193 行增加
和
9 行删除
@@ -20,10 +20,6 @@ | @@ -20,10 +20,6 @@ | ||
20 | /* #ifndef APP-NVUE */ | 20 | /* #ifndef APP-NVUE */ |
21 | @import '@/static/customicons.css'; | 21 | @import '@/static/customicons.css'; |
22 | // 设置整个项目的背景色 | 22 | // 设置整个项目的背景色 |
23 | - page { | ||
24 | - background-color: #f5f5f5; | ||
25 | - } | ||
26 | - | ||
27 | /* #endif */ | 23 | /* #endif */ |
28 | .example-info { | 24 | .example-info { |
29 | font-size: 14px; | 25 | font-size: 14px; |
@@ -49,7 +49,7 @@ | @@ -49,7 +49,7 @@ | ||
49 | /* 快应用特有相关 */ | 49 | /* 快应用特有相关 */ |
50 | "mp-weixin" : { | 50 | "mp-weixin" : { |
51 | /* 小程序特有相关 */ | 51 | /* 小程序特有相关 */ |
52 | - "appid" : "wx484f044b7502ff85", | 52 | + "appid" : "wx44fe7a472a10bce1", |
53 | "setting" : { | 53 | "setting" : { |
54 | "urlCheck" : false, | 54 | "urlCheck" : false, |
55 | "checkSiteMap" : false, | 55 | "checkSiteMap" : false, |
@@ -133,6 +133,16 @@ | @@ -133,6 +133,16 @@ | ||
133 | } | 133 | } |
134 | 134 | ||
135 | } | 135 | } |
136 | + ,{ | ||
137 | + "path" : "pages/invitationList/invitationList", | ||
138 | + "style" : | ||
139 | + { | ||
140 | + "navigationBarTitleText": "邀请列表", | ||
141 | + "navigationBarTextStyle":"black", | ||
142 | + "enablePullDownRefresh": false | ||
143 | + } | ||
144 | + | ||
145 | + } | ||
136 | ], | 146 | ], |
137 | "globalStyle": { | 147 | "globalStyle": { |
138 | "navigationBarTextStyle": "black", | 148 | "navigationBarTextStyle": "black", |
@@ -8,12 +8,12 @@ | @@ -8,12 +8,12 @@ | ||
8 | <view class="firstBoxText">100人</view> | 8 | <view class="firstBoxText">100人</view> |
9 | </view> | 9 | </view> |
10 | <view class="twoBox flex flexColumn justifyBetween"> | 10 | <view class="twoBox flex flexColumn justifyBetween"> |
11 | - <view class="twoBoxContainer flex"> | 11 | + <view class="twoBoxContainer flex" @click="getQrcode"> |
12 | <image src="/static/evering/ic_icon.png" mode="widthFix"></image> | 12 | <image src="/static/evering/ic_icon.png" mode="widthFix"></image> |
13 | <view class="twoBoxContainerText">生成专属邀请码</view> | 13 | <view class="twoBoxContainerText">生成专属邀请码</view> |
14 | </view> | 14 | </view> |
15 | <view class="line1" style="width: 574rpx;height: 1rpx; background-color: #8F939C;"></view> | 15 | <view class="line1" style="width: 574rpx;height: 1rpx; background-color: #8F939C;"></view> |
16 | - <view class="twoBoxContainer flex"> | 16 | + <view class="twoBoxContainer flex" @click="getList"> |
17 | <image src="/static/evering/ic_List.png" mode="widthFix"></image> | 17 | <image src="/static/evering/ic_List.png" mode="widthFix"></image> |
18 | <view class="twoBoxContainerText">查看邀请列表</view> | 18 | <view class="twoBoxContainerText">查看邀请列表</view> |
19 | </view> | 19 | </view> |
@@ -38,7 +38,18 @@ export default { | @@ -38,7 +38,18 @@ export default { | ||
38 | } | 38 | } |
39 | }; | 39 | }; |
40 | }, | 40 | }, |
41 | - methods: {} | 41 | + methods: { |
42 | + getQrcode(){ | ||
43 | + uni.navigateTo({ | ||
44 | + url:'/pages/invitation_Haoyou/invitation_Haoyou' | ||
45 | + }) | ||
46 | + }, | ||
47 | + getList(){ | ||
48 | + uni.navigateTo({ | ||
49 | + url:'/pages/invitationList/invitationList' | ||
50 | + }) | ||
51 | + } | ||
52 | + } | ||
42 | }; | 53 | }; |
43 | </script> | 54 | </script> |
44 | 55 |
pages/invitationList/invitationList.vue
0 → 100644
1 | +<template> | ||
2 | + <view> | ||
3 | + <uni-search-bar | ||
4 | + @confirm="search" | ||
5 | + :radius="16" | ||
6 | + :focus="true" | ||
7 | + v-model="searchValue" | ||
8 | + @input="input" | ||
9 | + @clear="clear" | ||
10 | + :clearButton="'always'" | ||
11 | + :cancelButton="'none'" | ||
12 | + :bgColor="'#f6f8fa'" | ||
13 | + ></uni-search-bar> | ||
14 | + <view class="yaoqingList"> | ||
15 | + <view class="yaoqingHeader flex justifyBetween alignC"> | ||
16 | + <view class="yaoqingHeaderLift flex justifyC alignC"> | ||
17 | + 全部 | ||
18 | + <image src="../../static/evering/ic_21.png" mode="widthFix"></image> | ||
19 | + </view> | ||
20 | + <view class="yaoqingHeaderRight">共有120人</view> | ||
21 | + </view> | ||
22 | + <view class="yaoqingPerson flex" v-for="(item, i) in yaoqingPerson" :key="i"> | ||
23 | + <image :src="item.personImage" mode="widthFix" class="personImage"></image> | ||
24 | + <view class="personMessage"> | ||
25 | + <view class="personMessageOne flex justifyBetween"> | ||
26 | + <view class="personName">{{ item.personName }}</view> | ||
27 | + <view class="personXX">{{ item.personXX }}</view> | ||
28 | + </view> | ||
29 | + <view class="personMessageTwo flex justifyBetween" style="margin-top: 10rpx;"> | ||
30 | + <view class="personPhone">{{ item.personPhone }}</view> | ||
31 | + <view class="personTime">{{ item.personTime }}</view> | ||
32 | + </view> | ||
33 | + </view> | ||
34 | + </view> | ||
35 | + </view> | ||
36 | + </view> | ||
37 | +</template> | ||
38 | + | ||
39 | +<script> | ||
40 | +export default { | ||
41 | + data() { | ||
42 | + return { | ||
43 | + searchValue: '', | ||
44 | + yaoqingPerson: [ | ||
45 | + { | ||
46 | + personImage: '/static/evering/touXiang.png', | ||
47 | + personName: '孙美丽', | ||
48 | + personXX: '已报名', | ||
49 | + personPhone: '18742564459', | ||
50 | + personTime: '2020-12-19' | ||
51 | + }, | ||
52 | + { | ||
53 | + personImage: '/static/evering/touXiang.png', | ||
54 | + personName: '孙美丽', | ||
55 | + personXX: '已报名', | ||
56 | + personPhone: '18742564459', | ||
57 | + personTime: '2020-12-19' | ||
58 | + }, | ||
59 | + { | ||
60 | + personImage: '/static/evering/touXiang.png', | ||
61 | + personName: '孙美丽', | ||
62 | + personXX: '', | ||
63 | + personPhone: '18742564459', | ||
64 | + personTime: '2020-12-19' | ||
65 | + }, | ||
66 | + { | ||
67 | + personImage: '/static/evering/touXiang.png', | ||
68 | + personName: '孙美丽', | ||
69 | + personXX: '已报名', | ||
70 | + personPhone: '18742564459', | ||
71 | + personTime: '2020-12-19' | ||
72 | + } | ||
73 | + ] | ||
74 | + }; | ||
75 | + }, | ||
76 | + methods: { | ||
77 | + input(res) { | ||
78 | + console.log('----input:', res); | ||
79 | + }, | ||
80 | + clear(res) { | ||
81 | + console.log('----clear:', res); | ||
82 | + } | ||
83 | + } | ||
84 | +}; | ||
85 | +</script> | ||
86 | + | ||
87 | +<style> | ||
88 | +.yaoqingList { | ||
89 | + margin-top: 12rpx; | ||
90 | + padding: 0 32rpx; | ||
91 | +} | ||
92 | +.yaoqingHeader { | ||
93 | + margin-bottom: 40rpx; | ||
94 | +} | ||
95 | +.yaoqingHeaderLift { | ||
96 | + width: 156rpx; | ||
97 | + height: 64rpx; | ||
98 | + background-image: url(/static/evering/ic_20.png); | ||
99 | + background-size: cover; | ||
100 | + color: rgba(50, 50, 51, 1); | ||
101 | + font-size: 28rpx; | ||
102 | + font-weight: 400; | ||
103 | +} | ||
104 | +.yaoqingHeaderLift image { | ||
105 | + width: 20rpx; | ||
106 | + height: 20rpx; | ||
107 | + margin-left: 18rpx; | ||
108 | +} | ||
109 | +.yaoqingHeaderRight { | ||
110 | + height: 36rpx; | ||
111 | + color: rgba(50, 50, 51, 1); | ||
112 | + font-size: 26rpx; | ||
113 | + font-weight: 400; | ||
114 | + text-align: left; | ||
115 | +} | ||
116 | +.yaoqingPerson { | ||
117 | + width: 686rpx; | ||
118 | + height: 112rpx; | ||
119 | + margin-top: 32rpx; | ||
120 | +} | ||
121 | + | ||
122 | +.personImage { | ||
123 | + width: 80rpx; | ||
124 | + height: 80rpx; | ||
125 | + margin-right: 26rpx; | ||
126 | + border-radius: 40rpx; | ||
127 | +} | ||
128 | +.personMessage { | ||
129 | + width: 580rpx; | ||
130 | + height: 112rpx; | ||
131 | + border-bottom: 1rpx #ebedf0 solid; | ||
132 | +} | ||
133 | +.personName { | ||
134 | + height: 40rpx; | ||
135 | + color: rgba(50, 50, 51, 1); | ||
136 | + font-size: 28rpx; | ||
137 | + font-weight: 600; | ||
138 | + font-family: 'PingFang SC'; | ||
139 | +} | ||
140 | +.personXX { | ||
141 | + width: 72rpx; | ||
142 | + height: 34rpx; | ||
143 | + opacity: 1; | ||
144 | + color: rgba(254, 149, 21, 1); | ||
145 | + font-size: 24rpx; | ||
146 | + font-weight: 600; | ||
147 | + font-family: 'PingFang SC'; | ||
148 | +} | ||
149 | +.personPhone { | ||
150 | + height: 34rpx; | ||
151 | + opacity: 1; | ||
152 | + color: rgba(50, 50, 51, 1); | ||
153 | + font-size: 24rpx; | ||
154 | + font-weight: 400; | ||
155 | + font-family: 'PingFang SC'; | ||
156 | + text-align: left; | ||
157 | +} | ||
158 | +.personTime { | ||
159 | + height: 34rpx; | ||
160 | + opacity: 1; | ||
161 | + color: rgba(50, 50, 51, 1); | ||
162 | + font-size: 24rpx; | ||
163 | + font-weight: 400; | ||
164 | + font-family: 'PingFang SC'; | ||
165 | + text-align: left; | ||
166 | +} | ||
167 | +</style> |
static/evering/ic_20.png
0 → 100644
10.2 KB
static/evering/ic_21.png
0 → 100644
1.1 KB
-
请 注册 或 登录 后发表评论