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

+ 4 - 3
ghsApp/src/admin/ptItem/components/Item.vue

@@ -15,12 +15,13 @@
 				<text v-if="info.select == 2 && info.is_delete == 1" 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 style="color:green;float:right;margin-right:110upx;border:1upx solid green;padding:4upx 10upx 4upx 10upx;">导入</text>
+				<text v-else style="color:green;float:right;margin-right:110upx;border:1upx solid green;padding:10upx 10upx 10upx 10upx;">采用</text>
 			</view>
 			<view class="num-open_bx">
 				<view class="open-bx warn">
-					<text v-if="info.ratioType == 0">{{info.ratio}}{{info.smallUnit}}/<text @click="changeAuth(info.id)">{{ info.bigUnit }}</text></text>
-					<text v-else>若干{{info.smallUnit}}/<text @click="changeAuth(info.id)">{{ info.bigUnit }}</text></text>
+					<text>编号 {{info.id}}</text>
+					<text style="margin-left:25upx;" v-if="info.ratioType == 0">{{info.ratio}}{{info.smallUnit}}/<text @click="changeAuth(info.id)">{{ info.bigUnit }}</text></text>
+					<text style="margin-left:25upx;" v-else>若干{{info.smallUnit}}/<text @click="changeAuth(info.id)">{{ info.bigUnit }}</text></text>
 				</view>
 			</view>
 		</view>

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

@@ -9,11 +9,11 @@
 				<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:90upx;background-color:white;width:100%;height:20upx;">
-			<view style="margin:0 auto;width:auto;">带
+		<view style="position:fixed;z-index:99999;text-align:center;top:96upx;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:35upx;height:35upx;display:inline-block;"></image>
-				为平台认可品种,请优先采用,使用后可改图</view>
+				style="width:38upx;height:38upx;display:inline-block;"></image>
+				为平台认可品种,请优先采用,用后可改名称</view>
 		</view>
 		<view class="scroll-middle_bx">
 			<block v-if="!$util.isEmpty(globalClassItemListContrapose)">
@@ -191,7 +191,7 @@ export default {
 		width: 100%;
 		height: 100%;
 		overflow: hidden;
-		margin-top:120upx;
+		margin-top:150upx;
 	}
 	.tab-view {
 		height: 100%;