shish 2 лет назад
Родитель
Сommit
b1ae49d964

+ 2 - 2
ghsApp/src/admin/ptItem/components/Item.vue

@@ -15,10 +15,10 @@
 				
 				<text v-if="info.select == 2 && info.is_delete == 1" style="position:absolute;right:7upx;color:#1f1cc0;">恢复</text>
 
-				<text v-if="info.select == 2" style="position:absolute;right:7upx;color:green;">查看</text>
+				<text v-if="info.select == 2 && info.is_delete == 0" style="position:absolute;right:7upx;color:#1f1cc0;">查看</text>
 
 				<text v-if="info.select == 2 && info.is_delete == 1" style="color:red;float:right;margin-right:110upx;">已删除</text>
-				<text v-else-if="info.select == 2" style="color:#1f1cc0;float:right;margin-right:110upx;">使用中</text>
+				<text v-else-if="info.select == 2" style="color:green;float:right;margin-right:110upx;">使用中</text>
 				<text v-else style="color:green;float:right;margin-right:110upx;border:1upx solid green;padding:10upx 10upx 10upx 10upx;border-radius:5upx;">采用</text>
 			</view>
 			<view class="num-open_bx">

+ 2 - 2
ghsApp/src/admin/ptItem/itemList.vue

@@ -9,7 +9,7 @@
 				<button class="admin-button-com middle blue" @click="pageTo({ url: '/admin/item/add',type:2 })">添加新品种</button>
 			</view>
 		</view>
-		<view style="position:fixed;z-index:99999;text-align:center;top:96upx;background-color:white;width:100%;height:60upx;font-size:26upx;">
+		<view style="position:fixed;z-index:99999;text-align:center;top:100upx;background-color:white;width:100%;height:60upx;font-size:26upx;">
 			<view style="display:flex;align-items:center;justify-content:center;margin-top:12upx;">带
 			<image :src="`${constant.imgUrl}/icon/official8.png`" mode="widthFix" 
 				style="width:38upx;height:38upx;display:inline-block;"></image>
@@ -193,7 +193,7 @@ export default {
 		width: 100%;
 		height: 100%;
 		overflow: hidden;
-		margin-top:150upx;
+		margin-top:155upx;
 	}
 	.tab-view {
 		height: 100%;