From fde0d8d0de95b322b9be6f01e419287ddb400868 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期二, 21 十一月 2023 19:42:04 +0800
Subject: [PATCH] 后台bug修改
---
cloud-server-management/src/main/webapp/WEB-INF/view/system/tCompetitionAudit/TCompetition_edit.html | 29 +++
cloud-server-management/src/main/webapp/WEB-INF/view/system/ticket/ticket_add.html | 14 +
cloud-server-management/src/main/webapp/static/modular/system/tShop/tShopOtherOne.js | 2
cloud-server-management/src/main/webapp/static/modular/system/introduce/introduce.js | 1
cloud-server-management/src/main/webapp/WEB-INF/view/system/tShop/TShop_add_two.html | 10
cloud-server-course/src/main/resources/mapper/TCoursePackageDiscountMapper.xml | 4
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TBodySideAppointmentsController.java | 46 ++----
cloud-server-management/src/main/webapp/WEB-INF/view/system/introduce/introduce_add.html | 3
cloud-server-management/src/main/java/com/dsh/course/feignClient/course/CourseClient.java | 4
cloud-server-management/src/main/webapp/static/modular/system/bodySideAppointment/tBodySideAppointment_edit.js | 38 ++---
cloud-server-management/src/main/webapp/WEB-INF/view/system/tGoods/TGoods_detail_two.html | 2
cloud-server-management/src/main/webapp/static/modular/system/tGoodsAudit/tGoods.js | 11
cloud-server-management/src/main/webapp/static/modular/system/cpPayment/cpPayment_info.js | 5
cloud-server-course/src/main/java/com/dsh/course/entity/CourseCounsum.java | 2
cloud-server-management/src/main/webapp/WEB-INF/view/system/tDiscount/TDiscount.html | 4
cloud-server-management/src/main/webapp/static/modular/system/tIntegral/tIntegral.js | 9 +
cloud-server-management/src/main/webapp/static/modular/system/tGoods/tGoods_info.js | 13 +
cloud-server-management/src/main/webapp/static/modular/system/introduce/introduce_info.js | 8 +
cloud-server-management/src/main/webapp/static/modular/system/bodySideAppointment/tBodySideAppointment.js | 34 ++--
cloud-server-management/src/main/webapp/WEB-INF/view/system/bodySideAppointment/TBodySideAppointment_edit.html | 6
cloud-server-activity/src/main/java/com/dsh/activity/controller/CouponController.java | 2
cloud-server-management/src/main/webapp/static/modular/system/appUser/tAppUser.js | 1
cloud-server-management/src/main/webapp/WEB-INF/view/system/bodySideAppointment/TBodySideAppointment_add.html | 10
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TDiscountController.java | 55 +++++++
cloud-server-activity/src/main/java/com/dsh/activity/controller/IntroduceRewardsController.java | 18 ++
cloud-server-management/src/main/webapp/WEB-INF/view/system/tShop/TShop_edit_two.html | 13 +
cloud-server-course/src/main/java/com/dsh/course/controller/CourseController.java | 11 +
cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackageDiscountServiceImpl.java | 4
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TGoodsController.java | 30 +++
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TIntroductionCourtesyController.java | 1
cloud-server-management/src/main/webapp/WEB-INF/view/system/tDiscount/coursePackageDiscount.html | 7
cloud-server-management/src/main/webapp/static/modular/system/benefits/tBenefitsVideos_add.js | 17 +
32 files changed, 276 insertions(+), 138 deletions(-)
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/controller/CouponController.java b/cloud-server-activity/src/main/java/com/dsh/activity/controller/CouponController.java
index 4d0e203..8958ca7 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/controller/CouponController.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/controller/CouponController.java
@@ -652,7 +652,7 @@
}
if (dataVo.getUserType() == 3){
coupon.setPublisherType(3);
- coupon.setAuditStatus(2);
+ coupon.setAuditStatus(1);
coupon.setCityManagerId(dataVo.getCityManagerId());
}
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/controller/IntroduceRewardsController.java b/cloud-server-activity/src/main/java/com/dsh/activity/controller/IntroduceRewardsController.java
index 8bb9b84..808d160 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/controller/IntroduceRewardsController.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/controller/IntroduceRewardsController.java
@@ -84,7 +84,25 @@
@RequestMapping("/base/introduce/addIntroduce")
public Object addIntroduce(@RequestBody IntroduceRewards introduceRewards){
+
if (introduceRewards.getId()!=null){
+ IntroduceRewards byId = idrService.getById(introduceRewards.getId());
+ // 判断当前活动有没有开始 如果开始了不能编辑赠送课时数 不能编辑活动开始时间
+ Date endTime = byId.getEndTime();
+ Date startTime = byId.getStartTime();
+ Date local = new Date();
+ if (startTime.before(local)&&endTime.after(local)){
+ // 证明当前活动已开始
+ // 判断有没有修改开始时间
+ if (!introduceRewards.getStartTime().equals(byId.getStartTime())){
+ // 表示不能修改开始时间
+ return 5002;
+ }
+ if (!introduceRewards.getGiveClass().equals(byId.getGiveClass())){
+ // 表示不能修改赠送课时数
+ return 5001;
+ }
+ }
return idrService.updateById(introduceRewards);
}else {
introduceRewards.setInsertTime(new Date());
diff --git a/cloud-server-course/src/main/java/com/dsh/course/controller/CourseController.java b/cloud-server-course/src/main/java/com/dsh/course/controller/CourseController.java
index 0b64bf6..aca0e77 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/controller/CourseController.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/controller/CourseController.java
@@ -59,6 +59,8 @@
@Autowired
private TCoursePackageDiscountService discountService;
+ @Autowired
+ private ICoursePackagePaymentConfigService coursePackagePaymentConfigService;
/**
* 上/下架 1为上架 2为下架 3为删除
@@ -451,7 +453,14 @@
return strings;
}
-
+ // 获取课包商品的价格配置
+ @PostMapping("/course/getHoursByPackageId")
+ @ResponseBody
+ public List<CoursePackagePaymentConfig> getHoursByPackageId(@RequestBody Integer coursePackageId1){
+ List<CoursePackagePaymentConfig> coursePackageId = coursePackagePaymentConfigService.list(new QueryWrapper<CoursePackagePaymentConfig>()
+ .eq("coursePackageId", coursePackageId1));
+ return coursePackageId;
+ }
@PostMapping("/course/getHours")
public List<Integer> getHours(@RequestBody Integer coursePackageId1){
return coursePackageService.getHours(coursePackageId1);
diff --git a/cloud-server-course/src/main/java/com/dsh/course/entity/CourseCounsum.java b/cloud-server-course/src/main/java/com/dsh/course/entity/CourseCounsum.java
index 1e91012..c20c92e 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/entity/CourseCounsum.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/entity/CourseCounsum.java
@@ -27,4 +27,6 @@
@TableField("insertTime")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone = "GMT+8")
Date insertTime;
+ @TableField("appUserId")
+ Integer appUserId;
}
diff --git a/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackageDiscountServiceImpl.java b/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackageDiscountServiceImpl.java
index 7f5a7bf..525eb9b 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackageDiscountServiceImpl.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackageDiscountServiceImpl.java
@@ -514,7 +514,9 @@
ids.add(-1);
queryDiscountList.setIds(ids);
}
- List<DiscountList> discountLists = this.baseMapper.queryDiscountList(discountListPage, queryDiscountList.getPCode(), queryDiscountList.getCCode(), queryDiscountList.getName(), queryDiscountList.getType(), queryDiscountList.getIds());
+ List<DiscountList> discountLists = this.baseMapper.queryDiscountList(discountListPage,
+ queryDiscountList.getPCode(), queryDiscountList.getCCode(),
+ queryDiscountList.getName(), queryDiscountList.getType(), queryDiscountList.getIds());
for (DiscountList discountList : discountLists) {
List<TCoursePackageDiscount> tCoursePackageDiscounts = this.baseMapper.selectList
(new LambdaQueryWrapper<TCoursePackageDiscount>()
diff --git a/cloud-server-course/src/main/resources/mapper/TCoursePackageDiscountMapper.xml b/cloud-server-course/src/main/resources/mapper/TCoursePackageDiscountMapper.xml
index ab53ac6..77ad1ff 100644
--- a/cloud-server-course/src/main/resources/mapper/TCoursePackageDiscountMapper.xml
+++ b/cloud-server-course/src/main/resources/mapper/TCoursePackageDiscountMapper.xml
@@ -16,7 +16,9 @@
</resultMap>
<select id="queryDiscountList" resultType="com.dsh.course.model.DiscountList">
- select t1.id,t1.type,t1.status,t2.province pName,t2.city cName,t2.name,t2.storeId,t2.id courseId from t_course_package_discount t1 left join t_course_package t2 on t1.coursePackageId = t2.id
+ select t1.id,t1.type,t1.status,t2.province pName,t2.city cName,t2.name,t2.storeId,t2.id courseId
+ from t_course_package_discount t1
+ left join t_course_package t2 on t1.coursePackageId = t2.id
where t2.storeId in <foreach collection="ids" close=")" item="id" open="(" separator=",">
#{id}
</foreach>
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/course/CourseClient.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/course/CourseClient.java
index 72e3f95..7510648 100644
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/course/CourseClient.java
+++ b/cloud-server-management/src/main/java/com/dsh/course/feignClient/course/CourseClient.java
@@ -23,7 +23,9 @@
*/
@FeignClient("mb-cloud-course")
public interface CourseClient {
-
+ // 获取课包商品的价格配置
+ @PostMapping("/course/getHoursByPackageId")
+ List<CoursePackagePaymentConfig> getHoursByPackageId(@RequestBody Integer coursePackageId1);
/**
* 上/下架 1为上架 2为下架 3为删除
*
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TBodySideAppointmentsController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TBodySideAppointmentsController.java
index 51a7edb..0ca9cfb 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TBodySideAppointmentsController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TBodySideAppointmentsController.java
@@ -1,6 +1,8 @@
package com.dsh.guns.modular.system.controller.code;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.dsh.course.feignClient.account.CityManagerClient;
import com.dsh.course.feignClient.account.StoreStaffClient;
import com.dsh.course.feignClient.account.model.CityManager;
@@ -14,7 +16,9 @@
import com.dsh.guns.config.UserExt;
import com.dsh.guns.modular.system.model.CoachQuery;
import com.dsh.guns.modular.system.model.Store;
+import com.dsh.guns.modular.system.model.TCity;
import com.dsh.guns.modular.system.model.TStore;
+import com.dsh.guns.modular.system.service.ICityService;
import com.dsh.guns.modular.system.service.IStoreService;
import com.dsh.guns.modular.system.util.ResultUtil;
import org.springframework.beans.factory.annotation.Autowired;
@@ -42,6 +46,8 @@
private CityManagerClient cityManagerClient;
@Autowired
private StoreStaffClient storeStaffClient;
+ @Autowired
+ private ICityService cityService;
/**
* 跳转体测预约管理首页
*/
@@ -55,22 +61,15 @@
@RequestMapping("/add")
public String add(Model model) {
Integer roleType = UserExt.getUser().getObjectType();
- List<CityManager> province = cityManagerClient.listAll();
- Set<String> seenNames = new HashSet<>();
- List<CityManager> result = new ArrayList<>();
- for (CityManager cityManager : province) {
- if(!seenNames.contains(cityManager.getProvince())){
- result.add(cityManager);
- seenNames.add(cityManager.getProvince());
- }
- }
+ List<TCity> list = cityService.list(new LambdaQueryWrapper<TCity>().eq(TCity::getParentId, 0));
+ model.addAttribute("list",list);
if (roleType == 2){
Integer cityManagerId = UserExt.getUser().getObjectId();
CityManager cityManager = cityManagerClient.queryCityManagerById(cityManagerId);
List<Store> stores = storeClient.getStoreByCityManagerId(cityManagerId);
model.addAttribute("stores",stores);
}
- model.addAttribute("list",result);
+ model.addAttribute("list",list);
model.addAttribute("roleType",roleType);
return PREFIX + "TBodySideAppointment_add.html";
@@ -84,30 +83,13 @@
Integer objectId = UserExt.getUser().getObjectId();
BodySideAppointment data = bodySideAppointmentClient.getInfoById(id);
if (roleType == 1){
- List<CityManager> cityManagers = cityManagerClient.listAll();
- List<CityManager> province = new ArrayList<>();
- List<CityManager> city = new ArrayList<>();
- Set<String> seenNames = new HashSet<>();
- Set<String> c = new HashSet<>();
- // 省列表
- List<CityManager> result = new ArrayList<>();
- // 市列表
- List<CityManager> cities = new ArrayList<>();
- // 对省/市去重
- for (CityManager cityManager : cityManagers) {
- if(!seenNames.contains(cityManager.getProvince())){
- result.add(cityManager);
- seenNames.add(cityManager.getProvince());
- }
- if(!c.contains(cityManager.getProvince())){
- cities.add(cityManager);
- c.add(cityManager.getProvince());
- }
- }
+ List<TCity> list = cityService.list(new LambdaQueryWrapper<TCity>().eq(TCity::getParentId, 0));
+ TCity province1 = cityService.getOne(new QueryWrapper<TCity>().eq("name", data.getProvince()));
+ List<TCity> city = cityService.list(new LambdaQueryWrapper<TCity>().eq(TCity::getParentId, province1.getId()));
+ model.addAttribute("list",list);
List<Store> stores = storeClient.getStore(data.getCity());
model.addAttribute("stores",stores);
- model.addAttribute("list",result);
- model.addAttribute("cities",cities);
+ model.addAttribute("cities",city);
}else if (roleType == 2){
List<Store> stores = storeClient.getStoreByCityManagerId(objectId);
model.addAttribute("stores",stores);
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TDiscountController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TDiscountController.java
index e0d855b..bf025a0 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TDiscountController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TDiscountController.java
@@ -147,6 +147,9 @@
model.addAttribute("item", tCoursePackage);
List<CoursePackagePaymentConfig> list4 = coursePackagePaymentConfigClient.queryCoursePackagePaymentConfigList(id);
List<Map<String, Object>> list = new ArrayList<>();
+ // 拒绝理由
+ StringBuilder reasons = new StringBuilder("");
+ int a =0;
for (CoursePackagePaymentConfig coursePackagePaymentConfig : list4) {
if(coursePackagePaymentConfig.getCashPayment() == 0){
continue;
@@ -163,13 +166,58 @@
}
map.put("payment", payment);
map.put("cashPayment", coursePackagePaymentConfig.getCashPayment());
+
List<TCoursePackageDiscount> tCoursePackageDiscounts = coursePackageDiscountClient.queryCoursePackageDiscount(coursePackagePaymentConfig.getId());
+ for (TCoursePackageDiscount tCoursePackageDiscount : tCoursePackageDiscounts) {
+ if (tCoursePackageDiscount.getAuditStatus()==3){
+ a = 3;
+ model.addAttribute("type1",3);
+ break;
+ }else if (tCoursePackageDiscount.getAuditStatus()==2){
+ a=2;
+ model.addAttribute("type1",-1);
+ }else{
+ a=1;
+ model.addAttribute("type1",-1);
+ break;
+ }
+ }
+ for (TCoursePackageDiscount tCoursePackageDiscount : tCoursePackageDiscounts) {
+ if (tCoursePackageDiscount.getAuditStatus()==3){
+ reasons.append(tCoursePackageDiscount.getAuditRemark()+",");
+ }
+ }
map.put("coursePackageDiscount", tCoursePackageDiscounts);
list.add(map);
}
model.addAttribute("role",UserExt.getUser().getObjectType());
- model.addAttribute("type",tCoursePackage.getType());
+ Integer type1 = tCoursePackage.getType();
+ // 审核状态
+ StringBuilder stringBuilder = new StringBuilder("");
+
+ switch (a){
+ case 1:
+ stringBuilder.append("待审核");
+ break;
+ case 2:
+ stringBuilder.append("已通过");
+ break;
+ case 3:
+ stringBuilder.append("未通过");
+ break;
+ }
+ model.addAttribute("type",stringBuilder);
+
+ String string = reasons.toString();
+ if (!string.equals("")){
+ int index = string.indexOf(",");
+ String result = string.substring(0, index);
+ model.addAttribute("reasons", result);
+ }else{
+ model.addAttribute("reasons", "");
+ }
model.addAttribute("coursePackagePaymentConfig", JSON.toJSONString(list));
+ model.addAttribute("type2",tCoursePackage.getType());
return PREFIX + "coursePackageDiscount.html";
}
@RequestMapping("/infoOne")
@@ -241,8 +289,9 @@
String string = reasons.toString();
if (!string.equals("")){
- String substring = string.substring(0, string.length() - 1);
- model.addAttribute("reasons", substring);
+ int index = string.indexOf(",");
+ String result = string.substring(0, index);
+ model.addAttribute("reasons", result);
}else{
model.addAttribute("reasons", "");
}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TGoodsController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TGoodsController.java
index 86ed776..ac14fe1 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TGoodsController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TGoodsController.java
@@ -14,6 +14,9 @@
import com.dsh.course.feignClient.activity.PointMercharsClient;
import com.dsh.course.feignClient.activity.model.*;
import com.dsh.course.feignClient.course.CourseClient;
+import com.dsh.course.feignClient.course.CoursePackageClient;
+import com.dsh.course.feignClient.course.model.CoursePackagePaymentConfig;
+import com.dsh.course.feignClient.course.model.TCoursePackage;
import com.dsh.guns.config.UserExt;
import com.dsh.guns.core.base.controller.BaseController;
import com.dsh.guns.core.base.tips.ErrorTip;
@@ -73,6 +76,8 @@
@Autowired
private CourseClient courseClient;
+ @Autowired
+ private CoursePackageClient coursePackageClient;
@Resource
private PointMercharsClient pointMercharsClient;
@@ -138,10 +143,10 @@
Integer coursePackageId = pointMercharsVo.getCoursePackageId();
List<String> name = courseClient.queryPackageById(coursePackageId);
Integer coursePackageId1 = pointMercharsVo.getCoursePackageId();
- List<Integer> classHours = courseClient.getHours(coursePackageId1);
+ List<CoursePackagePaymentConfig> hoursByPackageId = courseClient.getHoursByPackageId(coursePackageId1);
model.addAttribute("typeName",name.get(0));
model.addAttribute("pageName",name.get(1));
- model.addAttribute("classHours",classHours);
+ model.addAttribute("classHours",hoursByPackageId);
String productImages = pointMercharsVo.getProductImages();
ArrayList<String> strings = new ArrayList<>();
for (String s : productImages.split(",")) {
@@ -446,6 +451,24 @@
Double price,Integer type,Integer integral,Double cash,String cover,String imgOne,Integer userPopulation,Integer quantityIssued,Integer pickUpQuantity,
String startTime,String text,Integer sort,String name,Integer useScope,String cityIds,String storeIds,Integer cardType
) throws ParseException {
+ // 判断当前选择的课包 是不是假期课 然后判断选择的有效期是否在假期课有效期内
+ TCoursePackage tCoursePackage = coursePackageClient.queryById(coursePackageId);
+ if (tCoursePackage.getType()==2){
+ // 如果是假期课 获取到当前课包的开始时间和结束时间
+ Date endTime = tCoursePackage.getEndTime();
+ Date startTime1 = tCoursePackage.getStartTime();
+ SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
+ Date s = format.parse(startTime.split(" - ")[0]);
+ Date e = format.parse(startTime.split(" - ")[1]);
+ if (s.before(startTime1)){
+ // 有效期开始时间小于假期课开始时间
+ return 5009;
+ }
+ if (e.after(endTime)){
+ // 有效期结束时间大于假期课结束时间
+ return 5008;
+ }
+ }
PointsMerchandise pointsMerchandise = new PointsMerchandise();
pointsMerchandise.setType(typeAll);
pointsMerchandise.setName(name);
@@ -531,9 +554,6 @@
}else if(useScope==1){
Integer id = pointMercharsClient.add(pointsMerchandise);
}
-
-
-
}else {
// ?
pointsMerchandise.setShelves(storeId);
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TIntroductionCourtesyController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TIntroductionCourtesyController.java
index 71c744f..2db795a 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TIntroductionCourtesyController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TIntroductionCourtesyController.java
@@ -130,6 +130,7 @@
@RequestMapping("/addIntroduce")
@ResponseBody
public Object addAppUser(@RequestBody IntroduceRewards introduceRewards){
+
return introduceClient.addIntroduce(introduceRewards);
}
}
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/bodySideAppointment/TBodySideAppointment_add.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/bodySideAppointment/TBodySideAppointment_add.html
index 0c24cf2..42c7b23 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/bodySideAppointment/TBodySideAppointment_add.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/bodySideAppointment/TBodySideAppointment_add.html
@@ -45,20 +45,20 @@
<div class="form-group" id="provinceCode">
<label class="col-sm-3 control-label">*所在省：</label>
<div class="col-sm-9">
- <select style="width: 300px" class="form-control" id="pCode" name="pCode" onchange="TQuestion.oneChange()">
+ <select style="width: 300px" class="form-control" id="pCode" name="pCode" onchange="TQuestion.oneChange(this)">
<option value="">请选择省</option>
@for(obj in list){
- <option style="width: 300px" value="${obj.provinceCode}">${obj.province}</option>
+ <option style="width: 300px" value="${obj.code}">${obj.name}</option>
@}
</select>
</div>
</div>
- <div class="form-group" id="cityCode">
+ <div class="form-group">
<label class="col-sm-3 control-label">*所在市：</label>
<div class="col-sm-9">
- <select style="width: 300px" class="form-control" id="cCode" name="cCode" onchange="TQuestion.oneChangeNext(this)">
- <option value="">请选择市</option>
+ <select style="width: 300px" class="form-control" id="cCode" name="pCode" onchange="TQuestion.oneChangeNext(this)" >
+ <option value="">请选择省</option>
</select>
</div>
</div>
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/bodySideAppointment/TBodySideAppointment_edit.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/bodySideAppointment/TBodySideAppointment_edit.html
index ef5c817..2ad9010 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/bodySideAppointment/TBodySideAppointment_edit.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/bodySideAppointment/TBodySideAppointment_edit.html
@@ -46,9 +46,9 @@
<div class="form-group" id="provinceCode">
<label class="col-sm-3 control-label">*所在省：</label>
<div class="col-sm-9">
- <select style="width: 300px" class="form-control" id="pCode" name="pCode" onchange="TQuestion.oneChange()">
+ <select style="width: 300px" class="form-control" id="pCode" name="pCode" onchange="TQuestion.oneChange(this)">
@for(obj in list){
- <option value="${obj.provinceCode}" ${obj.province == data.province ? 'selected=selected' : ''}>${obj.province}</option>
+ <option value="${obj.code}" ${obj.name == data.province ? 'selected=selected' : ''}>${obj.name}</option>
@}
</select>
</div>
@@ -59,7 +59,7 @@
<div class="col-sm-9">
<select style="width: 300px" class="form-control" id="cCode" name="cCode" onchange="TQuestion.oneChangeNext(this)">
@for(obj in cities){
- <option value="${obj.cityCode}" ${obj.city == data.city ? 'selected=selected' : ''}>${obj.city}</option>
+ <option value="${obj.code}" ${obj.name == data.city ? 'selected=selected' : ''}>${obj.name}</option>
@}
</select>
</div>
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/introduce/introduce_add.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/introduce/introduce_add.html
index cfcc2bc..f921231 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/introduce/introduce_add.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/introduce/introduce_add.html
@@ -53,11 +53,10 @@
</div>
<div class="form-group">
- <label class="col-sm-3 control-label">*所在省：</label>
+ <label class="col-sm-3 control-label">*所在市：</label>
<div class="col-sm-9">
<select style="width: 300px" class="form-control" id="cCode" name="pCode" >
<option value="">请选择省</option>
-
</select>
</div>
</div>
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tCompetitionAudit/TCompetition_edit.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tCompetitionAudit/TCompetition_edit.html
index d23468f..d7566ff 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tCompetitionAudit/TCompetition_edit.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tCompetitionAudit/TCompetition_edit.html
@@ -225,17 +225,40 @@
}
}
- if($("#q1").val()>0 && $("#type").val()==2){
+ if(Number($("#q1").val())>0){
$("#payType1").show();
$("input[id='t1']").attr("checked", "checked")
+ }else{
+ console.log("看看现金")
+ console.log($("#q1").val());
+ $("#payType1").hide();
+ var checkbox = document.getElementById("t1");
+ // 取消选中
+ checkbox.checked = false;
}
- if($("#q2").val()>0 && $("#type").val()==2){
+
+ if(Number($("#q2").val())>0 ){
+
$("#payType2").show();
$("input[id='t2']").attr("checked", "checked")
+ }else{
+ console.log("看看玩湃比")
+ console.log($("#q2").val());
+ $("#payType2").hide();
+ var checkbox = document.getElementById("t2");
+ // 取消选中
+ checkbox.checked = false;
}
- if($("#q3").val()>0 && $("#type").val()==2){
+ if(Number($("#q3").val())>0 ){
$("#payType3").show();
$("input[id='t3']").attr("checked", "checked")
+ }else{
+ console.log("看看课时")
+ console.log($("#q3").val());
+ var checkbox = document.getElementById("t3");
+ // 取消选中
+ checkbox.checked = false;
+ $("#payType3").hide();
}
}
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tDiscount/TDiscount.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tDiscount/TDiscount.html
index 2ee274a..6c12ba4 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tDiscount/TDiscount.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tDiscount/TDiscount.html
@@ -58,11 +58,11 @@
</div>
</div>
<div class="hidden-xs" id="TCompetitionTableToolbar" role="group">
+ @if(role != 3){
<#button name="上架" icon="fa-plus" clickFun="TCompetition.updateState(1)"/>
<#button name="下架" icon="fa-edit" clickFun="TCompetition.updateState(2)" space="true"/>
- @if(role == 1){
- <#button name="查看详情" icon="fa-remove" clickFun="TCompetition.info()" space="true"/>
@}
+ <#button name="查看详情" icon="fa-remove" clickFun="TCompetition.info()" space="true"/>
</div>
<#table id="TCompetitionTable"/>
</div>
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tDiscount/coursePackageDiscount.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tDiscount/coursePackageDiscount.html
index 3b9b198..09007cd 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tDiscount/coursePackageDiscount.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tDiscount/coursePackageDiscount.html
@@ -17,13 +17,13 @@
</div>
</div>
</div>
- @if(type==3){
+ @if(type1==3){
<div class="form-group">
<div class="col-sm-2"></div>
<div class="col-sm-10">
<label class="col-sm-2 control-label">拒绝理由：</label>
<div class="col-sm-4" style="margin-top: 6px;">
- <span>拒绝理由:</span>
+ <span>${reasons}</span>
</div>
</div>
</div>
@@ -96,7 +96,8 @@
</div>
<div class="row btn-group-m-t">
<div class="col-sm-10">
- <#button btnCss="danger" name="关闭" id="cancel" icon="fa-eraser" clickFun="TCarInfoDlg.close()"/>
+ <#button btnCss="danger" name="关闭"
+ id="cancel" icon="fa-eraser" clickFun="TCarInfoDlg.close()"/>
</div>
</div>
</div>
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tGoods/TGoods_detail_two.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tGoods/TGoods_detail_two.html
index 6e88a0f..515ba13 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tGoods/TGoods_detail_two.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tGoods/TGoods_detail_two.html
@@ -93,7 +93,7 @@
<div class="col-sm-9">
<select class="form-control" id="coursePackageConfigId" name="coursePackageConfigId">
@for(obj in classHours){
- <option value="">${obj}</option>
+ <option value="" ${obj.id == item.coursePackageConfigId ? 'selected=selected' : ''}>${obj.classHours}</option>
@}
</select>
</div>
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tShop/TShop_add_two.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tShop/TShop_add_two.html
index 3502038..f779cda 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tShop/TShop_add_two.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tShop/TShop_add_two.html
@@ -81,7 +81,6 @@
function updateT(e) {
var oneId = $('#type option:selected').text();
-
console.log(oneId);
if (oneId!="详情"&&oneId!="指定商品"&&oneId!="指定折扣"){
$("#t3").hide()
@@ -107,15 +106,18 @@
$("#t1").val("")
$("#t2").val("")
$("#t3").val("")
+ $("#type").val("")
+ $("#page").val("")
}else {
$("#t1").show()
$("#t2").show()
$("#t3").show()
-
+ $("#type").val("")
+ $("#page").val("")
var oneId=$(e).val();
var ajax = new $ax(Feng.ctxPath + "/tShop/typeChange", function(data){
if(data!=null){
- var content;
+ var content= "<option value=''>请选择</option>";
$.each(data, function(k,v) {
content += "<option value='"+v.id+"'>"+v.name+"</option>";
});
@@ -137,7 +139,7 @@
if(data!=null&&data.length>0){
$("#t2").show()
- var content1;
+ var content1= "<option value=''>请选择</option>";
$.each(data, function(k,v) {
content1 += "<option value='"+v.id+"'>"+v.name+"</option>";
});
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tShop/TShop_edit_two.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tShop/TShop_edit_two.html
index 8fb9ad7..06a524b 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tShop/TShop_edit_two.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tShop/TShop_edit_two.html
@@ -82,10 +82,7 @@
});
- document.addEventListener('DOMContentLoaded', function() {
- var selectElement = document.getElementById('page');
- selectElement.onchange();
- });
+
function updateType(e) {
let name = $("#name").val()
@@ -98,11 +95,16 @@
$("#t1").val("")
$("#t2").val("")
$("#t3").val("")
+ $("#type").val("")
+ $("#page").val("")
}else {
$("#t1").show()
$("#t2").show()
$("#t3").show()
+ $("#type").val("")
+ $("#page").val("")
+ console.log("页面")
var oneId=$(e).val();
var ajax = new $ax(Feng.ctxPath + "/tShop/typeChange", function(data){
if(data!=null){
@@ -140,6 +142,7 @@
}
function updateOne(e) {
+ console.log("类型")
var oneId=$(e).val();
var ajax = new $ax(Feng.ctxPath + "/tShop/typeChangeOne", function(data){
if(data!=null&&data.length>0){
@@ -153,8 +156,6 @@
console.log("=-======0000")
$("#t2").hide()
$("#t2").val("")
-
-
}
});
if (oneId==2 || oneId==25|| oneId==27){
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/ticket/ticket_add.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/ticket/ticket_add.html
index b53f6dc..84a4b05 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/ticket/ticket_add.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/ticket/ticket_add.html
@@ -68,14 +68,14 @@
<div class="form-group" id="y1" hidden>
<label class="col-sm-3 control-label">所需现金：</label>
<div class="col-sm-9">
- <input class="form-control" id="cash" name="cash" type="number">
+ <input class="form-control" id="cash" name="cash" oninput="validateNumber(this)" type="text">
</div>
</div>
<div class="form-group" id="y2">
<label class="col-sm-3 control-label">所需积分：</label>
<div class="col-sm-9">
- <input class="form-control" id="integral" name="integral" type="number">
+ <input class="form-control" id="integral" name="integral" type="number">
</div>
</div>
@@ -281,7 +281,17 @@
}
}
+ function validateNumber(input) {
+// 获取输入的值
+ var value = input.value;
+ // 使用正则表达式匹配数字和最多两位小数
+ var regex = /^\d*\.?\d{0,2}/;
+ var match = value.match(regex);
+
+ // 更新输入框的值为匹配的结果（最多两位小数）
+ input.value = match
+ }
function changeCity(n){
diff --git a/cloud-server-management/src/main/webapp/static/modular/system/appUser/tAppUser.js b/cloud-server-management/src/main/webapp/static/modular/system/appUser/tAppUser.js
index f4b07fe..89aaa36 100644
--- a/cloud-server-management/src/main/webapp/static/modular/system/appUser/tAppUser.js
+++ b/cloud-server-management/src/main/webapp/static/modular/system/appUser/tAppUser.js
@@ -362,6 +362,7 @@
Feng.error("当前手机号 已被注册")
}else{
window.parent.TQuestion.table.refresh();
+ layer.closeAll('page');
TQuestion.close();
Feng.success("添加成功");
}
diff --git a/cloud-server-management/src/main/webapp/static/modular/system/benefits/tBenefitsVideos_add.js b/cloud-server-management/src/main/webapp/static/modular/system/benefits/tBenefitsVideos_add.js
index b14c0d4..aacd91f 100644
--- a/cloud-server-management/src/main/webapp/static/modular/system/benefits/tBenefitsVideos_add.js
+++ b/cloud-server-management/src/main/webapp/static/modular/system/benefits/tBenefitsVideos_add.js
@@ -60,13 +60,18 @@
* 选择视频 回显视频封面
* @param e
*/
-TQuestion.oneChange = function (e) {
- var id = $("#name").val();
- var ajax = new $ax(Feng.ctxPath + "/benefits/getCoverDrawing/"+id, function(data){
- document.getElementById('img').src = data.coverDrawing;
- $("#introduce").val(data.introduce);
+TCompetition.oneChange = function (e) {
+ var oneId=$(e).val();
+ var ajax = new $ax(Feng.ctxPath + "/tCompetition/onChange", function(data){
+ if(data!=null){
+ var content='<option value="">选择市</option>';
+ $.each(data, function(k,v) {
+ content += "<option value='"+v.code+"'>"+v.name+"</option>";
+ });
+ $("#cCode").empty().append(content);
+ }
});
- ajax.set("id",id);
+ ajax.set("oneId",oneId);
ajax.start();
};
/**
diff --git a/cloud-server-management/src/main/webapp/static/modular/system/bodySideAppointment/tBodySideAppointment.js b/cloud-server-management/src/main/webapp/static/modular/system/bodySideAppointment/tBodySideAppointment.js
index 5d43574..268dddd 100644
--- a/cloud-server-management/src/main/webapp/static/modular/system/bodySideAppointment/tBodySideAppointment.js
+++ b/cloud-server-management/src/main/webapp/static/modular/system/bodySideAppointment/tBodySideAppointment.js
@@ -47,7 +47,20 @@
TQuestion.dataCount = 0;
TQuestion.phone = "";
TQuestion.phoneId = "";
-
+TQuestion.oneChange = function (e) {
+ var oneId=$(e).val();
+ var ajax = new $ax(Feng.ctxPath + "/tCompetition/onChange", function(data){
+ if(data!=null){
+ var content='<option value="">选择市</option>';
+ $.each(data, function(k,v) {
+ content += "<option value='"+v.code+"'>"+v.name+"</option>";
+ });
+ $("#cCode").empty().append(content);
+ }
+ });
+ ajax.set("oneId",oneId);
+ ajax.start();
+};
/**
* 点击添加
*/
@@ -208,24 +221,7 @@
});
}
};
-TQuestion.oneChange = function () {
- var province = $('#pCode option:selected').text();
- var citySelect = document.getElementById("cCode");
- var ajax = new $ax(Feng.ctxPath + "/tSite/getCity", function(data){
- if(data!=null){
- var content='<option value="">选择市</option>';
- $.each(data, function(k,v) {
- content += "<option value='"+v.cityCode+"'>"+v.city+"</option>";
- });
- $("#cCode").empty().append(content);
- }
- });
- if (province === ""){
- citySelect.innerHTML = '<option value="">请先选择省</option>';
- }
- ajax.set("province",province);
- ajax.start();
-};
+
TQuestion.oneChangeNext = function (e) {
var oneId=$(e).val();
diff --git a/cloud-server-management/src/main/webapp/static/modular/system/bodySideAppointment/tBodySideAppointment_edit.js b/cloud-server-management/src/main/webapp/static/modular/system/bodySideAppointment/tBodySideAppointment_edit.js
index 7e5dc49..7e19457 100644
--- a/cloud-server-management/src/main/webapp/static/modular/system/bodySideAppointment/tBodySideAppointment_edit.js
+++ b/cloud-server-management/src/main/webapp/static/modular/system/bodySideAppointment/tBodySideAppointment_edit.js
@@ -37,6 +37,20 @@
];
};
+TQuestion.oneChange = function (e) {
+ var oneId=$(e).val();
+ var ajax = new $ax(Feng.ctxPath + "/tCompetition/onChange", function(data){
+ if(data!=null){
+ var content='<option value="">选择市</option>';
+ $.each(data, function(k,v) {
+ content += "<option value='"+v.code+"'>"+v.name+"</option>";
+ });
+ $("#cCode").empty().append(content);
+ }
+ });
+ ajax.set("oneId",oneId);
+ ajax.start();
+};
/**
* 检查是否选中
*/
@@ -55,29 +69,7 @@
TQuestion.phone = "";
TQuestion.phoneId = "";
// 选择省 获取对应市区
-TQuestion.oneChange = function () {
- var province = $('#pCode option:selected').text();
- var citySelect = document.getElementById("cCode");
- var storeSelect = document.getElementById("store");
- var ajax = new $ax(Feng.ctxPath + "/tSite/getCity", function(data){
- if(data!=null){
- var content='<option value="">选择市</option>';
- $.each(data, function(k,v) {
- content += "<option value='"+v.cityCode+"'>"+v.city+"</option>";
- });
- $("#cCode").empty().append(content);
- }
- });
- if (province === ""){
- citySelect.innerHTML = '<option value="">请先选择省</option>';
- storeSelect.innerHTML = '<option value="">请先选择省</option>';
- }else{
- citySelect.innerHTML = '<option value="">请选择市</option>';
- storeSelect.innerHTML = '<option value="">请先选择市区</option>';
- }
- ajax.set("province",province);
- ajax.start();
-};
+
// 选择市 获取对应门店
TQuestion.oneChangeNext = function (e) {
diff --git a/cloud-server-management/src/main/webapp/static/modular/system/cpPayment/cpPayment_info.js b/cloud-server-management/src/main/webapp/static/modular/system/cpPayment/cpPayment_info.js
index bf35e44..53fc429 100644
--- a/cloud-server-management/src/main/webapp/static/modular/system/cpPayment/cpPayment_info.js
+++ b/cloud-server-management/src/main/webapp/static/modular/system/cpPayment/cpPayment_info.js
@@ -490,7 +490,7 @@
, yes: function () {
var index = layer.open({
type: 2,
- title:'首页设置',
+ title:'添加用户',
area: ['100%', '100%'], //宽高
fix: false, //不固定
maxmin: true,
@@ -498,6 +498,8 @@
});
layer.closeAll('page');
},
+ btn2:function () {
+ }
});
}else{
province = response.province;
@@ -530,7 +532,6 @@
area: ['100%', '100%'], //宽高
fix: false, //不固定
maxmin: true,
- // todo 写用户管理路径
content: Feng.ctxPath + '/appUser/addStudent/'+appUserId
});
layer.closeAll('page');
diff --git a/cloud-server-management/src/main/webapp/static/modular/system/introduce/introduce.js b/cloud-server-management/src/main/webapp/static/modular/system/introduce/introduce.js
index c58c1d8..c0ae2e4 100644
--- a/cloud-server-management/src/main/webapp/static/modular/system/introduce/introduce.js
+++ b/cloud-server-management/src/main/webapp/static/modular/system/introduce/introduce.js
@@ -231,6 +231,7 @@
Feng.info("只能选择一条进行查看！");
}else {
if (this.check()) {
+
var index = layer.open({
type: 2,
title: '详情',
diff --git a/cloud-server-management/src/main/webapp/static/modular/system/introduce/introduce_info.js b/cloud-server-management/src/main/webapp/static/modular/system/introduce/introduce_info.js
index 7744a5b..54a85b3 100644
--- a/cloud-server-management/src/main/webapp/static/modular/system/introduce/introduce_info.js
+++ b/cloud-server-management/src/main/webapp/static/modular/system/introduce/introduce_info.js
@@ -196,6 +196,14 @@
data: JSON.stringify(data),
contentType: "application/json",
success: function (response) {
+ if (response==5001){
+ Feng.error("当前活动已开始,不能编辑赠送课时数！")
+ return;
+ }
+ if (response==5002){
+ Feng.error("当前活动已开始,不能编辑开始时间！")
+ return;
+ }
window.parent.TCompetition.table.refresh();
TCompetition.close();
Feng.success("修改成功");
diff --git a/cloud-server-management/src/main/webapp/static/modular/system/tGoods/tGoods_info.js b/cloud-server-management/src/main/webapp/static/modular/system/tGoods/tGoods_info.js
index 036ea58..5ceee15 100644
--- a/cloud-server-management/src/main/webapp/static/modular/system/tGoods/tGoods_info.js
+++ b/cloud-server-management/src/main/webapp/static/modular/system/tGoods/tGoods_info.js
@@ -571,9 +571,11 @@
}else if(data=="5003"){
console.log("请选择相同运营商门店")
Feng.info("请选择相同运营商门店");
-
- }else
- if(data.code == 200){
+ }else if (data=="5009"){
+ Feng.info("有效期开始时间不应小于假期课开始时间");
+ }else if (data=="5008"){
+ Feng.info("有效期结束时间不应大于假期课结束时间");
+ } else if(data.code == 200){
if(language==1){
Feng.success("添加成功!");
}else if(language==2){
@@ -615,11 +617,9 @@
}
TGoodsInfoDlg.addSubmit1 = function() {
- console.log("看看进入")
let company = 3;
this.clearData();
this.collectData();
-
var cityIds = [];
var cts = "";
if (company === '2'){
@@ -935,7 +935,6 @@
TGoodsInfoDlg.editor = UE.getEditor('editor');
TGoodsInfoDlg.editor1 = UE.getEditor('editor1');
getProvince(null);
- Feng.initValidator("carInfoForm", TGoodsInfoDlg.validateFields);
var drivingLicensePhoto = new $WebUpload("drivingLicensePhoto");
drivingLicensePhoto.setUploadBarId("progressBar");
drivingLicensePhoto.init();
@@ -1014,6 +1013,8 @@
ajax.set("limit",100);
ajax.start();
}
+
+
TGoodsInfoDlg.timeChange = function (e) {
var oneId=$(e).val();
var ajax = new $ax(Feng.ctxPath + "/tCity/timeChange", function(data){
diff --git a/cloud-server-management/src/main/webapp/static/modular/system/tGoodsAudit/tGoods.js b/cloud-server-management/src/main/webapp/static/modular/system/tGoodsAudit/tGoods.js
index fdbeaef..6bf954a 100644
--- a/cloud-server-management/src/main/webapp/static/modular/system/tGoodsAudit/tGoods.js
+++ b/cloud-server-management/src/main/webapp/static/modular/system/tGoodsAudit/tGoods.js
@@ -128,6 +128,11 @@
*/
TPointProducts.payDetail = function () {
if (this.check()) {
+ var state = TPointProducts.seItem.status;
+ if (state=="3"){
+ Feng.error("当前门票不能再次审核!")
+ return;
+ }
layer.open({
type: 1
, title: '审核'
@@ -156,11 +161,7 @@
, btnAlign: 'c' //按钮居中
, shade: 0.5 //不显示遮罩
, yes: function () {
- var state = TPointProducts.seItem.status;
- if (state=="3"){
- Feng.error("当前门票不能再次审核!")
- return;
- }
+
var OBJradio= $("input[name='type1']:checked").val();
console.log(OBJradio)
let remark = $("#remark").val()
diff --git a/cloud-server-management/src/main/webapp/static/modular/system/tIntegral/tIntegral.js b/cloud-server-management/src/main/webapp/static/modular/system/tIntegral/tIntegral.js
index c0fc2b7..4db5c09 100644
--- a/cloud-server-management/src/main/webapp/static/modular/system/tIntegral/tIntegral.js
+++ b/cloud-server-management/src/main/webapp/static/modular/system/tIntegral/tIntegral.js
@@ -86,6 +86,15 @@
Feng.info("请输入合法手机号")
return ;
}
+ if ($("#phone").val()==""){
+ Feng.error("请输入手机号!")
+ return;
+ }
+ if ($("#number").val()==""){
+ Feng.error("请输入赠送积分!")
+ return;
+ }
+
var ajax = new $ax(Feng.ctxPath + "/tIntegral/add", function(data){
console.log("看看返回")
console.log(data)
diff --git a/cloud-server-management/src/main/webapp/static/modular/system/tShop/tShopOtherOne.js b/cloud-server-management/src/main/webapp/static/modular/system/tShop/tShopOtherOne.js
index 65edfc8..be97dd6 100644
--- a/cloud-server-management/src/main/webapp/static/modular/system/tShop/tShopOtherOne.js
+++ b/cloud-server-management/src/main/webapp/static/modular/system/tShop/tShopOtherOne.js
@@ -694,7 +694,7 @@
let turnId = $("#turnId").val()
- if ($('#type option:selected').text() == "详情"&&$('#type option:selected').text() == "指定商品"&&$('#type option:selected').text() == "指定折扣") {
+ if ($('#type option:selected').text() == "详情"||$('#type option:selected').text() == "指定商品"||$('#type option:selected').text() == "指定折扣") {
if ($("#turnId").val() == '') {
Feng.info("请输入跳转ID")
return;
--
Gitblit v1.7.1