lilei %!s(int64=2) %!d(string=hai) anos
pai
achega
ea8e7f7ca7

+ 2 - 1
pages.json

@@ -213,7 +213,8 @@
 		        				"text": "\ue64e 待补货" ,//原生标题栏增加分享按钮,点击事件可通过页面的 onNavigationBarButtonTap 函数进行监听u
 		        				"fontSrc": "/static/iconfont/iconfont.ttf",
 		        				"fontSize": "14",
-		        				"width":"100px"
+								"color": "#ffffff",
+		        				"width":"90px"
 		        			}
 		        		]
 		        	}

+ 1 - 1
pages/batchShelves/cartList.vue

@@ -93,7 +93,7 @@
 			</view>
 		</u-popup>
 		<!-- 选择层删除 -->
-		<u-popup mode="center" width="80%" :mask-close-able="false" closeable @close="delLayer=[]" v-model="showDelLay" border-radius="15">
+		<u-popup mode="center" width="80%" :duration="0" :mask-close-able="false" closeable @close="delLayer=[]" v-model="showDelLay" border-radius="15">
 			<view class="layer-content">
 				 <view class="tits">
 					 <view>请选择需要删除的层</view>

+ 1 - 1
pages/replenishmentManage/detail.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="replenishment-detail-wrap">
 		<u-navbar back-text="补货单详情" :border-bottom="false" :background="{backgroundColor: $config('primaryColor')}" back-icon-color="#fff" :back-text-style="{ color: '#fff' }">
-			<view slot='right' style="padding: 0 30upx;color: #ffffff;" @click="creatSalesOrder" v-if="pageType=='success'">
+			<view slot='right' style="padding: 0 30upx;color: #ffffff;" @click="creatSalesOrder" v-if="pageType=='success'&&totalNums">
 				<u-icon name="chuangjiandingdan" custom-prefix="iscm-icon"></u-icon>
 				<text style="margin-left: 6rpx;">生成销售单</text>
 			</view>

+ 1 - 1
pages/replenishmentManage/outWarehousing.vue

@@ -6,7 +6,7 @@
 				<text style="margin-left: 6rpx;">生成销售单</text>
 			</view>
 		</u-navbar>
-		<view class="replenishment-outWarehousing-body">
+		<view class="replenishment-outWarehousing-body" :style="`backgroundImage:linear-gradient(180deg, ${$config('primaryColor')}, #F5F6F7 12%)`">
 			<view class="head-info" v-if="basicInfoData">
 				<view class="states">
 					<view>

+ 6 - 0
pages/replenishmentManage/replenishmentList.vue

@@ -122,6 +122,12 @@
 			// 跳到指定tab
 			uni.$on('refreshBhList',this.refreshBhList)
 		},
+		onReady() {
+			uni.setNavigationBarColor({
+				frontColor: '#ffffff',
+				backgroundColor: this.$config('primaryColor')
+			})
+		},
 		onUnload() {
 			uni.$off('refreshBL')
 		},

+ 1 - 1
pages/replenishmentManage/signWarehousing.vue

@@ -6,7 +6,7 @@
 				<text style="margin-left: 6rpx;">生成销售单</text>
 			</view>
 		</u-navbar>
-		<view class="replenishment-putWarehousing-body">
+		<view class="replenishment-putWarehousing-body" :style="`backgroundImage:linear-gradient(180deg, ${$config('primaryColor')}, #F5F6F7 12%)`">
 			<view class="head-info" v-if="basicInfoData">
 				<view class="states">
 					<view>

+ 10 - 4
pages/sales/chooseCustomer.vue

@@ -35,10 +35,13 @@
 				<view class="picker-main-item" v-for="(item, index) in listData" :key="item.id" @click="chooseItem(item)">
 					<view class="item-name">{{item.customerName}}</view>
 				</view>
-				<view v-if="listData&&listData.length>=20" style="color:#999;font-size: 26upx;text-align: center;padding: 10upx;">最多显示前20条匹配客户,请尝试输入更多内容</view>
-				<view v-if="listData && listData.length == 0">
+				<view v-if="listData&&listData.length>=20 && !loading" style="color:#999;font-size: 26upx;text-align: center;padding: 10upx;">最多显示前20条匹配客户,请尝试输入更多内容</view>
+				<view v-if="listData && listData.length == 0 && !loading">
 					<u-empty text="暂无匹配客户" mode="list" :img-width="200" :margin-top="60"></u-empty>
 				</view>
+				<view v-if="loading">
+					<u-loadmore :load-text="$config('loadText')" status="loading" />
+				</view>
 			</view>
 		</scroll-view>
 	</view>
