From 26e2592813b9263124d518d238262910e817d323 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 14 八月 2023 10:13:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 cloud-server-management/src/main/webapp/WEB-INF/view/system/tShop/TShop_edit.html |   25 ++++++++++++++++++++++---
 1 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tShop/TShop_edit.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tShop/TShop_edit.html
index e92282e..20d378a 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tShop/TShop_edit.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tShop/TShop_edit.html
@@ -1,9 +1,12 @@
 @layout("/common/_container.html"){
+<script type="text/javascript" src="http://webapi.amap.com/maps?v=1.4.15&key=77b37f0753049c4e712ea79a24e0719c"></script>
 <div class="ibox float-e-margins">
     <div class="ibox-content">
 
         <div class="form-horizontal" id="carInfoForm">
             <input hidden id="id" value="${item.id}">
+            <input hidden id="role" value="${role}">
+            @if(role=='1'){
             <div class="form-group" id="provinceCode">
                 <label class="col-sm-3 control-label">所在省:</label>
                 <div class="col-sm-9">
@@ -11,7 +14,6 @@
                         <option value="">选择省</option>
                         @for(obj in list){
                         <option value="${obj.code}" ${obj.code == item.provinceCode ? 'selected=selected' : ''}>${obj.name}</option>
-                        <option value="${obj.code}">${obj.name}</option>
                         @}
                     </select>
                 </div>
@@ -38,11 +40,27 @@
                     </select>
                 </div>
             </div>
+            @}
             <#input id="name" name="门店名称" type="text" value="${item.name}"/>
             <#input id="phone" name="联系电话" type="text" value="${item.phone}"/>
-            <#input id="address" name="门店地址" type="text" value="${item.address}"/>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">门店地址:</label>
+                <div class="col-sm-9">
+                    <input class="form-control" id="address" name="address" type="text"  value="${item.address}" onchange="TCarInfoDlg.searchByStationName(this,1)">
+
+                </div>
+            </div>
+            <div class="col-sm-10" style="margin-left: 397px;width: 70%;" >
+                <!-- 创建地图容器-->
+                <div id="container" style="height: 500px;" ></div>
+            </div>
             <#input id="time" name="营业时间" type="text" value="${time}"/>
-            <#input id="intro" name="门店介绍" type="text" value="${item.introduce}"/>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">门店介绍:</label>
+                <div class="col-sm-9">
+                    <textarea id="introduce" style="width: 617px; height: 180px;">${item.introduce}</textarea>
+                </div>
+            </div>
             <#input id="userName" name="管理员姓名" type="text" value="${city.name}"/>
             <#input id="userPhone" name="管理员手机号" type="text" value="${city.account}"/>
             <#avatar id="img" name="门店封面(推荐像素722*360px)" avatarImg="${item.coverDrawing}"/>
@@ -69,5 +87,6 @@
     });
 </script>
 <script type="application/javascript">
+
 </script>
 @}

--
Gitblit v1.7.1