花材展示优化

hdApp/src/admin/billing/customerPlace.vue

@@ -374,9 +374,9 @@ export default {
 	}
 	.item_list_title {
 		margin-bottom: 20upx;
-		font-size: 24upx;
-		font-weight: 600;
-		color: #666666;
+		font-size: 30upx;
+		font-weight: bold;
+		color: #067a40;
 	}
 	.select-cmd_bx {
 		& .kc {

hdApp/src/admin/billing/goods.vue

@@ -404,9 +404,9 @@ export default {
 	}
 	.item_list_title {
 		margin-bottom: 20upx;
-		font-size: 24upx;
-		font-weight: 600;
-		color: #666666;
+		font-size: 30upx;
+		font-weight: bold;
+		color: #067a40;
 	}
 	.select-cmd_bx {
 		& .kc {

hdApp/src/admin/billing/hs.vue

@@ -285,9 +285,9 @@ export default {
 	}
 	.item_list_title {
 		margin-bottom: 20upx;
-		font-size: 24upx;
-		font-weight: 600;
-		color: #666666;
+		font-size: 30upx;
+		font-weight: bold;
+		color: #067a40;
 	}
 	.select-cmd_bx {
 		& .kc {

hdApp/src/admin/billing/index.vue

@@ -274,9 +274,9 @@ export default {
 	}
 	.item_list_title {
 		margin-bottom: 20upx;
-		font-size: 24upx;
-		font-weight: 600;
-		color: #666666;
+		font-size: 30upx;
+		font-weight: bold;
+		color: #067a40;
 	}
 	.select-cmd_bx {
 		& .kc {

hdApp/src/admin/billing/index2.vue

@@ -330,9 +330,9 @@ export default {
 	}
 	.item_list_title {
 		margin-bottom: 20upx;
-		font-size: 24upx;
-		font-weight: 600;
-		color: #666666;
+		font-size: 30upx;
+		font-weight: bold;
+		color: #067a40;
 	}
 	.select-cmd_bx {
 		& .kc {

hdApp/src/admin/billing/priceChange.vue

@@ -135,10 +135,10 @@ export default {
     }
   }
   .item_list_title {
-    margin-bottom: 20upx;
-    font-size: 24upx;
-    font-weight: 600;
-    color: #666666;
+		margin-bottom: 20upx;
+		font-size: 30upx;
+		font-weight: bold;
+		color: #067a40;
   }
   .select-cmd_bx {
     & .kc {

hdApp/src/admin/billing/train.vue

@@ -447,9 +447,9 @@ export default {
 	}
 	.item_list_title {
 		margin-bottom: 20upx;
-		font-size: 24upx;
-		font-weight: 600;
-		color: #666666;
+		font-size: 30upx;
+		font-weight: bold;
+		color: #067a40;
 	}
 	.select-cmd_bx {
 		& .kc {

hdApp/src/admin/breakage/index.vue

@@ -241,9 +241,9 @@ export default {
 	}
 	.item_list_title {
 		margin-bottom: 20upx;
-		font-size: 24upx;
-		font-weight: 600;
-		color: #666666;
+		font-size: 30upx;
+		font-weight: bold;
+		color: #067a40;
 	}
 	.select-cmd_bx {
 		& .kc {

hdApp/src/admin/changePrice/list.vue

@@ -296,9 +296,9 @@ export default {
 	}
 	.item_list_title {
 		margin-bottom: 20upx;
-		font-size: 24upx;
-		font-weight: 600;
-		color: #666666;
+		font-size: 30upx;
+		font-weight: bold;
+		color: #067a40;
 	}
 	.select-cmd_bx {
 		& .kc {

hdApp/src/admin/changePrice/list2.vue

@@ -345,9 +345,9 @@ export default {
 	}
 	.item_list_title {
 		margin-bottom: 20upx;
-		font-size: 24upx;
-		font-weight: 600;
-		color: #666666;
+		font-size: 30upx;
+		font-weight: bold;
+		color: #067a40;
 	}
 	.select-cmd_bx {
 		& .kc {

hdApp/src/admin/goods/selectItem.vue

@@ -219,9 +219,9 @@ export default {
 	}
 	.item_list_title {
 		margin-bottom: 20upx;
-		font-size: 24upx;
-		font-weight: 600;
-		color: #666666;
+		font-size: 30upx;
+		font-weight: bold;
+		color: #067a40;
 	}
 	.select-cmd_bx {
 		& .kc {

hdApp/src/admin/home/workbench.vue

@@ -232,7 +232,7 @@
               <view class="icon-wrapper">
                 <image class="icon-image" :src="`${constant.hostUrl}/image/ghs/home/kcyjs2.png`" mode="aspectFit"></image>
               </view>
-              <view class="icon-text">损耗</view>
+              <view class="icon-text">报损</view>
             </view>
             <view class="icon-item" @click="goPage({url: '/admin/itemClass/list'})">
               <view class="icon-wrapper">

hdApp/src/admin/item/list.vue

@@ -396,9 +396,9 @@ export default {
 	}
 	.item_list_title {
 		margin-bottom: 20upx;
-		font-size: 24upx;
-		font-weight: 600;
-		color: #666666;
+		font-size: 30upx;
+		font-weight: bold;
+		color: #067a40;
 	}
 	.select-cmd_bx {
 		& .kc {

hdApp/src/admin/item/list2.vue

@@ -709,9 +709,9 @@ export default {
 	}
 	.item_list_title {
 		margin-bottom: 20upx;
-		font-size: 24upx;
-		font-weight: 600;
-		color: #666666;
+		font-size: 30upx;
+		font-weight: bold;
+		color: #067a40;
 	}
 }
 .class-popup-style{

hdApp/src/admin/item/xj.vue

@@ -241,9 +241,9 @@ export default {
 	}
 	.item_list_title {
 		margin-bottom: 20upx;
-		font-size: 24upx;
-		font-weight: 600;
-		color: #666666;
+		font-size: 30upx;
+		font-weight: bold;
+		color: #067a40;
 	}
 	.select-cmd_bx {
 		& .kc {

hdApp/src/admin/item/xjSelect.vue

@@ -270,9 +270,9 @@ export default {
 	}
 	.item_list_title {
 		margin-bottom: 20upx;
-		font-size: 24upx;
-		font-weight: 600;
-		color: #666666;
+		font-size: 30upx;
+		font-weight: bold;
+		color: #067a40;
 	}
 	.select-cmd_bx {
 		& .kc {

hdApp/src/admin/part/index.vue

@@ -241,9 +241,9 @@ export default {
 	}
 	.item_list_title {
 		margin-bottom: 20upx;
-		font-size: 24upx;
-		font-weight: 600;
-		color: #666666;
+		font-size: 30upx;
+		font-weight: bold;
+		color: #067a40;
 	}
 	.select-cmd_bx {
 		& .kc {

hdApp/src/admin/ptItem/itemList.vue

@@ -254,9 +254,9 @@ export default {
 	}
 	.item_list_title {
 		margin-bottom: 20upx;
-		font-size: 24upx;
-		font-weight: 600;
-		color: #666666;
+		font-size: 30upx;
+		font-weight: bold;
+		color: #067a40;
 	}
 	.select-cmd_bx {
 		& .kc {

hdApp/src/mixins/product2.js

@@ -40,7 +40,8 @@ export default {
 			globalScrollTopOldPlace:0,
 			globalIsRequesting:false,
 			globalCgMyCharge:0,
-			globalLookStock:0
+			globalLookStock:0,
+			globalDefaultClassId:0
 		};
 	},
 	onLoad(options) {
@@ -146,6 +147,7 @@ export default {
 				if(res.code == 1){
 					that.globalClassData = res.data.class ? res.data.class : []
 					that.globalClassDataIndex = res.data.classIndex ? res.data.classIndex : []
+					that.globalDefaultClassId = res.data.defaultClassId?res.data.defaultClassId:0
 					if(that.globalClassData[0]){
 						that.globalClassId = that.globalClassData[0].id
 						//保存到仓库
@@ -183,10 +185,24 @@ export default {
 				}
 			})
         },
-		sorts_fun(arr) {
+		sorts_fun(arr, lastValue = null) {
 			return function(a, b) {
 				var v1 = a[arr];
 				var v2 = b[arr];
+				
+				// 如果两个都是要排到最后的值
+				if (v1 === lastValue && v2 === lastValue) {
+					return 0;
+				}
+				// 如果 a 是要排到最后的值，就排后面
+				if (v1 === lastValue) {
+					return 1;
+				}
+				// 如果 b 是要排到最后的值，就排后面
+				if (v2 === lastValue) {
+					return -1;
+				}
+				// 其他情况正常升序排列
 				return v1 - v2;
 			}
 		},
@@ -204,7 +220,7 @@ export default {
 			//修改数据需要复制一份，否则不会生效
 			that.globalItemData = copyObject(that.globalItemData);
 
-			that.globalItemData = that.globalItemData.sort(this.sorts_fun('classId'))
+			that.globalItemData = that.globalItemData.sort(this.sorts_fun('classId',that.globalDefaultClassId))
 			let hasExists = []
 			for (let i=0;i<that.globalItemData.length;i++){
 				let currentProduct = that.globalItemData[i]

hdApp/src/pages.json

@@ -65,7 +65,7 @@
 		{
 			"root": "admin/breakage",
 			"pages": [
-				{"path": "list","style": {"navigationBarTitleText": "损耗记录","enablePullDownRefresh": true}},
+				{"path": "list","style": {"navigationBarTitleText": "报损记录","enablePullDownRefresh": true}},
 				{"path": "info","style": {"navigationBarTitleText": "详情"}},
 				{"path": "index","style": {"navigationBarTitleText": "选择花材"}},
 				{"path": "confirm","style": {"navigationBarTitleText": "确认订单"}},

hdApp/src/pagesOrder/select.vue

@@ -338,9 +338,9 @@ export default {
 	}
 	.item_list_title {
 		margin-bottom: 20upx;
-		font-size: 24upx;
-		font-weight: 600;
-		color: #666666;
+		font-size: 30upx;
+		font-weight: bold;
+		color: #067a40;
 	}
 	.select-cmd_bx {
 		& .kc {

hdApp/src/pagesPurchase/add.vue

@@ -364,9 +364,9 @@ export default {
 	}
 	.item_list_title {
 		margin-bottom: 20upx;
-		font-size: 24upx;
-		font-weight: 600;
-		color: #666666;
+		font-size: 30upx;
+		font-weight: bold;
+		color: #067a40;
 	}
 	.select-view {
 		margin-bottom: 30upx;

hdApp/src/pagesPurchase/addCg.vue

@@ -255,9 +255,9 @@ export default {
 	}
 	.item_list_title {
 		margin-bottom: 20upx;
-		font-size: 24upx;
-		font-weight: 600;
-		color: #666666;
+		font-size: 30upx;
+		font-weight: bold;
+		color: #067a40;
 	}
 	.select-cmd_bx {
 		& .kc {

hdApp/src/pagesPurchase/bookProduct.vue

@@ -850,9 +850,9 @@ export default {
 	}
 	.item_list_title {
 		margin-bottom: 20upx;
-		font-size: 24upx;
-		font-weight: 600;
-		color: #666666;
+		font-size: 30upx;
+		font-weight: bold;
+		color: #067a40;
 	}
 	.select-cmd_bx {
 		& .kc {

hdApp/src/pagesPurchase/bookProduct2.vue

@@ -850,9 +850,9 @@ export default {
 	}
 	.item_list_title {
 		margin-bottom: 20upx;
-		font-size: 24upx;
-		font-weight: 600;
-		color: #666666;
+		font-size: 30upx;
+		font-weight: bold;
+		color: #067a40;
 	}
 	.select-cmd_bx {
 		& .kc {

hdApp/src/pagesPurchase/ghsProduct.vue

@@ -1032,9 +1032,9 @@ export default {
 	}
 	.item_list_title {
 		margin-bottom: 20upx;
-		font-size: 24upx;
+		font-size: 26upx;
 		font-weight: 600;
-		color: #242424;
+		color: #067a40;
 	}
 	.select-cmd_bx {
 		& .kc {

hdApp/src/pagesPurchase/ghsProduct2.vue

@@ -956,9 +956,9 @@ export default {
 	}
 	.item_list_title {
 		margin-bottom: 20upx;
-		font-size: 24upx;
-		font-weight: 600;
-		color: #242424;
+		font-size: 26upx;
+		font-weight: bold;
+		color: #067a40;
 	}
 	.select-cmd_bx {
 		& .kc {

hdApp/src/pagesPurchase/xj.vue

@@ -286,9 +286,9 @@ export default {
 		margin-bottom:130upx;
 	}
 	.item_list_title {
-		font-size: 24upx;
-		font-weight: 600;
-		color: #666666;
+		font-size: 30upx;
+		font-weight: bold;
+		color: #067a40;
 	}
 	.select-cmd_bx {
 		& .kc {

hdApp/src/pagesStorehouse/allot/exSelect.vue

@@ -365,9 +365,9 @@ export default {
 	}
 	.item_list_title {
 		margin-bottom: 20upx;
-		font-size: 24upx;
-		font-weight: 600;
-		color: #666666;
+		font-size: 30upx;
+		font-weight: bold;
+		color: #067a40;
 	}
 	.select-cmd_bx {
 		& .kc {

hdApp/src/pagesStorehouse/inventory/select.vue

@@ -201,9 +201,9 @@ export default {
 	}
 	.item_list_title {
 		margin-bottom: 20upx;
-		font-size: 24upx;
-		font-weight: 600;
-		color: #666666;
+		font-size: 30upx;
+		font-weight: bold;
+		color: #067a40;
 	}
 	.select-cmd_bx {
 		& .kc {

hdApp/src/pagesStorehouse/stockWarn/manage.vue

@@ -289,9 +289,9 @@ export default {
 	}
 	.item_list_title {
 		margin-bottom: 20upx;
-		font-size: 24upx;
-		font-weight: 600;
-		color: #666666;
+		font-size: 30upx;
+		font-weight: bold;
+		color: #067a40;
 	}
 	.select-cmd_bx {
 		& .kc {