Browse Source

2023-12-15

cmy 1 year ago
parent
commit
6906d109e3
2 changed files with 55 additions and 928 deletions
  1. 14 292
      src/pages/cashier/reservation.vue
  2. 41 636
      src/pages/cashier/servecard.vue

+ 14 - 292
src/pages/cashier/reservation.vue

@@ -223,7 +223,7 @@
 				<div class="item acea-row row-between-wrapper">
 					<div>服务卡优惠:</div>
 					<div>
-						¥{{ ((payInfo.total_price || 0) - (cartSum && payInfo.pay_price ? payInfo.pay_price : 0) - (payInfo.level_price || 0)) || 0 }}
+						¥{{serverpre_ferential}}
 					</div>
 				</div>
 			</div>
@@ -440,6 +440,15 @@
 				zIndex: 9999,
 			};
 		},
+		computed:{
+			serverpre_ferential(){
+				const total_price = this.payInfo.total_price || 0;
+				const cartSum = this.cartSum && this.payInfo.pay_price ? this.payInfo.pay_price : 0;
+				const  level_price =this.payInfo.level_price || 0;
+				const num1 = this.$computes.Sub(total_price,cartSum);
+				return  this.$computes.Sub(num1,level_price)
+			}
+		},
 		watch: {
 			goodData(value) {
 				this.$nextTick(() => {
@@ -1526,12 +1535,6 @@
 			flex-direction: column;
 			height: 100%;
 			// max-width: 500px;
-
-			.title {
-				padding: 0 18px;
-				border: 2px solid #FF7700;
-			}
-
 			.left-top {
 				width: 100%;
 				height: 100%;
@@ -1544,6 +1547,7 @@
 					// height: calc(100% - 82px);
 					flex: 1;
 					min-width: 0;
+					padding-top: 27px;
 				}
 
 				.btn-group-vertical {
@@ -1684,13 +1688,13 @@
 			}
 
 			.title {
-				// border-bottom: 1px solid #D8D8D8;
-				// width: 376px;
+				padding: 0 18px;
+				border: 2px solid #FF7700;
 				flex-shrink: 0;
 				height: 90px;
 				background: rgba(255, 119, 0, 0.05);
 				border-radius: 10px;
-				margin: 27px 24px 24px;
+				margin: 0px 24px 24px;
 				display: flex;
 				align-items: center;
 				flex-wrap: nowrap;
@@ -1801,85 +1805,14 @@
 
 				.promotions {
 					border-bottom: 1px dashed #EEEEEE;
-
-					.promotions-msg {
-						display: flex;
-						justify-content: space-between;
-						padding: 10px 0;
-						color: #333333;
-						font-size: 14px;
-						border-bottom: 1px solid #f2f2f2;
-
-						.card {
-							color: #FF7700;
-							padding: 1px 6px;
-							margin-right: 8px;
-							border-radius: 3px;
-							background-color: #Fcf0e2;
-							font-size: 12px;
-							white-space: nowrap;
-						}
-
-						.flex-1 {
-							flex: 1;
-							display: flex;
-							align-items: center;
-						}
-
-						.collect {
-							cursor: pointer;
-							width: 70px;
-							display: flex;
-							align-items: center;
-							flex-basis: max-content;
-
-							.iconjinru {
-								font-size: 12px;
-							}
-						}
-					}
-
-					.is_give {
-						height: 60px;
-
-						.picture {
-							width: 40px;
-							height: 40px;
-
-							img {
-								width: 100%;
-								height: 100%;
-								border-radius: 5px;
-							}
-						}
-
-						.give-name {
-							font-size: 12px;
-							color: #333;
-							max-width: 200px;
-						}
-
-						.give-info {
-							font-size: 12px;
-							color: #ccc;
-						}
-					}
 				}
 			}
 
 			.list::-webkit-scrollbar {
 				width: 0 !important;
 			}
-
 			.list {
 				-ms-overflow-style: none;
-			}
-
-			.list {
-				overflow: -moz-scrollbars-none;
-			}
-
-			.list {
 				overflow: hidden;
 				overflow-y: scroll;
 
@@ -2212,177 +2145,6 @@
 			}
 		}
 	}
-
-	footer {
-		display: flex;
-		background-color: #fff;
-
-		.footer {
-			width: 500px;
-			padding: 13px 17px 13px 17px;
-
-			.pay {
-				.bnt {
-					border-radius: 6px;
-					width: 30%;
-					height: 0.32rem;
-					border: 1px solid #1890FF;
-					color: #1890FF;
-					font-size: 0.11rem;
-					text-align: center;
-					font-weight: 500;
-					cursor: pointer;
-
-					&.on {
-						background: #1890FF;
-						color: #fff;
-					}
-
-					&.bntUid {
-						background: #1890FF;
-						color: #fff;
-						cursor: unset;
-
-						&.on {
-							background: #ccc;
-							border: 1px solid #ccc;
-							color: #fff;
-						}
-					}
-				}
-
-				&.noCart {
-					.bnt {
-						border: 1px solid #ccc !important;
-						color: #ccc;
-						cursor: unset;
-
-						&.on {
-							border: 1px solid #1890FF;
-							background: #ccc;
-							color: #fff;
-						}
-					}
-				}
-			}
-		}
-
-		.right {
-			padding: 10px 17px 15px 17px;
-			border-radius: 0 6px 6px 0;
-			display: flex;
-			flex: 1;
-			box-shadow: 5px 0px 14px 0px rgba(0, 0, 0, 0.06);
-			background-color: #fff;
-
-			/deep/ .ivu-btn-primary {
-				width: 100px;
-			}
-
-			.rightCon {
-				display: flex;
-				align-items: center;
-
-				.top {
-					height: 80px;
-					color: rgba(0, 0, 0, 0.65);
-					font-size: 13px;
-					padding: 0 20px;
-
-					.num {
-						font-size: 42px;
-						color: rgba(0, 0, 0, 0.85);
-					}
-				}
-
-				.center {
-					width: 100%;
-					height: 46px;
-					background-color: #1890FF;
-					font-size: 13px;
-					color: #fff;
-					padding: 0 20px;
-
-					.num {
-						font-size: 27px;
-					}
-				}
-
-				.item {
-					width: 80px;
-					height: 46px;
-					display: flex;
-					align-items: center;
-					justify-content: center;
-					background: #F2F3F5;
-					color: #fff;
-					cursor: unset;
-					border-radius: 4px;
-					margin-right: 14px;
-					cursor: pointer;
-					color: #000000;
-					font-size: 17px;
-
-					&.on {
-						background: #E7F3FF;
-						color: #1890FF;
-						font-size: 17px;
-						font-weight: 400;
-					}
-
-					&.spot {
-						padding-bottom: 15px;
-					}
-				}
-
-				.bottom {
-					padding: 10px 0 0 8px;
-				}
-			}
-
-			.noCart {
-				display: flex;
-				align-items: center;
-
-				.item {
-					background: #ccc;
-					color: #fff;
-					cursor: unset;
-					width: 80px;
-					height: 46px;
-					display: flex;
-					align-items: center;
-					justify-content: center;
-					margin-right: 14px;
-					border-radius: 4px;
-					font-size: 16px;
-
-					&:nth-child(3) {
-						&:hover {
-							background-color: #ccc;
-						}
-					}
-
-					&:nth-child(4) {
-						&:hover {
-							background-color: #ccc;
-						}
-					}
-
-					&:nth-child(5) {
-						&:hover {
-							background-color: #ccc;
-						}
-					}
-
-					&.on {
-						background-color: #ccc;
-					}
-				}
-			}
-		}
-	}
-
 	/deep/ .ivu-page {
 		font-size: 15px;
 	}
@@ -2437,46 +2199,6 @@
 			margin-bottom: 30px;
 		}
 	}
