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 1/3] =?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 2/3] =?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 3/3] =?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 @@