From ed7e422a0af914265d6faffb3348bf0ddda1e7f1 Mon Sep 17 00:00:00 2001 From: "lenovo008\\lenovo" Date: Tue, 23 Jul 2024 13:39:13 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=93=81=E7=89=8C=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E5=8F=8A=E5=BC=80=E5=8F=91=E7=8E=AF=E5=A2=83=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 将品牌名称从“芋道商城”更新为“郑大钒水”，涉及的修改包括README文件、manifest.json文件中的displayName和appid配置、以及部分页面的文本内容。同时，调整了开发环境的BASE_URL至http://192.168.1.114:48080，并对部分组件的UI和逻辑进行了优化，如s-auth-modal和s-share-modal组件中对按钮和文本的显示进行了注释处理。 此外，还优化了代码的格式和可读性，例如在sms-login.vue文件中规范了模板标签的闭合方式。这些改动旨在提升品牌识别度和用户界面的友好性，同时为后续的功能开发和维护打下良好的基础。 --- yudao-mall-uniapp-master/.env.development | 5 ++++- yudao-mall-uniapp-master/.env.production | 2 +- yudao-mall-uniapp-master/README.md | 2 +- yudao-mall-uniapp-master/manifest.json | 2 +- yudao-mall-uniapp-master/package.json | 4 ++-- .../components/s-auth-modal/components/sms-login.vue | 8 ++++---- .../sheep/components/s-auth-modal/index.scss | 2 +- .../sheep/components/s-auth-modal/s-auth-modal.vue | 2 +- .../sheep/components/s-share-modal/s-share-modal.vue | 4 ++-- 9 files changed, 17 insertions(+), 14 deletions(-) diff --git a/yudao-mall-uniapp-master/.env.development b/yudao-mall-uniapp-master/.env.development index f3d3497..f3113de 100644 --- a/yudao-mall-uniapp-master/.env.development +++ b/yudao-mall-uniapp-master/.env.development @@ -1,2 +1,5 @@ # SHOPRO_DEV_BASE_URL = https://yanghaodong.51vip.biz - SHOPRO_DEV_BASE_URL = http://192.168.1.118:48080 \ No newline at end of file + SHOPRO_DEV_BASE_URL = http://192.168.1.114:48080 + + # 线上地址 + # SHOPRO_DEV_BASE_URL = https://zda.huamar.com \ No newline at end of file diff --git a/yudao-mall-uniapp-master/.env.production b/yudao-mall-uniapp-master/.env.production index f58a6bc..cb1b513 100644 --- a/yudao-mall-uniapp-master/.env.production +++ b/yudao-mall-uniapp-master/.env.production @@ -1,2 +1,2 @@ -SHOPRO_DEV_BASE_URL = https://123456789.shopro.cn +SHOPRO_DEV_BASE_URL = https://zda.huamar.com \ No newline at end of file diff --git a/yudao-mall-uniapp-master/README.md b/yudao-mall-uniapp-master/README.md index 2aeb2e4..7fbf94e 100644 --- a/yudao-mall-uniapp-master/README.md +++ b/yudao-mall-uniapp-master/README.md @@ -15,7 +15,7 @@ ## 🐯 商城简介 -**芋道商城**，基于 [芋道开发平台](https://github.com/YunaiV/ruoyi-vue-pro) 构建，以开发者为中心，打造中国第一流的 Java 开源商城系统，全部开源，个人与企业可 100% 免费使用。 +**郑大钒水**，基于 [郑大钒水平台](https://github.com/YunaiV/ruoyi-vue-pro) 构建，以开发者为中心，打造中国第一流的 Java 开源商城系统，全部开源，个人与企业可 100% 免费使用。 > 有任何问题，或者想要的功能，可以在 Issues 中提给艿艿。 > diff --git a/yudao-mall-uniapp-master/manifest.json b/yudao-mall-uniapp-master/manifest.json index abb3b87..f210bb0 100644 --- a/yudao-mall-uniapp-master/manifest.json +++ b/yudao-mall-uniapp-master/manifest.json @@ -184,7 +184,7 @@ "versionCode": 100 }, "mp-weixin": { - "appid": "wx53b5ac263b9cdb5b", + "appid": "wx879300e525dc9847", "setting": { "urlCheck": false, "minified": true, diff --git a/yudao-mall-uniapp-master/package.json b/yudao-mall-uniapp-master/package.json index d83ca3a..643da9a 100644 --- a/yudao-mall-uniapp-master/package.json +++ b/yudao-mall-uniapp-master/package.json @@ -1,9 +1,9 @@ { "id": "shopro", "name": "shopro", - "displayName": "芋道商城", + "displayName": "郑大钒水", "version": "2.1.0", - "description": "芋道商城，一套代码，同时发行到iOS、Android、H5、微信小程序多个平台，请使用手机扫码快速体验强大功能", + "description": "郑大钒水，一套代码，同时发行到iOS、Android、H5、微信小程序多个平台，请使用手机扫码快速体验强大功能", "scripts": { "prettier": "prettier --write \"{pages,sheep}/**/*.{js,json,tsx,css,less,scss,vue,html,md}\"" }, diff --git a/yudao-mall-uniapp-master/sheep/components/s-auth-modal/components/sms-login.vue b/yudao-mall-uniapp-master/sheep/components/s-auth-modal/components/sms-login.vue index 0651b78..dcc963a 100644 --- a/yudao-mall-uniapp-master/sheep/components/s-auth-modal/components/sms-login.vue +++ b/yudao-mall-uniapp-master/sheep/components/s-auth-modal/components/sms-login.vue @@ -2,7 +2,7 @@ diff --git a/yudao-mall-uniapp-master/sheep/components/s-auth-modal/index.scss b/yudao-mall-uniapp-master/sheep/components/s-auth-modal/index.scss index c4424e7..e46fba5 100644 --- a/yudao-mall-uniapp-master/sheep/components/s-auth-modal/index.scss +++ b/yudao-mall-uniapp-master/sheep/components/s-auth-modal/index.scss @@ -104,7 +104,7 @@ width: 100%; .auto-login-btn { width: 68rpx; - height: 68rpx; + height: 168rpx; border-radius: 50%; margin: 0 30rpx; } diff --git a/yudao-mall-uniapp-master/sheep/components/s-auth-modal/s-auth-modal.vue b/yudao-mall-uniapp-master/sheep/components/s-auth-modal/s-auth-modal.vue index cf6a6ff..2fef0ea 100644 --- a/yudao-mall-uniapp-master/sheep/components/s-auth-modal/s-auth-modal.vue +++ b/yudao-mall-uniapp-master/sheep/components/s-auth-modal/s-auth-modal.vue @@ -31,7 +31,7 @@ > - 还没有账号? + diff --git a/yudao-mall-uniapp-master/sheep/components/s-share-modal/s-share-modal.vue b/yudao-mall-uniapp-master/sheep/components/s-share-modal/s-share-modal.vue index 717940e..f9aa9bf 100644 --- a/yudao-mall-uniapp-master/sheep/components/s-share-modal/s-share-modal.vue +++ b/yudao-mall-uniapp-master/sheep/components/s-share-modal/s-share-modal.vue @@ -36,14 +36,14 @@ - + --> 取消 From 7f2456c0f4986f865d31e1d086c9996a2ef3a4cb Mon Sep 17 00:00:00 2001 From: "lenovo008\\lenovo" Date: Tue, 23 Jul 2024 17:41:49 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=87=AA=E6=8F=90?= =?UTF-8?q?=E4=BB=A5=E5=8F=8A=E8=AE=A2=E9=98=85=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- yudao-mall-uniapp-master/.env.development | 4 ++-- .../pages/order/confirm.vue | 21 +++++++++++++------ .../platform/provider/wechat/miniProgram.js | 9 ++++---- 3 files changed, 22 insertions(+), 12 deletions(-) diff --git a/yudao-mall-uniapp-master/.env.development b/yudao-mall-uniapp-master/.env.development index f3113de..7854d99 100644 --- a/yudao-mall-uniapp-master/.env.development +++ b/yudao-mall-uniapp-master/.env.development @@ -1,5 +1,5 @@ # SHOPRO_DEV_BASE_URL = https://yanghaodong.51vip.biz - SHOPRO_DEV_BASE_URL = http://192.168.1.114:48080 +# SHOPRO_DEV_BASE_URL = http://192.168.1.114:48080 # 线上地址 - # SHOPRO_DEV_BASE_URL = https://zda.huamar.com \ No newline at end of file + SHOPRO_DEV_BASE_URL = https://zda.huamar.com \ No newline at end of file diff --git a/yudao-mall-uniapp-master/pages/order/confirm.vue b/yudao-mall-uniapp-master/pages/order/confirm.vue index 908cc97..9b2fbcf 100644 --- a/yudao-mall-uniapp-master/pages/order/confirm.vue +++ b/yudao-mall-uniapp-master/pages/order/confirm.vue @@ -186,8 +186,8 @@ items: [], // 商品项列表 price: {}, // 价格信息 }, - deliType:2, - pickUpInfo:{},//门店信息 + deliType:2, + pickUpInfo:{},//门店信息 addressInfo: {}, // 选择的收货地址 showCoupon: false, // 是否展示优惠劵 couponInfo: [], // 优惠劵列表 @@ -230,9 +230,18 @@ // 提交订单 function onConfirm() { - if (!state.addressInfo.id) { - sheep.$helper.toast('请选择收货地址'); - return; + console.log(state.deliType, '11111111111111111'); + + if (state.deliType == 1) { + if (!state.addressInfo.id) { + sheep.$helper.toast('请选择收货地址'); + return; + } + }else{ + if (!state.pickUpInfo.id) { + sheep.$helper.toast('请选择自提门店'); + return; + } } submitOrder(); } @@ -250,7 +259,7 @@ items: state.orderPayload.items, couponId: state.orderPayload.couponId, addressId: state.deliType === 1 ? state.addressInfo.id: null, - pickUpStoreId:state.deliType === 2 ? state.pickUpInfo.id : null, + pickUpStoreId:state.deliType === 2 ? state.pickUpInfo.id : null, deliveryType: state.deliType, // TODO 芋艿：需要支持【门店自提】 pointStatus: false, // TODO 芋艿：需要支持【积分选择】 combinationActivityId: state.orderPayload.combinationActivityId, diff --git a/yudao-mall-uniapp-master/sheep/platform/provider/wechat/miniProgram.js b/yudao-mall-uniapp-master/sheep/platform/provider/wechat/miniProgram.js index a5b64b0..754b37e 100644 --- a/yudao-mall-uniapp-master/sheep/platform/provider/wechat/miniProgram.js +++ b/yudao-mall-uniapp-master/sheep/platform/provider/wechat/miniProgram.js @@ -164,10 +164,11 @@ const checkUpdate = async (silence = true) => { // 获取订阅消息模板 async function getSubscribeTemplate() { - const { error, data } = await third.wechat.subscribeTemplate(); - if (error === 0) { - subscribeEventList = data; - } + // const { error, data } = await third.wechat.subscribeTemplate(); + // if (error === 0) { + // subscribeEventList = data; + // } + console.log('获取订阅消息模板'); } // 订阅消息 From 588aa285ea15189d0ed0f9fe6906754bc6e9900f Mon Sep 17 00:00:00 2001 From: "lenovo008\\lenovo" Date: Tue, 23 Jul 2024 17:52:14 +0800 Subject: [PATCH 3/3] =?UTF-8?q?fix.pay:=20=E7=A6=81=E7=94=A8=E6=94=AF?= =?UTF-8?q?=E4=BB=98=E5=AE=9D=E6=94=AF=E4=BB=98=E9=80=89=E9=A1=B9=E7=9A=84?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=80=BB=E8=BE=91=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 在选择支付方式的页面中，修复了支付宝支付选项即使被禁用（disabled）也依然显示的问题。通过添加v-if条件判断，只有当支付方式未被禁用时，才展示对应的支付选项，从而提高了界面的交互逻辑准确性。 --- yudao-mall-uniapp-master/pages/pay/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yudao-mall-uniapp-master/pages/pay/index.vue b/yudao-mall-uniapp-master/pages/pay/index.vue index 46e3eaf..db937c1 100644 --- a/yudao-mall-uniapp-master/pages/pay/index.vue +++ b/yudao-mall-uniapp-master/pages/pay/index.vue @@ -17,7 +17,7 @@ 选择支付方式