shish 1 年間 前
コミット
07480751aa
2 ファイル変更126 行追加83 行削除
  1. 26 17
      hdApp/src/admin/item/components/item2.vue
  2. 100 66
      hdApp/src/admin/item/list2.vue

+ 26 - 17
hdApp/src/admin/item/components/item2.vue

@@ -58,11 +58,15 @@
 			</view>
 		</view>
 	</view>
-	<text class="bottom-button" @click.stop="moreAction(info)">更多</text>
-	<text class="bottom-button" @click.stop="goToStockDetail(info)">库明细</text>
-	<text class="bottom-button" @click.stop="hideChangeFn(info)">{{ frontHide == 0 ? '隐藏' : '显示' }}</text>
-	<text class="bottom-button" @click.stop="doPrintLabel(info,0)">标签</text>
-	<text class="bottom-button" @click.stop="doPrintLabel(info,1)">价码</text>
+	
+	<view class="bottom-buttons-container">
+		<text class="bottom-button" @click.stop="doPrintLabel(info,1)">价码</text>
+		<text class="bottom-button" @click.stop="doPrintLabel(info,0)">标签</text>
+		<text class="bottom-button" @click.stop="hideChangeFn(info)">{{ frontHide == 0 ? '隐藏' : '显示' }}</text>
+		<text class="bottom-button" @click.stop="goToStockDetail(info)">库存明细</text>
+		<text class="bottom-button" @click.stop="moreAction(info)">更多</text>
+	</view>
+
 </view>
 </template>
 <script>
