From 9319bd6fd7b7b2b69d5b31233c4b8a13dbd77403 Mon Sep 17 00:00:00 2001
From: wangfukang <15630117759@163.com>
Date: Tue, 23 Apr 2024 11:58:12 +0800
Subject: [PATCH] 11

---
 package1/AI/AIInventoryList.vue   |  33 +++++-
 package1/inventory/gategory.vue   |   4 +-
 package1/other/tutorialDetail.vue | 173 ----------------------------
 package1/other/tutorialList.vue   | 181 ++++--------------------------
 4 files changed, 55 insertions(+), 336 deletions(-)
 delete mode 100644 package1/other/tutorialDetail.vue

diff --git a/package1/AI/AIInventoryList.vue b/package1/AI/AIInventoryList.vue
index a683b76..8ec4da8 100644
--- a/package1/AI/AIInventoryList.vue
+++ b/package1/AI/AIInventoryList.vue
@@ -43,7 +43,10 @@
 					<text class="blink" v-if="item.inStorageStatus==2">识别中...</text>
 					<text style="position: absolute;top: 40rpx;right: 20rpx;" v-if="item.inStorageStatus == 3">识别完成</text>
 					<text style="position: absolute;top: 40rpx;right: 20rpx;" v-if="item.inStorageStatus == 4">识别失败</text>
-					<view class="btn" @tap="montageData(item.id)" v-if="item.inStorageStatus==3">去入库</view>
+					<view class="btn" @tap="montageData(item.id)" v-if="item.inStorageStatus==3">去入库</view>
+					<view @tap="delItem(item.id)" class="btn" style="background:linear-gradient(90deg, #FF9797, #FFC1E0);position: absolute;bottom: 20rpx;" :style="{right:item.inStorageStatus!=3?'20rpx':'160rpx'}">
+						删除
+					</view>
 				</view>
 			</view>
 		</view>
@@ -172,6 +175,34 @@
 				uni.navigateTo({
 					url: '/package1/AI/AIPicture'
 				})
+			},
+			//删除单条入库单
+			delItem(id){
+				let that = this;
+				uni.showModal({
+					title: "提示",
+					content: "确定要删除此条AI识别记录吗？",
+					success: function(res2) {
+						if (res2.confirm) {
+							that.tui.request("/app/purchase/delById", "POST", {
+								id:id
+							}, false, false).then((res) => {
+								if(res.code == 200){
+									that.pageNum = 1
+									that.aiList = []
+									that.getList()
+									setTimeout(res => {
+										that.tui.toast("删除成功")
+									}, 500)
+								}else{
+									that.tui.toast(res.message)
+								}
+							}).catch((res) => {
+								that.tui.toast(res.message)
+							})
+						}
+					}
+				})
 			}
 		}
 	}
diff --git a/package1/inventory/gategory.vue b/package1/inventory/gategory.vue
index b255eb4..1eac875 100644
--- a/package1/inventory/gategory.vue
+++ b/package1/inventory/gategory.vue
@@ -65,7 +65,7 @@
 				<view style="font-size: 36rpx;font-weight: bold;text-align: center;">提示</view>
 				<view v-if="goodsList !=''"
 					style="width:100%;font-weight:bold;text-align: center;font-size: 28rpx;margin: 20rpx 0;">
-					{{goodsList[0].productName}}商品有以下库存，确认继续删除吗？
+					“{{goodsList[0].productName}}”分类下有以下库存，确认继续删除吗？
 				</view>
 				<view class="tui-order-item boxbg">
 					<view style="display: flex;border-bottom: 1px solid #eee;height: 50rpx;line-height: 50rpx;">
@@ -690,7 +690,7 @@
 		padding: 15px;
 		height: 1200rpx;
 		background-color: #fff;
-		margin-bottom: 30rpx;
+		margin-bottom: 100rpx;
 		overflow: scroll;
 	}
 
