Merge branch 'dev' of http://git.xayunmei.com/SH-Arbitrate/miniapp into hcb

App.vue

@@ -32,7 +32,7 @@
 			},
 			checkLogin() {
 				if (!getToken()) {
-					this.$tab.reLaunch('/pages/login')
+					this.$tab.reLaunch('/pages/switchSystem')
 				}
 			}
 		}

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

@@ -0,0 +1,780 @@
+<template>
+	<view class="uni-stat__select">
+		<!-- hide-on-phone -->
+		<span v-if="label" class="uni-label-text">{{label + '：'}}</span>
+		<view class="uni-stat-box" :class="{'uni-stat__actived': current}">
+			<view class="uni-select" :style="{height:multiple?'100%':' 35px'}"
+				:class="{'uni-select--disabled':disabled}">
+				<view class="uni-select__input-box" :style="{height:multiple?'100%':'35px'}" @click="toggleSelector">
+					<view class="" style="display: flex;flex-wrap: wrap;width: 100%;" v-if="multiple&&current.length>0">
+						<view class="tag-calss"
+							v-for="(item,index) in collapseTags?current.slice(0,collapseTagsNum):current"
+							:key="item[dataValue]">
+							<span class="text">{{item[dataKey]}}</span>
+							<view class="" @click.stop="delItem(item)">
+								<uni-icons type="clear" style="margin-left: 4px;" color="#c0c4cc" />
+							</view>
+						</view>
+						<view v-if="current.length>collapseTagsNum&&collapseTags" class="tag-calss">
+							<span class="text">+{{current.length-collapseTagsNum}}</span>
+						</view>
+						<input v-if="filterable&&!disabled" @input="inputChange" class="uni-select__input-text"
+							type="text" style="font-size: 12px;height: 52rpx;margin-left: 6px;width: auto;"
+							placeholder="请输入" v-model="filterInput">
+					</view>
+					<view v-else-if="current&&current.length>0&&!showSelector" class="uni-select__input-text">
+						{{current}}
+					</view>
+					<input v-else-if="filterable&&showSelector" :focus="isFocus" @input="inputChange"
+						:disabled="disabled" @click.stop="" class="uni-select__input-text" type="text"
+						style="font-size: 12px;position: absolute;z-index: 1;" :placeholder="placeholderOld"
+						v-model="filterInput">
+					<view v-else class="uni-select__input-text uni-select__input-placeholder">{{typePlaceholder}}</view>
+					<uni-icons v-if="(current.length>0 && clear&&!disabled)||(currentArr.length>0&&clear&&!disabled)"
+						type="clear" color="#c0c4cc" size="24" style="position: absolute;right: 0;" @click="clearVal" />
+					<uni-icons style="right: 0;position: absolute;" v-else :type="showSelector? 'top' : 'bottom'"
+						size="14" color="#999" />
+				</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="filterMixinDatacomResData.length === 0">
+							<span>{{emptyTips}}</span>
+						</view>
+						<view v-else :class="['uni-select__selector-item', {'uni-select_selector-item_active' :multiple
+							&& currentArr.includes(item[dataValue])}]"
+							style="display: flex;justify-content: space-between;align-items: center;"
+							v-for="(item,index) in filterMixinDatacomResData" :key="index" @click="change(item)">
+							<span
+								:class="{'uni-select__selector__disabled': item.disable}">{{formatItemName(item)}}</span>
+							<uni-icons v-if="multiple&&currentArr.includes(item[dataValue])" type="checkmarkempty"
+								color="#007aff" />
+						</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-stat-select",
+		mixins: [uniCloud.mixinDatacom || {}],
+		props: {
+			collapseTagsNum: {
+				type: Number,
+				default: 1
+			},
+			collapseTags: {
+				type: Boolean,
+				default: false
+			},
+			dataKey: {
+				type: [String],
+				default: 'text'
+			},
+			dataValue: {
+				type: [String],
+				default: 'value'
+			},
+			multiple: {
+				type: Boolean,
+				default: false
+			},
+			filterable: {
+				type: Boolean,
+				default: false
+			},
+			localdata: {
+				type: Array,
+				default () {
+					return []
+				}
+			},
+			// #ifndef VUE3
+			value: {
+				type: [String, Number, Array],
+				default: ''
+			},
+			// #endif
+			// #ifdef VUE3
+			modelValue: {
+				type: [String, Number, Array],
+				default: ''
+			},
+			// #endif
+			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",
+				placeholderOld: "",
+				currentArr: [],
+				filterInput: "",
+				isFocus: false
+			};
+		},
+		created() {
+			if (this.multiple) {
+				// #ifndef VUE3
+				this.currentArr = this.value || []
+				// #endif
+				// #ifdef VUE3
+				this.currentArr = this.modelValue || []
+				// #endif
+				if (this.current.length > 0) {
+					this.current = []
+				}
+				// #ifndef VUE3
+				if (this.value && this.value.length > 0 && this.filterMixinDatacomResData.length > 0) {
+					this.current = this.value.map(item => {
+						let current = this.mixinDatacomResData.find(e =>
+							e[this.dataValue] == item
+						)
+						return {
+							...current
+						}
+					})
+				}
+				// #endif
+				// #ifdef VUE3
+				if (this.modelValue && this.modelValue.length > 0 && this.filterMixinDatacomResData.length > 0) {
+					this.current = this.modelValue.map(item => {
+						let current = this.mixinDatacomResData.find(e =>
+							e[this.dataValue] == item
+						)
+						return {
+							...current
+						}
+					})
+				}
+				// #endif
+
+			} else {
+
+				// #ifndef VUE3
+				if (this.value || this.value == 0) {
+					this.current = this.formatItemName(this.filterMixinDatacomResData.find(e =>
+						e[this.dataValue] == this.value
+					))
+				}
+				// #endif
+				// #ifdef VUE3
+				if (this.modelValue || this.value == 0) {
+					this.current = this.formatItemName(this.filterMixinDatacomResData.find(e =>
+						e[this.dataValue] == this.modelValue
+					))
+				}
+				// #endif
+			}
+			this.placeholderOld = this.placeholder
+			this.debounceGet = this.debounce(() => {
+				this.query();
+			}, 300);
+			if (this.collection && !this.localdata.length) {
+				this.debounceGet();
+			}
+		},
+		computed: {
+			filterMixinDatacomResData() {
+				if (this.filterable && this.filterInput) {
+					return this.mixinDatacomResData.filter(e => e[this.dataKey].includes(this.filterInput))
+				} else {
+					return this.mixinDatacomResData
+				}
+			},
+			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
+			}
+		},
+		watch: {
+			localdata: {
+				immediate: true,
+				handler(val, old) {
+					if (Array.isArray(val) && old !== val) {
+						this.mixinDatacomResData = val || []
+					}
+
+				}
+			},
+			valueCom: {
+				handler(newVal, oldVal) {
+					// console.log(newVal, oldVal);
+					this.initDefVal()
+				},
+				deep: true,
+				immediate: true
+			},
+			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][this.dataValue]
+						}
+						defValue = defItem
+					}
+					if (defValue || defValue === 0) {
+						this.emit(defValue)
+					}
+				}
+				if (this.multiple) {
+					const mixinDatacomResData = this.mixinDatacomResData || []
+					if (!defValue) defValue = []
+					this.current = defValue.map(item => {
+						const current = mixinDatacomResData.find(e => {
+							return e[this.dataValue] == item
+						})
+						return {
+							...current
+						}
+					})
+					this.currentArr = this.current.map(e => e[this.dataValue])
+					if (defValue.length < 1) {
+						this.currentArr = []
+					}
+				} else {
+					const def = this.mixinDatacomResData.find(item => item[this.dataValue] === defValue)
+					this.current = def ? this.formatItemName(def) : ''
+				}
+			},
+			/**
+			 * @param {[String, Number]} value
+			 * 判断用户给的 value 是否同时为禁用状态
+			 */
+			isDisabled(value) {
+				let isDisabled = false;
+
+				this.mixinDatacomResData.forEach(item => {
+					if (item[this.dataValue] === value) {
+						isDisabled = item.disable
+					}
+				})
+				return isDisabled;
+			},
+			inputChange(e) {
+				this.$emit('inputChange', e.detail.value)
+			},
+			clearVal() {
+				if (this.disabled) {
+					return
+				}
+				if (this.multiple) {
+					this.current = []
+					this.currentArr = []
+					this.emit([])
+				} else {
+					this.current = ""
+					this.currentArr = []
+					this.emit('')
+				}
+				if (this.collection) {
+					this.removeCache()
+				}
+				this.placeholderOld = this.placeholder
+				this.filterInput = ""
+			},
+			change(item) {
+				if (!item.disable) {
+					this.showSelector = false
+					if (this.multiple) {
+						if (!this.current) {
+							this.current = []
+						}
+						if (!this.currentArr) {
+							this.currentArr = []
+						}
+						if (this.currentArr.includes(item[this.dataValue])) {
+							let index = this.current.findIndex(e => {
+								return e[this.dataValue] == item[this.dataValue]
+							})
+							this.current.splice(index, 1)
+							this.currentArr.splice(index, 1)
+							this.emit(this.current)
+						} else {
+							this.current.push(item)
+							this.currentArr.push(item[this.dataValue])
+							this.emit(this.current)
+
+						}
+						this.filterInput = ""
+					} else {
+						this.current = this.formatItemName(item)
+						if (this.filterable) {
+							this.filterInput = item[this.dataKey]
+						}
+						this.emit(item[this.dataValue])
+					}
+				}
+			},
+			delItem(item) {
+				if (this.disabled) {
+					return
+				}
+				if (this.currentArr.includes(item[this.dataValue])) {
+					let index = this.current.findIndex(e => {
+						return e[this.dataValue] == item[this.dataValue]
+					})
+					this.current.splice(index, 1)
+					this.currentArr.splice(index, 1)
+					this.emit(this.current)
+				}
+			},
+			emit(val) {
+				if (this.multiple) {
+					this.$emit('input', this.currentArr)
+					this.$emit('update:modelValue', this.currentArr)
+					const currentArr = this.mixinDatacomResData.filter(item => this.currentArr.includes(item[this
+						.dataValue]))
+					this.$emit('change', currentArr)
+				} else {
+					this.$emit('input', val)
+					this.$emit('update:modelValue', val)
+					const current = this.mixinDatacomResData.find(item => val == item[this.dataValue])
+					console.log(current);
+					this.$emit('change', current)
+				}
+				if (this.collection) {
+					this.setCache(val);
+				}
+			},
+			toggleSelector() {
+				if (this.disabled) {
+					return
+				}
+				// if (this.filterable && this.filterInput && this.mixinDatacomResData.findIndex(e => {
+				// 		return e[this.dataKey] == this
+				// 			.filterInput
+				// 	}) < 0) {
+				// 	if (!this.multiple) {
+				// 		this.filterInput = ""
+				// 	}
+
+				// }
+				this.showSelector = !this.showSelector
+				this.isFocus = this.showSelector
+				if (this.filterable && this.current && this.showSelector) {
+					if (!this.multiple) {
+						this.placeholderOld = this.current
+						// this.filterInput = ""
+					}
+				} else if (this.filterable && !this.current && !this.showSelector) {
+					if (this.placeholderOld != this.placeholder) {
+						if (!this.multiple) {
+							this.current = this.placeholderOld
+						}
+					}
+				}
+				this.filterInput = ""
+
+			},
+			formatItemName(item) {
+				if (!item) {
+					return ""
+				}
+				let text = item[this.dataKey]
+				let value = item[this.dataValue]
+				let {
+					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;
+		cursor: pointer;
+		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;
+		min-height: 35px;
+
+		&--disabled {
+			background-color: #f5f7fa;
+			cursor: not-allowed;
+		}
+	}
+
+	.uni-select__label {
+		font-size: 16px;
+		// line-height: 22px;
+		min-height: 35px;
+		height: 35px;
+		padding-right: 10px;
+		color: $uni-secondary-color;
+	}
+
+	.uni-select__input-box {
+		width: 100%;
+		height: 35px;
+		position: relative;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex: 1;
+		flex-direction: row;
+		align-items: center;
+
+		.tag-calss {
+			font-family: Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, Microsoft YaHei, SimSun, sans-serif;
+			font-weight: 400;
+			-webkit-font-smoothing: antialiased;
+			-webkit-tap-highlight-color: transparent;
+			font-size: 12px;
+			border: 1px solid #d9ecff;
+			border-radius: 4px;
+			white-space: nowrap;
+			height: 24px;
+			padding: 0 4px 0px 8px;
+			line-height: 22px;
+			box-sizing: border-box;
+			margin: 2px 0 2px 6px;
+			display: flex;
+			max-width: 100%;
+			align-items: center;
+			background-color: #f4f4f5;
+			border-color: #e9e9eb;
+			color: #909399;
+
+			.text {
+				font-family: Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, Microsoft YaHei, SimSun, sans-serif;
+				font-weight: 400;
+				-webkit-font-smoothing: antialiased;
+				-webkit-tap-highlight-color: transparent;
+				font-size: 12px;
+				white-space: nowrap;
+				line-height: 22px;
+				color: #909399;
+				overflow: hidden;
+				text-overflow: ellipsis;
+			}
+		}
+	}
+
+	.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 */
+	}
+
+	.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-item_active {
+		color: #409eff;
+		font-weight: bold;
+		background-color: #f5f7fa;
+		border-radius: 3px;
+	}
+
+	.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: 90%;
+		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;
+	}
+</style>

