shish 3 лет назад
Родитель
Сommit
60e34c0755

+ 226 - 0
ghsApp/src/admin/changePrice/components/outItem.vue

@@ -0,0 +1,226 @@
+<template>
+<view class="product">
+	<view class="item-cmd_bx">
+		<view class="img_bx" @click.stop="pageTo({url: '/admin/item/detail',query: {id: info.id}})">
+			<view v-if="info.status == 2" class="sold-out">
+				<view class="sold-out-xj">已下架</view>
+			</view>
+			<image :src="info.cover" style="width:160upx;height:160upx;" lazy-load="true" :lazy-load-margin="0"></image>
+		</view>
+		<view class="cmd-info_bx" @click.stop="checkEvent">
+			<view class="tit">
+				<text style="font-size:22upx;border:1upx solid #3385ff;color:white;background-color:#3385ff;margin-right:5upx;padding-left:5upx;padding-right:5upx;" 
+				v-if="info.presell == 1">预售</text>
+				{{ info.name || "" }}
+			</view>
+			<view class="kc">¥{{ parseFloat(info.price) }}</view>
+			<view class="num-open_bx">
+				<view>
+					<view class="open-bx" >
+						<text style="color:#333333;">¥{{ parseFloat(info.skPrice) }}</text>
+					</view>
+				</view>
+			</view>
+			<view class="details-select">
+				<text class="iconfont iconxuanzhong" v-if="isCheck"> </text>
+				<text class="iconfont iconweixuanzhong" v-else> </text>
+			</view>
+		</view>
+	</view>
+</view>
+</template>
+<script>
+export default {
+	name: "outItem",
+	components: {
+	},
+	props: {
+		isPrice: {
+			type: Boolean,
+			default: true
+		},
+		isEdit: {
+			type: Boolean,
+			default: true
+		},
+		info: {
+			required: true
+		}
+	},
+	data() {
+		return {
+			isCheck:false
+		};
+	},
+	mounted(){
+	},
+	methods: {
+		checkEvent() {
+			this.isCheck = this.isCheck == true ? false : true
+			this.$emit("checkItem", this.info,this.isCheck)
+		}
+	}
+};
+</script>
+<style lang="scss" scoped>
+.product{
+	height:230upx;
+	.level-price{
+		display:flex;
+		color:rgb(75, 74, 74);
+		text-align: right;
+		font-size:24upx;
+		justify-content:space-around;
+	}
+}
+.item-cmd_bx {
+	height:160upx;
+	position: relative;
+	margin-bottom: 20upx;
+	.img_bx {
+		height: 160upx;
+		width: 160upx;
+		position: absolute;
+		left: 0upx;
+		top: 0upx;
+		.sold-out{
+			z-index:99999;
+			width:160upx;
+			height:160upx;
+			background-color:black;
+			position:absolute;
+			top:0;
+			left:0;
+			opacity: 0.6;
+			color:white;
+			text-align:center;
+			.sold-out-xj{
+				line-height:160upx;
+				font-size:28upx;
+			}
+		}
+	}
+	.cmd-info_bx {
+		position: relative;
+		padding-left: 177upx;
+		.details-select {
+			margin-right: 30upx;
+			position: absolute;
+			top:65upx;
+			right:70upx;
+			.iconfont {
+				font-size: 40upx;
+				color: #dddddd;
+			}
+			.iconxuanzhong {
+				color: $mainColor;
+			}
+		}
+		&.active{
+			&:before{
+				content: ' ';
+				height: 22upx;
+				width: 22upx;
+				border-width: 2upx 2upx 0 0;
+				border-color: #b2b2b2;
+				border-style: solid;
+				-webkit-transform: matrix(0.5, 0.5, -0.5, 0.5, 0, 0);
+				transform: matrix(0.5, 0.5, -0.5, 0.5, 0, 0);
+				position: absolute;
+				top: 50%;
+				margin-top: -12upx;
+				right: 30upx;
+			}
+		}
+		& .tit {
+			font-size: 30upx;
+			font-weight: bold;
+			color: #333333;
+			padding-top: 0upx;
+			overflow: hidden;
+			white-space: nowrap;
+			text-overflow: ellipsis;
+			width:360upx;
+		}
+		.show-color{
+			position:absolute;
+			top:84upx;
+			right:190upx;
+			display:inline-block;
+			width:25upx;
+			height:25upx;
+			background-color:rgb(9, 199, 9);
+			border-radius:15upx;
+			border:none;
+			margin-left:8upx;
+		}
+		& .kc {
+			color:red;
+			font-size: 31upx;
+			padding: 17upx 0 24upx;
+			font-weight: 700;
+		}
+		& .num-open_bx {
+			display: flex;
+			align-items: center;
+			& .price {
+				font-size: 30upx;
+				color: red;
+				flex: 1;
+			}
+			& .open-bx {
+				color:#999999;
+				width:300upx;
+				text{
+					font-size: 24upx;
+				}
+				*.warn {
+					color: $redColor;
+				}
+				.hd-price-area{
+					width:190upx;
+					position: absolute;
+					top:37upx;
+					right:-10upx;
+					.change-input {
+						width: 150upx;
+						height: 60upx;
+						line-height: 60upx;
+						text-align: center;
+						background: #ffffff;
+						border: 1upx solid #b4b4b4;
+						border-radius: 4upx;
+						font-size: 25upx;
+						color:#777777;
+						display:inline-block;
+					}
+					.change-text{
+						font-size:22upx;
+					}
+				}
+				.sk-price-area{
+					width:190upx;
+					position: absolute;
+					top:100upx;
+					right:-10upx;
+					.change-input {
+						width: 150upx;
+						height: 60upx;
+						line-height: 60upx;
+						text-align: center;
+						background: #ffffff;
+						border: 1upx solid #b4b4b4;
+						border-radius: 4upx;
+						font-size: 25upx;
+						color:#777777;
+						display:inline-block;
+					}
+					.change-text{
+						font-size:22upx;
+					}
+				}
+			}
+		}
+	}
+}
+</style>

+ 216 - 0
ghsApp/src/admin/changePrice/components/removeItem.vue

