临时
This commit is contained in:
parent
a869bf5ba0
commit
1c78652e88
16
.cursor/rules/mhbase.mdc
Normal file
16
.cursor/rules/mhbase.mdc
Normal file
|
|
@ -0,0 +1,16 @@
|
|||
---
|
||||
description:
|
||||
globs:
|
||||
alwaysApply: true
|
||||
---
|
||||
项目配置文件:.env
|
||||
本项目使用:php 7.4,ThinkPHPV6.0 框架
|
||||
后台管理:
|
||||
项目文件夹:app/admin
|
||||
路由文件:app/admin/route/app.php
|
||||
控制器文件夹:app/admin/controller
|
||||
视图文件夹:app/admin/view
|
||||
api项目文件夹:app/api
|
||||
项目文件夹:app/api/controller
|
||||
路由文件:app/api/route/app.php
|
||||
实体类文件夹:app/common/model
|
||||
|
|
@ -54,6 +54,16 @@ class GoodsType extends Base
|
|||
$data['is_fenlei'] = isset($data['is_fenlei']) ? 1 : 0;
|
||||
$data['sort_order'] = intval($data['sort_order']);
|
||||
|
||||
// 处理支付方式复选框
|
||||
$data['pay_wechat'] = isset($data['pay_wechat']) ? 1 : 0;
|
||||
$data['pay_balance'] = isset($data['pay_balance']) ? 1 : 0;
|
||||
$data['pay_currency'] = isset($data['pay_currency']) ? 1 : 0;
|
||||
$data['pay_currency2'] = isset($data['pay_currency2']) ? 1 : 0;
|
||||
$data['pay_coupon'] = isset($data['pay_coupon']) ? 1 : 0;
|
||||
|
||||
// 处理支付类型
|
||||
$data['is_deduction'] = isset($data['is_deduction']) ? 1 : 0;
|
||||
|
||||
// 保存数据
|
||||
$result = GoodsTypeModel::add($data);
|
||||
if ($result) {
|
||||
|
|
@ -105,6 +115,16 @@ class GoodsType extends Base
|
|||
$data['is_fenlei'] = isset($data['is_fenlei']) ? 1 : 0;
|
||||
$data['sort_order'] = intval($data['sort_order']);
|
||||
|
||||
// 处理支付方式复选框
|
||||
$data['pay_wechat'] = isset($data['pay_wechat']) ? 1 : 0;
|
||||
$data['pay_balance'] = isset($data['pay_balance']) ? 1 : 0;
|
||||
$data['pay_currency'] = isset($data['pay_currency']) ? 1 : 0;
|
||||
$data['pay_currency2'] = isset($data['pay_currency2']) ? 1 : 0;
|
||||
$data['pay_coupon'] = isset($data['pay_coupon']) ? 1 : 0;
|
||||
|
||||
// 处理支付类型
|
||||
$data['is_deduction'] = isset($data['is_deduction']) ? 1 : 0;
|
||||
|
||||
// 更新数据
|
||||
$result = GoodsTypeModel::edit($id, $data);
|
||||
if ($result) {
|
||||
|
|
|
|||
|
|
@ -44,6 +44,23 @@
|
|||
<div class="layui-form-mid layui-word-aux">如果分类显示为"是",则必须填写分类名称</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="layui-form-item">
|
||||
<label class="layui-form-label">支付方式</label>
|
||||
<div class="layui-input-block">
|
||||
<input type="checkbox" name="pay_wechat" title="微信支付" lay-skin="primary" checked>
|
||||
<input type="checkbox" name="pay_balance" title="余额支付" lay-skin="primary" checked>
|
||||
<input type="checkbox" name="pay_currency" title="货币支付" lay-skin="primary" checked>
|
||||
<input type="checkbox" name="pay_currency2" title="货币2支付" lay-skin="primary" checked>
|
||||
<input type="checkbox" name="pay_coupon" title="优惠券支付" lay-skin="primary" checked>
|
||||
</div>
|
||||
</div>
|
||||
<div class="layui-form-item">
|
||||
<label class="layui-form-label">支付类型</label>
|
||||
<div class="layui-input-block">
|
||||
<input type="checkbox" name="is_deduction" lay-skin="switch" lay-text="抵扣|支付" checked>
|
||||
<div class="layui-form-mid layui-word-aux">抵扣:使用的是优惠,支付:使用的是实际支付</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="layui-form-item layui-form-text">
|
||||
<label class="layui-form-label">备注</label>
|
||||
<div class="layui-input-block">
|
||||
|
|
|
|||
|
|
@ -45,6 +45,23 @@
|
|||
<div class="layui-form-mid layui-word-aux">如果分类显示为"是",则必须填写分类名称</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="layui-form-item">
|
||||
<label class="layui-form-label">支付方式</label>
|
||||
<div class="layui-input-block">
|
||||
<input type="checkbox" name="pay_wechat" title="微信支付" lay-skin="primary" {if $info.pay_wechat eq 1}checked{/if}>
|
||||
<input type="checkbox" name="pay_balance" title="余额支付" lay-skin="primary" {if $info.pay_balance eq 1}checked{/if}>
|
||||
<input type="checkbox" name="pay_currency" title="货币支付" lay-skin="primary" {if $info.pay_currency eq 1}checked{/if}>
|
||||
<input type="checkbox" name="pay_currency2" title="货币2支付" lay-skin="primary" {if $info.pay_currency2 eq 1}checked{/if}>
|
||||
<input type="checkbox" name="pay_coupon" title="优惠券支付" lay-skin="primary" {if $info.pay_coupon eq 1}checked{/if}>
|
||||
</div>
|
||||
</div>
|
||||
<div class="layui-form-item">
|
||||
<label class="layui-form-label">支付类型</label>
|
||||
<div class="layui-input-block">
|
||||
<input type="checkbox" name="is_deduction" lay-skin="switch" lay-text="抵扣|支付" {if $info.is_deduction neq 0}checked{/if}>
|
||||
<div class="layui-form-mid layui-word-aux">抵扣:使用的是优惠,支付:使用的是实际支付</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="layui-form-item layui-form-text">
|
||||
<label class="layui-form-label">备注</label>
|
||||
<div class="layui-input-block">
|
||||
|
|
|
|||
|
|
@ -58,6 +58,22 @@
|
|||
{field: 'is_show', title: '首页显示', width: 120, templet: '#isShowTpl'},
|
||||
{field: 'is_fenlei', title: '分类显示', width: 120, templet: '#isFenleiTpl'},
|
||||
{field: 'fl_name', title: '分类名称', width: 150},
|
||||
{title: '支付方式', minWidth: 200, templet: function(d){
|
||||
var html = '';
|
||||
if(d.pay_wechat == 1) html += '<span class="layui-badge layui-bg-green">微信</span> ';
|
||||
if(d.pay_balance == 1) html += '<span class="layui-badge layui-bg-blue">余额</span> ';
|
||||
if(d.pay_currency == 1) html += '<span class="layui-badge layui-bg-orange">货币</span> ';
|
||||
if(d.pay_currency2 == 1) html += '<span class="layui-badge layui-bg-cyan">货币2</span> ';
|
||||
if(d.pay_coupon == 1) html += '<span class="layui-badge layui-bg-red">优惠券</span> ';
|
||||
return html;
|
||||
}},
|
||||
{title: '支付类型', width: 100, templet: function(d){
|
||||
if(d.is_deduction == 1) {
|
||||
return '<span class="layui-badge layui-bg-blue">抵扣</span>';
|
||||
} else {
|
||||
return '<span class="layui-badge layui-bg-orange">支付</span>';
|
||||
}
|
||||
}},
|
||||
{field: 'remark', title: '备注', width: 200},
|
||||
{fixed: 'right', title: '操作', toolbar: '#operationTpl', width: 150}
|
||||
]],
|
||||
|
|
|
|||
|
|
@ -691,8 +691,9 @@ class Goods extends Base
|
|||
$prize_num = request()->param('prize_num/d', 0); #抽几发
|
||||
$goods_id = request()->param('goods_id/d', 0); #盒子ID
|
||||
$num = request()->param('goods_num/d', 0); #第几箱
|
||||
$use_money_is = request()->param('use_money_is/d', 0); #0不抵扣 1抵扣
|
||||
$use_integral_is = request()->param('use_integral_is/d', 0); #0不抵扣 1抵扣
|
||||
$use_money_is = request()->param('use_money_is/d', 0); #0不抵扣 1抵扣 余额抵扣
|
||||
$use_integral_is = request()->param('use_integral_is/d', 0); #0不抵扣 1抵扣 货币1抵扣
|
||||
$use_money2_is = request()->param('use_integral_is/d', 0); #0不抵扣 1抵扣 货币2抵扣
|
||||
$coupon_id = request()->param('coupon_id/d', 0); //优惠券
|
||||
|
||||
#盒子信息
|
||||
|
|
@ -823,7 +824,7 @@ class Goods extends Base
|
|||
$zhe_bl = bcdiv("$zhe", "10", 2);
|
||||
$order_zhe_total = $price = bcmul("$price", "$zhe_bl", 2);
|
||||
}
|
||||
#吧唧币抵扣
|
||||
#货币1抵扣
|
||||
$use_integral = 0;
|
||||
if ($use_integral_is == 1 && $goods['type'] != 10) {
|
||||
$price = $price * 100;
|
||||
|
|
@ -859,7 +860,7 @@ class Goods extends Base
|
|||
$zhe = 0;
|
||||
#微信支付
|
||||
$price = 0;
|
||||
#吧唧币抵扣
|
||||
#货币1币抵扣
|
||||
$use_integral = 0;
|
||||
#余额抵扣
|
||||
$use_money = 0;
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user