diff --git a/package1/other/tutorialDetail.vue b/package1/other/tutorialDetail.vue
deleted file mode 100644
index 5ef3177..0000000
--- a/package1/other/tutorialDetail.vue
+++ /dev/null
@@ -1,173 +0,0 @@
-<template>
-	<view>
-		<view class="formBox">
-			<view class="swipe-action">
-				<view class="swipe-action__content" @tap="onItemClick(item)" v-for="(item,index) in dataList" :key="index">
-					<view class="swipe-action__content__left">
-						<view class="swipe-action__content__text">{{item.name}}</view>
-					</view>
-				</view>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				dataList:[{
-					name:'开单',
-					id:'kaidan'
-				},{
-					name:'入库',
-					id:'ruku'
-				},{
-					name:'挂单',
-					id:'guadan'
-				},{
-					name:'推款',
-					id:'tuikuan'
-				},{
-					name:'邀请返佣',
-					id:'fanyong'
-				},{
-					name:'盘点',
-					id:'pandian'
-				},{
-					name:'打卡规则',
-					id:'guize'
-				},{
-					name:'新增商品',
-					id:'xinzengshangpin'
-				}]
-			}
-		},
-		methods: {
-			onItemClick(item) {
-				uni.navigateTo({
-					url: '/package1/other/tutorialDetail?id='+item.id
-				})
-			}
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-	.formBox {
-		.uni-data-select {
-			width: 100%;
-		}
-
-		.tui-order-title {
-			position: relative;
-			font-size: 28upx;
-			line-height: 28upx;
-			padding-left: 16upx;
-			box-sizing: border-box;
-		}
-
-		.tui-order-title::before {
-			content: '';
-			position: absolute;
-			left: 0;
-			top: 0;
-			border-left: 8upx solid $u-primary;
-			height: 120%;
-			border-radius: 4upx;
-		}
-	}
-
-	.tui-tabbar {
-		width: 100%;
-		height: 98rpx;
-		background: #fff;
-		position: fixed;
-		left: 0;
-		bottom: 0;
-		display: flex;
-		align-items: center;
-		justify-content: flex-end;
-		font-size: 26rpx;
-		box-shadow: 0 0 1px rgba(0, 0, 0, .3);
-		padding-bottom: env(safe-area-inset-bottom);
-		z-index: 996;
-	}
-
-	.u-page {
-		padding: 0;
-	}
-
-	.u-demo-block__title {
-		padding: 10px 0 2px 15px;
-	}
-
-	.swipe-action {
-		&__content {
-			background-color: #fff;
-			margin-bottom: 25rpx;
-			padding: 25rpx;
-			display: flex;
-			align-items: center;
-			justify-content: space-between;
-
-			&__left {
-				display: flex;
-				flex-direction: column;
-				align-items: center;
-			}
-
-			&__right {
-				display: flex;
-				align-items: center;
-				flex-basis: 300rpx;
-				justify-content: space-between;
-
-				&__text {
-					color: firebrick;
-				}
-
-				&__money {
-					flex-basis: 100rpx;
-					color: red;
-					text-align: right;
-				}
-			}
-
-			&__text {
-				padding: 12rpx 0;
-				width: 100%;
-			}
-
-			&__time {
-				font-size: 22rpx;
-				color: #3a3a3a;
-			}
-
-			&__icon {
-				flex-basis: 20rpx;
-			}
-		}
-	}
-
-	.edit-info {
-		height: 450 rpx;
-		padding: 25rpx;
-
-		.title {
-			text-align: center;
-			font-size: 32rpx;
-		}
-
-		.info-name {
-			display: flex;
-			align-items: center;
-			margin: 35rpx 0;
-		}
-	}
-</style>
-<style>
-	.u-radio {
-		margin: 15 upx 0;
-	}
-</style>
\ No newline at end of file
diff --git a/package1/other/tutorialList.vue b/package1/other/tutorialList.vue
index 27910bc..543939b 100644
--- a/package1/other/tutorialList.vue
+++ b/package1/other/tutorialList.vue
@@ -1,13 +1,8 @@
 <template>
 	<view>
-		<view class="formBox">
-			<view class="swipe-action">
-				<view class="swipe-action__content" @tap="onItemClick(item)" v-for="(item,index) in dataList" :key="index">
-					<view class="swipe-action__content__left">
-						<view class="swipe-action__content__text">{{item.name}}</view>
-					</view>
-				</view>
-			</view>
+		<view class="text">长按识别二维码，查看教程</view>
+		<view class="img-box">
+			<img show-menu-by-longpress="true" src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/d4d0045fe855414b82916a741e4251cc.jpg" alt="" />
 		</view>
 	</view>
 </template>
@@ -15,161 +10,27 @@
 <script>
 	export default {
 		data() {
-			return {
-				dataList:[{
-					name:'开单',
-					id:'kaidan'
-				},{
-					name:'入库',
-					id:'ruku'
-				},{
-					name:'挂单',
-					id:'guadan'
-				},{
-					name:'推款',
-					id:'tuikuan'
-				},{
-					name:'邀请返佣',
-					id:'fanyong'
-				},{
-					name:'盘点',
-					id:'pandian'
-				}
-				// ,{
-				// 	name:'打卡规则',
-				// 	id:'guize'
-				// }
-				,{
-					name:'新增商品',
-					id:'xinzengshangpin'
-				}]
-			}
+			return {}
 		},
-		methods: {
-			onItemClick(item) {
-				uni.navigateTo({
-					url: '/package1/other/tutorialDetail?id='+item.id
-				})
-			}
-		}
+		methods: {}
 	}
 </script>
 
-<style lang="scss" scoped>
-	.formBox {
-		.uni-data-select {
-			width: 100%;
-		}
-
-		.tui-order-title {
-			position: relative;
-			font-size: 28upx;
-			line-height: 28upx;
-			padding-left: 16upx;
-			box-sizing: border-box;
-		}
-
-		.tui-order-title::before {
-			content: '';
-			position: absolute;
-			left: 0;
-			top: 0;
-			border-left: 8upx solid $u-primary;
-			height: 120%;
-			border-radius: 4upx;
-		}
-	}
-
-	.tui-tabbar {
-		width: 100%;
-		height: 98rpx;
-		background: #fff;
-		position: fixed;
-		left: 0;
-		bottom: 0;
-		display: flex;
-		align-items: center;
-		justify-content: flex-end;
-		font-size: 26rpx;
-		box-shadow: 0 0 1px rgba(0, 0, 0, .3);
-		padding-bottom: env(safe-area-inset-bottom);
-		z-index: 996;
-	}
-
-	.u-page {
-		padding: 0;
-	}
-
-	.u-demo-block__title {
-		padding: 10px 0 2px 15px;
-	}
-
-	.swipe-action {
-		&__content {
-			background-color: #fff;
-			margin-bottom: 25rpx;
-			padding: 25rpx;
-			display: flex;
-			align-items: center;
-			justify-content: space-between;
-
-			&__left {
-				display: flex;
-				flex-direction: column;
-				align-items: center;
-			}
-
-			&__right {
-				display: flex;
-				align-items: center;
-				flex-basis: 300rpx;
-				justify-content: space-between;
-
-				&__text {
-					color: firebrick;
-				}
-
-				&__money {
-					flex-basis: 100rpx;
-					color: red;
-					text-align: right;
-				}
-			}
-
-			&__text {
-				padding: 12rpx 0;
-				width: 100%;
-			}
-
-			&__time {
-				font-size: 22rpx;
-				color: #3a3a3a;
-			}
-
-			&__icon {
-				flex-basis: 20rpx;
-			}
-		}
-	}
-
-	.edit-info {
-		height: 450 rpx;
-		padding: 25rpx;
-
-		.title {
-			text-align: center;
-			font-size: 32rpx;
-		}
-
-		.info-name {
-			display: flex;
-			align-items: center;
-			margin: 35rpx 0;
-		}
-	}
-</style>
-<style>
-	.u-radio {
-		margin: 15 upx 0;
+<style lang="scss">
+	.text{
+		font-size: 40rpx;
+		text-align: center;
+		height: 600rpx;
+		line-height: 600rpx;
+	}
+	.img-box{
+		width: 500rpx;
+		height: 500rpx;
+		margin: 0 auto;
+		img{
+			width: 100%;
+			height: 100%;
+			background-size: 100%;
+		}
 	}
 </style>
\ No newline at end of file