From 39d6919db3eda93933774089d89fbdda0ba0c0ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BD=90=E5=A4=A9=E5=A4=A7=E5=9C=A3?= <17615834396@163.com> Date: Wed, 29 May 2024 10:28:39 +0800 Subject: [PATCH 1/6] =?UTF-8?q?pos=E9=A6=96=E9=A1=B5=E5=89=8D=E4=B8=89?= =?UTF-8?q?=E4=B8=AA=E8=AE=A2=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/AllOrderInfoController.java | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/controller/AllOrderInfoController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/controller/AllOrderInfoController.java index fe3d01050..7afddb0e4 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/controller/AllOrderInfoController.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/controller/AllOrderInfoController.java @@ -13,6 +13,7 @@ import com.fuint.common.util.TokenUtil; import com.fuint.framework.web.BaseController; import com.fuint.framework.web.ResponseObject; import com.fuint.system.dept.vo.SysDeptVo; +import org.apache.commons.lang3.ObjectUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -51,6 +52,23 @@ public class AllOrderInfoController extends BaseController { return getSuccessResult(list); } + @GetMapping("getPageListByPosRecentThree") + public ResponseObject getPageListByPosRecentThree(AllOrderInfo allOrderInfo, + @RequestParam(value = "page",defaultValue = "1") Integer pageNo, + @RequestParam(value = "pageSize",defaultValue = "10") Integer pageSize){ + Page page =new Page(pageNo,pageSize); + + IPage list = allOrderInfoService.getPageListByPos(page, allOrderInfo); + if (ObjectUtils.isNotEmpty(list)){ + List records = list.getRecords(); + if (ObjectUtils.isNotEmpty(records) && records.size()>2){ + List allOrderInfoVos = records.subList(0, 3); + list.setRecords(allOrderInfoVos); + } + } + return getSuccessResult(list); + } + @GetMapping("sumPayMoney") From 70d1a50a04321e4b661bfadd6ea8d29909ef07cc Mon Sep 17 00:00:00 2001 From: cun-nan <19819293608@163.com> Date: Wed, 29 May 2024 11:05:24 +0800 Subject: [PATCH 2/6] bug --- .../api/fuyou/controller/FyPayController.java | 40 ++--- .../com/fuint/api/fuyou/entity/Const.java | 4 +- .../fuyou/service/impl/FyPayServiceImpl.java | 20 +++ .../order/controller/OilOrderController.java | 10 ++ .../order/service/OilOrderService.java | 2 +- .../service/impl/OilOrderServiceImpl.java | 38 ++-- pos-uni/.hbuilderx/launch.json | 39 ++-- pos-uni/pages/index/index.vue | 2 +- pos-uni/pagesHome/Collection/Collection.vue | 19 +- pos-uni/pagesHome/PaymentCode/PaymentCode.vue | 13 +- pos-uni/pagesHome/PaymentCode/SetUpCode.vue | 170 +++++++++++++++++- .../PaymentResults/PaymentResults.vue | 42 ++++- pos-uni/static/imgs/zfsb.png | Bin 0 -> 6982 bytes 13 files changed, 325 insertions(+), 74 deletions(-) create mode 100644 pos-uni/static/imgs/zfsb.png diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/controller/FyPayController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/controller/FyPayController.java index 0dea7e961..03990cce7 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/controller/FyPayController.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/controller/FyPayController.java @@ -140,26 +140,26 @@ public class FyPayController { String orderLock = "orderLock_notify"+orderNo; if (redisLock.tryLock(orderLock,5000, TimeUnit.MILLISECONDS)){ // 业务逻辑 判断订单状态 -// AllOrderInfo allOrderInfo = allOrderInfoService.selectAllOrderInfoByOrderNo(orderNo); -// if (ObjectUtil.isNotEmpty(allOrderInfo)){ -// allOrderInfo.setPayMoney(Double.valueOf(settleOrderAmt)/100); -// allOrderInfo.setTransactionId(transactionId); -// allOrderInfo.setStatus("paid"); -// allOrderInfo.setPayTime(new Date()); -// allOrderInfoService.updateAllOrderInfo(allOrderInfo); -// -// // 修改配置收款账户余额信息 -// MerchantConfig merchantConfig = merchantConfigService.selectMeChByIdIsUse(allOrderInfo.getStoreId()); -// Double beforeAmount = merchantConfig.getAmount(); -// Double afterAmount = beforeAmount + allOrderInfo.getPayMoney(); -// merchantConfig.setAmount(afterAmount); -// merchantConfigService.updateMerch(merchantConfig); -// merchantConfigRecordService.updateMerchantConfigRecordByOrderNo(orderNo,"yes"); -// } -// -// updateOrderStatus(orderNo,allOrderInfo.getType()); -//// 修改订单支付状态 -// redisLock.unlock(orderLock); + AllOrderInfo allOrderInfo = allOrderInfoService.selectAllOrderInfoByOrderNo(orderNo); + if (ObjectUtil.isNotEmpty(allOrderInfo)){ + allOrderInfo.setPayMoney(Double.valueOf(settleOrderAmt)/100); + allOrderInfo.setTransactionId(transactionId); + allOrderInfo.setStatus("paid"); + allOrderInfo.setPayTime(new Date()); + allOrderInfoService.updateAllOrderInfo(allOrderInfo); + + // 修改配置收款账户余额信息 + MerchantConfig merchantConfig = merchantConfigService.selectMeChByIdIsUse(allOrderInfo.getStoreId()); + Double beforeAmount = merchantConfig.getAmount(); + Double afterAmount = beforeAmount + allOrderInfo.getPayMoney(); + merchantConfig.setAmount(afterAmount); + merchantConfigService.updateMerch(merchantConfig); + merchantConfigRecordService.updateMerchantConfigRecordByOrderNo(orderNo,"yes"); + } + + updateOrderStatus(orderNo,allOrderInfo.getType()); +// 修改订单支付状态 + redisLock.unlock(orderLock); } // transaction_id 加锁 return "1"; diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/entity/Const.java b/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/entity/Const.java index c7ffc92c4..956fba457 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/entity/Const.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/entity/Const.java @@ -50,8 +50,8 @@ public class Const { //小程序异步通知(回调地址) // public static String notify_url = "https://www.tuofeng.cc/oilAdmin/api/fyPay/notify"; - public static String notify_url = "http://k40180f897.goho.co/api/fyPay/notify"; -// public static String notify_url = "https://8q4f124343.yicp.fun/api/fyPay/notify"; +// public static String notify_url = "http://k40180f897.goho.co/api/fyPay/notify"; + public static String notify_url = "https://8q4f124343.yicp.fun/api/fyPay/notify"; //主扫异步通知(回调地址) // public static String notify_url_scan = "https://www.tuofeng.cc/oilAdmin/api/fyPay/notifyScan"; diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/impl/FyPayServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/impl/FyPayServiceImpl.java index e8a61a940..a41f78e3a 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/impl/FyPayServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/impl/FyPayServiceImpl.java @@ -824,6 +824,7 @@ public class FyPayServiceImpl implements FyPayService { map.put("random_str", "orderNo"); map.put("order_type", receiveParameterPos.getPayType()); map.put("goods_des", receiveParameterPos.getContent()); + map.put("goods_detail", receiveParameterPos.getContent()); double amount = receiveParameterPos.getGoodsMoney() * 100; map.put("order_amt", String.valueOf((int) amount)); String nowtime = DateUtil.format(new Date(), "yyyyMMddHHmmss"); @@ -834,6 +835,18 @@ public class FyPayServiceImpl implements FyPayService { Const.INS_PUBLIC_KEY = publicKey; Const.INS_PRIVATE_KEY = privateKey; + if (ObjectUtil.isNotEmpty(merchantConfig)) { + +// 添加配置记录信息 + MerchantConfigRecord merchantConfigRecord = new MerchantConfigRecord(); + merchantConfigRecord.setMerchantId(merchantConfig.getId()); + merchantConfigRecord.setIsSuccess("no"); + merchantConfigRecord.setAmount(receiveParameterPos.getGoodsMoney()); + merchantConfigRecord.setType("0"); + merchantConfigRecord.setStoreId(merchantConfig.getStoreId()); + merchantConfigRecord.setOrderNo(receiveParameterPos.getOrderNo()); + merchantConfigRecordService.insertMerchantConfigRecord(merchantConfigRecord); + } // 请求报文 String reqBody = Message.requestMsg(map); // 响应报文 @@ -844,6 +857,13 @@ public class FyPayServiceImpl implements FyPayService { String str = resMap.get("sign"); if (Utils.verifySign(resMap, str)) { + OilOrder oilOrder = oilOrderService.selectOilOrderByOrderNo(receiveParameterPos.getOrderNo()); + ReceiveParameter receiveParameter = new ReceiveParameter(); + BeanUtils.copyProperties(receiveParameterPos, receiveParameter); +// 添加订单信息 + Double discountAmount = 0.0; + if (ObjectUtil.isNotEmpty(oilOrder)) discountAmount = oilOrder.getDiscountAmount(); + this.insertAllOrderInfo(receiveParameter, discountAmount); System.out.println(resMap); } return resMap; diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/controller/OilOrderController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/controller/OilOrderController.java index e6c32d533..3e923c8cc 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/controller/OilOrderController.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/controller/OilOrderController.java @@ -342,4 +342,14 @@ public class OilOrderController extends BaseController { public ResponseObject addOrderPos(@RequestBody OilOrderVo oilOrderVo) throws Exception { return getSuccessResult(orderService.addOrderPos(oilOrderVo)); } + + /** + * pos端扫码支付 + * @param oilOrderVo + * @return + */ + @PostMapping("addOrderScanPos") + public ResponseObject addOrderScanPos(@RequestBody OilOrderVo oilOrderVo) throws Exception { + return getSuccessResult(orderService.addOrderPosScan(oilOrderVo)); + } } diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/OilOrderService.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/OilOrderService.java index e9dc2bb71..a0539531b 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/OilOrderService.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/OilOrderService.java @@ -222,5 +222,5 @@ public interface OilOrderService extends IService { * @param oilOrderVo * @return */ - Map addOrderPosScan(OilOrderVo oilOrderVo) throws Exception; + Map addOrderPosScan(OilOrderVo oilOrderVo) throws Exception; } 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 12430e5b7..3fd0c4820 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 @@ -1727,7 +1727,8 @@ public class OilOrderServiceImpl extends ServiceImpl i int row = 0; OilOrder oilOrder = this.selectOilOrderByOrderNo(orderNo); Integer userId = oilOrder.getUserId(); - LJUser user = userService.queryUserByUserId(userId); + LJUser user = null; + if (ObjectUtil.isNotEmpty(userId)) user = userService.queryUserByUserId(userId); if (ObjectUtil.isNotEmpty(oilOrder)) { // oilOrder.setPayAmount(oilOrder.getOrderAmount()-oilOrder.getDiscountAmount()); oilOrder.setOrderStatus(status); @@ -1781,14 +1782,16 @@ public class OilOrderServiceImpl extends ServiceImpl i cardValueChildOrder.setPayTime(new Date()); cardValueChildOrderService.updateCardValueChildOrder(cardValueChildOrder); + if (ObjectUtil.isNotEmpty(user)) { // 查询主卡信息 - CardValudChildrens cardValudChildrens = cardValudChildrensService.selectCardValueChildrenByMobileAndStoreId(user.getMobile(), oilOrder.getStoreId()); - userId = cardValudChildrens.getUserId(); + CardValudChildrens cardValudChildrens = cardValudChildrensService.selectCardValueChildrenByMobileAndStoreId(user.getMobile(), oilOrder.getStoreId()); + userId = cardValudChildrens.getUserId(); + } } - this.updateGrowthValue(oilOrder.getOrderAmount(), oilOrder.getPayAmount(), userId, Integer.valueOf(oilOrder.getOils()), null, oilOrder.getStoreId(), orderNo); + if (ObjectUtil.isNotEmpty(userId)) this.updateGrowthValue(oilOrder.getOrderAmount(), oilOrder.getPayAmount(), userId, Integer.valueOf(oilOrder.getOils()), null, oilOrder.getStoreId(), orderNo); this.addOilTracks(oilOrder, oilOrder.getStoreId()); this.updateCardAndActiveById(oilOrder.getStoreId(), oilOrder.getUserId(), oilOrder.getActiveId(), oilOrder.getCouponId(), oilOrder.getActiveType(), oilOrder.getOrderAmount(), oilOrder.getPayAmount(), Integer.valueOf(oilOrder.getOils())); - this.insertCardBalance(oilOrder.getOrderAmount() - oilOrder.getDiscountAmount() - oilOrder.getPayAmount(), userId, oilOrder.getStoreId(), orderNo); + if (ObjectUtil.isNotEmpty(userId)) this.insertCardBalance(oilOrder.getOrderAmount() - oilOrder.getDiscountAmount() - oilOrder.getPayAmount(), userId, oilOrder.getStoreId(), orderNo); if (ObjectUtil.isNotEmpty(oilOrder.getStaffId())) staffCommissionService.countStaffCommission(oilOrder.getStaffId(), oilOrder.getStoreId(), oilOrder.getOrderAmount(), oilOrder.getPayAmount(), "1", orderNo); } @@ -2385,7 +2388,7 @@ public class OilOrderServiceImpl extends ServiceImpl i this.addOilTracks(oilOrderVo, nowAccountInfo.getStoreId()); this.updateCardAndActiveById(nowAccountInfo.getStoreId(), oilOrderVo.getUserId(), oilOrderVo.getActiveId(), oilOrderVo.getCouponId(), oilOrderVo.getActiveType(), oilOrderVo.getOrderAmount(), oilOrderVo.getPayAmount(), Integer.valueOf(oilOrderVo.getOils())); this.insertAllOrderInfo(orderNo, nowAccountInfo.getStoreId(), oilOrderVo.getOrderAmount(), oilOrderVo.getPayAmount(), oilOrderVo.getDiscountAmount(), oilOrderVo.getPayType(), oilOrderVo.getUserId(), "POS", "1", "paid"); - this.insertFavorable(oilOrderVo, oilOrderVo.getOilCardAmount()); + this.insertFavorable(oilOrderVo, oilOrderVo.getOilCardAmount1()); if (ObjectUtil.isNotEmpty(oilOrderVo.getUserId())) integralSettingsService.refuelPoints(oilOrderVo); //修改优惠券使用状态 if (oilOrderVo.getCouponId() != null) { @@ -2406,8 +2409,8 @@ public class OilOrderServiceImpl extends ServiceImpl i } @Override - public Map addOrderPosScan(OilOrderVo oilOrderVo) throws Exception { - Map res = new HashMap<>(); + public Map addOrderPosScan(OilOrderVo oilOrderVo) throws Exception { + Map res = new HashMap<>(); AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo(); // 根据日期生成订单信息 SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMddHHmmss"); @@ -2415,23 +2418,34 @@ public class OilOrderServiceImpl extends ServiceImpl i String randomString = UUID.randomUUID().toString().replace("-", "").substring(0, 6); String orderNo = "2345" + timestamp + randomString; - oilOrderVo.setOrderNo(orderNo); oilOrderVo.setStoreId(nowAccountInfo.getStoreId()); oilOrderVo.setStaffId(nowAccountInfo.getStaffId()); oilOrderVo.setTerminal("POS"); oilOrderVo.setOrderStatus("unpaid"); oilOrderVo.setOrderType("主订单"); - int row = baseMapper.insert(oilOrderVo); + if (ObjectUtil.isNotEmpty(oilOrderVo.getOrderNo())){ + OilOrder oilOrder = this.selectOilOrderByOrderNo(oilOrderVo.getOrderNo()); + oilOrderVo.setId(oilOrder.getId()); + oilOrderVo.setOrderNo(orderNo); + baseMapper.updateById(oilOrderVo); + }else { + oilOrderVo.setOrderNo(orderNo); + baseMapper.insert(oilOrderVo); + } + ReceiveParameterPos receiveParameterPos = new ReceiveParameterPos(); +// receiveParameterPos.setPayType("WECHAT"); receiveParameterPos.setPayType(oilOrderVo.getPayType()); receiveParameterPos.setType("1"); receiveParameterPos.setContent("油品订单"); receiveParameterPos.setOrderNo(orderNo); receiveParameterPos.setStoreId(oilOrderVo.getStoreId()); - receiveParameterPos.setStoreId(oilOrderVo.getUserId()); + receiveParameterPos.setUserId(oilOrderVo.getUserId()); receiveParameterPos.setGoodsMoney(oilOrderVo.getPayAmount()); receiveParameterPos.setOilCardAmount(oilOrderVo.getOilCardAmount1()); Map mainScan = fyPayService.mainScan(receiveParameterPos); - return mainScan; + res.put("oilOrder",this.selectOilOrderByOrderNo(orderNo)); + res.put("scanCode",mainScan); + return res; } } diff --git a/pos-uni/.hbuilderx/launch.json b/pos-uni/.hbuilderx/launch.json index ee5be7746..07d928111 100644 --- a/pos-uni/.hbuilderx/launch.json +++ b/pos-uni/.hbuilderx/launch.json @@ -1,20 +1,23 @@ -{ // launch.json 配置了启动调试时相关设置，configurations下节点名称可为 app-plus/h5/mp-weixin/mp-baidu/mp-alipay/mp-qq/mp-toutiao/mp-360/ - // launchtype项可配置值为local或remote, local代表前端连本地云函数，remote代表前端连云端云函数 - "version": "0.0", - "configurations": [{ - "app-plus" : - { - "launchtype" : "local" - }, - "default" : - { - "launchtype" : "local" - }, - "mp-weixin" : - { - "launchtype" : "local" - }, - "type" : "uniCloud" - } +{ + // launch.json 配置了启动调试时相关设置，configurations下节点名称可为 app-plus/h5/mp-weixin/mp-baidu/mp-alipay/mp-qq/mp-toutiao/mp-360/ + // launchtype项可配置值为local或remote, local代表前端连本地云函数，remote代表前端连云端云函数 + "version" : "0.0", + "configurations" : [ + { + "app-plus" : { + "launchtype" : "local" + }, + "default" : { + "launchtype" : "local" + }, + "mp-weixin" : { + "launchtype" : "local" + }, + "type" : "uniCloud" + }, + { + "playground" : "standard", + "type" : "uni-app:app-android" + } ] } diff --git a/pos-uni/pages/index/index.vue b/pos-uni/pages/index/index.vue index 5fa2ebbb9..1a4b8d4dd 100644 --- a/pos-uni/pages/index/index.vue +++ b/pos-uni/pages/index/index.vue @@ -117,7 +117,7 @@ }, goCode() { uni.navigateTo({ - url: '/pagesHome/PaymentCode/PaymentCode' + url: '/pagesHome/PaymentCode/SetUpCode' }) }, gochangeShifts() { diff --git a/pos-uni/pagesHome/Collection/Collection.vue b/pos-uni/pagesHome/Collection/Collection.vue index e85f93dab..2e5b076db 100644 --- a/pos-uni/pagesHome/Collection/Collection.vue +++ b/pos-uni/pagesHome/Collection/Collection.vue @@ -39,7 +39,6 @@ :key="index" @click="getspearIndex(index,item)"> {{item.gunName}} - @@ -85,8 +84,8 @@ - 确定 - 取消 + 确定 + 取消 @@ -228,6 +227,11 @@ headers }, methods: { + // 确定备注 + submitRemark(){ + this.show = false + this.oilOrder.remark = this.value1 + }, close() { this.show = false }, @@ -446,9 +450,12 @@ this.oilOrder.tankId = this.tankId this.oilOrder.oilPrice = this.oilPrice this.oilOrder.oilCardAmount1 = this.oilCardAmount - this.oilOrder.userId = this.userInfo.id this.oilOrder.oilGunNum = this.oilGunNum - this.oilOrder.payUser = this.userInfo.mobile + if (this.userInfo){ + this.oilOrder.userId = this.userInfo.id + this.oilOrder.payUser = this.userInfo.mobile + } + request({ url: "business/oilOrder/addOrderPos", method: 'post', @@ -463,7 +470,7 @@ // }) uni.navigateTo({ - url: "/pagesHome/PaymentResults/PaymentResults" + url: "/pagesHome/PaymentResults/PaymentResults?orderNo="+this.orderNo }) } else if (res.data.code == 2) { uni.showToast({ diff --git a/pos-uni/pagesHome/PaymentCode/PaymentCode.vue b/pos-uni/pagesHome/PaymentCode/PaymentCode.vue index f1601dda1..a3bc1afe5 100644 --- a/pos-uni/pagesHome/PaymentCode/PaymentCode.vue +++ b/pos-uni/pagesHome/PaymentCode/PaymentCode.vue @@ -22,11 +22,16 @@ data() { return { titles: "刷卡支付", - + orderNo:"", + qrCode:"", } }, - onLoad() { + onLoad(e) { + this.orderNo = e.orderNo + this.qrCode = uni.getStorageSync("qrCode") + console.log(this.qrCode); this.onReady() + }, onShow() { // this.actList = ["1", "1", "1", "1", "1", ] @@ -49,14 +54,14 @@ // 设置金额 setAmount() { uni.navigateTo({ - url: "/pagesHome/PaymentCode/SetUpCode" + url: "/pagesHome/PaymentCode/SetUpCode?orderNo="+this.orderNo }) }, onReady() { // 获取uQRCode实例 var qr = new UQRCode(); // 设置二维码内容 - qr.data = "https://uqrcode.cn/doc"; + qr.data = this.qrCode; // 设置二维码大小，必须与canvas设置的宽高一致 qr.size = 200; // 调用制作二维码方法 diff --git a/pos-uni/pagesHome/PaymentCode/SetUpCode.vue b/pos-uni/pagesHome/PaymentCode/SetUpCode.vue index 2d79c155d..f6dea918a 100644 --- a/pos-uni/pagesHome/PaymentCode/SetUpCode.vue +++ b/pos-uni/pagesHome/PaymentCode/SetUpCode.vue @@ -4,30 +4,73 @@ 金额 - + 备注 - + + + + 选择油枪 + + + {{item.gunName}} + + + + 选择支付方式 + + + {{item.dictLabel}} + + + + + + + 确定 + - - - \ No newline at end of file From 96fe1682b267299fc5982933d470424328902f7f Mon Sep 17 00:00:00 2001 From: cun-nan <19819293608@163.com> Date: Wed, 29 May 2024 13:53:49 +0800 Subject: [PATCH 5/6] bug --- pos-uni/pagesHome/CardPayment/CardPayment.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/pos-uni/pagesHome/CardPayment/CardPayment.vue b/pos-uni/pagesHome/CardPayment/CardPayment.vue index e25d745fe..bbec78a31 100644 --- a/pos-uni/pagesHome/CardPayment/CardPayment.vue +++ b/pos-uni/pagesHome/CardPayment/CardPayment.vue @@ -7,6 +7,7 @@ 请将您的卡片插入POS机 + From 5394e4969bd8569285cd4cfdfd19231cd1a28847 Mon Sep 17 00:00:00 2001 From: xvv Date: Wed, 29 May 2024 14:07:07 +0800 Subject: [PATCH 6/6] =?UTF-8?q?pos=20=E7=AB=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MemberRecharge/MemberRecharge.vue | 49 +++++++++++++++---- 1 file changed, 39 insertions(+), 10 deletions(-) diff --git a/pos-uni/pagesHome/MemberRecharge/MemberRecharge.vue b/pos-uni/pagesHome/MemberRecharge/MemberRecharge.vue index 5994e9eeb..4309839da 100644 --- a/pos-uni/pagesHome/MemberRecharge/MemberRecharge.vue +++ b/pos-uni/pagesHome/MemberRecharge/MemberRecharge.vue @@ -56,7 +56,10 @@ 微信扫码支付 - + + + + @@ -66,7 +69,10 @@ 支付宝扫码支付 - + + + + @@ -76,7 +82,10 @@ 银联扫码支付 - + + + + @@ -86,7 +95,10 @@ 现金支付 - + + + + @@ -107,6 +119,7 @@ return { titles: "会员充值", listindex: 0, + memberId: 0, numList: [ "50元", "100元", @@ -115,14 +128,14 @@ "1000元", "自定义金额", ], - isChooseUser:false, - userId:"", - userInfo:"", + isChooseUser: false, + userId: "", + userInfo: "", } }, onLoad(e) { this.userId = e.userId - if (e.userId){ + if (e.userId) { this.isChooseUser = true this.getUser() } @@ -145,6 +158,10 @@ headers }, methods: { + getmemberId(num) { + this.memberId = num + console.log(this.memberId); + }, // 获取用户信息 getUser() { request({ @@ -154,9 +171,9 @@ this.userInfo = res.data }) }, - goChooseUser(){ + goChooseUser() { uni.navigateTo({ - url:"/pagesHome/searchVip/searchVip?type=1" + url: "/pagesHome/searchVip/searchVip?type=1" }) }, getindex(index) { @@ -377,4 +394,16 @@ border-radius: 50%; border: 1px solid #333333; } + + .qiux { + width: 16px; + height: 16px; + border-radius: 50%; + border: 1px solid #0864e9; + background: #0864e9; + display: flex; + align-items: center; + justify-content: center; + color: #fff; + } \ No newline at end of file