From d69f9a06fb73f9d5efea882a684d217f12e34a4f Mon Sep 17 00:00:00 2001
From: lisy <linlangsur163@163.com>
Date: 星期三, 02 八月 2023 14:22:06 +0800
Subject: [PATCH] 创建省市县实体类+site的mapper实体映射修复
---
cloud-server-management/src/main/webapp/WEB-INF/view/system/tCoupon/TCouponAdd.html | 153 +++++++++++++++++++++++++++------------------------
1 files changed, 81 insertions(+), 72 deletions(-)
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tCoupon/TCouponAdd.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tCoupon/TCouponAdd.html
index 2ab5a09..66652cf 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tCoupon/TCouponAdd.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tCoupon/TCouponAdd.html
@@ -40,58 +40,54 @@
<div class="ibox-content">
<div class="form-horizontal">
<div class="row">
- <div class="col-sm-5">
+ <div class="col-sm-6">
<div class="form-group">
<label class="col-sm-3 control-label">*优惠券名称: </label>
<div class="col-sm-9">
<input class="form-control" id="name" name="name" autocomplete="off" placeholder="请输入优惠券名称">
</div>
</div>
+
</div>
</div>
<div class="row">
- <div class="col-sm-5">
+ <div class="col-sm-6">
<div class="form-group">
- <div class="initialLevel col-sm-12 control-label form-group">
- <label class="col-sm-3 control-label">*优惠券类型: </label>
- <input class="col-sm-1" style="margin-left: 1.7%;width: 13px;height: 13px;"
- name="prescription" onclick="radio1()"
- value="1" type="radio">
- <label class="col-sm-1" style="margin-left: 18px;width: 17%">满减券: 满</label>
- <input type="text" class="col-sm-1" id="conditionalAmount"
- onkeyup="value=value.replace(/\D/g,'')"/>
- <label class="col-sm-1" style="margin-left: -1.5%;width: 14%"> 元 , 减 </label>
- <input type="text" class="col-sm-1" id="deductionAmount"
- onkeyup="value=value.replace(/\D/g,'')"/>
- <label class="col-sm-1" style="margin-left: -1.5%"> 元</label>
- </div>
+ <label class="col-sm-3 control-label">*优惠券类型: </label>
+ <input class="col-sm-1" style="margin-left: 2.7%;width: 13px;height: 13px;"
+ name="prescription" onclick="radio1()"
+ value="1" type="radio">
+ <label class="col-sm-1" style="margin-left: 10px;width: 17%">满减券: 满</label>
+ <input type="text" class="col-sm-1" id="conditionalAmount"
+ onkeyup="value=value.replace(/\D/g,'')"/>
+ <label class="col-sm-1" style="margin-left: -1.5%;width: 14%"> 元 , 减 </label>
+ <input type="text" class="col-sm-1" id="deductionAmount"
+ onkeyup="value=value.replace(/\D/g,'')"/>
+ <label class="col-sm-1" style="margin-left: -1.5%"> 元</label>
</div>
<div class="form-group">
- <div class="initialLevel col-sm-12 control-label form-group">
- <input class="col-sm-1" name="prescription" type="radio" value="2"
- onclick="radio2()"
- style="margin-left: 24.7%;">
- <label class="col-sm-1" style="margin-left: -17px;width: 20%;">代金券: 可抵</label>
- <input class="col-sm-1" id="voucherAmount" onkeyup="value=value.replace(/\D/g,'')"/>
- <label class="col-sm-1">元</label>
- </div>
+ <input class="col-sm-1" name="prescription" type="radio" value="2"
+ onclick="radio2()"
+ style="margin-left: 24.7%;">
+ <label class="col-sm-1" style="margin-left: -17px;width: 20%;">代金券: 可抵</label>
+ <input class="col-sm-1" id="voucherAmount" onkeyup="value=value.replace(/\D/g,'')"/>
+ <label class="col-sm-1">元</label>
</div>
<div class="form-group">
- <div class="initialLevel col-sm-12 control-label form-group">
- <input class="col-sm-1" name="prescription" type="radio" value="3"
- onclick="radio3()"
- style="margin-left: 24.7%;">
- <label class="col-sm-3 control-label" style="margin-left: -1%;width: 14%;margin-top: -5px">体验券: </label>
- <input class="form-control" style="width: 35%" id="experienceName" name="name"
- autocomplete="off" placeholder="请输入体验券名称">
- </div>
+ <input class="col-sm-1" name="prescription" type="radio" value="3"
+ onclick="radio3()"
+ style="margin-left: 24.7%;">
+ <label class="col-sm-1 control-label" style="margin-left: -1%;width: 14%;margin-top: -5px">体验券: </label>
+ <input class="col-sm-1" style="width: 35%" id="experienceName" name="name"
+ autocomplete="off" placeholder="请输入体验券名称">
</div>
+
</div>
</div>
<div class="row">
- <div class="col-sm-5">
+ <div class="col-sm-6">
<div class="form-group">
<label class="col-sm-3 control-label">*优惠券说明: </label>
<div class="col-sm-9">
@@ -99,11 +95,12 @@
placeholder="请输入优惠券说明"></textarea>
</div>
</div>
+
</div>
</div>
<div class="row">
- <div class="col-sm-5">
+ <div class="col-sm-6">
<div class="form-group">
<div class="initialLevel col-sm-12 control-label form-group">
<label class="col-sm-3 control-label">*发放方式: </label>
@@ -118,11 +115,12 @@
<label class="col-sm-1" style="width: 16%;margin-top: 7px">自动发券</label>
</div>
</div>
+
</div>
</div>
<div class="row">
- <div class="col-sm-5">
+ <div class="col-sm-6">
<div class="form-group">
<div class="initialLevel col-sm-12 control-label form-group">
<label class="col-sm-3 control-label">*兑换方式: </label>
@@ -137,11 +135,12 @@
<label class="col-sm-1" style="width: 9%;margin-top: 7px">现金</label>
</div>
</div>
+
</div>
</div>
<div class="row" id="needAmount">
- <div class="col-sm-5">
+ <div class="col-sm-6">
<div class="form-group">
<label class="col-sm-3 control-label">*所需现金</label>
<div class="col-sm-9">
@@ -149,12 +148,12 @@
onkeyup="this.value=this.value.replace(/\D/g,'')">
</div>
</div>
- <div class="hr-line-dashed"></div>
+
</div>
</div>
<div class="row" id="needIntegral">
- <div class="col-sm-5">
+ <div class="col-sm-6">
<div class="form-group">
<label class="col-sm-3 control-label">*所需积分</label>
<div class="col-sm-9">
@@ -162,12 +161,12 @@
onkeyup="this.value=this.value.replace(/\D/g,'')">
</div>
</div>
- <div class="hr-line-dashed"></div>
+
</div>
</div>
<div class="row">
- <div class="col-sm-5">
+ <div class="col-sm-6">
<div class="form-group">
<div class="initialLevel col-sm-12 control-label form-group">
<label class="col-sm-3 control-label">*用户人群: </label>
@@ -182,10 +181,11 @@
<label class="col-sm-1" style="width: 18%;margin-top: 5px">已有学员用户</label>
</div>
</div>
+
</div>
</div>
<div class="row">
- <div class="col-sm-5">
+ <div class="col-sm-6">
<div class="form-group">
<label class="col-sm-3 control-label">*发放数量</label>
<div class="col-sm-9">
@@ -193,12 +193,12 @@
onkeyup="this.value=this.value.replace(/\D/g,'')">
</div>
</div>
- <div class="hr-line-dashed"></div>
+
</div>
</div>
<div class="row">
- <div class="col-sm-5">
+ <div class="col-sm-6">
<div class="form-group">
<label class="col-sm-3 control-label">*限领数量</label>
<div class="col-sm-9">
@@ -206,21 +206,20 @@
onkeyup="this.value=this.value.replace(/\D/g,'')">
</div>
</div>
- <div class="hr-line-dashed"></div>
+
</div>
</div>
- <div class="row" >
- <div class="col-sm-5">
- <div class="form-group">
- <label class="col-sm-3 control-label">*有效期: </label>
- <input type="text" style="width: 30%" class="form-control" id="periodOfValidity" placeholder="请选择"/>
- </div>
+ <div class="row">
+ <div class="col-sm-6">
+ <label class="col-sm-3 control-label">*有效期: </label>
+ <input type="text" style="width: 30%;margin-left: 1%" class="col-sm-3" id="periodOfValidity"
+ placeholder="请选择"/>
</div>
</div>
<div class="row" id="app">
- <div class="col-sm-5">
+ <div class="col-sm-6">
<div class="form-group">
<label class="col-sm-3 control-label">*商品封面: </label>
<div class="col-sm-2">
@@ -235,11 +234,12 @@
</el-upload>
</div>
</div>
+
</div>
</div>
<div class="row" id="app1">
- <div class="col-sm-5" style="width: 100%">
+ <div class="col-sm-6" style="width: 100%">
<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%">
@@ -257,53 +257,61 @@
<img width="100%" :src="imageUrl1" alt="">
</div>
</div>
+
</div>
</div>
<div class="row">
- <div class="col-sm-5">
+ <div class="col-sm-6">
<div class="form-group">
<div class="initialLevel col-sm-12 control-label form-group">
<label class="col-sm-3 control-label">*适用范围: </label>
<input class="col-sm-1 control-label" onclick="scopeOfApplication1()" name="company" type="radio"
- value="0" style="margin-top: 10px"/>
+ value="0" checked style="margin-top: 10px"/>
<label class="col-sm-1" style="margin-left: -15px;width: 16%;margin-top: 7px">全国通用</label>
<input class="col-sm-1 control-label" name="company" onclick="scopeOfApplication2()" type="radio"
- value="1" checked style="margin-left: 5%;margin-top: 10px;width: 13px;height: 13px"/>
+ value="1" style="margin-left: 5%;margin-top: 10px;width: 13px;height: 13px"/>
<label class="col-sm-1" style="width: 16%;margin-top: 7px">指定城市</label>
<input class="col-sm-1 control-label" name="company" onclick="scopeOfApplication3()" type="radio"
- value="1" checked style="margin-left: 4%;margin-top: 10px;width: 13px;height: 13px"/>
+ value="1" style="margin-left: 4%;margin-top: 10px;width: 13px;height: 13px"/>
<label class="col-sm-1" style="width: 16%;margin-top: -16px;margin-left: 8%">指定门店</label>
</div>
</div>
+
</div>
</div>
- <div class="row" id="citySelect">
- <div class="col-sm-5">
+ <div class="row" id="citySelect" hidden="hidden">
+ <div class="col-sm-6">
<div class="form-group">
<label class="col-sm-3 control-label">*指定城市: </label>
- <select id="province" onchange="changeCity()"></select>
- <label class="col-sm-1" style="width: 16%;margin-top: 7px">省</label>
- <select id="city"></select>
- <label class="col-sm-1" style="width: 16%;margin-top: 7px">市</label>
- <select id="County"></select>
- <div class="col-sm-1">
- <label name="addBranch" class="form-control" onclick="couponInfoDlg.addBranch()" style="border: 0px;cursor: pointer"><i class="fa fa-plus-circle"></i></label>
- <label name="addBranch" class="form-control" onclick="couponInfoDlg.delete()" style="border: 0px;cursor: pointer"><i class="fa fa-trash"></i></label>
+ <div class="col-sm-9 control-label">
+ <select class="col-sm-1" id="provinceData" style="margin-top: 1%;width: 25%" onchange="changeCity(null)">
+ <option value="">请选择</option>
+ </select>
+ <label class="col-sm-1" style="width: 9%;margin-top: 7px">省</label>
+ <select class="col-sm-1" style="margin-top: 1%;width: 25%" id="cityData">
+ <option value="">请选择</option>
+ </select>
+ <label class="col-sm-1" style="width: 7%;margin-top: 7px">市</label>
+ <label name="addBranch" class="col-sm-1" onclick="couponInfoDlg.addBranch()" style="border: 0px;cursor: pointer;margin-top: 1%"><i class="fa fa-plus-circle"></i></label>
</div>
+ <div id="cityDemo"></div>
</div>
+
</div>
</div>
- <div class="row" id="storeSelect">
- <div class="col-sm-5">
+ <div class="row" id="storeSelect" hidden="hidden">
+ <div class="col-sm-6">
<div class="form-group">
- <label class="col-sm-3 control-label">*指定门店: </label>
- <button onclick="couponInfoDlg.employeeSelection()"
- style="height: 22px;margin-left: -165px;width: 82px;background-color: #4a8ff1;color: white;z-index: 15;position:relative;border: none">
- 选择门店
- </button>
+ <div class="col-sm-12">
+ <label class="col-sm-3 control-label">*指定门店: </label>
+ <button onclick="storeList()"
+ style="height: 22px;width: 82px;background-color: #4a8ff1;color: white;z-index: 15;position:relative;border: none;margin-top: 1%">
+ 选择门店
+ </button>
+ </div>
<div class="col-sm-12" style="margin-left: -57px;margin-top: 20px">
<table class="table table-bordered" style="width: 70%;margin-left: 228px;" id="storeTable">
<thead>
@@ -318,6 +326,7 @@
</table>
</div>
</div>
+
</div>
</div>
--
Gitblit v1.7.1