Merge branch 'master' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-uniapp

common/style/new_style.css

@@ -2079,7 +2079,7 @@ button::after {
 }
 
 .card_batch {
-	color: #00B574;
+	color: #9747FF;
 	padding: 5px;
 }
 
@@ -2119,7 +2119,6 @@ button::after {
 
 .scan_view {
 	background: linear-gradient(90deg, rgba(12, 194, 182, 0.2) 0%, rgba(12, 194, 182, 0) 100%)
-
 }
 
 .card_view {

common/style/pdabasic.css

@@ -473,7 +473,7 @@ export function getItemTypeStyle(val) {
 
 .detail-list {
 	background-color: #fff;
-	/* padding: 10rpx; */
+	padding: 10rpx;
 	/* margin: 20rpx; */
 	/* border-radius: 16rpx; */
 	/* overflow: hidden; */

mycomponents/balance/balance.vue

@@ -1,5 +1,5 @@
 <template>
-	<view :class="dataContent.scaned?'scan_view':''" style="background-color: #ffffff;margin-bottom: 2px; ">
+	<view :class="dataContent.scaned?'scan_view':''" style="background-color: #ffffff;margin-bottom: 1px; ">
 		<view class="uni-flex uni-row space-between" style="align-items: center">
 			<view>
 				<pack v-if="isShowPack && dataContent.packingNumber" :packingCode="dataContent.packingNumber"></pack>

mycomponents/recommend/recommend.vue

@@ -1,5 +1,5 @@
 <template>
-	<view :class="detail.scaned?'scan_view':''" style="background-color: #ffffff;">
+	<view :class="detail.scaned?'scan_view':''" style="background-color: #ffffff; margin-bottom: 1px;">
 		<view class="uni-flex uni-row space-between"  style="align-items: center">
 			<!-- uni-inline-item 暂时拿掉-->
 			<view>

uni_modules/uni-collapse/components/uni-collapse-item/uni-collapse-item.vue

@@ -205,11 +205,12 @@
 							this.getCollapseHeight(false, index)
 							return
 						}
+					 
 						// #ifdef APP-NVUE
 						this.height = data.height + 1
 						// #endif
 						// #ifndef APP-NVUE
-						this.height = data.height
+						this.height = data.height+3
 						// #endif
 						this.isheight = true
 						if (type) return
@@ -220,6 +221,7 @@
 			getNvueHwight(type) {
 				const result = dom.getComponentRect(this.$refs['collapse--hook'], option => {
 					if (option && option.result && option.size) {
+						
 						// #ifdef APP-NVUE
 						this.height = option.size.height + 1
 						// #endif