config.js

@@ -1,10 +1,15 @@
 // 应用全局配置
 module.exports = {
-	// baseUrl: 'https://api.xayunmei.com/zhongcaiapi',
-	baseUrl: 'https://api.xayunmei.com/zhongcaiapitest',
+	 // baseUrlZC: 'https://api.xayunmei.com/zhongcaiapi',
+	// baseUrl: 'https://api.xayunmei.com/zhongcaiapitest',
 	// baseUrl: 'http://121.40.189.20:9001',
-	// baseUrl: 'http://121.40.189.20:8001',
-	// baseUrl: 'http://192.168.3.77:8080',
+	baseUrlZC:'https://api.xayunmei.com/zhongcaiapi',
+	// baseUrlZC:'https://api.xayunmei.com/zhongcaiapitest',
+	baseUrlTJ:'https://api.xayunmei.com/tiaojieapitest',
+	// baseUrlTJ:'https://api.xayunmei.com/tiaojieapi',
+	// baseUrlZC: 'http://121.40.189.20:8001',
+	// baseUrlTJ: 'http://121.40.189.20:6001',
+	// baseUrl: 'http://172.16.1.24:8001',
 	// baseUrl: 'http://localhost:8080',
 	// baseUrl: 'http://192.168.3.18:9001',
 	// 应用信息

pages.json

@@ -1,8 +1,14 @@
 {
-	"pages": [{
+	"pages": [
+		{
+			"path": "pages/switchSystem",
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		}, {
 			"path": "pages/login",
 			"style": {
-				"navigationBarTitleText": "登录"
+				"navigationBarTitleText": ""
 			}
 		}, {
 			"path": "pages/register",

pages/expressDelivery/component/list.vue

@@ -16,7 +16,7 @@
 				{{defalutVal.applicantName}}
 			</view>
 		</view>
-		<view class="listItem">
+		<view class="listItem" style="margin-top:22rpx">
 			<view class="lable">
 				被申请人姓名：
 			</view>
@@ -79,7 +79,6 @@
 			width: 100%;
 			display: flex;
 			height: 50rpx;
-
 			.lable {
 				width: 30%;
 			}

pages/handlecase/component/list.vue

@@ -16,8 +16,8 @@
 				{{defalutVal.applicantName}}
 			</view>
 		</view>
-		<view class="listItem">
-			<view class="lable">
+		<view class="listItem" style="margin-top:22rpx">
+			<view class="lable" >
 				被申请人姓名：
 			</view>
 			<view class="main">
@@ -102,14 +102,14 @@
 			width: 100%;
 			display: flex;
 			height: 50rpx;
-
 			.lable {
 				width: 30%;
 			}
 
 			.main {
 				width: 60%;
-			}
+			}
+			
 		}
 		.btn{
 			margin-top: 20rpx;

pages/handlecase/component/uploadEvidence.vue

@@ -1,6 +1,9 @@
 <template>
 	<view>
-		<uni-section title="  ">
+		<view>
+			
+			
+		</view>		<uni-section title="  ">
 			<!-- 选项卡 -->
 			<view>
 				<uni-segmented-control :current="current" :values="itemsT" :style-type="styleType"
@@ -58,7 +61,7 @@
 													<uni-data-checkbox class='checkbox' v-model="subnitForm.openCourtHear"
 														:localdata="arbitrationmethodArr" @change='arbitrationmethod'></uni-data-checkbox>
 												</uni-forms-item> -->
-												<!-- <uni-forms-item label="是否指派仲裁员" label-width="120px" name="pendingAppointArbotrar" required>
+												<!-- <uni-forms-item label="是否指派调解员" label-width="120px" v-if="sysType==2" name="pendingAppointArbotrar" required>
 													<uni-data-checkbox class='checkbox' v-model="subnitForm.pendingAppointArbotrar"
 														:localdata="uploadEvidence" @change='maintenancetypeChange'></uni-data-checkbox>
 												</uni-forms-item> -->
@@ -81,7 +84,16 @@
 													<uni-data-checkbox class='checkbox' v-model="subnitForm.respondentIsWrittenHear"
 														:localdata="adjudicateRecord" @change='arbitrationmethod'></uni-data-checkbox>
 												</uni-forms-item>
-												
+												<uni-forms-item
+												v-if="sysType==2"
+												label="预约时间" 
+												label-width="120px" 
+												name="respondentIsWrittenHear" 
+												>
+													<view class="example-body">
+														<uni-datetime-picker type="date"   @maskClick="maskClick" />
+													</view>
+												</uni-forms-item>
 											</view>
 										</uni-forms>
 										<!-- 自定义弹窗层组件 -->
@@ -139,10 +151,10 @@
 															
 														</uni-popup>
 										<view class="uni-list" v-if="selectFlag">
-											<radio-group @change="checkboxChange" style="width: 100%;">
+											<checkbox-group @change="checkboxChange" style="width: 100%;">
 												<label class="uni-list-cell uni-list-cell-pd" v-for="item in items" :key="item.userId">
 													<view>
-														<radio :value="item.userId + ''" />
+														<checkbox color="blue" style="transform:scale(0.7)"  :value="item.userId + ''" />
 													</view>
 													<view class="main">
 														<view class="">
@@ -153,7 +165,7 @@
 														</view>
 													</view>
 												</label>
-											</radio-group>
+											</checkbox-group>
 										</view>
 										<button type="primary" @click="submitImg">确认提交</button>
 									</view>
@@ -203,11 +215,15 @@
 	} from '@/utils/auth'
 	import moment from 'moment'
 	import config from '@/config'
-	const baseUrl = config.baseUrl
+	const baseUrl = config.baseUrlZC
 	const app = getApp()
 	export default {
 		data() {
 			return {
+				sysType:null,//默认系统 1.仲裁2.调节
+				selectValue:null,
+				defaultSelected: [], //默认选中项
+				serviceList: ['1','2'],//传递给子组件的数据
 				current:0,
 				itemsT:['案件详情','案件资料'],
 				styleType:'button',
@@ -301,12 +317,40 @@
 					text: '否',
 					value: 0
 				}],
-				items: []
+				items: [],
+				selectData: [{
+					value: 0,
+					label: '黄金糕'
+				}, {
+					value: '选项2',
+					label: '双皮奶'
+				}, {
+					value: '选项3',
+					label: '蚵仔煎'
+				}, {
+					value: '选项4',
+					label: '龙须面'
+				}, {
+					value: '选项5',
+					label: '北京烤鸭'
+				}, {
+					value: '选项6',
+					label: '豆腐'
+				}, {
+					value: '选项7',
+					label: '油条'
+				}]
 			}
-		},
+		},
+		mounted() {
+			this.sysType = uni.getStorageSync('sysType')
+		},
 		methods: {
+			selectTJ(e){
+				// console.log(this.defaultSelected,'11111111')
+				// console.log(e,'2222222222’')
+			},
 			onClickItem(e){
-				console.log()
 				if (this.current !== e.currentIndex) {
 					this.current = e.currentIndex
 				}
@@ -333,8 +377,7 @@
 				}
 			},
 			arbitrationmethod() {},
-			uploadEvidenceChange(val) {
-				console.log(val)
+			uploadEvidenceChange(val) {
 				let flag = val.detail.value;
 				if (flag == 1) {
 					this.caseFlag = true;
@@ -353,7 +396,6 @@
 			},
 			checkboxChange(e) {
 				let params =  parseInt(e.detail.value);
-				console.log(params,"LLLLLLLLLL");
 				let result = "";
 				this.items.forEach(item=>{
 					if(item.userId == params){
@@ -361,8 +403,6 @@
 					}
 				})
 				let arbitrators = [{id: params,arbitratorName: result}];
-				
-				console.log(result,"KKKKKKKKKKKKKKKK");
 				// let idArr = e.detail.value;
 				// let numberArray = idArr.map(str => parseInt(str));
 				// const result = this.items.filter(item => numberArray.includes(item.userId));
@@ -383,8 +423,7 @@
 							item['fileName'] = names[names.length -1]
 							item.annexPath = baseUrl +  item.annexPath
 						})
-					}
-					console.log(res.data.evidenceMaterialList)
+					}
 					this.formData = res.data
 					this.formData.loanEndDate = moment(this.formData.loanEndDate).format('YYYY-MM-DD HH:mm:ss');
 					this.formData.loanStartDate = moment(this.formData.loanStartDate).format(
@@ -444,10 +483,17 @@
 						title: '提交成功',
 						icon: 'none',
 						duration: 1000
-					})
-					uni.navigateTo({
-						url: '/pages/handlecase/index'
-					})
+					})
+					
+					uni.navigateBack({
+						 delta:1
+					})
+					// uni.$tab.redirectTo({
+					// 	url: '/pages/handlecase/index'
+					// })
+					// uni.navigateTo({
+					// 	url: '/pages/handlecase/index'
+					// })
 				})
 			},
 			submitImg() {
@@ -461,11 +507,7 @@
 			evidenceList(){
 				console.log(this.formData.evidenceMaterialList)
 				this.$tab.navigateTo(`/pages/handlecase/component/evidenceList?title=证据清单&evidenceList=${encodeURIComponent(JSON.stringify(this.formData.evidenceMaterialList))}`)
-			},
-			// 仲裁申请书
-			applicationArbitration(){
-				
-			}	
+			},
 		},
 		onLoad(data) {
 			this.getData(data.id);

pages/handlecase/index.vue

@@ -25,13 +25,17 @@
 				pageSize: 10,
 				
 			}
