shish %!s(int64=4) %!d(string=hai) anos
pai
achega
25bc32dc74

+ 4 - 4
ghsPad/src/admin/home/components/rightItem.vue

@@ -1,10 +1,10 @@
 <template>
-<view class="item-detail" @click="showAddModelFn(item)">
-    <image class="img" :src="item.cover" mode="scaleToFill" ></image>
+<view class="item-detail" @click="showAddModelFn(info)">
+    <image class="img" :src="info.cover" mode="scaleToFill" ></image>
     <view class="shop-info_price">
         <view>
-            <view>{{item.name}}</view>
-            <view>¥{{parseFloat(item.price)}}</view>
+            <view>{{info.name}}</view>
+            <view>¥{{parseFloat(info.price)}}</view>
         </view>
     </view>
 </view>

+ 11 - 3
ghsPad/src/admin/home/components/rightItemArea.vue

@@ -5,19 +5,26 @@
         </view>
         <view class="shop-show_box">
             <view v-for="item in currenTypeShopList" :key="item.id" class="show-shop_box">
-                <rightItemComponent :info="item"></rightItemComponent>
+                <rightItemComponent @showAddModelFn="showAddModelFn" :info="item"></rightItemComponent>
             </view>
         </view>
         <slot name="footer"></slot>
+
+        <!-- 开单选花材输入数量和金额 -->
+        <uni-popup ref="kdSelectNumPriceRef" background-color="#fff" type="center" :animation="false">
+            <kdSelectNumPrice @enterNum="confirmAddItemModel" :selectItem.sync="selectItem" @cancelKdSelectNumPrice="addItemModelHidden"></kdSelectNumPrice>
+        </uni-popup>
+
     </view>
 </template>
 <script>
 import settlePop from './settle-pop.vue'
 import rightItemComponent from './rightItem.vue'
 import { showClass,showList } from '@/api/home/index'
+import kdSelectNumPrice from '@/components/app-kd-select-num-price.vue'
 export default {
     name:'rightItemArea',
-    components:{ settlePop,rightItemComponent },
+    components:{ settlePop,rightItemComponent,kdSelectNumPrice },
     data(){
         return {
             shopListType:[],
@@ -36,7 +43,8 @@ export default {
     },
     methods:{
 		showAddModelFn(item) {
-			this.$emit("showAddModelFn", { ...item, bigCount: 1, smallCount: '', userPrice: item.price})
+            this.$refs.kdSelectNumPriceRef.open('center')
+			//this.$emit("showAddModelFn", { ...item, bigCount: 1, smallCount: '', userPrice: item.price})
 		},
         async init(){
             let { data } =  await showClass()

+ 2 - 33
ghsPad/src/admin/home/workbench.vue

@@ -50,10 +50,6 @@
 			<uni-popup ref="selectUserRef" background-color="#fff" type="center" :animation="false">
 				<selectUser @selectUser="selectUserReturn" @cancelSelectUser="cancelSelectUser"> </selectUser>
 			</uni-popup>
-			<!-- 开单选花材输入数量和金额 -->
-			<uni-popup ref="kdSelectNumPriceRef" background-color="#fff" type="center" :animation="false">
-				<kdSelectNumPrice @enterNum="confirmAddItemModel" :selectItem.sync="selectItem" @cancelKdSelectNumPrice="addItemModelHidden"></kdSelectNumPrice>
-			</uni-popup>
 			<!-- 结算弹框 isShowSettle -->
 			<uni-popup ref="settlePopRef" background-color="#fff" type="center" :animation="false">
 				<settlePop @settleReturn="settleReturn" ref="settlePop" :totalShop="totalShop"></settlePop>
@@ -77,7 +73,6 @@
 import { mapGetters,mapActions } from "vuex";
 import productMins from "@/mixins/product";
 import autoUpdateMixins from "@/mixins/autoUpdate";
-import kdSelectNumPrice from '@/components/app-kd-select-num-price.vue'
 import settlePop from './components/settle-pop.vue'
 import selectUser from './components/select-user.vue'
 import rightItemArea from './components/rightItemArea.vue'
@@ -86,7 +81,7 @@ import loginComponent from './login.vue'
 import { createCreateOrder, wastageCreateOrder } from '@/api/home/index'
 export default {
 	name: "workbench",
-	components: { selectUser, rightItemArea, kdSelectNumPrice, settlePop, selectPayWay,loginComponent },
+	components: { selectUser, rightItemArea,  settlePop, selectPayWay,loginComponent },
 	mixins: [productMins,autoUpdateMixins],
 	data() {
 		return {
@@ -250,32 +245,6 @@ export default {
 	& .all-item-area {
 		flex: 63;
 		height: 100%;
-		& .show-footer_box {
-			height: 40upx;
-			display: flex;
-			background:red;
-			width:150upx;
-			align-items: center;
-			justify-content: flex-end;
-			& > view {
-				height: 40upx;
-				padding: 5upx 25upx;
-				border-radius: 5upx;
-				font-size: 14upx;
-				margin: 0 10upx;
-				vertical-align: middle;
-				display: flex;
-				align-items: center;
-				&.btn-breakage {
-					background-color: #da9f5a;
-					color: #ffffff;
-				}
-				&.btn-account {
-					background-color: #009966;
-					color: #ffffff;
-				}
-			}
-		}
 	}
 	& .nav-left {
 		height: 100%;
@@ -291,7 +260,7 @@ export default {
 		}
 	}
 	& .itemList-box {
-			flex: 25;
+		flex: 25;
 		height: 100%;
 		display: flex;
 		flex-direction: column;