[200~1.兼容中国台湾、中国香港手机号码

2025-07-10 14:29:44 +08:00
parent c7bab5afb4
commit f71ab1b442
27 changed files with 5393 additions and 4190 deletions
--- a/pages/goods/index/index.vue
+++ b/pages/goods/index/index.vue
@@ -2,7 +2,7 @@
  <view class="container commonPageBox commonDetailPage">
    <!-- 公共组件-每个页面必须引入 -->
    <public-module></public-module>
-    <z-nav-bar title="商品详情" bgColor="#258feb" fontColor="#fff"></z-nav-bar>
+    <z-nav-bar title="商品详情"></z-nav-bar>

    <view
      class="contentBox commonPageContentBox"
@@ -424,7 +424,7 @@
        :fill="true"
        :options="buyOptions"
        :button-group="customButtonGroup1"
-        @click="onHandleClickBuy"
+        @click="onHandleClick"
        @buttonClick="onHandleClickBuy1"
      />
    </view>
@@ -540,7 +540,10 @@ export default {
      parameterList: [],
      booksList: [],
      coursesList: [],
-      buyOptions: [],
+      buyOptions: [{
+        icon: "cart",
+        text: "购物车",
+      }],

      swiperList: [],
      goodsList: [],
@@ -611,14 +614,21 @@ export default {
        visitorDetailInfo: "visitor/getProductDetail", // 游客状态下的商品详情
      },
      customButtonGroup1: [
+		{
+			text: "加入购物车",
+			backgroundColor: "linear-gradient(90deg, #FFCD1E, #FF8A18)",
+			color: "#fff",
+		},
        {
-          with: 200,
-          text: "立即购买",
-          backgroundColor: "linear-gradient(90deg, #FE6035, #EF1224)",
-          color: "#fff",
+			text: "立即购买",
+			backgroundColor: "linear-gradient(90deg, #FE6035, #EF1224)",
+			color: "#fff",
        },
      ],
      requestType: "", // 数据请求类型是否为游客登陆状态
+	  buttonType: '',  //点击的是加入购物车还是购买
+	  cartList: [], // 购物车列表
+	  productAmount: 1, // 商品数量
    };
  },
  filters: {
@@ -749,11 +759,19 @@ export default {
      }
      this.selectGoodsData = data;
      this.$refs.commonSelectGoods.open();
-      // this.show = true;
      this.$forceUpdate();
    },
