修改小程序

pages/home/index.vue

@@ -8,7 +8,7 @@
 				<button size="mini" class="button" type="primary" @click="toInput">搜索</button>
 			</view>
 		</view>
-		<view class="two">
+		<view class="two" v-if="total>0">
 			<scroll-view :scroll-top="scrollTop" scroll-y="true" class="scroll-view" @scrolltolower="toPage"
 				@scroll="toScroll">
 				<view class="list-scroll-view">
@@ -23,8 +23,8 @@
 								<span>{{getTime(item.start_time,item.end_time)||'暂无'}}</span>
 							</view>
 							<view class="list_left">
-								<text class="t-icon t-icon-zuobiao"></text>
-								<span>{{item.address||'在线活动'}}</span>
+								<text class="t-icon t-icon-gonglve"></text>
+								<span>{{getDict(item.match_type,'type')||'自办'}}</span>
 							</view>
 							<view class="list_right"
 								:class="[item.match_status=='0'?'active_1':item.match_status=='1'?'active_2':item.match_status=='2'?'active_3':'active_4']">
@@ -38,6 +38,7 @@
 				</view>
 			</scroll-view>
 		</view>
+		<o-empty v-else />
 		<view class="fixd" @tap="goTop" v-if="showDiv">
 			<text class="t-icon t-icon-fanhuidingbu"></text>
 		</view>
@@ -62,7 +63,8 @@
 				oldScrollTop: 0,
 				showDiv: false,
 				// 字典表
-				statusList: []
+				statusList: [],
+				typeList: []
 			}
 		},
 		onLoad: async function(e) {
@@ -110,6 +112,12 @@
 					is_use: '0',
 				})
 				if (res.errcode == '0') that.$set(that, `statusList`, res.data)
+				// 赛事类型
+				res = await that.$api(`/dictData`, 'GET', {
+					code: 'activeType',
+					is_use: '0',
+				})
+				if (res.errcode == '0') that.$set(that, `typeList`, res.data)
 			},
 			// 查询
 			async search() {
@@ -163,6 +171,7 @@
 				const that = this;
 				let res
 				if (model == 'status') res = that.statusList.find(i => i.value == item)
+				else if (model == 'type') res = that.typeList.find(i => i.value == item)
 				if (res) return res.label
 				else return '暂无'
 			},

pagesHome/login/index.vue

@@ -217,10 +217,10 @@
 <style lang="scss">
 	.main {
 		position: relative;
-		background-image: url('../../static/loginbg.jpg');
-		background-repeat: no-repeat;
-		background-size: cover;
-		background-position: center;
+		// background-image: url('../../static/loginbg.jpg');
+		// background-repeat: no-repeat;
+		// background-size: cover;
+		// background-position: center;
 
 		.overlay {
 			position: absolute;

pagesHome/match/index.vue

@@ -13,11 +13,11 @@
 							<span>{{getTime(info.start_time,info.end_time)||'暂无'}}</span>
 						</view>
 						<view class="two_1 text_color">
-							<text class="t-icon t-icon-zuobiao"></text>
-							<span>{{info.address||'在线活动'}}</span>
+							<text class="t-icon t-icon-gonglve"></text>
+							<span>{{getDict(info.match_type,'type')||'自办'}}</span>
 						</view>
 						<view class="two_1 text_color">
-							<text class="t-icon t-icon-dianzan"></text>
+							<text class="t-icon t-icon-gongsi"></text>
 							<span>{{info.work||'暂无组织单位'}}</span>
 						</view>
 					</view>
@@ -143,7 +143,8 @@
 				config: {},
 				info: {},
 				// 字典表
-				statusList: []
+				statusList: [],
+				typeList: []
 			}
 		},
 		onLoad: async function(e) {
@@ -198,6 +199,12 @@
 					is_use: '0',
 				})
 				if (res.errcode == '0') that.$set(that, `statusList`, res.data);
+				// 赛事类型
+				res = await that.$api(`/dictData`, 'GET', {
+					code: 'activeType',
+					is_use: '0',
+				})
+				if (res.errcode == '0') that.$set(that, `typeList`, res.data)
 			},
 			// 查询
 			async search() {
@@ -230,6 +237,14 @@
 					return `${month}/${day < 10 ? '0' + day : day} ${weekday} ${start_hours.toString().padStart(2, '0')}:${start_minutes.toString().padStart(2, '0')} - ${end_hours.toString().padStart(2, '0')}:${end_minutes.toString().padStart(2, '0')} `;
 				}
 			},
+			// 处理字典表
+			getDict(item, model) {
+				const that = this;
+				let res
+				if (model == 'type') res = that.typeList.find(i => i.value == item)
+				if (res) return res.label
+				else return '暂无'
+			},
 			// 图片处理
 			getUrl(e) {
 				const that = this;

pagesHome/match/sign.vue

@@ -14,11 +14,11 @@
 				</view>
 			</view>
 			<view class="one_1 text_color">
-				<text class="t-icon t-icon-zuobiao"></text>
-				<span>{{info.address||'在线活动'}}</span>
+				<text class="t-icon t-icon-gonglve"></text>
+				<span>{{getDict(info.match_type,'type')||'自办'}}</span>
 			</view>
 			<view class="one_1 text_color">
-				<text class="t-icon t-icon-dianzan"></text>
+				<text class="t-icon t-icon-gongsi"></text>
 				<span>{{info.work||'暂无组织单位'}}</span>
 			</view>
 		</view>
@@ -99,6 +99,7 @@
 					communication: ""
 				},
 				info: {},
+				cTypeList: [],
 				typeList: [],
 				statusList: [],
 				errors: {}
@@ -131,13 +132,19 @@
 					code: 'cardType',
 					is_use: '0',
 				})
-				if (res.errcode == '0') that.$set(that, `typeList`, res.data);
+				if (res.errcode == '0') that.$set(that, `cTypeList`, res.data);
 				// 查询状态
 				res = await that.$api(`/dictData`, 'GET', {
 					code: 'matchStatus',
 					is_use: '0',
 				})
 				if (res.errcode == '0') that.$set(that, `statusList`, res.data)
+				// 赛事类型
+				res = await that.$api(`/dictData`, 'GET', {
+					code: 'activeType',
+					is_use: '0',
+				})
+				if (res.errcode == '0') that.$set(that, `typeList`, res.data)
 			},
 			// 查询
 			async search() {
@@ -176,6 +183,7 @@
 				const that = this;
 				let res
 				if (model == 'status') res = that.statusList.find(i => i.value == item)
+				else if (model == 'type') res = that.typeList.find(i => i.value == item)
 				if (res) return res.label
 				else return '暂无'
 			},

pagesHome/register/index.vue

@@ -272,10 +272,10 @@
 		width: 100vw;
 		min-height: 100vh;
 		position: relative;
-		background-image: url('../../static/loginbg.jpg');
-		background-repeat: no-repeat;
-		background-size: cover;
-		background-position: center;
+		// background-image: url('../../static/loginbg.jpg');
+		// background-repeat: no-repeat;
+		// background-size: cover;
+		// background-position: center;
 
 		.overlay {
 			position: absolute;

pagesMy/activity/detail.vue

@@ -10,11 +10,11 @@
 				<span>{{getTime(info.start_time,info.end_time)||'暂无'}}</span>
 			</view>
 			<view class="two_1 text_color">
-				<text class="t-icon t-icon-zuobiao"></text>
-				<span>{{info.address||'在线活动'}}</span>
+				<text class="t-icon t-icon-gonglve"></text>
+				<span>{{getDict(info.match_type,'type')||'自办'}}</span>
 			</view>
 			<view class="two_1 text_color">
-				<text class="t-icon t-icon-dianzan"></text>
+				<text class="t-icon t-icon-gongsi"></text>
 				<span>{{info.work||'暂无组织单位'}}</span>
 			</view>
 		</view>
@@ -209,6 +209,7 @@
 				score: {},
 				// 字典表
 				statusList: [],
+				cTypeList: [],
 				typeList: [],
 			}
 		},
