第二次提交

components/cuihai-combox/cuihai-combox.vue

@@ -0,0 +1,417 @@
+<template>
+	<view>
+		<view class="maskbox" v-show="showSelector&&showMask" @click="showSelector=!showSelector"></view>
+		<view class="uni-combox" :style="{zIndex:showSelector?999:1}">
+			<view v-if="label" class="uni-combox__label" :style="labelStyle">
+				<text>{{label}}</text>
+			</view>
+			<view class="uni-combox__input-box">
+				<view class="combox_tags">
+					<view class="combox_tag" v-for="(item,index) in selectList" :key="item[keyId]"
+						@click="delSelected(index)">
+						<view class="tag_name">{{item[keyName]}}</view>
+						<icon type="clear" size="16" />
+					</view>
+				</view>
+				<view class="combox_input_view">
+					<input class="uni-combox__input" type="text" :placeholder="placeholder" :disabled="isDisabled"
+						v-model="inputVal" @input="onInput" @focus="onFocus" @blur="onBlur"
+						@click="isDisabled?toggleSelector():''" />
+					<icon type="clear" size="16" @tap="clearInputValue" v-if="!isDisabled" />
+					<image class="uni-combox__input-arrow" src="./arrow_down.png" style="width: 30rpx;height: 30rpx;"
+						@click="toggleSelector"></image>
+					<view class="uni-combox__selector" v-if="showSelector">
+						<scroll-view scroll-y="true" :style="{maxHeight:selectHeight+'px'}"
+							class="uni-combox__selector-scroll">
+							<view class="uni-combox__selector-empty" v-if="filterCandidatesLength === 0">
+								<text>{{emptyTips}}</text>
+							</view>
+							<view class="uni-combox__selector-item" v-for="(item,index) in filterCandidates"
+								:key="item[keyId]" @click="onSelectorClick(index)"
+								:style="isCheck(item[keyId])?'color:'+selectColor+';background-color:'+selectBgColor+';':'color:'+color+';'">
+								<text>{{item[keyName]}}</text>
+							</view>
+						</scroll-view>
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	/**
+	 * Combox 组合输入框
+	 * @description 组合输入框一般用于既可以输入也可以选择的场景
+	 * @property {String} unikey 一个页面同时使用多个组件时用不同值区分
+	 * @property {String} label 左侧文字
+	 * @property {String} labelWidth 左侧内容宽度
+	 * @property {String} placeholder 输入框占位符
+	 * @property {Array} candidates 候选项列表
+	 * @property {String} emptyTips 筛选结果为空时显示的文字
+	 * @property {String} value 单选时组合框的初始值
+	 * @property {Array} initValue 多选时组合框的初始值(下标集合)
+	 * @property {String} keyName json数组显示的字段值
+	 * @property {String} keyId json数组返回的字段
+	 * @property {String} showMask 展示下拉框是否显示遮罩
+	 * @property {Boolean} isJSON 是否是json数组，默认不是
+	 * @property {Boolean} isDisabled 是否是禁用输入，默认不禁用
+	 * @property {Boolean} isCheckBox 是否是多选，默认不是，多选时不能输入查询
+	 * @property {Number} maxNum 多选最多选择个数
+	 * @property {String} color 默认字体颜色，默认#000000
+	 * @property {String} selectColor 选中字体颜色，默认#0081ff
+	 * @property {String} selectBgColor 选中背景颜色，默认#e8e8e8
+	 * @property {String} selectHeight 下拉框最大高度，默认200px
+	 */
+	export default {
+		name: 'comboxSearch',
+		props: {
+			unikey: {
+				type: Number,
+				default: 0
+			},
+			label: {
+				type: String,
+				default: ''
+			},
+			labelWidth: {
+				type: String,
+				default: 'auto'
+			},
+			placeholder: {
+				type: String,
+				default: ''
+			},
+			candidates: {
+				type: Array,
+				default () {
+					return []
+				}
+			},
+			emptyTips: {
+				type: String,
+				default: '无匹配项'
+			},
+			value: {
+				type: String,
+				default: ''
+			},
+			initValue: {
+				type: Array,
+				default: null
+			},
+			keyName: {
+				type: String,
+				default: 'boxname'
+			},
+			keyId: {
+				type: String,
+				default: 'boxsort'
+			},
+			isJSON: {
+				type: Boolean,
+				default: false
+			},
+			isDisabled: {
+				type: Boolean,
+				default: false
+			},
+			showMask: {
+				type: Boolean,
+				default: true
+			},
+			isCheckBox: {
+				type: Boolean,
+				default: false
+			},
+			maxNum: {
+				type: Number,
+				default: -1
+			},
+			color: {
+				default: "#000000",
+				type: String
+			},
+			selectColor: {
+				default: "#0081ff",
+				type: String
+			},
+			selectBgColor: {
+				default: "#e8e8e8",
+				type: String
+			},
+			selectHeight: {
+				type: Number,
+				default: 200
+			}
+		},
+		data() {
+			return {
+				showSelector: false,
+				inputVal: '',
+				selectList: [],
+				arrays: [],
+				gid: `sm-org-dropDown-${(new Date()).getTime()}${Math.random()}`
+			}
+		},
+		computed: {
+			labelStyle() {
+				if (this.labelWidth === 'auto') {
+					return {}
+				}
+				return {
+					width: this.labelWidth
+				}
+			},
+			filterCandidates() {
+				if (!this.isDisabled) {
+					return this["candidates" + this.unikey].filter((item) => {
+						return item[this.keyName].indexOf(this.inputVal) > -1
+					})
+				} else {
+					return this["candidates" + this.unikey];
+				}
+			},
+			filterCandidatesLength() {
+				return this.filterCandidates.length
+			}
+		},
+		created() {
+			this["candidates" + this.unikey] = JSON.parse(JSON.stringify(this.candidates));
+			this.candidates.forEach((item, index) => {
+				if (this.isJSON) {
+					if (this.keyId == "boxsort") {
+						this["candidates" + this.unikey][index].boxsort = index;
+					}
+				} else {
+					let a = {
+						boxsort: index,
+						boxname: item
+					};
+					this["candidates" + this.unikey][index] = a;
+				}
+			});
+			if (this.initValue != null) {
+				this.initValue.forEach(v => {
+					this["candidates" + this.unikey].forEach(c => {
+						if (v == c[this.keyId]) {
+							this.selectList.push(c);
+						}
+					})
+				})
+			}
+			//在created的时候，给子组件放置一个监听，这个时候只是监听器被建立，此时这段代码不会生效
+			//uni.$on接收一个sm-org-dropDown-show的广播
+			uni.$on('sm-org-dropDown-show', (targetId) => {
+				//接收广播，当该组件处于下拉框被打开的状态，并且跟下一个被点击的下拉框的gid不同时，将该组件的下拉框关闭，产生一个互斥效果。
+				if (this.showSelector && this.gid != targetId) {
+					this.showSelector = false
+				}
+			})
+		},
+		//当子组件销毁的时候，将建立的监听销毁，这里不会影响代码效果，但是在多次反复引用组件时，会在根节点定义越来越多的监听，长此以往影响性能，所以在不用的时候及时销毁，养成好习惯
+		beforeDestroy() {
+			uni.$off('sm-org-dropDown-show')
+		},
+		watch: {
+			value: {
+				handler(newVal) {
+					this.inputVal = newVal
+				},
+				immediate: true
+			}
+		},
+		methods: {
+			toggleSelector() {
+				this.showSelector = !this.showSelector
+				if (this.showSelector) {
+					uni.$emit('sm-org-dropDown-show', this.gid)
+				}
+			},
+			onFocus() {
+				this.showSelector = true;
+				uni.$emit('sm-org-dropDown-show', this.gid)
+			},
+			onBlur() {
+
+			},
+			onSelectorClick(index) {
+				if (this.isCheckBox) {
+					let flag = this.selectList.
+					findIndex(item => item[this.keyId] == this.filterCandidates[index][this.keyId]);
+					if (flag != -1) {
+						this.selectList.splice(flag, 1);
+					} else {
+						if (this.selectList.length == this.maxNum) {
+							return;
+						}
+						this.selectList.push(this.filterCandidates[index]);
+					}
+					this.$emit('getValue', this.selectValue());
+				} else {
+					this.showSelector = false
+					if (this.isJSON) {
+						this.$emit('getValue', this.filterCandidates[index][this.keyId]);
+					} else {
+						this.$emit('getValue', this.filterCandidates[index][this.keyName]);
+					}
+					this.inputVal = this.filterCandidates[index][this.keyName];
+				}
+			},
+			selectValue() {
+				let arr = [];
+				if (this.isJSON) {
+					this.selectList.forEach(v => {
+						arr.push(v[this.keyId]);
+					})
+				} else {
+					this.selectList.forEach(v => {
+						arr.push(v[this.keyName]);
+					})
+				}
+				return arr;
+			},
+			delSelected(index) {
+				this.selectList.splice(index, 1);
+				this.$emit('getValue', this.selectValue());
+			},
+			onInput() {
+				setTimeout(() => {
+					this.$emit('input', this.inputVal)
+				})
+			},
+			clearInputValue() {
+				this.inputVal = "";
+				this.showSelector = false;
+			},
+			isCheck(keyId) {
+				return this.selectList.findIndex(v => v[this.keyId] == keyId) != -1;
+			}
+		}
+	}
+</script>
+
+<style scoped>
+	.uni-combox {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		min-height: 40px;
+		flex-direction: row;
+		align-items: center;
+		position: relative;
+	}
+
+	.uni-combox__label {
+		font-size: 16px;
+		line-height: 22px;
+		padding-right: 10px;
+		color: #999999;
+	}
+
+	.uni-combox__input-box {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex: 1;
+		flex-direction: column;
+	}
+
+	.combox_tags {
+		display: flex;
+		justify-content: flex-start;
+		flex-wrap: wrap;
+	}
+
+	.combox_tag {
+		padding: 10rpx 15rpx;
+		background-color: #F0F2F5;
+		color: #94979D;
+		margin-right: 10rpx;
+		display: flex;
+		justify-content: flex-start;
+		align-items: center;
+		margin-bottom: 10rpx;
+	}
+
+	.combox_tag .tag_name {
+		margin-right: 10rpx;
+	}
+
+	.combox_input_view {
+		position: relative;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex: 1;
+		flex-direction: row;
+		align-items: center;
+		min-width: 100%;
+	}
+
+	.uni-combox__input {
+		flex: 1;
+		font-size: 16px;
+		height: 22px;
+		line-height: 22px;
+	}
+
+	.uni-combox__input-arrow {
+		padding: 10px;
+	}
+
+	.uni-combox__selector {
+		box-sizing: border-box;
+		position: absolute;
+		top: 42px;
+		left: 0;
+		width: 100%;
+		background-color: #FFFFFF;
+		border-radius: 6px;
+		box-shadow: #DDDDDD 4px 4px 8px, #DDDDDD -4px -4px 8px;
+		z-index: 2;
+	}
+
+	.uni-combox__selector-scroll {
+		box-sizing: border-box;
+	}
+
+	.uni-combox__selector::before {
+		content: '';
+		position: absolute;
+		width: 0;
+		height: 0;
+		border-bottom: solid 6px #FFFFFF;
+		border-right: solid 6px transparent;
+		border-left: solid 6px transparent;
+		left: 50%;
+		top: -6px;
+		margin-left: -6px;
+	}
+
+	.uni-combox__selector-empty,
+	.uni-combox__selector-item {
+		/* #ifdef APP-NVUE */
+		display: flex;
+		/* #endif */
+		line-height: 36px;
+		font-size: 14px;
+		text-align: center;
+		border-bottom: solid 1px #DDDDDD;
+		/* margin: 0px 10px; */
+	}
+
+	.uni-combox__selector-empty:last-child,
+	.uni-combox__selector-item:last-child {
+		border-bottom: none;
+	}
+
+	.maskbox {
+		position: fixed;
+		top: 0;
+		left: 0;
+		width: 100vw;
+		height: 100vh;
+		z-index: 99;
+	}
+</style>