-
-	/deep/.remarks-modal {
-		.ivu-modal-content {
-			border-radius: 10px;
-		}
-
-		.ivu-modal-body {
-			padding: 20px 25px;
-		}
-
-		.ivu-input {
-			padding: 14px;
-			border: 1px solid #DDDDDD;
-			border-radius: 6px;
-
-			&:focus {
-				border-color: #1890FF;
-				box-shadow: none;
-			}
-		}
-
-		.ivu-input-word-count {
-			right: 14px;
-			bottom: 14px;
-		}
-
-		.ivu-modal-footer {
-			padding: 17px 25px;
-			border-top: none;
-		}
-
-		.ivu-btn {
-			height: 46px;
-			border-radius: 23px;
-			background: #1890FF;
-			font-weight: 500;
-			font-size: 16px !important;
-		}
-	}
-
 	/deep/.user-modal {
 		.ivu-modal-content {
 			border-radius: 10px;

+ 41 - 636
src/pages/cashier/servecard.vue

@@ -172,11 +172,12 @@
 					<div class="goodsCon">
 						<div class="goods-top">
 							<div ref="listWrap" class="list-wrap" @scroll="pageChange">
-								<Row v-if="goodData.length && (goodFrom.cate_id !== '99999' || activityFrom.type)"
+								<Row v-if="goodData.length && (goodFrom.cate_id !== '99999')"
 									:gutter="15" class="list">
 									<Col v-for="(item, index) in goodData" :key="index" :sm="12" :md="12" :lg="12"
 										:xl="8" :xxl="4">
-									<div :class="{ on: item.stock }" class="item" @click="attrTap(item)">
+									<div :class="{ on: item.stock }" class="item"
+										@click="!item.cart_num?attrTap(item):''">
 										<div :style="{ height: goodsHeight + 'px' }" class="picture">
 											<img :src="item.image" alt="商品图" style="width: 100%;" />
 										</div>
@@ -189,9 +190,9 @@
 													<span class="rmb">¥</span>{{ item.price }}
 												</div>
 											</div>
-											<div v-if="item.cart_num && cartList.length" class="icon-cart-num">
+											<!-- <div v-if="item.cart_num && cartList.length" class="icon-cart-num">
 												{{ item.cart_num > 99 ? "99+" : item.cart_num }}
-											</div>
+											</div> -->
 											<div v-if="!item.stock && !item.cart_num" class="no-stock">
 												<div class="trip">
 													<div>暂无</div>
@@ -233,9 +234,9 @@
 			width="950" class-name="user-modal">
 			<userList v-if="modalUser" ref="users" :uid="userInfo.uid || 0" @getUserId="getUserId"></userList>
 		</Modal>
-		<settleDrawer v-model="settleVisible" :list="payList" :type="payType" :money="settleMoney"
-			@close='cancel' :collection="collection" :verify="yueVerify" :z-index="zIndex"
-			@payPrice="payPrice" @numTap="numTap" @delNum="delNum" @cashBnt="cashBnt"></settleDrawer>
+		<settleDrawer v-model="settleVisible" :list="payList" :type="payType" :money="settleMoney" @close='cancel'
+			:collection="collection" :verify="yueVerify" :z-index="zIndex" @payPrice="payPrice" @numTap="numTap"
+			@delNum="delNum" @cashBnt="cashBnt"></settleDrawer>
 		<recharge ref="recharge" v-model="rechargeVisible" :userInfo="userInfo" @getSuccess="getSuccess"
 			@recharge="onRecharge"></recharge>
 		<storeList ref="store" :storeInfo="storeInfos" @getStoreId="getStoreId" @getUserInfo="getUserInfo"></storeList>
@@ -345,18 +346,12 @@
 					store_name: "",
 					field_key: "all",
 					cate_id: "",
+					service_card:1,
 					page: 1,
 					limit: 20,
 					uid: 0,
 					staff_id: 0,
 				},
-				activityFrom: {
-					page: 1,
-					limit: 20,
-					type: 0,
-					uid: 0,
-					promotions_id: 0,
-				},
 				total: 0,
 				goodData: [],
 				codeNum: "",
@@ -400,9 +395,6 @@
 				discount: false,
 				payType: "", // 支付方式
 				orderId: "", //订单id
-				seckillOrderId: "", //秒杀订单id
-				clientHeight: 0,
-				cartHeight: 0,
 				goodsHeight: 0,
 				invalidList: [],
 				defaultcalc: false,
@@ -432,18 +424,9 @@
 						status: true,
 					},
 				],