@@ -0,0 +1,216 @@
+<template>
+<view class="product">
+	<view class="item-cmd_bx">
+		<view class="img_bx" @click.stop="pageTo({url: '/admin/item/detail',query: {id: info.id}})">
+			<view v-if="info.status == 2" class="sold-out">
+				<view class="sold-out-xj">已下架</view>
+			</view>
+			<image :src="info.cover" style="width:160upx;height:160upx;" lazy-load="true" :lazy-load-margin="0"></image>
+		</view>
+		<view class="cmd-info_bx" @click.stop="checkEvent">
+			<view class="tit">
+				<text style="font-size:22upx;border:1upx solid #3385ff;color:white;background-color:#3385ff;margin-right:5upx;padding-left:5upx;padding-right:5upx;" 
+				v-if="info.presell == 1">预售</text>
+				{{ info.name || "" }}
+			</view>
+			<view class="kc">¥{{ parseFloat(info.price) }}</view>
+			<view class="num-open_bx">
+				<view>
+					<view class="open-bx" >
+						<text style="color:#333333;">¥{{ parseFloat(info.skPrice) }}</text>
+					</view>
+				</view>
+			</view>
+			<view class="details-select">
+				<text class="iconfont iconxuanzhong" v-if="isCheck"> </text>
+				<text class="iconfont iconweixuanzhong" v-else> </text>
+			</view>
+		</view>
+	</view>
+</view>
+</template>
+<script>
+export default {
+	name: "removeItem",
+	components: {
+	},
+	props: {
+		info: {
+			required: true
+		}
+	},
+	data() {
+		return {
+			isCheck:false
+		};
+	},
+	methods: {
+		checkEvent() {
+			this.isCheck = this.isCheck == true ? false : true
+			this.$emit("checkItem", this.info,this.isCheck)
+		}
+	}
+};
+</script>
+<style lang="scss" scoped>
+.product{
+	height:230upx;
+	.level-price{
+		display:flex;
+		color:rgb(75, 74, 74);
+		text-align: right;
+		font-size:24upx;
+		justify-content:space-around;
+	}
+}
+.item-cmd_bx {
+	height:160upx;
+	position: relative;
+	margin-bottom: 20upx;
+	.img_bx {
+		height: 160upx;
+		width: 160upx;
+		position: absolute;
+		left: 0upx;
+		top: 0upx;
+		.sold-out{
+			z-index:99999;
+			width:160upx;
+			height:160upx;
+			background-color:black;
+			position:absolute;
+			top:0;
+			left:0;
+			opacity: 0.6;
+			color:white;
+			text-align:center;
+			.sold-out-xj{
+				line-height:160upx;
+				font-size:28upx;
+			}
+		}
+	}
+	.cmd-info_bx {
+		position: relative;
+		padding-left: 177upx;
+		.details-select {
+			margin-right: 30upx;
+			position: absolute;
+			top:65upx;
+			right:70upx;
+			.iconfont {
+				font-size: 40upx;
+				color: #dddddd;
+			}
+			.iconxuanzhong {
+				color: $mainColor;
+			}
+		}
+		&.active{
+			&:before{
+				content: ' ';
+				height: 22upx;
+				width: 22upx;
+				border-width: 2upx 2upx 0 0;
+				border-color: #b2b2b2;
+				border-style: solid;
+				-webkit-transform: matrix(0.5, 0.5, -0.5, 0.5, 0, 0);
+				transform: matrix(0.5, 0.5, -0.5, 0.5, 0, 0);
+				position: absolute;
+				top: 50%;
+				margin-top: -12upx;
+				right: 30upx;
+			}
+		}
+		& .tit {
+			font-size: 30upx;
+			font-weight: bold;
+			color: #333333;
+			padding-top: 0upx;
+			overflow: hidden;
+			white-space: nowrap;
+			text-overflow: ellipsis;
+			width:360upx;
+		}
+		.show-color{
+			position:absolute;
+			top:84upx;
+			right:190upx;
+			display:inline-block;
+			width:25upx;
+			height:25upx;
+			background-color:rgb(9, 199, 9);
+			border-radius:15upx;
+			border:none;
+			margin-left:8upx;
+		}
+		& .kc {
+			color:red;
+			font-size: 31upx;
+			padding: 17upx 0 24upx;
+			font-weight: 700;
+		}
+		& .num-open_bx {
+			display: flex;
+			align-items: center;
+			& .price {
+				font-size: 30upx;
+				color: red;
+				flex: 1;
+			}
+			& .open-bx {
+				color:#999999;
+				width:300upx;
+				text{
+					font-size: 24upx;
+				}
+				*.warn {
+					color: $redColor;
+				}
+				.hd-price-area{
+					width:190upx;
+					position: absolute;
+					top:37upx;
+					right:-10upx;
+					.change-input {
+						width: 150upx;
+						height: 60upx;
+						line-height: 60upx;
+						text-align: center;
+						background: #ffffff;
+						border: 1upx solid #b4b4b4;
+						border-radius: 4upx;
+						font-size: 25upx;
+						color:#777777;
+						display:inline-block;
+					}
+					.change-text{
+						font-size:22upx;
+					}
+				}
+				.sk-price-area{
+					width:190upx;
+					position: absolute;
+					top:100upx;
+					right:-10upx;
+					.change-input {
+						width: 150upx;
+						height: 60upx;
+						line-height: 60upx;
+						text-align: center;
+						background: #ffffff;
+						border: 1upx solid #b4b4b4;
+						border-radius: 4upx;
+						font-size: 25upx;
+						color:#777777;
+						display:inline-block;
+					}
+					.change-text{
+						font-size:22upx;
+					}
+				}
+			}
+		}
+	}
+}
+</style>

+ 216 - 0
ghsApp/src/admin/changePrice/components/stopItem.vue

