dxtc
/
coupon-admin
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

setter

master
wangxinglong 2022-02-09 13:54:17 +08:00
parent 2fbfad2c09
commit 2aa4b5a61d
6 changed files with 73 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controller/api/Business.php
View File

@ -387,7 +387,7 @@ class Business extends Base
$data["usingRule"] = DictionaryRepository::getInstance()->getUsingRuleByCouponMainId($couponMain->id); $data["usingRule"] = DictionaryRepository::getInstance()->getUsingRuleByCouponMainId($couponMain->id);
$data["punishRule"] = '';//处罚规则 已取消 $data["punishRule"] = '';//处罚规则 已取消
$data["content"] = $couponMain->content; $data["content"] = (string)$couponMain->content;
//未登录可以领取 0可领取 1已领取 //未登录可以领取 0可领取 1已领取
if (empty($account)) { if (empty($account)) {

6
app/controller/api/Coupon.php
View File

@ -600,12 +600,12 @@ class Coupon extends Base
//发起支付 //发起支付
//$result = $payment->transfer->toBalance($toBalanceData); $result = $payment->transfer->toBalance($toBalanceData);
//var_dump($result); //var_dump($result);
//付款成功才提交！！！！！伪装成功 //付款成功才提交！！！！！伪装成功
if( true || isset($result['payment_no']) ){ if( isset($result['payment_no']) ){
$redpackData['pay_time'] = date("Y-m-d H:i:s",$time); $redpackData['pay_time'] = date("Y-m-d H:i:s",$time);
Db::commit(); Db::commit();
@ -616,7 +616,7 @@ class Coupon extends Base
"redpack" =>$consumerMoney "redpack" =>$consumerMoney
]); ]);
} }
//Log::info("企业发起付款失败:" . json_encode($result,JSON_UNESCAPED_UNICODE)); Log::info("企业发起付款失败:" . json_encode($result,JSON_UNESCAPED_UNICODE));
//默认回滚 //默认回滚

2
app/controller/manager/Business.php
View File

@ -230,7 +230,7 @@ class Business extends Base
'intro|介绍' => 'require', 'intro|介绍' => 'require',
'business_circle_id|商圈' => 'require', 'business_circle_id|商圈' => 'require',
'background|背景图' => 'require', 'background|背景图' => 'require',
'score|评分' => 'require|in:1,2,3,4,5', //'score|评分' => 'require|in:1,2,3,4,5',
'reason|驳回原因' => 'max:100', 'reason|驳回原因' => 'max:100',
]); ]);

20
view/manager/business/business_detail.html
View File

@ -181,16 +181,16 @@
</div> </div>
<div class="layui-form-item"> <!-- <div class="layui-form-item">-->
<label class="layui-form-label required">商家评分</label> <!-- <label class="layui-form-label required">商家评分</label>-->
<div class="layui-input-block"> <!-- <div class="layui-input-block">-->
<input type="radio" {if $item['score']==1 } checked="checked" {/if} name="score" value="1" title="1星" /> <!-- <input type="radio" { if $item['score']==1 } checked="checked" {/if} name="score" value="1" title="1星" />-->
<input type="radio" {if $item['score']==2 } checked="checked" {/if} name="score" value="2" title="2星" /> <!-- <input type="radio" { if $item['score']==2 } checked="checked" {/if} name="score" value="2" title="2星" />-->
<input type="radio" {if $item['score']==3 } checked="checked" {/if} name="score" value="3" title="3星" /> <!-- <input type="radio" { if $item['score']==3 } checked="checked" {/if} name="score" value="3" title="3星" />-->
<input type="radio" {if $item['score']==4 } checked="checked" {/if} name="score" value="4" title="4星" /> <!-- <input type="radio" { if $item['score']==4 } checked="checked" {/if} name="score" value="4" title="4星" />-->
<input type="radio" {if $item['score']==5 } checked="checked" {/if} name="score" value="5" title="5星" /> <!-- <input type="radio" { if $item['score']==5 } checked="checked" {/if} name="score" value="5" title="5星" />-->
</div> <!-- </div>-->
</div> <!-- </div>-->
<div class="layui-form-item"> <div class="layui-form-item">
<label class="layui-form-label required">商家模式</label> <label class="layui-form-label required">商家模式</label>

