liujiaxin 1 周之前
父節點
當前提交
51285d3f9a
共有 3 個文件被更改,包括 149 次插入801 次删除
  1. 147 21
      pages_course/living.vue
  2. 1 775
      pages_shopping/live/goods.vue
  3. 1 5
      pages_shopping/live/order.vue

+ 147 - 21
pages_course/living.vue

@@ -84,7 +84,7 @@
 						</view>
 					</view>
 				</view>
-				<view class="videolist">
+				<view class="videolist" v-if="liveItem.status==3">
 					<view class="video" :class="liveItem.showType == 1 ? 'video_row' : ''">
 						<view class="end">直播已结束</view>
 					</view>
@@ -178,7 +178,7 @@
 							<input :placeholder="placeholderText" v-model="value" placeholder-style="color:#e7e7e7;"
 								placeholder-class="placeholder-style" class="ml20 input-native" @focus="inputFocus"
 								@blur="inputBlur"
-								style="border: none; font-size: 24rpx; color: #ffffff; background: transparent; width: 70%;"
+								style="border: none; font-size: 32rpx; color: #ffffff; background: transparent; width: 70%;"
 								cursor-spacing="100" :adjust-position="false" />
 							<view class="send" @click="sendMsg()">发送</view>
 						</view>
@@ -324,7 +324,7 @@
 						<image class="w48 h48" src="/static/images/after_sales.png" />
 						<view style="text-align: center;">售后订单</view>
 					</view>
-					<view class=" item" @click="isMore=false">
+					<view class=" item" @click="isMore=false,goMiniProgram">
 						<image class="w48 h48" src="/static/images/points.png" />
 						<view style="text-align: center;">芳华币</view>
 					</view>
@@ -350,14 +350,9 @@
 							<image class="w48 h48" src="/static/images/search2.png" />
 							<view style="text-align: center;">更多</view>
 						</view>
-						<!-- <view class=" search-top"
-							@click="navgetTo('/pages_shopping/live/storeOrderRefundList?liveId='+liveId)">
-							<image class="w48 h48" src="/static/images/after_sales.png" />
-							<view style="text-align: center;">售后</view>
-						</view> -->
 					</view>
 
-					<scroll-view enable-flex scroll-y class="shop-list" :style="{ height: boxHeight + 'px' }">
+					<!-- <scroll-view enable-flex scroll-y class="shop-list" :style="{ height: boxHeight + 'px' }">
 						<view class="list-item" v-for="(item,index) in products" :key="index">
 							<view class="goods-img">
 								<image class="img" :src="item.imgUrl" mode="widthFix" />
@@ -385,6 +380,51 @@
 								</view>
 							</view>
 						</view>
+					</scroll-view> -->
+					<scroll-view enable-flex scroll-y class="shop-list" :style="{ height: boxHeight + 'px' }">
+						<!-- 骨架屏 -->
+						<view v-if="loadingProducts && products.length === 0" class="skeleton-list">
+							<view v-for="n in 6" :key="n" class="skeleton-item">
+								<view class="skeleton-img"></view>
+								<view class="skeleton-content">
+									<view class="skeleton-line short"></view>
+									<view class="skeleton-line medium"></view>
+									<view class="skeleton-line long"></view>
+								</view>
+							</view>
+						</view>
+
+						<!-- 实际商品列表 -->
+						<template v-else>
+							<view v-for="(item,index) in products" :key="index" class="list-item">
+								<view class="goods-img">
+									<image class="img" :src="item.imgUrl" mode="widthFix" />
+									<view class="goods-label">{{index+1}}</view>
+								</view>
+								<view class="goods-right">
+									<view class="goods-title">{{item.productName}}</view>
+									<view class="goods-people">{{item.sales}} 人已购</view>
+									<view class="goods-shop">
+										<text class="nummber"><text
+												style="font-size: 20rpx;font-weight: 600;">¥</text><text
+												style="font-size: 36rpx;font-weight: bold;">{{Math.trunc(item.price)}}</text>.{{getPureDecimal(item.price)?getPureDecimal(item.price):'00'}}</text>
+										<view class="btn-group x-f">
+											<view class="collect-btn">
+												<image v-if="item.isFavorite" @click="onGoodsCollect(item)"
+													class="w36 h36" style="vertical-align: middle;"
+													src="/static/images/collect_select.png" />
+												<image v-else @click="onGoodsCollect(item)" class="w36 h36"
+													style="vertical-align: middle;" src="/static/images/collect.png" />
+											</view>
+											<view v-if="item.status==1" class="shop-btn"
+												@click="goShop(item.productId,item.goodsId)">去购买 </view>
+											<view v-else-if="item.status==0" class="shop-btn">
+												已下架</view>
+										</view>
+									</view>
+								</view>
+							</view>
+						</template>
 					</scroll-view>
 				</view>
 			</u-popup>