@@ -0,0 +1,216 @@
+<template>
+<view class="product">
+	<view class="item-cmd_bx">
+		<view class="img_bx" @click.stop="pageTo({url: '/admin/item/detail',query: {id: info.id}})">
+			<view v-if="info.status == 2" class="sold-out">
+				<view class="sold-out-xj">已下架</view>
+			</view>
+			<image :src="info.cover" style="width:160upx;height:160upx;" lazy-load="true" :lazy-load-margin="0"></image>
+		</view>
+		<view class="cmd-info_bx" @click.stop="checkEvent">
+			<view class="tit">
+				<text style="font-size:22upx;border:1upx solid #3385ff;color:white;background-color:#3385ff;margin-right:5upx;padding-left:5upx;padding-right:5upx;" 
+				v-if="info.presell == 1">预售</text>
+				{{ info.name || "" }}
+			</view>
+			<view class="kc">¥{{ parseFloat(info.price) }}</view>
+			<view class="num-open_bx">
+				<view>
+					<view class="open-bx" >
+						<text style="color:#333333;">¥{{ parseFloat(info.skPrice) }}</text>
+					</view>
+				</view>
+			</view>
+			<view class="details-select">
+				<text class="iconfont iconxuanzhong" v-if="isCheck"> </text>
+				<text class="iconfont iconweixuanzhong" v-else> </text>
+			</view>
+		</view>
+	</view>
+</view>
+</template>
+<script>
+export default {
+	name: "stopItem",
+	components: {
+	},
+	props: {
+		info: {
+			required: true
+		}
+	},
+	data() {
+		return {
+			isCheck:false
+		};
+	},
+	methods: {
+		checkEvent() {
+			this.isCheck = this.isCheck == true ? false : true
+			this.$emit("checkItem", this.info,this.isCheck)
+		}
+	}
+};
+</script>
+<style lang="scss" scoped>
+.product{
+	height:230upx;
+	.level-price{
+		display:flex;
+		color:rgb(75, 74, 74);
+		text-align: right;
+		font-size:24upx;
+		justify-content:space-around;
+	}
+}
+.item-cmd_bx {
+	height:160upx;
+	position: relative;
+	margin-bottom: 20upx;
+	.img_bx {
+		height: 160upx;
+		width: 160upx;
+		position: absolute;
+		left: 0upx;
+		top: 0upx;
+		.sold-out{
+			z-index:99999;
+			width:160upx;
+			height:160upx;
+			background-color:black;
+			position:absolute;
+			top:0;
+			left:0;
+			opacity: 0.6;
+			color:white;
+			text-align:center;
+			.sold-out-xj{
+				line-height:160upx;
+				font-size:28upx;
+			}
+		}
+	}
+	.cmd-info_bx {
+		position: relative;
+		padding-left: 177upx;
+		.details-select {
+			margin-right: 30upx;
+			position: absolute;
+			top:65upx;
+			right:70upx;
+			.iconfont {
+				font-size: 40upx;
+				color: #dddddd;
+			}
+			.iconxuanzhong {
+				color: $mainColor;
+			}
+		}
+		&.active{
+			&:before{
+				content: ' ';
+				height: 22upx;
+				width: 22upx;
+				border-width: 2upx 2upx 0 0;
+				border-color: #b2b2b2;
+				border-style: solid;
+				-webkit-transform: matrix(0.5, 0.5, -0.5, 0.5, 0, 0);
+				transform: matrix(0.5, 0.5, -0.5, 0.5, 0, 0);
+				position: absolute;
+				top: 50%;
+				margin-top: -12upx;
+				right: 30upx;
+			}
+		}
+		& .tit {
+			font-size: 30upx;
+			font-weight: bold;
+			color: #333333;
+			padding-top: 0upx;
+			overflow: hidden;
+			white-space: nowrap;
+			text-overflow: ellipsis;
+			width:360upx;
+		}
+		.show-color{
+			position:absolute;
+			top:84upx;
+			right:190upx;
+			display:inline-block;
+			width:25upx;
+			height:25upx;
+			background-color:rgb(9, 199, 9);
+			border-radius:15upx;
+			border:none;
+			margin-left:8upx;
+		}
+		& .kc {
+			color:red;
+			font-size: 31upx;
+			padding: 17upx 0 24upx;
+			font-weight: 700;
+		}
+		& .num-open_bx {
+			display: flex;
+			align-items: center;
+			& .price {
+				font-size: 30upx;
+				color: red;
+				flex: 1;
+			}
+			& .open-bx {
+				color:#999999;
+				width:300upx;
+				text{
+					font-size: 24upx;
+				}
+				*.warn {
+					color: $redColor;
+				}
+				.hd-price-area{
+					width:190upx;
+					position: absolute;
+					top:37upx;
+					right:-10upx;
+					.change-input {
+						width: 150upx;
+						height: 60upx;
+						line-height: 60upx;
+						text-align: center;
+						background: #ffffff;
+						border: 1upx solid #b4b4b4;
+						border-radius: 4upx;
+						font-size: 25upx;
+						color:#777777;
+						display:inline-block;
+					}
+					.change-text{
+						font-size:22upx;
+					}
+				}
+				.sk-price-area{
+					width:190upx;
+					position: absolute;
+					top:100upx;
+					right:-10upx;
+					.change-input {
+						width: 150upx;
+						height: 60upx;
+						line-height: 60upx;
+						text-align: center;
+						background: #ffffff;
+						border: 1upx solid #b4b4b4;
+						border-radius: 4upx;
+						font-size: 25upx;
+						color:#777777;
+						display:inline-block;
+					}
+					.change-text{
+						font-size:22upx;
+					}
+				}
+			}
+		}
+	}
+}
+</style>

+ 286 - 0
ghsApp/src/admin/changePrice/outList.vue