35
view/manager/coupon/add.html
View File

@ -199,16 +199,39 @@
<textarea name="item[intro]" class="layui-textarea"></textarea> <textarea name="item[intro]" class="layui-textarea"></textarea>
</div> </div>
</div> </div>
<div class="layui-form-item"> <!-- <div class="layui-form-item">-->
<label class="layui-form-label">内容</label> <!-- <label class="layui-form-label">内容</label>-->
<div class="layui-input-block editor-text"> <!-- <div class="layui-input-block editor-text">-->
<div class="editor"></div> <!-- <div class="editor"></div>-->
<textarea name="item[content]" id="ueditor" class="layui-textarea"></textarea> <!-- <textarea name="item[content]" id="ueditor" class="layui-textarea"></textarea>-->
<!-- </div>-->
<!-- </div>-->
<div class="layui-form-item layui-row field-div current-field-cover" >
<label class="layui-form-label">内容组图:</label>
<div class="layui-inline layui-col-xs12 layui-col-md8">
<div class="layui-row upload-file-div">
<div class=" layui-col-xs12 layui-col-md8">
<input class="layui-input upload-file-value" name="item[content]" type="text" value="">
<div class="layui-form-mid layui-word-aux">图片尺寸：请选择合适尺寸</div>
</div>
<div class="layui-col-xs12 layui-col-md3">
<span>
<button type="button" class="layui-btn layui-btn-danger upload-btn" data-multiple="true">
<i class="fa fa-upload"></i> 上传
</button>
</span>
<span><button type="button" class="layui-btn layui-btn-primary upload-choose-btn" data-url="/manager/attachment/image"
data-type="image"
data-multiple="true"
><i class="fa fa-list"></i> 选择</button></span>
</div>
<ul class="layui-row layui-col-xs12 layui-col-md9 preview-list layui-col-space5"></ul>
</div>
</div> </div>
</div> </div>
<fieldset class="layui-elem-field layui-field-title site-title"> <fieldset class="layui-elem-field layui-field-title site-title">
<legend><a name="compatibility">请填写完整整数 总和为100</a></legend> <legend><a name="compatibility">请填写完整整数 总和为100</a></legend>
</fieldset> </fieldset>

34
view/manager/coupon/edit.html
View File

@ -201,11 +201,35 @@
</div> </div>
</div> </div>
<div class="layui-form-item"> <!-- <div class="layui-form-item">-->
<label class="layui-form-label">内容</label> <!-- <label class="layui-form-label">内容</label>-->
<div class="layui-input-block editor-text"> <!-- <div class="layui-input-block editor-text">-->
<div class="editor"></div> <!-- <div class="editor"></div>-->
<textarea name="item[content]" id="ueditor" class="layui-textarea">{$item["content"]|raw}</textarea> <!-- <textarea name="item[content]" id="ueditor" class="layui-textarea">{ $item["content"]|raw}</textarea>-->
<!-- </div>-->
<!-- </div>-->
<div class="layui-form-item layui-row field-div current-field-cover" >
<label class="layui-form-label">内容组图:</label>
<div class="layui-inline layui-col-xs12 layui-col-md8">
<div class="layui-row upload-file-div">
<div class=" layui-col-xs12 layui-col-md8">
<input class="layui-input upload-file-value" name="item[content]" type="text" value="{$item["content"]|raw}">
<div class="layui-form-mid layui-word-aux">图片尺寸：请选择合适尺寸</div>
</div>
<div class="layui-col-xs12 layui-col-md3">
<span>
<button type="button" class="layui-btn layui-btn-danger upload-btn" data-multiple="true">
<i class="fa fa-upload"></i> 上传
</button>
</span>
<span><button type="button" class="layui-btn layui-btn-primary upload-choose-btn" data-url="/manager/attachment/image"
data-type="image"
data-multiple="true"
><i class="fa fa-list"></i> 选择</button></span>
</div>
<ul class="layui-row layui-col-xs12 layui-col-md9 preview-list layui-col-space5"></ul>
</div>
</div> </div>
</div> </div>