Browse Source

修改地址字段

develop
李可松 4 years ago
parent
commit
59e4228b1c
  1. 6
      app/AdminAgent/Controllers/WorkorderController.php
  2. 6
      app/AdminSupplier/Controllers/ProductController.php
  3. 6
      resources/views/admin/pages/index.blade.php

6
app/AdminAgent/Controllers/WorkorderController.php

@ -19,6 +19,7 @@ use Dcat\Admin\Show;
use Dcat\Admin\Http\Controllers\AdminController; use Dcat\Admin\Http\Controllers\AdminController;
use Illuminate\Http\Request; use Illuminate\Http\Request;
use App\Traits\ResponseHelper; use App\Traits\ResponseHelper;
use Illuminate\Support\Facades\Storage;
use Illuminate\Support\Facades\Validator; use Illuminate\Support\Facades\Validator;
class WorkorderController extends AdminController class WorkorderController extends AdminController
@ -67,7 +68,8 @@ class WorkorderController extends AdminController
$data = [ $data = [
'user_list' => $userList, 'user_list' => $userList,
'msg_list' => $msgList
'msg_list' => $msgList,
'user' => Admin::user()
]; ];
return $content return $content
@ -215,7 +217,7 @@ class WorkorderController extends AdminController
} }
$path = $request->image->store('public/images/workorder'); $path = $request->image->store('public/images/workorder');
$path = (Storage::url($path));
$item = new WorkorderItem(); $item = new WorkorderItem();
$item->workorder_id = request('workorder_id',0); $item->workorder_id = request('workorder_id',0);
$item->content = $path; $item->content = $path;

6
app/AdminSupplier/Controllers/ProductController.php

@ -152,7 +152,7 @@ class ProductController extends AdminController
$table->text('tag', '包含项目')->placeholder('如:24小时热水、干洗服务等'); $table->text('tag', '包含项目')->placeholder('如:24小时热水、干洗服务等');
})->value($default)->help('首次创建时,系统会默认填充基本服务,请根据本酒店情况进行删减或新增'); })->value($default)->help('首次创建时,系统会默认填充基本服务,请根据本酒店情况进行删减或新增');
$form->text('address', '地址');
$form->text('extends.field_1.address', '地址');
$form->map('extends.field_1.latitude', 'extends.field_1.longitude', '位置'); $form->map('extends.field_1.latitude', 'extends.field_1.longitude', '位置');
})->when(2, function (Form $form) { //景区 })->when(2, function (Form $form) { //景区
$form->table('extends.field_2.open_time', '开放时间', function (NestedForm $table) { $form->table('extends.field_2.open_time', '开放时间', function (NestedForm $table) {
@ -167,7 +167,7 @@ class ProductController extends AdminController
$table->text('price', '费用'); $table->text('price', '费用');
})->help('第一行数据默认是表头,如:项目名称、数量、额外费用'); })->help('第一行数据默认是表头,如:项目名称、数量、额外费用');
$form->text('address', '地址');
$form->text('extends.field_2.address', '地址');
$form->map('extends.field_2.latitude', 'extends.field_2.longitude', '位置'); $form->map('extends.field_2.latitude', 'extends.field_2.longitude', '位置');
})->when(3, function (Form $form) { //餐厅 })->when(3, function (Form $form) { //餐厅
$form->table('extends.field_3.open_time', '开放时间', function (NestedForm $table) { $form->table('extends.field_3.open_time', '开放时间', function (NestedForm $table) {
@ -182,7 +182,7 @@ class ProductController extends AdminController
$table->text('price', '价格')->placeholder('如:99元'); $table->text('price', '价格')->placeholder('如:99元');
})->help('第一行数据默认是表头,如:项目名称、数量、额外费用'); })->help('第一行数据默认是表头,如:项目名称、数量、额外费用');
$form->text('address', '地址');
$form->text('extends.field_3.address', '地址');
$form->map('extends.field_3.latitude', 'extends.field_3.longitude', '位置'); $form->map('extends.field_3.latitude', 'extends.field_3.longitude', '位置');
}); });

6
resources/views/admin/pages/index.blade.php

@ -159,10 +159,10 @@
<div class="col-lg-11 offset-1 text-right"> <div class="col-lg-11 offset-1 text-right">
<div class="msg-user"> <div class="msg-user">
<div class="msg-name"> <div class="msg-name">
供应商5566
{{$user->name}}
</div> </div>
<div class="msg-avatar"> <div class="msg-avatar">
<img src="http://local.base_pro.com/vendor/dcat-admin/images/default-avatar.jpg" alt="头像" title="头像" />
<img src="{{$user->avatar}}" alt="头像" title="头像" />
</div> </div>
</div> </div>
<div class="msg-content text-left">#contents</div> <div class="msg-content text-left">#contents</div>
@ -190,7 +190,7 @@
contentType: false, contentType: false,
dataType: 'json', dataType: 'json',
success: function(res) { success: function(res) {
let imageUrl = {{env('APP_URL')}} + '/' + res.data.url
let imageUrl = 'https://hainan.lanzulive.com/'+res.data.content
let msgTime = res.data.created_at let msgTime = res.data.created_at
let templateHtml = $('.template-my').html() let templateHtml = $('.template-my').html()
let imgDoc = '<img class="msg-content-image" src="'+imageUrl+'" alt="图片" title="图片" />' let imgDoc = '<img class="msg-content-image" src="'+imageUrl+'" alt="图片" title="图片" />'

Loading…
Cancel
Save