20260720

feat:紧急联系人改成紧急联系人电话
fix:修复下单失败的圈圈没有消失问题
2026-07-20 11:45:16 +08:00 · 2024-09-29 10:02:59 +08:00 · 2024-09-04 11:18:02 +08:00 · 2024-09-03 15:34:02 +08:00 · 2024-09-03 15:33:38 +08:00 · 2024-08-27 18:03:10 +08:00
534 changed files with 284 additions and 158 deletions
--- a/.env.development
+++ b/.env.development
@@ -1,2 +1,3 @@
 VITE_APP_NAME=云芯威BMS
-apiUrl=http://127.0.0.1:8081/api
+# apiUrl=https://yxw.wsdns.cn/api
+apiUrl=http://127.0.0.1:9090/api
--- a/.env.production
+++ b/.env.production
@@ -1,2 +1,2 @@
 VITE_APP_NAME=云芯威BMS
-VITE_API_URL=https://yxw.wsdns.cn/api
+VITE_API_URL=https://yxw-api.websoft.top/api
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /unpackage
 /node_modules
 /utils/request-1.js
+/node_modules/
--- a/.hbuilderx/launch.json
+++ b/.hbuilderx/launch.json
--- a/.idea/.gitignore
+++ b/.idea/.gitignore
@@ -0,0 +1,6 @@
+# Default ignored files
+/shelf/
+/workspace.xml
+# Datasource local storage ignored files
+/dataSources/
+/dataSources.local.xml
--- a/App.vue
+++ b/App.vue
--- a/androidPrivacy.json
+++ b/androidPrivacy.json
--- a/api/address.js
+++ b/api/address.js
--- a/api/article/category.js
+++ b/api/article/category.js
--- a/api/article/index.js
+++ b/api/article/index.js
--- a/api/balance.js
+++ b/api/balance.js
--- a/api/balance/log.js
+++ b/api/balance/log.js
--- a/api/bargain/active.js
+++ b/api/bargain/active.js
--- a/api/bargain/checkout.js
+++ b/api/bargain/checkout.js
--- a/api/bargain/task.js
+++ b/api/bargain/task.js
--- a/api/captcha.js
+++ b/api/captcha.js
--- a/api/cart.js
+++ b/api/cart.js
--- a/api/cashier/index.js
+++ b/api/cashier/index.js
--- a/api/category/index.js
+++ b/api/category/index.js
--- a/api/checkout.js
+++ b/api/checkout.js
--- a/api/comment.js
+++ b/api/comment.js
--- a/api/coupon.js
+++ b/api/coupon.js
--- a/api/dealer/apply.js
+++ b/api/dealer/apply.js
--- a/api/dealer/index.js
+++ b/api/dealer/index.js
--- a/api/dealer/order.js
+++ b/api/dealer/order.js
--- a/api/dealer/poster.js
+++ b/api/dealer/poster.js
--- a/api/dealer/setting.js
+++ b/api/dealer/setting.js
--- a/api/dealer/team.js
+++ b/api/dealer/team.js
--- a/api/dealer/withdraw.js
+++ b/api/dealer/withdraw.js
--- a/api/express.js
+++ b/api/express.js
--- a/api/goods/index.js
+++ b/api/goods/index.js
--- a/api/goods/service.js
+++ b/api/goods/service.js
--- a/api/groupon/checkout.js
+++ b/api/groupon/checkout.js
--- a/api/groupon/goods.js
+++ b/api/groupon/goods.js
--- a/api/groupon/setting.js
+++ b/api/groupon/setting.js
--- a/api/groupon/task.js
+++ b/api/groupon/task.js
--- a/api/help.js
+++ b/api/help.js
--- a/api/live/room.js
+++ b/api/live/room.js
--- a/api/login/index.js
+++ b/api/login/index.js
--- a/api/myCoupon.js
+++ b/api/myCoupon.js
--- a/api/order.js
+++ b/api/order.js
@@ -9,7 +9,8 @@ const api = {
  cancel: 'order/cancel',
  extractQrcode: 'order/extractQrcode',
  receipt: '/open/equipment/receipt',
-  pay: 'order/pay'
+  pay: 'order/pay',
+  updateOrderNo: '/shop/order-pay/change-order-no',
 }

 // 当前用户待处理的订单数量
