2024-06-07 15:18:05 +08:00
17 changed files with 1015 additions and 51 deletions
--- a/api/financialCenter/serviceStation.js
+++ b/api/financialCenter/serviceStation.js
@@ -8,5 +8,11 @@ export default {
       method: 'post',
 	   data:data
     })
-   }
+   },
+   liekQuery (query) {
+      return request({
+        url: `/oil-user/sysCustomerInfo/liekQuery/${query}`,
+        method: 'get',
+      })
+    },
 }
--- a/contractManagement/list/details.vue
+++ b/contractManagement/list/details.vue
@@ -9,11 +9,11 @@
 		<view class="list">
 			<view class="item" v-for="item,index in infoList" :key="index">
 				<text>{{item.title}}</text>
-				<text v-if="item.type == 'text'">{{item.value}}</text>
-				<text v-if="item.type == 'date'" :style="{ color: dateHandle(item.value) }">{{item.value}}</text>
-				<text v-if="item.type == 'selector'">{{item.value}}</text>
+				<text v-if="item.type === 'text'">{{item.value}}</text>
+				<text v-if="item.type === 'date'" :style="{ color: dateHandle(item.value) }">{{item.value}}</text>
+				<text v-if="item.type === 'selector'">{{item.value}}</text>
 				<text v-if="item.type == 'number'">{{ item.value }}</text>
-				<template v-if="item.type == 'file'">
+				<template v-if="item.type === 'file'">
 					<text v-if="!item.value">暂无</text>
 					<template v-else>
 						<view v-if="item.value.endsWith('png') || item.value.endsWith('jpg')" class="file"
@@ -23,10 +23,36 @@
 						</view>
 						<view v-else class="file-download" @click="seeDocument(item.value)">
 							<image src="https://publicxingyou.oss-cn-hangzhou.aliyuncs.com/mp-oil/oms-file.png"></image>
-							<image src="https://publicxingyou.oss-cn-hangzhou.aliyuncs.com/mp-oil/eye.png"></image>
+							<view>
+								<view>{{altHandle(item.value)}}</view>
+								<text>点击在线预览</text>
+							</view>
+							<!-- <image src="https://publicxingyou.oss-cn-hangzhou.aliyuncs.com/mp-oil/eye.png"></image> -->
 						</view>
 					</template>
 				</template>
+				<view v-if="item.type === 'filelist'" style="padding-left: 200rpx;">
+					<text v-if="!item.value.length">暂无</text>
+					<template v-else>
+						<template v-for="(_item, _index) in item.value">
+							<view :key="_index" v-if="_item.endsWith('png') || _item.endsWith('jpg')" class="file"
+								style="margin-bottom:10rpx" @click="seePicture(_item)">
+								<image :src="_item"></image>
+								<text>{{_item | nameFilters}}</text>
+							</view>
+							<view :key="_index" v-else class="file-download special" @click="seeDocument(_item)">
+								<image src="https://publicxingyou.oss-cn-hangzhou.aliyuncs.com/mp-oil/oms-file.png">
+								</image>
+								<view>
+									<view>{{altHandle(_item)}}</view>
+									<text>点击在线预览</text>
+								</view>
+								<!-- <image src="https://publicxingyou.oss-cn-hangzhou.aliyuncs.com/mp-oil/eye.png"></image> -->
+							</view>
+						</template>
+
+					</template>
+				</view>
 			</view>
 		</view>
 		<uni-popup ref="popup" background-color="#fff">
@@ -55,7 +81,8 @@
 			this.styles = uni.getMenuButtonBoundingClientRect()

 			if (option.details) {
-				this.infoList = JSON.parse(option.details)
+				console.log('option', decodeURIComponent(option.details))
+				this.infoList = JSON.parse(decodeURIComponent(option.details))
 			}
 			console.log(this.infoList)
 		},