@@ -0,0 +1,286 @@
+<template>
+<view class="app-content" style="background:white;">
+	<view class="billing_box_bg">
+    <view class="input-wrap">
+			<view style="padding:0upx 0upx 0upx 0upx;margin-right:10upx;" >
+				<button class="admin-button-com middle blue" @click="selectFlowerNumFn()">图片分类</button>
+			</view>
+			<view class="search-bar">
+				<app-search-module v-model="py" placeholder="输入拼音首字母搜索" @input="searchFn"/>
+			</view>
+			<view style="padding:0 0upx 0 20upx;" >
+				<button class="admin-button-com middle blue" @click="downloadTable()">价格表</button>
+			</view>
+		</view>
+
+		<view class="scroll-middle_bx">
+			<scroll-view scroll-y scroll-with-animation class="tab-view" :scroll-top="scrollTop">
+				<div v-for="(item, index) in globalClassItemList" :key="index" class="tab-bar-item" :class="[classIndex == index ? 'active' : '']" :data-current="index" @tap.stop="swichClass(index)">
+					<text>{{ item.className || "" }}</text>
+				</div>
+			</scroll-view>
+				<scroll-view scroll-y class="right-box" 
+					:scroll-into-view="scroll_into_view" 
+					scroll-with-animation="true"
+					@scroll="scroll_detail"
+					lower-threshold="100"
+					@scrolltolower="scroll_bottom">
+
+				<block v-if="!$util.isEmpty(globalClassItemList)">
+					<view class="item_list_bx selectAll" v-for="(classItem, classIndex) in globalClassItemList" :key="classIndex" :id="`class_${classIndex}`">
+						<view class="item_list_title"> {{ classItem.className }}</view>
+
+						<view v-if="classItem.child && !$util.isEmpty(classItem.child)">
+
+							<template v-for="(productItem, productIndex) in classItem.child">
+								<view style="height:230upx" :id="`class_${classIndex}`" :key="productIndex">
+									<ItemComponent v-if="classItem.isActive" :isPrice="false" @checkItem="checkItemEvent" :info="productItem"></ItemComponent>
+								</view>
+							</template>
+
+						</view>
+						<view v-else>
+							<view style="height:260upx;text-align:center;color:#CCCCCC;position: relative;">
+								<view style="position: absolute;margin:auto;top:130upx;left:0;right:0;bottom:0;">暂无花材</view>
+							</view>
+						</view>
+
+					</view>
+				</block>
+				<block v-else>
+					<view style="width: 100%">
+						<app-wrapper-empty  title="加载中..." :is-empty="$util.isEmpty(globalClassItemList)"/>
+					</view>
+				</block>
+
+			</scroll-view>
+		</view>
+
+      <div class="app-footer">
+		<button class="admin-button-com big blue" @click="stopSelect()">停用所选</button>
+      </div>
+
+		<uni-popup ref="selectFlowerNumRef" background-color="#fff" type="center" :animation="false" class="class-popup-style">
+			<view style="display:flex;padding:20upx;height:auto;justify-content: space-between;align-items:center;flex-wrap:wrap;max-height:100vh;overflow:auto;">
+
+				<view v-for="(item, index) in globalClassItemList" :key="index" @tap.stop="changeClass(index)" style="margin-bottom:20upx;margin-left:3upx;">
+				<image :src="item.classCover" style="width:120upx;height:120upx;border-radius:10upx;"></image>
+				<view style="margin-top:5upx;overflow: hidden;white-space: nowrap;width:120upx;text-align:center;">{{item.className}}</view>
+				</view>
+
+			</view>
+		</uni-popup>
+
+		<image v-if="showClassRemind" @click="hideClassRemind" style="position:absolute;width:610upx;height:699upx;top:225upx;left:80upx;z-index:9999;" :src="`${constant.imgUrl}/class_remind.png`"></image>
+
+	</view>
+</view>
+</template>
+<script>
+import AppSearchModule from "@/components/module/app-search";
+import AppWrapperEmpty from "@/components/app-wrapper-empty";
+import ItemComponent from "./components/outItem";
+import productMins from "@/mixins/product";
+import { batchStopItem } from "@/api/item";
+import { mapGetters } from "vuex";
+export default {
+	name: "outlist",
+	components: {
+		AppSearchModule,
+		AppWrapperEmpty,
+		ItemComponent
+	},
+	mixins: [productMins],
+	data() {
+		return {
+			autoLoad: false,
+			selectJobType: "stock",
+			tabIndex: 0,
+			priceArr:[],
+			showClassRemind:false,
+			currentList:[]
+		};
+	},
+	computed:{
+		...mapGetters(["getMyShopInfo","getLoginInfo"]),
+	},
+	onLoad() {
+		this.initProduct()
+	},
+	methods: {
+		stopSelect(){
+			let that = this
+			if(this.$util.isEmpty(this.currentList)){
+				this.$msg('请选择花材')
+				return false
+			}
+			this.$util.confirmModal({content:'确认停用所选花材?'},() => {
+				batchStopItem({ids:JSON.stringify(that.currentList)}).then(res=>{
+					if(res.code == 1){
+						that.$msg(res.msg)
+					}
+				})
+			})
+		},
+		checkItemEvent(item,check) {
+			let id = item.id
+			if(check == true){
+				const index = this.currentList.indexOf(id);
+				if (index == -1) {
+					this.currentList.push(id)
+				}
+			}else{
+				const index = this.currentList.indexOf(id);
+				if (index > -1) {
+					this.currentList.splice(index, 1)
+				}
+			}
+		},
+		changeClass(index){
+			this.$refs.selectFlowerNumRef.close()
+			this.swichClass(index)
+		},
+		selectFlowerNumFn(){
+			this.$refs.selectFlowerNumRef.open('top')
+		},
+		initProduct(){
+			this.initData({ requestType:'outList'})
+		}
+	}
+};
+</script>
+
+<style lang="scss" scoped>
+.billing_box_bg {
+	height: 100%;
+	background: white;
+	display: flex;
+	background:white;
+	flex-direction: column;
+	.input-wrap {
+		display: flex;
+		padding: 22upx 20upx 22upx 13upx;
+		.search-bar {
+			flex: 1;
+		}
+		.city-select {
+			display: flex;
+			flex-shrink: 0;
+			align-items: center;
+			margin-right: 15upx;
+			margin-left: 45upx;
+			background-color: #ffff;
+			.iconfont {
+				margin-left: 20upx;
+				font-size: 30upx;
+			}
+		}
+	}
+	.scroll-middle_bx {
+		flex: 1;
+		display: flex;
+		width: 100%;
+		height: 100%;
+		overflow: hidden;
+	}
+	.tab-view {
+		height: calc(100vh - 140upx);
+		width: 170upx;
+		flex-shrink: 0;
+		background-color: #f0f2f6;
+		.tab-bar-item {
+			position: relative;
+			width: 170upx;
+			height: 90upx;
+			box-sizing: border-box;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			font-size: 26upx;
+			color: #444;
+			font-weight: 400;
+			.tag {
+				display: flex;
+				padding: 0 20upx;
+				align-items: center;
+				position: absolute;
+				right: 0;
+				top: 0;
+				height: 32upx;
+				background: #ff2842;
+				border-radius: 16upx;
+				color: #fff;
+				font-size: 20upx;
+			}
+      &:last-child{
+        margin-bottom: 110upx;
+      }
+		}
+
+		.active {
+			position: relative;
+			color: $mainColor;
+			font-size: 26upx;
+			background: #fff;
+		}
+
+		.active::before {
+			content: "";
+			position: absolute;
+			border-left: 8upx solid $mainColor;
+			height: 100%;
+			left: 0;
+		}
+	}
+	.right-box {
+		height: calc(100vh - 230upx);
+		flex: 1;
+		box-sizing: border-box;
+	}
+	.item_list_bx {
+		padding: 40upx 16upx;
+	}
+	.item_list_title {
+		margin-bottom: 20upx;
+		font-size: 24upx;
+		font-weight: 600;
+		color: #666666;
+	}
+	.select-cmd_bx {
+		& .kc {
+			color: #999999;
+			font-size: 28upx;
+			font-weight: 400;
+			margin-bottom: 60upx;
+			text-align: center;
+			margin-top: 10upx;
+		}
+		& .num_bx {
+			display: flex;
+			align-items: center;
+			margin-bottom: 80upx;
+			& > input {
+				width: 212upx;
+				height: 80upx;
+				border: 1upx solid #dddddd;
+				border-radius: 4upx;
+				text-align: center;
+				margin-right: 24upx;
+			}
+		}
+	}
+	.app-footer {
+		justify-content: space-evenly;
+		z-index: 9999;
+		.admin-button-com {
+			width: 60%;
+		}
+		button{
+			width:600upx;
+		}
+	}
+}
+.class-popup-style{
+	z-index:999999;
+}
+</style>

