页面调整

api/test/luckyDraw/LuckyDrawService.js

@@ -40,4 +40,12 @@ export default class LuckyDrawService {
       params: {id: id,number: number,awardId: awardId}
     })
   }
+  
+  luckyDrawAgain (id,number,awardId) {
+    return request({
+      url: '/luckyDraw/info/luckyDrawAgain',
+      method: 'post',
+      params: {id: id,number: number,awardId: awardId}
+    })
+  }
 }

common/graceChecker.js

@@ -75,6 +75,10 @@ module.exports = {
 					var reg = /^(((13[0-9]{1})|(15[0-9]{1})|(16[0-9]{1})|(18[0-9]{1})|(17[0-9]{1})|(19[0-9]{1}))+\d{8})$/;
 					if (!reg.test(value)) { this.error = rule[i].errorMsg || rule[i].name + '不是合法的手机号码！'; return false; }
 				break;
+				case 'isMobileNumber':
+					var reg = /^[0-9]{11}$/;
+					if (!reg.test(value)) { this.error = rule[i].errorMsg || rule[i].name + '不是合法的手机号码！'; return false; }
+				break;
 				case 'isUrl':
 					var reg = /^http[s]?:\/\/.*/
 					if (!reg.test(value)) { this.error = rule[i].errorMsg|| rule[i].name + '不是合法的URL！'; return false; }

pages.json

@@ -290,7 +290,7 @@
 				"ly-tree-node": "/components/ly-tree/ly-tree-node"
 			},
 		"navigationBarBackgroundColor": "#0081ff",
-		"navigationBarTitleText": "兴光业务系统",
+		"navigationBarTitleText": "兴光培训抽奖活动",
 		"navigationStyle": "custom",
 		"navigationBarTextStyle": "white"
 	},

pages/test/luckyDraw/LuckyDrawEvents.vue

@@ -2,7 +2,7 @@
 	<view>
 		<cu-custom :backUrl="'/pages/test/luckyDraw/LuckyDrawEvents'" :isBack="true" bgColor="bg-gradual-blue" >
 			<block slot="backText">返回</block>
-			<block slot="content">活动中心</block>
+			<block slot="content">抽奖活动</block>
 			<block slot="right" >
 				<view  @click="back()">
 					刷新

pages/test/luckyDraw/LuckyDrawEventsDetail.vue

@@ -33,7 +33,7 @@
 						<view class="action">
 							<text class="cuIcon-present text-red"></text>
 							<text class="text-red" style="margin-left: 2upx;" @click="toLottery()">
-								点击查看中奖信息
+								中奖信息
 							</text>
 						</view>
 					</view>

pages/test/luckyDraw/LuckyDrawEvents_pc.vue

@@ -1,8 +1,8 @@
 <template>
 	<view>
-		<cu-custom :backUrl="'/pages/test/luckyDraw/LuckyDrawEvents'" :isBack="true" bgColor="bg-gradual-blue" >
+		<cu-custom :backUrl="'/pages/test/luckyDraw/LuckyDrawEvents_pc'" :isBack="true" bgColor="bg-gradual-blue" >
 			<block slot="backText">返回</block>
-			<block slot="content">活动中心</block>
+			<block slot="content">活动抽奖</block>
 			<block slot="right" >
 				<view  @click="back()">
 					刷新
@@ -94,7 +94,7 @@ import LuckyDrawEventsService from '@/api/test/luckyDraw/LuckyDrawEventsService'
 			},
 			back () {
 				uni.navigateTo({
-				  url: '/pages/test/luckyDraw/LuckyDrawEvents'
+				  url: '/pages/test/luckyDraw/LuckyDrawEvents_pc'
 				})
 			}
 		}

pages/test/luckyDraw/LuckyDrawList.vue

@@ -2,7 +2,7 @@
 	<view>
 		<cu-custom bgColor="bg-blue" :isBack="true">
 			<block slot="backText">返回</block>
-			<block slot="content"> 抽奖结果</block>
+			<block slot="content"> 抽奖</block>
 		</cu-custom>
 		<view>
 			<view class="uni-container">
@@ -33,6 +33,7 @@
 						<uni-td align="center" :style="row.showFlag === '2'?'background-color: bisque;':''">
 							<view class="uni-group">
 								<button class="uni-button" size="mini" v-if="row.luckyDrawFlag !== '1'" @click="LuckyDraw(row.eventsId,row.number,row.id)" type="warn">抽奖</button>
+								<button class="uni-button" size="mini" v-if="row.luckyDrawAgainFlag === '1'" @click="luckyDrawAgain(row.eventsId,row.number,row.id)" type="warn">重新抽奖</button>
 							</view>
 						</uni-td>
 					</uni-tr>
@@ -99,7 +100,7 @@
 	  	  url: '/pages/test/mobile/TestMobileForm?id='+id
 	  	})
 	  },
-      // 删除
+      // 抽奖
 	  LuckyDraw (id,number,awardId) {
 	  	uni.showModal({
 	  		title: '提示',
@@ -152,6 +153,25 @@
 	  currentChangeHandle (e) {
 		this.tablePage.currentPage = e.current
 		this.refreshList()
+	  },
+		luckyDrawAgain (id,number,awardId) {
+	  	uni.showModal({
+	  		title: '提示',
+	  		content: '您确认要对该奖项进行重新抽奖吗？',
+	  		showCancel: true,
+	  		success: (res) => {
+	  			if (res.confirm) {
+	  				this.testMobileService.luckyDrawAgain(id,number,awardId).then(({data})=>{
+						console.log(data)
+	  					uni.showToast({
+	  						title: data.msg,
+	  						icon:"success"
+	  					})
+	  					this.refreshList(id)
+	  				})
+	  			}
+	  		}
+	  	});
 	  }
     }
   }

pages/test/luckyDraw/LuckyDrawRegister.vue

@@ -42,7 +42,7 @@
 					eventId: ''
 				},
 				officeList: [
-					'工程一部','工程二部','工程三部','工程四部','工程五部','其他'
+					'工程一部','工程二部','工程三部','工程四部','工程五部','招标代理部','其他'
 				],
 				officeIndex: -1
 			};
@@ -60,7 +60,7 @@
 					  {name:"name", checkType : "notnull", checkRule:"",  errorMsg:"姓名不能为空"},
 					  {name:"officeName", checkType : "notnull", checkRule:"",  errorMsg:"部门不能为空"},
 					  {name:"phone", checkType : "notnull", checkRule:"",  errorMsg:"电话号码不能为空"},
-					  {name:"phone", checkType : "isMobile", checkRule:"",  errorMsg:"电话号码格式不正确"}
+					  {name:"phone", checkType : "isMobileNumber", checkRule:"",  errorMsg:"电话号码格式不正确"}
 				];
 				//进行表单检查
 				var formData = this.inputForm;

pages/test/luckyDraw/LuckyDrawShowList.vue

@@ -2,7 +2,7 @@
 	<view>
 		<cu-custom :isBack="true" bgColor="bg-gradual-blue">
 			<block slot="backText">返回</block>
-			<block slot="content">中奖清单</block>
+			<block slot="content">抽奖结果</block>
 		</cu-custom>
 		<view>
 			<view class="uni-container">