文字

hdPad/src/pages/home/components/console.vue

@@ -3,7 +3,7 @@
 	<view class="active" @click="calcFn">{{calc == 'add' ? '+' : '-'}}</view>
 	<!-- <view class="active" @click="resetCustomer">选客</view> -->
 	<view class="active" @click="gatheringFn()">收款</view>
-	<view class="active" @click="changeProperty">{{property==1 ? '花材' : '成品'}}</view>
+	<view class="active" @click="changeProperty">{{property==1 ? '花材' : '商品'}}</view>
 	<view class="active" @click="goSettleCommit">结算 </view>
     <view class="active" @click="toWastage">报损</view>
     <view class="active" @click="clearItemFn">清空</view>
@@ -204,7 +204,7 @@ export default {
 			　　return item.property  == 1
 			})
 			if(hasGoods == true && hasItem == true){
-				this.$msg('成品和花材要分别进行报损')
+				this.$msg('商品和花材要分别进行报损')
 				return false
 			}
 			if(hasItem == true){

hdPad/src/pages/home/components/rightGoods.vue

@@ -3,7 +3,7 @@
         <view class="cat-list-area">
             <view v-for="item in allCategory" :key="item.id" :class="[currentCategory.id===item.id?'active':'']" @click="changeCategory(item)" > {{item.categoryName}} </view>
         </view>
-        <view class="num-area" v-if="currentCategory.flower && currentCategory.flower ==1">
+        <view class="num-area">
             <view v-for="info in flowerNumList" :class="[flowerNum===info.num?'selected':'']" @click="setNum(info)" :key="info.num">{{info.name}}</view>
         </view>
         <scroll-view class="shop-show_box" enable-flex="true" scroll-y="true" lower-threshold="20" @scrolltolower="reachBottom">
@@ -172,7 +172,9 @@ export default {
     display: flex;
     flex-direction: column;
     box-sizing: border-box;
+    align-items: center;
     & .cat-list-area {
+        justify-content:flex-start;
         max-height: 300upx;
         display: flex;
         align-items: center;
@@ -182,9 +184,11 @@ export default {
         & > view {
             border:1px solid #e4e4e4;
             padding: 12upx 0upx;
-            font-size: 15px;
-            min-width: 75upx;
+            font-size: 12px;
+            width: 68upx;
             text-align: center;
+            overflow: hidden;
+            white-space: nowrap;
             &.active {
                 background-color: #428369;
                 color: #ffffff;
@@ -194,17 +198,18 @@ export default {
     & .num-area{
         display: flex;
         flex-wrap: wrap;
-        margin:8upx 0 8upx 0;
+        margin:5upx 0 5upx 0;
+        width:100%;
         justify-content:space-around;
         & > view {
             border:1upx solid #CCCCCC;
-            width:30upx;
+            width:25upx;
             height:25upx;
             border-radius:13upx;
             display:flex;
             justify-content:center;
             align-items: center;
-            font-size:12upx;
+            font-size:11upx;
             color:#666666;
         }
         & .selected{
@@ -223,17 +228,17 @@ export default {
             flex-wrap: wrap;
             overflow-y: scroll;
             overflow-x: hidden;
-            height:90vh;
+            height:70vh;
+            justify-content:space-around;
             & .show-shop_box{
                 & .item-detail{
                     position: relative;
-                    margin-right: 9upx;
                     margin-bottom: 6upx;
-                    width: 82upx;
-                    height: 82upx;
+                    width: 72upx;
+                    height: 72upx;
                     & .img {
-                        width: 82upx;
-                        height: 82upx;
+                        width: 72upx;
+                        height: 72upx;
                     }
                     .shop-info_price {
                         position: absolute;
@@ -242,14 +247,14 @@ export default {
                         width: 100%;
                         font-size: 12upx;
                         color: #ffffff;
-                        height:25upx;
+                        height:22upx;
                         & > view {
-                            font-size: 10upx;
                             & > view:nth-child(1) {
                                 overflow: hidden;
                                 text-overflow:ellipsis;
                                 white-space: nowrap;
                                 width:90%;
+                                font-size: 9upx;
                             }
                             & > view:nth-child(2) {
                                 font-size:8upx;

hdPad/src/pages/home/components/rightItem.vue

@@ -145,7 +145,7 @@ export default {
                     width: 100%;
                     font-size: 12upx;
                     color: #ffffff;
-                    height:25upx;
+                    height:21upx;
                     & > view {
                         & > view:nth-child(1) {
                             overflow: hidden;
@@ -169,7 +169,7 @@ export default {
         flex-wrap: wrap;
         overflow-y: scroll;
         border-bottom:1upx solid #EEEEEE;
-        justify-content:center;
+        justify-content:flex-start;
         padding-bottom:2upx;
         & > view {
             border:1px solid #e4e4e4;