-
-    onHandleClickBuy1() {
+	
+	//点击购物车
+	onHandleClick(){
+		console.log('点击购物车')
+		uni.navigateTo({
+			url: "/pages/goods/shopping/index",
+		});
+	},
+	//点击筛选商品
+    onHandleClickBuy1(e) {
+		this.buttonType = e.index;
      if (this.requestType == "visitor") {
        uni.showModal({
          content: "登陆后可购买本商品",
@@ -770,34 +788,126 @@ export default {
        return;
      }
      this.$refs.commonSelectGoods.open();
-      // this.show = true;
    },
+	//点击下单按钮
    onHandleClickBuy() {
-      console.log(
-        this.selectGoodsData,
-        "this.selectGoodsDatathis.selectGoodsDatathis.selectGoodsData"
-      );
-      var mynavData = JSON.stringify({
-        goods: [
-          {
-            productImages: this.selectGoodsData.productImages,
-            productId: this.selectGoodsData.productId,
-            productName: this.selectGoodsData.productName,
-            activityPrice: this.selectGoodsData.activityPrice,
-            price: this.selectGoodsData.price,
-            goodsType: this.selectGoodsData.goodsType,
-          },
-        ],
-
-        navTitle: this.options.navTitle,
-        title: this.options.title,
-        typeId: 0,
-      }); // 这里转换成 字符串
-
-      uni.navigateTo({
-        url: `/pages/goods/order/index?data=${mynavData}`,
-      });
+		if(this.buttonType==0){  //如果是加入购物车
+			console.log('剩余', this.selectGoodsData.productStock)
+			if(this.selectGoodsData.productStock==0){
+				uni.showToast({
+					title: "商品库存不足",
+					icon: "none",
+					duration: 1000,
+				});
+			}else{
+				this.$http.post(`book/ordercart/getCartList?userId=${this.userInfo.id}`)
+				  .then((res) => {
+					this.cartList = res.cartList;
+					this.isAddLink(this.selectGoodsData);
+				  });
+			}
+		}else{
+			var mynavData = JSON.stringify({
+			  goods: [
+			    {
+			      productImages: this.selectGoodsData.productImages,
+			      productId: this.selectGoodsData.productId,
+			      productName: this.selectGoodsData.productName,
+			      activityPrice: this.selectGoodsData.activityPrice,
+			      price: this.selectGoodsData.price,
+			      goodsType: this.selectGoodsData.goodsType,
+				  productAmount: 1,
+			    },
+			  ],
+			
+			  navTitle: this.options.navTitle,
+			  title: this.options.title,
+			  typeId: 0,
+			});
+			
+			uni.navigateTo({
+			  url: `/pages/goods/order/index?data=${mynavData}`,
+			});
+		}
    },
+	//统计商品信息
+	isAddLink(item) {
+	  let data = {
+	    userId: this.userInfo.id,
+	    productId: item.productId,
+	    productAmount: this.productAmount,
+	    price: item.price,
+	  };
+	  // 判断列表是否为空
+	  if (this.cartList.length > 0) {
+	    let flag = "";
+	    let shagnpin = {};
+	    // 循环购物车列表
+	    flag = this.cartList.some((item, index) => {
+	      if (item.productId == data.productId) {
+	        shagnpin = item;
+	        shagnpin.productAmount = item.productAmount + 1;
+	        return true;
+	      }
+	    });
+	    if (flag) {
+	      // 已在购物车中添加
+	      $http.request({
+	          url: "book/ordercart/update",
+	          method: "POST",
+	          data: shagnpin,
+	          header: {
+	            "Content-Type": "application/json",
+	          },
+	        })
+	        .then((res) => {
+	          if (res.code == 0) {
+	            uni.showToast({
+	              title: "加入购物车成功",
+	              duration: 1000,
+	            });
+	          }
+	        });
+	    } else {
+	      // 加入购物车
+	      $http.request({
+	          url: "book/ordercart/save",
+	          method: "POST",
+	          data,
+	          header: {
+	            "Content-Type": "application/json",
+	          },
+	        })
+	        .then((res) => {
+	          if (res.code == 0) {
+	            uni.showToast({
+	              title: "加入购物车成功",
+	              duration: 1000,
+	            });
+	          }
+	        });
+	    }
+	  } else {
+	    // 购物车列表为空时直接加入购物车
+	    $http.request({
+	        url: "book/ordercart/save",
+	        method: "POST",
+	        data,
+	        header: {
+	          "Content-Type": "application/json",
+	        },
+	      })
+	      .then((res) => {
+	        if (res.code == 0) {
+	          uni.showToast({
+	            title: "加入购物车成功",
+	            duration: 1000,
+	          });
+	        }
+	      });
+	  }
+	  this.$refs.commonSelectGoods.close();
+	},
    buttonClick(e) {
      this.options[2].info++;
    },
--- a/pages/goods/order/index.vue
+++ b/pages/goods/order/index.vue
@@ -2,7 +2,7 @@
  <view class="container commonPageBox commonDetailPage">
    <!-- 公共组件-每个页面必须引入 -->
    <public-module></public-module>
-    <z-nav-bar title="确认订单" bgColor="#258feb" fontColor="#fff"></z-nav-bar>
+    <z-nav-bar title="确认订单"></z-nav-bar>

    <common-order-submit
      v-if="showOrder"
@@ -33,32 +33,19 @@
        >
      </template>
      <template slot="goodsInfoImgSlot" slot-scope="slotProps">
+		  <image
+			v-if="pageType == 'vip'"
+			src="/static/icon/vip.png"
+			class="goods_item_img"
+			mode="widthFix"
+		  ></image>
        <image
-          v-if="pageType == 'vip'"
-          src="/static/icon/vip.png"
-          class="goods_item_img"
-          mode="widthFix"
-          @click="goDetail(slotProps.row.productId)"
-        ></image>
-        <image
-          v-else-if="
-            (pageType == 'goods' || pageType == 'fudu') &&
-            slotProps.row.productImages &&
-            slotProps.row.productImages != ''
-          "
+          v-if="pageType!= 'vip'&&slotProps.row.productImages && slotProps.row.productImages != ''"
          class="goods_item_img"
          :src="slotProps.row.productImages"
          mode="aspectFit"
        >
        </image>
-
-        <image
-          v-else
-          src="/static/nobg1.jpg"
-          class="goods_item_img"
-          mode="widthFix"
-          @click="goDetail(slotProps.row.productId)"
-        ></image>
      </template>
      <template slot="goodsInfoNameSlot" slot-scope="slotProps">
        <span v-if="pageType == 'vip'"
@@ -173,7 +160,6 @@ export default {
      //vip订单
      this.pageType = "vip";
      this.showNumber = false;
-      // this.isHideAddress = true;
      this.priceKey = "rebateFee";
      await this.getVipDataInfo();
    } else {
@@ -221,7 +207,7 @@ export default {
          productList: this.options.goods.map((e) => {
            return {
              productId: e.productId || e.id,
-              quantity: 1,
+              quantity: e.productAmount,
            };
          }),
        };
@@ -295,7 +281,6 @@ export default {
          this.goodsDataList = res.productList.filter(
            (e) => this.options.goods[0].productName == e.productName
          );
-         
        });
    },

@@ -320,7 +305,6 @@ export default {
            {
              ...data,
              productId: data.id,
-
              price: data.rebateFee,
            },
          ];
@@ -340,7 +324,11 @@ export default {
          },
        })
        .then(async (res) => {
-          this.goodsDataList = res.shopProductList;
+			res.shopProductList.forEach(product => {
+			  const cartItem = this.options.goods.find(item => item.productId === product.productId);
+			  product.productAmount = cartItem ? cartItem.productAmount : 1;
+			});
+			this.goodsDataList = res.shopProductList;
        });
    },
  },