@@ -568,6 +608,7 @@
 				liveViewers: [], //观众
 				livingUrl: "",
 				products: [],
+				loadingProducts: false, // 商品加载状态
 				store: {},
 				orderUser: {}, //正在购买
 				userType: 0,
@@ -617,12 +658,15 @@
 			if (options.companyId && options.companyUserId) {
 				this.qrFrom = `&companyId=${options.companyId}&companyUserId=${options.companyUserId}`;
 			}
-
+			
 			// 初始化直播间列表
 			this.$nextTick(() => {
 				if (this.liveId) {
 					this.getliving(this.liveId);
 					this.isOnload = true
+					this.getLiveMsg(this.liveItem);
+					this.getliveViewData(this.liveItem);
+
 				} else {
 					console.error("直播间 ID(liveId)未获取到");
 				}
@@ -637,9 +681,12 @@
 			}, 1000)
 		},
 		async onShow() {
-			if (this.liveId && !this.isOnload) {
+			if (this.liveId&& !this.talklist) {
 				await this.getLiveMsg(this.liveItem);
 			}
+			if (!this.liveViewData) {
+				this.getliveViewData(this.liveItem);
+			}
 			if (!this.userData) {
 				await this.getUserInfo()
 			}
@@ -792,7 +839,24 @@
 				immediate: true
 			}
 		},
