shish il y a 2 ans
Parent
commit
d1ad34c982

+ 13 - 16
ghsApp/src/admin/item/components/item.vue

@@ -5,11 +5,14 @@
 		<button v-if="Number(info.discountPrice)>0" @click.stop="cancelDiscountFn(info)" class="admin-button-com mini-btn blue" 
 			style="position:absolute;bottom:0upx;font-size:24upx;left:10upx;z-index:20;">取消特价</button>
 
+        <image :src="`${constant.imgUrl}/icon/official8.png`" v-if="info.auth && info.auth == 1" mode="widthFix" class="official"></image>
+
 		<view class="img_bx" @click="pageTo({url: '/admin/item/detail?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 active" @click="pageTo({url: '/admin/item/detail?id='+info.id})">
 			<view class="tit">
@@ -108,6 +111,15 @@ export default {
 	height:160upx;
 	position: relative;
 	margin-bottom: 20upx;
+	.official{
+		z-index:99;
+		position:absolute;
+		top:62upx;
+		right:22upx;
+		width:39upx;
+		height:39upx;
+		display:inline-block;
+	}
 	.img_bx {
 		height: 160upx;
 		width: 160upx;
@@ -134,22 +146,7 @@ export default {
 	.cmd-info_bx {
 		position: relative;
 		padding-left: 177upx;
-		&.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: 52%;
-				margin-top: -12upx;
-				right: 30upx;
-			}
-		}
+
 
 		& .tit {
 			font-size: 30upx;

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

@@ -12,7 +12,11 @@
 			<view class="kc" @click="selectItem(info)">
 				<text style="font-size:28upx;">{{info.className}}</text> 
 				<text style="margin-left:20upx;color:#907a7a;font-size:28upx;font-weight:bold;">{{info.useNum}}家在用</text>
+				
 				<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 == 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:10upx 10upx 10upx 10upx;border-radius:5upx;">采用</text>

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

@@ -1,7 +1,7 @@
 <template>
 <view class="app-content">
 	<view class="billing_box_bg">
-    	<view class="input-wrap" style="position: fixed;z-index:99999;background-color: white;">
+    	<view class="input-wrap" style="position: fixed;z-index:99999;background-color: white;width:100%;">
 			<view class="search-bar">
 				<app-search-module v-model="py" placeholder="搜索要找的花材" @input="searchFnContrapose"/>
 			</view>
@@ -121,7 +121,9 @@ export default {
 				})
 			}else{
 				if(item.select == 2){
-					this.$msg("已导入")
+					this.$util.confirmModal({content:'确认查看?'},() => {
+						this.$util.pageTo({ url: '/admin/item/detail?id='+item.ghs_item_id})
+					})
 					return
 				}
 				this.$util.pageTo({ url: '/admin/item/detail',type:2,query:{ptItemId:item.id}})