更新

components/chunLei-popups/chunLei-popups.vue

@@ -0,0 +1,336 @@
+<template>
+	<view class="mask" :class="!show?'':'mask-show'" :style="{backgroundColor:show?maskBg:'rgba(0,0,0,0)'}" @tap="tapMask">
+		<view class="popups" :class="[theme]"
+			:style="{top: popupsTop ,left: popupsLeft,flexDirection:direction}">
+			<text :class="dynPlace" :style="{width:'0px',height:'0px'}" v-if="triangle"></text>
+			<view v-for="(item,index) in popData" :key="index" @tap.stop="tapItem(item)" v-show="item.show"
+				class="itemChild view" :class="[direction=='row'?'solid-right':'solid-bottom',item.disabled?'disabledColor':'']">
+				<image class="image" :src="item.icon" v-if="item.icon" v-show="item.show"></image>{{item.title}}
+			</view>
+			<slot></slot>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default{
+		props:{
+			maskBg:{
+				type:String,
+				default:'rgba(0,0,0,0)'
+			},
+			placement:{
+				type:String,
+				default:'default' //default top-start top-end bottom-start bottom-end 
+			},
+			direction:{
+				type:String,
+				default:'column' //column row
+			},
+			x:{
+				type:Number,
+				default:0
+			},
+			y:{
+				type:Number,
+				default:0
+			},
+			value:{
+				type:Boolean,
+				default:false
+			},
+			popData:{
+				type:Array,
+				default:()=>[]
+			},
+			theme:{
+				type:String,
+				default:'light' //light dark
+			},
+			dynamic:{
+				type:Boolean,
+				default:false
+			},
+			gap:{
+				type:Number,
+				default:20
+			},
+			triangle:{
+				type:Boolean,
+				default:true
+			}
+		},
+		data(){
+			return{
+				popupsTop:'0px',
+				popupsLeft:'0px',
+				show:false,
+				dynPlace:''
+			}
+		},
+		mounted() {
+			this.popupsPosition()
+		},
+		methods:{
+			tapMask(){
+				
+				this.$emit('input',!this.value)
+			},
+			tapItem(item){
+				if(item.disabled) return
+				this.$emit('tapPopup',item)
+				this.$emit('input',!this.value)
+			},
+			getStatusBar(){
+				let promise = new Promise((resolve,reject)=>{
+					uni.getSystemInfo({
+						success: function(e) {
+							
+							let customBar
+							// #ifdef H5
+					
+							customBar = e.statusBarHeight + e.windowTop;
+
+							// #endif
+							resolve(customBar)
+						}
+					})
+				})
+				return promise
+			},
+			async popupsPosition(){
+				let statusBar = await this.getStatusBar()
+				let promise = new Promise((resolve,reject)=>{
+					let popupsDom = uni.createSelectorQuery().in(this).select(".popups")
+					popupsDom.fields({
+					    size: true,  
+					}, (data) => {
+						let width = data.width
+						let height = data.height
+						
+						let y = this.dynamic?this.dynamicGetY(this.y,this.gap):this.transformRpx(this.y)
+						
+						let x = this.dynamic?this.dynamicGetX(this.x,this.gap):this.transformRpx(this.x)
+					
+						
+						// #ifdef H5
+						y = this.dynamic?(this.y+statusBar): this.transformRpx(this.y+statusBar)
+						// #endif 
+						
+						this.dynPlace = this.placement=='default'?this.getPlacement(x,y):this.placement
+						
+						switch(this.dynPlace){
+							case 'top-start':
+								this.popupsTop = `${y+9}px`
+								this.popupsLeft = `${x-15}px`
+								break;
+							case 'top-end':
+								this.popupsTop = `${y+9}px`
+								this.popupsLeft = `${x+15-width}px`
+								break;
+							case 'bottom-start':
+								this.popupsTop = `${y-18-height}px`
+								this.popupsLeft = `${x-15}px`
+								break;
+							case 'bottom-end':
+								this.popupsTop = `${y-9-height}px`
+								this.popupsLeft = `${x+15-width}px`
+								break;
+						}
+						resolve()
+					}).exec();
+					
+				})
+				return promise
+				
+			},
+			getPlacement(x,y){
+				let width = uni.getSystemInfoSync().windowWidth
+				let height = uni.getSystemInfoSync().windowHeight
+				if(x>width/2&&y>height/2){
+					return 'bottom-end'
+				}else if(x<width/2&&y<height/2){
+					return 'top-start'
+				}else if(x>width/2&&y<height/2){
+					return 'top-end'
+				}else if(x<width/2&&y>height/2){
+					return 'bottom-start'
+				}else if(x>width/2){
+					return 'top-end'
+				}else{
+					return 'top-start'
+				}
+			},
+			dynamicGetY(y,gap){
+				
+				let height = uni.getSystemInfoSync().windowHeight
+				y = y<gap?gap:y
+				y = height - y <gap? (height - gap) : y
+				
+				return y
+			},
+			dynamicGetX(x,gap){
+				let width = uni.getSystemInfoSync().windowWidth
+				x = x< gap?gap:x
+				x = width - x <gap? (width - gap) : x
+				return x
+			},
+			transformRpx(params){
+				
+				return params*uni.getSystemInfoSync().screenWidth/375
+			}
+		},
+		watch:{
+			value:{
+				immediate:true,
+				handler:async function (newVal,oldVal){
+					if(newVal) await this.popupsPosition()
+					this.show = newVal
+				}
+			},
+			placement:{
+				immediate:true,
+				handler(newVal,oldVal){
+					this.dynPlace = newVal
+				}
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.mask{
+		position: fixed;
+		top: 0;
+		right: 0;
+		bottom: 0;
+		left: 0;
+		z-index: 9999;
+		transition: background 0.3s ease-in-out;
+		visibility: hidden;
+		
+		&.mask-show{
+			
+			visibility: visible;
+		}
+	}
+	.popups{
+		position: absolute;
+		padding: 20rpx;
+		border-radius: 5px;
+		display:flex;
+		.view{
+			padding: 10rpx;
+		}
+		.image{
+			display: inline-block;
+			vertical-align: middle;
+			width: 40rpx;
+			height: 40rpx;
+			margin-right: 20rpx;
+		}
+	}
+	.dark{
+		background-color: #4C4C4C;
+		color: #fff;
+		.top-start:after {
+			content: "";
+			position: absolute;
+			top: -18rpx;
+			left: 10rpx;
+			border-width: 0 20rpx 20rpx;
+			border-style: solid;
+			border-color: transparent transparent #4C4C4C;
+		}
+		.top-end:after {
+			content: "";
+			position: absolute;
+			top: -18rpx;
+			right: 10rpx;
+			border-width: 0 20rpx 20rpx;
+			border-style: solid;
+			border-color: transparent transparent #4C4C4C;
+		}
+		.bottom-start:after {
+			content: "";
+			position: absolute;
+			bottom: -18rpx;
+			left: 10rpx;
+			border-width: 20rpx 20rpx 0 ;
+			border-style: solid;
+			border-color: #4C4C4C transparent transparent ;
+			
+		}
+		.bottom-end:after {
+			content: "";
+			position: absolute;
+			bottom: -18rpx;
+			right: 10rpx;
+			border-width: 20rpx 20rpx 0 ;
+			border-style: solid;
+			border-color: #4C4C4C transparent transparent ;
+		}
+		.disabledColor{
+			color: #c5c8ce;
+		}
+	}
+	.light{
+		color: #515a6e;
+		box-shadow: 0upx 0upx 30upx rgba(0,0,0,0.2);
+		background: #fff;
+		.top-start:after {
+			content: "";
+			position: absolute;
+			top: -18rpx;
+			left: 10rpx;
+			border-width: 0 20rpx 20rpx;
+			border-style: solid;
+			border-color: transparent transparent #fff;
+		}
+		.top-end:after {
+			content: "";
+			position: absolute;
+			top: -18rpx;
+			right: 10rpx;
+			border-width: 0 20rpx 20rpx;
+			border-style: solid;
+			border-color: transparent transparent #fff;
+		}
+		.bottom-start:after {
+			content: "";
+			position: absolute;
+			bottom: -18rpx;
+			left: 10rpx;
+			border-width: 20rpx 20rpx 0 ;
+			border-style: solid;
+			border-color: #fff transparent transparent ;
+			
+		}
+		.bottom-end:after {
+			content: "";
+			position: absolute;
+			bottom: -18rpx;
+			right: 10rpx;
+			border-width: 20rpx 20rpx 0 ;
+			border-style: solid;
+			border-color: #fff transparent transparent ;
+		}
+		.disabledColor{
+			color: #c5c8ce;
+		}
+	}
+	.solid-bottom{
+		border-bottom: 1px solid #ccc;
+	}
+	.solid-right{
+		
+		border-right: 1px solid #ccc;
+	}
+	.popups .itemChild:last-child{
+		border: none;
+	}
+	// .hide_css{
+	// 	display: none;
+	// }
+	
+</style>

components/itmister-address-picker/city.json

@@ -0,0 +1,864 @@
+[
+
+{ "name": "北京", "city":[{"name":"北京", "area":["全市","东城区","西城区","崇文区","宣武区","朝阳区","丰台区","石景山区","海淀区","门头沟区","房山区","通州区","顺义区","昌平区","大兴区","平谷区","怀柔区","密云县","延庆县"]}]},
+
+{ "name": "天津", "city":[{"name":"天津", "area":["全市","和平区","河东区","河西区","南开区","河北区","红桥区","塘沽区","汉沽区","大港区","东丽区","西青区","津南区","北辰区","武清区","宝坻区","宁河县","静海县","蓟  县"]}]},
+
+{ "name": "河北", "city":[
+         {"name":"全省", "area":[]},
+         {"name":"石家庄", "area":["全市","长安区","桥东区","桥西区","新华区","郊  区","井陉矿区","井陉县","正定县","栾城县","行唐县","灵寿县","高邑县","深泽县","赞皇县","无极县","平山县","元氏县","赵  县","辛集市","藁","晋州市","新乐市","鹿泉市"]},
+
+         {"name":"唐山", "area":["全市","路南区","路北区","古冶区","开平区","新  区","丰润县","滦  县","滦南县","乐亭县","迁西县","玉田县","唐海县","遵化市","丰南市","迁安市"]},
+
+         {"name":"秦皇岛", "area":["全市","海港区","山海关区","北戴河区","青龙满族自治县","昌黎县","抚宁县","卢龙县"]},
+
+         {"name":"邯郸", "area":["全市","邯山区","丛台区","复兴区","峰峰矿区","邯郸县","临漳县","成安县","大名县","涉  县","磁  县","肥乡县","永年县","邱  县","鸡泽县","广平县","馆陶县","魏  县","曲周县","武安市"]},
+
+         {"name":"邢台", "area":["全市","桥东区","桥西区","邢台县","临城县","内丘县","柏乡县","隆尧县","任  县","南和县","宁晋县","巨鹿县","新河县","广宗县","平乡县","威  县","清河县","临西县","南宫市","沙河市"]},
+
+         {"name":"保定", "area":["全市","新市区","北市区","南市区","满城县","清苑县","涞水县","阜平县","徐水县","定兴县","唐  县","高阳县","容城县","涞源县","望都县","安新县","易  县","曲阳县","蠡  县","顺平县","博野","雄县","涿州市","定州市","安国市","高碑店市"]},
+
+         {"name":"张家口", "area":["全市","桥东区","桥西区","宣化区","下花园区","宣化县","张北县","康保县","沽源县","尚义县","蔚  县","阳原县","怀安县","万全县","怀来县","涿鹿县","赤城县","崇礼县"]},
+
+         {"name":"承德", "area":["全市","双桥区","双滦区","鹰手营子矿区","承德县","兴隆县","平泉县","滦平县","隆化县","丰宁满族自治县","宽城满族自治县","围场满族蒙古族自治县"]},
+
+         {"name":"沧州", "area":["全市","新华区","运河区","沧  县","青  县","东光县","海兴县","盐山县","肃宁县","南皮县","吴桥县","献  县","孟村回族自治县","泊头市","任丘市","黄骅市","河间市"]},
+
+         {"name":"廊坊", "area":["全市","安次区","固安县","永清县","香河县","大城县","文安县","大厂回族自治县","霸州市","三河市"]},
+
+         {"name":"衡水", "area":["全市","桃城区","枣强县","武邑县","武强县","饶阳县","安平县","故城县","景  县","阜城县","冀州市","深州市"]}
+
+      ]},
+
+{ "name": "山西", "city":[
+     {"name":"全省", "area":[]},
+     {"name":"太原", "area":["全市","小店区","迎泽区","杏花岭区","尖草坪区","万柏林区","晋源区","清徐县","阳曲县","娄烦县","古交市"]},
+
+     {"name":"大同", "area":["全市","城  区","矿  区","南郊区","新荣区","阳高县","天镇县","广灵县","灵丘县","浑源县","左云县","大同县"]},
+
+     {"name":"阳泉", "area":["全市","城  区","矿  区","郊  区","平定县","盂  县"]},
+
+     {"name":"长治", "area":["全市","城  区","郊  区","长治县","襄垣县","屯留县","平顺县","黎城县","壶关县","长子县","武乡县","沁  县","沁源县","潞城市"]},
+
+     {"name":"晋城", "area":["全市","城  区","沁水县","阳城县","陵川县","泽州县","高平市"]},
+
+     {"name":"朔州", "area":["全市","朔城区","平鲁区","山阴县","应  县","右玉县","怀仁县"]},
+
+     {"name":"忻州", "area":["全市","忻府区","原平市","定襄县","五台县","代  县","繁峙县","宁武县","静乐县","神池县","五寨县","岢岚县","河曲县","保德县","偏关县"]},
+
+     {"name":"吕梁", "area":["全市","离石区","孝义市","汾阳市","文水县","交城县","兴  县","临  县","柳林县","石楼县","岚  县","方山县","中阳县","交口县"]},
+
+     {"name":"晋中", "area":["全市","榆次市","介休市","榆社县","左权县","和顺县","昔阳县","寿阳县","太谷县","祁  县","平遥县","灵石县"]},
+
+     {"name":"临汾", "area":["全市","临汾市","侯马市","霍州市","曲沃县","翼城县","襄汾县","洪洞县","古  县","安泽县","浮山县","吉  县","乡宁县","蒲  县","大宁县","永和县","隰  县","汾西县"]},
+
+     {"name":"运城", "area":["全市","运城市","永济市","河津市","芮城县","临猗县","万荣县","新绛县","稷山县","闻喜县","夏  县","绛  县","平陆县","垣曲县"]}
+
+]},
+
+{ "name": "内蒙古", "city":[
+   {"name":"全省", "area":[]},
+   {"name":"呼和浩特", "area":["全市","新城区","回民区","玉泉区","郊  区","土默特左旗","托克托县","和林格尔县","清水河县","武川县"]},
+
+   {"name":"包头", "area":["全市","东河区","昆都伦区","青山区","石拐矿区","白云矿区","郊  区","土默特右旗","固阳县","达尔罕茂明安联合旗"]},
+
+   {"name":"乌海", "area":["全市","海勃湾区","海南区","乌达区"]},
+
+   {"name":"赤峰", "area":["全市","红山区","元宝山区","松山区","阿鲁科尔沁旗","巴林左旗","巴林右旗","林西县","克什克腾旗","翁牛特旗","喀喇沁旗","宁城县","敖汉旗"]},
+
+   {"name":"呼伦贝尔", "area":["全市","海拉尔市","满洲里市","扎兰屯市","牙克石市","根河市","额尔古纳市","阿荣旗","莫力达瓦达斡尔族自治旗","鄂伦春自治旗","鄂温克族自治旗","新巴尔虎右旗","新巴尔虎左旗","陈巴尔虎旗"]},
+
+   {"name":"兴安盟", "area":["全市","乌兰浩特市","阿尔山市","科尔沁右翼前旗","科尔沁右翼中旗","扎赉特旗","突泉县"]},
+
+   {"name":"通辽", "area":["全市","科尔沁区","霍林郭勒市","科尔沁左翼中旗","科尔沁左翼后旗","开鲁县","库伦旗","奈曼旗","扎鲁特旗"]},
+
+   {"name":"锡林郭勒盟", "area":["全市","二连浩特市","锡林浩特市","阿巴嘎旗","苏尼特左旗","苏尼特右旗","东乌珠穆沁旗","西乌珠穆沁旗","太仆寺旗","镶黄旗","正镶白旗","正蓝旗","多伦县"]},
+
+   {"name":"乌兰察布盟", "area":["全市","集宁市","丰镇市","卓资县","化德县","商都县","兴和县","凉城县","察哈尔右翼前旗","察哈尔右翼中旗","察哈尔右翼后旗","四子王旗"]},
+
+   {"name":"伊克昭盟", "area":["全市","东胜市","达拉特旗","准格尔旗","鄂托克前旗","鄂托克旗","杭锦旗","乌审旗","伊金霍洛旗"]},
+
+   {"name":"巴彦淖尔盟", "area":["全市","临河市","五原县","磴口县","乌拉特前旗","乌拉特中旗","乌拉特后旗","杭锦后旗"]},
+
+   {"name":"阿拉善盟", "area":["全市","阿拉善左旗","阿拉善右旗","额济纳旗"]}
+
+]},
+
+{ "name": "辽宁", "city":[
+{"name":"全省", "area":[]},
+{"name":"沈阳", "area":["全市","沈河区","皇姑区","和平区","大东区","铁西区","苏家屯区","东陵区","于洪区","新民市","法库县","辽中县","康平县","新城子区","其他"]},
+
+{"name":"大连", "area":["全市","西岗区","中山区","沙河口区","甘井子区","旅顺口区","金州区","瓦房店市","普兰店市","庄河市","长海县","其他"]},
+
+{"name":"鞍山", "area":["全市","铁东区","铁西区","立山区","千山区","海城市","台安县","岫岩满族自治县","其他"]},
+
+{"name":"抚顺", "area":["全市","顺城区","新抚区","东洲区","望花区","抚顺县","清原满族自治县","新宾满族自治县","其他"]},
+
+{"name":"本溪", "area":["全市","平山区","明山区","溪湖区","南芬区","本溪满族自治县","桓仁满族自治县","其他"]},
+
+{"name":"丹东", "area":["全市","振兴区","元宝区","振安区","东港市","凤城市","宽甸满族自治县","其他"]},
+
+{"name":"锦州", "area":["全市","太和区","古塔区","凌河区","凌海市","黑山县","义县","北宁市","其他"]},
+
+{"name":"营口", "area":["全市","站前区","西市区","鲅鱼圈区","老边区","大石桥市","盖州市","其他"]},
+
+{"name":"阜新", "area":["全市","海州区","新邱区","太平区","清河门区","细河区","彰武县","阜新蒙古族自治县","其他"]},
+
+{"name":"辽阳", "area":["全市","白塔区","文圣区","宏伟区","太子河区","弓长岭区","灯塔市","辽阳县","其他"]},
+
+{"name":"盘锦", "area":["全市","双台子区","兴隆台区","盘山县","大洼县","其他"]},
+
+{"name":"铁岭", "area":["全市","银州区","清河区","调兵山市","开原市","铁岭县","昌图县","西丰县","其他"]},
+
+{"name":"朝阳", "area":["全市","双塔区","龙城区","凌源市","北票市","朝阳县","建平县","喀喇沁左翼蒙古族自治县","其他"]},
+
+{"name":"葫芦岛", "area":["全市","龙港区","南票区","连山区","兴城市","绥中县","建昌县","其他"]}
+
+
+]},
+
+{ "name": "吉林", "city":[
+{"name":"全省", "area":[]},
+{"name":"长春", "area":["全市","朝阳区","宽城区","二道区","南关区","绿园区","双阳区","九台市","榆树市","德惠市","农安县","其他"]},
+
+{"name":"吉林", "area":["全市","船营区","昌邑区","龙潭区","丰满区","舒兰市","桦甸市","蛟河市","磐石市","永吉县","其他"]},
+
+{"name":"四平", "area":["全市","铁西区","铁东区","公主岭市","双辽市","梨树县","伊通满族自治县","其他"]},
+
+{"name":"辽源", "area":["全市","龙山区","西安区","东辽县","东丰县","其他"]},
+
+{"name":"通化", "area":["全市","东昌区","二道江区","梅河口市","集安市","通化县","辉南县","柳河县","其他"]},
+
+{"name":"白山", "area":["全市","八道江区","江源区","临江市","靖宇县","抚松县","长白朝鲜族自治县","其他"]},
+
+{"name":"松原", "area":["全市","宁江区","乾安县","长岭县","扶余县","前郭尔罗斯蒙古族自治县","其他"]},
+
+{"name":"白城", "area":["全市","洮北区","大安市","洮南市","镇赉县","通榆县","其他"]},
+
+{"name":"延边朝鲜族自治州", "area":["全市","延吉市","图们市","敦化市","龙井市","珲春市","和龙市","安图县","汪清县","其他"]}
+
+]},
+
+{ "name": "黑龙江", "city":[
+{"name":"全省", "area":[]},
+{"name":"哈尔滨", "area":["全市","松北区","道里区","南岗区","平房区","香坊区","道外区","呼兰区","阿城区","双城市","尚志市","五常市","宾县","方正县","通河县","巴彦县","延寿县","木兰县","依兰县","其他"]},
+
+{"name":"齐齐哈尔", "area":["全市","龙沙区","昂昂溪区","铁锋区","建华区","富拉尔基区","碾子山区","梅里斯达斡尔族区","讷河市","富裕县","拜泉县","甘南县","依安县","克山县","泰来县","克东县","龙江县","其他"]},
+
+{"name":"鹤岗", "area":["全市","兴山区","工农区","南山区","兴安区","向阳区","东山区","萝北县","绥滨县","其他"]},
+
+{"name":"双鸭山", "area":["全市","尖山区","岭东区","四方台区","宝山区","集贤县","宝清县","友谊县","饶河县","其他"]},
+
+{"name":"鸡西", "area":["全市","鸡冠区","恒山区","城子河区","滴道区","梨树区","麻山区","密山市","虎林市","鸡东县","其他"]},
+
+{"name":"大庆", "area":["全市","萨尔图区","红岗区","龙凤区","让胡路区","大同区","林甸县","肇州县","肇源县","杜尔伯特蒙古族自治县","其他"]},
+
+{"name":"伊春", "area":["全市","伊春区","带岭区","南岔区","金山屯区","西林区","美溪区","乌马河区","翠峦区","友好区","上甘岭区","五营区","红星区","新青区","汤旺河区","乌伊岭区","铁力市","嘉荫县","其他"]},
+
+{"name":"牡丹江", "area":["全市","爱民区","东安区","阳明区","西安区","绥芬河市","宁安市","海林市","穆棱市","林口县","东宁县","其他"]},
+
+{"name":"佳木斯", "area":["全市","向阳区","前进区","东风区","郊区","同江市","富锦市","桦川县","抚远县","桦南县","汤原县","其他"]},
+
+{"name":"七台河", "area":["全市","桃山区","新兴区","茄子河区","勃利县","其他"]},
+
+{"name":"黑河", "area":["全市","爱辉区","北安市","五大连池市","逊克县","嫩江县","孙吴县","其他"]},
+
+{"name":"绥化", "area":["全市","北林区","安达市","肇东市","海伦市","绥棱县","兰西县","明水县","青冈县","庆安县","望奎县","其他"]},
+
+{"name":"大兴安岭地区", "area":["全市","呼玛县","塔河县","漠河县","大兴安岭辖区","其他"]}
+
+]},
+
+{ "name": "上海", "city":[
+
+{"name":"上海", "area":["全市","黄浦区","卢湾区","徐汇区","长宁区","静安区","普陀区","闸北区","虹口区","杨浦区","宝山区","闵行区","嘉定区","松江区","金山区","青浦区","南汇区","奉贤区","浦东新区","崇明县","其他"]}
+
+]},
+
+{ "name": "江苏", "city":[
+{"name":"全省", "area":[]},
+{"name":"南京", "area":["全市","玄武区","白下区","秦淮区","建邺区","鼓楼区","下关区","栖霞区","雨花台区","浦口区","江宁区","六合区","溧水县","高淳县","其他"]},
+
+{"name":"苏州", "area":["全市","金阊区","平江区","沧浪区","虎丘区","吴中区","相城区","常熟市","张家港市","昆山市","吴江市","太仓市","其他"]},
+
+{"name":"无锡", "area":["全市","崇安区","南长区","北塘区","滨湖区","锡山区","惠山区","江阴市","宜兴市","其他"]},
+
+{"name":"常州", "area":["全市","钟楼区","天宁区","戚墅堰区","新北区","武进区","金坛市","溧阳市","其他"]},
+
+{"name":"镇江", "area":["全市","京口区","润州区","丹徒区","丹阳市","扬中市","句容市","其他"]},
+
+{"name":"南通", "area":["全市","崇川区","港闸区","通州市","如皋市","海门市","启东市","海安县","如东县","其他"]},
+
+{"name":"泰州", "area":["全市","海陵区","高港区","姜堰市","泰兴市","靖江市","兴化市","其他"]},
+
+{"name":"扬州", "area":["全市","广陵区","维扬区","邗江区","江都市","仪征市","高邮市","宝应县","其他"]},
+
+{"name":"盐城", "area":["全市","亭湖区","盐都区","大丰市","东台市","建湖县","射阳县","阜宁县","滨海县","响水县","其他"]},
+
+{"name":"连云港", "area":["全市","新浦区","海州区","连云区","东海县","灌云县","赣榆县","灌南县","其他"]},
+
+{"name":"徐州", "area":["全市","云龙区","鼓楼区","九里区","泉山区","贾汪区","邳州市","新沂市","铜山县","睢宁县","沛县","丰县","其他"]},
+
+{"name":"淮安", "area":["全市","清河区","清浦区","楚州区","淮阴区","涟水县","洪泽县","金湖县","盱眙县","其他"]},
+
+{"name":"宿迁", "area":["全市","宿城区","宿豫区","沭阳县","泗阳县","泗洪县","其他"]}
+
+]},
+
+{ "name": "浙江", "city":[
+{"name":"全省", "area":[]},
+{"name":"杭州", "area":["全市","拱墅区","西湖区","上城区","下城区","江干区","滨江区","余杭区","萧山区","建德市","富阳市","临安市","桐庐县","淳安县","其他"]},
+
+{"name":"宁波", "area":["全市","海曙区","江东区","江北区","镇海区","北仑区","鄞州区","余姚市","慈溪市","奉化市","宁海县","象山县","其他"]},
+
+{"name":"温州", "area":["全市","鹿城区","龙湾区","瓯海区","瑞安市","乐清市","永嘉县","洞头县","平阳县","苍南县","文成县","泰顺县","其他"]},
+
+{"name":"嘉兴", "area":["全市","秀城区","秀洲区","海宁市","平湖市","桐乡市","嘉善县","海盐县","其他"]},
+
+{"name":"湖州", "area":["全市","吴兴区","南浔区","长兴县","德清县","安吉县","其他"]},
+
+{"name":"绍兴", "area":["越城区","诸暨市","上虞市","嵊州市","绍兴县","新昌县","其他"]},
+
+{"name":"金华", "area":["全市","婺城区","金东区","兰溪市","义乌市","东阳市","永康市","武义县","浦江县","磐安县","其他"]},
+
+{"name":"衢州", "area":["全市","柯城区","衢江区","江山市","龙游县","常山县","开化县","其他"]},
+
+{"name":"舟山", "area":["全市","定海区","普陀区","岱山县","嵊泗县","其他"]},
+
+{"name":"台州", "area":["全市","椒江区","黄岩区","路桥区","临海市","温岭市","玉环县","天台县","仙居县","三门县","其他"]},
+
+{"name":"丽水", "area":["全市","莲都区","龙泉市","缙云县","青田县","云和县","遂昌县","松阳县","庆元县","景宁畲族自治县","其他"]}
+
+]},
+
+{ "name": "安徽", "city":[
+{"name":"全省", "area":[]},
+{"name":"合肥", "area":["全市","庐阳区","瑶海区","蜀山区","包河区","长丰县","肥东县","肥西县","其他"]},
+
+{"name":"芜湖", "area":["全市","镜湖区","弋江区","鸠江区","三山区","芜湖县","南陵县","繁昌县","其他"]},
+
+{"name":"蚌埠", "area":["全市","蚌山区","龙子湖区","禹会区","淮上区","怀远县","固镇县","五河县","其他"]},
+
+{"name":"淮南", "area":["全市","田家庵区","大通区","谢家集区","八公山区","潘集区","凤台县","其他"]},
+
+{"name":"马鞍山", "area":["全市","雨山区","花山区","金家庄区","当涂县","其他"]},
+
+{"name":"淮北", "area":["全市","相山区","杜集区","烈山区","濉溪县","其他"]},
+
+{"name":"铜陵", "area":["全市","铜官山区","狮子山区","郊区","铜陵县","其他"]},
+
+{"name":"安庆", "area":["全市","迎江区","大观区","宜秀区","桐城市","宿松县","枞阳县","太湖县","怀宁县","岳西县","望江县","潜山县","其他"]},
+
+{"name":"黄山", "area":["全市","屯溪区","黄山区","徽州区","休宁县","歙县","祁门县","黟县","其他"]},
+
+{"name":"滁州", "area":["全市","琅琊区","南谯区","天长市","明光市","全椒县","来安县","定远县","凤阳县","其他"]},
+
+{"name":"阜阳", "area":["全市","颍州区","颍东区","颍泉区","界首市","临泉县","颍上县","阜南县","太和县","其他"]},
+
+{"name":"宿州", "area":["全市","埇桥区","萧县","泗县","砀山县","灵璧县","其他"]},
+
+{"name":"巢湖", "area":["全市","居巢区","含山县","无为县","庐江县","和县","其他"]},
+
+{"name":"六安", "area":["全市","金安区","裕安区","寿县","霍山县","霍邱县","舒城县","金寨县","其他"]},
+
+{"name":"亳州", "area":["全市","谯城区","利辛县","涡阳县","蒙城县","其他"]},
+
+{"name":"池州", "area":["全市","贵池区","东至县","石台县","青阳县","其他"]},
+
+{"name":"宣城", "area":["全市","宣州区","宁国市","广德县","郎溪县","泾县","旌德县","绩溪县","其他"]}
+
+]},
+
+{ "name": "福建", "city":[
+{"name":"全省", "area":[]},
+{"name":"福州", "area":["全市","鼓楼区","台江区","仓山区","马尾区","晋安区","福清市","长乐市","闽侯县","闽清县","永泰县","连江县","罗源县","平潭县","其他"]},
+
+{"name":"厦门", "area":["全市","思明区","海沧区","湖里区","集美区","同安区","翔安区","其他"]},
+
+{"name":"莆田", "area":["全市","城厢区","涵江区","荔城区","秀屿区","仙游县","其他"]},
+
+{"name":"三明", "area":["全市","梅列区","三元区","永安市","明溪县","将乐县","大田县","宁化县","建宁县","沙县","尤溪县","清流县","泰宁县","其他"]},
+
+{"name":"泉州", "area":["全市","鲤城区","丰泽区","洛江区","泉港区","石狮市","晋江市","南安市","惠安县","永春县","安溪县","德化县","金门县","其他"]},
+
+{"name":"漳州", "area":["全市","芗城区","龙文区","龙海市","平和县","南靖县","诏安县","漳浦县","华安县","东山县","长泰县","云霄县","其他"]},
+
+{"name":"南平", "area":["全市","延平区","建瓯市","邵武市","武夷山市","建阳市","松溪县","光泽县","顺昌县","浦城县","政和县","其他"]},
+
+{"name":"龙岩", "area":["全市","新罗区","漳平市","长汀县","武平县","上杭县","永定县","连城县","其他"]},
+
+{"name":"宁德", "area":["全市","蕉城区","福安市","福鼎市","寿宁县","霞浦县","柘荣县","屏南县","古田县","周宁县","其他"]}
+
+]},
+
+{ "name": "江西", "city":[
+{"name":"全省", "area":[]},
+{"name":"南昌", "area":["全市","东湖区","西湖区","青云谱区","湾里区","青山湖区","新建县","南昌县","进贤县","安义县","其他"]},
+
+{"name":"景德镇", "area":["全市","珠山区","昌江区","乐平市","浮梁县","其他"]},
+
+{"name":"萍乡", "area":["全市","安源区","湘东区","莲花县","上栗县","芦溪县","其他"]},
+
+{"name":"九江", "area":["全市","浔阳区","庐山区","瑞昌市","九江县","星子县","武宁县","彭泽县","永修县","修水县","湖口县","德安县","都昌县","其他"]},
+
+{"name":"新余", "area":["全市","渝水区","分宜县","其他"]},
+
+{"name":"鹰潭", "area":["全市","月湖区","贵溪市","余江县","其他"]},
+
+{"name":"赣州", "area":["全市","章贡区","瑞金市","南康市","石城县","安远县","赣县","宁都县","寻乌县","兴国县","定南县","上犹县","于都县","龙南县","崇义县","信丰县","全南县","大余县","会昌县","其他"]},
+
+{"name":"吉安", "area":["全市","吉州区","青原区","井冈山市","吉安县","永丰县","永新县","新干县","泰和县","峡江县","遂川县","安福县","吉水县","万安县","其他"]},
+
+{"name":"宜春", "area":["全市","袁州区","丰城市","樟树市","高安市","铜鼓县","靖安县","宜丰县","奉新县","万载县","上高县","其他"]},
+
+{"name":"抚州", "area":["全市","临川区","南丰县","乐安县","金溪县","南城县","东乡县","资溪县","宜黄县","广昌县","黎川县","崇仁县","其他"]},
+
+{"name":"上饶", "area":["全市","信州区","德兴市","上饶县","广丰县","鄱阳县","婺源县","铅山县","余干县","横峰县","弋阳县","玉山县","万年县","其他"]}
+
+]},
+
+{ "name": "山东", "city":[
+{"name":"全省", "area":[]},
+{"name":"济南", "area":["全市","市中区","历下区","天桥区","槐荫区","历城区","长清区","章丘市","平阴县","济阳县","商河县","其他"]},
+
+{"name":"青岛", "area":["全市","市南区","市北区","城阳区","四方区","李沧区","黄岛区","崂山区","胶南市","胶州市","平度市","莱西市","即墨市","其他"]},
+
+{"name":"淄博", "area":["全市","张店区","临淄区","淄川区","博山区","周村区","桓台县","高青县","沂源县","其他"]},
+
+{"name":"枣庄", "area":["全市","市中区","山亭区","峄城区","台儿庄区","薛城区","滕州市","其他"]},
+
+{"name":"东营", "area":["全市","东营区","河口区","垦利县","广饶县","利津县","其他"]},
+
+{"name":"烟台", "area":["全市","芝罘区","福山区","牟平区","莱山区","龙口市","莱阳市","莱州市","招远市","蓬莱市","栖霞市","海阳市","长岛县","其他"]},
+
+{"name":"潍坊", "area":["全市","潍城区","寒亭区","坊子区","奎文区","青州市","诸城市","寿光市","安丘市","高密市","昌邑市","昌乐县","临朐县","其他"]},
+
+{"name":"济宁", "area":["全市","市中区","任城区","曲阜市","兖州市","邹城市","鱼台县","金乡县","嘉祥县","微山县","汶上县","泗水县","梁山县","其他"]},
+
+{"name":"泰安", "area":["全市","泰山区","岱岳区","新泰市","肥城市","宁阳县","东平县","其他"]},
+
+{"name":"威海", "area":["全市","环翠区","乳山市","文登市","荣成市","其他"]},
+
+{"name":"日照", "area":["全市","东港区","岚山区","五莲县","莒县","其他"]},
+
+{"name":"莱芜", "area":["全市","莱城区","钢城区","其他"]},
+
+{"name":"临沂", "area":["全市","兰山区","罗庄区","河东区","沂南县","郯城县","沂水县","苍山县","费县","平邑县","莒南县","蒙阴县","临沭县","其他"]},
+
+{"name":"德州", "area":["全市","德城区","乐陵市","禹城市","陵县","宁津县","齐河县","武城县","庆云县","平原县","夏津县","临邑县","其他"]},
+
+{"name":"聊城", "area":["全市","东昌府区","临清市","高唐县","阳谷县","茌平县","莘县","东阿县","冠县","其他"]},
+
+{"name":"滨州", "area":["全市","滨城区","邹平县","沾化县","惠民县","博兴县","阳信县","无棣县","其他"]},
+
+{"name":"菏泽", "area":["全市","牡丹区","鄄城县","单县","郓城县","曹县","定陶县","巨野县","东明县","成武县","其他"]}
+
+]},
+
+{ "name": "河南", "city":[
+{"name":"全省", "area":[]},
+{"name":"郑州", "area":["全市","中原区","金水区","二七区","管城回族区","上街区","惠济区","巩义市","新郑市","新密市","登封市","荥阳市","中牟县","其他"]},
+
+{"name":"开封", "area":["全市","鼓楼区","龙亭区","顺河回族区","禹王台区","金明区","开封县","尉氏县","兰考县","杞县","通许县","其他"]},
+
+{"name":"洛阳", "area":["全市","西工区","老城区","涧西区","瀍河回族区","洛龙区","吉利区","偃师市","孟津县","汝阳县","伊川县","洛宁县","嵩县","宜阳县","新安县","栾川县","其他"]},
+
+{"name":"平顶山", "area":["全市","新华区","卫东区","湛河区","石龙区","汝州市","舞钢市","宝丰县","叶县","郏县","鲁山县","其他"]},
+
+{"name":"安阳", "area":["全市","北关区","文峰区","殷都区","龙安区","林州市","安阳县","滑县","内黄县","汤阴县","其他"]},
+
+{"name":"鹤壁", "area":["全市","淇滨区","山城区","鹤山区","浚县","淇县","其他"]},
+
+{"name":"新乡", "area":["全市","卫滨区","红旗区","凤泉区","牧野区","卫辉市","辉县市","新乡县","获嘉县","原阳县","长垣县","封丘县","延津县","其他"]},
+
+{"name":"焦作", "area":["全市","解放区","中站区","马村区","山阳区","沁阳市","孟州市","修武县","温县","武陟县","博爱县","其他"]},
+
+{"name":"濮阳", "area":["全市","华龙区","濮阳县","南乐县","台前县","清丰县","范县","其他"]},
+
+{"name":"许昌", "area":["全市","魏都区","禹州市","长葛市","许昌县","鄢陵县","襄城县","其他"]},
+
+{"name":"漯河", "area":["全市","源汇区","郾城区","召陵区","临颍县","舞阳县","其他"]},
+
+{"name":"三门峡", "area":["全市","湖滨区","义马市","灵宝市","渑池县","卢氏县","陕县","其他"]},
+
+{"name":"南阳", "area":["全市","卧龙区","宛城区","邓州市","桐柏县","方城县","淅川县","镇平县","唐河县","南召县","内乡县","新野县","社旗县","西峡县","其他"]},
+
+{"name":"商丘", "area":["全市","梁园区","睢阳区","永城市","宁陵县","虞城县","民权县","夏邑县","柘城县","睢县","其他"]},
+
+{"name":"信阳", "area":["全市","浉河区","平桥区","潢川县","淮滨县","息县","新县","商城县","固始县","罗山县","光山县","其他"]},
+
+{"name":"周口", "area":["全市","川汇区","项城市","商水县","淮阳县","太康县","鹿邑县","西华县","扶沟县","沈丘县","郸城县","其他"]},
+
+{"name":"驻马店", "area":["全市","驿城区","确山县","新蔡县","上蔡县","西平县","泌阳县","平舆县","汝南县","遂平县","正阳县","其他"]},
+
+{"name":"焦作", "area":["全市","济源市","其他"]}
+
+]},
+
+{ "name": "湖北", "city":[
+{"name":"全省", "area":[]},
+{"name":"武汉", "area":["全市","江岸区","武昌区","江汉区","硚口区","汉阳区","青山区","洪山区","东西湖区","汉南区","蔡甸区","江夏区","黄陂区","新洲区","其他"]},
+
+{"name":"黄石", "area":["全市","黄石港区","西塞山区","下陆区","铁山区","大冶市","阳新县","其他"]},
+
+{"name":"十堰", "area":["全市","张湾区","茅箭区","丹江口市","郧县","竹山县","房县","郧西县","竹溪县","其他"]},
+
+{"name":"荆州", "area":["全市","沙市区","荆州区","洪湖市","石首市","松滋市","监利县","公安县","江陵县","其他"]},
+
+{"name":"宜昌", "area":["全市","西陵区","伍家岗区","点军区","猇亭区","夷陵区","宜都市","当阳市","枝江市","秭归县","远安县","兴山县","五峰土家族自治县","长阳土家族自治县","其他"]},
+
+{"name":"襄樊", "area":["全市","襄城区","樊城区","襄阳区","老河口市","枣阳市","宜城市","南漳县","谷城县","保康县","其他"]},
+
+{"name":"鄂州", "area":["全市","鄂城区","华容区","梁子湖区","其他"]},
+
+{"name":"荆门", "area":["全市","东宝区","掇刀区","钟祥市","京山县","沙洋县","其他"]},
+
+{"name":"孝感", "area":["全市","孝南区","应城市","安陆市","汉川市","云梦县","大悟县","孝昌县","其他"]},
+
+{"name":"黄冈", "area":["全市","黄州区","麻城市","武穴市","红安县","罗田县","浠水县","蕲春县","黄梅县","英山县","团风县","其他"]},
+
+{"name":"咸宁", "area":["全市","咸安区","赤壁市","嘉鱼县","通山县","崇阳县","通城县","其他"]},
+
+{"name":"随州", "area":["全市","曾都区","广水市","其他"]},
+
+{"name":"恩施土家族苗族自治州", "area":["全市","恩施市","利川市","建始县","来凤县","巴东县","鹤峰县","宣恩县","咸丰县","其他"]},
+
+{"name":"仙桃", "area":["全市","仙桃"]},
+
+{"name":"天门", "area":["全市","天门"]},
+
+{"name":"潜江", "area":["全市","潜江"]},
+
+{"name":"神农架林区", "area":["全市","神农架林区"]}
+
+]},
+
+{ "name": "湖南", "city":[
+{"name":"全省", "area":[]},
+{"name":"长沙", "area":["全市","岳麓区","芙蓉区","天心区","开福区","雨花区","浏阳市","长沙县","望城县","宁乡县","其他"]},
+
+{"name":"株洲", "area":["全市","天元区","荷塘区","芦淞区","石峰区","醴陵市","株洲县","炎陵县","茶陵县","攸县","其他"]},
+
+{"name":"湘潭", "area":["全市","岳塘区","雨湖区","湘乡市","韶山市","湘潭县","其他"]},
+
+{"name":"衡阳", "area":["全市","雁峰区","珠晖区","石鼓区","蒸湘区","南岳区","耒阳市","常宁市","衡阳县","衡东县","衡山县","衡南县","祁东县","其他"]},
+
+{"name":"邵阳", "area":["全市","双清区","大祥区","北塔区","武冈市","邵东县","洞口县","新邵县","绥宁县","新宁县","邵阳县","隆回县","城步苗族自治县","其他"]},
+
+{"name":"岳阳", "area":["全市","岳阳楼区","云溪区","君山区","临湘市","汨罗市","岳阳县","湘阴县","平江县","华容县","其他"]},
+
+{"name":"常德", "area":["全市","武陵区","鼎城区","津市市","澧县","临澧县","桃源县","汉寿县","安乡县","石门县","其他"]},
+
+{"name":"张家界", "area":["全市","永定区","武陵源区","慈利县","桑植县","其他"]},
+
+{"name":"益阳", "area":["全市","赫山区","资阳区","沅江市","桃江县","南县","安化县","其他"]},
+
+{"name":"郴州", "area":["全市","北湖区","苏仙区","资兴市","宜章县","汝城县","安仁县","嘉禾县","临武县","桂东县","永兴县","桂阳县","其他"]},
+
+{"name":"永州", "area":["全市","冷水滩区","零陵区","祁阳县","蓝山县","宁远县","新田县","东安县","江永县","道县","双牌县","江华瑶族自治县","其他"]},
+
+{"name":"怀化", "area":["全市","鹤城区","洪江市","会同县","沅陵县","辰溪县","溆浦县","中方县","新晃侗族自治县","芷江侗族自治县","通道侗族自治县","靖州苗族侗族自治县","麻阳苗族自治县","其他"]},
+
+{"name":"娄底", "area":["全市","娄星区","冷水江市","涟源市","新化县","双峰县","其他"]},
+
+{"name":"湘西土家族苗族自治州", "area":["全市","吉首市","古丈县","龙山县","永顺县","凤凰县","泸溪县","保靖县","花垣县","其他"]}
+
+]},
+
+{ "name": "广东", "city":[
+{"name":"全省", "area":[]},
+{"name":"广州", "area":["全市","越秀区","荔湾区","海珠区","天河区","白云区","黄埔区","番禺区","花都区","南沙区","萝岗区","增城市","从化市","其他"]},
+
+{"name":"深圳", "area":["全市","福田区","罗湖区","南山区","宝安区","龙岗区","盐田区","其他"]},
+
+{"name":"东莞", "area":["全市","莞城","常平","塘厦","塘厦","塘厦","其他"]},
+
+{"name":"中山", "area":["全市","中山"]},
+
+{"name":"潮州", "area":["全市","湘桥区","潮安县","饶平县","其他"]},
+
+{"name":"揭阳", "area":["全市","榕城区","揭东县","揭西县","惠来县","普宁市","其他"]},
+
+{"name":"云浮", "area":["全市","云城区","新兴县","郁南县","云安县","罗定市","其他"]},
+
+{"name":"珠海", "area":["全市","香洲区","斗门区","金湾区","其他"]},
+
+{"name":"汕头", "area":["全市","金平区","濠江区","龙湖区","潮阳区","潮南区","澄海区","南澳县","其他"]},
+
+{"name":"韶关", "area":["全市","浈江区","武江区","曲江区","乐昌市","南雄市","始兴县","仁化县","翁源县","新丰县","乳源瑶族自治县","其他"]},
+
+{"name":"佛山", "area":["全市","禅城区","南海区","顺德区","三水区","高明区","其他"]},
+
+{"name":"江门", "area":["全市","蓬江区","江海区","新会区","恩平市","台山市","开平市","鹤山市","其他"]},
+
+{"name":"湛江", "area":["全市","赤坎区","霞山区","坡头区","麻章区","吴川市","廉江市","雷州市","遂溪县","徐闻县","其他"]},
+
+{"name":"茂名", "area":["全市","茂南区","茂港区","化州市","信宜市","高州市","电白县","其他"]},
+
+{"name":"肇庆", "area":["全市","端州区","鼎湖区","高要市","四会市","广宁县","怀集县","封开县","德庆县","其他"]},
+
+{"name":"惠州", "area":["全市","惠城区","惠阳区","博罗县","惠东县","龙门县","其他"]},
+
+{"name":"梅州", "area":["全市","梅江区","兴宁市","梅县","大埔县","丰顺县","五华县","平远县","蕉岭县","其他"]},
+
+{"name":"汕尾", "area":["全市","城区","陆丰市","海丰县","陆河县","其他"]},
+
+{"name":"河源", "area":["全市","源城区","紫金县","龙川县","连平县","和平县","东源县","其他"]},
+
+{"name":"阳江", "area":["全市","江城区","阳春市","阳西县","阳东县","其他"]},
+
+{"name":"清远", "area":["全市","清城区","英德市","连州市","佛冈县","阳山县","清新县","连山壮族瑶族自治县","连南瑶族自治县","其他"]}
+
+]},
+
+{ "name": "广西", "city":[
+{"name":"全省", "area":[]},
+{"name":"南宁", "area":["全市","青秀区","兴宁区","西乡塘区","良庆区","江南区","邕宁区","武鸣县","隆安县","马山县","上林县","宾阳县","横县","其他"]},
+
+{"name":"柳州", "area":["全市","城中区","鱼峰区","柳北区","柳南区","柳江县","柳城县","鹿寨县","融安县","融水苗族自治县","三江侗族自治县","其他"]},
+
+{"name":"桂林", "area":["全市","象山区","秀峰区","叠彩区","七星区","雁山区","阳朔县","临桂县","灵川县","全州县","平乐县","兴安县","灌阳县","荔浦县","资源县","永福县","龙胜各族自治县","恭城瑶族自治县","其他"]},
+
+{"name":"梧州", "area":["全市","万秀区","蝶山区","长洲区","岑溪市","苍梧县","藤县","蒙山县","其他"]},
+
+{"name":"北海", "area":["全市","海城区","银海区","铁山港区","合浦县","其他"]},
+
+{"name":"防城港", "area":["全市","港口区","防城区","东兴市","上思县","其他"]},
+
+{"name":"钦州", "area":["全市","钦南区","钦北区","灵山县","浦北县","其他"]},
+
+{"name":"贵港", "area":["全市","港北区","港南区","覃塘区","桂平市","平南县","其他"]},
+
+{"name":"玉林", "area":["全市","玉州区","北流市","容县","陆川县","博白县","兴业县","其他"]},
+
+{"name":"百色", "area":["全市","右江区","凌云县","平果县","西林县","乐业县","德保县","田林县","田阳县","靖西县","田东县","那坡县","隆林各族自治县","其他"]},
+
+{"name":"贺州", "area":["全市","八步区","钟山县","昭平县","富川瑶族自治县","其他"]},
+
+{"name":"河池", "area":["全市","金城江区","宜州市","天峨县","凤山县","南丹县","东兰县","都安瑶族自治县","罗城仫佬族自治县","巴马瑶族自治县","环江毛南族自治县","大化瑶族自治县","其他"]},
+
+{"name":"来宾", "area":["全市","兴宾区","合山市","象州县","武宣县","忻城县","金秀瑶族自治县","其他"]},
+
+{"name":"崇左", "area":["全市","江州区","凭祥市","宁明县","扶绥县","龙州县","大新县","天等县","其他"]}
+
+]},
+
+{ "name": "海南", "city":[
+{"name":"全省", "area":[]},
+{"name":"海口", "area":["全市","龙华区","秀英区","琼山区","美兰区","其他"]},
+
+{"name":"三亚", "area":["全市","三亚市","其他"]},
+
+{"name":"五指山", "area":["全市","五指山"]},
+
+{"name":"琼海", "area":["全市","琼海"]},
+
+{"name":"儋州", "area":["全市","儋州"]},
+
+{"name":"文昌", "area":["全市","文昌"]},
+
+{"name":"万宁", "area":["全市","万宁"]},
+
+{"name":"东方", "area":["全市","东方"]},
+
+{"name":"澄迈县", "area":["全市","澄迈县"]},
+
+{"name":"定安县", "area":["全市","定安县"]},
+
+{"name":"屯昌县", "area":["全市","屯昌县"]},
+
+{"name":"临高县", "area":["全市","临高县"]},
+
+{"name":"白沙黎族自治县", "area":["全市","白沙黎族自治县"]},
+
+{"name":"昌江黎族自治县", "area":["全市","昌江黎族自治县"]},
+
+{"name":"乐东黎族自治县", "area":["全市","乐东黎族自治县"]},
+
+{"name":"陵水黎族自治县", "area":["全市","陵水黎族自治县"]},
+
+{"name":"保亭黎族苗族自治县", "area":["全市","保亭黎族苗族自治县"]},
+
+{"name":"琼中黎族苗族自治县", "area":["全市","琼中黎族苗族自治县"]}
+
+]},
+
+{ "name": "重庆", "city":[
+
+{"name":"重庆", "area":["全市","渝中区","大渡口区","江北区","南岸区","北碚区","渝北区","巴南区","长寿区","双桥区","沙坪坝区","万盛区","万州区","涪陵区","黔江区","永川区","合川区","江津区","九龙坡区","南川区","綦江县","潼南县","荣昌县","璧山县","大足县","铜梁县","梁平县","开县","忠县","城口县","垫江县","武隆县","丰都县","奉节县","云阳县","巫溪县","巫山县","石柱土家族自治县","秀山土家族苗族自治县","酉阳土家族苗族自治县","彭水苗族土家族自治县","其他"]}
+
+]},
+
+{ "name": "四川", "city":[
+{"name":"全省", "area":[]},
+{"name":"成都", "area":["全市","青羊区","锦江区","金牛区","武侯区","成华区","龙泉驿区","青白江区","新都区","温江区","都江堰市","彭州市","邛崃市","崇州市","金堂县","郫县","新津县","双流县","蒲江县","大邑县","其他"]},
+
+{"name":"自贡", "area":["全市","大安区","自流井区","贡井区","沿滩区","荣县","富顺县","其他"]},
+
+{"name":"攀枝花", "area":["全市","仁和区","米易县","盐边县","东区","西区","其他"]},
+
+{"name":"泸州", "area":["全市","江阳区","纳溪区","龙马潭区","泸县","合江县","叙永县","古蔺县","其他"]},
+
+{"name":"德阳", "area":["全市","旌阳区","广汉市","什邡市","绵竹市","罗江县","中江县","其他"]},
+
+{"name":"绵阳", "area":["全市","涪城区","游仙区","江油市","盐亭县","三台县","平武县","安县","梓潼县","北川羌族自治县","其他"]},
+
+{"name":"广元", "area":["全市","元坝区","朝天区","青川县","旺苍县","剑阁县","苍溪县","市中区","其他"]},
+
+{"name":"遂宁", "area":["全市","船山区","安居区","射洪县","蓬溪县","大英县","其他"]},
+
+{"name":"内江", "area":["全市","市中区","东兴区","资中县","隆昌县","威远县","其他"]},
+
+{"name":"乐山", "area":["全市","市中区","五通桥区","沙湾区","金口河区","峨眉山市","夹江县","井研县","犍为县","沐川县","马边彝族自治县","峨边彝族自治县","其他"]},
+
+{"name":"南充", "area":["全市","顺庆区","高坪区","嘉陵区","阆中市","营山县","蓬安县","仪陇县","南部县","西充县","其他"]},
+
+{"name":"眉山", "area":["全市","东坡区","仁寿县","彭山县","洪雅县","丹棱县","青神县","其他"]},
+
+{"name":"宜宾", "area":["全市","翠屏区","宜宾县","兴文县","南溪县","珙县","长宁县","高县","江安县","筠连县","屏山县","其他"]},
+
+{"name":"广安", "area":["全市","广安区","华蓥市","岳池县","邻水县","武胜县","其他"]},
+
+{"name":"达州", "area":["全市","通川区","万源市","达县","渠县","宣汉县","开江县","大竹县","其他"]},
+
+{"name":"雅安", "area":["全市","雨城区","芦山县","石棉县","名山县","天全县","荥经县","宝兴县","汉源县","其他"]},
+
+{"name":"巴中", "area":["全市","巴州区","南江县","平昌县","通江县","其他"]},
+
+{"name":"资阳", "area":["全市","雁江区","简阳市","安岳县","乐至县","其他"]},
+
+{"name":"阿坝藏族羌族自治州", "area":["全市","马尔康县","九寨沟县","红原县","汶川县","阿坝县","理县","若尔盖县","小金县","黑水县","金川县","松潘县","壤塘县","茂县","其他"]},
+
+{"name":"甘孜藏族自治州", "area":["全市","康定县","丹巴县","炉霍县","九龙县","甘孜县","雅江县","新龙县","道孚县","白玉县","理塘县","德格县","乡城县","石渠县","稻城县","色达县","巴塘县","泸定县","得荣县","其他"]},
+
+{"name":"凉山彝族自治州", "area":["全市","西昌市","美姑县","昭觉县","金阳县","甘洛县","布拖县","雷波县","普格县","宁南县","喜德县","会东县","越西县","会理县","盐源县","德昌县","冕宁县","木里藏族自治县","其他"]}
+
+]},
+
+{ "name": "贵州", "city":[
+{"name":"全省", "area":[]},
+{"name":"贵阳", "area":["全市","南明区","云岩区","花溪区","乌当区","白云区","小河区","清镇市","开阳县","修文县","息烽县","其他"]},
+
+{"name":"六盘水", "area":["全市","钟山区","水城县","盘县","六枝特区","其他"]},
+
+{"name":"遵义", "area":["全市","红花岗区","汇川区","赤水市","仁怀市","遵义县","绥阳县","桐梓县","习水县","凤冈县","正安县","余庆县","湄潭县","道真仡佬族苗族自治县","务川仡佬族苗族自治县","其他"]},
+
+{"name":"安顺", "area":["全市","西秀区","普定县","平坝县","镇宁布依族苗族自治县","紫云苗族布依族自治县","关岭布依族苗族自治县","其他"]},
+
+{"name":"铜仁地区", "area":["全市","铜仁市","德江县","江口县","思南县","石阡县","玉屏侗族自治县","松桃苗族自治县","印江土家族苗族自治县","沿河土家族自治县","万山特区","其他"]},
+
+{"name":"毕节地区", "area":["全市","毕节市","黔西县","大方县","织金县","金沙县","赫章县","纳雍县","威宁彝族回族苗族自治县","其他"]},
+
+{"name":"黔西南布依族苗族自治州", "area":["全市","兴义市","望谟县","兴仁县","普安县","册亨县","晴隆县","贞丰县","安龙县","其他"]},
+
+{"name":"黔东南苗族侗族自治州", "area":["全市","凯里市","施秉县","从江县","锦屏县","镇远县","麻江县","台江县","天柱县","黄平县","榕江县","剑河县","三穗县","雷山县","黎平县","岑巩县","丹寨县","其他"]},
+
+{"name":"黔南布依族苗族自治州", "area":["全市","都匀市","福泉市","贵定县","惠水县","罗甸县","瓮安县","荔波县","龙里县","平塘县","长顺县","独山县","三都水族自治县","其他"]}
+
+]},
+
+{ "name": "云南", "city":[
+{"name":"全省", "area":[]},
+{"name":"昆明", "area":["全市","盘龙区","五华区","官渡区","西山区","东川区","安宁市","呈贡县","晋宁县","富民县","宜良县","嵩明县","石林彝族自治县","禄劝彝族苗族自治县","寻甸回族彝族自治县","其他"]},
+
+{"name":"曲靖", "area":["全市","麒麟区","宣威市","马龙县","沾益县","富源县","罗平县","师宗县","陆良县","会泽县","其他"]},
+
+{"name":"玉溪", "area":["全市","红塔区","江川县","澄江县","通海县","华宁县","易门县","峨山彝族自治县","新平彝族傣族自治县","元江哈尼族彝族傣族自治县","其他"]},
+
+{"name":"保山", "area":["全市","隆阳区","施甸县","腾冲县","龙陵县","昌宁县","其他"]},
+
+{"name":"昭通", "area":["全市","昭阳区","鲁甸县","巧家县","盐津县","大关县","永善县","绥江县","镇雄县","彝良县","威信县","水富县","其他"]},
+
+{"name":"丽江", "area":["全市","古城区","永胜县","华坪县","玉龙纳西族自治县","宁蒗彝族自治县","其他"]},
+
+{"name":"普洱", "area":["全市","思茅区","普洱哈尼族彝族自治县","墨江哈尼族自治县","景东彝族自治县","景谷傣族彝族自治县","镇沅彝族哈尼族拉祜族自治县","江城哈尼族彝族自治县","孟连傣族拉祜族佤族自治县","澜沧拉祜族自治县","西盟佤族自治县","其他"]},
+
+{"name":"临沧", "area":["全市","临翔区","凤庆县","云县","永德县","镇康县","双江拉祜族佤族布朗族傣族自治县","耿马傣族佤族自治县","沧源佤族自治县","其他"]},
+
+{"name":"德宏傣族景颇族自治州", "area":["全市","潞西市","瑞丽市","梁河县","盈江县","陇川县","其他"]},
+
+{"name":"怒江傈僳族自治州", "area":["全市","泸水县","福贡县","贡山独龙族怒族自治县","兰坪白族普米族自治县","其他"]},
+
+{"name":"迪庆藏族自治州", "area":["全市","香格里拉县","德钦县","维西傈僳族自治县","其他"]},
+
+{"name":"大理白族自治州", "area":["全市","大理市","祥云县","宾川县","弥渡县","永平县","云龙县","洱源县","剑川县","鹤庆县","漾濞彝族自治县","南涧彝族自治县","巍山彝族回族自治县","其他"]},
+
+{"name":"楚雄彝族自治州", "area":["全市","楚雄市","双柏县","牟定县","南华县","姚安县","大姚县","永仁县","元谋县","武定县","禄丰县","其他"]},
+
+{"name":"红河哈尼族彝族自治州", "area":["全市","蒙自县","个旧市","开远市","绿春县","建水县","石屏县","弥勒县","泸西县","元阳县","红河县","金平苗族瑶族傣族自治县","河口瑶族自治县","屏边苗族自治县","其他"]},
+
+{"name":"文山壮族苗族自治州", "area":["全市","文山县","砚山县","西畴县","麻栗坡县","马关县","丘北县","广南县","富宁县","其他"]},
+
+{"name":"西双版纳傣族自治州", "area":["全市","景洪市","勐海县","勐腊县","其他"]}
+
+]},
+
+{ "name": "西藏", "city":[
+{"name":"全省", "area":[]},
+{"name":"拉萨", "area":["全市","城关区","林周县","当雄县","尼木县","曲水县","堆龙德庆县","达孜县","墨竹工卡县","其他"]},
+
+{"name":"那曲地区", "area":["全市","那曲县","嘉黎县","比如县","聂荣县","安多县","申扎县","索县","班戈县","巴青县","尼玛县","其他"]},
+
+{"name":"昌都地区", "area":["全市","昌都县","江达县","贡觉县","类乌齐县","丁青县","察雅县","八宿县","左贡县","芒康县","洛隆县","边坝县","其他"]},
+
+{"name":"林芝地区", "area":["全市","林芝县","工布江达县","米林县","墨脱县","波密县","察隅县","朗县","其他"]},
+
+{"name":"山南地区", "area":["全市","乃东县","扎囊县","贡嘎县","桑日县","琼结县","曲松县","措美县","洛扎县","加查县","隆子县","错那县","浪卡子县","其他"]},
+
+{"name":"日喀则地区", "area":["全市","日喀则市","南木林县","江孜县","定日县","萨迦县","拉孜县","昂仁县","谢通门县","白朗县","仁布县","康马县","定结县","仲巴县","亚东县","吉隆县","聂拉木县","萨嘎县","岗巴县","其他"]},
+
+{"name":"阿里地区", "area":["全市","噶尔县","普兰县","札达县","日土县","革吉县","改则县","措勤县","其他"]}
+
+]},
+
+{ "name": "陕西", "city":[
+{"name":"全省", "area":[]},
+{"name":"西安", "area":["全市","莲湖区","新城区","碑林区","雁塔区","灞桥区","未央区","阎良区","临潼区","长安区","高陵县","蓝田县","户县","周至县","其他"]},
+
+{"name":"铜川", "area":["全市","耀州区","王益区","印台区","宜君县","其他"]},
+
+{"name":"宝鸡", "area":["全市","渭滨区","金台区","陈仓区","岐山县","凤翔县","陇县","太白县","麟游县","扶风县","千阳县","眉县","凤县","其他"]},
+
+{"name":"咸阳", "area":["全市","秦都区","渭城区","杨陵区","兴平市","礼泉县","泾阳县","永寿县","三原县","彬县","旬邑县","长武县","乾县","武功县","淳化县","其他"]},
+
+{"name":"渭南", "area":["全市","临渭区","韩城市","华阴市","蒲城县","潼关县","白水县","澄城县","华县","合阳县","富平县","大荔县","其他"]},
+
+{"name":"延安", "area":["全市","宝塔区","安塞县","洛川县","子长县","黄陵县","延川县","富县","延长县","甘泉县","宜川县","志丹县","黄龙县","吴起县","其他"]},
+
+{"name":"汉中", "area":["全市","汉台区","留坝县","镇巴县","城固县","南郑县","洋县","宁强县","佛坪县","勉县","西乡县","略阳县","其他"]},
+
+{"name":"榆林", "area":["全市","榆阳区","清涧县","绥德县","神木县","佳县","府谷县","子洲县","靖边县","横山县","米脂县","吴堡县","定边县","其他"]},
+
+{"name":"安康", "area":["全市","汉滨区","紫阳县","岚皋县","旬阳县","镇坪县","平利县","石泉县","宁陕县","白河县","汉阴县","其他"]},
+
+{"name":"商洛", "area":["全市","商州区","镇安县","山阳县","洛南县","商南县","丹凤县","柞水县","其他"]}
+
+]},
+
+{ "name": "甘肃", "city":[
+{"name":"全省", "area":[]},
+{"name":"兰州", "area":["全市","城关区","七里河区","西固区","安宁区","红古区","永登县","皋兰县","榆中县","其他"]},
+
+{"name":"嘉峪关", "area":["全市","嘉峪关市","其他"]},
+
+{"name":"金昌", "area":["全市","金川区","永昌县","其他"]},
+
+{"name":"白银", "area":["全市","白银区","平川区","靖远县","会宁县","景泰县","其他"]},
+
+{"name":"天水", "area":["全市","清水县","秦安县","甘谷县","武山县","张家川回族自治县","北道区","秦城区","其他"]},
+
+{"name":"武威", "area":["全市","凉州区","民勤县","古浪县","天祝藏族自治县","其他"]},
+
+{"name":"酒泉", "area":["全市","肃州区","玉门市","敦煌市","金塔县","肃北蒙古族自治县","阿克塞哈萨克族自治县","安西县","其他"]},
+
+{"name":"张掖", "area":["全市","甘州区","民乐县","临泽县","高台县","山丹县","肃南裕固族自治县","其他"]},
+
+{"name":"庆阳", "area":["全市","西峰区","庆城县","环县","华池县","合水县","正宁县","宁县","镇原县","其他"]},
+
+{"name":"平凉", "area":["全市","崆峒区","泾川县","灵台县","崇信县","华亭县","庄浪县","静宁县","其他"]},
+
+{"name":"定西", "area":["全市","安定区","通渭县","临洮县","漳县","岷县","渭源县","陇西县","其他"]},
+
+{"name":"陇南", "area":["全市","武都区","成县","宕昌县","康县","文县","西和县","礼县","两当县","徽县","其他"]},
+
+{"name":"临夏回族自治州", "area":["全市","临夏市","临夏县","康乐县","永靖县","广河县","和政县","东乡族自治县","积石山保安族东乡族撒拉族自治县","其他"]},
+
+{"name":"甘南藏族自治州", "area":["全市","合作市","临潭县","卓尼县","舟曲县","迭部县","玛曲县","碌曲县","夏河县","其他"]}
+
+]},
+
+{ "name": "青海", "city":[
+{"name":"全省", "area":[]},
+{"name":"西宁", "area":["全市","城中区","城东区","城西区","城北区","湟源县","湟中县","大通回族土族自治县","其他"]},
+
+{"name":"海东地区", "area":["全市","平安县","乐都县","民和回族土族自治县","互助土族自治县","化隆回族自治县","循化撒拉族自治县","其他"]},
+
+{"name":"海北藏族自治州", "area":["全市","海晏县","祁连县","刚察县","门源回族自治县","其他"]},
+
+{"name":"海南藏族自治州", "area":["全市","共和县","同德县","贵德县","兴海县","贵南县","其他"]},
+
+{"name":"黄南藏族自治州", "area":["全市","同仁县","尖扎县","泽库县","河南蒙古族自治县","其他"]},
+
+{"name":"果洛藏族自治州", "area":["全市","玛沁县","班玛县","甘德县","达日县","久治县","玛多县","其他"]},
+
+{"name":"玉树藏族自治州", "area":["全市","玉树县","杂多县","称多县","治多县","囊谦县","曲麻莱县","其他"]},
+
+{"name":"海西蒙古族藏族自治州", "area":["全市","德令哈市","格尔木市","乌兰县","都兰县","天峻县","其他"]}
+
+]},
+
+{ "name": "宁夏", "city":[
+{"name":"全省", "area":[]},
+{"name":"银川", "area":["全市","兴庆区","西夏区","金凤区","灵武市","永宁县","贺兰县","其他"]},
+
+{"name":"石嘴山", "area":["全市","大武口区","惠农区","平罗县","其他"]},
+
+{"name":"吴忠", "area":["全市","利通区","青铜峡市","盐池县","同心县","其他"]},
+
+{"name":"固原", "area":["全市","原州区","西吉县","隆德县","泾源县","彭阳县","其他"]},
+
+{"name":"中卫", "area":["全市","沙坡头区","中宁县","海原县","其他"]}
+
+]}, 
+
+{ "name": "新疆", "city":[
+{"name":"全省", "area":[]},
+{"name":"乌鲁木齐", "area":["全市","天山区","沙依巴克区","新市区","水磨沟区","头屯河区","达坂城区","东山区","乌鲁木齐县","其他"]},
+
+{"name":"克拉玛依", "area":["全市","克拉玛依区","独山子区","白碱滩区","乌尔禾区","其他"]},
+
+{"name":"吐鲁番地区", "area":["全市","吐鲁番市","托克逊县","鄯善县","其他"]},
+
+{"name":"哈密地区", "area":["全市","哈密市","伊吾县","巴里坤哈萨克自治县","其他"]},
+
+{"name":"和田地区", "area":["全市","和田市","和田县","洛浦县","民丰县","皮山县","策勒县","于田县","墨玉县","其他"]},
+
+{"name":"阿克苏地区", "area":["全市","阿克苏市","温宿县","沙雅县","拜城县","阿瓦提县","库车县","柯坪县","新和县","乌什县","其他"]},
+
+{"name":"喀什地区", "area":["全市","喀什市","巴楚县","泽普县","伽师县","叶城县","岳普湖县","疏勒县","麦盖提县","英吉沙县","莎车县","疏附县","塔什库尔干塔吉克自治县","其他"]},
+
+{"name":"克孜勒苏柯尔克孜自治州", "area":["全市","阿图什市","阿合奇县","乌恰县","阿克陶县","其他"]},
+
+{"name":"巴音郭楞蒙古自治州", "area":["全市","库尔勒市","和静县","尉犁县","和硕县","且末县","博湖县","轮台县","若羌县","焉耆回族自治县","其他"]},
+
+{"name":"昌吉回族自治州", "area":["全市","昌吉市","阜康市","奇台县","玛纳斯县","吉木萨尔县","呼图壁县","木垒哈萨克自治县","米泉市","其他"]},
+
+{"name":"博尔塔拉蒙古自治州", "area":["全市","博乐市","精河县","温泉县","其他"]},
+
+{"name":"石河子", "area":["全市","石河子"]},
+
+{"name":"阿拉尔", "area":["全市","阿拉尔"]},
+
+{"name":"图木舒克", "area":["全市","图木舒克"]},
+
+{"name":"五家渠", "area":["全市","五家渠"]},
+
+{"name":"伊犁哈萨克自治州", "area":["全市","伊宁市","奎屯市","伊宁县","特克斯县","尼勒克县","昭苏县","新源县","霍城县","巩留县","察布查尔锡伯自治县","塔城地区","阿勒泰地区","其他"]}
+
+]},
+
+{ "name": "台湾", "city":[
+
+{"name":"台湾", "area":["全市","台北市","高雄市","台北县","桃园县","新竹县","苗栗县","台中县","彰化县","南投县","云林县","嘉义县","台南县","高雄县","屏东县","宜兰县","花莲县","台东县","澎湖县","基隆市","新竹市","台中市","嘉义市","台南市","其他"]}
+
+]},
+
+{ "name": "澳门", "city":[
+
+{"name":"澳门", "area":["花地玛堂区","圣安多尼堂区","大堂区","望德堂区","风顺堂区","嘉模堂区","圣方济各堂区","路凼","其他"]}
+
+]},
+
+{ "name": "香港", "city":[
+
+{"name":"香港", "area":["中西区","湾仔区","东区","南区","深水埗区","油尖旺区","九龙城区","黄大仙区","观塘区","北区","大埔区","沙田区","西贡区","元朗区","屯门区","荃湾区","葵青区","离岛区","其他"]}
+
+]},
+
+{ "name": "钓鱼岛", "city":[
+
+{"name":"钓鱼岛", "area":["钓鱼岛"]}
+
+]}
+
+]

components/itmister-address-picker/itmister-address-picker.nvue

@@ -0,0 +1,330 @@
+<template>
+	<div v-if="isShow">
+		<div class="address-picker-mask" bubble='true' @click="hide" :class="[isOpen?'show-address-picker-mask':'hide-address-picker-mask']" 
+		:style="{backgroundColor:maskColor,opacity:opacity}">
+		</div>
+		<!-- #ifdef APP-PLUS-NVUE -->
+		<div class="address-picker-container" ref="addressPickerEl" @click.stop="handleClick" :class="[isOpen?'show-address-picker':'hide-address-picker']">
+		<!-- #endif -->
+		<!-- #ifndef APP-PLUS-NVUE -->
+		<div class="address-picker-container" @click.stop="handleClick" :class="[isOpen?'show-address-picker':'hide-address-picker']"
+		:style="{transform:'translatey('+translatey+'px)'}">
+		<!-- #endif -->
+			<div class="address-picker-button row between-center">
+				<text class="address-picker-button-text" style="color: #777777;" @click="hide">取消</text>
+				<text class="address-picker-button-text" style="color: #007AFF;" @click="confirmChange(value)">确认</text>
+			</div>
+			<picker-view class="address-picker-box" v-if="visible" :indicator-style="indicatorStyle" :value="value" @change="bindChange">
+				<picker-view-column class="center">
+					<div class="address-picker-item center" v-for="(item,index) in provinceList" :key="index">
+						<text class="address-picker-item-text">{{item}}</text>
+					</div>
+				</picker-view-column>
+				<picker-view-column>
+					<div class="address-picker-item center" v-for="(item,index) in cityList" :key="index">
+						<text class="address-picker-item-text">{{item}}</text>
+					</div>
+				</picker-view-column>
+				<picker-view-column v-show="showCheck">
+					<div class="address-picker-item center" v-for="(item,index) in areaList" :key="index">
+						<text class="address-picker-item-text">{{item}}</text>
+					</div>
+				</picker-view-column>
+			</picker-view>
+		</div>
+	</div>
+</template>
+
+<script>
+	// #ifdef APP-PLUS-NVUE
+	const animation = weex.requireModule('animation');
+	// #endif
+	export default {
+		name: "itmisterAddressPicker",
+		props: {
+			showCheck:{//是否显示区级
+				type: Boolean,
+				default: true
+			},
+			wholeCountry:{
+				type: Boolean,
+				default: false
+			},
+			maskColor: { // 模态框背景色
+				type: String,
+				default: 'rgba(0,0,0,0.3)'
+			},
+			addressIndex:{ // 修改地址时使用，接收旧地址的省市区，对应的索引数组
+				type:Array,
+				default(){
+					return [0,0,0]
+				}
+			}
+		},
+		data() {
+			return {
+				isShow: false, // 是否弹出
+				isOpen: false,
+				translatey: 500, // 弹出层高度
+				opacity: 0, // 模态框透明度
+				visible: true,
+				indicatorStyle: `height: ${Math.round(uni.getSystemInfoSync().screenWidth/(750/100))}px;`,
+				value: [], // 设置默认选中
+				cityData: require('../../components/itmister-address-picker/city.json'), // 加载城市数据
+				provinceList:[], // 省列表
+				cityList:[], // 市列表
+				areaList:[], // 区列表
+			}
+		},
+		mounted() {
+			this.value = this.addressIndex;
+			let arrays = {}
+			if(this.wholeCountry){
+				 arrays = {
+					city:[{area:[],name:''}],
+					name:'全国'
+				}
+				this.cityData.splice(0,0,arrays)
+			}
+			this.loadProvince(this.cityData);
+		},
+		methods: {
+			
+			// 确认选中
+			confirmChange(val){
+				let address = {
+					// 当前选中的地址
+					province:this.provinceList[val[0]],
+					city:this.cityList[val[1]],
+					area:this.areaList[val[2]],
+					// 当前地址的索引，保存起来，用于日后修改地址时，加载默认
+					provinceIndex:val[0],
+					cityIndex:val[1],
+					areaIndex:val[2]
+				}
+				this.$emit('confirmChange',address);
+				this.hide();
+			},
+			
+			// 监听选中
+			bindChange(e) {
+				const val = e.detail.value;
+				this.value = [val[0],val[1],val[2]];
+				this.loadCity(this.cityData[val[0]].city);
+			},
+			
+			// 加载数据
+			loadProvince(data){
+				let newList = [];
+				data.forEach(item => {
+					newList.push(item.name);
+				});
+				this.provinceList = newList;
+				this.loadCity(this.cityData[this.value[0]].city);
+			},
+			loadCity(data){
+				let newList = [];
+				data.forEach(item => {
+					newList.push(item.name);
+				});
+				this.cityList = newList;
+				
+				if((data.length - 1) >= this.value[1]){ // 解决特殊情况报错的问题
+					this.loadArea(this.cityData[this.value[0]].city[this.value[1]].area);
+				}else{
+					this.loadArea(this.cityData[this.value[0]].city[0].area);
+				}
+				
+			},
+			loadArea(data){
+				let newList = [];
+				data.forEach(item => {
+					newList.push(item);
+				});
+				this.areaList = newList;
+			},
+			
+			// 显示
+			show() {
+				// 渲染视图
+				this.isShow = true;
+				
+				// 等待视图渲染
+				this.$nextTick(() => {
+					setTimeout(() => {
+						// #ifdef APP-PLUS-NVUE
+						// APP 端获取动画元素
+						let ele = this.$refs.addressPickerEl;
+						// #endif
+						
+						// 执行 mask 透明度
+						this.isOpen = true;
+						this.opacity = 1;
+						
+						// #ifndef APP-PLUS-NVUE
+						// 非APP 端 执行动画
+						this.translatey = 0;
+						// #endif
+
+						// #ifdef APP-PLUS-NVUE
+						// APP 端执行动画
+						animation.transition(ele, {
+							styles: {
+								transform: 'translate(0,0)',
+								transformOrigin: 'center center'
+							},
+							duration: 250, //ms
+							timingFunction: 'ease',
+							delay: 0 //ms
+						});
+						// #endif
+
+					}, 10);
+				});
+			},
+			hide() {
+				// #ifdef APP-PLUS-NVUE
+				// APP 端获取动画元素
+				let ele = this.$refs.addressPickerEl;
+				// #endif
+				
+				// 执行 mask 透明度
+				this.isOpen = false;
+				this.opacity = 0;
+				
+				// #ifndef APP-PLUS-NVUE
+				// 非APP 端执行动画
+				this.translatey = 500;
+				setTimeout(() => {
+					this.isShow = false;
+				}, 200);
+				// #endif
+
+				// #ifdef APP-PLUS-NVUE
+				// APP 端执行动画
+				animation.transition(ele, {
+					styles: {
+						transform: 'translate(0,550)',
+						transformOrigin: 'center center'
+					},
+					duration: 250, //ms
+					timingFunction: 'ease',
+					delay: 0 //ms
+				},() => {
+					this.isShow = false;
+				});
+				// #endif
+
+			},
+			// 阻止冒泡
+			handleClick(event) {
+				event.stopPropagation();
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.address-picker-mask {
+		position: fixed;
+		left: 0;
+		right: 0;
+		top: 0;
+		bottom: 0;
+		z-index: 999988;
+	}
+
+	.address-picker-container {
+		position: fixed;
+		left: 0;
+		right: 0;
+		bottom: 0;
+		z-index: 999999;
+		height: 640rpx;
+		background-color: #FFFFFF;
+	}
+
+	.show-address-picker-mask {
+		transition-property: opacity;
+		transition-duration: 0.2s;
+		transition-timing-function: ease;
+	}
+
+	.hide-address-picker-mask {
+		transition-property: opacity;
+		transition-duration: 0.2s;
+		transition-timing-function: ease;
+	}
+
+	.show-address-picker {
+		/* #ifndef APP-PLUS-NVUE */
+		transition-property: transform;
+		transition-duration: 0.2s;
+		transition-timing-function: ease;
+		/* #endif */
+		/* #ifdef APP-PLUS-NVUE */
+		transform: 'translate(0,550)',
+		/* #endif */
+	}
+
+	.hide-address-picker {
+		/* #ifndef APP-PLUS-NVUE */
+		transition-property: transform;
+		transition-duration: 0.2s;
+		transition-timing-function: ease;
+		/* #endif */
+		/* #ifdef APP-PLUS-NVUE */
+		transform: 'translate(0,550)',
+		/* #endif */
+	}
+	
+	// 内容
+	.address-picker-box{
+		width: 750rpx;
+		height: 500rpx;
+		padding: 0 20rpx;
+		/* #ifdef H5 */
+		box-sizing: border-box;
+		/* #endif */
+		background-color: #FFF;
+	}
+	.address-picker-item{
+		height: 100rpx;
+	}
+	.address-picker-item-text{
+		color: #444;
+		font-size: 32rpx;
+	}
+	
+	// 按钮
+	.address-picker-button{
+		height: 100rpx;
+		margin-bottom: 20rpx;
+		box-shadow: 0 1rpx 1rpx #e4e4e4;
+		background-color: #FFFFFF;
+	}
+	.address-picker-button-text{
+		padding: 10rpx 25rpx;
+		margin: 0 30rpx;
+	}
+	
+	.row{
+		/* #ifndef APP-PLUS-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		
+	}
+	
+	.center{
+		/* #ifndef APP-PLUS-NVUE */
+		display: flex;
+		/* #endif */
+		justify-content: center;
+		align-items: center;
+	}
+	.between-center{
+		justify-content: space-between;
+		align-items: center;
+	}
+</style>

components/ossutil/uploadFile.js

@@ -48,7 +48,6 @@ const uploadFile = function(type, filePath, dir, success, failc) {
 			'success_action_status': '200',
 		},
 		success: function(res) {
-			debugger
 			console.log(res);
 			if (res.statusCode != 200) {
 				failc(new Error('上传错误:' + JSON.stringify(res)))

config/index.js

@@ -1,6 +1,6 @@
 const dev = {
 	// baseUrlNew: 'https://apitest.eliangeyun.com',
-	baseUrlNew: 'http://192.168.1.119:8090',
+	baseUrlNew: 'http://192.168.1.114:8099',
 	// baseUrlNew: 'http://192.168.1.116:8999',
 	h5Appid: 'wxb66b599f7f61b46f',
 	debug: false

pages.json

@@ -120,23 +120,79 @@
 			"path": "pages/riders/myTeam",
 			"style": {
 				"navigationBarTitleText": "我的车队",
-				"enablePullDownRefresh": false
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "white",
+				"app-plus": {
+					"titleNView": {
+						"buttons": [{
+							"text": "&#xe622",
+							"fontSrc": "/static/addfleet/iconfont.ttf",
+							"fontSize": "22"
+						}]
+					}
+				}
+		
 			}
-
-		}, {
+		},
+		{
 			"path": "pages/riders/inTeam",
 			"style": {
 				"navigationBarTitleText": "入队申请",
 				"enablePullDownRefresh": false
 			}
 
+		},
+		{
+			"path": "pages/riders/report",
+			"style": {
+				"navigationBarTitleText": "举报",
+				"enablePullDownRefresh": false
+			}
+		
+		},
+		{
+			"path": "pages/riders/notice",
+			"style": {
+				"navigationBarTitleText": "公告",
+				"enablePullDownRefresh": false
+			}
+		
 		},
 		{
 			"path": "pages/riders/fleetSee",
 			"style": {
-				"navigationStyle": "custom"
+				"navigationBarTitleText": "车队详情",
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "white",
+				"app-plus": {
+					"titleNView": {
+						"buttons": [{
+							"text": "&#xe7c3",
+							"fontSrc": "/static/addfleet/iconfont.ttf",
+							"fontSize": "22"
+						}]
+					}
+				}
+		
+			}
+		},
+		{
+			"path": "pages/mine/often/oftenRoute",
+			"style": {
+				"navigationBarTitleText": "常用路线",
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "white",
+				"app-plus": {
+					"titleNView": {
+						"buttons": [{
+							"text": "&#xe622",
+							"fontSrc": "/static/addfleet/iconfont.ttf",
+							"fontSize": "22"
+						}]
+					}
+				}
+					
 			}
-
 		},
 		{
 			"path": "pages/riders/addFleet",
@@ -215,14 +271,7 @@
 			}
 
 		},
-		{
-			"path": "pages/mine/often/oftenRoute",
-			"style": {
-				"navigationBarTitleText": "常用路线",
-				"navigationBarBackgroundColor": "#2772FB",
-				"navigationBarTextStyle": "white"
-			}
-		},
+		
 		{
 			"path": "pages/mine/often/addRoute",
 			"style": {

pages/goodSource/cargoOwnerSee.vue

@@ -122,7 +122,6 @@
 
 		},
 		onLoad(options) {
-			debugger
 			that = this
 			this.objectInfo = options
 			console.log(options)
@@ -144,7 +143,6 @@
 						pageSize: page.size,
 						currentPage: page.num
 					}).then(res => {
-						debugger
 						if (page.num == 1) that.list = [];
 						that.list = that.list.concat(res.data.records); //追加新数据
 						for (let i = 0; i < that.list.length; i++) {
@@ -187,7 +185,6 @@
 				this.getList()
 			},
 			confirmBtn(e) {
-				debugger
 				console.log(e.value)
 				if (e.value == '反馈') {
 					uni.$u.route('/pages/goodSource/fk', {
@@ -201,7 +198,6 @@
 				this.show = false
 			},
 			btnChange(num) {
-				debugger
 				this.btnData = num
 				this.getList()
 			}

pages/goodSource/fk.vue

@@ -34,7 +34,6 @@
 			};
 		},
 		onLoad(options) {
-			debugger
 			this.dataDetails = JSON.parse(options.val)
 			console.log(this.dataDetails)
 			this.imgList = []

pages/goodSource/index.vue

@@ -269,7 +269,7 @@
 
 		},
 		methods: {
-			cargoOwner(_obj){debugger
+			cargoOwner(_obj){
 				// uni.$u.route('/pages/order/evaluateList');
 				console.log("查看---------------",_obj)
 				uni.$u.route('/pages/goodSource/cargoOwnerSee',_obj)

pages/goodSource/jb.vue

@@ -37,7 +37,6 @@
 			...mapState(['hasLogin', 'userInfo', 'firstAuthentication'])
 		},
 		onLoad(options) {
-			debugger
 			this.dataDetails = JSON.parse(options.val)
 			console.log(this.dataDetails)
 			this.imgList = []

pages/mine/driverCertification.vue

@@ -697,7 +697,6 @@
 							uploadImage(res.tempFilePaths[0], 'appData/',
 								result => {
 									// 上传成功回调函数
-									debugger
 									console.log('图片地址', result)
 									switch (_this.uploadType) {
 										// 身份正面
@@ -857,7 +856,7 @@
 				}
 			},
 			next(val) {
-				if (this.validate()) return
+				// if (this.validate()) return
 				uni.$u.route('/pages/mine/driverCertificationNext', {
 					data: JSON.stringify(this.dataDetails),
 				});

pages/mine/driverCertificationNext.vue

@@ -544,7 +544,7 @@
 				
 			
 				// 校验
-				if (this.validate()) return
+				// if (this.validate()) return
 				// debugger
 				if(this.dataDetails.driverSex=='男'){
 					this.dataDetails.driverCall = this.dataDetails.driverCall+'先生'

pages/mine/often/addRoute.vue

@@ -3,19 +3,16 @@
 		<view class="flex row form_css">
 			<view class="left-text">发货城市</view>
 			<view class="right-text">
-				<!-- <regionPicker :multiIndex_="selections1" @region_="regionChange1" custom_="请选择"
-					@selecteRegion_="selecteRegion1" title_="全国" /> -->
-				<view @click="show1 = true">{{title1 ? title1 : "请选择地址"}}</view>
-				<Linkage @conceal="conceal1" class="flex" v-if="show1" ref="uDropdown"></Linkage>
+				<view @click="selectAddress(1)">{{title1 ? title1 : "请选择地址"}}</view>
+				<itmister-address-picker ref="addressElone" @confirmChange="confirmChangeOne"></itmister-address-picker>
 			</view>
 		</view>
 		<view class="flex row form_css">
 			<view class="left-text">到货城市</view>
 			<view class="right-text">
-				<!-- <regionPicker :multiIndex_="selections2" @region_="regionChange2" custom_="请选择"
-					@selecteRegion_="selecteRegion2" title_="全国" /> -->
-				<view @click="show2 = true">{{title2 ? title2 : "请选择地址"}}</view>
-				<Linkage @conceal="conceal2" class="flex" v-if="show2" ref="uDropdown"></Linkage>
+				<view @click="selectAddress(2)">{{title2 ? title2 : "请选择地址"}}</view>
+				<!-- <Linkage @conceal="conceal2" class="flex" v-if="show2" ref="uDropdown"></Linkage> -->
+				<itmister-address-picker ref="addressEltwo" @confirmChange="confirmChangeTwo"></itmister-address-picker>
 			</view>
 		</view>
 		<view class="text_css">注：常用路线用于展示给其他司机和货主查看。</view>
@@ -28,28 +25,28 @@
 </template>
 
 <script>
-	import regionPicker from "@/components/region/region-picker";
-	import Linkage from '@/components/gaojianghua-linkage/linkage.vue'
+	// import regionPicker from "@/components/region/region-picker";
+	// import Linkage from '@/components/gaojianghua-linkage/linkage.vue'
+	import itmisterAddressPicker from '@/components/itmister-address-picker/itmister-address-picker.nvue'
 
 	export default {
 		components: {
-			regionPicker,
-			Linkage
+			// regionPicker,
+			// Linkage,
+			itmisterAddressPicker
 		},
 		data() {
 			return {
 				id: "",
 				routeData: {},
-				selections1: [],
-				selections2: [],
+				// selections1: [],
+				// selections2: [],
 				driverData: {},
 				avatarUrl: "",
-				sendregion: [],
-				unloaddregion: [],
+				// sendregion: [],
+				// unloaddregion: [],
 				title1: "",
 				title2: "",
-				show1: false,
-				show2: false,
 			}
 		},
 		onShow() {},
@@ -58,62 +55,102 @@
 			this.avatarUrl = uni.getStorageSync("userInfo").avatarUrl
 			this.id = options.id
 			if (this.id) { //修改
-				wx.setNavigationBarTitle({
+				uni.setNavigationBarTitle({
 					title: '编辑路线'
 				})
 				this.getList()
 			}
 		},
 		methods: {
-			conceal1(param) {
-				const {
-					chooseprovince,
-					choosecity,
-					choosearea
-				} = param
-				// 获取到传过来的 省 市 区 县数据
-				this.routeData.sendProvince = chooseprovince
-				this.routeData.sendCity = choosecity == '全部' ? "" : choosecity
-				this.routeData.sendArea = choosearea == '全部' ? "" : choosearea
-				this.title1 = chooseprovince + choosecity + choosearea
-				if (chooseprovince == '全国') {
-					this.succeed(1)
-				}
-				if (choosecity == '全部') {
-					this.succeed(1)
-				} else if (choosearea != '') {
-					this.succeed(1)
+			selectAddress(num) {
+				if(num == 1){
+					this.$refs.addressElone.show();
+				}else{
+					this.$refs.addressEltwo.show();
 				}
 			},
-			conceal2(param) {
-				const {
-					chooseprovince,
-					choosecity,
-					choosearea
-				} = param
-				// 获取到传过来的 省 市 区 县数据
-				this.routeData.unloadProvince = chooseprovince
-				this.routeData.unloadCity = choosecity == '全部' ? "" : choosecity
-				this.routeData.unloadArea = choosearea == '全部' ? "" : choosearea
-				this.title2 = chooseprovince + choosecity + choosearea
-				if (chooseprovince == '全国') {
-					this.succeed(2)
-				}
-				if (choosecity == '全部') {
-					this.succeed(2)
-				} else if (choosearea != '') {
-					this.succeed(2)
+			// 确认选中
+			confirmChangeOne(address) {
+				this.routeData.sendProvince = address.province ? address.province : ''
+				this.routeData.sendCity = address.city ? address.city : ''
+				this.routeData.sendArea = address.area ? address.area : ''
+				if(address.city == '全省'){
+					this.title1 = address.province
+					this.routeData.sendCity = ""
+					this.routeData.sendArea = ""
+				}else if(address.area == '全市'){
+					this.title1 = address.province  + address.city
+					this.routeData.sendArea = ""
+				}else{
+					this.title1 = address.province  + address.city + address.area;
 				}
+				
 			},
-			//筛选框关闭
-			succeed(num) {
-				// this.$refs.uDropdown.close();
-				if (num == 1) {
-					this.show1 = false
-				} else if (num == 2) {
-					this.show2 = false
+			confirmChangeTwo(address) {
+				this.routeData.unloadProvince = address.province ? address.province : ''
+				this.routeData.unloadCity = address.city ? address.city : ''
+				this.routeData.unloadArea = address.area ? address.area : ''
+				if(address.city == '全省'){
+					this.title2 = address.province
+					this.routeData.unloadCity = ""
+					this.routeData.unloadArea = ""
+				}else if(address.area == '全市'){
+					this.title2 = address.province  + address.city
+					this.routeData.unloadArea = ""
+				}else{
+					this.title2 = address.province  + address.city + address.area;
 				}
+				
 			},
+			// conceal1(param) {
+			// 	const {
+			// 		chooseprovince,
+			// 		choosecity,
+			// 		choosearea
+			// 	} = param
+			// 	// 获取到传过来的 省 市 区 县数据
+			// 	this.routeData.sendProvince = chooseprovince
+			// 	this.routeData.sendCity = choosecity == '全部' ? "" : choosecity
+			// 	this.routeData.sendArea = choosearea == '全部' ? "" : choosearea
+			// 	this.title1 = chooseprovince + choosecity + choosearea
+			// 	if (chooseprovince == '全国') {
+			// 		this.succeed(1)
+			// 	}
+			// 	if (choosecity == '全部') {
+			// 		this.succeed(1)
+			// 	} else if (choosearea != '') {
+			// 		this.succeed(1)
+			// 	}
+			// },
+			// conceal2(param) {
+			// 	const {
+			// 		chooseprovince,
+			// 		choosecity,
+			// 		choosearea
+			// 	} = param
+			// 	// 获取到传过来的 省 市 区 县数据
+			// 	this.routeData.unloadProvince = chooseprovince
+			// 	this.routeData.unloadCity = choosecity == '全部' ? "" : choosecity
+			// 	this.routeData.unloadArea = choosearea == '全部' ? "" : choosearea
+			// 	this.title2 = chooseprovince + choosecity + choosearea
+			// 	if (chooseprovince == '全国') {
+			// 		this.succeed(2)
+			// 	}
+			// 	if (choosecity == '全部') {
+			// 		this.succeed(2)
+			// 	} else if (choosearea != '') {
+			// 		this.succeed(2)
+			// 	}
+			// },
+			//筛选框关闭
+			// succeed(num) {
+			// 	// this.$refs.uDropdown.close();
+			// 	if (num == 1) {
+			// 		this.show1 = false
+			// 	} else if (num == 2) {
+			// 		this.show2 = false
+			// 	}
+			// },
 			getList() {
 				this.$request.baseRequest('get', '/commonRoute/get', {
 						id: this.id
@@ -124,8 +161,6 @@
 								.sendArea
 							this.title2 = this.routeData.unloadProvince + this.routeData.unloadCity + this.routeData
 								.unloadArea
-							// this.selections1 = res.data.sendNum.split(",")
-							// this.selections2 = res.data.unloadNum.split(",")
 						}
 					})
 					.catch(res => {
@@ -169,26 +204,26 @@
 						});
 				}
 			},
-			regionChange1(value) {
-				this.sendregion = value
-				this.routeData.sendProvince = this.sendregion[0] == '请选择' ? '' : this.sendregion[0]
-				this.routeData.sendCity = this.sendregion[1] == '请选择' ? '' : this.sendregion[1]
-				this.routeData.sendArea = this.sendregion[2] == '请选择' ? '' : this.sendregion[2]
-			},
-			regionChange2(value) {
-				this.unloaddregion = value
-				this.routeData.unloadProvince = this.unloaddregion[0] == '请选择' ? '' : this.unloaddregion[0]
-				this.routeData.unloadCity = this.unloaddregion[1] == '请选择' ? '' : this.unloaddregion[1]
-				this.routeData.unloadArea = this.unloaddregion[2] == '请选择' ? '' : this.unloaddregion[2]
-			},
-			selecteRegion1(value) {
-				this.selections1 = value;
-				this.routeData.sendNum = this.selections1.toString()
-			},
-			selecteRegion2(value) {
-				this.selections2 = value;
-				this.routeData.unloadNum = this.selections2.toString()
-			},
+			// regionChange1(value) {
+			// 	this.sendregion = value
+			// 	this.routeData.sendProvince = this.sendregion[0] == '请选择' ? '' : this.sendregion[0]
+			// 	this.routeData.sendCity = this.sendregion[1] == '请选择' ? '' : this.sendregion[1]
+			// 	this.routeData.sendArea = this.sendregion[2] == '请选择' ? '' : this.sendregion[2]
+			// },
+			// regionChange2(value) {
+			// 	this.unloaddregion = value
+			// 	this.routeData.unloadProvince = this.unloaddregion[0] == '请选择' ? '' : this.unloaddregion[0]
+			// 	this.routeData.unloadCity = this.unloaddregion[1] == '请选择' ? '' : this.unloaddregion[1]
+			// 	this.routeData.unloadArea = this.unloaddregion[2] == '请选择' ? '' : this.unloaddregion[2]
+			// },
+			// selecteRegion1(value) {
+			// 	this.selections1 = value;
+			// 	this.routeData.sendNum = this.selections1.toString()
+			// },
+			// selecteRegion2(value) {
+			// 	this.selections2 = value;
+			// 	this.routeData.unloadNum = this.selections2.toString()
+			// },
 		}
 	}
 </script>

pages/mine/often/oftenRoute.vue

@@ -1,15 +1,19 @@
 <template>
 	<view class="center">
-		<view class="">
-			<view class="" v-for="(item,index) in routeData">
+		<view >
+			<view class="" v-for="(item,index) in routeData" class="route_css">
 				{{item.sendCity ? item.sendCity: item.sendProvince}} {{item.sendArea}} ----> {{item.unloadCity ? item.unloadCity: item.unloadProvince}} {{item.unloadArea}}
-				<view class="" @click="addRoute(item)">修改</view>
-				<view class="" @click="del(item.id)">删除</view>
+				<view class="flex">
+					<view class="btn_css" @click="addRoute(item)">修改</view>
+				    <view class="btn_css" @click="del(item.id)">删除</view>
+				</view>
+				
 			</view>
 		</view>
-		<view class="">
-			<u-button type="primary" @click="addRoute(1)">创建常用路线</u-button>
+		<view v-if="routeData.length == 0">
+			<u-empty mode="data" icon="http://cdn.uviewui.com/uview/empty/car.png"></u-empty>
 		</view>
+	
 		<u-toast ref="uToast"></u-toast>
 	</view>
 
@@ -26,6 +30,9 @@
 		onLoad() {
 			this.getList()
 		},
+		onNavigationBarButtonTap(e) {
+			this.addRoute(1)
+		},
 		methods: {
 			del(ids) {
 				this.$request.baseRequest('post', '/commonRoute/api/delete', {
@@ -45,7 +52,7 @@
 			},
 			getList() {
 				this.$request.baseRequest('get', '/commonRoute/select', {
-						commonId: uni.getStorageSync("firstAuthentication").id,
+						commonId: uni.getStorageSync("firstAuthentication").commonId,
 						pageSize: 10,
 						currentPage: 1
 					}).then(res => {
@@ -75,4 +82,13 @@
 </script>
 
 <style lang="scss" scoped>
+	.center{
+		padding: 30rpx;
+	}
+	.route_css{
+		margin-bottom: 40rpx;
+		.btn_css{
+			margin-right: 30rpx;
+		}
+	}
 </style>

pages/order/addEvaluation.vue

@@ -110,7 +110,6 @@
 			...mapState(['hasLogin', 'userInfo', 'firstAuthentication'])
 		},
 		onNavigationBarButtonTap() {
-			debugger
 			let _data = {
 				ownerId: this.objData.cargoCommonId,
 				driverName: this.checkboxValue1 ? this.objData.driverName : '',
@@ -184,7 +183,6 @@
 
 			},
 			getVal(e) {
-				debugger
 				this.starIndex = e.value
 				console.log(e)
 			},
@@ -221,10 +219,8 @@
 				}
 			},
 			uploadFilePromise(file, url) {
-				debugger
 				uploadImage('image', url, 'appData/',
 					result => {
-						debugger
 						// 上传成功回调函数
 						console.log('图片地址', result)
 						that.imageList.push(result)

pages/order/evaluateList.vue

@@ -124,7 +124,6 @@
 						pageSize: page.size,
 						currentPage: page.num
 					}).then(res => {
-						debugger
 						if (page.num == 1) that.list = [];
 						that.list = that.list.concat(res.data.records); //追加新数据
 						for (let i = 0; i < that.list.length; i++) {

pages/riders/addFleet.vue

@@ -9,12 +9,14 @@
 			</view>
 		</view>
 		<view class="flex row form_css">
-			<view class="left-text">发货城市</view>
+			<view class="left-text">常驻城市</view>
 			<view class="right-text">
 				<!-- <regionPicker :multiIndex_="selections1" @region_="regionChange1" custom_="请选择"
 					@selecteRegion_="selecteRegion1" title_="全国" /> -->
-				<view @click="show = true">{{title1 ? title1 : "请选择地址"}}</view>
-				<Linkage @conceal="conceal1" class="flex" v-if="show" ref="uDropdown"></Linkage>
+				<!-- <view @click="show = true">{{title1 ? title1 : "请选择地址"}}</view>
+				<Linkage @conceal="conceal1" class="flex" v-if="show" ref="uDropdown"></Linkage> -->
+				<view @click="selectAddress">{{title1 ? title1 : "请选择地址"}}</view>
+				<itmister-address-picker ref="addressElone" @confirmChange="confirmChangeOne"></itmister-address-picker>
 			</view>
 		</view>
 		<view class="flex row form_css">
@@ -28,12 +30,15 @@
 		</view>
 		<view class="row">
 			<view class="left-text">车队简介</view>
-			<u--textarea v-model="formData.fleetProfile" placeholder="请输入内容" ></u--textarea>
+			<u--textarea v-model="formData.fleetProfile" placeholder="请输入内容" autoHeight maxlength="500" height="100"></u--textarea>
 		</view>
-		<view class=" row ">
+		<view class="row">
 			<view class="left-text">封面照片</view>
 			<u-upload class="uview-upload" :fileList="fileList1" @afterRead="afterRead($event)" @delete="deletePic"
-				name="1" multiple :maxCount="1"></u-upload>
+				name="1" multiple :maxCount="1">
+				<!-- <image src="fileList1[0]" 
+					mode="widthFix" style="width: 250px;height: 150px;"></image> -->
+				</u-upload>
 		</view>
 		<view class=" row ">
 			<view class="left-text">车队照片</view>
@@ -47,11 +52,13 @@
 </template>
 
 <script>
-	import Linkage from '@/components/gaojianghua-linkage/linkage.vue'
+	// import Linkage from '@/components/gaojianghua-linkage/linkage.vue'
 	import uploadImage from '@/components/ossutil/uploadFile.js';
+	import itmisterAddressPicker from '@/components/itmister-address-picker/itmister-address-picker.nvue'
 	export default{
 		components: {
-			Linkage
+			// Linkage
+			itmisterAddressPicker
 		},
 		data(){
 			return{
@@ -68,13 +75,63 @@
 		onShow(){
 			
 		},
-		onLoad(){
-			
+		onLoad(options){
+			this.id = options.id
+			if(this.id){//修改
+				uni.setNavigationBarTitle({
+					title:'设置'
+				})
+				this.getList()
+			}
 		},
 		methods:{
-			radioChange(){
-				debugger
-				console.log(this.invitationPermission)
+			selectAddress() {
+					this.$refs.addressElone.show();
+			},
+			// 确认选中
+			confirmChangeOne(address) {
+				// if(address.province == '全国'){
+				// 	uni.$u.toast("发货地不可以是全国")
+				// 	// this.$refs.addressElone.show();
+				// 	return
+				// }
+				this.formData.province = address.province ? address.province : ''
+				this.formData.city = address.city ? address.city : ''
+				this.formData.Area = address.area ? address.area : ''
+				if(address.city == '全省'){
+					this.title1 = address.province
+					this.formData.sendCity = ""
+					this.formData.sendArea = ""
+				}else if(address.area == '全市'){
+					this.title1 = address.province  + address.city
+					this.formData.sendArea = ""
+				}else{
+					this.title1 = address.province  + address.city + address.area;
+				}
+			},
+			getList(){
+				this.$request.baseRequest('get', '/fleetInfo/getFleetInfo', {
+						id: this.id
+					}).then(res => {
+						this.formData = res.data
+						this.title1 = this.formData.province + this.formData.city + this.formData.area
+						let coverUrlList = this.formData.coverUrl.split(",")
+						for(let i = 0 ; i < coverUrlList.length ; i++){
+							this.fileList1.push({
+								url:coverUrlList[i]
+							})
+						}
+						let fleetUrlList = this.formData.fleetUrl.split(",")
+						// this.fileList2 = this.formData.fleetUrl.split(",")
+						for(let i = 0 ; i < fleetUrlList.length ; i++){
+							this.fileList2.push({
+								url:fleetUrlList[i]
+							})
+						}
+					})
+					.catch(res => {
+						uni.$u.toast(res.message);
+					});
 			},
 			conceal1(param) {
 				const {
@@ -102,12 +159,14 @@
 			},
 			// 删除图片
 			deletePic(event) {
+				console.log(this[`fileList${event.name}`])
 				this[`fileList${event.name}`].splice(event.index, 1)
 			},
 			// 新增图片
 			async afterRead(event) {
 				// 当设置 mutiple 为 true 时, file 为数组格式，否则为对象格式
 				let lists = [].concat(event.file)
+				console.log(this[`fileList${event.name}`])
 				let fileListLen = this[`fileList${event.name}`].length
 				lists.map((item) => {
 					this[`fileList${event.name}`].push({
@@ -176,24 +235,45 @@
 				)
 			},
 			submit(){
-				this.formData.fleetMemberInfo.commonId = uni.getStorageSync("firstAuthentication").id
-				this.formData.fleetMemberInfo.driverNickname = uni.getStorageSync("firstAuthentication").driverCall
-				this.formData.fleetMemberInfo.driverPortrait = uni.getStorageSync("userInfo").avatarUrl
-				this.$request.baseRequest('post', '/fleetInfo/api/addFleetInfo', this.formData).then(res => {
-						if (res.code == 200) {
-							this.$refs.uToast.show({
-								type: 'success',
-								message: "车队添加成功！",
-								complete() {
-									uni.$u.route("pages/riders/myTeam")
-								}
-							})
-						
-						}
-					})
-					.catch(res => {
-						uni.$u.toast(res.message);
-					});
+				if(this.id){//编辑
+					this.$request.baseRequest('post', '/fleetInfo/api/editFleetInfo', this.formData).then(res => {
+							if (res.code == 200) {
+								this.$refs.uToast.show({
+									type: 'success',
+									message: "车队修改成功！",
+									complete() {
+										// uni.$u.route("pages/riders/fleetSee")
+										uni.navigateBack({
+											delta: 1
+										});
+									}
+								})
+							}
+						})
+						.catch(res => {
+							uni.$u.toast(res.message);
+						});
+				}else{
+					this.formData.commonId = uni.getStorageSync("firstAuthentication").commonId
+					this.formData.fleetMemberInfo.commonId = uni.getStorageSync("firstAuthentication").commonId
+					this.formData.fleetMemberInfo.driverNickname = uni.getStorageSync("firstAuthentication").driverCall
+					this.formData.fleetMemberInfo.driverPortrait = uni.getStorageSync("userInfo").avatarUrl
+					this.$request.baseRequest('post', '/fleetInfo/api/addFleetInfo', this.formData).then(res => {
+							if (res.code == 200) {
+								this.$refs.uToast.show({
+									type: 'success',
+									message: "车队添加成功！",
+									complete() {
+										uni.$u.route("pages/riders/myTeam")
+									}
+								})
+							
+							}
+						})
+						.catch(res => {
+							uni.$u.toast(res.message);
+						});
+				}
 			}
 		}
 	}

pages/riders/fleetInvitation.vue

@@ -1,24 +1,118 @@
 <template>
-	<view class="center"></view>
+	<view class="center">
+		<view v-for="(item,index) in applyList" class="flex fleet" @click="fleetInfo(item)">
+			<view class="fleet_img">
+				<u--image class="flex-end" :showLoading="true" :src="item.coverUrl" width="60px" height="60px" shape='circle'>
+			</u--image>
+			</view>
+			<view class="fleet_right">
+				<view class="flex">
+					<view class="fleet_name">
+						{{item.fleetName}}
+					</view>
+					<view class="fleet_invite" v-if="item.status == '已申请'" @click="refuse(item)">拒绝</view>
+					<view class="fleet_invite" v-if="item.status == '已申请'" @click="accept(item)">接受</view>
+					<view class="fleet_invite" v-else>{{item.status}}</view>
+					
+				</view>
+			</view>	
+		</view>
+	</view>
 </template>
 
 <script>
 	export default{
 		data(){
 			return{
-				
+				commonId:"",
+				applyList:[]
 			}
 		},
 		onShow(){
 			
 		},
 		onLoad(){
-			
+			this.commonId = uni.getStorageSync("firstAuthentication").commonId
+			this.getList()
 		},
 		methods:{
+			refuse(item){
+				this.$request.baseRequest('post', '/fleetMemberInfo/api/editFleetMemberInfo', {
+						examineFlag:2,
+						id:item.id
+					}).then(res => {
+						if (res.code == 200) {
+							this.$refs.uToast.show({
+								type: 'success',
+								message: "拒绝成功！",
+								complete() {
+									uni.$u.route("pages/riders/myTeam")
+								}
+							})
+						}
+					})
+					.catch(res => {
+						uni.$u.toast(res.message);
+					});
+			},
+			accept(item){
+				this.$request.baseRequest('post', '/fleetMemberInfo/api/editFleetMemberInfo', {
+						examineFlag:1,
+						id:item.id
+					}).then(res => {
+						if (res.code == 200) {
+						this.$refs.uToast.show({
+							type: 'success',
+							message: "通过成功！",
+							complete() {
+								uni.$u.route("pages/riders/myTeam")
+							}
+						})
+						}
+					})
+					.catch(res => {
+						uni.$u.toast(res.message);
+					});
+			},
+			getList(){
+				this.$request.baseRequest('get', '/fleetMemberInfo/selectFleetMemberInfo', {
+						commonId:this.commonId,
+						flag:2,
+						pageSize: 10,
+						currentPage: 1
+					}).then(res => {
+						if (res.code == 200) {
+							this.applyList = res.data.records
+						}
+					})
+					.catch(res => {
+						uni.$u.toast(res.message);
+					});
+			}
 		}
 	}
 </script>
 
 <style lang="scss" scoped>
+	.center{
+		padding: 30rpx;
+	}
+	.fleet{
+		margin: 30rpx 0;
+		.fleet_img{
+			width: 20%;
+		}
+		.fleet_right{
+			margin-top: 20rpx;
+			width: 80%;
+			.fleet_name{
+				width: 70%;
+			}
+			.fleet_invite{
+				background-color: #5878e8;
+				color: #fff;
+				margin-left: 10rpx;
+			}
+		}
+	}
 </style>

pages/riders/fleetSee.vue

@@ -1,77 +1,111 @@
 <template>
 	<view class="center">
-		<uni-fab :content="content" :horizontal="horizontal" :vertical="vertical" :direction="direction"
-			@trigger="trigger" @fabClick="poinIn"></uni-fab>
-		<view class="top ">
-			<!-- <view class="top_left flex"><view @click="returnPage"><</view> 车队详情</view>
-			<view class="top_right" >•••</view> -->
-			<u-navbar leftText="返回" title="车队详情" :safeAreaInsetTop="false">
-				<view class="u-nav-slot" slot="left">
-					<u-icon name="arrow-left" size="19" @click="returnPage"></u-icon>
-					<!-- <u-line direction="column" :hairline="false" length="16" margin="0 8px"></u-line> -->
-					<!-- <u-icon name="home" size="20"></u-icon> -->
-				</view>
-				<view class="u-nav-slot" slot="right">
-					<u-icon name="more-dot-fill" size="20"></u-icon>
-					<!-- <uni-data-select v-model="more" :localdata="range" ></uni-data-select> -->
-				</view>
-			</u-navbar>
-		</view>
+
 		<view class="fleet_info">
 			<view class="fleet_img">
-				<image src="https://taohaoliang.oss-cn-beijing.aliyuncs.com/appData/165326622931949.png"
-					style="width: 100%;"></image>
+				<u-swiper :list="imgList" height="200" indicator></u-swiper>
 			</view>
 			<view>{{fleetInfo.fleetName}}</view>
 			<view>{{fleetInfo.province}}{{fleetInfo.city}}{{fleetInfo.area}}</view>
 			<view>车队简介</view>
-			<view style="width: 100%; height: 100px; border: 1px solid #000000;"></view>
+			<u--textarea v-model="fleetInfo.notice" placeholder="输入公告文字,0-500字" disabled autoHeight >
+			</u--textarea>
+			<view>车队简介</view>
+			<u--textarea v-model="fleetInfo.fleetProfile" placeholder="输入公告文字,0-500字" disabled maxlength="500" autoHeight count>
+			</u--textarea>
 			<view>车队成员（{{fleetInfo.fleetMemberNum}}）</view>
-			<view v-for="(item,index) in fleetInfo.fleetMemberInfoList">
-				<view style="width: 25%;">
+			<view class="flex">
+				<view margin v-for="(item,index) in fleetInfo.fleetMemberInfoList" >
 					<u--image class="flex-end" :showLoading="true" :src="item.driverPortrait" width="50px" height="50px"
 						shape='circle'>
 					</u--image>
 				</view>
 			</view>
 		</view>
+		<chunLei-popups v-model="value" :popData="dataList" @tapPopup="tapPopup" :x="344" :y="20" placement="top-end">
+		</chunLei-popups>
 	</view>
 </template>
 
 <script>
+	import chunLeiPopups from "@/components/chunLei-popups/chunLei-popups.vue";
 	export default {
+		components: {
+			chunLeiPopups
+		},
 		data() {
 			return {
+				value: false,
+				imgList:[],
+				type:"",
+				dataList: [{
+						title: '设置',
+						icon: '../../static/chuangjianqunliao-lan.png',
+						src: '/pages/riders/addFleet',
+						// disabled: true
+						show: true
+					},
+					{
+						title: '发公告',
+						icon: '../../static/tianjiahaoyou.png',
+						src: '/pages/riders/notice',
+						show: true
+					},
+					{
+						title: '删除成员',
+						icon: '../../static/scan_icon.png',
+						show: true
+					},
+					{
+						title: '转移队长',
+						icon: '../../static/zhifeiji.png',
+						show: true
+					},
+					{
+						title: '退出车队',
+						icon: '../../static/shoufukuan.png',
+						show:true
+					},
+					{
+						title: '举报',
+						icon: '../../static/shoufukuan.png',
+						src: "/pages/riders/report",
+						show:true,
+					}
+				],
 				id: "",
 				fleetInfo: {},
 				more: false,
-				horizontal: "left",
-				direction: "vertical",
-				content: [{
-					iconPath: '/static/image.png',
-					selectedIconPath: '/static/image-active.png',
-					text: '相册',
-					active: false
-				}, ],
-				vertical: 'top'
 			}
 		},
 		onShow() {
-
+			this.getList()
 		},
 		onLoad(options) {
 			this.id = options.id
+			this.type = options.type
+			if(!this.type){
+				for(let i = 0 ; i < this.dataList.length - 2 ; i++){
+					 this.dataList[i].show = false
+				}
+			}
 			this.getList()
 		},
+		onNavigationBarButtonTap(e) {
+			this.value = true
+		},
 		methods: {
-			trigger(){
-				
-			},
-			poinIn(e){
-				
+			clickRightIcon() {
+				this.value = true
 			},
-			okSubjecthander() {
-
+			tapPopup(e) {
+				this.$u.route(e.src, {
+					id: this.id
+				})
+				// uni.showToast({
+				// 	title:e.title,
+				// 	icon:'none'
+				// })
 			},
 			returnPage() {
 				this.$u.route("/pages/riders/myTeam")
@@ -80,16 +114,13 @@
 				this.$request.baseRequest('get', '/fleetInfo/getFleetInfo', {
 						id: this.id
 					}).then(res => {
-						// if (res.code == 200) {
-						// 	this.$refs.uToast.show({
-						// 		type: 'success',
-						// 		message: "车队添加成功！",
-						// 		complete() {
-						// 			uni.$u.route("pages/riders/myTeam")
-						// 		}
-						// 	})
-						// }
 						this.fleetInfo = res.data
+						if(this.fleetInfo.fleetUrl){
+							this.imgList = this.fleetInfo.fleetUrl.split(",")
+						}else{
+							this.imgList = this.fleetInfo.coverUrl.split(",")
+						}
+						
 					})
 					.catch(res => {
 						uni.$u.toast(res.message);

pages/riders/inTeam.vue

@@ -1,6 +1,26 @@
 <template>
-	<view>
-		
+	<view class="center">
+		<view v-for="(item,index) in applyList" class="flex fleet" @click="fleetInfo(item)">
+			<view class="fleet_img">
+				<u--image class="flex-end" :showLoading="true" :src="item.driverPortrait" width="60px" height="60px" shape='circle'>
+			</u--image>
+			</view>
+			
+			<view class="fleet_right">
+				<view class="flex">
+					<view class="fleet_name">
+						{{item.driverNickname}}
+					</view>
+					<view class="fleet_invite" @click="refuse(item)" v-if="item.status =='已申请'">拒绝</view>
+					<view class="fleet_invite" @click="accept(item)" v-if="item.status =='已申请'">通过</view>
+					<view class="fleet_invite" v-else>{{item.status == '已加入' ? "已通过" : item.status}}</view>
+				</view>
+				<view>
+					{{item.fleetName}}
+				</view>
+			</view>
+		</view>
+		<u-toast ref="uToast"></u-toast>
 	</view>
 </template>
 
@@ -8,19 +28,95 @@
 	export default{
 		data(){
 			return{
-				
+				commonId:"",
+				applyList:[]
 			}
 		},
 		onShow(){
 			
 		},
 		onLoad(){
-			
+			this.commonId = uni.getStorageSync("firstAuthentication").commonId
+			this.getList()
 		},
 		methods:{
+			refuse(item){
+				this.$request.baseRequest('post', '/fleetMemberInfo/api/editFleetMemberInfo', {
+						examineFlag:2,
+						id:item.id
+					}).then(res => {
+						if (res.code == 200) {
+							this.$refs.uToast.show({
+								type: 'success',
+								message: "拒绝成功！",
+								complete() {
+									uni.$u.route("pages/riders/myTeam")
+								}
+							})
+						}
+					})
+					.catch(res => {
+						uni.$u.toast(res.message);
+					});
+			},
+			accept(item){
+				this.$request.baseRequest('post', '/fleetMemberInfo/api/editFleetMemberInfo', {
+						examineFlag:1,
+						id:item.id
+					}).then(res => {
+						if (res.code == 200) {
+						this.$refs.uToast.show({
+							type: 'success',
+							message: "通过成功！",
+							complete() {
+								uni.$u.route("pages/riders/myTeam")
+							}
+						})
+						}
+					})
+					.catch(res => {
+						uni.$u.toast(res.message);
+					});
+			},
+			getList(){
+				this.$request.baseRequest('get', '/fleetMemberInfo/selectFleetMemberInfo', {
+						commonId:this.commonId,
+						flag:1,
+						pageSize: 10,
+						currentPage: 1
+					}).then(res => {
+						if (res.code == 200) {
+							this.applyList = res.data.records
+						}
+					})
+					.catch(res => {
+						uni.$u.toast(res.message);
+					});
+			}
 		}
 	}
 </script>
 
 <style lang="scss" scoped>
+	.center{
+		padding: 30rpx;
+	}
+	.fleet{
+		margin: 30rpx 0;
+		.fleet_img{
+			width: 20%;
+		}
+		.fleet_right{
+			margin-top: 20rpx;
+			width: 80%;
+			.fleet_name{
+				width: 70%;
+			}
+			.fleet_invite{
+				margin-left: 10rpx;
+				background-color: #5878e8;
+				color: #fff;
+			}
+		}
+	}
 </style>

pages/riders/index.vue

@@ -1,228 +1,459 @@
 <template>
 	<view class="center">
 		<view class="row1">
-			<u--image class="flex-end" :showLoading="true" src="../../static/images/mine/saoma.png" width="30px"
+			<u--image class="flex-end" :showLoading="true" src="../../static/images/reders/geren.png" width="30px"
 				height="30px" @click="myPage"></u--image>
 		</view>
 		<view class="flex center_top">
 			<u-button :type="indexbtn == 1? 'primary':''" @click="changebtn(1)">司机</u-button>
 			<u-button :type="indexbtn == 2? 'primary':''" @click="changebtn(2)">车队</u-button>
+			<view class="">司机</view>
+			<view class="">车队</view>
 		</view>
-		<view class="driver" v-if="indexbtn == 1">
-			<view class="flex" >
-				<!-- <regionPicker :multiIndex_="selections1" @region_="regionChange1" custom_="请选择"
-					@selecteRegion_="selecteRegion1" title_="全国" /> -->
-					<!-- <view > -->
-						<view @click="addressChange(1)">{{title1 ? title1 : "请选择地址"}}</view>
-						<Linkage @conceal="conceal1" class="flex" v-show="show1" ref="uDropdown"></Linkage>
-					<!-- </view> -->
-					<view @click="replace">--></view>
-					<!-- <view style="margin-left: 60px;"> -->
-						<view @click="addressChange(2)">{{title2 ? title2 : "请选择地址"}}</view>
-					<Linkage @conceal="conceal2" class="flex" v-show="show2" ref="uDropdown"></Linkage>
-					<!-- </view> -->
+		<view class="driver" v-show="indexbtn == 1">
+			<view class="flex screen">
+				<view @click="selectAddress(1)" class="screen_item">{{title1 ? title1 : "请选择地址"}}</view>
+				<itmister-address-picker ref="addressElone" @confirmChange="confirmChangeOne"></itmister-address-picker>
+				<view @click="replace">--></view>
+				<view @click="selectAddress(2)" class="screen_item">{{title2 ? title2 : "请选择地址"}}</view>
+				<!-- <itmister-address-picker ref="addressEltwo" :wholeCountry="true" @confirmChange="confirmChangeTwo"></itmister-address-picker> -->
 			</view>
-			<view class="" v-for="(item,index) in routeData">
-				<view>{{item.driverNickname}}</view>
+			<view class="route" v-for="(item,index) in routeData">
+				<view class="flex">{{item.driverNickname}}
+					<view class="" style="margin-left: 30px;" @click="invitation(item)">邀请</view>
+					<u-picker :show="fleetShow" :columns="columns" @cancel="fleetClose" @confirm="invitationCheng"></u-picker>
+				</view>
 				<view>{{item.sendCity ? item.sendCity: item.sendProvince }}{{item.sendArea}} ----->
-					{{item.unloadCity ? item.unloadCity: item.unloadCity }}{{item.unloadArea}} </view>
+					{{item.unloadCity ? item.unloadCity: item.unloadProvince }}{{item.unloadArea}}
+				</view>
+			</view>
+			<view v-if="routeData.length == 0">
+				<u-empty mode="search" icon="http://cdn.uviewui.com/uview/empty/car.png"></u-empty>
 			</view>
 
 		</view>
-		<view class="driver" v-if="indexbtn == 2">
-		<!-- 	<view @click="show = true">sss</view> -->
-			<!-- <u-picker :show="show" ref="uPicker" :columns="fprovincelist" @confirm="confirm" @change="changeHandler"></u-picker> -->
+		<view class="" v-show="indexbtn == 2">
+			<view class="flex">
+				<view @click="selectChange" class="screen_item">{{city ? city : province}}</view>
+				<!-- <itmister-address-picker ref="addressElthree" :showCheck="false" @confirmChange="confirmChangethree"></itmister-address-picker> -->
+				<u-search placeholder="输入车队信息关键字" v-model="searchKeyWord" @change="getList" maxlength="15"></u-search>
+			</view>
+			<view v-for="(item,index) in formData" class="flex fleet">
+				<view class="fleet_right">
+					<view class="flex">
+						<view class="fleet_name">
+							{{item.fleetName}}({{item.fleetMemberNum}})
+						</view>
+						<view class="fleet_invite" v-if="!item.fleetMemberStatus" @click="joinFleet(item)">加入</view>
+						<view class="fleet_invite" v-else @click="joinFleet(item)">{{item.fleetMemberStatus}}</view>
+					</view>
+					<view class="">
+						<u-upload class="uview-upload" :fileList="item.img" :deletable="false" name="1" multiple
+							:maxCount="1">
+						</u-upload>
+					</view>
+					<view>
+						{{item.fleetProfile}}
+					</view>
+				</view>
+			</view>
+			<view v-if="formData.length == 0">
+				<u-empty mode="data" icon="http://cdn.uviewui.com/uview/empty/car.png"></u-empty>
+			</view>
 		</view>
+		<u-toast ref="uToast"></u-toast>
+		<u-modal :show="isShowAlert" :title="alertTitle" :closeOnClickOverlay='true' :showCancelButton='true'
+			confirmColor='#2772FB' @confirm="confirmClick" @close="cancelClick" @cancel="cancelClick"></u-modal>
+			<u-modal :show="tipsShow"  :content='tipsText' :confirmText="btnTips" @confirm="authentication"></u-modal>
 	</view>
 </template>
 
 <script>
-	import regionPicker from "@/components/region/region-picker";
-	import dataList from "@/components/region/data.js";
-	import Linkage from '@/components/gaojianghua-linkage/linkage.vue'
-	import {
-		address,
-	} from '@/components/data/data.js'
+	import itmisterAddressPicker from '@/components/itmister-address-picker/itmister-address-picker.nvue'
 	export default {
 		components: {
-			regionPicker,
-			Linkage
+			itmisterAddressPicker
 		},
 		data() {
 			return {
 				indexbtn: 1,
-				// fprovincelist: [],
-				// sprovincelist: [],
-				// show: false,
-				selections1: [],
-				selections2: [],
-				// sendregion: [],
-				// unloaddregion: [],
 				routeData: [], //列表
-				//
-				show1:false,
-				show2:false,
-				title1:"",
-				title2:"",
-				sendInfo: {},
-				unloadInfo: {},
+				// show1: false,
+				// show2: false,
+				title1: "",
+				title2: "",
+				sendInfo: {
+					sendProvince: "",
+					sendCity: "",
+					sendArea: ""
+				},
+				unloadInfo: {
+					unloadProvince: "",
+					unloadCity: "",
+					unloadArea: ""
+				},
+				fleetLocation:{},
+				formData: [],
+				searchKeyWord: "",
+				province: "", //省
+				city: "", //市
+				alertTitle: "",
+				isShowAlert: false,
+				commonId: "",
+				addMember: {},
+				tipsShow:false,
+				tipsText:"",
+				btnTips:'去认证',
+				fleetShow:false,
+				columns:[],
+				fleetInviteList:[]
 			}
 		},
 		created() {},
 		onShow() {
-			this.sendInfo = uni.getStorageSync("sendInfo")
-			this.unloadInfo = uni.getStorageSync("unloadInfo")
-			if (this.sendInfo) {
+			if (uni.getStorageSync("sendInfo")) { //从缓存中获取  上一次的装车地 卸车地
+				this.sendInfo = uni.getStorageSync("sendInfo")
 				this.title1 = this.sendInfo.sendProvince + this.sendInfo.sendCity + this.sendInfo.sendArea
+			} else {
+				this.sendInfo.sendProvince = "北京"
+				this.title1 = "北京"
 			}
-			if (this.unloadInfo) {
+			if (uni.getStorageSync("unloadInfo")) {
+				this.unloadInfo = uni.getStorageSync("unloadInfo")
 				this.title2 = this.unloadInfo.unloadProvince + this.unloadInfo.unloadCity + this.unloadInfo.unloadArea
+			} else {
+				this.title2 = '全国'
+				this.unloadInfo.unloadProvince = '全国'
+			}
+			if(uni.getStorageSync("fleetLocation")){
+				this.province = uni.getStorageSync("fleetLocation").province
+				this.city = uni.getStorageSync("fleetLocation").city
+			}else{
+				this.province = ''
+				this.city = '北京'
+			}
+			this.commonId = uni.getStorageSync("firstAuthentication").commonId
+			if(uni.getStorageSync("firstAuthentication")){
+				this.statusVal = uni.getStorageSync("firstAuthentication").authenticationStatus
+				if(this.statusVal == '未认证'){
+					this.tipsShow = true
+					this.tipsText = "认证司机身份后，可查看车友信息"
+				}
+				if(this.statusVal == '审核中'){
+					this.tipsShow = true
+					this.tipsText = "司机身份审核中"
+					this.btnTips = "我知道了"
+				}else if(this.statusVal == '未通过'){
+					this.tipsShow = true
+					this.tipsText = "司机身份未通过审核"
+					this.btnTips = "重新认证"
+				}
+			}else{
+				this.tipsShow = true
+				this.tipsText = "您尚未登录，请前去登录！"
+				this.btnTips = "去登录"
 			}
 			this.getList()
 		},
 		onLoad() {},
 		methods: {
-			addressChange(num){
+			fleetClose(){
+				this.fleetShow = false
+			},
+			invitation(item){
+				this.addMember={}
+				this.columns = []
+				this.addMember.commonId = item.commonId
+				this.addMember.driverNickname = item.driverNickname
+				this.addMember.driverPortrait = item.driverPortrait
+				
+				this.$request.baseRequest('get', '/fleetInfo/fleetInfos', {
+						commonId: this.commonId,
+					}).then(res => {
+						this.fleetInviteList = res.data
+						let flrrtArray = []
+						for(let i = 0 ; i < res.data.length ; i++){
+							flrrtArray.push(res.data[i].fleetName)
+						}
+						this.columns.push(flrrtArray)
+						if(this.columns.length == 0){
+							uni.$u.toast("无可邀请的车队");
+						}else{
+							this.fleetShow = true
+						}
+					})
+					.catch(res => {
+						uni.$u.toast(res.message);
+					});	
+			},
+			invitationCheng(e){//邀请
+			    this.addMember.fleetId = this.fleetInviteList[e.indexs[0]].id
+				this.fleetShow = false
+				this.addMember.joinFlag = 2
+				this.$request.baseRequest('post', '/fleetMemberInfo/api/addFleetMemberInfo',this.addMember).then(res => {
+						if(res.code == 200){
+							this.$refs.uToast.show({
+								type: 'success',
+								message: "邀请已发出",
+							})
+						}else{
+							uni.$u.toast(res.message);
+						}
+					})
+					.catch(res => {
+						uni.$u.toast(res.message);
+					});
+			},
+			authentication(){
+				this.tipsShow = false
+				if(this.statusVal == '未认证'){
+					this.$u.route("/pages/mine/driverCertification")
+				}else if(this.statusVal == '未通过'){
+					this.$u.route("/pages/mine/editDriverCertification")
+				}else if(this.statusVal == '审核中'){
+					// this.$u.route("")
+					uni.switchTab({
+						url: '/pages/mine/index'
+					});
+				}else{
+					uni.$u.route('/pages/public/login');
+				}
+			},
+			selectAddress(num) {
 				if(num == 1){
-					this.show1 = true
-					this.show2 = false
+					this.$refs.addressElone.show();
+				}else if(num == 2){
+					this.$refs.addressEltwo.show();
+				}
+			},
+			selectChange(){
+				this.$refs.addressElthree.show();
+			},
+			// 确认选中
+			confirmChangeOne(address) {
+				if(address.province == '全国'){
+					uni.$u.toast("发货地不可以是全国")
+					// this.$refs.addressElone.show();
+					return
+				}
+				this.sendInfo.sendProvince = address.province ? address.province : ''
+				this.sendInfo.sendCity = address.city ? address.city : ''
+				this.sendInfo.sendArea = address.area ? address.area : ''
+				if(address.city == '全省'){
+					this.title1 = address.province
+					this.sendInfo.sendCity = ""
+					this.sendInfo.sendArea = ""
+				}else if(address.area == '全市'){
+					this.title1 = address.province  + address.city
+					this.sendInfo.sendArea = ""
 				}else{
-					this.show1 = false
-					this.show2 = true
+					this.title1 = address.province  + address.city + address.area;
 				}
+				uni.setStorageSync("sendInfo",this.sendInfo)
+				this.getList()
 			},
-			getList() {
-				
-				this.$request.baseRequest('get', '/commonRoute/select', {
-						pageSize: 10,
-						currentPage: 1,
-						sendProvince: this.sendInfo.sendProvince,
-						sendCity: this.sendInfo.sendCity,
-						sendArea: this.sendInfo.sendArea,
-						unloadProvince: this.unloadInfo.unloadProvince,
-						unloadCity: this.unloadInfo.unloadCity,
-						unloadArea: this.unloadInfo.unloadArea
-					}).then(res => {
-						if (res.code == 200) {
-							this.routeData = res.data.records
+			confirmChangeTwo(address) {
+				this.unloadInfo.unloadProvince = address.province ? address.province : ''
+				this.unloadInfo.unloadCity = address.city ? address.city : ''
+				this.unloadInfo.unloadArea = address.area ? address.area : ''
+				if(address.city == '全省'){
+					this.title2 = address.province
+					this.unloadInfo.unloadCity = ""
+					this.unloadInfo.unloadArea = ""
+				}else if(address.area == '全市'){
+					this.title2 = address.province  + address.city
+					this.unloadInfo.unloadArea = ""
+				}else{
+					this.title2 = address.province  + address.city + address.area;
+				}
+				uni.setStorageSync("unloadInfo",this.unloadInfo)
+				this.getList()
+			},
+			confirmChangethree(address){
+				this.province = address.province
+				this.city = address.city
+				if(address.city == "全省"){
+					this.city = ""
+				}
+				this.fleetLocation.province = address.province
+				this.fleetLocation.city = address.city
+				uni.setStorageSync("fleetLocation",this.fleetLocation)
+				this.getList()
+			},
+			joinFleet(item) { 
+				this.addMember.commonId = this.commonId
+				this.addMember.driverNickname = uni.getStorageSync("firstAuthentication").driverCall
+				this.addMember.driverPortrait = uni.getStorageSync("userInfo").avatarUrl
+				this.addMember.fleetId = item.id
+				this.alertTitle = "确定申请加入该车队？"
+				this.isShowAlert = true
+			},
+			// addressChange(num) {
+			// 	if (num == 1) {
+			// 		this.show1 = true
+			// 		this.show2 = false
+			// 	} else {
+			// 		this.show1 = false
+			// 		this.show2 = true
+			// 	}
+			// },
+			cancelClick() {
+				this.isShowAlert = false
+			},
+			confirmClick() {
+				this.isShowAlert = false
+				this.addMember.joinFlag = 1
+				this.$request.baseRequest('post', '/fleetMemberInfo/api/addFleetMemberInfo', this.addMember).then(res => {
+						if (res.code == '200') {
+							this.$refs.uToast.show({
+								type: 'success',
+								message: "申请成功，等待队长审核",
+							})
+							this.getList()
+						}else{
+							this.$refs.uToast.show({
+								type: 'success',
+								message: "申请失败，请稍后重试",
+							})
 						}
 					})
 					.catch(res => {
 						uni.$u.toast(res.message);
 					});
 			},
+			getList() {
+				if (this.indexbtn == 1) {
+					this.$request.baseRequest('get', '/commonRoute/select', {
+							pageSize: 10,
+							currentPage: 1,
+							sendProvince: this.sendInfo.sendProvince,
+							sendCity: this.sendInfo.sendCity,
+							sendArea: this.sendInfo.sendArea,
+							unloadProvince: this.unloadInfo.unloadProvince,
+							unloadCity: this.unloadInfo.unloadCity,
+							unloadArea: this.unloadInfo.unloadArea
+						}).then(res => {
+							if (res.code == 200) {
+								this.routeData = res.data.records
+							}
+						})
+						.catch(res => {
+							uni.$u.toast(res.message);
+						});
+				} else {
+					this.$request.baseRequest('get', '/fleetInfo/selectFleetInfo', {
+							commonId: this.commonId,
+							province: this.province, //省
+							city: this.city, //市
+							searchKeyWord: this.searchKeyWord,
+							pageSize: 10,
+							currentPage: 1
+						}).then(res => {
+							this.formData = res.data.records
+							let that = this
+							for (let i = 0; i < this.formData.length; i++) {
+								if (this.formData[i].fleetUrl) {
+									this.formData[i].img = []
+									let imgList = this.formData[i].fleetUrl.split(",")
+									for (let j = 0; j < imgList.length; j++) {
+										that.formData[i].img.push({
+											url: imgList[j]
+										})
+									}
+								}
+							}
+						})
+						.catch(res => {
+							uni.$u.toast(res.message);
+						});
+				}
+			},
 			changebtn(num) {
 				this.indexbtn = num
+				this.getList()
 			},
 			// 回调参数为包含columnIndex、value、values
 			confirm(e) {
 				console.log('confirm', e)
 				this.show = false
 			},
-			replace(){
+			replace() {
+				if(this.unloadInfo.unloadProvince == "全国"){
+					uni.$u.toast("发货地不可以是全国")
+					return
+				}
 				let _obj = {}
-				_obj = this.sendInfo
-				this.sendInfo = this.unloadInfo
-				this.unloadInfo = _obj
+				_obj = JSON.parse(JSON.stringify(this.sendInfo))
+				this.sendInfo.sendProvince = this.unloadInfo.unloadProvince
+				this.sendInfo.sendCity = this.unloadInfo.unloadCity
+				this.sendInfo.sendArea = this.unloadInfo.unloadArea
+				this.unloadInfo.unloadProvince = _obj.sendProvince
+				this.unloadInfo.unloadCity = _obj.sendCity
+				this.unloadInfo.unloadArea = _obj.sendArea
 				let text = ""
 				text = this.title1
 				this.title1 = this.title2
 				this.title2 = text
 				this.getList()
 			},
-			conceal1(param) {
-				const {
-					chooseprovince,
-					choosecity,
-					choosearea
-				} = param
-				// 获取到传过来的 省 市 区 县数据
-				this.sendInfo.sendProvince = chooseprovince
-				this.sendInfo.sendCity = choosecity == '全部' ? "" : choosecity
-				this.sendInfo.sendArea = choosearea == '全部' ? "" : choosearea
-				uni.setStorageSync("sendInfo", this.sendInfo)
-				this.title1 = chooseprovince + choosecity + choosearea
-				if (chooseprovince == '全国') {
-					this.succeed(1)
-				}
-				if (choosecity == '全部') {
-					this.succeed(1)
-				} else if (choosearea != '') {
-					this.succeed(1)
-				}
-			},
-			conceal2(param) {
-				const {
-					chooseprovince,
-					choosecity,
-					choosearea
-				} = param
-				// 获取到传过来的 省 市 区 县数据
-				this.unloadInfo.unloadProvince = chooseprovince
-				this.unloadInfo.unloadCity = choosecity == '全部' ? "" : choosecity
-				this.unloadInfo.unloadArea = choosearea == '全部' ? "" : choosearea
-				uni.setStorageSync("unloadInfo", this.unloadInfo)
-				this.title2 = chooseprovince + choosecity + choosearea
-				if (chooseprovince == '全国') {
-					this.succeed(2)
-				}
-				if (choosecity == '全部') {
-					this.succeed(2)
-				} else if (choosearea != '') {
-					this.succeed(2)
-				}
-			},
-			//筛选框关闭
-			succeed(num) {
-				// this.$refs.uDropdown.close();
-				if (num == 1) {
-					this.show1 = false
-				} else if (num == 2) {
-					this.show2 = false
-				}
-				this.getList()
-			},
-			myPage(){
-			    uni.$u.route("/pages/riders/myTeam")	
+			myPage() {
+				uni.$u.route("/pages/riders/myTeam")
 			}
-			// regionChange1(value) {
-			// 	this.sendregion = value
-			// 	this.sendInfo.sendProvince = this.sendregion[0] == '请选择' ? '' : this.sendregion[0]
-			// 	this.sendInfo.sendCity = this.sendregion[1] == '请选择' ? '' : this.sendregion[1]
-			// 	this.sendInfo.sendArea = this.sendregion[2] == '请选择' ? '' : this.sendregion[2]
-			// },
-			// regionChange2(value) {
-			// 	this.unloaddregion = value
-			// 	this.unloadInfo.unloadProvince = this.unloaddregion[0] == '请选择' ? '' : this.unloaddregion[0]
-			// 	this.unloadInfo.unloadCity = this.unloaddregion[1] == '请选择' ? '' : this.unloaddregion[1]
-			// 	this.unloadInfo.unloadArea = this.unloaddregion[2] == '请选择' ? '' : this.unloaddregion[2]
-
-			// },
-			// selecteRegion1(value) {
-			// 	this.selections1 = value;
-			// 	this.sendInfo.sendNum = this.selections1 ? this.selections1.toString() : ""
-			// 	this.getList()
-			// },
-			// selecteRegion2(value) {
-			// 	this.selections2 = value;
-			// 	this.unloadInfo.unloadNum = this.selections2 ? this.selections2.toString() : ""
-			// 	this.getList()
-			// },
 		}
 	}
 </script>
 
 <style lang="scss" scoped>
 	.center {
+		background: #F2F4F7 ;
 		.row1 {
 			display: flex;
 			justify-content: flex-end;
 			margin-top: 46rpx;
-			margin: 40rpx 30rpx 0 0;
+			margin: 30rpx 30rpx 0 0;
 		}
-		.center_top{
-			margin-top: 30rpx;
+
+		.center_top {
+			margin-top: 20rpx;
 			padding: 0 30rpx;
 		}
 	}
+
+	.fleet {
+		padding: 0 30rpx;
+		margin: 30rpx 0;
+
+		// .fleet_img {
+		// 	width: 20%;
+		// }
+
+		.fleet_right {
+			margin-top: 10rpx;
+			width: 100%;
+
+			.fleet_name {
+				width: 80%;
+			}
+
+			.fleet_invite {
+				text-align: right;
+				background-color: #5878e8;
+				color: #fff;
+			}
+		}
+	}
+
+	.route {
+		padding: 30rpx;
+	}
+
+	.driver {
+		.screen {
+			margin-top: 10rpx;
+			.screen_item{
+				width: 46%;
+				text-align: center;
+			}
+		}
+	}
 </style>

pages/riders/myTeam.vue

@@ -1,11 +1,7 @@
 <template>
 	<view class="center">
-		<view class="row1">
-			<u--image class="flex-end" :showLoading="true" src="../../static/images/mine/saoma.png" width="30px"
-				height="30px" @click="addFleet"></u--image>
-		</view>
 		<view>
-			<u-search placeholder="日照香炉生紫烟" v-model="keyword"></u-search>
+			<u-search placeholder="输入车队名称" v-model="searchKeyWord" @change="getList" maxlength="15"></u-search>
 		</view>
 		<view class="" @click="inTeam">
 			入队申请
@@ -24,7 +20,10 @@
 					<view class="fleet_name">
 						{{item.fleetName}}({{item.fleetMemberNum}})
 					</view>
-					<view class="fleet_invite" v-if="item.captainFlag == 1">{{item.fleetStatus}}</view>
+					<!-- “审核中”和“已驳回”只有队长本人可见 -->
+					<view class="fleet_invite" v-if="item.captainFlag == 1 && (item.fleetStatus =='审核中' || item.fleetStatus =='已驳回') ">{{item.fleetStatus}}</view>
+					<view class="fleet_invite" v-else-if="item.fleetStatus != '已通过'">{{item.fleetStatus}}</view>
+					<!-- <view class="fleet_invite" v-if="item.captainFlag == 1">{{item.fleetStatus}}</view> -->
 				</view>
 				<view>
 					{{item.province}}{{item.city}}{{item.area}}
@@ -39,7 +38,8 @@
 	export default {
 		data() {
 			return {
-				formData:[]
+				formData:[],
+				searchKeyWord:""
 			}
 		},
 		onShow() {
@@ -49,10 +49,14 @@
 			this.commonId = uni.getStorageSync("firstAuthentication").commonId
 			this.getList()
 		},
+		onNavigationBarButtonTap(e) {
+			this.$u.route("/pages/riders/addFleet")
+		},
 		methods: {
 			getList() {
 				this.$request.baseRequest('get', '/fleetMemberInfo/selectMyFleetInfo', {
 						commonId: this.commonId,
+						searchKeyWord:this.searchKeyWord,
 						pageSize: 10,
 						currentPage: 1
 					}).then(res => {
@@ -73,7 +77,8 @@
 			},
 			fleetInfo(item){
 				this.$u.route("/pages/riders/fleetSee",{
-					id:item.fleetId
+					id:item.fleetId,
+					type:item.captainFlag
 				})
 			},
 			inTeam() {
@@ -82,10 +87,7 @@
 			fleetInvitation() {
 				this.$u.route("/pages/riders/fleetInvitation")
 			},
-			addFleet() {
-				this.$u.route("/pages/riders/addFleet")
-			}
-
+			
 		}
 	}
 </script>

pages/riders/notice.vue

@@ -0,0 +1,94 @@
+<template>
+	<view class="center">
+		<view class="row">
+			<view class="left-text">发布公告</view>
+			<u--textarea v-model="fleetInfo.notice" placeholder="输入公告文字,0-500字" maxlength="500" autoHeight count></u--textarea>
+		</view>
+		<u-button type="primary" @click="submit">提交</u-button>
+
+<u-toast ref="uToast"></u-toast>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				id:"",
+				fleetInfo:{}
+			}
+		},
+		onShow() {
+
+		},
+		onLoad(option) {
+			this.id = option.id
+			this.getList()
+		},
+		methods: {
+			getList(){
+				this.$request.baseRequest('get', '/fleetInfo/getFleetInfo', {
+						id: this.id
+					}).then(res => {
+						this.fleetInfo = res.data
+					})
+					.catch(res => {
+						uni.$u.toast(res.message);
+					});
+			},
+			submit(){
+				if(!this.fleetInfo.notice){
+					this.$refs.uToast.show({
+						type: 'error',
+						message: "请输入公告内容！",
+					})
+					return 
+				}
+				this.$request.baseRequest('post', '/fleetInfo/api/editFleetInfo',this.fleetInfo).then(res => {
+						if (res.code == 200) {
+							this.$refs.uToast.show({
+								type: 'success',
+								message: "公告发布成功！",
+								complete() {
+									// uni.$u.route("pages/riders/myTeam")
+									uni.navigateBack({
+										delta: 1
+									});
+								}
+							})
+						}
+						// this.fleetInfo = res.data
+					})
+					.catch(res => {
+						uni.$u.toast(res.message);
+					});
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.center {
+		padding: 30rpx;
+	}
+
+	.form_css {
+		width: 100%;
+		display: flex;
+		margin: 20rpx 0;
+		height: 60rpx;
+		border-bottom: 1px solid #eeeeee;
+
+		.left-text {
+			width: 50%;
+			text-align: left;
+		}
+
+		.right-text {
+			width: 50%;
+			justify-content: flex-end;
+			display: flex;
+			text-align: right;
+		}
+	}
+</style>

pages/riders/report.vue

@@ -0,0 +1,78 @@
+<template>
+	<view class="center">
+		<view class="">被举报车队</view>
+		<view class="">举报信息</view>
+		<u--textarea v-model="content" placeholder="输入要举报的内容,10-300字" maxlength="300" autoHeight count></u--textarea>
+	     <u-upload class="uview-upload" :fileList="fileList1" @afterRead="afterRead($event)" @delete="deletePic"
+	     	name="1" multiple :maxCount="1" style="z-index: 9999;"></u-upload>
+	</view>
+</template>
+
+<script>
+	import uploadImage from '@/components/ossutil/uploadFile.js';
+	export default{
+		data(){
+			return{
+				fileList1:[],
+				content:"",
+				textNumber:300,
+				formData:{}
+			}
+		},
+		onShow(){
+			
+		},
+		onLoad(){
+			
+		},
+		methods:{
+			// 删除图片
+			deletePic(event) {
+				console.log(this[`fileList${event.name}`])
+				this[`fileList${event.name}`].splice(event.index, 1)
+			},
+			// 新增图片
+			async afterRead(event) {
+				// 当设置 mutiple 为 true 时, file 为数组格式，否则为对象格式
+				let lists = [].concat(event.file)
+				let fileListLen = this[`fileList${event.name}`].length
+				lists.map((item) => {
+					this[`fileList${event.name}`].push({
+						...item,
+						status: 'uploading',
+						message: '上传中'
+					})
+				})
+				for (let i = 0; i < lists.length; i++) {
+					const result = await this.uploadFilePromise(lists[i].url)
+					let item = this[`fileList${event.name}`][fileListLen]
+					this[`fileList${event.name}`].splice(fileListLen, 1, Object.assign(item, {
+						status: 'success',
+						message: '',
+						url: result
+					}))
+					fileListLen++
+				}
+			},
+			uploadFilePromise(url) {
+				uploadImage('image',url, 'appData/',
+					result => {
+						// 上传成功回调函数
+						if(this.formData.coverUrl){
+							this.formData.coverUrl = this.formData.coverUrl+','+ result
+						}else{
+							this.formData.coverUrl = result
+						}
+						
+					}
+				)
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.center{
+		padding: 30rpx;
+	}
+</style>

static/addfleet/demo.css

@@ -0,0 +1,539 @@
+/* Logo 字体 */
+@font-face {
+  font-family: "iconfont logo";
+  src: url('https://at.alicdn.com/t/font_985780_km7mi63cihi.eot?t=1545807318834');
+  src: url('https://at.alicdn.com/t/font_985780_km7mi63cihi.eot?t=1545807318834#iefix') format('embedded-opentype'),
+    url('https://at.alicdn.com/t/font_985780_km7mi63cihi.woff?t=1545807318834') format('woff'),
+    url('https://at.alicdn.com/t/font_985780_km7mi63cihi.ttf?t=1545807318834') format('truetype'),
+    url('https://at.alicdn.com/t/font_985780_km7mi63cihi.svg?t=1545807318834#iconfont') format('svg');
+}
+
+.logo {
+  font-family: "iconfont logo";
+  font-size: 160px;
+  font-style: normal;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+
+/* tabs */
+.nav-tabs {
+  position: relative;
+}
+
+.nav-tabs .nav-more {
+  position: absolute;
+  right: 0;
+  bottom: 0;
+  height: 42px;
+  line-height: 42px;
+  color: #666;
+}
+
+#tabs {
+  border-bottom: 1px solid #eee;
+}
+
+#tabs li {
+  cursor: pointer;
+  width: 100px;
+  height: 40px;
+  line-height: 40px;
+  text-align: center;
+  font-size: 16px;
+  border-bottom: 2px solid transparent;
+  position: relative;
+  z-index: 1;
+  margin-bottom: -1px;
+  color: #666;
+}
+
+
+#tabs .active {
+  border-bottom-color: #f00;
+  color: #222;
+}
+
+.tab-container .content {
+  display: none;
+}
+
+/* 页面布局 */
+.main {
+  padding: 30px 100px;
+  width: 960px;
+  margin: 0 auto;
+}
+
+.main .logo {
+  color: #333;
+  text-align: left;
+  margin-bottom: 30px;
+  line-height: 1;
+  height: 110px;
+  margin-top: -50px;
+  overflow: hidden;
+  *zoom: 1;
+}
+
+.main .logo a {
+  font-size: 160px;
+  color: #333;
+}
+
+.helps {
+  margin-top: 40px;
+}
+
+.helps pre {
+  padding: 20px;
+  margin: 10px 0;
+  border: solid 1px #e7e1cd;
+  background-color: #fffdef;
+  overflow: auto;
+}
+
+.icon_lists {
+  width: 100% !important;
+  overflow: hidden;
+  *zoom: 1;
+}
+
+.icon_lists li {
+  width: 100px;
+  margin-bottom: 10px;
+  margin-right: 20px;
+  text-align: center;
+  list-style: none !important;
+  cursor: default;
+}
+
+.icon_lists li .code-name {
+  line-height: 1.2;
+}
+
+.icon_lists .icon {
+  display: block;
+  height: 100px;
+  line-height: 100px;
+  font-size: 42px;
+  margin: 10px auto;
+  color: #333;
+  -webkit-transition: font-size 0.25s linear, width 0.25s linear;
+  -moz-transition: font-size 0.25s linear, width 0.25s linear;
+  transition: font-size 0.25s linear, width 0.25s linear;
+}
+
+.icon_lists .icon:hover {
+  font-size: 100px;
+}
+
+.icon_lists .svg-icon {
+  /* 通过设置 font-size 来改变图标大小 */
+  width: 1em;
+  /* 图标和文字相邻时，垂直对齐 */
+  vertical-align: -0.15em;
+  /* 通过设置 color 来改变 SVG 的颜色/fill */
+  fill: currentColor;
+  /* path 和 stroke 溢出 viewBox 部分在 IE 下会显示
+      normalize.css 中也包含这行 */
+  overflow: hidden;
+}
+
+.icon_lists li .name,
+.icon_lists li .code-name {
+  color: #666;
+}
+
+/* markdown 样式 */
+.markdown {
+  color: #666;
+  font-size: 14px;
+  line-height: 1.8;
+}
+
+.highlight {
+  line-height: 1.5;
+}
+
+.markdown img {
+  vertical-align: middle;
+  max-width: 100%;
+}
+
+.markdown h1 {
+  color: #404040;
+  font-weight: 500;
+  line-height: 40px;
+  margin-bottom: 24px;
+}
+
+.markdown h2,
+.markdown h3,
+.markdown h4,
+.markdown h5,
+.markdown h6 {
+  color: #404040;
+  margin: 1.6em 0 0.6em 0;
+  font-weight: 500;
+  clear: both;
+}
+
+.markdown h1 {
+  font-size: 28px;
+}
+
+.markdown h2 {
+  font-size: 22px;
+}
+
+.markdown h3 {
+  font-size: 16px;
+}
+
+.markdown h4 {
+  font-size: 14px;
+}
+
+.markdown h5 {
+  font-size: 12px;
+}
+
+.markdown h6 {
+  font-size: 12px;
+}
+
+.markdown hr {
+  height: 1px;
+  border: 0;
+  background: #e9e9e9;
+  margin: 16px 0;
+  clear: both;
+}
+
+.markdown p {
+  margin: 1em 0;
+}
+
+.markdown>p,
+.markdown>blockquote,
+.markdown>.highlight,
+.markdown>ol,
+.markdown>ul {
+  width: 80%;
+}
+
+.markdown ul>li {
+  list-style: circle;
+}
+
+.markdown>ul li,
+.markdown blockquote ul>li {
+  margin-left: 20px;
+  padding-left: 4px;
+}
+
+.markdown>ul li p,
+.markdown>ol li p {
+  margin: 0.6em 0;
+}
+
+.markdown ol>li {
+  list-style: decimal;
+}
+
+.markdown>ol li,
+.markdown blockquote ol>li {
+  margin-left: 20px;
+  padding-left: 4px;
+}
+
+.markdown code {
+  margin: 0 3px;
+  padding: 0 5px;
+  background: #eee;
+  border-radius: 3px;
+}
+
+.markdown strong,
+.markdown b {
+  font-weight: 600;
+}
+
+.markdown>table {
+  border-collapse: collapse;
+  border-spacing: 0px;
+  empty-cells: show;
+  border: 1px solid #e9e9e9;
+  width: 95%;
+  margin-bottom: 24px;
+}
+
+.markdown>table th {
+  white-space: nowrap;
+  color: #333;
+  font-weight: 600;
+}
+
+.markdown>table th,
+.markdown>table td {
+  border: 1px solid #e9e9e9;
+  padding: 8px 16px;
+  text-align: left;
+}
+
+.markdown>table th {
+  background: #F7F7F7;
+}
+
+.markdown blockquote {
+  font-size: 90%;
+  color: #999;
+  border-left: 4px solid #e9e9e9;
+  padding-left: 0.8em;
+  margin: 1em 0;
+}
+
+.markdown blockquote p {
+  margin: 0;
+}
+
+.markdown .anchor {
+  opacity: 0;
+  transition: opacity 0.3s ease;
+  margin-left: 8px;
+}
+
+.markdown .waiting {
+  color: #ccc;
+}
+
+.markdown h1:hover .anchor,
+.markdown h2:hover .anchor,
+.markdown h3:hover .anchor,
+.markdown h4:hover .anchor,
+.markdown h5:hover .anchor,
+.markdown h6:hover .anchor {
+  opacity: 1;
+  display: inline-block;
+}
+
+.markdown>br,
+.markdown>p>br {
+  clear: both;
+}
+
+
+.hljs {
+  display: block;
+  background: white;
+  padding: 0.5em;
+  color: #333333;
+  overflow-x: auto;
+}
+
+.hljs-comment,
+.hljs-meta {
+  color: #969896;
+}
+
+.hljs-string,
+.hljs-variable,
+.hljs-template-variable,
+.hljs-strong,
+.hljs-emphasis,
+.hljs-quote {
+  color: #df5000;
+}
+
+.hljs-keyword,
+.hljs-selector-tag,
+.hljs-type {
+  color: #a71d5d;
+}
+
+.hljs-literal,
+.hljs-symbol,
+.hljs-bullet,
+.hljs-attribute {
+  color: #0086b3;
+}
+
+.hljs-section,
+.hljs-name {
+  color: #63a35c;
+}
+
+.hljs-tag {
+  color: #333333;
+}
+
+.hljs-title,
+.hljs-attr,
+.hljs-selector-id,
+.hljs-selector-class,
+.hljs-selector-attr,
+.hljs-selector-pseudo {
+  color: #795da3;
+}
+
+.hljs-addition {
+  color: #55a532;
+  background-color: #eaffea;
+}
+
+.hljs-deletion {
+  color: #bd2c00;
+  background-color: #ffecec;
+}
+
+.hljs-link {
+  text-decoration: underline;
+}
+
+/* 代码高亮 */
+/* PrismJS 1.15.0
+https://prismjs.com/download.html#themes=prism&languages=markup+css+clike+javascript */
+/**
+ * prism.js default theme for JavaScript, CSS and HTML
+ * Based on dabblet (http://dabblet.com)
+ * @author Lea Verou
+ */
+code[class*="language-"],
+pre[class*="language-"] {
+  color: black;
+  background: none;
+  text-shadow: 0 1px white;
+  font-family: Consolas, Monaco, 'Andale Mono', 'Ubuntu Mono', monospace;
+  text-align: left;
+  white-space: pre;
+  word-spacing: normal;
+  word-break: normal;
+  word-wrap: normal;
+  line-height: 1.5;
+
+  -moz-tab-size: 4;
+  -o-tab-size: 4;
+  tab-size: 4;
+
+  -webkit-hyphens: none;
+  -moz-hyphens: none;
+  -ms-hyphens: none;
+  hyphens: none;
+}
+
+pre[class*="language-"]::-moz-selection,
+pre[class*="language-"] ::-moz-selection,
+code[class*="language-"]::-moz-selection,
+code[class*="language-"] ::-moz-selection {
+  text-shadow: none;
+  background: #b3d4fc;
+}
+
+pre[class*="language-"]::selection,
+pre[class*="language-"] ::selection,
+code[class*="language-"]::selection,
+code[class*="language-"] ::selection {
+  text-shadow: none;
+  background: #b3d4fc;
+}
+
+@media print {
+
+  code[class*="language-"],
+  pre[class*="language-"] {
+    text-shadow: none;
+  }
+}
+
+/* Code blocks */
+pre[class*="language-"] {
+  padding: 1em;
+  margin: .5em 0;
+  overflow: auto;
+}
+
+:not(pre)>code[class*="language-"],
+pre[class*="language-"] {
+  background: #f5f2f0;
+}
+
+/* Inline code */
+:not(pre)>code[class*="language-"] {
+  padding: .1em;
+  border-radius: .3em;
+  white-space: normal;
+}
+
+.token.comment,
+.token.prolog,
+.token.doctype,
+.token.cdata {
+  color: slategray;
+}
+
+.token.punctuation {
+  color: #999;
+}
+
+.namespace {
+  opacity: .7;
+}
+
+.token.property,
+.token.tag,
+.token.boolean,
+.token.number,
+.token.constant,
+.token.symbol,
+.token.deleted {
+  color: #905;
+}
+
+.token.selector,
+.token.attr-name,
+.token.string,
+.token.char,
+.token.builtin,
+.token.inserted {
+  color: #690;
+}
+
+.token.operator,
+.token.entity,
+.token.url,
+.language-css .token.string,
+.style .token.string {
+  color: #9a6e3a;
+  background: hsla(0, 0%, 100%, .5);
+}
+
+.token.atrule,
+.token.attr-value,
+.token.keyword {
+  color: #07a;
+}
+
+.token.function,
+.token.class-name {
+  color: #DD4A68;
+}
+
+.token.regex,
+.token.important,
+.token.variable {
+  color: #e90;
+}
+
+.token.important,
+.token.bold {
+  font-weight: bold;
+}
+
+.token.italic {
+  font-style: italic;
+}
+
+.token.entity {
+  cursor: help;
+}

static/addfleet/demo_index.html

@@ -0,0 +1,253 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta charset="utf-8"/>
+  <title>iconfont Demo</title>
+  <link rel="shortcut icon" href="//img.alicdn.com/imgextra/i2/O1CN01ZyAlrn1MwaMhqz36G_!!6000000001499-73-tps-64-64.ico" type="image/x-icon"/>
+  <link rel="icon" type="image/svg+xml" href="//img.alicdn.com/imgextra/i4/O1CN01EYTRnJ297D6vehehJ_!!6000000008020-55-tps-64-64.svg"/>
+  <link rel="stylesheet" href="https://g.alicdn.com/thx/cube/1.3.2/cube.min.css">
+  <link rel="stylesheet" href="demo.css">
+  <link rel="stylesheet" href="iconfont.css">
+  <script src="iconfont.js"></script>
+  <!-- jQuery -->
+  <script src="https://a1.alicdn.com/oss/uploads/2018/12/26/7bfddb60-08e8-11e9-9b04-53e73bb6408b.js"></script>
+  <!-- 代码高亮 -->
+  <script src="https://a1.alicdn.com/oss/uploads/2018/12/26/a3f714d0-08e6-11e9-8a15-ebf944d7534c.js"></script>
+  <style>
+    .main .logo {
+      margin-top: 0;
+      height: auto;
+    }
+
+    .main .logo a {
+      display: flex;
+      align-items: center;
+    }
+
+    .main .logo .sub-title {
+      margin-left: 0.5em;
+      font-size: 22px;
+      color: #fff;
+      background: linear-gradient(-45deg, #3967FF, #B500FE);
+      -webkit-background-clip: text;
+      -webkit-text-fill-color: transparent;
+    }
+  </style>
+</head>
+<body>
+  <div class="main">
+    <h1 class="logo"><a href="https://www.iconfont.cn/" title="iconfont 首页" target="_blank">
+      <img width="200" src="https://img.alicdn.com/imgextra/i3/O1CN01Mn65HV1FfSEzR6DKv_!!6000000000514-55-tps-228-59.svg">
+      
+    </a></h1>
+    <div class="nav-tabs">
+      <ul id="tabs" class="dib-box">
+        <li class="dib active"><span>Unicode</span></li>
+        <li class="dib"><span>Font class</span></li>
+        <li class="dib"><span>Symbol</span></li>
+      </ul>
+      
+    </div>
+    <div class="tab-container">
+      <div class="content unicode" style="display: block;">
+          <ul class="icon_lists dib-box">
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe60e;</span>
+                <div class="name">个人信息</div>
+                <div class="code-name">&amp;#xe60e;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe622;</span>
+                <div class="name">添加</div>
+                <div class="code-name">&amp;#xe622;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe7c3;</span>
+                <div class="name">点点点</div>
+                <div class="code-name">&amp;#xe7c3;</div>
+              </li>
+          
+          </ul>
+          <div class="article markdown">
+          <h2 id="unicode-">Unicode 引用</h2>
+          <hr>
+
+          <p>Unicode 是字体在网页端最原始的应用方式，特点是：</p>
+          <ul>
+            <li>支持按字体的方式去动态调整图标大小，颜色等等。</li>
+            <li>默认情况下不支持多色，直接添加多色图标会自动去色。</li>
+          </ul>
+          <blockquote>
+            <p>注意：新版 iconfont 支持两种方式引用多色图标：SVG symbol 引用方式和彩色字体图标模式。（使用彩色字体图标需要在「编辑项目」中开启「彩色」选项后并重新生成。）</p>
+          </blockquote>
+          <p>Unicode 使用步骤如下：</p>
+          <h3 id="-font-face">第一步：拷贝项目下面生成的 <code>@font-face</code></h3>
+<pre><code class="language-css"
+>@font-face {
+  font-family: 'iconfont';
+  src: url('iconfont.ttf?t=1653291862979') format('truetype');
+}
+</code></pre>
+          <h3 id="-iconfont-">第二步：定义使用 iconfont 的样式</h3>
+<pre><code class="language-css"
+>.iconfont {
+  font-family: "iconfont" !important;
+  font-size: 16px;
+  font-style: normal;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+</code></pre>
+          <h3 id="-">第三步：挑选相应图标并获取字体编码，应用于页面</h3>
+<pre>
+<code class="language-html"
+>&lt;span class="iconfont"&gt;&amp;#x33;&lt;/span&gt;
+</code></pre>
+          <blockquote>
+            <p>"iconfont" 是你项目下的 font-family。可以通过编辑项目查看，默认是 "iconfont"。</p>
+          </blockquote>
+          </div>
+      </div>
+      <div class="content font-class">
+        <ul class="icon_lists dib-box">
+          
+          <li class="dib">
+            <span class="icon iconfont icon-gerenxinxi"></span>
+            <div class="name">
+              个人信息
+            </div>
+            <div class="code-name">.icon-gerenxinxi
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-tianjia"></span>
+            <div class="name">
+              添加
+            </div>
+            <div class="code-name">.icon-tianjia
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-diandiandian"></span>
+            <div class="name">
+              点点点
+            </div>
+            <div class="code-name">.icon-diandiandian
+            </div>
+          </li>
+          
+        </ul>
+        <div class="article markdown">
+        <h2 id="font-class-">font-class 引用</h2>
+        <hr>
+
+        <p>font-class 是 Unicode 使用方式的一种变种，主要是解决 Unicode 书写不直观，语意不明确的问题。</p>
+        <p>与 Unicode 使用方式相比，具有如下特点：</p>
+        <ul>
+          <li>相比于 Unicode 语意明确，书写更直观。可以很容易分辨这个 icon 是什么。</li>
+          <li>因为使用 class 来定义图标，所以当要替换图标时，只需要修改 class 里面的 Unicode 引用。</li>
+        </ul>
+        <p>使用步骤如下：</p>
+        <h3 id="-fontclass-">第一步：引入项目下面生成的 fontclass 代码：</h3>
+<pre><code class="language-html">&lt;link rel="stylesheet" href="./iconfont.css"&gt;
+</code></pre>
+        <h3 id="-">第二步：挑选相应图标并获取类名，应用于页面：</h3>
+<pre><code class="language-html">&lt;span class="iconfont icon-xxx"&gt;&lt;/span&gt;
+</code></pre>
+        <blockquote>
+          <p>"
+            iconfont" 是你项目下的 font-family。可以通过编辑项目查看，默认是 "iconfont"。</p>
+        </blockquote>
+      </div>
+      </div>
+      <div class="content symbol">
+          <ul class="icon_lists dib-box">
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-gerenxinxi"></use>
+                </svg>
+                <div class="name">个人信息</div>
+                <div class="code-name">#icon-gerenxinxi</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-tianjia"></use>
+                </svg>
+                <div class="name">添加</div>
+                <div class="code-name">#icon-tianjia</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-diandiandian"></use>
+                </svg>
+                <div class="name">点点点</div>
+                <div class="code-name">#icon-diandiandian</div>
+            </li>
+          
+          </ul>
+          <div class="article markdown">
+          <h2 id="symbol-">Symbol 引用</h2>
+          <hr>
+
+          <p>这是一种全新的使用方式，应该说这才是未来的主流，也是平台目前推荐的用法。相关介绍可以参考这篇<a href="">文章</a>
+            这种用法其实是做了一个 SVG 的集合，与另外两种相比具有如下特点：</p>
+          <ul>
+            <li>支持多色图标了，不再受单色限制。</li>
+            <li>通过一些技巧，支持像字体那样，通过 <code>font-size</code>, <code>color</code> 来调整样式。</li>
+            <li>兼容性较差，支持 IE9+，及现代浏览器。</li>
+            <li>浏览器渲染 SVG 的性能一般，还不如 png。</li>
+          </ul>
+          <p>使用步骤如下：</p>
+          <h3 id="-symbol-">第一步：引入项目下面生成的 symbol 代码：</h3>
+<pre><code class="language-html">&lt;script src="./iconfont.js"&gt;&lt;/script&gt;
+</code></pre>
+          <h3 id="-css-">第二步：加入通用 CSS 代码（引入一次就行）：</h3>
+<pre><code class="language-html">&lt;style&gt;
+.icon {
+  width: 1em;
+  height: 1em;
+  vertical-align: -0.15em;
+  fill: currentColor;
+  overflow: hidden;
+}
+&lt;/style&gt;
+</code></pre>
+          <h3 id="-">第三步：挑选相应图标并获取类名，应用于页面：</h3>
+<pre><code class="language-html">&lt;svg class="icon" aria-hidden="true"&gt;
+  &lt;use xlink:href="#icon-xxx"&gt;&lt;/use&gt;
+&lt;/svg&gt;
+</code></pre>
+          </div>
+      </div>
+
+    </div>
+  </div>
+  <script>
+  $(document).ready(function () {
+      $('.tab-container .content:first').show()
+
+      $('#tabs li').click(function (e) {
+        var tabContent = $('.tab-container .content')
+        var index = $(this).index()
+
+        if ($(this).hasClass('active')) {
+          return
+        } else {
+          $('#tabs li').removeClass('active')
+          $(this).addClass('active')
+
+          tabContent.hide().eq(index).fadeIn()
+        }
+      })
+    })
+  </script>
+</body>
+</html>

static/addfleet/iconfont.css

@@ -0,0 +1,25 @@
+@font-face {
+  font-family: "iconfont"; /* Project id  */
+  src: url('iconfont.ttf?t=1653291862979') format('truetype');
+}
+
+.iconfont {
+  font-family: "iconfont" !important;
+  font-size: 16px;
+  font-style: normal;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+
+.icon-gerenxinxi:before {
+  content: "\e60e";
+}
+
+.icon-tianjia:before {
+  content: "\e622";
+}
+
+.icon-diandiandian:before {
+  content: "\e7c3";
+}
+

static/addfleet/iconfont.json

@@ -0,0 +1,30 @@
+{
+  "id": "",
+  "name": "",
+  "font_family": "iconfont",
+  "css_prefix_text": "icon-",
+  "description": "",
+  "glyphs": [
+    {
+      "icon_id": "1001663",
+      "name": "个人信息",
+      "font_class": "gerenxinxi",
+      "unicode": "e60e",
+      "unicode_decimal": 58894
+    },
+    {
+      "icon_id": "1304889",
+      "name": "添加",
+      "font_class": "tianjia",
+      "unicode": "e622",
+      "unicode_decimal": 58914
+    },
+    {
+      "icon_id": "5241212",
+      "name": "点点点",
+      "font_class": "diandiandian",
+      "unicode": "e7c3",
+      "unicode_decimal": 59331
+    }
+  ]
+}