+ 379 - 0
ghsApp/src/admin/changePrice/removeList.vue

@@ -0,0 +1,379 @@
+<template>
+<view class="app-content" style="background:white;">
+	<view class="billing_box_bg">
+    <view class="input-wrap">
+			<view style="padding:0upx 0upx 0upx 0upx;margin-right:10upx;" >
+				<button class="admin-button-com middle blue" @click="selectFlowerNumFn()">图片分类</button>
+			</view>
+			<view class="search-bar">
+				<app-search-module v-model="py" placeholder="输入拼音首字母搜索" @input="searchFn"/>
+			</view>
+			<view style="padding:0 0upx 0 20upx;" >
+				<button class="admin-button-com middle blue" @click="downloadTable()">价格表</button>
+			</view>
+		</view>
+
+		<view class="scroll-middle_bx">
+			<scroll-view scroll-y scroll-with-animation class="tab-view" :scroll-top="scrollTop">
+				<div v-for="(item, index) in globalClassItemList" :key="index" class="tab-bar-item" :class="[classIndex == index ? 'active' : '']" :data-current="index" @tap.stop="swichClass(index)">
+					<text>{{ item.className || "" }}</text>
+				</div>
+			</scroll-view>
+				<scroll-view scroll-y class="right-box" 
+					:scroll-into-view="scroll_into_view" 
+					scroll-with-animation="true"
+					@scroll="scroll_detail"
+					lower-threshold="100"
+					@scrolltolower="scroll_bottom">
+
+				<block v-if="!$util.isEmpty(globalClassItemList)">
+					<view class="item_list_bx selectAll" v-for="(classItem, classIndex) in globalClassItemList" :key="classIndex" :id="`class_${classIndex}`">
+						<view class="item_list_title"> {{ classItem.className }}</view>
+
+						<view v-if="classItem.child && !$util.isEmpty(classItem.child)">
+
+							<template v-for="(productItem, productIndex) in classItem.child">
+								<view style="height:230upx" :id="`class_${classIndex}`" :key="productIndex">
+									<ItemComponent v-if="classItem.isActive" :isPrice="false" :info="productItem" @checkItem="checkItemEvent"></ItemComponent>
+								</view>
+							</template>
+
+						</view>
+						<view v-else>
+							<view style="height:260upx;text-align:center;color:#CCCCCC;position: relative;">
+								<view style="position: absolute;margin:auto;top:130upx;left:0;right:0;bottom:0;">暂无花材</view>
+							</view>
+						</view>
+
+					</view>
+				</block>
+				<block v-else>
+					<view style="width: 100%">
+						<app-wrapper-empty  title="加载中..." :is-empty="$util.isEmpty(globalClassItemList)"/>
+					</view>
+				</block>
+
+			</scroll-view>
+		</view>
+
+      <div class="app-footer">
+        <button class="admin-button-com big blue" @click="recoverSelect">恢复所选</button>
+      </div>
+
+		<uni-popup ref="selectFlowerNumRef" background-color="#fff" type="center" :animation="false" class="class-popup-style">
+			<view style="display:flex;padding:20upx;height:auto;justify-content: space-between;align-items:center;flex-wrap:wrap;max-height:100vh;overflow:auto;">
+
+				<view v-for="(item, index) in globalClassItemList" :key="index" @tap.stop="changeClass(index)" style="margin-bottom:20upx;margin-left:3upx;">
+				<image :src="item.classCover" style="width:120upx;height:120upx;border-radius:10upx;"></image>
+				<view style="margin-top:5upx;overflow: hidden;white-space: nowrap;width:120upx;text-align:center;">{{item.className}}</view>
+				</view>
+
+			</view>
+		</uni-popup>
+
+		<image v-if="showClassRemind" @click="hideClassRemind" style="position:absolute;width:610upx;height:699upx;top:225upx;left:80upx;z-index:9999;" :src="`${constant.imgUrl}/class_remind.png`"></image>
+
+	</view>
+</view>
+</template>
+<script>
+import AppSearchModule from "@/components/module/app-search";
+import AppWrapperEmpty from "@/components/app-wrapper-empty";
+import ItemComponent from "./components/removeItem";
+import productMins from "@/mixins/product";
+import { mapGetters } from "vuex";
+import { batchRecover } from "@/api/item";
+export default {
+	name: "removeList",
+	components: {
+		AppSearchModule,
+		AppWrapperEmpty,
+		ItemComponent
+	},
+	mixins: [productMins],
+	data() {
+		return {
+			autoLoad: false,
+			selectJobType: "stock",
+			tabIndex: 0,
+			priceArr:[],
+			showClassRemind:false,
+			currentList:[]
+		};
+	},
+	computed:{
+		...mapGetters(["getMyShopInfo","getLoginInfo"]),
+	},
+	onLoad() {
+		this.initProduct()
+	},
+	methods: {
+		recoverSelect(){
+			let that = this
+			if(this.$util.isEmpty(this.currentList)){
+				this.$msg('请选择花材')
+				return false
+			}
+			this.$util.confirmModal({content:'确认恢复所选花材?'},() => {
+				batchRecover({ids:JSON.stringify(that.currentList)}).then(res=>{
+					if(res.code == 1){
+						that.$msg(res.msg)
+					}
+				})
+			})
+		},
+		checkItemEvent(item,check) {
+			let id = item.id
+			if(check == true){
+				const index = this.currentList.indexOf(id);
+				if (index == -1) {
+					this.currentList.push(id)
+				}
+			}else{
+				const index = this.currentList.indexOf(id);
+				if (index > -1) {
+					this.currentList.splice(index, 1)
+				}
+			}
+		},
+		changeClass(index){
+			this.$refs.selectFlowerNumRef.close()
+			this.swichClass(index)
+		},
+		selectFlowerNumFn(){
+			this.$refs.selectFlowerNumRef.open('top')
+		},
+		hideClassRemind(){
+
+		},
+		cancelDiscountFn(item){
+			let that = this
+			this.$util.confirmModal({content:'确认取消?'},() => {
+				cancelDiscountPrice({id:item.id}).then(res=>{
+					if(res.code == 1){
+						that.$msg(res.msg)
+					}
+				})
+			})
+		},
+		downloadTable(){
+			let level = 0
+			let levelList = ['散客价', '花店价']
+			uni.showActionSheet({
+				itemList: levelList,
+				success: function (respond) {
+					level = respond.tapIndex
+					uni.showLoading({title:'下载中',mask:true})
+					generatePriceTable({level:level}).then(res => {
+						if(res.code == 1){
+							uni.hideLoading()
+							let file = res.data.file
+							let shortFile = res.data.shortFile
+							uni.downloadFile({
+								url: file,
+								header: {"Content-Type": 'application/vnd.ms-excel'},
+								filePath: `${wx.env.USER_DATA_PATH}/${shortFile}`,
+								success: (res) => {
+									if (res.statusCode === 200) {
+										wx.saveFileToDisk({
+											filePath: res.filePath,
+											success: function(res) {
+												console.log(res)
+											},
+											fail:function(res) {
+												console.log(res)
+											}
+										})
+									}
+								},
+								fail:()=>{
+									uni.showToast({title:'请用电脑打开小程序下载',mask:true,icon:'none'})
+								}
+							});
+						}					
+					})
+				}
+			})
+		},
+		initProduct(){
+			this.initData({ requestType:'removeList'})
+		},
+		commitPrice(){
+			let that = this
+			if(this.priceArr.length == 0){
+				this.$msg('没有修改')
+				return;
+			}
+			this.$util.confirmModal({content:'确认修改?'},() => {
+				that.commitChange()
+			})
+		},
+		commitChange(){
+			let data = JSON.stringify(this.priceArr);
+			batchChangePrice({data}).then(res => {
+					if(res.code == 1){
+						this.priceArr = [];
+						this.initProduct()
+					}
+					this.$msg(res.msg)					
+				})
+		},
+		savePrice(price,skPrice,id){
+			if(this.priceArr.length > 0){
+				this.priceArr.forEach(function(value,index,array){
+					if(value.id == id){
+						array.splice(index,1)
+					}
+				});
+			}
+			this.priceArr.push({id:id,price:price,skPrice:skPrice})
+		},
+		affirm(val) {
+			if (val.index === 0) {
+				this.modalCancel();
+			}
+		},
+		scrollTop() {},
+		initProductInfo() {
+			this.globalClassItemListContrapose = [];
+			this.page = 1;
+			this.isMore = true;
+		}
+	}
+};
+</script>
+
+<style lang="scss" scoped>
+.billing_box_bg {
+	height: 100%;
+	background: white;
+	display: flex;
+	background:white;
+	flex-direction: column;
+	.input-wrap {
+		display: flex;
+		padding: 22upx 20upx 22upx 13upx;
+		.search-bar {
+			flex: 1;
+		}
+		.city-select {
+			display: flex;
+			flex-shrink: 0;
+			align-items: center;
+			margin-right: 15upx;
+			margin-left: 45upx;
+			background-color: #ffff;
+			.iconfont {
+				margin-left: 20upx;
+				font-size: 30upx;
+			}
+		}
+	}
+	.scroll-middle_bx {
+		flex: 1;
+		display: flex;
+		width: 100%;
+		height: 100%;
+		overflow: hidden;
+	}
+	.tab-view {
+		height: calc(100vh - 140upx);
+		width: 170upx;
+		flex-shrink: 0;
+		background-color: #f0f2f6;
+		.tab-bar-item {
+			position: relative;
+			width: 170upx;
+			height: 90upx;
+			box-sizing: border-box;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			font-size: 26upx;
+			color: #444;
+			font-weight: 400;
+			.tag {
+				display: flex;
+				padding: 0 20upx;
+				align-items: center;
+				position: absolute;
+				right: 0;
+				top: 0;
+				height: 32upx;
+				background: #ff2842;
+				border-radius: 16upx;
+				color: #fff;
+				font-size: 20upx;
+			}
+      &:last-child{
+        margin-bottom: 110upx;
+      }
+		}
+
+		.active {
+			position: relative;
+			color: $mainColor;
+			font-size: 26upx;
+			background: #fff;
+		}
+
+		.active::before {
+			content: "";
+			position: absolute;
+			border-left: 8upx solid $mainColor;
+			height: 100%;
+			left: 0;
+		}
+	}
+	.right-box {
+		height: calc(100vh - 200upx);
+		flex: 1;
+		box-sizing: border-box;
+	}
+	.item_list_bx {
+		padding: 40upx 16upx;
+	}
+	.item_list_title {
+		margin-bottom: 20upx;
+		font-size: 24upx;
+		font-weight: 600;
+		color: #666666;
+	}
+	.select-cmd_bx {
+		& .kc {
+			color: #999999;
+			font-size: 28upx;
+			font-weight: 400;
+			margin-bottom: 60upx;
+			text-align: center;
+			margin-top: 10upx;
+		}
+		& .num_bx {
+			display: flex;
+			align-items: center;
+			margin-bottom: 80upx;
+			& > input {
+				width: 212upx;
+				height: 80upx;
+				border: 1upx solid #dddddd;
+				border-radius: 4upx;
+				text-align: center;
+				margin-right: 24upx;
+			}
+		}
+	}
+	.app-footer {
+		justify-content: space-evenly;
+		z-index: 9999;
+		.admin-button-com {
+			width: 60%;
+		}
+		button{
+			width:600upx;
+		}
+	}
+}
+.class-popup-style{
+	z-index:999999;
+}
+</style>

