Merge remote-tracking branch 'origin/activity' into activity

sino-act-web/src/main/resources/public/act/address.html

@@ -105,7 +105,7 @@
                             <input placeholder="代理人工号" class="agentNo" name="agentNo" style="display:none;" id="agentNo">
                             <div>
                                 <input type="checkbox" id="protocol"checked="checked" >
-                               <a onclick="protocol(this)" >点击查看协议</a>
+                               <a onclick="pro()" >点击查看协议</a>
                                 <input  id="agreementPri" type="hidden">
                             </div>
 
@@ -124,7 +124,7 @@
                     <img src="../draw/images/success.png" >
                     <div>信息登记成功</div>
                     <div>奖品将在活动结束后四十个工作日寄送</div>
-                    <div type="button"  class='button1'  onclick="qrCode()">关注微信</div>
+                    <div type="button"  class='button'  onclick="qrCode()">确定</div>
                 </div>
                 <div class='right'></div>
             </div>
@@ -132,9 +132,33 @@
         </div>
         <img src="../draw/images/delect.png" class='popDelect regDelect'>
     </div>
-<div class="tip_copy" style="display: none;">
+<div class="tip_copy " style="display: none;">
     <p></p>
 </div>
+<!--活动规则-->
+<div class='popup rule' style="display: none;">
+    <div class='popupMin'>
+        <img src="../draw/images/top02.png" class='top'>
+        <div class='popCont'>
+            <div class='left'></div>
+            <div class='cont'>
+                <div>
+                    <img src="../draw/images/left.png">
+                    <div>协议内容</div>
+                    <img src="../draw/images/right.png">
+                </div>
+                <ul class='contBox' style="list-style: inside;">
+
+                </ul>
+
+            </div>
+            <div class='right'></div>
+        </div>
+        <img src="../draw/images/popupList04.png" class='bottom'>
+    </div>
+    <img src="../draw/images/delect.png" class='popDelect ruleDelect'>
+    <span style='clear: both;'></span>
+</div>
 <script src="../draw/js/main.js"></script>
 <script src="../draw/js/scroll.js"></script>
 <script src="../draw/js/common.js"></script>
@@ -143,9 +167,13 @@
     function qrCode(){
         window.location.href='subscribe.html?drawCode='+drawCode;
     }
-    function protocol() {
+    function pro() {
         var e = $("#agreementPri").val();
-        alert(e)
+        var desc = removeHTMLTag(e);
+        var desc1 = escape2Html(desc);
+        $('.contBox').append(desc1);
+        $('.rule').show();
+
     }
 </script>
 

sino-act-web/src/main/resources/public/doll/index.html

@@ -100,14 +100,7 @@
 <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>
 <script src="../draw/js/util.js"></script>
-<script src="../../js/mobile/login_register/login.js"></script>
-<script src="../../js/layui/layer.js"></script>
-<script src="../../js/layui/layerUtils.js"></script>
-<script src="../draw/js/draw.js"></script>
 <script src="js/main.js"></script>
 <script>
 	const DOLL = 'doll';

sino-act-web/src/main/resources/public/doll/js/main.js

@@ -42,6 +42,40 @@ function init(facade){
     }
   });
 }
+
+function drawrule() {
+  console.log('rule');
+  console.log(drawCode);
+  $.ajax({
+    type: "POST",
+    url: contextRootPath+"/draw/describe",
+    data: {actCode: drawCode},
+    dataType: "json",
+    success: function(data){
+      var desc = removeHTMLTag(data.drawRule.drawdescribe);
+      var desc1 = escape2Html(desc);
+      console.log(desc1);
+      $(".contBox").append(desc1);
+    },
+    error: function (XMLHttpRequest, textStatus, errorThrown) {
+      console.log('网络异常', textStatus, errorThrown);
+    }
+  });
+  $('.rule').show();
+}
+//转义替换
+/*移除HTML标签代码*/
+function removeHTMLTag(str) {
+  str = str.replace(/<\/?[^>]*>/g,''); //去除HTML tag
+  str = str.replace(/[ | ]*\n/g,'\n'); //去除行尾空白
+  //str = str.replace(/\n[\s| | ]*\r/g,'\n'); //去除多余空行
+  //str=str.replace(/ /ig,'');//去掉
+  return str;
+}
+function escape2Html(str) {
+  var arrEntities={'lt':'<','gt':'>','nbsp':' ','amp':'&','quot':'"'};
+  return str.replace(/&(|lt|gt|nbsp|amp|quot);/ig,function(all,t){return arrEntities[t];});
+}
 function initAwards(){
   $.ajax({
     type:'POST',
@@ -235,4 +269,5 @@ function num(drawType){
       layerTip('网络异常，请检查网络环境');
     }
   });
+
 }