From e5a574db867d6f5d7a7ae45a38f4bcd774a608c3 Mon Sep 17 00:00:00 2001
From: xu0625 <1212>
Date: Wed, 21 Apr 2021 14:35:13 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=A8=83=E5=A8=83=E6=9C=BA?=
 =?UTF-8?q?=E6=8A=BD=E5=A5=96=E8=AE=B0=E5=BD=95=E6=9F=A5=E8=AF=A2=E6=92=AD?=
 =?UTF-8?q?=E6=8A=A5=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../web/controller/draw/DrawController.java   |  2 +-
 .../src/main/resources/public/doll/index.html | 87 +++++++++----------
 .../src/main/resources/public/doll/js/main.js | 66 +++++++-------
 3 files changed, 75 insertions(+), 80 deletions(-)
diff --git a/sino-act-web/src/main/java/com/ruoyi/web/controller/draw/DrawController.java b/sino-act-web/src/main/java/com/ruoyi/web/controller/draw/DrawController.java
index 877806115..e203fa6c9 100644
--- a/sino-act-web/src/main/java/com/ruoyi/web/controller/draw/DrawController.java
+++ b/sino-act-web/src/main/java/com/ruoyi/web/controller/draw/DrawController.java
@@ -209,7 +209,7 @@ public class DrawController {
                 result.setRecord(prizes);
                 return result;
             }*/
