|
@@ -172,10 +172,10 @@ class WebsiteService implements WebsiteServiceInterface
|
|
|
// if (!empty($web_templsate) && $web_templsate['status'] == 2) {
|
|
// if (!empty($web_templsate) && $web_templsate['status'] == 2) {
|
|
|
// return Result::error("此网站已应用，不可修改基本信息", 0);
|
|
// return Result::error("此网站已应用，不可修改基本信息", 0);
|
|
|
// }
|
|
// }
|
|
|
-
|
|
|
|
|
- Db::beginTransaction();
|
|
|
|
|
- try{
|
|
|
|
|
- if($data['ad_key'] != $website['ad_key']){
|
|
|
|
|
|
|
+
|
|
|
|
|
+ Db::beginTransaction();
|
|
|
|
|
+ try {
|
|
|
|
|
+ if ($data['ad_key'] != $website['ad_key']) {
|
|
|
$web = Website::where(function ($query) use ($data) {
|
|
$web = Website::where(function ($query) use ($data) {
|
|
|
$query->where('id', '!=', $data['id'])
|
|
$query->where('id', '!=', $data['id'])
|
|
|
->where('ad_key', $data['ad_key']);
|
|
->where('ad_key', $data['ad_key']);
|
|
@@ -869,8 +869,8 @@ class WebsiteService implements WebsiteServiceInterface
|
|
|
$res['apply']['complaint'] = Complaint::where(['status' => 1])->count();
|
|
$res['apply']['complaint'] = Complaint::where(['status' => 1])->count();
|
|
|
$res['apply']['notice'] = Notice::where(['status' => 1])->count(); //订单状态：1：通过；2：驳回；3：撤回；4：修改；5：过期；6：待审核；7：结束',
|
|
$res['apply']['notice'] = Notice::where(['status' => 1])->count(); //订单状态：1：通过；2：驳回；3：撤回；4：修改；5：过期；6：待审核；7：结束',
|
|
|
$res['apply']['order'] = Order::where(['status' => 6])->count();
|
|
$res['apply']['order'] = Order::where(['status' => 6])->count();
|
|
|
- $res['apply']['company'] = Company::where(['status' => 1])->count();
|
|
|
|
|
- $res['apply']['project'] = Project::where(['status' => 1])->count();
|
|
|
|
|
|
|
+ $res['apply']['company'] = Company::where(['status' => 0])->count();
|
|
|
|
|
+ $res['apply']['project'] = Project::where(['status' => 0])->count();
|
|
|
|
|
|
|
|
return Result::success($res);
|
|
return Result::success($res);
|
|
|
case 1:
|
|
case 1:
|
|
@@ -1724,6 +1724,7 @@ class WebsiteService implements WebsiteServiceInterface
|
|
|
->pluck('aLIas_pinyin')
|
|
->pluck('aLIas_pinyin')
|
|
|
->implode('/');
|
|
->implode('/');
|
|
|
$data['path'] = $path;
|
|
$data['path'] = $path;
|
|
|
|
|
+
|
|
|
//处理包含此id的所有path
|
|
//处理包含此id的所有path
|
|
|
// 取出category_arr_id包含此id的所有数据
|
|
// 取出category_arr_id包含此id的所有数据
|
|
|
$all_other = WebsiteCategory::where('website_id', $data['website_id'])
|
|
$all_other = WebsiteCategory::where('website_id', $data['website_id'])
|
|
@@ -2244,7 +2245,7 @@ class WebsiteService implements WebsiteServiceInterface
|
|
|
return Result::error("请输入正确的网站id！", 0);
|
|
return Result::error("请输入正确的网站id！", 0);
|
|
|
}
|
|
}
|
|
|
// 0:未构建 1:未应用 2：已应用
|
|
// 0:未构建 1:未应用 2：已应用
|
|
|
- if($result['status'] == 2){
|
|
|
|
|
|
|
+ if ($result['status'] == 2) {
|
|
|
return Result::error("此网站的模板正在应用中，暂不可编辑！", 0);
|
|
return Result::error("此网站的模板正在应用中，暂不可编辑！", 0);
|
|
|
}
|
|
}
|
|
|
|
|
|
LiuJ