合并分支 'Branch_jsk' 到 'master'

end



查看合并请求 !7

@@ -20,10 +20,6 @@
 	/* #ifndef APP-NVUE */
 	@import '@/static/customicons.css';
 	// 设置整个项目的背景色
-	page {
-		background-color: #f5f5f5;
-	}
-
 	/* #endif */
 	.example-info {
 		font-size: 14px;

@@ -49,7 +49,7 @@
     /* 快应用特有相关 */
     "mp-weixin" : {
         /* 小程序特有相关 */
-        "appid" : "wx484f044b7502ff85",
+        "appid" : "wx44fe7a472a10bce1",
         "setting" : {
             "urlCheck" : false,
             "checkSiteMap" : false,

@@ -133,6 +133,16 @@
             }
             
         }
+        ,{
+            "path" : "pages/invitationList/invitationList",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "邀请列表",
+				"navigationBarTextStyle":"black",
+                "enablePullDownRefresh": false
+            }
+            
+        }
     ],
 	"globalStyle": {
 		"navigationBarTextStyle": "black",

@@ -8,12 +8,12 @@
 				<view class="firstBoxText">100人</view>
 			</view>
 			<view class="twoBox flex flexColumn justifyBetween">
-				<view class="twoBoxContainer flex">
+				<view class="twoBoxContainer flex" @click="getQrcode">
 					<image src="/static/evering/ic_icon.png" mode="widthFix"></image>
 					<view class="twoBoxContainerText">生成专属邀请码</view>
 				</view>
 				<view class="line1" style="width: 574rpx;height: 1rpx; background-color: #8F939C;"></view>
-				<view class="twoBoxContainer flex">
+				<view class="twoBoxContainer flex" @click="getList">
 					<image src="/static/evering/ic_List.png" mode="widthFix"></image>
 					<view class="twoBoxContainerText">查看邀请列表</view>
 				</view>
@@ -38,7 +38,18 @@ export default {
 			}
 		};
 	},
-	methods: {}
+	methods: {
+		getQrcode(){
+			uni.navigateTo({
+				url:'/pages/invitation_Haoyou/invitation_Haoyou'
+			})
+		},
+		getList(){
+			uni.navigateTo({
+				url:'/pages/invitationList/invitationList'
+			})
+		}
+	}
 };
 </script>
 

+<template>
+	<view>
+		<uni-search-bar
+			@confirm="search"
+			:radius="16"
+			:focus="true"
+			v-model="searchValue"
+			@input="input"
+			@clear="clear"
+			:clearButton="'always'"
+			:cancelButton="'none'"
+			:bgColor="'#f6f8fa'"
+		></uni-search-bar>
+		<view class="yaoqingList">
+			<view class="yaoqingHeader flex justifyBetween alignC">
+				<view class="yaoqingHeaderLift flex justifyC alignC">
+					全部
+					<image src="../../static/evering/ic_21.png" mode="widthFix"></image>
+				</view>
+				<view class="yaoqingHeaderRight">共有120人</view>
+			</view>
+			<view class="yaoqingPerson flex" v-for="(item, i) in yaoqingPerson" :key="i">
+				<image :src="item.personImage" mode="widthFix" class="personImage"></image>
+				<view class="personMessage">
+					<view class="personMessageOne flex justifyBetween">
+						<view class="personName">{{ item.personName }}</view>
+						<view class="personXX">{{ item.personXX }}</view>
+					</view>
+					<view class="personMessageTwo flex justifyBetween" style="margin-top: 10rpx;">
+						<view class="personPhone">{{ item.personPhone }}</view>
+						<view class="personTime">{{ item.personTime }}</view>
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+export default {
+	data() {
+		return {
+			searchValue: '',
+			yaoqingPerson: [
+				{
+					personImage: '/static/evering/touXiang.png',
+					personName: '孙美丽',
+					personXX: '已报名',
+					personPhone: '18742564459',
+					personTime: '2020-12-19'
+				},
+				{
+					personImage: '/static/evering/touXiang.png',
+					personName: '孙美丽',
+					personXX: '已报名',
+					personPhone: '18742564459',
+					personTime: '2020-12-19'
+				},
+				{
+					personImage: '/static/evering/touXiang.png',
+					personName: '孙美丽',
+					personXX: '',
+					personPhone: '18742564459',
+					personTime: '2020-12-19'
+				},
+				{
+					personImage: '/static/evering/touXiang.png',
+					personName: '孙美丽',
+					personXX: '已报名',
+					personPhone: '18742564459',
+					personTime: '2020-12-19'
+				}
+			]
+		};
+	},
+	methods: {
+		input(res) {
+			console.log('----input:', res);
+		},
+		clear(res) {
+			console.log('----clear:', res);
+		}
+	}
+};
+</script>
+
+<style>
+.yaoqingList {
+	margin-top: 12rpx;
+	padding: 0 32rpx;
+}
+.yaoqingHeader {
+	margin-bottom: 40rpx;
+}
+.yaoqingHeaderLift {
+	width: 156rpx;
+	height: 64rpx;
+	background-image: url(/static/evering/ic_20.png);
+	background-size: cover;
+	color: rgba(50, 50, 51, 1);
+	font-size: 28rpx;
+	font-weight: 400;
+}
+.yaoqingHeaderLift image {
+	width: 20rpx;
+	height: 20rpx;
+	margin-left: 18rpx;
+}
+.yaoqingHeaderRight {
+	height: 36rpx;
+	color: rgba(50, 50, 51, 1);
+	font-size: 26rpx;
+	font-weight: 400;
+	text-align: left;
+}
+.yaoqingPerson {
+	width: 686rpx;
+	height: 112rpx;
+	margin-top: 32rpx;
+}
+
+.personImage {
+	width: 80rpx;
+	height: 80rpx;
+	margin-right: 26rpx;
+	border-radius: 40rpx;
+}
+.personMessage {
+	width: 580rpx;
+	height: 112rpx;
+	border-bottom: 1rpx #ebedf0 solid;
+}
+.personName {
+	height: 40rpx;
+	color: rgba(50, 50, 51, 1);
+	font-size: 28rpx;
+	font-weight: 600;
+	font-family: 'PingFang SC';
+}
+.personXX {
+	width: 72rpx;
+	height: 34rpx;
+	opacity: 1;
+	color: rgba(254, 149, 21, 1);
+	font-size: 24rpx;
+	font-weight: 600;
+	font-family: 'PingFang SC';
+}
+.personPhone {
+	height: 34rpx;
+	opacity: 1;
+	color: rgba(50, 50, 51, 1);
+	font-size: 24rpx;
+	font-weight: 400;
+	font-family: 'PingFang SC';
+	text-align: left;
+}
+.personTime {
+	height: 34rpx;
+	opacity: 1;
+	color: rgba(50, 50, 51, 1);
+	font-size: 24rpx;
+	font-weight: 400;
+	font-family: 'PingFang SC';
+	text-align: left;
+}
+</style>

 {
 	"uni-search-bar.cancel": "cancel",
-	"uni-search-bar.placeholder": "请输入搜索内容"
+	"uni-search-bar.placeholder": "可搜索昵称"
 }