lilei преди 2 години
родител
ревизия
bd50f7eacf

+ 7 - 1
pages/approveStore/authPass.vue

@@ -55,7 +55,7 @@
 			</u-form>
 		</view>
 		<view class="form-btn-con flex justify_center">
-			<u-button class="form-btn" shape="circle" :loading="loading" type="info" :custom-style="{ background: '#066cff', color: '#fff',width:'350rpx' }" @click="formSubmit">审核通过</u-button>
+			<u-button class="form-btn" shape="circle" :loading="loading" type="info" :custom-style="customBtnStyle" @click="formSubmit">审核通过</u-button>
 		</view>
 	</view>
 </template>
@@ -73,6 +73,12 @@
 			return{
 				loading: false,
 				theme: '',
+				customBtnStyle: {  //  自定义按钮样式
+					borderColor: this.$config('primaryColor'),
+					backgroundColor: this.$config('primaryColor'),
+					color: '#fff',
+					width: '360rpx'
+				},
 				form: {
 					storeName: '', // 门店名称
 					contactPhone: '', //  联系手机

+ 5 - 0
pages/approveStore/list.vue

@@ -81,6 +81,11 @@
 			uni.$on("updateAuthState",function(){
 				_this.getRow(1)
 			})
+			
+			uni.setNavigationBarColor({
+				frontColor: '#ffffff',
+				backgroundColor: this.$config('primaryColor')
+			})
 		},
 		onUnload() {
 			uni.$off("updateAuthState")

+ 6 - 1
pages/batchShelves/setProductCost.vue

@@ -28,7 +28,7 @@
 			</view>
 		</view>
 		<view class="footer-bar">
-			<u-button type='primary' shape="circle" size="medium" @click="submitForm">设置完成</u-button>
+			<u-button type='primary' shape="circle" size="medium" :custom-style="customBtnStyle" @click="submitForm">设置完成</u-button>
 		</view>
 	</view>
 </template>
@@ -40,6 +40,11 @@
 		data() {
 			return {
 				partList:[],
+				customBtnStyle: {  //  自定义按钮样式
+					borderColor: this.$config('primaryColor'),
+					backgroundColor: this.$config('primaryColor'),
+					color: '#fff'
+				},
 			}
 		},
 		onLoad() {

+ 1 - 1
pages/shelfSetting/quickProductList.vue

@@ -25,7 +25,7 @@
 					<view>
 					最大库容:<text class="pnums">{{item.maxQty}}</text>
 					当前库存:<text class="pnums">{{item.qty}}</text>
-					补货在途:<text class="pnums">{{item.afloatQty||0}}</text>
+					补货在途:<text class="pnums">{{item.replenishBillQty||0}}</text>
 					</view>
 				</view>
 				<view class="ptools flex align_center justify_between">

+ 5 - 0
pages/shelfSetting/shelfList.vue

@@ -74,6 +74,11 @@
 			uni.$on("setCustome",(data)=>{
 				this.saveShelf(data)
 			})
+			
+			uni.setNavigationBarColor({
+				frontColor: '#ffffff',
+				backgroundColor: this.$config('primaryColor')
+			})
 		},
 		onUnload() {
 			uni.$off("setCustome")

+ 13 - 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" v-if="shelfPlaceList">
+		<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="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>
@@ -67,10 +67,15 @@
 		</view>
 		<view v-else>
 			<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>
+					<u-image :src="`../../static/${$config('themePath')}/def_no_data@3x.png`" width="180" height="180" border-radius="10"></u-image>
+				</view>
+				<view class="flex">
+					暂无货位信息,请点击
+					<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 class="nodata" v-else>
@@ -394,9 +399,12 @@
 		padding: 100rpx 50rpx;
 		text-align: center;
 		display: flex;
+		flex-direction: column;
 		justify-content: center;
+		align-items: center;
 		> view{
 			position: relative;
+			padding: 10upx 0;
 			text{
 				color: #00aaff;
 				margin-left: 10rpx;

+ 7 - 2
pages/soldOut/chooseProduct.vue

@@ -115,7 +115,7 @@
 			</div>
 		</div>
 		<!-- 筛选项 -->
-		<u-popup v-model="showTab" mode="right" width="70%">
+		<u-popup v-model="showTab" mode="right" closeable width="70%">
 			<view class="tabBox flex flex_column">
 				<view class="tabs">
 					<u-checkbox-group wrap @change="checkboxGroupChange">
@@ -204,6 +204,10 @@
 		onLoad(opts) {
 			this.nowData = JSON.parse(decodeURIComponent(opts.data));
 			this.getpartList()
+			uni.setNavigationBarColor({
+				frontColor: '#ffffff',
+				backgroundColor: this.$config('primaryColor')
+			})
 		},
 		computed: {
 			totalCategory () {
@@ -406,7 +410,7 @@
 	width: 100%;
 	background: #fff;
 	.searchBar{
-		padding: 0 0.8rem 0.3rem;
+		padding: 0.3rem 0.8rem;
 		.p-title{
 			padding: 0 15rpx;
 			display: flex;
@@ -496,6 +500,7 @@
 	.tabBox{
 		height: 100vh;
 		.tabs{
+			margin-top: 100rpx;
 			overflow: auto;
 			padding: 20rpx;
 			> view{

+ 3 - 3
pages/soldOut/creatOrder.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="content flex flex_column">
-		<u-navbar back-text="待补货产品" :border-bottom="false">
-			<view slot='right' style="padding: 0 30upx;" v-if="chooseList.length" @click="toChooseProduct">
+		<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;" v-if="chooseList.length" @click="toChooseProduct">
 				<u-icon name="chuangjiandingdan" custom-prefix="iscm-icon"></u-icon>
 				<text style="margin-left: 6rpx;">选择产品</text>
 			</view>
@@ -303,7 +303,7 @@
 	}
 
 	.searchBar{
-		padding: 0 0.8rem 0.3rem;
+		padding: 0.3rem 0.8rem;
 		.p-title{
 			padding: 0 15rpx;
 			display: flex;

+ 3 - 0
pages/soldOut/productList.vue

@@ -158,6 +158,9 @@
 	.partList-list-box{
 		padding: 10px 0;
 		border-bottom: 2rpx solid #f5f5f5;
+		&:active{
+			background-color: #f8f8f8;
+		}
 		.product{
 			flex-grow: 1;
 			.checkbox{

+ 6 - 4
pages/soldOut/shelfList.vue

@@ -70,7 +70,7 @@
 					</view>
 				</view>
 				<view v-if="shelfList&&shelfList.length==0">
-					<u-empty v-if="status!='loading'" :src="`/static/${$config('themePath')}/def_no_data@3x.png`" icon-size="180" :text="noDataText" mode="list" :margin-top="50"></u-empty>
+					<u-empty v-if="status!='loading'" :src="`/static/${$config('themePath')}/def_no_data@3x.png`" icon-size="180" :text="noDataText" mode="list" :margin-top="200"></u-empty>
 				</view>
 				<view style="padding: 20upx;" v-else>
 					<u-loadmore :status="status" />
@@ -103,7 +103,10 @@
 			}
 		},
 		onLoad(opts) {
-			 
+			 uni.setNavigationBarColor({
+			 	frontColor: '#ffffff',
+			 	backgroundColor: this.$config('primaryColor')
+			 })
 		},
 		onUnload() {
 			uni.$off("setCustome")
@@ -173,7 +176,6 @@
 							_this.noDataText = '没有查询到相关货架'
 						}
 						_this.allList = res.data
-						_this.noDataText = '暂无货架'
 					}else{
 						_this.status = 'loadmore'
 						_this.shelfList = []
@@ -220,7 +222,7 @@
 		height: 100vh;
 		background-color: #f8f8f8;
 		.moreShelfPart-search{
-			padding: 0 20rpx 10rpx;
+			padding: 20rpx;
 			background-color: #fff;
 		}
 		.moreShelfPart-body{