@@ -67,6 +94,10 @@
 			}
 		},
 		methods: {
+			altHandle(item) {
+				let arr = item.split('/')
+				return arr[arr.length - 1]
+			},
 			dateHandle(val) {
 				let dueTime = new Date(val).getTime()
 				return this.today > dueTime ? '#ff0000' : '#333'
@@ -89,7 +120,7 @@
 								console.log(_res1)
 							},
 							fail: (_res2) => {
-								console.log('_res2',_res2)
+								console.log('_res2', _res2)
 								uni.showToast({
 									title: '该文件格式暂不支持在线预览',
 									icon: 'none'
@@ -188,24 +219,56 @@
 		}

 		.file-download {
-			display: inline;
+			// display: inline;
+			// display: flex;
+			margin-bottom: 10rpx;
+	
+				display: inline-flex;
+			

-			image {
-				&:nth-of-type(1) {
-					// margin-right: 15rpx;
-					width: 80rpx;
-					height: 80rpx;
-					border-radius: 10rpx;
+			>image {
+				width: 80rpx;
+				height: 80rpx;
+				border-radius: 10rpx;
+			}
+
+			>view {
+				flex: 1;
+				margin-left: 10rpx;
+				padding-top: 7rpx;
+
+				>view {
+
+					width: 300rpx;
+					font-size: 22rpx;
+					white-space: nowrap;
+					overflow: hidden;
+					text-overflow: ellipsis;
 				}

-				&:nth-of-type(2) {
-					position: relative;
-					left: -5rpx;
-					bottom: -5rpx;
-					width: 32rpx;
-					height: 32rpx;
+				>text {
+					margin-top: 30rpx;
+					font-size: 22rpx;
+					color: #999;
 				}
 			}
+
+			// image {
+			// 	&:nth-of-type(1) {
+			// 		// margin-right: 15rpx;
+			// 		width: 80rpx;
+			// 		height: 80rpx;
+			// 		border-radius: 10rpx;
+			// 	}
+
+			// 	&:nth-of-type(2) {
+			// 		position: relative;
+			// 		left: -5rpx;
+			// 		bottom: -5rpx;
+			// 		width: 32rpx;
+			// 		height: 32rpx;
+			// 	}
+			// }
 		}
 	}
-</style>
+</style>
--- a/contractManagement/list/index.vue
+++ b/contractManagement/list/index.vue
@@ -174,7 +174,7 @@
 			},
 			jump(item) {
 				uni.navigateTo({
-					url: `./details?details=${item.details}`
+					url: `./details?details=${encodeURIComponent(item.details)}`
 				})
 			},
 		}
--- a/financialCenter/serviceStation/components/charge.vue
+++ b/financialCenter/serviceStation/components/charge.vue
@@ -0,0 +1,136 @@
+<template>
+	<view>
+		<uni-popup @change="change" ref="popup" type="bottom" background-color="#fff">
+			<view style="height:35vh; display: flex;flex-direction: column;">
+				<view style="display: flex;">
+					<uni-easyinput @input="iconClick" @confirm="confirmFn" style="width: 90%; margin: 0 auto;"
+						prefixIcon="search" v-model="nameOrPhone" placeholder="请输入内容" />
+				</view>
+				<picker-view @change="pickerChange" style="flex: 1;">
+					<picker-view-column>
+						<view style="display: flex;align-items: center;justify-content: center;"
+							v-for="(item,index) in list" :key="index">{{ item.userName || item.nickName}}</view>
+					</picker-view-column>
+				</picker-view>
+				<view @click="buttenFn" class="butten">
+					确定
+				</view>
+			</view>
+		</uni-popup>
+	</view>
+</template>
+
+<script>
+	import serve from '@/api/financialCenter/serviceStation.js'
+	export default {
+		name: 'charge',
+		props: {
+			value: {
+				type: Boolean,
+				default: false
+			}
+		},
+		watch: {
+			value: function(n, o) {
+				// console.log('监听', n)
+				if (n) {
+					this.$refs.popup.open('bottom')
+				} else {
+					this.$refs.popup.close()
+				}
+			}
+		},
+		created() {
+			this.getlist()
+		},
+		data() {
+			return {
+				nameOrPhone: '',
+				determine: null,
+				list: [
+
+				],
+				seleData: null,
+				seachValue: '',
+				getData: {
+					pageSize: 5,
+					currentPage: 1,
+					params: {
+						nameOrPhone: '',
+					}
+				},
+			}
+		},
+		methods: {
+			iconClick() {
+				if (!this.getData.params.nameOrPhone) {
+					this.getlist()
+				}
+			},
+			buttenFn() {
+				clearTimeout(this.determine)
+				uni.showLoading({
+					title: '加载中'
+				})
+				this.determine = setTimeout(() => {
+					this.$emit('chargeChange', this.seleData)
+					uni.hideLoading()
+					this.$emit('input', false)
+				}, 700)
+			},
+			getlist() {
+				if (!this.nameOrPhone) {
+					this.list = []
+					this.list.unshift({
+						userName: '全部',
+						id: ''
+					})
+					this.seleData = this.list[0]
+					return
+				}
+				serve.liekQuery(this.nameOrPhone).then(res => {
+					if (res.code !== 20000) return
+					if (res.data.length == 0) {
+						uni.showToast({
+							title: '暂无数据',
+							icon: 'none'
+						})
+						return
+					}
+					this.list = res.data
+					this.list.unshift({
+						userName: '全部',
+						id: ''
+					})
+					this.seleData = this.list[0]
+					// console.log('this.list', this.list)
+					// console.log('this.seleData', this.seleData)
+					// console.log(res, '负责人组件')
+				})
+			},
+			pickerChange(e) {
+				this.seleData = this.list[e.detail.value[0]]
+			},
+			change(e) {
+				this.$emit('input', e.show)
+			},
+			confirmFn() {
+				this.getlist()
+			}
+		}
+	}
+</script>
+
+<style scoped>
+	.butten {
+		display: flex;
+		justify-content: center;
+		font-size: 35rpx;
+		color: #ffffff;
+		width: 60%;
+		margin: 10rpx auto;
+		border-radius: 10px;
+		background: #007AFF;
+		padding: 20rpx 0;
+	}
+</style>
--- a/financialCenter/serviceStation/index.vue
+++ b/financialCenter/serviceStation/index.vue
@@ -5,11 +5,21 @@
 			<uni-nav-bar @clickLeft='jump(-1)' :border="false" color='white' backgroundColor="rgba(0,0,0,0)"
 				left-icon="back" title="油站账户管理" />
 			<view class="seach">
-				<uni-easyinput @confirm='seachFn' style="border-radius:12rpx ;" prefixIcon="search"
+				<uni-easyinput @confirm='seachFn' style="border-radius:12rpx; margin-bottom: 10rpx;" prefixIcon="search"
 					placeholder-style="color:#bbb;font-weight: 100;" confirmType="搜索"
 					v-model="paramter.params.accountName" placeholder="请输入油站账户名称">
 				</uni-easyinput>
+				<!-- <uni-easyinput class="input" style="border-radius:12rpx ;" prefixIcon="search"
+					placeholder-style="color:#bbb;font-weight: 100;" placeholder="业务负责人姓名/手机号">
+				</uni-easyinput> -->
+				<view style="display: flex; align-items: center;margin-top: 10rpx;">
+
+					<view class="input" @click="selectLeader">{{paramter.params.name || '运营负责人'}} </view>
+					<uni-data-select class="select" v-model="paramter.params.accountState"
+						:localdata="range" @change="changeSelect"></uni-data-select>
+				</view>
 			</view>
+
 		</view>
 		<view style="flex:1;overflow: hidden;">
 			<view v-if="!tableList.length"
@@ -29,26 +39,51 @@
 				</view>
 			</scroll-view>
 		</view>
+		<charge @chargeChange='chargeChange' v-model="controlWindows.charge" />
 	</view>
 </template>

 <script>
 	import serve from '@/api/financialCenter/serviceStation.js'
+
+	import charge from './components/charge.vue'
 	export default {
+		components: {
+			charge
+		},
 		data() {
 			return {
+				controlWindows: {
+					charge: false
+				},
 				styles: {},
 				paramter: {
 					currentPage: 1,
 					pageSize: 10,
-					sorted:{
-						createTime:'desc'
+					sorted: {
+						createTime: 'desc'
 					},
 					params: {
 						accountName: ''
 					}
 				},
-				tableList: []
+				tableList: [],
+				range: [{
+						value: "0",
+						text: "禁用"
+					},
+					{
+						value: "1",
+						text: "启用"
+					},
+					{
+						value: "-1",
+						text: "冻结"
+					}, {
+						value: "-5",
+						text: "作废"
+					},
+				],
 			}
 		},
 		onLoad() {
@@ -59,6 +94,17 @@
 		// 	this.getByPage()
 		// },
 		methods: {
+			chargeChange(item) {
+				this.paramter.params.businessLeader = item.id
+				this.paramter.params.name = item.userName
+				this.seachFn()
+			},
+			selectLeader() {
+				this.controlWindows.charge = true
+			},
+			changeSelect() {
+				this.seachFn()
+			},
 			seachFn() {
 				this.tableList = []
 				this.paramter.currentPage = 1
@@ -106,6 +152,27 @@
 </script>

 <style>
+	.input {
+		/* display: inline-block; */
+		/* margin-top: 10rpx; */
+		height: 70rpx;
+		border-radius: 12rpx;
+		width: 69%;
+		background: #fff;
+		line-height: 70rpx;
+		padding-left: 30rpx;
+		color: #999;
+	}
+
+	.select {
+		/* margin-top: 10rpx; */
+		margin-left: 2%;
+		display: inline-block;
+		width: 29%;
+		background: #fff;
+		border-radius: 12rpx;
+	}
+
 	.uni-easyinput__content {
 		background-color: #fff;
 	}
@@ -162,5 +229,4 @@
 		color: #778899;
 		font-size: 24rpx;
 	}
-
-</style>
+</style>
--- a/orderList/orderDetails/orderDetails.vue
+++ b/orderList/orderDetails/orderDetails.vue
@@ -263,7 +263,7 @@
 								duration: 2000
 							});
 							setTimeout(() => {
-								that.getList(id)
+								this.getList(id)
 							}, 1000)
 						}
 					})
@@ -277,7 +277,7 @@
 								duration: 2000
 							});
 							setTimeout(() => {
-								that.getList(id)
+								this.getList(id)
 							}, 1000)
 						}
 					})
