lilei пре 3 година
родитељ
комит
259edfe8fe

+ 4 - 0
.hbuilderx/launch.json

@@ -14,6 +14,10 @@
      	{
      		"launchtype" : "local"
      	},
+     	"mp-weixin" : 
+     	{
+     		"launchtype" : "local"
+     	},
      	"type" : "uniCloud"
      }
     ]

+ 1 - 1
pages/sales/index.vue

@@ -74,7 +74,7 @@
 		onReady() {
 			const query = uni.createSelectorQuery().in(this);
 			query.select('#tjCons').boundingClientRect(data => {
-			  this.listHeight = data.height
+			  this.listHeight = Math.floor(data.height + 18)
 			}).exec();
 		},
 		onLoad() {

+ 2 - 2
pages/sales/list.vue

@@ -44,7 +44,7 @@
 		onReady() {
 			const query = uni.createSelectorQuery().in(this);
 			query.select('#tjCons').boundingClientRect(data => {
-			  this.listHeight = data.height
+			  this.listHeight = Math.floor(data.height + 10)
 			}).exec();
 		},
 		onLoad() {
@@ -139,7 +139,7 @@
 			background-color: #fff;
 		}
 		.list-box{
-			padding: 20upx 20upx 0;
+			padding: 0;
 		}
 	}
 </style>

+ 11 - 3
pages/sales/listComponent.vue

@@ -87,13 +87,21 @@
 				outModal: false,  // 出库弹框
 				delModal: false,  // 删除/取消弹框
 				delText: '确认要删除吗?',
-				scrollH: 300
+				scrollH: 300,
 			}
 		},
 		watch:{
 			height(a,b){
 				const sys = uni.getSystemInfoSync()
-				this.scrollH = (sys.windowHeight - a - sys.statusBarHeight) * 2
+				if(sys.platform == 'android'){
+					this.scrollH = (sys.windowHeight - sys.statusBarHeight - a) * 2
+				}else{
+					if(sys.safeArea.top){
+						this.scrollH = (sys.windowHeight - a) * 2 + sys.statusBarHeight - 34
+					}else{
+						this.scrollH = (sys.windowHeight - a) * 2 - 14
+					}
+				}
 			},
 		},
 		mounted() {
@@ -219,7 +227,7 @@
 				.sales-list-item{
 					background: #ffffff;
 					padding: 20upx;
-					margin-bottom: 25upx;
+					margin: 25upx;
 					border-radius: 25upx;
 					box-shadow: 1px 1px 3px #EEEEEE;
 					.list-item-tit{

+ 3 - 1
pages/stock/index.vue

@@ -96,7 +96,9 @@
 		},
 		onShow() {
 			// 是否默认包括禁用产品
-			this.form.productEnabledFlag = uni.getStorageSync('productEnabledFlag-' + this.$store.state.vuex_userData.orgId) || true
+			const a = uni.getStorageSync('productEnabledFlag-' + this.$store.state.vuex_userData.orgId)
+			console.log(typeof a == 'boolean')
+			this.form.productEnabledFlag = typeof a == 'boolean' ? a : true
 			this.getTotal()
 		},
 		methods: {

+ 1 - 1
pages/userCenter/index.vue

@@ -67,7 +67,7 @@
 						item.text = item.orgName
 					})
 				}
-				return orgs.filter(item => item.orgSn != user.orgSn) 
+				return orgs ? orgs.filter(item => item.orgSn != user.orgSn) : []
 			},
 			userData () {
 				return this.$store.state.vuex_userData;