diff --git a/application/admin/controller/ump/StoreCombination.php b/application/admin/controller/ump/StoreCombination.php index b35db39d..b88f6df3 100644 --- a/application/admin/controller/ump/StoreCombination.php +++ b/application/admin/controller/ump/StoreCombination.php @@ -15,7 +15,7 @@ use app\admin\model\ump\StoreCombinationAttrResult; use app\admin\model\ump\StoreCombination as StoreCombinationModel; use think\Url; use app\admin\model\system\SystemAttachment; -use app\wap\model\store\StorePink; +use app\admin\model\ump\StorePink; /** * 拼团管理 diff --git a/application/admin/controller/wechat/Reply.php b/application/admin/controller/wechat/Reply.php index e5151fdc..888e0252 100644 --- a/application/admin/controller/wechat/Reply.php +++ b/application/admin/controller/wechat/Reply.php @@ -16,14 +16,15 @@ use think\Request; */ class Reply extends AuthController { + /**关注回复 + * @return mixed|void + */ public function index() { if(empty(input('key'))) return $this->failed('请输入参数key'); if(empty(input('title'))) return $this->failed('请输入参数title'); - $replay = WechatReply::where('key',input('key'))->find(); - $replay_arr =!empty($replay) ? $replay->toArray() : []; - $replay_arr['data'] = json_decode(isset($replay_arr['data']) ? $replay_arr['data'] : '',true); - $this->assign('replay_arr',json_encode($replay_arr)); + $replay = WechatReply::getDataByKey(input('key')); + $this->assign('replay_arr',json_encode($replay)); $this->assign('key',input('key')); $this->assign('title',input('title')); return $this->fetch(); @@ -36,10 +37,8 @@ class Reply extends AuthController ],$this->request); // dump($where); // exit(); - if(!empty($where['key'])) $replay = WechatReply::where('key',$where['key'])->find(); - $replay_arr = $replay->toArray(); + if(!empty($where['key'])) $replay_arr = WechatReply::getDataByKey($where['key']); $replay_arr['code'] = 200; - $replay_arr['data'] = json_decode($replay_arr['data'],true); if(empty($replay_arr)) { $replay_arr['code'] = 0; } @@ -117,10 +116,8 @@ class Reply extends AuthController public function info_keyword(){ $key = input('key'); if(empty($key)) return $this->failed('参数错误,请重新修改'); - $replay = WechatReply::where('key',$key)->find(); - $replay_arr = $replay->toArray(); - $replay_arr['data'] = json_decode($replay_arr['data'],true); - $this->assign('replay_arr',json_encode($replay_arr)); + $replay = WechatReply::getDataByKey($key); + $this->assign('replay_arr',json_encode($replay)); $this->assign('key',$key); $this->assign('dis',2); return $this->fetch('add_keyword'); diff --git a/application/admin/model/wechat/WechatReply.php b/application/admin/model/wechat/WechatReply.php index 66ce3cf9..4a82d2c7 100644 --- a/application/admin/model/wechat/WechatReply.php +++ b/application/admin/model/wechat/WechatReply.php @@ -26,6 +26,15 @@ class WechatReply extends ModelBasic public static $reply_type = ['text','image','news','voice']; + /**根据关键字查询一条 + * @param $key + */ + public static function getDataByKey($key){ + $resdata = []; + $resdata = self::where('key',$key)->find(); + $resdata['data'] = json_decode($resdata['data'],true); + return $resdata; + } public function getUrlAttr($value,$data) { return $value == '' ? \think\Url::build('index/index/news',['id'=>$data['id']]) : $value; @@ -194,4 +203,5 @@ class WechatReply extends ModelBasic } + } \ No newline at end of file diff --git a/application/admin/view/public/form-builder.php b/application/admin/view/public/form-builder.php index 16f3c077..9e3f10fa 100644 --- a/application/admin/view/public/form-builder.php +++ b/application/admin/view/public/form-builder.php @@ -8,6 +8,7 @@ /*弹框样式修改*/ .ivu-modal-body{padding: 5;} .ivu-modal-confirm-footer{display: none;} + .ivu-date-picker {display: inline-block;line-height: normal;width: 280px;}
@@ -19,6 +20,8 @@ //关闭当前窗口 // var index = parent.layer.getFrameIndex(window.name); // parent.layer.close(index); + //提交成功后按钮恢复 + $r.btn.finish(); }; (function () { var create = =$form->formScript()?> diff --git a/application/admin/view/ump/store_combination/combina_list.php b/application/admin/view/ump/store_combination/combina_list.php index c9aec669..ac66dc18 100644 --- a/application/admin/view/ump/store_combination/combina_list.php +++ b/application/admin/view/ump/store_combination/combina_list.php @@ -51,13 +51,14 @@