From 47e23cf659d4cc58bc93b44b16e64e82efcfb08d Mon Sep 17 00:00:00 2001
From: zhibing.pu <393733352@qq.com>
Date: 星期三, 24 七月 2024 17:34:27 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/PlayPai into 2.0
---
cloud-server-management/src/main/webapp/WEB-INF/view/system/tShop/TShop_edit.html | 264 ++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 240 insertions(+), 24 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..d179f30 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,17 +1,77 @@
@layout("/common/_container.html"){
+<style>
+ .avatar-uploader .el-upload {
+ border: 1px dashed #d9d9d9;
+ border-radius: 6px;
+ cursor: pointer;
+ position: relative;
+ height: 100px;
+ width: 100px;
+ overflow: hidden;
+ }
+
+ .avatar-uploader .el-upload:hover {
+ border-color: #409EFF;
+ }
+ .avatar-uploader-icon {
+ font-size: 28px;
+ color: #8c939d;
+ width: 100px;
+ height: 100px;
+ line-height: 100px;
+ margin-top: 32px;
+ text-align: center;
+ }
+ .avatar {
+ width: 100px;
+ height: 100px;
+ display: block;
+ }
+
+ .col-sm-12 {
+ margin-top: 20px;
+ }
+
+ .col-sm-12 select {
+ height: 33px;
+ }
+</style>
+<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}">
+ <input hidden id="type" value="${item.type}">
+
+ @if(role=='1'){
+ <div class="form-group">
+ <label class="col-sm-3 control-label">门店类型：</label>
+ <div class="col-sm-9">
+ <input type="radio" name="type" value="1" onclick="updateType(1)"> 平台门店
+ <input type="radio" name="type" value="2" onclick="updateType(2)"> 运营商门店
+ </div>
+ </div>
+ @}
+ @if(role=='1'){
+ <div class="form-group" id="yys" hidden >
+ <label class="col-sm-3 control-label">所属运营商：</label>
+ <div class="col-sm-9">
+ <select class="form-control" id="account" name="account" onchange="TCarInfoDlg.oneChange3(this)">
+ @for(obj in yysList){
+ <option value="${obj.id}" ${obj.id == item.operatorId ? 'selected=selected' : ''}>${obj.name}</option>
+ @}
+ </select>
+ </div>
+ </div>
+ @}
<div class="form-group" id="provinceCode">
<label class="col-sm-3 control-label">所在省：</label>
<div class="col-sm-9">
- <select class="form-control" id="pCode" name="pCode" onchange="TCarInfoDlg.oneChange(this)">
- <option value="">选择省</option>
+ <select class="form-control" id="pCode" name="pCode" onchange="TCarInfoDlg.oneChange9(this)">
@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>
@@ -19,40 +79,69 @@
<div class="form-group" id="cityCode">
<label class="col-sm-3 control-label">所在市：</label>
<div class="col-sm-9">
- <select class="form-control" id="cCode" name="cCode" onchange="TCarInfoDlg.oneChangeNext(this)">
- <option value="">选择市</option>
+ <select class="form-control" id="cCode" name="cCode">
@for(obj in list1){
- <option value="${obj.code}" ${obj.code == item.cityCode ? 'selected=selected' : ''}>${obj.name}</option>
- @}
- </select>
- </div>
- </div>
- <div class="form-group" >
- <label class="col-sm-3 control-label">所属账号：</label>
- <div class="col-sm-9">
- <select class="form-control" id="account" name="account">
- <option value="">选择账号</option>
- @for(obj in list2){
- <option value="${obj.id}" ${obj.id == item.cityManagerId ? 'selected=selected' : ''}>${obj.name}-${obj.phone}</option>
+ <option value="${obj.code}" ${item.cityCode == obj.code ? 'selected=selected' : ''}>${obj.name}</option>
@}
</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 hidden id="longitude" value="${item.lon}"></div>
+ <div hidden id="latitude" value="${item.lat}"></div>
+ <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}"/>
- <#input id="imgOne" name="实景照片" type="text" value="${item.realPicture}"/>
+ <div class="row" id="app1">
+ <div class="col-sm-6" style="width: 100%;margin-left: 103px;">
+ <div class="form-group">
+ <label class="col-sm-3 control-label" style="width: 15%;margin-left: 5%">*实景图片(请上传不超过五张图片): </label>
+ <div class="col-sm-2" style="width: 100%;margin-left: 11%;margin-top: 1%">
+ <el-upload
+ :limit="5"
+ class="avatar-uploader"
+ action="/tCouponManage/uploadPic"
+ list-type="picture-card"
+ accept="."
+ :file-list="imageUrl2"
+ :on-success="handleAvatarSuccess"
+ :on-remove="handleRemove">
+ <i class="el-icon-plus"></i>
+ </el-upload>
+ <el-dialog :visible.sync="dialogVisible">
+ <img width="100%" :src="imageUrl2" alt=""></el-dialog>
+
+ </div>
+ </div>
+
+ </div>
+ </div>
+ <!--<#input id="ids" name="添加入园闸机" type="text" value="${item.ids}"/>-->
</div>
<div class="row btn-group-m-t">
<div class="col-sm-10 col-sm-offset-5">
- @if(type==1){
+ @if(type !=0){
<#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="TCarInfoDlg.editSubmit()"/>
@}
<#button btnCss="danger" name="关闭" id="cancel" icon="fa-eraser" clickFun="TCarInfoDlg.close()"/>
@@ -62,12 +151,139 @@
</div>
</div>
<script src="${ctxPath}/modular/system/tShop/tShop_info.js"></script>
+<script src="${ctxPath}/js/vue/vue.js"></script>
+<script src="${ctxPath}/js/elementui/index.js"></script>
+<link rel="stylesheet" href="${ctxPath}/js/elementui/index.css">
<script>
- laydate.render({
- elem: '#time',
- range:true
+ layui.use('laydate', function(){
+ var laydate = layui.laydate;
+ //时间范围
+ laydate.render({
+ elem: '#time'
+ , type: 'time'
+ , range: true
+ , format: 'HH:mm'
+ , theme: '#368ee0'
+ , ready: function (date) {
+ var dom = $(".laydate-time-list").children("li");
+ for (var i = 0; i < dom.length; i++) {
+ if (i == 2 || i == 5) {
+ $(dom[i]).remove();
+ } else if(i==1||i==4) {
+ var li = $(dom[i]).children("ol").children("li")
+ //console.log(li.length);
+ for (var j = 0; j < li.length; j++) {
+ //console.log($(li[j]).text())
+ if ($(li[j]).text() != 00 && $(li[j]).text()!=30) {
+ $(li[j]).remove();
+ }
+ }
+ }
+ }
+ }
+ });
+ })
+
+
+
+
+
+
+
+ let id = "${item.realPicture}"
+ let obj = []
+
+
+ var vue2 = new Vue({
+ el: '#app1',
+ props: {
+ // 数量限制
+ limit: {
+ type: Number,
+ default: 2
+ },
+ },
+ data: {
+ autoUpload: true,//自动上传
+ imageUrl1: '',//模型数据，用于上传图片完成后图片预览
+ imageUrl2: [],
+ dialogVisible: false
+ },
+ methods: {
+ handleAvatarSuccess(res, file) {
+ file.url =file.response
+ TCarInfoDlg.goodsPicArray.push(res);
+ console.log(TCarInfoDlg.goodsPicArray)
+ },
+ beforeAvatarUpload(file) {
+ const isLt2M = file.size / 1024 / 1024 < 10;
+ if (!isLt2M) {
+ this.$message.error('上传图片大小不能超过 10MB!');
+ }
+ return isLt2M;
+ },
+ handleRemove(file, fileList) {
+ TCarInfoDlg.goodsPicArray = TCarInfoDlg.goodsPicArray.filter(item => {
+ return item.uid != file.uid;
+ });
+ },
+ changeImg(){
+ var i = id.split(",")
+ for (let j = 0; j <i.length; j++) {
+ let obj={
+ fileName:i[j],
+ uuid:i[j],
+ url:i[j],
+ response:i[j],
+ }
+ this.imageUrl2.push(obj)
+ }
+ console.log( this.imageUrl2,111)
+ },
+ },
+ created() {
+ this.changeImg()
+ TCarInfoDlg.goodsPicArray = this.imageUrl2
+ },
});
+
+
+ function updateType(o) {
+ if(o==1){
+ $("#yys").hide()
+ }else {
+ $("#yys").show()
+ }
+
+ }
+
+
+
+ window.onload = function(){
+
+ console.log("${item.operatorId}")
+ var OBJradio=document.getElementsByName("type")
+ if("${item.operatorId}"==0){
+ OBJradio[0].checked=true
+ }else {
+ OBJradio[1].checked=true
+ $("#yys").show()
+ }
+
+
+ var OBJradio=document.getElementsByName("ishalf")
+ if($("#type_").val()==1){
+ $("#halfCode").show()
+ }
+ for(i=0;i<OBJradio.length;i++){//循环查找这个radio
+ if($("#type_").val()==OBJradio[i].value){//判断是否与radio的值相同
+ OBJradio[i].checked=true//修改选中状态
+ }
+ }
+
+ }
</script>
<script type="application/javascript">
+
</script>
@}
--
Gitblit v1.7.1