v1.0.3

actMgt/App.vue

@@ -4,10 +4,29 @@ https://oss-mbh5.colormaprun.com/actMgt/
  -->
 <script>
 	export default {
+		globalData: {
+			// 默认赛事LOGO
+			defaultMatchLogo: "https://oss-mbh5.colormaprun.com/static/logo/default.png",
+			// 默认赛事BANNER
+			defaultMatchBanner: "https://oss-mbh5.colormaprun.com/static/banner/banner1.png"
+		},
 		onLaunch: function() {
 			console.log('App Launch')
 			this.$global.getWindowInfo()
-			
+
+			const style = document.documentElement.style;
+
+			// 通过JS设置CSS变量值
+			const defaultMatchLogoUrl = `url("${this.globalData.defaultMatchLogo}")`;
+			style.setProperty('--default-matchLogo-url', defaultMatchLogoUrl);
+
+			const defaultMatchBannerUrl = `url("${this.globalData.defaultMatchBanner}")`;
+			style.setProperty('--default-matchBanner-url', defaultMatchBannerUrl);
+
+			// 通过JS获取CSS变量值
+			// console.log("--default-matchLogo-url:", style.getPropertyValue('--default-matchLogo-url'));
+			// console.log("--default-matchBanner-url:", style.getPropertyValue('--default-matchBanner-url'));
+
 			// uni.onWindowResize(res => {
 			// 	// console.log('[APP onWindowResize]', res)
 			// 	this.$global.getWindowInfo(res.size)
@@ -25,122 +44,5 @@ https://oss-mbh5.colormaprun.com/actMgt/
 
 <style>
 	/*每个页面公共css */
-	uni-page {
-		background-color: #FFF;
-		overflow: scroll;
-	}
-	
-	.body {
-		display: flex;
-		flex-direction: column;
-		align-items: center;
-		justify-content: center;
-	}
-	
-	.body-radius {
-		border-radius: 50rpx;
-		overflow: hidden; /* 确保边框圆角不会溢出 */
-	}
-	
-	.content {
-		width: 100vw;
-	}
-	
-	.top {
-		width: 100%;
-		justify-content: space-between;
-	}
-	
-	.main {
-		width: 100%;
-		flex-grow: 1;
-	}
-	
-	.uni-width-100 {
-		width: 100%;
-	}
-	
-	.uni-row {
-		display: flex;
-		flex-direction: row;
-		align-items: center;
-	}
-	
-	.uni-column {
-		display: flex;
-		flex-direction: column;
-		align-items: center;
-	}
-	
-	.uni-jct {
-		justify-content: flex-start;
-	}
-	
-	.uni-jcc {
-		justify-content: center;
-	}
-	
-	.uni-jce {
-		justify-content: flex-end;
-	}
-	
-	.uni-jcsa {
-		justify-content: space-around;
-	}
-	
-	.uni-jcsb {
-		justify-content: space-between;
-	}
-	
-	.uni-jcse {
-		justify-content: space-evenly;
-	}
-	
-	.uni-ais {
-		align-items: flex-start;
-	}
-	
-	.uni-aie {
-		align-items: flex-end;
-	}
-	
-	.uni-aibl {
-		align-items: baseline;
-	}
-	
-	.uni-hidden {
-		visibility: hidden;
-	}
-	
-	.uni-nowrap {
-		white-space: nowrap;
-	}
-	
-	.uni-ovf-hidden {
-		overflow: hidden;
-	}
-	
-	.uni-ovf-ellipsis {
-		text-overflow: ellipsis;
-	}
-	
-	/deep/ .uni-easyinput__placeholder-class {
-		font-size: 14px !important;
-		color: #999;
-	}
-	
-	/deep/ .e-select-input-placeholder {
-		font-size: 14px !important;
-		color: #999;
-	}
-	
-	/deep/ .uni-date__x-input {
-		font-size: 14px !important;
-		color: #999;
-	}
-	
-	/deep/ .file-title {
-		font-size: 14px !important;
-		color: #999 !important;
-	}
-</style>
+	@import "global.css";
+</style>

actMgt/global.css

@@ -0,0 +1,124 @@
+:root {
+	--default-matchLogo-url: ;
+	--default-matchBanner-url: ;
+}
+
+uni-page {
+	background-color: #FFF;
+	overflow: scroll;
+}
+
+.body {
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+	justify-content: center;
+}
+
+.body-radius {
+	border-radius: 50rpx;
+	overflow: hidden;
+	/* 确保边框圆角不会溢出 */
+}
+
+.content {
+	width: 100vw;
+}
+
+.top {
+	width: 100%;
+	justify-content: space-between;
+}
+
+.main {
+	width: 100%;
+	flex-grow: 1;
+}
+
+.uni-width-100 {
+	width: 100%;
+}
+
+.uni-row {
+	display: flex;
+	flex-direction: row;
+	align-items: center;
+}
+
+.uni-column {
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+}
+
+.uni-jct {
+	justify-content: flex-start;
+}
+
+.uni-jcc {
+	justify-content: center;
+}
+
+.uni-jce {
+	justify-content: flex-end;
+}
+
+.uni-jcsa {
+	justify-content: space-around;
+}
+
+.uni-jcsb {
+	justify-content: space-between;
+}
+
+.uni-jcse {
+	justify-content: space-evenly;
+}
+
+.uni-ais {
+	align-items: flex-start;
+}
+
+.uni-aie {
+	align-items: flex-end;
+}
+
+.uni-aibl {
+	align-items: baseline;
+}
+
+.uni-hidden {
+	visibility: hidden;
+}
+
+.uni-nowrap {
+	white-space: nowrap;
+}
+
+.uni-ovf-hidden {
+	overflow: hidden;
+}
+
+.uni-ovf-ellipsis {
+	text-overflow: ellipsis;
+}
+
+/deep/ .uni-easyinput__placeholder-class {
+	font-size: 14px !important;
+	color: #999;
+}
+
+/deep/ .e-select-input-placeholder {
+	font-size: 14px !important;
+	color: #999;
+}
+
+/deep/ .uni-date__x-input {
+	font-size: 14px !important;
+	color: #999;
+}
+
+/deep/ .file-title {
+	font-size: 14px !important;
+	color: #999 !important;
+}

actMgt/manifest.json

@@ -2,8 +2,8 @@
     "name" : "actMgt",
     "appid" : "__UNI__F804C11",
     "description" : "彩图奔跑 - 赛事管理端",
-    "versionName" : "1.0.1",
-    "versionCode" : 101,
+    "versionName" : "1.0.3",
+    "versionCode" : 103,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {

actMgt/pages/actCreate/actEdit.vue

@@ -29,7 +29,7 @@
 					<uni-forms-item label="赛事LOGO" name="matchLogo">
 						<uni-file-picker v-model="matchLogoObj" :auto-upload="false" limit="1" :title="pubState > 1 ? '' : '请选择赛事使用的LOGO图片'"
 							:sizeType="['original', 'compressed']" file-mediatype="image"
-							file-extname="jpg,jpeg,png,gif,bmp,heic" @select="onLogoUploadSelect"
+							file-extname="jpg,jpeg,png,gif" @select="onLogoUploadSelect"
 							@delete="onLogoUploadDelete" :readonly="pubState > 1 ? true : false"></uni-file-picker>
 					</uni-forms-item>
 					<uni-forms-item label="赛事场地" name="mapId">
@@ -161,7 +161,7 @@
 								errorMessage: '请输入赛事简介',
 							},
 							{
-								minLength: 20,
+								minLength: 10,
 								maxLength: 500,
 								errorMessage: '赛事简介长度在 {minLength} 到 {maxLength} 个字符',
 							}
@@ -169,11 +169,11 @@
 					},
 					rules: {
 						rules: [{
-								required: true,
+								required: false,
 								errorMessage: '请输入活动规则',
 							},
 							{
-								minLength: 20,
+								minLength: 10,
 								maxLength: 500,
 								errorMessage: '活动规则长度在 {minLength} 到 {maxLength} 个字符',
 							}
@@ -266,7 +266,7 @@
 						compId: this.compId
 					},
 					success: (res) => {
-						console.log("[compInfoDetail] res", res);
+						// console.log("[compInfoDetail] res", res);
 						if (checkResCode(res)) {
 							this.pubState = res.data.data.otherInfo.pubState;
 							const config = res.data.data.config;
@@ -290,11 +290,13 @@
 							this.formData.mapId = config.mapInfo[0].mapId;
 							this.formData.planId = config.mapInfo[0].planId;
 							
-							this.matchLogoObj = {
-								// "name": "",
-								// "extname": "",
-								"url": config.tplInfo.matchLogo
-							};
+							if (config.tplInfo.matchLogo != undefined && config.tplInfo.matchLogo != "") {
+								this.matchLogoObj = {
+									// "name": "",
+									// "extname": "",
+									"url": config.tplInfo.matchLogo
+								};
+							}
 							
 							this.selectPlanQuery(this.formData.mapId);
 						}
@@ -314,8 +316,8 @@
 				this.formData.compBeginSecond = Date.parse(this.formData.compBeginTime) / 1000;
 				this.formData.compEndSecond = Date.parse(this.formData.compEndTime) / 1000;
 
-				console.log("[compInfoEdit] formData:", this.formData);
-				console.log("[compInfoEdit] formData:", JSON.stringify(this.formData));
+				// console.log("[compInfoEdit] formData:", this.formData);
+				// console.log("[compInfoEdit] formData:", JSON.stringify(this.formData));
 
 				uni.request({
 					url: apiCompInfoEdit,
@@ -354,7 +356,7 @@
 					method: "POST",
 					data: {},
 					success: (res) => {
-						console.log("selectSsctQuery", res);
+						// console.log("selectSsctQuery", res);
 						if (checkResCode(res)) {
 							// const data = res.data.data;
 						}
@@ -372,7 +374,7 @@
 					method: "POST",
 					data: {},
 					success: (res) => {
-						console.log("selectMapQuery", res);
+						// console.log("selectMapQuery", res);
 						if (checkResCode(res)) {
 							const data = res.data.data;
 							this.mapRs = data;
@@ -393,7 +395,7 @@
 						mapId: mapId
 					},
 					success: (res) => {
-						console.log("selectPlanQuery", res);
+						// console.log("selectPlanQuery", res);
 						if (checkResCode(res)) {
 							const data = res.data.data;
 							this.planRs = data;
@@ -416,7 +418,7 @@
 				}
 			},
 			onLogoUploadSelect(e) {
-				console.log('[onLogoUploadSelect] 选择文件：', e);
+				// console.log('[onLogoUploadSelect] 选择文件：', e);
 				// const imgUrl = e.tempFilePaths[0]; // 获取图片的本地路径
 				const img = e.tempFiles[0]; // 获取图片信息
 				// 上传图片
@@ -435,16 +437,36 @@
 						success: (uploadFileRes) => {
 							// console.log("[onLogoUploadSelect] uploadFileRes", uploadFileRes);
 							// console.log("上传成功", JSON.parse(uploadFileRes.data));
-							let data = JSON.parse(uploadFileRes.data).data;
-							this.formData.matchLogo = data.url;
-							this.matchLogoObj = {
-								"name": img.name,
-								"extname": img.extname,
-								"url": data.url
-							};
+							const uploadFileData = JSON.parse(uploadFileRes.data);
+							if (uploadFileData.code == 0) {
+								const data = uploadFileData.data;
+								this.formData.matchLogo = data.url;
+								this.matchLogoObj = {
+									"name": img.name,
+									"extname": img.extname,
+									"url": data.url
+								};
+							} else {
+								this.formData.matchLogo = "";
+								this.matchLogoObj = {};
+								
+								uni.showToast({
+									title: `图片上传失败 (${uploadFileData.message})`,
+									icon: 'none',
+									duration: 5000
+								});
+							}
 						},
 						fail: (err) => {
-							console.error("上传失败", err);
+							console.error("图片上传失败", err);
+							this.formData.matchLogo = "";
+							this.matchLogoObj = {};
+							
+							uni.showToast({
+								title: `图片上传失败 (${err.errMsg})`,
+								icon: 'none',
+								duration: 5000
+							});
 						}
 					});
 				}

actMgt/pages/actCreate/index.vue

@@ -29,7 +29,7 @@
 					<uni-forms-item label="赛事LOGO" name="matchLogo">
 						<uni-file-picker v-model="matchLogoObj" :auto-upload="false" limit="1" title="请选择赛事使用的LOGO图片"
 							:sizeType="['original', 'compressed']" file-mediatype="image"
-							file-extname="jpg,jpeg,png,gif,bmp,heic" @select="onLogoUploadSelect"
+							file-extname="jpg,jpeg,png,gif" @select="onLogoUploadSelect"
 							@delete="onLogoUploadDelete"></uni-file-picker>
 					</uni-forms-item>
 					<uni-forms-item label="赛事场地" name="mapId">
@@ -51,6 +51,7 @@
 				</uni-forms>
 
 				<view class="uni-row uni-jcse" style="width: 90%;">
+					<button class="button button-clear" @click="clearClick">清空</button>
 					<button class="button button-save" @click="saveClick">暂存</button>
 					<button class="button button-submit" @click="submitClick">提交审核</button>
 				</view>
@@ -157,7 +158,7 @@
 								errorMessage: '请输入赛事简介',
 							},
 							{
-								minLength: 20,
+								minLength: 10,
 								maxLength: 500,
 								errorMessage: '赛事简介长度在 {minLength} 到 {maxLength} 个字符',
 							}
@@ -165,11 +166,11 @@
 					},
 					rules: {
 						rules: [{
-								required: true,
+								required: false,
 								errorMessage: '请输入活动规则',
 							},
 							{
-								minLength: 20,
+								minLength: 10,
 								maxLength: 500,
 								errorMessage: '活动规则长度在 {minLength} 到 {maxLength} 个字符',
 							}
@@ -253,7 +254,7 @@
 		methods: {
 			getSaveData() {
 				const saveData = uni.getStorageSync(this.saveKey);
-				console.log("getSaveData", saveData);
+				// console.log("getSaveData", saveData);
 				// if (saveData) {
 				// 	this.formData = saveData;
 				// }
@@ -281,8 +282,8 @@
 				this.formData.compBeginSecond = Date.parse(this.formData.compBeginTime) / 1000;
 				this.formData.compEndSecond = Date.parse(this.formData.compEndTime) / 1000;
 
-				console.log("[compInfoAdd] formData:", this.formData);
-				console.log("[compInfoAdd] formData:", JSON.stringify(this.formData));
+				// console.log("[compInfoAdd] formData:", this.formData);
+				// console.log("[compInfoAdd] formData:", JSON.stringify(this.formData));
 
 				uni.request({
 					url: apiCompInfoAdd,
@@ -292,7 +293,7 @@
 						inJson: JSON.stringify(this.formData)
 					},
 					success: (res) => {
-						console.log("compInfoAdd", res);
+						// console.log("compInfoAdd", res);
 						if (checkResCode(res)) {
 							// const data = res.data.data;
 							uni.showToast({
@@ -321,7 +322,7 @@
 					method: "POST",
 					data: {},
 					success: (res) => {
-						console.log("selectSsctQuery", res);
+						// console.log("selectSsctQuery", res);
 						if (checkResCode(res)) {
 							// const data = res.data.data;
 						}
@@ -339,7 +340,7 @@
 					method: "POST",
 					data: {},
 					success: (res) => {
-						console.log("selectMapQuery", res);
+						// console.log("selectMapQuery", res);
 						if (checkResCode(res)) {
 							const data = res.data.data;
 							this.mapRs = data;
@@ -360,7 +361,7 @@
 						mapId: mapId
 					},
 					success: (res) => {
-						console.log("selectPlanQuery", res);
+						// console.log("selectPlanQuery", res);
 						if (checkResCode(res)) {
 							const data = res.data.data;
 							this.planRs = data;
@@ -376,7 +377,7 @@
 				tools.appAction(url, "uni.switchTab");
 			},
 			onLogoUploadSelect(e) {
-				console.log('[onLogoUploadSelect] 选择文件：', e);
+				// console.log('[onLogoUploadSelect] 选择文件：', e);
 				// const imgUrl = e.tempFilePaths[0]; // 获取图片的本地路径
 				const img = e.tempFiles[0]; // 获取图片信息
 				// 上传图片
@@ -395,16 +396,36 @@
 						success: (uploadFileRes) => {
 							// console.log("[onLogoUploadSelect] uploadFileRes", uploadFileRes);
 							// console.log("上传成功", JSON.parse(uploadFileRes.data));
-							let data = JSON.parse(uploadFileRes.data).data;
-							this.formData.matchLogo = data.url;
-							this.matchLogoObj = {
-								"name": img.name,
-								"extname": img.extname,
-								"url": data.url
-							};
+							const uploadFileData = JSON.parse(uploadFileRes.data);
+							if (uploadFileData.code == 0) {
+								const data = uploadFileData.data;
+								this.formData.matchLogo = data.url;
+								this.matchLogoObj = {
+									"name": img.name,
+									"extname": img.extname,
+									"url": data.url
+								};
+							} else {
+								this.formData.matchLogo = "";
+								this.matchLogoObj = {};
+								
+								uni.showToast({
+									title: `图片上传失败 (${uploadFileData.message})`,
+									icon: 'none',
+									duration: 5000
+								});
+							}
 						},
 						fail: (err) => {
-							console.error("上传失败", err);
+							console.error("图片上传失败", err);
+							this.formData.matchLogo = "";
+							this.matchLogoObj = {};
+							
+							uni.showToast({
+								title: `图片上传失败 (${err.errMsg})`,
+								icon: 'none',
+								duration: 5000
+							});
 						}
 					});
 				}
@@ -412,8 +433,25 @@
 			onLogoUploadDelete() {
 				this.formData.matchLogo = "";
 			},
+			clearClick() {
+				let that = this;
+				uni.showModal({
+					title: '提示',
+					content: `您确定要清空表单内容吗？`,
+					confirmText: '确定', //确定文本的文字
+					cancelText: '取消', //确定文本的文字
+					showCancel: true, //没有取消按钮的弹框
+					success: function(res) {
+						if (res.confirm) {
+							uni.setStorageSync(that.saveKey, "");
+							that.$router.go(0);	// 刷新当前页面
+						} else if (res.cancel) {}
+					}
+				});
+				
+			},
 			saveClick() {
-				console.log(this.formData);
+				// console.log(this.formData);
 				// const saveData = this.formData;
 				const saveData = {
 					mapRs: this.mapRs,
@@ -430,9 +468,22 @@
 			},
 			submitClick() {
 				// console.log(this.formData);
+				let that = this;
 				this.$refs.form.validate().then(res => {
 					// console.log('表单数据信息：', res);
-					this.compInfoAdd();
+					uni.showModal({
+						title: '提示',
+						content: `您确定要提交审核吗？`,
+						confirmText: '确定', //确定文本的文字
+						cancelText: '取消', //确定文本的文字
+						showCancel: true, //没有取消按钮的弹框
+						success: function(res) {
+							if (res.confirm) {
+								that.compInfoAdd();
+							} else if (res.cancel) {
+							}
+						}
+					});
 				}).catch(err => {
 					console.log('表单错误信息：', err);
 					uni.showToast({
@@ -517,12 +568,18 @@
 		word-spacing: 15px;
 	}
 
+	.button-clear {
+		width: 30%;
+	}
+	
 	.button-save {
+		width: 30%;
 		color: #ffffff;
 		background-color: #5b8839;
 	}
 
 	.button-submit {
+		width: 30%;
 		color: #ffffff;
 		background-color: #e39700;
 	}

actMgt/pages/actManage/actDetail.vue

@@ -49,7 +49,7 @@
 				<button v-if="userlevel > 0" class="bottom-button" @click="btnActEdit">赛事修改</button>
 				<button v-if="userlevel > 0 && actRs.otherInfo.pubState == 1" class="bottom-button" @click="btnActPublish">赛事发布</button>
 				<button class="bottom-button" @click="btnRankList">排行榜</button>
-				<!-- <button class="bottom-button" @click="btnTrack">场地直播</button> -->
+				<button class="bottom-button" @click="btnTrack">场地直播</button>
 			</view>
 		</view>
 
@@ -182,7 +182,7 @@
 						compId: this.compId
 					},
 					success: (res) => {
-						console.log("compInfoDetail", res);
+						// console.log("compInfoDetail", res);
 						if (checkResCode(res)) {
 							const data = res.data.data;
 							this.actRs = data;
@@ -207,7 +207,7 @@
 						compId: this.compId
 					},
 					success: (res) => {
-						console.log("compInfoPublish", res);
+						// console.log("compInfoPublish", res);
 						if (checkResCode(res)) {
 							// const data = res.data.data;
 							uni.showToast({
@@ -238,7 +238,7 @@
 						compId: this.compId
 					},
 					success: (res) => {
-						console.log("getQrCodeApp", res);
+						// console.log("getQrCodeApp", res);
 						if (checkResCode(res)) {
 							const data = res.data.data;
 							this.qrCodeApp = "url:" + data.qrCode;
@@ -259,7 +259,7 @@
 						compId: this.compId
 					},
 					success: (res) => {
-						console.log("qrCodeAppReset", res);
+						// console.log("qrCodeAppReset", res);
 						if (checkResCode(res)) {
 							this.getQrCodeApp(); // 重新获取二维码
 

actMgt/pages/actManage/index.vue

@@ -90,8 +90,7 @@ https://oss-mbh5.colormaprun.com/actMgt/#/pages/actManage/index
 					level: "", // 等级
 				},
 				
-				// defaultLogo: "/static/run.png",
-				defaultLogo: "https://oss-mbh5.colormaprun.com/static/logo/default.png",
+				defaultLogo: getApp().globalData.defaultMatchLogo,
 
 				actStatistic: {},	// 赛事活动统计信息
 				actList: null,	// 赛事活动列表
@@ -209,7 +208,7 @@ https://oss-mbh5.colormaprun.com/actMgt/#/pages/actManage/index
 			]),
 		},
 		onLoad(query) {
-			this.init();
+			// this.init();
 		},
 		onShow() {
 			// console.log("metadata:", this.metadata);
@@ -278,7 +277,7 @@ https://oss-mbh5.colormaprun.com/actMgt/#/pages/actManage/index
 					method: "POST",
 					data: {},
 					success: (res) => {
-						console.log("getSelfInfo", res);
+						// console.log("getSelfInfo", res);
 						if (checkResCode(res)) {
 							const data = res.data.data;
 							this.selfInfo = data;
@@ -297,7 +296,7 @@ https://oss-mbh5.colormaprun.com/actMgt/#/pages/actManage/index
 					method: "POST",
 					data: {},
 					success: (res) => {
-						console.log("compInfoQuery", res);
+						// console.log("compInfoQuery", res);
 						if (checkResCode(res)) {
 							const data = res.data.data;
 							this.actStatistic = data.info;

actMgt/pages/actManage/rankList.vue

@@ -124,7 +124,7 @@
 						compId: this.compId,
 					},
 					success: (res) => {
-						console.log("compInfoDetail", res);
+						// console.log("compInfoDetail", res);
 						if (checkResCode(res)) {
 							const data = res.data.data;
 							this.actRs = data;
@@ -146,7 +146,7 @@
 						dispArrStr: this.dispArrStr
 					},
 					success: (res) => {
-						console.log("cardRankDetailQuery", res);
+						// console.log("cardRankDetailQuery", res);
 						if (checkResCode(res)) {
 							const data = res.data.data;
 							this.rankList = data;

actMgt/pages/login/login - 副本.vue

@@ -0,0 +1,187 @@
+<template>
+	<view class="body body-bg">
+		<view class="main uni-column">
+			<view class="topLogo"></view>
+			<text class="title">主理人登录</text>
+			<view class="box uni-column">
+				<input class="input" placeholder-class="input-placeholder" type="text" maxlength="20"
+					placeholder="请输入用户名" v-model="username" />
+				<input class="input" placeholder-class="input-placeholder" password type="text" maxlength="20"
+					placeholder="请输入密码" v-model="password" />
+				<button class="button" @click="login">登 录</button>
+				<text class="hint">没有账号？点击 <text style="color: #FF8D1A;" @click="registerClick">注册</text></text>
+			</view>
+			<view class="bottomLogo"></view>
+		</view>
+		<text class="bottomText">&copy; 彩图奔跑 All Rights Reserved.</text>
+	</view>
+</template>
+
+<script>
+	import {
+		mapState,
+		mapGetters
+	} from 'vuex';
+	import tools from '/utils/tools';
+	import {
+		apiSignIn
+	} from '/utils/api.js';
+
+	export default {
+		data() {
+			return {
+				username: "",
+				password: "",
+			}
+		},
+		computed: {
+			/* ...mapState([
+				'username', // 映射 this.username 为 store.state.username
+				'token'
+			]), */
+			...mapGetters([
+				'metadata'
+			]),
+		},
+		onLoad() {
+
+		},
+		methods: {
+			login() {
+				uni.request({
+					url: apiSignIn,
+					header: this.metadata,
+					method: "POST",
+					data: {
+						username: this.username,
+						password: this.password
+					},
+					success: (res) => {
+						console.log("login", res);
+						if (res.data.code == 0) {
+							const data = res.data.data;
+							this.$store.commit("setUsername", data.userName);
+							this.$store.commit("setUserlevel", data.level);
+							this.$store.commit("setToken", data.token);
+
+							uni.showToast({
+								title: `登录成功`,
+								icon: 'none',
+								duration: 3000
+							});
+							
+							setTimeout(() => {
+								const url = '/pages/actManage/index';
+								tools.appAction(url, "uni.switchTab");
+							}, 100);
+						} else {
+							uni.showToast({
+								title: `登录失败: ${res.data.message}`,
+								icon: 'none',
+								duration: 5000
+							});
+						}
+					},
+					fail: (err) => {
+						console.log("login err", err);
+					},
+				});
+			},
+			registerClick() {
+				const url = "/pages/login/register";
+				tools.appAction(url, "uni.navigateTo");
+			}
+		}
+	}
+</script>
+
+<style scoped>
+	.body-bg {
+		width: 100vw;
+		height: 100vh;
+		background: url("/static/bg_login.png") no-repeat;
+		background-size: 100% 100%;
+		/* background-size: 100% auto; */
+		justify-content: space-between;
+	}
+
+	.main {
+		width: 90%;
+		/* height: 590px; */
+		margin-top: 10%;
+		justify-content: space-evenly;
+	}
+
+	.topLogo {
+		width: 90px;
+		height: 110px;
+		background: url("/static/run.png") no-repeat;
+		background-size: contain;
+	}
+
+	.title {
+		margin: 10px 0px;
+		font-weight: 500;
+		color: #ffffff;
+		font-size: 30px;
+		text-align: center;
+	}
+
+	.box {
+		/* width: 317px; */
+		width: 92%;
+		height: 237px;
+		padding-top: 10px;
+		padding-bottom: 10px;
+		justify-content: space-evenly;
+		background-color: white;
+		border-radius: 13px;
+		box-shadow: 0px 0px 6px rgba(0, 0, 0, 0.16);
+	}
+
+	.input {
+		width: 72%;
+		height: 46px;
+		padding: 0 5%;
+		border: 1px solid;
+		border-color: #c6c6c6;
+		border-radius: 3px;
+	}
+
+	.input-placeholder {
+		font-weight: 300;
+		color: #bfbfbf;
+		font-size: 16px;
+	}
+
+	.button {
+		width: 82%;
+		background: #ffb40b;
+		border-radius: 6px;
+		font-weight: 500;
+		color: #333333;
+		word-spacing: 15px;
+	}
+
+	.hint {
+		font-size: 16px;
+		font-weight: 500;
+		color: #383838;
+	}
+
+	.bottomLogo {
+		width: 232px;
+		height: 36px;
+		margin-top: 20px;
+		background: url("/static/ctbp.png") no-repeat;
+		background-size: contain;
+	}
+
+	.bottomText {
+		margin-bottom: 30px;
+		font-weight: 500;
+		color: #000000;
+		font-size: 12px;
+		text-align: center;
+	}
+</style>

actMgt/pages/login/login.vue

@@ -4,12 +4,25 @@
 			<view class="topLogo"></view>
 			<text class="title">主理人登录</text>
 			<view class="box uni-column">
-				<input class="input" placeholder-class="input-placeholder" type="text" maxlength="20"
-					placeholder="请输入用户名" v-model="username" />
-				<input class="input" placeholder-class="input-placeholder" password type="text" maxlength="20"
-					placeholder="请输入密码" v-model="password" />
+				<input class="input" placeholder-class="input-placeholder" type="text" maxlength="11"
+					placeholder="请输入手机号" v-model="formData.username" />
+				<view class="uni-row uni-jcsb uni-ais" style="width: 82%;">
+					<input class="input" style="width: 48%; margin-right: 10px;" placeholder-class="input-placeholder" type="text" maxlength="6"
+						placeholder="请输入验证码" v-model="formData.vfcode" />
+					<button class="btnSendVfcode" style="padding: 0px;" :disabled="!sendVfCode.state"
+						@click="sendVfcodeClick">
+						<view v-if="sendVfCode.state">
+							获取验证码
+						</view>
+						<view v-else class="uni-row uni-jcc">
+							<uni-countdown color="#c6c6c6" @timeup="timeup" :show-day="false" :showHour="false"
+								:showMinute="false" :second="sendVfCode.counttime"></uni-countdown>
+							秒后重试
+						</view>
+					</button>
+				</view>
 				<button class="button" @click="login">登 录</button>
-				<text class="hint">没有账号？点击 <text style="color: #FF8D1A;" @click="registerClick">注册</text></text>
+				<!-- <text class="hint">没有账号？点击 <text style="color: #FF8D1A;" @click="registerClick">注册</text></text> -->
 			</view>
 			<view class="bottomLogo"></view>
 		</view>
@@ -24,14 +37,21 @@
 	} from 'vuex';
 	import tools from '/utils/tools';
 	import {
+		apiSmsSend,
 		apiSignIn
 	} from '/utils/api.js';
 
 	export default {
 		data() {
 			return {
-				username: "",
-				password: "",
+				sendVfCode: {
+					state: true,
+					counttime: 30 // 倒计时 秒
+				},
+				formData: {
+					username: "",
+					vfcode: "",
+				}
 			}
 		},
 		computed: {
@@ -47,14 +67,56 @@
 
 		},
 		methods: {
+			smsSend() {
+				uni.request({
+					url: apiSmsSend,
+					header: this.metadata,
+					method: "POST",
+					data: {
+						phone: this.formData.username,
+					},
+					success: (res) => {
+						// console.log("smsSend", res);
+						if (res.data.code == 0) {
+						} else {
+							uni.showToast({
+								title: `验证码发送失败：${res.data.message}`,
+								icon: 'none',
+								duration: 5000
+							});
+						}
+					},
+					fail: (err) => {
+						console.log("smsSend err", err);
+					},
+				});
+			},
 			login() {
+				if (this.formData.username.length != 11) {
+					uni.showToast({
+						title: '请输入合法的手机号',
+						icon: 'none'
+					});
+					return;
+				}
+				if (!tools.isPhone(this.formData.username)) {
+					return;
+				}
+				if (!(this.formData.vfcode.length >= 4)) {
+					uni.showToast({
+						title: '请输入合法的验证码',
+						icon: 'none'
+					});
+					return;
+				}
+				
 				uni.request({
 					url: apiSignIn,
 					header: this.metadata,
 					method: "POST",
 					data: {
-						username: this.username,
-						password: this.password
+						username: this.formData.username,
+						vfCode: this.formData.vfcode
 					},
 					success: (res) => {
 						console.log("login", res);
@@ -69,7 +131,7 @@
 								icon: 'none',
 								duration: 3000
 							});
-							
+
 							setTimeout(() => {
 								const url = '/pages/actManage/index';
 								tools.appAction(url, "uni.switchTab");
@@ -87,9 +149,28 @@
 					},
 				});
 			},
-			registerClick() {
+			/* registerClick() {
 				const url = "/pages/login/register";
 				tools.appAction(url, "uni.navigateTo");
+			}, */
+			sendVfcodeClick() {
+				if (this.formData.username.length != 11) {
+					uni.showToast({
+						title: '请输入合法的手机号',
+						icon: 'none'
+					});
+					return;
+				}
+				if (!tools.isPhone(this.formData.username)) {
+					return;
+				}
+				
+				this.sendVfCode.state = false;
+				this.smsSend();
+			},
+			// 倒计时结束
+			timeup() {
+				this.sendVfCode.state = true;
 			}
 		}
 	}
@@ -154,6 +235,13 @@
 		font-size: 16px;
 	}
 
+	.btnSendVfcode {
+		width: 50%;
+		height: 47px;
+		font-size: 16px;
+		line-height: 47px;
+	}
+
 	.button {
 		width: 82%;
 		background: #ffb40b;

actMgt/pages/my/index.vue

@@ -73,12 +73,13 @@ https://oss-mbh5.colormaprun.com/actMgt/#/pages/my/index
 				},
 				
 				ucenterList: [
-					[{
+					[
+						/* {
 							"title": "姓名",
 							"rightText": "",
 							"icon": "person",
 							"to": ""
-						},
+						}, */
 						{
 							"title": "手机号",
 							"rightText": "",
@@ -116,7 +117,7 @@ https://oss-mbh5.colormaprun.com/actMgt/#/pages/my/index
 			]),
 		},
 		onLoad(query) {
-			this.init();
+			// this.init();
 		},
 		onShow() {
 			// console.log("metadata:", this.metadata);
@@ -135,13 +136,14 @@ https://oss-mbh5.colormaprun.com/actMgt/#/pages/my/index
 					data: {
 					},
 					success: (res) => {
-						console.log("getSelfInfo", res);
+						// console.log("getSelfInfo", res);
 						if (checkResCode(res)) {
 							const data = res.data.data;
 							this.selfInfo = data;
 							
-							this.ucenterList[0][0]["rightText"] = this.selfInfo.name;
-							this.ucenterList[0][1]["rightText"] = this.selfInfo.phone;
+							// this.ucenterList[0][0]["rightText"] = this.selfInfo.name;
+							// this.ucenterList[0][1]["rightText"] = this.selfInfo.phone;
+							this.ucenterList[0][0]["rightText"] = this.selfInfo.phone;
 							this.ucenterList[1][0]["rightText"] = this.selfInfo.balance + " 元";
 						}
 					},
@@ -161,7 +163,7 @@ https://oss-mbh5.colormaprun.com/actMgt/#/pages/my/index
 						password: this.password
 					},
 					success: (res) => {
-						console.log("signOut", res);
+						// console.log("signOut", res);
 						if (res.data.code == 0) {
 			
 							this.$store.commit("setUsername", "");

actMgt/unpackage/dist/build/web/assets/actEdit-BMBrBPna.css

@@ -1 +0,0 @@
-.top[data-v-651c23d7]{height:36px;flex-shrink:0;background:rgba(255,195,0,.26)}.form[data-v-651c23d7]{width:90%;margin-top:20px}.uni-forms-item[data-v-651c23d7]{align-items:center;margin-bottom:22px}.input[data-v-651c23d7]{width:90%;height:30px;padding:0 8px;border:1px solid;border-color:#c6c6c6;border-radius:3px;font-size:14px}.input-placeholder[data-v-651c23d7]{font-weight:300;color:#bfbfbf;font-size:14px}.button[data-v-651c23d7]{width:36vw;margin-top:5px;margin-bottom:25px;border-radius:6px;font-weight:500;color:#333;word-spacing:15px}.button-save[data-v-651c23d7]{color:#fff;background-color:#5a0}.button-submit[data-v-651c23d7]{color:#fff;background-color:#05f}

actMgt/unpackage/dist/build/web/assets/api.BMgalDqr.js

@@ -1 +0,0 @@
-import{ak as e,s as a,q as s}from"./index-ESTWQ1DK.js";const o="https://t-mapi.colormaprun.com/api/actMgt/",t=o+"SmsSend",n=o+"SignUp",r=o+"SignIn",i=o+"SignOut",l=o+"GetSelfInfo",m=o+"CompInfoQuery",d=o+"CompInfoDetail",c=o+"CompInfoAdd",p=o+"CompInfoEdit",u=o+"CompInfoPublish",f=o+"UploadFiles",g=o+"SelectSsctQuery",C=o+"SelectMapQuery",S=o+"SelectPlanQuery",Q=o+"CardRankDetailQuery",I=o+"CompQrCodeQuery",y=o+"CompQrCodeReset";function k(o){if(0==o.data.code)return!0;if(601==o.data.code){let a=e().$store;return a.state.userlevel>0&&(a.commit("setUsername",""),a.commit("setUserlevel",0),a.commit("setToken","")),!0}return 401==o.statusCode?(a({title:"您尚未登录",icon:"none",duration:3e3}),s({url:"/pages/login/login"}),!1):(console.log("======="),o.data.message&&a({title:`${o.data.message}`,icon:"none",duration:3e3}),!1)}export{l as a,m as b,k as c,d,u as e,I as f,y as g,Q as h,r as i,t as j,n as k,i as l,c as m,g as n,C as o,S as p,f as q,p as r};

actMgt/unpackage/dist/build/web/assets/index-Cb1cn3Ds.css

@@ -1 +0,0 @@
-.top[data-v-25064e30]{height:36px;flex-shrink:0;background:rgba(255,195,0,.26)}.form[data-v-25064e30]{width:90%;margin-top:20px}.uni-forms-item[data-v-25064e30]{align-items:center;margin-bottom:22px}.input[data-v-25064e30]{width:90%;height:30px;padding:0 8px;border:1px solid;border-color:#c6c6c6;border-radius:3px;font-size:14px}.input-placeholder[data-v-25064e30]{font-weight:300;color:#bfbfbf;font-size:14px}.button[data-v-25064e30]{width:36vw;margin-top:5px;margin-bottom:25px;border-radius:6px;font-weight:500;color:#333;word-spacing:15px}.button-save[data-v-25064e30]{color:#fff;background-color:#5b8839}.button-submit[data-v-25064e30]{color:#fff;background-color:#e39700}

actMgt/unpackage/dist/build/web/assets/login-X9Hh9wQX.css

@@ -1 +0,0 @@
-.body-bg[data-v-d3e9cd04]{width:100vw;height:100vh;background:url(/actMgt/assets/bg_login-nUa2NoY1.png) no-repeat;background-size:100% 100%;justify-content:space-between}.main[data-v-d3e9cd04]{width:90%;margin-top:10%;justify-content:space-evenly}.topLogo[data-v-d3e9cd04]{width:90px;height:110px;background:url(/actMgt/assets/run-BJVA1_NJ.png) no-repeat;background-size:contain}.title[data-v-d3e9cd04]{margin:10px 0;font-weight:500;color:#fff;font-size:30px;text-align:center}.box[data-v-d3e9cd04]{width:92%;height:237px;padding-top:10px;padding-bottom:10px;justify-content:space-evenly;background-color:#fff;border-radius:13px;box-shadow:0 0 6px rgba(0,0,0,.16)}.input[data-v-d3e9cd04]{width:72%;height:46px;padding:0 5%;border:1px solid;border-color:#c6c6c6;border-radius:3px}.input-placeholder[data-v-d3e9cd04]{font-weight:300;color:#bfbfbf;font-size:16px}.button[data-v-d3e9cd04]{width:82%;background:#ffb40b;border-radius:6px;font-weight:500;color:#333;word-spacing:15px}.hint[data-v-d3e9cd04]{font-size:16px;font-weight:500;color:#383838}.bottomLogo[data-v-d3e9cd04]{width:232px;height:36px;margin-top:20px;background:url(/actMgt/assets/ctbp-ajhRi4Mn.png) no-repeat;background-size:contain}.bottomText[data-v-d3e9cd04]{margin-bottom:30px;font-weight:500;color:#000;font-size:12px;text-align:center}

actMgt/unpackage/dist/build/web/assets/register-CvT6_zFV.css

@@ -1 +0,0 @@
-.uni-countdown[data-v-753d5db2]{display:flex;flex-direction:row;justify-content:flex-start;align-items:center}.uni-countdown__splitor[data-v-753d5db2]{margin:0 2px;font-size:14px;color:#333}.uni-countdown__number[data-v-753d5db2]{border-radius:3px;text-align:center;font-size:14px}.body-bg[data-v-14341258]{width:100vw;height:100vh;background:url(/actMgt/assets/bg_login-nUa2NoY1.png) no-repeat;background-size:100% 100%;justify-content:space-between}.main[data-v-14341258]{width:90%;margin-top:10%;justify-content:space-evenly}.topLogo[data-v-14341258]{width:90px;height:110px;background:url(/actMgt/assets/run-BJVA1_NJ.png) no-repeat;background-size:contain}.title[data-v-14341258]{margin:10px 0;font-weight:500;color:#fff;font-size:30px;text-align:center}.box[data-v-14341258]{width:92%;padding-top:25px;padding-bottom:20px;justify-content:space-evenly;background-color:#fff;border-radius:13px;box-shadow:0 0 6px rgba(0,0,0,.16)}.form[data-v-14341258]{width:80%}.input[data-v-14341258]{width:90%;height:36px;padding:0 5%;border:1px solid;border-color:#c6c6c6;border-radius:3px}.input-placeholder[data-v-14341258]{font-weight:300;color:#bfbfbf;font-size:14px}.btnSendVfcode[data-v-14341258]{width:48%;height:38px;font-size:13px;line-height:38px}.button[data-v-14341258]{width:82%;margin:5px 0;background:#ffb40b;border-radius:6px;font-weight:500;color:#333;word-spacing:15px}.hint[data-v-14341258]{margin-top:10px;font-size:16px;font-weight:500;color:#383838}.bottomLogo[data-v-14341258]{width:232px;height:36px;margin-top:20px;background:url(/actMgt/assets/ctbp-ajhRi4Mn.png) no-repeat;background-size:contain}.bottomText[data-v-14341258]{margin-bottom:30px;font-weight:500;color:#000;font-size:12px;text-align:center}

actMgt/unpackage/dist/build/web/assets/uni-app.es.B2O8FBxl.js

@@ -1 +0,0 @@
-import"./index-ESTWQ1DK.js";function r(r,t){return"string"==typeof r?t:r}export{r};

actMgt/unpackage/dist/build/web/index.html

@@ -14,7 +14,7 @@
     <title>actMgt</title>
     <!--preload-links-->
     <!--app-context-->
-    <script type="module" crossorigin src="/actMgt/assets/index-ESTWQ1DK.js"></script>
+    <script type="module" crossorigin src="/actMgt/assets/index-DPLz-9Yv.js"></script>
     <link rel="stylesheet" crossorigin href="/actMgt/assets/index-_fB64p-5.css">
   </head>
   <body>

actMgt/utils/card.js

@@ -30,14 +30,14 @@ var card = {
 	
 	getBannerStyle(actRs) {
 		const bannerUrl = actRs.config.tplInfo.matchBanner;
-		console.log("[getBannerStyle] bannerUrl", bannerUrl);
+		// console.log("[getBannerStyle] bannerUrl", bannerUrl);
 		let style = "";
 		if (bannerUrl.length > 0) {
 			style = `background-image: url("${bannerUrl}");`;
 		} else {
-			style = `background-image: url("https://oss-mbh5.colormaprun.com/static/banner/banner1.png");`;
+			style = `background-image: url("${getApp().globalData.defaultMatchBanner}");`;
 		}
-		console.log("[getBannerStyle] style", style);
+		// console.log("[getBannerStyle] style", style);
 		return style;
 	},
 }