@@ -49,6 +52,7 @@
 	export default{
 		data(){
 			return{
+				loading: false,
 				listData:[],
 				queryWord:'',
 				pageSize:20,
@@ -96,14 +100,16 @@
 			},
 			getData(){
 				console.log('调用')
-				uni.showLoading({title:'加载中...',mask:true})
+				// uni.showLoading({title:'加载中...',mask:true})
+				this.loading = true
 				customerList({queryWord:this.queryWord,pageNo:this.pageNo,pageSize:this.pageSize}).then(res => {
 					if(res.status == 200 && res.data){
-						uni.hideLoading({})
 						this.listData = res.data.list
 					}else{
 						this.listData = []
 					}
+					// uni.hideLoading()
+					this.loading = false
 				})
 			},
 			// 搜索品牌

+ 10 - 6
pages/shelfSetting/shelfSet.vue

@@ -66,13 +66,16 @@
 			</view>
 		</view>
 		<view v-else>
-			<view class="nodata">
+			<view class="nodata" v-if="!loading">
 				暂无货位信息,请点击 
 				<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 class="nodata" v-else>
+				<u-loadmore :load-text="$config('loadText')" status="loading" />
+			</view>
 		</view>
 	</view>
 </template>
@@ -86,6 +89,7 @@
 		},
 		data() {
 			return {
+				loading: false,
 				shelfSn: null,
 				detailData: null,
 				switchVal: false,
@@ -124,9 +128,11 @@
 			this.isLoad = true
 			this.webView = this.$mp.page.$getAppWebview(); 
 			uni.$on("editCustome",(data)=>{
+				this.isLoad = true
 				this.saveShelf(data,0)
 			})
 			uni.$on("editShelfName",(data)=>{
+				this.isLoad = true
 				this.saveShelf(data,1)
 			})
 			
@@ -149,6 +155,7 @@
 			// 刷新货位
 			updateHw(){
 				this.placeTab = []
+				this.shelfPlaceList = null
 				this.getShelfPlace(true)
 			},
 			// 批量上架
@@ -343,12 +350,8 @@
 				})
 			},
 			getShelfPlace(flag){
-				// uni.showLoading({
-				// 	mask: true,
-				// 	title: '正在查询...'
-				// })
+				this.loading = true
 				getProductPlace({ shelfSn: this.shelfSn }).then(res => {
-				  uni.hideLoading()
 				  if (res.status == 200 && res.data) {
 				    this.shelfPlaceList = res.data
 					// 获取层
@@ -371,6 +374,7 @@
 				  // 是否有已录入的产品
 				  this.getHasCartNotEmpty()
 				  this.isLoad = false
+				  this.loading = false
 				})
 			},
 			tabChange(item){

+ 5 - 5
pages/soldOut/productList.vue

@@ -23,9 +23,9 @@
 				</view>
 				<view class="ptxt flex align_center justify_end">
 					<view>
-					最大库容:<text class="pnums">{{item.maxQty}}</text>
-					当前库存:<text class="pnums">{{item.qty}}</text>
-					补货在途:<text class="pnums">{{item.replenishBillQty||0}}</text>
+					最大库容:<text class="pnums">{{item.maxQty||0}}</text>
+					货架库存:<text class="pnums">{{item.qty||0}}</text>
+					门店库存:<text class="pnums">{{item.qplsStockQty||0}}</text>
 					</view>
 				</view>
 				<view class="ptools flex align_center justify_between">
@@ -170,7 +170,7 @@
 					}
 				}
 				.pname1{
-					font-size: 26rpx;
+					font-size: 28rpx;
 				}
 			}
 		}
@@ -184,7 +184,7 @@
 		}
 		.ptools{
 			font-size: 26rpx;
-			margin-top: 20rpx;
+			margin-top: 10rpx;
 			color: #999;
 			.pnums{
 				color: #ff5500;

+ 3 - 3
pages/userCenter/index.vue

@@ -17,7 +17,7 @@
 			</view>
 		</view>
 		<!-- 列表 -->
-		<view class="user-list">
+		<view class="user-list" :style="`backgroundImage:linear-gradient(180deg, ${$config('primaryColor')}, #F5F6F7 30%)`">
 			<u-cell-group>
 				<u-cell-item icon="volume" icon-size="36" :icon-style="{color:'#00aaff'}" index="3" @click="toPage(3)" title="消息">
 					<u-badge :count="noReadNums" :absolute="false" slot="right-icon"></u-badge>
@@ -245,7 +245,7 @@
 		.user-head{
 			display: flex;
 			align-items: center;
-			padding: 80rpx 35rpx;
+			padding: 50rpx 35rpx;
 			.user-photo{
 				flex-shrink: 0;
 				margin-right: 5rpx;
@@ -271,7 +271,7 @@
 		.user-list{
 			padding: 0 20upx;
 			> view{
-				margin: 20upx 0;
+				margin-bottom: 20upx;
 				border-radius: 15upx;
 				box-shadow: 0upx 3upx 6upx #eee;
 				overflow: hidden;