@@ -46,3 +47,11 @@ export function receipt(data) {
 export function extractQrcode(orderId, param) {
  return request.get(api.extractQrcode, { orderId, ...param })
 }
+
+
+// 核销二维码
+export function updateOrderNo() {
+  return request.get(api.updateOrderNo)
+}
+
+
--- a/api/order/comment.js
+++ b/api/order/comment.js
--- a/api/page.js
+++ b/api/page.js
--- a/api/points/log.js
+++ b/api/points/log.js
--- a/api/recharge.js
+++ b/api/recharge.js
--- a/api/recharge/order.js
+++ b/api/recharge/order.js
--- a/api/recharge/plan.js
+++ b/api/recharge/plan.js
--- a/api/refund.js
+++ b/api/refund.js
--- a/api/region.js
+++ b/api/region.js
--- a/api/setting.js
+++ b/api/setting.js
--- a/api/sharp/checkout.js
+++ b/api/sharp/checkout.js
--- a/api/sharp/goods.js
+++ b/api/sharp/goods.js
--- a/api/sharp/home.js
+++ b/api/sharp/home.js
--- a/api/shop.js
+++ b/api/shop.js
--- a/api/shop/order.js
+++ b/api/shop/order.js
--- a/api/upload.js
+++ b/api/upload.js
--- a/api/user.js
+++ b/api/user.js
--- a/api/user/coupon.js
+++ b/api/user/coupon.js
--- a/api/wxofficial.js
+++ b/api/wxofficial.js
--- a/app.scss
+++ b/app.scss
--- a/common/constant/index.js
+++ b/common/constant/index.js
--- a/common/constant/paginate.js
+++ b/common/constant/paginate.js
--- a/common/enum/Client.js
+++ b/common/enum/Client.js
--- a/common/enum/coupon/ApplyRange.js
+++ b/common/enum/coupon/ApplyRange.js
--- a/common/enum/coupon/CouponType.js
+++ b/common/enum/coupon/CouponType.js
--- a/common/enum/coupon/ExpireType.js
+++ b/common/enum/coupon/ExpireType.js
--- a/common/enum/coupon/index.js
+++ b/common/enum/coupon/index.js
--- a/common/enum/dealer/apply/ApplyStatus.js
+++ b/common/enum/dealer/apply/ApplyStatus.js
--- a/common/enum/dealer/apply/ApplyType.js
+++ b/common/enum/dealer/apply/ApplyType.js
--- a/common/enum/dealer/apply/index.js
+++ b/common/enum/dealer/apply/index.js
--- a/common/enum/dealer/withdraw/ApplyStatus.js
+++ b/common/enum/dealer/withdraw/ApplyStatus.js
--- a/common/enum/dealer/withdraw/PayType.js
+++ b/common/enum/dealer/withdraw/PayType.js
--- a/common/enum/dealer/withdraw/index.js
+++ b/common/enum/dealer/withdraw/index.js
--- a/common/enum/enum.js
+++ b/common/enum/enum.js
--- a/common/enum/goods/GoodsType.js
+++ b/common/enum/goods/GoodsType.js
--- a/common/enum/goods/SpecType.js
+++ b/common/enum/goods/SpecType.js
--- a/common/enum/goods/index.js
+++ b/common/enum/goods/index.js
--- a/common/enum/groupon/ActiveStatus.js
+++ b/common/enum/groupon/ActiveStatus.js
--- a/common/enum/groupon/ActiveType.js
+++ b/common/enum/groupon/ActiveType.js
--- a/common/enum/groupon/GoodsStatus.js
+++ b/common/enum/groupon/GoodsStatus.js
--- a/common/enum/groupon/TaskStatus.js
+++ b/common/enum/groupon/TaskStatus.js
--- a/common/enum/groupon/index.js
+++ b/common/enum/groupon/index.js
--- a/common/enum/live/LiveStatus.js
+++ b/common/enum/live/LiveStatus.js
--- a/common/enum/live/index.js
+++ b/common/enum/live/index.js
--- a/common/enum/order/DeliveryStatus.js
+++ b/common/enum/order/DeliveryStatus.js
--- a/common/enum/order/DeliveryType.js
+++ b/common/enum/order/DeliveryType.js
--- a/common/enum/order/OrderSource.js
+++ b/common/enum/order/OrderSource.js
--- a/common/enum/order/OrderStatus.js
+++ b/common/enum/order/OrderStatus.js
--- a/common/enum/order/OrderType.js
+++ b/common/enum/order/OrderType.js
--- a/common/enum/order/PayStatus.js
+++ b/common/enum/order/PayStatus.js
--- a/common/enum/order/PayType.js
+++ b/common/enum/order/PayType.js
--- a/common/enum/order/ReceiptStatus.js
+++ b/common/enum/order/ReceiptStatus.js
--- a/common/enum/order/delivery/DeliveryMethod.js
+++ b/common/enum/order/delivery/DeliveryMethod.js
--- a/common/enum/order/delivery/index.js
+++ b/common/enum/order/delivery/index.js
--- a/common/enum/order/index.js
+++ b/common/enum/order/index.js
--- a/common/enum/order/refund/AuditStatus.js
+++ b/common/enum/order/refund/AuditStatus.js
--- a/common/enum/order/refund/RefundStatus.js
+++ b/common/enum/order/refund/RefundStatus.js
--- a/common/enum/order/refund/RefundType.js
+++ b/common/enum/order/refund/RefundType.js
--- a/common/enum/order/refund/index.js
+++ b/common/enum/order/refund/index.js
--- a/common/enum/payment/Method.js
+++ b/common/enum/payment/Method.js
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
b2894lxlx	96d153ac6d	20260720	2026-07-20 11:45:16 +08:00
yangqingyuan	6bcbdbe892	feat:紧急联系人改成紧急联系人电话	2024-09-29 10:02:59 +08:00
yangqingyuan	041d2a8b91	fix:修复下单失败的圈圈没有消失问题	2024-09-04 11:18:02 +08:00
yangqingyuan	e9cea6e194	feat:芝麻分免押判断	2024-09-03 15:34:02 +08:00
yangqingyuan	a7cfd63dc3	feat:退租信息标红	2024-09-03 15:33:38 +08:00
messi	bdd78601de	fix	2024-08-27 18:03:10 +08:00
messi	dbd2d70005	fix	2024-08-19 20:32:55 +08:00
messi	4913dfd52c	Merge branch 'dev' of http://git.gxwebsoft.com/gxwebsoft/yunxinwei-uniapp into dev	2024-08-19 17:17:52 +08:00
messi	4810dc79e3	fix	2024-08-19 17:17:46 +08:00
b2894lxlx	a7a251c1f3	update	2024-08-19 17:15:39 +08:00