components/uni-section.vue

@@ -0,0 +1,137 @@
+<template>
+	<view class="uni-section" nvue>
+		<view v-if="type" class="uni-section__head">
+			<view :class="type" class="uni-section__head-tag" />
+		</view>
+		<view class="uni-section__content">
+			<text :class="{'distraction':!subTitle}" class="uni-section__content-title">{{ title }}</text>
+			<text v-if="subTitle" class="uni-section__content-sub">{{ subTitle }}</text>
+		</view>
+		<slot />
+	</view>
+</template>
+
+<script>
+	/**
+	 * Section 标题栏
+	 * @description 标题栏
+	 * @property {String} type = [line|circle] 标题装饰类型
+	 * 	@value line 竖线
+	 * 	@value circle 圆形
+	 * @property {String} title 主标题
+	 * @property {String} subTitle 副标题
+	 */
+
+	export default {
+		name: 'UniTitle',
+		props: {
+			type: {
+				type: String,
+				default: ''
+			},
+			title: {
+				type: String,
+				default: ''
+			},
+			subTitle: {
+				type: String,
+				default: ''
+			}
+		},
+		data() {
+			return {}
+		},
+		watch: {
+			title(newVal) {
+				if (uni.report && newVal !== '') {
+					uni.report('title', newVal)
+				}
+			}
+		},
+		methods: {
+			onClick() {
+				this.$emit('click')
+			}
+		}
+	}
+</script>
+<style scoped>
+	.uni-section {
+		position: relative;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		margin-top: 10px;
+		flex-direction: row;
+		align-items: center;
+		padding: 0 10px;
+		height: 50px;
+		background-color: #f8f8f8;
+		/* #ifdef APP-NVUE */
+		border-bottom-color: #e5e5e5;
+		border-bottom-style: solid;
+		border-bottom-width: 0.5px;
+		/* #endif */
+		font-weight: normal;
+	}
+
+	/* #ifndef APP-NVUE */
+	.uni-section:after {
+		position: absolute;
+		bottom: 0;
+		right: 0;
+		left: 0;
+		height: 1px;
+		content: '';
+		-webkit-transform: scaleY(.5);
+		transform: scaleY(.5);
+		background-color: #e5e5e5;
+	}
+
+	/* #endif */
+
+	.uni-section__head {
+		flex-direction: row;
+		justify-content: center;
+		align-items: center;
+		margin-right: 10px;
+	}
+
+	.line {
+		height: 15px;
+		background-color: #c0c0c0;
+		border-radius: 5px;
+		width: 3px;
+	}
+
+	.circle {
+		width: 8px;
+		height: 8px;
+		border-top-right-radius: 50px;
+		border-top-left-radius: 50px;
+		border-bottom-left-radius: 50px;
+		border-bottom-right-radius: 50px;
+		background-color: #c0c0c0;
+	}
+
+	.uni-section__content {
+		flex-direction: column;
+		flex: 1;
+		color: #333;
+	}
+
+	.uni-section__content-title {
+		font-size: 14px;
+		color: #333;
+	}
+
+	.distraction {
+		flex-direction: row;
+		align-items: center;
+	}
+
+	.uni-section__content-sub {
+		font-size: 12px;
+		color: #999;
+	}
+</style>