@@ -254,7 +255,13 @@
 					code: 'cardType',
 					is_use: '0',
 				})
-				if (res.errcode == '0') that.$set(that, `typeList`, res.data);
+				if (res.errcode == '0') that.$set(that, `cTypeList`, res.data);
+				// 赛事类型
+				res = await that.$api(`/dictData`, 'GET', {
+					code: 'activeType',
+					is_use: '0',
+				})
+				if (res.errcode == '0') that.$set(that, `typeList`, res.data)
 			},
 			// 查询
 			async search() {
@@ -330,7 +337,8 @@
 				const that = this;
 				let res
 				if (model == 'status') res = that.statusList.find(i => i.value == item)
-				else if (model == 'cardType') res = that.typeList.find(i => i.value == item)
+				else if (model == 'cardType') res = that.cTypeList.find(i => i.value == item)
+				else if (model == 'type') res = that.typeList.find(i => i.value == item)
 				if (res) return res.label
 				else return '暂无'
 			},

pagesMy/activity/index.vue

@@ -11,9 +11,9 @@
 		<view class="two">
 			<tabs :tabs="tabs" @tabsChange="tabsChange">
 				<view class="tabsList">
-					<scroll-view scroll-y="true" class="scroll-view" @scrolltolower="toPage" @scroll="toScroll">
+					<scroll-view scroll-y="true" class="scroll-view" @scrolltolower="toPage" @scroll="toScroll" v-if="total>0">
 						<view class="list-scroll-view">
-							<view class="list" v-for="(item, index) in list" :key="index">
+							<view class="list" v-for="(item, index) in list" :key="index" @tap.stop="toView(item)">
 								<view class="list_1">
 									<image class="image" :src="getUrl(item.file)"></image>
 								</view>
@@ -24,23 +24,21 @@
 										<span>{{getTime(item.start_time,item.end_time)||'暂无'}}</span>
 									</view>
 									<view class="list_left">
-										<text class="t-icon t-icon-zuobiao"></text>
-										<span>{{item.address||'在线活动'}}</span>
+										<text class="t-icon t-icon-gonglve"></text>
+										<span>{{getDict(item.match_type,'type')||'自办'}}</span>
 									</view>
 									<view class="list_right"
 										:class="[item.match_status=='0'?'active_1':item.match_status=='1'?'active_2':item.match_status=='2'?'active_3':'active_4']">
 										{{getDict(item.match_status,'status')}}
 									</view>
 								</view>
-								<view class="list_4">
-									<button class="warning" size="mini" type="warn"	@tap.stop="toView(item)">查看详情</button>
-								</view>
 							</view>
 							<view class="is_bottom" v-if="is_bottom">
 								<text>{{config.bottom_title||'到底了！'}}</text>
 							</view>
 						</view>
 					</scroll-view>
+					<o-empty v-else />
 				</view>
 			</tabs>
 		</view>
@@ -71,7 +69,8 @@
 				// 数据是否触底
 				is_bottom: false,
 				scrollTop: 0,
-				statusList: []
+				statusList: [],
+				typeList: []
 			}
 		},
 		onLoad: async function(e) {
@@ -187,6 +186,7 @@
 				const that = this;
 				let res
 				if (model == 'status') res = that.statusList.find(i => i.value == item)
+				else if (model == 'type') res = that.typeList.find(i => i.value == item)
 				if (res) return res.label
 				else return '暂无'
 			},
@@ -215,6 +215,12 @@
 					is_use: '0',
 				})
 				if (res.errcode == '0') that.$set(that, `statusList`, res.data)
+				// 赛事类型
+				res = await that.$api(`/dictData`, 'GET', {
+					code: 'activeType',
+					is_use: '0',
+				})
+				if (res.errcode == '0') that.$set(that, `typeList`, res.data)
 			},
 			// 图片处理
 			getUrl(e) {

pagesMy/match/index.vue

@@ -11,7 +11,8 @@
 		<view class="two">
 			<tabs :tabs="tabs" @tabsChange="tabsChange">
 				<view class="tabsList">
-					<scroll-view scroll-y="true" class="scroll-view" @scrolltolower="toPage" @scroll="toScroll">
+					<scroll-view scroll-y="true" class="scroll-view" @scrolltolower="toPage" @scroll="toScroll"
+						v-if="total>0">
 						<view class="list-scroll-view">
 							<view class="list" v-for="(item, index) in list" :key="index" @tap="toView(item)">
 								<view class="list_1">
@@ -24,8 +25,8 @@
 										<span>{{getTime(item.start_time,item.end_time)||'暂无'}}</span>
 									</view>
 									<view class="list_left">
-										<text class="t-icon t-icon-zuobiao"></text>
-										<span>{{item.address||'在线活动'}}</span>
+										<text class="t-icon t-icon-gonglve"></text>
+										<span>{{getDict(item.match_type,'type')||'自办'}}</span>
 									</view>
 									<view class="list_right"
 										:class="[item.match_status=='0'?'active_1':item.match_status=='1'?'active_2':item.match_status=='2'?'active_3':'active_4']">
@@ -33,8 +34,10 @@
 									</view>
 								</view>
 								<view class="list_4">
-									<button class="warning" size="mini" type="warn"	@tap.stop="toSign(item)">报名信息</button>
-									<button class="warning" size="mini" type="warn"	@tap.stop="toScore(item)" v-if="item.match_status=='2'">分数列表</button>
+									<button class="warning" size="mini" type="warn"
+										@tap.stop="toSign(item)">报名信息</button>
+									<button class="warning" size="mini" type="warn" @tap.stop="toScore(item)"
+										v-if="item.match_status=='2'">分数列表</button>
 								</view>
 							</view>
 							<view class="is_bottom" v-if="is_bottom">
@@ -42,6 +45,7 @@
 							</view>
 						</view>
 					</scroll-view>
+					<o-empty v-else />
 				</view>
 			</tabs>
 		</view>
@@ -72,7 +76,8 @@
 				// 数据是否触底
 				is_bottom: false,
 				scrollTop: 0,
-				statusList: []
+				statusList: [],
+				typeList: []
 			}
 		},
 		onLoad: async function(e) {
@@ -193,6 +198,7 @@
 				const that = this;
 				let res
 				if (model == 'status') res = that.statusList.find(i => i.value == item)
+				else if (model == 'type') res = that.typeList.find(i => i.value == item)
 				if (res) return res.label
 				else return '暂无'
 			},
@@ -221,6 +227,12 @@
 					is_use: '0',
 				})
 				if (res.errcode == '0') that.$set(that, `statusList`, res.data)