-				shadow: 0,
 				rechargeVisible: false,
 				settleMoney: 0,
 				yueVerify: false,
-				activityTypeArr: [],
-				swiper: null,
-				swiperClickedIndex: 0,
-				swiperOption: {
-					slidesPerView: 'auto',
-					spaceBetween: 14,
-					setWrapperSize: true,
-				},
 				rechargeData: {},
 				zIndex: 9999,
 				endTimeout: ''
@@ -471,7 +454,6 @@
 				pageLimt = 30;
 			}
 			this.goodFrom.limit = pageLimt;
-			this.activityFrom.limit = pageLimt;
 			this.userInfo = JSON.parse(window.localStorage.getItem("cashierUser")) || {};
 			if (!this.userInfo.uid) {
 				this.setUp();
@@ -516,29 +498,20 @@
 				this.limitTemp = this.goodFrom.limit;
 				this.goodFrom.limit *= this.goodFrom.page;
 				this.goodFrom.page = 1;
-				if (this.activityFrom.type) {
-					this.limitTemp = this.activityFrom.limit;
-					this.activityFrom.limit *= this.activityFrom.page;
-					this.activityFrom.page = 1;
-				}
 			},
 			getSwithUser(data) {
 				swithUser(data).then(res => {}).catch(err => {
 					this.$Message.error(err.msg);
 				})
 			},
