diff --git a/rc-busness/assets/css/global.less b/rc-busness/assets/css/global.less index 0cdbc94d..f9ca05fc 100644 --- a/rc-busness/assets/css/global.less +++ b/rc-busness/assets/css/global.less @@ -317,7 +317,7 @@ picture { height: auto; position: fixed; right: 0; - top: 30%; + top: 40%; background: #FFFFFF; box-shadow: 0 0 10px rgba(0, 0, 0, 0.16); border-radius: .25rem; diff --git a/rc-busness/assets/css/search.less b/rc-busness/assets/css/search.less index 00deb868..23f69fe2 100644 --- a/rc-busness/assets/css/search.less +++ b/rc-busness/assets/css/search.less @@ -380,7 +380,8 @@ border-radius: 100px; @media screen and (min-width: 768px){ .usersearch { width: 100%; - margin: 0 auto; + margin-left:auto; + margin-right:auto; overflow: hidden; .ts-scrollable-container{ h2{ diff --git a/rc-busness/pages/myorder/userrecord.vue b/rc-busness/pages/myorder/userrecord.vue index 0162a9f7..79732038 100644 --- a/rc-busness/pages/myorder/userrecord.vue +++ b/rc-busness/pages/myorder/userrecord.vue @@ -274,6 +274,15 @@ export default { // }); }, plus(num, index) { + let leftAllotment = this.cartData[index].leftAllotment; + if(this.cartData[index].buyCount >= leftAllotment) { + this.$message({ + type: "error", + message: "已达到本品最大购买上限", + }); + return; + } + this.cartData[index].buyCount = parseInt(this.cartData[index].buyCount) + 1; }, diff --git a/rc-busness/pages/personal/settlement.vue b/rc-busness/pages/personal/settlement.vue index 2d105b9c..6ee2f83c 100644 --- a/rc-busness/pages/personal/settlement.vue +++ b/rc-busness/pages/personal/settlement.vue @@ -155,7 +155,7 @@ import Myheader from "~/components/header.vue"; import { userin, memberAddress, generateOrderWX } from "../../ajax/getData"; import tabs from "@/components/tabs.vue"; import myAddress from "~/components/address.vue"; - +import { mapMutations } from "vuex"; import itemMixin from "../../../smart-admin-web/src/components/main/components/side-menu/item-mixin"; export default { middleware: "metaTitle", @@ -216,6 +216,7 @@ export default { }, }, methods: { + ...mapMutations(["checkIsLogin"]), async getAddressList() { let memberId = JSON.parse(localStorage.getItem("userInfo")).data.id; let { data } = await memberAddress("getAll", { memberId: memberId }); @@ -295,6 +296,16 @@ export default { }, async jiesuan() { let orderAddress = this.useraddress.filter((item) => item.isDefault); + let userInfo = this.$store.state.userInfo; + if(!userInfo) { + this.$router.push({ + path: "/userlogin/login", + query: { + + }, + }); + return; + } let postData = []; this.goldmedal.forEach((item) => { let basePoint = (item.basePoint?item.basePoint:0); @@ -304,8 +315,8 @@ export default { buyCount: item.buyCount, productId: item.productCode, payAmount: item.productPrice, - memberId: item.memberId, - phoneNumber: item.mobile, + memberId: userInfo.data.id, + phoneNumber: userInfo.data.mobile, // couponId: "NGQ2022P12", // couponTypeId: "4", // couponName: "内购券", @@ -402,6 +413,7 @@ export default { mounted() { this.goldmedal = JSON.parse(this.$route.query.list); this.getAddressList(); + this.checkIsLogin(); // this.addressstype = this.$route.query.stype; // this.orderNumber = this.$route.query.orderNumber; // this.canceldanhao(this.orderNumber); diff --git a/rc-busness/pages/personal/useraddress.vue b/rc-busness/pages/personal/useraddress.vue index 121dffb0..b4a9db93 100644 --- a/rc-busness/pages/personal/useraddress.vue +++ b/rc-busness/pages/personal/useraddress.vue @@ -65,7 +65,7 @@
- {{ + {{ item.status == "0" ? "取消订单" : item.status == "1" diff --git a/rc-busness/pages/productdetails/producted.vue b/rc-busness/pages/productdetails/producted.vue index f1094d49..28a0512d 100644 --- a/rc-busness/pages/productdetails/producted.vue +++ b/rc-busness/pages/productdetails/producted.vue @@ -135,7 +135,7 @@ 商品规格:
- + {{ item.specifications }}
@@ -192,7 +192,7 @@ -
+
加入购物车 立即购买
@@ -254,7 +254,7 @@
-
+
加入购物车 立即购买
diff --git a/rc-busness/pages/usersearch/search.vue b/rc-busness/pages/usersearch/search.vue index 6e0875dc..ea1dac4e 100644 --- a/rc-busness/pages/usersearch/search.vue +++ b/rc-busness/pages/usersearch/search.vue @@ -38,7 +38,7 @@
-
+

我想搜

@@ -118,7 +118,7 @@
- {{ item.categoryName }} + {{ item.name }} {{ item.ecPrice?("¥"+item.ecPrice):'' }}