From 5c8ddf6e449514e3d1eead132f00b433d9e65d85 Mon Sep 17 00:00:00 2001 From: Jruome <2559028966@qq.com> Date: Fri, 19 May 2023 18:04:40 +0800 Subject: [PATCH 01/23] =?UTF-8?q?uniapp=20=E6=94=AF=E4=BB=98=E5=9B=9E?= =?UTF-8?q?=E8=B0=83=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- yudao-ui-app/pages/member_equity/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yudao-ui-app/pages/member_equity/index.vue b/yudao-ui-app/pages/member_equity/index.vue index aa4c071fe..a6b73b01f 100644 --- a/yudao-ui-app/pages/member_equity/index.vue +++ b/yudao-ui-app/pages/member_equity/index.vue @@ -141,7 +141,7 @@ background-repeat: no-repeat; background-attachment: fixed; - + .box-member { padding: 36rpx 40rpx; From 3b251f974515b55505cc5912fbb0c9d4eeded24e Mon Sep 17 00:00:00 2001 From: axzsd Date: Tue, 23 May 2023 14:07:48 +0800 Subject: [PATCH 02/23] =?UTF-8?q?=E6=9E=84=E5=BB=BA=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- builds/Dockerfile-pro | 20 ++++++++++++++++++++ builds/docker-compose-prod.yml | 28 ++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+) create mode 100644 builds/Dockerfile-pro create mode 100644 builds/docker-compose-prod.yml diff --git a/builds/Dockerfile-pro b/builds/Dockerfile-pro new file mode 100644 index 000000000..5d904f4c6 --- /dev/null +++ b/builds/Dockerfile-pro @@ -0,0 +1,20 @@ +FROM registry.cn-hangzhou.aliyuncs.com/lrh-public/openjdk:8u222-jre-up + +LABEL Author="axzsd" \ + Email="atva725@qq.com" \ + Description="创盈支付服务端" + +ENV SPRING_PROFILES_ACTIVE="prod" +ENV JAVA_OPTIONS "-Xms4000m -Xmx4096m \ +-XX:+HeapDumpOnOutOfMemoryError \ +-Dfile.encoding=UTF-8 \ +-Djava.awt.headless=true \ +-Dsun.net.client.defaultConnectTimeout=10000 \ +-Dsun.net.client.defaultReadTimeout=30000" + + +WORKDIR /work/projects/yudao-server +COPY yudao-server/target/yudao-server.jar /opt/app.jar + +EXPOSE 48080 +ENTRYPOINT exec java $JAVA_OPTIONS -jar -Dspring.profiles.active=${SPRING_PROFILES_ACTIVE} /opt/app.jar diff --git a/builds/docker-compose-prod.yml b/builds/docker-compose-prod.yml new file mode 100644 index 000000000..1a7a73eb6 --- /dev/null +++ b/builds/docker-compose-prod.yml @@ -0,0 +1,28 @@ +version: "3.9" +services: + yudao-server: + image: ${IMAGE_VERSION} + restart: always + privileged: true + container_name: yudao-server + environment: + TZ: Asia/Shanghai + SPRING_PROFILES_ACTIVE: prod +# volumes: +# - /opt/logs/cyywl:/work/projects/yudao-server + ulimits: + nproc: 65535 + nofile: + soft: 20000 + hard: 40000 + ports: + - "48080:48080" + deploy: + resources: + limits: + memory: 4096MB + healthcheck: + test: ["CMD", "curl", "-f", "http://localhost:48080/actuator/health"] + timeout: 30s + interval: 45s + retries: 3 \ No newline at end of file From 7a2b924b6469bfdb049322de36cdf9c8bdc85e6c Mon Sep 17 00:00:00 2001 From: axzsd Date: Tue, 23 May 2023 14:14:44 +0800 Subject: [PATCH 03/23] =?UTF-8?q?=E6=9E=84=E5=BB=BA=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- builds/docker-compose-prod.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/builds/docker-compose-prod.yml b/builds/docker-compose-prod.yml index 1a7a73eb6..d10aa09e1 100644 --- a/builds/docker-compose-prod.yml +++ b/builds/docker-compose-prod.yml @@ -25,4 +25,10 @@ services: test: ["CMD", "curl", "-f", "http://localhost:48080/actuator/health"] timeout: 30s interval: 45s - retries: 3 \ No newline at end of file + retries: 3 + networks: + - app_net +networks: + app_net: + external: true + name: cyywlnet \ No newline at end of file From cd68bf0be8a1e67d93043e8cc387a08a7a0f014d Mon Sep 17 00:00:00 2001 From: Jruome <2559028966@qq.com> Date: Wed, 24 May 2023 17:51:37 +0800 Subject: [PATCH 04/23] =?UTF-8?q?uniapp=20=E4=BC=9A=E5=91=98=E6=9D=83?= =?UTF-8?q?=E7=9B=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../freightSet/creatTemplates.vue | 2 +- yudao-ui-app/pages.json | 14 +- .../pages/member_application/index.vue | 14 +- yudao-ui-app/pages/member_back/index.vue | 419 ++++++++++++++++++ yudao-ui-app/pages/member_equity/index.vue | 7 +- 5 files changed, 432 insertions(+), 24 deletions(-) create mode 100644 yudao-ui-app/pages/member_back/index.vue diff --git a/yudao-ui-admin/src/views/deliverGoods/freightSet/creatTemplates.vue b/yudao-ui-admin/src/views/deliverGoods/freightSet/creatTemplates.vue index 4fbafa4d8..4b520501f 100644 --- a/yudao-ui-admin/src/views/deliverGoods/freightSet/creatTemplates.vue +++ b/yudao-ui-admin/src/views/deliverGoods/freightSet/creatTemplates.vue @@ -374,7 +374,7 @@ export default { shippingRegion() { logistics.shippingRegion({ tempId: this.tempId }).then(res => { res.data.forEach((item, index) => { - item.title = JSON.parse(item.title) + // item.title = JSON.parse(item.title) item.city_ids = item.title }) this.ruleForm.region = res.data diff --git a/yudao-ui-app/pages.json b/yudao-ui-app/pages.json index f8d4d0e20..2d84fc156 100644 --- a/yudao-ui-app/pages.json +++ b/yudao-ui-app/pages.json @@ -589,15 +589,15 @@ { "pagePath": "pages/index/index", "iconPath": "static/images/tabbar/nav_icon_shop.png", - "selectedIconPath": "static/images/1-002.png", + "selectedIconPath": "static/images/tabbar/nav_icon_shop_active.png", "text": "商城" }, - // { - // "pagePath": "pages/goods_cate/goods_cate", - // "iconPath": "static/images/tabbar/nav_icon_sort.png", - // "selectedIconPath": "static/images/2-002.png", - // "text": "分类" - // }, + { + "pagePath": "pages/goods_cate/goods_cate", + "iconPath": "static/images/tabbar/nav_icon_sort.png", + "selectedIconPath": "static/images/tabbar/nav_icon_sort_active.png", + "text": "分类" + }, { "pagePath": "pages/member_application/index", "iconPath": "static/images/tabbar/nav_icon_member.png", diff --git a/yudao-ui-app/pages/member_application/index.vue b/yudao-ui-app/pages/member_application/index.vue index 92b2bcd13..076524845 100644 --- a/yudao-ui-app/pages/member_application/index.vue +++ b/yudao-ui-app/pages/member_application/index.vue @@ -58,16 +58,6 @@ }, data() { return { - // list: [ - // { - // name:'购买记录', - // fontSize:'28' - // }, - // { - // name:'为他人充值', - // fontSize:'28' - // }, - // ], memberData: [], payInfo: { userPhone: '', @@ -106,7 +96,7 @@ const res = await memberGradeInfo() if(res.data.some((item) => !!parseInt(item.isExist))){ uni.setTabBarItem({ - index: 0, + index: 2, pagePath: '/pages/member_equity/index' }) uni.switchTab({ @@ -114,7 +104,7 @@ }) }else{ uni.setTabBarItem({ - index: 0, + index: 2, pagePath: '/pages/member_application/index' }) } diff --git a/yudao-ui-app/pages/member_back/index.vue b/yudao-ui-app/pages/member_back/index.vue new file mode 100644 index 000000000..188fd6127 --- /dev/null +++ b/yudao-ui-app/pages/member_back/index.vue @@ -0,0 +1,419 @@ + + + + + diff --git a/yudao-ui-app/pages/member_equity/index.vue b/yudao-ui-app/pages/member_equity/index.vue index 31cf1db87..c928c5bbf 100644 --- a/yudao-ui-app/pages/member_equity/index.vue +++ b/yudao-ui-app/pages/member_equity/index.vue @@ -103,12 +103,12 @@ const resful = await memberGradeInfo() if(resful.data.some((item) => !!parseInt(item.isExist))){ uni.setTabBarItem({ - index: 0, + index: 2, pagePath: '/pages/member_equity/index' }) }else{ uni.setTabBarItem({ - index: 0, + index: 2, pagePath: '/pages/member_application/index' }) uni.switchTab({ @@ -117,8 +117,7 @@ } const res = await memberHeadInfo() this.memberDetail = res.data - // this.userInfo.mobile - const equity = await query(13668261228) + const equity = await query(this.userInfo.mobile) this.equityData = equity.data }, methods: { From ac7a9d9c4ca7b271031cb270988a3dbe7a2e850b Mon Sep 17 00:00:00 2001 From: perry <292303709@qq.com> Date: Wed, 24 May 2023 18:10:09 +0800 Subject: [PATCH 05/23] =?UTF-8?q?=E8=AE=BF=E9=97=AE=E5=9C=B0=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../shop/controller/admin/notify/WxPayNotifyController.java | 2 +- .../shop/service/category/impl/CategoryServiceImpl.java | 1 - .../module/shop/service/order/impl/OrderServiceImpl.java | 4 ++-- .../module/shop/service/order/impl/StoreOrderServiceImpl.java | 2 +- yudao-server/src/main/resources/application-local.yaml | 2 +- 5 files changed, 5 insertions(+), 6 deletions(-) diff --git a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/admin/notify/WxPayNotifyController.java b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/admin/notify/WxPayNotifyController.java index 3f665e32b..4f1b31759 100644 --- a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/admin/notify/WxPayNotifyController.java +++ b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/admin/notify/WxPayNotifyController.java @@ -46,7 +46,7 @@ public class WxPayNotifyController { private StoreOrderService storeOrderService; @Autowired private RechargeOrderMapper rechargeOrderMapper; - + @Autowired private PhoneRecordService phoneRecordService; diff --git a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/category/impl/CategoryServiceImpl.java b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/category/impl/CategoryServiceImpl.java index 2fd93790a..cdd14f808 100644 --- a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/category/impl/CategoryServiceImpl.java +++ b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/category/impl/CategoryServiceImpl.java @@ -317,7 +317,6 @@ public class CategoryServiceImpl extends ServiceImpl i list.add(tree); } } - log.info("无限极分类 : getTree:" + JsonUtils.toJsonString(list)); return list; } diff --git a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/order/impl/OrderServiceImpl.java b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/order/impl/OrderServiceImpl.java index ed0231f75..ded5c0bdf 100644 --- a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/order/impl/OrderServiceImpl.java +++ b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/order/impl/OrderServiceImpl.java @@ -325,13 +325,13 @@ public class OrderServiceImpl implements OrderService { @Override public OrderDataResponse orderData(String dateLimit, Integer type, String payType) { OrderDataResponse response = new OrderDataResponse(); - if (type.equals(2)) { + if (type!=null && type==2) { type = null; } // 已完成订单数量 response.setCompleteCount(getCount(dateLimit, Constants.ORDER_STATUS_COMPLETE, type)); // 待核销订单数量 - response.setEvaluatedCount(getCount(dateLimit, Constants.ORDER_STATUS_STR_TOBE_WRITTEN_OFF, type)); +// response.setEvaluatedCount(getCount(dateLimit, Constants.ORDER_STATUS_STR_TOBE_WRITTEN_OFF, type)); // 支付订单总数 response.setOrderCount(getCount(dateLimit, Constants.ORDER_STATUS_ALL, type)); // 待收货订单数量 diff --git a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/order/impl/StoreOrderServiceImpl.java b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/order/impl/StoreOrderServiceImpl.java index 7c7cba6a7..d4dc24d0c 100644 --- a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/order/impl/StoreOrderServiceImpl.java +++ b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/order/impl/StoreOrderServiceImpl.java @@ -1275,7 +1275,7 @@ public class StoreOrderServiceImpl extends ServiceImpl Date: Wed, 24 May 2023 18:14:14 +0800 Subject: [PATCH 06/23] =?UTF-8?q?=E5=90=8E=E5=8F=B0--=E8=BF=90=E8=B4=B9?= =?UTF-8?q?=E6=A8=A1=E6=9D=BF=EF=BC=9A=E9=85=8D=E9=80=81=E5=8C=BA=E5=9F=9F?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/express/vo/ShippingTemplatesFreeRespVO.java | 3 +++ .../admin/express/vo/ShippingTemplatesNoDeliveryRespVO.java | 3 +++ .../admin/express/vo/ShippingTemplatesRegionRespVO.java | 3 +++ .../shop/dal/dataobject/express/ShippingTemplatesFreeDO.java | 5 +++++ .../dataobject/express/ShippingTemplatesNoDeliveryDO.java | 5 +++++ .../dal/dataobject/express/ShippingTemplatesRegionDO.java | 5 +++++ .../express/impl/ShippingTemplatesFreeServiceImpl.java | 2 +- .../express/impl/ShippingTemplatesNoDeliveryServiceImpl.java | 1 + .../express/impl/ShippingTemplatesRegionServiceImpl.java | 2 +- .../resources/mapper/express/ShippingTemplatesFreeMapper.xml | 2 +- .../mapper/express/ShippingTemplatesNoDeliveryMapper.xml | 2 +- .../mapper/express/ShippingTemplatesRegionMapper.xml | 2 +- 12 files changed, 30 insertions(+), 5 deletions(-) diff --git a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/admin/express/vo/ShippingTemplatesFreeRespVO.java b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/admin/express/vo/ShippingTemplatesFreeRespVO.java index b535a5a8b..0cbd27334 100644 --- a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/admin/express/vo/ShippingTemplatesFreeRespVO.java +++ b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/admin/express/vo/ShippingTemplatesFreeRespVO.java @@ -51,4 +51,7 @@ public class ShippingTemplatesFreeRespVO implements Serializable { @Schema(description = "分组唯一值", required = true) private String uniqid; + + @Schema(description = "城市名称描述") + private String title; } diff --git a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/admin/express/vo/ShippingTemplatesNoDeliveryRespVO.java b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/admin/express/vo/ShippingTemplatesNoDeliveryRespVO.java index 2dbd2744c..d5a703913 100644 --- a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/admin/express/vo/ShippingTemplatesNoDeliveryRespVO.java +++ b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/admin/express/vo/ShippingTemplatesNoDeliveryRespVO.java @@ -39,4 +39,7 @@ public class ShippingTemplatesNoDeliveryRespVO implements Serializable { @Schema(description = "省ID, 多个逗号分割。 全国 all", required = true, example = "1,2,3,4") private String provinceId; + + @Schema(description = "城市名称描述", required = true) + private String title; } diff --git a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/admin/express/vo/ShippingTemplatesRegionRespVO.java b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/admin/express/vo/ShippingTemplatesRegionRespVO.java index 4bd4be343..d44f44ede 100644 --- a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/admin/express/vo/ShippingTemplatesRegionRespVO.java +++ b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/admin/express/vo/ShippingTemplatesRegionRespVO.java @@ -58,4 +58,7 @@ public class ShippingTemplatesRegionRespVO implements Serializable { @Schema(description = "分组唯一值", required = true) private String uniqid; + @Schema(description = "城市名称描述") + private String title; + } diff --git a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/dal/dataobject/express/ShippingTemplatesFreeDO.java b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/dal/dataobject/express/ShippingTemplatesFreeDO.java index 05590bedf..eee0c694c 100644 --- a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/dal/dataobject/express/ShippingTemplatesFreeDO.java +++ b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/dal/dataobject/express/ShippingTemplatesFreeDO.java @@ -69,4 +69,9 @@ public class ShippingTemplatesFreeDO implements Serializable { *是否无效 */ private Boolean status; + + /** + * 城市名称描述 + */ + private String title; } diff --git a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/dal/dataobject/express/ShippingTemplatesNoDeliveryDO.java b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/dal/dataobject/express/ShippingTemplatesNoDeliveryDO.java index 8dcbcb291..7790300b3 100644 --- a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/dal/dataobject/express/ShippingTemplatesNoDeliveryDO.java +++ b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/dal/dataobject/express/ShippingTemplatesNoDeliveryDO.java @@ -50,5 +50,10 @@ public class ShippingTemplatesNoDeliveryDO implements Serializable { */ private String uniqid; + /** + * 城市名称描述 + */ + private String title; + } diff --git a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/dal/dataobject/express/ShippingTemplatesRegionDO.java b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/dal/dataobject/express/ShippingTemplatesRegionDO.java index efcf7d02c..17b544165 100644 --- a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/dal/dataobject/express/ShippingTemplatesRegionDO.java +++ b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/dal/dataobject/express/ShippingTemplatesRegionDO.java @@ -81,5 +81,10 @@ public class ShippingTemplatesRegionDO implements Serializable { */ private Boolean status; + /** + * 城市名称描述 + */ + private String title; + } diff --git a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/express/impl/ShippingTemplatesFreeServiceImpl.java b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/express/impl/ShippingTemplatesFreeServiceImpl.java index 42cd393dd..9082dca02 100644 --- a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/express/impl/ShippingTemplatesFreeServiceImpl.java +++ b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/express/impl/ShippingTemplatesFreeServiceImpl.java @@ -67,7 +67,7 @@ public class ShippingTemplatesFreeServiceImpl extends ServiceImpl diff --git a/yudao-module-mall/yudao-module-shop-biz/src/main/resources/mapper/express/ShippingTemplatesNoDeliveryMapper.xml b/yudao-module-mall/yudao-module-shop-biz/src/main/resources/mapper/express/ShippingTemplatesNoDeliveryMapper.xml index 680a2f38a..c1b34165a 100644 --- a/yudao-module-mall/yudao-module-shop-biz/src/main/resources/mapper/express/ShippingTemplatesNoDeliveryMapper.xml +++ b/yudao-module-mall/yudao-module-shop-biz/src/main/resources/mapper/express/ShippingTemplatesNoDeliveryMapper.xml @@ -3,6 +3,6 @@ diff --git a/yudao-module-mall/yudao-module-shop-biz/src/main/resources/mapper/express/ShippingTemplatesRegionMapper.xml b/yudao-module-mall/yudao-module-shop-biz/src/main/resources/mapper/express/ShippingTemplatesRegionMapper.xml index 063f68943..190b3e935 100644 --- a/yudao-module-mall/yudao-module-shop-biz/src/main/resources/mapper/express/ShippingTemplatesRegionMapper.xml +++ b/yudao-module-mall/yudao-module-shop-biz/src/main/resources/mapper/express/ShippingTemplatesRegionMapper.xml @@ -3,6 +3,6 @@ From 66e4d6ee54dd3682c23a53860f986986144965d9 Mon Sep 17 00:00:00 2001 From: TianYu <332368756@qq.com> Date: Wed, 24 May 2023 18:34:43 +0800 Subject: [PATCH 07/23] =?UTF-8?q?fix:=20=E8=B0=83=E6=95=B4=E5=85=85?= =?UTF-8?q?=E5=80=BC=E9=A1=B5=E9=9D=A2=E7=94=9F=E5=91=BD=E5=91=A8=E6=9C=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- yudao-ui-app/config/app.js | 4 ++-- yudao-ui-app/pages/member_application/index.vue | 2 +- yudao-ui-app/pages/member_equity/index.vue | 2 +- yudao-ui-app/pages/users/user_spread_code/index.vue | 1 + 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/yudao-ui-app/config/app.js b/yudao-ui-app/config/app.js index 0f19e7b1d..3f3bbf134 100644 --- a/yudao-ui-app/config/app.js +++ b/yudao-ui-app/config/app.js @@ -1,6 +1,6 @@ let domain = 'http://api.cyywl.top' -// let domain = 'http://192.168.1.188:48080' +// let domain = 'http://192.168.1.147:48080' module.exports = { // 请求域名 格式： https://您的域名 @@ -8,7 +8,7 @@ module.exports = { HTTP_REQUEST_URL: domain, // #endif HTTP_ADMIN_URL:'http://api.cyywl.top', //PC后台的API请求地址，上传图片用 - // HTTP_ADMIN_URL:'http://192.168.1.188:48080', //PC后台的API请求地址，上传图片用 + // HTTP_ADMIN_URL:'http://192.168.1.147:48080', //PC后台的API请求地址，上传图片用 // #ifdef H5 //H5接口是浏览器地址 // HTTP_REQUEST_URL: window.location.protocol+"//"+window.location.host, diff --git a/yudao-ui-app/pages/member_application/index.vue b/yudao-ui-app/pages/member_application/index.vue index 92b2bcd13..f91108a41 100644 --- a/yudao-ui-app/pages/member_application/index.vue +++ b/yudao-ui-app/pages/member_application/index.vue @@ -97,7 +97,7 @@ }; }, - async onLoad() { + async onShow() { try{ uni.showLoading({ title: '加载中', diff --git a/yudao-ui-app/pages/member_equity/index.vue b/yudao-ui-app/pages/member_equity/index.vue index 31cf1db87..c75bcb120 100644 --- a/yudao-ui-app/pages/member_equity/index.vue +++ b/yudao-ui-app/pages/member_equity/index.vue @@ -99,7 +99,7 @@ }; }, computed: mapGetters(['userInfo']), - async onLoad() { + async onShow() { const resful = await memberGradeInfo() if(resful.data.some((item) => !!parseInt(item.isExist))){ uni.setTabBarItem({ diff --git a/yudao-ui-app/pages/users/user_spread_code/index.vue b/yudao-ui-app/pages/users/user_spread_code/index.vue index 77abdba74..a9374e9b9 100644 --- a/yudao-ui-app/pages/users/user_spread_code/index.vue +++ b/yudao-ui-app/pages/users/user_spread_code/index.vue @@ -77,6 +77,7 @@ quality: 0.95, cacheBust: true }); + console.log('i', i) } htmlToImage.toPng(document.getElementById('poster-wrap'), { quality: 0.95, From 5af12064459f6cc8b67c1dc8f340eb5e0ce6539e Mon Sep 17 00:00:00 2001 From: perry <292303709@qq.com> Date: Wed, 24 May 2023 18:57:56 +0800 Subject: [PATCH 08/23] =?UTF-8?q?=E4=B8=8B=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/shop/dal/dataobject/recharge/RechargeOrderDO.java | 2 +- .../module/shop/service/order/impl/StoreOrderServiceImpl.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/dal/dataobject/recharge/RechargeOrderDO.java b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/dal/dataobject/recharge/RechargeOrderDO.java index f6b920dd8..a4674ece1 100644 --- a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/dal/dataobject/recharge/RechargeOrderDO.java +++ b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/dal/dataobject/recharge/RechargeOrderDO.java @@ -44,7 +44,7 @@ public class RechargeOrderDO extends TenantBaseDO { /** * 用户id */ - private Integer uid; + private Long uid; /** * 用户姓名 */ diff --git a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/order/impl/StoreOrderServiceImpl.java b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/order/impl/StoreOrderServiceImpl.java index d4dc24d0c..2c9069099 100644 --- a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/order/impl/StoreOrderServiceImpl.java +++ b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/order/impl/StoreOrderServiceImpl.java @@ -1408,7 +1408,7 @@ public class StoreOrderServiceImpl extends ServiceImpl orderInfos = request.getOrderInfos(); orderDO.setOrderId(code); - orderDO.setUid(user.getId().intValue()); + orderDO.setUid(user.getId()); orderDO.setRealName(user.getNickname()); orderDO.setUserPhone(StringUtils.isEmpty(request.getUserPhone()) ? user.getMobile() : request.getUserPhone()); orderDO.setConfirmPhone(StringUtils.isEmpty(request.getConfirmPhone()) ? user.getMobile() : request.getConfirmPhone()); From 7a2b8e64a3113c52c004983b4aa7dcc35f9b6fa0 Mon Sep 17 00:00:00 2001 From: TianYu <332368756@qq.com> Date: Wed, 24 May 2023 19:01:59 +0800 Subject: [PATCH 09/23] =?UTF-8?q?fix:=20=E8=B0=83=E6=95=B4=E6=B5=B7?= =?UTF-8?q?=E6=8A=A5=E6=96=87=E6=A1=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- yudao-ui-app/pages/users/user_spread_code/index.vue | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/yudao-ui-app/pages/users/user_spread_code/index.vue b/yudao-ui-app/pages/users/user_spread_code/index.vue index a9374e9b9..22264c274 100644 --- a/yudao-ui-app/pages/users/user_spread_code/index.vue +++ b/yudao-ui-app/pages/users/user_spread_code/index.vue @@ -11,7 +11,7 @@ 可享一年返回{{item.refundAmount}}元话费 - 三个活动可同时参与，每个手机号仅限一次，最高可反1920元话费！！！ + 三个活动可同时参与，每个手机号仅限一次，最高可返{{total}}元话费！！！ {{tenantInfo.serviceMobile}} @@ -55,7 +55,16 @@ isHideBtn: false }; }, - computed: mapGetters(['isLogin', 'uid', 'userInfo', 'tenantId', 'tenantInfo']), + computed:{ + ...mapGetters(['isLogin', 'uid', 'userInfo', 'tenantId', 'tenantInfo']), + total: function(){ + let _total = 0 + for (let active of this.activityList) { + _total+= parseInt(active.refundAmount) + } + return _total + }, + }, onLoad() { if (!this.isLogin) { toLogin() From 8aa259531abdf333cef816af1f25e13ba6da757a Mon Sep 17 00:00:00 2001 From: perry <292303709@qq.com> Date: Wed, 24 May 2023 19:06:11 +0800 Subject: [PATCH 10/23] =?UTF-8?q?=E4=B8=8B=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/notify/WxPayNotifyController.java | 26 +++++++++++-------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/admin/notify/WxPayNotifyController.java b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/admin/notify/WxPayNotifyController.java index 4f1b31759..1568c8b58 100644 --- a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/admin/notify/WxPayNotifyController.java +++ b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/admin/notify/WxPayNotifyController.java @@ -3,6 +3,7 @@ package cn.iocoder.yudao.module.shop.controller.admin.notify; import cn.hutool.core.util.NumberUtil; import cn.hutool.json.JSONUtil; +import cn.iocoder.yudao.framework.tenant.core.aop.TenantIgnore; import cn.iocoder.yudao.module.shop.dal.dataobject.recharge.RechargeOrderDO; import cn.iocoder.yudao.module.shop.dal.mysql.recharge.RechargeOrderMapper; import cn.iocoder.yudao.module.shop.service.order.StoreOrderService; @@ -115,6 +116,7 @@ public class WxPayNotifyController { * @return: */ @PostMapping("/refund_notify") + @TenantIgnore public String wxPayRefundNotify(@RequestBody String jsonData, HttpServletRequest request, HttpServletResponse response) throws Exception { // 支付结果通用通知文档: https://pay.weixin.qq.com/wiki/doc/api/jsapi.php?chapter=9_7 // 支付成功结果通知 @@ -134,18 +136,20 @@ public class WxPayNotifyController { BigDecimal payerTotal = NumberUtil.div(result.getAmount().getPayerTotal() + "", "100", 2); // 处理相关逻辑 RechargeOrderDO orderDO = rechargeOrderMapper.selectOne(Wrappers.lambdaQuery().eq(RechargeOrderDO::getOrderId, result.getOutTradeNo())); - if (payerTotal.compareTo(orderDO.getPayPrice()) != 0) { - log.error("支付金额不匹配,订单实际支付金额:{},微信入参验证金额:{}", orderDO.getPayPrice(), payerTotal); - return "failure"; + if(orderDO!=null){ + if (payerTotal.compareTo(orderDO.getPayPrice()) != 0) { + log.error("支付金额不匹配,订单实际支付金额:{},微信入参验证金额:{}", orderDO.getPayPrice(), payerTotal); + return "failure"; + } + orderDO.setRefundStatus(2); + orderDO.setPaid(2); + rechargeOrderMapper.updateById(orderDO); + //删除提报记录 + phoneRecordService.deletePhoneGear(orderDO.getOrderId()); + // 修改订单状态 + // 写入 + response.setStatus(HttpServletResponse.SC_OK); } - orderDO.setRefundStatus(2); - orderDO.setPaid(2); - rechargeOrderMapper.updateById(orderDO); - //删除提报记录 - phoneRecordService.deletePhoneGear(orderDO.getOrderId()); - // 修改订单状态 - // 写入 - response.setStatus(HttpServletResponse.SC_OK); return "success"; } } catch (Exception e) { From 65ed6707da0b7f4276a29899479ac78c85b5c937 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=8F=E5=B0=8F=E5=BC=A0?= <1085577365@qq.com> Date: Wed, 24 May 2023 19:15:54 +0800 Subject: [PATCH 11/23] =?UTF-8?q?=E5=90=8E=E5=8F=B0--=E8=BF=90=E8=B4=B9?= =?UTF-8?q?=E6=A8=A1=E6=9D=BF=EF=BC=9A=E9=85=8D=E9=80=81=E5=8C=BA=E5=9F=9F?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../express/ShippingTemplatesFreeMapper.xml | 18 +++++++++++++++++- .../ShippingTemplatesNoDeliveryMapper.xml | 18 +++++++++++++++++- .../express/ShippingTemplatesRegionMapper.xml | 18 +++++++++++++++++- 3 files changed, 51 insertions(+), 3 deletions(-) diff --git a/yudao-module-mall/yudao-module-shop-biz/src/main/resources/mapper/express/ShippingTemplatesFreeMapper.xml b/yudao-module-mall/yudao-module-shop-biz/src/main/resources/mapper/express/ShippingTemplatesFreeMapper.xml index 31a4a8431..b82a15ce5 100644 --- a/yudao-module-mall/yudao-module-shop-biz/src/main/resources/mapper/express/ShippingTemplatesFreeMapper.xml +++ b/yudao-module-mall/yudao-module-shop-biz/src/main/resources/mapper/express/ShippingTemplatesFreeMapper.xml @@ -3,6 +3,22 @@ diff --git a/yudao-module-mall/yudao-module-shop-biz/src/main/resources/mapper/express/ShippingTemplatesNoDeliveryMapper.xml b/yudao-module-mall/yudao-module-shop-biz/src/main/resources/mapper/express/ShippingTemplatesNoDeliveryMapper.xml index c1b34165a..6b042f88e 100644 --- a/yudao-module-mall/yudao-module-shop-biz/src/main/resources/mapper/express/ShippingTemplatesNoDeliveryMapper.xml +++ b/yudao-module-mall/yudao-module-shop-biz/src/main/resources/mapper/express/ShippingTemplatesNoDeliveryMapper.xml @@ -3,6 +3,22 @@ diff --git a/yudao-module-mall/yudao-module-shop-biz/src/main/resources/mapper/express/ShippingTemplatesRegionMapper.xml b/yudao-module-mall/yudao-module-shop-biz/src/main/resources/mapper/express/ShippingTemplatesRegionMapper.xml index 190b3e935..1aefe98c4 100644 --- a/yudao-module-mall/yudao-module-shop-biz/src/main/resources/mapper/express/ShippingTemplatesRegionMapper.xml +++ b/yudao-module-mall/yudao-module-shop-biz/src/main/resources/mapper/express/ShippingTemplatesRegionMapper.xml @@ -3,6 +3,22 @@ From fee30e45bd0f9d7c5b803c52a4972d79b2620054 Mon Sep 17 00:00:00 2001 From: perry <292303709@qq.com> Date: Wed, 24 May 2023 19:18:15 +0800 Subject: [PATCH 12/23] =?UTF-8?q?=E4=B8=8B=E5=8D=95=E9=80=80=E6=AC=BE?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=9C=AC=E5=9C=B0=E6=8F=90=E6=8A=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../shop/controller/admin/notify/WxPayNotifyController.java | 2 ++ .../module/shop/service/order/impl/StoreOrderServiceImpl.java | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/admin/notify/WxPayNotifyController.java b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/admin/notify/WxPayNotifyController.java index 1568c8b58..5fb07fcf5 100644 --- a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/admin/notify/WxPayNotifyController.java +++ b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/admin/notify/WxPayNotifyController.java @@ -146,6 +146,8 @@ public class WxPayNotifyController { rechargeOrderMapper.updateById(orderDO); //删除提报记录 phoneRecordService.deletePhoneGear(orderDO.getOrderId()); + //删除本地提报记录 + phoneRecordService.deletePhoneRecord(orderDO.getId()); // 修改订单状态 // 写入 response.setStatus(HttpServletResponse.SC_OK); diff --git a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/order/impl/StoreOrderServiceImpl.java b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/order/impl/StoreOrderServiceImpl.java index 2c9069099..a3bc287b3 100644 --- a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/order/impl/StoreOrderServiceImpl.java +++ b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/order/impl/StoreOrderServiceImpl.java @@ -1226,7 +1226,8 @@ public class StoreOrderServiceImpl extends ServiceImpl Date: Wed, 24 May 2023 19:59:44 +0800 Subject: [PATCH 13/23] =?UTF-8?q?uniapp=20=E8=AF=9D=E8=B4=B9=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../freightSet/creatTemplates.vue | 13 +- yudao-ui-app/pages/member_back/index.vue | 184 +++++------------- yudao-ui-app/pages/member_equity/index.vue | 14 +- yudao-ui-app/pages/member_record/index.vue | 38 ++-- 4 files changed, 85 insertions(+), 164 deletions(-) diff --git a/yudao-ui-admin/src/views/deliverGoods/freightSet/creatTemplates.vue b/yudao-ui-admin/src/views/deliverGoods/freightSet/creatTemplates.vue index 4b520501f..c32814375 100644 --- a/yudao-ui-admin/src/views/deliverGoods/freightSet/creatTemplates.vue +++ b/yudao-ui-admin/src/views/deliverGoods/freightSet/creatTemplates.vue @@ -375,7 +375,7 @@ export default { logistics.shippingRegion({ tempId: this.tempId }).then(res => { res.data.forEach((item, index) => { // item.title = JSON.parse(item.title) - item.city_ids = item.title + item.city_ids = JSON.parse(item.title) }) this.ruleForm.region = res.data }) @@ -385,10 +385,9 @@ export default { logistics.shippingFree({ tempId: this.tempId }).then(res => { res.data.forEach((item, index) => { // item.title = JSON.parse(item.title) - item.city_ids = item.cityId.split(',') + item.city_ids = JSON.parse(item.title) }) this.ruleForm.free = res.data - console.log(this.ruleForm.free ) }) }, @@ -462,9 +461,11 @@ export default { } this.ruleForm.region.forEach((el, index) => { if(el.city_ids.length > 0){ - el.cityId = JSON.stringify(el.city_ids) + el.title = JSON.stringify(el.city_ids) + el.cityId = el.city_ids.join(",") }else{ el.cityId = 'all' + el.title = 0 } }) param.shippingTemplatesRegionRespVOList = this.ruleForm.region @@ -484,9 +485,11 @@ export default { if (this.ruleForm.appoint) { this.ruleForm.free.forEach((el, index) => { if(el.city_ids.length > 0){ - el.cityId = JSON.stringify(el.city_ids) + el.title = JSON.stringify(el.city_ids) + el.cityId = el.city_ids.join(",") }else{ el.cityId = 'all' + el.title = 0 } }) param.shippingTemplatesFreeRespVOList = this.ruleForm.free diff --git a/yudao-ui-app/pages/member_back/index.vue b/yudao-ui-app/pages/member_back/index.vue index 188fd6127..6eded3d16 100644 --- a/yudao-ui-app/pages/member_back/index.vue +++ b/yudao-ui-app/pages/member_back/index.vue @@ -1,30 +1,16 @@ @@ -81,15 +67,15 @@ list: [ { img:'../../static/images/member240.png', - name:'360' + name:360 }, { img:'../../static/images/member400.png', - name:'600' + name:600 }, { img:'../../static/images/member960.png', - name:'900' + name:900 }, ], vipData:['普通会员','中级会员','高级会员'], @@ -99,24 +85,8 @@ }; }, computed: mapGetters(['userInfo']), - async onLoad() { - const resful = await memberGradeInfo() - if(resful.data.some((item) => !!parseInt(item.isExist))){ - uni.setTabBarItem({ - index: 0, - pagePath: '/pages/member_equity/index' - }) - }else{ - uni.setTabBarItem({ - index: 0, - pagePath: '/pages/member_application/index' - }) - uni.switchTab({ - url:'/pages/member_application/index' - }) - } - const res = await memberHeadInfo() - this.memberDetail = res.data + async onLoad(options) { + this.memberDetail = options const equity = await query(this.userInfo.mobile) this.equityData = equity.data }, @@ -153,7 +123,7 @@ From de63f91e4305a5934e17858b51fe077ca62b1365 Mon Sep 17 00:00:00 2001 From: Jruome <2559028966@qq.com> Date: Thu, 25 May 2023 15:44:52 +0800 Subject: [PATCH 23/23] =?UTF-8?q?uniapp=20=E7=99=BB=E5=BD=95=E6=AD=A3?= =?UTF-8?q?=E5=88=99=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- yudao-ui-app/pages/users/login/index.vue | 6 +++--- yudao-ui-app/pages/users/register/index.vue | 2 +- yudao-ui-app/pages/users/retrievePassword/index.vue | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/yudao-ui-app/pages/users/login/index.vue b/yudao-ui-app/pages/users/login/index.vue index 0759084e9..3044d1cc5 100644 --- a/yudao-ui-app/pages/users/login/index.vue +++ b/yudao-ui-app/pages/users/login/index.vue @@ -115,7 +115,7 @@ if (!that.mobile) return that.$util.Tips({ title: '请填写手机号码' }); - if (/^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/.test(that.mobile)) return that.$util.Tips({ + if (!/^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/.test(that.mobile)) return that.$util.Tips({ title: '请输入正确的手机号码' }); if (!that.captcha) return that.$util.Tips({ @@ -156,7 +156,7 @@ if (!that.mobile) return that.$util.Tips({ title: '请填写手机号码' }); - if (/^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/.test(that.mobile)) return that.$util.Tips({ + if (!/^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/.test(that.mobile)) return that.$util.Tips({ title: '请输入正确的手机号码' }); if (!that.captcha) return that.$util.Tips({ @@ -204,7 +204,7 @@ if (!that.mobile) return that.$util.Tips({ title: '请填写手机号码' }); - if (/^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/.test(that.mobile)) return that.$util.Tips({ + if (!/^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/.test(that.mobile)) return that.$util.Tips({ title: '请输入正确的手机号码' }); await registerVerify(that.mobile, 1) diff --git a/yudao-ui-app/pages/users/register/index.vue b/yudao-ui-app/pages/users/register/index.vue index 4ac7899f4..55ddbf97f 100644 --- a/yudao-ui-app/pages/users/register/index.vue +++ b/yudao-ui-app/pages/users/register/index.vue @@ -88,7 +88,7 @@ if (!this.registerForm.mobile) return this.$util.Tips({ title: '请填写手机号码' }); - if (/^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[1-25-9])\d{8}$/g.test(this.registerForm.mobile)) return this.$util.Tips({ + if (!/^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[1-25-9])\d{8}$/g.test(this.registerForm.mobile)) return this.$util.Tips({ title: '请输入正确的手机号码' }); if(this.checked.length === 0) return this.$util.Tips({ diff --git a/yudao-ui-app/pages/users/retrievePassword/index.vue b/yudao-ui-app/pages/users/retrievePassword/index.vue index 3e81bee3d..5ea273147 100644 --- a/yudao-ui-app/pages/users/retrievePassword/index.vue +++ b/yudao-ui-app/pages/users/retrievePassword/index.vue @@ -85,7 +85,7 @@ if (!that.account) return that.$util.Tips({ title: '请填写手机号码' }); - if (/^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/.test(that.account)) return that.$util.Tips({ + if (!/^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/.test(that.account)) return that.$util.Tips({ title: '请输入正确的手机号码' }); if (!that.captcha) return that.$util.Tips({ @@ -114,7 +114,7 @@ if (!that.account) return that.$util.Tips({ title: '请填写手机号码' }); - if (/^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/.test(that.account)) return that.$util.Tips({ + if (!/^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/.test(that.account)) return that.$util.Tips({ title: '请输入正确的手机号码' }); await registerVerify(that.account, 3)