+				// 赛事类型
+				res = await that.$api(`/dictData`, 'GET', {
+					code: 'activeType',
+					is_use: '0',
+				})
+				if (res.errcode == '0') that.$set(that, `typeList`, res.data)
 			},
 			// 图片处理
 			getUrl(e) {
@@ -357,19 +369,19 @@
 
 						.active_1 {
 							background: linear-gradient(to right, #4caf50, #a8f3b2);
-						
+
 						}
-						
+
 						.active_2 {
 							background: linear-gradient(to right, #2196f3, #a2ccec);
-						
+
 						}
-						
+
 						.active_3 {
 							background: linear-gradient(to right, #FF5722, #FF9800);
-						
+
 						}
-						
+
 						.active_4 {
 							background: linear-gradient(to right, #949698, #c6c9cc);
 						}

pagesMy/match/score.vue

@@ -12,7 +12,7 @@
 			<tabs :tabs="tabs" @tabsChange="tabsChange">
 				<view class="tabsList">
 					<scroll-view :scroll-top="scrollTop" scroll-y="true" class="scroll-view" @scrolltolower="toPage"
-						@scroll="toScroll">
+						@scroll="toScroll" v-if="total>0">
 						<view class="list-scroll-view">
 							<view class="list" v-for="(item, index) in list" :key="index">
 								<view class="value">
@@ -43,6 +43,7 @@
 							</view>
 						</view>
 					</scroll-view>
+					<o-empty v-else />
 				</view>
 			</tabs>
 		</view>

pagesMy/match/sign.vue

@@ -8,7 +8,7 @@
 				<button size="mini" class="button" type="primary" @click="toInput">搜索</button>
 			</view>
 		</view>
-		<view class="two">
+		<view class="two" v-if="total>0">
 			<scroll-view :scroll-top="scrollTop" scroll-y="true" class="scroll-view" @scrolltolower="toPage"
 				@scroll="toScroll">
 				<view class="list-scroll-view">
@@ -48,6 +48,7 @@
 				</view>
 			</scroll-view>
 		</view>
+		<o-empty v-else />
 		<uni-popup ref="popup" background-color="#fff" type="center" :is-mask-click="false" @change="change">
 			<view class="popup">
 				<view class="close">

uni_modules/o-empty/changelog.md

@@ -0,0 +1,7 @@
+## 1.1.0724（2023-07-24）
+- 优化 imgSize、height参数兼容性，数值可带可不带单位，不带则为rpx
+## 1.0.1（2023-06-13）
+- 优化部分代码
+- 新增 占位高度参数
+## 1.0.0（2022-10-04）
+初始化组件

uni_modules/o-empty/components/o-empty/o-empty.vue

@@ -0,0 +1,89 @@
+<template>
+	<view :class="['o-empty']" :style="Bg+Height">
+		<image :style="ImgSize" :src="Img" mode="aspectFit"></image>
+		<view class="text">{{text}}</view>
+		<view class="slot" v-if="$slots.default"> <slot></slot> </view>
+	</view>
+</template>
+
+<script>
+	export default {
+		name:'oEmpty',
+		// #ifdef MP-WEIXIN
+		options:{ virtualHost:true },
+		// #endif
+		props:{
+			
+			// img：缺省图片,可选值 error network search，支持传入图片URL，图片仅支持jpg/png/svg三种格式
+			// imgSize：缺省图尺寸,
+			// text：描述文字,
+			// bg：背景色
+            // height：组件占位最小高度，实际高度看是否被内容撑开
+			
+			img:{
+				type:String,
+				default:'e'
+			},
+			imgSize:{
+				type:[String,Number],
+				default:'320'
+			},
+			text:{
+				type:String,
+				default:'暂无数据'
+			},
+			bg:{
+				type:String,
+				default:'#fff'
+			},
+            height:{
+                type:String,
+                default:'480rpx'
+            }
+		},
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			
+		},
+		computed: {
+			Bg(){ return `backgroundColor:${this.bg};`},
+            Height(){
+				if(['rpx','px','rem','em','vw','vh','%'].includes(this.height)) return `minHeight:${this.height}`
+				else return `minHeight:${this.height}rpx`
+			},
+			Img(){
+				if(['error','network','search'].includes(this.img)) return require(`@/uni_modules/o-empty/static/${this.img}.svg`);
+				else if (this.img.endsWith('.jpg') || this.img.endsWith('.png') || this.img.endsWith('.svg')) return this.img;
+				else return require('@/uni_modules/o-empty/static/empty.svg')
+			},
+			ImgSize(){
+				if(['rpx','px','rem','em','vw','%'].includes(this.imgSize)) return `width:${this.imgSize};height:${this.imgSize};`
+				else return `width:${this.imgSize}rpx;height:${this.imgSize}rpx;`
+			}
+		},
+	}
+</script>
+
+<style lang="scss">
+	.o-empty{
+		// min-height:350rpx;
+		display: flex;
+		flex-direction: column;
+		padding: 64rpx 0!important;
+		align-items: center;
+		justify-content: center;
+		box-sizing: border-box;
+	}
+	.center{text-align: center;}
+	.text{
+		color:#969798;
+		padding: 20rpx 0;
+	}
+	.slot{
+		padding-top: 20rpx;
+	}
+</style>

uni_modules/o-empty/package.json

@@ -0,0 +1,84 @@
+{
+  "id": "o-empty",
+  "displayName": "o-empty 暂无数据 缺省页 空白数据 占位提示组件",
+  "version": "1.1.0724",
+  "description": "简单好用的暂无数据、Empty、缺省页、空白数据、占位提示组件, 内置通用无数据、错误、网络、搜索四类图标，支持传入图片URL",
+  "keywords": [
+    "Empty",
+    "缺省页",
+    "暂无数据",
+    "空白数据",
+    "占位提示"
+],
+  "repository": "",
+"engines": {
+  },
+"dcloudext": {
+    "sale": {
+      "regular": {
+        "price": "0.00"
+      },
+      "sourcecode": {
+        "price": "0.00"
+      }
+    },
+    "contact": {
+      "qq": "65166445"
+    },
+    "declaration": {
+      "ads": "无",
+      "data": "无",
+      "permissions": "无"
+    },
+    "npmurl": "",
+    "type": "component-vue"
+  },
+  "uni_modules": {
+    "dependencies": [],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "y",
+        "aliyun": "y"
+      },
+      "client": {
+        "Vue": {
+          "vue2": "y",
+          "vue3": "n"
+        },
+        "App": {
+          "app-vue": "y",
+          "app-nvue": "n"
+        },
+        "H5-mobile": {
+          "Safari": "y",
+          "Android Browser": "y",
+          "微信浏览器(Android)": "y",
+          "QQ浏览器(Android)": "y"
+        },
+        "H5-pc": {
+          "Chrome": "y",
+          "IE": "u",
+          "Edge": "y",
+          "Firefox": "y",
+          "Safari": "y"
+        },
+        "小程序": {
+          "微信": "y",
+          "阿里": "u",
+          "百度": "u",
+          "字节跳动": "u",
+          "QQ": "u",
+          "钉钉": "u",
+          "快手": "u",
+          "飞书": "u",
+        "京东": "u"
+        },
+        "快应用": {
+          "华为": "u",
+          "联盟": "u"
+        }
+      }
+    }
+  }
+}

uni_modules/o-empty/pages/index.vue

@@ -0,0 +1,30 @@
+<template>
+	<view class="h100">
+		<view class="title">基本用法</view>
+		<o-empty />
+		<view class="title">自定义背景色</view>
+		<o-empty img="error" bg="#f6f7f8" text="内容整理中.." />
+		<view class="title">自定义大小</view>
+		<o-empty img="search"  text="无搜索记录" imgSize="200" />
+		<view class="title">自定义插槽内容</view>
+		<o-empty img="network" text="网络中断" >
+			<button type="primary" size="mini">自定义按钮</button>
+		</o-empty>
+		<view class="title">自定义图片</view>
+		<!-- #ifndef MP -->
+		<o-empty img="../../static/icon.png" imgSize="180" text="自定义图片" height="50vh" />
+		<!-- #endif -->
+		<!-- #ifdef MP -->
+		<o-empty img="https://img.cdn.aliyun.dcloud.net.cn/guide/uniapp/gh_33446d7f7a26_430.jpg" imgSize="180" text="小程序需绝对路径" />
+		<!-- #endif -->
+	</view>
+</template>
+
+<style lang="scss">
+	.h100{
+		height:100vh;
+	}
+	.title{
+		padding: 20rpx 0 10rpx 20rpx;
+	}
+</style>

uni_modules/o-empty/readme.md

@@ -0,0 +1,54 @@
+# o-empty 暂无数据 缺省页 空白数据 占位提示组件
+
+## 描述
+Empty 简单易用 暂无数据 缺省页 空白数据 占位提示组件
+
+## 使用方法
+```html
+<template>
+	<view>
+		<view class="title">基本用法</view>
+		<o-empty />
+		<view class="title">自定义背景色</view>
+		<o-empty img="error" bg="#f6f7f8" text="内容整理中.." />
+		<view class="title">自定义大小</view>
+		<o-empty img="search"  text="无搜索记录" imgSize="200" />
+		<view class="title">自定义插槽内容</view>
+		<o-empty img="network" text="网络中断" >
+			<button type="primary" size="mini">自定义按钮</button>
+		</o-empty>
+		<view class="title">自定义图片</view>
+		<!-- #ifndef MP -->
+		<o-empty img="../../static/icon.png" imgSize="180" text="自定义图片" height="50vh" />
+		<!-- #endif -->
+		<!-- #ifdef MP -->
+		<o-empty img="https://img.cdn.aliyun.dcloud.net.cn/guide/uniapp/gh_33446d7f7a26_430.jpg" imgSize="180" text="小程序需绝对路径" />
+		<!-- #endif -->
+	</view>
+</template>
+
+<style lang="scss">
+	.title{
+		padding: 20rpx 0 10rpx 20rpx;
+	}
+</style>
+```
+
+
+
+## API
+
+#### oEmpty Props
+
+| 属性名    | 类型   | 默认值  | 可选值 | 说明                                 |
+| --------- | ------ | ------- | ----------------------------------- | ----------------------------------- |
+| img       | String | -   | network、search、error | 缺省图片，支持自定义图片，仅支持jpg/png/svg三种格式 |
+| imgSize   | String | 320rpx | rpx,px,rem,em,vw,% | 缺省图片大小，默认单位rpx |
+| text      | String | 暂无数据 |         | 缺省图下方描述文字             |
+| bg        | String | #fff | transparent | 组件背景，style模式                    |
+| height    | String | 480rpx | rpx,px,rem,em,vw,vh,% | 占位高度，style模式，支持calc()公式，默认单位rpx |
+
+
+
+
+

uni_modules/o-empty/static/empty.svg

@@ -0,0 +1,38 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 152 133">
+<defs>
+<linearGradient id="a" x1="0.65" y1="0.8" x2="0.65" gradientUnits="objectBoundingBox">
+    <stop offset="0" stop-color="#4d5a5a" stop-opacity="0"/>
+    <stop offset="1" stop-color="#4d5a5a" stop-opacity="0.12"/>
+</linearGradient>
+<linearGradient id="b" x1="0.65" y1="0.8" x2="0.65" xlink:href="#a"/>
+<linearGradient id="c" x1="0.65" y1="0.95" x2="0.65" xlink:href="#a"/>
+<linearGradient id="d" x1="0.65" y1="1.2" x2="0.65" xlink:href="#b"/>
+<linearGradient id="e" x1="0.5" x2="0.5" y2="1" gradientUnits="objectBoundingBox">
+<stop offset="0" stop-color="#f2f3f5"/><stop offset="1" stop-color="#dcdee0"/>
+</linearGradient>
+<linearGradient id="f" x1="0.95" y1="0.48" x2="0.055" y2="0.51" gradientUnits="objectBoundingBox">
+<stop offset="0" stop-color="#eaedf1"/><stop offset="1" stop-color="#dcdee0"/>
+</linearGradient>
+<linearGradient id="i" x1="0" y1="0.45" x2="1" y2="0.54" xlink:href="#f"/>
+</defs>
+
+<g transform="translate(-155 -150)">
+    <path d="M36,131V53H16V73H2v58Z" transform="translate(153 144)" fill="url(#a)"/>
+    <path d="M123,15h22V29h9v77H123Z" transform="translate(153 144)" fill="url(#b)"/>
+    <path d="M87,6c3,0,7,3,8,6a8.016,8.016,0,0,1-1,16H80a7,7,0,0,1-8-6c0-4,3-7,6-7A8.963,8.963,0,0,1,87,6Z" transform="translate(153 144)" fill="url(#c)" />
+    <path d="M19,23c2,0,3,1,4,3a4.033,4.033,0,0,1,4,4,4.08,4.08,0,0,1-4,4H15c-2,0-3-2-3-4a3.193,3.193,0,0,1,3-3A4.3,4.3,0,0,1,19,23Z" transform="translate(153 144)" fill="url(#c)" />
+    <g transform="translate(189 194)">
+        <g transform="translate(8)">
+        <rect width="36" height="53" rx="2" transform="translate(38 13)" fill="#ebedf0" opacity="0.6"/>
+        <rect width="64" height="66" rx="2" fill="url(#e)"/>
+        <rect width="52" height="55" rx="1" transform="translate(6 6)" fill="#fff"/>
+            <g transform="translate(15 17)"><rect width="34" height="6" rx="1" fill="url(#f)"/>
+                <path d="M0,14H34v6H0Z" fill="url(#f)"/><rect width="34" height="6" rx="1" transform="translate(0 28)" fill="url(#f)"/>
+            </g>
+        </g>
+    <rect width="88" height="28" rx="1" transform="translate(0 61)" fill="url(#i)"/>
+    <rect width="30" height="6" rx="1" transform="translate(29 72)" fill="#f7f8fa"/>
+    </g>
+</g>
+
+</svg>

uni_modules/o-empty/static/error.svg

@@ -0,0 +1,28 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 160 160">
+<defs>
+<linearGradient id="a" x1="0.65" y1="0.8" x2="0.65" gradientUnits="objectBoundingBox">
+    <stop offset="0" stop-color="#4d5a5a" stop-opacity="0"/>
+    <stop offset="1" stop-color="#4d5a5a" stop-opacity="0.12"/>
+</linearGradient>
+<linearGradient id="b" x1="0.65" y1="0.8" x2="0.65" xlink:href="#a"/>
+<linearGradient id="c" x1="0.65" y1="0.95" x2="0.65" xlink:href="#a"/>
+<radialGradient id="e" cx="0.5" cy="0.5" r="2.97" gradientTransform="translate(0.58 0.72) rotate(180) scale(0.16 0.33)" gradientUnits="objectBoundingBox">
+    <stop offset="0" stop-color="#ebedf0"/>
+    <stop offset="1" stop-color="#f2f3f5" stop-opacity="0.302"/>
+</radialGradient>
+<linearGradient id="f" x1="0.5" x2="0.5" y2="1" gradientUnits="objectBoundingBox">
+    <stop offset="0" stop-color="#4d5a5a" stop-opacity="0.12"/>
+    <stop offset="1" stop-color="#4d5a5a" stop-opacity="0.2"/>
+</linearGradient>
+</defs>
+<g transform="translate(-47 -211)">
+<g transform="translate(45 205)" opacity="0.8">
+<path d="M36,131V53H16V73H2v58Z" fill="url(#a)"/>
+<path d="M123,15h22V29h9v77H123Z" fill="url(#b)"/>
+</g>
+<path d="M87,6c3,0,7,3,8,6a8.016,8.016,0,0,1-1,16H80a7,7,0,0,1-8-6c0-4,3-7,6-7A8.963,8.963,0,0,1,87,6Z" transform="translate(45 205)" fill="url(#c)"/>
+<path d="M19,23c2,0,3,1,4,3a4.3,4.3,0,0,1,4,4,4,4,0,0,1-4,3v1H16V33l-1,1c-2,0-3-2-3-4a3.193,3.193,0,0,1,3-3A4.3,4.3,0,0,1,19,23Z" transform="translate(45 205)" fill="url(#c)"/>
+<ellipse cx="46" cy="8" rx="46" ry="8" transform="translate(79 337)" opacity="0.8" fill="url(#e)"/>
+<path d="M59,60,80,81l21-21h3l9,9v3L92,93l21,21v3l-9,9h-3L80,105,59,126H56l-9-9v-3L68,93,47,72V69l9-9Z" transform="translate(45 205)" fill="url(#f)"/>
+</g>
+</svg>

uni_modules/o-empty/static/search.svg

@@ -0,0 +1,63 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 160 160">
+
+<defs>
+    <linearGradient x1="50%" y1="100%" x2="50%" id="van-empty-10-9">
+        <stop stop-color="#EEE" offset="0%"/>
+        <stop stop-color="#D8D8D8" offset="100%"/>
+    </linearGradient>
+    <linearGradient x1="100%" y1="50%" y2="50%" id="van-empty-10-10">
+        <stop stop-color="#F2F3F5" offset="0%"/>
+        <stop stop-color="#DCDEE0" offset="100%"/>
+    </linearGradient>
+    <linearGradient x1="50%" x2="50%" y2="100%" id="van-empty-10-11">
+        <stop stop-color="#F2F3F5" offset="0%"/>
+        <stop stop-color="#DCDEE0" offset="100%"/>
+    </linearGradient>
+    <linearGradient x1="50%" x2="50%" y2="100%" id="van-empty-10-12">
+        <stop stop-color="#FFF" offset="0%"/>
+        <stop stop-color="#F7F8FA" offset="100%"/>
+    </linearGradient>
+</defs>
+
+<defs>
+    <linearGradient id="van-empty-10-a" x1="64%" y1="100%" x2="64%">
+        <stop offset="0" stop-color="#4d5a5a" stop-opacity="0"/>
+        <stop offset="1" stop-color="#4d5a5a" stop-opacity="0.12"/>
+    </linearGradient>
+</defs>
+
+<g opacity=".8">
+    <path d="M36 131V53H16v20H2v58h34z" fill="url(#van-empty-10-a)"/>
+    <path d="M123 15h22v14h9v77h-31V15z" fill="url(#van-empty-10-a)"/>
+</g>
+
+<defs>
+    <linearGradient id="van-empty-10-b" x1="64%" y1="97%" x2="64%" y2="0%">
+        <stop stop-color="#4d5a5a" offset="0%" stop-opacity="0.02"/>
+        <stop stop-color="#4d5a5a" offset="100%" stop-opacity="0.15"/>
+    </linearGradient>
+</defs>
+
+<g opacity=".8">
+    <path d="M87 6c3 0 7 3 8 6a8 8 0 1 1-1 16H80a7 7 0 0 1-8-6c0-4 3-7 6-7 0-5 4-9 9-9Z" fill="url(#van-empty-10-b)"/>
+    <path d="M19 23c2 0 3 1 4 3 2 0 4 2 4 4a4 4 0 0 1-4 3v1h-7v-1l-1 1c-2 0-3-2-3-4 0-1 1-3 3-3 0-2 2-4 4-4Z" fill="url(#van-empty-10-b)"/>
+</g>
+
+<defs>
+<radialGradient id="van-empty-10-d" cx="50%" cy="54%" fx="50%" fy="54%" r="297%" gradientTransform="matrix(-.16 0 0 -.33 .58 .72)">
+<stop stop-color="#EBEDF0" offset="0%"/>
+<stop stop-color="#F2F3F5" offset="100%" stop-opacity="0.3"/>
+</radialGradient>
+</defs>
+
+<ellipse fill="url(#van-empty-10-d)" opacity=".8" cx="80" cy="140" rx="46" ry="8"></ellipse>
+
+<g transform="rotate(-45 113 -4)" fill="none">
+    <rect fill="url(#van-empty-10-9)" x="24" y="52.8" width="5.8" height="19" rx="1"></rect>
+    <rect fill="url(#van-empty-10-10)" x="22.1" y="67.3" width="9.9" height="28" rx="1"></rect>
+    <circle stroke="url(#van-empty-10-11)" stroke-width="8" cx="27" cy="27" r="27"></circle>
+    <circle fill="url(#van-empty-10-12)" cx="27" cy="27" r="16"></circle>
+    <path d="M37 7c-8 0-15 5-16 12" stroke="url(#van-empty-10-11)" stroke-width="3" opacity=".5" stroke-linecap="round" transform="rotate(45 29 13)"/>
+</g>
+
+</svg>

unpackage/dist/dev/mp-weixin/common/vendor.js

@@ -1557,7 +1557,7 @@ function initData(vueOptions, context) {
     try {
       data = data.call(context); // 支持 Vue.prototype 上挂的数据
     } catch (e) {
-      if (Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"cxyy-applet","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG) {
+      if (Object({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"cxyy-applet","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG) {
         console.warn('根据 Vue 的 data 函数初始化小程序 data 失败，请尽量确保 data 函数中不访问 vm 对象，否则可能影响首次数据渲染速度。', data);
       }
     }
@@ -8934,7 +8934,7 @@ function type(obj) {
 
 function flushCallbacks$1(vm) {
     if (vm.__next_tick_callbacks && vm.__next_tick_callbacks.length) {
-        if (Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"cxyy-applet","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG) {
+        if (Object({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"cxyy-applet","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG) {
             var mpInstance = vm.$scope;
             console.log('[' + (+new Date) + '][' + (mpInstance.is || mpInstance.route) + '][' + vm._uid +
                 ']:flushCallbacks[' + vm.__next_tick_callbacks.length + ']');
@@ -8955,14 +8955,14 @@ function nextTick$1(vm, cb) {
     //1.nextTick 之前 已 setData 且 setData 还未回调完成
     //2.nextTick 之前存在 render watcher
     if (!vm.__next_tick_pending && !hasRenderWatcher(vm)) {
-        if(Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"cxyy-applet","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG){
+        if(Object({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"cxyy-applet","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG){
             var mpInstance = vm.$scope;
             console.log('[' + (+new Date) + '][' + (mpInstance.is || mpInstance.route) + '][' + vm._uid +
                 ']:nextVueTick');
         }
         return nextTick(cb, vm)
     }else{
-        if(Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"cxyy-applet","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG){
+        if(Object({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"cxyy-applet","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG){
             var mpInstance$1 = vm.$scope;
             console.log('[' + (+new Date) + '][' + (mpInstance$1.is || mpInstance$1.route) + '][' + vm._uid +
                 ']:nextMPTick');
@@ -9058,7 +9058,7 @@ var patch = function(oldVnode, vnode) {
     });
     var diffData = this.$shouldDiffData === false ? data : diff(data, mpData);
     if (Object.keys(diffData).length) {
-      if (Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"cxyy-applet","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG) {
+      if (Object({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"cxyy-applet","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG) {
         console.log('[' + (+new Date) + '][' + (mpInstance.is || mpInstance.route) + '][' + this._uid +
           ']差量更新',
           JSON.stringify(diffData));
@@ -39911,14 +39911,96 @@ exports.isEqual = isEqual;
 /* 403 */,
 /* 404 */,
 /* 405 */,
-/* 406 */,
-/* 407 */,
-/* 408 */,
-/* 409 */,
-/* 410 */,
+/* 406 */
+/*!***********************************************************************************!*\
+  !*** D:/project/产学研用系统/cxyy-applet/uni_modules/o-empty/static sync ^\.\/.*\.svg$ ***!
+  \***********************************************************************************/
+/*! no static exports found */
+/***/ (function(module, exports, __webpack_require__) {
+
+var map = {
+	"./empty.svg": 407,
+	"./error.svg": 408,
+	"./network.svg": 409,
+	"./search.svg": 410
+};
+
+
+function webpackContext(req) {
+	var id = webpackContextResolve(req);
+	return __webpack_require__(id);
+}
+function webpackContextResolve(req) {
+	if(!__webpack_require__.o(map, req)) {
+		var e = new Error("Cannot find module '" + req + "'");
+		e.code = 'MODULE_NOT_FOUND';
+		throw e;
+	}
+	return map[req];
+}
+webpackContext.keys = function webpackContextKeys() {
+	return Object.keys(map);
+};
+webpackContext.resolve = webpackContextResolve;
+module.exports = webpackContext;
+webpackContext.id = 406;
+
+/***/ }),
+/* 407 */
+/*!**************************************************************************!*\
+  !*** D:/project/产学研用系统/cxyy-applet/uni_modules/o-empty/static/empty.svg ***!
+  \**************************************************************************/
+/*! no static exports found */
+/***/ (function(module, exports, __webpack_require__) {
+
+module.exports = __webpack_require__.p + "static/img/empty.d8b033a4.svg";
+
+/***/ }),
+/* 408 */
+/*!**************************************************************************!*\
+  !*** D:/project/产学研用系统/cxyy-applet/uni_modules/o-empty/static/error.svg ***!
+  \**************************************************************************/
+/*! no static exports found */
+/***/ (function(module, exports, __webpack_require__) {
+
+module.exports = __webpack_require__.p + "static/img/error.1dc2bc7b.svg";
+
+/***/ }),
+/* 409 */
+/*!****************************************************************************!*\
+  !*** D:/project/产学研用系统/cxyy-applet/uni_modules/o-empty/static/network.svg ***!
+  \****************************************************************************/
+/*! no static exports found */
+/***/ (function(module, exports, __webpack_require__) {
+
+module.exports = __webpack_require__.p + "static/img/network.547defec.svg";
+
+/***/ }),
+/* 410 */
+/*!***************************************************************************!*\
+  !*** D:/project/产学研用系统/cxyy-applet/uni_modules/o-empty/static/search.svg ***!
+  \***************************************************************************/
+/*! no static exports found */
+/***/ (function(module, exports, __webpack_require__) {
+
+module.exports = __webpack_require__.p + "static/img/search.859032bb.svg";
+
+/***/ }),
 /* 411 */,
 /* 412 */,
-/* 413 */
+/* 413 */,
+/* 414 */,
+/* 415 */,
+/* 416 */,
+/* 417 */,
+/* 418 */,
+/* 419 */,
+/* 420 */,
+/* 421 */,
+/* 422 */,
+/* 423 */,
+/* 424 */,
+/* 425 */
 /*!*************************************************************************************************************!*\
   !*** D:/project/产学研用系统/cxyy-applet/uni_modules/uni-transition/components/uni-transition/createAnimation.js ***!
   \*************************************************************************************************************/
@@ -40052,12 +40134,12 @@ function createAnimation(option, _this) {
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 2)["default"]))
 
 /***/ }),
-/* 414 */,
-/* 415 */,
-/* 416 */,
-/* 417 */,
-/* 418 */,
-/* 419 */
+/* 426 */,
+/* 427 */,
+/* 428 */,
+/* 429 */,
+/* 430 */,
+/* 431 */
 /*!******************************************************************************************************!*\
   !*** D:/project/产学研用系统/cxyy-applet/uni_modules/uni-load-more/components/uni-load-more/i18n/index.js ***!
   \******************************************************************************************************/
@@ -40072,9 +40154,9 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _en = _interopRequireDefault(__webpack_require__(/*! ./en.json */ 420));
-var _zhHans = _interopRequireDefault(__webpack_require__(/*! ./zh-Hans.json */ 421));
-var _zhHant = _interopRequireDefault(__webpack_require__(/*! ./zh-Hant.json */ 422));
+var _en = _interopRequireDefault(__webpack_require__(/*! ./en.json */ 432));
+var _zhHans = _interopRequireDefault(__webpack_require__(/*! ./zh-Hans.json */ 433));
+var _zhHant = _interopRequireDefault(__webpack_require__(/*! ./zh-Hant.json */ 434));
 var _default = {
   en: _en.default,
   'zh-Hans': _zhHans.default,
@@ -40083,7 +40165,7 @@ var _default = {
 exports.default = _default;
 
 /***/ }),
-/* 420 */
+/* 432 */
 /*!*****************************************************************************************************!*\
   !*** D:/project/产学研用系统/cxyy-applet/uni_modules/uni-load-more/components/uni-load-more/i18n/en.json ***!
   \*****************************************************************************************************/
@@ -40093,7 +40175,7 @@ exports.default = _default;
 module.exports = JSON.parse("{\"uni-load-more.contentdown\":\"Pull up to show more\",\"uni-load-more.contentrefresh\":\"loading...\",\"uni-load-more.contentnomore\":\"No more data\"}");
 
 /***/ }),
-/* 421 */
+/* 433 */
 /*!**********************************************************************************************************!*\
   !*** D:/project/产学研用系统/cxyy-applet/uni_modules/uni-load-more/components/uni-load-more/i18n/zh-Hans.json ***!
   \**********************************************************************************************************/
@@ -40103,7 +40185,7 @@ module.exports = JSON.parse("{\"uni-load-more.contentdown\":\"Pull up to show mo
 module.exports = JSON.parse("{\"uni-load-more.contentdown\":\"上拉显示更多\",\"uni-load-more.contentrefresh\":\"正在加载...\",\"uni-load-more.contentnomore\":\"没有更多数据了\"}");
 
 /***/ }),
-/* 422 */
+/* 434 */
 /*!**********************************************************************************************************!*\
   !*** D:/project/产学研用系统/cxyy-applet/uni_modules/uni-load-more/components/uni-load-more/i18n/zh-Hant.json ***!
   \**********************************************************************************************************/
@@ -40113,14 +40195,14 @@ module.exports = JSON.parse("{\"uni-load-more.contentdown\":\"上拉显示更多
 module.exports = JSON.parse("{\"uni-load-more.contentdown\":\"上拉顯示更多\",\"uni-load-more.contentrefresh\":\"正在加載...\",\"uni-load-more.contentnomore\":\"沒有更多數據了\"}");
 
 /***/ }),
-/* 423 */,
-/* 424 */,
-/* 425 */,
-/* 426 */,
-/* 427 */,
-/* 428 */,
-/* 429 */,
-/* 430 */
+/* 435 */,
+/* 436 */,
+/* 437 */,
+/* 438 */,
+/* 439 */,
+/* 440 */,
+/* 441 */,
+/* 442 */
 /*!*****************************************************************************************************!*\
   !*** D:/project/产学研用系统/cxyy-applet/uni_modules/uni-icons/components/uni-icons/uniicons_file_vue.js ***!
   \*****************************************************************************************************/

unpackage/dist/dev/mp-weixin/pages/home/index.js

@@ -98,22 +98,50 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "recyclableRender", function() { return recyclableRender; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "components", function() { return components; });
 var components
+try {
+  components = {
+    oEmpty: function () {
+      return Promise.all(/*! import() | uni_modules/o-empty/components/o-empty/o-empty */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/o-empty/components/o-empty/o-empty")]).then(__webpack_require__.bind(null, /*! @/uni_modules/o-empty/components/o-empty/o-empty.vue */ 401))
+    },
+  }
+} catch (e) {
+  if (
+    e.message.indexOf("Cannot find module") !== -1 &&
+    e.message.indexOf(".vue") !== -1
+  ) {
+    console.error(e.message)
+    console.error("1. 排查组件名称拼写是否正确")
+    console.error(
+      "2. 排查组件是否符合 easycom 规范，文档：https://uniapp.dcloud.net.cn/collocation/pages?id=easycom"
+    )
+    console.error(
+      "3. 若组件不符合 easycom 规范，需手动引入，并在 components 中注册该组件"
+    )
+  } else {
+    throw e
+  }
+}
 var render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
-  var l0 = _vm.__map(_vm.list, function (item, index) {
-    var $orig = _vm.__get_orig(item)
-    var m0 = _vm.getUrl(item.file)
-    var m1 = _vm.getTime(item.start_time, item.end_time) || "暂无"
-    var m2 = _vm.getDict(item.match_status, "status")
-    return {
-      $orig: $orig,
-      m0: m0,
-      m1: m1,
-      m2: m2,
-    }
-  })
+  var l0 =
+    _vm.total > 0
+      ? _vm.__map(_vm.list, function (item, index) {
+          var $orig = _vm.__get_orig(item)
+          var m0 = _vm.getUrl(item.file)
+          var m1 = _vm.getTime(item.start_time, item.end_time) || "暂无"
+          var m2 = _vm.getDict(item.match_type, "type") || "自办"
+          var m3 = _vm.getDict(item.match_status, "status")
+          return {
+            $orig: $orig,
+            m0: m0,
+            m1: m1,
+            m2: m2,
+            m3: m3,
+          }
+        })
+      : null
   _vm.$mp.data = Object.assign(
     {},
     {
@@ -214,6 +242,7 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 //
 //
 //
+//
 var _default = {
   data: function data() {
     return {
@@ -231,7 +260,8 @@ var _default = {
       oldScrollTop: 0,
       showDiv: false,
       // 字典表
-      statusList: []
+      statusList: [],
+      typeList: []
     };
   },
   onLoad: function () {
@@ -346,7 +376,16 @@ var _default = {
               case 3:
                 res = _context4.sent;
                 if (res.errcode == '0') that.$set(that, "statusList", res.data);
-              case 5:
+                // 赛事类型
+                _context4.next = 7;
+                return that.$api("/dictData", 'GET', {
+                  code: 'activeType',
+                  is_use: '0'
+                });
+              case 7:
+                res = _context4.sent;
+                if (res.errcode == '0') that.$set(that, "typeList", res.data);
+              case 9:
               case "end":
                 return _context4.stop();
             }
@@ -421,6 +460,8 @@ var _default = {
       var res;
       if (model == 'status') res = that.statusList.find(function (i) {
         return i.value == item;
+      });else if (model == 'type') res = that.typeList.find(function (i) {
+        return i.value == item;
       });
       if (res) return res.label;else return '暂无';
     },

unpackage/dist/dev/mp-weixin/pages/home/index.json

@@ -1,5 +1,7 @@
 {
   "navigationBarTitleText": "双创活动",
   "enablePullDownRefresh": true,
-  "usingComponents": {}
+  "usingComponents": {
+    "o-empty": "/uni_modules/o-empty/components/o-empty/o-empty"
+  }
 }

unpackage/dist/dev/mp-weixin/pagesHome/match/index.js

@@ -127,55 +127,56 @@ var render = function () {
   var _c = _vm._self._c || _h
   var m0 = _vm.getUrl(_vm.info.file)
   var m1 = _vm.getTime(_vm.info.start_time, _vm.info.end_time) || "暂无"
-  var m2 =
+  var m2 = _vm.getDict(_vm.info.match_type, "type") || "自办"
+  var m3 =
     _vm.info.rules && _vm.info.rules.rules1
       ? _vm.formatRichText(_vm.info.rules.rules1)
       : null
-  var m3 =
+  var m4 =
     _vm.info.rules && _vm.info.rules.rules2
       ? _vm.formatRichText(_vm.info.rules.rules2)
       : null
-  var m4 =
+  var m5 =
     _vm.info.rules && _vm.info.rules.rules3
       ? _vm.formatRichText(_vm.info.rules.rules3)
       : null
-  var m5 =
+  var m6 =
     _vm.info.rules && _vm.info.rules.rules4
       ? _vm.formatRichText(_vm.info.rules.rules4)
       : null
-  var m6 =
+  var m7 =
     _vm.info.rules && _vm.info.rules.rules5
       ? _vm.formatRichText(_vm.info.rules.rules5)
       : null
-  var m7 =
+  var m8 =
     _vm.info.rules && _vm.info.rules.rules6
       ? _vm.formatRichText(_vm.info.rules.rules6)
       : null
-  var m8 =
+  var m9 =
     _vm.info.rules && _vm.info.rules.rules7
       ? _vm.formatRichText(_vm.info.rules.rules7)
       : null
-  var m9 =
+  var m10 =
     _vm.info.rules && _vm.info.rules.rules8
       ? _vm.formatRichText(_vm.info.rules.rules8)
       : null
-  var m10 =
+  var m11 =
     _vm.info.rules && _vm.info.rules.rules9
       ? _vm.formatRichText(_vm.info.rules.rules9)
       : null
-  var m11 =
+  var m12 =
     _vm.info.rules && _vm.info.rules.rules10
       ? _vm.formatRichText(_vm.info.rules.rules10)
       : null
-  var m12 =
+  var m13 =
     _vm.info.rules && _vm.info.rules.rules11
       ? _vm.formatRichText(_vm.info.rules.rules11)
       : null
-  var m13 =
+  var m14 =
     _vm.info.rules && _vm.info.rules.rules12
       ? _vm.formatRichText(_vm.info.rules.rules12)
       : null
-  var m14 = _vm.info.brief ? _vm.formatRichText(_vm.info.brief) : null
+  var m15 = _vm.info.brief ? _vm.formatRichText(_vm.info.brief) : null
   _vm.$mp.data = Object.assign(
     {},
     {
@@ -195,6 +196,7 @@ var render = function () {
         m12: m12,
         m13: m13,
         m14: m14,
+        m15: m15,
       },
     }
   )
@@ -384,7 +386,8 @@ var _default = {
       config: {},
       info: {},
       // 字典表
-      statusList: []
+      statusList: [],
+      typeList: []
     };
   },
   onLoad: function () {
@@ -485,7 +488,16 @@ var _default = {
               case 3:
                 res = _context3.sent;
                 if (res.errcode == '0') that.$set(that, "statusList", res.data);
-              case 5:
+                // 赛事类型
+                _context3.next = 7;
+                return that.$api("/dictData", 'GET', {
+                  code: 'activeType',
+                  is_use: '0'
+                });
+              case 7:
+                res = _context3.sent;
+                if (res.errcode == '0') that.$set(that, "typeList", res.data);
+              case 9:
               case "end":
                 return _context3.stop();
             }
@@ -542,6 +554,15 @@ var _default = {
         return "".concat(month, "/").concat(day < 10 ? '0' + day : day, " ").concat(weekday, " ").concat(start_hours.toString().padStart(2, '0'), ":").concat(start_minutes.toString().padStart(2, '0'), " - ").concat(end_hours.toString().padStart(2, '0'), ":").concat(end_minutes.toString().padStart(2, '0'), " ");
       }
     },
+    // 处理字典表
+    getDict: function getDict(item, model) {
+      var that = this;
+      var res;
+      if (model == 'type') res = that.typeList.find(function (i) {
+        return i.value == item;
+      });
+      if (res) return res.label;else return '暂无';
+    },
     // 图片处理
     getUrl: function getUrl(e) {
       var that = this;

unpackage/dist/dev/mp-weixin/pagesHome/match/sign.js

@@ -156,12 +156,14 @@ var render = function () {
   var _c = _vm._self._c || _h
   var m0 = _vm.getTime(_vm.info.start_time, _vm.info.end_time) || "暂无"
   var m1 = _vm.getDict(_vm.info.match_status, "status")
+  var m2 = _vm.getDict(_vm.info.match_type, "type") || "自办"
   _vm.$mp.data = Object.assign(
     {},
     {
       $root: {
         m0: m0,
         m1: m1,
+        m2: m2,
       },
     }
   )
@@ -226,6 +228,7 @@ var _default = {
         communication: ""
       },
       info: {},
+      cTypeList: [],
       typeList: [],
       statusList: [],
       errors: {}
@@ -288,7 +291,7 @@ var _default = {
                 });
               case 3:
                 res = _context2.sent;
-                if (res.errcode == '0') that.$set(that, "typeList", res.data);
+                if (res.errcode == '0') that.$set(that, "cTypeList", res.data);
                 // 查询状态
                 _context2.next = 7;
                 return that.$api("/dictData", 'GET', {
@@ -298,7 +301,16 @@ var _default = {
               case 7:
                 res = _context2.sent;
                 if (res.errcode == '0') that.$set(that, "statusList", res.data);
-              case 9:
+                // 赛事类型
+                _context2.next = 11;
+                return that.$api("/dictData", 'GET', {
+                  code: 'activeType',
+                  is_use: '0'
+                });
+              case 11:
+                res = _context2.sent;
+                if (res.errcode == '0') that.$set(that, "typeList", res.data);
+              case 13:
               case "end":
                 return _context2.stop();
             }
@@ -362,6 +374,8 @@ var _default = {
       var res;
       if (model == 'status') res = that.statusList.find(function (i) {
         return i.value == item;
+      });else if (model == 'type') res = that.typeList.find(function (i) {
+        return i.value == item;
       });
       if (res) return res.label;else return '暂无';
     },

unpackage/dist/dev/mp-weixin/pagesMy/activity/detail.js

@@ -104,59 +104,60 @@ var render = function () {
   var _c = _vm._self._c || _h
   var m0 = _vm.getUrl(_vm.info.file)
   var m1 = _vm.getTime(_vm.info.start_time, _vm.info.end_time) || "暂无"
-  var m2 =
+  var m2 = _vm.getDict(_vm.info.match_type, "type") || "自办"
+  var m3 =
     _vm.tabs.active == "0" && _vm.info.rules && _vm.info.rules.rules1
       ? _vm.formatRichText(_vm.info.rules.rules1)
       : null
-  var m3 =
+  var m4 =
     _vm.tabs.active == "0" && _vm.info.rules && _vm.info.rules.rules2
       ? _vm.formatRichText(_vm.info.rules.rules2)
       : null
-  var m4 =
+  var m5 =
     _vm.tabs.active == "0" && _vm.info.rules && _vm.info.rules.rules3
       ? _vm.formatRichText(_vm.info.rules.rules3)
       : null
-  var m5 =
+  var m6 =
     _vm.tabs.active == "0" && _vm.info.rules && _vm.info.rules.rules4
       ? _vm.formatRichText(_vm.info.rules.rules4)
       : null
-  var m6 =
+  var m7 =
     _vm.tabs.active == "0" && _vm.info.rules && _vm.info.rules.rules5
       ? _vm.formatRichText(_vm.info.rules.rules5)
       : null
-  var m7 =
+  var m8 =
     _vm.tabs.active == "0" && _vm.info.rules && _vm.info.rules.rules6
       ? _vm.formatRichText(_vm.info.rules.rules6)
       : null
-  var m8 =
+  var m9 =
     _vm.tabs.active == "0" && _vm.info.rules && _vm.info.rules.rules7
       ? _vm.formatRichText(_vm.info.rules.rules7)
       : null
-  var m9 =
+  var m10 =
     _vm.tabs.active == "0" && _vm.info.rules && _vm.info.rules.rules8
       ? _vm.formatRichText(_vm.info.rules.rules8)
       : null
-  var m10 =
+  var m11 =
     _vm.tabs.active == "0" && _vm.info.rules && _vm.info.rules.rules9
       ? _vm.formatRichText(_vm.info.rules.rules9)
       : null
-  var m11 =
+  var m12 =
     _vm.tabs.active == "0" && _vm.info.rules && _vm.info.rules.rules10
       ? _vm.formatRichText(_vm.info.rules.rules10)
       : null
-  var m12 =
+  var m13 =
     _vm.tabs.active == "0" && _vm.info.rules && _vm.info.rules.rules11
       ? _vm.formatRichText(_vm.info.rules.rules11)
       : null
-  var m13 =
+  var m14 =
     _vm.tabs.active == "0" && _vm.info.rules && _vm.info.rules.rules12
       ? _vm.formatRichText(_vm.info.rules.rules12)
       : null
-  var m14 =
+  var m15 =
     _vm.tabs.active == "0" && _vm.info.brief
       ? _vm.formatRichText(_vm.info.brief)
       : null
-  var m15 =
+  var m16 =
     _vm.tabs.active == "1"
       ? _vm.getDict(_vm.sign.cardType, "cardType") || "暂无证件类型"
       : null
@@ -180,6 +181,7 @@ var render = function () {
         m13: m13,
         m14: m14,
         m15: m15,
+        m16: m16,
       },
     }
   )
@@ -228,7 +230,7 @@ var _toConsumableArray2 = _interopRequireDefault(__webpack_require__(/*! @babel/
 var _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/helpers/asyncToGenerator */ 39));
 var tabs = function tabs() {
   __webpack_require__.e(/*! require.ensure | components/tabs/index */ "components/tabs/index").then((function () {
-    return resolve(__webpack_require__(/*! ../../components/tabs/index.vue */ 401));
+    return resolve(__webpack_require__(/*! ../../components/tabs/index.vue */ 413));
   }).bind(null, __webpack_require__)).catch(__webpack_require__.oe);
 };
 var _default = {
@@ -258,6 +260,7 @@ var _default = {
       score: {},
       // 字典表
       statusList: [],
+      cTypeList: [],
       typeList: []
     };
   },
@@ -333,9 +336,18 @@ var _default = {
                   is_use: '0'
                 });
               case 7:
+                res = _context2.sent;
+                if (res.errcode == '0') that.$set(that, "cTypeList", res.data);
+                // 赛事类型
+                _context2.next = 11;
+                return that.$api("/dictData", 'GET', {
+                  code: 'activeType',
+                  is_use: '0'
+                });
+              case 11:
                 res = _context2.sent;
                 if (res.errcode == '0') that.$set(that, "typeList", res.data);
-              case 9:
+              case 13:
               case "end":
                 return _context2.stop();
             }
@@ -467,7 +479,9 @@ var _default = {
       var res;
       if (model == 'status') res = that.statusList.find(function (i) {
         return i.value == item;
-      });else if (model == 'cardType') res = that.typeList.find(function (i) {
+      });else if (model == 'cardType') res = that.cTypeList.find(function (i) {
+        return i.value == item;
+      });else if (model == 'type') res = that.typeList.find(function (i) {
         return i.value == item;
       });
       if (res) return res.label;else return '暂无';

unpackage/dist/dev/mp-weixin/pagesMy/activity/index.json

@@ -1,6 +1,7 @@
 {
   "navigationBarTitleText": "我的报名",
   "usingComponents": {
+    "o-empty": "/uni_modules/o-empty/components/o-empty/o-empty",
     "tabs": "/components/tabs/index"
   }
 }

unpackage/dist/dev/mp-weixin/uni_modules/uni-data-checkbox/components/uni-data-checkbox/uni-data-checkbox.js

@@ -80,7 +80,7 @@ var components
 try {
   components = {
     uniLoadMore: function () {
-      return Promise.all(/*! import() | uni_modules/uni-load-more/components/uni-load-more/uni-load-more */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-load-more/components/uni-load-more/uni-load-more")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-load-more/components/uni-load-more/uni-load-more.vue */ 414))
+      return Promise.all(/*! import() | uni_modules/uni-load-more/components/uni-load-more/uni-load-more */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-load-more/components/uni-load-more/uni-load-more")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-load-more/components/uni-load-more/uni-load-more.vue */ 426))
     },
   }
 } catch (e) {

unpackage/dist/dev/mp-weixin/uni_modules/uni-data-select/components/uni-data-select/uni-data-select.js

@@ -80,7 +80,7 @@ var components
 try {
   components = {
     uniIcons: function () {
-      return Promise.all(/*! import() | uni_modules/uni-icons/components/uni-icons/uni-icons */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-icons/components/uni-icons/uni-icons")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-icons/components/uni-icons/uni-icons.vue */ 425))
+      return Promise.all(/*! import() | uni_modules/uni-icons/components/uni-icons/uni-icons */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-icons/components/uni-icons/uni-icons")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-icons/components/uni-icons/uni-icons.vue */ 437))
     },
   }
 } catch (e) {

unpackage/dist/dev/mp-weixin/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.js

@@ -80,7 +80,7 @@ var components
 try {
   components = {
     uniIcons: function () {
-      return Promise.all(/*! import() | uni_modules/uni-icons/components/uni-icons/uni-icons */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-icons/components/uni-icons/uni-icons")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-icons/components/uni-icons/uni-icons.vue */ 425))
+      return Promise.all(/*! import() | uni_modules/uni-icons/components/uni-icons/uni-icons */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-icons/components/uni-icons/uni-icons")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-icons/components/uni-icons/uni-icons.vue */ 437))
     },
   }
 } catch (e) {

unpackage/dist/dev/mp-weixin/uni_modules/uni-popup/components/uni-popup/uni-popup.js

@@ -80,7 +80,7 @@ var components
 try {
   components = {
     uniTransition: function () {
-      return Promise.all(/*! import() | uni_modules/uni-transition/components/uni-transition/uni-transition */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-transition/components/uni-transition/uni-transition")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-transition/components/uni-transition/uni-transition.vue */ 408))
+      return Promise.all(/*! import() | uni_modules/uni-transition/components/uni-transition/uni-transition */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-transition/components/uni-transition/uni-transition")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-transition/components/uni-transition/uni-transition.vue */ 420))
     },
   }
 } catch (e) {