-		methods: { // 阻止双击事件
+		methods: {
+			goMiniProgram() {
+				uni.navigateToMiniProgram({
+					appId: 'wx45cf09091aead547',
+					path: 'pages/index/index',
+					// extraData: {
+					//   key1: 'value1',
+					//   key2: 'value2'
+					// },
+					success: function(res) {
+						console.log('跳转成功', res);
+					},
+					fail: function(err) {
+						console.error('跳转失败', err);
+					}
+				});
+			},
+			// 阻止双击事件
 			preventDoubleClick(e) {
 				e.preventDefault();
 				e.stopPropagation();
@@ -937,9 +1001,9 @@
 			},
 			// 恢复页面活动
 			async resumePageActivity() {
-				await this.getliving(this.liveId)
+
 				if (this.liveItem) {
-					// this.playVideo()
+					await this.getliving(this.liveId)
 					this.startTimeTimer(this.liveItem)
 				}
 				if (!this.isSocketAvailable()) {
@@ -1865,9 +1929,6 @@
 						this.$set(this.liveItem, 'livingUrl', '');
 						this.$set(this.liveItem, 'videoUrl', '');
 					}
-					await this.getLiveMsg(this.liveItem);
-					await this.getliveViewData(this.liveItem);
-
 					this.$set(this.liveItem, 'autoplay', res.data.liveType !== 0);
 					this.$set(this.liveItem, 'showType', res.data.showType);
 					this.storeId = res.storeId;
@@ -1965,6 +2026,7 @@
 
 			// 查询店铺
 			async queryCollect() {
+				this.loadingProducts = true;
 				if (!this.liveId) return;
 				if (this.inputInfo == null) this.inputInfo = ''
 				uni.showLoading({
@@ -1973,12 +2035,15 @@
 				try {
 					const res = await liveStore(this.liveId, this.inputInfo);
 					uni.hideLoading()
+					this.shopping = true
 					if (res.code === 200) {
 						// 数据绑定到当前 liveItem,避免全局污染
 						this.products = Array.isArray(res.data) ? res.data : [];
 					}
 				} catch (error) {
 					console.error('获取小黄车商品失败:', error);
+				} finally {
+					this.loadingProducts = false;
 				}
 			},
 			// 时间戳
@@ -1989,7 +2054,7 @@
 
 			openCart() {
 				this.queryCollect()
-				this.shopping = true
+
 			},
 			close() {
 				this.showadd = false
@@ -2466,6 +2531,67 @@
 </script>
 
 <style scoped lang="scss">
+	.skeleton-item {
+		display: flex;
+		padding: 20rpx;
+		background: #fff;
+		margin-bottom: 16rpx;
+		border-radius: 16rpx;
+	}
+
+	.skeleton-img {
+		width: 200rpx;
+		height: 200rpx;
+		background: #f0f0f0;
+		border-radius: 8rpx;
+		margin-right: 24rpx;
+		animation: pulse 1.5s ease-in-out infinite;
+	}
+
+	.skeleton-content {
+		flex: 1;
+	}
+
+	.skeleton-line {
+		height: 20rpx;
+		background: #f0f0f0;
+		margin-bottom: 16rpx;
+		border-radius: 4rpx;
+		animation: pulse 1.5s ease-in-out infinite;
+	}
+
+	.skeleton-line.short {
+		width: 60%;
+	}
+
+	.skeleton-line.medium {
+		width: 80%;
+	}
+
+	.skeleton-line.long {
+		width: 95%;
+	}
+
+	@keyframes pulse {
+		0% {
+			opacity: 1;
+		}
+
+		50% {
+			opacity: 0.5;
+		}
+
+		100% {
+			opacity: 1;
+		}
+	}
+
+
+
+
+
+
+
 	::v-deep .u-icon--right {
 		justify-content: flex-end !important;
 	}
@@ -2763,11 +2889,11 @@
 				margin-left: 10rpx;
 			}
 
-			.end{
+			.end {
 				position: absolute;
 				top: 50%;
-				right: 50%;
-				transform: translate(-50%,-50%);
+				left: 50%;
+				transform: translate(-50%, -50%);
 				font-size: 36rpx;
 				color: #fff;
 			}

+ 1 - 775
pages_shopping/live/goods.vue

@@ -35,7 +35,6 @@
 			</view>
 		</view>
 		<view class="guige">
-
 			<view class="safe-box">
 				<text class="text">服务</text>
 				<view class="box">
@@ -43,53 +42,8 @@
 					<view class="mr30" v-for="(item,index) in serviceList" :key="index">
 						<text>{{item}}</text>
 					</view>
-					<!-- <view @click="openEditMoney()">
-						<image class='w48 h48' src="/static/images/arrow4.png"></image>
-					</view> -->
 				</view>
 			</view>
-
-			<!-- 点击服务,出现弹窗-->
-			<!-- <view class="popup-box" v-if="editShow">
-				<view class="info-mask" @tap="cancelEditMoney()"></view>
-				<view class="info-form">
-					<view class="top">
-						<view class="title">服务</view>
-						<view class="close" @click="cancelEditMoney()">
-						</view>
-					</view>
-					<view class="line"></view>
-					<view class="form-box">
-						<view class="form-item2">
-							<view class="form-item-box">
-								<text>免邮发货</text>
-							</view>
-							<view class="form-content">
-								订单支付成功后48小时内发货,若未在48小时内发货,平台审核后消费者将会收到至少3元无门槛红包(特殊商品及不可抗力因素除外)
-							</view>
-						</view>
-						<view class="form-item2">
-							<view class="form-item-box">
-								<text>药师服务</text>
-							</view>
-							<view class="form-content">
-								用药关怀认证药师,24小时专业用药咨询
-							</view>
-						</view>
-						<view class="form-item2">
-							<view class="form-item-box">
-								<text>隐私保护</text>
-							</view>
-							<view class="form-content">
-								除患者本人或其授权的代理人外,其他人员未经允许不得随意查阅患者的医疗记录
-							</view>
-						</view>
-					</view>
-					<view class="btns">
-						<view class="sub-btn" @click="cancelEditMoney()">确定</view>
-					</view>
-				</view>
-			</view> -->
 		</view>
 		<!-- 购买人数、库存 -->
 		<view class="det-box">
@@ -101,11 +55,6 @@
 		<!-- 底部按钮 -->
 		<view class="btn-foot">
 			<view class="menu-box">
-				<!-- <view class="item" @click="navgetTo('./storeOrderRefundList?liveId='+liveId)"
-					style="position: relative;">
-					<image src="/static/images/consult_small.png" mode=""></image>
-					<text class="label">售后</text>
-				</view> -->
 			</view>
 			<view class="btn-box">
 				<view class="btn buy" @click="addCart('buy')">{{buyText}}</view>
@@ -145,14 +94,9 @@
 <script>
 	import {
 		liveGoodsDetail
-
 	} from '@/api/living'
 	import {
-		liveCartDetails, //获取购物车详情
-		updateConfirm, // 点击取消/支付订单
-		updateLiveOrder, // 取消/支付订单
 		liveOrderKey, // 生成订单key
-		addLiveCart // 新增购物车
 	} from "@/api/order.js"
 	import popupBottom from '@/components/px-popup-bottom/px-popup-bottom.vue'
 
@@ -163,16 +107,13 @@
 		data() {
 			return {
 				banner: [],
-				storeInfo: {},
 				goodsId: null,
 				totalNum: 1,
 				orderKey: null,
 				type: null,
-				liveOrderList: [], //下订单的 不在这个页面
 				liveId: null,
 				storeId: null,
 				serviceList: ['品质保障', '药师服务', '隐私保护'],
-				// editShow: false,
 				productId: null,
 				goosDetail: {}, //商品详情
 				loadding: true,
@@ -226,7 +167,6 @@
 					icon: "none"
 				})
 			}
-
 		},
 		mounted() {
 			this.getliveGoods()
@@ -238,27 +178,6 @@
 			swiperChange(event) {
 				this.activeBanner = event.detail.current + 1
 			},
-			// //店铺展示
-			// getliveStore() {
-			// 	let data = {
-			// 		pageSize: 10,
-			// 		page: 1
-			// 	}
-			// 	liveStore(this.liveId, data).then(res => {
-			// 			if (res.code == 200) {
-			// 				console.log("小黄车 店铺展示>>>>", res)
-			// 				this.products = res.data
-			// 			} else {
-			// 				uni.showToast({
-			// 					title: res.msg,
-			// 					icon: 'none'
-			// 				});
-			// 			}
-			// 		},
-			// 		rej => {}
-			// 	);
-			// },
-
 			doAddCart(type) {
 				if (this.totalNum == 0) {
 					uni.showToast({
@@ -279,24 +198,7 @@
 				}
 
 			},
-			getCartCount() {
-				let data = {
-					productId: this.productId,
-					liveId: this.liveId,
-					goodsId: this.goodsId || "",
-					cartNum: this.totalNum,
-				};
-				addLiveCart(data).then(
-					res => {
-						if (res.code == 200) {
-							console.log("加购物车啦", res)
-							this.cartCount = res.data;
-						}
-					},
-					rej => {}
-				);
-
-			},
+			
 			// 获得key
 			getKey() {
 				liveOrderKey().then(res => {
@@ -384,19 +286,6 @@
 	.content {
 		font-family: PingFang SC;
 	}
-
-	.share-box {
-		position: fixed;
-		right: 24rpx;
-		top: 70%;
-		z-index: 99;
-		width: 112rpx;
-		height: 112rpx;
-		border-radius: 16rpx 16rpx 16rpx 16rpx;
-		border: 1rpx solid #EFF3F7;
-		background-color: #FFFFFF;
-	}
-
 	.shop-banner {
 		height: 756rpx;
 		background-color: #FFFFFF;
@@ -527,124 +416,9 @@
 
 		}
 
-		.popup-box {
-			position: fixed;
-			top: 0;
-			right: 0;
-			left: 0;
-			bottom: 0;
-			z-index: 999;
-			display: flex;
-			justify-content: center;
-			align-items: flex-end;
-
-			.info-mask {
-				position: fixed;
-				top: 0;
-				right: 0;
-				bottom: 0;
-				left: 0;
-				background-color: rgba($color: #000000, $alpha: 0.5);
-				z-index: 999;
-			}
-
-			.info-form {
-				z-index: 1000;
-				width: 100%;
-				display: flex;
-				flex-direction: column;
-				justify-content: center;
-				align-items: center;
-				padding: 0 30rpx 60rpx;
-				background: #FFFFFF;
-				border-radius: 40rpx;
-
-				.top {
-					display: flex;
-				}
-
-				.line {
-					border-top: 1px solid #F1F1F1;
-					width: 100%;
-				}
-
-				.title {
-					padding: 30rpx;
-					display: flex;
-					justify-content: center;
-					align-items: center;
-					font-size: 36rpx;
-					font-weight: bold;
-					line-height: 44rpx;
-					color: #222222;
-				}
-
-				.close {
-					padding-top: 30rpx;
-					position: absolute;
-					right: 30rpx;
-				}
-
-				.form-box {
-					width: 100%;
-					padding-top: 30rpx;
-
-					.form-item2 {
-						padding-bottom: 30rpx;
-
-						// display: flex;
-						// align-items: flex-start;
-						// border-bottom: 1px solid #F1F1F1;
-						.form-item-box {
-							display: flex;
-							align-items: center;
-
-							text {
-								font-size: 28rpx;
-								color: #222426;
-								margin-left: 10rpx;
-								font-weight: bold;
-							}
-						}
-
-						.form-content {
-							font-size: 24rpx;
-							text-align: left;
-							color: #626468;
-							margin-top: 20rpx;
-							line-height: 40rpx;
-						}
-					}
-				}
-
-				.btns {
-					width: 100%;
-					height: 120rpx;
-					padding: 20rpx 30rpx;
-					display: flex;
-					align-items: center;
-					justify-content: center;
-
-					.sub-btn {
-						width: 100%;
-						height: 88rpx;
-						line-height: 88rpx;
-						text-align: center;
-						font-size: 36rpx;
-						font-weight: bold;
-						color: #FFFFFF;
-						background: #2BC7B9;
-						border-radius: 44rpx;
-					}
-				}
-
-			}
-		}
 	}
 
 	.det-info {
-		// background: #FFFFFF;
-		// padding: 36rpx 30rpx 25rpx;
 		background: #FFFFFF;
 		padding: 24rpx;
 		margin: 24rpx;
@@ -733,52 +507,6 @@
 			line-height: 36rpx;
 			padding: 18rpx 0 23rpx;
 		}
-
-		.intro-box {
-			display: flex;
-			justify-content: space-between;
-			align-items: center;
-			padding: 20rpx;
-			border-radius: 16rpx;
-			background: #F5F7FA;
-			width: auto;
-
-			.title-1 {
-				font-size: 24rpx;
-				color: #222426;
-				font-weight: bold;
-				width: 40%;
-				text-align: center;
-			}
-
-			.title-2 {
-				font-size: 24rpx;
-				color: #222426;
-				font-weight: bold;
-				display: block;
-			}
-
-			.intro-text {
-				// padding: 0 20rpx;
-			}
-
-			.intro-text2 {
-				width: 50%;
-			}
-
-			.intro-content {
-				color: #898E91;
-				font-size: 24rpx;
-			}
-
-			.line {
-				width: 1px;
-				height: 40rpx;
-				background: #EDEEEF;
-				margin: 0 20rpx;
-			}
-		}
-
 		.safe-box {
 			display: flex;
 			align-items: center;
@@ -806,375 +534,7 @@
 		}
 	}
 
-	.inventor {
-		height: 88rpx;
-		padding: 0 39rpx 0 30rpx;
-		margin-top: 10rpx;
-		background: #FFFFFF;
-		display: flex;
-		align-items: center;
-		justify-content: space-between;
-
-		.left {
-			display: flex;
-			align-items: center;
-
-			.head-box {
-				margin-right: 27rpx;
-				display: flex;
-				align-items: center;
-
-				.head {
-					width: 48rpx;
-					height: 48rpx;
-					border-radius: 50%;
-					overflow: hidden;
-					box-shadow: 0 0 0 1px #fff;
-					margin-right: -10rpx;
-
-					image {
-						width: 100%;
-						height: 100%;
-					}
-				}
-			}
-
-			.num-box {
-				font-size: 24rpx;
-				font-weight: 500;
-				color: #999999;
-
-				.text {
-					font-size: 24rpx;
-					font-weight: 500;
-					color: #999999;
-				}
-			}
-		}
-
-		.right {
-			font-size: 24rpx;
-			font-family: PingFang SC;
-			font-weight: 500;
-			color: #999999;
-
-			.text {
-				font-size: 24rpx;
-				font-weight: 500;
-				color: #666666;
-			}
-		}
-	}
-
-	.effect {
-		box-sizing: border-box;
-		padding: 20rpx 30rpx;
-		background: #FFFFFF;
-		font-size: 28rpx;
-		font-weight: 500;
-		color: #666666;
-		line-height: 1.8;
-		margin-top: 10rpx;
-		display: flex;
-		flex-direction: row;
-		align-items: center;
-		justify-content: space-between;
-
-		.label {
-			font-size: 28rpx;
-			font-weight: 500;
-			color: #111111;
-			line-height: 1.8;
-		}
-	}
-
-
-	.shop-box {
-
-		display: flex;
-		justify-content: space-between;
-		align-items: center;
-		background: #FFFFFF;
-		font-size: 28rpx;
-		font-weight: 500;
-		color: #666666;
-		line-height: 1.8;
-		padding: 24rpx;
-		margin: 24rpx;
-		border-radius: 16rpx;
-
-		.logo {
-			flex-shrink: 0;
-			width: 100rpx;
-			height: 100rpx;
-			border-radius: 16rpx;
-			overflow: hidden;
-
-			image {
-				width: 100%;
-				height: 100%;
-			}
-		}
-
-		.txtBox {
-			flex: 1;
-			overflow: hidden;
-			margin: 0 30rpx;
-			display: flex;
-			flex-direction: column;
-			justify-content: space-between;
-		}
-
-		.name {
-			font-size: 32rpx;
-			font-weight: 600;
-			color: #333;
-			text-align: left;
-			overflow: hidden;
-			white-space: nowrap;
-			text-overflow: ellipsis;
-		}
-
-		.desc {
-			font-size: 24rpx;
-			font-weight: normal;
-			color: #222426;
-			text-align: left;
-		}
-
-
-		.goShop {
-			flex-shrink: 0;
-			width: 96rpx;
-			height: 56rpx;
-			background: #fff;
-			border-radius: 30rpx;
-			color: #008FD3;
-			font-size: 24rpx;
-			margin: 0;
-			border: 1px solid #008FD3;
-			padding: 0;
-			line-height: 56rpx;
-			display: flex;
-			align-items: center;
-			justify-content: center;
-		}
-	}
-
-	.tech-pBox {
-		box-sizing: border-box;
-		padding: 0rpx 0rpx;
-		background: #FFFFFF;
-		font-size: 28rpx;
-		font-family: PingFang SC;
-		font-weight: 500;
-		color: #666666;
-
-		.label {
-			font-weight: bold;
-			font-size: 26rpx;
-			color: #222426;
-			text-align: left;
-			padding: 24rpx 0;
-		}
-
-		.item {
-			border: 1px solid #fff;
-			border-radius: 12rpx;
-			padding: 30rpx;
-			border: 1px solid #EFF3F7;
-			display: flex;
-			align-items: center;
-			margin-bottom: 20rpx;
-
-			.price {
-				font-size: 42rpx;
-				font-weight: bold;
-				color: #FF6633;
-				display: flex;
-				flex: 1;
-			}
-
-			.num {
-				font-size: 28rpx;
-				font-weight: normal;
-				color: #999;
-				width: 200rpx;
-				text-align: right;
-			}
-
-			.name {
-				max-width: 60%;
-				margin-right: 10rpx;
-				font-size: 28rpx;
-				font-weight: normal;
-				color: #333;
-				text-align: left;
-				overflow: hidden;
-				white-space: nowrap;
-				text-overflow: ellipsis;
-			}
-
-			image {
-				width: 100rpx;
-				height: 100rpx;
-				border-radius: 50%;
-				margin-right: 30rpx;
-			}
-
-			.tech-right {
-				flex: 1;
-
-				&-bottom {
-					color: #898E91;
-					font-size: 24rpx;
-				}
-
-				&-top {
-					display: flex;
-					align-items: flex-end;
-					margin-bottom: 10rpx;
-
-					.title-1 {
-						font-size: 32rpx;
-						color: #222426;
-						margin-right: 14rpx;
-					}
-
-					.title-2 {
-						font-weight: 400;
-						font-size: 24rpx;
-						color: #222426;
-					}
-				}
-			}
-
-		}
-
-		.hover {
-			border: 1rpx solid #008FD3;
-			background: #F0FAFF;
-		}
-
-		.shop-morebtn {
-			margin-top: 14rpx;
-			box-sizing: border-box;
-			padding: 12rpx 30rpx;
-			font-size: 28rpx;
-			font-weight: 500;
-			color: #111111;
-			background: #F7F7F7;
-			border-radius: 32rpx;
-			text-align: center;
-
-			text {
-				color: #999;
-			}
-		}
-	}
-
-	.shop-pBox {
-		box-sizing: border-box;
-		padding: 0rpx 0rpx;
-		background: #FFFFFF;
-		font-size: 28rpx;
-		font-family: PingFang SC;
-		font-weight: 500;
-		color: #666666;
-
-		.item {
-			border: 1px solid #fff;
-			border-radius: 12rpx;
-			padding: 18rpx 20rpx 24rpx;
-
-			.price {
-				font-size: 42rpx;
-				font-weight: bold;
-				color: #FF6633;
-				display: flex;
-				flex: 1;
-
-				.strong {
-					font-size: 30rpx;
-					line-height: 46rpx;
-					margin-top: 14rpx;
-				}
-			}
-
-			.num {
-				font-size: 28rpx;
-				font-weight: normal;
-				color: #999;
-				width: 200rpx;
-				text-align: right;
-			}
-
-			.name {
-				max-width: 60%;
-				margin-right: 10rpx;
-				font-size: 28rpx;
-				font-weight: normal;
-				color: #333;
-				text-align: left;
-				overflow: hidden;
-				white-space: nowrap;
-				text-overflow: ellipsis;
-			}
-
-		}
-
-		.hover {
-			border: 1rpx solid #FF6633;
-		}
-
-		.shop-morebtn {
-			margin-top: 14rpx;
-			box-sizing: border-box;
-			padding: 12rpx 30rpx;
-			font-size: 28rpx;
-			font-weight: 500;
-			color: #111111;
-			background: #F7F7F7;
-			border-radius: 32rpx;
-			text-align: center;
-
-			text {
-				color: #999;
-			}
-		}
-	}
-
-	.shop-pBox-name {
-		display: flex;
-		align-items: center;
-		justify-content: flex-start;
-	}
-
-	.storepopup {
-		padding: 40rpx 20rpx 20rpx 20rpx;
-
-		.storepopup-title {
-			text-align: center;
-			margin-bottom: 30rpx;
-			position: relative;
-
-			.close-icon {
-				width: 40rpx;
-				height: 40rpx;
-				position: absolute;
-				right: 0;
-				top: 50%;
-				transform: translate(0, -50%);
-			}
-		}
-
-		.storepopup-box {
-			height: 60vh;
-		}
-	}
-
 	.det-box {
-
 		margin-top: 10rpx;
 		background-color: #FFFFFF;
 		padding: 24rpx;
@@ -1194,65 +554,6 @@
 		.inner {
 			margin-bottom: 100rpx;
 		}
-
-		.det-title {
-			display: flex;
-			align-items: center;
-			justify-content: space-between;
-
-			.tt {
-				font-size: 28rpx;
-				font-weight: bold;
-				color: #222426;
-			}
-		}
-
-		.det-right {
-			display: flex;
-			font-size: 24rpx;
-			color: #898E91;
-			align-items: center;
-		}
-
-		.det-table {
-			width: 100%;
-			margin: 24rpx 0;
-			background: #FFFFFF;
-			border-radius: 16rpx 16rpx 16rpx 16rpx;
-			border: 1rpx solid #ECECEC;
-			overflow: hidden;
-			font-size: 24rpx;
-
-			.row {
-				display: table-row;
-
-			}
-
-			.row:last-child .cell-1,
-			.row:last-child .cell-2 {
-				border-bottom: 0;
-			}
-
-			.cell {
-				display: table-cell;
-				padding: 24rpx;
-
-				&.cell-1 {
-					width: 30%;
-					text-align: center;
-					color: #626468;
-					background: #F5F7FA;
-					border-right: 1rpx solid #ECECEC;
-					border-bottom: 1rpx solid #ECECEC;
-				}
-
-				&.cell-2 {
-					color: #222426;
-					text-align: center;
-					border-bottom: 1rpx solid #ECECEC;
-				}
-			}
-		}
 	}
 
 	.btn-foot {
@@ -1436,22 +737,8 @@
 			background: #2BC7B9;
 			border-radius: 44rpx;
 			margin-top: 30rpx;
-			// margin-bottom: 30rpx;
-
 		}
 	}
-
-	.contact-btn {
-		display: inline-block;
-		position: absolute;
-		top: 0;
-		left: 0;
-		width: 100%;
-		height: 100%;
-		opacity: 0;
-		z-index: 9999;
-	}
-
 	.loadding {
 		background-color: #fff;
 		display: flex;
@@ -1477,65 +764,4 @@
 			margin-top: 20rpx;
 		}
 	}
-
-	.form-item {
-		padding: 30rpx 0;
-		display: flex;
-		align-items: flex-start;
-		border-bottom: 1px solid #F1F1F1;
-
-		&:last-child {
-			border-bottom: none;
-		}
-
-		.label {
-			width: 180rpx;
-			text-align: left;
-			font-size: 30rpx;
-			line-height: 44rpx;
-			font-weight: 500;
-			color: #222222;
-			flex-shrink: 0;
-		}
-
-		input {
-			text-align: left;
-		}
-
-		.form-input {
-			font-size: 30rpx;
-			font-weight: 500;
-			color: #999999;
-			text-align: left;
-		}
-
-		.form-textarea {
-			font-size: 30rpx;
-			color: #999999;
-			height: 100rpx;
-			padding: 4rpx 0;
-		}
-
-		.birth-picker {
-			flex: 1;
-			display: flex;
-			align-items: center;
-
-			.right-box {
-				width: 100%;
-				display: flex;
-				align-items: center;
-
-				.input-box {
-					width: 470rpx;
-				}
-
-				.arrow {
-					width: 13rpx;
-					height: 23rpx;
-					margin-left: 20rpx;
-				}
-			}
-		}
-	}
 </style>

+ 1 - 5
pages_shopping/live/order.vue

@@ -251,7 +251,6 @@
 			},
 			// 取消订单
 			cancel(item) {
-
 				var that = this;
 				uni.showModal({
 					title: '提示',
@@ -306,10 +305,7 @@
 					url: `./paymentOrder?orderList=${encodeURIComponent(JSON.stringify(item))}`
 				})
 			},
-			// 评价
-			evaluate(item) {
-				// 评价逻辑
-			}
+			
 		}
 	}
 </script>