From f70424921de4f7840e45de66a3e897daf59fc447 Mon Sep 17 00:00:00 2001
From: Handson <7420044+handson1107@user.noreply.gitee.com>
Date: Sat, 15 Jul 2023 08:58:38 +0000
Subject: [PATCH 1/4] update README.md.
Signed-off-by: Handson <7420044+handson1107@user.noreply.gitee.com>
---
README.md | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/README.md b/README.md
index af2f2c4f..f23bcfe7 100644
--- a/README.md
+++ b/README.md
@@ -99,7 +99,7 @@ CRMEB开源商城PHP：https://gitee.com/ZhongBangKeJi/CRMEB
---
-### 系统演示：
+### 🎬 系统演示：
移动端：https://java.crmeb.net
WEBPC管理端：https://admin.java.crmeb.net
@@ -113,7 +113,7 @@ WEBPC管理端：https://admin.java.crmeb.net
---
-### 系统资料
+### 📃 系统资料
需要系统文档的朋友看过来，安装文档、产品介绍、技术文档...你想要的我都有！
[https://doc.crmeb.com/java/crmeb_java](https://doc.crmeb.com/java/crmeb_java)
@@ -123,13 +123,13 @@ WEBPC管理端：https://admin.java.crmeb.net
---
-### UI界面
+### 💟 UI界面
#### 核心功能
-### 移动端预览
+### 📱 移动端预览
@@ -148,18 +148,18 @@ WEBPC管理端：https://admin.java.crmeb.net
---
-### CRMEB互动
+### 📲 CRMEB互动
#### 技术娱乐
代码写累了？那就歇会吧！扫码让你开心一刻！
-#### 技术社区
+#### 📈 技术社区
找方法、提bug、看官方消息、拿活跃大奖！
https://www.crmeb.com/ask/thread/list/152
-#### 技术交流
+#### 📞 技术交流
跟着官方，不迷路！欢迎扫码加入CRMEB 开源项目群，一手消息及资源，尽在掌握！
CRMEB JAVA 技术交流QQ群 1群 🈵️
CRMEB JAVA 技术交流QQ群 2群 🈵️
@@ -170,7 +170,7 @@ CRMEB JAVA 技术交流QQ群 3群 640230510 🈵️ 群已满
---
-### 特别鸣谢
+### 💌 特别鸣谢
核心开发团队
产品：木子刀客
@@ -183,13 +183,13 @@ UI：被子横盖显得高🐰
---
-### 使用须知
+### 🔔 使用须知
1.允许用于个人学习、毕业设计、教学案例、公益事业、商业使用;
2.如果商用必须保留版权信息，请自觉遵守;
3.禁止将本项目的代码和资源进行任何形式的出售，产生的一切任何后果责任由侵权者自负。
---
-### 版权信息
+### 🪪 版权信息
本项目包含的第三方源码和二进制文件之版权信息另行标注。
版权所有Copyright © 2017-2022 by CRMEB (https://www.crmeb.com)
All rights reserved。
From de2c57e6bcf2692bbf2bfe4582b4ce8eb5e334bb Mon Sep 17 00:00:00 2001
From: guaishoudemao <598705433@qq.com>
Date: Mon, 21 Aug 2023 15:01:50 +0800
Subject: [PATCH 2/4] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E6=94=B9=E5=95=86?=
=?UTF-8?q?=E5=93=81=E6=B7=BB=E5=8A=A0=E4=B8=AD=E5=95=86=E5=93=81=E7=9A=84?=
=?UTF-8?q?=E4=BB=B7=E6=A0=BC=E6=A0=A1=E9=AA=8C=EF=BC=8C=E6=9C=80=E5=B0=8F?=
=?UTF-8?q?=E5=80=BC=E4=B8=BA0.01=EF=BC=8C=E5=BA=93=E5=AD=98=E6=AD=A3?=
=?UTF-8?q?=E6=95=B4=E6=95=B0=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
admin/src/views/store/creatStore/index.vue | 43 +++++++++++-----------
1 file changed, 21 insertions(+), 22 deletions(-)
diff --git a/admin/src/views/store/creatStore/index.vue b/admin/src/views/store/creatStore/index.vue
index 03826c67..2118ef13 100644
--- a/admin/src/views/store/creatStore/index.vue
+++ b/admin/src/views/store/creatStore/index.vue
@@ -177,7 +177,7 @@
-
+
@@ -216,7 +216,7 @@
-
+
@@ -260,7 +260,7 @@
-
+
@@ -585,33 +585,32 @@
this.getGoodsType()
},
methods: {
- keyupEvent(e,array,index,row,num){
- e.target.value=e.target.value.replace(/[^\d.]/g, '');
- e.target.value=e.target.value.replace(/\.{2,}/g, '.');
- e.target.value=e.target.value.replace(/^\./g, '0.');
- e.target.value=e.target.value.replace(/^\d*\.\d*\./g, e.target.value.substring(0,e.target.value.length-1));
- e.target.value=e.target.value.replace(/^0[^\.]+/g, '0')
- e.target.value=e.target.value.replace(/^(\d+)\.(\d\d).*$/, '$1.$2')
+ // 校验输入框不能输入0，保留2位小数，库存为正整数
+ keyupEvent(key, val, index, num) {
+ var re = /^\D*([0-9]\d*\.?\d{0,2})?.*$/;
switch (num) {
case 1:
- if(row == 'stock'){
- this.oneFormBatch[index][row]=parseInt(e.target.value)
- }else{
- this.oneFormBatch[index][row]=e.target.value
+ if (val <= 0) {
+ this.oneFormBatch[index][key] = 0.01;
+ } else {
+ this.oneFormBatch[index][key] =
+ key === 'stock' ? parseInt(val) : this.$set(this.oneFormBatch[index], key, val.replace(re, '$1'));
}
break;
case 2:
- if(row == 'stock'){
- this.OneattrValue[index][row]=parseInt(e.target.value)
- }else{
- this.OneattrValue[index][row]=e.target.value
+ if (val <= 0) {
+ this.OneattrValue[index][key] = 0.01;
+ } else {
+ this.OneattrValue[index][key] =
+ key === 'stock' ? parseInt(val) : this.$set(this.OneattrValue[index], key, val.replace(re, '$1'));
}
break;
default:
- if(row == 'stock'){
- this.ManyAttrValue[index][row]=parseInt(e.target.value)
- }else{
- this.ManyAttrValue[index][row]=e.target.value
+ if (val <= 0) {
+ this.ManyAttrValue[index][key] = 0.01;
+ } else {
+ this.ManyAttrValue[index][key] =
+ key === 'stock' ? parseInt(val) : this.$set(this.ManyAttrValue[index], key, val.replace(re, '$1'));
}
break;
}
From 44dedf3e89814fc1c3deff2c8eeda7f80d6fdc83 Mon Sep 17 00:00:00 2001
From: guaishoudemao <598705433@qq.com>
Date: Tue, 22 Aug 2023 18:12:38 +0800
Subject: [PATCH 3/4] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E6=94=B9=E5=95=86?=
=?UTF-8?q?=E5=93=81=E6=B7=BB=E5=8A=A0=E4=B8=AD=E5=95=86=E5=93=81=E7=9A=84?=
=?UTF-8?q?=E4=BB=B7=E6=A0=BC=E6=A0=A1=E9=AA=8C=EF=BC=8C=E6=9C=80=E5=B0=8F?=
=?UTF-8?q?=E5=80=BC=E4=B8=BA0.01=EF=BC=8C=E5=BA=93=E5=AD=98=E6=AD=A3?=
=?UTF-8?q?=E6=95=B4=E6=95=B0=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
admin/src/views/store/creatStore/index.vue | 32 ++++++++++++++--------
1 file changed, 20 insertions(+), 12 deletions(-)
diff --git a/admin/src/views/store/creatStore/index.vue b/admin/src/views/store/creatStore/index.vue
index 2118ef13..cb1922c6 100644
--- a/admin/src/views/store/creatStore/index.vue
+++ b/admin/src/views/store/creatStore/index.vue
@@ -177,7 +177,7 @@
-
+
@@ -216,7 +216,7 @@
-
+
@@ -260,7 +260,8 @@
-
+
@@ -587,30 +588,37 @@
methods: {
// 校验输入框不能输入0，保留2位小数，库存为正整数
keyupEvent(key, val, index, num) {
+ if (key === 'barCode') return;
var re = /^\D*([0-9]\d*\.?\d{0,2})?.*$/;
switch (num) {
case 1:
- if (val <= 0) {
- this.oneFormBatch[index][key] = 0.01;
+ if (val == 0) {
+ this.oneFormBatch[index][key] = key === 'stock' ? 0 : 0.01;
} else {
this.oneFormBatch[index][key] =
- key === 'stock' ? parseInt(val) : this.$set(this.oneFormBatch[index], key, val.replace(re, '$1'));
+ key === 'stock'
+ ? parseInt(val)
+ : this.$set(this.oneFormBatch[index], key, val.toString().replace(re, '$1'));
}
break;
case 2:
- if (val <= 0) {
- this.OneattrValue[index][key] = 0.01;
+ if (val == 0) {
+ this.OneattrValue[index][key] = key === 'stock' ? 0 : 0.01;
} else {
this.OneattrValue[index][key] =
- key === 'stock' ? parseInt(val) : this.$set(this.OneattrValue[index], key, val.replace(re, '$1'));
+ key === 'stock'
+ ? parseInt(val)
+ : this.$set(this.OneattrValue[index], key, val.toString().replace(re, '$1'));
}
break;
default:
- if (val <= 0) {
- this.ManyAttrValue[index][key] = 0.01;
+ if (val == 0) {
+ this.ManyAttrValue[index][key] = key === 'stock' ? 0 : 0.01;
} else {
this.ManyAttrValue[index][key] =
- key === 'stock' ? parseInt(val) : this.$set(this.ManyAttrValue[index], key, val.replace(re, '$1'));
+ key === 'stock'
+ ? parseInt(val)
+ : this.$set(this.ManyAttrValue[index], key, val.toString().replace(re, '$1'));
}
break;
}
From 04129529bcb8522beb2b7d2b9ed056318d24225d Mon Sep 17 00:00:00 2001
From: guaishoudemao <598705433@qq.com>
Date: Thu, 24 Aug 2023 09:16:09 +0800
Subject: [PATCH 4/4] =?UTF-8?q?fix:=20=E4=BC=98=E5=93=81=E6=8E=A8=E8=8D=90?=
=?UTF-8?q?=E8=AF=B7=E6=B1=82=E4=B8=8D=E7=99=BB=E5=BD=95=E5=8F=AF=E4=BB=A5?=
=?UTF-8?q?=E8=AE=BF=E9=97=AE=E4=BF=AE=E6=94=B9=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/api/store.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/app/api/store.js b/app/api/store.js
index 0be14a76..a7750656 100644
--- a/app/api/store.js
+++ b/app/api/store.js
@@ -175,7 +175,7 @@ export function storeListApi(data) {
* @param object data
*/
export function getProductGood() {
- return request.get('product/good');
+ return request.get('product/good',{},{ noAuth : true});
}
/**
@@ -185,7 +185,7 @@ export function getProductGood() {
*
*/
export function getReplyProduct(id) {
- return request.get('reply/product/' + id, {
+ return request.get('reply/product/' + id, {},{
noAuth: true
})
}
\ No newline at end of file