From 81932e21cb584b992bdbde80df84eb81f77073d0 Mon Sep 17 00:00:00 2001 From: lisy <linlangsur163@163.com> Date: 星期四, 27 七月 2023 11:36:18 +0800 Subject: [PATCH] 管理后台的优惠券管理的角色模块修复 --- cloud-server-management/src/main/webapp/static/modular/system/tServerCarmodel/acrossCity.js | 2 cloud-server-management/src/main/webapp/static/modular/system/tSysSensitiveWords/tSysSensitiveWords.js | 2 cloud-server-management/src/main/webapp/static/js/plugins/bootstrap-table/locale/bootstrap-table-zh-CN.js | 22 +- cloud-server-management/src/main/webapp/static/modular/system/tLine/tLine.js | 2 cloud-server-management/src/main/webapp/static/modular/system/tUserRedPacketRecord/tUserRedPacketRecord.js | 2 cloud-server-activity/src/main/java/com/dsh/activity/mapper/CouponMapper.java | 12 + cloud-server-management/src/main/webapp/static/modular/system/tChatSetPage/tbChatSetPage.js | 2 cloud-server-management/src/main/webapp/static/modular/system/sysCouponActivity/sysCouponActivity.js | 2 cloud-server-management/src/main/webapp/static/modular/system/tDriver/tDriver.js | 2 cloud-server-management/src/main/webapp/static/modular/system/sysCouponActivity/tUser.js | 6 cloud-server-activity/src/main/resources/mapper/CouponMapper.xml | 36 ++++ cloud-server-management/src/main/webapp/static/js/plugins/highcharts/highcharts.src.js | 2 cloud-server-activity/src/main/java/com/dsh/activity/controller/CouponController.java | 19 ++ cloud-server-management/src/main/webapp/static/modular/system/tSmsrecord/tSmsrecord.js | 2 cloud-server-management/src/main/webapp/static/modular/system/userCouponRecord/userCouponRecord.js | 2 cloud-server-activity/src/main/java/com/dsh/activity/feignclient/model/CouponListOfSearch.java | 26 +++ cloud-server-management/src/main/webapp/static/modular/system/tOrderEvaluate/tOrderEvaluate.js | 2 cloud-server-management/src/main/webapp/static/modular/system/tVersionManagement/tVersionManagement.js | 2 cloud-server-management/src/main/webapp/static/modular/system/report/couponStatistics.js | 2 cloud-server-management/src/main/webapp/static/modular/system/tOrderLogistics/tOrderLogistics.js | 2 cloud-server-management/src/main/webapp/static/modular/system/tSite/tSite.js | 2 cloud-server-management/src/main/webapp/static/modular/system/tOpenCity/tOpenCity.js | 2 cloud-server-management/src/main/webapp/static/modular/system/tSystemPrice/tSystemPrice.js | 2 cloud-server-management/src/main/webapp/static/modular/system/user/user.js | 2 cloud-server-management/src/main/webapp/static/modular/system/tOrderCrossCity/tOrderCrossCity.js | 2 cloud-server-management/src/main/webapp/static/modular/system/tOrderPrivateCar/tOrderPrivateCar.js | 2 cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCouponController.java | 19 ++ cloud-server-management/src/main/webapp/static/modular/system/driverActivity/yesDriver.js | 6 cloud-server-management/src/main/webapp/static/modular/system/tDriver/tDriverVerify.js | 2 cloud-server-management/src/main/webapp/static/modular/system/driverActivityHistory/driverActivityHistory.js | 2 cloud-server-management/src/main/webapp/static/modular/system/notice/notice.js | 2 cloud-server-management/src/main/webapp/static/modular/system/tComplaint/tComplaint.js | 2 cloud-server-activity/src/main/java/com/dsh/activity/feignclient/CouponClient.java | 19 ++ cloud-server-management/src/main/webapp/static/modular/system/tCompany/tCompany.js | 2 cloud-server-management/src/main/webapp/static/modular/system/tNotices/tNotices.js | 2 cloud-server-management/src/main/webapp/static/modular/system/tFeedback/tFeedback.js | 2 cloud-server-management/src/main/webapp/static/modular/system/tDriver/yesDriver_selectCar.js | 4 cloud-server-management/src/main/webapp/static/modular/system/tReassign/smallPieceLogistics.js | 2 cloud-server-management/src/main/webapp/static/modular/system/tUserLargeCoupon/tUserLargeCoupon.js | 2 cloud-server-management/src/main/webapp/static/modular/system/tIntegralGoods/tIntegralGoods.js | 2 cloud-server-management/src/main/webapp/static/js/ueditor/jsp/third-party/highcharts/highcharts.src.js | 2 cloud-server-management/src/main/webapp/static/modular/system/tAdvertisement/tAdvertisement.js | 2 cloud-server-management/src/main/webapp/static/modular/system/tVerified/tVerified.js | 2 cloud-server-management/src/main/webapp/static/modular/system/tCoupon/TCoupon.js | 31 +++ cloud-server-management/src/main/webapp/static/modular/system/tCar/tCar.js | 2 cloud-server-management/src/main/webapp/static/modular/system/userActivity/sysRedPacketRecord.js | 6 cloud-server-management/src/main/webapp/static/modular/system/sysCouponActivity/sysCouponRecord.js | 6 cloud-server-management/src/main/webapp/static/modular/system/tCompany/franchisee.js | 2 cloud-server-management/src/main/webapp/static/modular/system/userActivity/sysCouponRecord.js | 14 cloud-server-management/src/main/webapp/static/modular/system/tPubWithdrawal/tPubWithdrawal.js | 2 cloud-server-management/src/main/webapp/static/modular/system/tAgreement/tAgreement.js | 2 cloud-server-management/src/main/webapp/static/js/ueditor/1.4.3/third-party/highcharts/highcharts-more.src.js | 2 cloud-server-management/src/main/webapp/static/modular/system/tCompany/tCompanyAudit.js | 2 cloud-server-management/src/main/webapp/static/modular/system/tSystemPrice/tSystemPriceService.js | 2 cloud-server-management/src/main/webapp/static/modular/system/log/login_log.js | 2 cloud-server-management/src/main/webapp/static/js/plugins/highcharts/modules/drilldown.src.js | 2 cloud-server-management/src/main/webapp/static/modular/system/sysCouponRecord/sysCouponRecord.js | 2 cloud-server-management/src/main/webapp/static/modular/system/tReassign/selectPrivateCarDriver.js | 2 cloud-server-management/src/main/webapp/static/js/plugins/highcharts/highcharts-more.src.js | 2 cloud-server-management/src/main/webapp/static/modular/system/report/operationalData.js | 2 cloud-server-management/src/main/webapp/static/modular/system/tFeedback/userFeedback.js | 2 cloud-server-management/src/main/webapp/static/modular/system/tOrderCharter/tOrderCharter.js | 2 cloud-server-management/src/main/webapp/static/modular/system/tOrderTaxi/selectDriver.js | 2 cloud-server-management/src/main/webapp/static/modular/system/tReassign/selectCrossDriver.js | 2 cloud-server-management/src/main/webapp/static/modular/system/tServerCarmodel/tServerCarmodel.js | 2 cloud-server-management/src/main/webapp/static/modular/system/userActivity/userActivity.js | 2 cloud-server-management/src/main/webapp/static/modular/system/tOrderCharteredCar/tOrderCharteredCar.js | 2 cloud-server-activity/src/main/java/com/dsh/activity/service/impl/CouponServiceImpl.java | 6 cloud-server-management/src/main/webapp/static/js/ueditor/jsp/third-party/highcharts/highcharts-more.src.js | 2 cloud-server-management/src/main/webapp/static/modular/system/dict/dict.js | 2 cloud-server-management/src/main/webapp/static/modular/system/tWithout/tWithout.js | 2 cloud-server-management/src/main/webapp/static/modular/system/tCarBrand/tCarBrand.js | 2 cloud-server-management/src/main/webapp/static/modular/system/tEnsureIncomeRule/tEnsureIncomeRule.js | 2 cloud-server-management/src/main/webapp/static/modular/system/sysRedPacketRecord/sysRedPacketRecord.js | 2 cloud-server-management/src/main/webapp/static/modular/system/tCar/carInsurance.js | 2 cloud-server-management/src/main/webapp/static/modular/system/tCarModel/tCarModel.js | 2 cloud-server-management/src/main/webapp/static/modular/system/tGuidePage/tbGuidePage.js | 2 cloud-server-management/src/main/webapp/static/modular/system/tProblem/tProblem.js | 2 cloud-server-management/src/main/webapp/static/modular/system/tInvoice/tInvoice.js | 2 cloud-server-management/src/main/webapp/static/modular/system/tIntegralOrder/tIntegralOrder.js | 2 cloud-server-management/src/main/webapp/static/modular/system/tNotices/system.js | 2 cloud-server-management/src/main/webapp/static/modular/system/tReassign/selectSmallDriver.js | 2 cloud-server-management/src/main/webapp/static/modular/system/log/log.js | 2 cloud-server-management/src/main/webapp/static/js/plugins/bootstrap-table/locale/bootstrap-table-zh-CN.min.js | 22 +- cloud-server-management/src/main/webapp/static/modular/system/tMotorModel/tMotorModel.js | 2 cloud-server-management/src/main/webapp/static/modular/system/tReassign/tReassign.js | 2 cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/CouponClient.java | 19 ++ cloud-server-management/src/main/webapp/static/modular/system/tServerCarmodel/charter.js | 2 cloud-server-management/src/main/webapp/static/modular/system/report/couponStatisticsInfo.js | 2 cloud-server-management/src/main/webapp/static/modular/system/tStartPage/tbStartPage.js | 2 cloud-server-management/src/main/webapp/static/modular/system/tUser/tUser.js | 2 cloud-server-management/src/main/webapp/static/js/plugins/bootstrap-treetable/bootstrap-treetable.js | 4 cloud-server-management/src/main/webapp/static/modular/system/tOrderTaxi/tOrderTaxi.js | 2 cloud-server-activity/src/main/java/com/dsh/activity/service/ICouponService.java | 4 cloud-server-management/src/main/webapp/static/modular/system/tHotAddress/tbHotAddress.js | 2 cloud-server-management/src/main/webapp/static/modular/system/tUserExit/tbUserExit.js | 2 cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/CouponListOfSearch.java | 26 +++ cloud-server-management/src/main/webapp/static/modular/system/tReassign/tCross.js | 2 cloud-server-management/src/main/webapp/static/modular/system/tbBanner/tbBanner.js | 2 cloud-server-management/src/main/webapp/static/js/ueditor/1.4.3/third-party/highcharts/highcharts.src.js | 2 cloud-server-management/src/main/webapp/static/modular/system/tDriver/yesDriver.js | 2 cloud-server-management/src/main/webapp/static/modular/system/driverActivity/driverActivity.js | 2 cloud-server-management/src/main/webapp/static/modular/system/tDispatch/tDispatch.js | 2 cloud-server-management/src/main/webapp/static/modular/system/tVoice/tbVoice.js | 2 104 files changed, 338 insertions(+), 137 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 ab641e5..19b5af2 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 @@ -1,8 +1,10 @@ package com.dsh.activity.controller; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.dsh.activity.entity.Coupon; import com.dsh.activity.entity.UserCoupon; +import com.dsh.activity.feignclient.model.CouponListOfSearch; import com.dsh.activity.model.CouponListVo; import com.dsh.activity.model.request.CommodityRequest; import com.dsh.activity.model.request.CouponPackageReq; @@ -163,6 +165,23 @@ + @ResponseBody + @PostMapping("/base/coupon/queryCouponListSearch") + public List<Map<String,Object>> getCouponListOfSearch(@RequestBody CouponListOfSearch ofSearch){ + List<Map<String, Object>> mapList = couponService.queryCouponListOfSearch(ofSearch); + if (mapList.size() > 0){ + for (Map<String, Object> stringObjectMap : mapList) { + Integer o = (Integer) stringObjectMap.get("id"); + Object startTime = stringObjectMap.get("startTime"); + Object endTime = stringObjectMap.get("endTime"); + stringObjectMap.put("timeValue",startTime + "至"+endTime); + int count = ucService.count(new LambdaQueryWrapper<UserCoupon>() + .eq(UserCoupon::getCouponId, o)); + stringObjectMap.put("hasPickQty",count); + } + } + return mapList; + } } diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/feignclient/CouponClient.java b/cloud-server-activity/src/main/java/com/dsh/activity/feignclient/CouponClient.java new file mode 100644 index 0000000..0edd1c7 --- /dev/null +++ b/cloud-server-activity/src/main/java/com/dsh/activity/feignclient/CouponClient.java @@ -0,0 +1,19 @@ +package com.dsh.activity.feignclient; + + +import com.dsh.activity.feignclient.model.CouponListOfSearch; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; + +import java.util.List; +import java.util.Map; + +@FeignClient(value = "mb-cloud-activity") +public interface CouponClient { + + + @PostMapping("/base/coupon/queryCouponListSearch") + List<Map<String,Object>> getCouponListOfSearch(@RequestBody CouponListOfSearch ofSearch); + +} diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/feignclient/model/CouponListOfSearch.java b/cloud-server-activity/src/main/java/com/dsh/activity/feignclient/model/CouponListOfSearch.java new file mode 100644 index 0000000..eceb9b3 --- /dev/null +++ b/cloud-server-activity/src/main/java/com/dsh/activity/feignclient/model/CouponListOfSearch.java @@ -0,0 +1,26 @@ +package com.dsh.activity.feignclient.model; + + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.Data; + +import java.util.Map; + +@Data +public class CouponListOfSearch { + + private String name; + + private Integer type; + + private Integer distributionMethod; + + private Integer userPopulation; + + private Integer status; + + private Integer state; + + private Page<Map<String, Object>> page; + +} diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/mapper/CouponMapper.java b/cloud-server-activity/src/main/java/com/dsh/activity/mapper/CouponMapper.java index c2cb1f9..42ba242 100644 --- a/cloud-server-activity/src/main/java/com/dsh/activity/mapper/CouponMapper.java +++ b/cloud-server-activity/src/main/java/com/dsh/activity/mapper/CouponMapper.java @@ -1,9 +1,12 @@ package com.dsh.activity.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.dsh.activity.entity.Coupon; +import com.dsh.activity.feignclient.model.CouponListOfSearch; import org.apache.ibatis.annotations.Param; +import java.util.List; import java.util.Map; /** @@ -18,4 +21,13 @@ Map<String, Object> queryConponRuleOfJson(@Param("id") Integer id); + + List<Map<String, Object>> queryCouponListOfSearch(@Param("name")String name, + @Param("type")Integer type, + @Param("distributionMethod")Integer distributionMethod, + @Param("userPopulation")Integer userPopulation, + @Param("status")Integer status, + @Param("state")Integer state, + @Param("page")Page<Map<String, Object>> page); + } diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/service/ICouponService.java b/cloud-server-activity/src/main/java/com/dsh/activity/service/ICouponService.java index f9cde35..1b89adc 100644 --- a/cloud-server-activity/src/main/java/com/dsh/activity/service/ICouponService.java +++ b/cloud-server-activity/src/main/java/com/dsh/activity/service/ICouponService.java @@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.dsh.activity.entity.Coupon; +import com.dsh.activity.feignclient.model.CouponListOfSearch; import com.dsh.activity.model.CouponListVo; import java.util.List; @@ -26,4 +27,7 @@ Map<String, Object> queryConponRuleOfJson(Integer id); + + List<Map<String, Object>> queryCouponListOfSearch(CouponListOfSearch ofSearch); + } diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/service/impl/CouponServiceImpl.java b/cloud-server-activity/src/main/java/com/dsh/activity/service/impl/CouponServiceImpl.java index 6a9bec7..4278dd6 100644 --- a/cloud-server-activity/src/main/java/com/dsh/activity/service/impl/CouponServiceImpl.java +++ b/cloud-server-activity/src/main/java/com/dsh/activity/service/impl/CouponServiceImpl.java @@ -10,6 +10,7 @@ import com.dsh.activity.feignclient.account.StudentClient; import com.dsh.activity.feignclient.account.model.AppUser; import com.dsh.activity.feignclient.account.model.Student; +import com.dsh.activity.feignclient.model.CouponListOfSearch; import com.dsh.activity.mapper.CouponMapper; import com.dsh.activity.model.CouponListVo; import com.dsh.activity.service.ICouponService; @@ -98,4 +99,9 @@ return this.baseMapper.queryConponRuleOfJson(id); } + @Override + public List<Map<String, Object>> queryCouponListOfSearch(CouponListOfSearch ofSearch) { + return this.baseMapper.queryCouponListOfSearch(ofSearch.getName(),ofSearch.getType(),ofSearch.getDistributionMethod(),ofSearch.getUserPopulation(),ofSearch.getStatus(),ofSearch.getState(),ofSearch.getPage()); + } + } diff --git a/cloud-server-activity/src/main/resources/mapper/CouponMapper.xml b/cloud-server-activity/src/main/resources/mapper/CouponMapper.xml index 142c094..e63a5c6 100644 --- a/cloud-server-activity/src/main/resources/mapper/CouponMapper.xml +++ b/cloud-server-activity/src/main/resources/mapper/CouponMapper.xml @@ -12,5 +12,41 @@ and `id` = #{id} </if> </select> + <select id="queryCouponListOfSearch" resultType="java.util.Map"> + SELECT id, + `name`, + useScope, + `type`, + distributionMethod, + date_format(startTime ,'%Y-%m-%d') as startTime, + date_format(endTime ,'%Y-%m-%d') as endTime, + userPopulation, + quantityIssued, + pickUpQuantity, + `status`, + state + from t_coupon + where 1 = 1 + <if test="name != null"> + and `name` like concat('%', #{}, '%') + </if> + <if test="type != null"> + and type = #{type} + </if> + <if test="distributionMethod != null"> + and distributionMethod = #{distributionMethod} + </if> + <if test="userPopulation != null"> + and userPopulation = #{userPopulation} + </if> + <if test="status !=null"> + and `status` = #{status} + </if> + <if test="state != null"> + and `state` = #{state} + </if> + order by insertTime desc + </select> + </mapper> diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/CouponClient.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/CouponClient.java new file mode 100644 index 0000000..082a999 --- /dev/null +++ b/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/CouponClient.java @@ -0,0 +1,19 @@ +package com.dsh.course.feignClient.activity; + + +import com.dsh.course.feignClient.activity.model.CouponListOfSearch; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; + +import java.util.List; +import java.util.Map; + +@FeignClient(value = "mb-cloud-activity") +public interface CouponClient { + + + @PostMapping("/base/coupon/queryCouponListSearch") + List<Map<String,Object>> getCouponListOfSearch(@RequestBody CouponListOfSearch ofSearch); + +} diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/CouponListOfSearch.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/CouponListOfSearch.java new file mode 100644 index 0000000..a41f7f6 --- /dev/null +++ b/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/CouponListOfSearch.java @@ -0,0 +1,26 @@ +package com.dsh.course.feignClient.activity.model; + + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.Data; + +import java.util.Map; + +@Data +public class CouponListOfSearch { + + private String name; + + private Integer type; + + private Integer distributionMethod; + + private Integer userPopulation; + + private Integer status; + + private Integer state; + + private Page<Map<String, Object>> page; + +} diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCouponController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCouponController.java index e650d67..8c343e3 100644 --- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCouponController.java +++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCouponController.java @@ -2,6 +2,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.dsh.course.feignClient.activity.CouponClient; +import com.dsh.course.feignClient.activity.model.CouponListOfSearch; import com.dsh.guns.core.common.constant.factory.PageFactory; import com.dsh.guns.core.util.ToolUtil; import org.apache.commons.beanutils.ConvertUtils; @@ -10,6 +12,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; +import javax.annotation.Resource; import java.util.Date; import java.util.List; import java.util.Map; @@ -26,6 +29,10 @@ private String PREFIX = "/system/tCoupon/"; + + + @Resource + private CouponClient client; /** * 跳转到优惠券管理首页 @@ -48,9 +55,17 @@ */ @RequestMapping(value = "/list") @ResponseBody - public Object listOfDatas(String member, Integer type, Integer distributionMethod , Integer userPopulation, Integer status, Integer state) { + public Object listOfDatas(String name, Integer type, Integer distributionMethod , Integer userPopulation, Integer status, Integer state) { Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage(); - List<Map<String, Object>> mapList = null; + CouponListOfSearch ofSearch = new CouponListOfSearch(); + ofSearch.setPage(page); + ofSearch.setName(name); + ofSearch.setType(type); + ofSearch.setDistributionMethod(distributionMethod); + ofSearch.setUserPopulation(userPopulation); + ofSearch.setStatus(status); + ofSearch.setState(state); + List<Map<String, Object>> mapList = client.getCouponListOfSearch(ofSearch); page.setRecords(mapList); return page.getRecords(); } diff --git a/cloud-server-management/src/main/webapp/static/js/plugins/bootstrap-table/locale/bootstrap-table-zh-CN.js b/cloud-server-management/src/main/webapp/static/js/plugins/bootstrap-table/locale/bootstrap-table-zh-CN.js index 6512959..874f340 100644 --- a/cloud-server-management/src/main/webapp/static/js/plugins/bootstrap-table/locale/bootstrap-table-zh-CN.js +++ b/cloud-server-management/src/main/webapp/static/js/plugins/bootstrap-table/locale/bootstrap-table-zh-CN.js @@ -7,37 +7,37 @@ $.fn.bootstrapTable.locales['zh-CN'] = { formatLoadingMessage: function () { - return 'Loding……'; + return '正在努力地加载数据中,请稍候……'; }, formatRecordsPerPage: function (pageNumber) { - return 'Display per page ' + pageNumber + ' A record'; + return '每页显示 ' + pageNumber + ' 条记录'; }, formatShowingRows: function (pageFrom, pageTo, totalRows) { - return 'Control of display ' + pageFrom + ' To the first ' + pageTo + ' One record, total ' + totalRows + ' recored'; + return '显示第 ' + pageFrom + ' 到第 ' + pageTo + ' 条记录,总共 ' + totalRows + ' 条记录'; }, formatSearch: function () { - return 'Search'; + return '搜索'; }, formatNoMatches: function () { - return 'No match was found'; + return '没有找到匹配的记录'; }, formatPaginationSwitch: function () { - return 'Hide/show pagination'; + return '隐藏/显示分页'; }, formatRefresh: function () { - return 'refresh'; + return '刷新'; }, formatToggle: function () { - return 'cut'; + return '切换'; }, formatColumns: function () { - return 'column'; + return '列'; }, formatExport: function () { - return 'export data'; + return '导出数据'; }, formatClearFilters: function () { - return 'Clear the filter'; + return '清空过滤'; } }; diff --git a/cloud-server-management/src/main/webapp/static/js/plugins/bootstrap-table/locale/bootstrap-table-zh-CN.min.js b/cloud-server-management/src/main/webapp/static/js/plugins/bootstrap-table/locale/bootstrap-table-zh-CN.min.js index 6512959..874f340 100644 --- a/cloud-server-management/src/main/webapp/static/js/plugins/bootstrap-table/locale/bootstrap-table-zh-CN.min.js +++ b/cloud-server-management/src/main/webapp/static/js/plugins/bootstrap-table/locale/bootstrap-table-zh-CN.min.js @@ -7,37 +7,37 @@ $.fn.bootstrapTable.locales['zh-CN'] = { formatLoadingMessage: function () { - return 'Loding……'; + return '正在努力地加载数据中,请稍候……'; }, formatRecordsPerPage: function (pageNumber) { - return 'Display per page ' + pageNumber + ' A record'; + return '每页显示 ' + pageNumber + ' 条记录'; }, formatShowingRows: function (pageFrom, pageTo, totalRows) { - return 'Control of display ' + pageFrom + ' To the first ' + pageTo + ' One record, total ' + totalRows + ' recored'; + return '显示第 ' + pageFrom + ' 到第 ' + pageTo + ' 条记录,总共 ' + totalRows + ' 条记录'; }, formatSearch: function () { - return 'Search'; + return '搜索'; }, formatNoMatches: function () { - return 'No match was found'; + return '没有找到匹配的记录'; }, formatPaginationSwitch: function () { - return 'Hide/show pagination'; + return '隐藏/显示分页'; }, formatRefresh: function () { - return 'refresh'; + return '刷新'; }, formatToggle: function () { - return 'cut'; + return '切换'; }, formatColumns: function () { - return 'column'; + return '列'; }, formatExport: function () { - return 'export data'; + return '导出数据'; }, formatClearFilters: function () { - return 'Clear the filter'; + return '清空过滤'; } }; diff --git a/cloud-server-management/src/main/webapp/static/js/plugins/bootstrap-treetable/bootstrap-treetable.js b/cloud-server-management/src/main/webapp/static/js/plugins/bootstrap-treetable/bootstrap-treetable.js index ab8eb6f..8f090d9 100644 --- a/cloud-server-management/src/main/webapp/static/js/plugins/bootstrap-treetable/bootstrap-treetable.js +++ b/cloud-server-management/src/main/webapp/static/js/plugins/bootstrap-treetable/bootstrap-treetable.js @@ -185,7 +185,7 @@ var tbody = $('<tbody class="treetable-tbody"></tbody>'); target.append(tbody); // 添加加载loading - var _loading = '<tr><td colspan="' + options.columns.length + '"><div style="display: block;text-align: center;">Loding……</div></td></tr>' + var _loading = '<tr><td colspan="' + options.columns.length + '"><div style="display: block;text-align: center;">正在努力地加载数据中,请稍候……</div></td></tr>' tbody.html(_loading); // 默认高度 if (options.height) { @@ -200,7 +200,7 @@ // 加载完数据先清空 tbody.html(""); if (!data || data.length <= 0) { - var _empty = '<tr><td colspan="' + options.columns.length + '"><div style="display: block;text-align: center;">No match was found</div></td></tr>' + var _empty = '<tr><td colspan="' + options.columns.length + '"><div style="display: block;text-align: center;">没有找到匹配的记录</div></td></tr>' tbody.html(_empty); return; } diff --git a/cloud-server-management/src/main/webapp/static/js/plugins/highcharts/highcharts-more.src.js b/cloud-server-management/src/main/webapp/static/js/plugins/highcharts/highcharts-more.src.js index 255e2ac..28ffc99 100644 --- a/cloud-server-management/src/main/webapp/static/js/plugins/highcharts/highcharts-more.src.js +++ b/cloud-server-management/src/main/webapp/static/js/plugins/highcharts/highcharts-more.src.js @@ -69,7 +69,7 @@ backgroundOption = options.background; // To avoid having weighty logic to place, update and remove the backgrounds, - // push them to the first axis' plot bands and borrow the existing logic there. + // push them 到第 axis' plot bands and borrow the existing logic there. if (backgroundOption) { each([].concat(splat(backgroundOption)).reverse(), function (config) { var backgroundColor = config.backgroundColor; // if defined, replace the old one (specific for gradients) diff --git a/cloud-server-management/src/main/webapp/static/js/plugins/highcharts/highcharts.src.js b/cloud-server-management/src/main/webapp/static/js/plugins/highcharts/highcharts.src.js index d461476..1f42f65 100644 --- a/cloud-server-management/src/main/webapp/static/js/plugins/highcharts/highcharts.src.js +++ b/cloud-server-management/src/main/webapp/static/js/plugins/highcharts/highcharts.src.js @@ -110,7 +110,7 @@ /** * Extend an object with the members of another * @param {Object} a The object to be extended - * @param {Object} b The object to add to the first one + * @param {Object} b The object to add 到第 one */ function extend(a, b) { var n; diff --git a/cloud-server-management/src/main/webapp/static/js/plugins/highcharts/modules/drilldown.src.js b/cloud-server-management/src/main/webapp/static/js/plugins/highcharts/modules/drilldown.src.js index 72aac35..a43e27e 100644 --- a/cloud-server-management/src/main/webapp/static/js/plugins/highcharts/modules/drilldown.src.js +++ b/cloud-server-management/src/main/webapp/static/js/plugins/highcharts/modules/drilldown.src.js @@ -116,7 +116,7 @@ } }); - // Add a record of properties for each drilldown level + // Add 条记录 of properties for each drilldown level level = { levelNumber: levelNumber, seriesOptions: oldSeries.userOptions, diff --git a/cloud-server-management/src/main/webapp/static/js/ueditor/1.4.3/third-party/highcharts/highcharts-more.src.js b/cloud-server-management/src/main/webapp/static/js/ueditor/1.4.3/third-party/highcharts/highcharts-more.src.js index 39d4941..b282f77 100644 --- a/cloud-server-management/src/main/webapp/static/js/ueditor/1.4.3/third-party/highcharts/highcharts-more.src.js +++ b/cloud-server-management/src/main/webapp/static/js/ueditor/1.4.3/third-party/highcharts/highcharts-more.src.js @@ -65,7 +65,7 @@ backgroundOption = options.background; // To avoid having weighty logic to place, update and remove the backgrounds, - // push them to the first axis' plot bands and borrow the existing logic there. + // push them 到第 axis' plot bands and borrow the existing logic there. if (backgroundOption) { each([].concat(splat(backgroundOption)).reverse(), function (config) { var backgroundColor = config.backgroundColor; // if defined, replace the old one (specific for gradients) diff --git a/cloud-server-management/src/main/webapp/static/js/ueditor/1.4.3/third-party/highcharts/highcharts.src.js b/cloud-server-management/src/main/webapp/static/js/ueditor/1.4.3/third-party/highcharts/highcharts.src.js index a29b0fa..44cdc31 100644 --- a/cloud-server-management/src/main/webapp/static/js/ueditor/1.4.3/third-party/highcharts/highcharts.src.js +++ b/cloud-server-management/src/main/webapp/static/js/ueditor/1.4.3/third-party/highcharts/highcharts.src.js @@ -123,7 +123,7 @@ /** * Extend an object with the members of another * @param {Object} a The object to be extended - * @param {Object} b The object to add to the first one + * @param {Object} b The object to add 到第 one */ function extend(a, b) { var n; diff --git a/cloud-server-management/src/main/webapp/static/js/ueditor/jsp/third-party/highcharts/highcharts-more.src.js b/cloud-server-management/src/main/webapp/static/js/ueditor/jsp/third-party/highcharts/highcharts-more.src.js index 39d4941..b282f77 100644 --- a/cloud-server-management/src/main/webapp/static/js/ueditor/jsp/third-party/highcharts/highcharts-more.src.js +++ b/cloud-server-management/src/main/webapp/static/js/ueditor/jsp/third-party/highcharts/highcharts-more.src.js @@ -65,7 +65,7 @@ backgroundOption = options.background; // To avoid having weighty logic to place, update and remove the backgrounds, - // push them to the first axis' plot bands and borrow the existing logic there. + // push them 到第 axis' plot bands and borrow the existing logic there. if (backgroundOption) { each([].concat(splat(backgroundOption)).reverse(), function (config) { var backgroundColor = config.backgroundColor; // if defined, replace the old one (specific for gradients) diff --git a/cloud-server-management/src/main/webapp/static/js/ueditor/jsp/third-party/highcharts/highcharts.src.js b/cloud-server-management/src/main/webapp/static/js/ueditor/jsp/third-party/highcharts/highcharts.src.js index a29b0fa..44cdc31 100644 --- a/cloud-server-management/src/main/webapp/static/js/ueditor/jsp/third-party/highcharts/highcharts.src.js +++ b/cloud-server-management/src/main/webapp/static/js/ueditor/jsp/third-party/highcharts/highcharts.src.js @@ -123,7 +123,7 @@ /** * Extend an object with the members of another * @param {Object} a The object to be extended - * @param {Object} b The object to add to the first one + * @param {Object} b The object to add 到第 one */ function extend(a, b) { var n; diff --git a/cloud-server-management/src/main/webapp/static/modular/system/dict/dict.js b/cloud-server-management/src/main/webapp/static/modular/system/dict/dict.js index 274d7c0..52a750f 100644 --- a/cloud-server-management/src/main/webapp/static/modular/system/dict/dict.js +++ b/cloud-server-management/src/main/webapp/static/modular/system/dict/dict.js @@ -29,7 +29,7 @@ if(language==1){ Feng.info("请先选中表格中的某一记录!"); }else if(language==2){ - Feng.info("Please select a record in the table first!"); + Feng.info("Please select 条记录 in the table first!"); }else { Feng.info("Pilih catatan di tabel terlebih dahulu!"); } diff --git a/cloud-server-management/src/main/webapp/static/modular/system/driverActivity/driverActivity.js b/cloud-server-management/src/main/webapp/static/modular/system/driverActivity/driverActivity.js index 17e1383..027a6aa 100644 --- a/cloud-server-management/src/main/webapp/static/modular/system/driverActivity/driverActivity.js +++ b/cloud-server-management/src/main/webapp/static/modular/system/driverActivity/driverActivity.js @@ -112,7 +112,7 @@ if(language==1){ Feng.info("请先选中表格中的某一记录!"); }else if(language==2){ - Feng.info("Please select a record in the table first!"); + Feng.info("Please select 条记录 in the table first!"); }else { Feng.info("Pilih catatan di tabel terlebih dahulu!"); } diff --git a/cloud-server-management/src/main/webapp/static/modular/system/driverActivity/yesDriver.js b/cloud-server-management/src/main/webapp/static/modular/system/driverActivity/yesDriver.js index 5fbfd85..303c8b7 100644 --- a/cloud-server-management/src/main/webapp/static/modular/system/driverActivity/yesDriver.js +++ b/cloud-server-management/src/main/webapp/static/modular/system/driverActivity/yesDriver.js @@ -170,7 +170,7 @@ if(language==1){ Feng.info("请先选中表格中的某一记录!"); }else if(language==2){ - Feng.info("Please select a record in the table first!"); + Feng.info("Please select 条记录 in the table first!"); }else { Feng.info("Pilih catatan di tabel terlebih dahulu!"); } @@ -237,7 +237,7 @@ if(language==1){ Feng.info("请先选中表格中的某一记录!"); }else if(language==2){ - Feng.info("Please select a record in the table first!"); + Feng.info("Please select 条记录 in the table first!"); }else { Feng.info("Pilih catatan di tabel terlebih dahulu!"); } @@ -253,7 +253,7 @@ if(language==1){ Feng.info("请先选中表格中的某一记录!"); }else if(language==2){ - Feng.info("Please select a record in the table first!"); + Feng.info("Please select 条记录 in the table first!"); }else { Feng.info("Pilih catatan di tabel terlebih dahulu!"); } diff --git a/cloud-server-management/src/main/webapp/static/modular/system/driverActivityHistory/driverActivityHistory.js b/cloud-server-management/src/main/webapp/static/modular/system/driverActivityHistory/driverActivityHistory.js index a32aef2..5554ce9 100644 --- a/cloud-server-management/src/main/webapp/static/modular/system/driverActivityHistory/driverActivityHistory.js +++ b/cloud-server-management/src/main/webapp/static/modular/system/driverActivityHistory/driverActivityHistory.js @@ -50,7 +50,7 @@ if(language==1){ Feng.info("请先选中表格中的某一记录!"); }else if(language==2){ - Feng.info("Please select a record in the table first!"); + Feng.info("Please select 条记录 in the table first!"); }else { Feng.info("Pilih catatan di tabel terlebih dahulu!"); } diff --git a/cloud-server-management/src/main/webapp/static/modular/system/log/log.js b/cloud-server-management/src/main/webapp/static/modular/system/log/log.js index a05dbdb..1531b0e 100644 --- a/cloud-server-management/src/main/webapp/static/modular/system/log/log.js +++ b/cloud-server-management/src/main/webapp/static/modular/system/log/log.js @@ -34,7 +34,7 @@ if(language==1){ Feng.info("请先选中表格中的某一记录!"); }else if(language==2){ - Feng.info("Please select a record in the table first!"); + Feng.info("Please select 条记录 in the table first!"); }else { Feng.info("Pilih catatan di tabel terlebih dahulu!"); } diff --git a/cloud-server-management/src/main/webapp/static/modular/system/log/login_log.js b/cloud-server-management/src/main/webapp/static/modular/system/log/login_log.js index c4b06b6..baaf59d 100644 --- a/cloud-server-management/src/main/webapp/static/modular/system/log/login_log.js +++ b/cloud-server-management/src/main/webapp/static/modular/system/log/login_log.js @@ -31,7 +31,7 @@ if(language==1){ Feng.info("请先选中表格中的某一记录!"); }else if(language==2){ - Feng.info("Please select a record in the table first!"); + Feng.info("Please select 条记录 in the table first!"); }else { Feng.info("Pilih catatan di tabel terlebih dahulu!"); } diff --git a/cloud-server-management/src/main/webapp/static/modular/system/notice/notice.js b/cloud-server-management/src/main/webapp/static/modular/system/notice/notice.js index ec64ea0..a36c088 100644 --- a/cloud-server-management/src/main/webapp/static/modular/system/notice/notice.js +++ b/cloud-server-management/src/main/webapp/static/modular/system/notice/notice.js @@ -31,7 +31,7 @@ if(language==1){ Feng.info("请先选中表格中的某一记录!"); }else if(language==2){ - Feng.info("Please select a record in the table first!"); + Feng.info("Please select 条记录 in the table first!"); }else { Feng.info("Pilih catatan di tabel terlebih dahulu!"); } diff --git a/cloud-server-management/src/main/webapp/static/modular/system/report/couponStatistics.js b/cloud-server-management/src/main/webapp/static/modular/system/report/couponStatistics.js index ebd9173..e7c2052 100644 --- a/cloud-server-management/src/main/webapp/static/modular/system/report/couponStatistics.js +++ b/cloud-server-management/src/main/webapp/static/modular/system/report/couponStatistics.js @@ -45,7 +45,7 @@ if(language==1){ Feng.info("请先选中表格中的某一记录!"); }else if(language==2){ - Feng.info("Please select a record in the table first!"); + Feng.info("Please select 条记录 in the table first!"); }else { Feng.info("Pilih catatan di tabel terlebih dahulu!"); } diff --git a/cloud-server-management/src/main/webapp/static/modular/system/report/couponStatisticsInfo.js b/cloud-server-management/src/main/webapp/static/modular/system/report/couponStatisticsInfo.js index 0256c75..779e170 100644 --- a/cloud-server-management/src/main/webapp/static/modular/system/report/couponStatisticsInfo.js +++ b/cloud-server-management/src/main/webapp/static/modular/system/report/couponStatisticsInfo.js @@ -21,7 +21,7 @@ if(language==1){ Feng.info("请先选中表格中的某一记录!"); }else if(language==2){ - Feng.info("Please select a record in the table first!"); + Feng.info("Please select 条记录 in the table first!"); }else { Feng.info("Pilih catatan di tabel terlebih dahulu!"); } diff --git a/cloud-server-management/src/main/webapp/static/modular/system/report/operationalData.js b/cloud-server-management/src/main/webapp/static/modular/system/report/operationalData.js index 7038740..6608e43 100644 --- a/cloud-server-management/src/main/webapp/static/modular/system/report/operationalData.js +++ b/cloud-server-management/src/main/webapp/static/modular/system/report/operationalData.js @@ -47,7 +47,7 @@ if(language==1){ Feng.info("请先选中表格中的某一记录!"); }else if(language==2){ - Feng.info("Please select a record in the table first!"); + Feng.info("Please select 条记录 in the table first!"); }else { Feng.info("Pilih catatan di tabel terlebih dahulu!"); } diff --git a/cloud-server-management/src/main/webapp/static/modular/system/sysCouponActivity/sysCouponActivity.js b/cloud-server-management/src/main/webapp/static/modular/system/sysCouponActivity/sysCouponActivity.js index 9aab24c..4b9d8b6 100644 --- a/cloud-server-management/src/main/webapp/static/modular/system/sysCouponActivity/sysCouponActivity.js +++ b/cloud-server-management/src/main/webapp/static/modular/system/sysCouponActivity/sysCouponActivity.js @@ -134,7 +134,7 @@ if(language==1){ Feng.info("请先选中表格中的某一记录!"); }else if(language==2){ - Feng.info("Please select a record in the table first!"); + Feng.info("Please select 条记录 in the table first!"); }else { Feng.info("Pilih catatan di tabel terlebih dahulu!"); } diff --git a/cloud-server-management/src/main/webapp/static/modular/system/sysCouponActivity/sysCouponRecord.js b/cloud-server-management/src/main/webapp/static/modular/system/sysCouponActivity/sysCouponRecord.js index 067abf5..2a440f6 100644 --- a/cloud-server-management/src/main/webapp/static/modular/system/sysCouponActivity/sysCouponRecord.js +++ b/cloud-server-management/src/main/webapp/static/modular/system/sysCouponActivity/sysCouponRecord.js @@ -111,7 +111,7 @@ if(language==1){ Feng.info("请先选中表格中的某一记录!"); }else if(language==2){ - Feng.info("Please select a record in the table first!"); + Feng.info("Please select 条记录 in the table first!"); }else { Feng.info("Pilih catatan di tabel terlebih dahulu!"); } @@ -139,7 +139,7 @@ if(language==1){ Feng.info("请先选中表格中的某一记录!"); }else if(language==2){ - Feng.info("Please select a record in the table first!"); + Feng.info("Please select 条记录 in the table first!"); }else { Feng.info("Pilih catatan di tabel terlebih dahulu!"); } @@ -153,7 +153,7 @@ if(language==1){ Feng.info("请先选中表格中的某一记录!"); }else if(language==2){ - Feng.info("Please select a record in the table first!"); + Feng.info("Please select 条记录 in the table first!"); }else { Feng.info("Pilih catatan di tabel terlebih dahulu!"); }return ; diff --git a/cloud-server-management/src/main/webapp/static/modular/system/sysCouponActivity/tUser.js b/cloud-server-management/src/main/webapp/static/modular/system/sysCouponActivity/tUser.js index 35a6824..eca00b8 100644 --- a/cloud-server-management/src/main/webapp/static/modular/system/sysCouponActivity/tUser.js +++ b/cloud-server-management/src/main/webapp/static/modular/system/sysCouponActivity/tUser.js @@ -201,7 +201,7 @@ if(language==1){ Feng.info("请先选中表格中的某一记录!"); }else if(language==2){ - Feng.info("Please select a record in the table first!"); + Feng.info("Please select 条记录 in the table first!"); }else { Feng.info("Pilih catatan di tabel terlebih dahulu!"); } @@ -227,7 +227,7 @@ if(language==1){ Feng.info("请先选中表格中的某一记录!"); }else if(language==2){ - Feng.info("Please select a record in the table first!"); + Feng.info("Please select 条记录 in the table first!"); }else { Feng.info("Pilih catatan di tabel terlebih dahulu!"); } @@ -242,7 +242,7 @@ if(language==1){ Feng.info("请先选中表格中的某一记录!"); }else if(language==2){ - Feng.info("Please select a record in the table first!"); + Feng.info("Please select 条记录 in the table first!"); }else { Feng.info("Pilih catatan di tabel terlebih dahulu!"); } diff --git a/cloud-server-management/src/main/webapp/static/modular/system/sysCouponRecord/sysCouponRecord.js b/cloud-server-management/src/main/webapp/static/modular/system/sysCouponRecord/sysCouponRecord.js index 5f305d3..382fc89 100644 --- a/cloud-server-management/src/main/webapp/static/modular/system/sysCouponRecord/sysCouponRecord.js +++ b/cloud-server-management/src/main/webapp/static/modular/system/sysCouponRecord/sysCouponRecord.js @@ -145,7 +145,7 @@ if(language==1){ Feng.info("请先选中表格中的某一记录!"); }else if(language==2){ - Feng.info("Please select a record in the table first!"); + Feng.info("Please select 条记录 in the table first!"); }else { Feng.info("Pilih catatan di tabel terlebih dahulu!"); } diff --git a/cloud-server-management/src/main/webapp/static/modular/system/sysRedPacketRecord/sysRedPacketRecord.js b/cloud-server-management/src/main/webapp/static/modular/system/sysRedPacketRecord/sysRedPacketRecord.js index 0523783..c560c63 100644 --- a/cloud-server-management/src/main/webapp/static/modular/system/sysRedPacketRecord/sysRedPacketRecord.js +++ b/cloud-server-management/src/main/webapp/static/modular/system/sysRedPacketRecord/sysRedPacketRecord.js @@ -68,7 +68,7 @@ if(language==1){ Feng.info("请先选中表格中的某一记录!"); }else if(language==2){ - Feng.info("Please select a record in the table first!"); + Feng.info("Please select 条记录 in the table first!"); }else { Feng.info("Pilih catatan di tabel terlebih dahulu!"); } diff --git a/cloud-server-management/src/main/webapp/static/modular/system/tAdvertisement/tAdvertisement.js b/cloud-server-management/src/main/webapp/static/modular/system/tAdvertisement/tAdvertisement.js index 308567c..6123fcb 100644 --- a/cloud-server-management/src/main/webapp/static/modular/system/tAdvertisement/tAdvertisement.js +++ b/cloud-server-management/src/main/webapp/static/modular/system/tAdvertisement/tAdvertisement.js @@ -182,7 +182,7 @@ if(language==1){ Feng.info("请先选中表格中的某一记录!"); }else if(language==2){ - Feng.info("Please select a record in the table first!"); + Feng.info("Please select 条记录 in the table first!"); }else { Feng.info("Pilih catatan di tabel terlebih dahulu!"); } diff --git a/cloud-server-management/src/main/webapp/static/modular/system/tAgreement/tAgreement.js b/cloud-server-management/src/main/webapp/static/modular/system/tAgreement/tAgreement.js index 1f03c15..6aef4dc 100644 --- a/cloud-server-management/src/main/webapp/static/modular/system/tAgreement/tAgreement.js +++ b/cloud-server-management/src/main/webapp/static/modular/system/tAgreement/tAgreement.js @@ -35,7 +35,7 @@ if(language==1){ Feng.info("请先选中表格中的某一记录!"); }else if(language==2){ - Feng.info("Please select a record in the table first!"); + Feng.info("Please select 条记录 in the table first!"); }else { Feng.info("Pilih catatan di tabel terlebih dahulu!"); } diff --git a/cloud-server-management/src/main/webapp/static/modular/system/tCar/carInsurance.js b/cloud-server-management/src/main/webapp/static/modular/system/tCar/carInsurance.js index 8ffae41..dce62b5 100644 --- a/cloud-server-management/src/main/webapp/static/modular/system/tCar/carInsurance.js +++ b/cloud-server-management/src/main/webapp/static/modular/system/tCar/carInsurance.js @@ -33,7 +33,7 @@ if(language==1){ Feng.info("请先选中表格中的某一记录!"); }else if(language==2){ - Feng.info("Please select a record in the table first!"); + Feng.info("Please select 条记录 in the table first!"); }else { Feng.info("Pilih catatan di tabel terlebih dahulu!"); } diff --git a/cloud-server-management/src/main/webapp/static/modular/system/tCar/tCar.js b/cloud-server-management/src/main/webapp/static/modular/system/tCar/tCar.js index c70ed2e..113051a 100644 --- a/cloud-server-management/src/main/webapp/static/modular/system/tCar/tCar.js +++ b/cloud-server-management/src/main/webapp/static/modular/system/tCar/tCar.js @@ -174,7 +174,7 @@ if(language==1){ Feng.info("请先选中表格中的某一记录!"); }else if(language==2){ - Feng.info("Please select a record in the table first!"); + Feng.info("Please select 条记录 in the table first!"); }else { Feng.info("Pilih catatan di tabel terlebih dahulu!"); } diff --git a/cloud-server-management/src/main/webapp/static/modular/system/tCarBrand/tCarBrand.js b/cloud-server-management/src/main/webapp/static/modular/system/tCarBrand/tCarBrand.js index b4e9244..74414bf 100644 --- a/cloud-server-management/src/main/webapp/static/modular/system/tCarBrand/tCarBrand.js +++ b/cloud-server-management/src/main/webapp/static/modular/system/tCarBrand/tCarBrand.js @@ -94,7 +94,7 @@ if(language==1){ Feng.info("请先选中表格中的某一记录!"); }else if(language==2){ - Feng.info("Please select a record in the table first!"); + Feng.info("Please select 条记录 in the table first!"); }else { Feng.info("Pilih catatan di tabel terlebih dahulu!"); } diff --git a/cloud-server-management/src/main/webapp/static/modular/system/tCarModel/tCarModel.js b/cloud-server-management/src/main/webapp/static/modular/system/tCarModel/tCarModel.js index afc33b2..6165ca7 100644 --- a/cloud-server-management/src/main/webapp/static/modular/system/tCarModel/tCarModel.js +++ b/cloud-server-management/src/main/webapp/static/modular/system/tCarModel/tCarModel.js @@ -91,7 +91,7 @@ if(language==1){ Feng.info("请先选中表格中的某一记录!"); }else if(language==2){ - Feng.info("Please select a record in the table first!"); + Feng.info("Please select 条记录 in the table first!"); }else { Feng.info("Pilih catatan di tabel terlebih dahulu!"); } diff --git a/cloud-server-management/src/main/webapp/static/modular/system/tChatSetPage/tbChatSetPage.js b/cloud-server-management/src/main/webapp/static/modular/system/tChatSetPage/tbChatSetPage.js index 4d596ad..bbfb04f 100644 --- a/cloud-server-management/src/main/webapp/static/modular/system/tChatSetPage/tbChatSetPage.js +++ b/cloud-server-management/src/main/webapp/static/modular/system/tChatSetPage/tbChatSetPage.js @@ -84,7 +84,7 @@ if(language==1){ Feng.info("请先选中表格中的某一记录!"); }else if(language==2){ - Feng.info("Please select a record in the table first!"); + Feng.info("Please select 条记录 in the table first!"); }else { Feng.info("Pilih catatan di tabel terlebih dahulu!"); } diff --git a/cloud-server-management/src/main/webapp/static/modular/system/tCompany/franchisee.js b/cloud-server-management/src/main/webapp/static/modular/system/tCompany/franchisee.js index 73d012c..3627f86 100644 --- a/cloud-server-management/src/main/webapp/static/modular/system/tCompany/franchisee.js +++ b/cloud-server-management/src/main/webapp/static/modular/system/tCompany/franchisee.js @@ -168,7 +168,7 @@ if(language==1){ Feng.info("请先选中表格中的某一记录!"); }else if(language==2){ - Feng.info("Please select a record in the table first!"); + Feng.info("Please select 条记录 in the table first!"); }else { Feng.info("Pilih catatan di tabel terlebih dahulu!"); } diff --git a/cloud-server-management/src/main/webapp/static/modular/system/tCompany/tCompany.js b/cloud-server-management/src/main/webapp/static/modular/system/tCompany/tCompany.js index 2055013..f3b0cda 100644 --- a/cloud-server-management/src/main/webapp/static/modular/system/tCompany/tCompany.js +++ b/cloud-server-management/src/main/webapp/static/modular/system/tCompany/tCompany.js @@ -188,7 +188,7 @@ if(language==1){ Feng.info("请先选中表格中的某一记录!"); }else if(language==2){ - Feng.info("Please select a record in the table first!"); + Feng.info("Please select 条记录 in the table first!"); }else { Feng.info("Pilih catatan di tabel terlebih dahulu!"); } diff --git a/cloud-server-management/src/main/webapp/static/modular/system/tCompany/tCompanyAudit.js b/cloud-server-management/src/main/webapp/static/modular/system/tCompany/tCompanyAudit.js index 77d1aae..4a56e3e 100644 --- a/cloud-server-management/src/main/webapp/static/modular/system/tCompany/tCompanyAudit.js +++ b/cloud-server-management/src/main/webapp/static/modular/system/tCompany/tCompanyAudit.js @@ -217,7 +217,7 @@ if(language==1){ Feng.info("请先选中表格中的某一记录!"); }else if(language==2){ - Feng.info("Please select a record in the table first!"); + Feng.info("Please select 条记录 in the table first!"); }else { Feng.info("Pilih catatan di tabel terlebih dahulu!"); } diff --git a/cloud-server-management/src/main/webapp/static/modular/system/tComplaint/tComplaint.js b/cloud-server-management/src/main/webapp/static/modular/system/tComplaint/tComplaint.js index bf5cfd3..67802ac 100644 --- a/cloud-server-management/src/main/webapp/static/modular/system/tComplaint/tComplaint.js +++ b/cloud-server-management/src/main/webapp/static/modular/system/tComplaint/tComplaint.js @@ -132,7 +132,7 @@ if(language==1){ Feng.info("请先选中表格中的某一记录!"); }else if(language==2){ - Feng.info("Please select a record in the table first!"); + Feng.info("Please select 条记录 in the table first!"); }else { Feng.info("Pilih catatan di tabel terlebih dahulu!"); } diff --git a/cloud-server-management/src/main/webapp/static/modular/system/tCoupon/TCoupon.js b/cloud-server-management/src/main/webapp/static/modular/system/tCoupon/TCoupon.js index fe7d648..6c7f68b 100644 --- a/cloud-server-management/src/main/webapp/static/modular/system/tCoupon/TCoupon.js +++ b/cloud-server-management/src/main/webapp/static/modular/system/tCoupon/TCoupon.js @@ -16,16 +16,35 @@ {field: 'selectItem', radio: true}, {title: 'id', field: 'id', visible: false, align: 'center', valign: 'middle'}, {title: '优惠券名称', field: 'name', visible: true, align: 'center', valign: 'middle'}, - {title: '适用范围', field: 'useScope', visible: true, align: 'center', valign: 'middle'}, - {title: '优惠券类型', field: 'type', visible: true, align: 'center', valign: 'middle'}, - {title: '发放方式', field: 'distributionMethod', visible: true, align: 'center', valign: 'middle'}, + {title: '适用范围', field: 'useScope', visible: true, align: 'center', valign: 'middle', + formatter: function (value, row, index) { + return {1: "全国", 2: "指定城市", 3: "指定门店"}[value] + } + }, + {title: '优惠券类型', field: 'type', visible: true, align: 'center', valign: 'middle', + formatter: function (value, row, index) { + return {1: "满减券", 2: "代金券", 3: "体验券"}[value] + }}, + {title: '发放方式', field: 'distributionMethod', visible: true, align: 'center', valign: 'middle', + formatter: function (value, row, index) { + return {1: "积分购买", 2: "注册赠送", 3: "自动发券"}[value] + }}, {title: '有效期', field: 'timeValue', visible: true, align: 'center', valign: 'middle'}, - {title: '用户人群', field: 'userPopulation', visible: true, align: 'center', valign: 'middle'}, + {title: '用户人群', field: 'userPopulation', visible: true, align: 'center', valign: 'middle', + formatter: function (value, row, index) { + return {1: "全部用户", 2: "年度会员", 3: "已有学员用户"}[value] + }}, {title: '发放数量', field: 'quantityIssued', visible: true, align: 'center', valign: 'middle'}, {title: '限领数量', field: 'pickUpQuantity', visible: true, align: 'center', valign: 'middle'}, {title: '已领数量', field: 'hasPickQty', visible: true, align: 'center', valign: 'middle'}, - {title: 'status', field: 'useTimes', visible: true, align: 'center', valign: 'middle'}, - {title: 'state', field: 'couponType', visible: true, align: 'center', valign: 'middle'}, + {title: '活动状态', field: 'status', visible: true, align: 'center', valign: 'middle', + formatter: function (value, row, index) { + return {1: "未开始", 2: "已开始", 3: "已结束"}[value] + }}, + {title: '可售状态', field: 'state', visible: true, align: 'center', valign: 'middle', + formatter: function (value, row, index) { + return {1: "上架", 2: "下架"}[value] + }}, ]; }; diff --git a/cloud-server-management/src/main/webapp/static/modular/system/tDispatch/tDispatch.js b/cloud-server-management/src/main/webapp/static/modular/system/tDispatch/tDispatch.js index f02538a..c5c3850 100644 --- a/cloud-server-management/src/main/webapp/static/modular/system/tDispatch/tDispatch.js +++ b/cloud-server-management/src/main/webapp/static/modular/system/tDispatch/tDispatch.js @@ -97,7 +97,7 @@ if(language==1){ Feng.info("请先选中表格中的某一记录!"); }else if(language==2){ - Feng.info("Please select a record in the table first!"); + Feng.info("Please select 条记录 in the table first!"); }else { Feng.info("Pilih catatan di tabel terlebih dahulu!"); } diff --git a/cloud-server-management/src/main/webapp/static/modular/system/tDriver/tDriver.js b/cloud-server-management/src/main/webapp/static/modular/system/tDriver/tDriver.js index 4dcc57f..6c34a14 100644 --- a/cloud-server-management/src/main/webapp/static/modular/system/tDriver/tDriver.js +++ b/cloud-server-management/src/main/webapp/static/modular/system/tDriver/tDriver.js @@ -250,7 +250,7 @@ if(language==1){ Feng.info("请先选中表格中的某一记录!"); }else if(language==2){ - Feng.info("Please select a record in the table first!"); + Feng.info("Please select 条记录 in the table first!"); }else { Feng.info("Pilih catatan di tabel terlebih dahulu!"); } diff --git a/cloud-server-management/src/main/webapp/static/modular/system/tDriver/tDriverVerify.js b/cloud-server-management/src/main/webapp/static/modular/system/tDriver/tDriverVerify.js index 830ad35..ac820a9 100644 --- a/cloud-server-management/src/main/webapp/static/modular/system/tDriver/tDriverVerify.js +++ b/cloud-server-management/src/main/webapp/static/modular/system/tDriver/tDriverVerify.js @@ -185,7 +185,7 @@ if(language==1){ Feng.info("请先选中表格中的某一记录!"); }else if(language==2){ - Feng.info("Please select a record in the table first!"); + Feng.info("Please select 条记录 in the table first!"); }else { Feng.info("Pilih catatan di tabel terlebih dahulu!"); } diff --git a/cloud-server-management/src/main/webapp/static/modular/system/tDriver/yesDriver.js b/cloud-server-management/src/main/webapp/static/modular/system/tDriver/yesDriver.js index 7064fc6..c7e51be 100644 --- a/cloud-server-management/src/main/webapp/static/modular/system/tDriver/yesDriver.js +++ b/cloud-server-management/src/main/webapp/static/modular/system/tDriver/yesDriver.js @@ -176,7 +176,7 @@ if(language==1){ Feng.info("请先选中表格中的某一记录!"); }else if(language==2){ - Feng.info("Please select a record in the table first!"); + Feng.info("Please select 条记录 in the table first!"); }else { Feng.info("Pilih catatan di tabel terlebih dahulu!"); } diff --git a/cloud-server-management/src/main/webapp/static/modular/system/tDriver/yesDriver_selectCar.js b/cloud-server-management/src/main/webapp/static/modular/system/tDriver/yesDriver_selectCar.js index 4cc8ef8..a5f94b9 100644 --- a/cloud-server-management/src/main/webapp/static/modular/system/tDriver/yesDriver_selectCar.js +++ b/cloud-server-management/src/main/webapp/static/modular/system/tDriver/yesDriver_selectCar.js @@ -91,7 +91,7 @@ if(language==1){ Feng.info("请先选中表格中的某一记录!"); }else if(language==2){ - Feng.info("Please select a record in the table first!"); + Feng.info("Please select 条记录 in the table first!"); }else { Feng.info("Pilih catatan di tabel terlebih dahulu!"); } @@ -147,7 +147,7 @@ if(language==1){ Feng.info("请先选中表格中的某一记录!"); }else if(language==2){ - Feng.info("Please select a record in the table first!"); + Feng.info("Please select 条记录 in the table first!"); }else { Feng.info("Pilih catatan di tabel terlebih dahulu!"); } diff --git a/cloud-server-management/src/main/webapp/static/modular/system/tEnsureIncomeRule/tEnsureIncomeRule.js b/cloud-server-management/src/main/webapp/static/modular/system/tEnsureIncomeRule/tEnsureIncomeRule.js index 0966a14..40f13ef 100644 --- a/cloud-server-management/src/main/webapp/static/modular/system/tEnsureIncomeRule/tEnsureIncomeRule.js +++ b/cloud-server-management/src/main/webapp/static/modular/system/tEnsureIncomeRule/tEnsureIncomeRule.js @@ -106,7 +106,7 @@ Feng.info("请先选中表格中的某一记录!"); } if(language == 2){ - Feng.info("Please select a record in the table first!"); + Feng.info("Please select 条记录 in the table first!"); } if(language == 3){ Feng.info("Silakan pilih catatan di tabel pertama!"); diff --git a/cloud-server-management/src/main/webapp/static/modular/system/tFeedback/tFeedback.js b/cloud-server-management/src/main/webapp/static/modular/system/tFeedback/tFeedback.js index 2092f22..11678f3 100644 --- a/cloud-server-management/src/main/webapp/static/modular/system/tFeedback/tFeedback.js +++ b/cloud-server-management/src/main/webapp/static/modular/system/tFeedback/tFeedback.js @@ -159,7 +159,7 @@ if(language==1){ Feng.info("请先选中表格中的某一记录!"); }else if(language==2){ - Feng.info("Please select a record in the table first!"); + Feng.info("Please select 条记录 in the table first!"); }else { Feng.info("Pilih catatan di tabel terlebih dahulu!"); } diff --git a/cloud-server-management/src/main/webapp/static/modular/system/tFeedback/userFeedback.js b/cloud-server-management/src/main/webapp/static/modular/system/tFeedback/userFeedback.js index 5b6b8e8..a94680e 100644 --- a/cloud-server-management/src/main/webapp/static/modular/system/tFeedback/userFeedback.js +++ b/cloud-server-management/src/main/webapp/static/modular/system/tFeedback/userFeedback.js @@ -168,7 +168,7 @@ if(language==1){ Feng.info("请先选中表格中的某一记录!"); }else if(language==2){ - Feng.info("Please select a record in the table first!"); + Feng.info("Please select 条记录 in the table first!"); }else { Feng.info("Pilih catatan di tabel terlebih dahulu!"); } diff --git a/cloud-server-management/src/main/webapp/static/modular/system/tGuidePage/tbGuidePage.js b/cloud-server-management/src/main/webapp/static/modular/system/tGuidePage/tbGuidePage.js index db01a39..5ca1a4f 100644 --- a/cloud-server-management/src/main/webapp/static/modular/system/tGuidePage/tbGuidePage.js +++ b/cloud-server-management/src/main/webapp/static/modular/system/tGuidePage/tbGuidePage.js @@ -97,7 +97,7 @@ if(language==1){ Feng.info("请先选中表格中的某一记录!"); }else if(language==2){ - Feng.info("Please select a record in the table first!"); + Feng.info("Please select 条记录 in the table first!"); }else { Feng.info("Pilih catatan di tabel terlebih dahulu!"); } diff --git a/cloud-server-management/src/main/webapp/static/modular/system/tHotAddress/tbHotAddress.js b/cloud-server-management/src/main/webapp/static/modular/system/tHotAddress/tbHotAddress.js index 5b9ec05..6fffc95 100644 --- a/cloud-server-management/src/main/webapp/static/modular/system/tHotAddress/tbHotAddress.js +++ b/cloud-server-management/src/main/webapp/static/modular/system/tHotAddress/tbHotAddress.js @@ -80,7 +80,7 @@ if(language==1){ Feng.info("请先选中表格中的某一记录!"); }else if(language==2){ - Feng.info("Please select a record in the table first!"); + Feng.info("Please select 条记录 in the table first!"); }else { Feng.info("Pilih catatan di tabel terlebih dahulu!"); } diff --git a/cloud-server-management/src/main/webapp/static/modular/system/tIntegralGoods/tIntegralGoods.js b/cloud-server-management/src/main/webapp/static/modular/system/tIntegralGoods/tIntegralGoods.js index e56c49c..be2b0b7 100644 --- a/cloud-server-management/src/main/webapp/static/modular/system/tIntegralGoods/tIntegralGoods.js +++ b/cloud-server-management/src/main/webapp/static/modular/system/tIntegralGoods/tIntegralGoods.js @@ -78,7 +78,7 @@ if(language==1){ Feng.info("请先选中表格中的某一记录!"); }else if(language==2){ - Feng.info("Please select a record in the table first!"); + Feng.info("Please select 条记录 in the table first!"); }else { Feng.info("Pilih catatan di tabel terlebih dahulu!"); } diff --git a/cloud-server-management/src/main/webapp/static/modular/system/tIntegralOrder/tIntegralOrder.js b/cloud-server-management/src/main/webapp/static/modular/system/tIntegralOrder/tIntegralOrder.js index cf825e4..562eef7 100644 --- a/cloud-server-management/src/main/webapp/static/modular/system/tIntegralOrder/tIntegralOrder.js +++ b/cloud-server-management/src/main/webapp/static/modular/system/tIntegralOrder/tIntegralOrder.js @@ -135,7 +135,7 @@ if(language==1){ Feng.info("请先选中表格中的某一记录!"); }else if(language==2){ - Feng.info("Please select a record in the table first!"); + Feng.info("Please select 条记录 in the table first!"); }else { Feng.info("Pilih catatan di tabel terlebih dahulu!"); } diff --git a/cloud-server-management/src/main/webapp/static/modular/system/tInvoice/tInvoice.js b/cloud-server-management/src/main/webapp/static/modular/system/tInvoice/tInvoice.js index 2e21dee..814844f 100644 --- a/cloud-server-management/src/main/webapp/static/modular/system/tInvoice/tInvoice.js +++ b/cloud-server-management/src/main/webapp/static/modular/system/tInvoice/tInvoice.js @@ -142,7 +142,7 @@ if(language==1){ Feng.info("请先选中表格中的某一记录!"); }else if(language==2){ - Feng.info("Please select a record in the table first!"); + Feng.info("Please select 条记录 in the table first!"); }else { Feng.info("Pilih catatan di tabel terlebih dahulu!"); } diff --git a/cloud-server-management/src/main/webapp/static/modular/system/tLine/tLine.js b/cloud-server-management/src/main/webapp/static/modular/system/tLine/tLine.js index 53aba83..8ccafdb 100644 --- a/cloud-server-management/src/main/webapp/static/modular/system/tLine/tLine.js +++ b/cloud-server-management/src/main/webapp/static/modular/system/tLine/tLine.js @@ -95,7 +95,7 @@ if(language==1){ Feng.info("请先选中表格中的某一记录!"); }else if(language==2){ - Feng.info("Please select a record in the table first!"); + Feng.info("Please select 条记录 in the table first!"); }else { Feng.info("Pilih catatan di tabel terlebih dahulu!"); } diff --git a/cloud-server-management/src/main/webapp/static/modular/system/tMotorModel/tMotorModel.js b/cloud-server-management/src/main/webapp/static/modular/system/tMotorModel/tMotorModel.js index a783f09..4d1f8a1 100644 --- a/cloud-server-management/src/main/webapp/static/modular/system/tMotorModel/tMotorModel.js +++ b/cloud-server-management/src/main/webapp/static/modular/system/tMotorModel/tMotorModel.js @@ -108,7 +108,7 @@ if(language==1){ Feng.info("请先选中表格中的某一记录!"); }else if(language==2){ - Feng.info("Please select a record in the table first!"); + Feng.info("Please select 条记录 in the table first!"); }else { Feng.info("Pilih catatan di tabel terlebih dahulu!"); } diff --git a/cloud-server-management/src/main/webapp/static/modular/system/tNotices/system.js b/cloud-server-management/src/main/webapp/static/modular/system/tNotices/system.js index 4f29928..9777eff 100644 --- a/cloud-server-management/src/main/webapp/static/modular/system/tNotices/system.js +++ b/cloud-server-management/src/main/webapp/static/modular/system/tNotices/system.js @@ -94,7 +94,7 @@ if(language==1){ Feng.info("请先选中表格中的某一记录!"); }else if(language==2){ - Feng.info("Please select a record in the table first!"); + Feng.info("Please select 条记录 in the table first!"); }else { Feng.info("Pilih catatan di tabel terlebih dahulu!"); } diff --git a/cloud-server-management/src/main/webapp/static/modular/system/tNotices/tNotices.js b/cloud-server-management/src/main/webapp/static/modular/system/tNotices/tNotices.js index 2e5c494..2e2c2b4 100644 --- a/cloud-server-management/src/main/webapp/static/modular/system/tNotices/tNotices.js +++ b/cloud-server-management/src/main/webapp/static/modular/system/tNotices/tNotices.js @@ -93,7 +93,7 @@ if(language==1){ Feng.info("请先选中表格中的某一记录!"); }else if(language==2){ - Feng.info("Please select a record in the table first!"); + Feng.info("Please select 条记录 in the table first!"); }else { Feng.info("Pilih catatan di tabel terlebih dahulu!"); } diff --git a/cloud-server-management/src/main/webapp/static/modular/system/tOpenCity/tOpenCity.js b/cloud-server-management/src/main/webapp/static/modular/system/tOpenCity/tOpenCity.js index bad9435..97f2ba1 100644 --- a/cloud-server-management/src/main/webapp/static/modular/system/tOpenCity/tOpenCity.js +++ b/cloud-server-management/src/main/webapp/static/modular/system/tOpenCity/tOpenCity.js @@ -105,7 +105,7 @@ if(language==1){ Feng.info("请先选中表格中的某一记录!"); }else if(language==2){ - Feng.info("Please select a record in the table first!"); + Feng.info("Please select 条记录 in the table first!"); }else { Feng.info("Pilih catatan di tabel terlebih dahulu!"); } diff --git a/cloud-server-management/src/main/webapp/static/modular/system/tOrderCharter/tOrderCharter.js b/cloud-server-management/src/main/webapp/static/modular/system/tOrderCharter/tOrderCharter.js index 3997b80..f078ea8 100644 --- a/cloud-server-management/src/main/webapp/static/modular/system/tOrderCharter/tOrderCharter.js +++ b/cloud-server-management/src/main/webapp/static/modular/system/tOrderCharter/tOrderCharter.js @@ -127,7 +127,7 @@ if(language==1){ Feng.info("请先选中表格中的某一记录!"); }else if(language==2){ - Feng.info("Please select a record in the table first!"); + Feng.info("Please select 条记录 in the table first!"); }else { Feng.info("Pilih catatan di tabel terlebih dahulu!"); } diff --git a/cloud-server-management/src/main/webapp/static/modular/system/tOrderCharteredCar/tOrderCharteredCar.js b/cloud-server-management/src/main/webapp/static/modular/system/tOrderCharteredCar/tOrderCharteredCar.js index e7ac110..60f5ed4 100644 --- a/cloud-server-management/src/main/webapp/static/modular/system/tOrderCharteredCar/tOrderCharteredCar.js +++ b/cloud-server-management/src/main/webapp/static/modular/system/tOrderCharteredCar/tOrderCharteredCar.js @@ -121,7 +121,7 @@ if(language==1){ Feng.info("请先选中表格中的某一记录!"); }else if(language==2){ - Feng.info("Please select a record in the table first!"); + Feng.info("Please select 条记录 in the table first!"); }else { Feng.info("Pilih catatan di tabel terlebih dahulu!"); } diff --git a/cloud-server-management/src/main/webapp/static/modular/system/tOrderCrossCity/tOrderCrossCity.js b/cloud-server-management/src/main/webapp/static/modular/system/tOrderCrossCity/tOrderCrossCity.js index e72ab31..13bde73 100644 --- a/cloud-server-management/src/main/webapp/static/modular/system/tOrderCrossCity/tOrderCrossCity.js +++ b/cloud-server-management/src/main/webapp/static/modular/system/tOrderCrossCity/tOrderCrossCity.js @@ -230,7 +230,7 @@ if(language==1){ Feng.info("请先选中表格中的某一记录!"); }else if(language==2){ - Feng.info("Please select a record in the table first!"); + Feng.info("Please select 条记录 in the table first!"); }else { Feng.info("Pilih catatan di tabel terlebih dahulu!"); } diff --git a/cloud-server-management/src/main/webapp/static/modular/system/tOrderEvaluate/tOrderEvaluate.js b/cloud-server-management/src/main/webapp/static/modular/system/tOrderEvaluate/tOrderEvaluate.js index d9f50d7..418d9da 100644 --- a/cloud-server-management/src/main/webapp/static/modular/system/tOrderEvaluate/tOrderEvaluate.js +++ b/cloud-server-management/src/main/webapp/static/modular/system/tOrderEvaluate/tOrderEvaluate.js @@ -114,7 +114,7 @@ if(language==1){ Feng.info("请先选中表格中的某一记录!"); }else if(language==2){ - Feng.info("Please select a record in the table first!"); + Feng.info("Please select 条记录 in the table first!"); }else { Feng.info("Pilih catatan di tabel terlebih dahulu!"); } diff --git a/cloud-server-management/src/main/webapp/static/modular/system/tOrderLogistics/tOrderLogistics.js b/cloud-server-management/src/main/webapp/static/modular/system/tOrderLogistics/tOrderLogistics.js index 7fbdab4..33edc09 100644 --- a/cloud-server-management/src/main/webapp/static/modular/system/tOrderLogistics/tOrderLogistics.js +++ b/cloud-server-management/src/main/webapp/static/modular/system/tOrderLogistics/tOrderLogistics.js @@ -270,7 +270,7 @@ if(language==1){ Feng.info("请先选中表格中的某一记录!"); }else if(language==2){ - Feng.info("Please select a record in the table first!"); + Feng.info("Please select 条记录 in the table first!"); }else { Feng.info("Pilih catatan di tabel terlebih dahulu!"); } diff --git a/cloud-server-management/src/main/webapp/static/modular/system/tOrderPrivateCar/tOrderPrivateCar.js b/cloud-server-management/src/main/webapp/static/modular/system/tOrderPrivateCar/tOrderPrivateCar.js index 29fe733..c2e43a1 100644 --- a/cloud-server-management/src/main/webapp/static/modular/system/tOrderPrivateCar/tOrderPrivateCar.js +++ b/cloud-server-management/src/main/webapp/static/modular/system/tOrderPrivateCar/tOrderPrivateCar.js @@ -273,7 +273,7 @@ if(language==1){ Feng.info("请先选中表格中的某一记录!"); }else if(language==2){ - Feng.info("Please select a record in the table first!"); + Feng.info("Please select 条记录 in the table first!"); }else { Feng.info("Pilih catatan di tabel terlebih dahulu!"); } diff --git a/cloud-server-management/src/main/webapp/static/modular/system/tOrderTaxi/selectDriver.js b/cloud-server-management/src/main/webapp/static/modular/system/tOrderTaxi/selectDriver.js index 1205a91..28aaa16 100644 --- a/cloud-server-management/src/main/webapp/static/modular/system/tOrderTaxi/selectDriver.js +++ b/cloud-server-management/src/main/webapp/static/modular/system/tOrderTaxi/selectDriver.js @@ -90,7 +90,7 @@ if(language==1){ Feng.info("请先选中表格中的某一记录!"); }else if(language==2){ - Feng.info("Please select a record in the table first!"); + Feng.info("Please select 条记录 in the table first!"); }else { Feng.info("Pilih catatan di tabel terlebih dahulu!"); } diff --git a/cloud-server-management/src/main/webapp/static/modular/system/tOrderTaxi/tOrderTaxi.js b/cloud-server-management/src/main/webapp/static/modular/system/tOrderTaxi/tOrderTaxi.js index a73b713..19e76cb 100644 --- a/cloud-server-management/src/main/webapp/static/modular/system/tOrderTaxi/tOrderTaxi.js +++ b/cloud-server-management/src/main/webapp/static/modular/system/tOrderTaxi/tOrderTaxi.js @@ -214,7 +214,7 @@ if(language==1){ Feng.info("请先选中表格中的某一记录!"); }else if(language==2){ - Feng.info("Please select a record in the table first!"); + Feng.info("Please select 条记录 in the table first!"); }else { Feng.info("Pilih catatan di tabel terlebih dahulu!"); } diff --git a/cloud-server-management/src/main/webapp/static/modular/system/tProblem/tProblem.js b/cloud-server-management/src/main/webapp/static/modular/system/tProblem/tProblem.js index 7a91afe..1822132 100644 --- a/cloud-server-management/src/main/webapp/static/modular/system/tProblem/tProblem.js +++ b/cloud-server-management/src/main/webapp/static/modular/system/tProblem/tProblem.js @@ -168,7 +168,7 @@ if(language==1){ Feng.info("请先选中表格中的某一记录!"); }else if(language==2){ - Feng.info("Please select a record in the table first!"); + Feng.info("Please select 条记录 in the table first!"); }else { Feng.info("Pilih catatan di tabel terlebih dahulu!"); } diff --git a/cloud-server-management/src/main/webapp/static/modular/system/tPubWithdrawal/tPubWithdrawal.js b/cloud-server-management/src/main/webapp/static/modular/system/tPubWithdrawal/tPubWithdrawal.js index bf6c2e2..b8442f3 100644 --- a/cloud-server-management/src/main/webapp/static/modular/system/tPubWithdrawal/tPubWithdrawal.js +++ b/cloud-server-management/src/main/webapp/static/modular/system/tPubWithdrawal/tPubWithdrawal.js @@ -191,7 +191,7 @@ if(language==1){ Feng.info("请先选中表格中的某一记录!"); }else if(language==2){ - Feng.info("Please select a record in the table first!"); + Feng.info("Please select 条记录 in the table first!"); }else { Feng.info("Harap pilih catatan di tabel terlebih dahulu!"); } diff --git a/cloud-server-management/src/main/webapp/static/modular/system/tReassign/selectCrossDriver.js b/cloud-server-management/src/main/webapp/static/modular/system/tReassign/selectCrossDriver.js index b2292fe..e85a159 100644 --- a/cloud-server-management/src/main/webapp/static/modular/system/tReassign/selectCrossDriver.js +++ b/cloud-server-management/src/main/webapp/static/modular/system/tReassign/selectCrossDriver.js @@ -90,7 +90,7 @@ if(language==1){ Feng.info("请先选中表格中的某一记录!"); }else if(language==2){ - Feng.info("Please select a record in the table first!"); + Feng.info("Please select 条记录 in the table first!"); }else { Feng.info("Pilih catatan di tabel terlebih dahulu!"); } diff --git a/cloud-server-management/src/main/webapp/static/modular/system/tReassign/selectPrivateCarDriver.js b/cloud-server-management/src/main/webapp/static/modular/system/tReassign/selectPrivateCarDriver.js index cfc028e..22b2763 100644 --- a/cloud-server-management/src/main/webapp/static/modular/system/tReassign/selectPrivateCarDriver.js +++ b/cloud-server-management/src/main/webapp/static/modular/system/tReassign/selectPrivateCarDriver.js @@ -90,7 +90,7 @@ if(language==1){ Feng.info("请先选中表格中的某一记录!"); }else if(language==2){ - Feng.info("Please select a record in the table first!"); + Feng.info("Please select 条记录 in the table first!"); }else { Feng.info("Pilih catatan di tabel terlebih dahulu!"); } diff --git a/cloud-server-management/src/main/webapp/static/modular/system/tReassign/selectSmallDriver.js b/cloud-server-management/src/main/webapp/static/modular/system/tReassign/selectSmallDriver.js index 6e4f553..c22812e 100644 --- a/cloud-server-management/src/main/webapp/static/modular/system/tReassign/selectSmallDriver.js +++ b/cloud-server-management/src/main/webapp/static/modular/system/tReassign/selectSmallDriver.js @@ -90,7 +90,7 @@ if(language==1){ Feng.info("请先选中表格中的某一记录!"); }else if(language==2){ - Feng.info("Please select a record in the table first!"); + Feng.info("Please select 条记录 in the table first!"); }else { Feng.info("Pilih catatan di tabel terlebih dahulu!"); } diff --git a/cloud-server-management/src/main/webapp/static/modular/system/tReassign/smallPieceLogistics.js b/cloud-server-management/src/main/webapp/static/modular/system/tReassign/smallPieceLogistics.js index 2c55d40..fa4e122 100644 --- a/cloud-server-management/src/main/webapp/static/modular/system/tReassign/smallPieceLogistics.js +++ b/cloud-server-management/src/main/webapp/static/modular/system/tReassign/smallPieceLogistics.js @@ -226,7 +226,7 @@ if(language==1){ Feng.info("请先选中表格中的某一记录!"); }else if(language==2){ - Feng.info("Please select a record in the table first!"); + Feng.info("Please select 条记录 in the table first!"); }else { Feng.info("Pilih catatan di tabel terlebih dahulu!"); } diff --git a/cloud-server-management/src/main/webapp/static/modular/system/tReassign/tCross.js b/cloud-server-management/src/main/webapp/static/modular/system/tReassign/tCross.js index 5e5f9ba..b736187 100644 --- a/cloud-server-management/src/main/webapp/static/modular/system/tReassign/tCross.js +++ b/cloud-server-management/src/main/webapp/static/modular/system/tReassign/tCross.js @@ -226,7 +226,7 @@ if(language==1){ Feng.info("请先选中表格中的某一记录!"); }else if(language==2){ - Feng.info("Please select a record in the table first!"); + Feng.info("Please select 条记录 in the table first!"); }else { Feng.info("Pilih catatan di tabel terlebih dahulu!"); } diff --git a/cloud-server-management/src/main/webapp/static/modular/system/tReassign/tReassign.js b/cloud-server-management/src/main/webapp/static/modular/system/tReassign/tReassign.js index ed54eed..a9180f5 100644 --- a/cloud-server-management/src/main/webapp/static/modular/system/tReassign/tReassign.js +++ b/cloud-server-management/src/main/webapp/static/modular/system/tReassign/tReassign.js @@ -226,7 +226,7 @@ if(language==1){ Feng.info("请先选中表格中的某一记录!"); }else if(language==2){ - Feng.info("Please select a record in the table first!"); + Feng.info("Please select 条记录 in the table first!"); }else { Feng.info("Pilih catatan di tabel terlebih dahulu!"); } diff --git a/cloud-server-management/src/main/webapp/static/modular/system/tServerCarmodel/acrossCity.js b/cloud-server-management/src/main/webapp/static/modular/system/tServerCarmodel/acrossCity.js index 1d04daa..3e609c7 100644 --- a/cloud-server-management/src/main/webapp/static/modular/system/tServerCarmodel/acrossCity.js +++ b/cloud-server-management/src/main/webapp/static/modular/system/tServerCarmodel/acrossCity.js @@ -69,7 +69,7 @@ if(language==1){ Feng.info("请先选中表格中的某一记录!"); }else if(language==2){ - Feng.info("Please select a record in the table first!"); + Feng.info("Please select 条记录 in the table first!"); }else { Feng.info("Pilih catatan di tabel terlebih dahulu!"); } diff --git a/cloud-server-management/src/main/webapp/static/modular/system/tServerCarmodel/charter.js b/cloud-server-management/src/main/webapp/static/modular/system/tServerCarmodel/charter.js index dbfbab2..360c024 100644 --- a/cloud-server-management/src/main/webapp/static/modular/system/tServerCarmodel/charter.js +++ b/cloud-server-management/src/main/webapp/static/modular/system/tServerCarmodel/charter.js @@ -78,7 +78,7 @@ if(language==1){ Feng.info("请先选中表格中的某一记录!"); }else if(language==2){ - Feng.info("Please select a record in the table first!"); + Feng.info("Please select 条记录 in the table first!"); }else { Feng.info("Pilih catatan di tabel terlebih dahulu!"); } diff --git a/cloud-server-management/src/main/webapp/static/modular/system/tServerCarmodel/tServerCarmodel.js b/cloud-server-management/src/main/webapp/static/modular/system/tServerCarmodel/tServerCarmodel.js index 597bbf8..0c98a0a 100644 --- a/cloud-server-management/src/main/webapp/static/modular/system/tServerCarmodel/tServerCarmodel.js +++ b/cloud-server-management/src/main/webapp/static/modular/system/tServerCarmodel/tServerCarmodel.js @@ -69,7 +69,7 @@ if(language==1){ Feng.info("请先选中表格中的某一记录!"); }else if(language==2){ - Feng.info("Please select a record in the table first!"); + Feng.info("Please select 条记录 in the table first!"); }else { Feng.info("Pilih catatan di tabel terlebih dahulu!"); } diff --git a/cloud-server-management/src/main/webapp/static/modular/system/tSite/tSite.js b/cloud-server-management/src/main/webapp/static/modular/system/tSite/tSite.js index 943e2b7..098489c 100644 --- a/cloud-server-management/src/main/webapp/static/modular/system/tSite/tSite.js +++ b/cloud-server-management/src/main/webapp/static/modular/system/tSite/tSite.js @@ -98,7 +98,7 @@ if(language==1){ Feng.info("请先选中表格中的某一记录!"); }else if(language==2){ - Feng.info("Please select a record in the table first!"); + Feng.info("Please select 条记录 in the table first!"); }else { Feng.info("Pilih catatan di tabel terlebih dahulu!"); } diff --git a/cloud-server-management/src/main/webapp/static/modular/system/tSmsrecord/tSmsrecord.js b/cloud-server-management/src/main/webapp/static/modular/system/tSmsrecord/tSmsrecord.js index 03bf800..46b91fa 100644 --- a/cloud-server-management/src/main/webapp/static/modular/system/tSmsrecord/tSmsrecord.js +++ b/cloud-server-management/src/main/webapp/static/modular/system/tSmsrecord/tSmsrecord.js @@ -81,7 +81,7 @@ if(language==1){ Feng.info("请先选中表格中的某一记录!"); }else if(language==2){ - Feng.info("Please select a record in the table first!"); + Feng.info("Please select 条记录 in the table first!"); }else { Feng.info("Pilih catatan di tabel terlebih dahulu!"); } diff --git a/cloud-server-management/src/main/webapp/static/modular/system/tStartPage/tbStartPage.js b/cloud-server-management/src/main/webapp/static/modular/system/tStartPage/tbStartPage.js index 5d4cbee..dbe2718 100644 --- a/cloud-server-management/src/main/webapp/static/modular/system/tStartPage/tbStartPage.js +++ b/cloud-server-management/src/main/webapp/static/modular/system/tStartPage/tbStartPage.js @@ -88,7 +88,7 @@ if(language==1){ Feng.info("请先选中表格中的某一记录!"); }else if(language==2){ - Feng.info("Please select a record in the table first!"); + Feng.info("Please select 条记录 in the table first!"); }else { Feng.info("Pilih catatan di tabel terlebih dahulu!"); } diff --git a/cloud-server-management/src/main/webapp/static/modular/system/tSysSensitiveWords/tSysSensitiveWords.js b/cloud-server-management/src/main/webapp/static/modular/system/tSysSensitiveWords/tSysSensitiveWords.js index 4040208..2a842d5 100644 --- a/cloud-server-management/src/main/webapp/static/modular/system/tSysSensitiveWords/tSysSensitiveWords.js +++ b/cloud-server-management/src/main/webapp/static/modular/system/tSysSensitiveWords/tSysSensitiveWords.js @@ -61,7 +61,7 @@ if(language==1){ Feng.info("请先选中表格中的某一记录!"); }else if(language==2){ - Feng.info("Please select a record in the table first!"); + Feng.info("Please select 条记录 in the table first!"); }else { Feng.info("Pilih catatan di tabel terlebih dahulu!"); } diff --git a/cloud-server-management/src/main/webapp/static/modular/system/tSystemPrice/tSystemPrice.js b/cloud-server-management/src/main/webapp/static/modular/system/tSystemPrice/tSystemPrice.js index 8086860..21924fc 100644 --- a/cloud-server-management/src/main/webapp/static/modular/system/tSystemPrice/tSystemPrice.js +++ b/cloud-server-management/src/main/webapp/static/modular/system/tSystemPrice/tSystemPrice.js @@ -88,7 +88,7 @@ if(language==1){ Feng.info("请先选中表格中的某一记录!"); }else if(language==2){ - Feng.info("Please select a record in the table first!"); + Feng.info("Please select 条记录 in the table first!"); }else { Feng.info("Pilih catatan di tabel terlebih dahulu!"); } diff --git a/cloud-server-management/src/main/webapp/static/modular/system/tSystemPrice/tSystemPriceService.js b/cloud-server-management/src/main/webapp/static/modular/system/tSystemPrice/tSystemPriceService.js index 1dc7cab..e6f8b6f 100644 --- a/cloud-server-management/src/main/webapp/static/modular/system/tSystemPrice/tSystemPriceService.js +++ b/cloud-server-management/src/main/webapp/static/modular/system/tSystemPrice/tSystemPriceService.js @@ -136,7 +136,7 @@ if(language==1){ Feng.info("请先选中表格中的某一记录!"); }else if(language==2){ - Feng.info("Please select a record in the table first!"); + Feng.info("Please select 条记录 in the table first!"); }else { Feng.info("Pilih catatan di tabel terlebih dahulu!"); } diff --git a/cloud-server-management/src/main/webapp/static/modular/system/tUser/tUser.js b/cloud-server-management/src/main/webapp/static/modular/system/tUser/tUser.js index 3d3ac31..6415e74 100644 --- a/cloud-server-management/src/main/webapp/static/modular/system/tUser/tUser.js +++ b/cloud-server-management/src/main/webapp/static/modular/system/tUser/tUser.js @@ -196,7 +196,7 @@ if(language==1){ Feng.info("请先选中表格中的某一记录!"); }else if(language==2){ - Feng.info("Please select a record in the table!"); + Feng.info("Please select 条记录 in the table!"); }else { Feng.info("Pilih catatan di tabel terlebih dahulu!"); } diff --git a/cloud-server-management/src/main/webapp/static/modular/system/tUserExit/tbUserExit.js b/cloud-server-management/src/main/webapp/static/modular/system/tUserExit/tbUserExit.js index 1c5b048..799e2ab 100644 --- a/cloud-server-management/src/main/webapp/static/modular/system/tUserExit/tbUserExit.js +++ b/cloud-server-management/src/main/webapp/static/modular/system/tUserExit/tbUserExit.js @@ -80,7 +80,7 @@ if(language==1){ Feng.info("请先选中表格中的某一记录!"); }else if(language==2){ - Feng.info("Please select a record in the table first!"); + Feng.info("Please select 条记录 in the table first!"); }else { Feng.info("Pilih catatan di tabel terlebih dahulu!"); } diff --git a/cloud-server-management/src/main/webapp/static/modular/system/tUserLargeCoupon/tUserLargeCoupon.js b/cloud-server-management/src/main/webapp/static/modular/system/tUserLargeCoupon/tUserLargeCoupon.js index a2e013b..03c4686 100644 --- a/cloud-server-management/src/main/webapp/static/modular/system/tUserLargeCoupon/tUserLargeCoupon.js +++ b/cloud-server-management/src/main/webapp/static/modular/system/tUserLargeCoupon/tUserLargeCoupon.js @@ -135,7 +135,7 @@ if(language==1){ Feng.info("请先选中表格中的某一记录!"); }else if(language==2){ - Feng.info("Please select a record in the table first!"); + Feng.info("Please select 条记录 in the table first!"); }else { Feng.info("Pilih catatan di tabel terlebih dahulu!"); } diff --git a/cloud-server-management/src/main/webapp/static/modular/system/tUserRedPacketRecord/tUserRedPacketRecord.js b/cloud-server-management/src/main/webapp/static/modular/system/tUserRedPacketRecord/tUserRedPacketRecord.js index 4f26388..09102ba 100644 --- a/cloud-server-management/src/main/webapp/static/modular/system/tUserRedPacketRecord/tUserRedPacketRecord.js +++ b/cloud-server-management/src/main/webapp/static/modular/system/tUserRedPacketRecord/tUserRedPacketRecord.js @@ -68,7 +68,7 @@ if(language==1){ Feng.info("请先选中表格中的某一记录!"); }else if(language==2){ - Feng.info("Please select a record in the table first!"); + Feng.info("Please select 条记录 in the table first!"); }else { Feng.info("Pilih catatan di tabel terlebih dahulu!"); } diff --git a/cloud-server-management/src/main/webapp/static/modular/system/tVerified/tVerified.js b/cloud-server-management/src/main/webapp/static/modular/system/tVerified/tVerified.js index c5f2696..7b35443 100644 --- a/cloud-server-management/src/main/webapp/static/modular/system/tVerified/tVerified.js +++ b/cloud-server-management/src/main/webapp/static/modular/system/tVerified/tVerified.js @@ -109,7 +109,7 @@ if(language==1){ Feng.info("请先选中表格中的某一记录!"); }else if(language==2){ - Feng.info("Please select a record in the table first!"); + Feng.info("Please select 条记录 in the table first!"); }else { Feng.info("Pilih catatan di tabel terlebih dahulu!"); } diff --git a/cloud-server-management/src/main/webapp/static/modular/system/tVersionManagement/tVersionManagement.js b/cloud-server-management/src/main/webapp/static/modular/system/tVersionManagement/tVersionManagement.js index e495293..f1e753c 100644 --- a/cloud-server-management/src/main/webapp/static/modular/system/tVersionManagement/tVersionManagement.js +++ b/cloud-server-management/src/main/webapp/static/modular/system/tVersionManagement/tVersionManagement.js @@ -197,7 +197,7 @@ if(language==1){ Feng.info("请先选中表格中的某一记录!"); }else if(language==2){ - Feng.info("Please select a record in the table first!"); + Feng.info("Please select 条记录 in the table first!"); }else { Feng.info("Pilih catatan di tabel terlebih dahulu!"); } diff --git a/cloud-server-management/src/main/webapp/static/modular/system/tVoice/tbVoice.js b/cloud-server-management/src/main/webapp/static/modular/system/tVoice/tbVoice.js index b70e7db..d6dfa12 100644 --- a/cloud-server-management/src/main/webapp/static/modular/system/tVoice/tbVoice.js +++ b/cloud-server-management/src/main/webapp/static/modular/system/tVoice/tbVoice.js @@ -149,7 +149,7 @@ if(language==1){ Feng.info("请先选中表格中的某一记录!"); }else if(language==2){ - Feng.info("Please select a record in the table first!"); + Feng.info("Please select 条记录 in the table first!"); }else { Feng.info("Pilih catatan di tabel terlebih dahulu!"); } diff --git a/cloud-server-management/src/main/webapp/static/modular/system/tWithout/tWithout.js b/cloud-server-management/src/main/webapp/static/modular/system/tWithout/tWithout.js index d70fbfa..78b2df9 100644 --- a/cloud-server-management/src/main/webapp/static/modular/system/tWithout/tWithout.js +++ b/cloud-server-management/src/main/webapp/static/modular/system/tWithout/tWithout.js @@ -42,7 +42,7 @@ if(language==1){ Feng.info("请先选中表格中的某一记录!"); }else if(language==2){ - Feng.info("Please select a record in the table first!"); + Feng.info("Please select 条记录 in the table first!"); }else { Feng.info("Pilih catatan di tabel terlebih dahulu!"); } diff --git a/cloud-server-management/src/main/webapp/static/modular/system/tbBanner/tbBanner.js b/cloud-server-management/src/main/webapp/static/modular/system/tbBanner/tbBanner.js index 2675350..a2ff28e 100644 --- a/cloud-server-management/src/main/webapp/static/modular/system/tbBanner/tbBanner.js +++ b/cloud-server-management/src/main/webapp/static/modular/system/tbBanner/tbBanner.js @@ -109,7 +109,7 @@ if(language==1){ Feng.info("请先选中表格中的某一记录!"); }else if(language==2){ - Feng.info("Please select a record in the table first!"); + Feng.info("Please select 条记录 in the table first!"); }else { Feng.info("Pilih catatan di tabel terlebih dahulu!"); } diff --git a/cloud-server-management/src/main/webapp/static/modular/system/user/user.js b/cloud-server-management/src/main/webapp/static/modular/system/user/user.js index fce716f..6b1ae9d 100644 --- a/cloud-server-management/src/main/webapp/static/modular/system/user/user.js +++ b/cloud-server-management/src/main/webapp/static/modular/system/user/user.js @@ -122,7 +122,7 @@ if(language==1){ Feng.info("请先选中表格中的某一记录!"); }else if(language==2){ - Feng.info("Please select a record in the table first!"); + Feng.info("Please select 条记录 in the table first!"); }else { Feng.info("Pilih catatan di tabel terlebih dahulu!"); } diff --git a/cloud-server-management/src/main/webapp/static/modular/system/userActivity/sysCouponRecord.js b/cloud-server-management/src/main/webapp/static/modular/system/userActivity/sysCouponRecord.js index 4de0a7f..1530629 100644 --- a/cloud-server-management/src/main/webapp/static/modular/system/userActivity/sysCouponRecord.js +++ b/cloud-server-management/src/main/webapp/static/modular/system/userActivity/sysCouponRecord.js @@ -84,7 +84,7 @@ if(language==1){ Feng.info("请先选中表格中的某一记录!"); }else if(language==2){ - Feng.info("Please select a record in the table first!"); + Feng.info("Please select 条记录 in the table first!"); }else { Feng.info("Pilih catatan di tabel terlebih dahulu!"); } @@ -129,7 +129,7 @@ if(language==1){ Feng.info("请先选中表格中的某一记录!"); }else if(language==2){ - Feng.info("Please select a record in the table first!"); + Feng.info("Please select 条记录 in the table first!"); }else { Feng.info("Pilih catatan di tabel terlebih dahulu!"); } @@ -144,7 +144,7 @@ if(language==1){ Feng.info("请先选中表格中的某一记录!"); }else if(language==2){ - Feng.info("Please select a record in the table first!"); + Feng.info("Please select 条记录 in the table first!"); }else { Feng.info("Pilih catatan di tabel terlebih dahulu!"); } @@ -165,7 +165,7 @@ if(language==1){ Feng.info("请先选中表格中的某一记录!"); }else if(language==2){ - Feng.info("Please select a record in the table first!"); + Feng.info("Please select 条记录 in the table first!"); }else { Feng.info("Pilih catatan di tabel terlebih dahulu!"); } @@ -180,7 +180,7 @@ if(language==1){ Feng.info("请先选中表格中的某一记录!"); }else if(language==2){ - Feng.info("Please select a record in the table first!"); + Feng.info("Please select 条记录 in the table first!"); }else { Feng.info("Pilih catatan di tabel terlebih dahulu!"); } @@ -199,7 +199,7 @@ if(language==1){ Feng.info("请先选中表格中的某一记录!"); }else if(language==2){ - Feng.info("Please select a record in the table first!"); + Feng.info("Please select 条记录 in the table first!"); }else { Feng.info("Pilih catatan di tabel terlebih dahulu!"); } @@ -212,7 +212,7 @@ if(language==1){ Feng.info("请先选中表格中的某一记录!"); }else if(language==2){ - Feng.info("Please select a record in the table first!"); + Feng.info("Please select 条记录 in the table first!"); }else { Feng.info("Pilih catatan di tabel terlebih dahulu!"); } diff --git a/cloud-server-management/src/main/webapp/static/modular/system/userActivity/sysRedPacketRecord.js b/cloud-server-management/src/main/webapp/static/modular/system/userActivity/sysRedPacketRecord.js index 56383f4..32f31e3 100644 --- a/cloud-server-management/src/main/webapp/static/modular/system/userActivity/sysRedPacketRecord.js +++ b/cloud-server-management/src/main/webapp/static/modular/system/userActivity/sysRedPacketRecord.js @@ -50,7 +50,7 @@ if(language==1){ Feng.info("请先选中表格中的某一记录!"); }else if(language==2){ - Feng.info("Please select a record in the table first!"); + Feng.info("Please select 条记录 in the table first!"); }else { Feng.info("Pilih catatan di tabel terlebih dahulu!"); } @@ -75,7 +75,7 @@ if(language==1){ Feng.info("请先选中表格中的某一记录!"); }else if(language==2){ - Feng.info("Please select a record in the table first!"); + Feng.info("Please select 条记录 in the table first!"); }else { Feng.info("Pilih catatan di tabel terlebih dahulu!"); } @@ -92,7 +92,7 @@ if(language==1){ Feng.info("请先选中表格中的某一记录!"); }else if(language==2){ - Feng.info("Please select a record in the table first!"); + Feng.info("Please select 条记录 in the table first!"); }else { Feng.info("Pilih catatan di tabel terlebih dahulu!"); } diff --git a/cloud-server-management/src/main/webapp/static/modular/system/userActivity/userActivity.js b/cloud-server-management/src/main/webapp/static/modular/system/userActivity/userActivity.js index 5052a25..f50b346 100644 --- a/cloud-server-management/src/main/webapp/static/modular/system/userActivity/userActivity.js +++ b/cloud-server-management/src/main/webapp/static/modular/system/userActivity/userActivity.js @@ -109,7 +109,7 @@ if(language==1){ Feng.info("请先选中表格中的某一记录!"); }else if(language==2){ - Feng.info("Please select a record in the table first!"); + Feng.info("Please select 条记录 in the table first!"); }else { Feng.info("Pilih catatan di tabel terlebih dahulu!"); } diff --git a/cloud-server-management/src/main/webapp/static/modular/system/userCouponRecord/userCouponRecord.js b/cloud-server-management/src/main/webapp/static/modular/system/userCouponRecord/userCouponRecord.js index 7779dbc..0b82f0f 100644 --- a/cloud-server-management/src/main/webapp/static/modular/system/userCouponRecord/userCouponRecord.js +++ b/cloud-server-management/src/main/webapp/static/modular/system/userCouponRecord/userCouponRecord.js @@ -111,7 +111,7 @@ if(language==1){ Feng.info("请先选中表格中的某一记录!"); }else if(language==2){ - Feng.info("Please select a record in the table first!"); + Feng.info("Please select 条记录 in the table first!"); }else { Feng.info("Pilih catatan di tabel terlebih dahulu!"); } -- Gitblit v1.7.1