-		},
-		
+		},
 		methods: {
 			getList(parms) {
 				respondentList(parms).then(res => {
 					// this.caseList = res.rows;
-					this.caseList = res.data;
+					if(res.data){
+						this.caseList = res.data;
+					}else{
+						this.caseList = []
+					}
+					
 					this.caseList.forEach(item => {
 						switch (item.caseStatus) {
 							case 0:
@@ -102,15 +106,24 @@
 				obj.pageNum = obj.pageNum + 1
 				this.getList(obj)
 			}
-		},
-		onLoad() {
-			let obj = {
-				pageNum: this.pageNum,
+		},
+		onShow() {
+			let obj = {
+				pageNum: this.pageNum,
 				pageSize: this.pageSize,
-				caseStatus:4
-			}
-			this.getList(obj)
-		}
+				caseStatus:4
+			}
+			this.getList(obj)
+		},
+		// onLoad() {
+		// 	let obj = {
+		// 		pageNum: this.pageNum,
+		// 		pageSize: this.pageSize,
+		// 		caseStatus:4
+		// 	}
+		// 	this.getList(obj)
+		// }
+		
 	}
 </script>
 

pages/im/component/imList.vue

@@ -16,7 +16,7 @@
 				{{defalutVal.applicantName}}
 			</view>
 		</view>
-		<view class="listItem">
+		<view class="listItem"  style="margin-top:22rpx">
 			<view class="lable">
 				被申请人姓名：
 			</view>
@@ -87,7 +87,6 @@
 			width: 100%;
 			display: flex;
 			height: 50rpx;
-
 			.lable {
 				width: 30%;
 			}

pages/login.vue

@@ -1,9 +1,14 @@
 <template>
 	<view class="normal-login-container">
-		<view class="logo-content align-center justify-center flex">
+		<view class="logo-content align-center justify-center flex" v-if="logSyste==1">
 			<image style="width: 100rpx;height: 100rpx;" :src="globalConfig.appInfo.logo" mode="widthFix">
 			</image>
 			<text class="title">仲裁平台</text>
+		</view>
+		<view class="logo-content align-center justify-center flex" v-if="logSyste==2">
+			<image style="width: 100rpx;height: 100rpx;" :src="globalConfig.appInfo.logo" mode="widthFix">
+			</image>
+			<text class="title">调解平台</text>
 		</view>
 		<view class="login-form-content">
 			<view class="input-item flex align-center">
@@ -60,7 +65,7 @@
 			return {
 				codeUrl: "",
 				captchaEnabled: true,
-				
+				logSyste:0,
 				// 用户注册开关
 				register: true,
 				globalConfig: getApp().globalData.config,
@@ -112,7 +117,7 @@
 			},
 			// 登录方法
 			async handleLogin() {
-				console.log(this.isSelectAgree,'xxxx')
+				const sysType = uni.getStorageSync('sysType')
 				if (this.loginForm.username === "") {
 					this.$modal.msgError("请输入您的账号")
 				}else if(this.isSelectAgree.length < 1){
@@ -144,6 +149,10 @@
 					this.$tab.reLaunch('/pages/work/index')
 				})
 			},
+			onLoad(options){
+				 let vals = decodeURIComponent(options.values);
+				 this.logSyste = vals
+			}
 			
 		}
 	}

