周海龙 / globalso · 提交

转到一个项目

作者 lyh
提交 8b37bb43cdd6579225d70ec6d9d27e6e4a077f43 1 个父辈 49ec4c5e

gx

内嵌 并排对比
正在显示 3 个修改的文件 包含 1 行增加 和 29 行删除
@@ -33,16 +33,9 @@ class TemplateController extends BaseController @@ -33,16 +33,9 @@ class TemplateController extends BaseController
33 * @time 2023/5/9 14:20 33 * @time 2023/5/9 14:20
34 */ 34 */
35 public function index(){ 35 public function index(){
36 -  
37 $limit = intval($this->param['limit']??20); 36 $limit = intval($this->param['limit']??20);
38 -  
39 -  
40 // 读取列表 37 // 读取列表
41 $data = ATemplate::_bAll($limit)->toArray(); 38 $data = ATemplate::_bAll($limit)->toArray();
42 -  
43 -  
44 -  
45 -  
46 return $this->success($data); 39 return $this->success($data);
47 } 40 }
48 41
@@ -53,7 +46,6 @@ class TemplateController extends BaseController @@ -53,7 +46,6 @@ class TemplateController extends BaseController
53 * @time 2023/5/9 15:19 46 * @time 2023/5/9 15:19
54 */ 47 */
55 public function info(){ 48 public function info(){
56 -  
57 // 保存更新 49 // 保存更新
58 if($this->isPost()){ 50 if($this->isPost()){
59 $template_id = intval($this->param['template_id']??0); 51 $template_id = intval($this->param['template_id']??0);
@@ -64,12 +56,10 @@ class TemplateController extends BaseController @@ -64,12 +56,10 @@ class TemplateController extends BaseController
64 return $this->response('无法使用不存在的模板',Code::SYSTEM_ERROR); 56 return $this->response('无法使用不存在的模板',Code::SYSTEM_ERROR);
65 } 57 }
66 } 58 }
67 -  
68 // 读取我的模板 59 // 读取我的模板
69 $conf = BSetting::_get($this->user['project_id']); 60 $conf = BSetting::_get($this->user['project_id']);
70 // 读取模板信息 61 // 读取模板信息
71 $data = ATemplate::_bFind($conf['template_id']); 62 $data = ATemplate::_bFind($conf['template_id']);
72 -  
73 return $this->success([ 63 return $this->success([
74 'template_id' => $data['id']??0, 64 'template_id' => $data['id']??0,
75 'name' => $data['name']??'', 65 'name' => $data['name']??'',
@@ -85,19 +75,11 @@ class TemplateController extends BaseController @@ -85,19 +75,11 @@ class TemplateController extends BaseController
85 * @time 2023/5/10 10:53 75 * @time 2023/5/10 10:53
86 */ 76 */
87 public function save(){ 77 public function save(){
88 -  
89 $html = '<header id="globalso-header" class="web_head sticky-top py-1 py-md-0" style="background-color: #318fff;">asdf</header>'; 78 $html = '<header id="globalso-header" class="web_head sticky-top py-1 py-md-0" style="background-color: #318fff;">asdf</header>';
90 -  
91 // 替换 header 79 // 替换 header
92 $html = preg_replace("/<header(.*)id=\"globalso-header\"(.*)>([\s\S]*)<\/header>/iU",'',$html); 80 $html = preg_replace("/<header(.*)id=\"globalso-header\"(.*)>([\s\S]*)<\/header>/iU",'',$html);
93 $html = preg_replace("/<main(.*)id=\"globalso-main\"(.*)>([\s\S]*)<\/main>/iU",'',$html); 81 $html = preg_replace("/<main(.*)id=\"globalso-main\"(.*)>([\s\S]*)<\/main>/iU",'',$html);
94 $html = preg_replace("/<footer(.*)id=\"globalso-footer\"(.*)>([\s\S]*)<\/footer>/iU",'',$html); 82 $html = preg_replace("/<footer(.*)id=\"globalso-footer\"(.*)>([\s\S]*)<\/footer>/iU",'',$html);
95 -  
96 -  
97 -  
98 -  
99 -  
100 -  
101 } 83 }
102 84
103 85
@@ -127,7 +109,6 @@ class TemplateController extends BaseController @@ -127,7 +109,6 @@ class TemplateController extends BaseController
127 'name' => 'example', 109 'name' => 'example',
128 ]; 110 ];
129 return $this->response('',Code::SUCCESS,$res); 111 return $this->response('',Code::SUCCESS,$res);
130 -  
131 } 112 }
132 113
133 /** 114 /**
@@ -136,7 +117,6 @@ class TemplateController extends BaseController @@ -136,7 +117,6 @@ class TemplateController extends BaseController
136 * @time 2023/5/11 11:00 117 * @time 2023/5/11 11:00
137 */ 118 */
138 public function save_html(TemplateRequest $request){ 119 public function save_html(TemplateRequest $request){
139 -  
140 $data = $request->validated(); 120 $data = $request->validated();
141 $data['data_source'] = $data['source']; 121 $data['data_source'] = $data['source'];
142 $data['data_source_id'] = $data['source_id']; 122 $data['data_source_id'] = $data['source_id'];
@@ -160,10 +140,8 @@ class TemplateController extends BaseController @@ -160,10 +140,8 @@ class TemplateController extends BaseController
160 unset($info['css']); 140 unset($info['css']);
161 unset($info['script']); 141 unset($info['script']);
162 unset($info['data_ext']); 142 unset($info['data_ext']);
163 -  
164 return $this->success($info,Code::SUCCESS,'保存成功'); 143 return $this->success($info,Code::SUCCESS,'保存成功');
165 } 144 }
166 -  
167 return $this->response('保存失败',Code::SYSTEM_ERROR); 145 return $this->response('保存失败',Code::SYSTEM_ERROR);
168 146
169 } 147 }
@@ -178,11 +156,8 @@ class TemplateController extends BaseController @@ -178,11 +156,8 @@ class TemplateController extends BaseController
178 * @time 2023/5/15 14:43 156 * @time 2023/5/15 14:43
179 */ 157 */
180 public function status(TemplateRequest $request){ 158 public function status(TemplateRequest $request){
181 -  
182 $data = $request->validated(); 159 $data = $request->validated();
183 -  
184 TemplateLogic::instance()->status($data['source'],$data['source_id'],$data['status']); 160 TemplateLogic::instance()->status($data['source'],$data['source_id'],$data['status']);
185 -  
186 return $this->response('保存成功'); 161 return $this->response('保存成功');
187 162
188 } 163 }
@@ -194,14 +169,12 @@ class TemplateController extends BaseController @@ -194,14 +169,12 @@ class TemplateController extends BaseController
194 * @time 2023/5/10 14:55 169 * @time 2023/5/10 14:55
195 */ 170 */
196 public function chunk(){ 171 public function chunk(){
197 -  
198 $lists = TemplateChunkLogic::instance()->getList([['status','=',1]],['sort'=>'asc'],['*'],false); 172 $lists = TemplateChunkLogic::instance()->getList([['status','=',1]],['sort'=>'asc'],['*'],false);
199 foreach ($lists as &$list){ 173 foreach ($lists as &$list){
200 unset($list['created_at']); 174 unset($list['created_at']);
201 unset($list['updated_at']); 175 unset($list['updated_at']);
202 unset($list['status']); 176 unset($list['status']);
203 } 177 }
204 -  
205 return $this->success($lists); 178 return $this->success($lists);
206 } 179 }
207 180
@@ -15,7 +15,6 @@ class ProjectRoleLogic extends BaseLogic @@ -15,7 +15,6 @@ class ProjectRoleLogic extends BaseLogic
15 public function __construct() 15 public function __construct()
16 { 16 {
17 parent::__construct(); 17 parent::__construct();
18 -  
19 $this->model = new ProjectRole(); 18 $this->model = new ProjectRole();
20 $this->param = $this->requestAll; 19 $this->param = $this->requestAll;
21 } 20 }
@@ -64,7 +64,7 @@ class CountLogic extends BaseLogic @@ -64,7 +64,7 @@ class CountLogic extends BaseLogic
64 $data = [ 64 $data = [
65 'total_pv'=>$pv, 65 'total_pv'=>$pv,
66 'total_ip'=>$ip, 66 'total_ip'=>$ip,
67 - 'conversion_rate' => (isset($inquiry_num) && !empty($inquiry_num)) ? round(($inquiry_num / $ip) * 10,2) : 0, 67 + 'conversion_rate' => (isset($inquiry_num) && !empty($inquiry_num) && ($ip != 0)) ? round(($inquiry_num / $ip) * 10,2) : 0,
68 ]; 68 ];
69 return $this->success($data); 69 return $this->success($data);
70 } 70 }