+ 301 - 0
ghsApp/src/admin/changePrice/stopList.vue

@@ -0,0 +1,301 @@
+<template>
+<view class="app-content" style="background:white;">
+	<view class="billing_box_bg">
+    <view class="input-wrap">
+			<view style="padding:0upx 0upx 0upx 0upx;margin-right:10upx;" >
+				<button class="admin-button-com middle blue" @click="selectFlowerNumFn()">图片分类</button>
+			</view>
+			<view class="search-bar">
+				<app-search-module v-model="py" placeholder="输入拼音首字母搜索" @input="searchFn"/>
+			</view>
+			<view style="padding:0 0upx 0 20upx;" >
+				<button class="admin-button-com middle blue" @click="downloadTable()">价格表</button>
+			</view>
+		</view>
+
+		<view class="scroll-middle_bx">
+			<scroll-view scroll-y scroll-with-animation class="tab-view" :scroll-top="scrollTop">
+				<div v-for="(item, index) in globalClassItemList" :key="index" class="tab-bar-item" :class="[classIndex == index ? 'active' : '']" :data-current="index" @tap.stop="swichClass(index)">
+					<text>{{ item.className || "" }}</text>
+				</div>
+			</scroll-view>
+				<scroll-view scroll-y class="right-box" 
+					:scroll-into-view="scroll_into_view" 
+					scroll-with-animation="true"
+					@scroll="scroll_detail"
+					lower-threshold="100"
+					@scrolltolower="scroll_bottom">
+
+				<block v-if="!$util.isEmpty(globalClassItemList)">
+					<view class="item_list_bx selectAll" v-for="(classItem, classIndex) in globalClassItemList" :key="classIndex" :id="`class_${classIndex}`">
+						<view class="item_list_title"> {{ classItem.className }}</view>
+
+						<view v-if="classItem.child && !$util.isEmpty(classItem.child)">
+
+							<template v-for="(productItem, productIndex) in classItem.child">
+								<view style="height:230upx" :id="`class_${classIndex}`" :key="productIndex">
+									<ItemComponent v-if="classItem.isActive" :isPrice="false" :info="productItem" @checkItem="checkItemEvent"></ItemComponent>
+								</view>
+							</template>
+
+						</view>
+						<view v-else>
+							<view style="height:260upx;text-align:center;color:#CCCCCC;position: relative;">
+								<view style="position: absolute;margin:auto;top:130upx;left:0;right:0;bottom:0;">暂无花材</view>
+							</view>
+						</view>
+
+					</view>
+				</block>
+				<block v-else>
+					<view style="width: 100%">
+						<app-wrapper-empty  title="加载中..." :is-empty="$util.isEmpty(globalClassItemList)"/>
+					</view>
+				</block>
+
+			</scroll-view>
+		</view>
+
+      <div class="app-footer">
+		<button class="admin-button-com big blue" @click="enableSelect()">启用所选</button>
+		<button class="admin-button-com big blue" @click="removeSelect()">删除所选</button>
+      </div>
+
+		<uni-popup ref="selectFlowerNumRef" background-color="#fff" type="center" :animation="false" class="class-popup-style">
+			<view style="display:flex;padding:20upx;height:auto;justify-content: space-between;align-items:center;flex-wrap:wrap;max-height:100vh;overflow:auto;">
+
+				<view v-for="(item, index) in globalClassItemList" :key="index" @tap.stop="changeClass(index)" style="margin-bottom:20upx;margin-left:3upx;">
+				<image :src="item.classCover" style="width:120upx;height:120upx;border-radius:10upx;"></image>
+				<view style="margin-top:5upx;overflow: hidden;white-space: nowrap;width:120upx;text-align:center;">{{item.className}}</view>
+				</view>
+
+			</view>
+		</uni-popup>
+
+		<image v-if="showClassRemind" @click="hideClassRemind" style="position:absolute;width:610upx;height:699upx;top:225upx;left:80upx;z-index:9999;" :src="`${constant.imgUrl}/class_remind.png`"></image>
+
+	</view>
+</view>
+</template>
+<script>
+import AppSearchModule from "@/components/module/app-search";
+import AppWrapperEmpty from "@/components/app-wrapper-empty";
+import ItemComponent from "./components/stopItem";
+import productMins from "@/mixins/product";
+import { mapGetters } from "vuex";
+import { batchRemove,batchEnable } from "@/api/item";
+export default {
+	name: "stopList",
+	components: {
+		AppSearchModule,
+		AppWrapperEmpty,
+		ItemComponent
+	},
+	mixins: [productMins],
+	data() {
+		return {
+			autoLoad: false,
+			selectJobType: "stock",
+			tabIndex: 0,
+			priceArr:[],
+			showClassRemind:false,
+			currentList:[]
+		};
+	},
+	computed:{
+		...mapGetters(["getMyShopInfo","getLoginInfo"]),
+	},
+	onLoad() {
+		this.initProduct()
+	},
+	methods: {
+		enableSelect(){
+			let that = this
+			if(this.$util.isEmpty(this.currentList)){
+				this.$msg('请选择花材')
+				return false
+			}
+			this.$util.confirmModal({content:'确认启用所选花材?'},() => {
+				batchEnable({ids:JSON.stringify(that.currentList)}).then(res=>{
+					if(res.code == 1){
+						that.$msg(res.msg)
+					}
+				})
+			})
+		},
+		removeSelect(){
+			let that = this
+			if(this.$util.isEmpty(this.currentList)){
+				this.$msg('请选择花材')
+				return false
+			}
+			this.$util.confirmModal({content:'确认删除所选花材?'},() => {
+				batchRemove({ids:JSON.stringify(that.currentList)}).then(res=>{
+					if(res.code == 1){
+						that.$msg(res.msg)
+					}
+				})
+			})
+		},
+		checkItemEvent(item,check) {
+			let id = item.id
+			if(check == true){
+				const index = this.currentList.indexOf(id);
+				if (index == -1) {
+					this.currentList.push(id)
+				}
+			}else{
+				const index = this.currentList.indexOf(id);
+				if (index > -1) {
+					this.currentList.splice(index, 1)
+				}
+			}
+		},
+		changeClass(index){
+			this.$refs.selectFlowerNumRef.close()
+			this.swichClass(index)
+		},
+		initProduct(){
+			this.initData({ requestType:'stopList'})
+		},
+		selectFlowerNumFn(){
+			this.$refs.selectFlowerNumRef.open('top')
+		}
+	}
+};
+</script>
+
+<style lang="scss" scoped>
+.billing_box_bg {
+	height: 100%;
+	background: white;
+	display: flex;
+	background:white;
+	flex-direction: column;
+	.input-wrap {
+		display: flex;
+		padding: 22upx 20upx 22upx 13upx;
+		.search-bar {
+			flex: 1;
+		}
+		.city-select {
+			display: flex;
+			flex-shrink: 0;
+			align-items: center;
+			margin-right: 15upx;
+			margin-left: 45upx;
+			background-color: #ffff;
+			.iconfont {
+				margin-left: 20upx;
+				font-size: 30upx;
+			}
+		}
+	}
+	.scroll-middle_bx {
+		flex: 1;
+		display: flex;
+		width: 100%;
+		height: 100%;
+		overflow: hidden;
+	}
+	.tab-view {
+		height: calc(100vh - 140upx);
+		width: 170upx;
+		flex-shrink: 0;
+		background-color: #f0f2f6;
+		.tab-bar-item {
+			position: relative;
+			width: 170upx;
+			height: 90upx;
+			box-sizing: border-box;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			font-size: 26upx;
+			color: #444;
+			font-weight: 400;
+			.tag {
+				display: flex;
+				padding: 0 20upx;
+				align-items: center;
+				position: absolute;
+				right: 0;
+				top: 0;
+				height: 32upx;
+				background: #ff2842;
+				border-radius: 16upx;
+				color: #fff;
+				font-size: 20upx;
+			}
+      &:last-child{
+        margin-bottom: 110upx;
+      }
+		}
+
+		.active {
+			position: relative;
+			color: $mainColor;
+			font-size: 26upx;
+			background: #fff;
+		}
+
+		.active::before {
+			content: "";
+			position: absolute;
+			border-left: 8upx solid $mainColor;
+			height: 100%;
+			left: 0;
+		}
+	}
+	.right-box {
+		height: calc(100vh - 200upx);
+		flex: 1;
+		box-sizing: border-box;
+	}
+	.item_list_bx {
+		padding: 40upx 16upx;
+	}
+	.item_list_title {
+		margin-bottom: 20upx;
+		font-size: 24upx;
+		font-weight: 600;
+		color: #666666;
+	}
+	.select-cmd_bx {
+		& .kc {
+			color: #999999;
+			font-size: 28upx;
+			font-weight: 400;
+			margin-bottom: 60upx;
+			text-align: center;
+			margin-top: 10upx;
+		}
+		& .num_bx {
+			display: flex;
+			align-items: center;
+			margin-bottom: 80upx;
+			& > input {
+				width: 212upx;
+				height: 80upx;
+				border: 1upx solid #dddddd;
+				border-radius: 4upx;
+				text-align: center;
+				margin-right: 24upx;
+			}
+		}
+	}
+	.app-footer {
+		justify-content: space-evenly;
+		z-index: 9999;
+		.admin-button-com {
+			width: 40%;
+		}
+		button{
+			width:600upx;
+		}
+	}
+}
+.class-popup-style{
+	z-index:999999;
+}
+</style>