@@ -353,6 +341,9 @@ export default {
 </script>

 <style lang="scss" scoped>
+.commonPage, .commonPageBox {
+    height: calc(100vh - 50px);
+}
 .goodsvipLabel {
  position: absolute;
  z-index: 10;
--- a/pages/goods/shopping/index.vue
+++ b/pages/goods/shopping/index.vue
@@ -0,0 +1,384 @@
+<template>
+	<view>
+		<z-nav-bar title="我的购物车"></z-nav-bar>
+		<view class="shopCarContent">
+			<scroll-view scroll-y="true" v-if="cartList.length>0">
+				<view class="cartItem" v-for="(item,index) in cartList" :key="index">
+					<view class="select">
+						<checkbox style="transform:scale(0.8)" :checked="item.checked" @click="checkboxGroupChange(index,item)" class="round checkedItem" />
+					</view>
+					<view class="cartContent" style="position: relative;">
+						<span v-if="item.isVipPrice==1&&item.vipPrice!=0&&item.vipPrice!=null"
+									style="position: absolute;z-index: 1;top: 4px;left: 0px; text-align: center;font-size: 18rpx;background-color: #f94f04;color: #fff; border-radius:4px; padding:2px 4px;line-height: 14px;">VIP优惠</span>
+								
+						<image :src="item.image" mode="" @click="goDetail(item.productId)"></image>
+						<view class="itemCenter">
+							<view class="cartTitle" @click="goDetail(item.productId)" style="display: flex;align-items: center;">
+								<text>{{item.productName}}</text>
+							</view>
+							<view class="itemPrice">
+								<text v-if="item.isVipPrice==1&&item.vipPrice!=0&&item.vipPrice!=null">
+									<text style="color: #e97512;font-size: 16px;font-weight: bold;">￥{{(item.vipPrice).toFixed(2)}}</text>
+									<text style="color: #8a8a8a;font-size: 14px;margin-left: 4px;font-weight: bold;text-decoration: line-through;">￥{{(item.price).toFixed(2)}}</text>
+								</text>
+
+							<text
+								v-else-if="item.activityPrice && item.activityPrice > 0">
+								<text style="color: #e97512;font-size: 16px;font-weight: bold;">￥{{(item.activityPrice).toFixed(2)}}</text>
+									<text style="color: #8a8a8a;font-size: 14px;margin-left: 4px;font-weight: bold;text-decoration: line-through;">￥{{(item.price).toFixed(2)}}</text>
+							</text>
+
+							<text v-else style="color: #e97512;font-size: 16px;font-weight: bold;">￥{{item.price}}</text>
+								<u-number-box button-size="20" v-model="item.productAmount" @change="valChange($event,item)"
+									:input-width="25" :input-height="10" :min="1" :max="item.productStock" integer
+									@overlimit='overlimit'></u-number-box>
+							</view>
+						</view>
+					</view>
+				</view>
+			</scroll-view>
+			<view v-else style=" font-size: 28rpx; text-align: center; padding-top: 100rpx; color: #999;">暂无数据</view>
+		</view>
+
+		<!-- 底部操作区 -->
+		<view class="shopCarFooter">
+			<view class="selectAll">
+				<checkbox :checked="all" style="transform:scale(0.8)" @click="isSelectAll()" class="round checkedItem" />
+				<text class="cartCho">全选</text>
+				<button class="mini-btn"
+					style="border-radius: 10rpx; font-size: 26rpx; line-height: 30rpx; padding: 10rpx 25rpx; margin-left: 20rpx;"
+					v-if="isCartDelShow" @click="delCart()" type="warn" size="mini">删除</button>
+			</view>
+			<view class="exhibition">
+				<view class="total">合计: <b>￥{{totalPrice}}</b>
+			</view>
+				<view class="settlement" @click="setTment()">
+					结算
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import $http from '@/config/requestConfig.js';
+	import {
+		mapState
+	} from 'vuex';
+	export default {
+		data() {
+			return {
+				playData: {},
+				totalPrice: 0, // 总价
+				all: false, // 是否全选
+				isCartDelShow: false, // 是否展示删除按钮
+				cartList: [] // 购物车列表
+			};
+		},
+		//第一次加载
+		onLoad(e) {
+			this.getCartList()
+		},
+		//页面显示
+		onShow() {
+			this.getCartList();
+			this.all = false;
+			this.isCartDelShow = false
+			this.totalPrice = 0
+		},
+		computed: {
+			...mapState(['userInfo']),
+		},
+		//方法
+		methods: {
+			// 获取购物车列表
+			getCartList() {
+				this.$http.post(`book/ordercart/getCartList?userId=${this.userInfo.id}`).then(res => {
+					this.cartList = res.cartList
+					if (res.cartList.length > 0) {
+						res.cartList.forEach((item, index) => {
+							item.checked = false
+						})
+						this.cartList = res.cartList
+					}
+				})
+			},
+			// 是否全选
+			isSelectAll(e) {
+				if (this.cartList.length > 0) {
+					this.all = !this.all
+					this.cartList.forEach((item, index) => {
+						item.checked = this.all
+					})
+					this.isCartDelShow = this.all
+					this.total()
+				} else {
+					this.all = false
+				}
+			},
+			// 选中单独商品
+			checkboxGroupChange(index, item) {
+				// 修改当前item的checked
+				this.cartList[index].checked = !item.checked
+				// 判断是否全选
+				this.all = this.cartList.every((item, index) => {
+					return item.checked == true
+				})
+				// 判断是否展示删除按钮
+				this.isCartDelShow = this.cartList.some((item, index) => {
+					return item.checked == true
+				})
+				// 计算总价
+				this.total()
+			},
+			// 计算总价
+			total() {
+				let allprice = 0;
+				this.cartList.forEach((item, index) => {
+					let price = 0;
+					if (item.checked) {
+						if (item.isVipPrice == 1 && item.vipPrice != 0) {
+						price = (item.productAmount * item.vipPrice).toFixed(2);
+					} else {
+						if (item.activityPrice && item.activityPrice > 0) {
+							price = (item.productAmount * item.activityPrice).toFixed(2);
+						} else {
+							price = (item.productAmount * item.price).toFixed(2);
+						}
+					}
+					}
+					allprice += Number(price)
+				})
+				this.totalPrice = allprice.toFixed(2)
+			},
+			// 超出阈值时
+			overlimit() {
+				uni.showToast({
+					title: '超出商品数量',
+					icon: 'error',
+					duration: 1000
+				})
+			},
+			valChange(e, item) {
+				console.log(e)
+				let productItem = {}
+				productItem = item
+				productItem.productAmount = e.value
+				this.updateCart(productItem)
+				setTimeout(() => {
+					this.total()
+				}, 300)
+			},
+			// 更新购物车
+			updateCart(shagnpin) {
+				// 已在购物车中添加
+				$http.request({
+					url: "book/ordercart/update",
+					method: "POST",
+					data: shagnpin,
+					header: {
+						'Content-Type': 'application/json'
+					}
+				}).then(res => {
+					if (res.code == 0) {
+						
+					}
+				})
+			},
+			// 删除购物车
+			delCart() {
+				let cartIdArr = [];
+				this.cartList.forEach((item, index) => {
+					if (item.checked) {
+						cartIdArr.push(item.cartId)
+					}
+				})
+				uni.showModal({
+					title: '提示',
+					content: '是否删除这个商品',
+					confirmText: '确定',
+					success: (res) => {
+						if (res.confirm) {
+							uni.showLoading({
+								title: '加载中',
+								mask: true
+							})
+							console.log(cartIdArr)
+							$http.request({
+								url: "book/ordercart/delete",
+								method: "POST",
+								data: cartIdArr,
+								header: {
+									'Content-Type': 'application/json'
+								},
+							}).then(res => {
+								this.isCartDelShow = false
+								this.totalPrice = 0
+								this.getCartList()
+								uni.hideLoading();
+								this.all = false;
+							})
+						} else {
+							console.log('cancel') //点击取消之后执行的代码
+						}
+					}
+				})
+			},
+
+			// 跳转结算页面
+			setTment() {
+				let goods = []
+				this.cartList.forEach((item, index) => {
+					if (item.checked) {
+						goods.push({
+							productImages: item.productImages,
+							productId: item.productId,
+							productName: item.productName,
+							goodsType: item.goodsType,
+							productAmount: item.productAmount,
+							price: item.price,
+							activityPrice: item.activityPrice,
+						})
+					}
+				})
+				
+				let mynavData = JSON.stringify({
+					goods: goods,
+					typeId: 1
+				})
+				// 如果没有勾选
+				if (goods.length == 0) {
+					uni.showToast({
+						title: "请先勾选商品",
+						icon: 'error',
+						duration: 1000,
+					})
+				} else {
+					uni.navigateTo({
+						url: '/pages/goods/order/index?data='+ mynavData
+					});
+				}
+			},
+			//商品内容跳转
+			goDetail(id) {
+				uni.navigateTo({
+					url: '/pages/goods/index?isMiaosha=1&id='+id
+				});
+			},
+		},
+
+	};
+</script>
+<style lang="scss" scoped>
+	@import '@/style/mixin.scss';
+
+	.shopCarContent {
+		width: 100%;
+		height: 100%;
+		padding-bottom: 104rpx;
+		padding-top: 20rpx;
+
+		.cartItem {
+			padding: 10rpx 10rpx 10rpx 10rpx;
+			margin-bottom: 20rpx;
+			display: flex;
+			align-items: center;
+			background-color: #fff;
+
+			.cartContent {
+
+				flex: 1;
+				display: flex;
+
+				image {
+					width: 130rpx;
+					height: 150rpx;
+					border-radius: 10rpx;
+					padding: 10rpx;
+					margin-right: 15rpx;
+				}
+
+				.itemCenter {
+					flex: 1;
+					flex-direction: column;
+					justify-content: space-around;
+				}
+
+				.cartTitle {
+					font-size: 30rpx;
+					margin: 35rpx 0 20rpx 0;
+				}
+
+				.itemPrice {
+					font-size: 28rpx;
+					display: flex;
+					justify-content: space-between;
+				}
+			}
+		}
+	}
+
+	.shopCarFooter {
+		width: 100%;
+		height: 100rpx;
+		padding: 20rpx;
+		background-color: #fff;
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		position: fixed;
+		bottom: 0;
+		z-index: 9;
+
+		.selectAll {
+
+			display: flex;
+
+
+			.cartCho {
+				font-size: 26rpx;
+				color: #888;
+			}
+
+			.cartDel {
+				font-weight: bold;
+				color: #bf0c0c;
+				font-size: 14px;
+				margin: 12rpx 0 0 20rpx;
+			}
+		}
+
+		.exhibition {
+			display: flex;
+			align-items: center;
+
+			.total {
+				font-size: 15px;
+				padding: 0 40rpx 0 0;
+				color: #888;
+
+				b {
+					margin-left: 10rpx;
+					color: #ef1224;
+					font-size: 35rpx;
+				}
+			}
+
+			.settlement {
+				font-size: 28rpx;
+				font-weight: 700;
+				padding: 10rpx 50rpx;
+				background-image: linear-gradient(90deg, rgb(254, 96, 53), rgb(239, 18, 36));
+				color: #fff;
+				border-radius: 40rpx;
+			}
+		}
+	}
+	/deep/.uni-checkbox-input{
+		border-radius: 50rpx;
+	}
+	.shopCarFooter .selectAll{
+		display: flex;
+		align-items: center;
+	}
+</style>