--- a/uni_modules/uni-data-select/changelog.md
+++ b/uni_modules/uni-data-select/changelog.md
@@ -0,0 +1,37 @@
+## 1.0.7（2024-01-20）
+- 修复 长文本回显超过容器的bug，超过容器部分显示省略号
+## 1.0.6（2023-04-12）
+- 修复 微信小程序点击时会改变背景颜色的 bug
+## 1.0.5（2023-02-03）
+- 修复 禁用时会显示清空按钮
+## 1.0.4（2023-02-02）
+- 优化 查询条件短期内多次变更只查询最后一次变更后的结果
+- 调整 内部缓存键名调整为 uni-data-select-lastSelectedValue
+## 1.0.3（2023-01-16）
+- 修复 不关联服务空间报错的问题
+## 1.0.2（2023-01-14）
+- 新增  属性 `format` 可用于格式化显示选项内容
+## 1.0.1（2022-12-06）
+- 修复  当where变化时，数据不会自动更新的问题
+## 0.1.9（2022-09-05）
+- 修复 微信小程序下拉框出现后选择会点击到蒙板后面的输入框
+## 0.1.8（2022-08-29）
+- 修复 点击的位置不准确
+## 0.1.7（2022-08-12）
+- 新增 支持 disabled 属性
+## 0.1.6（2022-07-06）
+- 修复 pc端宽度异常的bug
+## 0.1.5
+- 修复 pc端宽度异常的bug
+## 0.1.4（2022-07-05）
+- 优化 显示样式
+## 0.1.3（2022-06-02）
+- 修复 localdata 赋值不生效的 bug
+- 新增 支持  uni.scss 修改颜色
+- 新增 支持选项禁用（数据选项设置 disabled: true 即禁用）
+## 0.1.2（2022-05-08）
+- 修复 当 value 为 0 时选择不生效的 bug
+## 0.1.1（2022-05-07）
+- 新增 记住上次的选项（仅 collection 存在时有效）
+## 0.1.0（2022-04-22）
+- 初始化
--- a/uni_modules/uni-data-select/components/uni-data-select/uni-data-select.vue
+++ b/uni_modules/uni-data-select/components/uni-data-select/uni-data-select.vue
@@ -0,0 +1,527 @@
+<template>
+	<view class="uni-stat__select">
+		<span v-if="label" class="uni-label-text hide-on-phone">{{label + '：'}}</span>
+		<view class="uni-stat-box" :class="{'uni-stat__actived': current}">
+			<view class="uni-select" :class="{'uni-select--disabled':disabled}">
+				<view class="uni-select__input-box" @click="toggleSelector">
+					<view v-if="current" class="uni-select__input-text">{{textShow}}</view>
+					<view v-else class="uni-select__input-text uni-select__input-placeholder">{{typePlaceholder}}</view>
+					<view v-if="current && clear && !disabled" @click.stop="clearVal" >
+						<uni-icons type="clear" color="#c0c4cc" size="24"/>
+					</view>
+					<view v-else>
+						<uni-icons :type="showSelector? 'top' : 'bottom'" size="14" color="#999" />
+					</view>
+				</view>
+				<view class="uni-select--mask" v-if="showSelector" @click="toggleSelector" />
+				<view class="uni-select__selector" v-if="showSelector">
+					<view class="uni-popper__arrow"></view>
+					<scroll-view scroll-y="true" class="uni-select__selector-scroll">
+						<view class="uni-select__selector-empty" v-if="mixinDatacomResData.length === 0">
+							<text>{{emptyTips}}</text>
+						</view>
+						<view v-else class="uni-select__selector-item" v-for="(item,index) in mixinDatacomResData" :key="index"
+							@click="change(item)">
+							<text :class="{'uni-select__selector__disabled': item.disable}">{{formatItemName(item)}}</text>
+						</view>
+					</scroll-view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	/**
+	 * DataChecklist 数据选择器
+	 * @description 通过数据渲染的下拉框组件
+	 * @tutorial https://uniapp.dcloud.io/component/uniui/uni-data-select
+	 * @property {String} value 默认值
+	 * @property {Array} localdata 本地数据 ，格式 [{text:'',value:''}]
+	 * @property {Boolean} clear 是否可以清空已选项
+	 * @property {Boolean} emptyText 没有数据时显示的文字 ，本地数据无效
+	 * @property {String} label 左侧标题
+	 * @property {String} placeholder 输入框的提示文字
+	 * @property {Boolean} disabled 是否禁用
+	 * @event {Function} change  选中发生变化触发
+	 */
+
+	export default {
+		name: "uni-data-select",
+		mixins: [uniCloud.mixinDatacom || {}],
+		props: {
+			localdata: {
+				type: Array,
+				default () {
+					return []
+				}
+			},
+			value: {
+				type: [String, Number],
+				default: ''
+			},
+			modelValue: {
+				type: [String, Number],
+				default: ''
+			},
+			label: {
+				type: String,
+				default: ''
+			},
+			placeholder: {
+				type: String,
+				default: '请选择'
+			},
+			emptyTips: {
+				type: String,
+				default: '无选项'
+			},
+			clear: {
+				type: Boolean,
+				default: true
+			},
+			defItem: {
+				type: Number,
+				default: 0
+			},
+			disabled: {
+				type: Boolean,
+				default: false
+			},
+			// 格式化输出 用法 field="_id as value, version as text, uni_platform as label" format="{label} - {text}"
+			format: {
+				type: String,
+				default: ''
+			},
+		},
+		data() {
+			return {
+				showSelector: false,
+				current: '',
+				mixinDatacomResData: [],
+				apps: [],
+				channels: [],
+				cacheKey: "uni-data-select-lastSelectedValue",
+			};
+		},
+		created() {
+			this.debounceGet = this.debounce(() => {
+				this.query();
+			}, 300);
+			if (this.collection && !this.localdata.length) {
+				this.debounceGet();
+			}
+		},
+		computed: {
+			typePlaceholder() {
+				const text = {
+					'opendb-stat-app-versions': '版本',
+					'opendb-app-channels': '渠道',
+					'opendb-app-list': '应用'
+				}
+				const common = this.placeholder
+				const placeholder = text[this.collection]
+				return placeholder ?
+					common + placeholder :
+					common
+			},
+			valueCom(){
+				// #ifdef VUE3
+				return this.modelValue;
+				// #endif
+				// #ifndef VUE3
+				return this.value;
+				// #endif
+			},
+			textShow(){
+				// 长文本显示
+				let text = this.current;
+				if (text.length > 10) {
+					return text.slice(0, 25) + '...';
+				}
+				return text;
+			}
+		},
+
+		watch: {
+			localdata: {
+				immediate: true,
+				handler(val, old) {
+					if (Array.isArray(val) && old !== val) {
+						this.mixinDatacomResData = val
+					}
+				}
+			},
+			valueCom(val, old) {
+				this.initDefVal()
+			},
+			mixinDatacomResData: {
+				immediate: true,
+				handler(val) {
+					if (val.length) {
+						this.initDefVal()
+					}
+				}
+			},
+
+		},
+		methods: {
+			debounce(fn, time = 100){
+				let timer = null
+				return function(...args) {
+					if (timer) clearTimeout(timer)
+					timer = setTimeout(() => {
+						fn.apply(this, args)
+					}, time)
+				}
+			},
+			// 执行数据库查询
+			query(){
+				this.mixinDatacomEasyGet();
+			},
+			// 监听查询条件变更事件
+			onMixinDatacomPropsChange(){
+				if (this.collection) {
+					this.debounceGet();
+				}
+			},
+			initDefVal() {
+				let defValue = ''
+				if ((this.valueCom || this.valueCom === 0) && !this.isDisabled(this.valueCom)) {
+					defValue = this.valueCom
+				} else {
+					let strogeValue
+					if (this.collection) {
+						strogeValue = this.getCache()
+					}
+					if (strogeValue || strogeValue === 0) {
+						defValue = strogeValue
+					} else {
+						let defItem = ''
+						if (this.defItem > 0 && this.defItem <= this.mixinDatacomResData.length) {
+							defItem = this.mixinDatacomResData[this.defItem - 1].value
+						}
+						defValue = defItem
+					}
+          if (defValue || defValue === 0) {
+					  this.emit(defValue)
+          }
+				}
+				const def = this.mixinDatacomResData.find(item => item.value === defValue)
+				this.current = def ? this.formatItemName(def) : ''
+			},
+
+			/**
+			 * @param {[String, Number]} value
+			 * 判断用户给的 value 是否同时为禁用状态
+			 */
+			isDisabled(value) {
+				let isDisabled = false;
+
+				this.mixinDatacomResData.forEach(item => {
+					if (item.value === value) {
+						isDisabled = item.disable
+					}
+				})
+
+				return isDisabled;
+			},
+
+			clearVal() {
+				this.emit('')
+				if (this.collection) {
+					this.removeCache()
+				}
+			},
+			change(item) {
+				if (!item.disable) {
+					this.showSelector = false
+					this.current = this.formatItemName(item)
+					this.emit(item.value)
+				}
+			},
+			emit(val) {
+				this.$emit('input', val)
+				this.$emit('update:modelValue', val)
+				this.$emit('change', val)
+				if (this.collection) {
+					this.setCache(val);
+				}
+			},
+			toggleSelector() {
+				if (this.disabled) {
+					return
+				}
+
+				this.showSelector = !this.showSelector
+			},
+			formatItemName(item) {
+				let {
+					text,
+					value,
+					channel_code
+				} = item
+				channel_code = channel_code ? `(${channel_code})` : ''
+
+				if (this.format) {
+					// 格式化输出
+					let str = "";
+					str = this.format;
+					for (let key in item) {
+						str = str.replace(new RegExp(`{${key}}`,"g"),item[key]);
+					}
+					return str;
+				} else {
+					return this.collection.indexOf('app-list') > 0 ?
+						`${text}(${value})` :
+						(
+							text ?
+							text :
+							`未命名${channel_code}`
+						)
+				}
+			},
+			// 获取当前加载的数据
+			getLoadData(){
+				return this.mixinDatacomResData;
+			},
+			// 获取当前缓存key
+			getCurrentCacheKey(){
+				return this.collection;
+			},
+			// 获取缓存
+			getCache(name=this.getCurrentCacheKey()){
+				let cacheData = uni.getStorageSync(this.cacheKey) || {};
+				return cacheData[name];
+			},
+			// 设置缓存
+			setCache(value, name=this.getCurrentCacheKey()){
+				let cacheData = uni.getStorageSync(this.cacheKey) || {};
+				cacheData[name] = value;
+				uni.setStorageSync(this.cacheKey, cacheData);
+			},
+			// 删除缓存
+			removeCache(name=this.getCurrentCacheKey()){
+				let cacheData = uni.getStorageSync(this.cacheKey) || {};
+				delete cacheData[name];
+				uni.setStorageSync(this.cacheKey, cacheData);
+			},
+		}
+	}
+</script>
+
+<style lang="scss">
+	$uni-base-color: #6a6a6a !default;
+	$uni-main-color: #333 !default;
+	$uni-secondary-color: #909399 !default;
+	$uni-border-3: #e5e5e5;
+
+
+	/* #ifndef APP-NVUE */
+	@media screen and (max-width: 500px) {
+		.hide-on-phone {
+			display: none;
+		}
+	}
+
+	/* #endif */
+	.uni-stat__select {
+		display: flex;
+		align-items: center;
+		// padding: 15px;
+		/* #ifdef H5 */
+		cursor: pointer;
+		/* #endif */
+		width: 100%;
+		flex: 1;
+		box-sizing: border-box;
+	}
+
+	.uni-stat-box {
+		width: 100%;
+		flex: 1;
+	}
+
+	.uni-stat__actived {
+		width: 100%;
+		flex: 1;
+		// outline: 1px solid #2979ff;
+	}
+
+	.uni-label-text {
+		font-size: 14px;
+		font-weight: bold;
+		color: $uni-base-color;
+		margin: auto 0;
+		margin-right: 5px;
+	}
+
+	.uni-select {
+		font-size: 14px;
+		border: 1px solid $uni-border-3;
+		box-sizing: border-box;
+		border-radius: 4px;
+		padding: 0 5px;
+		padding-left: 10px;
+		position: relative;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		user-select: none;
+		/* #endif */
+		flex-direction: row;
+		align-items: center;
+		border-bottom: solid 1px $uni-border-3;
+		width: 100%;
+		flex: 1;
+		height: 35px;
+
+		&--disabled {
+			background-color: #f5f7fa;
+			cursor: not-allowed;
+		}
+	}
+
+	.uni-select__label {
+		font-size: 16px;
+		// line-height: 22px;
+		height: 35px;
+		padding-right: 10px;
+		color: $uni-secondary-color;
+	}
+
+	.uni-select__input-box {
+		height: 35px;
+		position: relative;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex: 1;
+		flex-direction: row;
+		align-items: center;
+	}
+
+	.uni-select__input {
+		flex: 1;
+		font-size: 14px;
+		height: 22px;
+		line-height: 22px;
+	}
+
+	.uni-select__input-plac {
+		font-size: 14px;
+		color: $uni-secondary-color;
+	}
+
+	.uni-select__selector {
+		/* #ifndef APP-NVUE */
+		box-sizing: border-box;
+		/* #endif */
+		position: absolute;
+		top: calc(100% + 12px);
+		left: 0;
+		width: 100%;
+		background-color: #FFFFFF;
+		border: 1px solid #EBEEF5;
+		border-radius: 6px;
+		box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
+		z-index: 3;
+		padding: 4px 0;
+	}
+
+	.uni-select__selector-scroll {
+		/* #ifndef APP-NVUE */
+		max-height: 200px;
+		box-sizing: border-box;
+		/* #endif */
+	}
+
+	/* #ifdef H5 */
+	@media (min-width: 768px) {
+		.uni-select__selector-scroll {
+			max-height: 600px;
+		}
+	}
+	/* #endif */
+
+	.uni-select__selector-empty,
+	.uni-select__selector-item {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		cursor: pointer;
+		/* #endif */
+		line-height: 35px;
+		font-size: 14px;
+		text-align: center;
+		/* border-bottom: solid 1px $uni-border-3; */
+		padding: 0px 10px;
+	}
+
+	.uni-select__selector-item:hover {
+		background-color: #f9f9f9;
+	}
+
+	.uni-select__selector-empty:last-child,
+	.uni-select__selector-item:last-child {
+		/* #ifndef APP-NVUE */
+		border-bottom: none;
+		/* #endif */
+	}
+
+	.uni-select__selector__disabled {
+		opacity: 0.4;
+		cursor: default;
+	}
+
+	/* picker 弹出层通用的指示小三角 */
+	.uni-popper__arrow,
+	.uni-popper__arrow::after {
+		position: absolute;
+		display: block;
+		width: 0;
+		height: 0;
+		border-color: transparent;
+		border-style: solid;
+		border-width: 6px;
+	}
+
+	.uni-popper__arrow {
+		filter: drop-shadow(0 2px 12px rgba(0, 0, 0, 0.03));
+		top: -6px;
+		left: 10%;
+		margin-right: 3px;
+		border-top-width: 0;
+		border-bottom-color: #EBEEF5;
+	}
+
+	.uni-popper__arrow::after {
+		content: " ";
+		top: 1px;
+		margin-left: -6px;
+		border-top-width: 0;
+		border-bottom-color: #fff;
+	}
+
+	.uni-select__input-text {
+		// width: 280px;
+		width: 100%;
+		color: $uni-main-color;
+		white-space: nowrap;
+		text-overflow: ellipsis;
+		-o-text-overflow: ellipsis;
+		overflow: hidden;
+	}
+
+	.uni-select__input-placeholder {
+		color: $uni-base-color;
+		font-size: 12px;
+	}
+
+	.uni-select--mask {
+		position: fixed;
+		top: 0;
+		bottom: 0;
+		right: 0;
+		left: 0;
+		z-index: 2;
+	}
+</style>
--- a/uni_modules/uni-data-select/package.json
+++ b/uni_modules/uni-data-select/package.json
@@ -0,0 +1,85 @@
+{
+  "id": "uni-data-select",
+  "displayName": "uni-data-select 下拉框选择器",
+  "version": "1.0.7",
+  "description": "通过数据驱动的下拉框选择器",
+  "keywords": [
+    "uni-ui",
+    "select",
+    "uni-data-select",
+    "下拉框",
+    "下拉选"
+],
+  "repository": "https://github.com/dcloudio/uni-ui",
+  "engines": {
+    "HBuilderX": "^3.1.1"
+  },
+  "directories": {
+    "example": "../../temps/example_temps"
+  },
+"dcloudext": {
+    "sale": {
+      "regular": {
+        "price": "0.00"
+      },
+      "sourcecode": {
+        "price": "0.00"
+      }
+    },
+    "contact": {
+      "qq": ""
+    },
+    "declaration": {
+      "ads": "无",
+      "data": "无",
+      "permissions": "无"
+    },
+    "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui",
+    "type": "component-vue"
+  },
+  "uni_modules": {
+    "dependencies": ["uni-load-more"],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "y",
+        "aliyun": "y"
+      },
+      "client": {
+        "App": {
+          "app-vue": "u",
+          "app-nvue": "n"
+        },
+        "H5-mobile": {
+          "Safari": "y",
+          "Android Browser": "y",
+          "微信浏览器(Android)": "y",
+          "QQ浏览器(Android)": "y"
+        },
+        "H5-pc": {
+          "Chrome": "y",
+          "IE": "y",
+          "Edge": "y",
+          "Firefox": "y",
+          "Safari": "y"
+        },
+        "小程序": {
+          "微信": "y",
+          "阿里": "u",
+          "百度": "u",
+          "字节跳动": "u",
+        "QQ": "u",
+        "京东": "u"
+        },
+        "快应用": {
+          "华为": "u",
+          "联盟": "u"
+        },
+        "Vue": {
+            "vue2": "y",
+            "vue3": "y"
+        }
+      }
+    }
+  }
+}
--- a/uni_modules/uni-data-select/readme.md
+++ b/uni_modules/uni-data-select/readme.md
@@ -0,0 +1,8 @@
+## DataSelect 下拉框选择器
+> **组件名：uni-data-select**
+> 代码块： `uDataSelect`
+
+当选项过多时，使用下拉菜单展示并选择内容
+
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-data-select)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
--- a/uni_modules/uni-load-more/changelog.md
+++ b/uni_modules/uni-load-more/changelog.md
@@ -1,3 +1,9 @@
+## 1.3.3（2022-01-20）
+- 新增 showText属性 ，是否显示文本
+## 1.3.2（2022-01-19）
+- 修复 nvue 平台下不显示文本的bug
+## 1.3.1（2022-01-19）
+- 修复 微信小程序平台样式选择器报警告的问题
 ## 1.3.0（2021-11-19）
 - 优化 组件UI，并提供设计资源，详见:[https://uniapp.dcloud.io/component/uniui/resource](https://uniapp.dcloud.io/component/uniui/resource)
 - 文档迁移，详见:[https://uniapp.dcloud.io/component/uniui/uni-load-more](https://uniapp.dcloud.io/component/uniui/uni-load-more)
--- a/uni_modules/uni-load-more/components/uni-load-more/uni-load-more.vue
+++ b/uni_modules/uni-load-more/components/uni-load-more/uni-load-more.vue
--- a/uni_modules/uni-load-more/package.json
+++ b/uni_modules/uni-load-more/package.json
@@ -1,7 +1,7 @@
 {
  "id": "uni-load-more",
  "displayName": "uni-load-more 加载更多",
-  "version": "1.3.0",
+  "version": "1.3.3",
  "description": "LoadMore 组件，常用在列表里面，做滚动加载使用。",
  "keywords": [
    "uni-ui",
--- a/uni_modules/uni-scss/changelog.md
+++ b/uni_modules/uni-scss/changelog.md
@@ -1,3 +1,5 @@
+## 1.0.3（2022-01-21）
+- 优化 组件示例
 ## 1.0.2（2021-11-22）
 - 修复 / 符号在 vue 不同版本兼容问题引起的报错问题
 ## 1.0.1（2021-11-22）
--- a/uni_modules/uni-scss/package.json
+++ b/uni_modules/uni-scss/package.json
@@ -1,7 +1,7 @@
 {
  "id": "uni-scss",
  "displayName": "uni-scss 辅助样式",
-  "version": "1.0.2",
+  "version": "1.0.3",
  "description": "uni-sass是uni-ui提供的一套全局样式 ，通过一些简单的类名和sass变量，实现简单的页面布局操作，比如颜色、边距、圆角等。",
  "keywords": [
    "uni-scss",
@@ -14,8 +14,8 @@
  },
  "dcloudext": {
    "category": [
-        "uni-app前端模板",
-        "前端页面模板"
+        "JS SDK",
+        "通用 SDK"
    ],
    "sale": {
      "regular": {
--- a/utils/request.js
+++ b/utils/request.js
@@ -1,8 +1,8 @@
 import axios from 'axios'
 import utils from '@/utils/encode'
 // const env = process.env.NODE_ENV
-const env = 'test'
-// const env = 'production'
+// const env = 'test'
+const env = 'production'
 const testUrl = 'http://192.168.110.77:38080'

 // const productUrl = 'https://www.xingoil.com/adminapi'
--- a/yarn.lock
+++ b/yarn.lock
@@ -0,0 +1,25 @@
+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+
+axios@^0.21.1:
+  version "0.21.4"
+  resolved "https://registry.yarnpkg.com/axios/-/axios-0.21.4.tgz#c67b90dc0568e5c1cf2b0b858c43ba28e2eda575"
+  integrity sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==
+  dependencies:
+    follow-redirects "^1.14.0"
+
+crypto-js@^4.0.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/crypto-js/-/crypto-js-4.2.0.tgz#4d931639ecdfd12ff80e8186dba6af2c2e856631"
+  integrity sha512-KALDyEYgpY+Rlob/iriUtjV6d5Eq+Y191A5g4UqLAi8CyGP9N1+FdVbkc1SxKc2r4YAYqG8JzO2KGL+AizD70Q==
+
+follow-redirects@^1.14.0:
+  version "1.15.6"
+  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.6.tgz#7f815c0cda4249c74ff09e95ef97c23b5fd0399b"
+  integrity sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==
+
+js-md5@^0.7.3:
+  version "0.7.3"
+  resolved "https://registry.yarnpkg.com/js-md5/-/js-md5-0.7.3.tgz#b4f2fbb0b327455f598d6727e38ec272cd09c3f2"
+  integrity sha512-ZC41vPSTLKGwIRjqDh8DfXoCrdQIyBgspJVPXHBGu4nZlAEvG3nf+jO9avM9RmLiGakg7vz974ms99nEV0tmTQ==