调整

common/locales/zh.js

@@ -15,11 +15,19 @@ export default {
 		numberquery:'胎号查询',
 		supplier:'我的供应商',
 		brandmanagement:'我的经营品牌'
+		
 	},
 	unified:{
 		networkstate: '无网络，请连接网络后再试~',
 		nodata:'暂无数据',
-		Loading:'加载中...'
+		Loading:'加载中...',
+		sun:'日',
+		mon:'一',
+		tues:'二',
+		wed:'三',
+		thur:'四',
+		fri:'五',
+		sat:'六'
 	},
 	//扫码页面
 	scanenter: {

pages/me/Delivery-details/index.vue

@@ -148,6 +148,9 @@
 			inputbox(e) {
 				this.page = 1
 				
+				this.bottoma = true
+				this.bottomb = false
+				this.bottomc = false
 				
 				this.itemList = []
 				this.brandCode = null

pages/me/Warehousing-details/index.vue

@@ -15,12 +15,12 @@
 				</view>
 				<view style="float: left;margin-left: 70rpx;">
 					<text @click="brand">{{$t('scancodeenter.tabs_b')}}</text>
-					<view  v-if="bottomb == true" style="width: 100%;height: 1rpx;background-color: #FFFFFF;border-radius: 10rpx;"></view>
+					<view v-if="bottomb == true" style="width: 100%;height: 1rpx;background-color: #FFFFFF;border-radius: 10rpx;"></view>
 					<view v-else></view>
 				</view>
 				<view style="float: left;margin-left: 70rpx;">
 					<text @click="time_s">{{$t('scancodeenter.tabs_c')}}</text>
-					<view  v-if="bottomc == true" style="width: 100%;height: 1rpx;background-color: #FFFFFF;border-radius: 10rpx;"></view>
+					<view v-if="bottomc == true" style="width: 100%;height: 1rpx;background-color: #FFFFFF;border-radius: 10rpx;"></view>
 					<view v-else></view>
 				</view>
 			</view>
@@ -76,7 +76,8 @@
 				<u-loadmore :status="status" :icon-type="iconType" :load-text="loadText" />
 			</view>
 			<u-action-sheet :list="list_a" @click="click" v-model="show" :mask-close-able="false" @close="close"></u-action-sheet>
-			<u-calendar v-model="show_d" :toolTip="$t('scancodeenter.daterange')"  :mode="mode" @change="time" :mask-close-able="false" :start-text="$t('scancodeenter.start')" :end-text="$t('scancodeenter.end')"></u-calendar>
+			<u-calendar v-model="show_d" :toolTip="$t('scancodeenter.daterange')" :mode="mode" @change="time" :mask-close-able="false"
+			 :start-text="$t('scancodeenter.start')" :end-text="$t('scancodeenter.end')"></u-calendar>
 		</view>
 	</view>
 </template>
@@ -147,12 +148,14 @@
 			},
 			inputbox(e) {
 				this.page = 1
-				// 
-				// 
+				this.bottoma = true
+				this.bottomb = false
+				this.bottomc = false
 				this.itemList = []
 				this.brandCode = null
 				this.beginDate = null
 				this.endDate = null
+				this.beginDate = null
 				this.content = e
 				if (this.itemList.length >= this.length) {
 					this.status = 'nomore';
@@ -320,13 +323,13 @@
 					}
 				}).then(res => {
 					// 
-					if(res.data.code == 500){
+					if (res.data.code == 500) {
 						uni.showToast({
 							icon: 'none',
 							title: res.data.msg,
 							position: "bottom"
 						})
-					}else{
+					} else {
 						this.total = res.data.stock
 						this.length = res.data.count
 						this.itemList = this.itemList.concat(res.data.record)

uview-ui/components/u-calendar/u-calendar.vue

@@ -129,12 +129,12 @@
 			// 可切换的最大年份
 			maxYear: {
 				type: [Number, String],
-				default: 2050
+				default: 2100
 			},
 			// 可切换的最小年份
 			minYear: {
 				type: [Number, String],
-				default: 1950
+				default: 2000
 			},
 			// 最小可选日期(不在范围内日期禁用不可选)
 			minDate: {
@@ -251,7 +251,7 @@
 				isStart: true,
 				min: null,
 				max: null,
-				// weekDayZh: ['日', '一', '二', '三', '四', '五', '六']
+				weekDayZh: [this.$t('unified.sun'), this.$t('unified.mon'), this.$t('unified.tues'), this.$t('unified.wed'), this.$t('unified.thur'), this.$t('unified.fri'), this.$t('unified.sat')]
 			};
 		},
 		computed: {