-			ceshi() {
-				this.$router.push({
-					path: `${Setting.roterPre}/auxScreen/login`
-				})
-			},
+			// 打开硬件收银台钱箱
 			jsToJava() {
 				try {
 					window.Jsbridge.invoke('openCacheBox', JSON.stringify({
 						'p1-key': 'p1-value'
 					}), this.myFunction());
 				} catch (e) {
-
+					console.log(e);
 				}
 			},
 			myFunction() {
@@ -576,7 +549,6 @@
 				this.createOrder.change_price = 0;
 				this.createOrder.remarks = "";
 				this.createOrder.is_price = 0;
-				this.activityFrom.type = 0;
 				this.goodFrom.cate_id = "";
 			},
 			// 关闭支付弹窗
@@ -783,12 +755,6 @@
 					}
 				}
 				this.createOrder.tourist_uid = this.userInfo.touristId;
-				if (this.activityFrom.type == 5) {
-					this.createOrder.cart_id = [this.seckillOrderId];
-					this.createOrder.new = 1;
-				} else if (this.storeInfo.product_type == 4) {
-					this.createOrder.new = 1;
-				}
 				if (this.payType == "") {
 					this.createOrder.auth_code = payNum
 				}
@@ -815,7 +781,6 @@
 								);
 								this.userInfo.now_money = money;
 								storage.setItem("cashierUser", JSON.stringify(this.userInfo));