package.json

@@ -0,0 +1,19 @@
+{
+    "id": "cuihai-combox",
+    "name": "下拉搜索选择组合框已更新",
+    "displayName": "下拉搜索选择组合框已更新",
+    "version": "0.0.3",
+    "description": "下拉搜索选择组合框，支持多选，单选，多种数据格式，自定义字体和背景颜色",
+    "keywords": [
+        "下拉选择",
+        "搜索选择",
+        "组合框",
+        "combox"
+    ],
+    "dcloudext": {
+        "category": [
+            "前端组件",
+            "通用组件"
+        ]
+    }
+}

pages.json

@@ -16,7 +16,7 @@
 		}, {
 			"path": "pages/index",
 			"style": {
-				"navigationBarTitleText": "报单",
+				"navigationBarTitleText": "运单列表",
 				"navigationBarBackgroundColor": "#3c9cff",
 				"navigationBarTextStyle": "white" //状态栏字体颜色
 			},
@@ -96,31 +96,31 @@
 
 		}
 	],
-	// "tabBar": {
-	// 	"color": "#000000",
-	// 	"selectedColor": "#000000",
-	// 	"borderStyle": "white",
-	// 	"backgroundColor": "#ffffff",
-	// 	"list": [{
-	// 			"pagePath": "pages/index",
-	// 			"iconPath": "static/images/tabbar/home.png",
-	// 			"selectedIconPath": "static/images/tabbar/home_.png",
-	// 			"text": "首页"
-	// 		},
-	// 		// {
-	// 		//      "pagePath": "pages/work/index",
-	// 		//      "iconPath": "static/images/tabbar/work.png",
-	// 		//      "selectedIconPath": "static/images/tabbar/work_.png",
-	// 		//      "text": "工作台"
-	// 		//    }, 
-	// 		{
-	// 			"pagePath": "pages/mine/index",
-	// 			"iconPath": "static/images/tabbar/mine.png",
-	// 			"selectedIconPath": "static/images/tabbar/mine_.png",
-	// 			"text": "我的"
-	// 		}
-	// 	]
-	// },
+	"tabBar": {
+		"color": "#000000",
+		"selectedColor": "#000000",
+		"borderStyle": "white",
+		"backgroundColor": "#ffffff",
+		"list": [{
+				"pagePath": "pages/index",
+				"iconPath": "static/images/tabbar/home.png",
+				"selectedIconPath": "static/images/tabbar/home_.png",
+				"text": "运单"
+			},
+			// {
+			//      "pagePath": "pages/work/index",
+			//      "iconPath": "static/images/tabbar/work.png",
+			//      "selectedIconPath": "static/images/tabbar/work_.png",
+			//      "text": "工作台"
+			//    }, 
+			{
+				"pagePath": "pages/mine/index",
+				"iconPath": "static/images/tabbar/mine.png",
+				"selectedIconPath": "static/images/tabbar/mine_.png",
+				"text": "我的"
+			}
+		]
+	},
 	"globalStyle": {
 		"navigationBarTextStyle": "black",
 		"navigationBarTitleText": "RuoYi",

pages/index.vue

@@ -21,11 +21,13 @@
 		<view class="dataList">
 
 			<!-- 列表 -->
-			<view class="list" v-for="(item,index) in orderBillsPlansList" @click="jumpDetails(item.orderNo)">
+			<view class="list" v-for="(item,index) in orderBillsPlansList"
+				@click="jumpDetails(item.orderNo, item.status317, item.status376)">
 				<!-- 头部 -->
 				<view class="head vertical-layout">
 					<view class="no">
-						<view class="blueStick"></view>
+						<view class="blueStick-blue"></view>
+						<!-- <view class="blueStick-red" v-if="item.billStatus == 6"></view> -->
 						<!-- 订单号 -->
 						<text class="odd">订单号:&nbsp;{{ item.orderNo == null ? '' : item.orderNo }}</text>
 					</view>
@@ -34,36 +36,41 @@
 						<text>{{ item.billDate }}</text>
 					</view> -->
 					<view class="date">
-						<text class="true" v-if="item.billStatus == 6">{{ item.billStatusName }}</text>
-						<text class="false" v-if="item.billStatus == 2">{{ item.billStatusName }}</text>
+						<text class="true"
+							v-if="item.status317 == 2 || item.status376 == 2 || item.status376 == 0">{{ item.billStatusName }}</text>
+						<text class="false" v-if="item.status376 == 6">{{ item.billStatusName }}</text>
 					</view>
 				</view>
 				<view class="details">
-					<view class="left">
-						<text class="vertical-layout">装车地:&nbsp;{{ item.loadAddr == null ? '' : item.loadAddr }}</text>
+					<view class="left vertical-layout">
+						<text class="data-left vertical-layout colorBlue">装车地</text>
+						<text class="data-right">{{ item.loadAddr == null ? '' : item.loadAddr }}</text>
 					</view>
-					<view class="right">
-						<text
-							class="vertical-layout">卸车地:&nbsp;{{ item.unLoadAddr == null ? '' : item.unLoadAddr }}</text>
+					<view class="right vertical-layout">
+						<text class="data-left vertical-layout colorBlue">卸车地&nbsp;</text>
+						<text>&nbsp;{{ item.unLoadAddr == null ? '' : item.unLoadAddr }}</text>
 					</view>
 				</view>
 
 				<view class="details">
-					<view class="left">
-						<text
-							class="vertical-layout">品名:&nbsp;{{ item.goodsCName == null ? '' : item.goodsCName }}</text>
+					<view class="left vertical-layout">
+						<text class="data-left vertical-layout colorBlue">装货品名&nbsp;</text>
+						<text>{{ item.goodsCName == null ? '' : item.goodsCName }}</text>
 					</view>
 					<view class="right">
-						<text class="vertical-layout">额定数量:&nbsp;{{ item.rightqty == null ? '' : item.rightqty }}</text>
+						<text class="data-left colorBlue">额定数量&nbsp;</text>
+						<text>{{ item.rightqty == null ? '' : item.rightqty }}</text>
 					</view>
 				</view>
 
 				<view class="details">
-					<view class="left">
-						<text class="vertical-layout">业务员:&nbsp;{{ item.transact == null ? '' : item.transact }}</text>
+					<view class="left vertical-layout">
+						<text class="data-left vertical-layout colorBlue">业务员&nbsp;</text>
+						<text>{{ item.transact == null ? '' : item.transact }}</text>
 					</view>
-					<view class="right">
-						<text class="vertical-layout">日期:&nbsp;{{ item.billDate == null ? '' : item.billDate}}</text>
+					<view class="right vertical-layout">
+						<text class="data-left vertical-layout colorBlue">派单日期</text>
+						<text>{{ item.billDate == null ? '' : item.billDate}}</text>
 					</view>
 				</view>
 			</view>
@@ -106,14 +113,15 @@
 				})
 			},
 			// 跳转详情
