lilei 2 gadi atpakaļ
vecāks
revīzija
aa1368e9b6

+ 1 - 1
App.vue

@@ -6,7 +6,7 @@
 			token: '',
 			changeOrg:'',
 			version: '', // 当前版本号
-			buildType: 'dev', // 打包环境对应类型,pro 生产 uat 预发布 dev 本地开发
+			buildType: 'uat', // 打包环境对应类型,pro 生产 uat 预发布 dev 本地开发
 			envTips: '', // 环境文字提示
 			theme: 'default', // 主题,default
 			isIphoneXup: false //是否iphonex以及以上的版本

+ 0 - 3
manifest.json

@@ -110,9 +110,6 @@
                         "apikey" : "uFrhrEO2NhtO72CKuRYB9MNt",
                         "secretkey" : "GWNVXBvBY21B7h2PvB6pvmXTgN6jdndR"
                     }
-                },
-                "push" : {
-                    "unipush" : null
                 }
             },
             "icons" : {

+ 7 - 6
pages/index/index.vue

@@ -40,7 +40,7 @@
 					 </div>
 					 <div class="title">库存盘点</div>
 				 </div>
-				 <div class="graid-box-1" @click="toPage('/pages/stockCheck/shelfList')" v-if="$hasPermissions('M_shelfOrder_mobile')">
+				 <div class="graid-box-1" @click="toPage('/pages/shelfOrder/shelfOrder')" v-if="$hasPermissions('M_shelfOrder_mobile')">
 					 <div class="icon">
 						<u-icon name="icon_order" custom-prefix="iscm-icon" size="65"></u-icon>
 						<u-badge type="error" size="mini" :offset="[-5,20]" :count="stockCheckNums"></u-badge>
@@ -52,7 +52,7 @@
 				 </div> -->
 			 </div>
 			 <!-- 货架订单 -->
-			 <view class="sales-list">
+			 <view class="sales-list"  v-if="$hasPermissions('M_shelfOrder_mobile')">
 			 	<view class="title">
 			 		<text class="title-name" @click="$refs.salesList.refash()">
 			 			货架订单 
@@ -63,7 +63,7 @@
 			 </view>
 		 </view>
 		 <!-- 销售单列表 -->
-		 <listComponent ref="salesList" :height="listHeight" />
+		 <listComponent ref="salesList" :height="listHeight"  v-if="$hasPermissions('M_shelfOrder_mobile')" />
 	</view>
 </template>
 <script>
@@ -90,7 +90,7 @@
 		onReady() {
 			const query = uni.createSelectorQuery().in(this);
 			query.select('#tjCons').boundingClientRect(data => {
-			  this.listHeight = Math.floor(data.height)
+			  this.listHeight = Math.floor(data.height-40)
 			}).exec();
 		},
 		onLoad() {
@@ -173,7 +173,7 @@
 <style lang="scss">
 	.homePage-container {
 		width: 100%;
-		padding: 30rpx;
+		padding: 0 30rpx;
 		.graid-box{
 			display: flex;
 			align-items: center;
@@ -184,7 +184,7 @@
 			box-shadow: 3upx 2upx 6upx #eee;
 			margin-bottom: 20upx;
 			.graid-box-1{
-				padding: 30rpx 0;
+				padding: 20rpx 0;
 				width: 25%;
 				font-size: 24rpx;
 				color: #424D5E;
@@ -205,6 +205,7 @@
 			border-radius: 30upx;
 			padding: 10upx 20upx;
 			box-shadow: 3upx 2upx 6upx #eee;
+			margin-top: 20upx;
 			margin-bottom: 20upx;
 			.panel-title {
 				display: flex;

+ 6 - 4
pages/shelfOrder/listComponent.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="sales-list-component">
-		<scroll-view class="sales-list-con" :style="{height: scrollH+'upx'}" scroll-y @scrolltolower="onreachBottom">
+		<scroll-view class="sales-list-con" :style="{height: scrollH+'px'}" scroll-y @scrolltolower="onreachBottom">
 			<view class="sales-list-main">
 				<view class="sales-list-item" v-for="(item, index) in listData" :key="item.id" @click="getDetail(item)">
 					<view class="list-item-tit flex align_center justify_between">
@@ -75,14 +75,16 @@
 		},
 		watch:{
 			height(a,b){
+				console.log(a,b)
 				const sys = uni.getSystemInfoSync()
+				console.log(sys.windowHeight)
 				if(sys.platform == 'android'){
-					this.scrollH = (sys.windowHeight - sys.statusBarHeight - a) * 2
+					this.scrollH = sys.windowHeight - sys.statusBarHeight - a
 				}else{
 					if(sys.safeArea.top){
-						this.scrollH = (sys.windowHeight - a) * 2 + sys.statusBarHeight - 34
+						this.scrollH = sys.windowHeight - a + sys.statusBarHeight - 34
 					}else{
-						this.scrollH = (sys.windowHeight - a) * 2 - 14
+						this.scrollH = sys.windowHeight - a - 14
 					}
 				}
 			},

+ 1 - 1
pages/shelfOrder/orderDetail.vue

@@ -174,7 +174,7 @@
 				padding: 15upx;
 				border-radius: 15rpx;
 				text{
-					color: #ffb355;
+					color: #ff5500;
 				}
 				font-size: 24rpx;
 				border-bottom: 1px solid #e4e7ed;

+ 8 - 8
pages/shelfOrder/shelfOrder.vue

@@ -5,10 +5,10 @@
 				<text>{{searchForm.shelfSnList.length?('已选'+searchForm.shelfSnList.length+'个货架'):'全部货架'}}</text>
 				<u-icon name="arrow-right"></u-icon>
 			</view>
-			<view class="countData" v-if="countData">
-				<view>总款数:<text>{{countData.productCategory}}</text>;</view>
-				<view>总数量:<text>{{countData.totalQty}}</text>;</view>
-				<view>总结算金额:<text>¥{{countData.settleAmount}}</text>;</view>
+			<view class="countData">
+				<view>总款数:<text>{{countData&&countData.productCategory||0}}</text>;</view>
+				<view>总数量:<text>{{countData&&countData.totalQty||0}}</text>;</view>
+				<view>总结算金额:<text>¥{{countData&&countData.settleAmount||0}}</text>;</view>
 			</view>
 		</view>
 		<!-- 销售单列表 -->
@@ -42,10 +42,10 @@
 					shelfSnList: []
 				},
 				searchParams: {},
-				listHeight: 200,
+				listHeight: 0,
 				openModal: false,
 				openShlefModal: false,
-				countData: null
+				countData: null,
 			}
 		},
 		onNavigationBarButtonTap(e){  // 标题栏 按钮操作
@@ -54,7 +54,7 @@
 		onReady() {
 			const query = uni.createSelectorQuery().in(this);
 			query.select('#tjCons').boundingClientRect(data => {
-			  this.listHeight = Math.floor(data.height + 10)
+			  this.listHeight = Math.floor(data.height-25)
 			}).exec();
 		},
 		onLoad() {
@@ -132,7 +132,7 @@
 				padding: 15upx;
 				border-radius: 15rpx;
 				text{
-					color: #ffb355;
+					color: #ff5500;
 				}
 				font-size: 24rpx;
 			}

+ 16 - 5
pages/shelfSetting/shelfSet.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="content">
 		<u-navbar back-text="货架设置">
-			<view slot='right' style="padding: 0 30upx;color: #00aaff;" @click="toPlRacking">
+			<view slot='right' style="padding: 0 30upx;color: #00aaff;" @click="toPlRacking" v-if="shelfPlaceList">
 				<u-icon name="piliangshangjia" custom-prefix="iscm-icon"></u-icon>
 				<text style="margin-left: 6rpx;">批量上架</text>
 				<u-badge v-if="showDot" :is-dot="true" size="mini" type="error"></u-badge>
@@ -63,7 +63,13 @@
 			</view>
 		</view>
 		<view v-else>
-			<view class="nodata">暂无货位信息,请点击 <text @click="toPlRacking">批量上架</text></view>
+			<view class="nodata">
+				暂无货位信息,请点击 
+				<view>
+					<text @click="toPlRacking">批量上架</text>
+					<u-badge :offset="[-6,-10]" v-if="showDot" :is-dot="true" size="mini" type="error"></u-badge>
+				</view>
+			</view>
 		</view>
 	</view>
 </template>
@@ -385,9 +391,14 @@
 	.nodata{
 		padding: 100rpx 50rpx;
 		text-align: center;
-		> text{
-			color: #00aaff;
-			margin-left: 10rpx;
+		display: flex;
+		justify-content: center;
+		> view{
+			position: relative;
+			text{
+				color: #00aaff;
+				margin-left: 10rpx;
+			}
 		}
 	}
 }

+ 2 - 2
pages/stockCheck/startCheck.vue

@@ -49,11 +49,11 @@
 										<text class="item-detail-text">{{item.currQty}}</text>
 										{{item.productEntity&&item.productEntity.unit}}
 									</view>
-									<view>
+									<!-- <view>
 										冻结库存:
 										<text class="item-detail-text">{{item.freezeQty}}</text>
 										{{item.productEntity&&item.productEntity.unit}}
-									</view>
+									</view> -->
 								</view>
 							</view>
 						</view>