-								// this.goodList();
 								this.clear();
 							} else {
 								this.isOrderCreate = 1;
@@ -828,8 +793,7 @@
 								this.$Message.success("支付成功");
 								// storage.removeItem("cashierUser");
 								// this.userInfo = null;
-								if (this.userInfo.uid) {
-								}
+								if (this.userInfo.uid) {}
 								storage.setItem("cashierUser", JSON.stringify(this.userInfo));
 								this.settleVisible = false;
 								this.clear();
@@ -927,7 +891,7 @@
 							.then((res) => {
 								this.$Message.success("删除成功");
 								this.reloadList();
-								this.goodList(this.activityFrom.type);
+								this.goodList();
 								if (type) {
 									this.clear();
 									this.invalidList = [];
@@ -988,8 +952,7 @@
 				);
 			},
 			// 加入购物车
-			joinCart(num) {
-				console.log(num, 'num');
+			joinCart(num, item) {
 				let that = this;
 				if (num) {
 					let productSelect = that.productValue[this.attrValue];
@@ -998,10 +961,10 @@
 						return this.$Message.warning("产品库存不足,请选择其它");
 					}
 				}
+
 				if (this.activeHangon == -1) this.activeHangon = 0;
 				// let uid = this.userInfo.uid;
 				let uid = this.userInfo.uid || 0;
-				console.log(uid);
 				let data = {
 					productId: this.productId,
 					cartNum: 1,
@@ -1011,11 +974,11 @@
 						"" : "",
 					staff_id: this.storeInfos.id,
 					tourist_uid: this.userInfo.touristId,
-					new: Number(this.storeInfo.product_type === 4),
+					new: 0,
+					ServiceCardId: item.service_card
 				};
 				cashierCart(uid, data)
 					.then((res) => {
-						this.$refs.attrs.modals = false;
 						this.$Message.success("添加购物车成功");
 						this.getCartList();
 						//如果是扫码查询商品摒弃直接加入购物车的情况下,在加入购物车成功以后,清空输入框的内容,重新请求列表
@@ -1071,8 +1034,10 @@
 				this.disabled = false;
 				if (this.userInfo && this.userInfo.uid >= 0) {
 					this.productId = item.product_id;
+					console.log(this.productId)
 					if (!item.stock) return this.$Message.error("暂无库存");
-					this.joinCart(0);
+					console.log(item);
+					this.joinCart(0, item);
 
 				} else {
 					this.$Message.error("请添加或选择用户");
@@ -1391,62 +1356,39 @@
 			},
 			//商品列表
 			goodList(type) {
-				if (this.activityFrom.type) {
-					this.activityFrom.uid = this.userInfo ? this.userInfo.uid : 0;
-					this.activityFrom.type = type;
-					this.activityFrom.staff_id = this.storeInfos.id;
-					if (!this.userInfo.uid)
-						this.activityFrom.tourist_uid = this.userInfo.touristId;
-					activityList(this.activityFrom).then((res) => {
+				this.goodFrom.uid = this.userInfo ? this.userInfo.uid : 0;
+				if (!this.userInfo.uid)
+					this.goodFrom.tourist_uid = this.userInfo.touristId;
+				cashierProduct(this.goodFrom)
+					.then((res) => {
 						let data = res.data;
 						this.total = data.count;
 						if (this.reloading) {
 							this.reloading = false;
-							this.activityFrom.limit = this.limitTemp;
+							this.goodFrom.limit = this.limitTemp;
 							this.goodData = data.list;
 						} else {
 							this.goodData = this.goodData.concat(data.list);
 						}
+						if (data.attrValue) {
+							// 加入购物车
+							this.attr.productSelect.unique = data.attrValue.unique;
+							this.productId = data.attrValue.product_id;
+							this.joinCart(1);
+						}
+						if (data.userInfo) {
+							this.modalUserInfo = data.userInfo;
+							this.userInfoShow = true;
+						}
+					})
+					.catch((err) => {
+						this.$Message.error(err.msg);
 					});
-				} else {
-					this.goodFrom.uid = this.userInfo ? this.userInfo.uid : 0;
-					if (!this.userInfo.uid)
-						this.goodFrom.tourist_uid = this.userInfo.touristId;
-					cashierProduct(this.goodFrom)
-						.then((res) => {
-							let data = res.data;
-							this.total = data.count;
-							if (this.reloading) {
-								this.reloading = false;
-								this.goodFrom.limit = this.limitTemp;
-								this.goodData = data.list;
-							} else {
-								this.goodData = this.goodData.concat(data.list);
-							}
-							if (data.attrValue) {
-								// 加入购物车
-								this.attr.productSelect.unique = data.attrValue.unique;
-								this.productId = data.attrValue.product_id;
-								this.joinCart(1);
-							}
-							if (data.userInfo) {
-								this.modalUserInfo = data.userInfo;
-								this.userInfoShow = true;
-							}
-						})
-						.catch((err) => {
-							this.$Message.error(err.msg);
-						});
-				}
 			},
 			pageChange(event) {
 				if (Math.abs(event.target.scrollHeight - event.target.clientHeight - event.target.scrollTop) < 1) {
-					if (this.activityFrom.type) {
-						this.activityFrom.page++;
-					} else {
 						this.goodFrom.page++;
-					}
-					this.goodList(this.activityFrom.type);
+					this.goodList();
 				}
 			},
 			// 监听键盘函数
@@ -1599,111 +1541,7 @@
 		/* 对垂直流动条有效 */
 	}
 
-	/deep/.change-price-modal {
-		.ivu-modal-content {
-			border-radius: 10px;
-		}
-
-		.ivu-modal-body {
-			padding: 30px 25px 50px;
-		}
-
-		.ivu-form-item:last-child {
-			margin-bottom: 0;
-		}
-
-		.ivu-form-item-content {
-			font-size: 14px !important;
-			color: #303133;
-		}
-
-		.input-suffix {
-			color: #909399;
-		}
-
-		.ivu-modal-footer {
-			padding: 17px 25px;
-			border-top: none;
-		}
-
-		.ivu-btn {
-			height: 46px;
-			border-radius: 23px;
-			background: #1890FF;
-			font-weight: 500;
-			font-size: 16px !important;
-		}
-	}
-
-	.input-number {
-		flex: 1;
-		position: relative;
-		display: flex;
-		align-items: center;
-		padding: 0 15px 0 0;
-		border: 1px solid #DDDDDD;
-		border-radius: 4px;
-
-		.ivu-input-number {
-			flex: 1;
-			height: 36px;
-			border: none;
-
-			&-focused {
-				box-shadow: none;
-			}
-		}
-
-		/deep/.ivu-input-number-handler-wrap {
-			display: none;
-		}
-
-		/deep/.ivu-input-number-input-wrap {
-			height: 36px;
-		}
-
-		/deep/.ivu-input-number-input {
-			height: 36px;
-			padding: 0 15px;
-		}
-
-		&.discount {
-			flex: none;
-			width: 167px;
-			margin-left: 12px;
-		}
-	}
-
-	.changePrice {
-		font-weight: 600;
-		font-size: 14px;
-		color: #F5222D;
-
-		.price {
-			font-size: 17px;
-			margin-left: 5px;
-		}
-	}
-
-	.tableList {
-		/deep/ .ivu-table-header table {
-			border-top: 0 !important;
-		}
-
-		/deep/ .ivu-table th,
-		/deep/ .ivu-table td {
-			border-bottom: 0 !important;
-			height: 34px !important;
-		}
 
-		/deep/ .ivu-table-cell {
-			padding: 0 !important;
-		}
-
-		/deep/ .ivu-table th {
-			color: #999999;
-		}
-	}
 
 	.left {
 		/deep/ .ivu-form-item {
@@ -1711,43 +1549,6 @@
 		}
 	}
 
-	.header .ivu-btn {
-		width: 56px;
-		height: 28px;
-		border-radius: 4px;
-		border: 1px solid #FFFFFF;
-		background-color: unset !important;
-		color: #fff;
-
-		&:hover {
-			border-color: #ccc;
-			color: #ccc;
-		}
-	}
-
-	.headerCard {
-		background: #1890FF;
-		border-radius: 0 !important;
-	}
-
-	.remark {
-		/deep/ .ivu-input-wrapper {
-			width: 91% !important;
-		}
-
-		/deep/ .ivu-input-number {
-			width: 91% !important;
-		}
-
-		/deep/ .ivu-form-item-content {
-			margin-left: 63px !important;
-		}
-
-		/deep/ .ivu-form-item-label {
-			width: 63px !important;
-		}
-	}
-
 	.noCart {
 		height: 100%;
 		display: flex;
@@ -1800,54 +1601,6 @@
 		flex-direction: column;
 	}
 
-	.cashPage {
-		text-align: center;
-
-		.right {
-			width: 488px;
-			background: #F5F5F5;
-			padding: 16px 16px 16px 0;
-			border-radius: 0 6px 6px 0;
-
-			/deep/ .ivu-btn-primary {
-				width: 100px;
-			}
-
-		}
-
-		.left {
-			width: 282px;
-			padding: 16px 0 16px 16px;
-
-			.picture {
-				width: 110px;
-				height: 110px;
-				margin: 180px auto 0 auto;
-
-				img {
-					width: 100%;
-					height: 100%;
-				}
-			}
-
-			.text {
-				color: rgba(0, 0, 0, 0.45);
-				font-size: 14px;
-				margin-top: 14px;
-			}
-
-			.money {
-				color: rgba(0, 0, 0, 0.85);
-				font-size: 18px;
-
-				.num {
-					font-size: 32px;
-					margin-left: 5px;
-				}
-			}
-		}
-	}
-
 	.goods {
 		flex: 1;
 		min-width: 0;
@@ -1931,7 +1684,7 @@
 			.list-wrap {
 				flex: 1;
 				min-height: 0;
-				padding-top: 20px;
+				// padding-top: 20px;
 				overflow-x: hidden;
 			}
 
@@ -1939,11 +1692,6 @@
 				display: none;
 			}
 
-			.ivu-scroll-wrapper {
-				flex: 1;
-				min-height: 0;
-			}
-
 			/deep/.ivu-scroll-container {
 				height: 100%;
 			}
@@ -2239,142 +1987,6 @@
 				}
 			}
 
-			.tourist::-webkit-scrollbar {
-				height: 4px !important;
-			}
-
-			.tourist {
-				width: 100%;
-				padding-left: 13px;
-				padding-top: 15px;
-				display: flex;
-				overflow-x: auto;
-				overflow-y: hidden;
-				white-space: nowrap;
-				/* 解决ios手机页面滑动卡顿问题 */
-				-webkit-overflow-scrolling: touch;
-
-				.item-w1 {
-					min-width: 100px;
-				}
-
-				.item-w2 {
-					min-width: 140px;
-				}
-
-				.item {
-					height: 38px;
-					background: #F7F7F7;
-					border-radius: 50px;
-					font-size: 12px;
-					color: rgba(0, 0, 0, 0.85);
-					position: relative;
-					padding-left: 7px;
-					margin-bottom: 9px;
-					margin-right: 12px;
-					cursor: pointer;
-
-					.picture {
-						width: 24px;
-						height: 24px;
-						border-radius: 50%;
-						margin-right: 6px;
-
-						img {
-							width: 100%;
-							height: 100%;
-							border-radius: 50%;
-						}
-					}
-
-					.name {
-						width: 50px;
-					}
-
-					.guadan {
-						font-size: 10px;
-						border: 1px solid #FF7700;
-						color: #FF7700;
-						padding: 0 3px;
-						border-radius: 2px;
-						margin-right: 12px;
-					}
-
-					&:hover {
-						background: #FF7700;
-						color: #fff;
-
-						.guadan {
-							border: 1px solid #fff;
-							color: #fff;
-						}
-					}
-
-					&.on {
-						background: #FF7700;
-						color: #fff;
-
-						.guadan {
-							border: 1px solid #fff;
-							color: #fff;
-						}
-					}
-				}
-			}
-
-			.right {
-				width: 90px;
-
-				.navTabs {
-					position: absolute;
-					top: 15px;
-					cursor: pointer;
-
-					img {
-						display: block;
-						width: 40px;
-						height: 85px;
-					}
-
-					.label01 {
-						z-index: 5;
-						position: relative;
-					}
-
-					.label02 {
-						margin-top: -16px;
-					}
-				}
-
-				.item {
-					width: 72px;
-					background: #F2F3F5;
-					margin: 0 auto 13px auto;
-					text-align: center;
-					padding: 9px 0;
-					cursor: pointer;
-					position: relative;
-
-					.iconfont {
-						position: absolute;
-						font-size: 20px;
-						top: -9px;
-						right: -7px;
-						color: #bbb;
-					}
-
-					&:hover {
-						background-color: #1890FF;
-						color: #fff;
-					}
-
-					&.on {
-						background-color: #1890FF;
-						color: #fff;
-					}
-				}
-			}
-
 			.title {
 				// border-bottom: 1px solid #D8D8D8;
 				// width: 376px;
@@ -2848,174 +2460,6 @@
 		}
 	}
 
-	.header {
-		color: #fff;
-
-		.title {
-			font-size: 18px;
-			font-weight: 500;
-		}
-
-		.right {
-			.picture {
-				width: 32px;
-				height: 32px;
-				border-radius: 50%;
-
-				img {
-					width: 100%;
-					height: 100%;
-					border-radius: 50%;
-				}
-			}
-
-			.storeBnt {
-				width: 80px;
-				height: 32px;
-				background: #FFFFFF;
-				border-radius: 1px;
-				color: #1890FF;
-				font-size: 14px;
-				text-align: center;
-				line-height: 32px;
-				margin-left: 10px;
-				cursor: pointer;
-
-				&:hover {
-					background-color: rgba(255, 255, 255, 0.9);
-				}
-			}
-
-			.info {
-				font-size: 14px;
-				font-weight: 400;
-				color: #fff;
-
-				span {
-					padding: 0 8px;
-
-					&~span {
-						border-left: 1px solid #DDDDDD;
-					}
-				}
-			}
-
-			.bnt {
-				margin-left: 20px;
-			}
-		}
-	}
-
-	footer {
-		display: flex;
-		background-color: #fff;
-
-		.footer {
-			width: 500px;
-			padding: 13px 17px 13px 17px;
-
-			.pay {
-				.bnt {
-					border-radius: 6px;
-					width: 30%;
-					height: 0.32rem;
-					border: 1px solid #1890FF;
-					color: #1890FF;
-					font-size: 0.11rem;
-					text-align: center;
-					font-weight: 500;
-					cursor: pointer;
-
-					&.on {
-						background: #1890FF;
-						color: #fff;
-					}
-
-					&.bntUid {
-						background: #1890FF;
-						color: #fff;
-						cursor: unset;
-
-						&.on {
-							background: #ccc;
-							border: 1px solid #ccc;
-							color: #fff;
-						}
-					}
-				}
-
-				&.noCart {
-					.bnt {
-						border: 1px solid #ccc !important;
-						color: #ccc;
-						cursor: unset;
-
-						&.on {
-							border: 1px solid #1890FF;
-							background: #ccc;
-							color: #fff;
-						}
-					}
-				}
-			}
-		}
-
-		.right {
-			padding: 10px 17px 15px 17px;
-			border-radius: 0 6px 6px 0;
-			display: flex;
-			flex: 1;
-			box-shadow: 5px 0px 14px 0px rgba(0, 0, 0, 0.06);
-			background-color: #fff;
-
-			/deep/ .ivu-btn-primary {
-				width: 100px;
-			}
-
-
-			.noCart {
-				display: flex;
-				align-items: center;
-
-				.item {
-					background: #ccc;
-					color: #fff;
-					cursor: unset;
-					width: 80px;
-					height: 46px;
-					display: flex;
-					align-items: center;
-					justify-content: center;
-					margin-right: 14px;
-					border-radius: 4px;
-					font-size: 16px;
-
-					&:nth-child(3) {
-						&:hover {
-							background-color: #ccc;
-						}
-					}
-
-					&:nth-child(4) {
-						&:hover {
-							background-color: #ccc;
-						}
-					}
-
-					&:nth-child(5) {
-						&:hover {
-							background-color: #ccc;
-						}
-					}
-
-					&.on {
-						background-color: #ccc;
-					}
-				}
-			}
-		}
-	}
-
 	/deep/ .ivu-page {
 		font-size: 15px;
 	}
@@ -3071,45 +2515,6 @@
 		}
 	}
 
-	/deep/.remarks-modal {
-		.ivu-modal-content {
-			border-radius: 10px;
-		}
-
-		.ivu-modal-body {
-			padding: 20px 25px;
-		}
-
-		.ivu-input {
-			padding: 14px;
-			border: 1px solid #DDDDDD;
-			border-radius: 6px;
-
-			&:focus {
-				border-color: #1890FF;
-				box-shadow: none;
-			}
-		}
-
-		.ivu-input-word-count {
-			right: 14px;
-			bottom: 14px;
-		}
-
-		.ivu-modal-footer {
-			padding: 17px 25px;
-			border-top: none;
-		}
-
-		.ivu-btn {
-			height: 46px;
-			border-radius: 23px;
-			background: #1890FF;
-			font-weight: 500;
-			font-size: 16px !important;
-		}
-	}
-
 	/deep/.user-modal {
 		.ivu-modal-content {
 			border-radius: 10px;