pages/personalInfoCollection.vue

@@ -1,5 +1,5 @@
 <template>
-	<view class="equityNotice">
+	<view class="equityNotice" style="margin:0 10rpx">
 		
 		<text>
 			关于“个人信息收集/使用”的同意书xxxxx公司业务管理系统需要收集与使用用户的个人信息，根据《中华人民共和国网络安全法》等相关法规，特告知如下请仔细阅读并理解文本件全部内容之后，决定是否同意并使用本公司业务管理系统的各项服务;如果您仍决定使用本公司业务管理系统的各项服务，则视为您同意执行本同意书

pages/switchSystem.vue

@@ -0,0 +1,39 @@
+<template>
+	<view class="" style="margin:300rpx auto;width:80%;">
+		<view class="button-sp-area">
+			<button @tap="logarBitration(1)" class="login-btn cu-btn block bg-blue lg round">登录仲裁系统</button>
+		</view>
+		<view class="action-btn"style="margin-top:100rpx">
+			<button @tap="logarBitration(2)" class="login-btn cu-btn block bg-blue lg round">登录调解系统</button>	
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data(){
+			return {
+				
+			}
+		},
+		methods:{
+			// 登录仲裁调节系统
+			logarBitration(val){
+				uni.setStorageSync('sysType',val)
+				let params ={values:val}
+				let url ='/pages/login?values='+encodeURIComponent(params.values)
+				uni.navigateTo({ url })
+			}
+	
+		},
+		onShow() {
+			uni.removeStorageSync('sysType')
+		}
+	}
+</script>
+
+<style lang="scss">
+	page {
+		background-color: #ffffff;
+	}
+</style>

