抽奖

app/common/Constant.php

@@ -5,7 +5,7 @@ namespace app\common;
 class Constant
 {
     const SEX          = ['保密', '男', '女'];
-    const MARRY        = ['未婚', '离异', '丧偶'];
+    const MARRY        = ['未婚', '离婚', '丧偶'];
     const TYPE         = ['交朋友', '找知己', '谈恋爱', '结婚'];
     const EDUCATION    = ['本科以下', '本科', '硕士', '博士'];
     const TINYINT      = ['保密', '是', '否'];

public/themes/simpleboot3/love/lottery/index.html

@@ -30,23 +30,23 @@
     <div class="content_box content_box_one">
         <p class="lottery_description">
             <span class="description_title">※抽奖机会：</span>
-            <span class="description_content">活动期间，每对结婚成功的情侣都有一次抽奖机会，100%中奖；</span>
+            <span class="description_content">活动期间，平台注册男女双方通过民政登记并在平台点击确认后女方可获得获得一次抽奖机会，中奖几率100%。</span>
         </p>
         <p class="lottery_description">
             <span class="description_title">※抽奖说明：</span>
-            <span class="description_content">男女双方都可以在平台确认结婚，抽奖只能是女方账号；</span>
+            <span class="description_content">男女双方都可以登录平台确认结婚，但只有女方账号可参与抽奖。</span>
         </p>
         <p class="lottery_description">
             <span class="description_title">※领奖说明：</span>
-            <span class="description_content">到指定地点领取奖品，需要携带结婚证和女方账号登录系统，打开抽奖记录；</span>
+            <span class="description_content">获奖者请于有效期限内工作时间到指定地点领取奖品，需携带一方结婚证书，并登录女方账号系统，打开抽奖记录页面，经工作人员登记确认。</span>
+        </p>
+        <p class="lottery_description">
+            <span class="description_content">图片仅供参考，礼品以最终实物为准。</span>
         </p>
         <p class="lottery_description mt20">
             <span class="description_title black">领取方式：</span>
             <span class="description_content">上班期间，晋江经济开发区人才服务共享中心进行登记兑奖。</span>
         </p>
-        <p class="lottery_description">
-            <span class="description_content">图片仅供参考，礼品以最终实物为准。</span>
-        </p>
         <p class="lottery_description">
             <span class="description_content">晋江聚才网客服热线：0595-88223456。</span>
         </p>
@@ -186,7 +186,8 @@
                     ctx.save();
 
                     //----绘制奖品开始----
-                    ctx.fillStyle = "#E5302F";
+                    // ctx.fillStyle = "#E5302F";
+                    ctx.fillStyle = "#000";
                     var text = turnplate.restaraunts[i];
                     var line_height = 17;
                     //translate方法重新映射画布上的 (0,0) 位置
@@ -202,30 +203,36 @@
                         for (var j = 0; j < texts.length; j++) {
                             ctx.font = j == 0 ? 'bold 20px Microsoft YaHei' : '16px Microsoft YaHei';
                             if (j == 0) {
-                                ctx.fillText(texts[j] + "M", -ctx.measureText(texts[j] + "M").width / 2, j * line_height);
+                                ctx.fillText(texts[j] + "M", -ctx.measureText(texts[j] + "M").width / 2, j * line_height * 3);
                             } else {
-                                ctx.fillText(texts[j], -ctx.measureText(texts[j]).width / 2, j * line_height);
+                                ctx.fillText(texts[j], -ctx.measureText(texts[j]).width / 2, j * line_height * 3);
                             }
                         }
                     } else if (text.indexOf("M") == -1 && text.length > 6) {
                         //奖品名称长度超过一定范围
                         text = text.substring(0, 6) + "||" + text.substring(6);
                         var texts = text.split("||");
+                        var height = 0;
                         for (var j = 0; j < texts.length; j++) {
-                            ctx.fillText(texts[j], -ctx.measureText(texts[j]).width / 2, j * line_height);
+                            if (j == 0) {
+                                height = 40;
+                            } else {
+                                height = j * line_height * 4;
+                            }
+                            ctx.fillText(texts[j], -ctx.measureText(texts[j]).width / 2, height);
                         }
                     } else {
                         //在画布上绘制填色的文本。文本的默认颜色是黑色
                         //measureText()方法返回包含一个对象，该对象包含以像素计的指定字体宽度
-                        ctx.fillText(text, -ctx.measureText(text).width / 2, 0);
+                        ctx.fillText(text, -ctx.measureText(text).width / 2, line_height * 4);
                     }
 
                     //添加对应图标
-                    var img = document.getElementById("gift-img" + i);
-                    img.onload = function () {
-                        ctx.drawImage(img, -18, 25, 40, 40);
-                    };
-                    ctx.drawImage(img, -18, 25, 40, 40);
+                    // var img = document.getElementById("gift-img" + i);
+                    // img.onload = function () {
+                    //     ctx.drawImage(img, -18, 25, 40, 40);
+                    // };
+                    // ctx.drawImage(img, -18, 25, 40, 40);
 
                     //把当前画布返回（调整）到上一个save()状态之前
                     ctx.restore();

public/themes/simpleboot3/love/lottery/log.html

@@ -20,11 +20,9 @@
     </van-nav-bar>
     <div class="block">
         <h2>中奖信息</h2>
-        <van-card
-                num="1"
-                :title="lottery.prize_name"
-                :thumb="lottery.lottery.image"
-        ></van-card>
+        <van-cell-group>
+            <van-cell title="{$lottery.prize_name}"></van-cell>
+        </van-cell-group>
     </div>
     <div class="block">
         <h2>领奖方式</h2>

public/themes/simpleboot3/love/my/profile.html

@@ -136,7 +136,7 @@
     </van-popup>-->
 
     <van-field
-            v-if="form.marry == '离异'"
+            v-if="form.marry == '离婚'"
             required
             v-model="form.children"
             label="几个小孩"

public/themes/simpleboot3/love/register/profile.html

@@ -147,7 +147,7 @@
     <!--</van-popup>-->
 
     <van-field
-            v-if="form.marry == '离异'"
+            v-if="form.marry == '离婚'"
             required
             v-model="form.children"
             label="几个小孩"