-            String userId ="1328495419744";
+            String userId ="";
          /*   if (!"1".equals(isAll)) {
                  Long userId1 = ShiroUtils.getUserId();
                 userId = userInfo.getOpenid();
diff --git a/sino-act-web/src/main/resources/public/doll/index.html b/sino-act-web/src/main/resources/public/doll/index.html
index 04c43b55e..16b0b489f 100644
--- a/sino-act-web/src/main/resources/public/doll/index.html
+++ b/sino-act-web/src/main/resources/public/doll/index.html
@@ -1,12 +1,13 @@
 <!DOCTYPE html>
 <html lang="zh">
 <head>
-	<meta charset="GBK">
-	<title>积分抓好运</title>
+	<meta charset="UTF-8">
+	<title>绉垎鎶撳ソ杩�</title>
 	<meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no">
 	<link rel="stylesheet" type="text/css" href="css/reset.css" />
 	<link rel="stylesheet" type="text/css" href="css/main.css?v=542" />
 	<link rel="stylesheet" type="text/css" href="css/iosSelect.css" />
+	<script src="/js/config.js"></script>
 </head>
 <body>
 <div class="lottery">
@@ -23,21 +24,21 @@
 	</div>
 	<p class="lottery_role"></p>
 	<p class="lottery_prize"></p>
-  <p class="lottery_tips">每次消耗<span class="integral">50</span>积分</p>
+  <p class="lottery_tips">姣忔娑堣€�<span class="integral">50</span>绉垎</p>
   <button class="lottery_go"></button>
-	<p class="lottery_points">您还剩余<span class="num">0</span>积分</p>
+	<p class="lottery_points">鎮ㄨ繕鍓╀綑<span class="num">0</span>绉垎</p>
 	<a href="javascript:void(0);" class="lottery_link"></a>
 </div>
 <input type="hidden" class="drawType"/>
-<!--未中奖-->
+<!--鏈腑濂�-->
 <div class="pop pop_fail" style="display:none;">
 	<div class="pop_bg">
 		<span class="closed"></span>
-		<div class="contact">就差一点点<br/>再接再厉哦</div>
+		<div class="contact">灏卞樊涓€鐐圭偣<br/>鍐嶆帴鍐嶅帀鍝�</div>
 		<p class="btn"></p>
 	</div>
 </div>
-<!--中奖-->
+<!--涓-->
 <div class="pop pop_success" style="display:none;">
 	<div class="pop_bg">
 		<span class="closed"></span>
@@ -48,41 +49,33 @@
 		<p class="btn"></p>
 	</div>
 </div>
-<!--填写信息-->
+<!--濉啓淇℃伅-->
 <div class="pop pop_fillin" style="display:none;">
 	<div class="pop_bg">
 		<span class="closed"></span>
 		<div class="contact">
-			<p><span>收&nbsp;&nbsp;货&nbsp;&nbsp;人:</span><input class="uname" type="text" placeholder="请输入"/></p>
-			<p><span>身份证号:</span><input class="idcard" type="text" maxlength="18" placeholder="请输入"/></p>
-			<p><span>联系电话:</span><input class="phone" type="text" maxlength="11" placeholder="请输入"/></p>
-			<p><span>所在地区:</span><input class="contact_sel city" type="text" placeholder="请输入" readonly value="北京市 北京市 西城区" id="select_contact"  data-city-code="110100" data-province-code="110000" data-district-code="110102"/></p>
-			<p><span>详细地址:</span><textarea class="addr" placeholder="请输入详细地址信息，如道路、门牌号、 小区、楼栋好、单元室等"></textarea></p>
+			<p><span>鏀�&nbsp;&nbsp;璐�&nbsp;&nbsp;浜�:</span><input class="uname" type="text" placeholder="璇疯緭鍏�"/></p>
+			<p><span>韬唤璇佸彿:</span><input class="idcard" type="text" maxlength="18" placeholder="璇疯緭鍏�"/></p>
+			<p><span>鑱旂郴鐢佃瘽:</span><input class="phone" type="text" maxlength="11" placeholder="璇疯緭鍏�"/></p>
+			<p><span>鎵€鍦ㄥ湴鍖�:</span><input class="contact_sel city" type="text" placeholder="璇疯緭鍏�" readonly value="鍖椾含甯� 鍖椾含甯� 瑗垮煄鍖�" id="select_contact"  data-city-code="110100" data-province-code="110000" data-district-code="110102"/></p>
+			<p><span>璇︾粏鍦板潃:</span><textarea class="addr" placeholder="璇疯緭鍏ヨ缁嗗湴鍧€淇℃伅锛屽閬撹矾銆侀棬鐗屽彿銆� 灏忓尯銆佹ゼ鏍嬪ソ銆佸崟鍏冨绛�"></textarea></p>
 			<p class="contact_btn"></p>
 		</div>
 	</div>
 </div>
-<!--我的奖品-->
+<!--鎴戠殑濂栧搧-->
 <div class="pop pop_prize" style="display:none;">
 	<div class="pop_bg">
 		<h3 class="title"></h3>
 		<span class="closed"></span>
 		<div class="contact">
 			<ul class="content_list myPrizes">
-				<li><img src="images/img_prize01.png" /><span>50积分</span><span class="list_date">2020-11-23</span></li>
-				<li><img src="images/img_prize02.png" /><span>猫眼50</span><span class="list_date">2020-11-23</span></li>
-				<li><img src="images/img_prize03.png" /><span>猫眼70</span><span class="list_date">2020-11-23</span></li>
-				<li><img src="images/img_prize04.png" /><span>网易季卡</span><span class="list_date">2020-11-23</span></li>
-				<li><img src="images/img_prize05.png" /><span>网易月卡</span><span class="list_date">2020-11-23</span></li>
-				<li><img src="images/img_prize06.png" /><span>QQ音乐</span><span class="list_date">2020-11-23</span></li>
-				<li><img src="images/img_prize07.png" /><span>优酷月卡</span><span class="list_date">2020-11-23</span></li>
-				<li><img src="images/img_prize08.png" /><span>优酷季卡</span><span class="list_date">2020-11-23</span></li>
 			</ul>
 		</div>
 	</div>
 </div>
-<!--活动规则-->
-<div class="pop pop_role role" style="display:none;">
+<!--娲诲姩瑙勫垯-->
+<div class="pop pop_role" style="display:none;">
 	<div class="pop_bg">
 		<h3 class="title"></h3>
 		<span class="closed"></span>
@@ -96,16 +89,17 @@
 	<img class="prize" src="" alt="">
 </div>
 <ul class="" style="display: none;">
-	<li class="award">恭喜 151****3445 获得京东E卡</li>
+	<li class="award">鎭枩 151****3445 鑾峰緱浜笢E鍗�</li>
 </ul>
 <ul class="" style="display: none;">
-	<li class="prize_li"><img src="images/img_prize01.png" /><span class="pname">50积分</span><span class="list_date time">2020-11-23</span></li>
+	<li class="prize_li"><img src="images/img_prize01.png" /><span class="pname">50绉垎</span><span class="list_date time">2020-11-23</span></li>
 </ul>
 <script src="js/jquery-1.11.0.min.js"></script>
 <script src="js/common.js"></script>
 <script src="js/scroll.js"></script>
 <script src="js/iosSelect.js"></script>
 <script src="js/areaData_v2.js" charset="GBK"></script>
+<script src="../draw/js/util.js"></script>
 <script src="../../common/taglibs.js"></script>
 <script src="../../js/jsencrypt.min.js"></script>
 <script src="../../js/encryptUtil.js"></script>
@@ -114,27 +108,26 @@
 <script src="../../js/layui/layer.js"></script>
 <script src="../../js/layui/layerUtils.js"></script>
 <script src="../draw/js/draw.js"></script>
-<script src="/js/config.js"></script>
 <script src="js/main.js"></script>
 <script>
 	const DOLL = 'doll';
 	$(function () {
-		init(DOLL);
+		//init(DOLL);
 		initAwards();
 	});
-	//抽奖
+	//鎶藉
 	var cH = $(".tool")[0].clientHeight;
 	var tH = $(".tool")[0].offsetTop;
 	var lH = $('.tool_line')[0].clientHeight;
 	var timer = null;
 	$('.lottery_go').click(function(){
-		//中奖传1，2，3，4，5，6，7，8（对应奖品）,未中奖传-1
-		//1:50积分,2:猫眼50,3:猫眼70,4:网易季卡,5:网易月卡,6:QQ音乐,7:优酷月卡,8:优酷季卡
+		//涓浼�1锛�2锛�3锛�4锛�5锛�6锛�7锛�8锛堝搴斿鍝侊級,鏈腑濂栦紶-1
+		//1:50绉垎,2:鐚溂50,3:鐚溂70,4:缃戞槗瀛ｅ崱,5:缃戞槗鏈堝崱,6:QQ闊充箰,7:浼橀叿鏈堝崱,8:浼橀叿瀛ｅ崱
 		fnLottery(-1);
 	});
 	function fnLottery(status){
 		try{
-			zhuge.track('娃娃机-开始抓奖按钮【'+drawCode+'】');
+			zhuge.track('濞冨▋鏈�-寮€濮嬫姄濂栨寜閽€�'+drawCode+'銆�');
 		}catch(err){console.log(err);}
 		if (running) {
 			console.log('running...');
@@ -161,7 +154,7 @@
 			}
 			$('.tool_line').animate({height:lH},1500);
 			$(".tool").animate({top:tH},1500,function(){
-				//中奖啦
+				//涓鍟�
 				if(status != -1){
 					$('.pop_success').show();
 					$(".tool img").hide();
@@ -169,7 +162,7 @@
 					let imgSrc = $('img[p-code='+prizeCode+']').attr('src');
 					$(".contact img").attr('src',imgSrc);
 				}
-				//未中奖
+				//鏈腑濂�
 				if(status == -1){
 					$('.pop_fail').show();
 				}
@@ -178,16 +171,16 @@
 		}, 2500);
 	}
 
-	//所在地区选择
+	//鎵€鍦ㄥ湴鍖洪€夋嫨
 	var selectContactDom = $('#select_contact');
 	selectContactDom.bind('click', function () {
-		var oneLevelId = selectContactDom.attr('data-province-code'); //省code
-		var twoLevelId = selectContactDom.attr('data-city-code');//市code
-		var threeLevelId = selectContactDom.attr('data-district-code');//区code
+		var oneLevelId = selectContactDom.attr('data-province-code'); //鐪乧ode
+		var twoLevelId = selectContactDom.attr('data-city-code');//甯俢ode
+		var threeLevelId = selectContactDom.attr('data-district-code');//鍖篶ode
 		var iosSelect = new IosSelect(3,
 						[iosProvinces, iosCitys, iosCountys],
 						{
-							title: '地址选择',
+							title: '鍦板潃閫夋嫨',
 							itemHeight: 35,
 							relation: [1, 1],
 							oneLevelId: oneLevelId,
@@ -201,29 +194,31 @@
 							}
 						});
 	});
-	//活动规则
+	//娲诲姩瑙勫垯
 	$('.lottery_role').click(function(){
 		drawrule();
 		$('.pop_role').show();
 	})
-	//关闭弹层
+	//鍏抽棴寮瑰眰
 	$('.closed,.btn').click(function(){
 		$(this).parents('.pop').hide();
 	})
-	//未中奖确认关闭弹层
+	//鏈腑濂栫‘璁ゅ叧闂脊灞�
 	$('.pop_fail .btn').click(function(){
 		$(this).parents('.pop').hide();
 	})
-	//中奖立即领取
+	//涓绔嬪嵆棰嗗彇
 	$('.pop_success .btn').click(function(){
-		$(this).parents('.pop').hide();
+		/*$(this).parents('.pop').hide();
 		let cue = body.cue;
 		let prizeType = body.prizeType;
 		if (prizeType === 'materialObject') {
 			$('.pop_fillin').show();
 		} else {
 			layerTip(cue);
-		}
+		}*/
+		window.location.href='../act/address.html?drawCode='+drawCode;
+
 	});
 	$('.contact_btn').click(function () {
 		saveAddr()
@@ -233,7 +228,7 @@
 	})
 	$('.lottery_link').click(function () {
 		try{
-			zhuge.track('娃娃机-点我赚积分按钮【'+drawCode+'】');
+			zhuge.track('濞冨▋鏈�-鐐规垜璧氱Н鍒嗘寜閽€�'+drawCode+'銆�');
 		}catch(err){console.log(err);}
 		// location.href = contextRootPath+'/wechat/user/toPension.do?ak=pensionSecond';
 		location.href = contextRootPath+'/activity/tree/index.html?showTask=1&cl='+cl;
diff --git a/sino-act-web/src/main/resources/public/doll/js/main.js b/sino-act-web/src/main/resources/public/doll/js/main.js
index 07dfa210b..a017a18cf 100644
--- a/sino-act-web/src/main/resources/public/doll/js/main.js
+++ b/sino-act-web/src/main/resources/public/doll/js/main.js
@@ -3,7 +3,7 @@ let cl = getParameter('cl');
 let uid = getParameter('uid');
 let running = false;
 let body;
-//剩余次数或积分
+//鍓╀綑娆℃暟鎴栫Н鍒�
 function init(facade){
   $.ajax({
     type:'POST',
@@ -38,40 +38,40 @@ function init(facade){
     },
     error:function(XMLHttpRequest, textStatus, errorThrown){
       console.log(textStatus);
-      layerTip('网络异常，请检查网络环境');
+      layerTip('缃戠粶寮傚父锛岃妫€鏌ョ綉缁滅幆澧�');
     }
   });
 }
 function initAwards(){
   $.ajax({
     type:'POST',
-    url:contextRootPath+'/integral/active/getRollList.do',
-    data: {"drawCode": drawCode},
+    url:contextRootPath+'/draw/prizes.action',
+    data: {"drawCode": drawCode, isAll: 1},
     dataType:'json',
     success:function(data){
-      let awards = data.awardPrizeLists;
+      let awards = data.record;
       if (!awards) {
         return;
       }
       $.each(awards, function (i, n) {
-        let userName = n.userName;
-        let prizeName = n.prizeName;
-        let dateStr = n.dateStr;
+        let userName = n.username;
+        let prizeName = n.prizename;
+        let dateStr = n.createtimestamp;
         let award = $('.award').clone();
         award.show();
         award.removeClass('award');
-        award.html('恭喜'+userName+'获得'+prizeName);
+        award.html('鎭枩'+userName+'鑾峰緱'+prizeName);
         $('.awards').append(award);
       });
-      //中奖名单滚动
+      //涓鍚嶅崟婊氬姩
       $('.my_scroll').myScroll({
-        speed: 100, //数值越大，速度越慢
-        rowHeight: 38//li的高度
+        speed: 100, //鏁板€艰秺澶э紝閫熷害瓒婃參
+        rowHeight: 38//li鐨勯珮搴�
       });
     },
     error:function(XMLHttpRequest, textStatus, errorThrown){
       console.log(textStatus);
-      layerTip('网络异常，请检查网络环境');
+      layerTip('缃戠粶寮傚父锛岃妫€鏌ョ綉缁滅幆澧�');
     }
   });
 }
@@ -80,23 +80,23 @@ function myprizes(facade) {
   $('.pop_prize').show();
   $.ajax({
     type: "POST",
-    url: contextRootPath+'/integral/active/awardPrizeList.do',
+    url: contextRootPath+'/draw/prizes.action',
     data: {drawCode: drawCode, facade: facade},
     dataType: "json",
     success: function(data){
-      let prizes = data.awardPrizeLists;
+      let prizes = data.record;
       if (!prizes) {
         return;
       }
       $.each(prizes, function (i, n) {
-        let ptype = n.prizeType;
+        let ptype = n.prizetype;
         let status = n.status;
-        let prizeCode = n.prizeCode;
+        let prizeCode = n.prizecode;
         let prize = $('.prize_li').clone();
         prize.show();
         prize.removeClass('prize_li');
-        prize.find('.pname').html(n.prizeName);
-        prize.find('.time').html(n.dateStr);
+        prize.find('.pname').html(n.prizename);
+        prize.find('.time').html(n.createtimestamp);
         let imgSrc = $('img[p-code=' + prizeCode + ']').attr('src');
         prize.find("img").attr('src', imgSrc);
         let link = n.link;
@@ -106,13 +106,13 @@ function myprizes(facade) {
           });
         }
         $(prize).attr('val', prizeCode);
-        $(prize).attr('flow', n.gatewayFolw);
+        $(prize).attr('flow', n.drawtranseqno);
         $(prize).attr('ptype', ptype);
         $('.myPrizes').append(prize);
       });
     },
     error: function (XMLHttpRequest, textStatus, errorThrown) {
-      console.log('网络异常', textStatus, errorThrown);
+      console.log('缃戠粶寮傚父', textStatus, errorThrown);
     }
   });
 
@@ -128,23 +128,23 @@ function saveAddr(type) {
   if ('integral' == prizeType) {
   } else if ('materialObject' == prizeType) {
     if (!uname) {
-      layerTip('请输入收货人姓名');
+      layerTip('璇疯緭鍏ユ敹璐т汉濮撳悕');
       return;
     }
     if (!idcard) {
-      layerTip('请输入身份证号');
+      layerTip('璇疯緭鍏ヨ韩浠借瘉鍙�');
       return;
     }
     if (!phone) {
-      layerTip('请输入联系电话');
+      layerTip('璇疯緭鍏ヨ仈绯荤數璇�');
       return;
     }
     if (!city) {
-      layerTip('请选择所在地区');
+      layerTip('璇烽€夋嫨鎵€鍦ㄥ湴鍖�');
       return;
     }
     if (!addr) {
-      layerTip('请输入详细地址');
+      layerTip('璇疯緭鍏ヨ缁嗗湴鍧€');
       return;
     }
   } else {
@@ -168,11 +168,11 @@ function saveAddr(type) {
       } else {
       }
       $('.pop_fillin').hide();
-      layerTip('保存成功')
+      layerTip('淇濆瓨鎴愬姛')
     },
     error: function (XMLHttpRequest, textStatus, errorThrown) {
-      console.log('网络异常', textStatus, errorThrown);
-      layerTip('网络异常，请检查网络环境');
+      console.log('缃戠粶寮傚父', textStatus, errorThrown);
+      layerTip('缃戠粶寮傚父锛岃妫€鏌ョ綉缁滅幆澧�');
     }
   });
 
@@ -199,7 +199,7 @@ function start() {
         return;
       } else if (code == '-1') {
         running = false;
-        layerTip('请先完善手机号');
+        layerTip('璇峰厛瀹屽杽鎵嬫満鍙�');
         return;
       }
       if (code != '0') {
@@ -213,11 +213,11 @@ function start() {
     error:function(XMLHttpRequest, textStatus, errorThrown){
       running = false;
       console.log(textStatus);
-      layerTip('网络异常，请检查网络环境');
+      layerTip('缃戠粶寮傚父锛岃妫€鏌ョ綉缁滅幆澧�');
     }
   });
 }
-//剩余次数或积分
+//鍓╀綑娆℃暟鎴栫Н鍒�
 function num(drawType){
   // let drawType = $('.drawType').val();
   $.ajax({
@@ -232,7 +232,7 @@ function num(drawType){
     },
     error:function(XMLHttpRequest, textStatus, errorThrown){
       console.log(textStatus);
-      layerTip('网络异常，请检查网络环境');
+      layerTip('缃戠粶寮傚父锛岃妫€鏌ョ綉缁滅幆澧�');
     }
   });
 }
\ No newline at end of file
