diff --git a/public/install/crmeb.sql b/public/install/crmeb.sql index 3a0dd8c0..dcfb7ee7 100644 --- a/public/install/crmeb.sql +++ b/public/install/crmeb.sql @@ -196,7 +196,7 @@ CREATE TABLE `eb_store_bargain` ( `bargain_num` int(11) unsigned NOT NULL DEFAULT '1' COMMENT '用户每次砍价的次数', `status` tinyint(1) unsigned NOT NULL DEFAULT '1' COMMENT '砍价状态 0(到砍价时间不自动开启) 1(到砍价时间自动开启时间)', `description` text COMMENT '砍价详情', - `give_integral` decimal(10,2) unsigned NOT NULL DEFAULT '0.00' COMMENT '反多少积分', + `give_integral` int(11) unsigned NOT NULL DEFAULT '0' COMMENT '反多少积分', `info` varchar(255) DEFAULT NULL COMMENT '砍价活动简介', `cost` decimal(8,2) unsigned DEFAULT NULL COMMENT '成本价', `sort` int(11) unsigned NOT NULL DEFAULT '0' COMMENT '排序', @@ -498,9 +498,9 @@ CREATE TABLE `eb_store_order` ( `delivery_name` varchar(64) DEFAULT NULL COMMENT '快递名称/送货人姓名', `delivery_type` varchar(32) DEFAULT NULL COMMENT '发货类型', `delivery_id` varchar(64) DEFAULT NULL COMMENT '快递单号/手机号', - `gain_integral` decimal(8,2) unsigned NOT NULL DEFAULT '0.00' COMMENT '消费赚取积分', - `use_integral` decimal(8,2) unsigned NOT NULL DEFAULT '0.00' COMMENT '使用积分', - `back_integral` decimal(8,2) unsigned DEFAULT NULL COMMENT '给用户退了多少积分', + `gain_integral` int(11) unsigned NOT NULL DEFAULT '0' COMMENT '消费赚取积分', + `use_integral` int(11) unsigned NOT NULL DEFAULT '0' COMMENT '使用积分', + `back_integral` int(11) unsigned DEFAULT '0' COMMENT '给用户退了多少积分', `mark` varchar(512) NOT NULL COMMENT '备注', `is_del` tinyint(1) unsigned NOT NULL DEFAULT '0' COMMENT '是否删除', `unique` char(32) NOT NULL COMMENT '唯一id(md5加密)类似id', @@ -610,7 +610,7 @@ CREATE TABLE `eb_store_product` ( `is_postage` tinyint(1) unsigned NOT NULL DEFAULT '0' COMMENT '是否包邮', `is_del` tinyint(1) unsigned NOT NULL DEFAULT '0' COMMENT '是否删除', `mer_use` tinyint(1) unsigned NOT NULL DEFAULT '0' COMMENT '商户是否代理 0不可代理1可代理', - `give_integral` decimal(8,2) unsigned NOT NULL COMMENT '获得积分', + `give_integral` int(11) unsigned NOT NULL DEFAULT '0' COMMENT '获得积分', `cost` decimal(8,2) unsigned NOT NULL COMMENT '成本价', `is_seckill` tinyint(1) unsigned NOT NULL DEFAULT '0' COMMENT '秒杀状态 0 未开启 1已开启', `is_bargain` tinyint(1) unsigned DEFAULT NULL COMMENT '砍价状态 0未开启 1开启', @@ -757,7 +757,7 @@ CREATE TABLE `eb_store_seckill` ( `price` decimal(10,2) unsigned NOT NULL COMMENT '价格', `cost` decimal(8,2) unsigned NOT NULL DEFAULT '0.00' COMMENT '成本', `ot_price` decimal(10,2) unsigned NOT NULL COMMENT '原价', - `give_integral` decimal(10,2) unsigned NOT NULL COMMENT '返多少积分', + `give_integral` int(11) unsigned NOT NULL DEFAULT '0' COMMENT '返多少积分', `sort` int(10) unsigned NOT NULL COMMENT '排序', `stock` int(10) unsigned NOT NULL COMMENT '库存', `sales` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '销量', @@ -1206,7 +1206,7 @@ CREATE TABLE `eb_user` ( `last_time` int(11) unsigned NOT NULL COMMENT '最后一次登录时间', `last_ip` varchar(16) NOT NULL COMMENT '最后一次登录ip', `now_money` decimal(8,2) unsigned NOT NULL DEFAULT '0.00' COMMENT '用户余额', - `integral` decimal(8,2) unsigned NOT NULL DEFAULT '0.00' COMMENT '用户剩余积分', + `integral` int(11) unsigned NOT NULL DEFAULT '0' COMMENT '用户剩余积分', `status` tinyint(1) NOT NULL DEFAULT '1' COMMENT '1为正常,0为禁止', `level` tinyint(2) unsigned NOT NULL DEFAULT '0' COMMENT '等级', `spread_uid` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '推广元id', diff --git a/public/static/plug/wxApi.js b/public/static/plug/wxApi.js index 8d4bc054..2d39d2a5 100644 --- a/public/static/plug/wxApi.js +++ b/public/static/plug/wxApi.js @@ -336,7 +336,7 @@ } wx.scanQRCode({ needResult: options.needResult || 0, // 默认为0,扫描结果由微信处理,1则直接返回扫描结果, - scanType: options.needResult || ["qrCode", "barCode"], // 可以指定扫二维码还是一维码,默认二者都有 + scanType: options.scanType || ["qrCode", "barCode"], // 可以指定扫二维码还是一维码,默认二者都有 success: function (res) { var result = res.resultStr; // 当needResult 为 1 时,扫码返回的结果 successFn && successFn.call(mapleApi, result, res); diff --git a/public/system/css/layui-admin.css b/public/system/css/layui-admin.css index efe36ee9..0f921ada 100644 --- a/public/system/css/layui-admin.css +++ b/public/system/css/layui-admin.css @@ -18,7 +18,7 @@ .table-responsive{ overflow: initial; } -/*.layui-table img{width: 100% !important;}*/ +.layui-table img{margin: 0px -10px;width: calc(100% + 20px);height: calc(100% + 20px);} /*部分样式重构*/ .layui-laypage-limits select{ height: 26px; @@ -155,6 +155,7 @@ height: auto!important; font-size: 13px; font-weight: normal; + word-wrap: break-word; } /*form 样式*/