From 55e070939c985b062f9654151a0099872c64aca3 Mon Sep 17 00:00:00 2001
From: lin <342011128@qq.com>
Date: Mon, 21 Mar 2022 15:47:47 +0800
Subject: [PATCH 1/4] upload
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
1.修改H5的打包错误
---
package-lock.json | 5 +----
smart-admin-h5/package.json | 8 ++++++--
smart-admin-h5/vue.config.js | 5 ++++-
smart-admin-web/package-lock.json | 3 +--
smart-admin-web/package.json | 2 +-
5 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/package-lock.json b/package-lock.json
index 8a57e32b..48e341a0 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,3 @@
{
- "name": "smart-admin",
- "lockfileVersion": 2,
- "requires": true,
- "packages": {}
+ "lockfileVersion": 1
}
diff --git a/smart-admin-h5/package.json b/smart-admin-h5/package.json
index cd09ecb3..27004afa 100644
--- a/smart-admin-h5/package.json
+++ b/smart-admin-h5/package.json
@@ -20,6 +20,8 @@
"axios": "^0.19.2",
"core-js": "^3.6.5",
"fastclick": "^1.0.6",
+ "joi": "^17.6.0",
+ "join": "^3.0.0",
"js-cookie": "^2.2.1",
"lib-flexible": "^0.3.2",
"lodash": "^4.17.20",
@@ -27,19 +29,21 @@
"nprogress": "^0.2.0",
"regenerator-runtime": "^0.13.5",
"vant": "^2.11.1",
- "vue": "^2.6.12",
+ "vue": "^3.2.31",
"vue-enum": "^1.0.5",
+ "vue-loader": "^17.0.0",
"vue-loading-overlay": "^3.4.2",
"vue-router": "^3.4.0",
"vuex": "^3.6.0"
},
"devDependencies": {
- "@sentry/webpack-plugin": "^1.11.1",
+ "@sentry/webpack-plugin": "^1.18.8",
"@vue/cli-plugin-babel": "~4.5.0",
"@vue/cli-plugin-eslint": "~4.5.0",
"@vue/cli-plugin-router": "~4.5.0",
"@vue/cli-plugin-vuex": "~4.5.0",
"@vue/cli-service": "~4.5.0",
+ "@vue/compiler-sfc": "^3.2.31",
"babel-eslint": "^10.1.0",
"babel-plugin-import": "^1.13.0",
"babel-plugin-transform-remove-console": "^6.9.4",
diff --git a/smart-admin-h5/vue.config.js b/smart-admin-h5/vue.config.js
index a31f3a23..51e5fa10 100644
--- a/smart-admin-h5/vue.config.js
+++ b/smart-admin-h5/vue.config.js
@@ -11,6 +11,9 @@ const projectConfig = require('./src/config/index.js');
// 生产环境，测试和正式
const isProductionEnv = ['production'].includes(process.env.NODE_ENV);
const isProductionAppEnv = ['prod', 'pre'].includes(process.env.VUE_APP_ENV);
+const addOptions = {
+ preserveWhitespace: true
+}
module.exports = {
publicPath: projectConfig.publicPath,
@@ -93,7 +96,7 @@ module.exports = {
.use('vue-loader')
.loader('vue-loader')
.tap(options => {
- options.compilerOptions.preserveWhitespace = true;
+ options.compilerOptions = addOptions;
return options;
})
.end();
diff --git a/smart-admin-web/package-lock.json b/smart-admin-web/package-lock.json
index 86b799c5..197e40a8 100644
--- a/smart-admin-web/package-lock.json
+++ b/smart-admin-web/package-lock.json
@@ -4084,8 +4084,7 @@
"core-js": {
"version": "2.6.11",
"resolved": "https://registry.npm.taobao.org/core-js/download/core-js-2.6.11.tgz?cache=0&sync_timestamp=1586450269267&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcore-js%2Fdownload%2Fcore-js-2.6.11.tgz",
- "integrity": "sha1-OIMUafmSK97Y7iHJ3EaYXgOZMIw=",
- "dev": true
+ "integrity": "sha1-OIMUafmSK97Y7iHJ3EaYXgOZMIw="
},
"core-util-is": {
"version": "1.0.2",
diff --git a/smart-admin-web/package.json b/smart-admin-web/package.json
index ee82b487..275dda9f 100644
--- a/smart-admin-web/package.json
+++ b/smart-admin-web/package.json
@@ -23,7 +23,7 @@
"cropperjs": "^1.2.2",
"dayjs": "^1.7.7",
"decimal.js": "^10.1.1",
- "core-js":"^2.0.0",
+ "core-js": "^2.0.0",
"e-guide-layer": "^0.1.1",
"echarts": "^4.0.4",
"gq-plus": "^2.1.5",
From c07b3a5c5a0dabb4f255889e7360d8db302b9762 Mon Sep 17 00:00:00 2001
From: lin <342011128@qq.com>
Date: Mon, 21 Mar 2022 16:43:29 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A2=E5=8D=95?=
=?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
rc-busness/pages/personal/useraddress.vue | 3 +++
1 file changed, 3 insertions(+)
diff --git a/rc-busness/pages/personal/useraddress.vue b/rc-busness/pages/personal/useraddress.vue
index 23ae45f3..2daaac97 100644
--- a/rc-busness/pages/personal/useraddress.vue
+++ b/rc-busness/pages/personal/useraddress.vue
@@ -281,6 +281,9 @@ export default {
for (let y = 0; y < this.goldmedal.length; y++) {
if(!this.goldmedal[y].orderDetailList)
continue;
+ if(!this.useralllist[y]){
+ this.useralllist[y] = {};
+ }
this.useralllist[y].orderNumber = this.goldmedal[y].orderNumber;
this.useralllist[y].status = this.goldmedal[y].status;
this.useralllist[y].addressUserName = this.goldmedal[y].addressUserName;
From 7f40887829f1e46cd8399ca3cd2b69b83c19749c Mon Sep 17 00:00:00 2001
From: lin <342011128@qq.com>
Date: Mon, 21 Mar 2022 17:32:56 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
1.修改折扣1折显示问题
2.修改取消订单请求两次的问题
---
rc-busness/pages/personal/discount.vue | 2 +-
rc-busness/pages/personal/settlement.vue | 2 +-
rc-busness/pages/personal/useraddress.vue | 12 +++++++-----
rc-busness/pages/productdetails/producted.vue | 3 ++-
4 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/rc-busness/pages/personal/discount.vue b/rc-busness/pages/personal/discount.vue
index f1fb7b69..56e1dd01 100644
--- a/rc-busness/pages/personal/discount.vue
+++ b/rc-busness/pages/personal/discount.vue
@@ -37,7 +37,7 @@
￥
- {{ item.couponAmount?item.couponAmount:(parseInt((1-item.discount)*10)+'折') }}
+ {{ item.couponAmount?item.couponAmount:(parseInt(10 - item.discount*10)+'折') }}
{{ item.couponName }}
diff --git a/rc-busness/pages/personal/settlement.vue b/rc-busness/pages/personal/settlement.vue
index 368fc431..e3caa8c6 100644
--- a/rc-busness/pages/personal/settlement.vue
+++ b/rc-busness/pages/personal/settlement.vue
@@ -167,7 +167,7 @@
￥
- {{ item.couponAmount?item.couponAmount:(parseInt((1-item.discount)*10)+'折') }}
+ {{ item.couponAmount?item.couponAmount:(parseInt(10 - item.discount*10)+'折') }}
{{ item.couponName }}
diff --git a/rc-busness/pages/personal/useraddress.vue b/rc-busness/pages/personal/useraddress.vue
index 2daaac97..dec7612b 100644
--- a/rc-busness/pages/personal/useraddress.vue
+++ b/rc-busness/pages/personal/useraddress.vue
@@ -356,11 +356,13 @@ export default {
type: "warning",
message: "取消订单成功",
});
- setTimeout(() => {
- this.indet(this.userdata);
- this.activeIndex=0;
- this.useralllist=[];
- }, 500);
+ /* 这个在全部变量去除的时候 记得加 */
+ // setTimeout(() => {
+ // this.indet(this.userdata);
+ // this.activeIndex=0;
+ // this.useralllist=[];
+ // console.log('2222');
+ // }, 500);
}
},
diff --git a/rc-busness/pages/productdetails/producted.vue b/rc-busness/pages/productdetails/producted.vue
index 9b72952b..345747fc 100644
--- a/rc-busness/pages/productdetails/producted.vue
+++ b/rc-busness/pages/productdetails/producted.vue
@@ -237,7 +237,8 @@
￥
- {{ item.couponAmount?item.couponAmount:(parseInt((1-item.discount)*10)+'折') }}
+
+ {{ item.couponAmount?item.couponAmount:(parseInt(10 - item.discount*10)+'折') }}
{{ item.couponName }}
From 0f7931155aba2eb871e0f1a644a31959a2d5484a Mon Sep 17 00:00:00 2001
From: lin <342011128@qq.com>
Date: Mon, 21 Mar 2022 19:08:34 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
1.修改价格显示问题
2.分化用户数据和添加cookit等静态方法
---
rc-busness/pages/personal/settlement.vue | 26 ++++++++++++----
rc-busness/pages/personal/useraddress.vue | 1 -
rc-busness/pages/userlogin/login.vue | 14 ++++++---
rc-busness/plugins/until/until.js | 38 +++++++++++++++++++++++
rc-busness/store/index.js | 12 ++++++-
rc-busness/store/modules/login.js | 17 ++++++++++
rc-busness/store/modules/user.js | 18 +++++++++++
7 files changed, 113 insertions(+), 13 deletions(-)
create mode 100644 rc-busness/plugins/until/until.js
create mode 100644 rc-busness/store/modules/login.js
create mode 100644 rc-busness/store/modules/user.js
diff --git a/rc-busness/pages/personal/settlement.vue b/rc-busness/pages/personal/settlement.vue
index e3caa8c6..79a6afbc 100644
--- a/rc-busness/pages/personal/settlement.vue
+++ b/rc-busness/pages/personal/settlement.vue
@@ -268,7 +268,9 @@ export default {
},
methods: {
...mapMutations(["checkIsLogin"]),
+ /* 计算优惠券价格 */
discountedSumPrice() {
+ /* 判断是否为商品卷 */
if(this.curCoupon.productCodes)
this.finalAmount = this.qualifiedProductDiscount();
else
@@ -309,15 +311,17 @@ export default {
return this.sumPrice;
}
},
+ /* 计算价格商品折扣 */
qualifiedProductDiscount(){
this.discountedItemIndex = 0;
let total = 0;
- let totalItemNum = 0;
+ let totalItemNum = 0; //判断满足优惠券条件的商品数量
let couponUsed = false;
- let tmpShoppingCartList = this.arrSort(this.goldmedal);
- let qualifiedProductAmount = 0;
+ let tmpShoppingCartList = this.arrSort(this.goldmedal); //对应的商品
+ let qualifiedProductAmount = 0; //满足条件的优惠券商品价格总价
let skipQualifiedProductAmountCalculating = false;
- let checkResult = true;
+ let checkResult = true; //是否可使用
+ let selectProduct = []; //满足条件的商品
for(let itemInCart of tmpShoppingCartList) {
if(this.curCoupon.productCodes.indexOf(itemInCart.productCode)>-1) {
qualifiedProductAmount += (itemInCart.productPrice * itemInCart.buyCount);
@@ -334,8 +338,17 @@ export default {
checkResult = false;
}
+
+ // couponTypeId
+ // 0-不用折扣
+ // 1-狗干粮金额券（50）
+ // 2-通用金额满减券（50）
+ // 3-通用折扣券（6折）
+ // 4-指定干粮折扣券（7折）
+ // 6-指定干粮金额券（100）
for(let itemInCart of tmpShoppingCartList) {
if(this.curCoupon.productCodes && this.curCoupon.productCodes.indexOf(itemInCart.productCode)>-1 && !couponUsed && checkResult) {
+ console.log(itemInCart,'itemInCart');
//Into coupon discount calculation
switch(this.curCoupon.couponTypeId) {
case 1: //Amount deduct
@@ -369,8 +382,8 @@ export default {
case 3: //Limited product % discount
case 4: //% discount
if(this.curCoupon.discount && this.curCoupon.productCodes.indexOf(itemInCart.productCode)>-1) {
- total = total + (itemInCart.productPrice * itemInCart.buyCount) * ( 1 - this.curCoupon.discount );
- this.discountAmount = (itemInCart.productPrice * itemInCart.buyCount) * this.curCoupon.discount;
+ total = total + qualifiedProductAmount * ( 1 - this.curCoupon.discount );
+ this.discountAmount = qualifiedProductAmount * this.curCoupon.discount;
this.discountedProductCode = itemInCart.productCode;
couponUsed=true;
skipQualifiedProductAmountCalculating = true;
@@ -517,6 +530,7 @@ export default {
}
}
},
+ /* 关闭弹出框 计算价格 */
pickCoupon(item){
this.curCoupon = item;
this.dialogInfo1 = false;
diff --git a/rc-busness/pages/personal/useraddress.vue b/rc-busness/pages/personal/useraddress.vue
index dec7612b..1415c2ea 100644
--- a/rc-busness/pages/personal/useraddress.vue
+++ b/rc-busness/pages/personal/useraddress.vue
@@ -363,7 +363,6 @@ export default {
// this.useralllist=[];
// console.log('2222');
// }, 500);
-
}
},
diff --git a/rc-busness/pages/userlogin/login.vue b/rc-busness/pages/userlogin/login.vue
index 7d491632..86f3a39a 100644
--- a/rc-busness/pages/userlogin/login.vue
+++ b/rc-busness/pages/userlogin/login.vue
@@ -143,7 +143,7 @@