permission.js

@@ -1,11 +1,12 @@
 import { getToken } from '@/utils/auth'
-
+//跳转页面
+const loginPage = "/pages/switchSystem"
 // 登录页面
-const loginPage = "/pages/login"
+// const loginPage = "/pages/login"
   
 // 页面白名单
 const whiteList = [
-  '/pages/login', '/pages/register', '/pages/common/webview/index','/pages/realName','/mp_ecard_sdk/index/index', '/pages/personalInfoCollection'
+'/pages/switchSystem', '/pages/login', '/pages/register', '/pages/common/webview/index','/pages/realName','/mp_ecard_sdk/index/index', '/pages/personalInfoCollection'
 ]
 
 // 检查地址白名单

utils/request.js

@@ -5,9 +5,11 @@ import errorCode from '@/utils/errorCode'
 import { toast, showConfirm, tansParams } from '@/utils/common'
 
 let timeout = 10000
-const baseUrl = config.baseUrl
-
-const request = config => {
+const baseUrlZC = config.baseUrlZC
+const baseUrlTJ = config.baseUrlTJ
+const request = config => {
+  const sysType = uni.getStorageSync('sysType')
+  
   // 是否需要设置 token
   const isToken = (config.headers || {}).isToken === false
   config.header = config.header || {}
@@ -20,11 +22,12 @@ const request = config => {
     url = url.slice(0, -1)
     config.url = url
   }
-  return new Promise((resolve, reject) => {
+  return new Promise((resolve, reject) => {
+	const reqURL = sysType == 1 ? baseUrlZC : baseUrlTJ
     uni.request({
         method: config.method || 'get',
         timeout: config.timeout ||  timeout,
-        url: config.baseUrl || baseUrl + config.url,
+        url: config.baseUrl || reqURL + config.url,
         data: config.data,
         header: config.header,
         dataType: 'json'