From ef96dbc9278ebae4af204cca9de98c63f0d6328e Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期三, 20 九月 2023 19:16:21 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai

---
 cloud-server-management/src/main/webapp/WEB-INF/view/system/tShop/TShop_edit.html |  167 ++++++++++++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 156 insertions(+), 11 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 103833c..17ba78f 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,4 +1,41 @@
 @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">
@@ -6,7 +43,24 @@
         <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}">
+
+            <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.oneChange1(this)">
+                        <option value="">选择运营商</option>
+                    </select>
+                </div>
+            </div>
             <div class="form-group" id="provinceCode">
                 <label class="col-sm-3 control-label">所在省:</label>
                 <div class="col-sm-9">
@@ -25,17 +79,6 @@
                         <option value="">选择市</option>
                         @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>
                         @}
                     </select>
                 </div>
@@ -65,6 +108,32 @@
             <#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">
@@ -77,11 +146,87 @@
     </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
     });
+
+    window.onload = function(){
+        var OBJradio=document.getElementsByName("type")
+        for(i=0;i<OBJradio.length;i++){//循环查找这个radio
+            if($("#type").val()==OBJradio[i].value){//判断是否与radio的值相同
+                OBJradio[i].checked=true//修改选中状态
+            }
+        }
+    }
+    let id = "https://evmoto.obs.ap-southeast-4.myhuaweicloud.com:443/b1d6f9e362414d1b895d916657776573.png,https://evmoto.obs.ap-southeast-4.myhuaweicloud.com:443/b1d6f9e362414d1b895d916657776573.png"
+    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) {
+                TCarInfoDlg.goodsPicArray.push(file);
+            },
+            changeImg(){
+               var i = id.split(",")
+                for (let j = 0; j <i.length; j++) {
+                    let obj={
+                        fileName:i[j],
+                        uuid:i[j],
+                        url:i[j]
+                    }
+                    this.imageUrl2.push(obj)
+
+                }
+                console.log( this.imageUrl2,111)
+            },
+            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;
+                });
+            },
+        },
+        created() {
+            this.changeImg()
+        },
+    });
+
+
+    function updateType(o) {
+        if(o==1){
+            $("#yys").hide()
+        }else {
+            $("#yys").show()
+            queryStudentData
+        }
+
+    }
 </script>
 <script type="application/javascript">
 

--
Gitblit v1.7.1