diff --git a/app/data/controller/LuckdrawRecord.php b/app/data/controller/LuckdrawRecord.php index e74d410a2..5f3d89eaa 100644 --- a/app/data/controller/LuckdrawRecord.php +++ b/app/data/controller/LuckdrawRecord.php @@ -18,7 +18,7 @@ class LuckdrawRecord extends Controller protected $table = 'ActivityLuckdrawRecord'; /** - * 中奖管理 + * 中奖记录管理 * @auth true * @menu true * @throws \think\Exception @@ -29,9 +29,15 @@ class LuckdrawRecord extends Controller */ public function index() { - $this->title = '中奖管理'; - $query = $this->_query($this->table)->like('username,prize_name,prize_level'); - $query->equal('uncode_status,code')->dateBetween('create_at,uncode_datetime')->page(); + $this->title = '中奖记录管理'; + $query = $this->_query($this->table)->like('phone,username,prize_name,prize_level'); + $query->equal('uncode_status,code')->dateBetween('create_at,uncode_datetime')->order('id desc'); + if (input('output') === 'json') { + $result = $query->page(true, false); + $this->success('获取数据列表成功', $result); + } else { + $query->page(); + } } /** diff --git a/app/data/controller/app/Luckdraw.php b/app/data/controller/app/Luckdraw.php index 1bfef8b0d..137f9a3d0 100644 --- a/app/data/controller/app/Luckdraw.php +++ b/app/data/controller/app/Luckdraw.php @@ -151,6 +151,7 @@ class Luckdraw extends Controller $_prize = $this->app->db->name('ActivityLuckdrawPrize')->where(['code' => $prize['prize_code']])->find(); $data = [ 'mid' => $this->member['id'], + 'phone' => $this->member['phone'], 'username' => $this->member['username'], 'code' => $this->code, 'prize_level' => $prize['prize_level'], @@ -180,4 +181,20 @@ class Luckdraw extends Controller $result = $this->app->db->name('ActivityLuckdrawRecord')->where(['id' => $this->record['id']])->update($data); $result !== false ? $this->success('奖品核销成功！') : $this->error('奖品核销失败，请稍候再试！'); } + + /** + * 提交收货地址 + * @throws \think\db\exception\DbException + */ + public function express() + { + $data = $this->_vali([ + 'express_province.require#province' => '收货省份不能为空！', + 'express_city.require#city' => '收货城市不能为空！', + 'express_area.require#area' => '收货区域不能为空！', + 'express_address.require#address' => '详细地址不能为空！', + ]); + $result = $this->app->db->name('ActivityLuckdrawRecord')->where(['id' => $this->record['id']])->update($data); + $result !== false ? $this->success('提交收货地址成功！') : $this->error('提交收货地址失败，请稍候再试！'); + } } \ No newline at end of file diff --git a/app/data/data.sql b/app/data/data.sql index 8e24d3b87..d7d2b5a9a 100644 --- a/app/data/data.sql +++ b/app/data/data.sql @@ -1,17 +1,17 @@ /* Navicat MySQL Data Transfer - Source Server : local.ctolog.com + Source Server : server.cuci.cc Source Server Type : MySQL Source Server Version : 50562 - Source Host : 127.0.0.1:3306 + Source Host : localhost:3306 Source Schema : admin_v6 Target Server Type : MySQL Target Server Version : 50562 File Encoding : 65001 - Date: 11/10/2020 18:49:38 + Date: 12/10/2020 11:32:03 */ SET NAMES utf8mb4; @@ -100,6 +100,7 @@ DROP TABLE IF EXISTS `activity_luckdraw_record`; CREATE TABLE `activity_luckdraw_record` ( `id` bigint(20) UNSIGNED NOT NULL AUTO_INCREMENT, `mid` bigint(20) UNSIGNED NULL DEFAULT 0 COMMENT '活动会员ID', + `phone` varchar(20) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '' COMMENT '会员手机', `username` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '' COMMENT '会员名称', `code` varchar(20) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '' COMMENT '活动编号', `prize_code` varchar(20) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '' COMMENT '奖品编号', @@ -112,6 +113,10 @@ CREATE TABLE `activity_luckdraw_record` ( `uncode_code` varchar(20) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '' COMMENT '奖品核销码', `uncode_status` tinyint(1) UNSIGNED NULL DEFAULT 0 COMMENT '奖品核销状态', `uncode_datetime` datetime NULL DEFAULT NULL COMMENT '奖品核销时间', + `express_province` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '' COMMENT '配送省份', + `express_city` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '' COMMENT '配送城市', + `express_area` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '' COMMENT '配送区域', + `express_address` varchar(500) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '' COMMENT '配送地址', `status` tinyint(1) UNSIGNED NULL DEFAULT 1 COMMENT '销售状态', `sort` bigint(20) UNSIGNED NULL DEFAULT 0 COMMENT '排序权重', `deleted` tinyint(1) UNSIGNED NULL DEFAULT 0 COMMENT '删除状态', @@ -121,7 +126,7 @@ CREATE TABLE `activity_luckdraw_record` ( INDEX `idx_activity_luckdraw_record_code`(`code`) USING BTREE, INDEX `idx_activity_luckdraw_record_prize_code`(`prize_code`) USING BTREE, INDEX `idx_activity_luckdraw_record_uncode_state`(`uncode_status`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 7 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '活动-抽奖中奖记录' ROW_FORMAT = Compact; +) ENGINE = InnoDB AUTO_INCREMENT = 2 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '活动-抽奖中奖记录' ROW_FORMAT = Compact; -- ---------------------------- -- Table structure for data_member @@ -160,7 +165,7 @@ CREATE TABLE `data_member` ( INDEX `idx_data_member_openid1`(`openid1`) USING BTREE, INDEX `idx_data_member_openid2`(`openid2`) USING BTREE, INDEX `idx_data_member_unionid`(`unionid`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 7 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '数据-会员' ROW_FORMAT = COMPACT; +) ENGINE = InnoDB AUTO_INCREMENT = 2 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '数据-会员' ROW_FORMAT = COMPACT; -- ---------------------------- -- Table structure for data_member_address @@ -184,7 +189,7 @@ CREATE TABLE `data_member_address` ( INDEX `idx_data_member_address_type`(`type`) USING BTREE, INDEX `idx_data_member_address_code`(`code`) USING BTREE, INDEX `idx_data_member_address_deleted`(`deleted`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 4 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '数据-会员-地址' ROW_FORMAT = COMPACT; +) ENGINE = InnoDB AUTO_INCREMENT = 3 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '数据-会员-地址' ROW_FORMAT = Compact; -- ---------------------------- -- Table structure for data_member_coin_item @@ -249,7 +254,7 @@ CREATE TABLE `data_news_item` ( PRIMARY KEY (`id`) USING BTREE, INDEX `idx_data_news_item_status`(`status`) USING BTREE, INDEX `idx_data_news_item_deleted`(`deleted`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 7 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '数据-文章-内容' ROW_FORMAT = COMPACT; +) ENGINE = InnoDB AUTO_INCREMENT = 2 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '数据-文章-内容' ROW_FORMAT = COMPACT; -- ---------------------------- -- Table structure for data_news_mark @@ -266,7 +271,7 @@ CREATE TABLE `data_news_mark` ( PRIMARY KEY (`id`) USING BTREE, INDEX `idx_data_news_mark_status`(`status`) USING BTREE, INDEX `idx_data_news_mark_deleted`(`deleted`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 15 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '数据-文章-标签' ROW_FORMAT = COMPACT; +) ENGINE = InnoDB AUTO_INCREMENT = 2 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '数据-文章-标签' ROW_FORMAT = COMPACT; -- ---------------------------- -- Table structure for data_news_x_collect @@ -282,7 +287,7 @@ CREATE TABLE `data_news_x_collect` ( INDEX `idx_data_news_x_collect_cid`(`cid`) USING BTREE, INDEX `idx_data_news_x_collect_mid`(`mid`) USING BTREE, INDEX `idx_data_news_x_collect_type`(`type`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '数据-文章-会员-收藏' ROW_FORMAT = COMPACT; +) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '数据-文章-会员-收藏' ROW_FORMAT = Compact; -- ---------------------------- -- Table structure for data_news_x_comment @@ -311,7 +316,7 @@ CREATE TABLE `data_news_x_history` ( PRIMARY KEY (`id`) USING BTREE, INDEX `idx_data_news_x_history_cid`(`cid`) USING BTREE, INDEX `idx_data_news_x_history_mid`(`mid`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 3 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '数据-文章-会员-历史' ROW_FORMAT = COMPACT; +) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '数据-文章-会员-历史' ROW_FORMAT = COMPACT; -- ---------------------------- -- Table structure for shop_goods @@ -345,7 +350,7 @@ CREATE TABLE `shop_goods` ( PRIMARY KEY (`id`) USING BTREE, INDEX `idx_data_news_item_status`(`status`) USING BTREE, INDEX `idx_data_news_item_deleted`(`deleted`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 38 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '商城-商品-内容' ROW_FORMAT = COMPACT; +) ENGINE = InnoDB AUTO_INCREMENT = 11 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '商城-商品-内容' ROW_FORMAT = Compact; -- ---------------------------- -- Table structure for shop_goods_cate @@ -365,7 +370,7 @@ CREATE TABLE `shop_goods_cate` ( INDEX `idx_shop_goods_cate_sort`(`sort`) USING BTREE, INDEX `idx_shop_goods_cate_status`(`status`) USING BTREE, INDEX `idx_shop_goods_cate_deleted`(`deleted`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 16 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '商城-商品-分类' ROW_FORMAT = COMPACT; +) ENGINE = InnoDB AUTO_INCREMENT = 8 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '商城-商品-分类' ROW_FORMAT = Compact; -- ---------------------------- -- Table structure for shop_goods_item @@ -388,7 +393,7 @@ CREATE TABLE `shop_goods_item` ( INDEX `index_store_goods_list_id`(`goods_code`) USING BTREE, INDEX `index_store_goods_list_spec`(`goods_spec`) USING BTREE, INDEX `index_store_goods_list_status`(`status`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 83 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '商城-商品-规格' ROW_FORMAT = COMPACT; +) ENGINE = InnoDB AUTO_INCREMENT = 17 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '商城-商品-规格' ROW_FORMAT = COMPACT; -- ---------------------------- -- Table structure for shop_goods_mark @@ -404,7 +409,7 @@ CREATE TABLE `shop_goods_mark` ( PRIMARY KEY (`id`) USING BTREE, INDEX `idx_shop_goods_mark_sort`(`sort`) USING BTREE, INDEX `idx_shop_goods_mark_status`(`status`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 5 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '商城-商品-标签' ROW_FORMAT = COMPACT; +) ENGINE = InnoDB AUTO_INCREMENT = 3 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '商城-商品-标签' ROW_FORMAT = Compact; -- ---------------------------- -- Table structure for shop_goods_stock @@ -422,7 +427,7 @@ CREATE TABLE `shop_goods_stock` ( PRIMARY KEY (`id`) USING BTREE, INDEX `idx_data_news_item_status`(`status`) USING BTREE, INDEX `idx_data_news_item_deleted`(`deleted`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 37 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '商城-商品-库存' ROW_FORMAT = COMPACT; +) ENGINE = InnoDB AUTO_INCREMENT = 11 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '商城-商品-库存' ROW_FORMAT = Compact; -- ---------------------------- -- Table structure for shop_order @@ -458,7 +463,7 @@ CREATE TABLE `shop_order` ( INDEX `idx_shop_order_orderno`(`order_no`) USING BTREE, INDEX `idx_shop_order_cancel_status`(`cancel_status`) USING BTREE, INDEX `idx_shop_order_payment_status`(`payment_status`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 5 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '商城-订单-内容' ROW_FORMAT = COMPACT; +) ENGINE = InnoDB AUTO_INCREMENT = 5 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '商城-订单-内容' ROW_FORMAT = Compact; -- ---------------------------- -- Table structure for shop_order_item @@ -490,7 +495,7 @@ CREATE TABLE `shop_order_item` ( INDEX `idx_shop_order_item_goods_sku`(`goods_sku`) USING BTREE, INDEX `idx_shop_order_item_goods_code`(`goods_code`) USING BTREE, INDEX `idx_shop_order_item_goods_spec`(`goods_spec`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 5 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '商城-订单-商品' ROW_FORMAT = COMPACT; +) ENGINE = InnoDB AUTO_INCREMENT = 5 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '商城-订单-商品' ROW_FORMAT = Compact; -- ---------------------------- -- Table structure for shop_order_send @@ -525,7 +530,7 @@ CREATE TABLE `shop_order_send` ( INDEX `idx_shop_order_send_status`(`status`) USING BTREE, INDEX `idx_shop_order_send_deleted`(`deleted`) USING BTREE, INDEX `idx_shop_order_send_order_no`(`order_no`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 3 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '商城-订单-配送' ROW_FORMAT = COMPACT; +) ENGINE = InnoDB AUTO_INCREMENT = 3 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '商城-订单-配送' ROW_FORMAT = Compact; -- ---------------------------- -- Table structure for shop_order_service @@ -549,7 +554,7 @@ CREATE TABLE `shop_order_service` ( PRIMARY KEY (`id`) USING BTREE, INDEX `idx_data_news_item_status`(`status`) USING BTREE, INDEX `idx_data_news_item_deleted`(`deleted`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '商城-订单-售后' ROW_FORMAT = COMPACT; +) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '商城-订单-售后' ROW_FORMAT = Compact; -- ---------------------------- -- Table structure for shop_truck_company @@ -572,7 +577,7 @@ CREATE TABLE `shop_truck_company` ( INDEX `idx_shop_truck_company_code3`(`code_3`) USING BTREE, INDEX `idx_shop_truck_company_status`(`status`) USING BTREE, INDEX `idx_shop_truck_company_deleted`(`deleted`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 16 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '商城-快递-公司' ROW_FORMAT = COMPACT; +) ENGINE = InnoDB AUTO_INCREMENT = 16 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '商城-快递-公司' ROW_FORMAT = Compact; -- ---------------------------- -- Table structure for shop_truck_province @@ -587,7 +592,7 @@ CREATE TABLE `shop_truck_province` ( PRIMARY KEY (`id`) USING BTREE, INDEX `idx_store_express_province_title`(`name`) USING BTREE, INDEX `idx_store_express_province_status`(`status`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 3113 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '商城-快递-省份' ROW_FORMAT = COMPACT; +) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '商城-快递-省份' ROW_FORMAT = COMPACT; -- ---------------------------- -- Table structure for shop_truck_region @@ -608,7 +613,7 @@ CREATE TABLE `shop_truck_region` ( PRIMARY KEY (`id`) USING BTREE, INDEX `idx_shop_truck_region_pid`(`pid`) USING BTREE, INDEX `idx_shop_truck_region_name`(`name`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 50001 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '商城-快递-区域' ROW_FORMAT = COMPACT; +) ENGINE = InnoDB AUTO_INCREMENT = 4019 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '商城-快递-区域' ROW_FORMAT = Compact; -- ---------------------------- -- Table structure for shop_truck_template @@ -625,6 +630,6 @@ CREATE TABLE `shop_truck_template` ( `deleted` tinyint(1) UNSIGNED NULL DEFAULT 0 COMMENT '删除状态', `create_at` timestamp NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 198 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '商城-快递-费用' ROW_FORMAT = COMPACT; +) ENGINE = InnoDB AUTO_INCREMENT = 195 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '商城-快递-费用' ROW_FORMAT = Compact; SET FOREIGN_KEY_CHECKS = 1; diff --git a/app/data/view/app/luckdraw/index.html b/app/data/view/app/luckdraw/index.html index 76df01305..ce6cc2b06 100644 --- a/app/data/view/app/luckdraw/index.html +++ b/app/data/view/app/luckdraw/index.html @@ -10,7 +10,7 @@ - + - -
{if !empty($vo.status) and empty($vo.is_deleted)} 一尚美术 @@ -94,7 +95,6 @@ 查看奖品 {/empty} -
中奖明细 @@ -108,7 +108,7 @@ {$vo.username|default=''} {$vo.prize_level|default='特等奖'}
-
{$vo.prize_title|default=''}
+
{$vo.prize_name|default=''}
{/foreach} @@ -142,19 +142,47 @@
关闭 中奖了 +
{if $record.prize_code neq ''}

{$record.prize_level|default='特等奖'}

{$record.prize_name|default='未中奖'}

- {if empty($record.uncode_status)} + {if empty($record.uncode_status) && empty($record.express_province)}
- + {if empty($record.prize_express)} +
确认核销
+ {else} + + +
提交收货地址
+ {/if}
{else} +
奖品已核销
+ +
+ +
已提交收货地址
+
+ {/if} {else}
未中奖
@@ -168,10 +196,9 @@ 关闭

活动规则

-
{foreach $rules as $r}

{$r}

{/foreach}
+
{foreach $rules as $rule}

{$rule}

{/foreach}
- {else} {/if} - - - \ No newline at end of file diff --git a/app/data/view/luckdraw_config/form.html b/app/data/view/luckdraw_config/form.html index dd1ab2e7e..adf49c7b3 100644 --- a/app/data/view/luckdraw_config/form.html +++ b/app/data/view/luckdraw_config/form.html @@ -7,7 +7,7 @@ @@ -64,7 +64,7 @@ 奖品名称 - 奖项名称 + 奖项等级 奖品数量 中奖率(总概率100%) @@ -77,9 +77,9 @@ diff --git a/app/data/view/luckdraw_record/index.html b/app/data/view/luckdraw_record/index.html index 82e0d9fd9..23b7a235c 100644 --- a/app/data/view/luckdraw_record/index.html +++ b/app/data/view/luckdraw_record/index.html @@ -15,7 +15,7 @@ 活动信息 奖品信息 中奖时间 - 核销时间 + 核销信息 {/notempty} @@ -27,9 +27,7 @@ {$vo.username|default=''} - {notempty name='vo.member.phone'} - {$vo.member.phone|default=''} - {/notempty} + {$vo.phone|default=''} {$vo.info.name|default=''} @@ -42,7 +40,12 @@ {$vo.create_at|format_datetime} + {if empty($vo.prize_express)} {$vo.uncode_datetime|default='未核销'} + {else} + {$vo.express_province|default=''}{$vo.express_city|default=''}{$vo.express_area|default=''} + {$vo.express_address|default=''} + {/if} {/foreach} diff --git a/app/data/view/luckdraw_record/index_search.html b/app/data/view/luckdraw_record/index_search.html index 97ca73e0b..3aa9ad8aa 100644 --- a/app/data/view/luckdraw_record/index_search.html +++ b/app/data/view/luckdraw_record/index_search.html @@ -6,21 +6,28 @@
-
+
+ +
+ +
+ +
-
+
+
-
+
+
-
+
+
-
+
+
-
+
+
- + +
@@ -70,4 +80,26 @@ \ No newline at end of file diff --git a/public/static/luckdraw/css/style.css b/public/static/luckdraw/css/style.css index bc0051e73..0474aeb57 100644 --- a/public/static/luckdraw/css/style.css +++ b/public/static/luckdraw/css/style.css @@ -442,35 +442,49 @@ body { .luck-dialog h3 { font-size: .36rem; color: #ffe100; - margin-bottom: .8rem; + margin-bottom: .4rem; } -.luck-dialog input { - font-size: .26rem; - display: block; - width: 4.7rem; +.luck-dialog label { + width: 6.5rem; + display: inline-block; + position: relative; +} + +.luck-dialog input, +.luck-dialog select { + width: 78%; height: .8rem; + display: block; + font-size: .26rem; line-height: .4rem; background: #fff; - border-radius: .8rem; + border-radius: .1rem; margin: 0 auto .4rem; text-align: left; padding-left: .3rem; } +.luck-dialog select { + width: 25.2%; + text-align: center; + margin-bottom: .1rem; + display: inline-block; +} + .luck-dialog .dialog-btn { width: 4.7rem; - line-height: .8rem; - border-radius: .8rem; margin: 0 auto; font-size: .3rem; + line-height: .8rem; + border-radius: .8rem; color: #dd0d1d; background: #ffe100; } .luck-dialog .btn1 { - background: #fff0e8; color: #dd0d1d; + background: #fff0e8; } .show.luck-mask, diff --git a/public/static/luckdraw/index.html b/public/static/luckdraw/index.html deleted file mode 100644 index 923a3c032..000000000 --- a/public/static/luckdraw/index.html +++ /dev/null @@ -1,177 +0,0 @@ - - - - - - - - 标题 - - - - - - - -
- 一尚美术 -
- 活动规则 - - 点我抽奖 - - - - -
- 中奖明细 - -
- - -
- 一尚美术 - 一尚美术 - -
    -
  • -
    - 林烨林 - 获得一等奖 -
    -
    多功能数据线1条
    -
    • -
  • -
    - 林烨林 - 获得一等奖 -
    -
    多功能数据线2条
    -
    • -
- -
- -
-
-
-
- - -
-
-

填写信息即可参与抽奖哦~

-
- - -
-
- 取消 - 确认 -
-
- - -
- 关闭 - 中奖了 -
-

一等奖

-

蓝牙音箱一台

- -
- -
确认核销
-
- -
奖品已核销
-
-
- - -
- 关闭 -
-

活动规则

-
-

这是内容这是内容这是内容这是内容这是内容这是内容

-
-
- -
- - - - - - - - \ No newline at end of file diff --git a/vendor/composer/autoload_classmap.php b/vendor/composer/autoload_classmap.php index af266aa1b..385bfee83 100644 --- a/vendor/composer/autoload_classmap.php +++ b/vendor/composer/autoload_classmap.php @@ -194,6 +194,9 @@ return array( 'app\\admin\\controller\\api\\Update' => $baseDir . '/app/admin/controller/api/Update.php', 'app\\admin\\controller\\api\\Upload' => $baseDir . '/app/admin/controller/api/Upload.php', 'app\\data\\controller\\Config' => $baseDir . '/app/data/controller/Config.php', + 'app\\data\\controller\\LuckdrawConfig' => $baseDir . '/app/data/controller/LuckdrawConfig.php', + 'app\\data\\controller\\LuckdrawPrize' => $baseDir . '/app/data/controller/LuckdrawPrize.php', + 'app\\data\\controller\\LuckdrawRecord' => $baseDir . '/app/data/controller/LuckdrawRecord.php', 'app\\data\\controller\\Member' => $baseDir . '/app/data/controller/Member.php', 'app\\data\\controller\\NewsItem' => $baseDir . '/app/data/controller/NewsItem.php', 'app\\data\\controller\\NewsMark' => $baseDir . '/app/data/controller/NewsMark.php', @@ -217,6 +220,7 @@ return array( 'app\\data\\controller\\api\\auth\\Center' => $baseDir . '/app/data/controller/api/auth/Center.php', 'app\\data\\controller\\api\\auth\\News' => $baseDir . '/app/data/controller/api/auth/News.php', 'app\\data\\controller\\api\\auth\\Order' => $baseDir . '/app/data/controller/api/auth/Order.php', + 'app\\data\\controller\\app\\Luckdraw' => $baseDir . '/app/data/controller/app/Luckdraw.php', 'app\\data\\service\\GoodsService' => $baseDir . '/app/data/service/GoodsService.php', 'app\\data\\service\\NewsService' => $baseDir . '/app/data/service/NewsService.php', 'app\\data\\service\\OrderService' => $baseDir . '/app/data/service/OrderService.php', diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php index 2afa60de0..1354b8f06 100644 --- a/vendor/composer/autoload_static.php +++ b/vendor/composer/autoload_static.php @@ -317,6 +317,9 @@ class ComposerStaticInit33b66ed99ea8fcca84c95dfb0e7ed409 'app\\admin\\controller\\api\\Update' => __DIR__ . '/../..' . '/app/admin/controller/api/Update.php', 'app\\admin\\controller\\api\\Upload' => __DIR__ . '/../..' . '/app/admin/controller/api/Upload.php', 'app\\data\\controller\\Config' => __DIR__ . '/../..' . '/app/data/controller/Config.php', + 'app\\data\\controller\\LuckdrawConfig' => __DIR__ . '/../..' . '/app/data/controller/LuckdrawConfig.php', + 'app\\data\\controller\\LuckdrawPrize' => __DIR__ . '/../..' . '/app/data/controller/LuckdrawPrize.php', + 'app\\data\\controller\\LuckdrawRecord' => __DIR__ . '/../..' . '/app/data/controller/LuckdrawRecord.php', 'app\\data\\controller\\Member' => __DIR__ . '/../..' . '/app/data/controller/Member.php', 'app\\data\\controller\\NewsItem' => __DIR__ . '/../..' . '/app/data/controller/NewsItem.php', 'app\\data\\controller\\NewsMark' => __DIR__ . '/../..' . '/app/data/controller/NewsMark.php', @@ -340,6 +343,7 @@ class ComposerStaticInit33b66ed99ea8fcca84c95dfb0e7ed409 'app\\data\\controller\\api\\auth\\Center' => __DIR__ . '/../..' . '/app/data/controller/api/auth/Center.php', 'app\\data\\controller\\api\\auth\\News' => __DIR__ . '/../..' . '/app/data/controller/api/auth/News.php', 'app\\data\\controller\\api\\auth\\Order' => __DIR__ . '/../..' . '/app/data/controller/api/auth/Order.php', + 'app\\data\\controller\\app\\Luckdraw' => __DIR__ . '/../..' . '/app/data/controller/app/Luckdraw.php', 'app\\data\\service\\GoodsService' => __DIR__ . '/../..' . '/app/data/service/GoodsService.php', 'app\\data\\service\\NewsService' => __DIR__ . '/../..' . '/app/data/service/NewsService.php', 'app\\data\\service\\OrderService' => __DIR__ . '/../..' . '/app/data/service/OrderService.php', diff --git a/vendor/services.php b/vendor/services.php index 5f1db8048..799ca5cc8 100644 --- a/vendor/services.php +++ b/vendor/services.php @@ -1,5 +1,5 @@ 'think\\admin\\Library',