shish 4 жил өмнө
parent
commit
ca0359424f

+ 1 - 1
ghsApp/src/admin/item/components/ItemStock.vue

@@ -88,7 +88,7 @@ export default {
 	border:2upx solid #cccccc;
 	font-size:22upx;
 	border-radius: 20upx;
-	padding:6upx 22upx 6upx 22upx;
+	padding:10upx 22upx 10upx 22upx;
 	margin:0 15upx 0 0;
 	float:right;
 	color:#aaa9a9;

+ 10 - 4
ghsApp/src/admin/item/list.vue

@@ -24,7 +24,7 @@
 							<view class="item_list_title"> {{ classItem.className }}</view>
 							<view v-if="classItem.child && !$util.isEmpty(classItem.child)">
 								<template v-for="(productItem, productIndex) in classItem.child">
-									<view style="height:240upx" :id="`class_${classIndex}`" :key="productIndex">
+									<view style="height:250upx" :id="`class_${classIndex}`" :key="productIndex">
 										<ItemStock v-if="classItem.isActive" :isPrice="false" :info="productItem" @goToProduct="goToProduct" @moreToDo="moreToDo" @doPrintLabel="doPrintLabel" ></ItemStock>
 									</view>
 								</template>
@@ -179,7 +179,7 @@ export default {
 		},
 		moreToDo(item){
 			let that=this;
-			let doList = ['复制花材', '销售记录','下架','上架']
+			let doList = ['复制花材','颜色管理', '销售记录','下架','上架']
 			uni.showActionSheet({
 				itemList: doList,
 				success: function (respond) {
@@ -187,8 +187,14 @@ export default {
 					if (index == 0) {
 						that.pageTo({url: '/admin/item/copy',query: {id: item.id}})
 					} else if (index == 1) {
-						that.pageTo({url: "/admin/order/itemOrder?id="+item.id})
+						if(item.variety == 0){
+							that.$msg('没有开启颜色管理')
+							return false
+						}
+						that.pageTo({url: "/admin/item/xjSelect?itemId="+item.id})
 					} else if (index == 2) {
+						that.pageTo({url: "/admin/order/itemOrder?id="+item.id})
+					} else if (index == 3) {
 						that.$util.confirmModal({content:'确认下架?'},() => {
 							statusUpdate({id:item.id,status:2}).then(res=>{
 								if(res.code == 1){
@@ -196,7 +202,7 @@ export default {
 								}
 							})
 						})
-					} else if (index == 3) {
+					} else if (index == 4) {
 						that.$util.confirmModal({content:'确认上架?'},() => {
 							statusUpdate({id:item.id,status:1}).then(res=>{
 								if(res.code == 1){

+ 1 - 1
ghsApp/src/admin/item/xjSelect.vue

@@ -23,7 +23,7 @@
 	</view>
 
 	<view style="text-align:center;border-top:1upx dashed #cccccc;padding-top:30upx;padding-bottom:30upx;">
-		<button @click="clearXj" class="admin-button-com small default">清空全部</button>
+		<button @click="clearXj" class="admin-button-com middle default">清空全部</button>
 	</view>
 
 	<view class="billing_box_bg">