diff --git a/fuintAdmin/src/api/staff/user/usergrade.js b/fuintAdmin/src/api/staff/user/usergrade.js index 7eeae693a..c65baa530 100644 --- a/fuintAdmin/src/api/staff/user/usergrade.js +++ b/fuintAdmin/src/api/staff/user/usergrade.js @@ -9,6 +9,14 @@ export function listUserGrade(query) { }) } +// 查询所有会员等级列表 +export function allUserGrade() { + return request({ + url: '/business/userManager/userGrade/allUserGrade', + method: 'get', + }) +} + // 查询会员等级详细 export function getUserGrade(id) { return request({ diff --git a/fuintAdmin/src/views/member/index.vue b/fuintAdmin/src/views/member/index.vue index baae09bbf..24bdafd34 100644 --- a/fuintAdmin/src/views/member/index.vue +++ b/fuintAdmin/src/views/member/index.vue @@ -184,7 +184,7 @@ @@ -199,7 +199,7 @@ @@ -309,6 +309,7 @@ @@ -371,7 +372,7 @@ - + 启用 禁用 @@ -453,7 +454,7 @@ import { listUser, listUserStatistic, updateUser } from "@/api/staff/user/user"; -import {listUserGrade} from "@/api/staff/user/usergrade"; +import {allUserGrade, listUserGrade} from "@/api/staff/user/usergrade"; import {ljStoreList} from "@/api/staff/store"; import {getSysConfig} from "@/api/staff/user/sysconfig"; import { getToken } from "@/utils/auth"; @@ -505,8 +506,10 @@ export default { list: [], // 会员表格数据 userList: [], - // 会员等级列表 + // 当前店铺会员等级列表 userGradeList: [], + // 所有等级信息 + allUserGrade:[], // 店铺列表 storeList: [], storeIds: [], @@ -549,7 +552,8 @@ export default { { required: true, message: "会员名称不能为空", trigger: "blur" }, { min: 2, max: 200, message: '会员名称长度必须介于2 和 100 之间', trigger: 'blur' } ], - gradeId: [{ required: true, message: "会员等级", trigger: "blur" }], + gradeId: [{ required: true, message: "请选择会员等级", trigger: "blur" }], + status: [{ required: true, message: "请选择会员状态", trigger: "blur" }], mobile: [ { required: true, message: "请输入手机号", trigger: "blur" }, ], @@ -596,11 +600,12 @@ export default { this.yesterdayAddNum = response.data.yesterdayAddNum; this.balance = response.data.balance; this.point = response.data.point; - // this.literCard = response.data.literCard; - // this.refuelMoney = response.data.refuelMoney; }); - listUserGrade().then( response => { - this.userGradeList = response.data.records + allUserGrade().then( response => { + this.allUserGrade = response.data + }); + listUserGrade({page:1,pageSize:20}).then( response => { + this.userGradeList = response.data.records; }); ljStoreList().then( response => { this.storeList = response.data @@ -749,6 +754,7 @@ export default { const id = row.id || this.ids; getUser(id).then(response => { this.form = response.data; + console.log(this.form) this.open = true; this.title = "编辑会员"; }); diff --git a/fuintAdmin/src/views/member/userInfo.vue b/fuintAdmin/src/views/member/userInfo.vue index 4c520ee19..f6d846ac9 100644 --- a/fuintAdmin/src/views/member/userInfo.vue +++ b/fuintAdmin/src/views/member/userInfo.vue @@ -1069,8 +1069,6 @@ export default { } }) } - console.log("data",data) - console.log("this.cardValueForm",this.cardValueForm) }, // 存油卡查询 async getCardFuelDieselList() { @@ -1131,7 +1129,7 @@ export default { }, // 根据油品过滤查询存油卡 async tabOilTypeClick(data){ - console.log("aaaaaaaaaaaaaa",data) + // console.log("aaaaaaaaaaaaaa",data) await this.getCardFuelDieselList() this.cardFuelDieselList = this.sourceCardFuelDieselList.filter(item => { @@ -1188,7 +1186,7 @@ export default { this.openConfirm = true; this.isPay = true - console.log("11111",this.isPay) + // console.log("11111",this.isPay) // this.isPaySuccess=false this.title = this.payment @@ -1199,7 +1197,7 @@ export default { if (falg === 1) { } - console.log("payType",payType) + // console.log("payType",payType) this.cardValueForm.paymentType = payType }, // 获取副卡信息 @@ -1220,6 +1218,7 @@ export default { // 获取会员详情 getUser(this.id).then(response => { this.form = response.data; + console.log(response.data) this.getGrade(response.data.gradeId); }); // 获取店铺详情 @@ -1236,7 +1235,7 @@ export default { // 选择余额充值金额 rechargeCard(index,item){ - console.log("index",index) + // console.log("index",index) this.cardValueForm.amount = null, this.cardValueForm.rechargeType = 0 @@ -1268,7 +1267,7 @@ export default { this.cardValueForm.percentageCommissions = file.percentageCommissions this.cardValueForm.amountCommission = file.amountCommission - console.log("file.royaltyType ", file.royaltyType ) + // console.log("file.royaltyType ", file.royaltyType ) // 计算员工提成金额 if (file.royaltyType === "3") { @@ -1363,7 +1362,7 @@ export default { },30000) }else if (this.flag === 2){ - console.log("cardFuelDieselForm",this.cardFuelDieselForm) + // console.log("cardFuelDieselForm",this.cardFuelDieselForm) this.cardFuelDieselForm.mtUserId = userForm.id this.cardFuelDieselForm.name = userForm.name this.cardFuelDieselForm.mobile = userForm.mobile @@ -1422,9 +1421,9 @@ export default { }, getPayList(){ - console.log("payment_type1") + // console.log("payment_type1") getDicts("payment_type").then( response => { - console.log("payment_type2",response.data) + // console.log("payment_type2",response.data) this.payList = response.data; }) }, diff --git a/fuintAdmin/src/views/userGrade/index.vue b/fuintAdmin/src/views/userGrade/index.vue index 85aa1c926..8aff6a044 100644 --- a/fuintAdmin/src/views/userGrade/index.vue +++ b/fuintAdmin/src/views/userGrade/index.vue @@ -678,12 +678,6 @@ export default { this.total = response.data.total; this.loading = false; }) - // getUserGradeList(this.queryParams).then( response => { - // this.list = response.data.paginationResponse.content; - // this.total = response.data.paginationResponse.totalElements; - // this.catchTypeList = response.data.catchTypeList - // } - // ); }, // 搜索按钮操作 handleQuery() { @@ -730,7 +724,6 @@ export default { this.form = { id: '', grade: 0, name: '',gasoline:1,dieselOil:1,naturalGas:1,preferential:'自定义优惠', gasolineDiscount:'无优惠',dieselDiscount:'无优惠',naturalGasDiscount:'无优惠',promotionGroup:'', - // catchCondition: '', userPrivilege: '', catchType: '', catchValue: '', validDay: '',discount: '', speedPoint: '', status: 'qy' }; this.gasolinePreferential=[ @@ -784,8 +777,10 @@ export default { this.$modal.msgSuccess("新增成功"); this.open = false; this.getList(); - }else { + }else if (res.data==0){ this.$modal.msgError("新增失败，最多支持20个等级"); + }else { + this.$modal.msgError("新增失败，已存在当前等级的会员等级信息"); } }); } @@ -807,12 +802,6 @@ export default { this.open = true; this.title = "编辑会员等级"; }); - - // getUserGradeInfo(id).then(response => { - // this.form = response.data.userGradeInfo; - // this.open = true; - // this.title = "编辑会员等级"; - // }); }, // 删除按钮操作 handleDelete(row) { diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/controller/LJStaffController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/controller/LJStaffController.java index 9f81a1a61..e62c9da6c 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/controller/LJStaffController.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/controller/LJStaffController.java @@ -121,4 +121,14 @@ public class LJStaffController extends BaseController { public ResponseObject auditPrem(String auditPrem) { return getSuccessResult(mtStaffService.auditPrem(auditPrem)); } + + /** + * 根据店铺id查询员工信息 + * @param storeId + * @return + */ + @GetMapping("/queryStaffList/{storeId}") + public ResponseObject queryStaffList(@PathVariable Integer storeId){ + return getSuccessResult(mtStaffService.queryStaffs(storeId)); + } } diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/service/ILJStaffService.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/service/ILJStaffService.java index 11724ad08..d53c8d3e1 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/service/ILJStaffService.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/service/ILJStaffService.java @@ -70,4 +70,11 @@ public interface ILJStaffService extends IService { public void entryptPassword(LJStaff staff); public int auditPrem(String auditPrem); + + /** + * 根据店铺id查询员工信息 + * @param storeId + * @return + */ + public List queryStaffs(int storeId); } diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/service/impl/LJStaffServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/service/impl/LJStaffServiceImpl.java index 6766840cf..55454b6be 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/service/impl/LJStaffServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/service/impl/LJStaffServiceImpl.java @@ -76,10 +76,7 @@ public class LJStaffServiceImpl extends ServiceImpl impl */ @Override public LJStaff selectStaffByMobile(String mobile) { - AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo(); - Integer storeId = nowAccountInfo.getStoreId(); QueryWrapper queryWrapper = new QueryWrapper(); - queryWrapper.eq("store_id",storeId); queryWrapper.eq("mobile",mobile); LJStaff staff = baseMapper.selectOne(queryWrapper); return staff; @@ -168,4 +165,12 @@ public class LJStaffServiceImpl extends ServiceImpl impl int row = baseMapper.auditPrem(nowAccountInfo.getStaffId(),auditPrem); return row; } + + @Override + public List queryStaffs(int storeId) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("store_id",storeId); + List list = baseMapper.selectList(queryWrapper); + return list; + } } diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/OilOrderServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/OilOrderServiceImpl.java index 5aa9932e2..6bbf91801 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/OilOrderServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/OilOrderServiceImpl.java @@ -387,8 +387,6 @@ public class OilOrderServiceImpl extends ServiceImpl i Integer gasGrowthValue = null; Integer dieselGrowthValue = null; Integer naturalGrowthValue = null; -// 根据id查询会员信息 获取会员当前成长值数据 - LJUser user = userService.selectUserById(userid); UserBalance balance = userBalanceService.selectUserBalance(userid); int growth = balance.getGrowthValue(); balance.setRefuelMoney(refuelMoney); @@ -404,10 +402,10 @@ public class OilOrderServiceImpl extends ServiceImpl i // 如果会员成长值达到会员等级成长值，则修改会员的会员等级信息 for (int i = 0; i < records.size(); i++){ if ((growthAfter-records.get(i).getGrowthValue())<100){ - user.setGradeId(records.get(i).getId()); + balance.setGradeId(records.get(i).getId()); } if (growthAfter>records.get(records.size()-1).getGrowthValue()){ - user.setGradeId(records.get(records.size()-1).getId()); + balance.setGradeId(records.get(records.size()-1).getId()); } } balance.setGrowthValue(growthAfter); @@ -419,10 +417,10 @@ public class OilOrderServiceImpl extends ServiceImpl i System.out.println(records.size()); for (int i = 0; i < records.size(); i++){ if ((growthAfter-records.get(i).getGrowthValue())<100 && (growthAfter-records.get(i).getGrowthValue())>0){ - user.setGradeId(records.get(i).getId()); + balance.setGradeId(records.get(i).getId()); } if (growthAfter > records.get(records.size()-1).getGrowthValue()){ - user.setGradeId(records.get(records.size()-1).getId()); + balance.setGradeId(records.get(records.size()-1).getId()); } } balance.setGrowthValue(growthAfter); @@ -433,16 +431,14 @@ public class OilOrderServiceImpl extends ServiceImpl i // 如果会员成长值达到会员等级成长值，则修改会员的会员等级信息 for (int i = 0; i < records.size(); i++){ if ((growthAfter-records.get(i).getGrowthValue())<100){ - user.setGradeId(records.get(i).getId()); + balance.setGradeId(records.get(i).getId()); } if (growthAfter>records.get(records.size()-1).getGrowthValue()){ - user.setGradeId(records.get(records.size()-1).getId()); + balance.setGradeId(records.get(records.size()-1).getId()); } } balance.setGrowthValue(growthAfter); } -// 修改用户会员等级 - userService.updateUser(user); // 修改用户成长值 userBalanceService.updateUserBalance(balance); } diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/storeInformation/controller/LJStoreController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/storeInformation/controller/LJStoreController.java index 40b468a4b..d24ab0113 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/storeInformation/controller/LJStoreController.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/storeInformation/controller/LJStoreController.java @@ -60,11 +60,12 @@ public class LJStoreController extends BaseController { /** * 根据id查询店铺信息 - * @param storeId + * @param map * @return */ - @GetMapping("/{storeId}") - public ResponseObject queryStore(@PathVariable Integer storeId){ + @PostMapping("/queryStoreById") + public ResponseObject queryStore(@Validated @RequestBody Map map){ + Integer storeId = Integer.valueOf(map.get("storeId")); return getSuccessResult(storeService.selectStoreByStoreId(storeId)); } } diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/storeInformation/service/impl/LJStoreServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/storeInformation/service/impl/LJStoreServiceImpl.java index 2b000c36e..58ddbaccb 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/storeInformation/service/impl/LJStoreServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/storeInformation/service/impl/LJStoreServiceImpl.java @@ -56,6 +56,7 @@ public class LJStoreServiceImpl extends ServiceImpl impl double c = 2 * Math.atan2(Math.sqrt(a), Math.sqrt(1 - a)); double min = earthRadius * c; + ljStore = list.get(0); // 计算最小距离 for (int i = 0; i < list.size(); i++){ @@ -85,7 +86,32 @@ public class LJStoreServiceImpl extends ServiceImpl impl @Override public List> queryStoreByPosition(Map map) { - return null; + // 经度 + Double lon = Double.valueOf(map.get("lon")); + Double lat = Double.valueOf(map.get("lat")); + List list = baseMapper.selectList(null); + + List> list1 = new ArrayList<>(); + + double earthRadius = 6371; // 地球半径，单位为公里 + for (LJStore store : list) { + Map map1 = new HashMap<>(); + if (StringUtils.isNotEmpty(store.getLatitude()) && StringUtils.isNotEmpty(store.getLongitude())){ + double dLat1 = Math.toRadians(Double.parseDouble(store.getLatitude()) - lat); + double dLon1 = Math.toRadians(Double.parseDouble(store.getLongitude()) - lon); + + double a1 = Math.sin(dLat1 / 2) * Math.sin(dLat1 / 2) + + Math.cos(Math.toRadians(lat)) * Math.cos(Math.toRadians(Double.parseDouble(store.getLatitude()))) * + Math.sin(dLon1 / 2) * Math.sin(dLon1 / 2); + + double c1 = 2 * Math.atan2(Math.sqrt(a1), Math.sqrt(1 - a1)); + + map1.put("distance",earthRadius * c1); + map1.put("store",store); + list1.add(map1); + } + } + return list1; } /** diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/controller/LJUserController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/controller/LJUserController.java index d1bbff17f..efaaba4c8 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/controller/LJUserController.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/controller/LJUserController.java @@ -69,7 +69,7 @@ public class LJUserController extends BaseController { */ @GetMapping("/{id}") public ResponseObject userInfo(@PathVariable Integer id){ - LJUser user = userService.selectUserById(id); + LJUserVo user = userService.selectUserById(id); return getSuccessResult(user); } @@ -151,7 +151,7 @@ public class LJUserController extends BaseController { * @return */ @PutMapping - public ResponseObject edit(@Validated @RequestBody LJUser user){ + public ResponseObject edit(@Validated @RequestBody LJUserVo user){ return getSuccessResult(userService.updateUser(user)); } } diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/controller/LJUserGradeController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/controller/LJUserGradeController.java index d26aa9960..47f175df0 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/controller/LJUserGradeController.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/controller/LJUserGradeController.java @@ -37,14 +37,26 @@ public class LJUserGradeController extends BaseController { return getSuccessResult(list); } + /** + * 查询所有启用的会员等级信息 + * @return + */ + @GetMapping("/allUserGrade") + public ResponseObject lists(){ + return getSuccessResult(userGradeService.selectUserGradeAll()); + } + /** * 根据id查询会员等级信息 * @param id * @return */ @GetMapping("/{id}") - public ResponseObject userGradeInfo(@PathVariable Integer id){ - LJUserGrade userGrade = userGradeService.selectUserGradeById(id); + public ResponseObject userGradeInfo(@PathVariable String id){ + LJUserGrade userGrade = null; + if (id!=null && !id.equals("null")){ + userGrade = userGradeService.selectUserGradeById(Integer.parseInt(id)); + } return getSuccessResult(userGrade); } diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/entity/LJUser.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/entity/LJUser.java index 3a101638c..40bb8c727 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/entity/LJUser.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/entity/LJUser.java @@ -57,8 +57,8 @@ public class LJUser extends BaseEntity implements Serializable { @ApiModelProperty("证件号码") private String idcard; - @ApiModelProperty("等级ID") - private Integer gradeId; +// @ApiModelProperty("等级ID") +// private Integer gradeId; @ApiModelProperty("性别 1男,0女") private Integer sex; @@ -72,8 +72,8 @@ public class LJUser extends BaseEntity implements Serializable { @ApiModelProperty("地址") private String address; - @ApiModelProperty("默认店铺") - private Integer storeId; +// @ApiModelProperty("默认店铺") +// private Integer storeId; @ApiModelProperty("状态，启用、禁用") private String status; @@ -84,15 +84,15 @@ public class LJUser extends BaseEntity implements Serializable { @ApiModelProperty("公众号") private String official; - @ApiModelProperty("加油次数") - private BigDecimal consumeNum; +// @ApiModelProperty("加油次数") +// private BigDecimal consumeNum; +// +// @ApiModelProperty("副卡信息") +// private String secondCard; +// +// @ApiModelProperty("固定等级") +// private String fixingLevel; - @ApiModelProperty("副卡信息") - private String secondCard; - - @ApiModelProperty("固定等级") - private String fixingLevel; - - @ApiModelProperty("邀请员工id") - private Integer staffId; +// @ApiModelProperty("邀请员工id") +// private Integer staffId; } diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/entity/MtInvitation.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/entity/MtInvitation.java index f0fec5241..5e4fb5ac5 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/entity/MtInvitation.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/entity/MtInvitation.java @@ -35,8 +35,10 @@ public class MtInvitation extends BaseEntity { * 状态：启用、禁用 */ private String status; - - + /** + * 连锁店id + */ + private Integer chainStoreId; } diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/mapper/LJUserMapper.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/mapper/LJUserMapper.java index 3f9335b6e..a2e31f0fd 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/mapper/LJUserMapper.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/mapper/LJUserMapper.java @@ -21,6 +21,13 @@ public interface LJUserMapper extends BaseMapper { */ public IPage selectUserList(Page page, @Param("user") LJUserVo user); + /** + * 根据id查询用户信息 + * @param id + * @return + */ + public LJUserVo selectUserById(@Param("id") Integer id); + /** * 根据手机号查询用户信息 * @param mobile diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/mapper/xml/LJUserGradeMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/mapper/xml/LJUserGradeMapper.xml index 33aee1c2f..9a2cb1325 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/mapper/xml/LJUserGradeMapper.xml +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/mapper/xml/LJUserGradeMapper.xml @@ -10,5 +10,6 @@ store_id = #{userGrade.storeId} + order by grade \ No newline at end of file diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/mapper/xml/LJUserMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/mapper/xml/LJUserMapper.xml index 9b19f5ebe..03b0a2845 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/mapper/xml/LJUserMapper.xml +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/mapper/xml/LJUserMapper.xml @@ -2,7 +2,9 @@ - select mu.*,mub.card_balance,mub.points,mub.growth_value,mub.refuel_money from mt_user mu + select mu.*,mub.card_balance,mub.points,mub.growth_value,mub.refuel_money,mub.grade_id,mub.consume_num, + mub.second_card,mub.fixing_level + from mt_user mu left join mt_user_balance mub on mu.id = mub.mt_user_id @@ -25,7 +27,7 @@ and mu.name like concat('%', #{user.name}, '%') - and mu.grade_id = #{user.gradeId} + and mub.grade_id = #{user.gradeId} and mu.official = #{user.official} @@ -75,4 +77,11 @@ left join mt_user_balance mub on mu.id = mub.mt_user_id where mu.id = #{userId} + \ No newline at end of file diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/mapper/xml/MtInvitationMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/mapper/xml/MtInvitationMapper.xml index 610ca8a2a..3df055530 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/mapper/xml/MtInvitationMapper.xml +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/mapper/xml/MtInvitationMapper.xml @@ -5,7 +5,7 @@ - + diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/LJUserGradeService.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/LJUserGradeService.java index e1b986f32..94ff278b5 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/LJUserGradeService.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/LJUserGradeService.java @@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.fuint.business.userManager.entity.LJUserGrade; +import java.util.List; + /** * 会员等级信息 业务层 */ @@ -16,6 +18,12 @@ public interface LJUserGradeService extends IService { */ public IPage selectUserGradeList(Page page, LJUserGrade userGrade); + /** + * 查询所有会员等级信息 + * @return + */ + public List selectUserGradeAll(); + /** * 根据id查询会员等级信息 * @param id diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/LJUserService.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/LJUserService.java index cd2d21506..05d55d3dc 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/LJUserService.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/LJUserService.java @@ -37,7 +37,7 @@ public interface LJUserService extends IService { * @param id * @return */ - public LJUser selectUserById(int id); + public LJUserVo selectUserById(int id); /** * 根据手机号查询会员信息 @@ -78,5 +78,5 @@ public interface LJUserService extends IService { * @param user * @return */ - public int updateUser(LJUser user); + public int updateUser(LJUserVo user); } diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/LJUserGradeServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/LJUserGradeServiceImpl.java index 7b227bc88..d6fde5d30 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/LJUserGradeServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/LJUserGradeServiceImpl.java @@ -16,6 +16,8 @@ import com.fuint.system.config.service.SysConfigService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.List; + @Service public class LJUserGradeServiceImpl extends ServiceImpl implements LJUserGradeService { @Override @@ -38,6 +40,13 @@ public class LJUserGradeServiceImpl extends ServiceImpl selectUserGradeAll() { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("status","qy"); + return baseMapper.selectList(queryWrapper); + } + @Override public LJUserGrade selectUserGradeById(int id) { return baseMapper.selectById(id); @@ -75,10 +84,19 @@ public class LJUserGradeServiceImpl extends ServiceImpl(); + queryWrapper1.eq("store_id",storeId); + queryWrapper1.eq("grade",userGrade.getGrade()); + LJUserGrade ljUserGrade = baseMapper.selectOne(queryWrapper1); + if (ljUserGrade!=null){ + return 2; + } + QueryWrapper queryWrapper = new QueryWrapper(); queryWrapper.eq("store_id",storeId); Integer num = baseMapper.selectCount(queryWrapper); - int row = 0; if (num<20){ userGrade.setStoreId(storeId); row = baseMapper.insert(userGrade); diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/LJUserServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/LJUserServiceImpl.java index fbab9b51c..00c7a5584 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/LJUserServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/LJUserServiceImpl.java @@ -1,5 +1,6 @@ package com.fuint.business.userManager.service.impl; +import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -96,8 +97,8 @@ public class LJUserServiceImpl extends ServiceImpl impleme * @return */ @Override - public LJUser selectUserById(int id) { - return baseMapper.selectById(id); + public LJUserVo selectUserById(int id) { + return baseMapper.selectUserById(id); } /** @@ -187,7 +188,6 @@ public class LJUserServiceImpl extends ServiceImpl impleme user1.setOpenId(user.getOpenId()); user1.setMobile(user.getMobile()); user1.setIdcard(user.getIdcard()); - user1.setGradeId(user.getGradeId()); user1.setSex(user.getSex()); user1.setBirthday(user.getBirthday()); user1.setCarNo(user.getCarNo()); @@ -195,9 +195,6 @@ public class LJUserServiceImpl extends ServiceImpl impleme user1.setStatus(user.getStatus()); user1.setDescription(user.getDescription()); user1.setOfficial(user.getOfficial()); - user1.setConsumeNum(user.getConsumeNum()); - user1.setSecondCard(user.getSecondCard()); - user1.setFixingLevel(user.getFixingLevel()); int row = baseMapper.insert(user1); // 查询添加后的用户id LJUser ljUser = this.selectUserByMobile(user.getMobile()); @@ -207,25 +204,52 @@ public class LJUserServiceImpl extends ServiceImpl impleme balance.setCardBalance(user.getCardBalance()); balance.setPoints(user.getPoints()); balance.setStoreId(storeId); + balance.setGradeId(user.getGradeId()); + balance.setConsumeNum(user.getConsumeNum()); + balance.setSecondCard(user.getSecondCard()); + balance.setFixingLevel(user.getFixingLevel()); balanceService.insertUserBalance(balance); return row; } /** * 修改会员信息 - * @param user + * @param userVo * @return */ @Override - public int updateUser(LJUser user) { + public int updateUser(LJUserVo userVo) { + LJUser user = new LJUser(); + user.setUserNo(userVo.getUserNo()); + user.setStoreId(userVo.getStoreId()); + user.setAvatar(userVo.getAvatar()); + user.setName(userVo.getName()); + user.setOpenId(userVo.getOpenId()); + user.setMobile(userVo.getMobile()); + user.setIdcard(userVo.getIdcard()); + user.setSex(userVo.getSex()); + user.setBirthday(userVo.getBirthday()); + user.setCarNo(userVo.getCarNo()); + user.setAddress(userVo.getAddress()); + user.setStatus(userVo.getStatus()); + user.setDescription(userVo.getDescription()); + user.setOfficial(userVo.getOfficial()); int row = baseMapper.updateById(user); // 修改认证会员手机号 CertifiedMember certifiedMember = new CertifiedMember(); - certifiedMember.setUserId(user.getId()); - certifiedMember.setMobile(user.getMobile()); + certifiedMember.setUserId(userVo.getId()); + certifiedMember.setMobile(userVo.getMobile()); QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("user_id",certifiedMember.getUserId()); certifiedMemberMapper.update(certifiedMember,queryWrapper); + +// 修改余额会员等级信息 + UserBalance balance = balanceService.selectUserBalance(userVo.getId()); + if (!ObjectUtil.isEmpty(balance)){ + balance.setGradeId(userVo.getGradeId()); + balance.setFixingLevel(userVo.getFixingLevel()); + balanceService.updateUserBalance(balance); + } return row; } } diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/vo/LJUserVo.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/vo/LJUserVo.java index a2494da67..e03c5a948 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/vo/LJUserVo.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/vo/LJUserVo.java @@ -11,9 +11,10 @@ import java.math.BigDecimal; @Data @ExcelIgnoreUnannotated public class LJUserVo extends BaseEntity { + /** + * 用户id + */ private Integer id; - private Integer balanceId; - // 会员号 @ExcelProperty(value = "会员号") @@ -72,9 +73,6 @@ public class LJUserVo extends BaseEntity { @ExcelProperty(value = "地址") private String address; -// 默认店铺 - private Integer storeId; - // 状态，启用、禁用 private String status; @@ -86,7 +84,7 @@ public class LJUserVo extends BaseEntity { private String official; // 加油次数 - private BigDecimal consumeNum; + private Integer consumeNum; // 副卡信息 @ExcelProperty(value = "副卡信息") @@ -94,6 +92,17 @@ public class LJUserVo extends BaseEntity { // 固定等级 private String fixingLevel; -// 邀请员工id - private Integer staffId; + + /** + * 店铺id + */ + private Integer storeId; + /** + * 员工id + */ + private Integer staffid; + /** + * 邀请人id + */ + private Integer inviterid; } diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/common/shiroConfig/ShiroConfig.java b/fuintBackend/fuint-application/src/main/java/com/fuint/common/shiroConfig/ShiroConfig.java index 1e1a7a5db..1b03ed879 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/common/shiroConfig/ShiroConfig.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/common/shiroConfig/ShiroConfig.java @@ -40,6 +40,8 @@ public class ShiroConfig { filterMap.put("/excel/export","anon"); //根据地理位置获取最近的店铺信息 filterMap.put("/business/storeInformation/store/recentlyStore","anon"); + //会员扫码进入小程序后根据id获取店铺信息 + filterMap.put("/business/storeInformation/store/queryStoreById","anon"); filterMap.put("/**","commonFilter"); filter.setFilterChainDefinitionMap(filterMap); filter.setLoginUrl("/login"); diff --git a/gasStation-uni/config.js b/gasStation-uni/config.js index 25c185f01..cf93dbac8 100644 --- a/gasStation-uni/config.js +++ b/gasStation-uni/config.js @@ -2,7 +2,7 @@ module.exports = { // baseUrl: 'https://vue.ruoyi.vip/prod-api', // baseUrl: 'http://192.168.0.196:8081/', - baseUrl: 'http://192.168.1.6:8008/', + baseUrl: 'http://192.168.1.4:8080/', // baseUrl: 'http://192.168.1.5:8002/cdJdc', imagesUrl: 'http://www.nuoyunr.com/lananRsc', diff --git a/gasStation-uni/pages/index/index.vue b/gasStation-uni/pages/index/index.vue index fd663e3b3..7d89587a2 100644 --- a/gasStation-uni/pages/index/index.vue +++ b/gasStation-uni/pages/index/index.vue @@ -70,7 +70,8 @@ - {{store.name}}{{store.description ? "("+store.description+")" : ""}} + + {{store.name}}{{store.description ? "("+store.description+")" : ""}} @@ -80,10 +81,12 @@ {{ store.address }} - {{ distance }}km + {{ distance }}km + + + {{ distance*1000 }}米 - {{ distance*1000 }}米 \r\n\t\t\t\r\n\t\t\t\t\r\n\t\t\t\t\t反馈内容\r\n\t\t\t\t\r\n\t\t\t\t\r\n\t\t\t\t\r\n\t\t\t\t\t相关截图（选填）\r\n\t\t\t\t\r\n\t\t\t\t\r\n\t\t\t\t\r\n\t\t\t\t\t提交反馈\r\n\t\t\t\t\r\n\t\t\t\r\n\r\n\r\n\t\t\r\n\t\r\n\r\n\r\n\r\n\r\n","import mod from \"-!../../../../../soft/HBuilderX/plugins/uniapp-cli/node_modules/mini-css-extract-plugin/dist/loader.js??ref--8-oneOf-1-0!../../../../../soft/HBuilderX/plugins/uniapp-cli/node_modules/css-loader/dist/cjs.js??ref--8-oneOf-1-1!../../../../../soft/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/stylePostLoader.js!../../../../../soft/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader/index.js??ref--8-oneOf-1-2!../../../../../soft/HBuilderX/plugins/uniapp-cli/node_modules/postcss-loader/src/index.js??ref--8-oneOf-1-3!../../../../../soft/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/sass-loader/dist/cjs.js??ref--8-oneOf-1-4!../../../../../soft/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader/index.js??ref--8-oneOf-1-5!../../../../../soft/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/index.js??vue-loader-options!../../../../../soft/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./feedback.vue?vue&type=style&index=0&id=1cdc0972&scoped=true&lang=scss&\"; export default mod; export * from \"-!../../../../../soft/HBuilderX/plugins/uniapp-cli/node_modules/mini-css-extract-plugin/dist/loader.js??ref--8-oneOf-1-0!../../../../../soft/HBuilderX/plugins/uniapp-cli/node_modules/css-loader/dist/cjs.js??ref--8-oneOf-1-1!../../../../../soft/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/stylePostLoader.js!../../../../../soft/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader/index.js??ref--8-oneOf-1-2!../../../../../soft/HBuilderX/plugins/uniapp-cli/node_modules/postcss-loader/src/index.js??ref--8-oneOf-1-3!../../../../../soft/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/sass-loader/dist/cjs.js??ref--8-oneOf-1-4!../../../../../soft/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader/index.js??ref--8-oneOf-1-5!../../../../../soft/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/index.js??vue-loader-options!../../../../../soft/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./feedback.vue?vue&type=style&index=0&id=1cdc0972&scoped=true&lang=scss&\"","// extracted by mini-css-extract-plugin\n if(module.hot) {\n // 1701236084249\n var cssReload = require(\"D:/soft/HBuilderX/plugins/uniapp-cli/node_modules/mini-css-extract-plugin/dist/hmr/hotModuleReplacement.js\")(module.id, {\"hmr\":true,\"publicPath\":\"../../\",\"locals\":false});\n module.hot.dispose(cssReload);\n module.hot.accept(undefined, cssReload);\n }\n "],"sourceRoot":""} \ No newline at end of file +{"version":3,"sources":["uni-app:///main.js","webpack:///D:/code/oilSystem/gasStation-uni/pagesMy/feedback/feedback.vue?e94f","webpack:///D:/code/oilSystem/gasStation-uni/pagesMy/feedback/feedback.vue?64d2","webpack:///D:/code/oilSystem/gasStation-uni/pagesMy/feedback/feedback.vue?19f9","webpack:///D:/code/oilSystem/gasStation-uni/pagesMy/feedback/feedback.vue?a6bf","uni-app:///pagesMy/feedback/feedback.vue","webpack:///D:/code/oilSystem/gasStation-uni/pagesMy/feedback/feedback.vue?9c52","webpack:///D:/code/oilSystem/gasStation-uni/pagesMy/feedback/feedback.vue?6b4b"],"names":["wx","__webpack_require_UNI_MP_PLUGIN__","__webpack_require__","createPage","Page","data","title","value5","fileList1","components","methods","deletePic","afterRead","lists","fileListLen","item","i","result","status","message","url","uploadFilePromise","filePath","goback","uni"],"mappings":";;;;;;;;;;;;;AAAA;AAGA;AACA;AAHA;AACAA,EAAE,CAACC,iCAAiC,GAAGC,mBAAmB;AAG1DC,UAAU,CAACC,iBAAI,CAAC,C;;;;;;;;;;;;;ACLhB;AAAA;AAAA;AAAA;AAAA;AAAA;AAAiI;AACjI;AAC4D;AACL;AACsC;;;AAG7F;AAC2K;AAC3K,gBAAgB,kLAAU;AAC1B,EAAE,8EAAM;AACR,EAAE,+FAAM;AACR,EAAE,wGAAe;AACjB;AACA;AACA;AACA;AACA;AACA,EAAE,mGAAU;AACZ;AACA;;AAEA;AACe,gF;;;;;;;;;;;;ACvBf;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;;;;;;;;;;;;;ACAA;AAAA;AAAA;AAAA;AAAA;AAAA;AACA;AACA;AACA;AACA,aAAa,0SAEN;AACP,KAAK;AACL;AACA,aAAa,+TAEN;AACP,KAAK;AACL;AACA,aAAa,6SAEN;AACP,KAAK;AACL;AACA,CAAC;AACD;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,GAAG;AACH;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;;;;;;;;;;;;;AC3CA;AAAA;AAAA;AAAA;AAA6oB,CAAgB,2oBAAG,EAAC,C;;;;;;;;;;;;;;;;;;;;;;AC+BjqB;AAAA;AAAA;AAAA,eACA;EACAC;IACA;MACAC;MACAC;MACAC;IAEA;EACA;EAEAC,aAEA;EACAC;IACAC;MACA;IACA;IACA;IACAC;MAAA;MAAA;QAAA;QAAA;UAAA;YAAA;cAAA;gBACA;gBACAC;gBACAC;gBACAD;kBACA,4DACAE,MAEA;gBACA;gBACAC;cAAA;gBAAA;kBAAA;kBAAA;gBAAA;gBAAA;gBAAA,OACA;cAAA;gBAAAC;gBACAF;gBACA;kBACAG;kBACAC;kBACAC;gBACA;gBACAN;cAAA;gBARAE;gBAAA;gBAAA;cAAA;cAAA;gBAAA;YAAA;UAAA;QAAA;MAAA;IAUA;IACAK;MACA;QACAD;QACAE;MACA;QACA;QACA;MAAA,CACA;IAEA;IACAC;MACAC;IACA;EACA;AACA;AAAA,2B;;;;;;;;;;;;;ACrFA;AAAA;AAAA;AAAA;AAAgvC,CAAgB,sqCAAG,EAAC,C;;;;;;;;;;;ACApwC;AACA,OAAO,KAAU,EAAE,kBAKd","file":"pagesMy/feedback/feedback.js","sourcesContent":["import 'uni-pages';\n// @ts-ignore\nwx.__webpack_require_UNI_MP_PLUGIN__ = __webpack_require__;\nimport Vue from 'vue'\nimport Page from './pagesMy/feedback/feedback.vue'\ncreatePage(Page)","import { render, staticRenderFns, recyclableRender, components } from \"./feedback.vue?vue&type=template&id=1cdc0972&scoped=true&\"\nvar renderjs\nimport script from \"./feedback.vue?vue&type=script&lang=js&\"\nexport * from \"./feedback.vue?vue&type=script&lang=js&\"\nimport style0 from \"./feedback.vue?vue&type=style&index=0&id=1cdc0972&scoped=true&lang=scss&\"\n\n\n/* normalize component */\nimport normalizer from \"!../../../../../soft/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/runtime/componentNormalizer.js\"\nvar component = normalizer(\n script,\n render,\n staticRenderFns,\n false,\n null,\n \"1cdc0972\",\n null,\n false,\n components,\n renderjs\n)\n\ncomponent.options.__file = \"pagesMy/feedback/feedback.vue\"\nexport default component.exports","export * from \"-!../../../../../soft/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!../../../../../soft/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader/index.js??ref--17-0!../../../../../soft/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!../../../../../soft/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!../../../../../soft/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/index.js??vue-loader-options!../../../../../soft/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./feedback.vue?vue&type=template&id=1cdc0972&scoped=true&\"","var components\ntry {\n components = {\n uniIcons: function () {\n return import(\n /* webpackChunkName: \"node-modules/@dcloudio/uni-ui/lib/uni-icons/uni-icons\" */ \"@dcloudio/uni-ui/lib/uni-icons/uni-icons.vue\"\n )\n },\n \"u-Textarea\": function () {\n return import(\n /* webpackChunkName: \"uni_modules/uview-ui/components/u--textarea/u--textarea\" */ \"@/uni_modules/uview-ui/components/u--textarea/u--textarea.vue\"\n )\n },\n uUpload: function () {\n return import(\n /* webpackChunkName: \"uni_modules/uview-ui/components/u-upload/u-upload\" */ \"@/uni_modules/uview-ui/components/u-upload/u-upload.vue\"\n )\n },\n }\n} catch (e) {\n if (\n e.message.indexOf(\"Cannot find module\") !== -1 &&\n e.message.indexOf(\".vue\") !== -1\n ) {\n console.error(e.message)\n console.error(\"1. 排查组件名称拼写是否正确\")\n console.error(\n \"2. 排查组件是否符合 easycom 规范，文档：https://uniapp.dcloud.net.cn/collocation/pages?id=easycom\"\n )\n console.error(\n \"3. 若组件不符合 easycom 规范，需手动引入，并在 components 中注册该组件\"\n )\n } else {\n throw e\n }\n}\nvar render = function () {\n var _vm = this\n var _h = _vm.$createElement\n var _c = _vm._self._c || _h\n}\nvar recyclableRender = false\nvar staticRenderFns = []\nrender._withStripped = true\n\nexport { render, staticRenderFns, recyclableRender, components }","import mod from \"-!../../../../../soft/HBuilderX/plugins/uniapp-cli/node_modules/babel-loader/lib/index.js!../../../../../soft/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader/index.js??ref--13-1!../../../../../soft/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!../../../../../soft/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/index.js??vue-loader-options!../../../../../soft/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./feedback.vue?vue&type=script&lang=js&\"; export default mod; export * from \"-!../../../../../soft/HBuilderX/plugins/uniapp-cli/node_modules/babel-loader/lib/index.js!../../../../../soft/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader/index.js??ref--13-1!../../../../../soft/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!../../../../../soft/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/index.js??vue-loader-options!../../../../../soft/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./feedback.vue?vue&type=script&lang=js&\"","\r\n\r\n\r\n\r\n","import mod from \"-!../../../../../soft/HBuilderX/plugins/uniapp-cli/node_modules/mini-css-extract-plugin/dist/loader.js??ref--8-oneOf-1-0!../../../../../soft/HBuilderX/plugins/uniapp-cli/node_modules/css-loader/dist/cjs.js??ref--8-oneOf-1-1!../../../../../soft/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/stylePostLoader.js!../../../../../soft/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader/index.js??ref--8-oneOf-1-2!../../../../../soft/HBuilderX/plugins/uniapp-cli/node_modules/postcss-loader/src/index.js??ref--8-oneOf-1-3!../../../../../soft/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/sass-loader/dist/cjs.js??ref--8-oneOf-1-4!../../../../../soft/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader/index.js??ref--8-oneOf-1-5!../../../../../soft/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/index.js??vue-loader-options!../../../../../soft/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./feedback.vue?vue&type=style&index=0&id=1cdc0972&scoped=true&lang=scss&\"; export default mod; export * from \"-!../../../../../soft/HBuilderX/plugins/uniapp-cli/node_modules/mini-css-extract-plugin/dist/loader.js??ref--8-oneOf-1-0!../../../../../soft/HBuilderX/plugins/uniapp-cli/node_modules/css-loader/dist/cjs.js??ref--8-oneOf-1-1!../../../../../soft/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/stylePostLoader.js!../../../../../soft/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader/index.js??ref--8-oneOf-1-2!../../../../../soft/HBuilderX/plugins/uniapp-cli/node_modules/postcss-loader/src/index.js??ref--8-oneOf-1-3!../../../../../soft/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/sass-loader/dist/cjs.js??ref--8-oneOf-1-4!../../../../../soft/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader/index.js??ref--8-oneOf-1-5!../../../../../soft/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/index.js??vue-loader-options!../../../../../soft/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./feedback.vue?vue&type=style&index=0&id=1cdc0972&scoped=true&lang=scss&\"","// extracted by mini-css-extract-plugin\n if(module.hot) {\n // 1701236084249\n var cssReload = require(\"D:/soft/HBuilderX/plugins/uniapp-cli/node_modules/mini-css-extract-plugin/dist/hmr/hotModuleReplacement.js\")(module.id, {\"hmr\":true,\"publicPath\":\"../../\",\"locals\":false});\n module.hot.dispose(cssReload);\n module.hot.accept(undefined, cssReload);\n }\n "],"sourceRoot":""}