-			jumpDetails(orderNo) {
+			jumpDetails(orderNo, status317, status376) {
 				uni.navigateTo({
-					url: 'particulars/index?orderNo=' + orderNo
+					url: 'particulars/index?orderNo=' + orderNo + '&status317=' + status317 + '&status376=' +
+						status376
 				});
 			},
 			// 跳转用户信息
 			userTo() {
-				console.log("跳转用户信息");
+				// console.log("跳转用户信息");
 				uni.navigateTo({
 					url: 'mine/index'
 				});
@@ -129,7 +137,18 @@
 				date.setDate(1);
 				var beginDate = date.toISOString().slice(0, 10);
 				var endDate = this.getFullDate(new Date().setDate(endOfMonth));
-				this.condition.range.push(beginDate, endDate);
+				
+				
+				var date1 = new Date();
+				var date2 = new Date(date1);
+				
+				//-30为30天前，+30可以获得30天后的日期
+				date2.setDate(date1.getDate() - 30);
+				
+				//30天前（月份判断是否小于10，小于10的前面+0）
+				var agoDay = `${date2.getFullYear()}-${date2.getMonth() + 1<10?`0${date2.getMonth() + 1}`:date2.getMonth() + 1}-${date2.getDate()}`;
+				
+				this.condition.range.push(agoDay, endDate);
 
 			},
 			// 日期格式化
@@ -160,13 +179,25 @@
 		display: flex;
 	}
 