+ 3 - 1
ghsApp/src/admin/home/apply.vue

@@ -36,7 +36,9 @@ export default {
                         {name: "花材",img: `${this.$constant.imgUrl}/ghs/home/hcgl.png`,url: "/admin/item/list"},
                         {name: "分类",img: `${this.$constant.imgUrl}/ghs/home/hcgl.png`,url: "/admin/itemClass/list"},
                         {name: "排序加价",img: `${this.$constant.imgUrl}/ghs/home/hcgl.png`,url: "/admin/itemClass/add"},
-                        {name: "停用花材",img: `${this.$constant.imgUrl}/ghs/home/hcgl.png`,url: "/admin/item/list?delStatus=1"},
+                        {name: "已下架",img: `${this.$constant.imgUrl}/ghs/home/hcgl.png`,url: "/admin/changePrice/outList"},
+                        {name: "已停用",img: `${this.$constant.imgUrl}/ghs/home/hcgl.png`,url: "/admin/changePrice/stopList"},
+                        {name: "已删除",img: `${this.$constant.imgUrl}/ghs/home/hcgl.png`,url: "/admin/changePrice/removeList"}
                     ]
                 },
                 {

+ 16 - 0
ghsApp/src/api/item/index.js

@@ -1,5 +1,21 @@
 import https from '@/plugins/luch-request_0.0.7/request'
 
+export const batchRecover = data => {
+	return https.post('/item/batch-recover', data)
+}
+
+export const batchRemove = data => {
+	return https.post('/item/batch-remove', data)
+}
+
+export const batchEnable = data => {
+	return https.post('/item/batch-enable', data)
+}
+
+export const batchStopItem = data => {
+	return https.post('/item/batch-stop', data)
+}
+
 export const getSkPoster = data => {
 	return https.get('/item/get-sk-poster', data)
 }

+ 4 - 1
ghsApp/src/pages.json

@@ -114,7 +114,10 @@
 			"pages": [
 				{"path": "list","style": {"navigationBarTitleText": "改价"}},
 				{"path": "changeList","style": {"navigationBarTitleText": "价格变动记录"}},
-				{"path": "costChangeList","style": {"navigationBarTitleText": "成本变动记录"}}
+				{"path": "costChangeList","style": {"navigationBarTitleText": "成本变动记录"}},
+				{"path": "outList","style": {"navigationBarTitleText": "已下架"}},
+				{"path": "stopList","style": {"navigationBarTitleText": "已停用"}},
+				{"path": "removeList","style": {"navigationBarTitleText": "已删除"}}
 			]
 		},
 		{