diff --git a/fapp/ciyon_ap/App.vue b/fapp/ciyon_ap/App.vue
index 357dd14..338c809 100644
--- a/fapp/ciyon_ap/App.vue
+++ b/fapp/ciyon_ap/App.vue
@@ -66,7 +66,7 @@
 			app.globalData.storselect = '/';
 			app.globalData.storlist = {
 				'/': 'https://ciyon.ciy.cn/ud/',
-				'A': 'https://cf5.xinquanyou.cn/ud/'
+				'A': 'https://cf5.nyyzsoft.cn/ud/'
 			};
 			app.globalData.stortransfer = ['/'];
 
@@ -82,7 +82,7 @@
 
 			setInterval(() => {
 				if (app.globalData._restorage) {
-					app.callajax({
+					app.callfunc({
 						func: 'login.restorage',
 						data: {},
 						loadhide: true,
@@ -107,7 +107,7 @@
 				}
 				app.globalData._restorage = false;
 				if (app.globalData.errdata.length > 0) {
-					app.callajax({
+					app.callfunc({
 						func: 'login.uperr',
 						data: {
 							meid: app.getme().id,
@@ -126,7 +126,7 @@
 			//lopn 结合me，将数据上传到平台
 			function getnewnotice() {
 				return;
-				app.callajax({
+				app.callfunc({
 					func: 'me.notice_new',
 					showload: false,
 					success: json => {
@@ -141,6 +141,8 @@
 
 			//#ifdef MP-WEIXIN
 			const accountInfo = uni.getAccountInfoSync();
+			app.globalData._wxappid = accountInfo.miniProgram.appId;
+			app.globalData._wxenv = accountInfo.miniProgram.envVersion;
 			app.globalData._version = accountInfo.miniProgram.version;
 			if (!app.globalData._version)
 				app.globalData._version = accountInfo.miniProgram.envVersion;
diff --git a/fapp/ciyon_ap/components/ciy-aivoice/ciy-aivoice.vue b/fapp/ciyon_ap/components/ciy-aivoice/ciy-aivoice.vue
index 813163d..b97333b 100644
--- a/fapp/ciyon_ap/components/ciy-aivoice/ciy-aivoice.vue
+++ b/fapp/ciyon_ap/components/ciy-aivoice/ciy-aivoice.vue
@@ -1,5 +1,5 @@
 <template>
-	<view class="_voice" @touchstart="start" @touchend="stop">
+	<view class="_voice" @touchstart="start" @touchend="stop" v-if="benable">
 		<ciy-ani class="_txt" ref="ani">{{txt}}</ciy-ani>
 		<ciy-svgimg :src="svg" class="_img" :style="{filter:'hue-rotate('+deg+'deg)'}"></ciy-svgimg>
 	</view>
@@ -16,6 +16,7 @@
 		},
 		data() {
 			return {
+				benable: true,
 				bst: false,
 				txt: '',
 				deg: 0, //150 红 
@@ -26,36 +27,40 @@
 		computed: {},
 		mounted() {
 			var app = getApp();
-			app.globalData.plugin_wechatsi_manager.onStop = res => {
-				this.$emit('change', {
-					txt: res.result,
-					data: res
-				});
-				this.getrefsSync('ani', this).Doani('op0|op1,200');
-				this.txt = res.result;
-				if (this._t)
-					clearTimeout(this._t);
-				this._t = setTimeout(() => {
-					this.getrefsSync('ani', this).Doani('op1|op0,sa1.5,300|hide');
-				}, 5000);
+			if (app.globalData.plugin_wechatsi_manager) {
+				app.globalData.plugin_wechatsi_manager.onStop = res => {
+					this.$emit('change', {
+						txt: res.result,
+						data: res
+					});
+					this.getrefsSync('ani', this).Doani('op0|op1,200');
+					this.txt = res.result;
+					if (this._t)
+						clearTimeout(this._t);
+					this._t = setTimeout(() => {
+						this.getrefsSync('ani', this).Doani('op1|op0,sa1.5,300|hide');
+					}, 5000);
+				}
+				app.globalData.plugin_wechatsi_manager.onStart = res => {
+					console.log("成功开始录音识别", res)
+				}
+				app.globalData.plugin_wechatsi_manager.onError = res => {
+					clearInterval(this._an);
+					this.deg = 150; //红
+					console.error("error msg", res.msg)
+				}
+				this._an = setInterval(() => {
+					this.deg += 10;
+				}, 100);
+			} else {
+				this.benable = false;
 			}
-			app.globalData.plugin_wechatsi_manager.onStart = res => {
-				console.log("成功开始录音识别", res)
-			}
-			app.globalData.plugin_wechatsi_manager.onError = res => {
-				clearInterval(this._an);
-				this.deg = 150; //红
-				console.error("error msg", res.msg)
-			}
-			this._an = setInterval(() => {
-				this.deg += 10;
-			}, 100);
 		},
 		unmounted() {
 			clearInterval(this._an);
 		},
 		methods: {
-			test(){
+			test() {
 				this.getrefsSync('ani', this).Doani('op0|op1,200');
 				this.txt = 'res.result';
 				if (this._t)
@@ -63,7 +68,7 @@
 				this._t = setTimeout(() => {
 					this.getrefsSync('ani', this).Doani('op1|op0,sa1.5,300|hide');
 				}, 5000);
-				
+
 			},
 			start() {
 				this.bst = true;
@@ -82,12 +87,6 @@
 </script>
 
 <style scoped>
-	._voice {
-		position: fixed;
-		bottom: 3em;
-		left: calc(50vw - 1.5em);
-	}
-
 	._voice ._img {
 		width: 3em;
 		height: 3em;
diff --git a/fapp/ciyon_ap/components/ciy-auth/ciy-auth.vue b/fapp/ciyon_ap/components/ciy-auth/ciy-auth.vue
index a9ef4f9..5ca7ff1 100644
--- a/fapp/ciyon_ap/components/ciy-auth/ciy-auth.vue
+++ b/fapp/ciyon_ap/components/ciy-auth/ciy-auth.vue
@@ -248,7 +248,7 @@
 						scopes: 'auth_base',
 						onlyAuthorize: true
 					});
-					var retjson = await this.callajax({
+					var retjson = await this.callfunc({
 						func: 'login.wx_autouser',
 						loadhide: true,
 						data: {
@@ -296,7 +296,7 @@
 				var epass = md5.md5(post.pass + app.globalData.tokensalt);
 				post.pass = md5.md5(epass + post.auth);
 				//._from = app.globalData._sysinfo;
-				var retjson = await this.callajax({
+				var retjson = await this.callfunc({
 					func: 'login.login_mobile', // login.login
 					data: post
 				});
@@ -319,7 +319,7 @@
 				post.pass = md5.md5(post.pass + app.globalData.tokensalt);
 				post.pass2 = '';
 				//._from = app.globalData._sysinfo;
-				var retjson = await this.callajax({
+				var retjson = await this.callfunc({
 					func: 'login.reg_mobile', // login.reg
 					data: post
 				});
@@ -341,7 +341,7 @@
 				if (post.pass != post.pass2)
 					return this.toast('两次密码输入不同');
 				post.pass = md5.md5(post.pass + app.globalData.tokensalt);
-				var retjson = await this.callajax({
+				var retjson = await this.callfunc({
 					func: 'login.forgetpass', // login.reg
 					data: post
 				});
@@ -391,8 +391,10 @@
 				if (this.ver !== 0)
 					return;
 				var app = getApp();
-				var retjson = await this.callajax({
-					func: 'login.debug',
+				if(app.globalData._wxenv == 'release')
+					return;
+				var retjson = await this.callfunc({
+					func: 'login.debug_list',
 					data: {}
 				});
 				this.tusers = retjson.list;
diff --git a/fapp/ciyon_ap/components/ciy-capcode/ciy-capcode.vue b/fapp/ciyon_ap/components/ciy-capcode/ciy-capcode.vue
index 4d03ab7..227a28b 100644
--- a/fapp/ciyon_ap/components/ciy-capcode/ciy-capcode.vue
+++ b/fapp/ciyon_ap/components/ciy-capcode/ciy-capcode.vue
@@ -62,7 +62,7 @@
 				if(!this.account)
 					return this.toast(this.lang('capcode.noinput'));
 					
-				var retjson = await this.callajax({
+				var retjson = await this.callfunc({
 					func: this.func,
 					data:{account:this.account,length:this.codelength}
 				});
diff --git a/fapp/ciyon_ap/components/ciy-checkbox/ciy-checkbox.vue b/fapp/ciyon_ap/components/ciy-checkbox/ciy-checkbox.vue
index c98fc5f..16c0cba 100644
--- a/fapp/ciyon_ap/components/ciy-checkbox/ciy-checkbox.vue
+++ b/fapp/ciyon_ap/components/ciy-checkbox/ciy-checkbox.vue
@@ -39,6 +39,11 @@
 
 	._gp._left {
 		flex-direction: row;
+		justify-content: flex-start;
+	}
+
+	._gp._left ._item {
+		flex-direction: row;
 	}
 
 	._gp ._item {
@@ -48,6 +53,7 @@
 		gap: 0.5em;
 		padding: 0.5em;
 		min-width: 7em;
+		flex-direction: row-reverse;
 	}
 
 	._gp._itemright ._item {
diff --git a/fapp/ciyon_ap/components/ciy-dbg/ciy-dbg.vue b/fapp/ciyon_ap/components/ciy-dbg/ciy-dbg.vue
new file mode 100644
index 0000000..ad0dc88
--- /dev/null
+++ b/fapp/ciyon_ap/components/ciy-dbg/ciy-dbg.vue
@@ -0,0 +1,122 @@
+<template>
+	<view class="_dbg" @tap.stop="showdbglist" v-if="bshow && me.id>0">
+		<view class="_dbgbg">
+		</view>
+		<view class="_dbgtxt">
+			{{me.id}}<br />
+			{{me.name}}
+		</view>
+	</view>
+</template>
+
+<style scoped>
+	._dbg {
+		top: 10em;
+		left: 1em;
+		position: fixed;
+		width: 4em;
+		height: 4em;
+		z-index: 10000000;
+	}
+
+	._dbgbg {
+		position: relative;
+		background: #9412cc;
+		width: 100%;
+		height: 100%;
+		border-radius: 50%;
+		opacity: 0.2;
+	}
+
+	._dbgtxt {
+		position: absolute;
+		width: 100%;
+		height: 100%;
+		text-align: center;
+		padding: 0 0.3em;
+		line-height: 1.3em;
+		text-shadow: 1px 1px #ffffff, -1px -1px #ffffff, -1px 1px #ffffff, 1px -1px #ffffff;
+		top: 0.7em;
+		left: 0;
+		font-size: 0.8em;
+		color: #000000;
+	}
+</style>
+
+<script>
+	//支持本地缓存，自动翻译
+	export default {
+		props: {},
+		data() {
+			return {
+				bshow: true
+			};
+		},
+		watch: {},
+		computed: {},
+		mounted() {
+			this.me = this.getme();
+		},
+		methods: {
+			async chguser(item) {
+				var retjson = await this.callfunc({
+					func: 'login.debug_chguser',
+					data: {
+						code: item.data.id
+					}
+				});
+				if (retjson.code != 1)
+					return this.alert(retjson.errmsg);
+				this.me = this.objdeepmerge(this.me, retjson.me);
+				getApp().setuserstorage(retjson);
+				var page = this.com_getpage();
+				page.me = this.me;
+				if (page.dbgcallback)
+					page.dbgcallback();
+			},
+			async mehide(item) {
+				this.bshow = false;
+				if (item.data > 0) {
+					setTimeout(() => {
+						this.bshow = true;
+					}, item.data);
+				}
+			},
+			async showdbglist() {
+				var retjson = await this.callfunc({
+					func: 'login.debug_list',
+					cache: 3600,
+				});
+				if (retjson.code != 1)
+					return this.alert(retjson.errmsg);
+				var items = [];
+				for (var i = 0; i < retjson.list.length; i++) {
+					items.push({
+						func: 'chguser',
+						name: retjson.list[i].name,
+						data: retjson.list[i]
+					});
+				}
+				items.push({
+					br: true
+				});
+				items.push({
+					func: 'mehide',
+					name: '消失5秒',
+					style: 'color:var(--warn6)',
+					data: 5000
+				});
+				items.push({
+					func: 'mehide',
+					name: '永久隐藏',
+					style: 'color:var(--dag6)',
+					data: 0
+				});
+				this.popmenu({
+					rowcount: 3,
+					items
+				});
+			},
+		}
+	}
+</script>
\ No newline at end of file
diff --git a/fapp/ciyon_ap/components/ciy-dialog/ciy-dialog.vue b/fapp/ciyon_ap/components/ciy-dialog/ciy-dialog.vue
index b861785..c21db73 100644
--- a/fapp/ciyon_ap/components/ciy-dialog/ciy-dialog.vue
+++ b/fapp/ciyon_ap/components/ciy-dialog/ciy-dialog.vue
@@ -2,7 +2,7 @@
 	<view class="_bg" v-if="bshow">
 		<view class="_dialog" :style="{top:top}">
 			<view class="_title">{{title}}</view>
-			<view class="_close" @click="Close(true)"></view>
+			<view class="_close" @tap="Close(true)"></view>
 			<view class="_content" :style="{maxHeight:maxheight,height:height}">
 				<slot></slot>
 			</view>
diff --git a/fapp/ciyon_ap/components/ciy-inputnumber/ciy-inputnumber.vue b/fapp/ciyon_ap/components/ciy-inputnumber/ciy-inputnumber.vue
index 4ebf329..50ecc66 100644
--- a/fapp/ciyon_ap/components/ciy-inputnumber/ciy-inputnumber.vue
+++ b/fapp/ciyon_ap/components/ciy-inputnumber/ciy-inputnumber.vue
@@ -134,11 +134,11 @@
 
 	._btn {
 		background: linear-gradient(100deg, var(--bg4), var(--bg6));
-		width: 2rem;
-		height: 2rem;
-		font-size: 1.5rem;
+		width: 1.5rem;
+		height: 1.5rem;
+		font-size: 1rem;
 		text-align: center;
-		line-height: 2rem;
+		line-height: 1.5rem;
 		border-radius: 0.3em;
 	}
 
diff --git a/fapp/ciyon_ap/components/ciy-markdown/ciy-markdown.vue b/fapp/ciyon_ap/components/ciy-markdown/ciy-markdown.vue
index 1a0f8dc..4935327 100644
--- a/fapp/ciyon_ap/components/ciy-markdown/ciy-markdown.vue
+++ b/fapp/ciyon_ap/components/ciy-markdown/ciy-markdown.vue
@@ -9,7 +9,7 @@
 		<view v-else-if="item.type == 'audio'" style="padding:1em;">
 			<ciy-audio :src="file_stor(item.content)"></ciy-audio>
 		</view>
-		<view v-else v-html="item.content" style="width:100%;position: relative;padding:0 1em;"></view>
+		<view v-else v-html="item.content" style="width:100%;position: relative;padding:0 0.5em;"></view>
 	</template>
 </template>
 
diff --git a/fapp/ciyon_ap/components/ciy-radio/ciy-radio.vue b/fapp/ciyon_ap/components/ciy-radio/ciy-radio.vue
index cccf271..2552b9f 100644
--- a/fapp/ciyon_ap/components/ciy-radio/ciy-radio.vue
+++ b/fapp/ciyon_ap/components/ciy-radio/ciy-radio.vue
@@ -201,6 +201,11 @@
 
 	._gp._left {
 		flex-direction: row;
+		justify-content: flex-start;
+	}
+
+	._gp._left ._item {
+		flex-direction: row;
 	}
 
 	._gp ._item {
@@ -210,6 +215,7 @@
 		gap: 0.5em;
 		min-width: 7em;
 		padding: 0.5em;
+		flex-direction: row-reverse;
 	}
 
 	._gp._itemright ._item {
diff --git a/fapp/ciyon_ap/components/ciy-radiobox/ciy-radiobox.vue b/fapp/ciyon_ap/components/ciy-radiobox/ciy-radiobox.vue
deleted file mode 100644
index b8cc0a9..0000000
--- a/fapp/ciyon_ap/components/ciy-radiobox/ciy-radiobox.vue
+++ /dev/null
@@ -1,194 +0,0 @@
-<template>
-	<view style="width:100%;">
-		<input type="hidden" :name="name" :value="tkv.id" style="display:none;" />
-		<template v-if="hasmore">
-			<input type="hidden" :name="name+'_name'" :value="tkv.name" style="display:none;" />
-		</template>
-		<radio-group class="_gp" :class="{'_line':line,'_left':left,'_itemright':itemright}">
-			<view @tap="chkitem(item)" class="_item" v-for="(item,index) in range" :key="index">
-				<ciy-checkitem style="pointer-events: none;" :disabled="disabled" :tag="item.id+''" :value="tkv.id == item.id"></ciy-checkitem>
-				<view :style="{color:disabled?'var(--txt1)':''}">{{item.name}}</view>
-			</view>
-		</radio-group>
-	</view>
-</template>
-
-<script>
-	export default {
-		behaviors: ['uni://form-field-group'],
-		emits: ['change', 'update:modelValue'],
-		props: {
-			name: {
-				type: String
-			},
-			modelValue: {
-				type: [String, Number],
-				default: ''
-			},
-			value: {
-				type: [String, Number],
-				default: ''
-			},
-			disabled: {
-				type: Boolean,
-				default: false
-			},
-			initevent: {
-				type: Boolean,
-				default: false
-			},
-			hasmore: {
-				type: Boolean,
-				default: false
-			},
-			range: {
-				type: Array,
-				default: []
-			},
-			left: {
-				type: Boolean,
-				default: false
-			},
-			itemright: {
-				type: Boolean,
-				default: false
-			},
-			line: {
-				type: Boolean,
-				default: false
-			},
-			byname: {
-				type: Boolean,
-				default: false
-			}
-		},
-		data() {
-			return {
-				v: '',
-				valuearr: {
-					id: 0,
-					name: ''
-				},
-			};
-		},
-		watch: {
-			tkv: {
-				handler(newD, oldD) {
-					if (this.from && newD.id == oldD.id)
-						return;
-					if (!this.from)
-						this.from = 'init';
-					else if (this.from == 'init') {
-						this.from = 'check';
-					}
-					if (this.from != 'init') {
-						if (this.byname)
-							this.$emit('update:modelValue', newD.name);
-						else
-							this.$emit('update:modelValue', newD.id);
-					}
-					if (this.from != 'init' || this.initevent) {
-						this.$emit('change', {
-							name: this.name,
-							from: this.from,
-							value: {
-								id: newD.id,
-								name: newD.name
-							}
-						});
-					}
-				},
-				immediate: true
-			},
-			value: {
-				handler(newD, oldD) {
-					if (newD || oldD)
-						this.v = 'value';
-				},
-				immediate: true
-			},
-			modelValue: {
-				handler(newD, oldD) {
-					if (newD || oldD)
-						this.v = 'modelValue';
-				},
-				immediate: true
-			}
-		},
-		computed: {
-			tkv() {
-				var val = '';
-				if (this.v == 'modelValue') {
-					if (typeof(this.modelValue) == 'number')
-						val = this.modelValue;
-					else if (this.modelValue)
-						val = this.modelValue;
-				} else if (this.v == 'value') {
-					if (typeof(this.value) == 'number')
-						val = this.value;
-					else if (this.value)
-						val = this.value;
-				} else {
-					val = this.v;
-				}
-				if (this.byname) {
-					for (var i in this.range) {
-						if (this.range[i].name == val)
-							return {
-								...this.range[i]
-							};
-					}
-				} else {
-					for (var i in this.range) {
-						if (this.range[i].id == val)
-							return {
-								...this.range[i]
-							};
-					}
-				}
-				return {
-					id: 0,
-					name: ''
-				};
-			}
-		},
-		mounted() {},
-		methods: {
-			chkitem(itm) {
-				if (this.disabled)
-					return;
-				this.v = itm.id;
-			}
-		}
-	}
-</script>
-
-<style scoped>
-	._gp {
-		display: flex;
-		flex-wrap: wrap;
-		flex-direction: row-reverse;
-	}
-
-	._gp._left {
-		flex-direction: row;
-	}
-
-	._gp ._item {
-		white-space: nowrap;
-		display: flex;
-		gap: 0.5em;
-		min-width: 7em;
-		padding: 0.5em;
-	}
-
-	._gp._itemright ._item {
-		justify-content: flex-start;
-		flex-direction: row-reverse;
-	}
-
-	._gp._line ._item {
-		width: 100%;
-		white-space: normal;
-	}
-</style>
\ No newline at end of file
diff --git a/fapp/ciyon_ap/components/ciy-selmap/ciy-selmap.vue b/fapp/ciyon_ap/components/ciy-selmap/ciy-selmap.vue
index 8d538c9..cf0b54a 100644
--- a/fapp/ciyon_ap/components/ciy-selmap/ciy-selmap.vue
+++ b/fapp/ciyon_ap/components/ciy-selmap/ciy-selmap.vue
@@ -14,19 +14,19 @@
 				<view class="_btn" :class="{_disabled:disabled}" @tap="map_select">
 					<view class="_icon _mapicon"></view>
 				</view>
-				<slot name="show" :data="{value:tvalue, loc:loc}">
+				<slot name="show" :data="{value:tvalue, loc:loc, bet:innerbet}">
 					<view style="line-height:1.5em;font-size:0.9em;flex: 1; margin-left:0.5em;text-align:left;">
 						<view v-if="loc.name || loc.addr">{{loc.name}}<br />{{loc.addr}}</view>
-						<view v-else-if="isfloat0(tvalue.lat)" style="padding-top:0.3em;display:inline-block;">{{lang('selmap.select')}}</view>
+						<view v-else-if="tvalue.lat == 0" style="padding-top:0.3em;display:inline-block;">{{lang('selmap.select')}}</view>
 						<view v-else style="padding-top:0.3em;display:inline-block;">{{lang('selmap.loced')}}</view>
 					</view>
 				</slot>
 			</template>
 			<template v-else>
-				<slot name="show" :data="{value:tvalue, loc:loc}">
+				<slot name="show" :data="{value:tvalue, loc:loc, bet:innerbet}">
 					<view style="line-height:1.5em;font-size:0.9em;flex: 1; margin-right:0.5em;">
 						<view v-if="loc.name || loc.addr">{{loc.name}}<br />{{loc.addr}}</view>
-						<view v-else-if="isfloat0(tvalue.lat)" style="padding-top:0.3em;display:inline-block;">{{lang('selmap.select')}}</view>
+						<view v-else-if="tvalue.lat == 0" style="padding-top:0.3em;display:inline-block;">{{lang('selmap.select')}}</view>
 						<view v-else style="padding-top:0.3em;display:inline-block;">{{lang('selmap.loced')}}</view>
 					</view>
 				</slot>
@@ -64,6 +64,10 @@
 				type: Boolean,
 				default: false
 			},
+			bet: {
+				type: [String, Number],
+				default: 10000000
+			},
 			lat: {
 				type: [String, Number],
 				default: ''
@@ -110,6 +114,12 @@
 					ret.lng = this.tofloat(this.lng);
 				}
 				return ret;
+			},
+			innerbet() {
+				var bet = this.bet;
+				if (bet <= 1)
+					return 1;
+				return this.toint(bet);
 			}
 		},
 		mounted() {},
@@ -118,20 +128,23 @@
 				if (this.disabled)
 					return;
 				var result;
-				if (this.isfloat0(this.lat)) {
+				if (this.toint(this.lat) == 0) {
 					result = this.getstorage('_map');
 					if (!result || result.length != 2) {
-						result = [116.4, 39.8];
+						result = [1164000000, 398000000];
 					} else {
-						result[0] += 0.005 * Math.random();
-						result[1] += 0.005 * Math.random();
+						result[0] += 50000 * Math.random();
+						result[1] += 50000 * Math.random();
 					}
-				} else
-					result = gcoord.transform([this.lng, this.lat], gcoord.WGS84, gcoord.GCJ02);
+				} else {
+					result = gcoord.transform([this.lng / this.innerbet, this.lat / this.innerbet], gcoord.WGS84, gcoord.GCJ02);
+					result[0] = this.caldectoint(result[0]);
+					result[1] = this.caldectoint(result[1]);
+				}
 				try {
 					var retchoose = await uni.chooseLocation({
-						longitude: result[0],
-						latitude: result[1]
+						longitude: result[0] / this.innerbet,
+						latitude: result[1] / this.innerbet
 					});
 				} catch (res) {
 					if (res.errMsg.indexOf('cancel') > -1)
@@ -142,6 +155,8 @@
 				if (!retchoose.longitude)
 					return this.alert(this.lang('selmap.noselect'));
 				var result = gcoord.transform([retchoose.longitude, retchoose.latitude], gcoord.GCJ02, gcoord.WGS84);
+				result[0] = this.caldectoint(result[0]);
+				result[1] = this.caldectoint(result[1]);
 				this.setstorage('_map', result);
 				this.loc.name = retchoose.name;
 				this.loc.addr = retchoose.address;
@@ -175,6 +190,11 @@
 				// gcoord.EPSG4326	[lng,lat]	WGS-84坐标系别名，同WGS-84
 				// gcoord.EPSG3857	[x,y]	Web Mercator投影，同WebMercator，单位：米
 				// gcoord.EPSG900913	[x,y]	Web Mercator投影，同WebMercator，单位：米
+			},
+			caldectoint(dec) {
+				if (this.innerbet <= 1)
+					return dec;
+				return this.toint(dec * this.innerbet);
 			}
 		}
 	}
diff --git a/fapp/ciyon_ap/components/ciy-selpage/ciy-selpage.vue b/fapp/ciyon_ap/components/ciy-selpage/ciy-selpage.vue
index 5c1d49c..015b0c7 100644
--- a/fapp/ciyon_ap/components/ciy-selpage/ciy-selpage.vue
+++ b/fapp/ciyon_ap/components/ciy-selpage/ciy-selpage.vue
@@ -92,7 +92,9 @@
 			morevalue: {
 				handler(newD, oldD) {
 					this.v = this.modelValue || this.value;
-					this.innermore = {...newD};
+					this.innermore = {
+						...newD
+					};
 				},
 				immediate: true
 			},
@@ -100,7 +102,9 @@
 		computed: {
 			tvalue() {
 				var val = '';
-				var valmore = {...this.innermore};
+				var valmore = {
+					...this.innermore
+				};
 				if (this.v == 'modelValue') {
 					if (typeof(this.modelValue) == 'number')
 						val = this.modelValue;
@@ -143,8 +147,12 @@
 					url: this.page + '?sel=true&id=' + this.tvalue.id,
 					events: {
 						writedata: data => {
-							this.v = data;
-							this.innertext = data.name;
+							this.v = {
+								...data
+							};
+							this.innermore = {
+								...data
+							};
 							this.$emit('update:modelValue', data.id);
 							this.$emit('change', {
 								name: this.name,
diff --git a/fapp/ciyon_ap/components/ciy-showimgs/ciy-showimgs.vue b/fapp/ciyon_ap/components/ciy-showimgs/ciy-showimgs.vue
index fce3d4b..a239659 100644
--- a/fapp/ciyon_ap/components/ciy-showimgs/ciy-showimgs.vue
+++ b/fapp/ciyon_ap/components/ciy-showimgs/ciy-showimgs.vue
@@ -2,12 +2,12 @@
 	<view style="display:flex;">
 		<view v-if="picarr.length > 0 && label" style="width: 1em;margin-right: 0.5em;line-height: 1.2em;color: #999999;">{{label}}</view>
 		<view v-if="type == 'thumb'" style="flex:1;">
-			<video :id="'video' + index" v-for="(item,index) in videoarr" :key="index" :src="file_stor(item)" controls @click="fullvideo('video' + index)" :show-fullscreen-btn="false" :style="{width:width,height:height,margin:'0 0.5em 0 0'}"></video>
+			<video :id="'video' + index" v-for="(item,index) in videoarr" :key="index" :src="file_stor(item)" controls @tap="fullvideo('video' + index)" :show-fullscreen-btn="false" :style="{width:width,height:height,margin:'0 0.5em 0 0'}"></video>
 			<image lazy-load :lazy-load-margin="0" @tap.stop="preview(index)" :src="item" v-for="(item,index) in picarr" :key="index" :mode="mode" :style="{width:width,height:height,margin:'0 0.5em 0 0'}" style="border-radius:0.3em;" />
 			<view @tap.stop="openfile(index)" v-for="(item,index) in pdfarr" :key="index" :style="{width:width,height:height,lineHeight: height}" style="margin:0 0.5em 0 0;border-radius:0.3em;display:inline-block;vertical-align: top;border: 1px solid #cccccc;text-align: center;color:#000000;background: #ffffff;">{{lang('showimgs.att')}}{{index+1}}</view>
 		</view>
 		<view v-else style="flex:1;">
-			<video :id="'video' + index" v-for="(item,index) in videoarr" :key="index" :src="file_stor(item)" controls @click="fullvideo('video' + index)" :show-fullscreen-btn="false" :style="{width:width,margin:'0 0 -2px 0;'}"></video>
+			<video :id="'video' + index" v-for="(item,index) in videoarr" :key="index" :src="file_stor(item)" controls @tap="fullvideo('video' + index)" :show-fullscreen-btn="false" :style="{width:width,margin:'0 0 -2px 0;'}"></video>
 			<image lazy-load :lazy-load-margin="0" @tap.stop="preview(index)" :src="item" v-for="(item,index) in picarr" :key="index" :mode="mode" :style="{width:width}" style="margin:0 0 -2px 0;" />
 			<view @tap.stop="openfile(index)" v-for="(item,index) in pdfarr" :key="index" :style="{width:width,height:height,lineHeight: height,margin:index==0?'0':'0 0.5em 0 0'}" style="border-radius:0.3em;display:inline-block;vertical-align: top;border: 1px solid #cccccc;text-align: center;color:#000000;background: #ffffff;">{{lang('showimgs.att')}}{{index+1}}</view>
 		</view>
diff --git a/fapp/ciyon_ap/components/ciy-upload/ciy-upload.vue b/fapp/ciyon_ap/components/ciy-upload/ciy-upload.vue
index c81b35e..0d9c272 100644
--- a/fapp/ciyon_ap/components/ciy-upload/ciy-upload.vue
+++ b/fapp/ciyon_ap/components/ciy-upload/ciy-upload.vue
@@ -119,7 +119,7 @@
 			},
 			zipjpg: {
 				type: [String, Number],
-				default: 0.7
+				default: 70
 			},
 			waterfont: {
 				type: String,
@@ -564,7 +564,7 @@
 				opn.maxkb = this.toint(this.maxkb);
 				opn.imgwidth = this.toint(this.imgwidth);
 				opn.imgheight = this.toint(this.imgheight);
-				opn.zipjpg = this.tofloat(this.zipjpg);
+				opn.zipjpg = this.toint(this.zipjpg);
 				opn.watertext = this.watertext;
 				opn.watertype = this.watertype;
 				opn.waterpadding = this.toint(this.waterpadding);
diff --git a/fapp/ciyon_ap/pages/demo/case/comlife.vue b/fapp/ciyon_ap/pages/demo/case/comlife.vue
index 62c5a56..3cab4ab 100644
--- a/fapp/ciyon_ap/pages/demo/case/comlife.vue
+++ b/fapp/ciyon_ap/pages/demo/case/comlife.vue
@@ -2,7 +2,7 @@
 	<ciy-header title="组件生命周期事件"></ciy-header>
 	<ciy-test></ciy-test>
 	<view class="txt-lggg txt-center py4">
-	<view @tap="gourl" data-url="/pages/main/paper?id=1">跳转测试</view>
+	<view @tap="gourl" data-url="/pages/pub/paper?id=1">跳转测试</view>
 	</view>
 	<view class="ciy-card">
 		<view class="title">H5页面</view>
diff --git a/fapp/ciyon_ap/pages/demo/comform/selmap.vue b/fapp/ciyon_ap/pages/demo/comform/selmap.vue
index 9607e52..2774120 100644
--- a/fapp/ciyon_ap/pages/demo/comform/selmap.vue
+++ b/fapp/ciyon_ap/pages/demo/comform/selmap.vue
@@ -31,7 +31,7 @@
 				<view>
 					<ciy-selmap v-model:lat="lat" v-model:lng="lng" name="ciy4" @change="chglog('change', $event)">
 						<template v-slot:show="{data}">
-							{{data.value.lat}},{{data.value.lng}}
+							{{data.value.lat/data.bet}},{{data.value.lng/data.bet}}
 						</template>
 					</ciy-selmap>
 				</view>
diff --git a/fapp/ciyon_ap/pages/demo/comform/selpage.vue b/fapp/ciyon_ap/pages/demo/comform/selpage.vue
index a229b94..4b9daaf 100644
--- a/fapp/ciyon_ap/pages/demo/comform/selpage.vue
+++ b/fapp/ciyon_ap/pages/demo/comform/selpage.vue
@@ -14,13 +14,13 @@
 			<view class="ciy-form">
 				<label>v-model绑定</label>
 				<view>
-					<ciy-selpage name="ciy1" page="/pages/main/me_shipaddr" :morevalue="formmore" v-model="formvalue" @change="chglog('change', $event)"></ciy-selpage>
+					<ciy-selpage name="ciy1" page="/pages/me/user_shipaddr" :morevalue="formmore" v-model="formvalue" @change="chglog('change', $event)"></ciy-selpage>
 				</view>
 			</view>
 			<view class="ciy-form">
 				<label>value绑定</label>
 				<view>
-					<ciy-selpage left hasmore initevent page="/pages/main/me_shipaddr" :morevalue="formmore" :value="formvalue" name="ciy2" @change="chglog('change', $event)"></ciy-selpage>
+					<ciy-selpage left hasmore initevent page="/pages/me/user_shipaddr" :morevalue="formmore" :value="formvalue" name="ciy2" @change="chglog('change', $event)"></ciy-selpage>
 				</view>
 			</view>
 			<view class="ciy-form">
@@ -32,13 +32,13 @@
 			<view class="ciy-form">
 				<label>显示样式</label>
 				<view>
-					<ciy-selpage :ciystyle="{color:'#cc0000'}" page="/pages/main/me_shipaddr" :morevalue="formmore" :value="formvalue" name="ciy4" @change="chglog('change', $event)"></ciy-selpage>
+					<ciy-selpage :ciystyle="{color:'#cc0000'}" page="/pages/me/user_shipaddr" :morevalue="formmore" :value="formvalue" name="ciy4" @change="chglog('change', $event)"></ciy-selpage>
 				</view>
 			</view>
 			<view class="ciy-form">
 				<label>自定义</label>
 				<view>
-					<ciy-selpage page="/pages/main/me_shipaddr" :morevalue="formmore" :value="formvalue" name="ciy5" @change="chglog('change', $event)">
+					<ciy-selpage page="/pages/me/user_shipaddr" :morevalue="formmore" :value="formvalue" name="ciy5" @change="chglog('change', $event)">
 						<template v-slot:default="{data}">
 						{{data.name}}<br/>
 						{{data.addr}}<br/>
diff --git a/fapp/ciyon_ap/pages/demo/comform/upload.vue b/fapp/ciyon_ap/pages/demo/comform/upload.vue
index 43f9a85..588c868 100644
--- a/fapp/ciyon_ap/pages/demo/comform/upload.vue
+++ b/fapp/ciyon_ap/pages/demo/comform/upload.vue
@@ -48,31 +48,31 @@
 			<view class="ciy-form">
 				<label>图像压缩</label>
 				<view>
-					<ciy-upload name="ciy7" path="demo" zipjpg="0.6" @change="chglog('change', $event)"></ciy-upload>
+					<ciy-upload name="ciy7" path="demo" zipjpg="60" @change="chglog('change', $event)"></ciy-upload>
 				</view>
 			</view>
 			<view class="ciy-form">
 				<label>右下文字</label>
 				<view>
-					<ciy-upload name="ciy8" path="demo" zipjpg="0.6" watertext="水电费|第二行" waterfont="36px Arial" @change="chglog('change', $event)"></ciy-upload>
+					<ciy-upload name="ciy8" path="demo" zipjpg="60" watertext="水电费|第二行" waterfont="36px Arial" @change="chglog('change', $event)"></ciy-upload>
 				</view>
 			</view>
 			<view class="ciy-form">
 				<label>满屏水印</label>
 				<view>
-					<ciy-upload name="ciy9" path="demo" zipjpg="0.6" watertext="众产(杭州)科技有限公司" waterfont="36px Arial" watertype="full" waterpadding="10" waterangle="20" wateralpha="0.8" watercolors="#ff0000,#00ff00" @change="chglog('change', $event)"></ciy-upload>
+					<ciy-upload name="ciy9" path="demo" zipjpg="60" watertext="众产(杭州)科技有限公司" waterfont="36px Arial" watertype="full" waterpadding="10" waterangle="20" wateralpha="0.8" watercolors="#ff0000,#00ff00" @change="chglog('change', $event)"></ciy-upload>
 				</view>
 			</view>
 			<view class="ciy-form">
 				<label>上传到云</label>
 				<view>
-					<ciy-upload name="ciy10" path="demo" stor="A" zipjpg="0.6" imgwidth="1000" @change="chglog('change', $event)"></ciy-upload>
+					<ciy-upload name="ciy10" path="demo" stor="A" zipjpg="60" imgwidth="1000" @change="chglog('change', $event)"></ciy-upload>
 				</view>
 			</view>
 			<view class="ciy-form">
 				<label>SaaS上传</label>
 				<view>
-					<ciy-upload left name="ciy11" saas="s10224" path="demo" stor="/" zipjpg="0.6" imgwidth="1000" @change="chglog('change', $event)"></ciy-upload>
+					<ciy-upload left name="ciy11" saas="s10224" path="demo" stor="/" zipjpg="60" imgwidth="1000" @change="chglog('change', $event)"></ciy-upload>
 				</view>
 			</view>
 			<view class="ciy-form">
diff --git a/fapp/ciyon_ap/pages/demo/comview/auth.vue b/fapp/ciyon_ap/pages/demo/comview/auth.vue
index 91cec81..acd5d42 100644
--- a/fapp/ciyon_ap/pages/demo/comview/auth.vue
+++ b/fapp/ciyon_ap/pages/demo/comview/auth.vue
@@ -39,10 +39,15 @@
 					自动微信登录注册，未登录则打开界面
 				</view>
 				<view class="hr"></view>
-				<view class="fun">this.getauth(bmust)</view>
+				<view class="fun">this.getauth(type)</view>
 				<view class="tip">
 					调取登录状态<br />
-					bmust: true 强制打开登录界面(换号登录)
+					type: 空 静默登录(默认)
+					type: relogin 强制打开登录界面(换号登录)
+					type: info 需填写个人信息
+					type: real 需实名认证。前提info
+					type: bank 需填写银行。前提real
+					type: cciy 需有全球众识码。前提real
 				</view>
 				<button class="btn sm" @tap="demo">调用</button>
 				<button class="btn sm def" @tap="logout">登出</button>
diff --git a/fapp/ciyon_ap/pages/demo/curd/demo_edit.vue b/fapp/ciyon_ap/pages/demo/curd/demo_edit.vue
index 9759258..932ffd0 100644
--- a/fapp/ciyon_ap/pages/demo/curd/demo_edit.vue
+++ b/fapp/ciyon_ap/pages/demo/curd/demo_edit.vue
@@ -10,131 +10,130 @@
 	</view>
 	<view v-else>
 		<view class="ciy-form-group">
-			<input type="hidden" name="id" :value="pagedata.demo.id" style="display:none;" />
 			<view class="ciy-form">
 				<label class="imp">默认标题</label>
 				<view>
-					<ciy-input name="name" v-model="pagedata.demo.name"></ciy-input>
+					<ciy-input name="name" v-model="editdata.name"></ciy-input>
 				</view>
 			</view>
 			<view class="ciy-form">
 				<label>所属菜单</label>
 				<view>
-					<ciy-select :range="g.zc_menu" name="menuid" v-model="pagedata.demo.menuid"></ciy-select>
+					<ciy-select :range="g.zc_menu" name="menuid" v-model="editdata.menuid"></ciy-select>
 				</view>
 			</view>
 			<view class="ciy-form">
 				<label>文件大小</label>
 				<view>
-					<ciy-inputbet bet="1024" unit="KB" name="filesize" v-model="pagedata.demo.filesize"></ciy-inputbet>
+					<ciy-inputbet bet="1024" unit="KB" name="filesize" v-model="editdata.filesize"></ciy-inputbet>
 				</view>
 			</view>
 			<view class="ciy-form">
 				<label>长度</label>
 				<view>
-					<ciy-inputbet bet="1000" unit="米" :ciystyle="{width:'8em'}" name="metre" v-model="pagedata.demo.metre"></ciy-inputbet>
+					<ciy-inputbet bet="1000" unit="米" :ciystyle="{width:'8em'}" name="metre" v-model="editdata.metre"></ciy-inputbet>
 				</view>
 			</view>
 			<view class="ciy-form">
 				<label>贷款金额</label>
 				<view>
-					<ciy-inputbet bet="1000000" unit="万元" name="bankmoney" v-model="pagedata.demo.bankmoney"></ciy-inputbet>
+					<ciy-inputbet bet="1000000" unit="万元" name="bankmoney" v-model="editdata.bankmoney"></ciy-inputbet>
 				</view>
 			</view>
 			<view class="ciy-form">
 				<label>设置日期</label>
 				<view>
-					<ciy-inputdatetime name="setdate" v-model="pagedata.demo.setdate"></ciy-inputdatetime>
+					<ciy-inputdatetime name="setdate" v-model="editdata.setdate"></ciy-inputdatetime>
 				</view>
 			</view>
 			<view class="ciy-form">
 				<label>设置时间</label>
 				<view>
-					<ciy-inputdatetime btime name="settimes" v-model="pagedata.demo.settimes"></ciy-inputdatetime>
+					<ciy-inputdatetime btime name="settimes" v-model="editdata.settimes"></ciy-inputdatetime>
 				</view>
 			</view>
 			<view class="ciy-form">
 				<label>营业时间</label>
 				<view>
-					<ciy-inputtimepoint bsec name="dayclock" v-model="pagedata.demo.dayclock"></ciy-inputtimepoint>
+					<ciy-inputtimepoint bsec name="dayclock" v-model="editdata.dayclock"></ciy-inputtimepoint>
 				</view>
 			</view>
 			<view class="ciy-form">
 				<label>文档</label>
 				<view>
-					<ciy-upload num="5" filetype="all" imgwidth="1000" sourcetype="album,message" path="demo" name="downurl" v-model="pagedata.demo.downurl"></ciy-upload>
+					<ciy-upload num="5" filetype="all" imgwidth="1000" sourcetype="album,message" path="demo" name="downurl" v-model="editdata.downurl"></ciy-upload>
 				</view>
 			</view>
 			<view class="ciy-form">
 				<label>头像</label>
 				<view>
-					<ciy-upload imgwidth="600" imgheight="600" path="demo" name="avar" v-model="pagedata.demo.avar"></ciy-upload>
+					<ciy-upload imgwidth="600" imgheight="600" path="demo" name="avar" v-model="editdata.avar"></ciy-upload>
 				</view>
 			</view>
 			<view class="ciy-form">
 				<label>是否使用</label>
 				<view>
-					<ciy-selbool name="isuse" v-model="pagedata.demo.isuse"></ciy-selbool>
+					<ciy-selbool name="isuse" v-model="editdata.isuse"></ciy-selbool>
 				</view>
 			</view>
 			<view class="ciy-form">
 				<label>是否开启</label>
 				<view>
-					<ciy-selbool y="开启" n="关闭" name="isopen" v-model="pagedata.demo.isopen"></ciy-selbool>
+					<ciy-selbool y="开启" n="关闭" name="isopen" v-model="editdata.isopen"></ciy-selbool>
 				</view>
 			</view>
 			<view class="ciy-form">
 				<label>库存单位</label>
 				<view>
-					<ciy-inputunitedit name="unit" v-model="pagedata.demo.unit"></ciy-inputunitedit>
+					<ciy-inputunitedit name="unit" v-model="editdata.unit"></ciy-inputunitedit>
 				</view>
 			</view>
 			<view class="ciy-form">
 				<label>单选状态</label>
 				<view>
-					<ciy-radio left :range="g.auditstatus" name="sigstatus" v-model="pagedata.demo.sigstatus"></ciy-radio>
+					<ciy-radio left :range="g.auditstatus" name="sigstatus" v-model="editdata.sigstatus"></ciy-radio>
 				</view>
 			</view>
 			<view class="ciy-form">
 				<label>多选状态</label>
 				<view>
-					<ciy-checkbox itemright line :range="g.auditstatus" name="mauditstatus" v-model="pagedata.demo.mauditstatus"></ciy-checkbox>
+					<ciy-checkbox itemright line :range="g.auditstatus" name="mauditstatus" v-model="editdata.mauditstatus"></ciy-checkbox>
 				</view>
 			</view>
 			<view class="ciy-form">
 				<label>组织结构</label>
 				<view>
-					<ciy-selcas :range="g.zc_depart" name="prodcata" v-model="pagedata.demo.prodcata"></ciy-selcas>
+					<ciy-selcas :range="g.zc_depart" name="prodcata" v-model="editdata.prodcata"></ciy-selcas>
 				</view>
 			</view>
 			<view class="ciy-form">
 				<label>所在地区</label>
 				<view>
-					<ciy-selcas :range="g.ciy_arearpc" name="areacode" v-model="pagedata.demo.areacode"></ciy-selcas>
+					<ciy-selcas :range="g.ciy_arearpc" name="areacode" v-model="editdata.areacode"></ciy-selcas>
 				</view>
 			</view>
 			<view class="ciy-form">
 				<label>认证情况</label>
 				<view>
-					<ciy-checkbox bin left line :range="g.renzheng" name="renzheng" v-model="pagedata.demo.renzheng"></ciy-checkbox>
+					<ciy-checkbox bin left line :range="g.renzheng" name="renzheng" v-model="editdata.renzheng"></ciy-checkbox>
 				</view>
 			</view>
 			<view class="ciy-form">
 				<label>临时字典</label>
 				<view>
-					<ciy-select :range="g.ppint" name="ppint" v-model="pagedata.demo.ppint"></ciy-select>
+					<ciy-select :range="g.ppint" name="ppint" v-model="editdata.ppint"></ciy-select>
 				</view>
 			</view>
 			<view class="ciy-form">
 				<label>执行周期</label>
 				<view>
-					<ciy-inputcyc name="npcyc" v-model="pagedata.demo.npcyc"></ciy-inputcyc>
+					<ciy-inputcyc name="npcyc" v-model="editdata.npcyc"></ciy-inputcyc>
 				</view>
 			</view>
 			<view class="ciy-form">
 				<label>执行用时</label>
 				<view>
-					<ciy-input name="runsec" v-model="pagedata.demo.runsec"></ciy-input>
+					<ciy-input name="runsec" v-model="editdata.runsec"></ciy-input>
 				</view>
 				<view style="flex:none;">秒</view>
 			</view>
@@ -142,80 +141,74 @@
 				<label>活动期数</label>
 				<view class="flex flex-center" style="justify-content: flex-end;">
 					第
-					<ciy-input :ciystyle="{width:'3em',margin:'0 0.5em',textAlign:'center',display:'inline-block'}" name="acttm" v-model="pagedata.demo.acttm"></ciy-input>
+					<ciy-input :ciystyle="{width:'3em',margin:'0 0.5em',textAlign:'center',display:'inline-block'}" name="acttm" v-model="editdata.acttm"></ciy-input>
 					期
 				</view>
 			</view>
 			<view class="ciy-form">
 				<label>活动花絮</label>
 				<view>
-					<ciy-upload num="9" imgwidth="1920" zipjpg="0.8" path="demo" name="imgs" v-model="pagedata.demo.imgs"></ciy-upload>
+					<ciy-upload num="9" imgwidth="1920" zipjpg="80" path="demo" name="imgs" v-model="editdata.imgs"></ciy-upload>
 				</view>
 			</view>
 			<view class="ciy-form">
 				<label>吨位</label>
 				<view>
-					<ciy-inputbet bb bet="1000000" unit="吨" :ciystyle="{width:'8em'}" name="ton" v-model="pagedata.demo.ton"></ciy-inputbet>
+					<ciy-inputbet bb bet="1000000" unit="吨" :ciystyle="{width:'8em'}" name="ton" v-model="editdata.ton"></ciy-inputbet>
 				</view>
 			</view>
 			<view class="ciy-form">
 				<label>单价</label>
 				<view>
-					<ciy-inputbet bet="100" unit="元" name="price" v-model="pagedata.demo.price"></ciy-inputbet>
+					<ciy-inputbet bet="100" unit="元" name="price" v-model="editdata.price"></ciy-inputbet>
 				</view>
 			</view>
 			<view class="ciy-form">
 				<label>位置</label>
 				<view>
-					<ciy-selmap name="loc" v-model:lng="pagedata.demo.lng" v-model:lat="pagedata.demo.lat"></ciy-selmap>
-				</view>
-			</view>
-			<view class="ciy-form">
-				<label>监管数量</label>
-				<view>
-					<ciy-input name="nums" v-model="pagedata.demo.nums"></ciy-input>
+					<ciy-selmap name="loc" v-model:lng="editdata.lng" v-model:lat="editdata.lat"></ciy-selmap>
 				</view>
 			</view>
 			<view class="ciy-form">
 				<label>百分比</label>
 				<view>
-					<ciy-inputbet bet="100" unit="%" name="pct" v-model="pagedata.demo.pct"></ciy-inputbet>
+					<ciy-inputbet bet="100" unit="%" name="pct" v-model="editdata.pct"></ciy-inputbet>
 				</view>
 			</view>
 			<view class="ciy-form">
 				<label>链接</label>
 				<view>
-					<ciy-input name="url" v-model="pagedata.demo.url"></ciy-input>
+					<ciy-input name="url" v-model="editdata.url"></ciy-input>
 				</view>
 			</view>
 			<view class="ciy-form">
 				<label>体重</label>
 				<view>
-					<ciy-inputbet bet="1000" unit="公斤" name="weightg" v-model="pagedata.demo.weightg"></ciy-inputbet>
+					<ciy-inputbet bet="1000" unit="公斤" name="weightg" v-model="editdata.weightg"></ciy-inputbet>
 				</view>
 			</view>
 			<view class="ciy-form">
 				<label>耳温</label>
 				<view>
-					<ciy-inputbet bet="1000" unit="℃" name="eartmpr" v-model="pagedata.demo.eartmpr"></ciy-inputbet>
+					<ciy-inputbet bet="1000" unit="℃" name="eartmpr" v-model="editdata.eartmpr"></ciy-inputbet>
 				</view>
 			</view>
 			<view class="ciy-form">
 				<label>身份证号</label>
 				<view>
-					<ciy-input name="idcard" v-model="pagedata.demo.idcard"></ciy-input>
+					<ciy-input name="idcard" v-model="editdata.idcard"></ciy-input>
 				</view>
 			</view>
 			<view class="ciy-form">
 				<label>介绍</label>
 				<view>
-					<ciy-textarea name="content" v-model="pagedata.demo.content"></ciy-textarea>
+					<ciy-textarea name="content" v-model="editdata.content"></ciy-textarea>
 				</view>
 			</view>
 			<!-- <view class="ciy-form v">
 				<label>富文本</label>
 				<view>
-					<ciy-mdedit name="md" v-model="pagedata.demo.md"></ciy-mdedit>
+					<ciy-mdedit name="md" v-model="editdata.md"></ciy-mdedit>
 				</view>
 			</view> -->
 		</view>
@@ -238,6 +231,7 @@
 		onLoad() {
 			if (!this.pagedata.demo)
 				return this.alert('不能直接访问，请重新进入'); //独立进入写后端函数获取数据
+			this.editdata = {...this.pagedata.demo};
 			this.getdata();
 		},
 		watch: {},
@@ -251,7 +245,7 @@
 				if (this._loading)
 					return;
 				this._loading = true;
-				var retjson = await this.callajax({
+				var retjson = await this.callfunc({
 					func: 'demo/demo.getdata',
 					data: {
 						...this.opn,
@@ -272,10 +266,10 @@
 				if (this._loading)
 					return;
 				this._loading = true;
-				var retjson = await this.callajax({
+				var retjson = await this.callfunc({
 					func: 'demo/demo.update',
 					data: {
-						...this.pagedata.demo
+						...this.editdata
 					}
 				});
 				this._loading = false;
diff --git a/fapp/ciyon_ap/pages/demo/curd/demo_list.vue b/fapp/ciyon_ap/pages/demo/curd/demo_list.vue
index 62e2e8d..f9c9030 100644
--- a/fapp/ciyon_ap/pages/demo/curd/demo_list.vue
+++ b/fapp/ciyon_ap/pages/demo/curd/demo_list.vue
@@ -10,8 +10,8 @@
 	</view>
 	<view v-else>
 		<view class="sti" :style="{top:(header_statusbar_height+header_title_height)+'px'}">
-			<ciy-segment :lis="init.once.lis" all="全部" v-model="liid" @change="segment_change"></ciy-segment>
-			<ciy-query ref="query" :gdict="g" :qry="init.once.input" @confirm="query_confirm">
+			<ciy-segment :lis="init.lis" all="全部" @change="segment_change"></ciy-segment>
+			<ciy-query ref="query" :gdict="g" :qry="init.searchinput" @confirm="query_confirm">
 				<template v-slot="{itm}">
 					<ciy-input :name="itm.item.form" v-model="itm.data[itm.item.form]"></ciy-input>
 				</template>
@@ -137,10 +137,6 @@
 				<view><text style="text-decoration: underline;" @tap.stop="goloc(item.lat, item.lng)">查看位置</text>
 				</view>
 			</view>
-			<view class="l2">
-				<label>监管数量</label>
-				<view>{{tofix(item.nums)}}</view>
-			</view>
 			<view class="l2">
 				<label>百分比</label>
 				<view>{{tofix(item.pct/100, 2)}}%</view>
@@ -177,10 +173,7 @@
 <script>
 	export default {
 		data() {
-			return {
-				liid: 0,
-				pageno: 0,
-			}
+			return {}
 		},
 		onLoad() {
 			this.load_ciydict(this.file_stor('/dict/ciy_arearpc.js')).then(json => {
@@ -206,18 +199,14 @@
 		computed: {},
 		methods: {
 			async getlist() {
-				//await this.getauth();
-				if(this.me.id == 0)
-					return uni.navigateBack();
 				if (this.pageno < 0)
 					return;
-				this.pagepost.pageno = this.pageno + 1;
-				this.pagepost.query.liid = this.liid;
-				this.pagepost.once = !this.init.once;
 				if (this._loading)
 					return;
+				this.pagepost.pageno = this.pageno + 1;
+				this.pagepost.once = !this.init.once;
 				this._loading = true;
-				var retjson = await this.callajax({
+				var retjson = await this.callfunc({
 					func: 'demo/demo.list',
 					data: this.pagepost
 				});
@@ -229,9 +218,9 @@
 					this.init.list = [];
 				this.init = this.objdeepmerge(this.init, retjson);
 				if (retjson.once) {
-					this.init.once.lis = [...this.g.auditstatus];
-					this.g.zc_depart = retjson.once.zc_depart;
-					this.g.ppint = retjson.once.ppint;
+					this.init.lis = [...this.g.auditstatus];
+					this.g.zc_depart = retjson.zc_depart;
+					this.g.ppint = retjson.ppint;
 				}
 				this.getrefs('query').then(ref => {
 					ref.setdata(retjson.where);
@@ -239,7 +228,8 @@
 				if (retjson.list.length < retjson.pagecount)
 					this.pageno = -1;
 			},
-			segment_change() {
+			segment_change(e) {
+				this.pagepost.liid = e.value.id;
 				this.pageno = 0;
 				this.getlist();
 				uni.pageScrollTo({
@@ -269,7 +259,7 @@
 			async del(item) {
 				if (await this.askmsg('是否删除？', '删除') != 'ok')
 					return;
-				var retjson = await this.callajax({
+				var retjson = await this.callfunc({
 					func: 'demo/demo.del',
 					data: {
 						id: item.data.id
@@ -300,7 +290,7 @@
 				}]);
 				if (msg.btn == 'cancel')
 					return;
-				var retjson = await this.callajax({
+				var retjson = await this.callfunc({
 					func: 'demo/demo.audit',
 					data: {
 						id: item.data.id,
diff --git a/fapp/ciyon_ap/pages/demo/curd/me.vue b/fapp/ciyon_ap/pages/demo/curd/me.vue
index af89f06..2c264f0 100644
--- a/fapp/ciyon_ap/pages/demo/curd/me.vue
+++ b/fapp/ciyon_ap/pages/demo/curd/me.vue
@@ -9,7 +9,7 @@
 
 	<view class="maincard" style="margin-top: -2.5em;">
 		<view class="flex flex-center">
-			<view class="nick" @tap="gourl" data-url="$/pages/main/me_info">{{me.name?me.name:'登录/注册'}}</view>
+			<view class="nick" @tap="gourl" data-url="$/pages/me/user_info">{{me.name?me.name:'登录/注册'}}</view>
 			<view class="icon zy" style="margin-left:1em;" v-if="showbalance" @tap="getbalance(2)"></view>
 			<view class="icon by" style="margin-left:1em;" v-else @tap="getbalance(1)"></view>
 		</view>
@@ -168,11 +168,15 @@
 	export default {
 		data() {
 			return {
+				version: '',
 				showbalance: false,
 				ciysvg: '<svg viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="M987.136 384.512C919.552 131.584 668.16-22.528 415.232 27.136c219.648-41.984 434.176 79.36 488.96 283.136 57.344 214.016-82.944 437.76-313.344 499.2-49.664 13.312-78.848 64-65.536 113.152 13.312 49.664 64 78.848 113.152 65.536 263.168-70.144 418.816-340.48 348.672-603.648zM116.224 713.216C58.88 499.2 199.68 275.456 430.08 214.016c49.664-13.312 78.848-64 65.536-113.152C482.816 51.2 432.128 21.504 382.464 34.816c-263.68 70.656-419.84 340.992-349.184 604.16 67.584 252.928 319.488 407.04 571.392 356.864-219.648 42.496-433.664-78.848-488.448-282.624z m93.184-203.776L291.84 449.536c44.544-32.256 90.112-32.256 133.12-0.512l83.456 60.928-149.504-230.4-149.504 229.888z m516.096-60.416L808.96 509.952l-149.504-229.888-149.504 229.376 82.432-59.904c44.544-32.256 90.112-32.256 133.12-0.512z m-366.08 291.84L441.856 680.96c44.544-32.256 90.112-32.256 133.12-0.512l83.456 60.928-149.504-230.4-149.504 229.888z" fill="#56a4ef"></path></svg>',
 			}
 		},
-		onLoad() {},
+		onLoad() {
+			var app = getApp();
+			this.version = app.globalData._version;
+		},
 		onShow() {
 			this.getinit();
 		},
@@ -184,7 +188,7 @@
 					return;
 				}
 				this._loading = true;
-				var retjson = await this.callajax({
+				var retjson = await this.callfunc({
 					func: 'me.balance_get',
 					data: {}
 				});
@@ -202,7 +206,7 @@
 				});
 			},
 			relogin() {
-				this.getauth(true);
+				this.getauth('relogin');
 			},
 			logout() {
 				this.removestorage('me');
diff --git a/fapp/ciyon_ap/pages/demo/page/func.vue b/fapp/ciyon_ap/pages/demo/page/func.vue
index af65d7f..860d9d8 100644
--- a/fapp/ciyon_ap/pages/demo/page/func.vue
+++ b/fapp/ciyon_ap/pages/demo/page/func.vue
@@ -159,7 +159,7 @@
 						未登录返回{me:0}。<br />
 					</view>
 					<view class="hr"></view>
-					<view class="fun">async callajax({srv, func, cache, cachekey, loadhide, loadtxt, data})</view>
+					<view class="fun">async callfunc({srv, func, cache, cachekey, loadhide, loadtxt, data})</view>
 					<view class="tip">
 						服务端Ajax API请求，header带上token。<br />
 						自动保存新token，无感续期。<br />
@@ -288,6 +288,7 @@
 					<view class="fun">isfloat0(num)</view>
 					<view class="tip">
 						判断是否为0，防止浮点数问题。<br />
+						尽量不要使用浮点数。<br />
 					</view>
 					<view class="hr"></view>
 					<view class="fun">isarray(val)</view>
diff --git a/fapp/ciyon_ap/pages/demo/page/sysinfo.vue b/fapp/ciyon_ap/pages/demo/page/sysinfo.vue
index 5020898..097b3c8 100644
--- a/fapp/ciyon_ap/pages/demo/page/sysinfo.vue
+++ b/fapp/ciyon_ap/pages/demo/page/sysinfo.vue
@@ -32,7 +32,7 @@
 		</view>
 		<view class="ciy-card">
 			<view class="title">系统参数</view>
-			<view class="right">this.sysinfo</view>
+			<view class="right">app.globalData._sysinfo</view>
 			<view class="content">
 				<view v-for="(item,index) in _sysinfo" :key="index">
 					<view v-if="index == 'safeArea' || index == 'safeAreaInsets'">
@@ -68,7 +68,7 @@
 				this.glbdata[i] = app.json_string(app.globalData[i]);
 			}
 			this._sysinfo = {};
-			for (var i in this.sysinfo) {
+			for (var i in app.globalData._sysinfo) {
 				this._sysinfo[i] = app.json_string(this.sysinfo[i]);
 			}
 			
diff --git a/fapp/ciyon_ap/pages/demo/test.vue b/fapp/ciyon_ap/pages/demo/test.vue
index 45e3425..67dadef 100644
--- a/fapp/ciyon_ap/pages/demo/test.vue
+++ b/fapp/ciyon_ap/pages/demo/test.vue
@@ -51,7 +51,7 @@
 		},
 		methods: {
 			async chktest(dt) {
-				var retjson = await this.callajax({
+				var retjson = await this.callfunc({
 					func: 'app.test',
 					data: {}
 				});
diff --git a/fapp/ciyon_ap/pages/main/index.vue b/fapp/ciyon_ap/pages/main/index.vue
index 0252946..4ae1c76 100644
--- a/fapp/ciyon_ap/pages/main/index.vue
+++ b/fapp/ciyon_ap/pages/main/index.vue
@@ -120,7 +120,7 @@
 		methods: {
 			async getinit() {
 				var retjson = await this.callajax({
-					func: 'index.init'
+					func: 'main.index_init'
 				});
 				if (retjson.code != 1)
 					return this.alert(retjson.errmsg);
diff --git a/fapp/ciyon_ap/pages/main/me_cash.vue b/fapp/ciyon_ap/pages/main/me_cash.vue
deleted file mode 100644
index 6879087..0000000
--- a/fapp/ciyon_ap/pages/main/me_cash.vue
+++ /dev/null
@@ -1,137 +0,0 @@
-<template>
-	<ciy-header title="提现"></ciy-header>
-	<view v-if="init.code != 1">
-		<view class="px4 py4">
-			<view style="height:2em;width:60%;" class="ciy-skeleton"></view>
-			<view style="height:1em;width:40%;margin-left:1em;" class="ciy-skeleton"></view>
-			<view style="height:1em;width:50%;" class="ciy-skeleton"></view>
-			<view style="height:6em;width:100%;" class="ciy-skeleton"></view>
-		</view>
-	</view>
-	<view v-else>
-		<form @submit="submit" class="char3">
-			<view class="ciy-card">
-				<view class="content">
-					<view class="ciy-form">
-						<label>余额</label>
-						<view style="text-align: left;">
-							{{init.user.mycashmoney/100}}元
-						</view>
-					</view>
-					<view class="ciy-form">
-						<label>可提现</label>
-						<view style="text-align: left;">
-							{{init.user.cash}}元
-						</view>
-					</view>
-					<view class="ciy-form">
-						<label>提现流向</label>
-						<view style="text-align: left;">
-							<ciy-selbool name="cashtype" v-model="me.cashtype" y="银行" n="微信"></ciy-selbool>
-						</view>
-					</view>
-					<view class="ciy-form-bottom">
-						<button class="btn lg cc" form-type="submit">申请提现</button>
-					</view>
-					<view class="ciy-tip">
-						每天可提交1次，以元为单位申请。
-					</view>
-					<view class="ciy-tip">
-						由于微信支付限制，申请提现平台审核通过后，还需手动点击收款操作。
-					</view>
-				</view>
-			</view>
-		</form>
-	</view>
-	<view class="ciy-list" v-for="(item,index) in init.cash" :key="item.id">
-		<view class="l2">
-			<text class="kbd" :class="ccode(g.cashstatus, item.cashstatus,'clas')">{{ccode(g.cashstatus, item.cashstatus)}}</text>
-		</view>
-		<view class="lb">{{todatetime(item.addtimes)}}</view>
-		<view class="rb">
-			<text class="txt-lgg txt-wb px2">{{item.cashmoney/10000}}</text>
-			<text class="txt-smm">元</text>
-		</view>
-		<view class="txt-right" v-if="item.cashtype==2">
-			<button class="btn" @tap="wxrecvpay(index)">立即收款</button>
-		</view>
-		<view class="txt-right" v-if="item.cashtype==1">
-			<button class="btn">上传发票</button>
-		</view>
-	</view>
-	<ciy-swipelist title="设置提现账户" @tap="gourl" data-url="$/pages/main/me_cash_bank" more></ciy-swipelist>
-	<ciy-swipelist title="提现历史记录" @tap="gourl" data-url="$/pages/main/me_cash_out" more></ciy-swipelist>
-</template>
-
-<style>
-</style>
-
-<script>
-	export default {
-		data() {
-			return {}
-		},
-		onLoad() {
-			this.getinit();
-		},
-		methods: {
-			async getinit() {
-				var retjson = await this.callajax({
-					func: 'me.cash_get',
-					data: {}
-				});
-				if (retjson.code != 1)
-					return this.alert(retjson.errmsg);
-				this.init = retjson;
-				this.init.user.cash = Math.floor(this.init.user.mycashmoney / 100);
-				if (this.init.user.cash < 0)
-					this.init.user.cash = 0;
-			},
-			async submit(e) {
-				if (this.init.user.cash <= 0)
-					return this.toast('不可提现');
-				if (this._loading)
-					return;
-				this._loading = true;
-				var retjson = await this.callajax({
-					func: 'me.cash',
-					data: {
-						cash: this.init.user.cash
-					}
-				});
-				this._loading = false;
-				if (retjson.code != 1)
-					return this.alert(retjson.errmsg);
-				this.init.user.mycashmoney -= this.init.user.cash * 100;
-				this.init.user.cash = 0;
-				this.toast('申请成功');
-			},
-			async wxrecvpay(idx) {
-				if (this._loading)
-					return;
-				this._loading = true;
-				var retjson = await this.callajax({
-					func: 'me.wxrecvpay',
-					data: {
-						id: this.init.cash[idx].id
-					}
-				});
-				this._loading = false;
-				if (retjson.code != 1)
-					return this.alert(retjson.errmsg);
-				this.init.cash.splice(idx, 1);
-				wx.requestMerchant({
-					mchId: retjson.transfer.mchid,
-					appId: retjson.transfer.appid,
-					package: retjson.transfer.package_info,
-					success: (res) => {
-						console.log('success Transfer:', res);
-					},
-					fail: (res) => {
-						console.log('fail Transfer:', res);
-					},
-				});
-			}
-		}
-	}
-</script>
\ No newline at end of file
diff --git a/fapp/ciyon_ap/pages/main/me_cash_bank.vue b/fapp/ciyon_ap/pages/main/me_cash_bank.vue
deleted file mode 100644
index 1bac5c5..0000000
--- a/fapp/ciyon_ap/pages/main/me_cash_bank.vue
+++ /dev/null
@@ -1,90 +0,0 @@
-<template>
-	<ciy-header title="设置提现账号"></ciy-header>
-	<form @submit="submit" class="char3">
-		<view class="ciy-card">
-			<view class="content char4">
-				<view class="ciy-form">
-					<label class="imp">提现方案</label>
-					<view style="text-align: left;">
-						<ciy-selbool name="cashtype" v-model="me.cashtype" y="独立纳税" n="个人微信"></ciy-selbool>
-					</view>
-				</view>
-				<view class="ciy-form" v-if="me.cashtype == 1">
-					<label class="imp">银行卡号</label>
-					<view>
-						<ciy-input name="bankno" v-model="me.bankno" type="text" bb></ciy-input>
-					</view>
-				</view>
-				<view class="ciy-form" v-if="me.cashtype == 1">
-					<label class="imp">开户银行</label>
-					<view>
-						<ciy-input name="bankname" v-model="me.bankname" type="text" bb></ciy-input>
-					</view>
-				</view>
-				<view class="ciy-form" v-if="me.cashtype == 1">
-					<label class="imp">账户名称</label>
-					<view>
-						<ciy-input name="bankaccount" v-model="me.bankaccount" type="text" bb></ciy-input>
-					</view>
-				</view>
-				<view class="ciy-form-bottom">
-					<button class="btn lg cc" form-type="submit">设置</button>
-				</view>
-			</view>
-		</view>
-	</form>
-	<view class="ciy-tip">
-		个人微信提现<br />
-		　每次最低提现金额为1元。<br />
-		　统一代扣缴20%个税，每月汇总申报个税。<br />
-		　以实名认证姓名、身份证号及手机号为准。<br />
-		<br />
-		独立纳税提现<br />
-		　每次最低提现金额为1000元。<br />
-		　申请提现后，平台收到电子发票后打款。<br />
-		　注意: 电子发票抬头与账户名称一致。<br />
-	</view>
-</template>
-
-<style>
-</style>
-
-<script>
-	export default {
-		data() {
-			return {
-			}
-		},
-		onLoad() {},
-		methods: {
-			async submit(e) {
-				if (e.detail.value.cashtype == 1) {
-					e.detail.value.bankno = e.detail.value.bankno.trim();
-					if (e.detail.value.bankno.length < 6)
-						return this.toast('请输入银行卡号');
-					if (e.detail.value.bankname.length == 0)
-						return this.toast('请输入开户行');
-					if (e.detail.value.bankaccount.length == 0)
-						return this.toast('请输入账户名称');
-				}
-				if (this._loading)
-					return;
-				this._loading = true;
-				var retjson = await this.callajax({
-					func: 'me.userbank_change',
-					data: e.detail.value
-				});
-				this._loading = false;
-				if (retjson.code != 1)
-					return this.alert(retjson.errmsg);
-				this.me.cashtype = e.detail.value.cashtype;
-				this.me.bankno = e.detail.value.bankno;
-				this.me.bankname = e.detail.value.bankname;
-				this.me.bankaccount = e.detail.value.bankaccount;
-				this.setstorage('me', this.me);
-				await this.toast('修改成功');
-				uni.navigateBack();
-			}
-		}
-	}
-</script>
\ No newline at end of file
diff --git a/fapp/ciyon_ap/pages/main/me_info.vue b/fapp/ciyon_ap/pages/main/me_info.vue
deleted file mode 100644
index b3308b0..0000000
--- a/fapp/ciyon_ap/pages/main/me_info.vue
+++ /dev/null
@@ -1,106 +0,0 @@
-<template>
-	<ciy-header title="本人信息"></ciy-header>
-	<form @submit="submit" class="char3">
-		<view class="ciy-card">
-			<view class="content char4">
-				<view class="ciy-form">
-					<label class="imp">姓名称呼</label>
-					<view>
-						<ciy-input name="name" v-model="me.name" type="nickname" bb></ciy-input>
-					</view>
-				</view>
-				<view class="ciy-form">
-					<label>头像</label>
-					<view>
-						<ciy-upload left v-model="me.icon" path="icon" name="icon" imgwidth="400" imgheight="400" camheight="100" sourcetype="rehcam,album,message"></ciy-upload>
-					</view>
-					<!-- #ifdef MP-WEIXIN -->
-					<view>
-						<button class="btn sm" open-type="chooseAvatar" @chooseavatar="wxavar">从微信获取</button>
-					</view>
-					<!-- #endif -->
-				</view>
-				<view class="ciy-form">
-					<label class="imp">手机号</label>
-					<view>
-						<ciy-input name="mobile" v-model="me.mobile" type="text" bb></ciy-input>
-					</view>
-				</view>
-				<view class="ciy-form">
-					<label>微信</label>
-					<view>
-						<ciy-input name="wxno" v-model="me.wxno" type="text" bb></ciy-input>
-					</view>
-				</view>
-				<view class="ciy-form">
-					<label>电子信箱</label>
-					<view>
-						<ciy-input name="email" v-model="me.email" type="text" bb></ciy-input>
-					</view>
-				</view>
-				<view class="ciy-form-bottom">
-					<button class="btn lg cc" form-type="submit">更新个人信息</button>
-				</view>
-			</view>
-		</view>
-	</form>
-</template>
-
-<style>
-</style>
-
-<script>
-	export default {
-		data() {
-			return {}
-		},
-		onLoad() {
-			setTimeout(() => {
-				if (this.me.neednick)
-					this.me.name = '';
-			}, 100);
-		},
-		methods: {
-			async wxavar(e) {
-				var app = getApp();
-				var opn = {};
-				opn.post = {
-					from: 'avar'
-				};
-				opn.path = 'icon';
-				opn.stor = app.globalData.storselect;
-				opn.maxkb = 0;
-				opn.imgwidth = 400;
-				opn.imgheight = 400;
-				opn.zipjpg = 0.7;
-				this.me.icon = await this.file_upload1(e.detail.avatarUrl, opn);
-			},
-			async submit(e) {
-				if (!e.detail.value.name)
-					return this.toast('请输入姓名称呼');
-				if (!e.detail.value.mobile)
-					return this.toast('请输入手机号');
-				if (e.detail.value.name[0] == ':')
-					return this.toast('姓名称呼不能以:开头');
-
-				this._loading = true;
-				var retjson = await this.callajax({
-					func: 'me.userinfo_change',
-					data: e.detail.value
-				});
-				this._loading = false;
-				if (retjson.code != 1)
-					return this.alert(retjson.errmsg);
-				this.me.name = e.detail.value.name;
-				this.me.neednick = false;
-				this.me.icon = e.detail.value.icon;
-				this.me.mobile = e.detail.value.mobile;
-				this.me.wxno = e.detail.value.wxno;
-				this.me.email = e.detail.value.email;
-				this.setstorage('me', this.me);
-				await this.toast('修改成功');
-				uni.navigateBack();
-			}
-		}
-	}
-</script>
\ No newline at end of file
diff --git a/fapp/ciyon_ap/pages/main/me_invoice.vue b/fapp/ciyon_ap/pages/main/me_invoice.vue
deleted file mode 100644
index 9b12c7a..0000000
--- a/fapp/ciyon_ap/pages/main/me_invoice.vue
+++ /dev/null
@@ -1,94 +0,0 @@
-<template>
-	<ciy-header title="我要开票"></ciy-header>
-	<view v-if="init.code != 1">
-		<view class="px4 py4">
-			<view style="height:2em;width:60%;" class="ciy-skeleton"></view>
-			<view style="height:1em;width:40%;margin-left:1em;" class="ciy-skeleton"></view>
-			<view style="height:1em;width:50%;" class="ciy-skeleton"></view>
-			<view style="height:6em;width:100%;" class="ciy-skeleton"></view>
-		</view>
-	</view>
-	<view v-else>
-		<form @submit="submit" class="char3">
-			<view class="ciy-card">
-				<view class="content">
-					<view class="ciy-form">
-						<label>可开票金额</label>
-						<view style="text-align: left;">
-							{{toint(init.user.myinvmoney/100)}}元
-						</view>
-					</view>
-					<view class="ciy-form">
-						<label>开票金额</label>
-						<view>
-							<ciy-inputbet name="money" :value="toint(init.user.myinvmoney/100)*100" bb unit="元" bet="100"></ciy-inputbet>
-						</view>
-					</view>
-					<view class="ciy-form">
-						<label>发票抬头</label>
-						<view>
-							<ciy-selpage name="invtit" page="me_invoicetitle">
-								<template v-slot:default="{data}">
-									<view>{{data.name}}</view>
-									<view class="txt1">{{data.taxnumber}}</view>
-								</template>
-							</ciy-selpage>
-						</view>
-					</view>
-					<view class="ciy-form-bottom">
-						<button class="btn lg cc" form-type="submit">申请开票</button>
-					</view>
-					<view class="ciy-tip">
-						开具增值税普通电子发票。<br />
-						开票科目: 技术服务费。<br />
-						联系客服签订技术服务合同。
-					</view>
-				</view>
-			</view>
-		</form>
-	</view>
-	<ciy-swipelist title="开票历史" @tap="gourl" data-url="$/pages/main/me_invoice_history" more></ciy-swipelist>
-</template>
-
-<style>
-</style>
-
-<script>
-	export default {
-		data() {
-			return {}
-		},
-		onLoad() {
-			this.getinit();
-		},
-		methods: {
-			async getinit() {
-				var retjson = await this.callajax({
-					func: 'me.balance_get',
-					data: {}
-				});
-				if (retjson.code != 1)
-					return this.alert(retjson.errmsg);
-				this.init = retjson;
-			},
-			async submit(e) {
-				if (e.detail.value.money < 100)
-					return;
-				if (this.init.user.myinvmoney < e.detail.value.money)
-					return this.toast('开票金额不足');
-				if (this._loading)
-					return;
-				this._loading = true;
-				var retjson = await this.callajax({
-					func: 'me.invoicing',
-					data: e.detail.value
-				});
-				this._loading = false;
-				if (retjson.code != 1)
-					return this.alert(retjson.errmsg);
-				this.init.user.myinvmoney -= retjson.money;
-				this.toast('申请成功');
-			}
-		}
-	}
-</script>
\ No newline at end of file
diff --git a/fapp/ciyon_ap/pages/main/me_passchange.vue b/fapp/ciyon_ap/pages/main/me_passchange.vue
deleted file mode 100644
index 8a10361..0000000
--- a/fapp/ciyon_ap/pages/main/me_passchange.vue
+++ /dev/null
@@ -1,68 +0,0 @@
-<template>
-	<ciy-header title="修改密码"></ciy-header>
-    <view>
-        <form @submit="submit" class="char4">
-            <view class="ciy-card">
-				<view class="content">
-                    <view class="ciy-form" v-if="!me.needpass">
-                        <label class="imp">旧密码</label>
-                        <view>
-                            <ciy-input name="oldpass" type="password" bb></ciy-input>
-                        </view>
-                    </view>
-                    <view class="ciy-form">
-                        <label class="imp">新密码</label>
-                        <view>
-                            <ciy-input name="newpass" type="password" bb></ciy-input>
-                        </view>
-                    </view>
-                    <view class="ciy-form">
-                        <label class="imp">再次输入</label>
-                        <view>
-                            <ciy-input name="repass" type="password" bb></ciy-input>
-                        </view>
-                    </view>
-					<view class="ciy-form-bottom">
-						<button class="btn lg cc" form-type="submit">修改密码</button>
-					</view>
-                </view>
-            </view>
-        </form>
-    </view>
-</template>
-
-<style>
-</style>
-
-<script>
-    export default {
-        data() {
-            return {
-            }
-        }
-        , onLoad() {
-        }
-        , methods: {
-            async submit(e) {
-                if (e.detail.value.newpass.length < 1)
-                    return this.toast('请输入新密码');
-                if (e.detail.value.newpass != e.detail.value.repass)
-                    return this.toast('两次输入的新密码不同');
-				if (this._loading)
-					return;
-				this._loading = true;
-				var retjson = await this.callajax({
-					func: 'me.pass_change',
-					data: e.detail.value
-				});
-				this._loading = false;
-				if(retjson.code != 1)
-					return this.alert(retjson.errmsg);
-				this.me.needpass = false;
-				this.setstorage('me', this.me);
-				await this.toast('修改成功');
-				uni.navigateBack();
-            }
-        }
-    }
-</script>
diff --git a/fapp/ciyon_ap/pages/main/me_cash_charge.vue b/fapp/ciyon_ap/pages/me/cash_charge.vue
similarity index 78%
rename from fapp/ciyon_ap/pages/main/me_cash_charge.vue
rename to fapp/ciyon_ap/pages/me/cash_charge.vue
index 760775a..69b7fbb 100644
--- a/fapp/ciyon_ap/pages/main/me_cash_charge.vue
+++ b/fapp/ciyon_ap/pages/me/cash_charge.vue
@@ -9,9 +9,9 @@
 		<view class="ciy-card">
 			<view class="content char4">
 				<view class="flex flex-wrap" style="gap:1em;">
-					<view class="fpay" v-for="(item,index) in init.charges" :key="item" @tap="currbuy=index;money=item" :class="{select:currbuy==index}">
+					<view class="fpay" v-for="(item,index) in init.charges" :key="item" @tap="currbuy=index;money=item.chargemoney" :class="{select:currbuy==index}">
 						<view class="money">
-							<text>{{item/100}}</text>元
+							<text>{{item.chargemoney/100}}</text>元
 						</view>
 					</view>
 				</view>
@@ -27,7 +27,7 @@
 			</view>
 		</view>
 		<view class="ciy-hr"></view>
-		<ciy-swipelist title="充值记录" @tap="gourl" data-url="$/pages/main/me_cash_in" more></ciy-swipelist>
+		<ciy-swipelist title="充值记录" @tap="gourl" data-url="cashin_lst" more></ciy-swipelist>
 	</view>
 </template>
 
@@ -72,12 +72,22 @@
 		},
 		methods: {
 			async getinit() {
+<<<<<<< HEAD:fapp/ciyon_ap/pages/main/me_cash_charge.vue
 				this.init.charges = [];
 				this.init.charges.push(10000);
 				this.init.charges.push(50000);
 				this.init.charges.push(100000);
 				this.init.charges.push(500000);
 				this.init.code = 1;
+=======
+				var retjson = await this.callfunc({
+					func: 'me.cash_charge_init',
+					data: this.pagepost
+				});
+				if (retjson.code != 1)
+					return this.alert(retjson.errmsg);
+				this.init = retjson;
+>>>>>>> publish:fapp/ciyon_ap/pages/me/cash_charge.vue
 				this.money = this.toint(this.opn.pay);
 				if(this.money > 0)
 					this.paynow();
@@ -88,8 +98,8 @@
 				if (this._loading)
 					return;
 				this._loading = true;
-				var retjson = await this.callajax({
-					func: 'me.charge_paynow',
+				var retjson = await this.callfunc({
+					func: 'me.cash_charge_pay',
 					data: {
 						money: this.money
 					}
@@ -102,8 +112,8 @@
 				try {
 					var retpay = await uni.requestPayment(retjson);
 					await this.sleep(1000);
-					var retjson2 = await this.callajax({
-						func: 'me.charge_paychk',
+					var retjson2 = await this.callfunc({
+						func: 'me.cash_charge_chk',
 						data: {
 							orderid: retjson.orderid
 						}
diff --git a/fapp/ciyon_ap/pages/main/me_cash_ie.vue b/fapp/ciyon_ap/pages/me/cashie_lst.vue
similarity index 84%
rename from fapp/ciyon_ap/pages/main/me_cash_ie.vue
rename to fapp/ciyon_ap/pages/me/cashie_lst.vue
index 3697384..a358cf2 100644
--- a/fapp/ciyon_ap/pages/main/me_cash_ie.vue
+++ b/fapp/ciyon_ap/pages/me/cashie_lst.vue
@@ -9,7 +9,11 @@
 	</view>
 	<view v-else>
 		<view class="sti" :style="{top:(header_statusbar_height+header_title_height)+'px'}">
+<<<<<<< HEAD:fapp/ciyon_ap/pages/main/me_cash_ie.vue
 			<ciy-segment lis="1:收入,2:支出" all="全部" v-model="liid" @change="segment_change"></ciy-segment>
+=======
+			<ciy-segment lis="1:收入,2:支出" all="全部" @change="segment_change"></ciy-segment>
+>>>>>>> publish:fapp/ciyon_ap/pages/me/cashie_lst.vue
 		</view>
 		<view class="ciy-list" v-for="(item,index) in init.list" :key="item.id">
 			<view class="l2" style="margin-right: 4em;">{{item.name}}</view>
@@ -27,12 +31,9 @@
 <script>
 	export default {
 		data() {
-			return {
-				liid: 0,
-			}
+			return {}
 		},
 		onLoad() {
-			this.liid = this.opn.liid;
 			this.getlist();
 		},
 		onReachBottom(b) {
@@ -51,13 +52,12 @@
 			async getlist() {
 				if (this.pageno < 0)
 					return;
-				this.pagepost.pageno = this.pageno + 1;
-				this.pagepost.query.liid = this.liid;
 				if (this._loading)
 					return;
+				this.pagepost.pageno = this.pageno + 1;
 				this._loading = true;
-				var retjson = await this.callajax({
-					func: 'me.cashie_get',
+				var retjson = await this.callfunc({
+					func: 'me.cashie_lst_list',
 					data: this.pagepost
 				});
 				this._loading = false;
@@ -70,16 +70,8 @@
 				if (retjson.list.length < retjson.pagecount)
 					this.pageno = -1;
 			},
-			segment_change() {
-				this.pageno = 0;
-				this.getlist();
-				uni.pageScrollTo({
-					scrollTop: 0,
-					duration: 800
-				});
-			},
-			search_change(e) {
-				this.pagepost.query.key = e.value;
+			segment_change(e) {
+				this.pagepost.liid = e.value.id;
 				this.pageno = 0;
 				this.getlist();
 				uni.pageScrollTo({
diff --git a/fapp/ciyon_ap/pages/main/me_cash_in.vue b/fapp/ciyon_ap/pages/me/cashin_lst.vue
similarity index 82%
rename from fapp/ciyon_ap/pages/main/me_cash_in.vue
rename to fapp/ciyon_ap/pages/me/cashin_lst.vue
index 5f789ad..a5df674 100644
--- a/fapp/ciyon_ap/pages/main/me_cash_in.vue
+++ b/fapp/ciyon_ap/pages/me/cashin_lst.vue
@@ -9,7 +9,9 @@
 	</view>
 	<view v-else>
 		<view class="ciy-list" v-for="(item,index) in init.list" :key="item.id">
-			<view class="l2"><ciy-showmoney :value="item.inmoney" ciystyle="text-align:left;font-size:1.5em;"></ciy-showmoney></view>
+			<view class="l2">支付流水</view>
+			<view class="l3">{{item.name}}</view>
+			<view class="rt"><ciy-showmoney :value="item.inmoney" ciystyle="font-size:1.5em;"></ciy-showmoney>元</view>
 			<view class="rb">{{todatetime(item.addtimes)}}</view>
 		</view>
 		<ciy-listend :page="pageno" :listlen="init.list.length" :nodataimg="file_stor('/img/mbnone.png')"></ciy-listend>
@@ -22,12 +24,9 @@
 <script>
 	export default {
 		data() {
-			return {
-				liid: 0,
-			}
+			return {}
 		},
 		onLoad() {
-			this.liid = this.opn.liid;
 			this.getlist();
 		},
 		onReachBottom(b) {
@@ -46,13 +45,12 @@
 			async getlist() {
 				if (this.pageno < 0)
 					return;
-				this.pagepost.pageno = this.pageno + 1;
-				this.pagepost.query.liid = this.liid;
 				if (this._loading)
 					return;
+				this.pagepost.pageno = this.pageno + 1;
 				this._loading = true;
-				var retjson = await this.callajax({
-					func: 'me.cashin_get',
+				var retjson = await this.callfunc({
+					func: 'me.cashin_lst_list',
 					data: this.pagepost
 				});
 				this._loading = false;
diff --git a/fapp/ciyon_ap/pages/me/cashout_cash.vue b/fapp/ciyon_ap/pages/me/cashout_cash.vue
new file mode 100644
index 0000000..c8be7cc
--- /dev/null
+++ b/fapp/ciyon_ap/pages/me/cashout_cash.vue
@@ -0,0 +1,196 @@
+<template>
+	<ciy-header title="提现"></ciy-header>
+	<view v-if="init.code != 1">
+		<view class="px4 py4">
+			<view style="height:2em;width:60%;" class="ciy-skeleton"></view>
+			<view style="height:1em;width:40%;margin-left:1em;" class="ciy-skeleton"></view>
+			<view style="height:1em;width:50%;" class="ciy-skeleton"></view>
+			<view style="height:6em;width:100%;" class="ciy-skeleton"></view>
+		</view>
+	</view>
+	<view v-else>
+		<view class="ciy-list" v-for="(item,index) in init.cashs" :key="item.id">
+			<view class="l2">
+				<text class="kbd">{{cashtype==1?'银行':'微信'}}</text>
+				{{item.taxmoney==-1?'企业开具发票':'代缴个税 ' + (item.taxmoney/100)+' 元'}}
+			</view>
+			<ciy-showimgs label="发票" :src="item.invfile"></ciy-showimgs>
+			<view class="l2" v-if="item.invcode">发票号码 {{item.invcode}}</view>
+			<view class="l2" v-if="item.cashtimes>0">操作时间 {{todatetime(item.cashtimes)}}</view>
+			<view class="l2" v-if="item.cashno">支付编号 {{item.cashno}}</view>
+			<view class="l2" v-if="item.auditmsg">拒绝原因 {{item.auditmsg}}</view>
+			<view class="l2" v-if="item.bankaccount">账户名称 {{item.bankaccount}}</view>
+			<view class="l2" v-if="item.bankno">银行卡号 {{item.bankno}}</view>
+			<view class="l2" v-if="item.bankname">开户银行 {{item.bankname}}</view>
+			<view class="l2" v-if="item.bankcode">联行号 {{item.bankcode}}</view>
+
+			<view v-if="item.cashstatus==20 && item.cashtype==2">
+				<button class="btn" @tap="wxrecvpay(index)">立即收款</button>
+			</view>
+			<view v-if="item.cashstatus==20 && item.cashtype==1">
+				<button class="btn" @tap="showinv(index)">上传发票</button>
+			</view>
+			<view class="rt"><text class="kbd" :class="ccode(g.cashstatus, item.cashstatus,'clas')">{{ccode(g.cashstatus, item.cashstatus)}}</text></view>
+			<view class="lb">{{todatetime(item.addtimes)}}</view>
+			<view class="rb txt-lgg txt-wb">{{item.cashmoney/100}}</view>
+
+		</view>
+		<view class="ciy-card char3" v-if="init.cashs.length==0">
+			<view class="content">
+				<view class="ciy-form">
+					<label>余额</label>
+					<view class="txt-left">
+						{{init.user.mycashmoney/100}}元
+					</view>
+				</view>
+				<view class="ciy-form">
+					<label>可提现</label>
+					<view class="txt-left">
+						<ciy-inputbet left bb v-model="editdata.cash" unit="元" bet="100"></ciy-inputbet>
+					</view>
+				</view>
+				<view class="ciy-form">
+					<label>提现流向</label>
+					<view class="txt-left">
+						<ciy-selbool v-model="editdata.cashtype" y="银行" n="微信"></ciy-selbool>
+					</view>
+				</view>
+				<view class="ciy-form">
+					<label>税务方案</label>
+					<view class="txt-left">
+						{{editdata.cashtype==2?'代扣缴个税':(me.truename == me.bankaccount?'代扣缴个税':'对公开具发票')}}
+					</view>
+				</view>
+				<view class="ciy-form" v-if="editdata.cashtype==1">
+					<label>银行账户</label>
+					<view class="txt-left">
+						{{me.bankaccount}}<br />
+						{{me.bankname}}<br />
+						{{me.bankno}}<br />
+					</view>
+				</view>
+				<view class="ciy-form-bottom">
+					<button class="btn lg cc" @tap="cashsubmit">申请提现</button>
+				</view>
+				<view class="ciy-tip"><ciy-markdown :md="init.tip"></ciy-markdown></view>
+			</view>
+		</view>
+		<ciy-swipelist v-else title="可提现余额" :right="init.user.mycashmoney/100+'元'"></ciy-swipelist>
+	</view>
+	<ciy-swipelist title="提现历史记录" @tap="gourl" data-url="$/pages/me/cashout_lst" more></ciy-swipelist>
+
+	<ciy-anipop v-model="popinv" :zindex="991" maskbg="#00000077" title="上传发票">
+		<view class="bg1 pop">
+			<view class="ciy-form">
+				<label class="imp">发票编号</label>
+				<view>
+					<ciy-input bb v-model="invedit.invcode" type="text"></ciy-input>
+				</view>
+			</view>
+			<view class="ciy-form">
+				<label class="imp">上传发票</label>
+				<view style="height:10em;">
+					<ciy-upload left num="1" path="cashinv" v-model="invedit.invfile" imgwidth="1600" sourcetype="camera,album,message"></ciy-upload>
+				</view>
+			</view>
+			<view class="px4 py4 txt-center">
+				<button class="btn lg" @tap="invsubmit">提交</button>
+			</view>
+		</view>
+	</ciy-anipop>
+	<view :style="{height:header_statusbar_height+'px'}"></view>
+</template>
+
+<style>
+</style>
+
+<script>
+	export default {
+		data() {
+			return {
+				popinv: false,
+				invedit: {}
+			}
+		},
+		onLoad() {
+			this.getinit();
+		},
+		methods: {
+			async getinit() {
+				var retjson = await this.callfunc({
+					func: 'me.cashout_cash_init',
+				});
+				if (retjson.code != 1)
+					return this.alert(retjson.errmsg);
+				this.init = retjson;
+				this.editdata.cashtype = 2;
+				this.editdata.cash = Math.floor(this.init.user.mycashmoney / 100) * 100;
+				if (this.editdata.cash < 0)
+					this.editdata.cash = 0;
+			},
+			async cashsubmit() {
+				await this.getauth('bank');
+				if (this.editdata.cash <= 0)
+					return this.toast('不可提现');
+				if (this._loading)
+					return;
+				this._loading = true;
+				var retjson = await this.callfunc({
+					func: 'me.cashout_cash_submit',
+					data: this.editdata
+				});
+				this._loading = false;
+				if (retjson.code != 1)
+					return this.alert(retjson.errmsg);
+				this.init.user.mycashmoney -= this.editdata.cash;
+				this.editdata.cash = 0;
+				this.toast('申请成功');
+			},
+			async wxrecvpay(idx) {
+				if (this._loading)
+					return;
+				this._loading = true;
+				var retjson = await this.callfunc({
+					func: 'me.cashout_cash_wxrecvpay',
+					data: {
+						id: this.init.cashs[idx].id
+					}
+				});
+				this._loading = false;
+				if (retjson.code != 1)
+					return this.alert(retjson.errmsg);
+				this.init.cashs.splice(idx, 1);
+				wx.requestMerchant({
+					mchId: retjson.transfer.mchid,
+					appId: retjson.transfer.appid,
+					package: retjson.transfer.package_info,
+					success: (res) => {
+						console.log('success Transfer:', res);
+					},
+					fail: (res) => {
+						console.log('fail Transfer:', res);
+					},
+				});
+			},
+			showinv(idx) {
+				this.invedit.id = this.init.cashs[idx].id;
+				this.popinv = true;
+			},
+			async invsubmit(e) {
+				if (this._loading)
+					return;
+				this._loading = true;
+				var retjson = await this.callfunc({
+					func: 'me.cashout_cash_inv',
+					data: this.invedit
+				});
+				this._loading = false;
+				if (retjson.code != 1)
+					return this.alert(retjson.errmsg);
+				this.objtolist(this.init.cashs, retjson.data);
+				this.toast('上传发票成功');
+				this.popinv = false;
+			},
+		}
+	}
+</script>
\ No newline at end of file
diff --git a/fapp/ciyon_ap/pages/main/me_cash_out.vue b/fapp/ciyon_ap/pages/me/cashout_lst.vue
similarity index 62%
rename from fapp/ciyon_ap/pages/main/me_cash_out.vue
rename to fapp/ciyon_ap/pages/me/cashout_lst.vue
index 60ef120..9d3dbaa 100644
--- a/fapp/ciyon_ap/pages/main/me_cash_out.vue
+++ b/fapp/ciyon_ap/pages/me/cashout_lst.vue
@@ -9,13 +9,28 @@
 	</view>
 	<view v-else>
 		<view class="sti" :style="{top:(header_statusbar_height+header_title_height)+'px'}">
-			<ciy-segment all="全部" :lis="init.lis" v-model="liid" @change="segment_change"></ciy-segment>
+			<ciy-segment lis="90:已拒绝,100:已完成" all="全部" @change="segment_change"></ciy-segment>
 		</view>
 		<view class="ciy-list" v-for="(item,index) in init.list" :key="item.id">
-			<view class="l2" style="margin-right: 4em;">{{item.cashtype==1?'银行收款 (开具发票独立纳税)':'微信打款 (代扣缴个税)'}}</view>
+			<view class="l2">
+				<text class="kbd">{{cashtype==1?'银行':'微信'}}</text>
+				{{item.taxmoney==-1?'企业开具发票':'代缴个税 ' + (item.taxmoney/100)+' 元'}}
+			</view>
+			<ciy-showimgs label="发票" :src="item.invfile"></ciy-showimgs>
+			<view class="l2" v-if="item.invcode">发票号码 {{item.invcode}}</view>
+			<view class="l2" v-if="item.cashtimes>0">操作时间 {{todatetime(item.cashtimes)}}</view>
+			<view class="l2" v-if="item.cashno">支付编号 {{item.cashno}}</view>
+			<view class="l2" v-if="item.auditmsg">拒绝原因 {{item.auditmsg}}</view>
+			<view class="l2" v-if="item.bankaccount">账户名称 {{item.bankaccount}}</view>
+			<view class="l2" v-if="item.bankno">银行卡号 {{item.bankno}}</view>
+			<view class="l2" v-if="item.bankname">开户银行 {{item.bankname}}</view>
+			<view class="l2" v-if="item.bankcode">联行号 {{item.bankcode}}</view>
+
 			<view class="rt"><text class="kbd" :class="ccode(g.cashstatus, item.cashstatus,'clas')">{{ccode(g.cashstatus, item.cashstatus)}}</text></view>
 			<view class="lb">{{todatetime(item.addtimes)}}</view>
 			<view class="rb txt-lgg txt-wb">{{item.cashmoney/100}}</view>
+
+
 		</view>
 		<ciy-listend :page="pageno" :listlen="init.list.length" :nodataimg="file_stor('/img/mbnone.png')"></ciy-listend>
 	</view>
@@ -27,16 +42,9 @@
 <script>
 	export default {
 		data() {
-			return {
-				liid: 0,
-				pageno: 0,
-			}
+			return {}
 		},
 		onLoad() {
-			this.liid = this.opn.liid;
-			this.init.lis = [...this.g.cashstatus];
-			var ind = this.arrayfind(this.init.lis, 21, 'id');
-			this.init.lis.splice(ind, 1);
 			this.getlist();
 		},
 		onReachBottom(b) {
@@ -55,13 +63,12 @@
 			async getlist() {
 				if (this.pageno < 0)
 					return;
-				this.pagepost.pageno = this.pageno + 1;
-				this.pagepost.query.liid = this.liid;
 				if (this._loading)
 					return;
+				this.pagepost.pageno = this.pageno + 1;
 				this._loading = true;
-				var retjson = await this.callajax({
-					func: 'me.cashout_get',
+				var retjson = await this.callfunc({
+					func: 'me.cashout_lst_list',
 					data: this.pagepost
 				});
 				this._loading = false;
@@ -74,7 +81,8 @@
 				if (retjson.list.length < retjson.pagecount)
 					this.pageno = -1;
 			},
-			segment_change() {
+			segment_change(e) {
+				this.pagepost.liid = e.value.id;
 				this.pageno = 0;
 				this.getlist();
 				uni.pageScrollTo({
diff --git a/fapp/ciyon_ap/pages/main/me_invoice_history.vue b/fapp/ciyon_ap/pages/me/invoice_lst.vue
similarity index 70%
rename from fapp/ciyon_ap/pages/main/me_invoice_history.vue
rename to fapp/ciyon_ap/pages/me/invoice_lst.vue
index 8b1375e..7443bdf 100644
--- a/fapp/ciyon_ap/pages/main/me_invoice_history.vue
+++ b/fapp/ciyon_ap/pages/me/invoice_lst.vue
@@ -7,13 +7,13 @@
 	</view>
 	<view v-else>
 		<view class="sti" :style="{top:(header_statusbar_height+header_title_height)+'px'}">
-			<ciy-segment :lis="init.lis" all="全部" v-model="liid" @change="segment_change"></ciy-segment>
+			<ciy-segment lis="20:待开票,100:已开票,90:已拒开" all="全部" @change="segment_change"></ciy-segment>
 		</view>
 		<view class="ciy-list" v-for="(item,index) in init.list" :key="item.id">
 			<view class="rt">
-				<text class="code" v-if="item.invtimes>0">已开票</text>
-				<text class="code" v-else style="color:var(--txt1);">未开票</text>
+				<text class="kbd" :class="ccode(g.auditstatus, item.auditstatus,'clas')">{{ccode(g.auditstatus,item.auditstatus)}}</text>
 			</view>
+			<view class="l2 txt-wb">{{ccode(init.ap_invoicedetail,item.invoicedetailid)}}</view>
 			<view class="l2">{{item.name}}</view>
 			<view class="l3" v-if="item.taxnumber">税号 {{item.taxnumber}}</view>
 			<view class="l3" v-if="item.addr">地址 {{item.addr}}</view>
@@ -21,6 +21,13 @@
 			<view class="l3" v-if="item.bankname">银行 {{item.bankname}}</view>
 			<view class="l3" v-if="bankaccount">账号 {{item.bankaccount}}</view>
 			<view class="lb">{{todatetime(item.addtimes)}}</view>
+			<template v-if="item.audittimes>20">
+				<view class="ciy-hr"></view>
+				<view class="l2" v-if="item.invcode">发票号码 <text class="txt-lgg px2" @tap="copyboard(item.invcode)">{{item.invcode}}</text></view>
+				<ciy-showimgs label="发票附件" :src="item.invfile"></ciy-showimgs>
+				<view class="l2">操作时间 {{todatetime(item.audittimes)}}</view>
+				<view class="l2" v-if="item.auditmsg">拒开原因 {{item.auditmsg}}</view>
+			</template>
 			<view class="rb">
 				<text class="txt-lgg txt-wb px2">{{item.invoicemoney/100}}</text>
 				<text class="txt-smm">元</text>
@@ -36,22 +43,9 @@
 <script>
 	export default {
 		data() {
-			return {
-				liid: 0,
-				pageno: 0,
-			}
+			return {}
 		},
 		onLoad() {
-			this.liid = this.opn.liid;
-			this.init.lis = [];
-			this.init.lis.push({
-				id: 2,
-				name: '待开票'
-			});
-			this.init.lis.push({
-				id: 3,
-				name: '已开票'
-			});
 			this.getlist();
 		},
 		onReachBottom(b) {
@@ -70,13 +64,12 @@
 			async getlist() {
 				if (this.pageno < 0)
 					return;
-				this.pagepost.pageno = this.pageno + 1;
-				this.pagepost.query.liid = this.liid;
 				if (this._loading)
 					return;
+				this.pagepost.pageno = this.pageno + 1;
 				this._loading = true;
-				var retjson = await this.callajax({
-					func: 'me.invoicing_get',
+				var retjson = await this.callfunc({
+					func: 'me.invoice_lst_list',
 					data: this.pagepost
 				});
 				this._loading = false;
@@ -89,7 +82,8 @@
 				if (retjson.list.length < retjson.pagecount)
 					this.pageno = -1;
 			},
-			segment_change() {
+			segment_change(e) {
+				this.pagepost.liid = e.value.id;
 				this.pageno = 0;
 				this.getlist();
 				uni.pageScrollTo({
diff --git a/fapp/ciyon_ap/pages/main/me_invoicetitle.vue b/fapp/ciyon_ap/pages/me/invoicetitle.vue
similarity index 61%
rename from fapp/ciyon_ap/pages/main/me_invoicetitle.vue
rename to fapp/ciyon_ap/pages/me/invoicetitle.vue
index 87f612a..f0a6224 100644
--- a/fapp/ciyon_ap/pages/main/me_invoicetitle.vue
+++ b/fapp/ciyon_ap/pages/me/invoicetitle.vue
@@ -6,70 +6,68 @@
 		<view style="height:8em;width:100%;" class="ciy-skeleton"></view>
 	</view>
 	<view v-else>
-		<view class="ciy-list" :class="{selected:opn.sel&&item.id==opn.id,del:item._clas=='del'}" v-for="(item,index) in init.list" :key="item.id" @click="select(item.id)">
+		<view class="ciy-list" :class="{selected:opn.sel&&item.id==opn.id,del:item._del}" v-for="(item,index) in init.list" :key="item.id" @tap="select(item.id)">
 			<view class="l2">名称 {{item.name}}</view>
 			<view class="l2" v-if="item.taxnumber">税号 {{item.taxnumber}}</view>
 			<view class="l2" v-if="item.addr">单位地址 {{item.addr}}</view>
 			<view class="l2" v-if="item.phone">电话号码 {{item.phone}}</view>
 			<view class="l2" v-if="item.bankname">银行名称 {{item.bankname}}</view>
 			<view class="l2" v-if="item.bankaccount">银行账号 {{item.bankaccount}}</view>
-			<view class="dot" @click="showmenu(index)"></view>
+			<view class="dot" @tap.stop="showmenu(index)"></view>
 		</view>
 		<view style="height:5em;"></view>
-		<view class="ciy-add" style="z-index:41;" @tap="editshow(null)"></view>
+		<view class="ciy-add" style="z-index:41;bottom:6em;" @tap="editshow(null)"></view>
 		<view v-if="opn.sel">
 			<view class="bg1 txt-center py4 ciy-bottom">
-				<button class="btn lg" @click="selectok">选定</button>
+				<button class="btn lg" @tap="selectok">选定</button>
 			</view>
 		</view>
-		<ciy-anipop v-model="popedit" :zindex="998" maskbg="#00000077" :title="edit.id>0?'更新抬头':'新建抬头'">
-			<view class="bg1 pop">
-				<form @submit="submit_edit" class="char5">
-					<view class="ciy-form">
-						<label class="imp">抬头名称</label>
-						<view>
-							<ciy-input name="name" v-model="edit.name" bb></ciy-input>
-						</view>
+		<ciy-anipop v-model="popedit" :zindex="998" maskbg="#00000077" :title="editdata.id>0?'更新抬头':'新建抬头'">
+			<view class="bg1 pop char5">
+				<view class="ciy-form">
+					<label class="imp">抬头名称</label>
+					<view>
+						<ciy-input bb v-model="editdata.name"></ciy-input>
 					</view>
-					<view class="ciy-form">
-						<label class="imp">税号</label>
-						<view>
-							<ciy-input name="taxnumber" v-model="edit.taxnumber" bb></ciy-input>
-						</view>
+				</view>
+				<view class="ciy-form">
+					<label>税号</label>
+					<view>
+						<ciy-input bb v-model="editdata.taxnumber"></ciy-input>
 					</view>
-					<view class="ciy-form">
-						<label>单位地址</label>
-						<view>
-							<ciy-input name="addr" v-model="edit.addr" bb></ciy-input>
-						</view>
+				</view>
+				<view class="ciy-form">
+					<label>单位地址</label>
+					<view>
+						<ciy-input bb v-model="editdata.addr"></ciy-input>
 					</view>
-					<view class="ciy-form">
-						<label>电话号码</label>
-						<view>
-							<ciy-input name="phone" v-model="edit.phone" bb ciystyle="width:9em;"></ciy-input>
-						</view>
+				</view>
+				<view class="ciy-form">
+					<label>电话号码</label>
+					<view>
+						<ciy-input bb v-model="editdata.phone" ciystyle="width:9em;"></ciy-input>
 					</view>
-					<view class="ciy-form">
-						<label>银行名称</label>
-						<view>
-							<ciy-input name="bankname" v-model="edit.bankname" bb></ciy-input>
-						</view>
+				</view>
+				<view class="ciy-form">
+					<label>银行名称</label>
+					<view>
+						<ciy-input bb v-model="editdata.bankname"></ciy-input>
 					</view>
-					<view class="ciy-form">
-						<label>银行账号</label>
-						<view>
-							<ciy-input name="bankaccount" v-model="edit.bankaccount" bb></ciy-input>
-						</view>
+				</view>
+				<view class="ciy-form">
+					<label>银行账号</label>
+					<view>
+						<ciy-input bb v-model="editdata.bankaccount"></ciy-input>
 					</view>
-					<view class="rel px4 py4 txt-center">
-						<button class="btn lg" form-type="submit">提交</button>
-						<!-- #ifdef MP-WEIXIN -->
-						<view class="abs t1 r1">
-							<button class="btn sm" @tap="chooseinvoice">从微信同步</button>
-						</view>
-						<!-- #endif -->
+				</view>
+				<view class="rel px4 py4 txt-center">
+					<button class="btn lg" @tap="submit_edit">提交</button>
+					<!-- #ifdef MP-WEIXIN -->
+					<view class="abs t1 r1">
+						<button class="btn sm" @tap="chooseinvoice">从微信同步</button>
 					</view>
-				</form>
+					<!-- #endif -->
+				</view>
 			</view>
 		</ciy-anipop>
 	</view>
@@ -95,9 +93,6 @@
 		data() {
 			return {
 				popedit: false,
-				edit: {
-					id: -1
-				},
 			}
 		},
 		onLoad() {
@@ -110,8 +105,8 @@
 				if (this._loading)
 					return;
 				this._loading = true;
-				var retjson = await this.callajax({
-					func: 'me.invoicetitle_get'
+				var retjson = await this.callfunc({
+					func: 'me.invoicetitle_list'
 				});
 				this._loading = false;
 				if (retjson.code != 1)
@@ -146,41 +141,35 @@
 			editshow(item) {
 				item = item || {
 					data: {
-						_idx: -1
+						id: 0
 					}
 				};
-				this.edit = {
+				this.editdata = {
 					...item.data
 				};
 				this.popedit = true;
 			},
-			async submit_edit(e) {
-				if (!e.detail.value.name)
+			async submit_edit() {
+				if (!this.editdata.name)
 					return this.alert('请输入抬头名称');
-				if (!e.detail.value.taxnumber)
-					return this.alert('请输入税号');
-				e.detail.value.id = this.edit.id;
 				if (this._loading)
 					return;
 				this._loading = true;
-				var retjson = await this.callajax({
+				var retjson = await this.callfunc({
 					func: 'me.invoicetitle_edit',
-					data: e.detail.value
+					data: this.editdata
 				});
 				this._loading = false;
 				if (retjson.code != 1)
 					return this.alert(retjson.errmsg);
-				if (this.edit._idx == -1)
-					this.init.list.unshift(retjson.data);
-				else
-					this.init.list[this.edit._idx] = this.objdeepmerge(this.init.list[this.edit._idx], retjson.data);
+				this.objtolist(this.init.list, retjson.data);
 				this.popedit = false;
 				this.toast('更新成功');
 			},
 			async del(item) {
 				if (await this.askmsg('是否删除？') != 'ok')
 					return;
-				var retjson = await this.callajax({
+				var retjson = await this.callfunc({
 					func: 'me.invoicetitle_del',
 					data: {
 						id: item.data.id
@@ -188,7 +177,7 @@
 				});
 				if (retjson.code != 1)
 					return this.alert(retjson.errmsg);
-				this.init.list[item.data._idx]._clas = 'del';
+				this.init.list[item.data._idx]._del = true;
 				setTimeout(() => {
 					this.init.list.splice(item.data._idx, 1);
 				}, 500);
diff --git a/fapp/ciyon_ap/pages/me/invoicing.vue b/fapp/ciyon_ap/pages/me/invoicing.vue
new file mode 100644
index 0000000..42463b7
--- /dev/null
+++ b/fapp/ciyon_ap/pages/me/invoicing.vue
@@ -0,0 +1,102 @@
+<template>
+	<ciy-header title="我要开票"></ciy-header>
+	<view v-if="init.code != 1">
+		<view class="px4 py4">
+			<view style="height:2em;width:60%;" class="ciy-skeleton"></view>
+			<view style="height:1em;width:40%;margin-left:1em;" class="ciy-skeleton"></view>
+			<view style="height:1em;width:50%;" class="ciy-skeleton"></view>
+			<view style="height:6em;width:100%;" class="ciy-skeleton"></view>
+		</view>
+	</view>
+	<view v-else>
+		<view class="ciy-card char3">
+			<view class="content">
+				<view class="ciy-form">
+					<label>可开票金额</label>
+					<view style="text-align: left;">
+						{{init.user.myinvmoney/100}}元
+					</view>
+				</view>
+				<view class="ciy-form">
+					<label>开票金额</label>
+					<view>
+						<ciy-inputbet bb v-model="editdata.money" unit="元" bet="100"></ciy-inputbet>
+					</view>
+				</view>
+				<view class="ciy-form" v-if="init.details.length>0">
+					<label>开票明细</label>
+					<view>
+						<ciy-select v-model="editdata.invoicedetailid" :range="init.details"></ciy-select>
+					</view>
+				</view>
+				<view class="ciy-form">
+					<label>发票抬头</label>
+					<view>
+						<ciy-selpage v-model="editdata.invoicetitleid" page="invoicetitle">
+							<template v-slot:default="{data}">
+								<view>{{data.name}}</view>
+								<view class="txt1">{{data.taxnumber}}</view>
+							</template>
+						</ciy-selpage>
+					</view>
+				</view>
+				<view class="ciy-form-bottom">
+					<button class="btn lg cc" @tap="submit">申请开票</button>
+				</view>
+				<view class="ciy-tip"><ciy-markdown :md="init.tip"></ciy-markdown></view>
+			</view>
+		</view>
+	</view>
+	<ciy-swipelist title="开票历史" @tap="gourl" data-url="invoice_lst" more></ciy-swipelist>
+</template>
+
+<style>
+</style>
+
+<script>
+	export default {
+		data() {
+			return {}
+		},
+		onLoad() {
+			this.getinit();
+		},
+		methods: {
+			async getinit() {
+				var retjson = await this.callfunc({
+					func: 'me.invoicing_init',
+				});
+				if (retjson.code != 1)
+					return this.alert(retjson.errmsg);
+				this.init = retjson;
+				this.editdata.money = retjson.user.myinvmoney;
+			},
+			async submit() {
+				if (this.editdata.money < 1000)
+					return this.toast('开票金额10元');
+				if (this.init.user.myinvmoney < this.editdata.money)
+					return this.toast('开票金额不足');
+				if (!this.editdata.invoicetitleid)
+					return this.toast('请选择发票抬头');
+				if (this.init.details.length > 0) {
+					if (!this.editdata.invoicedetailid)
+						return this.toast('请选择发票明细');
+				}
+				if (this._loading)
+					return;
+				this._loading = true;
+				var retjson = await this.callfunc({
+					func: 'me.invoicing_submit',
+					data: this.editdata
+				});
+				this._loading = false;
+				if (retjson.code != 1)
+					return this.alert(retjson.errmsg);
+				this.init.user.myinvmoney -= this.editdata.money;
+				this.me.myinvmoney = this.init.user.myinvmoney;
+				this.setstorage('me', this.me);
+				this.toast('申请成功');
+			}
+		}
+	}
+</script>
\ No newline at end of file
diff --git a/fapp/ciyon_ap/pages/main/me_bank_info.vue b/fapp/ciyon_ap/pages/me/me_bank_info.vue
similarity index 100%
rename from fapp/ciyon_ap/pages/main/me_bank_info.vue
rename to fapp/ciyon_ap/pages/me/me_bank_info.vue
diff --git a/fapp/ciyon_ap/pages/main/me_pnt_buy.vue b/fapp/ciyon_ap/pages/me/pnt_buylst.vue
similarity index 73%
rename from fapp/ciyon_ap/pages/main/me_pnt_buy.vue
rename to fapp/ciyon_ap/pages/me/pnt_buylst.vue
index 24a3751..1f9a7ba 100644
--- a/fapp/ciyon_ap/pages/main/me_pnt_buy.vue
+++ b/fapp/ciyon_ap/pages/me/pnt_buylst.vue
@@ -6,9 +6,6 @@
 		<view style="height:6em;width:100%;" class="ciy-skeleton"></view>
 	</view>
 	<view v-else>
-		<view class="sti" :style="{top:(header_statusbar_height+header_title_height)+'px'}">
-			<ciy-segment :lis="init.lis" all="全部" v-model="liid" @change="segment_change"></ciy-segment>
-		</view>
 		<view class="ciy-list" v-for="(item,index) in init.list" :key="item.id">
 			<view class="rt">
 				<text class="code" v-if="item.paytimes>0">已支付</text>
@@ -18,6 +15,8 @@
 				<text class="txt-lgg txt-wb px2">{{item.pnt}}</text>
 				<text class="txt-smm">金币</text>
 			</view>
+			<view class="l2">支付流水</view>
+			<view class="l3">{{item.name}}</view>
 			<view class="lb">{{todatetime(item.addtimes)}}</view>
 			<view class="rb">
 				<text class="txt-lgg txt-wb px2">{{item.buypntmoney/100}}</text>
@@ -34,22 +33,9 @@
 <script>
 	export default {
 		data() {
-			return {
-				liid: 0,
-				pageno: 0,
-			}
+			return {}
 		},
 		onLoad() {
-			this.liid = this.opn.liid;
-			this.init.lis = [];
-			this.init.lis.push({
-				id: 2,
-				name: '未支付'
-			});
-			this.init.lis.push({
-				id: 3,
-				name: '已支付'
-			});
 			this.getlist();
 		},
 		onReachBottom(b) {
@@ -68,13 +54,12 @@
 			async getlist() {
 				if (this.pageno < 0)
 					return;
-				this.pagepost.pageno = this.pageno + 1;
-				this.pagepost.query.liid = this.liid;
 				if (this._loading)
 					return;
+				this.pagepost.pageno = this.pageno + 1;
 				this._loading = true;
-				var retjson = await this.callajax({
-					func: 'me.pntbuy_get',
+				var retjson = await this.callfunc({
+					func: 'me.pnt_buylst_list',
 					data: this.pagepost
 				});
 				this._loading = false;
@@ -87,14 +72,6 @@
 				if (retjson.list.length < retjson.pagecount)
 					this.pageno = -1;
 			},
-			segment_change() {
-				this.pageno = 0;
-				this.getlist();
-				uni.pageScrollTo({
-					scrollTop: 0,
-					duration: 800
-				});
-			}
 		}
 	}
 </script>
\ No newline at end of file
diff --git a/fapp/ciyon_ap/pages/main/me_pnt.vue b/fapp/ciyon_ap/pages/me/pnt_buynow.vue
similarity index 95%
rename from fapp/ciyon_ap/pages/main/me_pnt.vue
rename to fapp/ciyon_ap/pages/me/pnt_buynow.vue
index f4ade44..ca006d6 100644
--- a/fapp/ciyon_ap/pages/main/me_pnt.vue
+++ b/fapp/ciyon_ap/pages/me/pnt_buynow.vue
@@ -7,11 +7,11 @@
 	</view>
 	<view v-else>
 		<view class="ciy-grid">
-			<view class="grid" style="width:50%" @tap="gourl" data-url="$/pages/main/me_pnt_buy">
+			<view class="grid" style="width:50%" @tap="gourl" data-url="pnt_buylst">
 				<view class="icon" :style="{backgroundImage:svg2bg(svg.buy)}"></view>
 				<view class="name">购买记录</view>
 			</view>
-			<view class="grid" style="width:50%" @tap="gourl" data-url="/pages/main/me_pnt_record">
+			<view class="grid" style="width:50%" @tap="gourl" data-url="pnt_lst">
 				<view class="icon" :style="{backgroundImage:svg2bg(svg.record)}"></view>
 				<view class="name">金币流水</view>
 			</view>
@@ -92,8 +92,8 @@
 		},
 		methods: {
 			async getinit() {
-				var retjson = await this.callajax({
-					func: 'me.buy_init',
+				var retjson = await this.callfunc({
+					func: 'me.pnt_buynow_init',
 					data: this.pagepost
 				});
 				if (retjson.code != 1)
@@ -104,8 +104,8 @@
 				if (this._loading)
 					return;
 				this._loading = true;
-				var retjson = await this.callajax({
-					func: 'me.buy_paynow',
+				var retjson = await this.callfunc({
+					func: 'me.pnt_buynow_pay',
 					data: {
 						id: this.init.buys[this.currbuy].id
 					}
@@ -118,8 +118,8 @@
 				try {
 					var retpay = await uni.requestPayment(retjson);
 					await this.sleep(1000);
-					var retjson2 = await this.callajax({
-						func: 'me.buy_paychk',
+					var retjson2 = await this.callfunc({
+						func: 'me.pnt_buynow_chk',
 						data: {
 							orderid: retjson.orderid
 						}
diff --git a/fapp/ciyon_ap/pages/main/me_pnt_record.vue b/fapp/ciyon_ap/pages/me/pnt_lst.vue
similarity index 93%
rename from fapp/ciyon_ap/pages/main/me_pnt_record.vue
rename to fapp/ciyon_ap/pages/me/pnt_lst.vue
index 2170c07..68f69a1 100644
--- a/fapp/ciyon_ap/pages/main/me_pnt_record.vue
+++ b/fapp/ciyon_ap/pages/me/pnt_lst.vue
@@ -24,9 +24,7 @@
 <script>
 	export default {
 		data() {
-			return {
-				pageno: 0,
-			}
+			return {}
 		},
 		onLoad() {
 			this.getlist();
@@ -47,12 +45,12 @@
 			async getlist() {
 				if (this.pageno < 0)
 					return;
-				this.pagepost.pageno = this.pageno + 1;
 				if (this._loading)
 					return;
+				this.pagepost.pageno = this.pageno + 1;
 				this._loading = true;
-				var retjson = await this.callajax({
-					func: 'me.pntrecord_get',
+				var retjson = await this.callfunc({
+					func: 'me.pnt_lst_list',
 					data: this.pagepost
 				});
 				this._loading = false;
diff --git a/fapp/ciyon_ap/pages/main/me_problechat.vue b/fapp/ciyon_ap/pages/me/problem_chat.vue
similarity index 75%
rename from fapp/ciyon_ap/pages/main/me_problechat.vue
rename to fapp/ciyon_ap/pages/me/problem_chat.vue
index d566067..b5aa5b5 100644
--- a/fapp/ciyon_ap/pages/main/me_problechat.vue
+++ b/fapp/ciyon_ap/pages/me/problem_chat.vue
@@ -9,12 +9,9 @@
 	<view v-else class="flex flexcol" :style="'height:calc(100vh - ' + (header_statusbar_height+header_title_height) + 'px);'">
 		<scroll-view @scrolltoupper="chgupper" :scroll-top="top" id="id_chats" class="flex1" style="overflow: auto;" scroll-y>
 			<view class="ciy-list">
-				<view class="l2" v-html="tobr(init.once.data.content)"></view>
-				<ciy-showimgs :src="init.once.data.imgs" label="图片截图"></ciy-showimgs>
-				<view class="rt">
-					<button class="btn smm" @tap="closechat">关闭工单</button>
-				</view>
-				<view class="rb">{{todatetime(init.once.data.addtimes)}} 提交</view>
+				<view class="l2" v-html="tobr(init.problem.content)"></view>
+				<ciy-showimgs :src="init.problem.imgs" label="图片截图"></ciy-showimgs>
+				<view class="rb">{{todatetime(init.problem.addtimes)}} 提交</view>
 			</view>
 			<view :class="item._od" class="vchat" v-for="(item,index) in init.list" :key="item.id">
 				<view class="nick" v-if="item.nick">{{item.nick}}</view>
@@ -22,11 +19,11 @@
 				<view class="time">{{todatetime(item.addtimes,'st')}}</view>
 			</view>
 		</scroll-view>
-		<form @submit="submitsend" v-if="init.once.data.closetimes==0">
+		<form v-if="init.problem.closetimes==0">
 			<view class="bg2 vchatsend">
 				<!-- <view><button class="btn def" @tap="sendimg">图片</button></view> -->
-				<view style="flex:1;"><ciy-textarea name="content" v-model="content"></ciy-textarea></view>
-				<view><button form-type="submit" class="btn">发送</button></view>
+				<view style="flex:1;"><ciy-textarea v-model="editdata.content"></ciy-textarea></view>
+				<view><button @tap="submitsend" class="btn">发送</button></view>
 			</view>
 		</form>
 		<view class="bg2 txt-center px4 py4" v-else>
@@ -67,6 +64,7 @@
 
 	.vchat.me .chat {
 		background: var(--succ4);
+		color: var(--txt9);
 		display: inline-block;
 		clear: both;
 		padding: 0.5em;
@@ -89,8 +87,7 @@
 	export default {
 		data() {
 			return {
-				top: 0,
-				content: ''
+				top: 999999999,
 			}
 		},
 		onLoad() {
@@ -114,8 +111,8 @@
 				if (this._loading)
 					return;
 				this._loading = true;
-				var retjson = await this.callajax({
-					func: 'me.problechat_get',
+				var retjson = await this.callfunc({
+					func: 'me.problem_chat_get',
 					data: {
 						mid: this.minid,
 						op: 'min',
@@ -130,8 +127,8 @@
 					this.minid = 0;
 			},
 			async getnew(blong) {
-				var retjson = await this.callajax({
-					func: 'me.problechat_get',
+				var retjson = await this.callfunc({
+					func: 'me.problem_chat_get',
 					data: {
 						mid: this.maxid,
 						op: 'max',
@@ -168,19 +165,20 @@
 			chgupper(e) {
 				this.getlist();
 			},
-			async submitsend(e) {
-				if (!e.detail.value.content)
+			async submitsend() {
+				if (!this.editdata.content)
 					return this.toast('请输入内容');
 				if (this._loading)
 					return;
 				this._loading = true;
-				e.detail.value.id = this.opn.id;
-				var retjson = await this.callajax({
-					func: 'me.problechat_send',
-					data: e.detail.value
+				var retjson = await this.callfunc({
+					func: 'me.problem_chat_send',
+					data: this.editdata
 				});
 				this._loading = false;
-				this.content = '';
+				if (retjson.code != 1)
+					return this.alert(retjson.errmsg);
+				this.editdata.content = '';
 				retjson.list = [retjson.data];
 				this.callist(retjson.list);
 				this.init = this.objdeepmerge(this.init, retjson);
@@ -188,21 +186,6 @@
 					this.top = 999999999 + this.maxid;
 				}, 300);
 			},
-			async closechat(e) {
-				if (await this.askmsg('是否关闭工单？', '关闭') != 'ok')
-					return;
-				if (this._loading)
-					return;
-				this._loading = true;
-				var retjson = await this.callajax({
-					func: 'me.problechat_close',
-					data: {
-						id: this.opn.id
-					}
-				});
-				this._loading = false;
-				uni.navigateBack();
-			},
 			sendimg() {}
 		}
 	}
diff --git a/fapp/ciyon_ap/pages/main/me_problem.vue b/fapp/ciyon_ap/pages/me/problem_pub.vue
similarity index 54%
rename from fapp/ciyon_ap/pages/main/me_problem.vue
rename to fapp/ciyon_ap/pages/me/problem_pub.vue
index 467a73e..741d1ed 100644
--- a/fapp/ciyon_ap/pages/main/me_problem.vue
+++ b/fapp/ciyon_ap/pages/me/problem_pub.vue
@@ -7,10 +7,10 @@
 	</view>
 	<view v-else>
 		<view class="sti" :style="{top:(header_statusbar_height+header_title_height)+'px'}">
-			<ciy-segment :lis="init.lis" v-model="liid" @change="segment_change"></ciy-segment>
+			<ciy-segment lis=":等待中,3:有回复,9:已关闭" v-model="liid" @change="segment_change"></ciy-segment>
 		</view>
-		<view class="ciy-list" v-for="(item,index) in init.list" :key="item.id">
-			<view class="l2" v-html="tobr(item.content)" @tap="gourl" :data-url="'me_problechat?id=' + item.id"></view>
+		<view class="ciy-list" v-for="(item,index) in init.list" :key="item.id" @tap="showmenu(index)">
+			<view class="l2" v-html="tobr(item.content)"></view>
 			<ciy-showimgs :src="item.imgs" label="图片截图"></ciy-showimgs>
 			<view class="rt" v-if="item.closetimes>0">已关闭</view>
 			<view class="rt" style="color:var(--succ5)" v-else-if="item.replytimes>0">有回复</view>
@@ -21,29 +21,27 @@
 		<ciy-listend :page="pageno" :listlen="init.list.length" :nodataimg="file_stor('/img/mbnone.png')"></ciy-listend>
 		<view class="ciy-add" @tap="openadd()"></view>
 		<ciy-dialog ref="dialog">
-			<form @submit="editsubmit">
-				<view class="ciy-form v">
-					<label class="imp">问题描述</label>
-					<view>
-						<ciy-textarea name="content" type="text" bb ciystyle="min-height:4em"></ciy-textarea>
-					</view>
+			<view class="ciy-form v">
+				<label class="imp">问题描述</label>
+				<view>
+					<ciy-textarea bb v-model="editdata.content" ciystyle="min-height:4em"></ciy-textarea>
 				</view>
-				<view class="ciy-form">
-					<label>图片截图</label>
-					<view>
-						<ciy-upload left num="8" path="problem" name="imgs" imgwidth="1600" sourcetype="camera,album,message"></ciy-upload>
-					</view>
+			</view>
+			<view class="ciy-form">
+				<label>图片截图</label>
+				<view>
+					<ciy-upload left num="8" path="problem" v-model="editdata.imgs" imgwidth="1600" sourcetype="camera,album,message"></ciy-upload>
 				</view>
-				<view class="ciy-form">
-					<label>联系方式</label>
-					<view>
-						<ciy-input :value="me.mobile" name="contract" type="text" bb></ciy-input>
-					</view>
+			</view>
+			<view class="ciy-form">
+				<label>联系方式</label>
+				<view>
+					<ciy-input bb v-model="editdata.contract"></ciy-input>
 				</view>
-				<view class="ciy-form-bottom">
-					<button class="btn lg cc" form-type="submit">建立工单</button>
-				</view>
-			</form>
+			</view>
+			<view class="ciy-form-bottom">
+				<button class="btn lg cc" @tap="edited">建立工单</button>
+			</view>
 		</ciy-dialog>
 	</view>
 </template>
@@ -54,25 +52,9 @@
 <script>
 	export default {
 		data() {
-			return {
-				liid: 0,
-				pageno: 0,
-			}
+			return {}
 		},
 		onLoad() {
-			this.init.lis = [];
-			this.init.lis.push({
-				id: '',
-				name: '等待中'
-			});
-			this.init.lis.push({
-				id: 3,
-				name: '有回复'
-			});
-			this.init.lis.push({
-				id: 9,
-				name: '已关闭'
-			});
 			this.getlist();
 		},
 		onReachBottom(b) {
@@ -91,13 +73,12 @@
 			async getlist() {
 				if (this.pageno < 0)
 					return;
-				this.pagepost.pageno = this.pageno + 1;
-				this.pagepost.query.liid = this.liid;
 				if (this._loading)
 					return;
+				this.pagepost.pageno = this.pageno + 1;
 				this._loading = true;
-				var retjson = await this.callajax({
-					func: 'me.problem_get',
+				var retjson = await this.callfunc({
+					func: 'me.problem_pub_list',
 					data: this.pagepost
 				});
 				this._loading = false;
@@ -111,32 +92,70 @@
 					this.pageno = -1;
 			},
 			openadd() {
+				this.editdata.contract = this.me.mobile;
 				this.getrefsSync('dialog').Open({
 					title: '新建工单'
 				});
 			},
-			async editsubmit(e) {
-				if (!e.detail.value.content)
+			async edited() {
+				if (!this.editdata.content)
 					return this.toast('请输入问题描述');
 				if (this._loading)
 					return;
 				this._loading = true;
-				var retjson = await this.callajax({
-					func: 'me.problem_add',
-					data: e.detail.value
+				var retjson = await this.callfunc({
+					func: 'me.problem_pub_add',
+					data: this.editdata
 				});
 				this._loading = false;
+				if (retjson.code != 1)
+					return this.alert(retjson.errmsg);
 				this.getrefsSync('dialog').Close();
 				this.init.list.unshift(retjson.data);
 			},
-			segment_change() {
+			segment_change(e) {
+				this.pagepost.liid = e.value.id;
 				this.pageno = 0;
 				this.getlist();
 				uni.pageScrollTo({
 					scrollTop: 0,
 					duration: 800
 				});
-			}
+			},
+			async close(item) {
+				if (await this.askmsg('是否关闭工单？', '关闭工单') != 'ok')
+					return;
+				var retjson = await this.callfunc({
+					func: 'me.problem_pub_close',
+					data: {
+						id: item.data.id
+					}
+				});
+				if (retjson.code != 1)
+					return this.alert(retjson.errmsg);
+				this.init.list[item.data._idx].closetimes = this.tostamp();
+			},
+			showmenu(idx) {
+				var dat = this.init.list[idx];
+				dat._idx = idx;
+				var items = [];
+				items.push({
+					url: 'problem_chat?id=' + dat.id,
+					name: '详情',
+				});
+				if (dat.closetimes == 0) {
+					items.push({
+						func: 'close',
+						name: '关闭工单',
+						data: dat,
+						style: 'color:var(--warn6)',
+					});
+				}
+				this.popmenu({
+					one: true,
+					items
+				});
+			},
 		}
 	}
 </script>
\ No newline at end of file
diff --git a/fapp/ciyon_ap/pages/me/safe_ccub.vue b/fapp/ciyon_ap/pages/me/safe_ccub.vue
new file mode 100644
index 0000000..5a231bb
--- /dev/null
+++ b/fapp/ciyon_ap/pages/me/safe_ccub.vue
@@ -0,0 +1,96 @@
+<template>
+	<ciy-header title="申请众识码"></ciy-header>
+	<view v-if="init.code != 1" class="px4 py4">
+		<view style="height:60vw;width:100%;" class="ciy-skeleton"></view>
+	</view>
+	<view v-else-if="me.cciy" class="txt-center py4">
+		您已申请成功
+		<view @tap="copyboard(me.cciy)" class="txt-lgg py4">{{me.cciy}}</view>
+	</view>
+	<view v-else-if="init.data && init.data.auditstatus != 90">
+		<view class="ciy-tip" v-if="init.data.auditstatus == 20">您已提交申请，等待审核...</view>
+		<view class="ciy-tip" v-if="init.data.auditstatus == 50">您的申请正在审核中...</view>
+		<view class="ciy-tip" v-if="init.data.auditstatus == 100">您已申请通过</view>
+		<view class="ciy-list">
+			<view class="l1">{{init.data.name}}</view>
+			<view class="l1">{{init.data.country}}</view>
+			<view class="rb">{{todatetime(init.data.addtimes)}} 申请</view>
+		</view>
+	</view>
+	<view v-else>
+		<view class="ciy-tip" v-if="init.data?.auditmsg">
+			{{init.data.auditmsg}}
+		</view>
+		<view class="ciy-card char4">
+			<view class="ciy-form">
+				<label class="imp">主体国籍</label>
+				<view>
+					<ciy-input bb v-model="editdata.country" type="idcard"></ciy-input>
+				</view>
+				<view class="flexnone px4" @tap="editdata.country='中国'">
+					中国
+				</view>
+			</view>
+			<view class="ciy-form">
+				<label class="imp">多国身份</label>
+				<view class="txt-left">
+					<ciy-selbool v-model="editdata.dualcitizen" y="存在" n="没有"></ciy-selbool>
+				</view>
+			</view>
+			<view class="ciy-form-bottom">
+				<button class="btn lg cc" @tap="submit">申请众识码</button>
+			</view>
+		</view>
+		<view class="ciy-tip"><ciy-markdown :md="init.tip"></ciy-markdown></view>
+	</view>
+</template>
+
+<style>
+</style>
+
+<script>
+	export default {
+		data() {
+			return {
+			}
+		},
+		onLoad() {
+			this.getinit();
+		},
+		methods: {
+			async getinit() {
+				await this.getauth('real');
+				this.editdata.dualcitizen = 2;
+				var retjson = await this.callfunc({
+					func: 'me.safe_ccub_init'
+				});
+				if (retjson.code != 1)
+					return this.alert(retjson.errmsg);
+				if (retjson.data && retjson.data.auditstatus == 100 && !this.me.cciy) {
+					this.me.cciy = retjson.data.cciy;
+					this.setstorage('me', this.me);
+					var app = getApp();
+					var page = app.getpage(1);
+					page.me = this.me;
+				}
+				this.init = retjson;
+			},
+			async submit(e) {
+				if (this.editdata.country.length < 1)
+					return this.toast('请输入主体国籍');
+				if (this._loading)
+					return;
+				this._loading = true;
+				var retjson = await this.callfunc({
+					func: 'me.safe_ccub_submit',
+					data: this.editdata
+				});
+				this._loading = false;
+				if (retjson.code != 1)
+					return this.alert(retjson.errmsg);
+				await this.toast('申请提交成功');
+				uni.navigateBack();
+			},
+		}
+	}
+</script>
\ No newline at end of file
diff --git a/fapp/ciyon_ap/pages/me/safe_password.vue b/fapp/ciyon_ap/pages/me/safe_password.vue
new file mode 100644
index 0000000..0e3271f
--- /dev/null
+++ b/fapp/ciyon_ap/pages/me/safe_password.vue
@@ -0,0 +1,64 @@
+<template>
+	<ciy-header title="修改密码"></ciy-header>
+	<view>
+		<view class="ciy-card char4">
+			<view class="content">
+				<view class="ciy-form" v-if="!me.needpass">
+					<label class="imp">旧密码</label>
+					<view>
+						<ciy-input v-model="editdata.oldpass" type="password" bb></ciy-input>
+					</view>
+				</view>
+				<view class="ciy-form">
+					<label class="imp">新密码</label>
+					<view>
+						<ciy-input v-model="editdata.newpass" type="password" bb></ciy-input>
+					</view>
+				</view>
+				<view class="ciy-form">
+					<label class="imp">再次输入</label>
+					<view>
+						<ciy-input v-model="editdata.repass" type="password" bb></ciy-input>
+					</view>
+				</view>
+				<view class="ciy-form-bottom">
+					<button class="btn lg cc" @tap="submit">修改密码</button>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<style>
+</style>
+
+<script>
+	export default {
+		data() {
+			return {}
+		},
+		onLoad() {},
+		methods: {
+			async submit() {
+				if (this.editdata.newpass.length < 1)
+					return this.toast('请输入新密码');
+				if (this.editdata.newpass != this.editdata.repass)
+					return this.toast('两次输入的新密码不同');
+				if (this._loading)
+					return;
+				this._loading = true;
+				var retjson = await this.callfunc({
+					func: 'me.safe_password_change',
+					data: this.editdata
+				});
+				this._loading = false;
+				if (retjson.code != 1)
+					return this.alert(retjson.errmsg);
+				this.me.needpass = false;
+				this.setstorage('me', this.me);
+				await this.toast('修改成功');
+				uni.navigateBack();
+			}
+		}
+	}
+</script>
\ No newline at end of file
diff --git a/fapp/ciyon_ap/pages/main/me_real.vue b/fapp/ciyon_ap/pages/me/safe_real.vue
similarity index 57%
rename from fapp/ciyon_ap/pages/main/me_real.vue
rename to fapp/ciyon_ap/pages/me/safe_real.vue
index e4b6c05..b27da67 100644
--- a/fapp/ciyon_ap/pages/main/me_real.vue
+++ b/fapp/ciyon_ap/pages/me/safe_real.vue
@@ -3,36 +3,73 @@
 	<view v-if="init.code != 1" class="px4 py4">
 		<view style="height:60vw;width:100%;" class="ciy-skeleton"></view>
 	</view>
+	<view v-else-if="me.truename" class="txt-center py4">
+		{{me.truename}}，已通过实名认证<br/>
+		{{tomsk(me.idid, '*#**')}}
+	</view>
 	<view v-else-if="init.data && init.data.auditstatus != 90">
 		<view class="ciy-tip" v-if="init.data.auditstatus == 20">您已提交申请，等待审核...</view>
 		<view class="ciy-tip" v-if="init.data.auditstatus == 50">您的申请正在审核中...</view>
 		<view class="ciy-tip" v-if="init.data.auditstatus == 100">您已申请通过</view>
 		<view class="ciy-list">
 			<view class="l1">{{init.data.name}}</view>
+<<<<<<< HEAD:fapp/ciyon_ap/pages/main/me_real.vue
 			<view class="l1">{{init.data.idid}}</view>
+=======
+			<view class="l1">{{tomsk(init.data.idid, '**###***')}}</view>
+>>>>>>> publish:fapp/ciyon_ap/pages/me/safe_real.vue
 			<view class="rb">{{todatetime(init.data.addtimes)}} 申请</view>
 		</view>
 	</view>
 	<view v-else>
-		<view class="ciy-tip" v-if="init.data && init.data.auditmsg">
+		<view class="ciy-tip" v-if="init.data?.auditmsg">
 			{{init.data.auditmsg}}
 		</view>
-		<!-- <view class="ciy-card">
+		<view class="ciy-card char4">
+			<view class="ciy-form" v-if="inputtype==2">
+				<label class="imp">人像面</label>
+				<view>
+					<ciy-upload left num="1" path="idid" v-model="editdata.idcard1" imgwidth="1600" sourcetype="camera,album,message"></ciy-upload>
+				</view>
+			</view>
+			<view class="ciy-form" v-if="inputtype==2">
+				<label class="imp">国徽面</label>
+				<view>
+					<ciy-upload left num="1" path="idid" v-model="editdata.idcard2" imgwidth="1600" sourcetype="camera,album,message"></ciy-upload>
+				</view>
+			</view>
+			<view class="ciy-form">
+				<label class="imp">实名姓名</label>
+				<view>
+					<ciy-input bb :disabled="inputtype!=2" v-model="editdata.name" ciystyle="width:6em;" type="text"></ciy-input>
+				</view>
+			</view>
+			<view class="ciy-form">
+				<label class="imp">身份证号</label>
+				<view>
+					<ciy-input bb :disabled="inputtype!=2" v-model="editdata.idid" type="idcard"></ciy-input>
+				</view>
+			</view>
+			<view class="ciy-form-bottom">
+				<button class="btn lg cc" @tap="submit">申请实名认证</button>
+			</view>
+			<view class="content" v-if="inputtype==1">
+				<label>摄像头拍摄身份证正面(人像面)，自动识别</label>
+				<view>
+					<ciy-aicameraocr ref="cameraocr" checkidcard="front" mode="idcard" @change="chgcameraocr"></ciy-aicameraocr>
+				</view>
+			</view>
+		</view>
+		<view v-if="inputtype==2" style="position: fixed;bottom: 3em;left: calc(50vw - 1.5em);">
+			<ciy-aivoice @change="chgvoice"></ciy-aivoice>
+		</view>
+		<view class="ciy-card" v-if="inputtype==3">
 			<view class="content">
 				<view class="ciy-form-bottom">
 					<button class="btn lg cc" @tap="readnfc">{{nfcwork==0?'手机贴近身份证识别':'停止NFC扫描'}}</button>
 				</view>
-				<view>
-					无需审核，立即完成实名认证。
-				</view>
-				<view v-if="nfcdata.name">
-					<view v-if="nfcdata.name">姓名 {{nfcdata.name}}</view>
-					<view v-if="nfcdata.idno">证号 {{nfcdata.idno}}</view>
-					<view class="ciy-form-bottom">
-						<button class="btn lg cc" @tap="autoreal">立即实名完成</button>
-					</view>
-				</view>
 			</view>
+<<<<<<< HEAD:fapp/ciyon_ap/pages/main/me_real.vue
 		</view> -->
 		<form @submit="submit" class="char4">
 			<view class="ciy-card">
@@ -60,6 +97,9 @@
 			</view>
 		</form>
 		<!-- <ciy-aivoice @change="chgvoice"></ciy-aivoice> -->
+=======
+		</view>
+>>>>>>> publish:fapp/ciyon_ap/pages/me/safe_real.vue
 	</view>
 </template>
 
@@ -70,10 +110,9 @@
 	export default {
 		data() {
 			return {
-				name: '',
-				idno: '',
+				inputtype: 0, //1拍照识别，2语音识别手动录入扫描件，3nfc刷卡识别
 				nfcdata: {},
-				nfcwork: 0
+				nfcwork: 0,
 			}
 		},
 		onLoad() {
@@ -81,58 +120,87 @@
 		},
 		methods: {
 			async getinit() {
-				var retjson = await this.callajax({
-					func: 'me.userreal_apply_get'
+				await this.getauth('info');
+				var app = getApp();
+				this.inputtype = 2;
+				var retjson = await this.callfunc({
+					func: 'me.safe_real_init'
 				});
 				this.init = retjson;
 				if (retjson.code != 1)
+<<<<<<< HEAD:fapp/ciyon_ap/pages/main/me_real.vue
 					return;
+=======
+					return this.alert(retjson.errmsg);
+>>>>>>> publish:fapp/ciyon_ap/pages/me/safe_real.vue
 				if (retjson.data && retjson.data.auditstatus == 100 && !this.me.truename) {
 					this.me.truename = retjson.data.name;
 					this.me.idid = retjson.data.idid;
 					this.setstorage('me', this.me);
+<<<<<<< HEAD:fapp/ciyon_ap/pages/main/me_real.vue
 					var app = getApp();
 					var page = app.getpage(1);
 					page.me = this.me;
+=======
+					var page = app.getpage(1);
+					page.me = this.me;
+				}
+				this.editdata.name = this.me.truename;
+				this.editdata.idid = this.me.idid;
+				if (this.inputtype == 1) {
+					setTimeout(() => {
+						this.getrefsSync('cameraocr').Step(1);
+					}, 500);
+>>>>>>> publish:fapp/ciyon_ap/pages/me/safe_real.vue
 				}
 				setTimeout(() => {
 					this.getrefsSync('cameraocr').Step(1);
 				}, 500);
 			},
 			async submit(e) {
+<<<<<<< HEAD:fapp/ciyon_ap/pages/main/me_real.vue
 				// e.detail.value.name = '张东';
 				// e.detail.value.idno = '152304200111157127';
 				if (e.detail.value.name.length < 1)
+=======
+				// this.editdata.name = '张东';
+				// this.editdata.idid = '152304200111157127';
+				if (this.editdata.name.length < 1)
+>>>>>>> publish:fapp/ciyon_ap/pages/me/safe_real.vue
 					return this.toast('请输入姓名');
-				if (e.detail.value.idno.length < 10)
+				if (this.editdata.idid.length < 10)
 					return this.toast('请输入身份证号');
 				if (this._loading)
 					return;
 				this._loading = true;
-				if (this.idimg) {
+				if (this.inputtype == 1 && this.idimg) {
 					var opn = {};
 					opn.basepath = 'idcard';
 					opn.stor = '/';
-					e.detail.value.idcard1 = await this.file_upload1(this.idimg, opn);
+					this.editdata.idcard1 = await this.file_upload1(this.idimg, opn);
 				}
-				var retjson = await this.callajax({
-					func: 'me.userreal_apply_submit',
-					data: e.detail.value
+				var retjson = await this.callfunc({
+					func: 'me.safe_real_submit',
+					data: this.editdata
 				});
 				this._loading = false;
 				if (retjson.code != 1)
 					return this.alert(retjson.errmsg);
-				await this.toast('申请已提交');
+				await this.toast('申请提交成功');
 				uni.navigateBack();
 			},
+<<<<<<< HEAD:fapp/ciyon_ap/pages/main/me_real.vue
 			async chgidcard(e) {
+=======
+			async chgcameraocr(e) {
+>>>>>>> publish:fapp/ciyon_ap/pages/me/safe_real.vue
 				console.log(e);
 				this.idimg = e.tempimg;
 				if (this._loading)
 					return this.toast('请稍后再试');
 				this._loading = true;
-				var retjson = await this.callajax({
-					func: 'ai.aidecision',
+				var retjson = await this.callfunc({
+					func: 'ciyai.aidecision',
 					data: {
 						id: 3,
 						idcardocr: e.txts.join('\n')
@@ -141,8 +209,25 @@
 				this._loading = false;
 				if (retjson.code != 1)
 					return this.alert(retjson.errmsg);
-				this.name = retjson.ai.name;
-				this.idno = retjson.ai.idno;
+				this.editdata.name = retjson.ai.name;
+				this.editdata.idno = retjson.ai.idno;
+			},
+			async chgvoice(e) {
+				//按住说话，调用@change，界面上调用大模型给出合理结果，自动填写姓名和身份证号
+				//简单的文字，用字符串匹配先试试。
+				var retjson = await this.callfunc({
+					func: 'ciyai.aidecision',
+					data: {
+						id: 4,
+						voicetxt: e.txt
+					}
+				});
+				if (retjson.code != 1)
+					return this.alert(retjson.errmsg);
+				if (retjson.ai.name)
+					this.editdata.name = retjson.ai.name;
+				if (retjson.ai.idno)
+					this.editdata.idid = retjson.ai.idno;
 			},
 			async readnfc() {
 				var ciynfc = res => {
@@ -162,8 +247,10 @@
 							console.log('connect', res);
 							nfc.transceive({
 								data: buffer,
-								success(res) {
+								success: (res) => {
 									console.log('transecive', res);
+									this.editdata.name = res.nfcdata.name;
+									this.editdata.idid = res.nfcdata.idno;
 								},
 								fail(res) {
 									console.log('transecive fail', res);
@@ -202,23 +289,6 @@
 				//res.id = ArrayBuffer(8) {byteLength: 8, maxByteLength: 8, resizable: false, detached: false}
 				//res.techs = ['NFC-B']
 			},
-			async chgvoice(e) {
-				//按住说话，调用@change，界面上调用大模型给出合理结果，自动填写姓名和身份证号
-				//简单的文字，用字符串匹配先试试。
-				var retjson = await this.callajax({
-					func: 'ai.aidecision',
-					data: {
-						id: 4,
-						voicetxt: e.txt
-					}
-				});
-				if (retjson.code != 1)
-					return this.alert(retjson.errmsg);
-				if (retjson.ai.name)
-					this.name = retjson.ai.name;
-				if (retjson.ai.idno)
-					this.idno = retjson.ai.idno;
-			}
 		}
 	}
 </script>
\ No newline at end of file
diff --git a/fapp/ciyon_ap/pages/main/me_qrcode.vue b/fapp/ciyon_ap/pages/me/share_qrcode.vue
similarity index 88%
rename from fapp/ciyon_ap/pages/main/me_qrcode.vue
rename to fapp/ciyon_ap/pages/me/share_qrcode.vue
index 73eaa51..2b6ed63 100644
--- a/fapp/ciyon_ap/pages/main/me_qrcode.vue
+++ b/fapp/ciyon_ap/pages/me/share_qrcode.vue
@@ -24,8 +24,8 @@
 		},
 		methods: {
 			async getinit() {
-				var retjson = await this.callajax({
-					func: 'me.getqrcode',
+				var retjson = await this.callfunc({
+					func: 'me.share_qrcode_get',
 					data: {}
 				});
 				if (retjson.code != 1)
diff --git a/fapp/ciyon_ap/pages/main/me_suggest.vue b/fapp/ciyon_ap/pages/me/suggest.vue
similarity index 56%
rename from fapp/ciyon_ap/pages/main/me_suggest.vue
rename to fapp/ciyon_ap/pages/me/suggest.vue
index 6d59669..9d4f5ba 100644
--- a/fapp/ciyon_ap/pages/main/me_suggest.vue
+++ b/fapp/ciyon_ap/pages/me/suggest.vue
@@ -6,33 +6,31 @@
 		<view class="ciy-skeleton" style="height:6em;width:100%;"></view>
 	</view>
 	<view v-else>
-		<form @submit="submit">
-			<view class="ciy-card">
-				<view class="content char4">
-					<view class="ciy-form v">
-						<label class="imp">意见建议</label>
-						<view>
-							<ciy-textarea name="content" type="text" bb ciystyle="min-height:5em"></ciy-textarea>
-						</view>
-					</view>
-					<view class="ciy-form">
-						<label>图片截图</label>
-						<view>
-							<ciy-upload left num="8" path="suggest" name="imgs" imgwidth="1600" sourcetype="camera,album,message"></ciy-upload>
-						</view>
-					</view>
-					<view class="ciy-form">
-						<label>联系方式</label>
-						<view>
-							<ciy-input name="contract" type="text" bb></ciy-input>
-						</view>
-					</view>
-					<view class="ciy-form-bottom">
-						<button class="btn lg cc" form-type="submit">提交</button>
+		<view class="ciy-card">
+			<view class="content char4">
+				<view class="ciy-form v">
+					<label class="imp">意见建议</label>
+					<view>
+						<ciy-textarea v-model="editdata.content" type="text" bb ciystyle="min-height:5em"></ciy-textarea>
 					</view>
 				</view>
+				<view class="ciy-form">
+					<label>图片截图</label>
+					<view>
+						<ciy-upload left num="5" path="suggest" v-model="editdata.imgs" imgwidth="1600" sourcetype="camera,album,message"></ciy-upload>
+					</view>
+				</view>
+				<view class="ciy-form">
+					<label>联系方式</label>
+					<view>
+						<ciy-input v-model="editdata.contract" type="text" bb></ciy-input>
+					</view>
+				</view>
+				<view class="ciy-form-bottom">
+					<button class="btn lg cc" @tap="submit">提交</button>
+				</view>
 			</view>
-		</form>
+		</view>
 		<view class="ciy-list" v-for="(item,index) in init.list" :key="item.id">
 			<view class="l2" v-html="tobr(item.content)"></view>
 			<ciy-showimgs :src="item.imgs" label="图片截图"></ciy-showimgs>
@@ -40,7 +38,7 @@
 			<template v-if="item.replytimes > 0">
 				<view class="ciy-hr my4"></view>
 				<view class="l2 ciy-tip" v-html="tobr(item.replymsg)"></view>
-			<view class="rt" style="color:var(--succ5)">已答复</view>
+				<view class="rt" style="color:var(--succ5)">已答复</view>
 			</template>
 			<view class="rt" v-else>未答复</view>
 			<view class="rb">{{todatetime(item.addtimes)}}</view>
@@ -54,15 +52,15 @@
 <script>
 	export default {
 		data() {
-			return {
-			}
+			return {}
 		},
 		onLoad() {
+			this.editdata.contract = this.me.mobile;
 			this.getinit();
 		},
 		methods: {
 			async getinit() {
-				var retjson = await this.callajax({
+				var retjson = await this.callfunc({
 					func: 'me.suggest_get',
 					data: {}
 				});
@@ -71,19 +69,20 @@
 				this.init = retjson;
 			},
 			async submit(e) {
-				if (e.detail.value.content.length < 5)
+				if (this.editdata.content.length < 5)
 					return this.toast('内容至少输入5个字');
-
+				if (this._loading)
+					return;
 				this._loading = true;
-				var retjson = await this.callajax({
+				var retjson = await this.callfunc({
 					func: 'me.suggest_submit',
-					data: e.detail.value
+					data: this.editdata
 				});
 				this._loading = false;
 				if (retjson.code != 1)
 					return this.alert(retjson.errmsg);
-				await this.toast('已提交');
-				uni.navigateBack();
+				this.init.list.unshift(retjson.data);
+				await this.toast('提交成功');
 			}
 		}
 	}
diff --git a/fapp/ciyon_ap/pages/me/user_bank.vue b/fapp/ciyon_ap/pages/me/user_bank.vue
new file mode 100644
index 0000000..42710df
--- /dev/null
+++ b/fapp/ciyon_ap/pages/me/user_bank.vue
@@ -0,0 +1,90 @@
+<template>
+	<ciy-header title="收款银行"></ciy-header>
+	<view class="ciy-card char3">
+		<view class="ciy-form">
+			<label class="imp">账户名称</label>
+			<view>
+				<ciy-input v-model="editdata.bankaccount" type="text" bb></ciy-input>
+			</view>
+			<view class="flexnone" style="padding-left:1em" @tap="editdata.bankaccount=me.truename">
+				{{me.truename}}
+			</view>
+		</view>
+		<view class="ciy-form">
+			<label class="imp">银行账号</label>
+			<view>
+				<ciy-input v-model="editdata.bankno" type="text" bb></ciy-input>
+			</view>
+		</view>
+		<view class="ciy-form">
+			<label class="imp">开户银行</label>
+			<view>
+				<ciy-input v-model="editdata.bankname" type="text" bb></ciy-input>
+			</view>
+		</view>
+		<view class="ciy-form">
+			<label>联行号</label>
+			<view>
+				<ciy-input v-model="editdata.bankcode" type="text" bb></ciy-input>
+			</view>
+		</view>
+
+		<view class="ciy-tip">实名认证人【{{me.truename}}】
+			<br />账户名称与实名不一致，需为对公账户。
+			<br />对公账户收款(含提现)，需开具发票。
+			<br />个人银行账户收款，平台代缴个税。
+		</view>
+		<view class="ciy-form-bottom">
+			<button class="btn lg cc" @tap="submit">设置收款信息</button>
+		</view>
+	</view>
+</template>
+
+<style>
+</style>
+
+<script>
+	export default {
+		data() {
+			return {}
+		},
+		onLoad() {
+			this.getauth('real');
+			this.editdata.bankaccount = this.me.bankaccount;
+			this.editdata.bankno = this.me.bankno;
+			this.editdata.bankname = this.me.bankname;
+			this.editdata.bankcode = this.me.bankcode;
+		},
+		methods: {
+			async submit(e) {
+				if (!this.editdata.bankaccount)
+					return this.toast('请输入账户名称');
+				if (!this.editdata.bankno)
+					return this.toast('请输入银行账号');
+				if (!this.editdata.bankname)
+					return this.toast('请输入开户银行');
+				//对公账户，再次确认。
+				if (this.me.truename != this.editdata.bankaccount) {
+					if (await this.askmsg(this.editdata.bankaccount + '\n请确认该账户为对公账户？\n对公账户提现需开具发票', '是对公户') != 'ok')
+						return;
+				}
+
+				this._loading = true;
+				var retjson = await this.callfunc({
+					func: 'me.user_bank_change',
+					data: this.editdata
+				});
+				this._loading = false;
+				if (retjson.code != 1)
+					return this.alert(retjson.errmsg);
+				this.me.bankno = this.editdata.bankno;
+				this.me.bankname = this.editdata.bankname;
+				this.me.bankaccount = this.editdata.bankaccount;
+				this.me.bankcode = this.editdata.bankcode;
+				this.setstorage('me', this.me);
+				await this.toast('设置成功');
+				uni.navigateBack();
+			}
+		}
+	}
+</script>
\ No newline at end of file
diff --git a/fapp/ciyon_ap/pages/me/user_info.vue b/fapp/ciyon_ap/pages/me/user_info.vue
new file mode 100644
index 0000000..50770ff
--- /dev/null
+++ b/fapp/ciyon_ap/pages/me/user_info.vue
@@ -0,0 +1,102 @@
+<template>
+	<ciy-header title="本人信息"></ciy-header>
+	<view class="ciy-card char3">
+		<view class="content char4">
+			<view class="ciy-form">
+				<label class="imp">姓名称呼</label>
+				<view>
+					<ciy-input bb v-model="editdata.name" type="nickname"></ciy-input>
+				</view>
+			</view>
+			<view class="ciy-form">
+				<label>头像</label>
+				<view>
+					<ciy-upload left v-model="editdata.icon" path="icon" imgwidth="400" imgheight="400" camheight="100" sourcetype="rehcam,album,message"></ciy-upload>
+				</view>
+				<!-- #ifdef MP-WEIXIN -->
+				<view>
+					<button class="btn sm" open-type="chooseAvatar" @chooseavatar="wxavar">从微信获取</button>
+				</view>
+				<!-- #endif -->
+			</view>
+			<view class="ciy-form">
+				<label class="imp">手机号</label>
+				<view>
+					<ciy-input bb v-model="editdata.mobile" type="text"></ciy-input>
+				</view>
+			</view>
+			<view class="ciy-form">
+				<label>微信</label>
+				<view>
+					<ciy-input bb v-model="editdata.wxno" type="text"></ciy-input>
+				</view>
+			</view>
+			<view class="ciy-form">
+				<label>电子信箱</label>
+				<view>
+					<ciy-input bb v-model="editdata.email" type="text"></ciy-input>
+				</view>
+			</view>
+			<view class="ciy-form-bottom">
+				<button class="btn lg cc" @tap="submit">更新个人信息</button>
+			</view>
+		</view>
+	</view>
+</template>
+
+<style>
+</style>
+
+<script>
+	export default {
+		data() {
+			return {}
+		},
+		onLoad() {
+			this.editdata = {
+				...this.me
+			};
+		},
+		methods: {
+			async wxavar(e) {
+				var app = getApp();
+				var opn = {};
+				opn.post = {
+					from: 'avar'
+				};
+				opn.path = 'icon';
+				opn.stor = app.globalData.storselect;
+				opn.maxkb = 0;
+				opn.imgwidth = 400;
+				opn.imgheight = 400;
+				opn.zipjpg = 70;
+				this.me.icon = await this.file_upload1(e.detail.avatarUrl, opn);
+			},
+			async submit() {
+				if (!this.editdata.name)
+					return this.toast('请输入姓名称呼');
+				if (!this.editdata.mobile)
+					return this.toast('请输入手机号');
+				if (this.editdata.name[0] == ':')
+					return this.toast('姓名称呼不能以:开头');
+
+				this._loading = true;
+				var retjson = await this.callfunc({
+					func: 'me.user_info_change',
+					data: this.editdata
+				});
+				this._loading = false;
+				if (retjson.code != 1)
+					return this.alert(retjson.errmsg);
+				this.me.name = this.editdata.name;
+				this.me.icon = this.editdata.icon;
+				this.me.mobile = this.editdata.mobile;
+				this.me.wxno = this.editdata.wxno;
+				this.me.email = this.editdata.email;
+				this.setstorage('me', this.me);
+				await this.toast('修改成功');
+				uni.navigateBack();
+			}
+		}
+	}
+</script>
\ No newline at end of file
diff --git a/fapp/ciyon_ap/pages/main/me_shipaddr.vue b/fapp/ciyon_ap/pages/me/user_shipaddr.vue
similarity index 93%
rename from fapp/ciyon_ap/pages/main/me_shipaddr.vue
rename to fapp/ciyon_ap/pages/me/user_shipaddr.vue
index e2124a8..065ef04 100644
--- a/fapp/ciyon_ap/pages/main/me_shipaddr.vue
+++ b/fapp/ciyon_ap/pages/me/user_shipaddr.vue
@@ -7,18 +7,18 @@
 		<view class="ciy-skeleton" style="height:6em;width:100%;"></view>
 	</view>
 	<view v-else>
-		<view class="ciy-list" :class="{selected:opn.sel&&item.id==opn.id,del:item._clas=='del'}" v-for="(item,index) in init.list" :key="item.id" @click="select(item.id)">
+		<view class="ciy-list" :class="{selected:opn.sel&&item.id==opn.id,del:item._del}" v-for="(item,index) in init.list" :key="item.id" @tap="select(item.id)">
 			<view class="l2">收件人 {{item.name}}</view>
 			<view class="l2">联系电话 {{item.phone}}</view>
 			<view class="l2">{{mcode(g.ciy_arearpc,item.areacode,'name').join(' . ')}}</view>
 			<view class="l2">{{item.addr}}</view>
-			<view class="dot" @click="showmenu(index)"></view>
+			<view class="dot" @tap.stop="showmenu(index)"></view>
 		</view>
 		<view style="height:5em;"></view>
 		<view class="ciy-add" style="z-index:41;" @tap="editshow()"></view>
 		<view v-if="opn.sel">
 			<view class="bg1 txt-center py4 ciy-bottom">
-				<button class="btn lg" @click="selectok">选定</button>
+				<button class="btn lg" @tap="selectok">选定</button>
 			</view>
 		</view>
 		<ciy-anipop v-model="popedit" :zindex="998" maskbg="#00000077" :title="edit.id>0?'更新地址':'新建地址'">
@@ -52,7 +52,7 @@
 						<view>
 							<ciy-input name="addr" v-model="edit.addr" bb ciystyle="margin-right:0.5em;"></ciy-input>
 						</view>
-						<view style="flex:none;display: block;line-height: 1em;font-size: 0.7em;text-align: center;margin-right: 1em;" @click="getloc">
+						<view style="flex:none;display: block;line-height: 1em;font-size: 0.7em;text-align: center;margin-right: 1em;" @tap="getloc">
 							<i class="iconloc"></i><br />
 							定位
 						</view>
@@ -113,8 +113,8 @@
 				if (this._loading)
 					return;
 				this._loading = true;
-				var retjson = await this.callajax({
-					func: 'me.shipaddr_get'
+				var retjson = await this.callfunc({
+					func: 'me.user_shipaddr_list'
 				});
 				this._loading = false;
 				if (retjson.code != 1)
@@ -171,8 +171,8 @@
 				if (this._loading)
 					return;
 				this._loading = true;
-				var retjson = await this.callajax({
-					func: 'me.shipaddr_edit',
+				var retjson = await this.callfunc({
+					func: 'me.user_shipaddr_edit',
 					data: e.detail.value
 				});
 				this._loading = false;
@@ -188,15 +188,15 @@
 			async del(item) {
 				if (await this.askmsg('是否删除？') != 'ok')
 					return;
-				var retjson = await this.callajax({
-					func: 'me.shipaddr_del',
+				var retjson = await this.callfunc({
+					func: 'me.user_shipaddr_del',
 					data: {
 						id: item.data.id
 					}
 				});
 				if (retjson.code != 1)
 					return this.alert(retjson.errmsg);
-				this.init.list[item.data._idx]._clas = 'del';
+				this.init.list[item.data._idx]._del = true;
 				setTimeout(() => {
 					this.init.list.splice(item.data._idx, 1);
 				}, 500);
diff --git a/fapp/ciyon_ap/pages/pub/camera.vue b/fapp/ciyon_ap/pages/pub/camera.vue
index 9510191..7905d23 100644
--- a/fapp/ciyon_ap/pages/pub/camera.vue
+++ b/fapp/ciyon_ap/pages/pub/camera.vue
@@ -30,7 +30,7 @@
 		onUnload() {
 			var postparam = {};
 			postparam.id = this.opn.id;
-			var retjson = this.callajax({
+			var retjson = this.callfunc({
 				func: 'pub.imgend',
 				data: postparam
 			});
@@ -47,7 +47,7 @@
 				postparam.id = this.opn.id;
 				postparam.txts = e.txts.join('\n');
 				postparam.img = await this.file_upload1(e.tempimg, opn);
-				var retjson = await this.callajax({
+				var retjson = await this.callfunc({
 					func: 'pub.imgadd',
 					data: postparam
 				});
diff --git a/fapp/ciyon_ap/pages/main/paper.vue b/fapp/ciyon_ap/pages/pub/paper.vue
similarity index 92%
rename from fapp/ciyon_ap/pages/main/paper.vue
rename to fapp/ciyon_ap/pages/pub/paper.vue
index 03c329d..c995495 100644
--- a/fapp/ciyon_ap/pages/main/paper.vue
+++ b/fapp/ciyon_ap/pages/pub/paper.vue
@@ -28,8 +28,8 @@
 		computed: {},
 		methods: {
 			async getinit() {
-				var retjson = await this.callajax({
-					func: 'index.paper',
+				var retjson = await this.callfunc({
+					func: 'main.paper_get',
 					data: this.opn
 				});
 				if (retjson.code != 1)
diff --git a/fapp/ciyon_ap/pages/main/part.vue b/fapp/ciyon_ap/pages/pub/part.vue
similarity index 73%
rename from fapp/ciyon_ap/pages/main/part.vue
rename to fapp/ciyon_ap/pages/pub/part.vue
index 099e7a5..5b22008 100644
--- a/fapp/ciyon_ap/pages/main/part.vue
+++ b/fapp/ciyon_ap/pages/pub/part.vue
@@ -17,13 +17,11 @@
 			<ciy-markdown :md="init.data.content"></ciy-markdown>
 		</scroll-view>
 		<view class="bg2" style="border-top:1px solid var(--bg5)">
-			<form @submit="submitsend">
-				<view class="flex flex-center">
-					<!-- <view><button class="btn def" @tap="sendimg">图片</button></view> -->
-					<view class="flex1"><ciy-textarea name="content" v-model="content" ciystyle="min-height:1em;padding:0.5em"></ciy-textarea></view>
-					<view><button form-type="submit" :disabled="init.vent" class="btn">吐槽</button></view>
-				</view>
-			</form>
+			<view class="flex flex-center">
+				<!-- <view><button class="btn def" @tap="sendimg">图片</button></view> -->
+				<view class="flex1"><ciy-textarea v-model="editdata.content" ciystyle="min-height:1em;padding:0.5em"></ciy-textarea></view>
+				<view><button @tap="submitsend" :disabled="init.vent" class="btn">吐槽</button></view>
+			</view>
 		</view>
 		<view class="bg2" :style="{height:footer_safe_height+'px'}"></view>
 	</view>
@@ -35,8 +33,7 @@
 <script>
 	export default {
 		data() {
-			return {
-			}
+			return {}
 		},
 		onLoad() {
 			this.getinit();
@@ -53,8 +50,8 @@
 		computed: {},
 		methods: {
 			async getinit() {
-				var retjson = await this.callajax({
-					func: 'index.art_read',
+				var retjson = await this.callfunc({
+					func: 'main.part_init',
 					data: this.pagepost
 				});
 				if (retjson.code != 1)
@@ -66,22 +63,21 @@
 					return;
 				this._hot = true;
 				this.pagepost.sec = this.tostamp() - this.readtimes;
-				this.callajax({
-					func: 'index.art_hot',
+				this.callfunc({
+					func: 'main.part_hot',
 					data: this.pagepost
 				});
 			},
-			async submitsend(e) {
-				if (!e.detail.value.content)
+			async submitsend() {
+				if (!this.editdata.content)
 					return this.toast('请输入内容');
-				e.detail.value.sectionid = this.init.section.id;
-				e.detail.value.id = this.opn.id;
 				if (this._loading)
 					return;
+				this.editdata.sectionid = this.init.section.id;
 				this._loading = true;
-				var retjson = await this.callajax({
-					func: 'index.art_vent',
-					data: e.detail.value
+				var retjson = await this.callfunc({
+					func: 'main.part_vent',
+					data: this.editdata
 				});
 				this._loading = false;
 				if (retjson.code != 1)
diff --git a/fapp/ciyon_ap/pages/main/psection.vue b/fapp/ciyon_ap/pages/pub/psection.vue
similarity index 85%
rename from fapp/ciyon_ap/pages/main/psection.vue
rename to fapp/ciyon_ap/pages/pub/psection.vue
index 445de9a..701f6dd 100644
--- a/fapp/ciyon_ap/pages/main/psection.vue
+++ b/fapp/ciyon_ap/pages/pub/psection.vue
@@ -1,5 +1,5 @@
 <template>
-	<ciy-header :title="init.code==1?init.once.section.name:'加载中'" ref="header"></ciy-header>
+	<ciy-header :title="init.code==1?init.section.name:'加载中'" ref="header"></ciy-header>
 	<view v-if="init.code != 1" class="px4 py4">
 		<view class="ciy-skeleton" style="height:2em;width:100%;"></view>
 		<view class="ciy-skeleton" style="height:8em;width:100%;"></view>
@@ -10,7 +10,7 @@
 			<ciy-searchbar placeholder="请输入关键字" @confirm="search_change"></ciy-searchbar>
 		</view>
 		<view class="ciy-list" v-for="(item,index) in init.list" :key="item.id">
-			<ciy-svgimg :src="item.img"></ciy-svgimg>
+			<ciy-svgimg v-if="item.img" :src="item.img"></ciy-svgimg>
 			<view class="l1 txt-wb" @tap="gourl" :data-url="'part?id=' + item.id">{{item.name}}</view>
 			<view class="l3" v-html="tobr(item.descs)"></view>
 		</view>
@@ -24,9 +24,7 @@
 <script>
 	export default {
 		data() {
-			return {
-				pageno: 0,
-			}
+			return {}
 		},
 		onLoad() {
 			this.getlist();
@@ -47,13 +45,13 @@
 			async getlist() {
 				if (this.pageno < 0)
 					return;
-				this.pagepost.pageno = this.pageno + 1;
-				this.pagepost.once = !this.init.once;
 				if (this._loading)
 					return;
+				this.pagepost.pageno = this.pageno + 1;
+				this.pagepost.once = !this.init.once;
 				this._loading = true;
-				var retjson = await this.callajax({
-					func: 'index.section_get',
+				var retjson = await this.callfunc({
+					func: 'main.psection_list',
 					data: this.pagepost
 				});
 				this._loading = false;
@@ -67,7 +65,7 @@
 					this.pageno = -1;
 			},
 			search_change(e) {
-				this.pagepost.query.key = e.value;
+				this.pagepost.key = e.value;
 				this.pageno = 0;
 				this.getlist();
 			},
diff --git a/fapp/ciyon_ap/pages/pub/web.vue b/fapp/ciyon_ap/pages/pub/web.vue
index 7c47773..8b4a12c 100644
--- a/fapp/ciyon_ap/pages/pub/web.vue
+++ b/fapp/ciyon_ap/pages/pub/web.vue
@@ -14,6 +14,7 @@
 		},
 		onLoad() {
 			this.web = decodeURIComponent(this.opn.web);
+			var app = getApp();
 			// #ifdef APP-PLUS
 			setTimeout(() => {
 				var currentWebview = this.$scope.$getAppWebview();
@@ -21,7 +22,7 @@
 				var top = this.header_statusbar_height + this.header_title_height;
 				wv.setStyle({
 					top: top,
-					height: this.sysinfo.screenHeight - top
+					height: app.globalData._sysinfo.screenHeight - top
 				});
 				this.name = wv.getTitle();
 			}, 500);
diff --git a/fapp/ciyon_ap/util/ciy.js b/fapp/ciyon_ap/util/ciy.js
index 7dab1cf..498edec 100644
--- a/fapp/ciyon_ap/util/ciy.js
+++ b/fapp/ciyon_ap/util/ciy.js
@@ -15,7 +15,7 @@ app函数库
  
  app&page函数库
  * getme			获取本地me缓存
- * callajax			(await)服务端ajax请求
+ * callfunc			(await)服务端ajax请求
  * lang				多语言
  * uperr			错误捕获处理
  * json_parse		字符串转json
@@ -122,7 +122,6 @@ page默认数据
  * jsnurl			指向动态服务器(多个)。默认t
  * header_*			页面边角尺寸
  * footer_*			页面边角尺寸
- * sysinfo			systemInfo缓存
 
 */
 export default {
@@ -286,7 +285,7 @@ export default {
 			}
 			return '';
 		};
-		app.methods.callajax = async function(opt) {
+		app.methods.callfunc = async function(opt) {
 			//成功{code:1,...}
 			//失败{errmsg:'错误信息'}
 			//func				
@@ -348,7 +347,9 @@ export default {
 				var header = {};
 				header['ciyauth'] = app.getstorage("_" + app.globalData.tokenfield);
 				opt.data = opt.data || {};
-				opt.data._pf = 'MB';
+				opt.data._pf = 'MB' + new Date().getTime() + '_' + parseInt(80000000 + Math.random() * 10000000);
+				if (app.globalData._wxappid)
+					opt.data._appid = app.globalData._wxappid;
 				if (opt.pagethis)
 					opt.data = Object.assign({}, opt.pagethis.opn, opt.data);
 				uni.request({
@@ -449,12 +450,6 @@ export default {
 		};
 		app.methods.setuserstorage = function(json) {
 			var app = this;
-			if (json.me.name) {
-				if (json.me.name[0] == ':') {
-					json.me.neednick = true;
-					json.me.name = json.me.name.substring(1);
-				}
-			}
 			app.setstorage("me", json.me);
 			var pnttrack = app.getstorage('_pnttrack', {});
 			if (!(pnttrack instanceof Object))
@@ -524,7 +519,7 @@ export default {
 			var app = this;
 			// #ifdef APP-PLUS
 			plus.runtime.getProperty(plus.runtime.appid, async widgetInfo => {
-				app.callajax({
+				app.callfunc({
 					func: 'login.getappver',
 					cache: 0,
 					showload: false,
@@ -600,126 +595,6 @@ export default {
 			// }
 			btdev.bt_devopen(deviceid);
 		};
-		app.methods.CiyWebSocket = function(addr) {
-			var app = getApp();
-			var thos = this;
-			this.buffer = new Array(); //发送数据缓冲区
-			this.reOpenData = [2, 5, 3, 5, 5, 3, 5, 8, 10, 20, 30, 30]; //断线重连，每次间隔时间/秒
-			this.reOpen = 0; //断线重连次数
-			this.keepAliveTimer = setInterval(function() {
-				console.log('keep');
-				try {
-					if (thos.wsock && thos.wsock.readyState !== 1) {
-						thos.reOpenSec--;
-						if (thos.reOpenSec <= 0) {
-							thos.reOpen++;
-							thos.reOpenSec = 10;
-							thos.open();
-						}
-						return;
-					}
-					if (thos.buffer.length > 0) {
-						var data = thos.buffer.pop();
-						thos.send(data);
-					} else {
-						if (new Date().getTime() - thos.last_health_time >= 15000 && thos.wsock
-							.readyState === 1) {
-							thos.wsock.send({
-								data: 'h'
-							});
-							thos.last_health_time = new Date().getTime();
-						}
-					}
-				} catch (err) {
-					app.uperr("app.ws.error", err);
-				}
-			}, 1000);
-			this.setOpenSec = function() {
-				(thos.reOpen < thos.reOpenData.length) ? thos.reOpenSec = thos.reOpenData[thos.reOpen]: thos
-					.reOpenSec = 90; //断线重试太多后的间隔时间
-			}
-			this.open = function() {
-				try {
-					if (thos.wsock && thos.wsock.trueClose)
-						return;
-					thos.setOpenSec();
-					if (thos.wsock) {
-						if (thos.wsock.readyState == 1)
-							return;
-						thos.wsock.close();
-					}
-					thos.wsock = uni.connectSocket({
-						url: addr,
-						complete: () => {}
-					});
-					thos.wsock.onOpen(function(event) {
-						try {
-							thos.reOpen = 0;
-							thos.last_health_time = new Date().getTime();
-							if (typeof(thos.onopen) == "function")
-								thos.onopen(event);
-						} catch (err) {
-							app.uperr('app.ws.onopen', err);
-						}
-					});
-					thos.wsock.onMessage(function(e) {
-						try {
-							if (typeof(thos.onmessage) == "function")
-								thos.onmessage(e);
-						} catch (err) {
-							app.uperr('app.ws.onmessage', err);
-						}
-					});
-					thos.wsock.onClose(function(e) {
-						try {
-							if (thos.wsock.trueClose) {
-								clearInterval(thos.keepAliveTimer);
-								return;
-							}
-							thos.setOpenSec();
-							if (typeof(thos.onclose) == "function")
-								thos.onclose(e);
-						} catch (err) {
-							app.uperr('app.ws.onclose', err);
-						}
-					});
-					thos.wsock.onError(function(e) {
-						try {
-							thos.setOpenSec();
-							if (typeof(thos.onerror) == "function")
-								thos.onerror(e);
-						} catch (err) {
-							app.uperr('app.ws.onerror', err);
-						}
-					});
-				} catch (err) {
-					console.log(app, err);
-					app.uperr('app.ws.open', err);
-				}
-			}
-			this.send = function(msg) {
-				try {
-					if (this.wsock === undefined || this.wsock.trueClose)
-						return false;
-					if (this.wsock.readyState !== 1 || this.wsock.bufferedAmount > 0)
-						this.buffer.push(msg);
-					else {
-						this.wsock.send({
-							data: msg
-						});
-						this.last_health_time = new Date().getTime();
-					}
-					return true;
-				} catch (err) {
-					app.uperr('app.ws.send', err);
-				}
-			}
-			this.close = function(send) {
-				this.wsock.trueClose = true;
-				this.wsock.close();
-			}
-			this.open();
-		};
 		app.methods.getstorage = function(key, def) {
 			def = def || '';
 			var x = uni.getStorageSync(key);
@@ -759,9 +634,8 @@ export default {
 					header_title_margin: 0, //顶部标题栏左右留白(正好躲过胶囊，且可使文字居中)
 					footer_safe_height: 0, //底部安全高度(躲过刘海屏、底部横线等)
 					pageclass: 'dark',
+					editdata: {},
 					pagedata: {}, //外部g.page_init
-					sysinfo: {},
-					version: '',
 					isPage: false,
 					jsnurl: {},
 					pageno: 0,
@@ -807,8 +681,6 @@ export default {
 				this.header_title_margin = app.globalData._header_title_margin;
 				this.footer_safe_height = app.globalData._footer_safe_height;
 				this.pagedata = app.globalData.ciy_page_data;
-				this.version = app.globalData._version;
-				this.sysinfo = app.globalData._sysinfo;
 				this.jsnurl = app.globalData.jsnurl;
 				//this.constant = {maxtimes: 9999999999999};
 				this.me = this.getme();
@@ -841,9 +713,9 @@ export default {
 					console.log('showe', e);
 					return '';
 				},
-				callajax(opt) {
+				callfunc(opt) {
 					opt.pagethis = this;
-					return getApp().callajax(opt);
+					return getApp().callfunc(opt);
 				},
 				calltxt(opt) {
 					return new Promise((resolve, reject) => {
@@ -919,7 +791,7 @@ export default {
 					if (typeof(b) != 'string') {
 						url = b.currentTarget.dataset.url;
 						if (!initdata) {
-							initdata = b.currentTarget.dataset.init;
+							initdata = b.currentTarget.dataset.data;
 						}
 						if (!initkey) {
 							initkey = b.currentTarget.dataset.key;
@@ -1000,10 +872,11 @@ export default {
 						animationDuration: 1000
 					});
 				},
-				goloc(lat, lng) {
+				goloc(lat, lng, bet) {
+					bet = bet || 10000000;
 					uni.openLocation({
-						latitude: this.tofloat(lat),
-						longitude: this.tofloat(lng)
+						latitude: this.tofloat(lat) / bet,
+						longitude: this.tofloat(lng) / bet
 					});
 				},
 				gophone(phone) {
@@ -1393,14 +1266,9 @@ export default {
 					return '.' + m2;
 				},
 				tocciy(cciy) {
-					if (!cciy)
+					if (!cciy) //cciy必须为字符串，否则js无法处理
 						return '';
-					var hex = cciy.toString(16).toUpperCase();
-					hex = hex.substring(hex.length - 12);
-					hex = hex.replace(/^0+/, '');
-					if (hex.length < 7)
-						hex = '0'.repeat(7 - hex.length) + hex;
-					return 'cx...' + hex.substring(0, hex.length - 1);
+					return 'cx' + cciy.substring(0, 1) + '...' + cciy.substring(cciy.length - 6);
 				},
 				tostr(obj) {
 					if (!obj)
@@ -1515,7 +1383,7 @@ export default {
 						var inde = num.split('.');
 						if (inde[1] && /^0+$/.test(inde[1]))
 							return inde[0];
-						return num;
+						return num.replace(/\.?0+$/, '');
 					}
 					num = num.toFixed(length);
 					return num;
@@ -1651,7 +1519,8 @@ export default {
 					} else {
 						theme = this.getstorage('_theme');
 						if (!theme) {
-							if (this.sysinfo.theme == 'dark')
+							var app = getApp();
+							if (app.globalData._sysinfo.theme == 'dark')
 								theme = 'dark';
 						}
 					}
@@ -1678,11 +1547,12 @@ export default {
 				},
 				setfont(font) {
 					// 空，lg  xl   xxl   xxl
+					var app = getApp();
 					if (!font) {
 						font = this.getstorage('_font');
 						if (!font) {
 							font = 'def';
-							var fsize = this.sysinfo.fontSizeSetting * this.sysinfo.fontSizeScaleFactor;
+							var fsize = app.globalData._sysinfo.fontSizeSetting * app.globalData._sysinfo.fontSizeScaleFactor;
 							if (fsize >= 20 && fsize < 30)
 								font = 'lg';
 							if (fsize >= 30 && fsize < 40)
@@ -1707,7 +1577,7 @@ export default {
 						fontsize = this.toint(font);
 					if (fontsize < 20)
 						fontsize = 30;
-					var fz = (fontsize / 750 * this.sysinfo.windowWidth) + 'px';
+					var fz = (fontsize / 750 * app.globalData._sysinfo.windowWidth) + 'px';
 					this.meta.styles['font-size'] = fz;
 					this.meta.style = Object.keys(this.meta.styles).map(key => key + ':' + this.meta.styles[key]).join(';') + ';';
 					this.meta.fontsize = fz;
@@ -1733,8 +1603,8 @@ export default {
 						post = {};
 					post.id = pntid;
 					this.setstorage('_pnttrack', pnttrack);
-					this.callajax({
-						func: 'me.pnt_up',
+					this.callfunc({
+						func: 'main.pnt_up',
 						loadhide: true,
 						data: post
 					}).then(res => {
@@ -1765,7 +1635,7 @@ export default {
 					});
 				},
 
-				async getauth(must) {
+				async getauth(type) {
 					return new Promise((resolve, reject) => {
 						this.$nextTick(() => {
 							this.getrefs('auth').then(ref => {
@@ -1774,8 +1644,32 @@ export default {
 										return resolve(auth);
 									this.me = auth.me;
 									this.g = this.objdeepmerge(this.g, this.getstorage('g', {}));
+									if (type == 'info' && !this.me.name) {
+										this.alert('请先填写个人信息').then(() => {
+											uni.redirectTo({
+												url: 'user_info'
+											});
+										});
+										return;
+									}
+									if (type == 'real' && !this.me.truename) {
+										this.alert('请进行实名认证').then(() => {
+											uni.redirectTo({
+												url: 'safe_real'
+											});
+										});
+										return;
+									}
+									if (type == 'bank' && !this.me.bankname) {
+										this.alert('请填写银行信息').then(() => {
+											uni.redirectTo({
+												url: 'user_bank'
+											});
+										});
+										return;
+									}
 									resolve(auth);
-								}, must);
+								}, type == 'relogin');
 							});
 						});
 					}).catch(e => {
@@ -2357,8 +2251,8 @@ export default {
 							if (err)
 								return fn.fail('h5Image Load Error', gf, err);
 							var [width, height] = setimgrect(img);
-							var zipjpg = this.tofloat(opn.zipjpg);
-							if (width == 0 && this.isfloat0(zipjpg) && !opn.watertext)
+							var zipjpg = this.toint(opn.zipjpg);
+							if (width == 0 && zipjpg == 0 && !opn.watertext)
 								return uploadpfile(gf);
 							if (width == 0) {
 								width = img.width;
@@ -2375,9 +2269,9 @@ export default {
 							canvas.setAttributeNode(attrh);
 							ctx.drawImage(img, 0, 0, width, height);
 							waterctx(ctx, width, height);
-							if (zipjpg < 0.0001)
-								zipjpg = 0.7;
-							var dataurl = canvas.toDataURL("image/jpeg", zipjpg);
+							if (zipjpg == 0)
+								zipjpg = 70;
+							var dataurl = canvas.toDataURL("image/jpeg", zipjpg / 100);
 							var b64s = dataurl.split(",");
 							var b64type = b64s[0].match(/:(.*?);/)[1];
 							var ab = atob(b64s[1]);
@@ -2399,8 +2293,8 @@ export default {
 								return fn.fail('getImageInfo Error:' + fpath,
 									gf, err);
 							var [width, height] = setimgrect(img);
-							var zipjpg = this.tofloat(opn.zipjpg);
-							if (width == 0 && this.isfloat0(zipjpg) && !opn.watertext)
+							var zipjpg = this.toint(opn.zipjpg);
+							if (width == 0 && zipjpg == 0 && !opn.watertext)
 								return uploadpfile(gf);
 							if (width == 0) {
 								width = img.width;
@@ -2424,11 +2318,11 @@ export default {
 							ctx.drawImage(image, 0, 0, width, height);
 							waterctx(ctx, width, height);
 							if (zipjpg <= 0)
-								zipjpg = 0.7;
+								zipjpg = 70;
 							var res = await uni.canvasToTempFilePath({
 								canvas: canvas,
 								fileType: 'jpg',
-								quality: zipjpg
+								quality: zipjpg / 100
 							});
 							gf.tempFilePath = res.tempFilePath;
 							fs.getFileInfo({
@@ -2573,7 +2467,7 @@ export default {
 							if (typeof(fn.success) == 'function')
 								fn.success(jsonup.url, gf);
 						} else {
-							var [err, s3json] = await this.go(this.callajax({
+							var [err, s3json] = await this.go(this.callfunc({
 								func: opn.action + "s3&pathfile=" + pathfile +
 									"&storselect=" + opn.stor
 							}));
diff --git a/fapp/ciyon_ap/util/style.css b/fapp/ciyon_ap/util/style.css
index 1efe589..d6e9b57 100644
--- a/fapp/ciyon_ap/util/style.css
+++ b/fapp/ciyon_ap/util/style.css
@@ -65,6 +65,7 @@ card			bg3
 
 
 	/* 主色 */
+	--man2: #e1f6ff;
 	--man3: #a6d2fa;
 	--man4: #80c1f3;
 	--man5: #1E9FFF;
@@ -879,7 +880,6 @@ text {
 .md-h1 {
 	font-weight: bold;
 	font-size: 1.2em;
-	margin-left: 0.3em;
 	line-height: 1.5em;
 	text-align: left;
 	padding: 0.5em 0 0.5em 0.5em;
@@ -888,7 +888,6 @@ text {
 .md-h2 {
 	font-weight: bold;
 	font-size: 1.1em;
-	margin-left: 0.4em;
 	line-height: 1.8em;
 	padding: 0.5em 0 0.5em 0.5em;
 }
@@ -898,7 +897,6 @@ text {
 .md-h5 {
 	font-weight: bold;
 	font-size: 1em;
-	margin-left: 0.5em;
 	line-height: 1.5em;
 	padding: 0.5em 0 0.5em 0.5em;
 }
@@ -963,6 +961,10 @@ text {
 	text-decoration: underline;
 }
 
+.txt-del.txt-del.txt-del {
+	text-decoration: line-through;
+}
+
 .txt-left.txt-left.txt-left {
 	text-align: left;
 }
diff --git a/fapp/ciyon_ap/util/websocket.js b/fapp/ciyon_ap/util/websocket.js
new file mode 100644
index 0000000..a5f2903
--- /dev/null
+++ b/fapp/ciyon_ap/util/websocket.js
@@ -0,0 +1,122 @@
+var websocket = function(addr) {
+	var app = getApp();
+	var thos = this;
+	this.buffer = new Array(); //发送数据缓冲区
+	this.reOpenData = [2, 5, 3, 5, 5, 3, 5, 8, 10, 20, 30, 30]; //断线重连，每次间隔时间/秒
+	this.reOpen = 0; //断线重连次数
+	this.keepAliveTimer = setInterval(function() {
+		console.log('keep');
+		try {
+			if (thos.wsock && thos.wsock.readyState !== 1) {
+				thos.reOpenSec--;
+				if (thos.reOpenSec <= 0) {
+					thos.reOpen++;
+					thos.reOpenSec = 10;
+					thos.open();
+				}
+				return;
+			}
+			if (thos.buffer.length > 0) {
+				var data = thos.buffer.pop();
+				thos.send(data);
+			} else {
+				if (new Date().getTime() - thos.last_health_time >= 15000 && thos.wsock
+					.readyState === 1) {
+					thos.wsock.send({
+						data: 'h'
+					});
+					thos.last_health_time = new Date().getTime();
+				}
+			}
+		} catch (err) {
+			app.uperr("app.ws.error", err);
+		}
+	}, 1000);
+	this.setOpenSec = function() {
+		(thos.reOpen < thos.reOpenData.length) ? thos.reOpenSec = thos.reOpenData[thos.reOpen]: thos
+			.reOpenSec = 90; //断线重试太多后的间隔时间
+	}
+	this.open = function() {
+		try {
+			if (thos.wsock && thos.wsock.trueClose)
+				return;
+			thos.setOpenSec();
+			if (thos.wsock) {
+				if (thos.wsock.readyState == 1)
+					return;
+				thos.wsock.close();
+			}
+			thos.wsock = uni.connectSocket({
+				url: addr,
+				complete: () => {}
+			});
+			thos.wsock.onOpen(function(event) {
+				try {
+					thos.reOpen = 0;
+					thos.last_health_time = new Date().getTime();
+					if (typeof(thos.onopen) == "function")
+						thos.onopen(event);
+				} catch (err) {
+					app.uperr('app.ws.onopen', err);
+				}
+			});
+			thos.wsock.onMessage(function(e) {
+				try {
+					if (typeof(thos.onmessage) == "function")
+						thos.onmessage(e);
+				} catch (err) {
+					app.uperr('app.ws.onmessage', err);
+				}
+			});
+			thos.wsock.onClose(function(e) {
+				try {
+					if (thos.wsock.trueClose) {
+						clearInterval(thos.keepAliveTimer);
+						return;
+					}
+					thos.setOpenSec();
+					if (typeof(thos.onclose) == "function")
+						thos.onclose(e);
+				} catch (err) {
+					app.uperr('app.ws.onclose', err);
+				}
+			});
+			thos.wsock.onError(function(e) {
+				try {
+					thos.setOpenSec();
+					if (typeof(thos.onerror) == "function")
+						thos.onerror(e);
+				} catch (err) {
+					app.uperr('app.ws.onerror', err);
+				}
+			});
+		} catch (err) {
+			console.log(app, err);
+			app.uperr('app.ws.open', err);
+		}
+	}
+	this.send = function(msg) {
+		try {
+			if (this.wsock === undefined || this.wsock.trueClose)
+				return false;
+			if (this.wsock.readyState !== 1 || this.wsock.bufferedAmount > 0)
+				this.buffer.push(msg);
+			else {
+				this.wsock.send({
+					data: msg
+				});
+				this.last_health_time = new Date().getTime();
+			}
+			return true;
+		} catch (err) {
+			app.uperr('app.ws.send', err);
+		}
+	}
+	this.close = function(send) {
+		this.wsock.trueClose = true;
+		this.wsock.close();
+	}
+	this.open();
+};
+
+export default websocket
\ No newline at end of file
diff --git a/fapp/ciyon_ap/vite.config.js b/fapp/ciyon_ap/vite.config.js
index 58f357d..9c20def 100644
--- a/fapp/ciyon_ap/vite.config.js
+++ b/fapp/ciyon_ap/vite.config.js
@@ -14,6 +14,7 @@ const htmlPlugin_ciy = () => {
 				pft += '<ciy-auth ref="auth"></ciy-auth>'; //暂时只做微信生态
 				pft += '<ciy-alert ref="alert"></ciy-alert>';
 				pft += '<ciy-toast ref="toast"></ciy-toast>';
+				//pft += '<ciy-dbg ref="dbg"></ciy-dbg>';
 				pft += '<ciy-popmenu ref="popmenu"></ciy-popmenu>';
 
 				let pfb = '</view>';
diff --git a/web/admin/ap/api.php b/web/admin/ap/api.php
index 6c2d33e..de58dc5 100644
--- a/web/admin/ap/api.php
+++ b/web/admin/ap/api.php
@@ -24,7 +24,7 @@ class api {
         $rows = $db->get($csql, $mainrowcount);
         if ($rows === false)
             return errjson($db->error);
-        $ret = array('where' => $where, 'pageno' => $pageno, 'pagecount' => $pagecount, 'count' => $mainrowcount, 'list' => $rows);
+        $ret = array('searchwhere' => $where, 'pageno' => $pageno, 'pagecount' => $pagecount, 'count' => $mainrowcount, 'list' => $rows);
         if ($post->getbool('field')) {
             $field = array();
             $fshow = $db->getfield($field, 'ap_api');
@@ -38,9 +38,9 @@ class api {
             $ret['fshow'] = $fshow;
         }
         if ($post->getbool('once')) {
-            $ret['once'] = array();
+            $ret['once'] = true;
             $input = array();
-            $ret['once']['input'] = $input;
+            $ret['searchinput'] = $input;
         }
         return succjson($ret);
     }
diff --git a/web/admin/ap/art_post.html b/web/admin/ap/art_post.html
index 27cca82..b3a5b48 100644
--- a/web/admin/ap/art_post.html
+++ b/web/admin/ap/art_post.html
@@ -105,7 +105,7 @@
             </div>
             <div class="ciy-form col-24 col-sm-24 top">
                 <div>
-                    <ciy-markdown com="content" imgwidth="1200" zipjpg="0.6" />
+                    <ciy-markdown com="content" imgwidth="1200" zipjpg="60" />
                 </div>
             </div>
         </div>
diff --git a/web/admin/ap/art_post.php b/web/admin/ap/art_post.php
index 78523d5..5112273 100644
--- a/web/admin/ap/art_post.php
+++ b/web/admin/ap/art_post.php
@@ -34,7 +34,7 @@ class art_post {
         $rows = $db->get($csql, $mainrowcount);
         if ($rows === false)
             return errjson($db->error);
-        $ret = array('where' => $where, 'pageno' => $pageno, 'pagecount' => $pagecount, 'count' => $mainrowcount, 'list' => $rows);
+        $ret = array('searchwhere' => $where, 'pageno' => $pageno, 'pagecount' => $pagecount, 'count' => $mainrowcount, 'list' => $rows);
         if ($post->getbool('field')) {
             $field = array();
             $fshow = $db->getfield($field, 'ap_art_post');
@@ -47,7 +47,7 @@ class art_post {
             $ret['fshow'] = $fshow;
         }
         if ($post->getbool('once')) {
-            $ret['once'] = array();
+            $ret['once'] = true;
             $input = array();
             $input[] = array('type' => 'input', 'form' => 'name', 'name' => '文章标题', 'prop' => ' style="width:8em;"');
             $input[] = array('type' => 'input', 'form' => 'source', 'name' => '来源', 'prop' => ' style="width:8em;"');
@@ -56,7 +56,7 @@ class art_post {
             $input[] = array('type' => 'select', 'form' => 'inputuser', 'name' => '撰写人', 'all' => '全部', 'select' => 'adminuser');
             $input[] = array('type' => 'select', 'form' => 'audituser', 'name' => '审核人', 'all' => '全部', 'select' => 'adminuser');
             $input[] = array('type' => 'daterange', 'form' => 'pubtimes', 'name' => '发布时间');
-            $ret['once']['input'] = $input;
+            $ret['searchinput'] = $input;
         }
         return succjson($ret);
     }
diff --git a/web/admin/ap/art_section.php b/web/admin/ap/art_section.php
index 0a7d20a..3a49d8d 100644
--- a/web/admin/ap/art_section.php
+++ b/web/admin/ap/art_section.php
@@ -28,7 +28,7 @@ class art_section {
         $rows = $db->get($csql, $mainrowcount);
         if($rows === false)
             return errjson($db->error);
-        $ret = array('where' => $where, 'pageno' => $pageno, 'pagecount' => $pagecount, 'count' => $mainrowcount, 'list' => $rows);
+        $ret = array('searchwhere' => $where, 'pageno' => $pageno, 'pagecount' => $pagecount, 'count' => $mainrowcount, 'list' => $rows);
         if ($post->getbool('field')) {
             $field = array();
             $fshow = $db->getfield($field, 'ap_art_section');
@@ -41,13 +41,13 @@ class art_section {
             $ret['fshow'] = $fshow;
         }
         if ($post->getbool('once')) {
-            $ret['once'] = array();
+            $ret['once'] = true;
             $input = array();
             $input[] = array('type' => 'input', 'form' => 'ngroup', 'name' => '分组名', 'prop' => ' style="width:8em;"');
             $input[] = array('type' => 'input', 'form' => 'name', 'name' => '版块名称', 'prop' => ' style="width:8em;"');
             $input[] = array('type' => 'input', 'form' => 'artcnt', 'name' => '文章数', 'prop' => ' style="width:8em;"');
             $input[] = array('type' => 'select', 'form' => 'adminuser', 'name' => '责任人', 'all' => '全部', 'select' => 'adminuser');
-            $ret['once']['input'] = $input;
+            $ret['searchinput'] = $input;
         }
         return succjson($ret);
     }
diff --git a/web/admin/ap/art_vent.html b/web/admin/ap/art_vent.html
index eeed30c..1e9c7da 100644
--- a/web/admin/ap/art_vent.html
+++ b/web/admin/ap/art_vent.html
@@ -81,7 +81,7 @@
         function menubtn(dom, btn) {
             var id = $5(dom).parent('tr').attr('data-id');
             if (btn == 'read') {
-                ciyfn.callfastfunc(dom, '是否已读?', 'read', { ids: id }, function (json) { table.updateline(json) });
+                ciyfn.callfastfunc(dom, '', 'read', { ids: id }, function (json) { table.updateline(json) });
             }
         }
 
diff --git a/web/admin/ap/art_vent.php b/web/admin/ap/art_vent.php
index e1fdeb9..fa9ad90 100644
--- a/web/admin/ap/art_vent.php
+++ b/web/admin/ap/art_vent.php
@@ -57,7 +57,7 @@ class art_vent {
         $rows = $db->get($csql, $mainrowcount);
         if ($rows === false)
             return errjson($db->error);
-        $ret = array('where' => $where, 'pageno' => $pageno, 'pagecount' => $pagecount, 'count' => $mainrowcount, 'list' => $rows);
+        $ret = array('searchwhere' => $where, 'pageno' => $pageno, 'pagecount' => $pagecount, 'count' => $mainrowcount, 'list' => $rows);
         if ($post->getbool('field')) {
             $field = array();
             $fshow = $db->getfield($field, 'ap_art_vent');
@@ -70,14 +70,14 @@ class art_vent {
             $ret['fshow'] = $fshow;
         }
         if ($post->getbool('once')) {
-            $ret['once'] = array();
+            $ret['once'] = true;
             $input = array();
             $input[] = array('type' => 'input', 'form' => 'artid', 'name' => '文章', 'prop' => ' style="width:8em;"');
             $input[] = array('type' => 'input', 'form' => 'vuser', 'name' => '所属用户', 'prop' => ' style="width:8em;"');
             $input[] = array('type' => 'input', 'form' => 'content', 'name' => '内容', 'prop' => ' style="width:8em;"');
             $input[] = array('type' => 'daterange', 'form' => 'pubtimes', 'name' => '反馈时间');
             $input[] = array('type' => 'select', 'form' => 'audituser', 'name' => '审核人', 'all' => '全部', 'select' => 'adminuser');
-            $ret['once']['input'] = $input;
+            $ret['searchinput'] = $input;
         }
         $ret['ap_art_section'] = getrelation($db, $rows, 'ap_art_section', 'sectionid');
         $ret['ap_art_post'] = getrelation($db, $rows, 'ap_art_post', 'artid');
diff --git a/web/admin/ap/banner.php b/web/admin/ap/banner.php
index c12574f..8b3777d 100644
--- a/web/admin/ap/banner.php
+++ b/web/admin/ap/banner.php
@@ -22,7 +22,7 @@ class banner {
         $csql->limit($pageno, $pagecount);
         $mainrowcount = $post->getint('count');
         $rows = $db->get($csql, $mainrowcount);
-        $ret = array('where' => $where, 'pageno' => $pageno, 'pagecount' => $pagecount, 'count' => $mainrowcount, 'list' => $rows);
+        $ret = array('searchwhere' => $where, 'pageno' => $pageno, 'pagecount' => $pagecount, 'count' => $mainrowcount, 'list' => $rows);
         if ($post->getbool('field')) {
             $field = array();
             $fshow = $db->getfield($field, 'ap_banner');
@@ -35,11 +35,11 @@ class banner {
             $ret['fshow'] = $fshow;
         }
         if ($post->getbool('once')) {
-            $ret['once'] = array();
+            $ret['once'] = true;
             $input = array();
             $input[] = array('type' => 'input', 'form' => 'groupcode', 'name' => '组别代码', 'prop' => ' style="width:6em;"' );
             $input[] = array('type' => 'input', 'form' => 'url', 'name' => '链接', 'prop' => ' style="width:8em;"' );
-            $ret['once']['input'] = $input;
+            $ret['searchinput'] = $input;
         }
         return succjson($ret);
     }
diff --git a/web/admin/ap/cash_ie.php b/web/admin/ap/cash_ie.php
index e8c8163..2ac9a43 100644
--- a/web/admin/ap/cash_ie.php
+++ b/web/admin/ap/cash_ie.php
@@ -42,7 +42,7 @@ class cash_ie {
         $rows = $db->get($csql, $mainrowcount);
         if($rows === false)
             return errjson($db->error);
-        $ret = array('where' => $where, 'pageno' => $pageno, 'pagecount' => $pagecount, 'count' => $mainrowcount, 'list' => $rows);
+        $ret = array('searchwhere' => $where, 'pageno' => $pageno, 'pagecount' => $pagecount, 'count' => $mainrowcount, 'list' => $rows);
         if ($post->getbool('field')) {
             $field = array();
             $fshow = $db->getfield($field, 'ap_cash_ie');
@@ -54,13 +54,13 @@ class cash_ie {
             $ret['fshow'] = $fshow;
         }
         if ($post->getbool('once')) {
-            $ret['once'] = array();
+            $ret['once'] = true;
             $input = array();
             $input[] = array('type' => 'input', 'form' => 'vuser', 'name' => '所属用户', 'prop' => ' style="width:8em;"');
             $input[] = array('type' => 'num', 'form' => 'iemoney', 'name' => '金额', 'prop' => ' style="width:4em;"');
             $input[] = array('type' => 'daterange', 'form' => 'addtimes', 'name' => '发生时间');
             $input[] = array('type' => 'input', 'form' => 'name', 'name' => '摘要', 'prop' => ' style="width:8em;"');
-            $ret['once']['input'] = $input;
+            $ret['searchinput'] = $input;
         }
         $ret['ap_user'] = getrelation($db, $rows, 'ap_user', 'vuser');
         return succjson($ret);
diff --git a/web/admin/ap/cash_in.php b/web/admin/ap/cash_in.php
index 59735f4..59eefcd 100644
--- a/web/admin/ap/cash_in.php
+++ b/web/admin/ap/cash_in.php
@@ -44,7 +44,7 @@ class cash_in {
         $rows = $db->get($csql, $mainrowcount);
         if($rows === false)
             return errjson($db->error);
-        $ret = array('where' => $where, 'pageno' => $pageno, 'pagecount' => $pagecount, 'count' => $mainrowcount, 'list' => $rows);
+        $ret = array('searchwhere' => $where, 'pageno' => $pageno, 'pagecount' => $pagecount, 'count' => $mainrowcount, 'list' => $rows);
         if ($post->getbool('field')) {
             $field = array();
             $fshow = $db->getfield($field, 'ap_cash_in');
@@ -56,13 +56,13 @@ class cash_in {
             $ret['fshow'] = $fshow;
         }
         if ($post->getbool('once')) {
-            $ret['once'] = array();
+            $ret['once'] = true;
             $input = array();
             $input[] = array('type' => 'input', 'form' => 'vuser', 'name' => '所属用户', 'prop' => ' style="width:8em;"');
             $input[] = array('type' => 'num', 'form' => 'cashmoney', 'name' => '金额', 'prop' => ' style="width:4em;"');
             $input[] = array('type' => 'daterange', 'form' => 'addtimes', 'name' => '发生时间');
             $input[] = array('type' => 'input', 'form' => 'name', 'name' => '摘要', 'prop' => ' style="width:8em;"');
-            $ret['once']['input'] = $input;
+            $ret['searchinput'] = $input;
         }
         $ret['ap_user'] = getrelation($db, $rows, 'ap_user', 'vuser');
         return succjson($ret);
diff --git a/web/admin/ap/cash_out_1.html b/web/admin/ap/cash_out_apply.html
similarity index 93%
rename from web/admin/ap/cash_out_1.html
rename to web/admin/ap/cash_out_apply.html
index 591151f..57fe476 100644
--- a/web/admin/ap/cash_out_1.html
+++ b/web/admin/ap/cash_out_apply.html
@@ -66,8 +66,7 @@
                     ciyfn.fillsearch({
                         searchdom: '.search'
                         , data: json
-                        , liall: '全部'
-                        , lidata: 'cashstatus'
+                        , lidata: ':申请中,20:已通过,90:已拒绝,100:已完成'
                         , liclick: function (dom) {
                             table.search(dom, 'li');
                         }
@@ -75,9 +74,13 @@
                     return json;
                 }
                 , fn_tdcontent: function (key, datashow, field, data) {
+                    if (key == 'taxmoney') {
+                        if(data[key] == -1)
+                            return '对公';
+                    }
                     if (key == '_btn') {
                         var html = '';
-                        if(data['cashstatus'] < 100)
+                        if(data['cashstatus'] == 10)
                             html += `<a class="lang btn dag" onclick="menubtn(this, 'reject')">拒绝</a>`;
                         return html;
                     }
@@ -95,12 +98,6 @@
             if (btn == 'reject') {
                 reject(id);
             }
-            if (btn == 'sub') {
-                ciyfn.sendsignal(window.top, 'manage_ifropen', {
-                    url: 'xxx.html?_xxxid=' + id
-                    , name: '提现记录<code>' + table.data[id].name + '</code>'
-                });
-            }
         }
 
         function getdata(id, act, cb) {
diff --git a/web/admin/ap/cash_out_1.php b/web/admin/ap/cash_out_apply.php
similarity index 88%
rename from web/admin/ap/cash_out_1.php
rename to web/admin/ap/cash_out_apply.php
index 68258e6..98d6e95 100644
--- a/web/admin/ap/cash_out_1.php
+++ b/web/admin/ap/cash_out_apply.php
@@ -2,13 +2,15 @@
 
 namespace web\admin\ap;
 
-class cash_out_1 {
+class cash_out_apply {
     static function setwhere($db, $post) {
         $query = $post->get('query');
         $csql = new \ciy\sql('ap_cash_out');
         $liid = objint($query, 'liid');
         if ($liid > 0)
             $csql->where('cashstatus', $liid);
+        else
+            $csql->where('cashstatus=10');
         $val = objstr($query, 'vuser');
         if (!empty($val)) {
             $csqlt = new \ciy\sql('ap_user');
@@ -43,7 +45,7 @@ class cash_out_1 {
         $rows = $db->get($csql, $mainrowcount);
         if ($rows === false)
             return errjson($db->error);
-        $ret = array('where' => $where, 'pageno' => $pageno, 'pagecount' => $pagecount, 'count' => $mainrowcount, 'list' => $rows);
+        $ret = array('searchwhere' => $where, 'pageno' => $pageno, 'pagecount' => $pagecount, 'count' => $mainrowcount, 'list' => $rows);
         if ($post->getbool('field')) {
             $field = array();
             $fshow = $db->getfield($field, 'ap_cash_out');
@@ -56,14 +58,14 @@ class cash_out_1 {
             $ret['fshow'] = $fshow;
         }
         if ($post->getbool('once')) {
-            $ret['once'] = array();
+            $ret['once'] = true;
             $input = array();
             $input[] = array('type' => 'input', 'form' => 'vuser', 'name' => '所属用户', 'prop' => ' style="width:8em;"');
             $input[] = array('type' => 'select', 'form' => 'cashtype', 'name' => '提现方式', 'all' => '全部', 'select' => '独立纳税.个人微信');
             $input[] = array('type' => 'num', 'form' => 'cashmoney', 'name' => '金额', 'prop' => ' style="width:4em;"');
             $input[] = array('type' => 'daterange', 'form' => 'addtimes', 'name' => '申请时间');
             $input[] = array('type' => 'input', 'form' => 'cashno', 'name' => '支付编号', 'prop' => ' style="width:8em;"');
-            $ret['once']['input'] = $input;
+            $ret['searchinput'] = $input;
         }
         $ret['ap_user'] = getrelation($db, $rows, 'ap_user', 'vuser');
         return succjson($ret);
@@ -86,16 +88,27 @@ class cash_out_1 {
         $csql = new \ciy\sql('ap_cash_out');
         $csql->where('id in', $ids);
         $rows = $db->get($csql);
-        $updata = array();
         $ids = array();
         try {
             $db->begin();
             foreach ($rows as $row) {
-                if ($row['cashstatus'] != 10 && $row['cashstatus'] != 90 && $row['cashstatus'] != 20)
+                if ($row['cashstatus'] != 10)
                     continue;
+                if ($act == 2) { //退余额
+                    $updata = array();
+                    $updata['mycashmoney'] = array('mycashmoney+' . $row['cashmoney']);
+                    $csql = new \ciy\sql('ap_user');
+                    $csql->where('id', $row['vuser']);
+                    if ($db->update($csql, $updata) === false)
+                        throw new \Exception('更新账户失败:' . $db->error);
+                }
                 $id = $row['id'];
+                $updata = array();
                 if ($act == 1) {
-                    $updata['cashstatus'] = 20;
+                    if ($row['cashtype'] == 1)
+                        $updata['cashstatus'] = 50;
+                    else
+                        $updata['cashstatus'] = 20;
                 } else {
                     $updata['cashstatus'] = 90;
                     $updata['auditmsg'] = $auditmsg;
@@ -105,7 +118,6 @@ class cash_out_1 {
                 if ($db->update($csql, $updata) === false)
                     throw new \Exception('更新失败:' . $db->error);
                 $updata['id'] = $id;
-                savelogdb($db, $rsuser['id'], 'ap_cash_out', $row, $updata);
                 $ids[] = $id;
             }
             $db->commit();
@@ -135,11 +147,11 @@ class cash_out_1 {
         try {
             $db->begin();
             foreach ($rows as $row) {
-                if ($row['cashstatus'] != 10 && $row['cashstatus'] != 90)
+                if ($row['cashstatus'] < 90)
+                    continue;
+                if ($row['addtimes'] > time() - 86400 * 30)
                     continue;
                 $delid = $row['id'];
-                //delcheck($db, $delid, 'tablexx', 'xxid', '管理员');
-                //delall($db, $delid, 'tablexx', 'xxid', '运动员');  //deltimeall
                 delme($db, $delid, 'ap_cash_out');
                 savelogdb($db, $rsuser['id'], 'ap_cash_out', $row, null);
                 $vids[] = $delid;
diff --git a/web/admin/ap/usr_invoicing.html b/web/admin/ap/cash_out_inv.html
similarity index 55%
rename from web/admin/ap/usr_invoicing.html
rename to web/admin/ap/cash_out_inv.html
index af2317e..e5b6c54 100644
--- a/web/admin/ap/usr_invoicing.html
+++ b/web/admin/ap/cash_out_inv.html
@@ -30,54 +30,19 @@
                     <a class="lang btn def" onclick="ciyfn.select_diff(table)">反选</a>
                     |
                     <a class="lang btn dag" onclick="ciyfn.select_callfunc(table, this, 'del','已选{n}条，是否批量删除?', {},function(json){table.delline(json)})">批量删除</a>
+                    <a class="lang btn" onclick="ciyfn.select_callfunc(table, this, 'audit','已选{n}条，是否批量通过?', {act:1},function(json){table.updateline(json)})">批量通过</a>
                 </div>
                 <div class="page"></div>
             </div>
         </div>
     </div>
 
-    <div id="alert_edit" style="display:none;">
+    <div id="alert_reject" style="display:none;">
         <div class="char4 row">
-            <div class="ciy-form col-24 col-sm-12">
-                <label class="lang">名称</label>
-                <div>
-                    <div wit="name"></div>
-                </div>
-            </div>
-            <div class="ciy-form col-24 col-sm-12">
-                <label class="lang">税号</label>
-                <div>
-                    <div wit="taxnumber"></div>
-                </div>
-            </div>
-            <div class="ciy-form col-24 col-sm-12">
-                <label class="lang">单位地址</label>
-                <div>
-                    <div wit="addr"></div>
-                </div>
-            </div>
-            <div class="ciy-form col-24 col-sm-12">
-                <label class="lang">电话号码</label>
-                <div>
-                    <div wit="phone"></div>
-                </div>
-            </div>
-            <div class="ciy-form col-24 col-sm-12">
-                <label class="lang">银行名称</label>
-                <div>
-                    <div wit="bankname"></div>
-                </div>
-            </div>
-            <div class="ciy-form col-24 col-sm-12">
-                <label class="lang">银行账号</label>
-                <div>
-                    <div wit="bankaccount"></div>
-                </div>
-            </div>
             <div class="ciy-form col-24 col-sm-24">
-                <label class="lang imp">发票</label>
+                <label class="lang">拒绝原因</label>
                 <div>
-                    <ciy-upload com="invfile" num="3" type="jpg,png,webp,pdf,zip,rar,docx,xlsx,pptx" />
+                    <input type="text" name="auditmsg" style="width:100%;" />
                 </div>
             </div>
         </div>
@@ -101,7 +66,7 @@
                     ciyfn.fillsearch({
                         searchdom: '.search'
                         , data: json
-                        , lidata: [{ id: '', name: '全部' }, { id: '1', name: '待开票' }, { id: '2', name: '已开票' }]
+                        , lidata: ':发票审核,50:发票合规,90:已拒绝'
                         , liclick: function (dom) {
                             table.search(dom, 'li');
                         }
@@ -109,10 +74,14 @@
                     return json;
                 }
                 , fn_tdcontent: function (key, datashow, field, data) {
+                    if (key == 'taxmoney') {
+                        if(data[key] == -1)
+                            return '对公';
+                    }
                     if (key == '_btn') {
                         var html = '';
-                        if(data.invtimes == 0)
-                            html += `<a class="lang btn" onclick="menubtn(this, 'edit')">开票</a>`;
+                        if(data['cashstatus'] == 30)
+                            html += `<a class="lang btn dag" onclick="menubtn(this, 'reject')">拒收</a>`;
                         return html;
                     }
                 }
@@ -126,14 +95,8 @@
         });
         function menubtn(dom, btn) {
             var id = $5(dom).parent('tr').attr('data-id');
-            if (btn == 'edit') {
-                edit(id);
-            }
-            if (btn == 'sub') {
-                ciyfn.sendsignal(window.top, 'manage_ifropen', {
-                    url: 'xxx.html?_xxxid=' + id
-                    , name: '发票开票<code>' + table.data[id].name + '</code>'
-                });
+            if (btn == 'reject') {
+                reject(id);
             }
         }
 
@@ -141,36 +104,28 @@
             cb({ data: id == 0 ? {} : table.data[id] });
         }
 
-        function edit(id) {
-            getdata(id, 'edit', function (jsndat) {
+        function reject(id) {
+            getdata(id, 'reject', function (jsndat) {
                 ciyfn.alert({
-                    title: '修改'
+                    title: '拒收'
                     , width: 'pc'
-                    , content: document.getElementById("alert_edit").innerHTML
+                    , content: document.getElementById("alert_reject").innerHTML
                     //, noparent:true
                     , fn_showed: function (doc, dom) {
-                        var dat = jsndat.data;
-                        var path = ciyfn.makeuploadpath('usr_invoicing', ciyfn.getstorage(ciy_vars.tokenfield));
-                        $5('[wit=name]', dom).html(ciyfn.tdshow(dat.name, table.field.name.ext, dat, table.once, table.json, true));
-                        $5('[wit=taxnumber]', dom).html(ciyfn.tdshow(dat.taxnumber, table.field.taxnumber.ext, dat, table.once, table.json, true));
-                        $5('[wit=addr]', dom).html(ciyfn.tdshow(dat.addr, table.field.addr.ext, dat, table.once, table.json, true));
-                        $5('[wit=phone]', dom).html(ciyfn.tdshow(dat.phone, table.field.phone.ext, dat, table.once, table.json, true));
-                        $5('[wit=bankname]', dom).html(ciyfn.tdshow(dat.bankname, table.field.bankname.ext, dat, table.once, table.json, true));
-                        $5('[wit=bankaccount]', dom).html(ciyfn.tdshow(dat.bankaccount, table.field.bankaccount.ext, dat, table.once, table.json, true));
-                        ciycmp({ dom: $5('[com=invfile]', dom), value: dat.invfile, path: path });
                     }
                     , cb: function (opn) {
                         if (opn.btn == "关闭")
                             return opn.close();
-                        opn.inputs.id = id;
+                        opn.inputs.ids = id;
+                        opn.inputs.act = 2;
                         if (ciyfn.throttle(opn.dombtn)) return;
-                        ciyfn.callfunc('update', opn.inputs, function (json) {
+                        ciyfn.callfunc('audit', opn.inputs, function (json) {
                             table.updateline(json);
                             opn.close();
                             ciyfn.toast('提交成功');
                         });
                     },
-                    btns: ["已开票", "*关闭"],
+                    btns: ["拒收", "*关闭"],
                 });
             });
         }
@@ -182,6 +137,7 @@
                 });
             });
         }
+
     </script>
 </body>
 
diff --git a/web/admin/ap/cash_out_2.php b/web/admin/ap/cash_out_inv.php
similarity index 64%
rename from web/admin/ap/cash_out_2.php
rename to web/admin/ap/cash_out_inv.php
index 8507fe7..bc47714 100644
--- a/web/admin/ap/cash_out_2.php
+++ b/web/admin/ap/cash_out_inv.php
@@ -2,13 +2,15 @@
 
 namespace web\admin\ap;
 
-class cash_out_2 {
+class cash_out_inv {
     static function setwhere($db, $post) {
         $query = $post->get('query');
         $csql = new \ciy\sql('ap_cash_out');
         $liid = objint($query, 'liid');
         if ($liid > 0)
             $csql->where('cashstatus', $liid);
+        else
+            $csql->where('cashstatus=30');
         $val = objstr($query, 'vuser');
         if (!empty($val)) {
             $csqlt = new \ciy\sql('ap_user');
@@ -21,7 +23,7 @@ class cash_out_2 {
                 $csql->where('vuser=0');
             }
         }
-        $csql->where('cashtype', 1);
+        $csql->where('cashtype', objstr($query, 'cashtype'));
         $csql->wherenumrange('cashmoney', objstr($query, 'cashmoney_1'), objstr($query, 'cashmoney_2'), 100);
         $csql->wheredaterange('addtimes', objstr($query, 'addtimes'));
         $csql->where('cashno like', objstr($query, 'cashno'));
@@ -43,7 +45,7 @@ class cash_out_2 {
         $rows = $db->get($csql, $mainrowcount);
         if ($rows === false)
             return errjson($db->error);
-        $ret = array('where' => $where, 'pageno' => $pageno, 'pagecount' => $pagecount, 'count' => $mainrowcount, 'list' => $rows);
+        $ret = array('searchwhere' => $where, 'pageno' => $pageno, 'pagecount' => $pagecount, 'count' => $mainrowcount, 'list' => $rows);
         if ($post->getbool('field')) {
             $field = array();
             $fshow = $db->getfield($field, 'ap_cash_out');
@@ -52,48 +54,74 @@ class cash_out_2 {
                     $field[$fr]['c'] = ',' . $field[$fr]['c'];
             }
             $fshow = fieldadd($fshow, $field, 0, '_btn', '操作');
+            $field['bankaccount']['c'] = '';
+            $field['bankname']['c'] = '';
+            $field['bankno']['c'] = '';
+            $field['bankcode']['c'] = '';
+            $field['cashno']['c'] = '';
             $ret['field'] = $field;
             $ret['fshow'] = $fshow;
         }
         if ($post->getbool('once')) {
-            $ret['once'] = array();
+            $ret['once'] = true;
             $input = array();
             $input[] = array('type' => 'input', 'form' => 'vuser', 'name' => '所属用户', 'prop' => ' style="width:8em;"');
+            $input[] = array('type' => 'select', 'form' => 'cashtype', 'name' => '提现方式', 'all' => '全部', 'select' => '独立纳税.个人微信');
             $input[] = array('type' => 'num', 'form' => 'cashmoney', 'name' => '金额', 'prop' => ' style="width:4em;"');
             $input[] = array('type' => 'daterange', 'form' => 'addtimes', 'name' => '申请时间');
             $input[] = array('type' => 'input', 'form' => 'cashno', 'name' => '支付编号', 'prop' => ' style="width:8em;"');
-            $ret['once']['input'] = $input;
+            $ret['searchinput'] = $input;
         }
         $ret['ap_user'] = getrelation($db, $rows, 'ap_user', 'vuser');
         return succjson($ret);
     }
-    public static function json_update() {
+    public static function json_audit() {
         global $db;
         $rsuser = verifyfast();
         //if (nopower($db, $rsuser['id'], 'p u'))
         //    return errjson('您未被授权操作');
         $post = new \ciy\post();
-        $id = $post->getint('id');
-        $cashno = $post->get('cashno');
+        $act = $post->getint('act');
+        $auditmsg = $post->get('auditmsg');
+        $ids = $post->get('ids');
+        if (empty($ids))
+            return errjson('请选择至少一条');
+        if ($act == 2) {
+            if (empty($auditmsg))
+                return errjson('请填写拒绝原因');
+        }
         $csql = new \ciy\sql('ap_cash_out');
-        $csql->where('id', $id);
-        $datarow = $db->getone($csql);
-        if (!is_array($datarow))
-            return errjson('数据不存在');
-        if ($datarow['cashstatus'] != 20)
-            return errjson('提现状态不正确');
+        $csql->where('id in', $ids);
+        $rows = $db->get($csql);
+        $ids = array();
         try {
             $db->begin();
-            $updata = array();
-            $updata['cashstatus'] = 100;
-            $updata['cashtimes'] = tostamp();
-            $updata['cashno'] = $cashno;
-            $csql = new \ciy\sql('ap_cash_out');
-            $csql->where('id', $id);
-            if ($db->update($csql, $updata) === false)
-                throw new \Exception('更新失败:' . $db->error);
-            $updata['id'] = $id;
-            savelogdb($db, $rsuser['id'], 'ap_cash_out', $datarow, $updata);
+            foreach ($rows as $row) {
+                if ($row['cashstatus'] != 30)
+                    continue;
+                if ($act == 2) { //退余额
+                    $updata = array();
+                    $updata['mycashmoney'] = array('mycashmoney+' . $row['cashmoney']);
+                    $csql = new \ciy\sql('ap_user');
+                    $csql->where('id', $row['vuser']);
+                    if ($db->update($csql, $updata) === false)
+                        throw new \Exception('更新账户失败:' . $db->error);
+                }
+                $id = $row['id'];
+                $updata = array();
+                if ($act == 1) {
+                    $updata['cashstatus'] = 50;
+                } else {
+                    $updata['cashstatus'] = 90;
+                    $updata['auditmsg'] = $auditmsg;
+                }
+                $csql = new \ciy\sql('ap_cash_out');
+                $csql->where('id', $id);
+                if ($db->update($csql, $updata) === false)
+                    throw new \Exception('更新失败:' . $db->error);
+                $updata['id'] = $id;
+                $ids[] = $id;
+            }
             $db->commit();
         } catch (\Exception $ex) {
             $db->rollback();
@@ -101,9 +129,44 @@ class cash_out_2 {
             return errjson($ex->getMessage());
         }
         $ret['data'] = $updata;
+        $ret['ids'] = $ids;
         return succjson($ret);
     }
 
+    public static function json_del() {
+        global $db;
+        $rsuser = verifyfast();
+        //if (nopower($db, $rsuser['id'], 'p d'))
+        //    return errjson('您未被授权操作');
+        $post = new \ciy\post();
+        $ids = $post->get('ids');
+        if (empty($ids))
+            return errjson('请选择至少一条');
+        $csql = new \ciy\sql('ap_cash_out');
+        $csql->where('id in', $ids);
+        $rows = $db->get($csql);
+        $vids = array();
+        try {
+            $db->begin();
+            foreach ($rows as $row) {
+                if ($row['cashstatus'] < 90)
+                    continue;
+                if ($row['addtimes'] > time() - 86400 * 30)
+                    continue;
+                $delid = $row['id'];
+                delme($db, $delid, 'ap_cash_out');
+                savelogdb($db, $rsuser['id'], 'ap_cash_out', $row, null);
+                $vids[] = $delid;
+            }
+            $db->commit();
+        } catch (\Exception $ex) {
+            $db->rollback();
+            savelogfile('err_db', $ex->getMessage());
+            return errjson($ex->getMessage());
+        }
+        $ret['ids'] = $vids;
+        return succjson($ret);
+    }
     public static function json_exportxls() {
         global $db;
         $rsuser = verifyfast();
diff --git a/web/admin/ap/cash_out_transfer.html b/web/admin/ap/cash_out_transfer.html
new file mode 100644
index 0000000..b23c7e8
--- /dev/null
+++ b/web/admin/ap/cash_out_transfer.html
@@ -0,0 +1,214 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+    <meta http-equiv="Content-type" content="text/html; charset=utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1, minimum-scale=1">
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+    <link href="/jscss/style.css" rel="stylesheet" type="text/css" />
+    <script type="text/javascript" charset="utf-8" src="/jscss/theme.js"></script>
+</head>
+
+<body>
+    <div class="container">
+        <form class="search" onsubmit="table.search(this,'btn');return false;">
+            <ul></ul>
+            <div>
+                <div class="sinps"></div>
+                <div class="sbtns">
+                    <button class="lang btn" type="submit">查询</button>
+                    <a class="lang btn">导入支付</a>
+                    <a class="lang btn" onclick="exportxls()">导出</a>
+                    <a class="lang btn" onclick="exporttaxxls()">报税导出</a>
+                </div>
+            </div>
+        </form>
+        <div class="table">
+            <div class="loading col-24">Loading...</div>
+            <div class="list"></div>
+            <div>
+                <div class="btmbtn">
+                    <a class="lang btn def" onclick="ciyfn.select_all(table)">全选</a>
+                    <a class="lang btn def" onclick="ciyfn.select_diff(table)">反选</a>
+                    |
+                    <a class="lang btn dag" onclick="ciyfn.select_callfunc(table, this, 'del','已选{n}条，是否批量删除?', {},function(json){table.delline(json)})">批量删除</a>
+                </div>
+                <div class="page"></div>
+            </div>
+        </div>
+    </div>
+    <script type="text/javascript" src="/jscss/ciy.js"></script>
+    <script type="text/javascript" src="/jscss/ciycmp.js"></script>
+    <script type="text/javascript" src="/jscss/ciycmp2.js"></script>
+    <script type="text/javascript" src="/jscss/ciytable.js"></script>
+    <script type="text/javascript" src="../common.js"></script>
+    <script type="text/javascript">
+        'use strict';
+        var table;
+        var Glob = {};
+        ciyfn.pageload(function () {
+            //Glob.urlp = ciyfn.urlparam();
+            table = new ciyclass.table({
+                dom: '.table'
+                , url: 'list'
+                , pagecount: 10
+                , fn_beforedata: function (json) {
+                    ciyfn.fillsearch({
+                        searchdom: '.search'
+                        , data: json
+                        , lidata: ':待支付,100:已支付,90:已拒绝'
+                        , liclick: function (dom) {
+                            table.search(dom, 'li');
+                        }
+                    });
+                    return json;
+                }
+                , fn_tdcontent: function (key, datashow, field, data) {
+                    if (key == 'cashmoney') {
+                        var money = data[key];
+                        if (data['taxmoney'] > 0)
+                            money -= data['taxmoney'];
+                        return ciyfn.tonumunit(money, 100, '2', '元|10000|万元');
+                    }
+                    if (key == '_btn') {
+                        var html = '';
+                        if (data['cashstatus'] == 50) {
+                            html += `<a class="lang btn" onclick="menubtn(this, 'review')">支付操作</a>`;
+                        }
+                        return html;
+                    }
+                }
+                , fn_done: function (json) {
+                    // table.mergecol('auditstatus');
+                    // table.mergefix('总计', 'center', 6, 0, 8, 1);
+                    // table.footertotal();
+                }
+            });
+            table.callpage(1);
+        });
+        function menubtn(dom, btn) {
+            var id = $5(dom).parent('tr').attr('data-id');
+            if (btn == 'review') {
+                review(id);
+            }
+        }
+
+        function getdata(id, act, cb) {
+            cb({ data: id == 0 ? {} : table.data[id] });
+        }
+        function review(id) {
+            getdata(id, 'review', function (jsndat) {
+                var dat = jsndat.data;
+                var html = '<div class="char5 row gridline">';
+                html += '<div class="ciy-form col-24 col-sm-8">';
+                html += '<label class="lang">提现状态</label><div>';
+                html += ciyfn.tdshow('cashstatus', dat.cashstatus, table.field.cashstatus.ext, dat, table.json, true);
+                html += '</div></div>';
+
+                html += '<div class="ciy-form col-24 col-sm-8">';
+                html += '<label class="lang">所属用户</label><div>';
+                html += ciyfn.tdshow('vuser', dat.vuser, table.field.vuser.ext, dat, table.json, true);
+                html += '</div></div>';
+
+                html += '<div class="ciy-form col-24 col-sm-8">';
+                html += '<label class="lang">提现方式</label><div>';
+                html += ciyfn.tdshow('cashtype', dat.cashtype, table.field.cashtype.ext, dat, table.json, true);
+                html += '</div></div>';
+
+                var money = dat.cashmoney;
+                if (dat.taxmoney > 0)
+                    money -= dat.taxmoney;
+                html += '<div class="ciy-form col-24 col-sm-24">';
+                html += '<label class="lang">打款金额</label><div>';
+                html += ciyfn.tdshow('money', money, table.field.cashmoney.ext, dat, table.json, true);
+                html += '</div></div>';
+
+                html += '<div class="ciy-form col-24 col-sm-12">';
+                html += '<label class="lang">账户名称</label><div>';
+                html += ciyfn.tdshow('bankaccount', dat.bankaccount, table.field.bankaccount.ext, dat, table.json, true);
+                html += '</div></div>';
+
+                html += '<div class="ciy-form col-24 col-sm-12">';
+                html += '<label class="lang">银行卡号</label><div>';
+                html += ciyfn.tdshow('bankno', dat.bankno, table.field.bankno.ext, dat, table.json, true);
+                html += '</div></div>';
+
+                html += '<div class="ciy-form col-24 col-sm-12">';
+                html += '<label class="lang">开户银行</label><div>';
+                html += ciyfn.tdshow('bankname', dat.bankname, table.field.bankname.ext, dat, table.json, true);
+                html += '</div></div>';
+
+                html += '<div class="ciy-form col-24 col-sm-12">';
+                html += '<label class="lang">联行号</label><div>';
+                html += ciyfn.tdshow('bankcode', dat.bankcode, table.field.bankcode.ext, dat, table.json, true);
+                html += '</div></div>';
+
+                html += '<div class="ciy-form col-24 col-sm-24">';
+                html += '<label class="lang">支付流水号</label><div>';
+                html += '<input type="text" name="cashno"/> ';
+                html += '</div></div>';
+
+                html += '<div class="ciy-form col-24 col-sm-24">';
+                html += '<label>拒绝理由</label><div>';
+                html += '<input type="text" name="auditmsg" style="width:100%;" />';
+                html += '</div></div>';
+                html += '</div>';
+                ciyfn.alert({
+                    title: '支付'
+                    , width: 'pc'
+                    , autoheight: true
+                    , content: html
+                    , fn_showed: function (doc, dom) {
+                    }
+                    , cb: function (opn) {
+                        if (opn.btn == "关闭")
+                            return opn.close();
+                        opn.inputs.id = id;
+                        opn.inputs.auditstatus = opn.btn == "已打款" ? 100 : 90;
+                        if (ciyfn.throttle(opn.dombtn)) return;
+                        ciyfn.callfunc('audit', opn.inputs, function (json) {
+                            table.updateline(json);
+                            opn.close();
+                            ciyfn.toast('提交成功');
+                        });
+                    }
+                    , btns: ["已打款", "!无法支付", "*关闭"]
+                });
+            });
+        }
+        function exportxls() {
+            ciyfn.table_exportxls('exportxls', table, function (json) {
+                ciyfn.alert({
+                    content: '<div style="text-align:center;"><span class="lang">导出数据已生成</span><br/><br/><a class="lang btn lg" href="' + json.url + '" target="_blank">下载数据</a></div>'
+                    , btns: null
+                });
+            });
+        }
+        function exporttaxxls() {
+            ciyfn.alert({
+                content: '<div class="ciy-form char4"><label>所属月</label><div><ciy-datetime com="month" type="month" /></div></div>'
+                , fn_showed: function (doc, dom) {
+                    ciycmp({ dom: $5('[com=month]', dom) });
+                }
+                , btns: ['导出', '*取消']
+                , cb: function (opn) {
+                    if (opn.btn == '取消')
+                        return opn.close();
+                    if (opn.inputs.month == 0)
+                        return ciyfn.alert('请选择月份');
+                    table.post.month = opn.inputs.month;
+                    ciyfn.callfunc('exporttaxxls', table.post, function (json) {
+                        opn.close();
+                        ciyfn.alert({
+                            content: '<div style="text-align:center;"><span class="lang">导出数据已生成</span><br/><br/><a class="lang btn lg" href="' + json.url + '" target="_blank">下载数据</a></div>'
+                            , btns: null
+                        });
+                    });
+                }
+            });
+        }
+
+    </script>
+</body>
+
+</html>
\ No newline at end of file
diff --git a/web/admin/ap/cash_out_transfer.php b/web/admin/ap/cash_out_transfer.php
new file mode 100644
index 0000000..121bfdd
--- /dev/null
+++ b/web/admin/ap/cash_out_transfer.php
@@ -0,0 +1,306 @@
+<?php
+
+namespace web\admin\ap;
+
+class cash_out_transfer {
+    static function setwhere($db, $post) {
+        $query = $post->get('query');
+        $csql = new \ciy\sql('ap_cash_out');
+        $liid = objint($query, 'liid');
+        if ($liid > 0)
+            $csql->where('cashstatus', $liid);
+        else
+            $csql->where('cashstatus=50');
+        $val = objstr($query, 'vuser');
+        if (!empty($val)) {
+            $csqlt = new \ciy\sql('ap_user');
+            $csqlt->where('name like', $val);
+            $trow = $db->getone($csqlt);
+            if (is_array($trow)) {
+                $csql->where('vuser', $trow['id']);
+                $query['vuser'] = $trow['name'];
+            } else {
+                $csql->where('vuser=0');
+            }
+        }
+        $csql->where('cashtype', objstr($query, 'cashtype'));
+        $csql->wherenumrange('cashmoney', objstr($query, 'cashmoney_1'), objstr($query, 'cashmoney_2'), 100);
+        $csql->wheredaterange('addtimes', objstr($query, 'addtimes'));
+        $csql->where('cashno like', objstr($query, 'cashno'));
+        $order = objstr($query, 'order', 'id desc');
+        $csql->order($order);
+        $query['order'] = $order;
+        return [$query, $csql];
+    }
+
+    public static function json_list() {
+        global $db;
+        $rsuser = verifyfast();
+        $post = new \ciy\post();
+        list($where, $csql) = self::setwhere($db, $post);
+        $pageno = $post->getint('pageno', 1);
+        $pagecount = $post->getint('pagecount', 10);
+        $csql->limit($pageno, $pagecount);
+        $mainrowcount = $post->getint('count');
+        $rows = $db->get($csql, $mainrowcount);
+        if ($rows === false)
+            return errjson($db->error);
+        $ret = array('searchwhere' => $where, 'pageno' => $pageno, 'pagecount' => $pagecount, 'count' => $mainrowcount, 'list' => $rows);
+        if ($post->getbool('field')) {
+            $field = array();
+            $fshow = $db->getfield($field, 'ap_cash_out');
+            foreach ($field as $fr => $v) {
+                if (get('_' . $fr))
+                    $field[$fr]['c'] = ',' . $field[$fr]['c'];
+            }
+            $fshow = fieldadd($fshow, $field, 0, '_btn', '操作');
+            $field['invfile']['c'] = '';
+            $field['invcode']['c'] = '';
+            $field['cashmoney']['c'] = '打款金额|,CNY';
+            $field['taxmoney']['c'] = '';
+            $ret['field'] = $field;
+            $ret['fshow'] = $fshow;
+        }
+        if ($post->getbool('once')) {
+            $ret['once'] = true;
+            $input = array();
+            $input[] = array('type' => 'input', 'form' => 'vuser', 'name' => '所属用户', 'prop' => ' style="width:8em;"');
+            $input[] = array('type' => 'select', 'form' => 'cashtype', 'name' => '提现方式', 'all' => '全部', 'select' => '银行.微信');
+            $input[] = array('type' => 'num', 'form' => 'cashmoney', 'name' => '金额', 'prop' => ' style="width:4em;"');
+            $input[] = array('type' => 'daterange', 'form' => 'addtimes', 'name' => '申请时间');
+            $input[] = array('type' => 'input', 'form' => 'cashno', 'name' => '支付编号', 'prop' => ' style="width:8em;"');
+            $ret['searchinput'] = $input;
+        }
+        $ret['ap_user'] = getrelation($db, $rows, 'ap_user', 'vuser');
+        return succjson($ret);
+    }
+    public static function json_audit() {
+        global $db;
+        $rsuser = verifyfast();
+        //if (nopower($db, $rsuser['id'], 'p u'))
+        //    return errjson('您未被授权操作');
+        $post = new \ciy\post();
+        $auditstatus = $post->getint('auditstatus');
+        $auditmsg = $post->get('auditmsg');
+        $cashno = $post->get('cashno');
+        $id = $post->getint('id');
+        if ($auditstatus == 90) {
+            if (empty($auditmsg))
+                return errjson('请填写拒绝原因');
+        } else {
+            if (empty($cashno))
+                return errjson('请填写支付流水号');
+        }
+        $csql = new \ciy\sql('ap_cash_out');
+        $csql->where('id', $id);
+        $row = $db->getone($csql);
+        if (!is_array($row))
+            return errjson('数据不存在');
+        if ($row['cashstatus'] != 50)
+            return errjson('数据状态不是待支付');
+        $ids = array();
+        try {
+            $db->begin();
+            if ($auditstatus == 90) { //退余额
+                $updata = array();
+                $updata['mycashmoney'] = array('mycashmoney+' . $row['cashmoney']);
+                $csql = new \ciy\sql('ap_user');
+                $csql->where('id', $row['vuser']);
+                if ($db->update($csql, $updata) === false)
+                    throw new \Exception('更新账户失败:' . $db->error);
+            }
+            $id = $row['id'];
+            $updata = array();
+            if ($auditstatus == 90) {
+                $updata['cashstatus'] = 90;
+                $updata['auditmsg'] = $auditmsg;
+            } else {
+                $updata['cashstatus'] = 100;
+                $updata['cashtimes'] = tostamp();
+                $updata['cashno'] = $cashno;
+            }
+            $csql = new \ciy\sql('ap_cash_out');
+            $csql->where('id', $id);
+            if ($db->update($csql, $updata) === false)
+                throw new \Exception('更新失败:' . $db->error);
+            $updata['id'] = $id;
+            $ids[] = $id;
+            $db->commit();
+        } catch (\Exception $ex) {
+            $db->rollback();
+            savelogfile('err_db', $ex->getMessage());
+            return errjson($ex->getMessage());
+        }
+        $ret['data'] = $updata;
+        $ret['ids'] = $ids;
+        return succjson($ret);
+    }
+
+    public static function json_del() {
+        global $db;
+        $rsuser = verifyfast();
+        //if (nopower($db, $rsuser['id'], 'p d'))
+        //    return errjson('您未被授权操作');
+        $post = new \ciy\post();
+        $ids = $post->get('ids');
+        if (empty($ids))
+            return errjson('请选择至少一条');
+        $csql = new \ciy\sql('ap_cash_out');
+        $csql->where('id in', $ids);
+        $rows = $db->get($csql);
+        $vids = array();
+        try {
+            $db->begin();
+            foreach ($rows as $row) {
+                if ($row['cashstatus'] < 90)
+                    continue;
+                if ($row['addtimes'] > time() - 86400 * 30)
+                    continue;
+                $delid = $row['id'];
+                delme($db, $delid, 'ap_cash_out');
+                savelogdb($db, $rsuser['id'], 'ap_cash_out', $row, null);
+                $vids[] = $delid;
+            }
+            $db->commit();
+        } catch (\Exception $ex) {
+            $db->rollback();
+            savelogfile('err_db', $ex->getMessage());
+            return errjson($ex->getMessage());
+        }
+        $ret['ids'] = $vids;
+        return succjson($ret);
+    }
+    public static function json_exportxls() {
+        global $db;
+        $rsuser = verifyfast();
+        //if (nopower($db, $rsuser['id'], 'p e'))
+        //    return errjson('您未被授权操作');
+        $post = new \ciy\post();
+        list($where, $csql) = self::setwhere($db, $post);
+        $rows = $db->get($csql);
+        if (count($rows) > 10000)
+            return errjson('将导出' . count($rows) . '条，不建议超过1万条，请筛选缩小范围');
+        $fields = array();
+        $fields[] = array('style' => 'l', 'width' => 60,  'field' => 'id', 'name' => '行码');
+        $fields[] = array('style' => 'l', 'width' => 100,  'field' => 'vuser', 'name' => '所属用户');
+        $fields[] = array('style' => 'r', 'width' => 100,  'field' => 'cashmoney', 'name' => '打款金额');
+        $fields[] = array('style' => 'l', 'width' => 150,  'field' => 'bankaccount', 'name' => '账户名称');
+        $fields[] = array('style' => 'l', 'width' => 150,  'field' => 'bankno', 'name' => '银行卡号');
+        $fields[] = array('style' => 'l', 'width' => 150,  'field' => 'bankname', 'name' => '开户银行');
+        $fields[] = array('style' => 'l', 'width' => 150,  'field' => 'bankcode', 'name' => '联行号');
+        $code_cashstatus = getcatas($db, 'cashstatus');
+        $code_vuser = getrelation($db, $rows, 'ap_user', 'vuser', 'id,name');
+        $code_cashtype = $db->getdbcodes('ap_cash_out', 'cashtype');
+        $datas = array();
+        foreach ($rows as $row) {
+            $dat = array();
+            foreach ($fields as $field) {
+                $field = $field['field'];
+                $val = isset($row[$field]) ? $row[$field] : '';
+                if ($field == 'id')
+                    $val = enid($val);
+                if ($field == 'cashstatus')
+                    $val = ccode($code_cashstatus, $val);
+                if ($field == 'vuser')
+                    $val = ccode($code_vuser, $val);
+                if ($field == 'cashtype')
+                    $val = ($val == 1 ? $code_cashtype[0]['name'] : @$code_cashtype[1]['name']);
+                if ($field == 'cashmoney') {
+                    $val = $row[$field];
+                    if ($row['taxmoney'] > 0)
+                        $val -= $row['taxmoney'];
+                    $val = number_format($val / 100, 2);
+                }
+                if ($field == 'addtimes')
+                    $val = ($val == 0 ? '--' : date('Y-m-d H:i', $val));
+                if ($field == 'cashtimes')
+                    $val = ($val == 0 ? '--' : date('Y-m-d H:i', $val));
+                $dat[] = $val;
+            }
+            $datas[] = $dat;
+        }
+        $param = array();
+        $param['field'] = $fields;
+        $param['data'] = $datas;
+        $param['sheetname'] = '数据报表';
+        $param['titleheight'] = '25'; //列头高度
+        $param['landscape'] = true; //横向打印
+        $param['fixtopage'] = true; //打印整个工作表
+        $param['toptitle'] = 'Demo数据报表';
+        $str = \ciy\excel::general_excel_xml($param);
+        $filename = '';
+        if (empty($filename))
+            $filename = date('Y-m-d_H-i-s') . rand(1000, 9999);
+        $filename .= '.xls';
+        file_put_contents(PATH_WEB . 'ud/tmp/' . $filename, $str);
+        return succjson(array('url' => '/ud/tmp/' . $filename));
+    }
+    public static function json_exporttaxxls() {
+        global $db;
+        $rsuser = verifyfast();
+        //if (nopower($db, $rsuser['id'], 'p e'))
+        //    return errjson('您未被授权操作');
+        $post = new \ciy\post();
+        $month = $post->getint('month');
+        $monthend = strtotime("+1 month", $month);
+        $csql = new \ciy\sql('ap_cash_out');
+        $csql->where('cashstatus', 100);
+        $csql->where('taxmoney>=0');
+        $csql->where('cashtimes>=', $month);
+        $csql->where('cashtimes<', $monthend);
+        $csql->order('vuser,cashtimes');
+        $rows = $db->get($csql);
+        //姓名与账户名称不符，且未银行卡的，风控提示
+
+        $fields = array();
+        $fields[] = array('style' => 'l', 'width' => 60,  'field' => 'id', 'name' => '行码');
+        $fields[] = array('style' => 'c', 'width' => 100,  'field' => 'name', 'name' => '姓名');
+        $fields[] = array('style' => 'l', 'width' => 150,  'field' => 'idid', 'name' => '身份证号');
+        $fields[] = array('style' => 'r', 'width' => 100,  'field' => 'cashmoney', 'name' => '涉税金额');
+        $fields[] = array('style' => 'r', 'width' => 100,  'field' => 'taxmoney', 'name' => '个税金额');
+        $fields[] = array('style' => 'l', 'width' => 150,  'field' => 'bankno', 'name' => '银行卡号');
+        $fields[] = array('style' => 'l', 'width' => 150,  'field' => 'bankname', 'name' => '开户银行');
+        $fields[] = array('style' => 'l', 'width' => 100,  'field' => 'addtimes', 'name' => '申请时间');
+        $fields[] = array('style' => 'l', 'width' => 100,  'field' => 'cashtimes', 'name' => '支付时间');
+        $code_vuser = getrelation($db, $rows, 'ap_usr_ext', 'vuser', 'id,truename,idid');
+        $datas = array();
+        foreach ($rows as $row) {
+            $dat = array();
+            foreach ($fields as $field) {
+                $field = $field['field'];
+                $val = isset($row[$field]) ? $row[$field] : '';
+                if ($field == 'id')
+                    $val = enid($val);
+                if ($field == 'name')
+                    $val = ccode($code_vuser, $row['vuser'], 'id', 'truename');
+                if ($field == 'idid')
+                    $val = ccode($code_vuser, $row['vuser'], 'id', 'idid');
+                if ($field == 'cashmoney')
+                    $val = number_format($val / 100, 2);
+                if ($field == 'taxmoney')
+                    $val = number_format($val / 100, 2);
+                if ($field == 'addtimes')
+                    $val = ($val == 0 ? '--' : date('Y-m-d H:i', $val));
+                if ($field == 'cashtimes')
+                    $val = ($val == 0 ? '--' : date('Y-m-d H:i', $val));
+                $dat[] = $val;
+            }
+            $datas[] = $dat;
+        }
+        $param = array();
+        $param['field'] = $fields;
+        $param['data'] = $datas;
+        $param['sheetname'] = '数据报表';
+        $param['titleheight'] = '25'; //列头高度
+        $param['landscape'] = true; //横向打印
+        $param['fixtopage'] = true; //打印整个工作表
+        $param['toptitle'] = '个税数据报表';
+        $str = \ciy\excel::general_excel_xml($param);
+        $filename = '';
+        if (empty($filename))
+            $filename = date('Y-m-d_H-i-s') . rand(1000, 9999);
+        $filename .= '.xls';
+        file_put_contents(PATH_WEB . 'ud/tmp/' . $filename, $str);
+        return succjson(array('url' => '/ud/tmp/' . $filename));
+    }
+}
diff --git a/web/admin/ap/cash_out_2.html b/web/admin/ap/invoicedetail.html
similarity index 76%
rename from web/admin/ap/cash_out_2.html
rename to web/admin/ap/invoicedetail.html
index 6be9f60..9d05279 100644
--- a/web/admin/ap/cash_out_2.html
+++ b/web/admin/ap/invoicedetail.html
@@ -17,6 +17,7 @@
                 <div class="sinps"></div>
                 <div class="sbtns">
                     <button class="lang btn" type="submit">查询</button>
+                    <a class="lang btn" onclick="edit(0)">添加</a>
                     <a class="lang btn" onclick="exportxls()">导出</a>
                 </div>
             </div>
@@ -29,6 +30,7 @@
                     <a class="lang btn def" onclick="ciyfn.select_all(table)">全选</a>
                     <a class="lang btn def" onclick="ciyfn.select_diff(table)">反选</a>
                     |
+                    <a class="lang btn dag" onclick="ciyfn.select_callfunc(table, this, 'del','已选{n}条，是否批量删除?', {},function(json){table.delline(json)})">批量删除</a>
                 </div>
                 <div class="page"></div>
             </div>
@@ -37,17 +39,28 @@
 
     <div id="alert_edit" style="display:none;">
         <div class="char4 row">
-            <div class="ciy-form col-24 col-sm-24">
-                <label class="lang">支付编号</label>
+            <div class="ciy-form col-24 col-sm-16">
+                <label class="lang imp">名称</label>
                 <div>
-                    <input type="text" name="cashno" style="width:100%;" />
+                    <input type="text" name="name" style="width:100%;" />
+                </div>
+            </div>
+            <div class="ciy-form col-24 col-sm-8">
+                <label class="lang">维护人</label>
+                <div>
+                    <ciy-select com="adminuser" all="无" />
+                </div>
+            </div>
+            <div class="ciy-form col-24 col-sm-24">
+                <label class="lang">备注信息</label>
+                <div>
+                    <input type="text" name="memo" style="width:100%;" />
                 </div>
             </div>
         </div>
     </div>
     <script type="text/javascript" src="/jscss/ciy.js"></script>
     <script type="text/javascript" src="/jscss/ciycmp.js"></script>
-    <script type="text/javascript" src="/jscss/ciycmp2.js"></script>
     <script type="text/javascript" src="/jscss/ciytable.js"></script>
     <script type="text/javascript" src="../common.js"></script>
     <script type="text/javascript">
@@ -60,23 +73,18 @@
                 dom: '.table'
                 , url: 'list'
                 , pagecount: 10
+                , chkbox: true
                 , fn_beforedata: function (json) {
                     ciyfn.fillsearch({
                         searchdom: '.search'
                         , data: json
-                        , liall: '全部'
-                        , lidata: [{ id: 20, name: '已通过' }, { id: 100, name: '已支付' }]
-                        , liclick: function (dom) {
-                            table.search(dom, 'li');
-                        }
                     });
                     return json;
                 }
                 , fn_tdcontent: function (key, datashow, field, data) {
                     if (key == '_btn') {
                         var html = '';
-                        if (data['cashstatus'] == 20)
-                            html += `<a class="lang btn" onclick="menubtn(this, 'edit')">支付</a>`;
+                        html += `<a class="lang btn" onclick="menubtn(this, 'edit')" onmousedown="event.stopPropagation()">修改</a>`;
                         return html;
                     }
                 }
@@ -102,14 +110,15 @@
         function edit(id) {
             getdata(id, 'edit', function (jsndat) {
                 ciyfn.alert({
-                    title: '修改'
+                    title: id == 0 ? '新建' : '修改'
                     , width: 'pc'
                     , content: document.getElementById("alert_edit").innerHTML
                     //, noparent:true
                     , fn_showed: function (doc, dom) {
                         var dat = jsndat.data;
-                        var path = ciyfn.makeuploadpath('cash_out', ciyfn.getstorage(ciy_vars.tokenfield));
-                        $5('[name=cashno]', dom).val(dat.cashno);
+                        $5('[name=name]', dom).val(dat.name);
+                        ciycmp({ dom: $5('[com=adminuser]', dom), value: dat.adminuser, range: 'adminuser' });
+                        $5('[name=memo]', dom).val(dat.memo);
                     }
                     , cb: function (opn) {
                         if (opn.btn == "关闭")
@@ -122,7 +131,7 @@
                             ciyfn.toast('提交成功');
                         });
                     },
-                    btns: ["已支付", "*关闭"],
+                    btns: id == 0 ? ["新建", "*关闭"] : ["提交", "*关闭"],
                 });
             });
         }
@@ -134,6 +143,7 @@
                 });
             });
         }
+
     </script>
 </body>
 
diff --git a/web/admin/ap/invoicedetail.php b/web/admin/ap/invoicedetail.php
new file mode 100644
index 0000000..dd11cef
--- /dev/null
+++ b/web/admin/ap/invoicedetail.php
@@ -0,0 +1,197 @@
+<?php
+
+namespace web\admin\ap;
+
+class invoicedetail {
+    static function setwhere($db, $post, $rsuser) {
+        $query = $post->get('query', array());
+        $csql = new \ciy\sql('ap_invoicedetail');
+        $csql->where('name like', objstr($query, 'name'));
+        $csql->wheredaterange('uptimes', objstr($query, 'uptimes'));
+        $val = objstr($query, 'adminuser');
+        if (!empty($val)) {
+            $csqlt = new \ciy\sql('zc_cata');
+            $csqlt->where('cbid in (select id from zc_cata where cbid=0 and codeid=\'adminuser\')');
+            $csqlt->where('name like', $val);
+            $trow = $db->getone($csqlt);
+            if (is_array($trow)) {
+                $csql->where('adminuser', $trow['codeid']);
+                $query['adminuser'] = $trow['name'];
+            } else {
+                $csql->where('adminuser=0');
+            }
+        }
+        $csql->where('memo like', objstr($query, 'memo'));
+        $order = objstr($query, 'order', 'id desc');
+        $csql->order($order);
+        $query['order'] = $order;
+        return [$query, $csql];
+    }
+
+    public static function json_list() {
+        global $db;
+        $rsuser = verifyfast();
+        $post = new \ciy\post();
+        list($where, $csql) = self::setwhere($db, $post, $rsuser);
+        $pageno = $post->getint('pageno', 1);
+        $pagecount = $post->getint('pagecount', 10);
+        $csql->limit($pageno, $pagecount);
+        $mainrowcount = $post->getint('count');
+        $rows = $db->get($csql, $mainrowcount);
+        if($rows === false)
+            return errjson($db->error);
+        $ret = array('searchwhere' => $where, 'pageno' => $pageno, 'pagecount' => $pagecount, 'count' => $mainrowcount, 'list' => $rows);
+        if ($post->getbool('field')) {
+            $field = array();
+            $fshow = $db->getfield($field, 'ap_invoicedetail');
+            foreach ($field as $fr => $v) {
+                if (get('_' . $fr))
+                    $field[$fr]['c'] = ',' . $field[$fr]['c'];
+            }
+            $fshow = fieldadd($fshow, $field, 0, '_btn', '操作');
+            $ret['field'] = $field;
+            $ret['fshow'] = $fshow;
+        }
+        if ($post->getbool('once')) {
+            $ret['once'] = true;
+            $input = array();
+            $input[] = array('type' => 'input', 'form' => 'name', 'name' => '名称', 'prop' => ' style="width:8em;"');
+            $input[] = array('type' => 'daterange', 'form' => 'uptimes', 'name' => '更新时间');
+            $input[] = array('type' => 'input', 'form' => 'adminuser', 'name' => '维护人', 'prop' => ' style="width:8em;"');
+            $input[] = array('type' => 'input', 'form' => 'memo', 'name' => '备注信息', 'prop' => ' style="width:8em;"');
+            $ret['searchinput'] = $input;
+        }
+        return succjson($ret);
+    }
+    public static function json_update() {
+        global $db;
+        $rsuser = verifyfast();
+        //if (nopower($db, $rsuser['id'], 'p u'))
+        //    return errjson('您未被授权操作');
+        $post = new \ciy\post();
+        $id = $post->getint('id');
+        $name = $post->get('name');
+        $adminuser = $post->getint('adminuser');
+        $memo = $post->get('memo');
+        if (empty($name))
+            return errjson('请填写名称');
+        $datarow = null;
+        if ($id > 0) {
+            $csql = new \ciy\sql('ap_invoicedetail');
+            $csql->where('id', $id);
+            $datarow = $db->getone($csql);
+            if (!is_array($datarow))
+                return errjson('数据不存在');
+        }
+        try {
+            $db->begin();
+            $updata = array();
+            $updata['name'] = $name;
+            $updata['uptimes'] = tostamp();
+            $updata['adminuser'] = $adminuser;
+            $updata['memo'] = $memo;
+            $csql = new \ciy\sql('ap_invoicedetail'); //auto
+            if ($id > 0) {
+                $csql->where('id', $id);
+                if ($db->update($csql, $updata) === false)
+                    throw new \Exception('更新失败:' . $db->error);
+            } else {
+                if ($db->insert($csql, $updata) === false)
+                    throw new \Exception('新增失败:' . $db->error);
+                $id = $db->insert_id();
+            }
+            $updata['id'] = $id;
+            //savelogdb($db, $rsuser['id'], 'ap_invoicedetail', $datarow, $updata);
+            $db->commit();
+        } catch (\Exception $ex) {
+            $db->rollback();
+            savelogfile('err_db', $ex->getMessage());
+            return errjson($ex->getMessage());
+        }
+        $ret['data'] = $updata;
+        return succjson($ret);
+    }
+
+    public static function json_del() {
+        global $db;
+        $rsuser = verifyfast();
+        //if (nopower($db, $rsuser['id'], 'p d'))
+        //    return errjson('您未被授权操作');
+        $post = new \ciy\post();
+        $ids = $post->get('ids');
+        if (empty($ids))
+            return errjson('请选择至少一条');
+        $csql = new \ciy\sql('ap_invoicedetail');
+        $csql->where('id in', $ids);
+        $rows = $db->get($csql);
+        $vids = array();
+        try {
+            $db->begin();
+            foreach ($rows as $row) {
+                $delid = $row['id'];
+                //delcheck($db, $delid, 'tablexx', 'xxid', '管理员');
+                //delall($db, $delid, 'tablexx', 'xxid', '运动员');  //deltimeall
+                delme($db, $delid, 'ap_invoicedetail');
+                savelogdb($db, $rsuser['id'], 'ap_invoicedetail', $row, null);
+                $vids[] = $delid;
+            }
+            $db->commit();
+        } catch (\Exception $ex) {
+            $db->rollback();
+            savelogfile('err_db', $ex->getMessage());
+            return errjson($ex->getMessage());
+        }
+        $ret['ids'] = $vids;
+        return succjson($ret);
+    }
+
+    public static function json_exportxls() {
+        global $db;
+        $rsuser = verifyfast();
+        //if (nopower($db, $rsuser['id'], 'p e'))
+        //    return errjson('您未被授权操作');
+        $post = new \ciy\post();
+        list($where, $csql) = self::setwhere($db, $post, $rsuser);
+        $rows = $db->get($csql);
+        if (count($rows) > 10000)
+            return errjson('将导出' . count($rows) . '条，不建议超过1万条，请筛选缩小范围');
+        $fields = array();
+        $fields[] = array('style' => 'l', 'width' => 60,  'field' => 'id', 'name' => '行码');
+        $fields[] = array('style' => 'l', 'width' => 150,  'field' => 'name', 'name' => '名称');
+        $fields[] = array('style' => 'l', 'width' => 100,  'field' => 'uptimes', 'name' => '更新时间');
+        $fields[] = array('style' => 'l', 'width' => 100,  'field' => 'adminuser', 'name' => '维护人');
+        $fields[] = array('style' => 'l', 'width' => 150,  'field' => 'memo', 'name' => '备注信息');
+        $code_adminuser = getcatas($db, 'adminuser');
+        $datas = array();
+        foreach ($rows as $row) {
+            $dat = array();
+            foreach ($fields as $field) {
+                $field = $field['field'];
+                $val = isset($row[$field]) ? $row[$field] : '';
+                if ($field == 'id')
+                    $val = enid($val);
+                if ($field == 'uptimes')
+                    $val = ($val <= 0 ? '--' : date('Y-m-d H:i', $val));
+                if ($field == 'adminuser')
+                    $val = ccode($code_adminuser, $val);
+                $dat[] = $val;
+            }
+            $datas[] = $dat;
+        }
+        $param = array();
+        $param['field'] = $fields;
+        $param['data'] = $datas;
+        $param['sheetname'] = '数据报表';
+        $param['titleheight'] = '25'; //列头高度
+        $param['landscape'] = true; //横向打印
+        $param['fixtopage'] = true; //打印整个工作表
+        $param['toptitle'] = '发票类型数据报表';
+        $str = \ciy\excel::general_excel_xml($param);
+        $filename = '';
+        if (empty($filename))
+            $filename = date('Y-m-d_H-i-s') . rand(1000, 9999);
+        $filename .= '.xls';
+        file_put_contents(PATH_WEB . 'ud/tmp/' . $filename, $str);
+        return succjson(array('url' => '/ud/tmp/' . $filename));
+    }
+}
diff --git a/web/admin/ap/usr_invoicetitle.html b/web/admin/ap/invoicetitle.html
similarity index 100%
rename from web/admin/ap/usr_invoicetitle.html
rename to web/admin/ap/invoicetitle.html
diff --git a/web/admin/ap/usr_invoicetitle.php b/web/admin/ap/invoicetitle.php
similarity index 91%
rename from web/admin/ap/usr_invoicetitle.php
rename to web/admin/ap/invoicetitle.php
index 41d468e..f704407 100644
--- a/web/admin/ap/usr_invoicetitle.php
+++ b/web/admin/ap/invoicetitle.php
@@ -2,10 +2,10 @@
 
 namespace web\admin\ap;
 
-class usr_invoicetitle {
+class invoicetitle {
     static function setwhere($db, $post) {
         $query = $post->get('query');
-        $csql = new \ciy\sql('ap_usr_invoicetitle');
+        $csql = new \ciy\sql('ap_invoicetitle');
         $val = objstr($query, 'vuser');
         if (!empty($val)) {
             $csqlt = new \ciy\sql('ap_user');
@@ -40,10 +40,10 @@ class usr_invoicetitle {
         $rows = $db->get($csql, $mainrowcount);
         if($rows === false)
             return errjson($db->error);
-        $ret = array('where' => $where, 'pageno' => $pageno, 'pagecount' => $pagecount, 'count' => $mainrowcount, 'list' => $rows);
+        $ret = array('searchwhere' => $where, 'pageno' => $pageno, 'pagecount' => $pagecount, 'count' => $mainrowcount, 'list' => $rows);
         if ($post->getbool('field')) {
             $field = array();
-            $fshow = $db->getfield($field, 'ap_usr_invoicetitle');
+            $fshow = $db->getfield($field, 'ap_invoicetitle');
             foreach ($field as $fr => $v) {
                 if (get('_' . $fr))
                     $field[$fr]['c'] = ',' . $field[$fr]['c'];
@@ -53,14 +53,14 @@ class usr_invoicetitle {
             $ret['fshow'] = $fshow;
         }
         if ($post->getbool('once')) {
-            $ret['once'] = array();
+            $ret['once'] = true;
             $input = array();
             $input[] = array('type' => 'input', 'form' => 'vuser', 'name' => '所属用户', 'prop' => ' style="width:8em;"');
             $input[] = array('type' => 'input', 'form' => 'name', 'name' => '名称', 'prop' => ' style="width:8em;"');
             $input[] = array('type' => 'input', 'form' => 'taxnumber', 'name' => '税号', 'prop' => ' style="width:8em;"');
             $input[] = array('type' => 'input', 'form' => 'bankname', 'name' => '银行名称', 'prop' => ' style="width:8em;"');
             $input[] = array('type' => 'daterange', 'form' => 'uptimes', 'name' => '更新时间');
-            $ret['once']['input'] = $input;
+            $ret['searchinput'] = $input;
         }
         $ret['ap_user'] = getrelation($db, $rows, 'ap_user', 'vuser');
         return succjson($ret);
@@ -80,7 +80,7 @@ class usr_invoicetitle {
         $bankaccount = $post->get('bankaccount');
         if (empty($name))
             return errjson('请填写名称');
-        $csql = new \ciy\sql('ap_usr_invoicetitle');
+        $csql = new \ciy\sql('ap_invoicetitle');
         $csql->where('id', $id);
         $datarow = $db->getone($csql);
         if (!is_array($datarow))
@@ -95,12 +95,12 @@ class usr_invoicetitle {
             $updata['bankname'] = $bankname;
             $updata['bankaccount'] = $bankaccount;
             $updata['uptimes'] = tostamp();
-            $csql = new \ciy\sql('ap_usr_invoicetitle');
+            $csql = new \ciy\sql('ap_invoicetitle');
             $csql->where('id', $id);
             if ($db->update($csql, $updata) === false)
                 throw new \Exception('更新失败:' . $db->error);
             $updata['id'] = $id;
-            savelogdb($db, $rsuser['id'], 'ap_usr_invoicetitle', $datarow, $updata);
+            savelogdb($db, $rsuser['id'], 'ap_invoicetitle', $datarow, $updata);
             $db->commit();
         } catch (\Exception $ex) {
             $db->rollback();
@@ -121,7 +121,7 @@ class usr_invoicetitle {
         $ids = $post->get('ids');
         if (empty($ids))
             return errjson('请选择至少一条');
-        $csql = new \ciy\sql('ap_usr_invoicetitle');
+        $csql = new \ciy\sql('ap_invoicetitle');
         $csql->where('id in', $ids);
         $rows = $db->get($csql);
         $vids = array();
@@ -131,8 +131,8 @@ class usr_invoicetitle {
                 $delid = $row['id'];
                 //delcheck($db, $delid, 'tablexx', 'xxid', '管理员');
                 //delall($db, $delid, 'tablexx', 'xxid', '运动员');  //deltimeall
-                delme($db, $delid, 'ap_usr_invoicetitle');
-                savelogdb($db, $rsuser['id'], 'ap_usr_invoicetitle', $row, null);
+                delme($db, $delid, 'ap_invoicetitle');
+                savelogdb($db, $rsuser['id'], 'ap_invoicetitle', $row, null);
                 $vids[] = $delid;
             }
             $db->commit();
diff --git a/web/admin/ap/invoicing.html b/web/admin/ap/invoicing.html
new file mode 100644
index 0000000..9029177
--- /dev/null
+++ b/web/admin/ap/invoicing.html
@@ -0,0 +1,201 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+    <meta http-equiv="Content-type" content="text/html; charset=utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1, minimum-scale=1">
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+    <link href="/jscss/style.css" rel="stylesheet" type="text/css" />
+    <script type="text/javascript" charset="utf-8" src="/jscss/theme.js"></script>
+</head>
+
+<body>
+    <div class="container">
+        <form class="search" onsubmit="table.search(this,'btn');return false;">
+            <ul></ul>
+            <div>
+                <div class="sinps"></div>
+                <div class="sbtns">
+                    <button class="lang btn" type="submit">查询</button>
+                    <a class="lang btn" onclick="exportxls()">导出</a>
+                </div>
+            </div>
+        </form>
+        <div class="table">
+            <div class="loading col-24">Loading...</div>
+            <div class="list"></div>
+            <div>
+                <div class="btmbtn">
+                    <a class="lang btn def" onclick="ciyfn.select_all(table)">全选</a>
+                    <a class="lang btn def" onclick="ciyfn.select_diff(table)">反选</a>
+                    |
+                    <a class="lang btn dag" onclick="ciyfn.select_callfunc(table, this, 'del','已选{n}条，是否批量删除?', {},function(json){table.delline(json)})">批量删除</a>
+                </div>
+                <div class="page"></div>
+            </div>
+        </div>
+    </div>
+
+    <script type="text/javascript" src="/jscss/ciy.js"></script>
+    <script type="text/javascript" src="/jscss/ciycmp.js"></script>
+    <script type="text/javascript" src="/jscss/ciycmp2.js"></script>
+    <script type="text/javascript" src="/jscss/ciytable.js"></script>
+    <script type="text/javascript" src="../common.js"></script>
+    <script type="text/javascript">
+        'use strict';
+        var table;
+        var Glob = {};
+        ciyfn.pageload(function () {
+            //Glob.urlp = ciyfn.urlparam();
+            table = new ciyclass.table({
+                dom: '.table'
+                , url: 'list'
+                , pagecount: 10
+                , chkbox: true
+                , fn_beforedata: function (json) {
+                    ciyfn.fillsearch({
+                        searchdom: '.search'
+                        , data: json
+                        , liall: '全部'
+                        , lidata: '20:未审核,90:驳回,100:通过'
+                        , liclick: function (dom) {
+                            table.search(dom, 'li');
+                        }
+                    });
+                    return json;
+                }
+                , fn_tdcontent: function (key, datashow, field, data) {
+                    if (key == '_btn') {
+                        var html = '';
+                        if(data.auditstatus == 20){
+                        html += `<a class="lang btn" onclick="menubtn(this, 'review')" onmousedown="event.stopPropagation()">开票</a>`;
+                        }
+                        return html;
+                    }
+                }
+                , fn_done: function (json) {
+                    // table.mergecol('auditstatus');
+                    // table.mergefix('总计', 'center', 6, 0, 8, 1);
+                    // table.footertotal();
+                }
+            });
+            table.callpage(1);
+        });
+        function menubtn(dom, btn) {
+            var id = $5(dom).parent('tr').attr('data-id');
+            if (btn == 'review') {
+                review(id);
+            }
+        }
+
+        function getdata(id, act, cb) {
+            cb({ data: id == 0 ? {} : table.data[id] });
+        }
+
+        function review(id) {
+            getdata(id, 'review', function (jsndat) {
+                var dat = jsndat.data;
+                var html = '<div class="char4 row gridline">';
+                html += '<div class="ciy-form col-24 col-sm-8">';
+                html += '<label>所属用户</label><div>';
+                html += ciyfn.tdshow('vuser', dat.vuser, table.field.vuser.ext, dat, table.json, true);
+                html += '</div></div>';
+
+                html += '<div class="ciy-form col-24 col-sm-8">';
+                html += '<label>所属明细</label><div>';
+                html += ciyfn.tdshow('invoicedetailid', dat.invoicedetailid, table.field.invoicedetailid.ext, dat, table.json, true);
+                html += '</div></div>';
+
+                html += '<div class="ciy-form col-24 col-sm-8">';
+                html += '<label>开票金额</label><div>';
+                html += ciyfn.tdshow('invoicemoney', dat.invoicemoney, table.field.invoicemoney.ext, dat, table.json, true);
+                html += '</div></div>';
+
+                html += '<div class="ciy-form col-24 col-sm-8">';
+                html += '<label>申请时间</label><div>';
+                html += ciyfn.tdshow('addtimes', dat.addtimes, table.field.addtimes.ext, dat, table.json, true);
+                html += '</div></div>';
+
+                html += '<div class="ciy-form col-24 col-sm-8">';
+                html += '<label>名称</label><div>';
+                html += ciyfn.tdshow('name', dat.name, table.field.name.ext, dat, table.json, true);
+                html += '</div></div>';
+
+                html += '<div class="ciy-form col-24 col-sm-8">';
+                html += '<label>税号</label><div>';
+                html += ciyfn.tdshow('taxnumber', dat.taxnumber, table.field.taxnumber.ext, dat, table.json, true);
+                html += '</div></div>';
+
+                html += '<div class="ciy-form col-24 col-sm-12">';
+                html += '<label>单位地址</label><div>';
+                html += ciyfn.tdshow('addr', dat.addr, table.field.addr.ext, dat, table.json, true);
+                html += '</div></div>';
+
+                html += '<div class="ciy-form col-24 col-sm-12">';
+                html += '<label>电话号码</label><div>';
+                html += ciyfn.tdshow('phone', dat.phone, table.field.phone.ext, dat, table.json, true);
+                html += '</div></div>';
+
+                html += '<div class="ciy-form col-24 col-sm-12">';
+                html += '<label>银行名称</label><div>';
+                html += ciyfn.tdshow('bankname', dat.bankname, table.field.bankname.ext, dat, table.json, true);
+                html += '</div></div>';
+
+                html += '<div class="ciy-form col-24 col-sm-12">';
+                html += '<label>银行账号</label><div>';
+                html += ciyfn.tdshow('bankaccount', dat.bankaccount, table.field.bankaccount.ext, dat, table.json, true);
+                html += '</div></div>';
+
+                html += '<div class="ciy-form col-24 col-sm-24">';
+                html += '<label class="lang">上传发票</label><div>';
+                html += '<ciy-upload com="invfile" num="1" type="jpg,png,webp,pdf,ofd,zip,rar" />';
+                html += '</div></div>';
+                html += '<div class="ciy-form col-24 col-sm-24">';
+                html += '<label class="lang">发票编号</label><div>';
+                html += '<input type="text" name="invcode"/> ';
+                html += '</div></div>';
+
+                html += '<div class="ciy-form col-24 col-sm-24">';
+                html += '<label>拒绝理由</label><div>';
+                html += '<input type="text" name="auditmsg" style="width:100%;" />';
+                html += '</div></div>';
+                html += '</div>';
+                ciyfn.alert({
+                    title: '开票/拒开'
+                    , width: 'pc'
+                    , autoheight: true
+                    , content: html
+                    , fn_showed: function (doc, dom) {
+                        var dat = jsndat.data;
+                        var path = ciyfn.makeuploadpath('invoice', ciyfn.getstorage(ciy_vars.tokenfield));
+                        ciycmp({ dom: $5('[com=invfile]', dom), path: path });
+                    }
+                    , cb: function (opn) {
+                        if (opn.btn == "关闭")
+                            return opn.close();
+                        opn.inputs.ids = id;
+                        opn.inputs.auditstatus = opn.btn == "开票" ? 100 : 90;
+                        if (ciyfn.throttle(opn.dombtn)) return;
+                        ciyfn.callfunc('audit', opn.inputs, function (json) {
+                            table.updateline(json);
+                            opn.close();
+                            ciyfn.toast('提交成功');
+                        });
+                    }
+                    , btns: ["开票", "!拒开", "*关闭"]
+                });
+            });
+        }
+        function exportxls() {
+            ciyfn.table_exportxls('exportxls', table, function (json) {
+                ciyfn.alert({
+                    content: '<div style="text-align:center;"><span class="lang">导出数据已生成</span><br/><br/><a class="lang btn lg" href="' + json.url + '" target="_blank">下载数据</a></div>'
+                    , btns: null
+                });
+            });
+        }
+
+    </script>
+</body>
+
+</html>
\ No newline at end of file
diff --git a/web/admin/ap/usr_invoicing.php b/web/admin/ap/invoicing.php
similarity index 59%
rename from web/admin/ap/usr_invoicing.php
rename to web/admin/ap/invoicing.php
index a2d1a97..222b1c3 100644
--- a/web/admin/ap/usr_invoicing.php
+++ b/web/admin/ap/invoicing.php
@@ -2,15 +2,13 @@
 
 namespace web\admin\ap;
 
-class usr_invoicing {
-    static function setwhere($db, $post) {
-        $query = $post->get('query');
-        $csql = new \ciy\sql('ap_usr_invoicing');
+class invoicing {
+    static function setwhere($db, $post, $rsuser) {
+        $query = $post->get('query', array());
+        $csql = new \ciy\sql('ap_invoicing');
         $liid = objint($query, 'liid');
-        if ($liid == 1)
-            $csql->where('invtimes=0');
-        if ($liid == 2)
-            $csql->where('invtimes>0');
+        if ($liid > 0)
+            $csql->where('auditstatus', $liid);
         $val = objstr($query, 'vuser');
         if (!empty($val)) {
             $csqlt = new \ciy\sql('ap_user');
@@ -23,24 +21,24 @@ class usr_invoicing {
                 $csql->where('vuser=0');
             }
         }
-        $csql->wherenumrange('invoicemoney', objstr($query, 'invoicemoney_1'), objstr($query, 'invoicemoney_2'), 100);
-        $csql->where('name like', objstr($query, 'name'));
-        $csql->where('taxnumber like', objstr($query, 'taxnumber'));
-        $csql->wheredaterange('addtimes', objstr($query, 'addtimes'));
-        $csql->wheredaterange('invtimes', objstr($query, 'invtimes'));
-        $val = objstr($query, 'invuser');
+        $val = objstr($query, 'invoicedetailid');
         if (!empty($val)) {
-            $csqlt = new \ciy\sql('zc_cata');
-            $csqlt->where('cbid in (select id from zc_cata where cbid=0 and codeid=\'invuser\')');
+            $csqlt = new \ciy\sql('ap_invoicedetail');
             $csqlt->where('name like', $val);
             $trow = $db->getone($csqlt);
             if (is_array($trow)) {
-                $csql->where('invuser', $trow['codeid']);
-                $query['invuser'] = $trow['name'];
+                $csql->where('invoicedetailid', $trow['id']);
+                $query['invoicedetailid'] = $trow['name'];
             } else {
-                $csql->where('invuser=0');
+                $csql->where('invoicedetailid=0');
             }
         }
+        $csql->wherenumrange('invoicemoney', objstr($query, 'invoicemoney_1'), objstr($query, 'invoicemoney_2'), 100);
+        $csql->where('invcode like', objstr($query, 'invcode'));
+        $csql->wheredaterange('addtimes', objstr($query, 'addtimes'));
+        $csql->where('name like', objstr($query, 'name'));
+        $csql->where('taxnumber', objstr($query, 'taxnumber'));
+        $csql->where('auditmsg like', objstr($query, 'auditmsg'));
         $order = objstr($query, 'order', 'id desc');
         $csql->order($order);
         $query['order'] = $order;
@@ -51,18 +49,18 @@ class usr_invoicing {
         global $db;
         $rsuser = verifyfast();
         $post = new \ciy\post();
-        list($where, $csql) = self::setwhere($db, $post);
+        list($where, $csql) = self::setwhere($db, $post, $rsuser);
         $pageno = $post->getint('pageno', 1);
         $pagecount = $post->getint('pagecount', 10);
         $csql->limit($pageno, $pagecount);
         $mainrowcount = $post->getint('count');
         $rows = $db->get($csql, $mainrowcount);
-        if($rows === false)
+        if ($rows === false)
             return errjson($db->error);
-        $ret = array('where' => $where, 'pageno' => $pageno, 'pagecount' => $pagecount, 'count' => $mainrowcount, 'list' => $rows);
+        $ret = array('searchwhere' => $where, 'pageno' => $pageno, 'pagecount' => $pagecount, 'count' => $mainrowcount, 'list' => $rows);
         if ($post->getbool('field')) {
             $field = array();
-            $fshow = $db->getfield($field, 'ap_usr_invoicing');
+            $fshow = $db->getfield($field, 'ap_invoicing');
             foreach ($field as $fr => $v) {
                 if (get('_' . $fr))
                     $field[$fr]['c'] = ',' . $field[$fr]['c'];
@@ -72,60 +70,25 @@ class usr_invoicing {
             $ret['fshow'] = $fshow;
         }
         if ($post->getbool('once')) {
-            $ret['once'] = array();
+            $ret['once'] = true;
             $input = array();
             $input[] = array('type' => 'input', 'form' => 'vuser', 'name' => '所属用户', 'prop' => ' style="width:8em;"');
+            $input[] = array('type' => 'input', 'form' => 'invoicedetailid', 'name' => '所属明细', 'prop' => ' style="width:8em;"');
             $input[] = array('type' => 'num', 'form' => 'invoicemoney', 'name' => '开票金额', 'prop' => ' style="width:4em;"');
+            $input[] = array('type' => 'input', 'form' => 'invcode', 'name' => '发票号码', 'prop' => ' style="width:8em;"');
+            $input[] = array('type' => 'daterange', 'form' => 'addtimes', 'name' => '申请时间');
             $input[] = array('type' => 'input', 'form' => 'name', 'name' => '名称', 'prop' => ' style="width:8em;"');
             $input[] = array('type' => 'input', 'form' => 'taxnumber', 'name' => '税号', 'prop' => ' style="width:8em;"');
-            $input[] = array('type' => 'daterange', 'form' => 'addtimes', 'name' => '申请时间');
-            $input[] = array('type' => 'daterange', 'form' => 'invtimes', 'name' => '开票时间');
-            $input[] = array('type' => 'input', 'form' => 'invuser', 'name' => '开票人', 'prop' => ' style="width:8em;"');
-            $ret['once']['input'] = $input;
+            $input[] = array('type' => 'input', 'form' => 'auditmsg', 'name' => '拒开原因', 'prop' => ' style="width:8em;"');
+            $ret['searchinput'] = $input;
         }
         $ret['ap_user'] = getrelation($db, $rows, 'ap_user', 'vuser');
-        $ret['ap_usr_invoicetitle'] = getrelation($db, $rows, 'ap_usr_invoicetitle', 'invoicetitleid');
-        return succjson($ret);
-    }
-    public static function json_update() {
-        global $db;
-        $rsuser = verifyfast();
-        //if (nopower($db, $rsuser['id'], 'p u'))
-        //    return errjson('您未被授权操作');
-        $post = new \ciy\post();
-        $id = $post->getint('id');
-        $invfile = $post->get('invfile');
-        if (empty($invfile))
-            return errjson('请填写发票');
-        $csql = new \ciy\sql('ap_usr_invoicing');
-        $csql->where('id', $id);
-        $datarow = $db->getone($csql);
-        if (!is_array($datarow))
-            return errjson('数据不存在');
-        try {
-            $db->begin();
-            $updata = array();
-            $updata['invtimes'] = tostamp();
-            $updata['invuser'] = $rsuser['id'];
-            $updata['invfile'] = $invfile;
-            $csql = new \ciy\sql('ap_usr_invoicing');
-            $csql->where('id', $id);
-            if ($db->update($csql, $updata) === false)
-                throw new \Exception('更新失败:' . $db->error);
-            $updata['id'] = $id;
-            savelogdb($db, $rsuser['id'], 'ap_usr_invoicing', $datarow, $updata);
-            $db->commit();
-        } catch (\Exception $ex) {
-            $db->rollback();
-            savelogfile('err_db', $ex->getMessage());
-            return errjson($ex->getMessage());
-        }
-        $ret['data'] = $updata;
-        $ret['ap_user'] = getrelation($db, [$updata], 'ap_user', 'vuser');
-        $ret['ap_usr_invoicetitle'] = getrelation($db, [$updata], 'ap_usr_invoicetitle', 'invoicetitleid');
+        $ret['ap_invoicedetail'] = getrelation($db, $rows, 'ap_invoicedetail', 'invoicedetailid');
         return succjson($ret);
     }
 
+
+
     public static function json_del() {
         global $db;
         $rsuser = verifyfast();
@@ -135,18 +98,21 @@ class usr_invoicing {
         $ids = $post->get('ids');
         if (empty($ids))
             return errjson('请选择至少一条');
-        $csql = new \ciy\sql('ap_usr_invoicing');
+        $csql = new \ciy\sql('ap_invoicing');
         $csql->where('id in', $ids);
         $rows = $db->get($csql);
         $vids = array();
         try {
             $db->begin();
             foreach ($rows as $row) {
+                if ($row['auditstatus'] < 90)
+                    continue;
+                if ($row['addtimes'] > tostamp() - 86400 * 14)
+                    continue;
+                //已开票超过14天，或已拒开超过14天
                 $delid = $row['id'];
-                //delcheck($db, $delid, 'tablexx', 'xxid', '管理员');
-                //delall($db, $delid, 'tablexx', 'xxid', '运动员');  //deltimeall
-                delme($db, $delid, 'ap_usr_invoicing');
-                savelogdb($db, $rsuser['id'], 'ap_usr_invoicing', $row, null);
+                delme($db, $delid, 'ap_invoicing');
+                savelogdb($db, $rsuser['id'], 'ap_invoicing', $row, null);
                 $vids[] = $delid;
             }
             $db->commit();
@@ -159,34 +125,97 @@ class usr_invoicing {
         return succjson($ret);
     }
 
+    public static function json_audit() {
+        global $db;
+        $rsuser = verifyfast();
+        //if (nopower($db, $rsuser['id'], 'p a'))
+        //    return errjson('您未被授权操作');
+        $post = new \ciy\post();
+        $ids = $post->getint('ids');
+        $auditstatus = $post->getint('auditstatus');
+        $auditmsg = $post->get('auditmsg');
+        if ($auditstatus == 90 && empty($auditmsg))
+            return errjson('请填写驳回原因');
+        if ($auditstatus == 100) {
+            $invcode = $post->get('invcode');
+            $invfile = $post->get('invfile');
+            if (empty($invfile))
+                return errjson('请上传发票');
+        }
+        $csql = new \ciy\sql('ap_invoicing');
+        $csql->where('id', $ids);
+        $mrow = $db->getone($csql);
+        if (!is_array($mrow))
+            return errjson('数据不存在');
+        $ids = array();
+        try {
+            $db->begin();
+            $updata = array();
+            if ($auditstatus == 100) {
+                $updata['invcode'] = $invcode;
+                $updata['invfile'] = $invfile;
+            } else {
+                //归还金额
+                $updata2 = array();
+                $updata2['myinvmoney'] = array('myinvmoney+' . $mrow['invoicemoney']);
+                $csql = new \ciy\sql('ap_user');
+                $csql->where('id', $mrow['vuser']);
+                if ($db->update($csql, $updata2) === false)
+                    throw new \Exception('更新账户失败:' . $db->error);
+            }
+            $updata['auditstatus'] = $auditstatus;
+            $updata['audittimes'] = tostamp();
+            $updata['audituser'] = $rsuser['id'];
+            $updata['auditmsg'] = $auditmsg;
+            $csql = new \ciy\sql('ap_invoicing');
+            $csql->where('id', $mrow['id']);
+            if ($db->update($csql, $updata) === false)
+                throw new \Exception('审核失败:' . $db->error);
+            $updata['id'] = $mrow['id'];
+            $db->commit();
+        } catch (\Exception $ex) {
+            $db->rollback();
+            savelogfile('err_db', $ex->getMessage());
+            return errjson($ex->getMessage());
+        }
+        $ret['data'] = $updata;
+        return succjson($ret);
+    }
+
     public static function json_exportxls() {
         global $db;
         $rsuser = verifyfast();
         //if (nopower($db, $rsuser['id'], 'p e'))
         //    return errjson('您未被授权操作');
         $post = new \ciy\post();
-        list($where, $csql) = self::setwhere($db, $post);
+        list($where, $csql) = self::setwhere($db, $post, $rsuser);
         $rows = $db->get($csql);
         if (count($rows) > 10000)
             return errjson('将导出' . count($rows) . '条，不建议超过1万条，请筛选缩小范围');
         $fields = array();
         $fields[] = array('style' => 'l', 'width' => 60,  'field' => 'id', 'name' => '行码');
+        $fields[] = array('style' => 'l', 'width' => 100,  'field' => 'auditstatus', 'name' => '审核状态');
         $fields[] = array('style' => 'l', 'width' => 100,  'field' => 'vuser', 'name' => '所属用户');
-        $fields[] = array('style' => 'r', 'width' => 100,  'field' => 'invoicemoney', 'name' => '开票金额');
         $fields[] = array('style' => 'l', 'width' => 100,  'field' => 'invoicetitleid', 'name' => '所属抬头');
+        $fields[] = array('style' => 'l', 'width' => 100,  'field' => 'invoicedetailid', 'name' => '所属明细');
+        $fields[] = array('style' => 'r', 'width' => 100,  'field' => 'invoicemoney', 'name' => '开票金额');
+        $fields[] = array('style' => 'l', 'width' => 150,  'field' => 'invfile', 'name' => '发票');
+        $fields[] = array('style' => 'l', 'width' => 150,  'field' => 'invcode', 'name' => '发票号码');
+        $fields[] = array('style' => 'l', 'width' => 100,  'field' => 'addtimes', 'name' => '申请时间');
         $fields[] = array('style' => 'l', 'width' => 150,  'field' => 'name', 'name' => '名称');
         $fields[] = array('style' => 'l', 'width' => 150,  'field' => 'taxnumber', 'name' => '税号');
         $fields[] = array('style' => 'l', 'width' => 150,  'field' => 'addr', 'name' => '单位地址');
         $fields[] = array('style' => 'l', 'width' => 150,  'field' => 'phone', 'name' => '电话号码');
         $fields[] = array('style' => 'l', 'width' => 150,  'field' => 'bankname', 'name' => '银行名称');
         $fields[] = array('style' => 'l', 'width' => 150,  'field' => 'bankaccount', 'name' => '银行账号');
-        $fields[] = array('style' => 'l', 'width' => 100,  'field' => 'addtimes', 'name' => '申请时间');
-        $fields[] = array('style' => 'l', 'width' => 100,  'field' => 'invtimes', 'name' => '开票时间');
-        $fields[] = array('style' => 'l', 'width' => 100,  'field' => 'invuser', 'name' => '开票人');
-        $fields[] = array('style' => 'l', 'width' => 150,  'field' => 'invfile', 'name' => '发票');
+        $fields[] = array('style' => 'l', 'width' => 100,  'field' => 'audittimes', 'name' => '操作时间');
+        $fields[] = array('style' => 'l', 'width' => 100,  'field' => 'audituser', 'name' => '操作人');
+        $fields[] = array('style' => 'l', 'width' => 150,  'field' => 'auditmsg', 'name' => '拒开原因');
+        $code_auditstatus = getcatas($db, 'auditstatus');
         $code_vuser = getrelation($db, $rows, 'ap_user', 'vuser', 'id,name');
-        $code_invoicetitleid = getrelation($db, $rows, 'ap_usr_invoicetitle', 'invoicetitleid', 'id,name');
-        $code_invuser = getcatas($db, 'adminuser');
+        $code_invoicetitleid = getrelation($db, $rows, 'ap_invoicetitle', 'invoicetitleid', 'id,name');
+        $code_invoicedetailid = getrelation($db, $rows, 'ap_invoicedetail', 'invoicedetailid', 'id,name');
+        $code_audituser = getcatas($db, 'adminuser');
         $datas = array();
         foreach ($rows as $row) {
             $dat = array();
@@ -195,18 +224,22 @@ class usr_invoicing {
                 $val = isset($row[$field]) ? $row[$field] : '';
                 if ($field == 'id')
                     $val = enid($val);
+                if ($field == 'auditstatus')
+                    $val = ccode($code_auditstatus, $val);
                 if ($field == 'vuser')
                     $val = ccode($code_vuser, $val);
-                if ($field == 'invoicemoney')
-                    $val = number_format($val / 100, 2);
                 if ($field == 'invoicetitleid')
                     $val = ccode($code_invoicetitleid, $val);
+                if ($field == 'invoicedetailid')
+                    $val = ccode($code_invoicedetailid, $val);
+                if ($field == 'invoicemoney')
+                    $val = number_format($val / 100, 2);
                 if ($field == 'addtimes')
-                    $val = ($val == 0 ? '--' : date('Y-m-d H:i', $val));
-                if ($field == 'invtimes')
-                    $val = ($val == 0 ? '--' : date('Y-m-d H:i', $val));
-                if ($field == 'invuser')
-                    $val = ccode($code_invuser, $val);
+                    $val = ($val <= 0 ? '--' : date('Y-m-d H:i', $val));
+                if ($field == 'audittimes')
+                    $val = ($val <= 0 ? '--' : date('Y-m-d H:i', $val));
+                if ($field == 'audituser')
+                    $val = ccode($code_audituser, $val);
                 $dat[] = $val;
             }
             $datas[] = $dat;
@@ -218,7 +251,7 @@ class usr_invoicing {
         $param['titleheight'] = '25'; //列头高度
         $param['landscape'] = true; //横向打印
         $param['fixtopage'] = true; //打印整个工作表
-        $param['toptitle'] = 'Demo数据报表';
+        $param['toptitle'] = '发票开票数据报表';
         $str = \ciy\excel::general_excel_xml($param);
         $filename = '';
         if (empty($filename))
diff --git a/web/admin/ap/logdb.php b/web/admin/ap/logdb.php
index b905f63..cc8e046 100644
--- a/web/admin/ap/logdb.php
+++ b/web/admin/ap/logdb.php
@@ -42,7 +42,11 @@ class logdb {
         $csql->limit($pageno, $pagecount);
         $mainrowcount = $post->getint('count');
         $rows = $db->get($csql, $mainrowcount);
+<<<<<<< HEAD
         $ret = array('where' => $where, 'pageno' => $pageno, 'pagecount' => $pagecount, 'count' => $mainrowcount, 'list' => $rows);
+=======
+        $ret = array('searchwhere' => $where, 'pageno' => $pageno, 'pagecount' => $pagecount, 'count' => $mainrowcount, 'list' => $rows);
+>>>>>>> publish
         if ($post->getbool('field')) {
             $field = array();
             $fshow = $db->getfield($field, 'ap_log');
@@ -51,7 +55,11 @@ class logdb {
         }
 
         if ($post->getbool('once')) {
+<<<<<<< HEAD
             $ret['once'] = array();
+=======
+            $ret['once'] = true;
+>>>>>>> publish
             $input = array();
             $input[] = array(
                 'type' => 'input',
@@ -84,7 +92,11 @@ class logdb {
                 'name' => '详情',
                 'prop' => ' style="width:8em;"'
             );
+<<<<<<< HEAD
             $ret['once']['input'] = $input;
+=======
+            $ret['searchinput'] = $input;
+>>>>>>> publish
         }
         $ret['ap_user'] = getrelation($db, $rows, 'ap_user', 'loguser');
         return succjson($ret);
diff --git a/web/admin/ap/luser.php b/web/admin/ap/luser.php
index f2920ab..734526e 100644
--- a/web/admin/ap/luser.php
+++ b/web/admin/ap/luser.php
@@ -38,7 +38,11 @@ class luser {
         $csql->limit($pageno, $pagecount);
         $mainrowcount = $post->getint('count');
         $rows = $db->get($csql, $mainrowcount);
+<<<<<<< HEAD
         $ret = array('where' => $where, 'pageno' => $pageno, 'pagecount' => $pagecount, 'count' => $mainrowcount, 'list' => $rows);
+=======
+        $ret = array('searchwhere' => $where, 'pageno' => $pageno, 'pagecount' => $pagecount, 'count' => $mainrowcount, 'list' => $rows);
+>>>>>>> publish
         if ($post->getbool('field')) {
             $field = array();
             $fshow = $db->getfield($field, 'ap_luser');
@@ -47,7 +51,11 @@ class luser {
         }
 
         if ($post->getbool('once')) {
+<<<<<<< HEAD
             $ret['once'] = array();
+=======
+            $ret['once'] = true;
+>>>>>>> publish
             $input = array();
             $input[] = array(
                 'type' => 'input',
@@ -65,7 +73,11 @@ class luser {
                 'form' => 'model',
                 'name' => '设备指纹',
             );
+<<<<<<< HEAD
             $ret['once']['input'] = $input;
+=======
+            $ret['searchinput'] = $input;
+>>>>>>> publish
         }
         $ret['ap_user'] = getrelation($db, $rows, 'ap_user', 'loguser');
         return succjson($ret);
diff --git a/web/admin/ap/paper.html b/web/admin/ap/paper.html
index aa5a777..3b8ddb7 100644
--- a/web/admin/ap/paper.html
+++ b/web/admin/ap/paper.html
@@ -106,16 +106,10 @@
                     Glob.edit = id;
                     if (id == 0 && !table.data[0])
                         table.data[0] = {};
-                    var postparam = { id: id, data: true, once: {} };
-                    for (var to in table.once)
-                        postparam.once[to] = 1;
+                    var postparam = { id: id, data: true };
                     ciyfn.callfunc('getdata', postparam, function (json) {
                         if (json.data)
                             table.data[id] = json.data;
-                        if (json.once) {
-                            for (var to in json.once)
-                                table.once[to] = json.once[to];
-                        }
                         $5('[name=id]', dom).val(table.data[id].id);
                         $5('[name=name]', dom).val(table.data[id].name);
                         $5('[name=title]', dom).val(table.data[id].title);
@@ -144,31 +138,31 @@
                 html += '<div class="ciy-form col-24 col-sm-12">';
                 html += '<label class="lang">名称</label>';
                 html += '<div>';
-                html += ciyfn.tdshow(dat.name, table.field.name.ext, dat, table.once, table.json, true);
+                html += ciyfn.tdshow('name', dat.name, table.field.name.ext, dat, table.json, true);
                 html += '</div>';
                 html += '</div>';
                 html += '<div class="ciy-form col-24 col-sm-12">';
                 html += '<label class="lang">显示标题</label>';
                 html += '<div>';
-                html += ciyfn.tdshow(dat.title, table.field.title.ext, dat, table.once, table.json, true);
+                html += ciyfn.tdshow('title', dat.title, table.field.title.ext, dat, table.json, true);
                 html += '</div>';
                 html += '</div>';
                 html += '<div class="ciy-form col-24 col-sm-8">';
                 html += '<label class="lang">阅读数</label>';
                 html += '<div>';
-                html += ciyfn.tdshow(dat.readcnt, table.field.readcnt.ext, dat, table.once, table.json, true);
+                html += ciyfn.tdshow('readcnt', dat.readcnt, table.field.readcnt.ext, dat, table.json, true);
                 html += '</div>';
                 html += '</div>';
                 html += '<div class="ciy-form col-24 col-sm-8">';
                 html += '<label class="lang">撰写人</label>';
                 html += '<div>';
-                html += ciyfn.tdshow(dat.inputuser, table.field.inputuser.ext, dat, table.once, table.json, true);
+                html += ciyfn.tdshow('inputuser', dat.inputuser, table.field.inputuser.ext, dat, table.json, true);
                 html += '</div>';
                 html += '</div>';
                 html += '<div class="ciy-form col-24 col-sm-8">';
                 html += '<label class="lang">更新时间</label>';
                 html += '<div>';
-                html += ciyfn.tdshow(dat.uptimes, table.field.uptimes.ext, dat, table.once, table.json, true);
+                html += ciyfn.tdshow('uptimes', dat.uptimes, table.field.uptimes.ext, dat, table.json, true);
                 html += '</div>';
                 html += '</div>';
                 html += '<div class="ciy-form col-24 col-sm-24">';
diff --git a/web/admin/ap/paper.php b/web/admin/ap/paper.php
index 236bd9f..57a9e41 100644
--- a/web/admin/ap/paper.php
+++ b/web/admin/ap/paper.php
@@ -26,7 +26,7 @@ class paper {
         $csql->column('!content', $db->getraw('show full fields from ap_paper'));
         $mainrowcount = $post->getint('count');
         $rows = $db->get($csql, $mainrowcount);
-        $ret = array('where' => $where, 'pageno' => $pageno, 'pagecount' => $pagecount, 'count' => $mainrowcount, 'list' => $rows);
+        $ret = array('searchwhere' => $where, 'pageno' => $pageno, 'pagecount' => $pagecount, 'count' => $mainrowcount, 'list' => $rows);
         if ($post->getbool('field')) {
             $field = array();
             $fshow = $db->getfield($field, 'ap_paper');
@@ -43,7 +43,7 @@ class paper {
         }
 
         if ($post->getbool('once')) {
-            $ret['once'] = array();
+            $ret['once'] = true;
             $input = array();
             $input[] = array(
                 'type' => 'input',
@@ -69,7 +69,7 @@ class paper {
                 'form' => 'uptimes',
                 'name' => '更新时间'
             );
-            $ret['once']['input'] = $input;
+            $ret['searchinput'] = $input;
         }
         return succjson($ret);
     }
diff --git a/web/admin/ap/pnt_bundle.php b/web/admin/ap/pnt_bundle.php
index 2425c8c..0095c78 100644
--- a/web/admin/ap/pnt_bundle.php
+++ b/web/admin/ap/pnt_bundle.php
@@ -26,7 +26,7 @@ class pnt_bundle {
         $rows = $db->get($csql, $mainrowcount);
         if($rows === false)
             return errjson($db->error);
-        $ret = array('where' => $where, 'pageno' => $pageno, 'pagecount' => $pagecount, 'count' => $mainrowcount, 'list' => $rows);
+        $ret = array('searchwhere' => $where, 'pageno' => $pageno, 'pagecount' => $pagecount, 'count' => $mainrowcount, 'list' => $rows);
         if ($post->getbool('field')) {
             $field = array();
             $fshow = $db->getfield($field, 'ap_pnt_bundle');
@@ -39,11 +39,11 @@ class pnt_bundle {
             $ret['fshow'] = $fshow;
         }
         if ($post->getbool('once')) {
-            $ret['once'] = array();
+            $ret['once'] = true;
             $input = array();
             $input[] = array('type' => 'num', 'form' => 'buypnt', 'name' => '金币', 'prop' => ' style="width:4em;"');
             $input[] = array('type' => 'num', 'form' => 'buymoney', 'name' => '金额', 'prop' => ' style="width:4em;"');
-            $ret['once']['input'] = $input;
+            $ret['searchinput'] = $input;
         }
         return succjson($ret);
     }
diff --git a/web/admin/ap/pnt_buy.php b/web/admin/ap/pnt_buy.php
index d83b824..f08396e 100644
--- a/web/admin/ap/pnt_buy.php
+++ b/web/admin/ap/pnt_buy.php
@@ -44,7 +44,7 @@ class pnt_buy {
         $rows = $db->get($csql, $mainrowcount);
         if($rows === false)
             return errjson($db->error);
-        $ret = array('where' => $where, 'pageno' => $pageno, 'pagecount' => $pagecount, 'count' => $mainrowcount, 'list' => $rows);
+        $ret = array('searchwhere' => $where, 'pageno' => $pageno, 'pagecount' => $pagecount, 'count' => $mainrowcount, 'list' => $rows);
         if ($post->getbool('field')) {
             $field = array();
             $fshow = $db->getfield($field, 'ap_pnt_buy');
@@ -56,13 +56,13 @@ class pnt_buy {
             $ret['fshow'] = $fshow;
         }
         if ($post->getbool('once')) {
-            $ret['once'] = array();
+            $ret['once'] = true;
             $input = array();
             $input[] = array('type' => 'input', 'form' => 'vuser', 'name' => '所属用户', 'prop' => ' style="width:8em;"');
             $input[] = array('type' => 'num', 'form' => 'pnt', 'name' => '金币', 'prop' => ' style="width:4em;"');
             $input[] = array('type' => 'num', 'form' => 'buypntmoney', 'name' => '金额', 'prop' => ' style="width:4em;"');
             $input[] = array('type' => 'daterange', 'form' => 'addtimes', 'name' => '提交时间');
-            $ret['once']['input'] = $input;
+            $ret['searchinput'] = $input;
         }
         $ret['ap_user'] = getrelation($db, $rows, 'ap_user', 'vuser');
         return succjson($ret);
diff --git a/web/admin/ap/pnt_record.php b/web/admin/ap/pnt_record.php
index 045e552..ce4a426 100644
--- a/web/admin/ap/pnt_record.php
+++ b/web/admin/ap/pnt_record.php
@@ -44,7 +44,7 @@ class pnt_record {
         $rows = $db->get($csql, $mainrowcount);
         if($rows === false)
             return errjson($db->error);
-        $ret = array('where' => $where, 'pageno' => $pageno, 'pagecount' => $pagecount, 'count' => $mainrowcount, 'list' => $rows);
+        $ret = array('searchwhere' => $where, 'pageno' => $pageno, 'pagecount' => $pagecount, 'count' => $mainrowcount, 'list' => $rows);
         if ($post->getbool('field')) {
             $field = array();
             $fshow = $db->getfield($field, 'ap_pnt_record');
@@ -56,13 +56,13 @@ class pnt_record {
             $ret['fshow'] = $fshow;
         }
         if ($post->getbool('once')) {
-            $ret['once'] = array();
+            $ret['once'] = true;
             $input = array();
             $input[] = array('type' => 'input', 'form' => 'vuser', 'name' => '所属用户', 'prop' => ' style="width:8em;"');
             $input[] = array('type' => 'daterange', 'form' => 'addtimes', 'name' => '发生时间');
             $input[] = array('type' => 'num', 'form' => 'pnt', 'name' => '积分', 'prop' => ' style="width:4em;"');
             $input[] = array('type' => 'input', 'form' => 'name', 'name' => '摘要', 'prop' => ' style="width:8em;"');
-            $ret['once']['input'] = $input;
+            $ret['searchinput'] = $input;
         }
         $ret['ap_user'] = getrelation($db, $rows, 'ap_user', 'vuser');
         return succjson($ret);
diff --git a/web/admin/ap/pnt_track.php b/web/admin/ap/pnt_track.php
index 9aced1d..a985036 100644
--- a/web/admin/ap/pnt_track.php
+++ b/web/admin/ap/pnt_track.php
@@ -25,7 +25,7 @@ class pnt_track {
         $csql->limit($pageno, $pagecount);
         $mainrowcount = $post->getint('count');
         $rows = $db->get($csql, $mainrowcount);
-        $ret = array('where' => $where, 'pageno' => $pageno, 'pagecount' => $pagecount, 'count' => $mainrowcount, 'list' => $rows);
+        $ret = array('searchwhere' => $where, 'pageno' => $pageno, 'pagecount' => $pagecount, 'count' => $mainrowcount, 'list' => $rows);
         if ($post->getbool('field')) {
             $field = array();
             $fshow = $db->getfield($field, 'ap_pnt_track');
@@ -38,12 +38,12 @@ class pnt_track {
             $ret['fshow'] = $fshow;
         }
         if ($post->getbool('once')) {
-            $ret['once'] = array();
+            $ret['once'] = true;
             $input = array();
             $input[] = array('type' => 'input', 'form' => 'name', 'name' => '埋点名称', 'prop' => ' style="width:8em;"');
             $input[] = array('type' => 'num', 'form' => 'point', 'name' => '可获金币', 'prop' => ' style="width:4em;"');
             $input[] = array('type' => 'num', 'form' => 'limh24', 'name' => '24小时上限', 'prop' => ' style="width:4em;"');
-            $ret['once']['input'] = $input;
+            $ret['searchinput'] = $input;
         }
         return succjson($ret);
     }
diff --git a/web/admin/ap/transfer.php b/web/admin/ap/transfer.php
index e99d92c..d7e9eaf 100644
--- a/web/admin/ap/transfer.php
+++ b/web/admin/ap/transfer.php
@@ -33,7 +33,7 @@ class transfer {
         $rows = $db->get($csql, $mainrowcount);
         if ($rows === false)
             return errjson($db->error);
-        $ret = array('where' => $where, 'pageno' => $pageno, 'pagecount' => $pagecount, 'count' => $mainrowcount, 'list' => $rows);
+        $ret = array('searchwhere' => $where, 'pageno' => $pageno, 'pagecount' => $pagecount, 'count' => $mainrowcount, 'list' => $rows);
         if ($post->getbool('field')) {
             $field = array();
             $fshow = $db->getfield($field, 'ap_transfer');
@@ -46,13 +46,13 @@ class transfer {
             $ret['fshow'] = $fshow;
         }
         if ($post->getbool('once')) {
-            $ret['once'] = array();
+            $ret['once'] = true;
             $input = array();
             $input[] = array('type' => 'input', 'form' => 'id', 'name' => '流水号', 'prop' => ' style="width:8em;"');
             $input[] = array('type' => 'num', 'form' => 'amount', 'name' => '金额', 'prop' => ' style="width:4em;"');
             $input[] = array('type' => 'daterange', 'form' => 'addtimes', 'name' => '创建时间');
             $input[] = array('type' => 'input', 'form' => 'thirdno', 'name' => '三方单号', 'prop' => ' style="width:8em;"');
-            $ret['once']['input'] = $input;
+            $ret['searchinput'] = $input;
         }
         return succjson($ret);
     }
diff --git a/web/admin/ap/user.html b/web/admin/ap/user.html
index 7c2aef7..81833ac 100644
--- a/web/admin/ap/user.html
+++ b/web/admin/ap/user.html
@@ -221,87 +221,77 @@
                 var html = '<div class="char6 row gridline">';
                 html += '<div class="ciy-form col-24 col-sm-8">';
                 html += '<label>头像</label><div>';
-                html += ciyfn.tdshow(dat.icon, table.field.icon.ext, dat, table.once, table.json, true);
+                html += ciyfn.tdshow('icon', dat.icon, table.field.icon.ext, dat, table.json, true);
                 html += '</div></div>';
 
                 html += '<div class="ciy-form col-24 col-sm-8">';
                 html += '<label>用户昵称</label><div>';
-                html += ciyfn.tdshow(dat.name, table.field.name.ext, dat, table.once, table.json, true);
+                html += ciyfn.tdshow('name', dat.name, table.field.name.ext, dat, table.json, true);
                 html += '</div></div>';
 
                 html += '<div class="ciy-form col-24 col-sm-8">';
                 html += '<label>手机号</label><div>';
-                html += ciyfn.tdshow(dat.mobile, table.field.mobile.ext, dat, table.once, table.json, true);
+                html += ciyfn.tdshow('mobile', dat.mobile, table.field.mobile.ext, dat, table.json, true);
                 html += '</div></div>';
 
                 html += '<div class="ciy-form col-24 col-sm-8">';
                 html += '<label>账号状态</label><div>';
-                html += ciyfn.tdshow(dat.stpstatus, table.field.stpstatus.ext, dat, table.once, table.json, true);
+                html += ciyfn.tdshow('stpstatus', dat.stpstatus, table.field.stpstatus.ext, dat, table.json, true);
                 html += '</div></div>';
 
                 html += '<div class="ciy-form col-24 col-sm-8">';
                 html += '<label>余额</label><div>';
-                html += ciyfn.tdshow(dat.myinvmoney, table.field.myinvmoney.ext, dat, table.once, table.json, true);
+                html += ciyfn.tdshow('myinvmoney', dat.myinvmoney, table.field.myinvmoney.ext, dat, table.json, true);
                 html += '</div></div>';
 
                 html += '<div class="ciy-form col-24 col-sm-8">';
                 html += '<label>金币</label><div>';
-                html += ciyfn.tdshow(dat.mypnt, table.field.mypnt.ext, dat, table.once, table.json, true);
+                html += ciyfn.tdshow('mypnt', dat.mypnt, table.field.mypnt.ext, dat, table.json, true);
                 html += '</div></div>';
 
                 html += '<div class="ciy-form col-24 col-sm-8">';
                 html += '<label>认证范围</label><div>';
-                html += ciyfn.tdshow(dat.certs, table.field.certs.ext, dat, table.once, table.json, true);
+                html += ciyfn.tdshow('certs', dat.certs, table.field.certs.ext, dat, table.json, true);
                 html += '</div></div>';
 
                 html += '<div class="ciy-form col-24 col-sm-8">';
                 html += '<label>登录时间</label><div>';
-                html += ciyfn.tdshow(dat.logintimes, table.field.logintimes.ext, dat, table.once, table.json, true);
+                html += ciyfn.tdshow('logintimes', dat.logintimes, table.field.logintimes.ext, dat, table.json, true);
                 html += '</div></div>';
 
                 html += '<div class="ciy-form col-24 col-sm-8">';
                 html += '<label>注册日期</label><div>';
-                html += ciyfn.tdshow(dat.addtimes, table.field.addtimes.ext, dat, table.once, table.json, true);
+                html += ciyfn.tdshow('addtimes', dat.addtimes, table.field.addtimes.ext, dat, table.json, true);
                 html += '</div></div>';
 
                 html += '<div class="ciy-form col-24 col-sm-8">';
                 html += '<label>分享人</label><div>';
-                html += ciyfn.tdshow(dat.upid, table.field.upid.ext, dat, table.once, table.json, true);
+                html += ciyfn.tdshow('upid', dat.upid, table.field.upid.ext, dat, table.json, true);
                 html += '</div></div>';
 
                 html += '<div class="ciy-form col-24 col-sm-8">';
-                html += '<label>密码重试次数</label><div>';
-                html += ciyfn.tdshow(dat.trytime, table.field.trytime.ext, dat, table.once, table.json, true);
+                html += '<label>UnionID</label><div>';
+                html += ciyfn.tdshow('wxunionid', dat.wxunionid, table.field.wxunionid.ext, dat, table.json, true);
                 html += '</div></div>';
 
                 html += '<div class="ciy-form col-24 col-sm-8">';
-                html += '<label>备注</label><div>';
-                html += ciyfn.tdshow(dat.memo, table.field.memo.ext, dat, table.once, table.json, true);
-                html += '</div></div>';
-
-                html += '<div class="ciy-form col-24 col-sm-8">';
-                html += '<label>微信UnionID</label><div>';
-                html += ciyfn.tdshow(dat.wxunionid, table.field.wxunionid.ext, dat, table.once, table.json, true);
-                html += '</div></div>';
-
-                html += '<div class="ciy-form col-24 col-sm-8">';
-                html += '<label>小程序OpenID</label><div>';
-                html += ciyfn.tdshow(dat.wxminaid, table.field.wxminaid.ext, dat, table.once, table.json, true);
-                html += '</div></div>';
-
-                html += '<div class="ciy-form col-24 col-sm-8">';
-                html += '<label>小程序Key</label><div>';
-                html += ciyfn.tdshow(dat.wxminakey, table.field.wxminakey.ext, dat, table.once, table.json, true);
+                html += '<label>OpenID</label><div>';
+                html += ciyfn.tdshow('wxminaid', dat.wxminaid, table.field.wxminaid.ext, dat, table.json, true);
                 html += '</div></div>';
 
                 html += '<div class="ciy-form col-24 col-sm-8">';
                 html += '<label>到期时间</label><div>';
-                html += ciyfn.tdshow(dat.exptimes, table.field.exptimes.ext, dat, table.once, table.json, true);
+                html += ciyfn.tdshow('exptimes', dat.exptimes, table.field.exptimes.ext, dat, table.json, true);
                 html += '</div></div>';
 
-                html += '<div class="ciy-form col-24 col-sm-8">';
+                html += '<div class="ciy-form col-24 col-sm-16">';
                 html += '<label>登录IP</label><div>';
-                html += ciyfn.tdshow(dat.ip, table.field.ip.ext, dat, table.once, table.json, true);
+                html += ciyfn.tdshow('ip', dat.ip, table.field.ip.ext, dat, table.json, true);
+                html += '</div></div>';
+
+                html += '<div class="ciy-form col-24 col-sm-24">';
+                html += '<label>备注</label><div>';
+                html += ciyfn.tdshow('memo', dat.memo, table.field.memo.ext, dat, table.json, true);
                 html += '</div></div>';
 
                 html += '</div>';
diff --git a/web/admin/ap/user.php b/web/admin/ap/user.php
index 27ee96b..b579f0e 100644
--- a/web/admin/ap/user.php
+++ b/web/admin/ap/user.php
@@ -41,7 +41,7 @@ class user {
         $csql->limit($pageno, $pagecount);
         $mainrowcount = $post->getint('count');
         $rows = $db->get($csql, $mainrowcount);
-        $ret = array('where' => $where, 'pageno' => $pageno, 'pagecount' => $pagecount, 'count' => $mainrowcount, 'list' => $rows);
+        $ret = array('searchwhere' => $where, 'pageno' => $pageno, 'pagecount' => $pagecount, 'count' => $mainrowcount, 'list' => $rows);
         if ($post->getbool('field')) {
             $field = array();
             $fshow = $db->getfield($field, 'ap_user');
@@ -54,7 +54,7 @@ class user {
             $ret['fshow'] = $fshow;
         }
         if ($post->getbool('once')) {
-            $ret['once'] = array();
+            $ret['once'] = true;
             $input = array();
             $input[] = array('type' => 'input', 'form' => 'id', 'name' => '会员编号', 'prop' => ' style="width:6em;"');
             $input[] = array('type' => 'select', 'form' => 'certs', 'name' => '认证', 'select' => 'certs', 'all' => '全部');
@@ -65,7 +65,7 @@ class user {
             $input[] = array('type' => 'daterange', 'form' => 'logintimes', 'name' => '登录时间');
             $input[] = array('type' => 'daterange', 'form' => 'addtimes', 'name' => '注册日期');
             $input[] = array('type' => 'input', 'form' => 'memo', 'name' => '备注', 'prop' => ' style="width:8em;"');
-            $ret['once']['input'] = $input;
+            $ret['searchinput'] = $input;
         }
         $ret['ap_user'] = getrelation($db, $rows, 'ap_user', 'upid');
         return succjson($ret);
diff --git a/web/admin/ap/user_service.php b/web/admin/ap/user_service.php
index 4c4c72d..2eec559 100644
--- a/web/admin/ap/user_service.php
+++ b/web/admin/ap/user_service.php
@@ -41,7 +41,7 @@ class user_service {
         $csql->limit($pageno, $pagecount);
         $mainrowcount = $post->getint('count');
         $rows = $db->get($csql, $mainrowcount);
-        $ret = array('where' => $where, 'pageno' => $pageno, 'pagecount' => $pagecount, 'count' => $mainrowcount, 'list' => $rows);
+        $ret = array('searchwhere' => $where, 'pageno' => $pageno, 'pagecount' => $pagecount, 'count' => $mainrowcount, 'list' => $rows);
         if ($post->getbool('field')) {
             $field = array();
             $fshow = $db->getfield($field, 'ap_user');
@@ -54,7 +54,7 @@ class user_service {
             $ret['fshow'] = $fshow;
         }
         if ($post->getbool('once')) {
-            $ret['once'] = array();
+            $ret['once'] = true;
             $input = array();
             $input[] = array('type' => 'input', 'form' => 'id', 'name' => '会员编号', 'prop' => ' style="width:6em;"');
             $input[] = array('type' => 'select', 'form' => 'certs', 'name' => '认证', 'select' => 'certs', 'all' => '全部');
@@ -65,7 +65,7 @@ class user_service {
             $input[] = array('type' => 'daterange', 'form' => 'logintimes', 'name' => '登录时间');
             $input[] = array('type' => 'daterange', 'form' => 'addtimes', 'name' => '注册日期');
             $input[] = array('type' => 'input', 'form' => 'memo', 'name' => '备注', 'prop' => ' style="width:8em;"');
-            $ret['once']['input'] = $input;
+            $ret['searchinput'] = $input;
         }
         $ret['ap_user'] = getrelation($db, $rows, 'ap_user', 'upid');
         return succjson($ret);
diff --git a/web/admin/ap/usr_buy_bundle.php b/web/admin/ap/usr_buy_bundle.php
index 453bb89..bfb17ea 100644
--- a/web/admin/ap/usr_buy_bundle.php
+++ b/web/admin/ap/usr_buy_bundle.php
@@ -28,7 +28,7 @@ class usr_buy_bundle {
         $rows = $db->get($csql, $mainrowcount);
         if($rows === false)
             return errjson($db->error);
-        $ret = array('where' => $where, 'pageno' => $pageno, 'pagecount' => $pagecount, 'count' => $mainrowcount, 'list' => $rows);
+        $ret = array('searchwhere' => $where, 'pageno' => $pageno, 'pagecount' => $pagecount, 'count' => $mainrowcount, 'list' => $rows);
         if ($post->getbool('field')) {
             $field = array();
             $fshow = $db->getfield($field, 'ap_usr_buy_bundle');
@@ -41,13 +41,13 @@ class usr_buy_bundle {
             $ret['fshow'] = $fshow;
         }
         if ($post->getbool('once')) {
-            $ret['once'] = array();
+            $ret['once'] = true;
             $input = array();
             $input[] = array('type' => 'input', 'form' => 'name', 'name' => '套餐说明', 'prop' => ' style="width:8em;"');
             $input[] = array('type' => 'select', 'form' => 'userlevel', 'name' => '对应等级', 'all' => '全部', 'select' => 'userlevel');
             $input[] = array('type' => 'num', 'form' => 'days', 'name' => '天数', 'prop' => ' style="width:4em;"');
             $input[] = array('type' => 'num', 'form' => 'usermoney', 'name' => '金额', 'prop' => ' style="width:4em;"');
-            $ret['once']['input'] = $input;
+            $ret['searchinput'] = $input;
         }
         return succjson($ret);
     }
diff --git a/web/admin/ap/usr_buy_user.php b/web/admin/ap/usr_buy_user.php
index b5ee557..f854921 100644
--- a/web/admin/ap/usr_buy_user.php
+++ b/web/admin/ap/usr_buy_user.php
@@ -57,7 +57,7 @@ class usr_buy_user {
         $rows = $db->get($csql, $mainrowcount);
         if($rows === false)
             return errjson($db->error);
-        $ret = array('where' => $where, 'pageno' => $pageno, 'pagecount' => $pagecount, 'count' => $mainrowcount, 'list' => $rows);
+        $ret = array('searchwhere' => $where, 'pageno' => $pageno, 'pagecount' => $pagecount, 'count' => $mainrowcount, 'list' => $rows);
         if ($post->getbool('field')) {
             $field = array();
             $fshow = $db->getfield($field, 'ap_usr_buy_user');
@@ -69,7 +69,7 @@ class usr_buy_user {
             $ret['fshow'] = $fshow;
         }
         if ($post->getbool('once')) {
-            $ret['once'] = array();
+            $ret['once'] = true;
             $input = array();
             $input[] = array('type' => 'input', 'form' => 'vuser', 'name' => '所属用户', 'prop' => ' style="width:8em;"');
             $input[] = array('type' => 'input', 'form' => 'bundleid', 'name' => '所属套餐', 'prop' => ' style="width:8em;"');
@@ -77,7 +77,7 @@ class usr_buy_user {
             $input[] = array('type' => 'num', 'form' => 'days', 'name' => '会员天数', 'prop' => ' style="width:4em;"');
             $input[] = array('type' => 'num', 'form' => 'buydaymoney', 'name' => '金额', 'prop' => ' style="width:4em;"');
             $input[] = array('type' => 'daterange', 'form' => 'addtimes', 'name' => '提交时间');
-            $ret['once']['input'] = $input;
+            $ret['searchinput'] = $input;
         }
         $ret['ap_user'] = getrelation($db, $rows, 'ap_user', 'vuser');
         $ret['ap_usr_buy_bundle'] = getrelation($db, $rows, 'ap_usr_buy_bundle', 'bundleid');
diff --git a/web/admin/ap/usr_capcode.php b/web/admin/ap/usr_capcode.php
index f7b25a2..3161be9 100644
--- a/web/admin/ap/usr_capcode.php
+++ b/web/admin/ap/usr_capcode.php
@@ -38,7 +38,7 @@ class usr_capcode {
         $rows = $db->get($csql, $mainrowcount);
         if($rows === false)
             return errjson($db->error);
-        $ret = array('where' => $where, 'pageno' => $pageno, 'pagecount' => $pagecount, 'count' => $mainrowcount, 'list' => $rows);
+        $ret = array('searchwhere' => $where, 'pageno' => $pageno, 'pagecount' => $pagecount, 'count' => $mainrowcount, 'list' => $rows);
         if ($post->getbool('field')) {
             $field = array();
             $fshow = $db->getfield($field, 'ap_usr_capcode');
@@ -50,12 +50,12 @@ class usr_capcode {
             $ret['fshow'] = $fshow;
         }
         if ($post->getbool('once')) {
-            $ret['once'] = array();
+            $ret['once'] = true;
             $input = array();
             $input[] = array('type' => 'input', 'form' => 'vuser', 'name' => '所属用户', 'prop' => ' style="width:8em;"');
             $input[] = array('type' => 'input', 'form' => 'account', 'name' => '账号', 'prop' => ' style="width:8em;"');
             $input[] = array('type' => 'daterange', 'form' => 'addtimes', 'name' => '生成时间');
-            $ret['once']['input'] = $input;
+            $ret['searchinput'] = $input;
         }
         $ret['ap_user'] = getrelation($db, $rows, 'ap_user', 'vuser');
         return succjson($ret);
diff --git a/web/admin/ap/usr_problem.html b/web/admin/ap/usr_problem.html
index eb5a55e..90151f1 100644
--- a/web/admin/ap/usr_problem.html
+++ b/web/admin/ap/usr_problem.html
@@ -38,7 +38,7 @@
     <div id="alert_edit" style="display:none;">
         <div class="char4 row">
             <div id="id_chats" style="height: 25.5em;overflow-y: auto;width: 100%;padding: 1em;"></div>
-            <div class="form-group col-24 col-sm-24 px2" style="position: absolute;bottom: 0;left: 0;right:0;">
+            <div class="px2" style="position: absolute;bottom: 0;left: 0;right:0;">
                 <ciy-textarea com="content" style="display: block;"></ciy-textarea>
             </div>
         </div>
@@ -102,11 +102,11 @@
                         var html = '';
                         for (var i in json.chats) {
                             if (json.chats[i].sendtype == 1) {
-                                html += '<div><div style="font-size:0.7em;line-height: 1.2em;margin-top: 1em;">用户 ' + ciyfn.todatetime(json.chats[i].addtimes, 'm-d H:i') + '</div><div style="display:inline-block;background: #f7f7f7;padding: 0.5em 1em;border-radius: 7px;min-width: 5em;">' + json.chats[i].content.replace('\n', '<br/>') + '</div></div>';
+                                html += '<div><div style="font-size:0.7em;line-height: 1.2em;margin-top: 1em;">用户 ' + ciyfn.todatetime(json.chats[i].addtimes, 'm-d H:i') + '</div><div style="display:inline-block;background: #f7f7f7;padding: 0.5em 1em;border-radius: 7px;min-width: 5em;">' + json.chats[i].content.replace(/\n/g, '<br/>') + '</div></div>';
                             } else if (json.chats[i].sendtype == 2) {
-                                html += '<div style="text-align: right;"><div style="font-size:0.7em;line-height: 1.2em;margin-top: 1em;">' + ciyfn.todatetime(json.chats[i].addtimes, 'm-d H:i') + ' 平台</div><div style="display:inline-block;background: #88f7af;padding: 0.5em 1em;border-radius: 7px;min-width: 5em;text-align:left;">' + json.chats[i].content.replace('\n', '<br/>') + '</div></div>';
+                                html += '<div style="text-align: right;"><div style="font-size:0.7em;line-height: 1.2em;margin-top: 1em;">' + ciyfn.todatetime(json.chats[i].addtimes, 'm-d H:i') + ' 平台</div><div style="display:inline-block;background: #88f7af;padding: 0.5em 1em;border-radius: 7px;min-width: 5em;text-align:left;">' + json.chats[i].content.replace(/\n/g, '<br/>') + '</div></div>';
                             } else {
-                                html += '<div style="text-align: center;"><div style="font-size:0.7em;line-height: 1.2em;margin-top: 1em;">AI助手 ' + ciyfn.todatetime(json.chats[i].addtimes, 'm-d H:i') + '</div><div style="display:inline-block;background: #a3d1f9;padding: 0.5em 1em;border-radius: 7px;min-width: 5em;text-align:left;">' + json.chats[i].content.replace('\n', '<br/>') + '</div></div>';
+                                html += '<div style="text-align: center;"><div style="font-size:0.7em;line-height: 1.2em;margin-top: 1em;">AI助手 ' + ciyfn.todatetime(json.chats[i].addtimes, 'm-d H:i') + '</div><div style="display:inline-block;background: #a3d1f9;padding: 0.5em 1em;border-radius: 7px;min-width: 5em;text-align:left;">' + json.chats[i].content.replace(/\n/g, '<br/>') + '</div></div>';
                             }
                         }
                         if (html == '')
diff --git a/web/admin/ap/usr_problem.php b/web/admin/ap/usr_problem.php
index f77fdd1..a672923 100644
--- a/web/admin/ap/usr_problem.php
+++ b/web/admin/ap/usr_problem.php
@@ -46,7 +46,7 @@ class usr_problem {
         $rows = $db->get($csql, $mainrowcount);
         if ($rows === false)
             return errjson($db->error);
-        $ret = array('where' => $where, 'pageno' => $pageno, 'pagecount' => $pagecount, 'count' => $mainrowcount, 'list' => $rows);
+        $ret = array('searchwhere' => $where, 'pageno' => $pageno, 'pagecount' => $pagecount, 'count' => $mainrowcount, 'list' => $rows);
         if ($post->getbool('field')) {
             $field = array();
             $fshow = $db->getfield($field, 'ap_usr_problem');
@@ -59,13 +59,13 @@ class usr_problem {
             $ret['fshow'] = $fshow;
         }
         if ($post->getbool('once')) {
-            $ret['once'] = array();
+            $ret['once'] = true;
             $input = array();
             $input[] = array('type' => 'input', 'form' => 'vuser', 'name' => '所属用户', 'prop' => ' style="width:8em;"');
             $input[] = array('type' => 'input', 'form' => 'contract', 'name' => '联系方式', 'prop' => ' style="width:8em;"');
             $input[] = array('type' => 'input', 'form' => 'content', 'name' => '工单提问', 'prop' => ' style="width:8em;"');
             $input[] = array('type' => 'daterange', 'form' => 'addtimes', 'name' => '提交时间');
-            $ret['once']['input'] = $input;
+            $ret['searchinput'] = $input;
         }
         $ret['ap_user'] = getrelation($db, $rows, 'ap_user', 'vuser');
         return succjson($ret);
diff --git a/web/admin/ap/usr_real_apply.html b/web/admin/ap/usr_real_apply.html
index 792933e..7b3773f 100644
--- a/web/admin/ap/usr_real_apply.html
+++ b/web/admin/ap/usr_real_apply.html
@@ -29,9 +29,6 @@
                     <a class="lang btn def" onclick="ciyfn.select_all(table)">全选</a>
                     <a class="lang btn def" onclick="ciyfn.select_diff(table)">反选</a>
                     |
-                    <a class="lang btn dag" onclick="ciyfn.select_callfunc(table, this, 'del','已选{n}条，是否批量删除?', {},function(json){table.delline(json)})">批量删除</a>
-                    <a class="lang btn imp" onclick="ciyfn.select_callfunc(table, this, 'audit','已选{n}条，是否批量审核通过?', {auditstatus:100},function(json){table.updateline(json)})">审核通过</a>
-                    <a class="lang btn warn" onclick="ciyfn.select_callfunc(table, this, 'audit','已选{n}条，是否批量驳回?<br/>原因 <input name=auditmsg type=text />', {auditstatus:90},function(json){table.updateline(json)})">驳回</a>
                 </div>
                 <div class="page"></div>
             </div>
@@ -40,6 +37,7 @@
 
     <script type="text/javascript" src="/jscss/ciy.js"></script>
     <script type="text/javascript" src="/jscss/ciycmp.js"></script>
+    <script type="text/javascript" src="/jscss/ciycmp2.js"></script>
     <script type="text/javascript" src="/jscss/ciytable.js"></script>
     <script type="text/javascript" src="../common.js"></script>
     <script type="text/javascript">
@@ -52,12 +50,13 @@
                 dom: '.table'
                 , url: 'list'
                 , pagecount: 10
+                , chkbox: true
                 , fn_beforedata: function (json) {
                     ciyfn.fillsearch({
                         searchdom: '.search'
                         , data: json
                         , liall: '全部'
-                        , lidata: 'auditstatus'
+                        , lidata: '20:未审核,90:驳回,100:通过'
                         , liclick: function (dom) {
                             table.search(dom, 'li');
                         }
@@ -67,7 +66,8 @@
                 , fn_tdcontent: function (key, datashow, field, data) {
                     if (key == '_btn') {
                         var html = '';
-                        html += `<a class="lang btn" onclick="menubtn(this, 'review')">审核</a>`;
+                        if(data.auditstatus < 100)
+                            html += `<a class="lang btn" onclick="menubtn(this, 'review')" onmousedown="event.stopPropagation()">审核</a>`;
                         return html;
                     }
                 }
@@ -84,57 +84,58 @@
             if (btn == 'review') {
                 review(id);
             }
-            if (btn == 'sub') {
-                ciyfn.sendsignal(window.top, 'manage_ifropen', {
-                    url: 'xxx.html?_xxxid=' + id
-                    , name: '实名认证申请<code>' + table.data[id].name + '</code>'
-                });
-            }
         }
 
         function getdata(id, act, cb) {
-            ciyfn.callfunc('getdata', { id: id, act: act }, function (json) {
-                cb(json);
-            });
-            // cb({ data: id == 0 ? {} : table.data[id] });
+            cb({ data: id == 0 ? {} : table.data[id] });
         }
 
         function review(id) {
             getdata(id, 'review', function (jsndat) {
                 var dat = jsndat.data;
                 var html = '<div class="char6 row gridline">';
-                html += '<div class="ciy-form col-24 col-sm-24">';
-                html += '<label>所属用户</label><div>';
-                html += ciyfn.tdshow(dat.vuser, table.field.vuser.ext, dat, table.once, table.json, true);
+                html += '<div class="ciy-form col-24 col-sm-8">';
+                html += '<label class="lang">所属用户</label><div>';
+                html += ciyfn.tdshow('vuser', dat.vuser, table.field.vuser.ext, dat, table.json, true);
+                html += '</div></div>';
+
+                html += '<div class="ciy-form col-24 col-sm-8">';
+                html += '<label class="lang">真实姓名</label><div>';
+                html += ciyfn.tdshow('name', dat.name, table.field.name.ext, dat, table.json, true);
+                html += '</div></div>';
+
+                html += '<div class="ciy-form col-24 col-sm-8">';
+                html += '<label class="lang">身份证号</label><div>';
+                html += ciyfn.tdshow('idid', dat.idid, table.field.idid.ext, dat, table.json, true);
+                html += '</div></div>';
+
+                html += '<div class="ciy-form col-24 col-sm-8">';
+                html += '<label class="lang">身份证人像面</label><div>';
+                html += ciyfn.tdshow('idcard1', dat.idcard1, table.field.idcard1.ext, dat, table.json, true);
+                html += '</div></div>';
+
+                html += '<div class="ciy-form col-24 col-sm-16">';
+                html += '<label class="lang">身份证国徽面</label><div>';
+                html += ciyfn.tdshow('idcard2', dat.idcard2, table.field.idcard2.ext, dat, table.json, true);
+                html += '</div></div>';
+
+                html += '<div class="ciy-form col-24 col-sm-8">';
+                html += '<label class="lang">申请时间</label><div>';
+                html += ciyfn.tdshow('addtimes', dat.addtimes, table.field.addtimes.ext, dat, table.json, true);
+                html += '</div></div>';
+
+                html += '<div class="ciy-form col-24 col-sm-8">';
+                html += '<label class="lang">审核员</label><div>';
+                html += ciyfn.tdshow('audituser', dat.audituser, table.field.audituser.ext, dat, table.json, true);
+                html += '</div></div>';
+
+                html += '<div class="ciy-form col-24 col-sm-8">';
+                html += '<label class="lang">审核时间</label><div>';
+                html += ciyfn.tdshow('audittimes', dat.audittimes, table.field.audittimes.ext, dat, table.json, true);
                 html += '</div></div>';
 
                 html += '<div class="ciy-form col-24 col-sm-24">';
-                html += '<label>真实姓名</label><div>';
-                html += ciyfn.tdshow(dat.name, table.field.name.ext, dat, table.once, table.json, true);
-                html += '</div></div>';
-
-                html += '<div class="ciy-form col-24 col-sm-24">';
-                html += '<label>身份证号</label><div>';
-                html += ciyfn.tdshow(dat.idid, table.field.idid.ext, dat, table.once, table.json, true);
-                html += '</div></div>';
-
-                html += '<div class="ciy-form col-24 col-sm-24">';
-                html += '<label>身份证人像面</label><div>';
-                html += ciyfn.tdshow(dat.idcard1, table.field.idcard1.ext, dat, table.once, table.json, true);
-                html += '</div></div>';
-
-                html += '<div class="ciy-form col-24 col-sm-24">';
-                html += '<label>身份证国徽面</label><div>';
-                html += ciyfn.tdshow(dat.idcard2, table.field.idcard2.ext, dat, table.once, table.json, true);
-                html += '</div></div>';
-
-                html += '<div class="ciy-form col-24 col-sm-24">';
-                html += '<label>申请时间</label><div>';
-                html += ciyfn.tdshow(dat.addtimes, table.field.addtimes.ext, dat, table.once, table.json, true);
-                html += '</div></div>';
-
-                html += '<div class="ciy-form col-24 col-sm-24">';
-                html += '<label>拒绝理由</label><div>';
+                html += '<label class="lang">拒绝理由</label><div>';
                 html += '<input type="text" name="auditmsg" style="width:100%;" />';
                 html += '</div></div>';
                 html += '</div>';
@@ -167,6 +168,7 @@
                 });
             });
         }
+
     </script>
 </body>
 
diff --git a/web/admin/ap/usr_real_apply.php b/web/admin/ap/usr_real_apply.php
index cd0cc66..bdd8356 100644
--- a/web/admin/ap/usr_real_apply.php
+++ b/web/admin/ap/usr_real_apply.php
@@ -3,15 +3,29 @@
 namespace web\admin\ap;
 
 class usr_real_apply {
-    static function setwhere($db, $post) {
-        $query = $post->get('query');
+    static function setwhere($db, $post, $rsuser) {
+        $query = $post->get('query', array());
         $csql = new \ciy\sql('ap_usr_real_apply');
         $liid = objint($query, 'liid');
         if ($liid > 0)
             $csql->where('auditstatus', $liid);
+        $val = objstr($query, 'vuser');
+        if (!empty($val)) {
+            $csqlt = new \ciy\sql('ap_user');
+            $csqlt->where('name like', $val);
+            $trow = $db->getone($csqlt);
+            if (is_array($trow)) {
+                $csql->where('vuser', $trow['id']);
+                $query['vuser'] = $trow['name'];
+            } else {
+                $csql->where('vuser=0');
+            }
+        }
         $csql->where('name like', objstr($query, 'name'));
+        $csql->where('idid like', objstr($query, 'idid'));
         $csql->wheredaterange('addtimes', objstr($query, 'addtimes'));
         $csql->where('audituser', objstr($query, 'audituser'));
+        $csql->wheredaterange('audittimes', objstr($query, 'audittimes'));
         $csql->where('auditmsg like', objstr($query, 'auditmsg'));
         $order = objstr($query, 'order', 'id desc');
         $csql->order($order);
@@ -23,15 +37,15 @@ class usr_real_apply {
         global $db;
         $rsuser = verifyfast();
         $post = new \ciy\post();
-        list($where, $csql) = self::setwhere($db, $post);
+        list($where, $csql) = self::setwhere($db, $post, $rsuser);
         $pageno = $post->getint('pageno', 1);
         $pagecount = $post->getint('pagecount', 10);
         $csql->limit($pageno, $pagecount);
         $mainrowcount = $post->getint('count');
-        $rows = $db->get($csql, $mainrowcount);
-        if($rows === false)
+        $mrows = $db->get($csql, $mainrowcount);
+        if ($mrows === false)
             return errjson($db->error);
-        $ret = array('where' => $where, 'pageno' => $pageno, 'pagecount' => $pagecount, 'count' => $mainrowcount, 'list' => $rows);
+        $ret = array('searchwhere' => $where, 'pageno' => $pageno, 'pagecount' => $pagecount, 'count' => $mainrowcount, 'list' => $mrows);
         if ($post->getbool('field')) {
             $field = array();
             $fshow = $db->getfield($field, 'ap_usr_real_apply');
@@ -44,77 +58,18 @@ class usr_real_apply {
             $ret['fshow'] = $fshow;
         }
         if ($post->getbool('once')) {
-            $ret['once'] = array();
+            $ret['once'] = true;
             $input = array();
+            $input[] = array('type' => 'input', 'form' => 'vuser', 'name' => '所属用户', 'prop' => ' style="width:8em;"');
             $input[] = array('type' => 'input', 'form' => 'name', 'name' => '真实姓名', 'prop' => ' style="width:8em;"');
+            $input[] = array('type' => 'input', 'form' => 'idid', 'name' => '身份证号', 'prop' => ' style="width:8em;"');
             $input[] = array('type' => 'daterange', 'form' => 'addtimes', 'name' => '申请时间');
             $input[] = array('type' => 'select', 'form' => 'audituser', 'name' => '审核员', 'all' => '全部', 'select' => 'adminuser');
+            $input[] = array('type' => 'daterange', 'form' => 'audittimes', 'name' => '审核时间');
             $input[] = array('type' => 'input', 'form' => 'auditmsg', 'name' => '驳回原因', 'prop' => ' style="width:8em;"');
-            $ret['once']['input'] = $input;
+            $ret['searchinput'] = $input;
         }
-        $ret['ap_user'] = getrelation($db, $rows, 'ap_user', 'vuser');
-        return succjson($ret);
-    }
-
-    public static function json_getdata() {
-        global $db;
-        $rsuser = verifyfast();
-        $post = new \ciy\post();
-        $id = $post->getint('id');
-        $act = $post->get('act');
-        if ($id > 0) {
-            $csql = new \ciy\sql('ap_usr_real_apply');
-            $csql->where('id', $id);
-            $row = $db->getone($csql);
-            if (!is_array($row))
-                return errjson('数据不存在');
-            if ($act == 'view' || $act == 'review') {
-                $csql = (new \ciy\sql('ap_user'))->column('id,name');
-                $csql->where('id', $row['vuser']);
-                $ret['ap_user'] = $db->get($csql);
-            }
-        } else {
-            $row = array();
-        }
-        $ret['data'] = $row;
-        if ($act == 'edit') {
-            $csql = (new \ciy\sql('ap_user'))->column('id,name');
-            $ret['ap_user'] = $db->get($csql);
-        }
-        return succjson($ret);
-    }
-
-
-    public static function json_del() {
-        global $db;
-        $rsuser = verifyfast();
-        //if (nopower($db, $rsuser['id'], 'p d'))
-        //    return errjson('您未被授权操作');
-        $post = new \ciy\post();
-        $ids = $post->get('ids');
-        if (empty($ids))
-            return errjson('请选择至少一条');
-        $csql = new \ciy\sql('ap_usr_real_apply');
-        $csql->where('id in', $ids);
-        $rows = $db->get($csql);
-        $vids = array();
-        try {
-            $db->begin();
-            foreach ($rows as $row) {
-                $delid = $row['id'];
-                //delcheck($db, $delid, 'tablexx', 'xxid', '管理员');
-                //delall($db, $delid, 'tablexx', 'xxid', '运动员');  //deltimeall
-                delme($db, $delid, 'ap_usr_real_apply');
-                savelogdb($db, $rsuser['id'], 'ap_usr_real_apply', $row, null);
-                $vids[] = $delid;
-            }
-            $db->commit();
-        } catch (\Exception $ex) {
-            $db->rollback();
-            savelogfile('err_db', $ex->getMessage());
-            return errjson($ex->getMessage());
-        }
-        $ret['ids'] = $vids;
+        $ret['ap_user'] = getrelation($db, $mrows, 'ap_user', 'vuser');
         return succjson($ret);
     }
 
@@ -133,25 +88,30 @@ class usr_real_apply {
             return errjson('请填写驳回原因');
         $csql = new \ciy\sql('ap_usr_real_apply');
         $csql->where('id in', $ids);
-        $rows = $db->get($csql);
+        $mrows = $db->get($csql);
         $ids = array();
         try {
             $db->begin();
-            foreach ($rows as $row) {
-                $csql = new \ciy\sql('ap_usr_real_apply');
-                $csql->where('id', $row['id']);
+            foreach ($mrows as $mrow) {
+                if ($auditstatus == 100) {
+                    $updata = array();
+                    $updata['truename'] = $mrow['name'];
+                    $updata['idid'] = $mrow['idid'];
+                    $csql = new \ciy\sql('ap_usr_ext');
+                    $csql->where('id', $mrow['vuser']);
+                    if ($db->update($csql, $updata) === false)
+                        throw new \Exception('用户更新失败:' . $db->error);
+                }
                 $updata = array();
                 $updata['auditstatus'] = $auditstatus;
                 $updata['audituser'] = $rsuser['id'];
                 $updata['audittimes'] = tostamp();
                 $updata['auditmsg'] = $auditmsg;
                 $csql = new \ciy\sql('ap_usr_real_apply');
-                $csql->where('id', $row['id']);
+                $csql->where('id', $mrow['id']);
                 if ($db->update($csql, $updata) === false)
                     throw new \Exception('审核失败:' . $db->error);
-                $ids[] = $row['id'];
-                if ($auditstatus == 100) {
-                }
+                $ids[] = $mrow['id'];
             }
             $db->commit();
         } catch (\Exception $ex) {
@@ -170,10 +130,10 @@ class usr_real_apply {
         //if (nopower($db, $rsuser['id'], 'p e'))
         //    return errjson('您未被授权操作');
         $post = new \ciy\post();
-        list($where, $csql) = self::setwhere($db, $post);
-        $rows = $db->get($csql);
-        if (count($rows) > 10000)
-            return errjson('将导出' . count($rows) . '条，不建议超过1万条，请筛选缩小范围');
+        list($where, $csql) = self::setwhere($db, $post, $rsuser);
+        $mrows = $db->get($csql);
+        if (count($mrows) > 10000)
+            return errjson('将导出' . count($mrows) . '条，不建议超过1万条，请筛选缩小范围');
         $fields = array();
         $fields[] = array('style' => 'l', 'width' => 60,  'field' => 'id', 'name' => '行码');
         $fields[] = array('style' => 'c', 'width' => 100,  'field' => 'auditstatus', 'name' => '审核状态');
@@ -187,14 +147,14 @@ class usr_real_apply {
         $fields[] = array('style' => 'l', 'width' => 100,  'field' => 'audittimes', 'name' => '审核时间');
         $fields[] = array('style' => 'l', 'width' => 150,  'field' => 'auditmsg', 'name' => '驳回原因');
         $code_auditstatus = getcatas($db, 'auditstatus');
-        $code_vuser = getrelation($db, $rows, 'ap_user', 'vuser', 'id,name');
+        $code_vuser = getrelation($db, $mrows, 'ap_user', 'vuser', 'id,name');
         $code_audituser = getcatas($db, 'adminuser');
         $datas = array();
-        foreach ($rows as $row) {
+        foreach ($mrows as $mrow) {
             $dat = array();
             foreach ($fields as $field) {
                 $field = $field['field'];
-                $val = isset($row[$field]) ? $row[$field] : '';
+                $val = isset($mrow[$field]) ? $mrow[$field] : '';
                 if ($field == 'id')
                     $val = enid($val);
                 if ($field == 'auditstatus')
@@ -202,11 +162,11 @@ class usr_real_apply {
                 if ($field == 'vuser')
                     $val = ccode($code_vuser, $val);
                 if ($field == 'addtimes')
-                    $val = ($val == 0 ? '--' : date('Y-m-d H:i', $val));
+                    $val = ($val <= 0 ? '--' : date('Y-m-d H:i', $val));
                 if ($field == 'audituser')
                     $val = ccode($code_audituser, $val);
                 if ($field == 'audittimes')
-                    $val = ($val == 0 ? '--' : date('Y-m-d H:i', $val));
+                    $val = ($val <= 0 ? '--' : date('Y-m-d H:i', $val));
                 $dat[] = $val;
             }
             $datas[] = $dat;
@@ -218,7 +178,7 @@ class usr_real_apply {
         $param['titleheight'] = '25'; //列头高度
         $param['landscape'] = true; //横向打印
         $param['fixtopage'] = true; //打印整个工作表
-        $param['toptitle'] = 'Demo数据报表';
+        $param['toptitle'] = '实名认证申请数据报表';
         $str = \ciy\excel::general_excel_xml($param);
         $filename = '';
         if (empty($filename))
diff --git a/web/admin/ap/usr_sendmail.html b/web/admin/ap/usr_sendmail.html
new file mode 100644
index 0000000..22a5883
--- /dev/null
+++ b/web/admin/ap/usr_sendmail.html
@@ -0,0 +1,100 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+    <meta http-equiv="Content-type" content="text/html; charset=utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1, minimum-scale=1">
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+    <link href="/jscss/style.css" rel="stylesheet" type="text/css" />
+    <script type="text/javascript" charset="utf-8" src="/jscss/theme.js"></script>
+</head>
+
+<body>
+    <div class="container">
+        <form class="search" onsubmit="table.search(this,'btn');return false;">
+            <ul></ul>
+            <div>
+                <div class="sinps"></div>
+                <div class="sbtns">
+                    <button class="lang btn" type="submit">查询</button>
+                    <a class="lang btn" onclick="exportxls()">导出</a>
+                </div>
+            </div>
+        </form>
+        <div class="table">
+            <div class="loading col-24">Loading...</div>
+            <div class="list"></div>
+            <div>
+                <div class="btmbtn">
+                    <a class="lang btn def" onclick="ciyfn.select_all(table)">全选</a>
+                    <a class="lang btn def" onclick="ciyfn.select_diff(table)">反选</a>
+                    |
+                    <a class="lang btn dag" onclick="ciyfn.select_callfunc(table, this, 'del','已选{n}条，是否批量删除?', {},function(json){table.delline(json)})">批量删除</a>
+                    <a class="lang btn" onclick="ciyfn.select_callfunc(table, this, '','已选{n}条，是否批量重发?', {xxx:1},function(json){table.updateline(json)})">批量重发</a>
+                </div>
+                <div class="page"></div>
+            </div>
+        </div>
+    </div>
+
+    <script type="text/javascript" src="/jscss/ciy.js"></script>
+    <script type="text/javascript" src="/jscss/ciycmp.js"></script>
+    <script type="text/javascript" src="/jscss/ciytable.js"></script>
+    <script type="text/javascript" src="../common.js"></script>
+    <script type="text/javascript">
+        'use strict';
+        var table;
+        var Glob = {};
+        ciyfn.pageload(function () {
+            //Glob.urlp = ciyfn.urlparam();
+            table = new ciyclass.table({
+                dom: '.table'
+                , url: 'list'
+                , pagecount: 10
+                , chkbox: true
+                , fn_beforedata: function (json) {
+                    ciyfn.fillsearch({
+                        searchdom: '.search'
+                        , data: json
+                        , lidata: [{ id: '', name: '全部' }, { id: '1', name: '未发送' }, { id: '2', name: '已发送' }, { id: '3', name: '重发中' }, { id: '4', name: '已失败' }]
+                        , liclick: function (dom) {
+                            table.search(dom, 'li');
+                        }
+                    });
+                    return json;
+                }
+                , fn_tdcontent: function (key, datashow, field, data) {
+                    if (key == '_btn') {
+                        var html = '';
+                        html += `<a class="lang btn" onclick="menubtn(this, '')" onmousedown="event.stopPropagation()"></a>`;
+                        return html;
+                    }
+                }
+                , fn_done: function (json) {
+                    // table.mergecol('auditstatus');
+                    // table.mergefix('总计', 'center', 6, 0, 8, 1);
+                    // table.footertotal();
+                }
+            });
+            table.callpage(1);
+        });
+        function menubtn(dom, btn) {
+            var id = $5(dom).parent('tr').attr('data-id');
+            if (btn == '') {
+                ciyfn.callfastfunc(dom, '是否?', '', { ids: id }, function (json) { table.updateline(json) });
+            }
+        }
+
+        function exportxls() {
+            ciyfn.table_exportxls('exportxls', table, function (json) {
+                ciyfn.alert({
+                    content: '<div style="text-align:center;"><span class="lang">导出数据已生成</span><br/><br/><a class="lang btn lg" href="' + json.url + '" target="_blank">下载数据</a></div>'
+                    , btns: null
+                });
+            });
+        }
+
+    </script>
+</body>
+
+</html>
\ No newline at end of file
diff --git a/web/admin/ap/usr_sendmail.php b/web/admin/ap/usr_sendmail.php
new file mode 100644
index 0000000..5422c99
--- /dev/null
+++ b/web/admin/ap/usr_sendmail.php
@@ -0,0 +1,206 @@
+<?php
+
+namespace web\admin\ap;
+
+class usr_sendmail {
+    static function setwhere($db, $post, $rsuser) {
+        $query = $post->get('query', array());
+        $csql = new \ciy\sql('ap_usr_sendmail');
+        $liid = objint($query, 'liid');
+        if ($liid == 1)
+            $csql->where('');
+        if ($liid == 2)
+            $csql->where('');
+        if ($liid == 3)
+            $csql->where('');
+        if ($liid == 4)
+            $csql->where('');
+        $val = objstr($query, 'vuser');
+        if (!empty($val)) {
+            $csqlt = new \ciy\sql('ap_user');
+            $csqlt->where('name like', $val);
+            $trow = $db->getone($csqlt);
+            if (is_array($trow)) {
+                $csql->where('vuser', $trow['id']);
+                $query['vuser'] = $trow['name'];
+            } else {
+                $csql->where('vuser=0');
+            }
+        }
+        $csql->where('email like', objstr($query, 'email'));
+        $csql->where('chan like', objstr($query, 'chan'));
+        $csql->where('name like', objstr($query, 'name'));
+        $csql->wheredaterange('addtimes', objstr($query, 'addtimes'));
+        $csql->wheredaterange('sendtimes', objstr($query, 'sendtimes'));
+        $csql->wheredaterange('donetimes', objstr($query, 'donetimes'));
+        $order = objstr($query, 'order', 'id desc');
+        $csql->order($order);
+        $query['order'] = $order;
+        return [$query, $csql];
+    }
+
+    public static function json_list() {
+        global $db;
+        $rsuser = verifyfast();
+        $post = new \ciy\post();
+        list($where, $csql) = self::setwhere($db, $post, $rsuser);
+        $pageno = $post->getint('pageno', 1);
+        $pagecount = $post->getint('pagecount', 10);
+        $csql->limit($pageno, $pagecount);
+        $mainrowcount = $post->getint('count');
+        $rows = $db->get($csql, $mainrowcount);
+        if($rows === false)
+            return errjson($db->error);
+        $ret = array('searchwhere' => $where, 'pageno' => $pageno, 'pagecount' => $pagecount, 'count' => $mainrowcount, 'list' => $rows);
+        if ($post->getbool('field')) {
+            $field = array();
+            $fshow = $db->getfield($field, 'ap_usr_sendmail');
+            foreach ($field as $fr => $v) {
+                if (get('_' . $fr))
+                    $field[$fr]['c'] = ',' . $field[$fr]['c'];
+            }
+            $ret['field'] = $field;
+            $ret['fshow'] = $fshow;
+        }
+        if ($post->getbool('once')) {
+            $ret['once'] = true;
+            $input = array();
+            $input[] = array('type' => 'input', 'form' => 'vuser', 'name' => '所属用户', 'prop' => ' style="width:8em;"');
+            $input[] = array('type' => 'input', 'form' => 'email', 'name' => '邮件地址', 'prop' => ' style="width:8em;"');
+            $input[] = array('type' => 'input', 'form' => 'chan', 'name' => '通道号', 'prop' => ' style="width:8em;"');
+            $input[] = array('type' => 'input', 'form' => 'name', 'name' => '标题', 'prop' => ' style="width:8em;"');
+            $input[] = array('type' => 'daterange', 'form' => 'addtimes', 'name' => '添加时间');
+            $input[] = array('type' => 'daterange', 'form' => 'sendtimes', 'name' => '发送时间');
+            $input[] = array('type' => 'daterange', 'form' => 'donetimes', 'name' => '完成时间');
+            $ret['searchinput'] = $input;
+        }
+        $ret['ap_user'] = getrelation($db, $rows, 'ap_user', 'vuser');
+        return succjson($ret);
+    }
+
+    public static function json_del() {
+        global $db;
+        $rsuser = verifyfast();
+        //if (nopower($db, $rsuser['id'], 'p d'))
+        //    return errjson('您未被授权操作');
+        $post = new \ciy\post();
+        $ids = $post->get('ids');
+        if (empty($ids))
+            return errjson('请选择至少一条');
+        $csql = new \ciy\sql('ap_usr_sendmail');
+        $csql->where('id in', $ids);
+        $rows = $db->get($csql);
+        $vids = array();
+        try {
+            $db->begin();
+            foreach ($rows as $row) {
+                $delid = $row['id'];
+                //delcheck($db, $delid, 'tablexx', 'xxid', '管理员');
+                //delall($db, $delid, 'tablexx', 'xxid', '运动员');  //deltimeall
+                delme($db, $delid, 'ap_usr_sendmail');
+                savelogdb($db, $rsuser['id'], 'ap_usr_sendmail', $row, null);
+                $vids[] = $delid;
+            }
+            $db->commit();
+        } catch (\Exception $ex) {
+            $db->rollback();
+            savelogfile('err_db', $ex->getMessage());
+            return errjson($ex->getMessage());
+        }
+        $ret['ids'] = $vids;
+        return succjson($ret);
+    }
+
+    public static function json_multi_status() {
+        global $db;
+        $rsuser = verifyfast();
+        //if (nopower($db, $rsuser['id'], 'p m'))
+        //    return errjson('您未被授权操作');
+        $post = new \ciy\post();
+        $status = $post->getint('status');
+        $ids = $post->get('ids');
+        if (empty($ids))
+            return errjson('请选择至少一条');
+        $csql = new \ciy\sql('ap_usr_sendmail');
+        $csql->where('id in', $ids);
+        $rows = $db->get($csql);
+        $ids = array();
+        try {
+            $db->begin();
+            foreach ($rows as $row) {
+                $updata = array();
+                $updata['status'] = $status;
+                $csql = new \ciy\sql('ap_usr_sendmail');
+                $csql->where('id', $row['id']);
+                if ($db->update($csql, $updata) === false)
+                    throw new \Exception('批量操作失败:' . $db->error);
+                $ids[] = $row['id'];
+            }
+            $db->commit();
+        } catch (\Exception $ex) {
+            $db->rollback();
+            savelogfile('err_db', $ex->getMessage());
+            return errjson($ex->getMessage());
+        }
+        $ret['data'] = $updata;
+        $ret['ids'] = $ids;
+        return succjson($ret);
+    }
+
+    public static function json_exportxls() {
+        global $db;
+        $rsuser = verifyfast();
+        //if (nopower($db, $rsuser['id'], 'p e'))
+        //    return errjson('您未被授权操作');
+        $post = new \ciy\post();
+        list($where, $csql) = self::setwhere($db, $post, $rsuser);
+        $rows = $db->get($csql);
+        if (count($rows) > 10000)
+            return errjson('将导出' . count($rows) . '条，不建议超过1万条，请筛选缩小范围');
+        $fields = array();
+        $fields[] = array('style' => 'l', 'width' => 60,  'field' => 'id', 'name' => '行码');
+        $fields[] = array('style' => 'l', 'width' => 100,  'field' => 'vuser', 'name' => '所属用户');
+        $fields[] = array('style' => 'l', 'width' => 150,  'field' => 'email', 'name' => '邮件地址');
+        $fields[] = array('style' => 'l', 'width' => 100,  'field' => 'chan', 'name' => '通道号');
+        $fields[] = array('style' => 'l', 'width' => 150,  'field' => 'name', 'name' => '标题');
+        $fields[] = array('style' => 'l', 'width' => 100,  'field' => 'addtimes', 'name' => '添加时间');
+        $fields[] = array('style' => 'l', 'width' => 100,  'field' => 'sendtimes', 'name' => '发送时间');
+        $fields[] = array('style' => 'l', 'width' => 100,  'field' => 'donetimes', 'name' => '完成时间');
+        $code_vuser = getrelation($db, $rows, 'ap_user', 'vuser', 'id,name');
+        $datas = array();
+        foreach ($rows as $row) {
+            $dat = array();
+            foreach ($fields as $field) {
+                $field = $field['field'];
+                $val = isset($row[$field]) ? $row[$field] : '';
+                if ($field == 'id')
+                    $val = enid($val);
+                if ($field == 'vuser')
+                    $val = ccode($code_vuser, $val);
+                if ($field == 'addtimes')
+                    $val = ($val <= 0 ? '--' : date('Y-m-d H:i', $val));
+                if ($field == 'sendtimes')
+                    $val = ($val <= 0 ? '--' : date('Y-m-d H:i', $val));
+                if ($field == 'donetimes')
+                    $val = ($val <= 0 ? '--' : date('Y-m-d H:i', $val));
+                $dat[] = $val;
+            }
+            $datas[] = $dat;
+        }
+        $param = array();
+        $param['field'] = $fields;
+        $param['data'] = $datas;
+        $param['sheetname'] = '数据报表';
+        $param['titleheight'] = '25'; //列头高度
+        $param['landscape'] = true; //横向打印
+        $param['fixtopage'] = true; //打印整个工作表
+        $param['toptitle'] = '发送邮件数据报表';
+        $str = \ciy\excel::general_excel_xml($param);
+        $filename = '';
+        if (empty($filename))
+            $filename = date('Y-m-d_H-i-s') . rand(1000, 9999);
+        $filename .= '.xls';
+        file_put_contents(PATH_WEB . 'ud/tmp/' . $filename, $str);
+        return succjson(array('url' => '/ud/tmp/' . $filename));
+    }
+}
diff --git a/web/admin/ap/usr_sendsms.html b/web/admin/ap/usr_sendsms.html
new file mode 100644
index 0000000..22a5883
--- /dev/null
+++ b/web/admin/ap/usr_sendsms.html
@@ -0,0 +1,100 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+    <meta http-equiv="Content-type" content="text/html; charset=utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1, minimum-scale=1">
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+    <link href="/jscss/style.css" rel="stylesheet" type="text/css" />
+    <script type="text/javascript" charset="utf-8" src="/jscss/theme.js"></script>
+</head>
+
+<body>
+    <div class="container">
+        <form class="search" onsubmit="table.search(this,'btn');return false;">
+            <ul></ul>
+            <div>
+                <div class="sinps"></div>
+                <div class="sbtns">
+                    <button class="lang btn" type="submit">查询</button>
+                    <a class="lang btn" onclick="exportxls()">导出</a>
+                </div>
+            </div>
+        </form>
+        <div class="table">
+            <div class="loading col-24">Loading...</div>
+            <div class="list"></div>
+            <div>
+                <div class="btmbtn">
+                    <a class="lang btn def" onclick="ciyfn.select_all(table)">全选</a>
+                    <a class="lang btn def" onclick="ciyfn.select_diff(table)">反选</a>
+                    |
+                    <a class="lang btn dag" onclick="ciyfn.select_callfunc(table, this, 'del','已选{n}条，是否批量删除?', {},function(json){table.delline(json)})">批量删除</a>
+                    <a class="lang btn" onclick="ciyfn.select_callfunc(table, this, '','已选{n}条，是否批量重发?', {xxx:1},function(json){table.updateline(json)})">批量重发</a>
+                </div>
+                <div class="page"></div>
+            </div>
+        </div>
+    </div>
+
+    <script type="text/javascript" src="/jscss/ciy.js"></script>
+    <script type="text/javascript" src="/jscss/ciycmp.js"></script>
+    <script type="text/javascript" src="/jscss/ciytable.js"></script>
+    <script type="text/javascript" src="../common.js"></script>
+    <script type="text/javascript">
+        'use strict';
+        var table;
+        var Glob = {};
+        ciyfn.pageload(function () {
+            //Glob.urlp = ciyfn.urlparam();
+            table = new ciyclass.table({
+                dom: '.table'
+                , url: 'list'
+                , pagecount: 10
+                , chkbox: true
+                , fn_beforedata: function (json) {
+                    ciyfn.fillsearch({
+                        searchdom: '.search'
+                        , data: json
+                        , lidata: [{ id: '', name: '全部' }, { id: '1', name: '未发送' }, { id: '2', name: '已发送' }, { id: '3', name: '重发中' }, { id: '4', name: '已失败' }]
+                        , liclick: function (dom) {
+                            table.search(dom, 'li');
+                        }
+                    });
+                    return json;
+                }
+                , fn_tdcontent: function (key, datashow, field, data) {
+                    if (key == '_btn') {
+                        var html = '';
+                        html += `<a class="lang btn" onclick="menubtn(this, '')" onmousedown="event.stopPropagation()"></a>`;
+                        return html;
+                    }
+                }
+                , fn_done: function (json) {
+                    // table.mergecol('auditstatus');
+                    // table.mergefix('总计', 'center', 6, 0, 8, 1);
+                    // table.footertotal();
+                }
+            });
+            table.callpage(1);
+        });
+        function menubtn(dom, btn) {
+            var id = $5(dom).parent('tr').attr('data-id');
+            if (btn == '') {
+                ciyfn.callfastfunc(dom, '是否?', '', { ids: id }, function (json) { table.updateline(json) });
+            }
+        }
+
+        function exportxls() {
+            ciyfn.table_exportxls('exportxls', table, function (json) {
+                ciyfn.alert({
+                    content: '<div style="text-align:center;"><span class="lang">导出数据已生成</span><br/><br/><a class="lang btn lg" href="' + json.url + '" target="_blank">下载数据</a></div>'
+                    , btns: null
+                });
+            });
+        }
+
+    </script>
+</body>
+
+</html>
\ No newline at end of file
diff --git a/web/admin/ap/usr_sendsms.php b/web/admin/ap/usr_sendsms.php
new file mode 100644
index 0000000..e8997b3
--- /dev/null
+++ b/web/admin/ap/usr_sendsms.php
@@ -0,0 +1,203 @@
+<?php
+
+namespace web\admin\ap;
+
+class usr_sendsms {
+    static function setwhere($db, $post, $rsuser) {
+        $query = $post->get('query', array());
+        $csql = new \ciy\sql('ap_usr_sendsms');
+        $liid = objint($query, 'liid');
+        if ($liid == 1)
+            $csql->where('');
+        if ($liid == 2)
+            $csql->where('');
+        if ($liid == 3)
+            $csql->where('');
+        if ($liid == 4)
+            $csql->where('');
+        $val = objstr($query, 'vuser');
+        if (!empty($val)) {
+            $csqlt = new \ciy\sql('ap_user');
+            $csqlt->where('name like', $val);
+            $trow = $db->getone($csqlt);
+            if (is_array($trow)) {
+                $csql->where('vuser', $trow['id']);
+                $query['vuser'] = $trow['name'];
+            } else {
+                $csql->where('vuser=0');
+            }
+        }
+        $csql->where('mobile like', objstr($query, 'mobile'));
+        $csql->where('chan like', objstr($query, 'chan'));
+        $csql->wheredaterange('addtimes', objstr($query, 'addtimes'));
+        $csql->wheredaterange('sendtimes', objstr($query, 'sendtimes'));
+        $csql->wheredaterange('donetimes', objstr($query, 'donetimes'));
+        $order = objstr($query, 'order', 'id desc');
+        $csql->order($order);
+        $query['order'] = $order;
+        return [$query, $csql];
+    }
+
+    public static function json_list() {
+        global $db;
+        $rsuser = verifyfast();
+        $post = new \ciy\post();
+        list($where, $csql) = self::setwhere($db, $post, $rsuser);
+        $pageno = $post->getint('pageno', 1);
+        $pagecount = $post->getint('pagecount', 10);
+        $csql->limit($pageno, $pagecount);
+        $mainrowcount = $post->getint('count');
+        $rows = $db->get($csql, $mainrowcount);
+        if($rows === false)
+            return errjson($db->error);
+        $ret = array('searchwhere' => $where, 'pageno' => $pageno, 'pagecount' => $pagecount, 'count' => $mainrowcount, 'list' => $rows);
+        if ($post->getbool('field')) {
+            $field = array();
+            $fshow = $db->getfield($field, 'ap_usr_sendsms');
+            foreach ($field as $fr => $v) {
+                if (get('_' . $fr))
+                    $field[$fr]['c'] = ',' . $field[$fr]['c'];
+            }
+            $ret['field'] = $field;
+            $ret['fshow'] = $fshow;
+        }
+        if ($post->getbool('once')) {
+            $ret['once'] = true;
+            $input = array();
+            $input[] = array('type' => 'input', 'form' => 'vuser', 'name' => '所属用户', 'prop' => ' style="width:8em;"');
+            $input[] = array('type' => 'input', 'form' => 'mobile', 'name' => '手机号', 'prop' => ' style="width:8em;"');
+            $input[] = array('type' => 'input', 'form' => 'chan', 'name' => '通道号', 'prop' => ' style="width:8em;"');
+            $input[] = array('type' => 'daterange', 'form' => 'addtimes', 'name' => '添加时间');
+            $input[] = array('type' => 'daterange', 'form' => 'sendtimes', 'name' => '发送时间');
+            $input[] = array('type' => 'daterange', 'form' => 'donetimes', 'name' => '完成时间');
+            $ret['searchinput'] = $input;
+        }
+        $ret['ap_user'] = getrelation($db, $rows, 'ap_user', 'vuser');
+        return succjson($ret);
+    }
+
+    public static function json_del() {
+        global $db;
+        $rsuser = verifyfast();
+        //if (nopower($db, $rsuser['id'], 'p d'))
+        //    return errjson('您未被授权操作');
+        $post = new \ciy\post();
+        $ids = $post->get('ids');
+        if (empty($ids))
+            return errjson('请选择至少一条');
+        $csql = new \ciy\sql('ap_usr_sendsms');
+        $csql->where('id in', $ids);
+        $rows = $db->get($csql);
+        $vids = array();
+        try {
+            $db->begin();
+            foreach ($rows as $row) {
+                $delid = $row['id'];
+                //delcheck($db, $delid, 'tablexx', 'xxid', '管理员');
+                //delall($db, $delid, 'tablexx', 'xxid', '运动员');  //deltimeall
+                delme($db, $delid, 'ap_usr_sendsms');
+                savelogdb($db, $rsuser['id'], 'ap_usr_sendsms', $row, null);
+                $vids[] = $delid;
+            }
+            $db->commit();
+        } catch (\Exception $ex) {
+            $db->rollback();
+            savelogfile('err_db', $ex->getMessage());
+            return errjson($ex->getMessage());
+        }
+        $ret['ids'] = $vids;
+        return succjson($ret);
+    }
+
+    public static function json_multi_status() {
+        global $db;
+        $rsuser = verifyfast();
+        //if (nopower($db, $rsuser['id'], 'p m'))
+        //    return errjson('您未被授权操作');
+        $post = new \ciy\post();
+        $status = $post->getint('status');
+        $ids = $post->get('ids');
+        if (empty($ids))
+            return errjson('请选择至少一条');
+        $csql = new \ciy\sql('ap_usr_sendsms');
+        $csql->where('id in', $ids);
+        $rows = $db->get($csql);
+        $ids = array();
+        try {
+            $db->begin();
+            foreach ($rows as $row) {
+                $updata = array();
+                $updata['status'] = $status;
+                $csql = new \ciy\sql('ap_usr_sendsms');
+                $csql->where('id', $row['id']);
+                if ($db->update($csql, $updata) === false)
+                    throw new \Exception('批量操作失败:' . $db->error);
+                $ids[] = $row['id'];
+            }
+            $db->commit();
+        } catch (\Exception $ex) {
+            $db->rollback();
+            savelogfile('err_db', $ex->getMessage());
+            return errjson($ex->getMessage());
+        }
+        $ret['data'] = $updata;
+        $ret['ids'] = $ids;
+        return succjson($ret);
+    }
+
+    public static function json_exportxls() {
+        global $db;
+        $rsuser = verifyfast();
+        //if (nopower($db, $rsuser['id'], 'p e'))
+        //    return errjson('您未被授权操作');
+        $post = new \ciy\post();
+        list($where, $csql) = self::setwhere($db, $post, $rsuser);
+        $rows = $db->get($csql);
+        if (count($rows) > 10000)
+            return errjson('将导出' . count($rows) . '条，不建议超过1万条，请筛选缩小范围');
+        $fields = array();
+        $fields[] = array('style' => 'l', 'width' => 60,  'field' => 'id', 'name' => '行码');
+        $fields[] = array('style' => 'l', 'width' => 100,  'field' => 'vuser', 'name' => '所属用户');
+        $fields[] = array('style' => 'l', 'width' => 150,  'field' => 'mobile', 'name' => '手机号');
+        $fields[] = array('style' => 'l', 'width' => 100,  'field' => 'chan', 'name' => '通道号');
+        $fields[] = array('style' => 'l', 'width' => 100,  'field' => 'addtimes', 'name' => '添加时间');
+        $fields[] = array('style' => 'l', 'width' => 100,  'field' => 'sendtimes', 'name' => '发送时间');
+        $fields[] = array('style' => 'l', 'width' => 100,  'field' => 'donetimes', 'name' => '完成时间');
+        $code_vuser = getrelation($db, $rows, 'ap_user', 'vuser', 'id,name');
+        $datas = array();
+        foreach ($rows as $row) {
+            $dat = array();
+            foreach ($fields as $field) {
+                $field = $field['field'];
+                $val = isset($row[$field]) ? $row[$field] : '';
+                if ($field == 'id')
+                    $val = enid($val);
+                if ($field == 'vuser')
+                    $val = ccode($code_vuser, $val);
+                if ($field == 'addtimes')
+                    $val = ($val <= 0 ? '--' : date('Y-m-d H:i', $val));
+                if ($field == 'sendtimes')
+                    $val = ($val <= 0 ? '--' : date('Y-m-d H:i', $val));
+                if ($field == 'donetimes')
+                    $val = ($val <= 0 ? '--' : date('Y-m-d H:i', $val));
+                $dat[] = $val;
+            }
+            $datas[] = $dat;
+        }
+        $param = array();
+        $param['field'] = $fields;
+        $param['data'] = $datas;
+        $param['sheetname'] = '数据报表';
+        $param['titleheight'] = '25'; //列头高度
+        $param['landscape'] = true; //横向打印
+        $param['fixtopage'] = true; //打印整个工作表
+        $param['toptitle'] = '发送短信数据报表';
+        $str = \ciy\excel::general_excel_xml($param);
+        $filename = '';
+        if (empty($filename))
+            $filename = date('Y-m-d_H-i-s') . rand(1000, 9999);
+        $filename .= '.xls';
+        file_put_contents(PATH_WEB . 'ud/tmp/' . $filename, $str);
+        return succjson(array('url' => '/ud/tmp/' . $filename));
+    }
+}
diff --git a/web/admin/ap/usr_shipaddr.php b/web/admin/ap/usr_shipaddr.php
index a1b1855..0a36395 100644
--- a/web/admin/ap/usr_shipaddr.php
+++ b/web/admin/ap/usr_shipaddr.php
@@ -39,7 +39,7 @@ class usr_shipaddr {
         $rows = $db->get($csql, $mainrowcount);
         if($rows === false)
             return errjson($db->error);
-        $ret = array('where' => $where, 'pageno' => $pageno, 'pagecount' => $pagecount, 'count' => $mainrowcount, 'list' => $rows);
+        $ret = array('searchwhere' => $where, 'pageno' => $pageno, 'pagecount' => $pagecount, 'count' => $mainrowcount, 'list' => $rows);
         if ($post->getbool('field')) {
             $field = array();
             $fshow = $db->getfield($field, 'ap_usr_shipaddr');
@@ -52,13 +52,13 @@ class usr_shipaddr {
             $ret['fshow'] = $fshow;
         }
         if ($post->getbool('once')) {
-            $ret['once'] = array();
+            $ret['once'] = true;
             $input = array();
             $input[] = array('type' => 'input', 'form' => 'vuser', 'name' => '所属用户', 'prop' => ' style="width:8em;"');
             $input[] = array('type' => 'input', 'form' => 'name', 'name' => '收件人', 'prop' => ' style="width:8em;"');
             $input[] = array('type' => 'input', 'form' => 'phone', 'name' => '联系电话', 'prop' => ' style="width:8em;"');
             $input[] = array('type' => 'daterange', 'form' => 'uptimes', 'name' => '更新时间');
-            $ret['once']['input'] = $input;
+            $ret['searchinput'] = $input;
         }
         $ret['ap_user'] = getrelation($db, $rows, 'ap_user', 'vuser');
         return succjson($ret);
diff --git a/web/admin/ap/usr_suggest.html b/web/admin/ap/usr_suggest.html
index 5f501aa..821ff49 100644
--- a/web/admin/ap/usr_suggest.html
+++ b/web/admin/ap/usr_suggest.html
@@ -134,42 +134,42 @@
                 var html = '<div class="char4 row gridline">';
                 html += '<div class="ciy-form col-24 col-sm-12">';
                 html += '<label>所属用户</label><div>';
-                html += ciyfn.tdshow(dat.vuser, table.field.vuser.ext, dat, table.once, table.json, true);
+                html += ciyfn.tdshow('vuser', dat.vuser, table.field.vuser.ext, dat, table.json, true);
                 html += '</div></div>';
 
                 html += '<div class="ciy-form col-24 col-sm-12">';
                 html += '<label>联系方式</label><div>';
-                html += ciyfn.tdshow(dat.contract, table.field.contract.ext, dat, table.once, table.json, true);
+                html += ciyfn.tdshow('contract', dat.contract, table.field.contract.ext, dat, table.json, true);
                 html += '</div></div>';
 
                 html += '<div class="ciy-form col-24 col-sm-24 top">';
                 html += '<label>建议内容</label><div>';
-                html += ciyfn.tdshow(dat.content, table.field.content.ext, dat, table.once, table.json, true);
+                html += ciyfn.tdshow('content', dat.content, table.field.content.ext, dat, table.json, true);
                 html += '</div></div>';
 
                 html += '<div class="ciy-form col-24 col-sm-24 top">';
                 html += '<label>图片</label><div>';
-                html += ciyfn.tdshow(dat.imgs, table.field.imgs.ext, dat, table.once, table.json, true);
+                html += ciyfn.tdshow('imgs', dat.imgs, table.field.imgs.ext, dat, table.json, true);
                 html += '</div></div>';
 
                 html += '<div class="ciy-form col-24 col-sm-8">';
                 html += '<label>提交时间</label><div>';
-                html += ciyfn.tdshow(dat.addtimes, table.field.addtimes.ext, dat, table.once, table.json, true);
+                html += ciyfn.tdshow('addtimes', dat.addtimes, table.field.addtimes.ext, dat, table.json, true);
                 html += '</div></div>';
 
                 html += '<div class="ciy-form col-24 col-sm-8">';
                 html += '<label>答复人</label><div>';
-                html += ciyfn.tdshow(dat.replyuser, table.field.replyuser.ext, dat, table.once, table.json, true);
+                html += ciyfn.tdshow('replyuser', dat.replyuser, table.field.replyuser.ext, dat, table.json, true);
                 html += '</div></div>';
 
                 html += '<div class="ciy-form col-24 col-sm-8">';
                 html += '<label>答复时间</label><div>';
-                html += ciyfn.tdshow(dat.replytimes, table.field.replytimes.ext, dat, table.once, table.json, true);
+                html += ciyfn.tdshow('replytimes', dat.replytimes, table.field.replytimes.ext, dat, table.json, true);
                 html += '</div></div>';
 
                 html += '<div class="ciy-form col-24 col-sm-24 top">';
                 html += '<label>答复内容</label><div>';
-                html += ciyfn.tdshow(dat.replymsg, table.field.replymsg.ext, dat, table.once, table.json, true);
+                html += ciyfn.tdshow('replymsg', dat.replymsg, table.field.replymsg.ext, dat, table.json, true);
                 html += '</div></div>';
 
                 html += '</div>';
diff --git a/web/admin/ap/usr_suggest.php b/web/admin/ap/usr_suggest.php
index 43aa1e3..3d8b6da 100644
--- a/web/admin/ap/usr_suggest.php
+++ b/web/admin/ap/usr_suggest.php
@@ -45,7 +45,7 @@ class usr_suggest {
         $rows = $db->get($csql, $mainrowcount);
         if ($rows === false)
             return errjson($db->error);
-        $ret = array('where' => $where, 'pageno' => $pageno, 'pagecount' => $pagecount, 'count' => $mainrowcount, 'list' => $rows);
+        $ret = array('searchwhere' => $where, 'pageno' => $pageno, 'pagecount' => $pagecount, 'count' => $mainrowcount, 'list' => $rows);
         if ($post->getbool('field')) {
             $field = array();
             $fshow = $db->getfield($field, 'ap_usr_suggest');
@@ -58,14 +58,14 @@ class usr_suggest {
             $ret['fshow'] = $fshow;
         }
         if ($post->getbool('once')) {
-            $ret['once'] = array();
+            $ret['once'] = true;
             $input = array();
             $input[] = array('type' => 'input', 'form' => 'vuser', 'name' => '所属用户', 'prop' => ' style="width:8em;"');
             $input[] = array('type' => 'input', 'form' => 'contract', 'name' => '联系方式', 'prop' => ' style="width:8em;"');
             $input[] = array('type' => 'input', 'form' => 'content', 'name' => '建议内容', 'prop' => ' style="width:8em;"');
             $input[] = array('type' => 'daterange', 'form' => 'addtimes', 'name' => '提交时间');
             $input[] = array('type' => 'select', 'form' => 'replyuser', 'name' => '答复人', 'all' => '全部', 'select' => 'adminuser');
-            $ret['once']['input'] = $input;
+            $ret['searchinput'] = $input;
         }
         $ret['ap_user'] = getrelation($db, $rows, 'ap_user', 'vuser');
         return succjson($ret);
diff --git a/web/admin/autotask/task.php b/web/admin/autotask/task.php
index 72bbab0..c0a5ad1 100644
--- a/web/admin/autotask/task.php
+++ b/web/admin/autotask/task.php
@@ -27,6 +27,11 @@ class task {
         if (isset($_SERVER['HTTP_HOST']))
             ob_end_clean();
         $db = new \ciy\db();
+        $rsuser = verifyuser();
+        if ($rsuser == null)
+            return clog('您未登录');
+        if (nopower($db, $rsuser['id'], 'p602r'))
+            return clog('您未被授权操作');
         echo '<!DOCTYPE html> <html><head>';
         echo '<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">';
         echo '<title>AutoTask Running</title>';
@@ -36,11 +41,6 @@ class task {
         if ($runid == 0) {
             clog('runid参数错误');
         }
-        $rsuser = verifyuser();
-        if ($rsuser == null)
-            return clog('您未登录');
-        if (nopower($db, $rsuser['id'], 'p602r'))
-            return clog('您未被授权操作');
         $csql = new \ciy\sql('zc_autotask');
         $csql->where('id', $runid);
         $taskrow = $db->getone($csql);
@@ -77,7 +77,8 @@ class task {
         }
         echo $html;
         echo '</body></html>';
-        return 'html';
+    }
+    public static function outputhtml($html) {
     }
     // exit
     static function run($db, $taskrow) {
diff --git a/web/admin/common.php b/web/admin/common.php
index 99a6c6d..1b71991 100644
--- a/web/admin/common.php
+++ b/web/admin/common.php
@@ -18,9 +18,9 @@
  */
 
 $_token = array();
-$_token['type'] = 'localstorage'; //cookie(更安全，只支持https) 、 localstorage(兼容性好)
+$_token['type'] = 'cookie'; //cookie(更安全) 、 localstorage(兼容性好)
 $_token['swapsec'] = 3600; //更换JWT时间
-$_token['expsec'] = 86400 * 7; //过期退出时间
+$_token['expsec'] = 86400 * 30; //过期退出时间
 $_token['field'] = 'ciyadm';
 $_token['salt'] = 'bka02$59gG'; //做数据加解密时的加密因子，每个项目都不要相同。
 
diff --git a/web/admin/demo/front/form_map.html b/web/admin/demo/front/form_map.html
index c110378..55b21fc 100644
--- a/web/admin/demo/front/form_map.html
+++ b/web/admin/demo/front/form_map.html
@@ -20,12 +20,20 @@
             </div>
             <div class="ciy-form col-24 col-sm-24">
                 <label>测试b</label>
-                <div><ciy-map hasmore initevent com="b" value="33,111" /></div>
+                <div><ciy-map hasmore initevent com="b" value="330000000,1110000000" /></div>
             </div>
             <div class="ciy-form col-24 col-sm-24">
                 <label>测试loc</label>
                 <div>第 <ciy-map com="loc" style="font-size:2em;" /></div>
             </div>
+            <div class="ciy-form col-24 col-sm-24">
+                <label>毫米精度d</label>
+                <div><ciy-map hasmore bet="1000000000" com="d" /></div>
+            </div>
+            <div class="ciy-form col-24 col-sm-24">
+                <label>浮点数e</label>
+                <div><ciy-map hasmore bet="1" com="e" /></div>
+            </div>
         </div>
         <button type="submit" class="btn lg">提交</button>
         <a class="btn" onclick="chg()">改变值</a>
@@ -43,10 +51,14 @@
     <script type="text/javascript">
         'use strict';
         var c;
+        //经纬度乘以10000000，通常使用int存储。精度在分米级。
+        //如果需要厘米级精度，可以自定调整精度。
         ciyfn.pageload(function () {
             c = ciycmp({ dom: '[com=a]', onchange: function (d) { showlog(d) } });
             ciycmp({ dom: '[com=b]', onchange: function (d) { showlog(d) } });
-            ciycmp({ dom: '[com=loc]', value: { lat: 12, lng: 34 }, onchange: function (d) { showlog(d) } });
+            ciycmp({ dom: '[com=loc]', value: { lat: 301331321, lng: 1200375089 }, onchange: function (d) { showlog(d) } });
+            ciycmp({ dom: '[com=d]',bet:1000000000, onchange: function (d) { showlog(d) } });
+            ciycmp({ dom: '[com=e]',bet:1, onchange: function (d) { showlog(d) } });
         });
         function formsubmit(event) {
             event.preventDefault();
@@ -60,7 +72,7 @@
         }
         function chg() {
             console.log(c);
-            c.setvalue({ lat: 30, lng: 118 });
+            c.setvalue({ lat: 300000000, lng: 1180000000 });
         }
     </script>
 </body>
diff --git a/web/admin/demo/front/win_alert.html b/web/admin/demo/front/win_alert.html
index 044e744..d8b734c 100644
--- a/web/admin/demo/front/win_alert.html
+++ b/web/admin/demo/front/win_alert.html
@@ -103,7 +103,7 @@
             'use strict';
             function alert3() {
                 ciyfn.alert({
-                    content: '<div class="form-group"><label>文本框</label><div><input type="text" name="title"/></div></div><div class="form-group"><label>下拉列表框</label><div><select name="sel"><option value="afds">aaaa</option></select></div></div><div class="form-group"><label>多行文本框</label><div><textarea name="text"></textarea></div></div>',
+                    content: '<div class="ciy-form"><label>文本框</label><div><input type="text" name="title"/></div></div><div class="ciy-form"><label>下拉列表框</label><div><select name="sel"><option value="afds">aaaa</option></select></div></div><div class="ciy-form"><label>多行文本框</label><div><textarea name="text"></textarea></div></div>',
                     cb: function (opn) {
                         console.log(opn);
                         ciyfn.alert('已输入<br/>input:' + opn.inputs.title + "<br/>select:" + opn.inputs.sel + "<br/>textarea:" + opn.inputs.text);
diff --git a/web/admin/demo/multicat.html b/web/admin/demo/multicat.html
index 20aec03..6e9b010 100644
--- a/web/admin/demo/multicat.html
+++ b/web/admin/demo/multicat.html
@@ -16,8 +16,8 @@
 				<div class="sinps"></div>
 				<div class="sbtns">
 					<button class="lang btn" type="submit">查询</button>
-					<a class="lang btn" onclick="multiadd()">添加新部门</a>
-					<a class="lang btn" onclick="datatxt()">部门结构</a>
+					<a class="lang btn" onclick="multiadd()">添加</a>
+					<a class="lang btn def" onclick="datatxt()">结构</a>
 					<a class="lang btn dag" onclick="deltree()">批量删除</a>
 				</div>
 			</div>
@@ -43,7 +43,7 @@
 			</div>
 		</div>
 		<div class="ciy-form v">
-			<label style="min-width:3em;"><span class="lang">部门名称</span><code class="lang">(一行一个)</code></label>
+			<label style="min-width:3em;"><span class="lang">名称</span><code class="lang">(一行一个)</code></label>
 			<div>
 				<ciy-textarea com="multi" minheight="30em"></ciy-textarea>
 			</div>
@@ -92,28 +92,28 @@
 				}
 				, fn_tdcontent: function (key, datashow, field, data) {
 					if (key == 'isuse') {
-						return '<ciy-switch com="' + key + '" value="' + data[key] + '" y="显示" n="隐藏" />';
+						return '<ciy-switch com="' + key + '" value="' + data[key] + '" y="显示" n="隐藏"  onmousedown="event.stopPropagation();"/>';
 					}
 					if (key == 'leaderuser') {
-						return '<ciy-select com="' + key + '" value="' + data[key] + '"/>';
+						return '<ciy-select com="' + key + '" value="' + data[key] + '" onmousedown="event.stopPropagation();"/>';
 					}
 					if (key == 'csort') {
-						return '<input spellcheck="false" style="width:100%;" onkeydown="btnset(this)" type="text" name="' + key + '" value="' + datashow + '"/>';
+						return '<input spellcheck="false" style="width:100%;" onkeydown="btnset(this)" type="text" name="' + key + '" value="' + datashow + '" onmousedown="event.stopPropagation();"/>';
 					}
 					if (key == '_btn') {
-						var html = '<a class="lang btn def upbtn" onclick="menubtn(this, \'edit\')">' + (data['id'] == 0 ? '新增' : '更新') + '</a>';
-						html += '<a class="lang btn" onclick="menubtn(this, \'tz\')">调整</a>';
+						var html = '<a class="lang btn def upbtn" onclick="menubtn(this, \'edit\')" onmousedown="event.stopPropagation();">' + (data['id'] == 0 ? '新增' : '更新') + '</a>';
+						html += '<a class="lang btn" onclick="menubtn(this, \'tz\')" onmousedown="event.stopPropagation();">调整</a>';
 						return html;
 					}
 					if (key == 'name') {
 						var deep = toint(data['_deep']);
 						var html = '　'.repeat(deep);
 						if (data['_count'] > 0) {
-							html += '<span class="ciy-tree-dot">▶</span> <input style="margin-left: 0.3em;width:100%;" onclick="event.stopPropagation();" onkeydown="btnset(this)" type="text" name="' + key + '" value="' + data['name'] + '"/>';
+							html += '<span class="ciy-tree-dot" onmousedown="event.stopPropagation();">▶</span> <input style="margin-left: 0.3em;width:100%;" onclick="event.stopPropagation();" onkeydown="btnset(this)" type="text" name="' + key + '" value="' + data['name'] + '" onmousedown="event.stopPropagation();"/>';
 						} else {
 							if (deep > 0)
 								html += '　 ';
-							html += '<input style="width:100%;" onclick="event.stopPropagation();" onkeydown="btnset(this)" type="text" name="' + key + '" value="' + data['name'] + '"/>';
+							html += '<input style="width:100%;" onclick="event.stopPropagation();" onkeydown="btnset(this)" type="text" name="' + key + '" value="' + data['name'] + '" onmousedown="event.stopPropagation();"/>';
 						}
 						return {
 							divprop: (data['_count'] > 0 ? ' data-treeid="' + data['id'] + '"' : '') + ' data-deep="' + data['_deep'] + '" style="display: flex;" class="ciy-tree-spread"'// class="ciy-tree-spread"
@@ -170,7 +170,7 @@
 		}
 		function multiadd() {
 			ciyfn.alert({
-				title: '添加新部门'
+				title: '添加'
 				, width: 'mb'
 				, contentstyle: 'overflow:hidden;'
 				, content: document.getElementById("alert_multiadd").innerHTML
@@ -212,7 +212,7 @@
 				return menutxt;
 			}
 			ciyfn.alert({
-				title: '部门结构'
+				title: '结构'
 				, width: 'mb'
 				, height: 'pc'
 				, content: '<textarea style="height: 100%;">' + deeptxt(tdata) + '</textarea>'
@@ -233,7 +233,7 @@
 			}
 			if (btn == 'tz') {
 				ciyfn.alert({
-					title: '调整部门层级'
+					title: '调整层级'
 					, content: document.getElementById("alert_modifyupid").innerHTML
 					, fn_showed: function (doc, dom) {
 						if (id == 0)
diff --git a/web/admin/demo/multicat.php b/web/admin/demo/multicat.php
index 432de49..c6da30f 100644
--- a/web/admin/demo/multicat.php
+++ b/web/admin/demo/multicat.php
@@ -24,7 +24,10 @@ class multicat {
             $ret['once'] = array();
             $input = array();
             $input[] = array(
-                'type' => 'input', 'form' => 'name', 'name' => '组织名称', 'prop' => ' style="width:8em;"'
+                'type' => 'input',
+                'form' => 'name',
+                'name' => '名称',
+                'prop' => ' style="width:8em;"'
             );
             $ret['once']['input'] = $input;
         }
@@ -34,15 +37,15 @@ class multicat {
     public static function json_update() {
         global $db;
         $rsuser = verifyfast();
-        
-        if (nopower($db, $rsuser['id'], 'p501u'))
-            return errjson('您未被授权操作');
+
+        // if (nopower($db, $rsuser['id'], 'p501u'))
+        //     return errjson('您未被授权操作');
         $post = new \ciy\post();
         $updata = array();
         $id = $post->getint('id');
         $name = $post->get('name');
         if ($name == '')
-            return errjson('请填写部门名称');
+            return errjson('请填写名称');
         $upid = $post->getint('upid');
         $csort = $post->getint('csort');
         $isuse = $post->getint('isuse');
@@ -78,9 +81,9 @@ class multicat {
     public static function json_del() {
         global $db;
         $rsuser = verifyfast();
-        
-        if (nopower($db, $rsuser['id'], 'p501d'))
-            return errjson('您未被授权操作');
+
+        // if (nopower($db, $rsuser['id'], 'p501d'))
+        //     return errjson('您未被授权操作');
         $post = new \ciy\post();
         $csql = new \ciy\sql('zc_depart');
         $ids = $post->get('ids');
@@ -94,7 +97,7 @@ class multicat {
             foreach ($rows as $row) {
                 $delid = $row['id'];
                 delcheck($db, $delid, 'zc_admin', 'departid', '人员');
-                delcheck($db, $delid, 'zc_depart', 'upid', '下级部门');
+                delcheck($db, $delid, 'zc_depart', 'upid', '下级');
                 delme($db, $delid, 'zc_depart');
                 savelogdb($db, $rsuser['id'], 'zc_depart', $row, null);
                 $vids[] = $delid;
@@ -111,9 +114,9 @@ class multicat {
     public static function json_modifyupid() {
         global $db;
         $rsuser = verifyfast();
-        
-        if (nopower($db, $rsuser['id'], 'p501u'))
-            return errjson('您未被授权操作');
+
+        // if (nopower($db, $rsuser['id'], 'p501u'))
+        //     return errjson('您未被授权操作');
         $post = new \ciy\post();
         $id = $post->getint('id');
         $newupid = $post->getint('newupid');
@@ -143,29 +146,45 @@ class multicat {
     public static function json_multiadd() {
         global $db;
         $rsuser = verifyfast();
-        
-        if (nopower($db, $rsuser['id'], 'p501u'))
-            return errjson('您未被授权操作');
+
+        // if (nopower($db, $rsuser['id'], 'p501u'))
+        //     return errjson('您未被授权操作');
         $post = new \ciy\post();
         $upid = $post->getint('upid');
         $multi = explode("\n", $post->get('multi'));
 
         $cnt = 0;
+        $deepids = array();
+        $deepids[0] = $upid;
+        $lastdeep = 0;
         try {
             $db->begin();
             foreach ($multi as $m) {
                 $m = trim($m);
                 if (empty($m))
                     continue;
+                $deep = 0;
+                while (true) {
+                    if (substr($m, 0, 2) != '--')
+                        break;
+                    $deep++;
+                    $m = trim(substr($m, 2));
+                }
+                if (empty($m))
+                    continue;
+                if ($lastdeep < $deep)
+                    throw new \Exception('不能跳跃层级:' . $m);
                 $updata = array();
                 $updata['name'] = $m;
                 $updata['isuse'] = 1;
-                $updata['upid'] = $upid;
+                $updata['upid'] = $deepids[$deep];
                 $updata['csort'] = 10;
                 $csql = new \ciy\sql('zc_depart');
                 if ($db->insert($csql, $updata) === false)
                     throw new \Exception('新增失败:' . $db->error);
                 $updata['id'] = $db->insert_id();
+                $deepids[$deep + 1] = $updata['id'];
+                $lastdeep = $deep + 1;
                 $cnt++;
                 savelogdb($db, $rsuser['id'], 'zc_depart', null, $updata);
             }
diff --git a/web/admin/demo/normal.go b/web/admin/demo/normal.go
index 49cddc6..4ff175e 100644
--- a/web/admin/demo/normal.go
+++ b/web/admin/demo/normal.go
@@ -218,9 +218,8 @@ func Normal_update(w http.ResponseWriter, r *http.Request) bool {
 	imgs := post.Get("imgs")
 	ton := post.Getint("ton")
 	price := post.Getint("price")
-	lat := post.Getfloat("lat")
-	lng := post.Getfloat("lng")
-	nums := post.Getfloat("nums")
+	lat := post.Getint("lat")
+	lng := post.Getint("lng")
 	url := post.Get("url")
 	idcard := post.Get("idcard")
 	weightg := post.Getint("weightg")
@@ -277,7 +276,6 @@ func Normal_update(w http.ResponseWriter, r *http.Request) bool {
 		updata["price"] = price
 		updata["lat"] = lat
 		updata["lng"] = lng
-		updata["nums"] = nums
 		updata["url"] = url
 		updata["idcard"] = idcard
 		updata["weightg"] = weightg
@@ -441,7 +439,6 @@ func Normal_exportxls(w http.ResponseWriter, r *http.Request) bool {
 	fields = append(fields, map[string]string{"style": "r", "width": "100", "field": "price", "name": "单价"})
 	fields = append(fields, map[string]string{"style": "l", "width": "100", "field": "lat", "name": "纬度"})
 	fields = append(fields, map[string]string{"style": "c", "width": "100", "field": "lng", "name": "位置"})
-	fields = append(fields, map[string]string{"style": "r", "width": "100", "field": "nums", "name": "监管数量"})
 	fields = append(fields, map[string]string{"style": "l", "width": "100", "field": "url", "name": "链接"})
 	fields = append(fields, map[string]string{"style": "l", "width": "100", "field": "idcard", "name": "身份证号"})
 	fields = append(fields, map[string]string{"style": "r", "width": "100", "field": "weightg", "name": "体重"})
@@ -623,7 +620,6 @@ func Normal_importxls_in(w http.ResponseWriter, r *http.Request) bool {
 	headsn = append(headsn, "单价.price")
 	headsn = append(headsn, "纬度.lat")
 	headsn = append(headsn, "位置.lng")
-	headsn = append(headsn, "监管数量.nums")
 	headsn = append(headsn, "链接.url")
 	headsn = append(headsn, "身份证号.idcard")
 	headsn = append(headsn, "体重.weightg")
@@ -1115,7 +1111,6 @@ func Normal_importxls_data(w http.ResponseWriter, r *http.Request) bool {
 			price := post.Get("price_" + istr)
 			lat := post.Get("lat_" + istr)
 			lng := post.Get("lng_" + istr)
-			nums := post.Get("nums_" + istr)
 			url := post.Get("url_" + istr)
 			idcard := post.Get("idcard_" + istr)
 			weightg := post.Get("weightg_" + istr)
@@ -1153,7 +1148,6 @@ func Normal_importxls_data(w http.ResponseWriter, r *http.Request) bool {
 			updata["price"] = price
 			updata["lat"] = lat
 			updata["lng"] = lng
-			updata["nums"] = nums
 			updata["url"] = url
 			updata["idcard"] = idcard
 			updata["weightg"] = weightg
diff --git a/web/admin/demo/normal.html b/web/admin/demo/normal.html
index 289f415..84712fa 100644
--- a/web/admin/demo/normal.html
+++ b/web/admin/demo/normal.html
@@ -213,19 +213,13 @@
                     <ciy-map com="loc" />
                 </div>
             </div>
-            <div class="ciy-form col-24 col-sm-8">
-                <label class="lang">监管数量</label>
-                <div>
-                    <input type="text" name="nums" style="width:9em;text-align:right;" />
-                </div>
-            </div>
             <div class="ciy-form col-24 col-sm-8">
                 <label class="lang">百分比</label>
                 <div>
                     <ciy-inputbet com="pct" unit="%" bet="100" />
                 </div>
             </div>
-            <div class="ciy-form col-24 col-sm-8">
+            <div class="ciy-form col-24 col-sm-16">
                 <label class="lang">链接</label>
                 <div>
                     <input type="text" name="url" style="width:100%;" />
@@ -405,7 +399,6 @@
                         ciycmp({ dom: $5('[com=ton]', dom), value: dat.ton });
                         ciycmp({ dom: $5('[com=price]', dom), value: dat.price });
                         ciycmp({ dom: $5('[com=loc]', dom), value: { lat: dat.lat, lng: dat.lng } });
-                        $5('[name=nums]', dom).val(dat.nums);
                         ciycmp({ dom: $5('[com=pct]', dom), value: dat.pct });
                         $5('[name=url]', dom).val(dat.url);
                         ciycmp({ dom: $5('[com=weightg]', dom), value: dat.weightg });
@@ -452,222 +445,217 @@
                 var html = '<div class="char4 row gridline">';
                 html += '<div class="ciy-form col-24 col-sm-8">';
                 html += '<label>审核状态</label><div>';
-                html += ciyfn.tdshow(dat.auditstatus, table.field.auditstatus.ext, dat, table.once, table.json, true);
+                html += ciyfn.tdshow('auditstatus', dat.auditstatus, table.field.auditstatus.ext, dat, table.json, true);
                 html += '</div></div>';
 
                 html += '<div class="ciy-form col-24 col-sm-8">';
                 html += '<label>审核人</label><div>';
-                html += ciyfn.tdshow(dat.audituser, table.field.audituser.ext, dat, table.once, table.json, true);
+                html += ciyfn.tdshow('audituser', dat.audituser, table.field.audituser.ext, dat, table.json, true);
                 html += '</div></div>';
 
                 html += '<div class="ciy-form col-24 col-sm-8">';
                 html += '<label>审核时间</label><div>';
-                html += ciyfn.tdshow(dat.audittimes, table.field.audittimes.ext, dat, table.once, table.json, true);
+                html += ciyfn.tdshow('audittimes', dat.audittimes, table.field.audittimes.ext, dat, table.json, true);
                 html += '</div></div>';
 
                 html += '<div class="ciy-form col-24 col-sm-24">';
                 html += '<label>审核理由</label><div>';
-                html += ciyfn.tdshow(dat.auditmsg, table.field.auditmsg.ext, dat, table.once, table.json, true);
+                html += ciyfn.tdshow('auditmsg', dat.auditmsg, table.field.auditmsg.ext, dat, table.json, true);
                 html += '</div></div>';
 
                 html += '<div class="ciy-form col-24 col-sm-16">';
                 html += '<label>默认标题</label><div>';
-                html += ciyfn.tdshow(dat.name, table.field.name.ext, dat, table.once, table.json, true);
+                html += ciyfn.tdshow('name', dat.name, table.field.name.ext, dat, table.json, true);
                 html += '</div></div>';
 
                 html += '<div class="ciy-form col-24 col-sm-8">';
                 html += '<label>所属菜单</label><div>';
-                html += ciyfn.tdshow(dat.menuid, table.field.menuid.ext, dat, table.once, table.json, true);
+                html += ciyfn.tdshow('menuid', dat.menuid, table.field.menuid.ext, dat, table.json, true);
                 html += '</div></div>';
 
                 html += '<div class="ciy-form col-24 col-sm-8">';
                 html += '<label>文件大小</label><div>';
-                html += ciyfn.tdshow(dat.filesize, table.field.filesize.ext, dat, table.once, table.json, true);
+                html += ciyfn.tdshow('filesize', dat.filesize, table.field.filesize.ext, dat, table.json, true);
                 html += '</div></div>';
 
                 html += '<div class="ciy-form col-24 col-sm-8">';
                 html += '<label>长度</label><div>';
-                html += ciyfn.tdshow(dat.metre, table.field.metre.ext, dat, table.once, table.json, true);
+                html += ciyfn.tdshow('metre', dat.metre, table.field.metre.ext, dat, table.json, true);
                 html += '</div></div>';
 
                 html += '<div class="ciy-form col-24 col-sm-8">';
                 html += '<label>贷款金额</label><div>';
-                html += ciyfn.tdshow(dat.bankmoney, table.field.bankmoney.ext, dat, table.once, table.json, true);
+                html += ciyfn.tdshow('bankmoney', dat.bankmoney, table.field.bankmoney.ext, dat, table.json, true);
                 html += '</div></div>';
 
                 html += '<div class="ciy-form col-24 col-sm-8">';
                 html += '<label>设置日期</label><div>';
-                html += ciyfn.tdshow(dat.setdate, table.field.setdate.ext, dat, table.once, table.json, true);
+                html += ciyfn.tdshow('setdate', dat.setdate, table.field.setdate.ext, dat, table.json, true);
                 html += '</div></div>';
 
                 html += '<div class="ciy-form col-24 col-sm-8">';
                 html += '<label>设置时间</label><div>';
-                html += ciyfn.tdshow(dat.settimes, table.field.settimes.ext, dat, table.once, table.json, true);
+                html += ciyfn.tdshow('settimes', dat.settimes, table.field.settimes.ext, dat, table.json, true);
                 html += '</div></div>';
 
                 html += '<div class="ciy-form col-24 col-sm-8">';
                 html += '<label>营业时间</label><div>';
-                html += ciyfn.tdshow(dat.dayclock, table.field.dayclock.ext, dat, table.once, table.json, true);
+                html += ciyfn.tdshow('dayclock', dat.dayclock, table.field.dayclock.ext, dat, table.json, true);
                 html += '</div></div>';
 
                 html += '<div class="ciy-form col-24 col-sm-24 top">';
                 html += '<label>文档</label><div>';
-                html += ciyfn.tdshow(dat.downurl, table.field.downurl.ext, dat, table.once, table.json, true);
+                html += ciyfn.tdshow('downurl', dat.downurl, table.field.downurl.ext, dat, table.json, true);
                 html += '</div></div>';
 
                 html += '<div class="ciy-form col-24 col-sm-24 top">';
                 html += '<label>头像</label><div>';
-                html += ciyfn.tdshow(dat.avar, table.field.avar.ext, dat, table.once, table.json, true);
+                html += ciyfn.tdshow('avar', dat.avar, table.field.avar.ext, dat, table.json, true);
                 html += '</div></div>';
 
                 html += '<div class="ciy-form col-24 col-sm-6">';
                 html += '<label>是否使用</label><div>';
-                html += ciyfn.tdshow(dat.isuse, table.field.isuse.ext, dat, table.once, table.json, true);
+                html += ciyfn.tdshow('isuse', dat.isuse, table.field.isuse.ext, dat, table.json, true);
                 html += '</div></div>';
 
                 html += '<div class="ciy-form col-24 col-sm-6">';
                 html += '<label>是否开启</label><div>';
-                html += ciyfn.tdshow(dat.isopen, table.field.isopen.ext, dat, table.once, table.json, true);
+                html += ciyfn.tdshow('isopen', dat.isopen, table.field.isopen.ext, dat, table.json, true);
                 html += '</div></div>';
 
                 html += '<div class="ciy-form col-24 col-sm-12">';
                 html += '<label>库存单位</label><div>';
-                html += ciyfn.tdshow(dat.unit, table.field.unit.ext, dat, table.once, table.json, true);
+                html += ciyfn.tdshow('unit', dat.unit, table.field.unit.ext, dat, table.json, true);
                 html += '</div></div>';
 
                 html += '<div class="ciy-form col-24 col-sm-6">';
                 html += '<label>单选状态</label><div>';
-                html += ciyfn.tdshow(dat.sigstatus, table.field.sigstatus.ext, dat, table.once, table.json, true);
+                html += ciyfn.tdshow('sigstatus', dat.sigstatus, table.field.sigstatus.ext, dat, table.json, true);
                 html += '</div></div>';
 
                 html += '<div class="ciy-form col-24 col-sm-6">';
                 html += '<label>多选状态</label><div>';
-                html += ciyfn.tdshow(dat.mauditstatus, table.field.mauditstatus.ext, dat, table.once, table.json, true);
+                html += ciyfn.tdshow('mauditstatus', dat.mauditstatus, table.field.mauditstatus.ext, dat, table.json, true);
                 html += '</div></div>';
 
                 html += '<div class="ciy-form col-24 col-sm-12">';
                 html += '<label>组织结构</label><div>';
-                html += ciyfn.tdshow(dat.prodcata, table.field.prodcata.ext, dat, table.once, table.json, true);
+                html += ciyfn.tdshow('prodcata', dat.prodcata, table.field.prodcata.ext, dat, table.json, true);
                 html += '</div></div>';
 
                 html += '<div class="ciy-form col-24 col-sm-12">';
                 html += '<label>所在地区</label><div>';
-                html += ciyfn.tdshow(dat.areacode, table.field.areacode.ext, dat, table.once, table.json, true);
+                html += ciyfn.tdshow('areacode', dat.areacode, table.field.areacode.ext, dat, table.json, true);
                 html += '</div></div>';
 
                 html += '<div class="ciy-form col-24 col-sm-12">';
                 html += '<label>认证情况</label><div>';
-                html += ciyfn.tdshow(dat.renzheng, table.field.renzheng.ext, dat, table.once, table.json, true);
+                html += ciyfn.tdshow('renzheng', dat.renzheng, table.field.renzheng.ext, dat, table.json, true);
                 html += '</div></div>';
 
                 html += '<div class="ciy-form col-24 col-sm-6">';
                 html += '<label>临时字典</label><div>';
-                html += ciyfn.tdshow(dat.ppint, table.field.ppint.ext, dat, table.once, table.json, true);
+                html += ciyfn.tdshow('ppint', dat.ppint, table.field.ppint.ext, dat, table.json, true);
                 html += '</div></div>';
 
                 html += '<div class="ciy-form col-24 col-sm-6">';
                 html += '<label>执行周期</label><div>';
-                html += ciyfn.tdshow(dat.npcyc, table.field.npcyc.ext, dat, table.once, table.json, true);
+                html += ciyfn.tdshow('npcyc', dat.npcyc, table.field.npcyc.ext, dat, table.json, true);
                 html += '</div></div>';
 
                 html += '<div class="ciy-form col-24 col-sm-6">';
                 html += '<label>执行用时</label><div>';
-                html += ciyfn.tdshow(dat.runsec, table.field.runsec.ext, dat, table.once, table.json, true);
+                html += ciyfn.tdshow('runsec', dat.runsec, table.field.runsec.ext, dat, table.json, true);
                 html += '</div></div>';
 
                 html += '<div class="ciy-form col-24 col-sm-6">';
                 html += '<label>活动期数</label><div>';
-                html += ciyfn.tdshow(dat.acttm, table.field.acttm.ext, dat, table.once, table.json, true);
+                html += ciyfn.tdshow('acttm', dat.acttm, table.field.acttm.ext, dat, table.json, true);
                 html += '</div></div>';
 
                 html += '<div class="ciy-form col-24 col-sm-24 top">';
                 html += '<label>活动花絮</label><div>';
-                html += ciyfn.tdshow(dat.imgs, table.field.imgs.ext, dat, table.once, table.json, true);
+                html += ciyfn.tdshow('imgs', dat.imgs, table.field.imgs.ext, dat, table.json, true);
                 html += '</div></div>';
 
                 html += '<div class="ciy-form col-24 col-sm-6">';
                 html += '<label>吨位</label><div>';
-                html += ciyfn.tdshow(dat.ton, table.field.ton.ext, dat, table.once, table.json, true);
+                html += ciyfn.tdshow('ton', dat.ton, table.field.ton.ext, dat, table.json, true);
                 html += '</div></div>';
 
                 html += '<div class="ciy-form col-24 col-sm-6">';
                 html += '<label>单价</label><div>';
-                html += ciyfn.tdshow(dat.price, table.field.price.ext, dat, table.once, table.json, true);
+                html += ciyfn.tdshow('price', dat.price, table.field.price.ext, dat, table.json, true);
                 html += '</div></div>';
 
                 html += '<div class="ciy-form col-24 col-sm-6">';
                 html += '<label>位置</label><div>';
-                html += ciyfn.tdshow(dat.lng, table.field.lng.ext, dat, table.once, table.json, true);
-                html += '</div></div>';
-
-                html += '<div class="ciy-form col-24 col-sm-6">';
-                html += '<label>监管数量</label><div>';
-                html += ciyfn.tdshow(dat.nums, table.field.nums.ext, dat, table.once, table.json, true);
+                html += ciyfn.tdshow('lng', dat.lng, table.field.lng.ext, dat, table.json, true);
                 html += '</div></div>';
 
                 html += '<div class="ciy-form col-24 col-sm-6">';
                 html += '<label>百分比</label><div>';
-                html += ciyfn.tdshow(dat.pct, table.field.pct.ext, dat, table.once, table.json, true);
+                html += ciyfn.tdshow('pct', dat.pct, table.field.pct.ext, dat, table.json, true);
                 html += '</div></div>';
 
                 html += '<div class="ciy-form col-24 col-sm-6">';
                 html += '<label>链接</label><div>';
-                html += ciyfn.tdshow(dat.url, table.field.url.ext, dat, table.once, table.json, true);
+                html += ciyfn.tdshow('url', dat.url, table.field.url.ext, dat, table.json, true);
                 html += '</div></div>';
 
                 html += '<div class="ciy-form col-24 col-sm-6">';
                 html += '<label>体重</label><div>';
-                html += ciyfn.tdshow(dat.weightg, table.field.weightg.ext, dat, table.once, table.json, true);
+                html += ciyfn.tdshow('weightg', dat.weightg, table.field.weightg.ext, dat, table.json, true);
                 html += '</div></div>';
 
                 html += '<div class="ciy-form col-24 col-sm-6">';
                 html += '<label>耳温</label><div>';
-                html += ciyfn.tdshow(dat.eartmpr, table.field.eartmpr.ext, dat, table.once, table.json, true);
+                html += ciyfn.tdshow('eartmpr', dat.eartmpr, table.field.eartmpr.ext, dat, table.json, true);
                 html += '</div></div>';
 
-                html += '<div class="ciy-form col-24 col-sm-24">';
+                html += '<div class="ciy-form col-24 col-sm-6">';
                 html += '<label>中式钱</label><div>';
-                html += ciyfn.tdshow(dat.qian, table.field.qian.ext, dat, table.once, table.json, true);
+                html += ciyfn.tdshow('qian', dat.qian, table.field.qian.ext, dat, table.json, true);
                 html += '</div></div>';
 
-                html += '<div class="ciy-form col-24 col-sm-24">';
+                html += '<div class="ciy-form col-24 col-sm-6">';
                 html += '<label>美式钱</label><div>';
-                html += ciyfn.tdshow(dat.meishi, table.field.meishi.ext, dat, table.once, table.json, true);
+                html += ciyfn.tdshow('meishi', dat.meishi, table.field.meishi.ext, dat, table.json, true);
                 html += '</div></div>';
 
-                html += '<div class="ciy-form col-24 col-sm-24">';
+                html += '<div class="ciy-form col-24 col-sm-6">';
                 html += '<label>重量</label><div>';
-                html += ciyfn.tdshow(dat.weight, table.field.weight.ext, dat, table.once, table.json, true);
+                html += ciyfn.tdshow('weight', dat.weight, table.field.weight.ext, dat, table.json, true);
                 html += '</div></div>';
 
-                html += '<div class="ciy-form col-24 col-sm-24">';
+                html += '<div class="ciy-form col-24 col-sm-6">';
                 html += '<label>长度</label><div>';
-                html += ciyfn.tdshow(dat.height, table.field.height.ext, dat, table.once, table.json, true);
+                html += ciyfn.tdshow('height', dat.height, table.field.height.ext, dat, table.json, true);
                 html += '</div></div>';
 
-                html += '<div class="ciy-form col-24 col-sm-24">';
+                html += '<div class="ciy-form col-24 col-sm-6">';
                 html += '<label>科学数</label><div>';
-                html += ciyfn.tdshow(dat.skt, table.field.skt.ext, dat, table.once, table.json, true);
+                html += ciyfn.tdshow('skt', dat.skt, table.field.skt.ext, dat, table.json, true);
                 html += '</div></div>';
 
                 html += '<div class="ciy-form col-24 col-sm-12">';
                 html += '<label>身份证号</label><div>';
-                html += ciyfn.tdshow(dat.idcard, table.field.idcard.ext, dat, table.once, table.json, true);
+                html += ciyfn.tdshow('idcard', dat.idcard, table.field.idcard.ext, dat, table.json, true);
                 html += '</div></div>';
 
                 html += '<div class="ciy-form col-24 col-sm-12">';
                 html += '<label>添加时间</label><div>';
-                html += ciyfn.tdshow(dat.addtimes, table.field.addtimes.ext, dat, table.once, table.json, true);
+                html += ciyfn.tdshow('addtimes', dat.addtimes, table.field.addtimes.ext, dat, table.json, true);
                 html += '</div></div>';
 
                 html += '<div class="ciy-form col-24 col-sm-24 top">';
                 html += '<label>介绍</label><div>';
-                html += ciyfn.tdshow(dat.content, table.field.content.ext, dat, table.once, table.json, true);
+                html += ciyfn.tdshow('content', dat.content, table.field.content.ext, dat, table.json, true);
                 html += '</div></div>';
 
                 html += '<div class="ciy-form col-24 col-sm-24 top">';
                 html += '<label>富文本</label><div>';
-                html += ciyfn.tdshow(dat.md, table.field.md.ext, dat, table.once, table.json, true);
+                html += ciyfn.tdshow('md', dat.md, table.field.md.ext, dat, table.json, true);
                 html += '</div></div>';
 
                 html += '</div>';
@@ -685,202 +673,197 @@
                 var html = '<div class="char4 row gridline">';
                 html += '<div class="ciy-form col-24 col-sm-16">';
                 html += '<label>默认标题</label><div>';
-                html += ciyfn.tdshow(dat.name, table.field.name.ext, dat, table.once, table.json, true);
+                html += ciyfn.tdshow('name', dat.name, table.field.name.ext, dat, table.json, true);
                 html += '</div></div>';
 
                 html += '<div class="ciy-form col-24 col-sm-8">';
                 html += '<label>所属菜单</label><div>';
-                html += ciyfn.tdshow(dat.menuid, table.field.menuid.ext, dat, table.once, table.json, true);
+                html += ciyfn.tdshow('menuid', dat.menuid, table.field.menuid.ext, dat, table.json, true);
                 html += '</div></div>';
 
                 html += '<div class="ciy-form col-24 col-sm-8">';
                 html += '<label>文件大小</label><div>';
-                html += ciyfn.tdshow(dat.filesize, table.field.filesize.ext, dat, table.once, table.json, true);
+                html += ciyfn.tdshow('filesize', dat.filesize, table.field.filesize.ext, dat, table.json, true);
                 html += '</div></div>';
 
                 html += '<div class="ciy-form col-24 col-sm-8">';
                 html += '<label>长度</label><div>';
-                html += ciyfn.tdshow(dat.metre, table.field.metre.ext, dat, table.once, table.json, true);
+                html += ciyfn.tdshow('metre', dat.metre, table.field.metre.ext, dat, table.json, true);
                 html += '</div></div>';
 
                 html += '<div class="ciy-form col-24 col-sm-8">';
                 html += '<label>贷款金额</label><div>';
-                html += ciyfn.tdshow(dat.bankmoney, table.field.bankmoney.ext, dat, table.once, table.json, true);
+                html += ciyfn.tdshow('bankmoney', dat.bankmoney, table.field.bankmoney.ext, dat, table.json, true);
                 html += '</div></div>';
 
                 html += '<div class="ciy-form col-24 col-sm-8">';
                 html += '<label>设置日期</label><div>';
-                html += ciyfn.tdshow(dat.setdate, table.field.setdate.ext, dat, table.once, table.json, true);
+                html += ciyfn.tdshow('setdate', dat.setdate, table.field.setdate.ext, dat, table.json, true);
                 html += '</div></div>';
 
                 html += '<div class="ciy-form col-24 col-sm-8">';
                 html += '<label>设置时间</label><div>';
-                html += ciyfn.tdshow(dat.settimes, table.field.settimes.ext, dat, table.once, table.json, true);
+                html += ciyfn.tdshow('settimes', dat.settimes, table.field.settimes.ext, dat, table.json, true);
                 html += '</div></div>';
 
                 html += '<div class="ciy-form col-24 col-sm-8">';
                 html += '<label>营业时间</label><div>';
-                html += ciyfn.tdshow(dat.dayclock, table.field.dayclock.ext, dat, table.once, table.json, true);
+                html += ciyfn.tdshow('dayclock', dat.dayclock, table.field.dayclock.ext, dat, table.json, true);
                 html += '</div></div>';
 
                 html += '<div class="ciy-form col-24 col-sm-24">';
                 html += '<label>文档</label><div>';
-                html += ciyfn.tdshow(dat.downurl, table.field.downurl.ext, dat, table.once, table.json, true);
+                html += ciyfn.tdshow('downurl', dat.downurl, table.field.downurl.ext, dat, table.json, true);
                 html += '</div></div>';
 
                 html += '<div class="ciy-form col-24 col-sm-24">';
                 html += '<label>头像</label><div>';
-                html += ciyfn.tdshow(dat.avar, table.field.avar.ext, dat, table.once, table.json, true);
+                html += ciyfn.tdshow('avar', dat.avar, table.field.avar.ext, dat, table.json, true);
                 html += '</div></div>';
 
                 html += '<div class="ciy-form col-24 col-sm-6">';
                 html += '<label>是否使用</label><div>';
-                html += ciyfn.tdshow(dat.isuse, table.field.isuse.ext, dat, table.once, table.json, true);
+                html += ciyfn.tdshow('isuse', dat.isuse, table.field.isuse.ext, dat, table.json, true);
                 html += '</div></div>';
 
                 html += '<div class="ciy-form col-24 col-sm-6">';
                 html += '<label>是否开启</label><div>';
-                html += ciyfn.tdshow(dat.isopen, table.field.isopen.ext, dat, table.once, table.json, true);
+                html += ciyfn.tdshow('isopen', dat.isopen, table.field.isopen.ext, dat, table.json, true);
                 html += '</div></div>';
 
                 html += '<div class="ciy-form col-24 col-sm-12">';
                 html += '<label>库存单位</label><div>';
-                html += ciyfn.tdshow(dat.unit, table.field.unit.ext, dat, table.once, table.json, true);
+                html += ciyfn.tdshow('unit', dat.unit, table.field.unit.ext, dat, table.json, true);
                 html += '</div></div>';
 
                 html += '<div class="ciy-form col-24 col-sm-6">';
                 html += '<label>单选状态</label><div>';
-                html += ciyfn.tdshow(dat.sigstatus, table.field.sigstatus.ext, dat, table.once, table.json, true);
+                html += ciyfn.tdshow('sigstatus', dat.sigstatus, table.field.sigstatus.ext, dat, table.json, true);
                 html += '</div></div>';
 
                 html += '<div class="ciy-form col-24 col-sm-6">';
                 html += '<label>多选状态</label><div>';
-                html += ciyfn.tdshow(dat.mauditstatus, table.field.mauditstatus.ext, dat, table.once, table.json, true);
+                html += ciyfn.tdshow('mauditstatus', dat.mauditstatus, table.field.mauditstatus.ext, dat, table.json, true);
                 html += '</div></div>';
 
                 html += '<div class="ciy-form col-24 col-sm-12">';
                 html += '<label>组织结构</label><div>';
-                html += ciyfn.tdshow(dat.prodcata, table.field.prodcata.ext, dat, table.once, table.json, true);
+                html += ciyfn.tdshow('prodcata', dat.prodcata, table.field.prodcata.ext, dat, table.json, true);
                 html += '</div></div>';
 
                 html += '<div class="ciy-form col-24 col-sm-12">';
                 html += '<label>所在地区</label><div>';
-                html += ciyfn.tdshow(dat.areacode, table.field.areacode.ext, dat, table.once, table.json, true);
+                html += ciyfn.tdshow('areacode', dat.areacode, table.field.areacode.ext, dat, table.json, true);
                 html += '</div></div>';
 
                 html += '<div class="ciy-form col-24 col-sm-12">';
                 html += '<label>认证情况</label><div>';
-                html += ciyfn.tdshow(dat.renzheng, table.field.renzheng.ext, dat, table.once, table.json, true);
+                html += ciyfn.tdshow('renzheng', dat.renzheng, table.field.renzheng.ext, dat, table.json, true);
                 html += '</div></div>';
 
                 html += '<div class="ciy-form col-24 col-sm-6">';
                 html += '<label>临时字典</label><div>';
-                html += ciyfn.tdshow(dat.ppint, table.field.ppint.ext, dat, table.once, table.json, true);
+                html += ciyfn.tdshow('ppint', dat.ppint, table.field.ppint.ext, dat, table.json, true);
                 html += '</div></div>';
 
                 html += '<div class="ciy-form col-24 col-sm-6">';
                 html += '<label>执行周期</label><div>';
-                html += ciyfn.tdshow(dat.npcyc, table.field.npcyc.ext, dat, table.once, table.json, true);
+                html += ciyfn.tdshow('npcyc', dat.npcyc, table.field.npcyc.ext, dat, table.json, true);
                 html += '</div></div>';
 
                 html += '<div class="ciy-form col-24 col-sm-6">';
                 html += '<label>执行用时</label><div>';
-                html += ciyfn.tdshow(dat.runsec, table.field.runsec.ext, dat, table.once, table.json, true);
+                html += ciyfn.tdshow('runsec', dat.runsec, table.field.runsec.ext, dat, table.json, true);
                 html += '</div></div>';
 
                 html += '<div class="ciy-form col-24 col-sm-6">';
                 html += '<label>活动期数</label><div>';
-                html += ciyfn.tdshow(dat.acttm, table.field.acttm.ext, dat, table.once, table.json, true);
+                html += ciyfn.tdshow('acttm', dat.acttm, table.field.acttm.ext, dat, table.json, true);
                 html += '</div></div>';
 
                 html += '<div class="ciy-form col-24 col-sm-24">';
                 html += '<label>活动花絮</label><div>';
-                html += ciyfn.tdshow(dat.imgs, table.field.imgs.ext, dat, table.once, table.json, true);
+                html += ciyfn.tdshow('imgs', dat.imgs, table.field.imgs.ext, dat, table.json, true);
                 html += '</div></div>';
 
                 html += '<div class="ciy-form col-24 col-sm-6">';
                 html += '<label>吨位</label><div>';
-                html += ciyfn.tdshow(dat.ton, table.field.ton.ext, dat, table.once, table.json, true);
+                html += ciyfn.tdshow('ton', dat.ton, table.field.ton.ext, dat, table.json, true);
                 html += '</div></div>';
 
                 html += '<div class="ciy-form col-24 col-sm-6">';
                 html += '<label>单价</label><div>';
-                html += ciyfn.tdshow(dat.price, table.field.price.ext, dat, table.once, table.json, true);
+                html += ciyfn.tdshow('price', dat.price, table.field.price.ext, dat, table.json, true);
                 html += '</div></div>';
 
                 html += '<div class="ciy-form col-24 col-sm-6">';
                 html += '<label>位置</label><div>';
-                html += ciyfn.tdshow(dat.lng, table.field.lng.ext, dat, table.once, table.json, true);
-                html += '</div></div>';
-
-                html += '<div class="ciy-form col-24 col-sm-6">';
-                html += '<label>监管数量</label><div>';
-                html += ciyfn.tdshow(dat.nums, table.field.nums.ext, dat, table.once, table.json, true);
+                html += ciyfn.tdshow('lng', dat.lng, table.field.lng.ext, dat, table.json, true);
                 html += '</div></div>';
 
                 html += '<div class="ciy-form col-24 col-sm-6">';
                 html += '<label>百分比</label><div>';
-                html += ciyfn.tdshow(dat.pct, table.field.pct.ext, dat, table.once, table.json, true);
+                html += ciyfn.tdshow('pct', dat.pct, table.field.pct.ext, dat, table.json, true);
                 html += '</div></div>';
 
                 html += '<div class="ciy-form col-24 col-sm-6">';
                 html += '<label>链接</label><div>';
-                html += ciyfn.tdshow(dat.url, table.field.url.ext, dat, table.once, table.json, true);
+                html += ciyfn.tdshow('url', dat.url, table.field.url.ext, dat, table.json, true);
                 html += '</div></div>';
 
                 html += '<div class="ciy-form col-24 col-sm-6">';
                 html += '<label>体重</label><div>';
-                html += ciyfn.tdshow(dat.weightg, table.field.weightg.ext, dat, table.once, table.json, true);
+                html += ciyfn.tdshow('weightg', dat.weightg, table.field.weightg.ext, dat, table.json, true);
                 html += '</div></div>';
 
                 html += '<div class="ciy-form col-24 col-sm-6">';
                 html += '<label>耳温</label><div>';
-                html += ciyfn.tdshow(dat.eartmpr, table.field.eartmpr.ext, dat, table.once, table.json, true);
+                html += ciyfn.tdshow('eartmpr', dat.eartmpr, table.field.eartmpr.ext, dat, table.json, true);
                 html += '</div></div>';
 
                 html += '<div class="ciy-form col-24 col-sm-24">';
                 html += '<label>中式钱</label><div>';
-                html += ciyfn.tdshow(dat.qian, table.field.qian.ext, dat, table.once, table.json, true);
+                html += ciyfn.tdshow('qian', dat.qian, table.field.qian.ext, dat, table.json, true);
                 html += '</div></div>';
 
                 html += '<div class="ciy-form col-24 col-sm-24">';
                 html += '<label>美式钱</label><div>';
-                html += ciyfn.tdshow(dat.meishi, table.field.meishi.ext, dat, table.once, table.json, true);
+                html += ciyfn.tdshow('meishi', dat.meishi, table.field.meishi.ext, dat, table.json, true);
                 html += '</div></div>';
 
                 html += '<div class="ciy-form col-24 col-sm-24">';
                 html += '<label>重量</label><div>';
-                html += ciyfn.tdshow(dat.weight, table.field.weight.ext, dat, table.once, table.json, true);
+                html += ciyfn.tdshow('weight', dat.weight, table.field.weight.ext, dat, table.json, true);
                 html += '</div></div>';
 
                 html += '<div class="ciy-form col-24 col-sm-24">';
                 html += '<label>长度</label><div>';
-                html += ciyfn.tdshow(dat.height, table.field.height.ext, dat, table.once, table.json, true);
+                html += ciyfn.tdshow('height', dat.height, table.field.height.ext, dat, table.json, true);
                 html += '</div></div>';
 
                 html += '<div class="ciy-form col-24 col-sm-24">';
                 html += '<label>科学数</label><div>';
-                html += ciyfn.tdshow(dat.skt, table.field.skt.ext, dat, table.once, table.json, true);
+                html += ciyfn.tdshow('skt', dat.skt, table.field.skt.ext, dat, table.json, true);
                 html += '</div></div>';
 
                 html += '<div class="ciy-form col-24 col-sm-12">';
                 html += '<label>身份证号</label><div>';
-                html += ciyfn.tdshow(dat.idcard, table.field.idcard.ext, dat, table.once, table.json, true);
+                html += ciyfn.tdshow('idcard', dat.idcard, table.field.idcard.ext, dat, table.json, true);
                 html += '</div></div>';
 
                 html += '<div class="ciy-form col-24 col-sm-12">';
                 html += '<label>添加时间</label><div>';
-                html += ciyfn.tdshow(dat.addtimes, table.field.addtimes.ext, dat, table.once, table.json, true);
+                html += ciyfn.tdshow('addtimes', dat.addtimes, table.field.addtimes.ext, dat, table.json, true);
                 html += '</div></div>';
 
                 html += '<div class="ciy-form col-24 col-sm-24">';
                 html += '<label>介绍</label><div>';
-                html += ciyfn.tdshow(dat.content, table.field.content.ext, dat, table.once, table.json, true);
+                html += ciyfn.tdshow('content', dat.content, table.field.content.ext, dat, table.json, true);
                 html += '</div></div>';
 
                 html += '<div class="ciy-form col-24 col-sm-24">';
                 html += '<label>富文本</label><div>';
-                html += ciyfn.tdshow(dat.md, table.field.md.ext, dat, table.once, table.json, true);
+                html += ciyfn.tdshow('md', dat.md, table.field.md.ext, dat, table.json, true);
                 html += '</div></div>';
 
                 html += '<div class="ciy-form col-24 col-sm-24">';
diff --git a/web/admin/demo/normal.php b/web/admin/demo/normal.php
index ec87ca1..6b9c747 100644
--- a/web/admin/demo/normal.php
+++ b/web/admin/demo/normal.php
@@ -150,9 +150,8 @@ class normal {
         $imgs = $post->get('imgs');
         $ton = $post->getint('ton');
         $price = $post->getint('price');
-        $lat = $post->getfloat('lat');
-        $lng = $post->getfloat('lng');
-        $nums = $post->getfloat('nums');
+        $lat = $post->getint('lat');
+        $lng = $post->getint('lng');
         $pct = $post->getint('pct');
         $url = $post->get('url');
         $weightg = $post->getint('weightg');
@@ -205,7 +204,6 @@ class normal {
             $updata['price'] = $price;
             $updata['lat'] = $lat;
             $updata['lng'] = $lng;
-            $updata['nums'] = $nums;
             $updata['pct'] = $pct;
             $updata['url'] = $url;
             $updata['weightg'] = $weightg;
@@ -370,7 +368,6 @@ class normal {
         $fields[] = array('style' => 'r', 'width' => 100,  'field' => 'price', 'name' => '单价');
         $fields[] = array('style' => 'l', 'width' => 100,  'field' => 'lat', 'name' => '纬度');
         $fields[] = array('style' => 'c', 'width' => 100,  'field' => 'lng', 'name' => '位置');
-        $fields[] = array('style' => 'r', 'width' => 100,  'field' => 'nums', 'name' => '监管数量');
         $fields[] = array('style' => 'r', 'width' => 100,  'field' => 'pct', 'name' => '百分比');
         $fields[] = array('style' => 'l', 'width' => 150,  'field' => 'url', 'name' => '链接');
         $fields[] = array('style' => 'r', 'width' => 100,  'field' => 'weightg', 'name' => '体重');
@@ -527,7 +524,6 @@ class normal {
         $headsn[] = '吨位.ton';
         $headsn[] = '单价.price';
         $headsn[] = '位置.lng';
-        $headsn[] = '监管数量.nums';
         $headsn[] = '百分比.pct';
         $headsn[] = '链接.url';
         $headsn[] = '体重.weightg';
@@ -1052,7 +1048,6 @@ class normal {
                 $updata['ton'] = $post->get('ton_' . $i);
                 $updata['price'] = $post->get('price_' . $i);
                 $updata['lng'] = $post->get('lng_' . $i);
-                $updata['nums'] = $post->get('nums_' . $i);
                 $updata['pct'] = $post->get('pct_' . $i);
                 $updata['url'] = $post->get('url_' . $i);
                 $updata['weightg'] = $post->get('weightg_' . $i);
diff --git a/web/admin/develop/code_create.html b/web/admin/develop/code_create.html
index f62a9c7..c3654a2 100644
--- a/web/admin/develop/code_create.html
+++ b/web/admin/develop/code_create.html
@@ -91,6 +91,8 @@
                     <label>PC保存路径</label>
                     <div><input type="text" name="_bcod_savepc" style="width:100%;" />
                     </div>
+                    <div class="flexnone"><button class="btn def" onclick="safepath();" type="button">覆盖保护</button>
+                    </div>
                 </div>
                 <div class="ciy-form">
                     <label>PC前端语言</label>
@@ -125,14 +127,14 @@
                 <div class="ciy-form">
                     <label>生成源码</label>
                     <div>
-                        <button class="btn btn-default" type="button" onclick="createhtml(this);">PC前端(原生JS)</button>
-                        <button class="btn btn-default" type="button" onclick="createhtml(this);">PC前端(Vue3)</button>
+                        <button class="btn" type="button" onclick="createhtml(this);">PC前端(原生JS)</button>
+                        <button class="btn" type="button" onclick="createhtml(this);">PC前端(Vue3)</button>
                         |
-                        <button class="btn btn-default" type="button" onclick="creatembvue3(this);">MB前端(Vue3)</button>
+                        <button class="btn" type="button" onclick="creatembvue3(this);">MB前端(Vue3)</button>
                         |
-                        <button class="btn btn-default" type="button" onclick="createphp(this);">后端(PHP)</button>
-                        <button class="btn btn-default" type="button" onclick="createphp(this);">后端(Golang)</button>
-                        <button class="btn btn-default" type="button" onclick="createphp(this);">后端(Python)</button>
+                        <button class="btn" type="button" onclick="createphp(this);">后端(PHP)</button>
+                        <button class="btn" type="button" onclick="createphp(this);">后端(Golang)</button>
+                        <button class="btn" type="button" onclick="createphp(this);">后端(Python)</button>
                     </div>
                 </div>
             </div>
@@ -411,7 +413,7 @@
                         if (data.DATA_TYPE == 'text' || data.DATA_TYPE == 'mediumtext') {
                             chkvalue = chkvalue.replace(',bmin', '').replace(',bout', '');
                         }
-                        if (colcomment.cate == 'BR' || colcomment.cate == 'MD') {
+                        if (colcomment.cate == 'BR' || colcomment.cate == 'MD' || colcomment.cate == 'FILEMD') {
                             if (!colcomment.show)
                                 spset.nocmn = 'no';
                         }
@@ -426,7 +428,6 @@
                             || data.COLUMN_NAME == 'ip') {
                             spset.noup = 'no';
                         }
-                        
                         if (data.COLUMN_NAME == table.json.dbsaas.saasfield) {
                             spset.noup = 'saas';
                         }
@@ -451,7 +452,7 @@
                         if (colcomment.cate == 'DOWN' || colcomment.cate == 'AV' || colcomment.cate == 'IMG') {
                             spset.num = toint(data.CHARACTER_MAXIMUM_LENGTH / 50);
                         }
-                        if (colcomment.cate == 'MD' || colcomment.cate == 'DOWN' || colcomment.cate == 'AV' || colcomment.cate == 'IMG' || colcomment.cate == 'IMG1') {
+                        if (colcomment.cate == 'MD' || colcomment.cate == 'FILEMD' || colcomment.cate == 'DOWN' || colcomment.cate == 'AV' || colcomment.cate == 'IMG' || colcomment.cate == 'IMG1') {
                             spset.savepath = data.COLUMN_NAME;
                             if (spset.savepath.substring(spset.savepath.length - 4) == 'imgs')
                                 spset.savepath = spset.savepath.substring(0, spset.savepath.length - 4);
@@ -461,6 +462,8 @@
                                 spset.savepath = spset.savepath.substring(0, spset.savepath.length - 3);
                             if (spset.savepath.substring(spset.savepath.length - 4) == 'file')
                                 spset.savepath = spset.savepath.substring(0, spset.savepath.length - 4);
+                            if (spset.savepath.substring(spset.savepath.length - 3) == 'ver')
+                                spset.savepath = spset.savepath.substring(0, spset.savepath.length - 3);
                         }
                         if (colcomment.dicttype == 'dictdb' && (colcomment.cate == 'DB' || colcomment.cate == 'CATU'))
                             spset.listload = 'rel';
@@ -511,8 +514,8 @@
                     if (colcomment.cate == 'DOWN' || colcomment.cate == 'AV' || colcomment.cate == 'IMG') {
                         html += '<div title="设置上传最大数量">上传数 <input oninput="chgset(this)" name="subset_num_' + i + '" type="text" style="width:3em;" /></div>';
                     }
-                    if (colcomment.cate == 'MD' || colcomment.cate == 'DOWN' || colcomment.cate == 'AV' || colcomment.cate == 'IMG' || colcomment.cate == 'IMG1') {
-                        if (colcomment.cate != 'MD') {
+                    if (colcomment.cate == 'MD' || colcomment.cate == 'FILEMD' || colcomment.cate == 'DOWN' || colcomment.cate == 'AV' || colcomment.cate == 'IMG' || colcomment.cate == 'IMG1') {
+                        if (colcomment.cate != 'MD' || colcomment.cate == 'FILEMD') {
                             html += '<div title="组件的宽高，带单位，如100px">宽高 <input oninput="chgset(this)" name="subset_fwh_' + i + '" type="text" style="width:6em;" /></div>';
                             html += '<div title="设置可上传文档扩展名">扩展名 <input oninput="chgset(this)" name="subset_ftype_' + i + '" type="text" style="width:6em;" /></div>';
                         }
@@ -524,7 +527,7 @@
                         html += '<div title="哪些类型图片可被压缩，默认jpg,png,webp">压缩范围 <input oninput="chgset(this)" name="subset_fzext_' + i + '" type="text" style="width:6em;" /></div>';
                         html += '<div title="设置本地保存路径">savepath <input oninput="chgset(this)" name="subset_savepath_' + i + '" type="text" style="width:10em;" /></div>';
                     }
-                    if (colcomment.cate == 'BR' || colcomment.cate == 'MD') {
+                    if (colcomment.cate == 'BR' || colcomment.cate == 'MD' || colcomment.cate == 'FILEMD') {
                         html += '<div title="列表是否加载">列加载 <ciy-select com="subset_nocmn_' + i + '"></ciy-select></div>';
                         html += '<div title="设置高度，只填数字，单位px">高度 <input oninput="chgset(this)" name="subset_height_' + i + '" type="text" style="width:4em;" /></div>';
                     }
@@ -656,6 +659,18 @@
                 window.close();
             });
         }
+        function safepath() {
+            var savepc = $5('[name=_bcod_savepc]').val();
+            var idx = savepc.lastIndexOf('\\');
+            if (idx > 0) {
+                if (savepc[idx + 1] == '_') {
+                    savepc = savepc.substring(0, idx + 1) + savepc.substring(idx + 2);
+                } else {
+                    savepc = savepc.substring(0, idx + 1) + '_' + savepc.substring(idx + 1);
+                }
+                $5('[name=_bcod_savepc]').val(savepc);
+            }
+        }
         function createhtml(dom) {
             var postparam = checkformdata(dom);
             if (typeof (postparam) == 'string')
diff --git a/web/admin/develop/code_create.php b/web/admin/develop/code_create.php
index 1946a23..8eb2786 100644
--- a/web/admin/develop/code_create.php
+++ b/web/admin/develop/code_create.php
@@ -55,7 +55,10 @@ class code_create {
             $subend = substr($dbsaasrow['subpath'], strrpos($dbsaasrow['subpath'], '\\') + 1);
             if (substr($maintab, 0, strlen($subend)) == $subend)
                 $maintab = substr($maintab, strlen($subend));
+            if (substr($maintab, 0, 1) == '_')
+                $maintab = substr($maintab, 1);
             $ret['code_create']['bcod']['savepc'] = 'web\\' . $dbsaasrow['subpath'] . '\\' . $maintab;
+            $ret['code_create']['bcod']['maintab'] = $maintab;
             $ret['code_create']['bcod']['pctemplate'] = 'sigpage';
             $ret['code_create']['bcod']['pcparam'] = ',listchk,';
 
diff --git a/web/admin/develop/code_list.html b/web/admin/develop/code_list.html
index 8e2449d..d5ab9a4 100644
--- a/web/admin/develop/code_list.html
+++ b/web/admin/develop/code_list.html
@@ -44,10 +44,10 @@
 						, data: json
 					});
 					Glob.tabls = {};
-					for (var i in json.once.dbcode)
-						Glob.tabls[json.once.dbcode[i].tabl] = 1;
-					document.title = '🔆' + json.once.dbsaas.name + ' - ' + json.once.dbsaas.subpath;
-					$5('#id_dbc').html('<kbd>' + json.once.dbsaas.name + '</kbd><kbd>' + json.once.dbsaas.schem + '</kbd><kbd>' + json.once.dbsaas.subpath + '</kbd>');
+					for (var i in json.dbcode)
+						Glob.tabls[json.dbcode[i].tabl] = 1;
+					document.title = '🔆' + json.dbsaas.name + ' - ' + json.dbsaas.subpath;
+					$5('#id_dbc').html('<kbd>' + json.dbsaas.name + '</kbd><kbd>' + json.dbsaas.schem + '</kbd><kbd>' + json.dbsaas.subpath + '</kbd>');
 					return json;
 				}
 				, fn_tdcontent: function (key, datashow, field, data) {
@@ -96,7 +96,7 @@
 		function menubtn(dom, btn) {
 			var id = $5(dom).parent('tr').attr('data-id');
 			if (btn == 'create') {
-				window.open('code_create.html?dbcid=' + table.once.dbsaas.id + '&table=' + table.data[id].TABLE_NAME);
+				window.open('code_create.html?dbcid=' + table.json.dbsaas.id + '&table=' + table.data[id].TABLE_NAME);
 			}
 		}
 	</script>
diff --git a/web/admin/develop/code_list.php b/web/admin/develop/code_list.php
index 47d5457..3a2b014 100644
--- a/web/admin/develop/code_list.php
+++ b/web/admin/develop/code_list.php
@@ -20,7 +20,7 @@ class code_list {
         $rows = $db->get($csql);
         for ($i = 0; $i < count($rows); $i++)
             $rows[$i]['id'] = $i + 1;
-        $ret = array('where' => $where, 'list' => $rows);
+        $ret = array('searchwhere' => $where, 'list' => $rows);
 
         if ($post->getbool('field')) {
             $field = array();
@@ -33,12 +33,7 @@ class code_list {
         }
 
         if ($post->getbool('once')) {
-            $ret['once'] = array();
-            $ret['once']['dbsaas'] = $dbsaasrow;
-            $csql = new \ciy\sql('zc_dev_dbcode');
-            $csql->where('dbcid', getint('dbcid'));
-            $csql->column('tabl');
-            $ret['once']['dbcode'] = $db->get($csql);
+            $ret['once'] = true;
             $input = array();
             $input[] = array(
                 'type' => 'input',
@@ -52,7 +47,12 @@ class code_list {
                 'name' => '英文名',
                 'prop' => ' style="width:8em;"'
             );
-            $ret['once']['input'] = $input;
+            $ret['searchinput'] = $input;
+            $ret['dbsaas'] = $dbsaasrow;
+            $csql = new \ciy\sql('zc_dev_dbcode');
+            $csql->where('dbcid', getint('dbcid'));
+            $csql->column('tabl');
+            $ret['dbcode'] = $db->get($csql);
         }
         return succjson($ret);
     }
diff --git a/web/admin/develop/code_pc_html.php b/web/admin/develop/code_pc_html.php
index 57a0fd8..3bc0593 100644
--- a/web/admin/develop/code_pc_html.php
+++ b/web/admin/develop/code_pc_html.php
@@ -46,7 +46,7 @@ function code_pc_html($post) {
             $chk_getupdate = true;
         $cate = $fld['cate'];
         if (
-            $cate == 'CATM' || $cate == 'CATS' || $cate == 'MD' || $cate == 'CYC' || $cate == 'LOC' || $cate == 'UNIT'
+            $cate == 'CATM' || $cate == 'CATS' || $cate == 'MD' || $cate == 'FILEMD' || $cate == 'CYC' || $cate == 'LOC' || $cate == 'UNIT'
             || $cate == 'TIME' || $cate == 'SEC' || $cate == 'IMG1' || $cate == 'IMG' || $cate == 'DOWN' || $cate == 'AV'
         )
             $ciycmp2 = true;
@@ -279,10 +279,10 @@ if($hasedit){
         if ($fld['bimp'] && $fld['set']['noup'] != 'view')
             $labclass .= ' imp';
         $clstop = '';
-        if($cate == 'MD' || $cate == 'BR' || $cate == 'AV' || $cate == 'IMG' || $cate == 'IMG1')
+        if($cate == 'MD' || $cate == 'FILEMD' || $cate == 'BR' || $cate == 'AV' || $cate == 'IMG' || $cate == 'IMG1')
             $clstop = ' top';
         $codex .= "\n{$pspec}            <div class=\"ciy-form col-24 col-sm-{$sgcol}{$clstop}\">";
-        if ($cate != 'MD') //富文本编辑器，不加label
+        if ($cate != 'MD' && $cate != 'FILEMD') //富文本编辑器，不加label
             $codex .= "\n{$pspec}                <label class=\"{$labclass}\">{$fld['name']}</label>";
         $codex .= "\n{$pspec}                <div>";
         $ext = '';
@@ -304,8 +304,8 @@ if($hasedit){
             $codex .= "\n{$pspec}                    <ciy-inputbet com=\"{$col}\" unit=\"元\" bet=\"10000\" />";
         } else if ($cate == 'WCNY') {
             $codex .= "\n{$pspec}                    <ciy-inputbet com=\"{$col}\" unit=\"万元\" bet=\"1000000\" />";
-        } else if ($cate == 'MD' || $cate == 'DOWN' || $cate == 'AV' || $cate == 'IMG' || $cate == 'IMG1') {
-            if ($cate != 'MD') {
+        } else if ($cate == 'MD' || $cate == 'FILEMD' || $cate == 'DOWN' || $cate == 'AV' || $cate == 'IMG' || $cate == 'IMG1') {
+            if ($cate != 'MD' && $cate != 'FILEMD') {
                 if ($cate == 'IMG1')
                     $num = 1;
                 else
@@ -330,7 +330,7 @@ if($hasedit){
                 $ext .= ' zipext="' . $fld['set']['fzext'] . '"';
             // if(isset($fld['set']['savepath']))
             //     $ext .= ' path="' . $fld['set']['savepath'] . '"';
-            if ($cate == 'MD')
+            if ($cate == 'MD' || $cate == 'FILEMD')
                 $codex .= "\n{$pspec}                    <ciy-markdown com=\"{$col}\"{$ext} />";
             else
                 $codex .= "\n{$pspec}                    <ciy-upload com=\"{$col}\"{$ext} />";
@@ -634,7 +634,35 @@ if($hasedit){
                         $menubtn .= "\n                    , name: '{$str}<code>' + table.data[id].name + '</code>'";
                         $menubtn .= "\n                });";
                         $menubtn .= "\n            }";
-                    }else{
+                    }else if ($str == '查看') {
+                        $extcls = ' def';
+                        $extkey = 'view';
+                        $menubtn .= "\n            if (btn == 'view') {";
+                        $menubtn .= "\n                view(id);";
+                        $menubtn .= "\n            }";
+                    }
+                    else if ($str == '修改') {
+                        $extkey = 'edit';
+                        $menubtn .= "\n            if (btn == 'edit') {";
+                        $menubtn .= "\n                edit(id);";
+                        $menubtn .= "\n            }";
+                    }
+                    else if ($str == '删除') {
+                        $extcls = ' dag';
+                        $extkey = 'del';
+                        $menubtn .= "\n            if (btn == 'del') {";
+                        $menubtn .= "\n                ciyfn.callfastfunc(dom, '是否删除?', 'del', { ids: id }, function (json){ table.delline(json) });";
+                        $menubtn .= "\n            }";
+                    }
+                    else if ($str == '审核') {
+                        $hasreview = true;
+                        $extcls = '';
+                        $extkey = 'review';
+                        $menubtn .= "\n            if (btn == 'review') {";
+                        $menubtn .= "\n                review(id);";
+                        $menubtn .= "\n            }";
+                    }
+                    else {
                         if(empty($extkey))
                             $extkey = $str;
                         $menubtn .= "\n            if (btn == '{$extkey}') {";
@@ -727,7 +755,7 @@ if($hasedit){
                 continue;
 
             if ($fld['set']['noup'] == 'view') {
-                $codex .= "\n                        $5('[wit={$col}]', dom).html(ciyfn.tdshow(dat.{$col}, table.field.{$col}.ext, dat, table.once, table.json, true));";
+                $codex .= "\n                        $5('[wit={$col}]', dom).html(ciyfn.tdshow('{$col}', dat.{$col}, table.field.{$col}.ext, dat, table.json, true));";
             } else if (
                 $cate == 'FSIZE' || $cate == 'METRE' || $cate == 'DATE' || $cate == 'TIME' || $cate == 'BOOL'
                 || $cate == 'WCNY' || $cate == 'UNIT' || $cate == 'CYC' || $cate == 'SEC' || $cate == 'TON'
@@ -745,7 +773,7 @@ if($hasedit){
                     if (isset($fld['set']['listload']) && $fld['set']['listload'] == 'rel')
                         $range = 'jsndat.' . $dictname;
                     else
-                        $range = 'table.once.' . $dictname;
+                        $range = 'table.json.' . $dictname;
                 } else
                     $range = "'{$dictname}'";
                 if (isset($fld['set']['dbedit']) && $fld['set']['dbedit'] == 'text')
@@ -754,6 +782,19 @@ if($hasedit){
                     $codex .= "\n                        ciycmp({ dom: $5('[com={$col}]', dom), value: dat.{$col}, range: {$range} });";
             } else if ($cate == 'MD' || $cate == 'DOWN' || $cate == 'AV' || $cate == 'IMG' || $cate == 'IMG1') {
                 $codex .= "\n                        ciycmp({ dom: $5('[com={$col}]', dom), value: dat.{$col}, path: ciyfn.makeuploadpath('{$fld['set']['savepath']}', ciyfn.getstorage(ciy_vars.tokenfield)) });";
+            } else if ($cate == 'FILEMD') {
+                $codex .= "\n                        var path = ciyfn.makeuploadpath('{$fld['set']['savepath']}', ciyfn.getstorage(ciy_vars.tokenfield));";
+                $codex .= "\n                        path = path.replace(/{Y}/g, new Date().getFullYear()).replace(/{m}/g, ciyfn.topad0(new Date().getMonth() + 1, 2)).replace(/{d}/g, ciyfn.topad0(new Date().getDate(), 2));";
+                $codex .= "\n                        ciyfn.ajax({";
+                $codex .= "\n                            url: ciyfn.file_stor('/' + path + '/' + dat.id + '_' + dat.{$col} + '.txt')";
+                $codex .= "\n                            , method: 'GET'";
+                $codex .= "\n                            , success: function (res) {";
+                $codex .= "\n                                ciycmp({ dom: $5('[com={$col}]', dom), value: res, path: path });";
+                $codex .= "\n                            }";
+                $codex .= "\n                        , fail: function (res) {";
+                $codex .= "\n                                ciycmp({ dom: $5('[com={$col}]', dom), value: '[MD]', path: path });";
+                $codex .= "\n                            }";
+                $codex .= "\n                        });";
             } else if ($cate == 'TBIN') {
                 $codex .= "\n                        var values = [];";
                 $codex .= "\n                        var ibin = parseInt(dat.{$col});";
@@ -828,11 +869,11 @@ if($hasedit){
                 continue;
             $sgcol = (isset($fld['set']['colview']) ? $fld['set']['colview'] : '24');
             $clstop = '';
-            if($cate == 'MD' || $cate == 'BR' || $cate == 'AV' || $cate == 'IMG' || $cate == 'IMG1')
+            if($cate == 'MD' || $cate == 'FILEMD' || $cate == 'BR' || $cate == 'AV' || $cate == 'IMG' || $cate == 'IMG1')
                 $clstop = ' top';
             $codex .= "\n                html += '<div class=\"ciy-form col-24 col-sm-{$sgcol}{$clstop}\">';";
-            $codex .= "\n                html += '<label>{$fld['name']}</label><div>';";
-            $codex .= "\n                html += ciyfn.tdshow(dat.{$col}, table.field.{$col}.ext, dat, table.once, table.json, true);";
+            $codex .= "\n                html += '<label class=\"lang\">{$fld['name']}</label><div>';";
+            $codex .= "\n                html += ciyfn.tdshow('{$col}', dat.{$col}, table.field.{$col}.ext, dat, table.json, true);";
             $codex .= "\n                html += '&nbsp;</div></div>';";
             $codex .= "\n";
         }
@@ -841,6 +882,24 @@ if($hasedit){
         $codex .= "\n                    title: '查看'";
         $codex .= "\n                    , width: 'pc'";
         $codex .= "\n                    , autoheight: true";
+        foreach ($flds as $fld) {
+            if($fld['cate'] == 'FILEMD'){
+                $codex .= "\n                    , fn_showed: function (doc, dom) {";
+                $codex .= "\n                        var path = ciyfn.makeuploadpath('{$fld['set']['savepath']}', ciyfn.getstorage(ciy_vars.tokenfield));";
+                $codex .= "\n                        path = path.replace(/{Y}/g, new Date().getFullYear()).replace(/{m}/g, ciyfn.topad0(new Date().getMonth() + 1, 2)).replace(/{d}/g, ciyfn.topad0(new Date().getDate(), 2));";
+                $codex .= "\n                        ciyfn.ajax({";
+                $codex .= "\n                            url: ciyfn.file_stor('/' + path + '/' + dat.id + '_' + dat.{$fld['col']} + '.txt')";
+                $codex .= "\n                            , method: 'GET'";
+                $codex .= "\n                            , success: function (res) {";
+                $codex .= "\n                                $5('[data-mdver]', dom).html(ciyfn.markdown(res));";
+                $codex .= "\n                            }";
+                $codex .= "\n                        , fail: function (res) {";
+                $codex .= "\n                                $5('[data-mdver]', dom).html('未加载');";
+                $codex .= "\n                            }";
+                $codex .= "\n                        });";
+                $codex .= "\n                    }";
+            }
+        }
         $codex .= "\n                    , content: html";
         $codex .= "\n                });";
         $codex .= "\n            });";
@@ -864,15 +923,15 @@ if($hasedit){
                 continue;
             $sgcol = (isset($fld['set']['colview']) ? $fld['set']['colview'] : '24');
             $codex .= "\n                html += '<div class=\"ciy-form col-24 col-sm-{$sgcol}\">';";
-            $codex .= "\n                html += '<label>{$fld['name']}</label><div>';";
-            $codex .= "\n                html += ciyfn.tdshow(dat.{$col}, table.field.{$col}.ext, dat, table.once, table.json, true);";
+            $codex .= "\n                html += '<label class=\"lang\">{$fld['name']}</label><div>';";
+            $codex .= "\n                html += ciyfn.tdshow('{$col}', dat.{$col}, table.field.{$col}.ext, dat, table.json, true);";
             $codex .= "\n                html += '</div></div>';";
             $codex .= "\n";
         }
         foreach ($flds as $fld) {
             if($fld['col'] == 'auditmsg'){
                 $codex .= "\n                html += '<div class=\"ciy-form col-24 col-sm-24\">';";
-                $codex .= "\n                html += '<label>拒绝理由</label><div>';";
+                $codex .= "\n                html += '<label class=\"lang\">拒绝理由</label><div>';";
                 $codex .= "\n                html += '<input type=\"text\" name=\"auditmsg\" style=\"width:100%;\" />';";
                 $codex .= "\n                html += '</div></div>';";
             }
diff --git a/web/admin/develop/code_pc_php.php b/web/admin/develop/code_pc_php.php
index 4fdf4dc..0265b21 100644
--- a/web/admin/develop/code_pc_php.php
+++ b/web/admin/develop/code_pc_php.php
@@ -123,6 +123,9 @@ function code_pc_php($post) {
                     $codex .= "\n            \$csqlt->where('name like', \$val);";
                     $codex .= "\n            \$trow = \$db->getone(\$csqlt);";
                     $codex .= "\n            if (is_array(\$trow)) {";
+                if ($cate == 'CATS')
+                    $codex .= "\n                \$csql->where('{$col} like', ',' . \$trow['id'] . ',');";
+                else
                     $codex .= "\n                \$csql->where('{$col}', \$trow['id']);";
                 }
                 $codex .= "\n                \$query['{$col}'] = \$trow['name'];";
@@ -197,10 +200,10 @@ function code_pc_php($post) {
     $codex .= "\n        \$pagecount = \$post->getint('pagecount', 10);";
     $codex .= "\n        \$csql->limit(\$pageno, \$pagecount);";
     $codex .= "\n        \$mainrowcount = \$post->getint('count');";
-    $codex .= "\n        \$rows = \$db->get(\$csql, \$mainrowcount);";
-    $codex .= "\n        if(\$rows === false)";
+    $codex .= "\n        \$mrows = \$db->get(\$csql, \$mainrowcount);";
+    $codex .= "\n        if (\$mrows === false)";
     $codex .= "\n            return errjson(\$db->error);";
-    $codex .= "\n        \$ret = array('where' => \$where, 'pageno' => \$pageno, 'pagecount' => \$pagecount, 'count' => \$mainrowcount, 'list' => \$rows);";
+    $codex .= "\n        \$ret = array('searchwhere' => \$where, 'pageno' => \$pageno, 'pagecount' => \$pagecount, 'count' => \$mainrowcount, 'list' => \$mrows);";
     $codex .= "\n        if (\$post->getbool('field')) {";
     $codex .= "\n            \$field = array();";
     $codex .= "\n            \$fshow = \$db->getfield(\$field, '{$tabname}');";
@@ -222,7 +225,7 @@ function code_pc_php($post) {
     $codex .= "\n            \$ret['fshow'] = \$fshow;";
     $codex .= "\n        }";
     $codex .= "\n        if (\$post->getbool('once')) {";
-    $codex .= "\n            \$ret['once'] = array();";
+    $codex .= "\n            \$ret['once'] = true;";
     $codex .= "\n            \$input = array();";
     foreach ($flds as $fld) {
         if (!$fld['bqry'])
@@ -234,7 +237,7 @@ function code_pc_php($post) {
             $dbquery = isset($fld['set']['dbquery']) ? $fld['set']['dbquery'] : '';
             $pspec = '';
             if ($fld['breq']) {
-                $codex .= "\n            if(!get('_{$col}'))";
+                $codex .= "\n            if (!get('_{$col}'))";
                 $pspec = '    ';
             }
             if ($dbquery == 'window') {
@@ -292,7 +295,7 @@ function code_pc_php($post) {
         }
         $codex .= "\n            \$input[] = array('type' => 'select', 'form' => 'order', 'name' => '排序', 'select' => \$vals);";
     }
-    $codex .= "\n            \$ret['once']['input'] = \$input;";
+    $codex .= "\n            \$ret['searchinput'] = \$input;";
 
     foreach ($flds as $fld) {
         $cate = $fld['cate'];
@@ -304,7 +307,7 @@ function code_pc_php($post) {
                     if ($cate == 'CATM')
                         $ext = ',upid';
                     $codex .= "\n            \$csql = (new \ciy\sql('{$dictname}'))->column('id,name{$ext}');";
-                    $codex .= "\n            \$ret['once']['{$dictname}'] = \$db->get(\$csql);";
+                    $codex .= "\n            \$ret['{$dictname}'] = \$db->get(\$csql);";
                 }
             }
         }
@@ -331,7 +334,7 @@ function code_pc_php($post) {
     }
     foreach ($rels as $dictname => $cols) {
         $colsn = implode(',', $cols);
-        $codex .= "\n        \$ret['{$dictname}'] = getrelation(\$db, \$rows, '{$dictname}', '{$colsn}');";
+        $codex .= "\n        \$ret['{$dictname}'] = getrelation(\$db, \$mrows, '{$dictname}', '{$colsn}');";
     }
     $codex .= "\n        return succjson(\$ret);";
     $codex .= "\n    }";
@@ -352,8 +355,8 @@ function code_pc_php($post) {
                 $codex .= "\n            \$csql->where('{$saasfield}', \$rsuser['{$saasusr}']);";
         }
         $codex .= "\n            \$csql->where('id', \$id);";
-        $codex .= "\n            \$row = \$db->getone(\$csql);";
-        $codex .= "\n            if (!is_array(\$row))";
+        $codex .= "\n            \$mrow = \$db->getone(\$csql);";
+        $codex .= "\n            if (!is_array(\$mrow))";
         $codex .= "\n                return errjson('数据不存在');";
         $codex .= "\n            if (\$act == 'view' || \$act == 'review') {";
         foreach ($flds as $fld) {
@@ -363,7 +366,7 @@ function code_pc_php($post) {
                     list($dicttype, $dictname) = splitdict($fld['data']);
                     if ($dicttype == 'dictdb') {
                         $codex .= "\n                \$csql = (new \ciy\sql('{$dictname}'))->column('id,name');";
-                        $codex .= "\n                \$csql->where('id', \$row['{$fld['col']}']);";
+                        $codex .= "\n                \$csql->where('id', \$mrow['{$fld['col']}']);";
                         $codex .= "\n                \$ret['{$dictname}'] = \$db->get(\$csql);";
                     }
                 }
@@ -371,9 +374,9 @@ function code_pc_php($post) {
         }
         $codex .= "\n            }";
         $codex .= "\n        } else {";
-        $codex .= "\n            \$row = array();";
+        $codex .= "\n            \$mrow = array();";
         $codex .= "\n        }";
-        $codex .= "\n        \$ret['data'] = \$row;";
+        $codex .= "\n        \$ret['data'] = \$mrow;";
         $codex .= "\n        if (\$act == 'edit') {";
         foreach ($flds as $fld) {
             $cate = $fld['cate'];
@@ -401,13 +404,14 @@ function code_pc_php($post) {
             $codex .= "\n        //    return errjson('您未被授权操作');";
         }
         $codex .= "\n        \$post = new \ciy\post();";
+        $codex .= "\n        //\$db->trace(\$post->get('_pf'), \$rsuser);";
         foreach ($flds as $fld) {
             $col = $fld['col'];
-            // if($col == $saasfield || $col == 'addtimes' || $col == 'ip' || $col == 'uptimes')
+            // if ($col == $saasfield || $col == 'addtimes' || $col == 'ip' || $col == 'uptimes')
             //     continue;
-            // if($col == 'auditstatus' || $col == 'audittimes' || $col == 'audituser' || $col == 'auditmsg')
+            // if ($col == 'auditstatus' || $col == 'audittimes' || $col == 'audituser' || $col == 'auditmsg')
             //     continue;
-            // if($col == 'matterstatus' || $col == 'matternextuser' || $col == 'mattertimes')
+            // if ($col == 'matterstatus' || $col == 'matternextuser' || $col == 'mattertimes')
             //     continue;
             if ($col != 'id' && !empty($fld['set']['noup']) && $fld['set']['noup'] != 'fow')
                 continue;
@@ -418,7 +422,10 @@ function code_pc_php($post) {
                 $typefc = 'getfloat';
             else
                 $typefc = 'get';
-            $codex .= "\n        \${$col} = \$post->{$typefc}('{$col}');";
+            if ($fld['cate'] == 'FILEMD')
+                $codex .= "\n        \${$col}_text = \$post->get('{$col}');";
+            else 
+                $codex .= "\n        \${$col} = \$post->{$typefc}('{$col}');";
         }
         foreach ($flds as $fld) {
             if (!$fld['bimp'])
@@ -429,10 +436,12 @@ function code_pc_php($post) {
             $cate = $fld['cate'];
             $name = $fld['name'];
             $type = $fld['type'];
-            if ($type == 'bigint' || $type == 'int' || $type == 'double' || $type == 'float')
-                $codex .= "\n        if (\${$col} == 0)";
-            else if ($cate == 'MD')
+            if ($cate == 'MD')
                 $codex .= "\n        if (\${$col} == '[MD]')";
+            else if ($cate == 'FILEMD')
+                $codex .= "\n        if (\${$col}_text == '[MD]')";
+            else if ($type == 'bigint' || $type == 'int' || $type == 'double' || $type == 'float')
+                $codex .= "\n        if (\${$col} == 0)";
             else
                 $codex .= "\n        if (empty(\${$col}))";
             $codex .= "\n            return errjson('请填写{$name}');";
@@ -461,6 +470,12 @@ function code_pc_php($post) {
             $codex .= "\n        if (!is_array(\$datarow))";
             $codex .= "\n            return errjson('数据不存在');";
         }
+        foreach ($flds as $fld) {
+            $col = $fld['col'];
+            if ($fld['cate'] == 'FILEMD'){
+                $codex .= "\n        \${$col} = (isset(\$datarow['{$col}']) ? \$datarow['{$col}'] + 1 : 1);";
+            }
+        }
         $codex .= "\n        try {";
         $codex .= "\n            \$db->begin();";
         $dups = array();
@@ -488,13 +503,13 @@ function code_pc_php($post) {
             $col = $fld['col'];
             if ($col == 'id' || $col == 'addtimes')
                 continue;
-            // if($col == 'auditstatus' || $col == 'audittimes' || $col == 'audituser' || $col == 'auditmsg')
+            // if ($col == 'auditstatus' || $col == 'audittimes' || $col == 'audituser' || $col == 'auditmsg')
             //     continue;
-            // if($col == 'matterstatus' || $col == 'matternextuser' || $col == 'mattertimes')
+            // if ($col == 'matterstatus' || $col == 'matternextuser' || $col == 'mattertimes')
             //     continue;
-            // if($col == 'uptimes')
+            // if ($col == 'uptimes')
             //     $codex .= "\n            \$updata['{$col}'] = tostamp();";
-            // else if($col == 'ip')
+            // else if ($col == 'ip')
             //     $codex .= "\n            \$updata['{$col}'] = getip();";
             if (!empty($fld['set']['noup'])) {
                 if ($fld['set']['noup'] == 'now')
@@ -573,6 +588,13 @@ function code_pc_php($post) {
             $colsn = implode(',', $cols);
             $codex .= "\n        \$ret['{$dictname}'] = getrelation(\$db, [\$updata], '{$dictname}', '{$colsn}');";
         }
+        foreach ($flds as $fld) {
+            $col = $fld['col'];
+            if ($fld['cate'] == 'FILEMD'){
+                $codex .= "\n        if (storsave('/{Y}/{m}{d}/{$fld['set']['savepath']}/' . \$id . '_' . \${$col} . '.txt', \${$col}_text) === false)";
+                $codex .= "\n            return errjson('写入失败');";
+            }
+        }
         $codex .= "\n        return succjson(\$ret);";
         // $codex .= "\n        \$csql = new \ciy\sql('{$tabname}');";
         // $codex .= "\n        \$csql->where('id', \$id);";
@@ -591,6 +613,7 @@ function code_pc_php($post) {
             $codex .= "\n        //    return errjson('您未被授权操作');";
         }
         $codex .= "\n        \$post = new \ciy\post();";
+        $codex .= "\n        //\$db->trace(\$post->get('_pf'), \$rsuser);";
         $codex .= "\n        \$ids = \$post->get('ids');";
         $codex .= "\n        if (empty(\$ids))";
         $codex .= "\n            return errjson('请选择至少一条');";
@@ -600,12 +623,12 @@ function code_pc_php($post) {
                 $codex .= "\n        \$csql->where('{$saasfield}', \$rsuser['{$saasusr}']);";
         }
         $codex .= "\n        \$csql->where('id in', \$ids);";
-        $codex .= "\n        \$rows = \$db->get(\$csql);";
+        $codex .= "\n        \$mrows = \$db->get(\$csql);";
         $codex .= "\n        \$vids = array();";
         $codex .= "\n        try {";
         $codex .= "\n            \$db->begin();";
-        $codex .= "\n            foreach (\$rows as \$row) {";
-        $codex .= "\n                \$delid = \$row['id'];";
+        $codex .= "\n            foreach (\$mrows as \$mrow) {";
+        $codex .= "\n                \$delid = \$mrow['id'];";
         $codex .= "\n                //delcheck(\$db, \$delid, 'tablexx', 'xxid', '管理员');";
         if ($chk_deltimes) {
             $codex .= "\n                //deltimeall(\$db, \$delid, 'tablexx', 'xxid', '运动员');";
@@ -614,7 +637,7 @@ function code_pc_php($post) {
             $codex .= "\n                //delall(\$db, \$delid, 'tablexx', 'xxid', '运动员');  //deltimeall";
             $codex .= "\n                delme(\$db, \$delid, '{$tabname}');";
         }
-        $codex .= "\n                savelogdb(\$db, \$rsuser['id'], '{$tabname}', \$row, null);";
+        $codex .= "\n                savelogdb(\$db, \$rsuser['id'], '{$tabname}', \$mrow, null);";
         $codex .= "\n                \$vids[] = \$delid;";
         $codex .= "\n            }";
         $codex .= "\n            \$db->commit();";
@@ -638,6 +661,7 @@ function code_pc_php($post) {
             $codex .= "\n        //    return errjson('您未被授权操作');";
         }
         $codex .= "\n        \$post = new \ciy\post();";
+        $codex .= "\n        //\$db->trace(\$post->get('_pf'), \$rsuser);";
         $codex .= "\n        \$ids = \$post->get('ids');";
         $codex .= "\n        if (empty(\$ids))";
         $codex .= "\n            return errjson('请选择至少一条');";
@@ -655,11 +679,11 @@ function code_pc_php($post) {
                 $codex .= "\n        \$csql->where('{$saasfield}', \$rsuser['{$saasusr}']);";
         }
         $codex .= "\n        \$csql->where('id in', \$ids);";
-        $codex .= "\n        \$rows = \$db->get(\$csql);";
+        $codex .= "\n        \$mrows = \$db->get(\$csql);";
         $codex .= "\n        \$ids = array();";
         $codex .= "\n        try {";
         $codex .= "\n            \$db->begin();";
-        $codex .= "\n            foreach (\$rows as \$row) {";
+        $codex .= "\n            foreach (\$mrows as \$mrow) {";
         $codex .= "\n                if (\$auditstatus == 100) {";
         $codex .= "\n                }";
         $codex .= "\n                \$updata = array();";
@@ -675,10 +699,10 @@ function code_pc_php($post) {
                 $codex .= "\n                \$updata['{$col}'] = \$auditmsg;";
         }
         $codex .= "\n                \$csql = new \ciy\sql('{$tabname}');";
-        $codex .= "\n                \$csql->where('id', \$row['id']);";
+        $codex .= "\n                \$csql->where('id', \$mrow['id']);";
         $codex .= "\n                if (\$db->update(\$csql, \$updata) === false)";
         $codex .= "\n                    throw new \Exception('审核失败:' . \$db->error);";
-        $codex .= "\n                \$ids[] = \$row['id'];";
+        $codex .= "\n                \$ids[] = \$mrow['id'];";
         $codex .= "\n            }";
         $codex .= "\n            \$db->commit();";
         $codex .= "\n        } catch (\Exception \$ex) {";
@@ -702,6 +726,7 @@ function code_pc_php($post) {
             $codex .= "\n        //    return errjson('您未被授权操作');";
         }
         $codex .= "\n        \$post = new \ciy\post();";
+        $codex .= "\n        //\$db->trace(\$post->get('_pf'), \$rsuser);";
         $codex .= "\n        \$status = \$post->getint('status');";
         $codex .= "\n        \$ids = \$post->get('ids');";
         $codex .= "\n        if (empty(\$ids))";
@@ -712,18 +737,18 @@ function code_pc_php($post) {
                 $codex .= "\n        \$csql->where('{$saasfield}', \$rsuser['{$saasusr}']);";
         }
         $codex .= "\n        \$csql->where('id in', \$ids);";
-        $codex .= "\n        \$rows = \$db->get(\$csql);";
+        $codex .= "\n        \$mrows = \$db->get(\$csql);";
         $codex .= "\n        \$ids = array();";
         $codex .= "\n        try {";
         $codex .= "\n            \$db->begin();";
-        $codex .= "\n            foreach (\$rows as \$row) {";
+        $codex .= "\n            foreach (\$mrows as \$mrow) {";
         $codex .= "\n                \$updata = array();";
         $codex .= "\n                \$updata['status'] = \$status;";
         $codex .= "\n                \$csql = new \ciy\sql('{$tabname}');";
-        $codex .= "\n                \$csql->where('id', \$row['id']);";
+        $codex .= "\n                \$csql->where('id', \$mrow['id']);";
         $codex .= "\n                if (\$db->update(\$csql, \$updata) === false)";
         $codex .= "\n                    throw new \Exception('批量操作失败:' . \$db->error);";
-        $codex .= "\n                \$ids[] = \$row['id'];";
+        $codex .= "\n                \$ids[] = \$mrow['id'];";
         $codex .= "\n            }";
         $codex .= "\n            \$db->commit();";
         $codex .= "\n        } catch (\Exception \$ex) {";
@@ -747,9 +772,9 @@ function code_pc_php($post) {
 
         $codex .= "\n        \$post = new \\ciy\\post();";
         $codex .= "\n        list(\$where, \$csql) = self::setwhere(\$db, \$post, \$rsuser);";
-        $codex .= "\n        \$rows = \$db->get(\$csql);";
-        $codex .= "\n        if (count(\$rows) > 10000)";
-        $codex .= "\n            return errjson('将导出' . count(\$rows) . '条，不建议超过1万条，请筛选缩小范围');";
+        $codex .= "\n        \$mrows = \$db->get(\$csql);";
+        $codex .= "\n        if (count(\$mrows) > 10000)";
+        $codex .= "\n            return errjson('将导出' . count(\$mrows) . '条，不建议超过1万条，请筛选缩小范围');";
         $codex .= "\n        \$fields = array();";
         foreach ($flds as $fld) {
             if (!$fld['bout'])
@@ -789,7 +814,7 @@ function code_pc_php($post) {
                     $codex .= "\n        \$code_{$col} = \$db->get((new \\ciy\\sql('{$dictname}'))->column('id,name{$ext}'));";
                 } else if ($dicttype == 'dictdb') {
                     if (isset($fld['set']['listload']) && $fld['set']['listload'] == 'rel')
-                        $codex .= "\n        \$code_{$col} = getrelation(\$db, \$rows, '{$dictname}', '{$col}', 'id,name{$ext}');";
+                        $codex .= "\n        \$code_{$col} = getrelation(\$db, \$mrows, '{$dictname}', '{$col}', 'id,name{$ext}');";
                     else
                         $codex .= "\n        \$code_{$col} = \$db->get((new \\ciy\\sql('{$dictname}'))->column('id,name{$ext}'));";
                 } else if ($dicttype == 'dictcata') {
@@ -800,11 +825,11 @@ function code_pc_php($post) {
             }
         }
         $codex .= "\n        \$datas = array();";
-        $codex .= "\n        foreach (\$rows as \$row) {";
+        $codex .= "\n        foreach (\$mrows as \$mrow) {";
         $codex .= "\n            \$dat = array();";
         $codex .= "\n            foreach (\$fields as \$field) {";
         $codex .= "\n                \$field = \$field['field'];";
-        $codex .= "\n                \$val = isset(\$row[\$field]) ? \$row[\$field] : '';";
+        $codex .= "\n                \$val = isset(\$mrow[\$field]) ? \$mrow[\$field] : '';";
 
         foreach ($flds as $fld) {
             if ($fld['col'] != 'id' && !$fld['bout'])
@@ -947,6 +972,8 @@ function code_pc_php($post) {
 
         foreach ($flds as $fld) {
             $col = $fld['col'];
+            if ($fld['cate'] == 'FILEMD')
+                continue;
             if ($col == 'id') {
                 $codex .= "\n        \$headsn[] = '行码.id';";
                 continue;
@@ -1050,6 +1077,8 @@ function code_pc_php($post) {
             if ($fld['col'] == 'id' || !$fld['bmin'])
                 continue;
             $col = $fld['col'];
+            if($col == 'FILEMD')
+                continue;
             $name = $fld['name'];
             $cate = $fld['cate'];
             $type = $fld['type'];
@@ -1271,6 +1300,7 @@ function code_pc_php($post) {
         $codex .= "\n        //if (nopower(\$db, \$rsuser['id'], 'p i'))";
         $codex .= "\n        //    return errjson('您未被授权操作');";
         $codex .= "\n        \$post = new \ciy\post();";
+        $codex .= "\n        //\$db->trace(\$post->get('_pf'), \$rsuser);";
         $codex .= "\n        \$total = \$post->getint('total');";
         $codex .= "\n        try {";
         $codex .= "\n            \$db->begin();";
@@ -1305,6 +1335,8 @@ function code_pc_php($post) {
             $col = $fld['col'];
             if ($col == 'id')
                 continue;
+            if ($fld['cate'] == 'FILEMD')
+                continue;
             $codex .= "\n                \$updata['{$col}'] = \$post->get('{$col}_' . \$i);";
         }
         $codex .= "\n                \$csql = new \ciy\sql('{$tabname}');";
diff --git a/web/admin/develop/code_saas.php b/web/admin/develop/code_saas.php
index f6d9263..daa3824 100644
--- a/web/admin/develop/code_saas.php
+++ b/web/admin/develop/code_saas.php
@@ -24,7 +24,7 @@ class code_saas {
         $rows = $db->get($csql, $mainrowcount);
         if ($rows === false)
             return errjson($db->error);
-        $ret = array('where' => $where, 'pageno' => $pageno, 'pagecount' => $pagecount, 'count' => $mainrowcount, 'list' => $rows);
+        $ret = array('searchwhere' => $where, 'pageno' => $pageno, 'pagecount' => $pagecount, 'count' => $mainrowcount, 'list' => $rows);
         if ($post->getbool('field')) {
             $field = array();
             $fshow = $db->getfield($field, 'zc_dev_dbsaas');
@@ -37,7 +37,7 @@ class code_saas {
             $ret['fshow'] = $fshow;
         }
         if ($post->getbool('once')) {
-            $ret['once'] = array();
+            $ret['once'] = true;
         }
         return succjson($ret);
     }
diff --git a/web/admin/rigger/admin.go b/web/admin/rigger/admin.go
index 29e2c78..0bd8484 100644
--- a/web/admin/rigger/admin.go
+++ b/web/admin/rigger/admin.go
@@ -90,10 +90,10 @@ func Admin_init(w http.ResponseWriter, r *http.Request) bool {
 
 		csql = c.NewCiySQL("zc_depart")
 		csql.Column("id,upid,name,isuse")
-		once["zc_depart"], _, _ = c.CiyDB.Get(csql)
+		ret["zc_depart"], _, _ = c.CiyDB.Get(csql)
 		csql = c.NewCiySQL("zc_role")
 		csql.Column("id,name")
-		once["zc_role"], _, _ = c.CiyDB.Get(csql)
+		ret["zc_role"], _, _ = c.CiyDB.Get(csql)
 		ret["once"] = once
 	}
 	return c.SuccJSON(w, r, ret)
diff --git a/web/admin/rigger/admin.html b/web/admin/rigger/admin.html
index c7bc631..a4aeb1c 100644
--- a/web/admin/rigger/admin.html
+++ b/web/admin/rigger/admin.html
@@ -87,7 +87,7 @@
         <div class="char4 row">
             <div class="ciy-form col-24 col-sm-8">
                 <div>
-                    <ciy-upload path="{Y}/{m}{d}/avar" showwh="13em" com="icon" num="1" type="jpg,png,webp" zipjpg="0.7" imgwidth="400" imgheight="400" zipext="jpg" style="justify-content: center;" />
+                    <ciy-upload path="{Y}/{m}{d}/avar" showwh="13em" com="icon" num="1" type="jpg,png,webp" zipjpg="70" imgwidth="400" imgheight="400" zipext="jpg" style="justify-content: center;" />
                 </div>
             </div>
             <div class="ciy-form col-24 col-sm-8">
@@ -145,7 +145,7 @@
                 , pagecount: 10
                 , fn_beforedata: function (json) {
                     if (json.once)
-                        filldepart(json.once.zc_depart);
+                        filldepart(json.zc_depart);
                     ciyfn.fillsearch({
                         searchdom: '.search'
                         , data: json
@@ -213,8 +213,8 @@
                     ciycmp({ dom: $5('[com=icon]', dom), value: table.data[id].icon });
                     ciycmp({ dom: $5('[com=stpstatus]', dom), value: table.data[id].stpstatus, range: 'stpstatus' });
                     ciycmp({ dom: $5('[com=sex]', dom), value: table.data[id].sex, range: 'sex' });
-                    ciycmp({ dom: $5('[com=departid]', dom), value: table.data[id].departid, range: table.once.zc_depart });
-                    ciycmp({ dom: $5('[com=roleid]', dom), value: table.data[id].roleid, range: table.once.zc_role });
+                    ciycmp({ dom: $5('[com=departid]', dom), value: table.data[id].departid, range: table.json.zc_depart });
+                    ciycmp({ dom: $5('[com=roleid]', dom), value: table.data[id].roleid, range: table.json.zc_role });
                 }
                 , btns: ["提交", "*关闭"]
                 , cb: function (opn) {
diff --git a/web/admin/rigger/admin.php b/web/admin/rigger/admin.php
index b43a249..1c0b59b 100644
--- a/web/admin/rigger/admin.php
+++ b/web/admin/rigger/admin.php
@@ -30,7 +30,7 @@ class admin {
         $csql->limit($pageno, $pagecount);
         $mainrowcount = $post->getint('count');
         $rows = $db->get($csql, $mainrowcount);
-        $ret = array('where' => $where, 'pageno' => $pageno, 'pagecount' => $pagecount, 'count' => $mainrowcount, 'list' => $rows);
+        $ret = array('searchwhere' => $where, 'pageno' => $pageno, 'pagecount' => $pagecount, 'count' => $mainrowcount, 'list' => $rows);
         if ($post->getbool('field')) {
             $field = array();
             $fshow = $db->getfield($field, 'zc_admin');
@@ -44,7 +44,7 @@ class admin {
         }
 
         if ($post->getbool('once')) {
-            $ret['once'] = array();
+            $ret['once'] = true;
             $input = array();
             $input[] = array(
                 'type' => 'input',
@@ -75,12 +75,12 @@ class admin {
                 'form' => 'addtimes',
                 'name' => '注册时间'
             );
-            $ret['once']['input'] = $input;
+            $ret['searchinput'] = $input;
             $csql = (new \ciy\sql('zc_depart'))->column('id,upid,name,isuse');
-            $ret['once']['zc_depart'] = $db->get($csql);
+            $ret['zc_depart'] = $db->get($csql);
             $csql = new \ciy\sql('zc_role');
             $csql->column('id,name');
-            $ret['once']['zc_role'] = $db->get($csql);
+            $ret['zc_role'] = $db->get($csql);
         }
         return succjson($ret);
     }
diff --git a/web/admin/rigger/autotask.php b/web/admin/rigger/autotask.php
index c516189..0543ca5 100644
--- a/web/admin/rigger/autotask.php
+++ b/web/admin/rigger/autotask.php
@@ -27,7 +27,7 @@ class autotask {
         $mainrowcount = $post->getint('count');
         $rows = $db->get($csql, $mainrowcount);
         $rows[] = array('id' => '', 'runcycle' => 0, 'nexttimes' => tostamp());
-        $ret = array('where' => $where, 'pageno' => $pageno, 'pagecount' => $pagecount, 'count' => $mainrowcount, 'list' => $rows);
+        $ret = array('searchwhere' => $where, 'pageno' => $pageno, 'pagecount' => $pagecount, 'count' => $mainrowcount, 'list' => $rows);
         if ($post->getbool('field')) {
             $field = array();
             $fshow = $db->getfield($field, 'zc_autotask');
@@ -40,7 +40,7 @@ class autotask {
             $ret['fshow'] = $fshow;
         }
         if ($post->getbool('once')) {
-            $ret['once'] = array();
+            $ret['once'] = true;
             $input = array();
             $input[] = array(
                 'type' => 'input',
@@ -54,7 +54,7 @@ class autotask {
                 'name' => '入口函数',
                 'prop' => ' style="width:8em;"'
             );
-            $ret['once']['input'] = $input;
+            $ret['searchinput'] = $input;
         }
         return succjson($ret);
     }
diff --git a/web/admin/rigger/autotskrun.go b/web/admin/rigger/autotskrun.go
index 6d64626..910ee65 100644
--- a/web/admin/rigger/autotskrun.go
+++ b/web/admin/rigger/autotskrun.go
@@ -76,7 +76,7 @@ func Autotskrun_init(w http.ResponseWriter, r *http.Request) bool {
 		once["input"] = input
 		csql = c.NewCiySQL("zc_autotask")
 		csql.Column("id,name")
-		once["zc_autotask"], _, _ = c.CiyDB.Get(csql)
+		ret["zc_autotask"], _, _ = c.CiyDB.Get(csql)
 		ret["once"] = once
 	}
 	return c.SuccJSON(w, r, ret)
diff --git a/web/admin/rigger/autotskrun.php b/web/admin/rigger/autotskrun.php
index db3045b..0b17653 100644
--- a/web/admin/rigger/autotskrun.php
+++ b/web/admin/rigger/autotskrun.php
@@ -26,7 +26,7 @@ class autotskrun {
         $csql->limit($pageno, $pagecount);
         $mainrowcount = $post->getint('count');
         $rows = $db->get($csql, $mainrowcount);
-        $ret = array('where' => $where, 'pageno' => $pageno, 'pagecount' => $pagecount, 'count' => $mainrowcount, 'list' => $rows);
+        $ret = array('searchwhere' => $where, 'pageno' => $pageno, 'pagecount' => $pagecount, 'count' => $mainrowcount, 'list' => $rows);
         if ($post->getbool('field')) {
             $field = array();
             $fshow = $db->getfield($field, 'zc_autotsk_run');
@@ -40,7 +40,7 @@ class autotskrun {
         }
 
         if ($post->getbool('once')) {
-            $ret['once'] = array();
+            $ret['once'] = true;
             $input = array();
             $input[] = array(
                 'type' => 'daterange', 'form' => 'addtimes', 'name' => '执行时间'
@@ -54,9 +54,9 @@ class autotskrun {
             $input[] = array(
                 'type' => 'input', 'form' => 'msg', 'name' => '任务简报', 'prop' => ' style="width:8em;"'
             );
-            $ret['once']['input'] = $input;
+            $ret['searchinput'] = $input;
             $csql = (new \ciy\sql('zc_autotask'))->column('id,name');
-            $ret['once']['zc_autotask'] = $db->get($csql);
+            $ret['zc_autotask'] = $db->get($csql);
         }
         return succjson($ret);
     }
diff --git a/web/admin/rigger/cata.go b/web/admin/rigger/cata.go
index c1f4b76..70d9c86 100644
--- a/web/admin/rigger/cata.go
+++ b/web/admin/rigger/cata.go
@@ -101,10 +101,10 @@ func Cata_init(w http.ResponseWriter, r *http.Request) bool {
 			})
 		}
 		once["input"] = input
-		once["cbid"] = cbid
-		once["issub"] = issub
-		once["ismulti"] = ismulti
-		once["code"] = code
+		ret["cbid"] = cbid
+		ret["issub"] = issub
+		ret["ismulti"] = ismulti
+		ret["codename"] = code
 		ret["once"] = once
 	}
 	return c.SuccJSON(w, r, ret)
diff --git a/web/admin/rigger/cata.html b/web/admin/rigger/cata.html
index 8e4cb57..4615faa 100644
--- a/web/admin/rigger/cata.html
+++ b/web/admin/rigger/cata.html
@@ -33,7 +33,7 @@
 				<a class="lang btn def" onclick="ciyfn.select_all(table)">全选</a>
 				<a class="lang btn def" onclick="ciyfn.select_diff(table)">反选</a>
 				|
-				<a class="lang btn dag" onclick="ciyfn.select_callfunc(table, this,'del','已选{n}条，确认是否删除?',{cbid:table.once.cbid},function(json){table.delline(json)})">批量删除</a>
+				<a class="lang btn dag" onclick="ciyfn.select_callfunc(table, this,'del','已选{n}条，确认是否删除?',{cbid:table.json.cbid},function(json){table.delline(json)})">批量删除</a>
 			</div>
 		</div>
 	</div>
@@ -98,17 +98,17 @@
 				, url: 'init'
 				, thfield: function (name, key, field, json) {
 					if (key == 'name') {
-						if (table.once.issub)
+						if (table.json.issub)
 							return '<a style="font-size: 1.5em;vertical-align: middle;padding-right: 0.5em;" onclick="$5(\'div[data-treeid][data-deep=0]\').trigger(\'click\');">⇅</a> ' + ciyfn.lang(name);
 					}
 				}
 				, fn_beforedata: function (json) {
 					json.list = ciyfn.conv_treerow(json.list, 0, 0);
 					if (json.once) {
-						if (!json.once.ismulti)
+						if (!json.ismulti)
 							$5('.btn-multi').hide('', 0, true);
 						else
-							$5('#id_code').text(json.once.code).show();
+							$5('#id_code').text(json.codename).show();
 					}
 					ciyfn.fillsearch({
 						searchdom: '.search'
@@ -137,14 +137,14 @@
 							html += '<a class="lang btn def upbtn" onclick="menubtn(this, \'edit\')">新增</a>';
 						else
 							html += '<a class="lang btn def upbtn" onclick="menubtn(this, \'edit\')">更新</a>';
-						if (data['id'] > 0 && table.once.issub)
+						if (data['id'] > 0 && table.json.issub)
 							html += '<a class="lang btn def" onclick="menubtn(this, \'sub\')">添加子码</a>';
 						return html;
 					}
 					if (key == 'name') {
 						if (data['id'] == 0) {
 							var html = '';
-							if (table.once.issub)
+							if (table.json.issub)
 								html += '<ciy-checkbox com="upcheck" text="' + ciyfn.lang('子码') + '" style="margin-right: 0.3em;"></ciy-checkbox>';
 							html += '<input style="width:100%;" onclick="event.stopPropagation();" onkeydown="btnset(this)" type="text" name="' + key + '" value="' + data['name'] + '"/>';
 							return { divprop: ' style="display: flex;"', datashow: html };
@@ -213,7 +213,7 @@
 				, cb: function (opn) {
 					if (opn.btn == "关闭")
 						return opn.close();
-					var txt = 'rigger/cata.html?cbid=' + table.once.cbid;
+					var txt = 'rigger/cata.html?cbid=' + table.json.cbid;
 					if (opn.inputs.issub == 1)
 						txt += '&issub=yes';
 					if (opn.inputs.ismulti == 1)
@@ -241,7 +241,7 @@
 						postparam.upid = domselect.attr('data-id');
 					}
 				}
-				postparam.cbid = table.once.cbid;
+				postparam.cbid = table.json.cbid;
 				ciyfn.callfunc('update', postparam, function (json) {
 					$5(dom).addClass('def');
 					if (id == 0) {
@@ -285,7 +285,7 @@
 					if (opn.btn == "关闭")
 						return opn.close();
 					opn.inputs.upid = upid;
-					opn.inputs.cbid = table.once.cbid;
+					opn.inputs.cbid = table.json.cbid;
 					if (ciyfn.throttle(opn.dombtn)) return;
 					ciyfn.callfunc('multiadd', opn.inputs, function (json) {
 						opn.close();
diff --git a/web/admin/rigger/cata.php b/web/admin/rigger/cata.php
index e671b93..0238769 100644
--- a/web/admin/rigger/cata.php
+++ b/web/admin/rigger/cata.php
@@ -56,7 +56,7 @@ class cata {
             $ret['field'] = $field;
         }
         if ($post->getbool('once')) {
-            $ret['once'] = array();
+            $ret['once'] = true;
             $input = array();
             $input[] = array(
                 'type' => 'input',
@@ -78,11 +78,11 @@ class cata {
                     'prop' => ' style="width:8em;"'
                 );
             }
-            $ret['once']['input'] = $input;
-            $ret['once']['cbid'] = $cbid;
-            $ret['once']['issub'] = $issub;
-            $ret['once']['ismulti'] = $ismulti;
-            $ret['once']['code'] = $code;
+            $ret['searchinput'] = $input;
+            $ret['cbid'] = $cbid;
+            $ret['issub'] = $issub;
+            $ret['ismulti'] = $ismulti;
+            $ret['codename'] = $code;
         }
         return succjson($ret);
     }
@@ -224,6 +224,9 @@ class cata {
         $codes = explode("\n", str_replace('，', ',', $code));
 
         $cnt = 0;
+        $deepids = array();
+        $deepids[0] = $upid;
+        $lastdeep = 0;
         try {
             $db->begin();
             if (count($codes) == 1 && strpos($code, ',') !== false && strpos($code, ':') !== false) {
@@ -237,20 +240,30 @@ class cata {
                     $name = $cs[1];
                     if (empty($name))
                         continue;
+                    $deep = 0;
+                    while (true) {
+                        if (substr($name, 0, 2) != '--')
+                            break;
+                        $deep++;
+                        $name = trim(substr($name, 2));
+                    }
+                    if (empty($name))
+                        continue;
+                    if ($lastdeep < $deep)
+                        throw new \Exception('不能跳跃层级:' . $name);
                     $csql = new \ciy\sql('zc_cata');
                     $csql->where('cbid', $cbid)->where('codeid', $codeid);
                     $chkrow = $db->getone($csql);
                     $updata = array();
-                    $updata['upid'] = $upid;
+                    $updata['upid'] = $deepids[$deep];
                     $updata['name'] = $name;
                     $csql = new \ciy\sql('zc_cata');
                     if (is_array($chkrow)) {
-                        $chkid = $chkrow['id'];
-                        $csql->where('id', $chkid);
+                        $id = $chkrow['id'];
+                        $csql->where('id', $id);
                         if ($db->update($csql, $updata) === false)
                             throw new \Exception('批量更新失败.' . $db->error);
                     } else {
-                        $chkid = 0;
                         $updata['isuse'] = 1;
                         $updata['cbid'] = $cbid;
                         $updata['codeid'] = $codeid;
@@ -260,6 +273,8 @@ class cata {
                         $id = $db->insert_id();
                     }
                     $updata['id'] = $id;
+                    $deepids[$deep + 1] = $id;
+                    $lastdeep = $deep + 1;
                     savelogdb($db, $rsuser['id'], 'zc_cata', $chkrow, $updata);
                     $cnt++;
                 }
@@ -275,21 +290,31 @@ class cata {
                         $name = $cs[1];
                         $codeid = $cs[0];
                     }
+                    $deep = 0;
+                    while (true) {
+                        if (substr($name, 0, 2) != '--')
+                            break;
+                        $deep++;
+                        $name = trim(substr($name, 2));
+                    }
+                    if (empty($name))
+                        continue;
+                    if ($lastdeep < $deep)
+                        throw new \Exception('不能跳跃层级:' . $name);
                     $csql = new \ciy\sql('zc_cata');
                     $csql->where('cbid', $cbid)->where('codeid', $codeid);
                     $chkrow = $db->getone($csql);
                     $updata = array();
-                    $updata['upid'] = $upid;
+                    $updata['upid'] = $deepids[$deep];
                     $updata['name'] = $name;
                     $updata['extdata'] = @$cs[2] . '';
                     $csql = new \ciy\sql('zc_cata');
                     if (is_array($chkrow)) {
-                        $chkid = $chkrow['id'];
-                        $csql->where('id', $chkid);
+                        $id = $chkrow['id'];
+                        $csql->where('id', $id);
                         if ($db->update($csql, $updata) === false)
                             throw new \Exception('批量更新失败.' . $db->error);
                     } else {
-                        $chkid = 0;
                         $updata['isuse'] = 1;
                         $updata['cbid'] = $cbid;
                         $updata['codeid'] = $codeid;
@@ -297,6 +322,8 @@ class cata {
                         if ($db->insert($csql, $updata) === false)
                             throw new \Exception('批量新增失败.' . $db->error);
                         $id = $db->insert_id();
+                        $deepids[$deep + 1] = $id;
+                        $lastdeep = $deep + 1;
                     }
                     $updata['id'] = $id;
                     savelogdb($db, $rsuser['id'], 'zc_cata', $chkrow, $updata);
diff --git a/web/admin/rigger/cataindex.php b/web/admin/rigger/cataindex.php
index fb9d1a5..52a4ee7 100644
--- a/web/admin/rigger/cataindex.php
+++ b/web/admin/rigger/cataindex.php
@@ -27,7 +27,7 @@ class cataindex {
             $ret['fshow'] = $fshow;
         }
         if ($post->getbool('once')) {
-            $ret['once'] = array();
+            $ret['once'] = true;
             $input = array();
             $input[] = array(
                 'type' => 'input',
@@ -47,7 +47,7 @@ class cataindex {
                 'name' => '引用表',
                 'prop' => ' style="width:10em;"'
             );
-            $ret['once']['input'] = $input;
+            $ret['searchinput'] = $input;
         }
         return succjson($ret);
     }
diff --git a/web/admin/rigger/config.php b/web/admin/rigger/config.php
index 7b6b71d..ba5add2 100644
--- a/web/admin/rigger/config.php
+++ b/web/admin/rigger/config.php
@@ -24,7 +24,7 @@ class config {
         $mainrowcount = $post->getint('count');
         $rows = $db->get($csql, $mainrowcount);
         $rows[] = array('id' => 0, 'types' => '');
-        $ret = array('where' => $where, 'pageno' => $pageno, 'pagecount' => $pagecount, 'count' => $mainrowcount, 'list' => $rows);
+        $ret = array('searchwhere' => $where, 'pageno' => $pageno, 'pagecount' => $pagecount, 'count' => $mainrowcount, 'list' => $rows);
         if ($post->getbool('field')) {
             $field = array();
             $fshow = '';
@@ -37,7 +37,7 @@ class config {
             $ret['field'] = $field;
         }
         if ($post->getbool('once')) {
-            $ret['once'] = array();
+            $ret['once'] = true;
             $input = array();
             $input[] = array(
                 'type' => 'input', 'form' => 'types', 'name' => '参数代码', 'prop' => ' style="width:8em;"'
@@ -45,7 +45,7 @@ class config {
             $input[] = array(
                 'type' => 'input', 'form' => 'params', 'name' => '参数值', 'prop' => ' style="width:8em;"'
             );
-            $ret['once']['input'] = $input;
+            $ret['searchinput'] = $input;
         }
         return succjson($ret);
     }
diff --git a/web/admin/rigger/crawtable.php b/web/admin/rigger/crawtable.php
index 61bcfc6..6d03e9c 100644
--- a/web/admin/rigger/crawtable.php
+++ b/web/admin/rigger/crawtable.php
@@ -24,7 +24,7 @@ class crawtable {
         $csql->limit($pageno, $pagecount);
         $mainrowcount = $post->getint('count');
         $rows = $db->get($csql, $mainrowcount);
-        $ret = array('where' => $where, 'pageno' => $pageno, 'pagecount' => $pagecount, 'count' => $mainrowcount, 'list' => $rows);
+        $ret = array('searchwhere' => $where, 'pageno' => $pageno, 'pagecount' => $pagecount, 'count' => $mainrowcount, 'list' => $rows);
         if ($post->getbool('field')) {
             $field = array();
             $fshow = $db->getfield($field, $table);
@@ -37,12 +37,12 @@ class crawtable {
         }
 
         if ($post->getbool('once')) {
-            $ret['once'] = array();
+            $ret['once'] = true;
             $input = array();
             $input[] = array(
                 'type' => 'input', 'form' => 'name', 'name' => '名称'
             );
-            $ret['once']['input'] = $input;
+            $ret['searchinput'] = $input;
         }
         return succjson($ret);
     }
diff --git a/web/admin/rigger/debug_user.php b/web/admin/rigger/debug_user.php
index 75e0174..6146ace 100644
--- a/web/admin/rigger/debug_user.php
+++ b/web/admin/rigger/debug_user.php
@@ -26,7 +26,7 @@ class debug_user {
         $csql->limit($pageno, $pagecount);
         $mainrowcount = $post->getint('count');
         $rows = $db->get($csql, $mainrowcount);
-        $ret = array('where' => $where, 'pageno' => $pageno, 'pagecount' => $pagecount, 'count' => $mainrowcount, 'list' => $rows);
+        $ret = array('searchwhere' => $where, 'pageno' => $pageno, 'pagecount' => $pagecount, 'count' => $mainrowcount, 'list' => $rows);
         if ($post->getbool('field')) {
             $field = array();
             $fshow = $db->getfield($field, 'zc_debug_user');
@@ -36,7 +36,7 @@ class debug_user {
         }
 
         if ($post->getbool('once')) {
-            $ret['once'] = array();
+            $ret['once'] = true;
             $input = array();
             $input[] = array(
                 'type' => 'select', 'form' => 'targettype', 'name' => '子系统', 'select' => 'targettype', 'all' => '全部'
@@ -54,7 +54,7 @@ class debug_user {
             $input[] = array(
                 'type' => 'input', 'form' => 'user', 'name' => '用户名', 'prop' => ' style="width:8em;"'
             );
-            $ret['once']['input'] = $input;
+            $ret['searchinput'] = $input;
         }
         return succjson($ret);
     }
diff --git a/web/admin/rigger/depart.html b/web/admin/rigger/depart.html
index 20aec03..35791f0 100644
--- a/web/admin/rigger/depart.html
+++ b/web/admin/rigger/depart.html
@@ -207,7 +207,7 @@
 						continue;
 					menutxt += indent + tdata[i].name + '\n';
 					if (tdata[i].upid === upid)
-						menutxt += deeptxt(tdata, tdata[i].id, indent + '　');
+						menutxt += deeptxt(tdata, tdata[i].id, indent + '--');
 				}
 				return menutxt;
 			}
diff --git a/web/admin/rigger/depart.php b/web/admin/rigger/depart.php
index 52927fd..79c5e70 100644
--- a/web/admin/rigger/depart.php
+++ b/web/admin/rigger/depart.php
@@ -21,12 +21,15 @@ class depart {
             $ret['fshow'] = $fshow;
         }
         if ($post->getbool('once')) {
-            $ret['once'] = array();
+            $ret['once'] = true;
             $input = array();
             $input[] = array(
-                'type' => 'input', 'form' => 'name', 'name' => '组织名称', 'prop' => ' style="width:8em;"'
+                'type' => 'input',
+                'form' => 'name',
+                'name' => '组织名称',
+                'prop' => ' style="width:8em;"'
             );
-            $ret['once']['input'] = $input;
+            $ret['searchinput'] = $input;
         }
         return succjson($ret);
     }
@@ -34,7 +37,7 @@ class depart {
     public static function json_update() {
         global $db;
         $rsuser = verifyfast();
-        
+
         if (nopower($db, $rsuser['id'], 'p501u'))
             return errjson('您未被授权操作');
         $post = new \ciy\post();
@@ -78,7 +81,7 @@ class depart {
     public static function json_del() {
         global $db;
         $rsuser = verifyfast();
-        
+
         if (nopower($db, $rsuser['id'], 'p501d'))
             return errjson('您未被授权操作');
         $post = new \ciy\post();
@@ -111,7 +114,7 @@ class depart {
     public static function json_modifyupid() {
         global $db;
         $rsuser = verifyfast();
-        
+
         if (nopower($db, $rsuser['id'], 'p501u'))
             return errjson('您未被授权操作');
         $post = new \ciy\post();
@@ -143,7 +146,7 @@ class depart {
     public static function json_multiadd() {
         global $db;
         $rsuser = verifyfast();
-        
+
         if (nopower($db, $rsuser['id'], 'p501u'))
             return errjson('您未被授权操作');
         $post = new \ciy\post();
@@ -151,21 +154,37 @@ class depart {
         $multi = explode("\n", $post->get('multi'));
 
         $cnt = 0;
+        $deepids = array();
+        $deepids[0] = $upid;
+        $lastdeep = 0;
         try {
             $db->begin();
             foreach ($multi as $m) {
                 $m = trim($m);
                 if (empty($m))
                     continue;
+                $deep = 0;
+                while (true) {
+                    if (substr($m, 0, 2) != '--')
+                        break;
+                    $deep++;
+                    $m = trim(substr($m, 2));
+                }
+                if (empty($m))
+                    continue;
+                if ($lastdeep < $deep)
+                    throw new \Exception('不能跳跃层级:' . $m);
                 $updata = array();
                 $updata['name'] = $m;
                 $updata['isuse'] = 1;
-                $updata['upid'] = $upid;
+                $updata['upid'] = $deepids[$deep];
                 $updata['csort'] = 10;
                 $csql = new \ciy\sql('zc_depart');
                 if ($db->insert($csql, $updata) === false)
                     throw new \Exception('新增失败:' . $db->error);
                 $updata['id'] = $db->insert_id();
+                $deepids[$deep + 1] = $updata['id'];
+                $lastdeep = $deep + 1;
                 $cnt++;
                 savelogdb($db, $rsuser['id'], 'zc_depart', null, $updata);
             }
diff --git a/web/admin/rigger/funcslow.php b/web/admin/rigger/funcslow.php
index 1622fac..2dae420 100644
--- a/web/admin/rigger/funcslow.php
+++ b/web/admin/rigger/funcslow.php
@@ -25,7 +25,7 @@ class funcslow {
         $csql->limit($pageno, $pagecount);
         $mainrowcount = $post->getint('count');
         $rows = $db->get($csql, $mainrowcount);
-        $ret = array('where' => $where, 'pageno' => $pageno, 'pagecount' => $pagecount, 'count' => $mainrowcount, 'list' => $rows);
+        $ret = array('searchwhere' => $where, 'pageno' => $pageno, 'pagecount' => $pagecount, 'count' => $mainrowcount, 'list' => $rows);
         if ($post->getbool('field')) {
             $field = array();
             $fshow = $db->getfield($field, 'zc_funcslow');
@@ -37,7 +37,7 @@ class funcslow {
         }
 
         if ($post->getbool('once')) {
-            $ret['once'] = array();
+            $ret['once'] = true;
             $input = array();
             $input[] = array(
                 'type' => 'daterange', 'form' => 'addtimes', 'name' => '记录时间'
@@ -51,7 +51,7 @@ class funcslow {
             $input[] = array(
                 'type' => 'input', 'form' => 'posts', 'name' => '参数', 'prop' => ' style="width:8em;"'
             );
-            $ret['once']['input'] = $input;
+            $ret['searchinput'] = $input;
         }
         return succjson($ret);
     }
diff --git a/web/admin/rigger/logdb.php b/web/admin/rigger/logdb.php
index 2b88a09..569095c 100644
--- a/web/admin/rigger/logdb.php
+++ b/web/admin/rigger/logdb.php
@@ -31,7 +31,7 @@ class logdb {
         $csql->limit($pageno, $pagecount);
         $mainrowcount = $post->getint('count');
         $rows = $db->get($csql, $mainrowcount);
-        $ret = array('where' => $where, 'pageno' => $pageno, 'pagecount' => $pagecount, 'count' => $mainrowcount, 'list' => $rows);
+        $ret = array('searchwhere' => $where, 'pageno' => $pageno, 'pagecount' => $pagecount, 'count' => $mainrowcount, 'list' => $rows);
         if ($post->getbool('field')) {
             $field = array();
             $fshow = $db->getfield($field, 'zc_log');
@@ -40,7 +40,7 @@ class logdb {
         }
 
         if ($post->getbool('once')) {
-            $ret['once'] = array();
+            $ret['once'] = true;
             $input = array();
             $input[] = array(
                 'type' => 'select',
@@ -75,7 +75,7 @@ class logdb {
                 'name' => '详情',
                 'prop' => ' style="width:8em;"'
             );
-            $ret['once']['input'] = $input;
+            $ret['searchinput'] = $input;
         }
         return succjson($ret);
     }
diff --git a/web/admin/rigger/luser.php b/web/admin/rigger/luser.php
index d742fda..9c03aad 100644
--- a/web/admin/rigger/luser.php
+++ b/web/admin/rigger/luser.php
@@ -27,7 +27,7 @@ class luser {
         $csql->limit($pageno, $pagecount);
         $mainrowcount = $post->getint('count');
         $rows = $db->get($csql, $mainrowcount);
-        $ret = array('where' => $where, 'pageno' => $pageno, 'pagecount' => $pagecount, 'count' => $mainrowcount, 'list' => $rows);
+        $ret = array('searchwhere' => $where, 'pageno' => $pageno, 'pagecount' => $pagecount, 'count' => $mainrowcount, 'list' => $rows);
         if ($post->getbool('field')) {
             $field = array();
             $fshow = $db->getfield($field, 'zc_luser');
@@ -36,7 +36,7 @@ class luser {
         }
 
         if ($post->getbool('once')) {
-            $ret['once'] = array();
+            $ret['once'] = true;
             $input = array();
             $input[] = array(
                 'type' => 'select',
@@ -56,7 +56,7 @@ class luser {
                 'form' => 'model',
                 'name' => '设备指纹',
             );
-            $ret['once']['input'] = $input;
+            $ret['searchinput'] = $input;
         }
         return succjson($ret);
     }
diff --git a/web/admin/rigger/menu.html b/web/admin/rigger/menu.html
index 2e127e9..b312c03 100644
--- a/web/admin/rigger/menu.html
+++ b/web/admin/rigger/menu.html
@@ -135,7 +135,7 @@
 						return '<ciy-switch com="' + key + '" value="' + data[key] + '" y="显示" n="隐藏" />';
 					}
 					if (key == 'url' || key == 'csort' || key == 'pow') {
-						return '<input spellcheck="false" style="width:100%;" onkeydown="btnset(this)" type="text" name="' + key + '" value="' + datashow.replace(/"/g, '&quot;').split('~')[0] + '"/>';
+						return '<input spellcheck="false" style="width:100%;" onkeydown="btnset(this)" type="text" name="' + key + '" value="' + datashow.replace(/"/g, '&quot;').split('~')[0] + '" onmousedown="event.stopPropagation();"/>';
 					}
 					if (key == 'icon') {
 						if (data['upid'] == 1)
@@ -145,28 +145,28 @@
 						if (data['_deep'] > 0)
 							return '';
 						if (data[key] && data[key].substring(0, 4) == '<svg')
-							return '<div class="icon" onclick="seticon(this,' + data['id'] + ')" style="cursor:pointer;">' + data[key] + '</div>';
+							return '<div class="icon" onclick="seticon(this,' + data['id'] + ')" onmousedown="event.stopPropagation();" style="cursor:pointer;">' + data[key] + '</div>';
 						else
-							return '<div class="icon" onclick="seticon(this,' + data['id'] + ')" style="cursor:pointer;">' + Glob.ciysvg + '</div>';
+							return '<div class="icon" onclick="seticon(this,' + data['id'] + ')" onmousedown="event.stopPropagation();" style="cursor:pointer;">' + Glob.ciysvg + '</div>';
 					}
 					if (key == 'demo') {
 						var demo = data["url"].split('~')[1] || "";
-						return '<input spellcheck="false" style="width:100%;" onkeydown="btnset(this)" type="text" name="' + key + '" value="' + demo + '"/>';
+						return '<input spellcheck="false" style="width:100%;" onkeydown="btnset(this)" type="text" name="' + key + '" value="' + demo + '" onmousedown="event.stopPropagation();"/>';
 					}
 					if (key == '_btn') {
-						var html = '<a class="lang btn def upbtn" onclick="menubtn(this, \'edit\')">' + (data['id'] == 0 ? '新增' : '更新') + '</a>';
-						html += '<a class="lang btn" onclick="menubtn(this, \'tz\')">调整</a>';
+						var html = '<a class="lang btn def upbtn" onclick="menubtn(this, \'edit\')" onmousedown="event.stopPropagation();">' + (data['id'] == 0 ? '新增' : '更新') + '</a>';
+						html += '<a class="lang btn" onclick="menubtn(this, \'tz\')" onmousedown="event.stopPropagation();">调整</a>';
 						return html;
 					}
 					if (key == 'name') {
 						var deep = toint(data['_deep']);
 						var html = '　'.repeat(deep);
 						if (data['_count'] > 0) {
-							html += '<span class="ciy-tree-dot">▶</span> <input style="margin-left: 0.3em;width:100%;" onclick="event.stopPropagation();" onkeydown="btnset(this)" type="text" name="' + key + '" value="' + data['name'] + '"/>';
+							html += '<span class="ciy-tree-dot">▶</span> <input style="margin-left: 0.3em;width:100%;" onclick="event.stopPropagation();" onkeydown="btnset(this)" type="text" name="' + key + '" value="' + data['name'] + '" onmousedown="event.stopPropagation();"/>';
 						} else {
 							if (deep > 0)
 								html += '　 ';
-							html += '<input style="width:100%;" onclick="event.stopPropagation();" onkeydown="btnset(this)" type="text" name="' + key + '" value="' + data['name'] + '"/>';
+							html += '<input style="width:100%;" onclick="event.stopPropagation();" onkeydown="btnset(this)" type="text" name="' + key + '" value="' + data['name'] + '" onmousedown="event.stopPropagation();"/>';
 						}
 						return {
 							divprop: (data['_count'] > 0 ? ' data-treeid="' + data['id'] + '"' : '') + ' data-deep="' + data['_deep'] + '" style="display: flex;" class="ciy-tree-spread"'// class="ciy-tree-spread"
@@ -277,7 +277,7 @@
 						continue;
 					menutxt += indent + tdata[i].name + '\n';
 					if (tdata[i].upid === upid)
-						menutxt += deeptxt(tdata, tdata[i].id, indent + '　');
+						menutxt += deeptxt(tdata, tdata[i].id, indent + '--');
 				}
 				return menutxt;
 			}
@@ -303,7 +303,6 @@
 				var postparam = ciyfn.getform(dom, 'TR');
 				postparam.id = id;
 				postparam.upid = table.data[id].upid;
-				postparam.cbid = table.once.cbid;
 				ciyfn.callfunc('update', postparam, function (json) {
 					$5(dom).addClass('def');
 					$5('[name=url]', domtr).val(json.url);
diff --git a/web/admin/rigger/menu.php b/web/admin/rigger/menu.php
index bdfffe4..25da2c1 100644
--- a/web/admin/rigger/menu.php
+++ b/web/admin/rigger/menu.php
@@ -34,15 +34,21 @@ class menu {
             $ret['fshow'] = $fshow;
         }
         if ($post->getbool('once')) {
-            $ret['once'] = array();
+            $ret['once'] = true;
             $input = array();
             $input[] = array(
-                'type' => 'input', 'form' => 'name', 'name' => '名称', 'prop' => ' style="width:8em;"'
+                'type' => 'input',
+                'form' => 'name',
+                'name' => '名称',
+                'prop' => ' style="width:8em;"'
             );
             $input[] = array(
-                'type' => 'input', 'form' => 'url', 'name' => '链接', 'prop' => ' style="width:12em;"'
+                'type' => 'input',
+                'form' => 'url',
+                'name' => '链接',
+                'prop' => ' style="width:12em;"'
             );
-            $ret['once']['input'] = $input;
+            $ret['searchinput'] = $input;
         }
         return succjson($ret);
     }
@@ -197,15 +203,30 @@ class menu {
         $multi = explode("\n", $post->get('multi'));
 
         $cnt = 0;
+        $deepids = array();
+        $deepids[0] = $upid;
+        $lastdeep = 0;
         try {
             $db->begin();
             foreach ($multi as $m) {
-                if (empty(trim($m)))
+                $m = trim($m);
+                if (empty($m))
+                    continue;
+                $deep = 0;
+                while (true) {
+                    if (substr($m, 0, 2) != '--')
+                        break;
+                    $deep++;
+                    $m = trim(substr($m, 2));
+                }
+                if (empty($m))
                     continue;
                 $ms = explode('~', $m);
                 $name = trim($ms[0]);
-                if(empty($name))
+                if (empty($name))
                     continue;
+                if ($lastdeep < $deep)
+                    throw new \Exception('不能跳跃层级:' . $m);
                 $updata = array();
                 $updata['name'] = $name;
                 if (count($ms) > 1)
@@ -213,12 +234,14 @@ class menu {
                 if (count($ms) > 2)
                     $updata['pow'] = trim($ms[2]);
                 $updata['isuse'] = 1;
-                $updata['upid'] = $upid;
+                $updata['upid'] = $deepids[$deep];
                 $updata['csort'] = 10;
                 $csql = new \ciy\sql('zc_menu');
                 if ($db->insert($csql, $updata) === false)
                     throw new \Exception('操作数据库失败.' . $db->error);
                 $updata['id'] = $db->insert_id();
+                $deepids[$deep + 1] = $updata['id'];
+                $lastdeep = $deep + 1;
                 $cnt++;
                 savelogdb($db, $rsuser['id'], 'zc_menu', null, $updata);
             }
diff --git a/web/admin/rigger/mock.php b/web/admin/rigger/mock.php
index 2b2c696..1f7eb7e 100644
--- a/web/admin/rigger/mock.php
+++ b/web/admin/rigger/mock.php
@@ -24,7 +24,7 @@ class mock {
         $mainrowcount = $post->getint('count');
         $rows = $db->get($csql, $mainrowcount);
         $rows[] = array('id' => 0, 'name' => '', 'ufunc' => '', 'mockjson' => '{"code":1}');
-        $ret = array('where' => $where, 'pageno' => $pageno, 'pagecount' => $pagecount, 'count' => $mainrowcount, 'list' => $rows);
+        $ret = array('searchwhere' => $where, 'pageno' => $pageno, 'pagecount' => $pagecount, 'count' => $mainrowcount, 'list' => $rows);
         if ($post->getbool('field')) {
             $field = array();
             $fshow = '';
@@ -37,7 +37,7 @@ class mock {
             $ret['field'] = $field;
         }
         if ($post->getbool('once')) {
-            $ret['once'] = array();
+            $ret['once'] = true;
             $input = array();
             $input[] = array(
                 'type' => 'input', 'form' => 'name', 'name' => '名称', 'prop' => ' style="width:8em;"'
@@ -45,7 +45,7 @@ class mock {
             $input[] = array(
                 'type' => 'input', 'form' => 'ufunc', 'name' => '类.函数', 'prop' => ' style="width:8em;"'
             );
-            $ret['once']['input'] = $input;
+            $ret['searchinput'] = $input;
         }
         return succjson($ret);
     }
diff --git a/web/admin/rigger/online.php b/web/admin/rigger/online.php
index a7693cb..1d2a42b 100644
--- a/web/admin/rigger/online.php
+++ b/web/admin/rigger/online.php
@@ -24,7 +24,7 @@ class online {
         $csql->limit($pageno, $pagecount);
         $mainrowcount = $post->getint('count');
         $rows = $db->get($csql, $mainrowcount);
-        $ret = array('where' => $where, 'pageno' => $pageno, 'pagecount' => $pagecount, 'count' => $mainrowcount, 'list' => $rows);
+        $ret = array('searchwhere' => $where, 'pageno' => $pageno, 'pagecount' => $pagecount, 'count' => $mainrowcount, 'list' => $rows);
         if ($post->getbool('field')) {
             $field = array();
             $fshow = $db->getfield($field, 'zc_online');
@@ -34,7 +34,7 @@ class online {
         }
 
         if ($post->getbool('once')) {
-            $ret['once'] = array();
+            $ret['once'] = true;
             $input = array();
             $input[] = array(
                 'type' => 'daterange',
@@ -53,7 +53,7 @@ class online {
                 'form' => 'ip',
                 'name' => '登录IP'
             );
-            $ret['once']['input'] = $input;
+            $ret['searchinput'] = $input;
         }
         return succjson($ret);
     }
diff --git a/web/admin/rigger/power.php b/web/admin/rigger/power.php
index b1db6eb..03f2b59 100644
--- a/web/admin/rigger/power.php
+++ b/web/admin/rigger/power.php
@@ -25,7 +25,7 @@ class power {
         $mainrowcount = $post->getint('count');
         $rows = $db->get($csql, $mainrowcount);
         $rows[] = array('id' => 0, 'groupname' => '', 'name' => '', 'scope' => '', 'csort' => 10, 'powers' => '');
-        $ret = array('where' => $where, 'pageno' => $pageno, 'pagecount' => $pagecount, 'count' => $mainrowcount, 'list' => $rows);
+        $ret = array('searchwhere' => $where, 'pageno' => $pageno, 'pagecount' => $pagecount, 'count' => $mainrowcount, 'list' => $rows);
         if ($post->getbool('field')) {
             $field = array();
             $fshow = '';
@@ -44,7 +44,7 @@ class power {
             $ret['field'] = $field;
         }
         if ($post->getbool('once')) {
-            $ret['once'] = array();
+            $ret['once'] = true;
             $input = array();
             $input[] = array(
                 'type' => 'input', 'form' => 'groupname', 'name' => '分组名', 'prop' => ' style="width:8em;"'
@@ -55,7 +55,7 @@ class power {
             $input[] = array(
                 'type' => 'input', 'form' => 'scope', 'name' => '模块代码', 'prop' => ' style="width:8em;"'
             );
-            $ret['once']['input'] = $input;
+            $ret['searchinput'] = $input;
         }
         return succjson($ret);
     }
diff --git a/web/admin/rigger/role.php b/web/admin/rigger/role.php
index 2a07181..e3b86ae 100644
--- a/web/admin/rigger/role.php
+++ b/web/admin/rigger/role.php
@@ -23,7 +23,7 @@ class role {
         $csql->limit($pageno, $pagecount);
         $mainrowcount = $post->getint('count');
         $rows = $db->get($csql, $mainrowcount);
-        $ret = array('where' => $where, 'pageno' => $pageno, 'pagecount' => $pagecount, 'count' => $mainrowcount, 'list' => $rows);
+        $ret = array('searchwhere' => $where, 'pageno' => $pageno, 'pagecount' => $pagecount, 'count' => $mainrowcount, 'list' => $rows);
         if ($post->getbool('field')) {
             $field = array();
             $fshow = $db->getfield($field, 'zc_role');
@@ -38,7 +38,7 @@ class role {
         }
 
         if ($post->getbool('once')) {
-            $ret['once'] = array();
+            $ret['once'] = true;
             $input = array();
             $input[] = array(
                 'type' => 'input', 'form' => 'name', 'name' => '角色名称', 'prop' => ' style="width:8em;"'
@@ -46,7 +46,7 @@ class role {
             $input[] = array(
                 'type' => 'input', 'form' => 'memo', 'name' => '角色说明', 'prop' => ' style="width:8em;"'
             );
-            $ret['once']['input'] = $input;
+            $ret['searchinput'] = $input;
         }
         return succjson($ret);
     }
diff --git a/web/admin/rigger/statsfunc.php b/web/admin/rigger/statsfunc.php
index 28407d9..c6ccae3 100644
--- a/web/admin/rigger/statsfunc.php
+++ b/web/admin/rigger/statsfunc.php
@@ -26,7 +26,7 @@ class statsfunc {
         $csql->limit($pageno, $pagecount);
         $mainrowcount = $post->getint('count');
         $rows = $db->get($csql, $mainrowcount);
-        $ret = array('where' => $where, 'pageno' => $pageno, 'pagecount' => $pagecount, 'count' => $mainrowcount, 'list' => $rows);
+        $ret = array('searchwhere' => $where, 'pageno' => $pageno, 'pagecount' => $pagecount, 'count' => $mainrowcount, 'list' => $rows);
         if ($post->getbool('field')) {
             $field = array();
             $fshow = $db->getfield($field, 'zc_stats');
@@ -35,7 +35,7 @@ class statsfunc {
         }
 
         if ($post->getbool('once')) {
-            $ret['once'] = array();
+            $ret['once'] = true;
             $input = array();
             $input[] = array(
                 'type' => 'daterange', 'form' => 'addtimes', 'name' => '记录时间'
@@ -52,7 +52,7 @@ class statsfunc {
             $input[] = array(
                 'type' => 'num', 'form' => 'func_runms', 'name' => '平均用时', 'prop' => ' style="width:4em;"'
             );
-            $ret['once']['input'] = $input;
+            $ret['searchinput'] = $input;
         }
         return succjson($ret);
     }
diff --git a/web/ambap/common.php b/web/ambap/common.php
index b55e2f5..24f0e58 100644
--- a/web/ambap/common.php
+++ b/web/ambap/common.php
@@ -22,6 +22,7 @@ $_token['swapsec'] = 3600; //更换JWT时间
 $_token['expsec'] = 86400; //过期退出时间
 $_token['field'] = 'ciyap';
 $_token['salt'] = 'ast34h$3'; //做数据加解密时的加密因子，每个项目都不要相同。
+$_token['maindomain'] = 'https://ciyon.ciy.cn/ajax/ambap/'; //一般用于api回调
 
 function verifyfast() {
     $rsuser = verifyuser();
diff --git a/web/ambap/demo/demo.php b/web/ambap/demo/demo.php
index dd5f011..0282140 100644
--- a/web/ambap/demo/demo.php
+++ b/web/ambap/demo/demo.php
@@ -51,7 +51,7 @@ class demo {
         $csql->limit($pageno, $pagecount);
         $mainrowcount = $post->getint('count');
         $rows = $db->get($csql, $mainrowcount);
-        $ret = array('where' => $where, 'pageno' => $pageno, 'pagecount' => $pagecount, 'count' => $mainrowcount, 'list' => $rows);
+        $ret = array('searchwhere' => $where, 'pageno' => $pageno, 'pagecount' => $pagecount, 'count' => $mainrowcount, 'list' => $rows);
         if ($post->getbool('field')) {
             $field = array();
             $fshow = $db->getfield($field, 'demo_normal');
@@ -69,7 +69,7 @@ class demo {
         }
 
         if ($post->getbool('once')) {
-            $ret['once'] = array();
+            $ret['once'] = true;
             $input = array();
             $input[] = array(
                 'type' => 'input',
@@ -146,10 +146,10 @@ class demo {
                 'name' => '排序',
                 'select' => $vals
             );
-            $ret['once']['input'] = $input;
+            $ret['searchinput'] = $input;
             $csql = (new \ciy\sql('zc_depart'))->column('id,name,upid');
-            $ret['once']['zc_depart'] = $db->get($csql); //列表数据较少，一次性加载
-            $ret['once']['ppint'] = $db->getdbcodes('demo_normal', 'ppint');
+            $ret['zc_depart'] = $db->get($csql); //列表数据较少，一次性加载
+            $ret['ppint'] = $db->getdbcodes('demo_normal', 'ppint');
         }
         $ret['xa_user'] = getrelation($db, $rows, 'xa_user', 'audituser'); //列表数据较多，按需加载
         $ret['zc_menu'] = getrelation($db, $rows, 'zc_menu', 'menuid'); //列表数据较多，按需加载
@@ -205,9 +205,8 @@ class demo {
         $imgs = $post->get('imgs');
         $ton = $post->getint('ton');
         $price = $post->getint('price');
-        $lat = $post->getfloat('lat');
-        $lng = $post->getfloat('lng');
-        $nums = $post->getfloat('nums');
+        $lat = $post->getint('lat');
+        $lng = $post->getint('lng');
         $pct = $post->getint('pct');
         $url = $post->get('url');
         $weightg = $post->getint('weightg');
@@ -262,7 +261,6 @@ class demo {
             $updata['price'] = $price;
             $updata['lat'] = $lat;
             $updata['lng'] = $lng;
-            $updata['nums'] = $nums;
             $updata['pct'] = $pct;
             $updata['url'] = $url;
             $updata['weightg'] = $weightg;
@@ -399,7 +397,6 @@ class demo {
         $fields[] = array('style' => 'r', 'width' => 100, 'field' => 'price', 'name' => '单价');
         $fields[] = array('style' => 'l', 'width' => 100, 'field' => 'lat', 'name' => '纬度');
         $fields[] = array('style' => 'c', 'width' => 100, 'field' => 'lng', 'name' => '位置');
-        $fields[] = array('style' => 'r', 'width' => 100, 'field' => 'nums', 'name' => '监管数量');
         $fields[] = array('style' => 'l', 'width' => 100, 'field' => 'url', 'name' => '链接');
         $fields[] = array('style' => 'l', 'width' => 100, 'field' => 'idcard', 'name' => '身份证号');
         $fields[] = array('style' => 'r', 'width' => 100, 'field' => 'weightg', 'name' => '体重');
@@ -558,7 +555,6 @@ class demo {
         $headsn[] = '单价.price';
         $headsn[] = '纬度.lat';
         $headsn[] = '位置.lng';
-        $headsn[] = '监管数量.nums';
         $headsn[] = '链接.url';
         $headsn[] = '身份证号.idcard';
         $headsn[] = '体重.weightg';
@@ -1003,7 +999,6 @@ class demo {
                 $price = $post->get('price_' . $i);
                 $lat = $post->get('lat_' . $i);
                 $lng = $post->get('lng_' . $i);
-                $nums = $post->get('nums_' . $i);
                 $url = $post->get('url_' . $i);
                 $idcard = $post->get('idcard_' . $i);
                 $weightg = $post->get('weightg_' . $i);
@@ -1040,7 +1035,6 @@ class demo {
                 $updata['price'] = $price;
                 $updata['lat'] = $lat;
                 $updata['lng'] = $lng;
-                $updata['nums'] = $nums;
                 $updata['url'] = $url;
                 $updata['idcard'] = $idcard;
                 $updata['weightg'] = $weightg;
diff --git a/web/ambap/login.php b/web/ambap/login.php
index 6493c4f..44d0005 100644
--- a/web/ambap/login.php
+++ b/web/ambap/login.php
@@ -44,7 +44,7 @@ class login {
         }
         $authtime = $post->getint('auth');
         if (abs($authtime / 1000 - tostamp()) > 300)
-            return errjson('您的本地时间与服务器时间相差超过5分钟，请调整本机时间。<br/>服务器时间: ' . date('Y-m-d H:i:s') . '<br/>您本机时间: ' . date('Y-m-d H:i:s', $authtime / 1000));
+            return errjson('您的本地时间与服务器时间相差超过5分钟，请调整本机时间。<br/>服务器时间: ' . date('Y-m-d H:i:s') . '<br/>您本机时间: ' . date('Y-m-d H:i:s', (int)($authtime / 1000)));
         // if($user == '1')
         //     clog(md5('1' . $_token['salt'])); //开发生成默认密码
         if ($post->get('pass') != md5($rsuser['password'] . $authtime)) {
@@ -361,12 +361,19 @@ class login {
         $ret['me']['mobile'] = $userrow['mobile'];
         $ret['me']['name'] = $userrow['name'];
         $ret['me']['userlevel'] = $userrow['userlevel'];
-        $ret['me']['myinvmoney'] = $userrow['myinvmoney'];
+        $ret['me']['mymoney'] = $userrow['mymoney'];
         $ret['me']['mycashmoney'] = $userrow['mycashmoney'];
+        $ret['me']['myinvmoney'] = $userrow['myinvmoney'];
         $ret['me']['mybondmoney'] = $userrow['mybondmoney'];
         $ret['me']['mypnt'] = $userrow['mypnt'];
         $ret['me']['certs'] = $userrow['certs'];
         $ret['me']['needpass'] = empty($userrow['password']);
+        $csql = new \ciy\sql('zc_debug_user');
+        $csql->where('targettype', 21);
+        $csql->where('isuse', 1);
+        $csql->where('user', $userrow['mobile']);
+        $ret['me']['dbg'] = is_array($db->getone($csql));
+
         $csql = new \ciy\sql('ap_usr_ext');
         $csql->where('id', $userrow['id']);
         $extrow = $db->getone($csql);
@@ -375,11 +382,12 @@ class login {
             $ret['me']['email'] = $extrow['email'];
             $ret['me']['wxno'] = $extrow['wxno'];
             $ret['me']['idid'] = $extrow['idid'];
-            $ret['me']['cciy'] = $extrow['cciy'];
+            $ret['me']['cciy'] = $extrow['cciy'] . '';
             $ret['me']['cashtype'] = $extrow['cashtype'];
             $ret['me']['bankno'] = $extrow['bankno'];
             $ret['me']['bankname'] = $extrow['bankname'];
             $ret['me']['bankaccount'] = $extrow['bankaccount'];
+            $ret['me']['bankcode'] = $extrow['bankcode'];
         } else {
             $ret['me']['truename'] = '';
         }
@@ -393,7 +401,7 @@ class login {
         }
         return succjson();
     }
-    public static function json_debug() {
+    public static function json_debug_list() {
         global $db;
         $csql = new \ciy\sql('zc_debug_user');
         $csql->where('targettype', 21);
@@ -401,6 +409,38 @@ class login {
         $ret['list'] = $db->get($csql);
         return succjson($ret);
     }
+    public static function json_debug_chguser() {
+        global $db;
+        global $_token;
+        $post = new \ciy\post();
+        $usercode = $post->getint('code');
+        $csql = new \ciy\sql('zc_debug_user');
+        $csql->where('id', $usercode);
+        $dbguser = $db->getone($csql);
+        if ($dbguser === false)
+            return errjson($db->error);
+        if (!is_array($dbguser))
+            return errjson('用户code不存在');
+        $csql = new \ciy\sql('ap_user');
+        $csql->where('mobile', $dbguser['user']);
+        $rsuser = $db->getone($csql);
+        if (!is_array($rsuser))
+            return errjson('用户不存在');
+        $sid = randstr(10);
+        $exp = tostamp() + $_token['swapsec'];
+        $id = $rsuser['id'];
+        $updata = array();
+        $updata['logintimes'] = tostamp();
+        $updata['trytime'] = 0;
+        $updata['sid'] = $sid;
+        $updata['exptimes'] = $exp;
+        $updata['ip'] = getip();
+        $csql = new \ciy\sql('ap_user');
+        $csql->where('id', $id);
+        if ($db->update($csql, $updata) === false)
+            return errjson('user数据库更新失败:' . $db->error);
+        return self::getsync($rsuser, $sid);
+    }
     private static function saveluser($db, $isinout, $userid, $model = '') {
         $updata = array();
         $updata['isinout'] = $isinout;
diff --git a/web/ambap/index.php b/web/ambap/main.php
similarity index 66%
rename from web/ambap/index.php
rename to web/ambap/main.php
index c936cba..dff1b05 100644
--- a/web/ambap/index.php
+++ b/web/ambap/main.php
@@ -2,69 +2,77 @@
 
 namespace web\ambap;
 
-class index {
-    public static function json_init() {
+class main {
+
+
+
+
+
+    public static function json_pnt_up() {
         global $db;
+        $rsuser = verifyfast();
         $post = new \ciy\post();
-        $ret['once'] = array();
-        $csql = new \ciy\sql('ap_banner');
-        $csql->where('groupcode', 'index');
-        $row = $db->get($csql);
-        $ret['once']['banner'] = $row;
-        $csql = new \ciy\sql('demo_normal');
-        $csql->order('id desc');
-        $csql->limit(1, 8);
-        $rows = $db->get($csql);
-        $ret['demos'] = $rows;
-        $ret['zc_menu'] = getrelation($db, $rows, 'zc_menu', 'menuid', 'id,name');
-        $ret['sharename'] = '分享主标题，千人千面';
+        $id = $post->getint('id');
+        $csql = new \ciy\sql('ap_pnt_track');
+        $csql->where('id', $id);
+        $trackrow = $db->getone($csql);
+        if (!is_array($trackrow))
+            return errjson('埋点不存在' . $id);
+        $point = $trackrow['point'];
+        $updata = array();
+        $updata['vuser'] = $rsuser['id'];
+        $updata['fromid'] = $id;
+        $updata['name'] = $trackrow['name'];
+        $updata['pnt'] = $point;
+        $updata['addtimes'] = tostamp();
+        $csql = new \ciy\sql('ap_pnt_record');
+        $db->insert($csql, $updata);
+        $db->execute('update ap_user set mypnt=mypnt+' . $point . ' where id=' . $rsuser['id']);
+        $msg = '';
+        if ($id == 1)
+            $msg = '已签到 +' . $point . ' 积分';
+        $ret['msg'] = $msg;
         return succjson($ret);
     }
-    public static function json_paper() {
+    public static function json_signpath() {
+        $rsuser = verifyfast();
+        $post = new \ciy\post();
+        $path = $post->get('path'); //'/pages/main/index';
+        $ret['sign'] = hash_hmac('sha256', $path, $rsuser['wxminakey'], false);
+        $ret['path'] = $path;
+        return succjson($ret);
+    }
+    public static function json_part_vent() {
+        global $db;
+        $rsuser = verifyfast();
+        $post = new \ciy\post();
+        $id = $post->getint('id');
+        $sectionid = $post->getint('sectionid');
+        $content = $post->get('content');
+        $updata = array();
+        $updata['artid'] = $id;
+        $updata['sectionid'] = $sectionid;
+        $updata['content'] = $content;
+        $updata['pubtimes'] = time();
+        $updata['audituser'] = 0;
+        $updata['vuser'] = $rsuser['id'];
+        $csql = new \ciy\sql('ap_art_vent');
+        $db->insert($csql, $updata);
+        return succjson();
+    }
+    public static function json_part_hot() {
         global $db;
         $post = new \ciy\post();
         $id = $post->getint('id');
-        $csql = new \ciy\sql('ap_paper');
-        $csql->where('id', $id);
-        $artrow = $db->getone($csql);
-        if (!is_array($artrow))
-            return errjson('文章不存在' . $id);
-        $ret = array('data' => $artrow);
+        $sec = $post->getint('sec');
         $updata = array();
-        $updata['readcnt'] = array('readcnt+1');
-        $csql = new \ciy\sql('ap_paper');
+        $updata['studycnt'] = array('studycnt+1');
+        $csql = new \ciy\sql('ap_art_post');
         $csql->where('id', $id);
         $db->update($csql, $updata);
-        return succjson($ret);
+        return succjson();
     }
-    public static function json_section_get() {
-        global $db;
-        $post = new \ciy\post();
-        $sectionid = $post->getint('id');
-        $csql = new \ciy\sql('ap_art_section');
-        $csql->where('id', $sectionid);
-        $sectionrow = $db->getone($csql);
-        if (!is_array($sectionrow))
-            return errjson('板块不存在' . $sectionid);
-        $query = $post->get('query');
-        $csql = new \ciy\sql('ap_art_post');
-        $csql->where('sectionid', $sectionid);
-        $csql->where('artstatus', 100);
-        $csql->where('name like', objstr($query, 'key'));
-        $csql->column('id,name,img,descs');
-        $csql->order('artsort desc, id desc');
-        $pageno = $post->getint('pageno', 1);
-        $pagecount = $post->getint('pagecount', 10);
-        $csql->limit($pageno, $pagecount);
-        $rows = $db->get($csql);
-        $ret = array('pageno' => $pageno, 'pagecount' => $pagecount, 'list' => $rows);
-        if ($post->getbool('once')) {
-            $ret['once'] = array();
-            $ret['once']['section'] = $sectionrow;
-        }
-        return succjson($ret);
-    }
-    public static function json_art_read() {
+    public static function json_part_init() {
         global $db;
         $post = new \ciy\post();
         $id = $post->getint('id');
@@ -88,34 +96,92 @@ class index {
         $db->update($csql, $updata);
         return succjson($ret);
     }
-    public static function json_art_hot() {
+    public static function json_psection_list() {
         global $db;
         $post = new \ciy\post();
-        $id = $post->getint('id');
-        $sec = $post->getint('sec');
-        $updata = array();
-        $updata['studycnt'] = array('studycnt+1');
+        $sectionid = $post->getint('id');
+        $csql = new \ciy\sql('ap_art_section');
+        $csql->where('id', $sectionid);
+        $sectionrow = $db->getone($csql);
+        if (!is_array($sectionrow))
+            return errjson('板块不存在' . $sectionid);
+        $query = $post->get('query');
         $csql = new \ciy\sql('ap_art_post');
+        $csql->where('sectionid', $sectionid);
+        $csql->where('artstatus', 100);
+        $csql->where('name like', objstr($query, 'key'));
+        $csql->column('id,name,img,descs');
+        $csql->order('artsort desc, id desc');
+        $pageno = $post->getint('pageno', 1);
+        $pagecount = $post->getint('pagecount', 10);
+        $csql->limit($pageno, $pagecount);
+        $rows = $db->get($csql);
+        $ret = array('pageno' => $pageno, 'pagecount' => $pagecount, 'list' => $rows);
+        if ($post->getbool('once')) {
+            $ret['once'] = true;
+            $ret['section'] = $sectionrow;
+        }
+        return succjson($ret);
+    }
+    public static function json_paper_get() {
+        global $db;
+        $post = new \ciy\post();
+        $db->trace($post->get('_pf'));
+        $id = $post->getint('id');
+        $csql = new \ciy\sql('ap_paper');
+        $csql->where('id', $id);
+        $artrow = $db->getone($csql);
+        if (!is_array($artrow))
+            return errjson('文章不存在' . $id);
+        $ret = array('data' => $artrow);
+        $updata = array();
+        $updata['readcnt'] = array('readcnt+1');
+        $csql = new \ciy\sql('ap_paper');
         $csql->where('id', $id);
         $db->update($csql, $updata);
-        return succjson();
+        return succjson($ret);
     }
-    public static function json_art_vent() {
+    public static function json_index_init() {
         global $db;
-        $rsuser = verifyfast();
         $post = new \ciy\post();
-        $id = $post->getint('id');
-        $sectionid = $post->getint('sectionid');
-        $content = $post->get('content');
-        $updata = array();
-        $updata['artid'] = $id;
-        $updata['sectionid'] = $sectionid;
-        $updata['content'] = $content;
-        $updata['pubtimes'] = time();
-        $updata['audituser'] = 0;
-        $updata['vuser'] = $rsuser['id'];
-        $csql = new \ciy\sql('ap_art_vent');
-        $db->insert($csql, $updata);
-        return succjson();
+        $csql = new \ciy\sql('ap_banner');
+        $csql->where('groupcode', 'index');
+        $row = $db->get($csql);
+        $ret['banner'] = $row;
+        $csql = new \ciy\sql('demo_normal');
+        $csql->order('id desc');
+        $csql->limit(1, 8);
+        $rows = $db->get($csql);
+        $ret['demos'] = $rows;
+        $ret['zc_menu'] = getrelation($db, $rows, 'zc_menu', 'menuid', 'id,name');
+        $ret['sharename'] = '分享主标题，千人千面';
+        return succjson($ret);
     }
+    public static function json_me_init() {
+        global $db;
+        $csql = new \ciy\sql('ap_usr_buy_bundle');
+        $ret['userbuys'] = $db->get($csql);
+        $ret['recommend'] = 2;
+        return succjson($ret);
+    }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    
 }
\ No newline at end of file
diff --git a/web/ambap/me.php b/web/ambap/me.php
index 2693345..6f067d8 100644
--- a/web/ambap/me.php
+++ b/web/ambap/me.php
@@ -3,24 +3,565 @@
 namespace web\ambap;
 
 class me {
-    
-    public static function json_signpath() {
-        $rsuser = verifyfast();
-        $post = new \ciy\post();
-        $path = $post->get('path');//'/pages/main/index';
-        $ret['sign'] = hash_hmac('sha256', $path, $rsuser['wxminakey'], false);
-        $ret['path'] = $path;
-        return succjson($ret);
-    }
-    public static function json_invoicetitle_get() {
+
+    public static function json_user_bank_change() {
         global $db;
         $rsuser = verifyfast();
-        $csql = new \ciy\sql('ap_usr_invoicetitle');
+        $post = new \ciy\post();
+        $bankno = $post->get('bankno');
+        $bankname = $post->get('bankname');
+        $bankaccount = $post->get('bankaccount');
+        $bankcode = $post->get('bankcode');
+        $updata = array();
+        $updata['bankno'] = $bankno;
+        $updata['bankname'] = $bankname;
+        $updata['bankaccount'] = $bankaccount;
+        $updata['bankcode'] = $bankcode;
+        $csql = new \ciy\sql('ap_usr_ext');
+        $csql->where('id', $rsuser['id']);
+        $extrow = $db->getone($csql);
+        if (is_array($extrow)) {
+            if ($db->update($csql, $updata) === false)
+                return errjson('ext更新失败:' . $db->error);
+        } else {
+            $updata['id'] = $rsuser['id'];
+            if ($db->insert($csql, $updata) === false)
+                return errjson('ext新增失败:' . $db->error);
+        }
+        return succjson();
+    }
+    public static function json_cashout_lst_list() {
+        global $db;
+        $rsuser = verifyfast();
+        $post = new \ciy\post();
+        $query = $post->get('query');
+        $csql = new \ciy\sql('ap_cash_out');
+        $csql->where('vuser', $rsuser['id']);
+        $liid = $post->getint('liid');
+        if ($liid > 0)
+            $csql->where('cashstatus', $liid);
+        $csql->order(objstr($query, 'order', 'id desc'));
+        $pageno = $post->getint('pageno', 1);
+        $pagecount = $post->getint('pagecount', 10);
+        $csql->limit($pageno, $pagecount);
+        $rows = $db->get($csql);
+        $ret = array('pageno' => $pageno, 'pagecount' => $pagecount, 'list' => $rows);
+        return succjson($ret);
+    }
+    public static function json_cashout_cash_inv() {
+        global $db;
+        $rsuser = verifyfast();
+        $post = new \ciy\post();
+        $id = $post->getint('id');
+        $invcode = $post->get('invcode');
+        $invfile = $post->get('invfile');
+        if (empty($invcode))
+            return errjson('请填写发票编号');
+        if (empty($invfile))
+            return errjson('请上传发票');
+        $csql = new \ciy\sql('ap_cash_out');
+        $csql->where('vuser', $rsuser['id']);
+        $csql->where('id', $id);
+        $cashoutrow = $db->getone($csql);
+        if (!is_array($cashoutrow))
+            return errjson('提现不存在');
+        if ($cashoutrow['cashstatus'] != 20)
+            return errjson('提现不是已通过状态');
+        try {
+            $db->begin();
+            $updata = array();
+            $updata['cashstatus'] = 30;
+            $updata['invcode'] = $invcode;
+            $updata['invfile'] = $invfile;
+            $updata['cashtimes'] = tostamp();
+            $csql = new \ciy\sql('ap_cash_out');
+            $csql->where('id', $id);
+            if ($db->update($csql, $updata) === false)
+                throw new \Exception('更新失败:' . $db->error);
+            $updata['id'] = $id;
+            $db->commit();
+        } catch (\Exception $ex) {
+            $db->rollback();
+            return errjson($ex->getMessage());
+        }
+        $ret['data'] = $updata;
+        return succjson($ret);
+    }
+    public static function json_cashout_cash_wxrecvpay() {
+        global $db;
+        global $_token;
+        $rsuser = verifyfast();
+        $post = new \ciy\post();
+        $id = $post->getint('id');
+        $csql = new \ciy\sql('ap_cash_out');
+        $csql->where('id', $id);
+        $cashrow = $db->getone($csql);
+        if (!is_array($cashrow))
+            return errjson('提现不存在');
+        if ($cashrow['cashstatus'] == 21) {
+            if ($cashrow['cashtimes'] > tostamp() - 86400)
+                return errjson('提现打款进程被打断。24小时后重新操作，请务必点击收款');
+        } else if ($cashrow['cashstatus'] != 20)
+            return errjson('提现不是已通过状态');
+        if ($cashrow['vuser'] != $rsuser['id'])
+            return errjson('提现用户不匹配');
+        $updata = array();
+        $updata['cashstatus'] = 21;
+        $updata['cashtimes'] = tostamp();
+        $csql = new \ciy\sql('ap_cash_out');
+        $csql->where('id', $id);
+        if ($db->update($csql, $updata) === false)
+            return errjson('更新失败');
+
+        $cashmoney = $cashrow['cashmoney'];
+        if ($cashrow['taxmoney'] > 0)
+            $cashmoney -= $cashrow['taxmoney'];
+        $param = array();
+        $param['out_bill_no'] = 'TB' . date('ymd') . '8' . $id;
+        $param['transfer_scene_id'] = '1005';
+        $param['openid'] = $rsuser['wxminaid'];
+        $param['notify_url'] = $_token['maindomain'] . 'wxpay.transfer';
+        $param['transfer_remark'] = '佣金奖励';
+        $param['transfer_amount'] = $cashmoney;
+        $param['transfer_scene_report_infos'] = array();
+        $param['transfer_scene_report_infos'][] = array('info_type' => '岗位类型', 'info_content' => '采集员');
+        $param['transfer_scene_report_infos'][] = array('info_type' => '报酬说明', 'info_content' => '用户主动申请提现');
+
+        $wxcfg = gettoken($db, 1);
+        $wxpay = new \ciy\wxfunc($wxcfg);
+        $rettransfer = $wxpay->transfer($param);
+        if (is_string($rettransfer))
+            return errjson($rettransfer);
+        $rettransfer['mchid'] = $wxpay->mchid;
+        $rettransfer['appid'] = $wxpay->appid;
+        $ret['transfer'] = $rettransfer;
+        return succjson($ret);
+    }
+    private static function caltax($money) {
+        if ($money <= 80000)
+            return 0;
+        if ($money <= 400000)
+            $taxable_income = $money - 80000;
+        else
+            $taxable_income = $money * 0.8;
+        if ($taxable_income <= 2000000)
+            return toint($taxable_income * 0.2);
+        else if ($taxable_income <= 5000000)
+            return toint($taxable_income * 0.3 - 200000);
+        else
+            return toint($taxable_income * 0.4 - 700000);
+    }
+    public static function json_cashout_cash_submit() {
+        global $db;
+        $rsuser = verifyfast();
+        $post = new \ciy\post();
+        $cashtype = $post->getint('cashtype');
+        $cash = $post->getint('cash');
+        if ($rsuser['mycashmoney'] < $cash)
+            return errjson('余额不足');
+        $csql = new \ciy\sql('ap_cash_out');
+        $csql->where('vuser', $rsuser['id']);
+        $csql->where('cashstatus<90');
+        $chkrow = $db->getone($csql);
+        if (is_array($chkrow))
+            return errjson('有未处理提现');
+        $taxperson = true;
+        if ($cashtype == 1) {
+            $csql = new \ciy\sql('ap_usr_ext');
+            $csql->where('id', $rsuser['id']);
+            $extrow = $db->getone($csql);
+            if (!is_array($extrow))
+                return errjson('用户信息不存在');
+            if (empty($extrow['truename']))
+                return errjson('请先完善个人信息');
+            if ($extrow['truename'] != $extrow['bankaccount'])
+                $taxperson = false;
+        }
+        $taxmoney = -1;
+        if ($taxperson) {
+            $monthstart = strtotime(date('Y-m-01'));
+            $csql = new \ciy\sql('ap_cash_out');
+            $csql->where('vuser', $rsuser['id']);
+            $csql->where('cashstatus=100');
+            $csql->where('addtimes>=', $monthstart);
+            $cashoutrows = $db->get($csql);
+            $totalcash = 0;
+            $totaltax = 0;
+            foreach ($cashoutrows as $cashoutrow) {
+                $totalcash += $cashoutrow['cashmoney'];
+                $totaltax += $cashoutrow['taxmoney'];
+            }
+            $taxmoney = self::caltax($totalcash + $cash) - $totaltax;
+        }
+        try {
+            $db->begin();
+            $updata = array();
+            $updata['mycashmoney'] = array('mycashmoney-' . $cash);
+            $csql = new \ciy\sql('ap_user');
+            $csql->where('id', $rsuser['id']);
+            if ($db->update($csql, $updata) === false)
+                throw new \Exception('更新账户失败:' . $db->error);
+            $updata = array();
+            $updata['cashstatus'] = 10;
+            $updata['cashmoney'] = $cash;
+            $updata['taxmoney'] = $taxmoney;
+            $updata['cashtype'] = $cashtype;
+            $updata['vuser'] = $rsuser['id'];
+            $updata['addtimes'] = tostamp();
+            if ($cashtype == 1) {
+                $updata['bankaccount'] = $extrow['bankaccount'];
+                $updata['bankno'] = $extrow['bankno'];
+                $updata['bankname'] = $extrow['bankname'];
+                $updata['bankcode'] = $extrow['bankcode'];
+            }
+            $csql = new \ciy\sql('ap_cash_out');
+            if ($db->insert($csql, $updata) === false)
+                throw new \Exception('创建失败:' . $db->error);
+            $db->commit();
+        } catch (\Exception $ex) {
+            $db->rollback();
+            return errjson($ex->getMessage());
+        }
+        return succjson();
+    }
+    public static function json_cashout_cash_init() {
+        global $db;
+        $rsuser = verifyfast();
+        $csql = new \ciy\sql('ap_user');
+        $csql->where('id', $rsuser['id']);
+        $csql->column('myinvmoney,mycashmoney,mybondmoney');
+        $ret['user'] = $db->getone($csql);
+        $csql = new \ciy\sql('ap_cash_out');
+        $csql->where('vuser', $rsuser['id']);
+        $csql->where('cashstatus<90');
+        $ret['cashs'] = $db->get($csql);
+        $ret['tip'] = '[MD]
+每天可提交1次，以元为单位申请。
+非对公提现，平台代扣缴劳务个税。
+多次提现以本月1日开始累计计算个税。
+由于微信支付限制，申请提现平台审核通过后，需手动点击收款操作。
+';
+        return succjson($ret);
+    }
+    public static function json_user_info_change() {
+        global $db;
+        $rsuser = verifyfast();
+        $post = new \ciy\post();
+        $name = $post->get('name');
+        $icon = $post->get('icon');
+        $mobile = $post->get('mobile');
+        $wxno = $post->get('wxno');
+        $email = $post->get('email');
+        if (empty($name))
+            return errjson('姓名不能为空');
+        if (!ismobile($mobile))
+            return errjson('手机号码格式不正确');
+        if (empty($email)) {
+            if (ismail($email))
+                return errjson('邮箱格式不正确');
+        }
+        $updata = array();
+        $updata['name'] = $name;
+        $updata['icon'] = $icon;
+        $updata['mobile'] = $mobile;
+        $csql = new \ciy\sql('ap_user');
+        $csql->where('id', $rsuser['id']);
+        if ($db->update($csql, $updata) === false)
+            return errjson('更新失败:' . $db->error);
+        $updata = array();
+        $updata['wxno'] = $wxno;
+        $updata['email'] = $email;
+        $csql = new \ciy\sql('ap_usr_ext');
+        $csql->where('id', $rsuser['id']);
+        $extrow = $db->getone($csql);
+        if (is_array($extrow)) {
+            if ($db->update($csql, $updata) === false)
+                return errjson('ext更新失败:' . $db->error);
+        } else {
+            $updata['id'] = $rsuser['id'];
+            if ($db->insert($csql, $updata) === false)
+                return errjson('ext新增失败:' . $db->error);
+        }
+        return succjson();
+    }
+    public static function json_cashie_lst_list() {
+        global $db;
+        $rsuser = verifyfast();
+        $post = new \ciy\post();
+        $query = $post->get('query');
+        $csql = new \ciy\sql('ap_cash_ie');
+        $csql->where('vuser', $rsuser['id']);
+        $liid = $post->getint('liid');
+        if ($liid == 1)
+            $csql->where('iemoney>0');
+        if ($liid == 2)
+            $csql->where('iemoney<0');
+        $csql->order(objstr($query, 'order', 'id desc'));
+        $pageno = $post->getint('pageno', 1);
+        $pagecount = $post->getint('pagecount', 10);
+        $csql->limit($pageno, $pagecount);
+        $rows = $db->get($csql);
+        $ret = array('pageno' => $pageno, 'pagecount' => $pagecount, 'list' => $rows);
+        return succjson($ret);
+    }
+    public static function json_cashin_lst_list() {
+        global $db;
+        $rsuser = verifyfast();
+        $post = new \ciy\post();
+        $query = $post->get('query');
+        $csql = new \ciy\sql('ap_cash_in');
+        $csql->where('paytimes>0');
+        $csql->where('vuser', $rsuser['id']);
+        $csql->order(objstr($query, 'order', 'id desc'));
+        $pageno = $post->getint('pageno', 1);
+        $pagecount = $post->getint('pagecount', 10);
+        $csql->limit($pageno, $pagecount);
+        $rows = $db->get($csql);
+        $ret = array('pageno' => $pageno, 'pagecount' => $pagecount, 'list' => $rows);
+        return succjson($ret);
+    }
+    public static function json_cash_charge_chk() {
+        global $db;
+        $rsuser = verifyfast();
+        $post = new \ciy\post();
+        $id = $post->getint('orderid');
+        for ($i = 0; $i < 10; $i++) {
+            $csql = new \ciy\sql('ap_cash_in');
+            $csql->where('id', $id);
+            $buyrow = $db->getone($csql);
+            if (!is_array($buyrow))
+                return errjson('订单不存在');
+            if ($buyrow['paytimes'] > 0)
+                return succjson();
+            sleep(1);
+        }
+        return errjson('充值不成功,请联系客服');
+    }
+    public static function json_cash_charge_pay() {
+        global $db;
+        global $_token;
+        $rsuser = verifyfast();
+        $post = new \ciy\post();
+        $money = $post->getint('money');
+        $updata = array();
+        $updata['name'] = '';
+        $updata['inmoney'] = $money;
+        $updata['vuser'] = $rsuser['id'];
+        $updata['addtimes'] = tostamp();
+        $updata['paytimes'] = 0;
+        $csql = new \ciy\sql('ap_cash_in');
+        if ($db->insert($csql, $updata) === false)
+            return errjson('订单创建失败:' . $db->error);
+        $orderid = $db->insert_id();
+        $param = array();
+        $param['description'] = '充值';
+        $param['out_trade_no'] = 'IN' . date('ymd') . '2' . $orderid;
+        $param['notify_url'] = $_token['maindomain'] . 'wxpay.charge';
+        $param['amount'] = array();
+        $param['amount']['total'] = (int)$money;
+        $param['payer'] = array();
+        $param['payer']['openid'] = $rsuser['wxminaid'];
+        $wxcfg = gettoken($db, 1);
+        $wxpay = new \ciy\wxfunc($wxcfg);
+        $retpay = $wxpay->pay($param);
+        if (is_string($retpay))
+            return errjson($retpay);
+        $retpay['orderid'] = $orderid;
+        return succjson($retpay);
+    }
+    public static function json_cash_charge_init() {
+        global $db;
+        $csql = new \ciy\sql('ap_cash_bundle');
+        $ret['charges'] = $db->get($csql);
+        return succjson($ret);
+    }
+    public static function json_pnt_buylst_list() {
+        global $db;
+        $rsuser = verifyfast();
+        $post = new \ciy\post();
+        $query = $post->get('query');
+        $csql = new \ciy\sql('ap_pnt_buy');
+        $csql->where('vuser', $rsuser['id']);
+        $csql->where('paytimes>0');
+        $csql->order(objstr($query, 'order', 'id desc'));
+        $pageno = $post->getint('pageno', 1);
+        $pagecount = $post->getint('pagecount', 10);
+        $csql->limit($pageno, $pagecount);
+        $rows = $db->get($csql);
+        $ret = array('pageno' => $pageno, 'pagecount' => $pagecount, 'list' => $rows);
+        return succjson($ret);
+    }
+    public static function json_pnt_buynow_chk() {
+        global $db;
+        $rsuser = verifyfast();
+        $post = new \ciy\post();
+        $id = $post->getint('orderid');
+        for ($i = 0; $i < 10; $i++) {
+            $csql = new \ciy\sql('ap_pnt_buy');
+            $csql->where('id', $id);
+            $buyrow = $db->getone($csql);
+            if (!is_array($buyrow))
+                return errjson('订单不存在');
+            if ($buyrow['paytimes'] > 0)
+                return succjson();
+            sleep(1);
+        }
+        return errjson('支付不成功,请联系客服');
+    }
+
+    public static function json_pnt_buynow_pay() {
+        global $db;
+        global $_token;
+        $rsuser = verifyfast();
+        //建立订单，支付
+        $post = new \ciy\post();
+        $id = $post->getint('id');
+        $csql = new \ciy\sql('ap_pnt_bundle');
+        $csql->where('id', $id);
+        $bundlerow = $db->getone($csql);
+        if (!is_array($bundlerow))
+            return errjson('购买项目不存在');
+        $payprice = $bundlerow['buymoney'];
+        $updata = array();
+        $updata['pnt'] = $bundlerow['buypnt'];
+        $updata['buypntmoney'] = $payprice;
+        $updata['vuser'] = $rsuser['id'];
+        $updata['addtimes'] = tostamp();
+
+        $csql = new \ciy\sql('ap_pnt_buy');
+        if ($db->insert($csql, $updata) === false)
+            return errjson('订单创建失败:' . $db->error);
+        $orderid = $db->insert_id();
+        $param = array();
+        $param['description'] = '购买金币';
+        $param['out_trade_no'] = 'PT' . date('ymd') . '9' . $orderid;
+        $param['notify_url'] = $_token['maindomain'] . 'wxpay.pay_pnt';
+        $param['amount'] = array();
+        $param['amount']['total'] = (int)$payprice;
+        $param['payer'] = array();
+        $param['payer']['openid'] = $rsuser['wxminaid'];
+        $wxcfg = gettoken($db, 1);
+        $wxpay = new \ciy\wxfunc($wxcfg);
+        $retpay = $wxpay->pay($param);
+        if (is_string($retpay))
+            return errjson($retpay);
+        $retpay['orderid'] = $orderid;
+        return succjson($retpay);
+    }
+    public static function json_pnt_buynow_init() {
+        global $db;
+        $csql = new \ciy\sql('ap_pnt_bundle');
+        $ret['buys'] = $db->get($csql);
+        return succjson($ret);
+    }
+    public static function json_pnt_lst_list() {
+        global $db;
+        $rsuser = verifyfast();
+        $post = new \ciy\post();
+        $query = $post->get('query');
+        $csql = new \ciy\sql('ap_pnt_record');
+        $csql->where('vuser', $rsuser['id']);
+        $csql->order(objstr($query, 'order', 'id desc'));
+        $pageno = $post->getint('pageno', 1);
+        $pagecount = $post->getint('pagecount', 10);
+        $csql->limit($pageno, $pagecount);
+        $rows = $db->get($csql);
+        $ret = array('pageno' => $pageno, 'pagecount' => $pagecount, 'list' => $rows);
+        return succjson($ret);
+    }
+    public static function json_safe_ccub_init() {
+        global $db;
+        $rsuser = verifyfast();
+        $csql = new \ciy\sql('dao_ccub_apply');
         $csql->where('vuser', $rsuser['id']);
         $csql->order('id desc');
-        $ret['list'] = $db->get($csql);
+        $ret['data'] = $db->getone($csql);
+        if (is_array($ret['data']))
+            $ret['data']['cciy'] = $ret['data']['cciy'] . '';
+        $ret['tip'] = '[MD]
+打造一人一码的唯一标识。
+申请标识后可参与众产投票。
+#主体国籍
+#多国身份
+在非主体国拥有居留、永居、入籍等身份。
+与普通公民有同种社会标识的情况。
+';
         return succjson($ret);
     }
+    public static function json_safe_ccub_submit() {
+        global $db;
+        $rsuser = verifyfast();
+        $post = new \ciy\post();
+        $country = $post->get('country');
+        if (empty($country))
+            return errjson('主体国籍不能为空');
+        $dualcitizen = $post->getint('dualcitizen');
+        $csql = new \ciy\sql('ap_usr_ext');
+        $csql->where('id', $rsuser['id']);
+        $usrextrow = $db->getone($csql);
+        if (!is_array($usrextrow))
+            return errjson('用户不存在');
+        $updata = array();
+        $updata['auditstatus'] = 20;
+        $updata['vuser'] = $rsuser['id'];
+        $updata['name'] = $usrextrow['truename'];
+        $updata['idid'] = $usrextrow['idid'];
+        $updata['country'] = $country;
+        $updata['dualcitizen'] = $dualcitizen;
+        $updata['addtimes'] = tostamp();
+        $csql = new \ciy\sql('dao_ccub_apply');
+        if ($db->insert($csql, $updata) === false)
+            return errjson('新增失败:' . $db->error);
+        return succjson();
+    }
+    public static function json_safe_real_init() {
+        global $db;
+        $rsuser = verifyfast();
+        $csql = new \ciy\sql('ap_usr_real_apply');
+        $csql->where('vuser', $rsuser['id']);
+        $csql->order('id desc');
+        $ret['data'] = $db->getone($csql);
+        return succjson($ret);
+    }
+    public static function json_safe_real_submit() {
+        global $db;
+        $rsuser = verifyfast();
+        $post = new \ciy\post();
+        $name = $post->get('name');
+        if (empty($name))
+            return errjson('姓名不能为空.');
+        $idid = idcard($post->get('idid'));
+        if (is_string($idid))
+            return errjson($idid);
+        $idcard1 = $post->get('idcard1');
+        $idcard2 = $post->get('idcard2');
+        $updata = array();
+        $updata['auditstatus'] = 20;
+        $updata['vuser'] = $rsuser['id'];
+        $updata['name'] = $name;
+        $updata['idid'] = $idid['code'];
+        $updata['idcard1'] = $idcard1;
+        $updata['idcard2'] = $idcard2;
+        $updata['addtimes'] = tostamp();
+        $csql = new \ciy\sql('ap_usr_real_apply');
+        if ($db->insert($csql, $updata) === false)
+            return errjson('新增失败:' . $db->error);
+        return succjson();
+    }
+    public static function json_invoicetitle_del() {
+        global $db;
+        $rsuser = verifyfast();
+        if ($rsuser === null)
+            return errjson('您还未登陆', 2);
+        $post = new \ciy\post();
+        $id = $post->getint('id');
+        $csql = new \ciy\sql('ap_invoicetitle');
+        $csql->where('vuser', $rsuser['id']);
+        $csql->where('id', $id);
+        if ($db->delete($csql) === false)
+            return errjson('删除失败:' . $db->error);
+        return succjson();
+    }
     public static function json_invoicetitle_edit() {
         global $db;
         $rsuser = verifyfast();
@@ -29,7 +570,7 @@ class me {
         $post = new \ciy\post();
         $id = $post->getint('id');
         if ($id > 0) {
-            $csql = new \ciy\sql('ap_usr_invoicetitle');
+            $csql = new \ciy\sql('ap_invoicetitle');
             $csql->where('vuser', $rsuser['id']);
             $csql->where('id', $id);
             $shiprow = $db->getone($csql);
@@ -52,7 +593,7 @@ class me {
             $updata['bankname'] = $bankname;
             $updata['bankaccount'] = $bankaccount;
             $updata['uptimes'] = tostamp();
-            $csql = new \ciy\sql('ap_usr_invoicetitle');
+            $csql = new \ciy\sql('ap_invoicetitle');
             if ($id > 0) {
                 $csql->where('id', $id);
                 if ($db->update($csql, $updata) === false)
@@ -72,21 +613,97 @@ class me {
         $ret['data'] = $updata;
         return succjson($ret);
     }
-    public static function json_invoicetitle_del() {
+    public static function json_invoicetitle_list() {
         global $db;
         $rsuser = verifyfast();
-        if ($rsuser === null)
-            return errjson('您还未登陆', 2);
-        $post = new \ciy\post();
-        $id = $post->getint('id');
-        $csql = new \ciy\sql('ap_usr_invoicetitle');
+        $csql = new \ciy\sql('ap_invoicetitle');
         $csql->where('vuser', $rsuser['id']);
-        $csql->where('id', $id);
-        if ($db->delete($csql) === false)
-            return errjson('删除失败:' . $db->error);
+        $csql->order('id desc');
+        $ret['list'] = $db->get($csql);
+        return succjson($ret);
+    }
+    public static function json_invoice_lst_list() {
+        global $db;
+        $rsuser = verifyfast();
+        $post = new \ciy\post();
+        $query = $post->get('query');
+        $csql = new \ciy\sql('ap_invoicing');
+        $csql->where('vuser', $rsuser['id']);
+        $liid = $post->getint('liid');
+        if ($liid > 0)
+            $csql->where('auditstatus', $liid);
+        $csql->order(objstr($query, 'order', 'id desc'));
+        $pageno = $post->getint('pageno', 1);
+        $pagecount = $post->getint('pagecount', 10);
+        $csql->limit($pageno, $pagecount);
+        $rows = $db->get($csql);
+        $ret = array('pageno' => $pageno, 'pagecount' => $pagecount, 'list' => $rows);
+        $ret['ap_invoicedetail'] = getrelation($db, $rows, 'ap_invoicedetail', 'invoicedetailid');
+        return succjson($ret);
+    }
+    public static function json_invoicing_submit() {
+        global $db;
+        $rsuser = verifyfast();
+        $post = new \ciy\post();
+        $invoicetitleid = $post->getint('invoicetitleid');
+        $invoicedetailid = $post->getint('invoicedetailid');
+        $money = $post->getint('money');
+        if ($money < 100)
+            return errjson('需填开票金额');
+        if ($rsuser['myinvmoney'] < $money)
+            return errjson('可开票金额不足');
+        $csql = new \ciy\sql('ap_invoicetitle');
+        $csql->where('id', $invoicetitleid);
+        $invoicerow = $db->getone($csql);
+        if (!is_array($invoicerow))
+            return errjson('开票抬头不存在');
+        try {
+            $db->begin();
+            $updata = array();
+            $updata['myinvmoney'] = array('myinvmoney-' . $money);
+            $csql = new \ciy\sql('ap_user');
+            $csql->where('id', $rsuser['id']);
+            if ($db->update($csql, $updata) === false)
+                throw new \Exception('更新账户失败:' . $db->error);
+            $updata = array();
+            $updata['invoicemoney'] = $money;
+            $updata['invoicetitleid'] = $invoicetitleid;
+            $updata['invoicedetailid'] = $invoicedetailid;
+            $updata['vuser'] = $rsuser['id'];
+            $updata['addtimes'] = tostamp();
+            $updata['auditstatus'] = 20;
+            $updata['name'] = $invoicerow['name'];
+            $updata['taxnumber'] = $invoicerow['taxnumber'];
+            $updata['addr'] = $invoicerow['addr'];
+            $updata['phone'] = $invoicerow['phone'];
+            $updata['bankname'] = $invoicerow['bankname'];
+            $updata['bankaccount'] = $invoicerow['bankaccount'];
+            $csql = new \ciy\sql('ap_invoicing');
+            if ($db->insert($csql, $updata) === false)
+                throw new \Exception('创建失败:' . $db->error);
+            $db->commit();
+        } catch (\Exception $ex) {
+            $db->rollback();
+            return errjson($ex->getMessage());
+        }
         return succjson();
     }
-    public static function json_shipaddr_get() {
+    public static function json_invoicing_init() {
+        global $db;
+        $rsuser = verifyfast();
+        $csql = new \ciy\sql('ap_user');
+        $csql->where('id', $rsuser['id']);
+        $csql->column('myinvmoney');
+        $ret['user'] = $db->getone($csql);
+        $csql = new \ciy\sql('ap_invoicedetail');
+        $csql->column('id,name');
+        $ret['details'] = $db->get($csql);
+        $ret['tip'] = '[MD]
+可联系客服签订相关合同。
+';
+        return succjson($ret);
+    }
+    public static function json_user_shipaddr_list() {
         global $db;
         $rsuser = verifyfast();
         $csql = new \ciy\sql('ap_usr_shipaddr');
@@ -95,7 +712,7 @@ class me {
         $ret['list'] = $db->get($csql);
         return succjson($ret);
     }
-    public static function json_shipaddr_edit() {
+    public static function json_user_shipaddr_edit() {
         global $db;
         $rsuser = verifyfast();
         if ($rsuser === null)
@@ -142,7 +759,7 @@ class me {
         $ret['data'] = $updata;
         return succjson($ret);
     }
-    public static function json_shipaddr_del() {
+    public static function json_user_shipaddr_del() {
         global $db;
         $rsuser = verifyfast();
         if ($rsuser === null)
@@ -156,149 +773,7 @@ class me {
             return errjson('删除失败:' . $db->error);
         return succjson();
     }
-    public static function json_problechat_close() {
-        global $db;
-        $rsuser = verifyfast();
-        $post = new \ciy\post();
-        $id = $post->getint('id');
-        $updata = array();
-        $updata['closetimes'] = tostamp();
-        $csql = new \ciy\sql('ap_usr_problem');
-        $csql->where('id', $id);
-        if ($db->update($csql, $updata) === false)
-            return errjson('更新失败:' . $db->error);
-        return succjson();
-    }
-    public static function json_problechat_send() {
-        global $db;
-        $rsuser = verifyfast();
-        $post = new \ciy\post();
-        $content = $post->get('content');
-        $id = $post->getint('id');
-        $updata = array();
-        $updata['problemid'] = $id;
-        $updata['content'] = $content;
-        $updata['sendtype'] = 1;
-        $updata['addtimes'] = tostamp();
-        $csql = new \ciy\sql('ap_usr_problechat');
-        if ($db->insert($csql, $updata) === false)
-            return errjson('更新失败:' . $db->error);
-        $updata['id'] = $db->insert_id();
-        $ret['data'] = $updata;
-        $updata = array();
-        $updata['replytimes'] = 0;
-        $updata['closetimes'] = 0;
-        $csql = new \ciy\sql('ap_usr_problem');
-        $csql->where('id', $id);
-        if ($db->update($csql, $updata) === false)
-            return errjson('更新失败:' . $db->error);
-        return succjson($ret);
-    }
-    public static function json_problechat_get() {
-        global $db;
-        $rsuser = verifyfast();
-        $post = new \ciy\post();
-        $id = $post->getint('id');
-        $csql = new \ciy\sql('ap_usr_problechat');
-        $csql->where('problemid', $id);
-        $mid = $post->getint('mid');
-        $pagecount = $post->getint('pagecount', 20);
-        if ($post->get('op') == 'max') {
-            $csql->where('id>', $mid);
-            $csql->order('id');
-        } else {
-            $csql->where('id<', $mid);
-            $csql->order('id desc');
-            $csql->limit(1, $pagecount);
-        }
-        $rows = $db->get($csql);
-        $ret['list'] = $rows;
-        $ret['pagecount'] = $pagecount;
-        if ($post->getbool('once')) {
-            $ret['once'] = array();
-            $csql = new \ciy\sql('ap_usr_problem');
-            $csql->where('id', $id);
-            $ret['once']['data'] = $db->getone($csql);
-        }
-        return succjson($ret);
-    }
-    public static function json_problem_get() {
-        global $db;
-        $rsuser = verifyfast();
-        $post = new \ciy\post();
-        $query = $post->get('query');
-        $csql = new \ciy\sql('ap_usr_problem');
-        $liid = objint($query, 'liid');
-        if ($liid == 3)
-            $csql->where('closetimes=0')->where('replytimes>0');
-        else if ($liid == 9)
-            $csql->where('closetimes>0');
-        else
-            $csql->where('closetimes=0')->where('replytimes=0');
-        $csql->where('vuser', $rsuser['id']);
-        $csql->order('id desc');
-        $pageno = $post->getint('pageno', 1);
-        $pagecount = $post->getint('pagecount', 10);
-        $csql->limit($pageno, $pagecount);
-        $rows = $db->get($csql);
-        $ret = array('pageno' => $pageno, 'pagecount' => $pagecount, 'list' => $rows);
-        return succjson($ret);
-    }
-    public static function json_problem_add() {
-        global $db;
-        $rsuser = verifyfast();
-        $post = new \ciy\post();
-        $content = $post->get('content');
-        $imgs = $post->get('imgs');
-        $contract = $post->get('contract');
-        $updata = array();
-        $updata['content'] = $content;
-        $updata['imgs'] = $imgs;
-        $updata['contract'] = $contract;
-        $updata['vuser'] = $rsuser['id'];
-        $updata['addtimes'] = tostamp();
-        $csql = new \ciy\sql('ap_usr_problem');
-        if ($db->insert($csql, $updata) === false)
-            return errjson('更新失败:' . $db->error);
-        $updata['id'] = $db->insert_id();
-        $ret['data'] = $updata;
-        return succjson($ret);
-    }
-    public static function json_suggest_get() {
-        global $db;
-        $rsuser = verifyuser();
-        $ret['list'] = array();
-        if ($rsuser == null)
-            return succjson($ret);
-        $csql = new \ciy\sql('ap_usr_suggest');
-        $csql->where('vuser', $rsuser['id']);
-        $csql->order('id desc');
-        $csql->limit(1, 10);
-        $ret['list'] = $db->get($csql);
-        return succjson($ret);
-    }
-    public static function json_suggest_submit() {
-        global $db;
-        $rsuser = verifyuser();
-        $post = new \ciy\post();
-        $content = $post->get('content');
-        $imgs = $post->get('imgs');
-        $contract = $post->get('contract');
-        $updata = array();
-        $updata['content'] = $content;
-        $updata['imgs'] = $imgs;
-        $updata['contract'] = $contract;
-        if ($rsuser === null)
-            $updata['vuser'] = 0;
-        else
-            $updata['vuser'] = $rsuser['id'];
-        $updata['addtimes'] = tostamp();
-        $csql = new \ciy\sql('ap_usr_suggest');
-        if ($db->insert($csql, $updata) === false)
-            return errjson('更新失败:' . $db->error);
-        return succjson();
-    }
-    public static function json_getqrcode() {
+    public static function json_share_qrcode_get() {
         global $db;
         $rsuser = verifyfast();
         $filename = '/xcxqrcode/' . $rsuser['id'] . '.jpg';
@@ -336,322 +811,9 @@ class me {
         fclose($fp);
         return succjson($ret);
     }
-    public static function json_userreal_apply_get() {
+    public static function json_safe_password_change() {
         global $db;
-        $rsuser = verifyfast();
-        $csql = new \ciy\sql('ap_usr_real_apply');
-        $csql->where('vuser', $rsuser['id']);
-        $csql->order('id desc');
-        $ret['data'] = $db->getone($csql);
-        return succjson($ret);
-    }
-    public static function json_userreal_apply_submit() {
-        global $db;
-        $rsuser = verifyfast();
-        $post = new \ciy\post();
-        $name = $post->get('name');
-        if (empty($name))
-            return errjson('姓名不能为空.');
-        $idid = idcard($post->get('idno'));
-        if (is_string($idid))
-            return errjson($idid);
-        $idcard1 = $post->get('idcard1');
-        $updata = array();
-        $updata['auditstatus'] = 20;
-        $updata['vuser'] = $rsuser['id'];
-        $updata['name'] = $name;
-        $updata['idid'] = $idid['code'];
-        $updata['idcard1'] = $idcard1;
-        $updata['addtimes'] = tostamp();
-        $csql = new \ciy\sql('ap_usr_real_apply');
-        if ($db->insert($csql, $updata) === false)
-            return errjson('新增失败:' . $db->error);
-        return succjson();
-    }
-    public static function json_wxrecvpay() {
-        global $db;
-        $rsuser = verifyfast();
-        $post = new \ciy\post();
-        $id = $post->getint('id');
-        $csql = new \ciy\sql('ap_cash_out');
-        $csql->where('id', $id);
-        $cashrow = $db->getone($csql);
-        if (!is_array($cashrow))
-            return errjson('提现不存在');
-        if ($cashrow['cashstatus'] == 21) {
-            if ($cashrow['cashtimes'] > tostamp() - 86400)
-                return errjson('提现打款进程被打断。24小时后重新操作，请务必点击收款');
-        } else if ($cashrow['cashstatus'] != 20)
-            return errjson('提现不是已通过状态');
-        if ($cashrow['vuser'] != $rsuser['id'])
-            return errjson('提现用户不匹配');
-        $updata = array();
-        $updata['cashstatus'] = 21;
-        $updata['cashtimes'] = tostamp();
-        $csql = new \ciy\sql('ap_cash_out');
-        $csql->where('id', $id);
-        if ($db->update($csql, $updata) === false)
-            return errjson('更新失败');
-
-        $param = array();
-        $param['out_bill_no'] = 'TB' . date('ymd') . '8' . $id;
-        $param['transfer_scene_id'] = '1005';
-        $param['openid'] = $rsuser['wxminaid'];
-        $param['notify_url'] = 'https://ciyon.ciy.cn/ajax/ambap/wxpay.transfer';
-        $param['transfer_remark'] = '佣金奖励';
-        $param['transfer_amount'] = $cashrow['cashmoney'];
-        $param['transfer_scene_report_infos'] = array();
-        $param['transfer_scene_report_infos'][] = array('info_type' => '岗位类型', 'info_content' => '采集员');
-        $param['transfer_scene_report_infos'][] = array('info_type' => '报酬说明', 'info_content' => '用户主动申请提现');
-
-        $wxcfg = gettoken($db, 1);
-        $wxpay = new \ciy\wxfunc($wxcfg);
-        $rettransfer = $wxpay->transfer($param);
-        if (is_string($rettransfer))
-            return errjson($rettransfer);
-        $rettransfer['mchid'] = $wxpay->mchid;
-        $rettransfer['appid'] = $wxpay->appid;
-        $ret['transfer'] = $rettransfer;
-        return succjson($ret);
-    }
-    public static function json_userbank_change() {
-        global $db;
-        $rsuser = verifyfast();
-        $post = new \ciy\post();
-        $cashtype = $post->getint('cashtype');
-        $bankno = $post->get('bankno');
-        $bankname = $post->get('bankname');
-        $bankaccount = $post->get('bankaccount');
-        $updata = array();
-        $updata['cashtype'] = $cashtype;
-        $updata['bankno'] = $bankno;
-        $updata['bankname'] = $bankname;
-        $updata['bankaccount'] = $bankaccount;
-        $csql = new \ciy\sql('ap_usr_ext');
-        $csql->where('id', $rsuser['id']);
-        $extrow = $db->getone($csql);
-        if (is_array($extrow))
-            if ($db->update($csql, $updata) === false)
-                return errjson('更新失败:' . $db->error);
-            else {
-                $updata['id'] = $rsuser['id'];
-                if ($db->insert($csql, $updata) === false)
-                    return errjson('新增失败:' . $db->error);
-            }
-        return succjson();
-    }
-    public static function json_cashout_get() {
-        global $db;
-        $rsuser = verifyfast();
-        $post = new \ciy\post();
-        $query = $post->get('query');
-        $csql = new \ciy\sql('ap_cash_out');
-        $csql->where('vuser', $rsuser['id']);
-        $liid = objint($query, 'liid');
-        if ($liid > 0)
-            $csql->where('cashstatus', $liid);
-        $csql->order(objstr($query, 'order', 'id desc'));
-        $pageno = $post->getint('pageno', 1);
-        $pagecount = $post->getint('pagecount', 10);
-        $csql->limit($pageno, $pagecount);
-        $rows = $db->get($csql);
-        $ret = array('pageno' => $pageno, 'pagecount' => $pagecount, 'list' => $rows);
-        return succjson($ret);
-    }
-    public static function json_invoicing_get() {
-        global $db;
-        $rsuser = verifyfast();
-        $post = new \ciy\post();
-        $query = $post->get('query');
-        $csql = new \ciy\sql('ap_usr_invoicing');
-        $csql->where('vuser', $rsuser['id']);
-        $liid = objint($query, 'liid');
-        if ($liid == 2)
-            $csql->where('invtimes=0');
-        if ($liid == 3)
-            $csql->where('invtimes>0');
-        $csql->order(objstr($query, 'order', 'id desc'));
-        $pageno = $post->getint('pageno', 1);
-        $pagecount = $post->getint('pagecount', 10);
-        $csql->limit($pageno, $pagecount);
-        $rows = $db->get($csql);
-        $ret = array('pageno' => $pageno, 'pagecount' => $pagecount, 'list' => $rows);
-        return succjson($ret);
-    }
-    public static function json_invoicing() {
-        global $db;
-        $rsuser = verifyfast();
-        $post = new \ciy\post();
-        $invtit = $post->getint('invtit');
-        $money = $post->getint('money');
-        if ($money < 100)
-            return errjson('需填开票金额');
-        if ($rsuser['myinvmoney'] < $money)
-            return errjson('可开票金额不足');
-        $csql = new \ciy\sql('ap_usr_invoicetitle');
-        $csql->where('id', $invtit);
-        $invoicerow = $db->getone($csql);
-        if (!is_array($invoicerow))
-            return errjson('开票抬头不存在');
-        try {
-            $db->begin();
-            $updata = array();
-            $updata['myinvmoney'] = array('myinvmoney-' . $money);
-            $csql = new \ciy\sql('ap_user');
-            $csql->where('id', $rsuser['id']);
-            if ($db->update($csql, $updata) === false)
-                throw new \Exception('更新账户失败:' . $db->error);
-            $updata = array();
-            $updata['invoicemoney'] = $money;
-            $updata['invoicetitleid'] = $invtit;
-            $updata['vuser'] = $rsuser['id'];
-            $updata['addtimes'] = tostamp();
-            $updata['name'] = $invoicerow['name'];
-            $updata['taxnumber'] = $invoicerow['taxnumber'];
-            $updata['addr'] = $invoicerow['addr'];
-            $updata['phone'] = $invoicerow['phone'];
-            $updata['bankname'] = $invoicerow['bankname'];
-            $updata['bankaccount'] = $invoicerow['bankaccount'];
-            $csql = new \ciy\sql('ap_usr_invoicing');
-            if ($db->insert($csql, $updata) === false)
-                throw new \Exception('创建失败:' . $db->error);
-            $db->commit();
-        } catch (\Exception $ex) {
-            $db->rollback();
-            return errjson($ex->getMessage());
-        }
-        return succjson();
-    }
-    public static function json_cash() {
-        global $db;
-        $rsuser = verifyfast();
-        $post = new \ciy\post();
-        $cash = $post->getint('cash') * 100;
-        if ($rsuser['mycashmoney'] < $cash)
-            return errjson('余额不足');
-        if ($rsuser['mybondmoney'] > 0) {
-            if ($rsuser['mycashmoney'] - $rsuser['mybondmoney'] < $cash)
-                return errjson('余额不足，保证金不能直接提现，请先退保证金');
-        }
-        $cashtype = 1;
-        $csql = new \ciy\sql('ap_usr_ext');
-        $csql->where('id', $rsuser['id']);
-        $extrow = $db->getone($csql);
-        if (is_array($extrow))
-            $cashtype = $extrow['cashtype'];
-        if ($cashtype == 1) {
-            if ($cash < 1000 * 100)
-                return errjson('独立纳税，单次提现金额不能少于1000元');
-        }
-        try {
-            $db->begin();
-            $updata = array();
-            $updata['mycashmoney'] = array('mycashmoney-' . $cash);
-            $csql = new \ciy\sql('ap_user');
-            $csql->where('id', $rsuser['id']);
-            if ($db->update($csql, $updata) === false)
-                throw new \Exception('更新账户失败:' . $db->error);
-            $updata = array();
-            $updata['cashstatus'] = 10;
-            $updata['cashmoney'] = $cash;
-            $updata['cashtype'] = $cashtype;
-            $updata['vuser'] = $rsuser['id'];
-            $updata['addtimes'] = tostamp();
-            $csql = new \ciy\sql('ap_cash_out');
-            if ($db->insert($csql, $updata) === false)
-                throw new \Exception('创建失败:' . $db->error);
-            $db->commit();
-        } catch (\Exception $ex) {
-            $db->rollback();
-            return errjson($ex->getMessage());
-        }
-        return succjson();
-    }
-    public static function json_pntbuy_get() {
-        global $db;
-        $rsuser = verifyfast();
-        $post = new \ciy\post();
-        $query = $post->get('query');
-        $csql = new \ciy\sql('ap_pnt_buy');
-        $csql->where('vuser', $rsuser['id']);
-        $liid = objint($query, 'liid');
-        if ($liid == 2)
-            $csql->where('paytimes=0');
-        if ($liid == 3)
-            $csql->where('paytimes>0');
-        $csql->order(objstr($query, 'order', 'id desc'));
-        $pageno = $post->getint('pageno', 1);
-        $pagecount = $post->getint('pagecount', 10);
-        $csql->limit($pageno, $pagecount);
-        $rows = $db->get($csql);
-        $ret = array('pageno' => $pageno, 'pagecount' => $pagecount, 'list' => $rows);
-        return succjson($ret);
-    }
-    public static function json_buy_paychk() {
-        global $db;
-        $rsuser = verifyfast();
-        $post = new \ciy\post();
-        $id = $post->getint('orderid');
-        for ($i = 0; $i < 10; $i++) {
-            $csql = new \ciy\sql('ap_pnt_buy');
-            $csql->where('id', $id);
-            $buyrow = $db->getone($csql);
-            if (!is_array($buyrow))
-                return errjson('订单不存在');
-            if ($buyrow['paytimes'] > 0)
-                return succjson();
-            sleep(1);
-        }
-        return errjson('支付不成功,请联系客服');
-    }
-
-    public static function json_buy_paynow() {
-        global $db;
-        $rsuser = verifyfast();
-        //建立订单，支付
-        $post = new \ciy\post();
-        $id = $post->getint('id');
-        $csql = new \ciy\sql('ap_pnt_bundle');
-        $csql->where('id', $id);
-        $bundlerow = $db->getone($csql);
-        if (!is_array($bundlerow))
-            return errjson('购买项目不存在');
-        $payprice = $bundlerow['buymoney'];
-        $updata = array();
-        $updata['pnt'] = $bundlerow['buypnt'];
-        $updata['buypntmoney'] = $payprice;
-        $updata['vuser'] = $rsuser['id'];
-        $updata['addtimes'] = tostamp();
-
-        $csql = new \ciy\sql('ap_pnt_buy');
-        if ($db->insert($csql, $updata) === false)
-            return errjson('订单创建失败:' . $db->error);
-        $orderid = $db->insert_id();
-        $param = array();
-        $param['description'] = '购买金币';
-        $param['out_trade_no'] = 'PT' . date('ymd') . '9' . $orderid;
-        $param['notify_url'] = 'https://ciyon.ciy.cn/ajax/ambap/wxpay.pay_pnt';
-        $param['amount'] = array();
-        $param['amount']['total'] = toint($payprice);
-        $param['payer'] = array();
-        $param['payer']['openid'] = $rsuser['wxminaid'];
-        $wxcfg = gettoken($db, 1);
-        $wxpay = new \ciy\wxfunc($wxcfg);
-        $retpay = $wxpay->pay($param);
-        if (is_string($retpay))
-            return errjson($retpay);
-        $retpay['orderid'] = $orderid;
-        return succjson($retpay);
-    }
-    public static function json_buy_init() {
-        global $db;
-        $csql = new \ciy\sql('ap_pnt_bundle');
-        $ret['buys'] = $db->get($csql);
-        return succjson($ret);
-    }
-    public static function json_pass_change() {
-        global $db;
-        global $tokensalt;
+        global $_token;
         $rsuser = verifyfast();
         $post = new \ciy\post();
         $oldpass = $post->get('oldpass');
@@ -659,17 +821,160 @@ class me {
         $csql = new \ciy\sql('ap_user');
         $csql->where('id', $rsuser['id']);
         $rsuser = $db->getone($csql);
-        if (!empty($rsuser['password']) && $rsuser['password'] != md5($oldpass . $tokensalt))
+        if (!empty($rsuser['password']) && $rsuser['password'] != md5($oldpass . $_token['salt']))
             return errjson('旧密码错误.');
         $updata = array();
-        $updata['password'] = md5($newpass . $tokensalt);
+        $updata['password'] = md5($newpass . $_token['salt']);
         $csql = new \ciy\sql('ap_user');
         $csql->where('id', $rsuser['id']);
         if ($db->update($csql, $updata) === false)
             return errjson('密码更新失败:' . $db->error);
         return succjson();
     }
-    public static function json_buy_userchk() {
+    public static function json_suggest_get() {
+        global $db;
+        $rsuser = verifyuser();
+        $ret['list'] = array();
+        if ($rsuser == null)
+            return succjson($ret);
+        $csql = new \ciy\sql('ap_usr_suggest');
+        $csql->where('vuser', $rsuser['id']);
+        $csql->order('id desc');
+        $csql->limit(1, 10);
+        $ret['list'] = $db->get($csql);
+        return succjson($ret);
+    }
+    public static function json_suggest_submit() {
+        global $db;
+        $rsuser = verifyuser();
+        $post = new \ciy\post();
+        $content = $post->get('content');
+        $imgs = $post->get('imgs');
+        $contract = $post->get('contract');
+        $updata = array();
+        $updata['content'] = $content;
+        $updata['imgs'] = $imgs;
+        $updata['contract'] = $contract;
+        if ($rsuser === null)
+            $updata['vuser'] = 0;
+        else
+            $updata['vuser'] = $rsuser['id'];
+        $updata['addtimes'] = tostamp();
+        $csql = new \ciy\sql('ap_usr_suggest');
+        if ($db->insert($csql, $updata) === false)
+            return errjson('更新失败:' . $db->error);
+        $updata['id'] = $db->insert_id();
+        $ret['data'] = $updata;
+        return succjson($ret);
+    }
+    public static function json_problem_chat_send() {
+        global $db;
+        $rsuser = verifyfast();
+        $post = new \ciy\post();
+        $content = $post->get('content');
+        $id = $post->getint('id');
+        $updata = array();
+        $updata['problemid'] = $id;
+        $updata['content'] = $content;
+        $updata['sendtype'] = 1;
+        $updata['addtimes'] = tostamp();
+        $csql = new \ciy\sql('ap_usr_problechat');
+        if ($db->insert($csql, $updata) === false)
+            return errjson('更新失败:' . $db->error);
+        $updata['id'] = $db->insert_id();
+        $ret['data'] = $updata;
+        $updata = array();
+        $updata['replytimes'] = 0;
+        $updata['closetimes'] = 0;
+        $csql = new \ciy\sql('ap_usr_problem');
+        $csql->where('id', $id);
+        if ($db->update($csql, $updata) === false)
+            return errjson('更新失败:' . $db->error);
+        return succjson($ret);
+    }
+    public static function json_problem_chat_get() {
+        global $db;
+        $rsuser = verifyfast();
+        $post = new \ciy\post();
+        $id = $post->getint('id');
+        $csql = new \ciy\sql('ap_usr_problechat');
+        $csql->where('problemid', $id);
+        $mid = $post->getint('mid');
+        $pagecount = $post->getint('pagecount', 20);
+        if ($post->get('op') == 'max') {
+            $csql->where('id>', $mid);
+            $csql->order('id');
+        } else {
+            $csql->where('id<', $mid);
+            $csql->order('id desc');
+            $csql->limit(1, $pagecount);
+        }
+        $rows = $db->get($csql);
+        $ret['list'] = $rows;
+        $ret['pagecount'] = $pagecount;
+        if ($post->getbool('once')) {
+            $ret['once'] = true;
+            $csql = new \ciy\sql('ap_usr_problem');
+            $csql->where('id', $id);
+            $ret['problem'] = $db->getone($csql);
+        }
+        return succjson($ret);
+    }
+    public static function json_problem_pub_close() {
+        global $db;
+        $rsuser = verifyfast();
+        $post = new \ciy\post();
+        $id = $post->getint('id');
+        $updata = array();
+        $updata['closetimes'] = tostamp();
+        $csql = new \ciy\sql('ap_usr_problem');
+        $csql->where('id', $id);
+        if ($db->update($csql, $updata) === false)
+            return errjson('更新失败:' . $db->error);
+        return succjson();
+    }
+    public static function json_problem_pub_add() {
+        global $db;
+        $rsuser = verifyfast();
+        $post = new \ciy\post();
+        $content = $post->get('content');
+        $imgs = $post->get('imgs');
+        $contract = $post->get('contract');
+        $updata = array();
+        $updata['content'] = $content;
+        $updata['imgs'] = $imgs;
+        $updata['contract'] = $contract;
+        $updata['vuser'] = $rsuser['id'];
+        $updata['addtimes'] = tostamp();
+        $csql = new \ciy\sql('ap_usr_problem');
+        if ($db->insert($csql, $updata) === false)
+            return errjson('更新失败:' . $db->error);
+        $updata['id'] = $db->insert_id();
+        $ret['data'] = $updata;
+        return succjson($ret);
+    }
+    public static function json_problem_pub_list() {
+        global $db;
+        $rsuser = verifyfast();
+        $post = new \ciy\post();
+        $csql = new \ciy\sql('ap_usr_problem');
+        $liid = $post->getint('liid');
+        if ($liid == 3)
+            $csql->where('closetimes=0')->where('replytimes>0');
+        else if ($liid == 9)
+            $csql->where('closetimes>0');
+        else
+            $csql->where('closetimes=0')->where('replytimes=0');
+        $csql->where('vuser', $rsuser['id']);
+        $csql->order('id desc');
+        $pageno = $post->getint('pageno', 1);
+        $pagecount = $post->getint('pagecount', 10);
+        $csql->limit($pageno, $pagecount);
+        $rows = $db->get($csql);
+        $ret = array('pageno' => $pageno, 'pagecount' => $pagecount, 'list' => $rows);
+        return succjson($ret);
+    }
+    public static function json_me_userbuy_chk() {
         global $db;
         $rsuser = verifyfast();
         $post = new \ciy\post();
@@ -693,8 +998,9 @@ class me {
         return errjson('支付信息未同步，请下拉刷新');
     }
 
-    public static function json_buy_usernow() {
+    public static function json_me_userbuy_create() {
         global $db;
+        global $_token;
         $rsuser = verifyfast();
         $post = new \ciy\post();
         $id = $post->getint('id');
@@ -718,230 +1024,31 @@ class me {
         $param = array();
         $param['description'] = '购买会员';
         $param['out_trade_no'] = 'UB' . date('ymd') . '9' . $orderid;
-        $param['notify_url'] = 'https://ciyon.ciy.cn/ajax/ambap/wxpay.pay_user';
+        $param['notify_url'] = $_token['maindomain'] . 'wxpay.pay_user';
         $param['amount'] = array();
-        $param['amount']['total'] = toint($money);
+        $param['amount']['total'] = (int)$money;
         $param['payer'] = array();
         $param['payer']['openid'] = $rsuser['wxminaid'];
         $wxcfg = gettoken($db, 1);
         $wxpay = new \ciy\wxfunc($wxcfg);
-        $retpay = $wxpay->pay($param);
-        if (is_string($retpay))
-            return errjson($retpay);
-        $retpay['orderid'] = $orderid;
-        return succjson($retpay);
-    }
-    public static function json_usrbuy_get() {
-        global $db;
-        $csql = new \ciy\sql('ap_usr_buy_bundle');
-        $ret['userbuys'] = $db->get($csql);
-        $ret['recommend'] = 2;
+        $ret = $wxpay->pay($param);
+        if (is_string($ret))
+            return errjson($ret);
+        $ret['orderid'] = $orderid;
         return succjson($ret);
     }
-    public static function json_me_bank_info_change() {
-        global $db;
-        $rsuser = verifyfast();
-        $post = new \ciy\post();
-        $bankno = $post->get('bankno');
-        $bankname = $post->get('bankname');
-        $bankaccount = $post->get('bankaccount');
-        $bankcode = $post->get('bankcode');
-        $updata = array();
-        $updata['bankno'] = $bankno;
-        $updata['bankname'] = $bankname;
-        $updata['bankaccount'] = $bankaccount;
-        $updata['bankcode'] = $bankcode;
-        $csql = new \ciy\sql('ap_usr_ext');
-        $csql->where('id', $rsuser['id']);
-        $extrow = $db->getone($csql);
-        if (is_array($extrow)) {
-            if ($db->update($csql, $updata) === false)
-                return errjson('ext更新失败:' . $db->error);
-        } else {
-            $updata['id'] = $rsuser['id'];
-            if ($db->insert($csql, $updata) === false)
-                return errjson('ext新增失败:' . $db->error);
-        }
-        return succjson();
-    }
-    public static function json_userinfo_change() {
-        global $db;
-        $rsuser = verifyfast();
-        $post = new \ciy\post();
-        $name = $post->get('name');
-        $icon = $post->get('icon');
-        $mobile = $post->get('mobile');
-        $wxno = $post->get('wxno');
-        $email = $post->get('email');
-        $updata = array();
-        $updata['name'] = $name;
-        $updata['icon'] = $icon;
-        $updata['mobile'] = $mobile;
-        $csql = new \ciy\sql('ap_user');
-        $csql->where('id', $rsuser['id']);
-        if ($db->update($csql, $updata) === false)
-            return errjson('更新失败:' . $db->error);
-        $updata = array();
-        $updata['wxno'] = $wxno;
-        $updata['email'] = $email;
-        $csql = new \ciy\sql('ap_usr_ext');
-        $csql->where('id', $rsuser['id']);
-        $extrow = $db->getone($csql);
-        if (is_array($extrow)) {
-            if ($db->update($csql, $updata) === false)
-                return errjson('ext更新失败:' . $db->error);
-        } else {
-            $updata['id'] = $rsuser['id'];
-            if ($db->insert($csql, $updata) === false)
-                return errjson('ext新增失败:' . $db->error);
-        }
-        return succjson();
-    }
-    public static function json_balance_get() {
+    public static function json_me_balance_get() {
         global $db;
         $rsuser = verifyfast();
         $csql = new \ciy\sql('ap_user');
         $csql->where('id', $rsuser['id']);
-        $csql->column('myinvmoney,mycashmoney,mybondmoney,mypnt');
         $ret['user'] = $db->getone($csql);
-        return succjson($ret);
-    }
-    public static function json_cash_get() {
-        global $db;
-        $rsuser = verifyfast();
-        $csql = new \ciy\sql('ap_user');
-        $csql->where('id', $rsuser['id']);
-        $csql->column('myinvmoney,mycashmoney,mybondmoney,mypnt');
-        $ret['user'] = $db->getone($csql);
-        $csql = new \ciy\sql('ap_cash_out');
-        $csql->where('vuser', $rsuser['id']);
-        $csql->where('cashstatus', 20);
-        $ret['cash'] = $db->get($csql);
-        return succjson($ret);
-    }
-    public static function json_charge_paychk() {
-        global $db;
-        $rsuser = verifyfast();
-        $post = new \ciy\post();
-        $id = $post->getint('orderid');
-        for ($i = 0; $i < 10; $i++) {
-            $csql = new \ciy\sql('ap_cash_in');
-            $csql->where('id', $id);
-            $buyrow = $db->getone($csql);
-            if (!is_array($buyrow))
-                return errjson('订单不存在');
-            if ($buyrow['paytimes'] > 0)
-                return succjson();
-            sleep(1);
-        }
-        return errjson('充值不成功,请联系客服');
-    }
-    public static function json_charge_paynow() {
-        global $db;
-        $rsuser = verifyfast();
-        $post = new \ciy\post();
-        $money = $post->getint('money');
-        $updata = array();
-        $updata['name'] = '';
-        $updata['inmoney'] = $money;
-        $updata['vuser'] = $rsuser['id'];
-        $updata['addtimes'] = tostamp();
-        $updata['paytimes'] = 0;
-        $csql = new \ciy\sql('ap_cash_in');
-        if ($db->insert($csql, $updata) === false)
-            return errjson('订单创建失败:' . $db->error);
-        $orderid = $db->insert_id();
-        $param = array();
-        $param['description'] = '充值';
-        $param['out_trade_no'] = 'IN' . date('ymd') . '2' . $orderid;
-        $param['notify_url'] = 'https://ciyon.ciy.cn/ajax/ambap/wxpay.charge';
-        $param['amount'] = array();
-        $param['amount']['total'] = toint($money);
-        $param['payer'] = array();
-        $param['payer']['openid'] = $rsuser['wxminaid'];
-        $wxcfg = gettoken($db, 1);
-        $wxpay = new \ciy\wxfunc($wxcfg);
-        $retpay = $wxpay->pay($param);
-        if (is_string($retpay))
-            return errjson($retpay);
-        $retpay['orderid'] = $orderid;
-        return succjson($retpay);
-    }
-    public static function json_cashin_get() {
-        global $db;
-        $rsuser = verifyfast();
-        $post = new \ciy\post();
-        $query = $post->get('query');
-        $csql = new \ciy\sql('ap_cash_in');
-        $csql->where('paytimes>0');
-        $csql->where('vuser', $rsuser['id']);
-        $csql->order(objstr($query, 'order', 'id desc'));
-        $pageno = $post->getint('pageno', 1);
-        $pagecount = $post->getint('pagecount', 10);
-        $csql->limit($pageno, $pagecount);
-        $rows = $db->get($csql);
-        $ret = array('pageno' => $pageno, 'pagecount' => $pagecount, 'list' => $rows);
-        return succjson($ret);
-    }
-    public static function json_cashie_get() {
-        global $db;
-        $rsuser = verifyfast();
-        $post = new \ciy\post();
-        $query = $post->get('query');
-        $csql = new \ciy\sql('ap_cash_ie');
-        $csql->where('vuser', $rsuser['id']);
-        $liid = objint($query, 'liid');
-        if ($liid == 1)
-            $csql->where('iemoney>0');
-        if ($liid == 2)
-            $csql->where('iemoney<0');
-        $csql->order(objstr($query, 'order', 'id desc'));
-        $pageno = $post->getint('pageno', 1);
-        $pagecount = $post->getint('pagecount', 10);
-        $csql->limit($pageno, $pagecount);
-        $rows = $db->get($csql);
-        $ret = array('pageno' => $pageno, 'pagecount' => $pagecount, 'list' => $rows);
-        return succjson($ret);
-    }
-    public static function json_pntrecord_get() {
-        global $db;
-        $rsuser = verifyfast();
-        $post = new \ciy\post();
-        $query = $post->get('query');
-        $csql = new \ciy\sql('ap_pnt_record');
-        $csql->where('vuser', $rsuser['id']);
-        $csql->order(objstr($query, 'order', 'id desc'));
-        $pageno = $post->getint('pageno', 1);
-        $pagecount = $post->getint('pagecount', 10);
-        $csql->limit($pageno, $pagecount);
-        $rows = $db->get($csql);
-        $ret = array('pageno' => $pageno, 'pagecount' => $pagecount, 'list' => $rows);
-        return succjson($ret);
-    }
-    public static function json_pnt_up() {
-        global $db;
-        $rsuser = verifyfast();
-        $post = new \ciy\post();
-        $id = $post->getint('id');
-        $csql = new \ciy\sql('ap_pnt_track');
-        $csql->where('id', $id);
-        $trackrow = $db->getone($csql);
-        if (!is_array($trackrow))
-            return errjson('埋点不存在' . $id);
-        $point = $trackrow['point'];
-        $updata = array();
-        $updata['vuser'] = $rsuser['id'];
-        $updata['fromid'] = $id;
-        $updata['name'] = $trackrow['name'];
-        $updata['pnt'] = $point;
-        $updata['addtimes'] = tostamp();
-        $csql = new \ciy\sql('ap_pnt_record');
-        $db->insert($csql, $updata);
-        $db->execute('update ap_user set mypnt=mypnt+' . $point . ' where id=' . $rsuser['id']);
-        $msg = '';
-        if ($id == 1)
-            $msg = '已签到 +' . $point . ' 积分';
-        $ret['msg'] = $msg;
+        unset($ret['user']['password']);
+        unset($ret['user']['sid']);
+        unset($ret['user']['wxminaid']);
+        unset($ret['user']['wxminakey']);
+        unset($ret['user']['wxunionid']);
+        unset($ret['user']['memo']);
         return succjson($ret);
     }
 }
diff --git a/web/ambap/wxpay.php b/web/ambap/wxpay.php
index 5e0b1b0..7e661bb 100644
--- a/web/ambap/wxpay.php
+++ b/web/ambap/wxpay.php
@@ -1,6 +1,6 @@
 <?php
-//http://expo.local.ciy.cn/ajax/amb/wxpay.pay_pnt
-//http://expo.local.ciy.cn/ajax/amb/wxpay.transfer
+//https://ciyon.local.ciy.cn/ajax/ambap/wxpay.pay_pnt
+//https://ciyon.local.ciy.cn/ajax/ambap/wxpay.transfer
 namespace web\ambap;
 
 class wxpay {
@@ -58,7 +58,8 @@ class wxpay {
             //sendusermsg($db, $orderrow['userid'], '集市通知', '买家已付款，请及时处理', '/work/ec/order_detail?id=' . $noid);
 
             $updata = array();
-            $updata['mycashmoney'] = array('mycashmoney+' . $inmoney);
+            $updata['mymoney'] = array('mymoney+' . $inmoney);
+            $updata['myinvmoney'] = array('myinvmoney+' . $inmoney);
             $csql = new \ciy\sql('ap_user');
             $csql->where('id', $userid);
             if ($db->update($csql, $updata) === false)
@@ -100,9 +101,9 @@ class wxpay {
 
         if (@$json['state'] != 'SUCCESS')
             return self::errlog('付款失败:' . $dat);
-        $noid = toint(substr($json['out_bill_no'], 9));
+        $noid = (int)substr($json['out_bill_no'], 9);
 
-        $csql = new \ciy\sql('ap_fina_cash');
+        $csql = new \ciy\sql('ap_cash_out');
         $csql->where('id', $noid);
         $orderrow = $db->getone($csql);
         if (!is_array($orderrow))
@@ -122,16 +123,15 @@ class wxpay {
             $updata['cashtimes'] = tostamp();
             $updata['cashno'] = $json['transfer_bill_no'];
             $updata['cashstatus'] = 100;
-            $csql = new \ciy\sql('ap_fina_cash');
+            $csql = new \ciy\sql('ap_cash_out');
             $csql->where('id', $noid);
             if ($db->update($csql, $updata) === false)
-                throw new \Exception('更新ap_fina_cash失败:' . $db->error);
+                throw new \Exception('更新ap_cash_out失败:' . $db->error);
             //sendusermsg($db, $orderrow['userid'], '集市通知', '买家已付款，请及时处理', '/work/ec/order_detail?id=' . $noid);
 
             $db->commit();
         } catch (\Exception $ex) {
             $db->rollback();
-            savelogfile('err_db', $ex->getMessage());
             return self::errlog($ex->getMessage(), $userid);
         }
         savelogfile('wxpay_pnt', '成功提现[' . $noid . ']');
@@ -164,7 +164,7 @@ class wxpay {
             return self::errlog('解析密文JSON出错:' . $dat);
         if (@$json['trade_state'] != 'SUCCESS')
             return self::errlog('支付失败:' . $dat);
-        $noid = toint(substr($json['out_trade_no'], 9));
+        $noid = (int)substr($json['out_trade_no'], 9);
 
         $csql = new \ciy\sql('ap_pnt_buy');
         $csql->where('id', $noid);
@@ -172,7 +172,7 @@ class wxpay {
         if (!is_array($orderrow))
             return self::errlog('订单不存在:' . $noid);
         $userid = $orderrow['vuser'];
-        $buypntmoney = toint($orderrow['buypntmoney']);
+        $buypntmoney = (int)$orderrow['buypntmoney'];
         if ($buypntmoney != $json['amount']['total'])
             return self::errlog('订单金额错误[' . $buypntmoney . '!=' . $json['amount']['total'] . ']:' . $noid, $userid);
         if ($orderrow['paytimes'] > 0) {
@@ -183,6 +183,7 @@ class wxpay {
         try {
             $db->begin();
             $updata = array();
+            $updata['name'] = $json['transaction_id'];
             $updata['paytimes'] = tostamp();
             $csql = new \ciy\sql('ap_pnt_buy');
             $csql->where('id', $noid);
@@ -190,9 +191,10 @@ class wxpay {
                 throw new \Exception('更新ap_pnt_buy失败:' . $db->error);
             //sendusermsg($db, $orderrow['userid'], '集市通知', '买家已付款，请及时处理', '/work/ec/order_detail?id=' . $noid);
 
-            $pnt = toint($orderrow['pnt']);
+            $pnt = (int)$orderrow['pnt'];
             $updata = array();
             $updata['mypnt'] = array('mypnt+' . $pnt);
+            $updata['myinvmoney'] = array('myinvmoney+' . $buypntmoney);
             $csql = new \ciy\sql('ap_user');
             $csql->where('id', $userid);
             if ($db->update($csql, $updata) === false)
@@ -268,6 +270,7 @@ class wxpay {
                 $userrow['accounttimes'] = tostamp();
             $updata = array();
             $updata['userlevel'] = $orderrow['userlevel'];
+            $updata['myinvmoney'] = array('myinvmoney+' . $money);
             $updata['accounttimes'] = $userrow['accounttimes'] + $days * 86400;
             $csql = new \ciy\sql('ap_user');
             $csql->where('id', $userid);
diff --git a/web/jscss/ciy.js b/web/jscss/ciy.js
index b20e2e4..edf0c89 100644
--- a/web/jscss/ciy.js
+++ b/web/jscss/ciy.js
@@ -821,8 +821,8 @@ ciyfn.split = function (str, sep) {
         arr[i] = arr[i].trim();
     return arr;
 }
-ciyfn.getdictdata = function (datakey, once, reldata) {
-    //直接数组(直传，once数据)，字典缓存，静态引用，字符串拼接
+ciyfn.getdictdata = function (datakey, pagedata) {
+    //直接数组，字典缓存，静态引用，字符串拼接
     if (isarray(datakey))
         return datakey;
     if (typeof (datakey) != 'string')
@@ -830,10 +830,8 @@ ciyfn.getdictdata = function (datakey, once, reldata) {
     var datas = ciyfn.getstorage('cata_' + datakey);
     if (isarray(datas))
         return datas;
-    if (isobj(once) && once[datakey])
-        return once[datakey];
-    if (isobj(reldata) && reldata[datakey])
-        return reldata[datakey];
+    if (isobj(pagedata) && pagedata[datakey])
+        return pagedata[datakey];
     if (isarray(window[datakey]))
         return window[datakey];
     if (datakey.indexOf(',') == -1 && datakey.indexOf(':') == -1)
@@ -1071,7 +1069,7 @@ ciyfn.callfunc = function (funcname, post, successfunc, opn) { //opn  showload,m
     }
 
     opn.data = post || {};
-    opn.data._pf = 'PC';
+    opn.data._pf = 'PC' + new Date().getTime() + '_' + parseInt(80000000 + Math.random() * 10000000);
     opn.done = function (xhr) {
         ciygv._clickduptime = null;
         if (ciygv._clickdupdombtn) {
@@ -2306,7 +2304,7 @@ ciyfn.objdeepmerge = function (src, desc, btop) {
                 src[key] = desc[key];
         }
     }
-    if (!desc.errmsg && src.errmsg)
+    if (desc && !desc.errmsg && src.errmsg)
         delete src.errmsg;
     return src;
 }
diff --git a/web/jscss/ciycmp.js b/web/jscss/ciycmp.js
index b7ce456..0033e39 100644
--- a/web/jscss/ciycmp.js
+++ b/web/jscss/ciycmp.js
@@ -84,7 +84,7 @@ ciyfn.file_uploads = function (maxcount, files, opn, fn) {
 						}
 						var name = gfile.name;
 						if (zipjpg > 0) {
-							var U = canvas.toDataURL("image/jpeg", zipjpg);
+							var U = canvas.toDataURL("image/jpeg", zipjpg/100);
 							if (fext != 'JPG')
 								name = gfile.name + '.jpg';
 						}
@@ -1219,7 +1219,7 @@ ciycmpfunc.ciyupload = function (opn) { // v2
 	opn.imgwidth = toint(opn.imgwidth || opn.dom.attr('imgwidth'));
 	opn.imgheight = toint(opn.imgheight || opn.dom.attr('imgheight'));
 	opn.maxsize = toint(opn.maxsize || opn.dom.attr('maxsize'));
-	opn.zipjpg = tofloat(opn.zipjpg || opn.dom.attr('zipjpg'));
+	opn.zipjpg = toint(opn.zipjpg || opn.dom.attr('zipjpg'));
 	opn.zipext = opn.zipext || opn.dom.attr('zipext') || 'jpg,png,webp';
 	if (opn.zipext)
 		opn.zipext = opn.zipext.toUpperCase().split(',');
diff --git a/web/jscss/ciycmp2.js b/web/jscss/ciycmp2.js
index 65afbea..55810ea 100644
--- a/web/jscss/ciycmp2.js
+++ b/web/jscss/ciycmp2.js
@@ -752,7 +752,10 @@ ciycmpfunc.ciymap = function (opn) {
 	var thos = this;
 	this.onchange = opn.onchange;
 	opn.initevent = opn.initevent || opn.dom.hasattr('initevent');
+	opn.bet = toint(opn.bet || opn.dom.attr('bet') || 10000000);
 	opn.mapkey = opn.mapkey || opn.dom.hasattr('mapkey');
+	if(opn.bet < 1)
+		opn.bet = 1;
 	var html = '';
 	html += '<input type="hidden" name="' + (opn.name == 'loc' ? 'lat' : opn.name + '_lat') + '"/>';
 	html += '<input type="hidden" name="' + (opn.name == 'loc' ? 'lng' : opn.name + '_lng') + '"/>';
@@ -763,15 +766,20 @@ ciycmpfunc.ciymap = function (opn) {
 	var valuedom_lng = opn.dom.children(1);
 	var showbtndom = opn.dom.children(2);
 	var showspandom = opn.dom.children(3);
+	function caldectoint(dec) {
+		if(opn.bet <= 1)
+			return dec;
+		return toint(dec * opn.bet);
+	}
 	this.setvalue = function (newvalue, from) {
 		if (typeof (newvalue) == 'object') {
-			this.value.lat = tofloat(newvalue.lat);
-			this.value.lng = tofloat(newvalue.lng);
+			this.value.lat = newvalue.lat;
+			this.value.lng = newvalue.lng;
 		} else if (newvalue !== undefined) {
 			var ll = (newvalue + '').split(',');
 			if (ll.length > 1) {
-				this.value.lat = tofloat(ll[0]);
-				this.value.lng = tofloat(ll[1]);
+				this.value.lat = ll[0];
+				this.value.lng = ll[1];
 			}
 		}
 		valuedom_lat.val(this.value.lat);
@@ -792,11 +800,11 @@ ciycmpfunc.ciymap = function (opn) {
 			title: '选择地图位置'
 			, width: 'max'
 			, height: 'max'
-			, frame: '/jscss/map_loc.html?edit=true&addr=' + opn.mapkey + '&lat=' + thos.value.lat + "&lng=" + thos.value.lng
+			, frame: '/jscss/map_loc.html?edit=true&addr=' + opn.mapkey + '&lat=' + thos.value.lat / opn.bet + "&lng=" + thos.value.lng / opn.bet
 			, cb: function (opnmap) {
 				opnmap.close();
-				thos.value.lat = opnmap.inputs.lat;
-				thos.value.lng = opnmap.inputs.lng;
+				thos.value.lat = caldectoint(opnmap.inputs.lat);
+				thos.value.lng = caldectoint(opnmap.inputs.lng);
 				thos.setvalue(undefined, 'select');
 			}
 		});
@@ -1041,8 +1049,7 @@ ciycmpfunc.ciymarkdown = function (opn) {
 	else
 		opn.width = '418px';
 	opn.maxsize = toint(opn.maxsize || opn.dom.attr('maxsize'));
-	opn.zipjpg = tofloat(opn.zipjpg || opn.dom.attr('zipjpg'));
-	opn.zipext = tofloat(opn.zipext || opn.dom.attr('zipext'));
+	opn.zipjpg = toint(opn.zipjpg || opn.dom.attr('zipjpg'));
 	opn.waterfont = opn.waterfont || opn.dom.attr('waterfont') || '28px Arial';
 	opn.watertext = opn.watertext || opn.dom.attr('watertext') || '';
 	opn.fileext = (opn.fileext || opn.dom.attr('fileext') || '.pdf,.zip,.docx,.doc,.pptx,.ppt,.xlsx,.xls,.txt,.rar,.7z,.tar,.glb').toLowerCase().split(',');
diff --git a/web/jscss/ciytable.js b/web/jscss/ciytable.js
index 3bfba11..d9fabc4 100644
--- a/web/jscss/ciytable.js
+++ b/web/jscss/ciytable.js
@@ -44,7 +44,7 @@ ciyclass.cardtable = function (opn) {
         this.post.count = this.cachecount;
         ciyfn.callfunc(opn.url, this.post, function (json) {
             thos.post.once = false;
-            thos.json = json;
+            thos.json = ciyfn.objdeepmerge(thos.json, json);
             if (json.once)
                 thos.once = json.once;
             if (typeof (opn.fn_beforedata) == 'function')
@@ -200,7 +200,7 @@ ciyclass.table = function (opn) {
             thos.post.once = false;
             if (json.once)
                 thos.once = json.once;
-            thos.json = json;
+            thos.json = ciyfn.objdeepmerge(thos.json, json);
             if (json.count > -1)
                 thos.cachecount = json.count;
             else if (thos.cachecount > -1)
@@ -439,8 +439,8 @@ ciyclass.table = function (opn) {
         }
         ciyfn._table_fillpage(_pagedom, json, opn.btncolumnset == 1);
         $5('th>i.sort', this.dom).removeClass('js').removeClass('db');
-        if (json.where) {
-            $5('i[data-order="' + json.where.order + '"]', this.dom).addClass('sort').addClass('db');
+        if (json.searchwhere) {
+            $5('i[data-order="' + json.searchwhere.order + '"]', this.dom).addClass('sort').addClass('db');
         }
         dataready = false;
         pubhtml(html);
@@ -483,7 +483,7 @@ ciyclass.table = function (opn) {
             if (dataori === undefined)
                 dataori = '';
             dataori = dataori + '';
-            var datashow = ciyfn.tdshow(dataori, ftf.ext, ldat, this.once, this.json);
+            var datashow = ciyfn.tdshow(key, dataori, ftf.ext, ldat, this.json);
             var fdata = undefined;
             if (typeof (opn.fn_tdcontent) == 'function')
                 fdata = opn.fn_tdcontent(key, datashow, ftf, ldat, this.json);
@@ -760,7 +760,7 @@ ciyclass.table = function (opn) {
                     if (json.total[key][0] == '_')
                         html += json.total[key].substring(1);
                     else
-                        html += ciyfn.tdshow(json.total[key], field.ext, json.total, thos.once, json);
+                        html += ciyfn.tdshow(key, json.total[key], field.ext, json.total, json);
                 }
                 html += '</div></td>';
             });
@@ -774,21 +774,21 @@ ciyfn.fillsearch = function (opn) {
     opn.data = opn.data || {};
     var urlp = ciyfn.urlparam();
     opn.more = (opn.more === undefined ? true : opn.more);
-    if (isobj(opn.data.where)) {
-        for (var w in opn.data.where) {
-            if (!opn.data.where[w])
+    if (isobj(opn.data.searchwhere)) {
+        for (var w in opn.data.searchwhere) {
+            if (!opn.data.searchwhere[w])
                 continue;
             if (w == 'liid') {
                 $5('li[data-liid]', '.search').removeClass('active');
-                $5('li[data-liid="' + opn.data.where[w] + '"]', '.search').addClass('active');
+                $5('li[data-liid="' + opn.data.searchwhere[w] + '"]', '.search').addClass('active');
             } else if (w)
-                $5('[sechr=' + w + ']', '.search').val(opn.data.where[w]);
+                $5('[sechr=' + w + ']', '.search').val(opn.data.searchwhere[w]);
         }
     }
-    if (!opn.data.once || !opn.data.once.input)
+    if (!opn.data.once || !opn.data.searchinput)
         return;
     if (opn.lidata) {
-        opn.lidata = ciyfn.filterdictdata(ciyfn.getdictdata(opn.lidata, opn.data.once), {
+        opn.lidata = ciyfn.filterdictdata(ciyfn.getdictdata(opn.lidata, opn.data), {
             limit: opn.lilimit
             , filter: opn.lifilter
             , rename: opn.lirename
@@ -813,9 +813,9 @@ ciyfn.fillsearch = function (opn) {
     if (inpsdom.length == 0)
         return console.warn('search input not found');
     inpsdom.children().remove();
-    for (var idx in opn.data.once.input) {
+    for (var idx in opn.data.searchinput) {
         var html = '';
-        var sp = opn.data.once.input[idx];
+        var sp = opn.data.searchinput[idx];
         var name = sp.form;
         if (sp.type == 'hidden') {
             html = '<input type="hidden" name="' + name + '" value="' + sp.def + '" />';
@@ -844,7 +844,7 @@ ciyfn.fillsearch = function (opn) {
             if (sp.type == 'radio')
                 html += '<ciy-radio sechr="' + name + '" com="' + name + '" value="' + val + '"' + prop + '></ciy-radio>';
             sp.def = sp.def || '';
-            seldata = ciyfn.filterdictdata(ciyfn.getdictdata(sp.select, opn.data.once), {
+            seldata = ciyfn.filterdictdata(ciyfn.getdictdata(sp.select, opn.data), {
                 limit: sp.limit
                 , first: sp.first
                 , filter: sp.filter
@@ -1003,7 +1003,7 @@ ciyfn._table_eventpage = function (_pagedom, thos) {
             var values = [];
             for (var i = 0; i < thdoms.length; i++) {
                 var key = thdoms[i].getAttribute('data-field');
-                if(key === null)
+                if (key === null)
                     continue;
                 range.push({ id: key, name: thdoms[i].textContent });
                 if (isarray(localset.thhide)) {
@@ -1230,72 +1230,80 @@ ciyfn.table_exportxls = function (func, table, fn_success) {
         }
     });
 }
-ciyfn.tdshow = function (dataori, ext, linedata, once, json, isview) {
-    function numunit(num, bet, pstr, defunit, data) {
-        var ind = pstr.indexOf(',');
-        if (ind > -1) {
-            defunit = pstr.substring(ind + 1);
-            pstr = pstr.substring(0, ind);
-        }
-        if (data && data[defunit])
-            defunit = data[defunit];
-        num = num / bet;
-        var unitarr = defunit.split('|');
-        var u1 = toint(unitarr[1]);
-        var u2 = toint(unitarr[3]);
-        var unit = unitarr[0];
-        if (u1 > 0 && u2 > 0) {
-            if (num >= u1 * u2) {
-                num = num / u1 / u2;
-                unit = unitarr[4];
-            } else if (num >= u1) {
-                num = num / u1;
-                unit = unitarr[2];
-            }
-        } else if (u1 > 0) {
-            if (num >= u1) {
-                num = num / u1;
-                unit = unitarr[2];
-            }
-        }
-        var cns = (ciyfn.tofix(num, toint(pstr)) + '').split('.');
-        var ret = cns[0].replace(/\d{1,3}(?=(\d{3})+$)/g, '$&,');
-        if (cns.length > 1)
-            ret += '<span style="font-size:0.7em;">.' + cns[1] + '</span> ';
-        ret += ciyfn.lang(unit);
-        return ret;
+ciyfn.tonumunit = function (num, bet, pstr, defunit, data) {
+    var ind = pstr.indexOf(',');
+    if (ind > -1) {
+        defunit = pstr.substring(ind + 1);
+        pstr = pstr.substring(0, ind);
     }
-    function numbet(num, fixlen, bet, unit) {
-        var unitarr = unit.split('.');
-        var betarr = bet.split('.');
-        num = toint(num);
-        var betidx = 0;
-        for (var i = betarr.length - 1; i >= 0; i--) {
-            if (num / betarr[i] >= 0.1) {
-                if (betarr[i] >= 1000 && num % parseInt(betarr[i] / 1000) == 0) {
-                    betidx = i;
-                    break;
-                }
-            }
-            if (num != 0 && num % betarr[i] == 0) {
+    if (data && data[defunit])
+        defunit = data[defunit];
+    num = num / bet;
+    var unitarr = defunit.split('|');
+    var u1 = toint(unitarr[1]);
+    var u2 = toint(unitarr[3]);
+    var unit = unitarr[0];
+    if (u1 > 0 && u2 > 0) {
+        if (num >= u1 * u2) {
+            num = num / u1 / u2;
+            unit = unitarr[4];
+        } else if (num >= u1) {
+            num = num / u1;
+            unit = unitarr[2];
+        }
+    } else if (u1 > 0) {
+        if (num >= u1) {
+            num = num / u1;
+            unit = unitarr[2];
+        }
+    }
+    var cns = (ciyfn.tofix(num, toint(pstr)) + '').split('.');
+    var ret = cns[0].replace(/\d{1,3}(?=(\d{3})+$)/g, '$&,');
+    if (cns.length > 1)
+        ret += '<span style="font-size:0.7em;">.' + cns[1] + '</span> ';
+    ret += ciyfn.lang(unit);
+    return ret;
+}
+ciyfn.tonumbet = function (num, fixlen, bet, unit) {
+    var unitarr = unit.split('.');
+    var betarr = bet.split('.');
+    num = toint(num);
+    var betidx = 0;
+    for (var i = betarr.length - 1; i >= 0; i--) {
+        if (num / betarr[i] >= 0.1) {
+            if (betarr[i] >= 1000 && num % parseInt(betarr[i] / 1000) == 0) {
                 betidx = i;
                 break;
             }
         }
-        num = num / betarr[betidx];
-        var cns = (ciyfn.tofix(num, toint(fixlen)) + '').split('.');
-        var ret = cns[0].replace(/\d{1,3}(?=(\d{3})+$)/g, '$&,');
-        if (cns.length > 1)
-            ret += '<span style="font-size:0.7em;">.' + cns[1] + '</span> ';
-        var unit = unitarr[betidx];
-        if (unit.substring(0, 1) == '*')
-            unit = unit.substring(1);
-        ret += ciyfn.lang(unit);
-        return ret;
+        if (num != 0 && num % betarr[i] == 0) {
+            betidx = i;
+            break;
+        }
     }
+    num = num / betarr[betidx];
+    var cns = (ciyfn.tofix(num, toint(fixlen)) + '').split('.');
+    var ret = cns[0].replace(/\d{1,3}(?=(\d{3})+$)/g, '$&,');
+    if (cns.length > 1)
+        ret += '<span style="font-size:0.7em;">.' + cns[1] + '</span> ';
+    var unit = unitarr[betidx];
+    if (unit.substring(0, 1) == '*')
+        unit = unit.substring(1);
+    ret += ciyfn.lang(unit);
+    return ret;
+}
+ciyfn.tdshow = function (fieldname, dataori, ext, linedata, json, isview) {
     if (!ext)
         return dataori;
     var datashow = '';
+    var preext = ext.substring(0, 6);
+    if (preext == 'FILEMD') {
+        if (dataori == 0)
+            return '--';
+        if (!isview)
+            return 'V' + dataori;
+        return '<div data-mdver="' + dataori + '" style="padding-right:0.5em;"><!--mdver--></div>';
+    }
     var preext = ext.substring(0, 5);
     if (preext == 'FSIZE') {
         var pint = toint(ext.substring(6));
@@ -1312,13 +1320,14 @@ ciyfn.tdshow = function (dataori, ext, linedata, once, json, isview) {
     if (preext == 'METRE') {
         if (dataori == 0)
             return '--';
-        return numunit(dataori, 1000, ext.substring(6), '米|1000|公里');
+        return ciyfn.tonumunit(dataori, 1000, ext.substring(6), '米|1000|公里');
     }
     preext = ext.substring(0, 4);
     if (preext == 'DATE') {
         if (dataori == 0)
             return '--';
-        return ciyfn.todatetime(dataori, ext.substring(5));
+        var pstr = ext.substring(5);
+        return ciyfn.todatetime(dataori, pstr);
     }
     if (preext == 'TIME') {
         if (dataori == 0)
@@ -1329,7 +1338,7 @@ ciyfn.tdshow = function (dataori, ext, linedata, once, json, isview) {
         if (dataori == 0)
             return '--';
         var pstr = ext.substring(4) || '4';
-        return numunit(dataori, 10000, pstr, '|1000000|万');
+        return ciyfn.tonumunit(dataori, 10000, pstr, '|1000000|万');
     }
     if (preext == 'WCNY') {
         if (dataori == 0)
@@ -1337,7 +1346,7 @@ ciyfn.tdshow = function (dataori, ext, linedata, once, json, isview) {
         var pstrs = ext.substring(5).split(',');
         if (!pstrs[1])
             pstrs[1] = '元';
-        return numunit(dataori, 1000000, pstrs[0], '万' + pstrs[1] + '|10000|亿' + pstrs[1]);
+        return ciyfn.tonumunit(dataori, 1000000, pstrs[0], '万' + pstrs[1] + '|10000|亿' + pstrs[1]);
     }
     if (preext == 'DOWN') {
         if (!dataori)
@@ -1407,7 +1416,7 @@ ciyfn.tdshow = function (dataori, ext, linedata, once, json, isview) {
     }
     if (preext == 'CATA' || preext == 'CATU') {
         var pstr = ext.substring(5);
-        var catas = ciyfn.getdictdata(pstr, once, json);
+        var catas = ciyfn.getdictdata(pstr, json);
         if (dataori == 0)
             return '--';
         if (!isarray(catas))
@@ -1436,7 +1445,7 @@ ciyfn.tdshow = function (dataori, ext, linedata, once, json, isview) {
         }
         if (dataori == '')
             return '--';
-        var catas = ciyfn.getdictdata(pstr, once, json);
+        var catas = ciyfn.getdictdata(pstr, json);
         if (!isarray(catas))
             return dataori + "!";
         var vals = dataori.split(',');
@@ -1466,7 +1475,7 @@ ciyfn.tdshow = function (dataori, ext, linedata, once, json, isview) {
         }
         if (dataori == '')
             return '--';
-        var catas = ciyfn.getdictdata(pstr, once, json);
+        var catas = ciyfn.getdictdata(pstr, json);
         if (!isarray(catas))
             return dataori + "!";
         var mdatas = ciyfn.mcode(catas, dataori);
@@ -1491,7 +1500,7 @@ ciyfn.tdshow = function (dataori, ext, linedata, once, json, isview) {
         }
         if (dataori == '')
             return '--';
-        var catas = ciyfn.getdictdata(pstr, once, json);
+        var catas = ciyfn.getdictdata(pstr, json);
         if (!isarray(catas))
             return dataori + "!";
         var pstrs = {};
@@ -1508,7 +1517,7 @@ ciyfn.tdshow = function (dataori, ext, linedata, once, json, isview) {
     }
     if (preext == 'TINT') {
         var pstr = ext.substring(5);
-        var catas = ciyfn.getdictdata(pstr, once, json);
+        var catas = ciyfn.getdictdata(pstr, json);
         if (dataori == 0)
             return '--';
         if (!isarray(catas))
@@ -1529,7 +1538,7 @@ ciyfn.tdshow = function (dataori, ext, linedata, once, json, isview) {
         var pstrs = ext.substring(4).split(',');
         pstrs[0] = pstrs[0] || '元.万元.亿元';
         pstrs[1] = pstrs[1] || '2';
-        return numbet(dataori, pstrs[1], '100.1000000.10000000000', pstrs[0]);
+        return ciyfn.tonumbet(dataori, pstrs[1], '100.1000000.10000000000', pstrs[0]);
     }
     if (preext == 'SNY') {
         if (dataori == 0)
@@ -1537,7 +1546,7 @@ ciyfn.tdshow = function (dataori, ext, linedata, once, json, isview) {
         var pstrs = ext.substring(4).split(',');
         pstrs[0] = pstrs[0] || '.K.M.B.T.Q';
         pstrs[1] = pstrs[1] || '2';
-        return numbet(dataori, pstrs[1], '100.100000.100000000.100000000000.100000000000000', pstrs[0]);
+        return ciyfn.tonumbet(dataori, pstrs[1], '100.100000.100000000.100000000000.100000000000000', pstrs[0]);
     }
     if (preext == 'WGT') {
         if (dataori == 0)
@@ -1545,7 +1554,7 @@ ciyfn.tdshow = function (dataori, ext, linedata, once, json, isview) {
         var pstrs = ext.substring(4).split(',');
         pstrs[0] = pstrs[0] || '克.千克.吨';
         pstrs[1] = pstrs[1] || '2';
-        return numbet(dataori, pstrs[1], '1.1000.1000000', pstrs[0]);
+        return ciyfn.tonumbet(dataori, pstrs[1], '1.1000.1000000', pstrs[0]);
     }
     if (preext == 'LGH') {
         if (dataori == 0)
@@ -1553,7 +1562,7 @@ ciyfn.tdshow = function (dataori, ext, linedata, once, json, isview) {
         var pstrs = ext.substring(4).split(',');
         pstrs[0] = pstrs[0] || '厘米.米.公里';
         pstrs[1] = pstrs[1] || '2';
-        return numbet(dataori, pstrs[1], '10.1000.1000000', pstrs[0]);
+        return ciyfn.tonumbet(dataori, pstrs[1], '10.1000.1000000', pstrs[0]);
     }
     if (preext == 'BET') {
         if (dataori == 0)
@@ -1561,7 +1570,7 @@ ciyfn.tdshow = function (dataori, ext, linedata, once, json, isview) {
         var pstrs = ext.substring(4).split(',');
         pstrs[1] = pstrs[1] || '100';
         pstrs[2] = pstrs[2] || '2';
-        return numbet(dataori, pstrs[2], pstrs[1], pstrs[0]);
+        return ciyfn.tonumbet(dataori, pstrs[2], pstrs[1], pstrs[0]);
     }
     if (preext == 'CYC') {
         if (dataori == 0)
@@ -1634,13 +1643,13 @@ ciyfn.tdshow = function (dataori, ext, linedata, once, json, isview) {
     if (preext == 'TON') {
         if (dataori == 0)
             return '--';
-        return numunit(dataori, 1000000, ext.substring(4), '吨|10000|万吨');
+        return ciyfn.tonumunit(dataori, 1000000, ext.substring(4), '吨|10000|万吨');
     }
     if (preext == 'PCT') {
         if (dataori == 0)
             return '--';
         var pstr = ext.substring(4) || '2';
-        return numunit(dataori, 100, pstr, '%');
+        return ciyfn.tonumunit(dataori, 100, pstr, '%');
     }
     if (preext == 'CNY') {
         if (dataori == 0)
@@ -1649,23 +1658,27 @@ ciyfn.tdshow = function (dataori, ext, linedata, once, json, isview) {
         pstrs[0] = pstrs[0] || '2';
         if (!pstrs[1])
             pstrs[1] = '元';
-        return numunit(dataori, 100, pstrs[0], pstrs[1] + '|10000|万' + pstrs[1]);
+        return ciyfn.tonumunit(dataori, 100, pstrs[0], pstrs[1] + '|10000|万' + pstrs[1]);
     } if (preext == 'LOC') {
         var pstr = ext.substring(4);
         if (pstr.length == 0)
             pstr = 'lat';
+        var pstrs = pstr.split(',');
         var lng = tofloat(dataori);
-        var lat = tofloat(linedata[pstr]);
+        var lat = tofloat(linedata[pstrs[0]]);
+        var bet = 10000000;
+        if (pstrs.length > 1)
+            bet = toint(pstrs[1]);
         if (ciyfn.isfloat0(lng) && ciyfn.isfloat0(lat))
             return '--';
-        return '<a onclick="ciyfn.showmap(' + lat + ',' + lng + ',10)">' + ciyfn.lang('打开地图') + '</a>';
+        return '<a onclick="ciyfn.showmap(' + lat / bet + ',' + lng / bet + ',10)">' + ciyfn.lang('打开地图') + '</a>';
     }
     if (preext == 'NUM') { //小数处理  -3 整数或保留3位小数  3只保留3位小数   空 整数    小数去掉.9999999和.0000001
         var dnum = tofloat(dataori);
         if (Math.abs(dnum - Math.round(dnum)) < 0.00001) {
             dnum = Math.round(dnum);
         }
-        return numunit(dnum, 1, ext.substring(4), '', linedata);
+        return ciyfn.tonumunit(dnum, 1, ext.substring(4), '', linedata);
     }
     if (preext == 'URL') {
         var pstr = ext.substring(4);
@@ -1696,20 +1709,18 @@ ciyfn.tdshow = function (dataori, ext, linedata, once, json, isview) {
     if (preext == 'KG') {
         if (dataori == 0)
             return '--';
-        return numunit(dataori, 1000, ext.substring(3), 'KG|1000|吨');
+        return ciyfn.tonumunit(dataori, 1000, ext.substring(3), 'KG|1000|吨');
     }
     if (preext == 'TC') {
         if (dataori == 0)
             return '--';
-        return numunit(dataori, 1000, ext.substring(3), '℃');
+        return ciyfn.tonumunit(dataori, 1000, ext.substring(3), '℃');
     }
     if (preext == 'DB') {
         if (dataori == 0)
             return '--';
         var pstr = ext.substring(3);
         var catas = null;
-        if (once)
-            catas = once[pstr];
         if (!catas)
             catas = json[pstr];
         if (!isarray(catas))
@@ -1735,7 +1746,7 @@ ciyfn.tdshow = function (dataori, ext, linedata, once, json, isview) {
     if (preext == 'MD') {
         if (!dataori)
             return '';
-        return ciyfn.markdown(dataori);
+        return '<div style="padding-right:0.5em;">' + ciyfn.markdown(dataori) + '</div>';
     }
     return dataori;
 };
\ No newline at end of file
diff --git a/web/jscss/style.css b/web/jscss/style.css
index 6c35df9..a5c0762 100644
--- a/web/jscss/style.css
+++ b/web/jscss/style.css
@@ -1552,35 +1552,35 @@ textarea[disabled], select[disabled], input[disabled], input[disabled]+i, .btn.d
     padding-left: 0.5em;
 }
 
-.char9 .ciy-form>label {
+.char9 .ciy-form>label,.ciy-form.char9>label {
     min-width: 9.5em;
 }
 
-.char8 .ciy-form>label {
+.char8 .ciy-form>label,.ciy-form.char8>label {
     min-width: 8.5em;
 }
 
-.char7 .ciy-form>label {
+.char7 .ciy-form>label,.ciy-form.char7>label {
     min-width: 7.5em;
 }
 
-.char6 .ciy-form>label {
+.char6 .ciy-form>label,.ciy-form.char6>label {
     min-width: 6.5em;
 }
 
-.char5 .ciy-form>label {
+.char5 .ciy-form>label,.ciy-form.char5>label {
     min-width: 5.5em;
 }
 
-.char4 .ciy-form>label {
+.char4 .ciy-form>label,.ciy-form.char4>label {
     min-width: 4.5em;
 }
 
-.char3 .ciy-form>label {
+.char3 .ciy-form>label,.ciy-form.char3>label {
     min-width: 3.5em;
 }
 
-.char2 .ciy-form>label {
+.char2 .ciy-form>label,.ciy-form.char2>label {
     min-width: 2.5em;
 }
 
@@ -2203,7 +2203,7 @@ textarea.tran:focus, select.tran:focus, input.tran:focus {
 .md-content {
     font-size: 1.1em;
     text-indent: 1em;
-    padding: 0.3em 1em;
+    padding: 0.3em 0;
     line-height: 2em;
     white-space: pre-wrap;
 }
diff --git a/web/z/index.php b/web/z/index.php
index 1b0fd0a..d2b83c1 100644
--- a/web/z/index.php
+++ b/web/z/index.php
@@ -43,8 +43,8 @@ if (!empty($qstr)) {
             die;
         }
     }
-    if ($retarr === 'html')
-        die;
+    if(!is_array($retarr))
+        die('{"errmsg":"无succ返回值"}');
     if ($retarr['code'] == 302) {
         header('Location: ' . $retarr['redirect']);
         die;
diff --git a/zciyphp/comm.php b/zciyphp/comm.php
index 71478f7..3d5dadb 100644
--- a/zciyphp/comm.php
+++ b/zciyphp/comm.php
@@ -136,7 +136,7 @@ function tostr($str = '') {
 function toint($str = 0) {
     if (!$str)
         return 0;
-    if(!is_numeric($str))
+    if (!is_numeric($str))
         return 0;
     return intval(round($str));
 }
@@ -807,20 +807,11 @@ function savelogfile($types, $msg, $isrequest = false) {
  * 将调用json_函数名(){}
  * 函数返回array数组。
  */
-function _getmemvar($db, $types, $defvalue = '') {
-    if (function_exists('getmemvar'))
-        return getmemvar($db, $types, $defvalue);
-    return $defvalue;
-}
 function _setmemvar($db, $types, $value) {
-    if (function_exists('setmemvar'))
-        return setmemvar($db, $types, $value);
+    // if (function_exists('setmemvar'))
+    //     return setmemvar($db, $types, $value);
     return false;
 }
-function _delmemvar($db, $types) {
-    if (function_exists('delmemvar'))
-        return delmemvar($db, $types);
-}
 function ciy_ouputJSON($retarr, $ms = 0, $uri = '') {
     global $db;
     global $_token;
@@ -1074,6 +1065,17 @@ function fileload($dfile) {
     }
     return '';
 }
+//存储文本到文件
+function storsave($filename, $text) {
+    if (!$filename || !$text)
+        return false;
+    $filename = str_replace('{Y}', date('Y'), $filename);
+    $filename = str_replace('{m}', date('m'), $filename);
+    $filename = str_replace('{d}', date('d'), $filename);
+    if (substr($filename, 0, 1) == '/')
+        $filename = PATH_WEB . 'ud' . $filename;
+    return filesave($filename, $text);
+}
 function webini($section) {
     if (!file_exists(PATH_ROOT . 'web.ini'))
         return 'INI file nofind:' . PATH_ROOT . 'web.ini';
diff --git a/zciyphp/db.php b/zciyphp/db.php
index d7d4343..7ba4ca9 100644
--- a/zciyphp/db.php
+++ b/zciyphp/db.php
@@ -35,15 +35,16 @@
  * 
  * 变量名取名尽量用s尾缀区分，建议getone函数使用$xxrow，get函数使用$xxrows。
  */
+
 namespace ciy;
 
 class db { //单数据库版
     public $linkdb; //写服务器驱动层类实例。
     public $dbpst;
     public $error;
+    public $pf;
     public $lock;
 
-
     function __construct($dbpst = '') {
         $this->linkdb = false;
         $this->dbpst = $dbpst;
@@ -59,7 +60,7 @@ class db { //单数据库版
         $cfg = webini('db' . $this->dbpst);
         if (is_string($cfg))
             die($cfg);
-        $this->linkdb = new pdo($cfg);
+        $this->linkdb = new pdo($cfg, $this->pf);
         $this->linkdb->connect();
         return $this->linkdb;
     }
@@ -125,7 +126,7 @@ class db { //单数据库版
      * $row['username']...
      * }
      */
-    function get($csql, &$rowcount = -1) { //$pageno=null 查询全部
+    function get($csql, &$rowcount = 0) { //$pageno=null 查询全部
         $sql = $csql->buildsql();
         $limit = $csql->limit;
         if ($this->lock)
@@ -310,6 +311,17 @@ class db { //单数据库版
             $this->error = $this->linkdb->error;
         return $ret;
     }
+    function trace($pf, $rsuser = null) { //traceid全链路跟踪
+        if (!preg_match('/^[A-Z]{2}\d{13}_\d{8}$/', $pf)) //防止前端攻击
+            $pf = 'ER' . time() . '000_' . rand(10000000, 99999999);
+        $time = substr($pf, 2, 10);
+        if (abs(time() - $time) > 10) //跟随服务器时间
+            $pf .= ',svrt=' . time();
+        if (is_array($rsuser))
+            $this->pf = $pf . ',ip=' . getip() . ',uid=' . $rsuser['id'];
+        else
+            $this->pf = $pf . ',ip=' . getip() . ',uid=no';
+    }
     function __destruct() {
     }
 }
diff --git a/zciyphp/pdo.php b/zciyphp/pdo.php
index 1e9589c..4f75b35 100644
--- a/zciyphp/pdo.php
+++ b/zciyphp/pdo.php
@@ -8,11 +8,14 @@ class pdo {
     public $error;
     public $lastsql;
     public $lastdata;
+    private $pf; //traceid全链路跟踪
     private $conn;
-    function __construct($conn) {
+    function __construct($conn, $pf = null) {
         $this->isconnected = false;
         $this->error = '';
         $this->conn = $conn;
+        $this->pf = $pf;
+        $this->conn = $conn;
     }
     function connect() {
         if ($this->isconnected)
@@ -64,6 +67,8 @@ class pdo {
     function get($type, $query, $data) {
         if (!$this->isconnected)
             return false;
+        if ($this->pf)
+            $query = '/* ' . $this->pf . ' */ ' . $query;
         $rs = $this->_prepare($query, $data);
         if ($rs === false)
             return false;
@@ -162,6 +167,8 @@ class pdo {
     function execute($query, $data) {
         if (!$this->isconnected)
             return false;
+        if ($this->pf)
+            $query = '/* ' . $this->pf . ' */ ' . $query;
         $rs = $this->_prepare($query, $data);
         if ($rs === false)
             return false;
@@ -217,7 +224,7 @@ class pdo {
                 if ($arr[0] == 'HY000' && $arr[1] == 2006) {
                     sleep(1);
                     $this->isconnected = false;
-                    if($this->connect())
+                    if ($this->connect())
                         continue;
                 }
                 return $this->errsql(false, 'SQL出错:' . $arr[2] . '[' . $arr[0] . '][' . $arr[1] . ']' . $query);