-	.blueStick {
+	// 文字浅蓝色
+	.colorBlue {
+		color: #3c9cff;
+	}
+
+	.blueStick-blue {
 		width: 10rpx;
 		height: 100%;
 		border-radius: 5rpx;
 		background-color: #3c9cff;
 	}
 
+	.blueStick-red {
+		width: 10rpx;
+		height: 100%;
+		border-radius: 5rpx;
+		background-color: red;
+	}
+
 	.img {
 		padding-left: 20rpx;
 		max-width: 30rpx;
@@ -259,7 +290,7 @@
 
 				padding-top: 6rpx;
 				padding-bottom: 6rpx;
-				
+
 				// margin-bottom: 20rpx;
 
 				display: flex;
@@ -267,10 +298,11 @@
 				justify-content: space-between;
 
 				.no {
-					
+
 					height: 100%;
 					display: flex;
 					align-items: center;
+
 					.odd {
 						height: 100%;
 						display: flex;
@@ -284,7 +316,7 @@
 					.true {
 						color: red;
 					}
-					
+
 					.false {
 						color: green;
 					}
@@ -293,25 +325,32 @@
 
 			.details {
 
+				width: 100%;
+
 				font-size: 30rpx;
 
-				margin-left: 20rpx;
+				// margin-left: 20rpx;
 				margin-right: 20rpx;
 				margin-bottom: 10rpx;
-				
+
 				padding-bottom: 4rpx;
 
+
+					margin-left: 20rpx;
 				// border-top: 4rpx solid #f0f0f0ff;
-				
-				border-bottom: 2rpx dotted #000;
+
+				// border-bottom: 2rpx dotted #000;
 
 				.left {
-					width: 50%;
+					// text-align: right;
+					width: 35%;
 					float: left;
+
 				}
 
 				.right {
-					margin-left: 50%;
+					width: 50%;
+					margin-left: 30%;
 				}
 
 				.right-two {
@@ -320,6 +359,17 @@
 					padding-bottom: 10rpx;
 
 				}
+
+				.data-left {
+					margin-right: 20rpx;
+					display: inline-block;
+					width: 50%;
+					text-align: right;
+				}
+
+				.data-right {
+					// width: 50%;
+				}
 			}
 
 			.primary {

pages/particulars/claimExpense/index.vue

@@ -5,7 +5,7 @@
 		</view>
 		<view class="striping"></view>
 		<view class="head" @click="telFun">
-			<text>驾驶员: {{formData.driver1Name == null ? '' : formData.driver1Name}}&nbsp;{{formData.driver1mobile == null ? '' : formData.driver1mobile}}</text>
+			<text>驾驶员: {{formData.driver1Name == null ? '' : formData.driver1Name}}&nbsp;电话:&nbsp;{{formData.driver1mobile == null ? '' : formData.driver1mobile}}</text>
 		</view>
 		<u-collapse>
 			<!-- <u-collapse-item title="报销费用" name="claim expense"> -->
@@ -36,61 +36,128 @@
 					</view>
 				</view>
 
-				<view class="box-list vertical-layout">
+
+
+
+
+
+				<view class="box">
+					<view class="data-two">
+						<text class="key">定点加油</text>
+						<view class="list">
+							<uni-data-select :localdata="gasStationList" v-model="formData.gasstation1"
+								:clear="false"></uni-data-select>
+						</view>
+					</view>
+				</view>
+				<view class="box">
+					<view class="data">
+						<text class="key">升数</text>
+						<input class="value" :disabled="disabled" inputmode="decimal" @input="checkUnOilappoint1Qty"
+							placeholder="请输入升数" v-model="formData.oilappoint1Qty" />
+					</view>
+					<view class="data">
+						<text class="key">金额</text>
+
+						<input class="value" :disabled="disabled" inputmode="decimal" @input="checkUnOilappoint1Amt"
+							placeholder="请输入金额" v-model="formData.oilappoint1Amt" />
+					</view>
+				</view>
+
+
+
+
+				<!-- <view class="box-list vertical-layout"> -->
 					<!-- <view class="iconfont icon-jiayouzhan icon"></view> -->
-					<view class="icon">定点加油</view>
-					<view>
-						<u-radio-group class="list" :disabled="disabled" v-model="formData.gasstation1"
+					<!-- <view class="icon" style="color: #3c9cff;">定点加油</view>
+					<view> -->
+						<!-- <u-radio-group class="list" :disabled="disabled" v-model="formData.gasstation1"
 							@change="groupChangeOne">
 							<u-radio :customStyle="{marginBottom: '20rpx', marginRight: '30rpx'}"
 								v-for="(item, index) in gasStationList" :key="index" :label="item.cname"
 								:name="item.cname" @change="radioChangeOne">
 							</u-radio>
-						</u-radio-group>
-						<view class="quantity-aum vertical-layout">
+						</u-radio-group> -->
+						<!-- <view class="list">
+							<uni-data-select :localdata="gasStationList" v-model="formData.gasstation1"
+								:clear="false"></uni-data-select>
+						</view> -->
+
+						<!-- <view class="quantity-aum vertical-layout">
 							<view class="aaa vertical-layout">
-								<text>升数</text>
+								<text style="color: #3c9cff;">升数</text>
 								<input class="key" :disabled="disabled" inputmode="decimal"
 									@input="checkUnOilappoint1Qty" placeholder="请输入升数"
 									v-model="formData.oilappoint1Qty" />
 							</view>
 							<view class="bbb vertical-layout">
-								<text>金额</text>
+								<text style="color: #3c9cff;">金额</text>
 								<input class="value" :disabled="disabled" inputmode="decimal"
 									@input="checkUnOilappoint1Amt" placeholder="请输入金额"
 									v-model="formData.oilappoint1Amt" />
 							</view>
 						</view>
 					</view>
+				</view> -->
+				
+				<view class="box">
+					<view class="data-two">
+						<text class="key">定点加油</text>
+						<view class="list">
+							<uni-data-select :localdata="gasStationList" v-model="formData.gasstation2"
+								:clear="false"></uni-data-select>
+						</view>
+					</view>
 				</view>
-				<view class="box-list vertical-layout">
+				<view class="box">
+					<view class="data">
+						<text class="key">升数</text>
+						<input class="value" :disabled="disabled" inputmode="decimal" @input="checkUnOilappoint2Qty"
+							placeholder="请输入升数" v-model="formData.oilappoint2Qty" />
+					</view>
+					<view class="data">
+						<text class="key">金额</text>
+				
+						<input class="value" :disabled="disabled" inputmode="decimal" @input="checkUnOilappoint2Amt"
+							placeholder="请输入金额" v-model="formData.oilappoint2Amt" />
+					</view>
+				</view>
+
+
+				<!-- <view class="box-list vertical-layout"> -->
 					<!-- <view class="iconfont icon-jiayouzhan icon"></view> -->
-					<view class="icon">定点加油</view>
-					<view>
-						<u-radio-group class="list" :disabled="disabled" v-model="formData.gasstation2"
+					<!-- <view class="icon" style="color: #3c9cff;">定点加油</view>
+					<view> -->
+						<!-- <u-radio-group class="list" :disabled="disabled" v-model="formData.gasstation2"
 							@change="groupChangeTwo">
 							<u-radio :customStyle="{marginBottom: '20rpx', marginRight: '30rpx'}"
 								v-for="(item, index) in gasStationList" :key="index" :label="item.cname"
 								:name="item.cname" @change="radioChangeTwo">
 							</u-radio>
-						</u-radio-group>
+						</u-radio-group> -->
+
+
+						<!-- <view class="list">
+							<uni-data-select :localdata="gasStationList" v-model="formData.gasstation2"
+								:clear="false"></uni-data-select>
+						</view>
 
 						<view class="quantity-aum vertical-layout">
 							<view class="aaa vertical-layout">
-								<text>升数</text>
+								<text style="color: #3c9cff;">升数</text>
 								<input class="key" :disabled="disabled" inputmode="decimal"
 									@input="checkUnOilappoint2Qty" placeholder="请输入升数"
 									v-model="formData.oilappoint2Qty" />
 							</view>
 							<view class="bbb vertical-layout">
-								<text>金额</text>
+								<text style="color: #3c9cff;">金额</text>
 								<input class="value" :disabled="disabled" inputmode="decimal"
 									@input="checkUnOilappoint2Amt" placeholder="请输入金额"
 									v-model="formData.oilappoint2Amt" />
 							</view>
 						</view>
 					</view>
-				</view>
+				</view> -->
 
 				<view class="box">
 					<view class="data">
@@ -127,7 +194,7 @@
 				<view class="table">
 					<view class="data vertical-layout" v-for="(item, index) in itemsList" :key="index">
 						<view class="name">
-							<text>{{ item.cname }}</text>
+							<text style="color: #3c9cff;">{{ item.cname }}</text>
 						</view>
 						<view class="sum">
 							<input class="value" :disabled="disabled" inputmode="decimal"
@@ -143,7 +210,7 @@
 
 		</view>
 
-		<view class="bottom vertical-layout" v-if="formData.billStatus == 2">
+		<view class="bottom vertical-layout" v-if="status376 == 2">
 			<button class="submit" iconColor="#3c9cff" type="primary" @click="submit">提交费用</button>
 		</view>
 
@@ -165,6 +232,7 @@
 	export default {
 		data() {
 			return {
+				aaa: [],
 				// 遮盖罩
 				loading: true,
 				formData: {
@@ -183,7 +251,8 @@
 				radioValueTwo: '', // 当前 radio 的值
 				numTwo: 0, //用于区分是否是重复选中
 				// 输入框禁用
-				disabled: false
+				disabled: false,
+				status376: 0
 			}
 		},
 		onUnload() {
@@ -191,9 +260,18 @@
 			this.loading = true;
 		},
 		onLoad: function(option) {
+			this.status376 = option.status376;
 			// 报销费用下拉选
 			getGasStations().then(res => {
-				this.gasStationList = res.data
+				// this.gasStationList = res.data
+
+				for (var item in res.data) {
+					var data = {
+						text: res.data[item].cname,
+						value: res.data[item].cname
+					};
+					this.gasStationList.push(data);
+				}
 				getItems().then(res => {
 					this.itemsList = res.data
 					getLoadFeeItems(option.orderNo).then(res => {
@@ -257,8 +335,6 @@
 								iconUrl: 'https://cdn.uviewui.com/uview/demo/toast/error.png'
 							})
 						}
-
-
 					})
 				}
 
@@ -315,8 +391,6 @@
 				// 切换选项后需要初始化 num
 				this.numTwo = 0
 			},
-
-
 			checkUnLoadetc(e) {
 				//正则表达试
 				e.target.value = (e.target.value.match(/^\d*(\.?\d{0,2})/g)[0]) || null
@@ -460,6 +534,7 @@
 		background-color: white;
 
 		.head {
+			color: #3c9cff;
 			// width: 100%;
 			height: 100rpx;
 			padding-left: 30rpx;
@@ -539,11 +614,46 @@
 			}
 		}
 
+		// .box {
+
+		// 	color: #3b3b3b;
+
+		// 	overflow: hidden;
+		// 	height: 100rpx;
+
+		// 	border-bottom: 2rpx solid #f0f0f0f0;
+
+		// 	font-size: 30rpx;
+
+		// 	display: flex;
+		// 	align-items: center;
+
+		// 	.data {
+		// 		width: 50%;
+		// 		height: 100%;
+		// 		// background-color: pink;
+		// 		display: flex;
+		// 		align-items: center;
+
+		// 		.key {
+		// 			// background-color: indianred;
+		// 			width: 80%;
+		// 		}
+
+		// 		.value {
+		// 			color: #3b3b3b;
+		// 			width: 45%;
+		// 			margin-right: 20rpx;
+		// 			border-bottom: 2rpx dotted #000;
+		// 		}
+		// 	}
+		// }
+
 		.box {
 
 			color: #3b3b3b;
 
-			overflow: hidden;
+			// overflow: hidden;
 			height: 100rpx;
 
 			border-bottom: 2rpx solid #f0f0f0f0;
@@ -555,23 +665,51 @@
 
 			.data {
 				width: 50%;
-				height: 100%;
-				// background-color: pink;
 				display: flex;
 				align-items: center;
 
 				.key {
-					// background-color: indianred;
-					width: 80%;
+					width: 55%;
+					text-align: right;
+					color: #3c9cff;
 				}
 
 				.value {
-					color: #3b3b3b;
+					margin-left: 20rpx;
 					width: 45%;
-					margin-right: 20rpx;
+					color: #3b3b3b;
 					border-bottom: 2rpx dotted #000;
 				}
 			}
+
+			.data-two {
+				width: 100%;
+				display: flex;
+				align-items: center;
+				
+				.key {
+					width: 35%;
+					text-align: right;
+					color: #3c9cff;
+					
+				}
+				
+				.list {
+					margin-top: 30rpx;
+					margin-bottom: 20rpx;
+					
+					width: 100%;
+					height: 100%;
+					// background-color: pink;
+					
+					height: auto;
+					display: flex;
+					
+					flex-wrap: wrap;
+					
+					font-size: 30rpx;
+				}
+			}
 		}
 
 		.table {
@@ -586,13 +724,15 @@
 				align-items: center;
 
 				.name {
-					width: 50%;
+
+					text-align: right;
+					width: 20%;
 					margin-left: 20rpx;
 					color: #000;
 				}
 
 				.sum {
-
+					margin-left: 20rpx;
 					margin-right: 80rpx;
 					border-bottom: 2rpx dotted #000;
 				}

pages/particulars/index.vue

@@ -1,10 +1,10 @@
 <template>
 	<view class="content">
-		<view class="head">
+		<view class="head-no a-blue">
 			<text>订单号: {{formData.orderNo}}</text>
 		</view>
 		<view class="striping"></view>
-		<view class="head" @click="telFun">
+		<view class="head a-blue" @click="telFun">
 			<text>驾驶员: {{formData.driver1Name == null ? '' : formData.driver1Name}}&nbsp;{{formData.driver1mobile == null ? '' : formData.driver1mobile}}</text>
 		</view>
 		<!-- <u-collapse :value="['Declaration information']"> -->
@@ -12,7 +12,7 @@
 			<!-- <u-collapse-item title="报单信息" name="Declaration information"> -->
 			<view class="box-box">
 
-				<view class="box">
+				<!-- <view class="box">
 					<view class="data">
 						<text class="key">装车吨位</text>
 						<input class="value" :disabled="disabled" inputmode="decimal" @input="checkLoadQty"
@@ -23,9 +23,22 @@
 						<uni-datetime-picker class="value" :disabled="disabled"
 							v-model="formData.loadDateString">{{formData.loadDateString == null ? "请选择日期" : formData.loadDateString }}</uni-datetime-picker>
 					</view>
+				</view> -->
+
+				<view class="box-two">
+					<text class="key">装车吨位</text>
+					<input class="value-two" :disabled="disabled" inputmode="decimal" @input="checkLoadQty"
+						v-model="formData.loadQty" />
 				</view>
 
-				<view class="box">
+				<view class="box-two">
+					<text class="key">装车时间</text>
+					<uni-datetime-picker class="value-two" :disabled="disabled"
+						v-model="formData.loadDateString">{{formData.loadDateString == null ? "请选择日期" : formData.loadDateString }}</uni-datetime-picker>
+				</view>
+
+
+				<!-- <view class="box">
 					<view class="data">
 						<text class="key">卸车吨位</text>
 						<input class="value" :disabled="disabled" inputmode="decimal" @input="checkUnLoadQty"
@@ -36,8 +49,19 @@
 						<uni-datetime-picker class="value" :disabled="disabled"
 							v-model="formData.unLoadDateString">{{formData.unLoadDateString == null ? "请选择日期" : formData.unLoadDateString }}</uni-datetime-picker>
 					</view>
+				</view> -->
+
+				<view class="box-two">
+					<text class="key">卸车吨位</text>
+					<input class="value-two" :disabled="disabled" inputmode="decimal" @input="checkUnLoadQty"
+						v-model="formData.unLoadQty" />
 				</view>
 
+				<view class="box-two">
+					<text class="key">卸车时间</text>
+					<uni-datetime-picker class="value-two" :disabled="disabled"
+						v-model="formData.unLoadDateString">{{formData.unLoadDateString == null ? "请选择日期" : formData.unLoadDateString }}</uni-datetime-picker>
+				</view>
 
 				<view class="box">
 					<view class="data">
@@ -76,38 +100,39 @@
 			<!-- </u-collapse-item> -->
 
 			<u-collapse-item title="照片" name="img" ref="collapseHeight">
-				<u-upload :fileList="fileList1" @afterRead="imgUploading" @delete="deletePic" name="1" multiple
-					:previewFullImage="true" :disabled="this.formData.billStatus == 6"></u-upload>
+				<!-- @afterRead="imgUploading" -->
+				<u-upload :fileList="fileList1" @delete="deletePic" name="1" multiple :previewFullImage="true"
+					:disabled="this.status317 == 2"></u-upload>
 			</u-collapse-item>
 
 			<u-collapse-item title="订单信息" name="order information">
-				<view class="box-two">
+				<view class="box-two textAlign">
 					<text class="key">货物名称</text>
 					<text class="value">{{formData.goodsCName == null ? "" : formData.goodsCName}}</text>
 				</view>
-				<view class="box-two">
+				<view class="box-two textAlign">
 					<text class="key">装车地点</text>
 					<text class="value">{{formData.loadAddr == null ? "" : formData.loadAddr}}</text>
 				</view>
-				<view class="box-two">
+				<view class="box-two textAlign">
 					<text class="key">装车厂家</text>
 					<text class="value">{{formData.loadFactory == null ? "" : formData.loadFactory}}</text>
 				</view>
-				<view class="box-two">
-					<text class="key">联系人及电话</text>
+				<view class="box-two textAlign">
+					<text class="key">联系人电话</text>
 					<text
 						class="value">{{formData.loadAttn == null ? "" : formData.loadAttn}}&nbsp;{{formData.loadAttnTel == null ? "" : formData.loadAttnTel}}</text>
 				</view>
-				<view class="box-two">
+				<view class="box-two textAlign">
 					<text class="key">卸车地点</text>
 					<text class="value">{{formData.unLoadAddr == null ? "" : formData.unLoadAddr}}</text>
 				</view>
-				<view class="box-two">
+				<view class="box-two textAlign">
 					<text class="key">卸车厂家</text>
 					<text class="value">{{formData.unLoadFactory == null ? "" : formData.unLoadFactory}}</text>
 				</view>
-				<view class="box-two">
-					<text class="key">联系人及电话</text>
+				<view class="box-two textAlign">
+					<text class="key">联系人电话</text>
 					<text
 						class="value">{{formData.unLoadAttn == null ? "" : formData.unLoadAttn}}&nbsp;{{formData.unLoadAttnTel == null ? "" : formData.unLoadAttnTel}}</text>
 				</view>
@@ -125,12 +150,12 @@
 		<view class="bottom vertical-layout">
 
 			<view class="onsubmit-script" @click="setOrderBillsPlansByid()">
-				<text v-if="formData.billStatus == 2">提交里程</text>
-				<text v-if="formData.billStatus == 6">里程信息</text>
+				<text v-if="status317 == 2">提交里程</text>
+				<text v-if="status317 == 6 || status317 == 0">里程信息</text>
 			</view>
 			<view class="claim-expense" @click="skipClaimExpense()">
-				<text v-if="formData.billStatus == 2">报销费用</text>
-				<text v-if="formData.billStatus == 6">查看报销</text>
+				<text v-if="status376 == 2">报销费用</text>
+				<text v-if="status376 == 6 || status376 == 0">查看报销</text>
 			</view>
 
 		</view>
@@ -184,11 +209,15 @@
 				// 删除的图片
 				event: {},
 				// 输入框禁用
-				disabled: false
+				disabled: false,
+				status317: 0,
+				status376: 0
 
 			};
 		},
 		onLoad: function(option) {
+			this.status317 = option.status317;
+			this.status376 = option.status376;
 			getOrderBillsPlansByid(option.orderNo).then(res => {
 				this.orderNo = option.orderNo;
 				this.formData = res.data;
@@ -208,25 +237,53 @@
 		methods: {
 			// 保存订单
 			setOrderBillsPlansByid(id) {
-				if (this.formData.billStatus == 2) {
-					putOrderBillsPlansByid(this.formData).then(res => {
-						if (res.code == 200) {
-							// 保存成功弹窗提示
-							this.$refs.uToast.show({
-								type: 'success',
-								message: "保存成功!",
-								iconUrl: 'https://cdn.uviewui.com/uview/demo/toast/success.png'
-							})
-						} else {
-							// 保存失败消息
-							this.$refs.uToast.show({
-								icon: false,
-								message: "保存失败请重试!",
-								iconUrl: 'https://cdn.uviewui.com/uview/demo/toast/error.png'
-							})
-						}
-					})
-				} else if (this.formData.billStatus == 6) {
+				// console.log(this.status317);
+				if (this.status317 == 2) {
+
+					if (this.formData.unLoadQty == '' || this.formData.unLoadQty == null) {
+						this.$refs.uToast.show({
+							type: 'warning',
+							icon: false,
+							message: "请输入卸车吨位!",
+							iconUrl: 'https://cdn.uviewui.com/uview/demo/toast/warning.png'
+						})
+					} else if (this.formData.unLoadDateString == '' || this.formData.unLoadDateString == null) {
+						this.$refs.uToast.show({
+							type: 'warning',
+							icon: false,
+							message: "请选择卸车时间!",
+							iconUrl: 'https://cdn.uviewui.com/uview/demo/toast/warning.png'
+						})
+
+					} else if (this.formData.loadmile == '' || this.formData.loadmile == null) {
+						this.$refs.uToast.show({
+							type: 'warning',
+							icon: false,
+							message: "请输入重车里程!",
+							iconUrl: 'https://cdn.uviewui.com/uview/demo/toast/warning.png'
+						})
+
+					} else {
+
+						putOrderBillsPlansByid(this.formData).then(res => {
+							if (res.code == 200) {
+								// 保存成功弹窗提示
+								this.$refs.uToast.show({
+									type: 'success',
+									message: "保存成功!",
+									iconUrl: 'https://cdn.uviewui.com/uview/demo/toast/success.png'
+								})
+							} else {
+								// 保存失败消息
+								this.$refs.uToast.show({
+									icon: false,
+									message: "保存失败请重试!",
+									iconUrl: 'https://cdn.uviewui.com/uview/demo/toast/error.png'
+								})
+							}
+						})
+					}
+				} else {
 					// this.$refs.uToast.show({
 					// 	type: 'warning',
 					// 	icon: false,
@@ -251,14 +308,14 @@
 			},
 			// 删除图片
 			deletePic(event) {
-				if (this.formData.billStatus == 6) {
+				if (this.formData.status376 == 6) {
 					this.$refs.uToast.show({
 						type: 'warning',
 						icon: false,
 						message: "不允许修改!",
 						iconUrl: 'https://cdn.uviewui.com/uview/demo/toast/warning.png'
 					})
-				} else if (this.formData.billStatus == 2) {
+				} else if (this.formData.status376 == 2) {
 					this.event = event;
 					this.deleteShow = true;
 				}
@@ -321,8 +378,8 @@
 							pictureUploading(data, dataForm).then(res => {
 
 								let item = this[`fileList${event.name}`][fileListLen]
-								console.log("item");
-								console.log(item);
+								// console.log("item");
+								// console.log(item);
 								this[`fileList${event.name}`].splice(fileListLen, 1, Object.assign(
 									item, {
 										status: 'success',
@@ -357,7 +414,7 @@
 			// 跳转报销费用页面
 			skipClaimExpense() {
 				uni.navigateTo({
-					url: '/pages/particulars/claimExpense/index?orderNo=' + this.orderNo,
+					url: '/pages/particulars/claimExpense/index?orderNo=' + this.orderNo + '&status376=' + this.status376,
 				});
 			},
 			// 跳转注意事项
@@ -402,6 +459,11 @@
 	.vertical-layout {
 		display: flex;
 	}
+	
+	.textAlign {
+		text-align: right;
+		// margin-left: 20rpx;
+	}
 
 	// 分割线
 	.striping {
@@ -414,12 +476,32 @@
 		padding-left: 30rpx;
 		padding-right: 30rpx;
 	}
+	
+	.a-blue {
+		color: #3c9cff;
+	}
 
 	.content {
 
 		// box-sizing: border-box;
 		background-color: white;
 
+		.head-no {
+			// border-radius: 0 0 40rpx 40rpx;
+			// width: 500rpx;
+			height: 100rpx;
+			padding-left: 30rpx;
+
+			vertical-align: middle;
+			display: table-cell;
+
+			font-size: 34rpx;
+			font-weight: 900;
+
+			// background-color: #3c9cff;
+
+		}
+
 		.head {
 			// width: 100%;
 			height: 100rpx;
@@ -440,10 +522,10 @@
 			overflow: hidden;
 			height: 100rpx;
 
-			border-bottom: 2rpx solid #f0f0f0f0;
+			// border-bottom: 2rpx solid #f0f0f0f0;
 
 			padding-left: 20rpx;
-			// margin-right: 20rpx;
+			margin-right: 20rpx;
 
 			font-size: 30rpx;
 
@@ -451,13 +533,17 @@
 			align-items: center;
 
 			.key {
+				
+				
 				display: inline-block;
 				width: 24%;
+				color:  #3c9cff;
 				// font-weight: 700;
 
 			}
 
 			.value {
+				margin-left: 20rpx;
 				// color: #787878;
 				color: #3b3b3b;
 				margin-right: 20rpx;
@@ -465,8 +551,9 @@
 			}
 
 			.value-two {
+				width: calc(100% - 24%);
 				color: #3b3b3b;
-				margin-right: 20rpx;
+				// margin-right: 20rpx;
 				border-bottom: 2rpx dotted #000;
 			}
 		}
@@ -478,7 +565,7 @@
 			overflow: hidden;
 			height: 100rpx;
 
-			border-bottom: 2rpx solid #f0f0f0f0;
+			// border-bottom: 2rpx solid #f0f0f0f0;
 			padding-left: 20rpx;
 			font-size: 30rpx;
 
@@ -495,6 +582,7 @@
 				.key {
 					// background-color: indianred;
 					width: 100%;
+					color:  #3c9cff;
 				}
 
 				.key-date {
@@ -516,12 +604,12 @@
 			position: fixed;
 			bottom: calc(var(--window-bottom));
 			width: 100%;
-			height: 100rpx;
+			height: 80rpx;
 
 			background-color: pink;
 
 			text-align: center;
-			line-height: 100rpx;
+			line-height: 80rpx;
 
 
 

uni_modules/uni-data-select/components/uni-data-select/uni-data-select.vue

@@ -348,7 +348,7 @@
 
 	.uni-select {
 		font-size: 14px;
-		border: 1px solid $uni-border-3;
+		// border: 1px solid $uni-border-3;
 		box-sizing: border-box;
 		border-radius: 4px;
 		padding: 0 5px;
@@ -360,7 +360,7 @@
 		/* #endif */
 		flex-direction: row;
 		align-items: center;
-		border-bottom: solid 1px $uni-border-3;
+		// border-bottom: solid 1px $uni-border-3;
 		width: 100%;
 		flex: 1;
 		height: 35px;