@@ -126,15 +130,28 @@ export default {
 .product{
 	height:230upx;
 }
+.bottom-buttons-container{
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+	width: 100%;
+	flex-wrap: nowrap;
+}
 .bottom-button{
 	font-weight:normal;
 	border:2upx solid #cccccc;
-	font-size:24upx;
+	font-size:22upx;
 	border-radius: 20upx;
-	padding:13upx 22upx 13upx 22upx;
-	margin:0 8upx 0 0;
-	float:right;
+	padding:14upx 16upx;
 	color:#aaa9a9;
+	flex: 1;
+	text-align: center;
+	margin: 0 4upx;
+	white-space: nowrap;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	box-sizing: border-box;
 }
 .item-cmd_bx {
 	height:160upx;
@@ -211,11 +228,6 @@ export default {
 		& .num-open_bx {
 			display: flex;
 			align-items: center;
-			& .price {
-				font-size: 28upx;
-				color: #999999;
-				flex: 1;
-			}
 			& .open-bx {
 				font-size:23upx;
 				color:#333333;
@@ -229,9 +241,6 @@ export default {
 				text:nth-child(2){
 					font-weight:normal;
 				}
-				*.warn {
-					color: $redColor;
-				}
 			}
 		}
 	}

+ 100 - 66
hdApp/src/admin/item/list2.vue

@@ -104,24 +104,52 @@
 		</uni-popup>
 
 		<uni-popup ref="rightShowMore" background-color="#fff" type="center" :animation="true" class="class-popup-style">
-			<view style="display:flex;width:100vw;padding:20upx 20upx 40upx 20upx;height:auto;justify-content: space-between;align-items:center;flex-wrap:wrap;max-height:100vh;overflow:auto;">
-				<view style="width:100vw;"><button @click="costChange()">成本变动记录</button></view>
-				<view style="width:100vw;margin-top:8upx;"><button @click="priceChange()">价格变动记录</button></view>
-				<!-- <view style="width:100vw;margin-top:8upx;"><button @click="varietyManage()">多颜色</button></view> -->
-				<view style="width:100vw;margin-top:8upx;"><button @click="copyCreate()">复制新建</button></view>
-				<!-- <view style="width:100vw;margin-top:8upx;"><button @click="moveToLose()">挪到处理区</button></view> -->
-				<!-- <view style="width:100vw;margin-top:8upx;"><button @click="shareItem()">打开分享(批发)</button></view> -->
-				<!-- <view style="width:100vw;margin-top:8upx;"><button @click="getHdPosterFn()">分享海报(批发)</button></view> -->
-				<view style="width:100vw;margin-top:8upx;"><button @click="getSkPosterFn()">分享海报</button></view>
-				<view style="width:100vw;margin-top:8upx;"><button @click="orderRecord()">下单记录</button></view>
-				<!-- <view style="width:100vw;margin-top:8upx;"><button @click="onStockChange()">路上库存变动</button></view> -->
-				<!-- <view style="width:100vw;margin-top:8upx;"><button @click="ptAuth()">申请平台认证</button></view> -->
-				<!-- <view style="width:100vw;margin-top:8upx;"><button @click="preSell()">预售</button></view> -->
-				<view style="width:100vw;margin-top:8upx;"><button @click="doWaste()">报损</button></view>
-				<view style="width:100vw;margin-top:8upx;"><button @click="doPart()">拆散</button></view>
-				<view style="width:100vw;margin-top:8upx;"><button @click="delItem()">删除</button></view>
-				<!-- <view style="width:100vw;margin-top:8upx;"><button @click="sendStock()">分配库存</button></view> -->
-				<view style="width:100vw;margin-top:30upx;"><button @click="closeRightShow()">取消</button></view>
+			<view class="action-popup-container">
+				<view class="action-button-item">
+					<button class="action-button" @click="costChange()">成本变动记录</button>
+				</view>
+				<view class="action-button-item">
+					<button class="action-button" @click="priceChange()">价格变动记录</button>
+				</view>
+				<view class="action-button-item">
+					<button class="action-button" @click="varietyManage()">多颜色</button>
+				</view>
+				<view class="action-button-item">
+					<button class="action-button" @click="copyCreate()">复制新建</button>
+				</view>
+				<view class="action-button-item">
+					<button class="action-button" @click="moveToLose()">挪到处理区</button>
+				</view>
+				<view class="action-button-item">
+					<button class="action-button" @click="shareItem()">打开分享</button>
+				</view>
+				<view class="action-button-item">
+					<button class="action-button" @click="getHdPosterFn()">生成海报</button>
+				</view>
+				<view class="action-button-item">
+					<button class="action-button" @click="orderRecord()">下单记录</button>
+				</view>
+				<view class="action-button-item">
+					<button class="action-button" @click="onStockChange()">路上库存变动</button>
+				</view>
+				<view class="action-button-item">
+					<button class="action-button" @click="preSell()">预售</button>
+				</view>
+				<view class="action-button-item">
+					<button class="action-button" @click="doWaste()">报损</button>
+				</view>
+				<view class="action-button-item">
+					<button class="action-button" @click="doPart()">拆散</button>
+				</view>
+				<view class="action-button-item">
+					<button class="action-button" @click="delItem()">删除</button>
+				</view>
+				<view class="action-button-item">
+					<button class="action-button" @click="sendStock()">分配库存</button>
+				</view>
+				<view class="action-button-item cancel">
+					<button class="action-button cancel" @click="closeRightShow()">取消</button>
+				</view>
 			</view>
 		</uni-popup>
 
@@ -613,18 +641,6 @@ export default {
 		.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;
@@ -649,19 +665,6 @@ export default {
 			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;
       }
@@ -696,31 +699,62 @@ export default {
 		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;
-			}
-		}
-	}
 }
 .class-popup-style{
 	z-index:999999;
 }
+
+.action-popup-container {
+	display: grid;
+	grid-template-columns: 1fr 1fr;
+	gap: 24upx;
+	padding: 50upx 40upx 60upx 40upx;
+	max-height: 99vh;
+	overflow-y: auto;
+	width: 92vw;
+	max-width: 650upx;
+	margin: 0 auto;
+}
+
+.action-button-item {
+	&.cancel {
+		grid-column: 1 / -1;
+		margin-top: 30upx;
+	}
+}
+
+.action-button {
+	width: 100%;
+	height: 120upx;
+	border: 2upx solid #d0d7de;
+	border-radius: 16upx;
+	background: #ffffff;
+	color: #24292f;
+	font-size: 34upx;
+	font-weight: 600;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	box-shadow: 0 4upx 12upx rgba(0, 0, 0, 0.1);
+	transition: all 0.15s ease;
+	line-height: 1.2;
+	
+	&:active {
+		background: #f6f8fa;
+		transform: scale(0.96);
+		border-color: #8c959f;
+	}
+	
+	&.cancel {
+		background: #f6f8fa;
+		color: #656d76;
+		border-color: #d0d7de;
+		font-size: 32upx;
+		
+		&:active {
+			background: #eaeef2;
+			border-color: #8c959f;
+		}
+	}
+}
 </style>