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 078860a57..877806115 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
@@ -1,8 +1,7 @@
 package com.ruoyi.web.controller.draw;
 
 import com.ruoyi.common.utils.DateUtils;
-import com.ruoyi.dto.DrawActivityRequest;
-import com.ruoyi.web.vo.Const;
+import com.ruoyi.dto.*;
 import com.ruoyi.web.vo.Result;
 import com.ruoyi.web.vo.draw.*;
 import com.sinosoft.activity.domain.DrawConfig;
@@ -12,6 +11,7 @@ import com.sinosoft.activity.service.IDrawConfigService;
 import com.sinosoft.activity.service.IDrawInfoService;
 import com.sinosoft.activity.service.IDrawTaskNotifyService;
 import com.sinosoft.activity.service.*;
+import com.sinosoft.activity.service.impl.ActPageConfigUserinfoServiceImpl;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -19,7 +19,6 @@ import io.swagger.annotations.ApiOperation;
 import me.chanjar.weixin.common.bean.WxOAuth2UserInfo;
 import me.chanjar.weixin.common.bean.oauth2.WxOAuth2AccessToken;
 import me.chanjar.weixin.mp.api.WxMpService;
-import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -32,6 +31,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpSession;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -58,11 +58,18 @@ public class DrawController {
     @Autowired
     private IActConfigService actConfigService;
     @Autowired
+    private ActPageConfigUserinfoServiceImpl actPageConfigUserinfoServiceImpl;
+    @Autowired
     private IActPageConfigSubscribeService iActPageConfigSubscribeService;
 
     @Autowired
     private IActPageConfigUserinfoService  iActPageConfigUserinfoService;
     @Autowired
+    private IDrawRecordService iDrawRecordService;
+
+    @Autowired
+    private IDrawUserInfoService iDrawUserInfoService;
+    @Autowired
     private IDrawTaskNotifyService taskNotifyService;
     @Autowired
     private IDrawRuleService drawRuleService;
@@ -174,12 +181,12 @@ public class DrawController {
 
     @RequestMapping(value="/info.action", method = RequestMethod.POST)
     @ResponseBody
-    public ActPageConfigUserinfoResult info(HttpServletRequest request, String drawCode) {
+    public ActPageConfigUserinfoResult info(HttpServletRequest request, String actCode) {
         ActPageConfigUserinfoResult result = new ActPageConfigUserinfoResult();
-        logger.info("活动编码"+drawCode);
+        logger.info("活动编码"+actCode);
         try{
             List<ActPageConfigUserinfo> prizes = new ArrayList<ActPageConfigUserinfo>();
-            ActPageConfigUserinfo actPageConfigUserinfo = iActPageConfigUserinfoService.selectActPageConfigUserinfoByCode(drawCode);
+            ActPageConfigUserinfo actPageConfigUserinfo = iActPageConfigUserinfoService.selectActPageConfigUserinfoByCode(actCode);
             prizes.add(actPageConfigUserinfo);
             result.setActPageConfigUserinfo(prizes);
         }catch (Exception e){
@@ -193,51 +200,28 @@ public class DrawController {
     @ResponseBody
     public PrizeResult prizes(HttpServletRequest request, String drawCode, String isAll) {
         PrizeResult result = new PrizeResult();
-        List<Prize> prizes = new ArrayList<Prize>();
+        List<DrawRecord> prizes = new ArrayList<DrawRecord>();
         try {
+
             HttpSession session = request.getSession();
             WxOAuth2UserInfo userInfo = getUserInfo(request, null);
-            if (userInfo == null && !"1".equals(isAll)) {
-                result.setPrizes(prizes);
+         /*   if (userInfo == null && !"1".equals(isAll)) {
+                result.setRecord(prizes);
                 return result;
-            }
-            String userId = null;
-            if (!"1".equals(isAll)) {
+            }*/
+            String userId ="1328495419744";
+         /*   if (!"1".equals(isAll)) {
+                 Long userId1 = ShiroUtils.getUserId();
                 userId = userInfo.getOpenid();
+            }*/
+            List<DrawRecord> drawRecords = iDrawRecordService.selectDrawRecordCodeList(drawCode, userId);
+            for (DrawRecord draw: drawRecords) {
+                String mobile = draw.getPHONE();
+                if (StringUtils.isNotBlank(mobile)) {
+                    draw.setPHONE(mobile.substring(0, 3) + "****" + mobile.substring(7, mobile.length()));
+                }
             }
-//            AwardPrizeListResponse awardPrizeListResponse = activityService.awardPrizeList(drawCode, userId).get_return();
-//            AwardPrizeListResponseHeader header = awardPrizeListResponse.getHeader();
-//            result.setRespCode(header.getResultCode());
-//            result.setRespMsg(header.getResultInfo());
-//            AwardPrizeListResponseBody responseBody = awardPrizeListResponse.getResponseBody();
-//            AwardPrizeList[] awardPrizes = responseBody.getAwardPrizeLists();
-//            if (awardPrizes != null) {
-//                for (int i = 0; i < awardPrizes.length; i++) {
-//                    AwardPrizeList awardPrize = awardPrizes[i];
-//                    Prize prize = new Prize();
-//                    prize.setPrizeCode(awardPrize.getPrizeCode());
-//                    prize.setPrizeName(awardPrize.getPrizeName());
-//                    prize.setPrizeType(awardPrize.getPrizeType());
-//                    prize.setDrawTime(DateUtil.convertDate(DateUtil.convertStringToDate(awardPrize.getDrawTime(), DateUtil.YYYYMMDDHHMMSSS), "yyyy/MM/dd HH:mm"));
-//                    prize.setStatus(awardPrize.getStatus());
-//                    prize.setExtId(awardPrize.getExtId());
-//                    prize.setGatewayFlow(awardPrize.getGatewayFolw());
-//                    String userName = awardPrize.getUserName();
-//                    if (StringUtils.isNotBlank(userName)) {
-//                        int end = 1;
-//                        if (userName.length()==2) {
-//                            end = 0;
-//                        }
-//                        prize.setUserName(StringUtil.getStarString2(userName, 1, end));
-//                    }
-//                    String mobile = awardPrize.getMobile();
-//                    if (StringUtils.isNotBlank(mobile)) {
-//                        prize.setMobile(StringUtil.getStarString2(mobile, 3, 4));
-//                    }
-//                    prizes.add(prize);
-//                }
-//            }
-            result.setPrizes(prizes);
+            result.setRecord(drawRecords);
         } catch (Exception e) {
             result.setRespCode("-1");
             result.setRespMsg("系统异常，请稍后再试");
@@ -309,42 +293,13 @@ public class DrawController {
         }
         return result;
     }
-    @RequestMapping(value="/saveAddress.action", method = RequestMethod.POST)
+    @RequestMapping(value="/saveAddress", method = RequestMethod.POST)
     @ResponseBody
-    public Result saveAddress(HttpServletRequest request, String drawCode, String uname, String phone, String addr, String flow) {
+    public Result saveAddress(HttpServletRequest request, DrawUserInfo userInfo) {
         Result result = new Result();
         try {
-            HttpSession session = request.getSession();
-            WxOAuth2UserInfo userInfo = getUserInfo(request, null);
-            if (userInfo == null) {
-                result.setRespCode("-2");
-                result.setRespMsg("会话已失效，请重新登录");
-                logger.info("DrawController.saveAddress userId is null");
-                return result;
-            }
-            if (StringUtils.isBlank(uname)) {
-                result.setRespCode("-4");
-                result.setRespMsg("请输入姓名");
-                return result;
-            }
-//            String validateMobile = CommonValidate.validateMobile(phone, "1");
-//            if (StringUtils.isNotBlank(validateMobile)) {
-//                result.setRespCode("-4");
-//                result.setRespMsg(validateMobile);
-//                return result;
-//            }
-            String userId = userInfo.getOpenid();
-//            SaveUserAddressRequestBody requestBody = new SaveUserAddressRequestBody();
-//            requestBody.setDrawCode(drawCode);
-//            requestBody.setGatewayFlow(flow);
-//            requestBody.setUserId(userId);
-//            requestBody.setUserName(uname);
-//            requestBody.setPhone(phone);
-//            requestBody.setAddress(addr);
-//            //实物留资
-//            requestBody.setNotifyType("007");
-//            requestBody.setCity("无");
-//            activityService.saveUserAddress(requestBody);
+            userInfo.setCreateTime(new Date());
+            iDrawUserInfoService.insertDrawUserInfo(userInfo);
         } catch (Exception e) {
             result.setRespCode("-1");
             result.setRespMsg("系统异常，请稍后再试");
@@ -410,7 +365,7 @@ public class DrawController {
         }catch (Exception e){
             result.setRespCode("-1");
             result.setRespMsg("系统异常，请稍后再试");
-            logger.error("DrawController.saveAddress ex: ", e);
+            logger.error("DrawController.qrCode ex: ", e);
         }
         return result;
     }
@@ -431,5 +386,4 @@ public class DrawController {
         return result;
     }
 
-
 }
diff --git a/sino-act-web/src/main/java/com/ruoyi/web/vo/draw/PrizeResult.java b/sino-act-web/src/main/java/com/ruoyi/web/vo/draw/PrizeResult.java
index e9d943095..37b2ce08e 100644
--- a/sino-act-web/src/main/java/com/ruoyi/web/vo/draw/PrizeResult.java
+++ b/sino-act-web/src/main/java/com/ruoyi/web/vo/draw/PrizeResult.java
@@ -1,12 +1,15 @@
 package com.ruoyi.web.vo.draw;
 
 import com.ruoyi.web.vo.Result;
+import com.sinosoft.activity.domain.DrawRecord;
 
 import java.util.List;
 
 public class PrizeResult extends Result {
     private List<Prize> prizes;
 
+    private List<DrawRecord>  record;
+
     public List<Prize> getPrizes() {
         return prizes;
     }
@@ -14,4 +17,12 @@ public class PrizeResult extends Result {
     public void setPrizes(List<Prize> prizes) {
         this.prizes = prizes;
     }
+
+    public List<DrawRecord> getRecord() {
+        return record;
+    }
+
+    public void setRecord(List<DrawRecord> record) {
+        this.record = record;
+    }
 }
diff --git a/sino-act-web/src/main/resources/public/draw/css/goods.css b/sino-act-web/src/main/resources/public/draw/css/goods.css
index ecf492d1c..d26b2c5e5 100644
--- a/sino-act-web/src/main/resources/public/draw/css/goods.css
+++ b/sino-act-web/src/main/resources/public/draw/css/goods.css
@@ -71,4 +71,19 @@
 	margin-top:10px;
 	outline: none;
 	line-height:20px;
+}
+.button { /* 按钮美化 */
+	width: 40px; /* 宽度 */
+	height: 30px; /* 高度 */
+	border-width: 0px; /* 边框宽度 */
+	border-radius: 3px; /* 边框半径 */
+	background: #d1d1d1; /* 背景颜色 */
+	cursor: pointer; /* 鼠标移入按钮范围时出现手势 */
+	outline: none; /* 不显示轮廓线 */
+	font-family: Microsoft YaHei; /* 设置字体 */
+	color: white; /* 字体颜色 */
+	font-size: 17px; /* 字体大小 */
+}
+.button:hover { /* 鼠标移入按钮范围时改变颜色 */
+	background: #5599FF;
 }
\ No newline at end of file
diff --git a/sino-act-web/src/main/resources/public/draw/js/draw.js b/sino-act-web/src/main/resources/public/draw/js/draw.js
index 43a3e87b4..b024f4466 100644
--- a/sino-act-web/src/main/resources/public/draw/js/draw.js
+++ b/sino-act-web/src/main/resources/public/draw/js/draw.js
@@ -58,23 +58,23 @@ function myprizes() {
         data: {drawCode: drawCode},
         dataType: "json",
         success: function(data){
-            if (!data.prizes) {
+            if (!data.record) {
                 return;
             }
-            console.log(data.prizes);
-            $.each(data.prizes, function (i, n) {
-                var ptype = n.prizeType;
+            console.log(data.record);
+            $.each(data.record, function (i, n) {
+                var ptype = n.prizetype;
                 var status = n.status;
                 var iscenter = 0;
-                var prize = $('.prize_li').clone();
-                $(prize).css('display', 'inherit');
-                prize.removeClass('prize_li');
-                prize.find('.pname').html(n.prizeName);
-                prize.find('.time').html(n.drawTime);
-                $(prize).attr('val', n.prizeCode);
-                $(prize).attr('flow', n.gatewayFlow);
-                $(prize).attr('ptype', ptype);
-                $('.popList').append(prize);
+                var record = $('.prize_li').clone();
+                $(record).css('display', 'inherit');
+                record.removeClass('prize_li');
+                record.find('.pname').html(n.prizename);
+                record.find('.time').html(n.createtimestamp);
+                $(record).attr('val', n.prizecode);
+                $(record).attr('flow', n.drawtranseqno);
+                $(record).attr('ptype', n.prizetype);
+                $('.popList').append(record);
             });
         },
         error: function (XMLHttpRequest, textStatus, errorThrown) {
@@ -132,10 +132,10 @@ function prizes() {
         dataType: "json",
         success: function(data){
             var content = '';
-            if (data.prizes) {
-                $.each(data.prizes, function (i, n) {
-                    if (n.mobile) {
-                        content = content + ('<li>恭喜 '+n.mobile+' 获得'+n.prizeName+'</li>');
+            if (data.record) {
+                $.each(data.record, function (i, n) {
+                    if (n.phone) {
+                        content = content + ('<li>恭喜 '+n.phone+' 获得'+n.prizename+'</li>');
                     }
                 });
             }
@@ -152,6 +152,12 @@ function prizes() {
 
 }
 function saveAddr() {
+    var boolean = $("#protocol").prop("checked");
+    if (!boolean){
+        tip('请勾选协议');
+        return ;
+    }
+
     var uname = $('.uname').val();
     var phone = $('.phone').val();
     var addr = $('.addr').val();
@@ -172,22 +178,26 @@ function saveAddr() {
     } else {
     }
     var flow = $('.flow').val();
-    uname = getEntryptPwd(uname);
-    phone = getEntryptPwd(phone);
+  /*  uname = getEntryptPwd(uname);
+    phone = getEntryptPwd(phone);*/
+    var data = $("#addressId").serialize();
     $.ajax({
-        type: "POST",
-        url: contextRootPath+"/draw/saveAddress.action",
-        data: {drawCode: drawCode, flow:flow, uname: uname, phone: phone, addr: addr},
+        url: contextRootPath+"/draw/saveAddress",
         dataType: "json",
+        type: "post",
+        data:  data,
         success: function(data){
             if (data.respCode == '1') {
                 if ('integral' == prizeType) {
+
                 } else if ('materialObject' == prizeType) {
+
                 } else {
+
                 }
-                $('.goods').hide();
                 $('.register').show();
             } else {
+                $('.register').show();
                 tip(data.respMsg);
             }
         },
diff --git a/sino-act-web/src/main/resources/public/draw/scratchcard.html b/sino-act-web/src/main/resources/public/draw/scratchcard.html
index 29a3274ba..8ece012e4 100644
--- a/sino-act-web/src/main/resources/public/draw/scratchcard.html
+++ b/sino-act-web/src/main/resources/public/draw/scratchcard.html
@@ -4,15 +4,18 @@
 <head>
 	<meta name="viewport"
 		content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" />
-	<meta charset="GBK">
+	<meta charset="UTF-8">
 	<meta name="format-detection" content="telephone=no" />
-	<title>֧������񣬺��˰�����</title>
+	<title>支付抽好礼，好运伴随你</title>
 	<link rel="stylesheet" href="css/reset.css">
 	<link rel="stylesheet" href="css/style.css">
 	<link rel="stylesheet" href="css/main.css">
     <link rel="stylesheet" type="text/css" href="css/popup.css"/>
     <link rel="stylesheet" type="text/css" href="css/myPrize.css"/>
   <link rel="stylesheet" type="text/css" href="css/rule.css"/>
+    <script src="js/jquery-1.9.1.min.js"></script>
+    <script src="/js/config.js"></script>
+
     <style type="text/css">
         .popupBox{
             width:100%;
@@ -25,61 +28,63 @@
 <body class="template_bg popupBox" style="background-color: #f9eec8;">
   <div class="promotion_goBack rtn_btn" onclick="rtn()">
     <span class="btn_back"><img src="images/btn_back.png" alt=""></span>
-    <span>����</span>
+    <span>返回</span>
   </div>
 	<div class="promotion_container">
 		<header class="template_header">
-      <p class="header_left"><span onclick="drawrule()">�����</span></p>
-			<p class="header_right"><span onclick="myprizes()">�ҵĽ�Ʒ</span></p>
-<!--      <p class="header_right" style="position: absolute;top: 2rem;right: 0;z-index: 10;"><span onclick="rtn()">&nbsp;��&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;��&nbsp;</span></p>-->
+      <p class="header_left"><span onclick="drawrule()">活动规则</span></p>
+			<p class="header_right"><span onclick="myprizes()">我的奖品</span></p>
+<!--      <p class="header_right" style="position: absolute;top: 2rem;right: 0;z-index: 10;"><span onclick="rtn()">&nbsp;返&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;回&nbsp;</span></p>-->
 		</header>
 
-		<!-- �ƹ�ͼ1 -->
+		<!-- 推广图1 -->
 		<div class="promotion_main clearfix promotion_main_1 nowPage">
-            <!-- ��� -->
+            <!-- 红包 -->
             <div class="zk_red_box">
                 <div class="zk_red_box_header">
-                    <h2 class="title">ʣ��齱������<span class="num">0</span>��</h2>
-                    <!-- ��� -->
+                    <h2 class="title">剩余抽奖次数：<span class="num">0</span>次</h2>
+                    <!-- 刮奖区 -->
                     <!-- <div class="scratch_off_popup"> -->
                         <canvas id="canvas" style="height: 4rem;"></canvas>
                     <!-- </div> -->
-                    <!-- ����״̬ -->
+                    <!-- 三种状态 -->
                     <div style="display: none;" class="scratch_off_box success">
-                        <p class="cue" style="display: none;">��ϲ�����ֽ���</p>
-                        <p class="amount" style="margin-top: 0.18rem;">0.08Ԫ</p>
-                        <p class="remark" style="padding-top: 0.3rem;color: #bbadad;">�������2Сʱ�ڷ���������һ��ͨ�����п��У���ע�����</p>
-                        <p class="again_btn">����һ��</p>
+                        <p class="cue" style="display: none;">恭喜你获得现金红包</p>
+                        <p class="amount" style="margin-top: 0.18rem;">0.08元</p>
+                        <p class="remark" style="padding-top: 0.3rem;color: #bbadad;">红包将在2小时内发放至您的一账通绑定银行卡中，请注意查收</p>
+                        <p class="again_btn">再来一次</p>
                     </div>
                     <div style="display: none;" class="scratch_off_box fail">
-                        <p>�����㻹��һ���������</p>
-                        <p class="again_btn">�ٳ�һ��</p>
+                        <p>大奖离你还差一点儿，加油</p>
+                        <p class="again_btn">再抽一次</p>
                     </div>
                     <div style="display: none;" class="scratch_off_box no_chance">
-                        <p><img src="images/16.gif" style="width: 25px;vertical-align: middle;" alt="">���ij齱����������</p>
-                        <p>�Ƽ��ͻ���ȡ����齱����ɡ�</p>
+                        <p><img src="images/16.gif" style="width: 25px;vertical-align: middle;" alt="">您的抽奖机会已用完</p>
+                        <p>推荐客户获取更多抽奖机会吧～</p>
                     </div>
                 </div>
                 <div class="zk_red_box_footer">
-                    <p>�����л���γ�</p>
+                    <p>今日有机会刮出</p>
                 </div>
                 
                 
                 
             </div>
-            <!-- ���� -->
-            <div class="myscroll zk_carry_box">
-                <ul class="">
-                    <!-- zk_carry_box -->
-                    <li>��ϲ 187****1234 ����ֽ���</li>
-                </ul>
+            <!-- 获奖人 -->
+            <div class="lucy_info">
+                <img src="images/icon_hb1.png" />
+                <div class="myscroll">
+                    <ul>
+                        <li>恭喜 187****1234 获得爱奇艺月卡</li>
+                    </ul>
+                </div>
             </div>
 		</div>
 	</div>
     <div class="tip_copy" style="display: none;">
         <p></p>
     </div>
-    <!--�ҵĽ�Ʒ   ����-->
+    <!--我的奖品   弹窗-->
     <div class='popup myPrize' style="display: none;">
         <div class='popupMin'>
             <img src="images/top02.png" class='top'>
@@ -88,13 +93,13 @@
                 <div class='cont'>
                     <div>
                         <img src="images/left.png">
-                        <div>�ҵĽ�Ʒ</div>
+                        <div>我的奖品</div>
                         <img src="images/right.png">
                     </div>
                     <div class='postListTop'>
                         <div>
-                            <div>���н�Ʒ</div>
-                            <div>��ʱ��</div>
+                            <div>抽中奖品</div>
+                            <div>获奖时间</div>
                         </div>
                     </div>
                     <div class='popList'>
@@ -108,10 +113,10 @@
         <img src="images/delect.png" class='popDelect prizeDelect'>
     </div>
     <div class="prize_li" style="display: none;">
-        <div class="pname">��Ʒ����</div>
+        <div class="pname">奖品名称</div>
         <div class="time">2020/08/05 09:00</div>
     </div>
-    <!--�����-->
+    <!--活动规则-->
     <div class='popup rule' style="display: none;">
       <div class='popupMin'>
         <img src="images/top02.png" class='top'>
@@ -120,22 +125,22 @@
           <div class='cont'>
             <div>
               <img src="images/left.png">
-              <div>�����</div>
+              <div>活动规则</div>
               <img src="images/right.png">
             </div>
             <ul class='contBox' style="list-style: inside">
-<!--              <li class='content'>�ʱ�䣺2020��10��29��-12��31�ա�</li>-->
-<!--              <li class='content'>��ڼ䣬�ͻ��Ƽ��ͻ�ʹ��һ��ͨ���֧�������������Ʋ�Ʒ�����ֻ���ֵ������ɷѣ������ɻ��һ�κ���齱���ᣬ�н�����100%���齱������Ч�ڽ�ֹ��2021��1��15�ա�</li>-->
-<!--              <li class='content'>��Ʒ�ֽ���29400�����н�����100%���н���ϵͳ���Զ����ŵ������ֻ������п��У��뼰ʱ���ա�</li>-->
-<!--              <li class='content'>���ս�Ʒ����Իʵ�����Ϊ׼���й����ٱ���������ؽ�Ʒ�����Ȩ�����罱Ʒ�����������ͨ���齱�ҳ����й�ʾ��</li>-->
-<!--              <li class='content'>�н����û��輰ʱ��ȡ���������ύ������ȡ��Ϣ�������콱��Ϣ���󡢲����������½�Ʒδ�ܼ�ʱ��á��޷��������ţ��������û���δ��ȡ��Ʒ������Ϊ�û������ý�Ʒ��</li>-->
-<!--              <li class='content'>�û��μӻ����Ϊ���Ⲣͬ�Ȿ�����</li>-->
-<!--              <li class='content'>�Ի���κ����ʣ��������ҳ���Ŀͷ�ͼ�������ѯ��Ҳ����ϵ�й��������߿ͷ�����ע���й����ٱ��ա�΢�Ź��ںţ��ڶԻ������롰0���������롰2�����ɣ���</li>-->
-<!--              <li class='content'>���Ʋ�Ʒ�������ϱ��ϡ��ֽ𱦡������������������Ʒ��</li>-->
-<!--              <li class='content'>�ڲ����Ĺ����У������Υ�������Ϊ��Υ���������ж����������û����й�������Ȩ׷�ؽ�����ȡ������뱾�λ���ʸ�׷���䷨�����Ρ�</li>-->
-<!--              <li class='content'>������ս���Ȩ���й����ٵ����������޹�˾���У��й����ٵ����������޹�˾�����޸����������������Ȩ��������������������ڷ������������̶���ʹ�á�</li>-->
-<!--              <li class='content'>�����ƻ����˾�޹ء�</li>-->
-<!--              <li class='content'>��Ʒ�������ޣ��ȵ��ȵá�</li>-->
+<!--              <li class='content'>�ʱ�䣺2020��10��29��-12��31�ա�</li>-->
+<!--              <li class='content'>��ڼ䣬�ͻ��Ƽ��ͻ�ʹ��һ��ͨ���֧������������Ʋ�Ʒ�����ֻ���ֵ������ɷѣ������ɻ��һ�κ���齱���ᣬ�н�����100%���齱������Ч�ڽ�ֹ��2021��1��15�ա�</li>-->
+<!--              <li class='content'>��Ʒ�ֽ���29400�����н�����100%���н���ϵͳ���Զ����ŵ������ֻ������п��У��뼰ʱ���ա�</li>-->
+<!--              <li class='content'>���ս�Ʒ����Իʵ�����Ϊ׼���й����ٱ���������ؽ�Ʒ�����Ȩ�����罱Ʒ�����������ͨ���齱�ҳ����й�ʾ��</li>-->
+<!--              <li class='content'>�н����û��輰ʱ��ȡ���������ύ������ȡ��Ϣ�������콱��Ϣ���󡢲����������½�Ʒδ�ܼ�ʱ��á��޷��������ţ��������û���δ��ȡ��Ʒ������Ϊ�û������ý�Ʒ��</li>-->
+<!--              <li class='content'>�û��μӻ����Ϊ��Ⲣͬ�Ȿ�����</li>-->
+<!--              <li class='content'>�Ի���κ����ʣ��������ҳ���Ŀͷ�ͼ�������ѯ��Ҳ����ϵ�й��������߿ͷ�����ע���й����ٱ��ա�΢�Ź��ںţ��ڶԻ������롰0���������롰2�����ɣ���</li>-->
+<!--              <li class='content'>��Ʋ�Ʒ�������ϱ��ϡ��ֽ𱦡����������������Ʒ��</li>-->
+<!--              <li class='content'>�ڲ����Ĺ����У������Υ�������Ϊ��Υ���������ж����������û����й�������Ȩ׷�ؽ�����ȡ������뱾�λ���ʸ�׷���䷨�����Ρ�</li>-->
+<!--              <li class='content'>������ս���Ȩ���й����ٵ����������޹�˾���У��й����ٵ����������޹�˾�����޸����������������Ȩ��������������������ڷ�����������̶���ʹ�á�</li>-->
+<!--              <li class='content'>�����ƻ����˾�޹ء�</li>-->
+<!--              <li class='content'>��Ʒ�������ޣ��ȵ��ȵá�</li>-->
             </ul>
 
           </div>
@@ -146,14 +151,11 @@
       <img src="images/delect.png" class='popDelect ruleDelect'>
       <span style='clear: both;'></span>
     </div>
-	  <script src="js/jquery-1.9.1.min.js"></script>
     <script src="js/main.js"></script>
     <script src="js/scroll.js"></script>
-    <script src="../../common/taglibs.js"></script>
     <script src="js/util.js"></script>
     <script src="js/draw.js"></script>
     <script src="js/common.js"></script>
-    <script src="../../js/mobile/login_register/login.js"></script>
 	<script>
 		(function () {
       var num = 0;
@@ -167,11 +169,11 @@
               $('.num').text(num);
           },
           error: function (XMLHttpRequest, textStatus, errorThrown) {
-              console.log('�����쳣', textStatus, errorThrown);
+              console.log('网络异常', textStatus, errorThrown);
           }
       });
 
-      // �����ƹ����ݸ߶�
+      // 设置推广内容高度
       function innerHeight() {
         if(!$('.promotion_main_1').is(':hidden')) {
           var arr = [];
@@ -191,14 +193,14 @@
 
 
       $('.myscroll').myScroll({
-        speed: 80, //��ֵԽ���ٶ�Խ��
-        rowHeight: 24//li�ĸ߶�
+        speed: 80, //数值越大，速度越慢
+        rowHeight: 24//li的高度
       });
 
-      // ���ó�ʼ���н�״̬ success-�н�  fail-δ�н�  no_chance-û�г齱����
+      // 设置初始的中奖状态 success-中奖  fail-未中奖  no_chance-没有抽奖机会
       var status = '';
 
-      // �ν�Ч�� -zk
+      // 刮奖效果 -zk
       window.onload = function(){
         // let list = $('.scratch_off_box');
         // setTimeout(()=>{
@@ -216,8 +218,8 @@
         var style = window.getComputedStyle(canvas, null);
         var cssWidth = parseFloat(style["width"]);
         var cssHeight = parseFloat(style["height"]);
-        var scaleX = canvas.width / cssWidth; // ˮƽ�������������
-        var scaleY = canvas.height / cssHeight; // ��ֱ�������������
+        var scaleX = canvas.width / cssWidth; // 水平方向的缩放因子
+        var scaleY = canvas.height / cssHeight; // 垂直方向的缩放因子
         var ctx = canvas.getContext('2d');
 
         ctx.strokeStyle = 'red';
@@ -238,9 +240,9 @@
         var rect = canvas.getBoundingClientRect();
         var time = 0;
         var running = false;
-        // ����-2020-8-20-��ʼ�� �н�״̬
+        // 新增-2020-8-20-初始化 中奖状态
         canvas.addEventListener('touchstart',function(){
-          // success-�н�  fail-δ�н�  no_chance-û�г齱����
+          // success-中奖  fail-未中奖  no_chance-没有抽奖机会
           if (running) {
             console.log('running...');
             return;
@@ -259,8 +261,8 @@
 
           x -= rect.left;
           y -= rect.top;
-          x *= scaleX; // ����ˮƽ���������
-          y *= scaleY; // ������ֱ���������
+          x *= scaleX; // 修正水平方向的坐标
+          y *= scaleY; // 修正垂直方向的坐标
           // ctx.clearRect(x,y,15,15)
           clearArcFun(x,y,15,ctx);
           isArea();
@@ -268,9 +270,9 @@
         })
 
         function isArea(){
-          //�жϹο�����Ƿ񵽴�ٷ�֮��ʮ
-          console.log('ִ��isAreaЧ��')
-          var data = ctx.getImageData(0,0,canvas.width,canvas.height).data;//��ȡ��������Ϣ
+          //判断刮开面积是否到达百分之六十
+          console.log('执行isArea效果')
+          var data = ctx.getImageData(0,0,canvas.width,canvas.height).data;//获取画布的信息
           var n = 0 ;
           for (var i = 0; i < data.length; i++) {
             if (data[i] == 0) {
@@ -278,15 +280,15 @@
             };
           };
           if (n >= data.length * 0.6) {
-            ctx.globalCompositeOperation = 'destination-over';//�ص�
+            ctx.globalCompositeOperation = 'destination-over';//重点
             // ctx.canvas.style.opacity = 0;
             ctx.clearRect(0,0,canvas.width,canvas.height);
             $('#canvas').css('pointer-events','none')
           }
         }
 
-        function clearArcFun(x,y,r,cxt){    //(x,y)ΪҪ�����Բ��Բ�ģ�rΪ�뾶��cxtΪcontext
-          var stepClear=1;//��������һ��
+        function clearArcFun(x,y,r,cxt){    //(x,y)为要清除的圆的圆心，r为半径，cxt为context
+          var stepClear=1;//别忘记这一步
           clearArc(x,y,r);
           function clearArc(x,y,radius){
             var calcWidth=radius-stepClear;
@@ -306,11 +308,11 @@
           }
         }
 
-        // �ٳ�һ��
+        // 再抽一次
         $('.again_btn').click(function(){
           if(num<1) {
             $('.no_chance').show().siblings('.scratch_off_box').hide();
-            console.log('�齱��������')
+            console.log('抽奖次数不足')
             return;
           }
           drawimage();
@@ -336,7 +338,7 @@
                 }
                 if(respCode == 'GT00007') {
                   $('.no_chance').show().siblings('.scratch_off_box').hide();
-                  console.log('�齱��������');
+                  console.log('抽奖次数不足');
                   return;
                 }
                 running = false;
@@ -358,7 +360,7 @@
               setPrizeInfo(prizeType, prizeCode, data.cue, data.gatewayFlow);
             },
             error: function (XMLHttpRequest, textStatus, errorThrown) {
-              console.log('�����쳣', textStatus, errorThrown);
+              console.log('网络异常', textStatus, errorThrown);
               running = false;
             }
           });
@@ -370,6 +372,7 @@
 		})();
         prizes();
 	</script>
+
 </body>
 
 </html>
\ No newline at end of file
diff --git a/sino-act-web/src/main/resources/public/draw/turntable.html b/sino-act-web/src/main/resources/public/draw/turntable.html
index 3c547d985..2cffc2d93 100644
--- a/sino-act-web/src/main/resources/public/draw/turntable.html
+++ b/sino-act-web/src/main/resources/public/draw/turntable.html
@@ -119,7 +119,9 @@
 					callback: function () {	//回调
 						console.log(txt);
 						if ('materialObject' == prizeType) {
+
 							$('.goods').show();
+							window.location.href='address.html?drawCode='+drawCode;
 						} else {
 							$('.winPrize').show();
 						}
@@ -389,11 +391,8 @@
 					<div>恭喜您获得</div>
 					<div class="cue">戴森吸尘器</div>
 					<div>请留下收货信息，我们奖品将在活动结束后四十个工作日寄送</div>
-					<input class="uname" type="text" value="" placeholder="请输入收货人姓名"/>
-					<input class="phone" type="text" value="" placeholder="请输入收货人手机号码" maxlength="11"/>
-					<textarea class="addr" rows="" cols="" placeholder="请输入收货地址"></textarea>
 					<input class="flow" type="hidden" value="">
-					<img src="images/btn1.png" class='popBtn popBtn3' onclick="saveAddr()">
+					<div type="button"  class='button'  onclick="qrCode()">确认</div>
 				</div>
 				<div class='right'></div>
 			</div>
@@ -444,6 +443,10 @@
 	<script src="js/common.js"></script>
 	<script>
 		prizes();
+
+		function qrCode(){
+			window.location.href='../act/address.html?drawCode='+drawCode;
+		}
 	</script>
 </body>
 
diff --git a/sino-activity/src/main/java/com/sinosoft/activity/domain/DrawRecord.java b/sino-activity/src/main/java/com/sinosoft/activity/domain/DrawRecord.java
index 58f74d9e8..6e0b6c153 100644
--- a/sino-activity/src/main/java/com/sinosoft/activity/domain/DrawRecord.java
+++ b/sino-activity/src/main/java/com/sinosoft/activity/domain/DrawRecord.java
@@ -91,8 +91,18 @@ public class DrawRecord extends BaseEntity
     /** 扩展域 */
     @Excel(name = "扩展域")
     private String EXTAREA;
+    /** 奖品名称*/
+    private String PRIZENAME;
 
-    public void setDRAWRECORDID(String DRAWRECORDID) 
+    public String getPRIZENAME() {
+        return PRIZENAME;
+    }
+
+    public void setPRIZENAME(String PRIZENAME) {
+        this.PRIZENAME = PRIZENAME;
+    }
+
+    public void setDRAWRECORDID(String DRAWRECORDID)
     {
         this.DRAWRECORDID = DRAWRECORDID;
     }
diff --git a/sino-activity/src/main/java/com/sinosoft/activity/mapper/DrawRecordMapper.java b/sino-activity/src/main/java/com/sinosoft/activity/mapper/DrawRecordMapper.java
index ec8a7ab31..8466a54e2 100644
--- a/sino-activity/src/main/java/com/sinosoft/activity/mapper/DrawRecordMapper.java
+++ b/sino-activity/src/main/java/com/sinosoft/activity/mapper/DrawRecordMapper.java
@@ -2,6 +2,7 @@ package com.sinosoft.activity.mapper;
 
 import java.util.List;
 import com.sinosoft.activity.domain.DrawRecord;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 抽奖记录信息Mapper接口
@@ -59,4 +60,19 @@ public interface DrawRecordMapper
      * @return 结果
      */
     public int deleteDrawRecordByIds(String[] DRAWRECORDIDs);
+
+    /**
+     *查询抽奖记录信息
+     * @param drawCode
+     * @param userId
+     * @return
+     */
+    List<DrawRecord> selectDrawRecordCodeUserList(@Param("drawCode") String drawCode,@Param("userId") String userId);
+
+    /**
+     *  查询抽奖记录信息
+     * @param drawCode
+     * @return
+     */
+    List<DrawRecord> selectDrawRecordCodeList(String drawCode);
 }
diff --git a/sino-activity/src/main/java/com/sinosoft/activity/service/IDrawRecordService.java b/sino-activity/src/main/java/com/sinosoft/activity/service/IDrawRecordService.java
index 13c774319..50653ffb5 100644
--- a/sino-activity/src/main/java/com/sinosoft/activity/service/IDrawRecordService.java
+++ b/sino-activity/src/main/java/com/sinosoft/activity/service/IDrawRecordService.java
@@ -59,4 +59,6 @@ public interface IDrawRecordService
      * @return 结果
      */
     public int deleteDrawRecordById(String DRAWRECORDID);
+
+    List<DrawRecord> selectDrawRecordCodeList(String drawCode, String userId);
 }
diff --git a/sino-activity/src/main/java/com/sinosoft/activity/service/impl/DrawRecordServiceImpl.java b/sino-activity/src/main/java/com/sinosoft/activity/service/impl/DrawRecordServiceImpl.java
index 575b965ca..bbc39e99f 100644
--- a/sino-activity/src/main/java/com/sinosoft/activity/service/impl/DrawRecordServiceImpl.java
+++ b/sino-activity/src/main/java/com/sinosoft/activity/service/impl/DrawRecordServiceImpl.java
@@ -96,4 +96,13 @@ public class DrawRecordServiceImpl implements IDrawRecordService
     {
         return drawRecordMapper.deleteDrawRecordById(DRAWRECORDID);
     }
+
+    @Override
+    public List<DrawRecord> selectDrawRecordCodeList(String drawCode, String userId) {
+      if(!(userId==null || "".equals(userId))){
+       return   drawRecordMapper.selectDrawRecordCodeUserList(drawCode ,userId);
+       }else{
+        return  drawRecordMapper.selectDrawRecordCodeList(drawCode);
+      }
+    }
 }
diff --git a/sino-activity/src/main/resources/mapper/activity/DrawRecordMapper.xml b/sino-activity/src/main/resources/mapper/activity/DrawRecordMapper.xml
index ed91f4db2..2dbc4c8ef 100644
--- a/sino-activity/src/main/resources/mapper/activity/DrawRecordMapper.xml
+++ b/sino-activity/src/main/resources/mapper/activity/DrawRecordMapper.xml
@@ -23,6 +23,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="SOURCE"    column="SOURCE"    />
         <result property="PHONE"    column="PHONE"    />
         <result property="EXTAREA"    column="EXTAREA"    />
+        <result property="PRIZENAME"    column="PRIZENAME"    />
     </resultMap>
 
     <sql id="selectDrawRecordVo">
@@ -78,7 +79,33 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectDrawRecordVo"/>
         where DRAWRECORDID = #{DRAWRECORDID}
     </select>
-        
+    <select id="selectDrawRecordCodeUserList" parameterType="String" resultMap="DrawRecordResult">
+                 SELECT
+            dr.*, pi.PRIZENAME
+        FROM
+            draw_record dr
+        LEFT JOIN draw_prize_info pi ON dr.PRIZECODE = pi.PRIZECODE
+
+        WHERE
+	     dr.drawResult != '0'
+        AND dr.DRAWCODE = #{drawCode}
+        AND dr.USERID = #{userId}
+         order by dr.CREATETIMESTAMP desc
+
+    </select>
+    <select id="selectDrawRecordCodeList" parameterType="String" resultMap="DrawRecordResult">
+           SELECT
+            dr.*, pi.PRIZENAME
+        FROM
+            draw_record dr
+        LEFT JOIN draw_prize_info pi ON dr.PRIZECODE = pi.PRIZECODE
+        WHERE
+	     dr.DRAWRESULT != '0'
+        AND dr.DRAWCODE = #{drawCode}
+         order by dr.CREATETIMESTAMP desc
+         LIMIT 100
+    </select>
+
     <insert id="insertDrawRecord" parameterType="DrawRecord">
         insert into draw_record
         <trim prefix="(" suffix=")" suffixOverrides=",">