Merge remote-tracking branch 'origin/feature/wxPay' into feature/temp

# Conflicts:
#	sa-frame/menu-list-sp.js

sa-frame/menu-list-sp.js

@@ -7,11 +7,11 @@ window.menuList.unshift({
 		isShow: false, // 隐藏显示
 		info: '身份相关权限，不显示在菜单上',
 		childList: [{
-				id: '1',
-				name: '身份-超管',
-				info: '最高权限，超管身份的代表（请谨慎授权）',
-				isShow: false
-			},
+			id: '1',
+			name: '身份-超管',
+			info: '最高权限，超管身份的代表（请谨慎授权）',
+			isShow: false
+		},
 			{
 				id: '11',
 				name: '身份-普通账号',
@@ -32,11 +32,11 @@ window.menuList.unshift({
 		info: '对本系统的各种监控',
 		parent: true,
 		childList: [{
-				id: 'sql-console',
-				name: 'SQL监控台',
-				url: 'sa-view-sp/sp-console/sql-console.html',
-				info: 'sql控制台'
-			},
+			id: 'sql-console',
+			name: 'SQL监控台',
+			url: 'sa-view-sp/sp-console/sql-console.html',
+			info: 'sql控制台'
+		},
 			{
 				id: 'redis-console',
 				name: 'Redis控制台',
@@ -62,22 +62,22 @@ window.menuList.unshift({
 		icon: 'el-icon-unlock',
 		info: '对系统角色权限的分配等设计，敏感度较高，请谨慎授权',
 		childList: [{
-				id: 'admin-list',
-				name: '用户列表',
-				url: 'sa-view-sp/sp-admin/admin-list.html',
-				info: '所有管理员账号'
-			}, {
-				id: 'role-list',
-				name: '角色列表',
-				url: 'sa-view-sp/sp-role/role-list.html',
-				info: '管理系统各种角色',
-				childList: [{
-					id: 'role-add',
-					name: '添加角色',
-					info: '添加角色的权限',
-					isShow: false
-				}]
-			},
+			id: 'admin-list',
+			name: '用户列表',
+			url: 'sa-view-sp/sp-admin/admin-list.html',
+			info: '所有管理员账号'
+		}, {
+			id: 'role-list',
+			name: '角色列表',
+			url: 'sa-view-sp/sp-role/role-list.html',
+			info: '管理系统各种角色',
+			childList: [{
+				id: 'role-add',
+				name: '添加角色',
+				info: '添加角色的权限',
+				isShow: false
+			}]
+		},
 			{
 				id: 'menu-list',
 				name: '菜单列表',
@@ -117,10 +117,10 @@ window.menuList.unshift({
 				name: '隐私政策&协议',
 				url: 'sa-view/tb-agreement/tb-agreement-list.html',
 				childList: [{
-						id: 'tb-agreement-add',
-						name: '协议表添加',
-						isShow: true
-					},
+					id: 'tb-agreement-add',
+					name: '协议表添加',
+					isShow: true
+				},
 					{
 						id: 'tb-agreement-edit',
 						name: '协议表更新',
@@ -158,37 +158,37 @@ window.menuList.unshift({
 				icon: 'el-icon-school',
 				parent: true,
 				childList: [{
-						id: 'tb-trade-area',
-						icon: 'el-icon-s-management',
-						name: '场所管理',
-						url: 'sa-view/tb-trade-area/tb-trade-area-list.html',
-						childList: [{
-								id: 'tb-trade-area-add',
-								name: '添加场所',
-								isShow: false
-							},
-							{
-								id: 'tb-trade-area-edit',
-								name: '更新场所',
-								isShow: false
-							},
-							{
-								id: 'tb-trade-area-del',
-								name: '删除场所',
-								isShow: false
-							},
-						]
+					id: 'tb-trade-area',
+					icon: 'el-icon-s-management',
+					name: '场所管理',
+					url: 'sa-view/tb-trade-area/tb-trade-area-list.html',
+					childList: [{
+						id: 'tb-trade-area-add',
+						name: '添加场所',
+						isShow: false
 					},
+						{
+							id: 'tb-trade-area-edit',
+							name: '更新场所',
+							isShow: false
+						},
+						{
+							id: 'tb-trade-area-del',
+							name: '删除场所',
+							isShow: false
+						},
+					]
+				},
 					{
 						id: 'tb-group',
 						icon: 'el-icon-s-data',
 						name: '互助组管理',
 						url: 'sa-view/tb-group/tb-group-list.html',
 						childList: [{
-								id: 'tb-group-add',
-								name: '互助组添加',
-								isShow: false
-							},
+							id: 'tb-group-add',
+							name: '互助组添加',
+							isShow: false
+						},
 							{
 								id: 'tb-group-edit',
 								name: '互助组更新',
@@ -212,10 +212,10 @@ window.menuList.unshift({
 						name: '边民管理',
 						url: 'sa-view/tb-people/tb-people-list.html',
 						childList: [{
-								id: 'tb-people-add',
-								name: '边民添加',
-								isShow: false
-							},
+							id: 'tb-people-add',
+							name: '边民添加',
+							isShow: false
+						},
 							{
 								id: 'tb-people-bind-shop',
 								name: '绑定店铺',
@@ -239,10 +239,10 @@ window.menuList.unshift({
 						name: '商铺管理',
 						url: 'sa-view/tb-shop/tb-shop-list.html',
 						childList: [{
-								id: 'tb-shop-add',
-								name: '商铺添加',
-								isShow: false
-							},
+							id: 'tb-shop-add',
+							name: '商铺添加',
+							isShow: false
+						},
 							{
 								id: 'tb-shop-edit',
 								name: '商铺更新',
@@ -263,10 +263,10 @@ window.menuList.unshift({
 						icon:'el-icon-smoking',
 						url: 'sa-view/tb-goods-units/tb-goods-units-list.html',
 						childList: [{
-								id: 'tb-goods-units-add',
-								name: '计价单位添加',
-								isShow: false
-							},
+							id: 'tb-goods-units-add',
+							name: '计价单位添加',
+							isShow: false
+						},
 							{
 								id: 'tb-goods-units-edit',
 								name: '计价单位更新',
@@ -285,10 +285,10 @@ window.menuList.unshift({
 						icon:'el-icon-notebook-2',
 						url: 'sa-view/tb-goods-type/tb-goods-type-list.html',
 						childList: [{
-								id: 'tb-goods-type-add',
-								name: '商品分类添加',
-								isShow: true
-							},
+							id: 'tb-goods-type-add',
+							name: '商品分类添加',
+							isShow: true
+						},
 							{
 								id: 'tb-goods-type-edit',
 								name: '商品分类更新',
@@ -307,10 +307,10 @@ window.menuList.unshift({
 						icon:'el-icon-grape',
 						url: 'sa-view/tb-goods/tb-goods-list.html',
 						childList: [{
-								id: 'tb-goods-add',
-								name: '商品添加',
-								isShow: false
-							},
+							id: 'tb-goods-add',
+							name: '商品添加',
+							isShow: false
+						},
 							{
 								id: 'tb-goods-edit',
 								name: '商品更新',
@@ -330,10 +330,10 @@ window.menuList.unshift({
 						name: '合作社',
 						url: 'sa-view/tb-cooperative/tb-cooperative-list.html',
 						childList: [{
-								id: 'tb-cooperative-add',
-								name: '添加合作社',
-								isShow: false
-							},
+							id: 'tb-cooperative-add',
+							name: '添加合作社',
+							isShow: false
+						},
 							{
 								id: 'tb-cooperative-edit',
 								name: '更新合作社',
@@ -354,27 +354,27 @@ window.menuList.unshift({
 				parent: true,
 				icon: 'el-icon-office-building',
 				childList: [{
-						id: 'tb-purchaser',
-						icon: 'el-icon-film',
-						name: '企业收购商',
-						url: 'sa-view/tb-purchaser/tb-purchaser-list.html',
-						childList: [{
-								id: 'tb-purchaser-add',
-								name: '收购商添加',
-								isShow: false
-							},
-							{
-								id: 'tb-purchaser-edit',
-								name: '收购商更新',
-								isShow: false
-							},
-							{
-								id: 'tb-purchaser-del',
-								name: '收购商删除',
-								isShow: false
-							},
-						]
+					id: 'tb-purchaser',
+					icon: 'el-icon-film',
+					name: '企业收购商',
+					url: 'sa-view/tb-purchaser/tb-purchaser-list.html',
+					childList: [{
+						id: 'tb-purchaser-add',
+						name: '收购商添加',
+						isShow: false
 					},
+						{
+							id: 'tb-purchaser-edit',
+							name: '收购商更新',
+							isShow: false
+						},
+						{
+							id: 'tb-purchaser-del',
+							name: '收购商删除',
+							isShow: false
+						},
+					]
+				},
 					{
 						id: 'tb-purchaser-judge',
 						icon: 'el-icon-s-check',
@@ -391,10 +391,10 @@ window.menuList.unshift({
 						name: '个人收购商',
 						url: 'sa-view/tb-purchaser-personal/tb-purchaser-personal-list.html',
 						childList: [{
-								id: 'tb-purchaser-add',
-								name: '收购商添加',
-								isShow: false
-							},
+							id: 'tb-purchaser-add',
+							name: '收购商添加',
+							isShow: false
+						},
 							{
 								id: 'tb-purchaser-edit',
 								name: '收购商更新',
@@ -424,10 +424,10 @@ window.menuList.unshift({
 						name: '个体户(开票)',
 						url: 'sa-view/tb-people-tax-account/tb-people-tax-account-list.html',
 						childList: [{
-								id: 'tb-people-tax-account-add',
-								name: '个体户(开票)添加',
-								isShow: false
-							},
+							id: 'tb-people-tax-account-add',
+							name: '个体户(开票)添加',
+							isShow: false
+						},
 							{
 								id: 'tb-people-tax-account-edit',
 								name: '个体户(开票)更新',
@@ -452,37 +452,37 @@ window.menuList.unshift({
 		icon: 'el-icon-mobile-phone',
 		parent: true,
 		childList: [{
-				id: 'app-menu',
-				icon: 'el-icon-s-operation',
-				name: '菜单管理',
-				url: 'sa-view/app-menu/app-menu-list.html',
-				childList: [{
-						id: 'app-menu-add',
-						name: 'app菜单管理添加',
-						isShow: false
-					},
-					{
-						id: 'app-menu-edit',
-						name: 'app菜单管理更新',
-						isShow: false
-					},
-					{
-						id: 'app-menu-del',
-						name: 'app菜单管理删除',
-						isShow: false
-					},
-				]
+			id: 'app-menu',
+			icon: 'el-icon-s-operation',
+			name: '菜单管理',
+			url: 'sa-view/app-menu/app-menu-list.html',
+			childList: [{
+				id: 'app-menu-add',
+				name: 'app菜单管理添加',
+				isShow: false
 			},
+				{
+					id: 'app-menu-edit',
+					name: 'app菜单管理更新',
+					isShow: false
+				},
+				{
+					id: 'app-menu-del',
+					name: 'app菜单管理删除',
+					isShow: false
+				},
+			]
+		},
 			{
 				id: 'app-role',
 				icon: 'el-icon-postcard',
 				name: '角色管理',
 				url: 'sa-view/app-role/app-role-list.html',
 				childList: [{
-						id: 'app-role-add',
-						name: '添加',
-						isShow: false
-					},
+					id: 'app-role-add',
+					name: '添加',
+					isShow: false
+				},
 					{
 						id: 'app-role-edit',
 						name: '更新',
@@ -501,10 +501,10 @@ window.menuList.unshift({
 				name: '账号管理',
 				url: 'sa-view/app-user/app-user-list.html',
 				childList: [{
-						id: 'app-user-add',
-						name: '添加',
-						isShow: false
-					},
+					id: 'app-user-add',
+					name: '添加',
+					isShow: false
+				},
 					{
 						id: 'app-user-edit',
 						name: '更新',
@@ -523,10 +523,10 @@ window.menuList.unshift({
 				icon: 'el-icon-apple',
 				url: 'sa-view/tb-app/tb-app-list.html',
 				childList: [{
-						id: 'tb-app-add',
-						name: 'APK管理添加',
-						isShow: false
-					},
+					id: 'tb-app-add',
+					name: 'APK管理添加',
+					isShow: false
+				},
 					{
 						id: 'tb-app-edit',
 						name: 'APK管理更新',
@@ -545,10 +545,10 @@ window.menuList.unshift({
 				icon:'el-icon-document',
 				url: 'sa-view/tb-port-news/tb-port-news-list.html',
 				childList: [{
-						id: 'tb-port-news-add',
-						name: '口岸资讯添加',
-						isShow: true
-					},
+					id: 'tb-port-news-add',
+					name: '口岸资讯添加',
+					isShow: true
+				},
 					{
 						id: 'tb-port-news-edit',
 						name: '口岸资讯更新',
@@ -567,10 +567,10 @@ window.menuList.unshift({
 				icon: 'el-icon-receiving',
 				url: 'sa-view/tb-message/tb-message-list.html',
 				childList: [{
-						id: 'tb-message-add',
-						name: '通知消息添加',
-						isShow: false
-					},
+					id: 'tb-message-add',
+					name: '通知消息添加',
+					isShow: false
+				},
 					{
 						id: 'tb-message-edit',
 						name: '通知消息更新',
@@ -583,17 +583,17 @@ window.menuList.unshift({
 					},
 				]
 			},
-			
+
 			{
 				id: 'tb-banner',
 				name: '轮播图',
 				icon:'el-icon-picture-outline',
 				url: 'sa-view/tb-banner/tb-banner-list.html',
 				childList: [{
-						id: 'tb-banner-add',
-						name: '轮播图添加',
-						isShow: true
-					},
+					id: 'tb-banner-add',
+					name: '轮播图添加',
+					isShow: true
+				},
 					{
 						id: 'tb-banner-edit',
 						name: '轮播图更新',
@@ -624,168 +624,190 @@ window.menuList.unshift({
 		parent: true,
 		icon: 'el-icon-s-unfold',
 		childList: [{
-				id: 'level-one-market',
-				icon: 'el-icon-school',
-				name: '一级市场',
+			id: 'level-one-market',
+			icon: 'el-icon-school',
+			name: '一级市场',
+			parent: true,
+			childList: [{
+				id: 'listing-manage',
+				name: '上架管理',
+				icon: 'el-icon-shopping-cart-full',
 				parent: true,
 				childList: [{
-						id: 'listing-manage',
-						name: '上架管理',
-						icon: 'el-icon-shopping-cart-full',
-						parent: true,
-						childList: [{
-							id: 'listing-management',
-							name: '整车订单',
-							icon: 'el-icon-notebook-2',
-							url: 'sa-view/listing-management/listing-management.html',
-							childList: [{
-								id: 'tb-order-edit-price',
-								name: '修改上架金额',
-								isShow: false
-							}]
-						}]
-					},
+					id: 'listing-management',
+					name: '整车订单',
+					icon: 'el-icon-notebook-2',
+					url: 'sa-view/listing-management/listing-management.html',
+					childList: [{
+						id: 'tb-order-edit-price',
+						name: '修改上架金额',
+						isShow: false
+					}]
+				}]
+			},
 
-					{
-						id: 'level-order',
-						name: '交易订单',
-						icon: 'el-icon-s-operation',
-						parent: true,
+				{
+					id: 'level-order',
+					name: '交易订单',
+					icon: 'el-icon-s-operation',
+					parent: true,
+					childList: [{
+						id: 'ht-trade-settlement',
+						name: '进境结算单',
+						icon: 'el-icon-s-home',
+						url: 'sa-view/ht-trade-settlement/ht-trade-settlement-list.html',
 						childList: [{
-								id: 'ht-trade-settlement',
-								name: '进境结算单',
-								icon: 'el-icon-s-home',
-								url: 'sa-view/ht-trade-settlement/ht-trade-settlement-list.html',
-								childList: [{
-										id: 'ht-trade-settlement-add',
-										name: '添加订单',
-										isShow: false
-									},
-									{
-										id: 'ht-trade-settlement-edit',
-										name: '修改订单',
-										isShow: false
-									},
-									{
-										id: 'tb-order-edit-price',
-										name: '修改上架金额',
-										isShow: false
-									},
-									{
-										id: 'ht-trade-settlement-hzsconfirm',
-										name: '互助社确认',
-										isShow: false
-									},
-								]
+							id: 'ht-trade-settlement-add',
+							name: '添加订单',
+							isShow: false
+						},
+							{
+								id: 'ht-trade-settlement-edit',
+								name: '修改订单',
+								isShow: false
 							},
 							{
-								id: 'tb-order',
-								name: '边民购买订单',
-								icon: 'el-icon-s-custom',
-								url: 'sa-view/tb-order/tb-order-list.html',
-								childList: [{
-										id: 'tb-order-edit',
-										name: '修改订单',
-										isShow: false
-									},
-									{
-										id: 'tb-order-del',
-										name: '删除订单',
-										isShow: false
-									},
-									{
-										id: 'bank-info',
-										name: '银行回执',
-										isShow: false
-									},
-									{
-										id: 'tb-order-deduction',
-										name: '订单扣款',
-										isShow: false
-									},
-									{
-										id: 'tb-order-send009',
-										name: '补推009',
-										isShow: false
-									},
-									{
-										id: 'tb-order-sendCXB001',
-										name: '推送结关',
-										isShow: false
-									},
-								]
+								id: 'tb-order-edit-price',
+								name: '修改上架金额',
+								isShow: false
 							},
 							{
-								id: 'tb-import-order',
-								name: '进口申报单',
-								icon: 'el-icon-s-unfold',
-								url: 'sa-view/tb-import-order/tb-import-order-list.html',
-								childList: [{
-										id: 'tb-import-order-add',
-										name: '订单添加',
-										isShow: false
-									},
-									{
-										id: 'tb-import-order-edit',
-										name: '订单更新',
-										isShow: false
-									},
-									{
-										id: 'tb-import-order-del',
-										name: '订单删除',
-										isShow: false
-									},
-								]
+								id: 'ht-trade-settlement-hzsconfirm',
+								name: '互助社确认',
+								isShow: false
 							},
 						]
 					},
-					{
-						id: 'returns-chargebacks-list',
-						name: '退运/单管理',
-						parent: true,
-						icon: 'el-icon-position',
-						childList: [{
-								id: 'ht-returns-settlement',
-								name: '退运订单',
-								icon: 'el-icon-c-scale-to-original',
-								url: 'sa-view/ht-settlement-error/ht-trade-returns-list.html'
-							},
-							{
-								id: 'ht-chargebacks-settlement',
-								name: '退单订单',
-								icon: 'el-icon-date',
-								url: 'sa-view/ht-settlement-error/ht-trade-chargebacks-list.html'
+						{
+							id: 'tb-order',
+							name: '边民购买订单',
+							icon: 'el-icon-s-custom',
+							url: 'sa-view/tb-order/tb-order-list.html',
+							childList: [{
+								id: 'tb-order-edit',
+								name: '修改订单',
+								isShow: false
 							},
+								{
+									id: 'tb-order-del',
+									name: '删除订单',
+									isShow: false
+								},
+								{
+									id: 'bank-info',
+									name: '银行回执',
+									isShow: false
+								},
+								{
+									id: 'tb-order-deduction',
+									name: '订单扣款',
+									isShow: false
+								},
+								{
+									id: 'tb-order-send009',
+									name: '补推009',
+									isShow: false
+								},
+								{
+									id: 'tb-order-sendCXB001',
+									name: '推送结关',
+									isShow: false
+								},
+							]
+						},
+						{
+							id: 'tb-import-order',
+							name: '进口申报单',
+							icon: 'el-icon-s-unfold',
+							url: 'sa-view/tb-import-order/tb-import-order-list.html',
+							childList: [{
+								id: 'tb-import-order-add',
+								name: '订单添加',
+								isShow: false
+							},
+								{
+									id: 'tb-import-order-edit',
+									name: '订单更新',
+									isShow: false
+								},
+								{
+									id: 'tb-import-order-del',
+									name: '订单删除',
+									isShow: false
+								},
+							]
+						},
+					]
+				},
+				{
+					id: 'tb-wallet-manager',
+					name: '服务点管理',
+					parent: true,
+					childList: [
+						{
+							id: 'tb-wallet-topup',
+							name: '服务点充值记录',
+							url: 'sa-view/tb-wallet-topup/tb-wallet-topup-list.html',
+						},
+						{
+							id: 'tb-wallet-topdown',
+							name: '服务点提现记录',
+							url: 'sa-view/tb-wallet-topdown/tb-wallet-topdown-list.html',
+						},
+						{
+							id: 'tb-wallet-record',
+							name: '服务掉扣除记录',
+							url: 'sa-view/tb-wallet-record/tb-wallet-record-list.html',
+						}
+					]
+				},
+				{
+					id: 'returns-chargebacks-list',
+					name: '退运/单管理',
+					parent: true,
+					icon: 'el-icon-position',
+					childList: [{
+						id: 'ht-returns-settlement',
+						name: '退运订单',
+						icon: 'el-icon-c-scale-to-original',
+						url: 'sa-view/ht-settlement-error/ht-trade-returns-list.html'
+					},
+						{
+							id: 'ht-chargebacks-settlement',
+							name: '退单订单',
+							icon: 'el-icon-date',
+							url: 'sa-view/ht-settlement-error/ht-trade-chargebacks-list.html'
+						},
 
-						]
-					},
-				]
-			},
+					]
+				},
+			]
+		},
 			{
 				id: 'order-list',
 				name: '二级市场',
 				parent: true,
 				icon: 'el-icon-office-building',
 				childList: [{
-						id: 'tb-import-order-judge',
-						name: '互助委托协议审核',
-						url: 'sa-view/tb-import-order/tb-import-order-judge.html',
-						childList: [{
-							id: 'tb-import-order-do-judge',
-							name: '审核',
-							isShow: false
-						}, ]
-					},
+					id: 'tb-import-order-judge',
+					name: '互助委托协议审核',
+					url: 'sa-view/tb-import-order/tb-import-order-judge.html',
+					childList: [{
+						id: 'tb-import-order-do-judge',
+						name: '审核',
+						isShow: false
+					}, ]
+				},
 					{
 						id: 'tb-orders',
 						name: '订单管理',
 						icon: 'el-icon-document-copy',
 						url: 'sa-view/tb-orders/tb-orders-list.html',
 						childList: [{
-								id: 'tb-orders-add',
-								name: '添加订单',
-								isShow: false
-							},
+							id: 'tb-orders-add',
+							name: '添加订单',
+							isShow: false
+						},
 							{
 								id: 'tb-orders-edit',
 								name: '修改订单',
@@ -812,37 +834,37 @@ window.menuList.unshift({
 		parent: true,
 		icon: 'el-icon-s-grid',
 		childList: [{
-				id: 'tb-driver',
-				icon: 'el-icon-s-custom',
-				name: '司机管理',
-				url: 'sa-view/tb-driver/tb-driver-list.html',
-				childList: [{
-						id: 'tb-driver-add',
-						name: '司机添加',
-						isShow: true
-					},
-					{
-						id: 'tb-driver-edit',
-						name: '司机更新',
-						isShow: true
-					},
-					{
-						id: 'tb-driver-del',
-						name: '司机删除',
-						isShow: true
-					},
-				]
+			id: 'tb-driver',
+			icon: 'el-icon-s-custom',
+			name: '司机管理',
+			url: 'sa-view/tb-driver/tb-driver-list.html',
+			childList: [{
+				id: 'tb-driver-add',
+				name: '司机添加',
+				isShow: true
 			},
+				{
+					id: 'tb-driver-edit',
+					name: '司机更新',
+					isShow: true
+				},
+				{
+					id: 'tb-driver-del',
+					name: '司机删除',
+					isShow: true
+				},
+			]
+		},
 			{
 				id: 'tb-vehicle',
 				icon: 'el-icon-s-check',
 				name: '车辆管理',
 				url: 'sa-view/tb-vehicle/tb-vehicle-list.html',
 				childList: [{
-						id: 'tb-vehicle-add',
-						name: '车辆添加',
-						isShow: true
-					},
+					id: 'tb-vehicle-add',
+					name: '车辆添加',
+					isShow: true
+				},
 					{
 						id: 'tb-vehicle-edit',
 						name: '车辆更新',
@@ -862,28 +884,28 @@ window.menuList.unshift({
 		parent: true,
 		icon: 'el-icon-s-shop',
 		childList: [{
-				id: 'tb-company-list',
-				name: '收费企业',
-				icon: 'el-icon-folder-opened',
-				info: '企业管理表数据的维护',
-				url: 'sa-view/tb-company/tb-company-list.html',
-				childList: [{
-						id: 'tb-company-add',
-						name: '企业添加',
-						isShow: false
-					},
-					{
-						id: 'tb-company-edit',
-						name: '企业更新',
-						isShow: false
-					},
-					{
-						id: 'tb-company-del',
-						name: '企业删除',
-						isShow: false
-					},
-				]
+			id: 'tb-company-list',
+			name: '收费企业',
+			icon: 'el-icon-folder-opened',
+			info: '企业管理表数据的维护',
+			url: 'sa-view/tb-company/tb-company-list.html',
+			childList: [{
+				id: 'tb-company-add',
+				name: '企业添加',
+				isShow: false
 			},
+				{
+					id: 'tb-company-edit',
+					name: '企业更新',
+					isShow: false
+				},
+				{
+					id: 'tb-company-del',
+					name: '企业删除',
+					isShow: false
+				},
+			]
+		},
 			{
 				id: 'tb-fee-item-list',
 				name: '费用管理',
@@ -891,10 +913,10 @@ window.menuList.unshift({
 				info: '费项管理表数据的维护',
 				url: 'sa-view/tb-fee-item/tb-fee-item-list.html',
 				childList: [{
-						id: 'tb-fee-item-add',
-						name: '费项添加',
-						isShow: false
-					},
+					id: 'tb-fee-item-add',
+					name: '费项添加',
+					isShow: false
+				},
 					{
 						id: 'tb-fee-item-edit',
 						name: '费项更新',
@@ -917,4 +939,4 @@ window.menuList.unshift({
 		]
 	}
 
-);
+);

sa-view-sp/sp-cfg/app-cfg.html

@@ -61,7 +61,10 @@
 					<!-- ---------------------------------- 其它配置 ---------------------------------- -->
 					<el-tab-pane label="其它配置" name="tab2">
 						<br>
-						<span>其它配置</span>
+						<div class="c-item br">
+							<label class="c-label">交易扣除点数：</label>
+							<el-input type="number" v-model="m.tradeNum"></el-input>
+						</div>
 					</el-tab-pane>
 
 				</el-tabs>
@@ -85,6 +88,7 @@
 					appName: 'sa-plus快速开发框架'	,// 系统名称
 					appVersionNo: 'v1.0.0',	// 系统版本
 					appVersionLog: '更新于2099-10-1',	// 更新日志
+					tradeNum:1
 				}
 			}
 		</script>

sa-view/tb-people/tb-people-info.html

@@ -131,6 +131,12 @@
 								<th>创建时间</th>
 								<td>{{sa.forDate(m.createTime, 2)}}</td>
 							</tr>
+							<tr v-if="m.role == 1">
+								<th>服务点数</th>
+								<td>{{m.wallet}}</td>
+								<th></th>
+								<td></td>
+							</tr>
 						</table>
 					</el-form>
 				</div>

sa-view/tb-wallet-record/tb-wallet-record-add.html

@@ -0,0 +1,149 @@
+<!DOCTYPE html>
+<html>
+	<head>
+		<title>服务点交易记录-添加/修改</title>
+		<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+		<meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" />
+		<!-- 所有的 css js 资源 -->
+		<link rel="stylesheet" href="../../static/kj/element-ui/theme-chalk/index.css">
+		<link rel="stylesheet" href="../../static/sa.css">
+		<script src="../../static/kj/vue.min.js"></script>
+		<script src="../../static/kj/element-ui/index.js"></script>
+		<script src="../../static/kj/httpVueLoader.js"></script>
+		<script src="../../static/kj/jquery.min.js"></script>
+		<script src="../../static/kj/layer/layer.js"></script>
+		<script src="../../static/sa.js"></script>
+		<style type="text/css">
+			.c-panel .el-form .c-label{width: 7em !important;}
+			.c-panel .el-form .el-input, .c-panel .el-form .el-textarea__inner{width: 250px;}
+		</style>
+	</head>
+	<body>
+		<div class="vue-box" :class="{sbot: id}" style="display: none;" :style="'display: block;'">
+			<!-- ------- 内容部分 ------- -->
+			<div class="s-body">
+				<div class="c-panel">
+                    <div class="c-title" v-if="id == 0">数据添加</div>
+					<div class="c-title" v-else>数据修改</div>
+					<el-form v-if="m">
+						<sa-item type="num" name="主键" v-model="m.id" br></sa-item>
+						<sa-item type="text" name="边民id" v-model="m.peopleId" br></sa-item>
+						<sa-item type="text" name="交易前点数" v-model="m.beforeAmount" br></sa-item>
+						<sa-item type="text" name="交易后点数" v-model="m.afterAmount" br></sa-item>
+						<sa-item type="text" name="交易扣除点数" v-model="m.amount" br></sa-item>
+						<sa-item type="text" name="关联订单号" v-model="m.tradeNo" br></sa-item>
+						<sa-item type="text" name="关联商品id" v-model="m.goodsId" br></sa-item>
+						<sa-item type="text" name="关联商品名称" v-model="m.goodsNames" br></sa-item>
+						<sa-item type="text" name="扣除时间" v-model="m.recordTime" br></sa-item>
+						<sa-item type="text" name="创建人编号" v-model="m.createBy" br></sa-item>
+						<sa-item type="text" name="创建人名称" v-model="m.createName" br></sa-item>
+						<sa-item type="text" name="创建时间" v-model="m.createTime" br></sa-item>
+						<sa-item type="text" name="更新人编号" v-model="m.updateBy" br></sa-item>
+						<sa-item type="text" name="更新人名称" v-model="m.updateName" br></sa-item>
+						<sa-item type="text" name="更新时间" v-model="m.updateTime" br></sa-item>
+						<sa-item type="enum" name="删除状态" v-model="m.deleteStatus" :jv="{0: '禁用', 1: '启用'}" jtype="3" br></sa-item>
+						<sa-item name="" class="s-ok" br>
+							<el-button type="primary" icon="el-icon-plus" @click="ok()">保存</el-button>
+						</sa-item>
+					</el-form>
+				</div>
+			</div>
+			<!-- ------- 底部按钮 ------- -->
+			<div class="s-foot">
+				<el-button type="primary" @click="ok()">确定</el-button>
+				<el-button @click="sa.closeCurrIframe()">取消</el-button>
+			</div>
+		</div>
+        <script>
+			
+			var app = new Vue({
+				components: {
+					"sa-item": httpVueLoader('../../sa-frame/com/sa-item.vue')
+				},
+				el: '.vue-box',
+				data: {
+					id: sa.p('id', 0),		// 获取超链接中的id参数（0=添加，非0=修改） 
+					m: null,		// 实体对象 
+				},
+				methods: {
+					// 创建一个 默认Model 
+					createModel: function() {
+						return {
+							id: '',		// 主键 
+							peopleId: '',		// 边民id 
+							beforeAmount: '',		// 交易前点数 
+							afterAmount: '',		// 交易后点数 
+							amount: '',		// 交易扣除点数 
+							tradeNo: '',		// 关联订单号 
+							goodsId: '',		// 关联商品id 
+							goodsNames: '',		// 关联商品名称 
+							recordTime: '',		// 扣除时间 
+							createBy: '',		// 创建人编号 
+							createName: '',		// 创建人名称 
+							createTime: '',		// 创建时间 
+							updateBy: '',		// 更新人编号 
+							updateName: '',		// 更新人名称 
+							updateTime: '',		// 更新时间 
+							deleteStatus: '',		// 删除状态(0=禁用,1=启用) 
+						}
+					},
+					// 提交数据 
+					ok: function(){
+						// 表单校验 
+						let m = this.m;
+						sa.checkNull(m.id, '请输入 [主键]');
+						sa.checkNull(m.peopleId, '请输入 [边民id]');
+						sa.checkNull(m.beforeAmount, '请输入 [交易前点数]');
+						sa.checkNull(m.afterAmount, '请输入 [交易后点数]');
+						sa.checkNull(m.amount, '请输入 [交易扣除点数]');
+						sa.checkNull(m.tradeNo, '请输入 [关联订单号]');
+						sa.checkNull(m.goodsId, '请输入 [关联商品id]');
+						sa.checkNull(m.goodsNames, '请输入 [关联商品名称]');
+						sa.checkNull(m.recordTime, '请输入 [扣除时间]');
+						sa.checkNull(m.createBy, '请输入 [创建人编号]');
+						sa.checkNull(m.createName, '请输入 [创建人名称]');
+						sa.checkNull(m.createTime, '请输入 [创建时间]');
+						sa.checkNull(m.updateBy, '请输入 [更新人编号]');
+						sa.checkNull(m.updateName, '请输入 [更新人名称]');
+						sa.checkNull(m.updateTime, '请输入 [更新时间]');
+						sa.checkNull(m.deleteStatus, '请输入 [删除状态]');
+				
+						// 开始增加或修改
+						if(this.id <= 0) {	// 添加
+							sa.ajax('/TbWalletRecord/add', m, function(res){
+								sa.alert('增加成功', this.clean); 
+							}.bind(this));
+						} else {	// 修改
+							sa.ajax('/TbWalletRecord/update', m, function(res){
+								sa.alert('修改成功', this.clean);
+							}.bind(this));
+						}
+					},
+					// 添加/修改 完成后的动作
+					clean: function() {
+						if(this.id == 0) {
+							this.m = this.createModel();
+						} else {
+							parent.app.f5();		// 刷新父页面列表
+							sa.closeCurrIframe();	// 关闭本页 
+						}
+					}
+				},
+				mounted: function(){
+					// 初始化数据 
+					if(this.id <= 0) {	
+						this.m = this.createModel();
+					} else {	
+						sa.ajax('/TbWalletRecord/getById?id=' + this.id, function(res) {
+							this.m = res.data;
+							if(res.data == null) {
+								sa.alert('未能查找到 id=' + this.id + " 详细数据");
+							}
+						}.bind(this))
+					}
+				}
+			})
+			
+		</script>
+	</body>
+</html>

sa-view/tb-wallet-record/tb-wallet-record-info.html

@@ -0,0 +1,109 @@
+<!DOCTYPE html>
+<html>
+	<head>
+		<title>服务点扣除记录-详情</title>
+		<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+		<meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" />
+		<!-- 所有的 css js 资源 -->
+		<link rel="stylesheet" href="../../static/kj/element-ui/theme-chalk/index.css">
+		<link rel="stylesheet" href="../../static/sa.css">
+		<script src="../../static/kj/vue.min.js"></script>
+		<script src="../../static/kj/element-ui/index.js"></script>
+		<script src="../../static/kj/httpVueLoader.js"></script>
+		<script src="../../static/kj/jquery.min.js"></script>
+		<script src="../../static/kj/layer/layer.js"></script>
+		<script src="../../static/sa.js"></script>
+		<style type="text/css">
+			.c-panel .c-label{width: 8em;}
+			table {
+			  font-family: arial, sans-serif;
+			  border-collapse: collapse;
+			  width: 90%;
+			  margin-top: 20px ;
+			  margin-left: auto;
+			  margin-right: auto;
+			}
+			th {
+			  border: 1px solid darkgray;
+			  text-align: left;
+			  height: 24px;
+			  padding: 8px;
+			  background-color: #dddddd;
+			}
+			td {
+			  border: 1px solid darkgray;
+			  text-align: left;
+			  padding: 8px;
+			}
+		</style>
+	</head>
+	<body>
+		<div class="vue-box sbot" style="display: none;" :style="'display: block;'">
+			<!-- ------- 内容部分 ------- -->
+			<div class="s-body">
+				<div class="c-panel">
+					<el-form v-if="m">
+						<table>
+							<tr>
+								<th>边民姓名</th>
+								<td>{{m.peopleName}}</td>
+							</tr>
+							<tr>
+								<th>交易前点数</th>
+								<td>{{m.beforeAmount}}</td>
+							</tr>
+							<tr>
+								<th>交易后点数</th>
+								<td>{{m.afterAmount}}</td>
+							</tr>
+							<tr>
+								<th>交易扣除点数</th>
+								<td>{{m.amount}}</td>
+							</tr>
+							<tr>
+								<th>关联订单号</th>
+								<td>{{m.tradeNo}}</td>
+							</tr>
+							<tr>
+								<th>关联商品名称</th>
+								<td>{{m.goodsNames}}</td>
+							</tr>
+							<tr>
+								<th>扣除时间</th>
+								<td>{{m.recordTime}}</td>
+							</tr>
+						</table>
+					</el-form>
+				</div>
+			</div>
+			<!-- ------- 底部按钮 ------- -->
+			<div class="s-foot">
+				<el-button type="success" @click="sa.closeCurrIframe()">确定</el-button>
+				<el-button @click="sa.closeCurrIframe()">取消</el-button>
+			</div>
+		</div>
+		<script>
+			var app = new Vue({
+				components: {
+					"sa-info": httpVueLoader('../../sa-frame/com/sa-info.vue')
+				},
+				el: '.vue-box',
+				data: {
+					id: sa.p('id', 0),	// 获取数据ID 
+					m: null
+				},
+				methods: {
+				},
+				mounted: function() {
+					sa.ajax('/level-one-server/TbWalletRecord/getById?id=' + this.id, function(res) {
+						this.m = res.data;
+						if(res.data == null) {
+							sa.alert('未能查找到 id=' + this.id + " 详细数据");
+						}
+					}.bind(this))
+				}
+			})
+			
+		</script>
+	</body>
+</html>

sa-view/tb-wallet-record/tb-wallet-record-list.html

@@ -0,0 +1,98 @@
+<!DOCTYPE html>
+<html>
+	<head>
+		<title>服务点扣除记录-列表</title>
+		<meta charset="utf-8">
+		<meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" />
+		<!-- 所有的 css & js 资源 -->
+		<link rel="stylesheet" href="../../static/kj/element-ui/theme-chalk/index.css">
+		<link rel="stylesheet" href="../../static/sa.css">
+		<script src="../../static/kj/vue.min.js"></script>
+		<script src="../../static/kj/element-ui/index.js"></script>
+		<script src="../../static/kj/httpVueLoader.js"></script>
+		<script src="../../static/kj/jquery.min.js"></script>
+		<script src="../../static/kj/layer/layer.js"></script>
+		<script src="../../static/sa.js"></script>
+	</head>
+	<body>
+		<div class="vue-box" style="display: none;" :style="'display: block;'">
+			<div class="c-panel">
+				<!-- ------------- 检索参数 ------------- -->
+				<div class="c-title">检索参数</div>
+				<el-form ref="form" :model='p' @submit.native.prevent>
+					<sa-item type="text" name="边民姓名" v-model="p.peopleName" width="8em"></sa-item>
+					<sa-item type="text" name="关联订单号" v-model="p.tradeNo" width="7em"></sa-item>
+					<el-button type="primary" icon="el-icon-search" @click="p.pageNo = 1; f5()">查询</el-button>
+					<el-button size="mini" type="info" @click="sa.f5()">重置</el-button>
+				</el-form>
+				<!-- ------------- 数据列表 ------------- -->
+				<el-table class="data-table" ref="data-table" :data="dataList" >
+					<sa-td type="index" name="序号"></sa-td>
+					<sa-td name="边民姓名" prop="peopleName" ></sa-td>
+					<sa-td name="交易前点数" prop="beforeAmount" ></sa-td>
+					<sa-td name="交易后点数" prop="afterAmount" ></sa-td>
+					<sa-td name="交易扣除点数" prop="amount" ></sa-td>
+					<sa-td name="关联订单号" prop="tradeNo" ></sa-td>
+					<sa-td name="关联商品id" prop="goodsId" ></sa-td>
+					<sa-td name="关联商品名称" prop="goodsNames" ></sa-td>
+					<sa-td name="扣除时间" prop="recordTime" ></sa-td>
+					<el-table-column label="操作" fixed="right"  width="240px">
+						<template slot-scope="s">
+							<el-button class="c-btn" type="success" icon="el-icon-view" @click="get(s.row)">查看</el-button>
+							<el-button class="c-btn" type="primary"  @click="getPeople(s.row)">边民信息</el-button>
+							<el-button class="c-btn" type="primary"  @click="getOrder(s.row)">商品信息</el-button>
+						</template>
+					</el-table-column>
+				</el-table>
+				<!-- ------------- 分页 ------------- -->
+				<sa-item type="page" :curr.sync="p.pageNo" :size.sync="p.pageSize" :total="dataCount" @change="f5()"></sa-item>
+			</div>
+		</div>
+		<script>
+			var app = new Vue({
+				components: {
+					"sa-item": httpVueLoader('../../sa-frame/com/sa-item.vue'),  
+					"sa-td": httpVueLoader('../../sa-frame/com/sa-td.vue'),		
+				},
+				el: '.vue-box',
+				data: {
+					p: { // 查询参数  
+						peopleName: '',		// 边民姓名 
+						tradeNo: '',		// 关联订单号 
+						pageNo: 1,		// 当前页 
+						pageSize: 10,	// 页大小 
+						sortType: 0		// 排序方式 
+					},
+					dataCount: 0,
+					dataList: [], // 数据集合 
+				},
+				methods: {
+					// 刷新
+					f5: function() {
+						sa.ajax('/level-one-server/TbWalletRecord/getList', sa.removeNull(this.p), function(res) {
+							this.dataList = res.data; // 数据
+							this.dataCount = res.dataCount; // 数据总数 
+							sa.f5TableHeight();		// 刷新表格高度 
+						}.bind(this));
+					},
+					// 查看
+					get: function(data) {
+						sa.showIframe('数据详情', 'tb-wallet-record-info.html?id=' + data.id, '1050px', '90%');
+					},
+					// 查看 - 关联边民
+					getPeople(data){
+						sa.showIframe('边民信息', '../tb-people/tb-people-info.html?id='+data.peopleId, '90%', '90%');
+					},
+					// 查看 - 关联订单
+					getOrder(data){
+						sa.showIframe('商品信息', '../tb-order/tb-order-info.html?id=' + data.orderId, '1050px', '70%');
+					}
+				},
+				created: function() {
+					this.f5();
+					sa.onInputEnter();
+				}
+			})
+		</script>
+	</body>
+</html>

sa-view/tb-wallet-topdown/tb-wallet-topdown-add.html

@@ -0,0 +1,143 @@
+<!DOCTYPE html>
+<html>
+	<head>
+		<title>服务点提现记录-添加/修改</title>
+		<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+		<meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" />
+		<!-- 所有的 css js 资源 -->
+		<link rel="stylesheet" href="../../static/kj/element-ui/theme-chalk/index.css">
+		<link rel="stylesheet" href="../../static/sa.css">
+		<script src="../../static/kj/vue.min.js"></script>
+		<script src="../../static/kj/element-ui/index.js"></script>
+		<script src="../../static/kj/httpVueLoader.js"></script>
+		<script src="../../static/kj/jquery.min.js"></script>
+		<script src="../../static/kj/layer/layer.js"></script>
+		<script src="../../static/sa.js"></script>
+		<style type="text/css">
+			.c-panel .el-form .c-label{width: 7em !important;}
+			.c-panel .el-form .el-input, .c-panel .el-form .el-textarea__inner{width: 250px;}
+		</style>
+	</head>
+	<body>
+		<div class="vue-box" :class="{sbot: id}" style="display: none;" :style="'display: block;'">
+			<!-- ------- 内容部分 ------- -->
+			<div class="s-body">
+				<div class="c-panel">
+                    <div class="c-title" v-if="id == 0">数据添加</div>
+					<div class="c-title" v-else>数据修改</div>
+					<el-form v-if="m">
+						<sa-item type="num" name="主键" v-model="m.id" br></sa-item>
+						<sa-item type="text" name="边民id" v-model="m.peopleId" br></sa-item>
+						<sa-item type="text" name="商户号" v-model="m.mchid" br></sa-item>
+						<sa-item type="text" name="商户系统内部订单号" v-model="m.outTradeNo" br></sa-item>
+						<sa-item type="text" name="微信支付系统生成的订单号" v-model="m.transactionId" br></sa-item>
+						<sa-item type="text" name="提现金额" v-model="m.amount" br></sa-item>
+						<sa-item type="text" name="提现时间" v-model="m.topdownTime" br></sa-item>
+						<sa-item type="text" name="创建时间" v-model="m.createTime" br></sa-item>
+						<sa-item type="text" name="创建人编号" v-model="m.createBy" br></sa-item>
+						<sa-item type="text" name="创建人名称" v-model="m.createName" br></sa-item>
+						<sa-item type="text" name="更新时间" v-model="m.updateTime" br></sa-item>
+						<sa-item type="text" name="更新人编号" v-model="m.updateBy" br></sa-item>
+						<sa-item type="text" name="更新人名称" v-model="m.updateName" br></sa-item>
+						<sa-item type="enum" name="删除状态" v-model="m.deleteStatus" :jv="{0: '禁用', 1: '启用'}" jtype="3" br></sa-item>
+						<sa-item name="" class="s-ok" br>
+							<el-button type="primary" icon="el-icon-plus" @click="ok()">保存</el-button>
+						</sa-item>
+					</el-form>
+				</div>
+			</div>
+			<!-- ------- 底部按钮 ------- -->
+			<div class="s-foot">
+				<el-button type="primary" @click="ok()">确定</el-button>
+				<el-button @click="sa.closeCurrIframe()">取消</el-button>
+			</div>
+		</div>
+        <script>
+			
+			var app = new Vue({
+				components: {
+					"sa-item": httpVueLoader('../../sa-frame/com/sa-item.vue')
+				},
+				el: '.vue-box',
+				data: {
+					id: sa.p('id', 0),		// 获取超链接中的id参数（0=添加，非0=修改） 
+					m: null,		// 实体对象 
+				},
+				methods: {
+					// 创建一个 默认Model 
+					createModel: function() {
+						return {
+							id: '',		// 主键 
+							peopleId: '',		// 边民id 
+							mchid: '',		// 商户号 
+							outTradeNo: '',		// 商户系统内部订单号 
+							transactionId: '',		// 微信支付系统生成的订单号 
+							amount: '',		// 提现金额 
+							topdownTime: '',		// 提现时间 
+							createTime: '',		// 创建时间 
+							createBy: '',		// 创建人编号 
+							createName: '',		// 创建人名称 
+							updateTime: '',		// 更新时间 
+							updateBy: '',		// 更新人编号 
+							updateName: '',		// 更新人名称 
+							deleteStatus: '',		// 删除状态(0=禁用,1=启用) 
+						}
+					},
+					// 提交数据 
+					ok: function(){
+						// 表单校验 
+						let m = this.m;
+						sa.checkNull(m.id, '请输入 [主键]');
+						sa.checkNull(m.peopleId, '请输入 [边民id]');
+						sa.checkNull(m.mchid, '请输入 [商户号]');
+						sa.checkNull(m.outTradeNo, '请输入 [商户系统内部订单号]');
+						sa.checkNull(m.transactionId, '请输入 [微信支付系统生成的订单号]');
+						sa.checkNull(m.amount, '请输入 [提现金额]');
+						sa.checkNull(m.topdownTime, '请输入 [提现时间]');
+						sa.checkNull(m.createTime, '请输入 [创建时间]');
+						sa.checkNull(m.createBy, '请输入 [创建人编号]');
+						sa.checkNull(m.createName, '请输入 [创建人名称]');
+						sa.checkNull(m.updateTime, '请输入 [更新时间]');
+						sa.checkNull(m.updateBy, '请输入 [更新人编号]');
+						sa.checkNull(m.updateName, '请输入 [更新人名称]');
+						sa.checkNull(m.deleteStatus, '请输入 [删除状态]');
+				
+						// 开始增加或修改
+						if(this.id <= 0) {	// 添加
+							sa.ajax('/TbWalletTopdown/add', m, function(res){
+								sa.alert('增加成功', this.clean); 
+							}.bind(this));
+						} else {	// 修改
+							sa.ajax('/TbWalletTopdown/update', m, function(res){
+								sa.alert('修改成功', this.clean);
+							}.bind(this));
+						}
+					},
+					// 添加/修改 完成后的动作
+					clean: function() {
+						if(this.id == 0) {
+							this.m = this.createModel();
+						} else {
+							parent.app.f5();		// 刷新父页面列表
+							sa.closeCurrIframe();	// 关闭本页 
+						}
+					}
+				},
+				mounted: function(){
+					// 初始化数据 
+					if(this.id <= 0) {	
+						this.m = this.createModel();
+					} else {	
+						sa.ajax('/TbWalletTopdown/getById?id=' + this.id, function(res) {
+							this.m = res.data;
+							if(res.data == null) {
+								sa.alert('未能查找到 id=' + this.id + " 详细数据");
+							}
+						}.bind(this))
+					}
+				}
+			})
+			
+		</script>
+	</body>
+</html>

sa-view/tb-wallet-topdown/tb-wallet-topdown-info.html

@@ -0,0 +1,106 @@
+<!DOCTYPE html>
+<html>
+	<head>
+		<title>服务点提现记录-详情</title>
+		<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+		<meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" />
+		<!-- 所有的 css js 资源 -->
+		<link rel="stylesheet" href="../../static/kj/element-ui/theme-chalk/index.css">
+		<link rel="stylesheet" href="../../static/sa.css">
+		<script src="../../static/kj/vue.min.js"></script>
+		<script src="../../static/kj/element-ui/index.js"></script>
+		<script src="../../static/kj/httpVueLoader.js"></script>
+		<script src="../../static/kj/jquery.min.js"></script>
+		<script src="../../static/kj/layer/layer.js"></script>
+		<script src="../../static/sa.js"></script>
+		<style type="text/css">
+			.c-panel .c-label{width: 8em;}
+			table {
+			  font-family: arial, sans-serif;
+			  border-collapse: collapse;
+			  width: 90%;
+			  margin-top: 20px ;
+			  margin-left: auto;
+			  margin-right: auto;
+			}
+			th {
+			  border: 1px solid darkgray;
+			  text-align: left;
+			  height: 24px;
+			  padding: 8px;
+			  background-color: #dddddd;
+			}
+			td {
+			  border: 1px solid darkgray;
+			  text-align: left;
+			  padding: 8px;
+			}
+		</style>
+	</head>
+	<body>
+		<div class="vue-box sbot" style="display: none;" :style="'display: block;'">
+			<!-- ------- 内容部分 ------- -->
+			<div class="s-body">
+				<div class="c-panel">
+					<el-form v-if="m">
+						<table>
+							<tr>
+								<th>边民姓名</th>
+								<td>{{m.peopleName}}</td>
+							</tr>
+							<tr>
+								<th>商户号</th>
+								<td>{{m.mchid}}</td>
+							</tr>
+							<tr>
+								<th>商户系统内部订单号</th>
+								<td>{{m.outTradeNo}}</td>
+							</tr>
+							<tr>
+								<th>微信支付系统生成的订单号</th>
+								<td>{{m.transactionId}}</td>
+							</tr>
+							<tr>
+								<th>充值金额</th>
+								<td>{{m.amount}}</td>
+							</tr>
+							<tr>
+								<th>充值时间</th>
+								<td>{{m.topdownTime}}</td>
+							</tr>
+						</table>
+
+					</el-form>
+				</div>
+			</div>
+			<!-- ------- 底部按钮 ------- -->
+			<div class="s-foot">
+				<el-button type="success" @click="sa.closeCurrIframe()">确定</el-button>
+				<el-button @click="sa.closeCurrIframe()">取消</el-button>
+			</div>
+		</div>
+		<script>
+			var app = new Vue({
+				components: {
+					"sa-info": httpVueLoader('../../sa-frame/com/sa-info.vue')
+				},
+				el: '.vue-box',
+				data: {
+					id: sa.p('id', 0),	// 获取数据ID 
+					m: null
+				},
+				methods: {
+				},
+				mounted: function() {
+					sa.ajax('/level-one-server/TbWalletTopdown/getById?id=' + this.id, function(res) {
+						this.m = res.data;
+						if(res.data == null) {
+							sa.alert('未能查找到 id=' + this.id + " 详细数据");
+						}
+					}.bind(this))
+				}
+			})
+			
+		</script>
+	</body>
+</html>

sa-view/tb-wallet-topdown/tb-wallet-topdown-list.html

@@ -0,0 +1,91 @@
+<!DOCTYPE html>
+<html>
+	<head>
+		<title>服务点提现记录-列表</title>
+		<meta charset="utf-8">
+		<meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" />
+		<!-- 所有的 css & js 资源 -->
+		<link rel="stylesheet" href="../../static/kj/element-ui/theme-chalk/index.css">
+		<link rel="stylesheet" href="../../static/sa.css">
+		<script src="../../static/kj/vue.min.js"></script>
+		<script src="../../static/kj/element-ui/index.js"></script>
+		<script src="../../static/kj/httpVueLoader.js"></script>
+		<script src="../../static/kj/jquery.min.js"></script>
+		<script src="../../static/kj/layer/layer.js"></script>
+		<script src="../../static/sa.js"></script>
+	</head>
+	<body>
+		<div class="vue-box" style="display: none;" :style="'display: block;'">
+			<div class="c-panel">
+				<!-- ------------- 检索参数 ------------- -->
+				<div class="c-title">检索参数</div>
+				<el-form ref="form" :model='p' @submit.native.prevent>
+					<sa-item type="text" name="边民姓名" v-model="p.peopleName" width="8em"></sa-item>
+					<sa-item type="text" name="商户号" v-model="p.mchid" width="7em"></sa-item>
+					<el-button type="primary" icon="el-icon-search" @click="p.pageNo = 1; f5()">查询</el-button>
+					<el-button size="mini" type="info" @click="sa.f5()">重置</el-button>
+				</el-form>
+				<!-- ------------- 数据列表 ------------- -->
+				<el-table class="data-table" ref="data-table" :data="dataList" >
+					<sa-td type="index" name="序号"></sa-td>
+					<sa-td name="边民姓名" prop="peopleName" ></sa-td>
+					<sa-td name="商户号" prop="mchid" ></sa-td>
+					<sa-td name="商户系统内部订单号" prop="outTradeNo" ></sa-td>
+					<sa-td name="微信支付系统生成的订单号" prop="transactionId" ></sa-td>
+					<sa-td name="提现金额" prop="amount" ></sa-td>
+					<sa-td name="提现时间" prop="topdownTime" ></sa-td>
+					<el-table-column label="操作" fixed="right"  width="160px">
+						<template slot-scope="s">
+							<el-button class="c-btn" type="success" icon="el-icon-view" @click="get(s.row)">查看</el-button>
+							<el-button class="c-btn" type="primary"  @click="getPeople(s.row)">边民信息</el-button>
+						</template>
+					</el-table-column>
+				</el-table>
+				<!-- ------------- 分页 ------------- -->
+				<sa-item type="page" :curr.sync="p.pageNo" :size.sync="p.pageSize" :total="dataCount" @change="f5()"></sa-item>
+			</div>
+		</div>
+		<script>
+			var app = new Vue({
+				components: {
+					"sa-item": httpVueLoader('../../sa-frame/com/sa-item.vue'),  
+					"sa-td": httpVueLoader('../../sa-frame/com/sa-td.vue'),		
+				},
+				el: '.vue-box',
+				data: {
+					p: { // 查询参数  
+						peopleName: '',		// 边民姓名 
+						mchid: '',		// 商户号 	 
+						pageNo: 1,		// 当前页 
+						pageSize: 10,	// 页大小 
+						sortType: 0		// 排序方式 
+					},
+					dataCount: 0,
+					dataList: [], // 数据集合 
+				},
+				methods: {
+					// 刷新
+					f5: function() {
+						sa.ajax('/level-one-server/TbWalletTopdown/getList', sa.removeNull(this.p), function(res) {
+							this.dataList = res.data; // 数据
+							this.dataCount = res.dataCount; // 数据总数 
+							sa.f5TableHeight();		// 刷新表格高度 
+						}.bind(this));
+					},
+					// 查看
+					get: function(data) {
+						sa.showIframe('数据详情', 'tb-wallet-topdown-info.html?id=' + data.id, '70%', '90%');
+					},
+					// 查看 - 根据选中的边民
+					getPeople(data){
+						sa.showIframe('边民信息', '../tb-people/tb-people-info.html?id='+data.peopleId, '90%', '90%');
+					},
+				},
+				created: function() {
+					this.f5();
+					sa.onInputEnter();
+				}
+			})
+		</script>
+	</body>
+</html>

sa-view/tb-wallet-topup/tb-wallet-topup-add.html

@@ -0,0 +1,143 @@
+<!DOCTYPE html>
+<html>
+	<head>
+		<title>服务点充值记录-添加/修改</title>
+		<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+		<meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" />
+		<!-- 所有的 css js 资源 -->
+		<link rel="stylesheet" href="../../static/kj/element-ui/theme-chalk/index.css">
+		<link rel="stylesheet" href="../../static/sa.css">
+		<script src="../../static/kj/vue.min.js"></script>
+		<script src="../../static/kj/element-ui/index.js"></script>
+		<script src="../../static/kj/httpVueLoader.js"></script>
+		<script src="../../static/kj/jquery.min.js"></script>
+		<script src="../../static/kj/layer/layer.js"></script>
+		<script src="../../static/sa.js"></script>
+		<style type="text/css">
+			.c-panel .el-form .c-label{width: 7em !important;}
+			.c-panel .el-form .el-input, .c-panel .el-form .el-textarea__inner{width: 250px;}
+		</style>
+	</head>
+	<body>
+		<div class="vue-box" :class="{sbot: id}" style="display: none;" :style="'display: block;'">
+			<!-- ------- 内容部分 ------- -->
+			<div class="s-body">
+				<div class="c-panel">
+                    <div class="c-title" v-if="id == 0">数据添加</div>
+					<div class="c-title" v-else>数据修改</div>
+					<el-form v-if="m">
+						<sa-item type="num" name="主键" v-model="m.id" br></sa-item>
+						<sa-item type="text" name="边民id" v-model="m.peopleId" br></sa-item>
+						<sa-item type="text" name="商户号" v-model="m.mchid" br></sa-item>
+						<sa-item type="text" name="商户系统内部订单号" v-model="m.outTradeNo" br></sa-item>
+						<sa-item type="text" name="微信支付系统生成的订单号" v-model="m.transactionId" br></sa-item>
+						<sa-item type="text" name="充值金额" v-model="m.amount" br></sa-item>
+						<sa-item type="text" name="充值时间" v-model="m.topupTime" br></sa-item>
+						<sa-item type="text" name="创建时间" v-model="m.createTime" br></sa-item>
+						<sa-item type="text" name="创建人编号" v-model="m.createBy" br></sa-item>
+						<sa-item type="text" name="创建人名称" v-model="m.createName" br></sa-item>
+						<sa-item type="text" name="更新时间" v-model="m.updateTime" br></sa-item>
+						<sa-item type="text" name="更新人编号" v-model="m.updateBy" br></sa-item>
+						<sa-item type="text" name="更新人名称" v-model="m.updateName" br></sa-item>
+						<sa-item type="enum" name="删除状态" v-model="m.deleteStatus" :jv="{0: '禁用', 1: '启用'}" jtype="3" br></sa-item>
+						<sa-item name="" class="s-ok" br>
+							<el-button type="primary" icon="el-icon-plus" @click="ok()">保存</el-button>
+						</sa-item>
+					</el-form>
+				</div>
+			</div>
+			<!-- ------- 底部按钮 ------- -->
+			<div class="s-foot">
+				<el-button type="primary" @click="ok()">确定</el-button>
+				<el-button @click="sa.closeCurrIframe()">取消</el-button>
+			</div>
+		</div>
+        <script>
+			
+			var app = new Vue({
+				components: {
+					"sa-item": httpVueLoader('../../sa-frame/com/sa-item.vue')
+				},
+				el: '.vue-box',
+				data: {
+					id: sa.p('id', 0),		// 获取超链接中的id参数（0=添加，非0=修改） 
+					m: null,		// 实体对象 
+				},
+				methods: {
+					// 创建一个 默认Model 
+					createModel: function() {
+						return {
+							id: '',		// 主键 
+							peopleId: '',		// 边民id 
+							mchid: '',		// 商户号 
+							outTradeNo: '',		// 商户系统内部订单号 
+							transactionId: '',		// 微信支付系统生成的订单号 
+							amount: '',		// 充值金额 
+							topupTime: '',		// 充值时间 
+							createTime: '',		// 创建时间 
+							createBy: '',		// 创建人编号 
+							createName: '',		// 创建人名称 
+							updateTime: '',		// 更新时间 
+							updateBy: '',		// 更新人编号 
+							updateName: '',		// 更新人名称 
+							deleteStatus: '',		// 删除状态(0=禁用,1=启用) 
+						}
+					},
+					// 提交数据 
+					ok: function(){
+						// 表单校验 
+						let m = this.m;
+						sa.checkNull(m.id, '请输入 [主键]');
+						sa.checkNull(m.peopleId, '请输入 [边民id]');
+						sa.checkNull(m.mchid, '请输入 [商户号]');
+						sa.checkNull(m.outTradeNo, '请输入 [商户系统内部订单号]');
+						sa.checkNull(m.transactionId, '请输入 [微信支付系统生成的订单号]');
+						sa.checkNull(m.amount, '请输入 [充值金额]');
+						sa.checkNull(m.topupTime, '请输入 [充值时间]');
+						sa.checkNull(m.createTime, '请输入 [创建时间]');
+						sa.checkNull(m.createBy, '请输入 [创建人编号]');
+						sa.checkNull(m.createName, '请输入 [创建人名称]');
+						sa.checkNull(m.updateTime, '请输入 [更新时间]');
+						sa.checkNull(m.updateBy, '请输入 [更新人编号]');
+						sa.checkNull(m.updateName, '请输入 [更新人名称]');
+						sa.checkNull(m.deleteStatus, '请输入 [删除状态]');
+				
+						// 开始增加或修改
+						if(this.id <= 0) {	// 添加
+							sa.ajax('/TbWalletTopup/add', m, function(res){
+								sa.alert('增加成功', this.clean); 
+							}.bind(this));
+						} else {	// 修改
+							sa.ajax('/TbWalletTopup/update', m, function(res){
+								sa.alert('修改成功', this.clean);
+							}.bind(this));
+						}
+					},
+					// 添加/修改 完成后的动作
+					clean: function() {
+						if(this.id == 0) {
+							this.m = this.createModel();
+						} else {
+							parent.app.f5();		// 刷新父页面列表
+							sa.closeCurrIframe();	// 关闭本页 
+						}
+					}
+				},
+				mounted: function(){
+					// 初始化数据 
+					if(this.id <= 0) {	
+						this.m = this.createModel();
+					} else {	
+						sa.ajax('/TbWalletTopup/getById?id=' + this.id, function(res) {
+							this.m = res.data;
+							if(res.data == null) {
+								sa.alert('未能查找到 id=' + this.id + " 详细数据");
+							}
+						}.bind(this))
+					}
+				}
+			})
+			
+		</script>
+	</body>
+</html>

sa-view/tb-wallet-topup/tb-wallet-topup-info.html

@@ -0,0 +1,105 @@
+<!DOCTYPE html>
+<html>
+	<head>
+		<title>服务点充值记录-详情</title>
+		<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+		<meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" />
+		<!-- 所有的 css js 资源 -->
+		<link rel="stylesheet" href="../../static/kj/element-ui/theme-chalk/index.css">
+		<link rel="stylesheet" href="../../static/sa.css">
+		<script src="../../static/kj/vue.min.js"></script>
+		<script src="../../static/kj/element-ui/index.js"></script>
+		<script src="../../static/kj/httpVueLoader.js"></script>
+		<script src="../../static/kj/jquery.min.js"></script>
+		<script src="../../static/kj/layer/layer.js"></script>
+		<script src="../../static/sa.js"></script>
+		<style type="text/css">
+			.c-panel .c-label{width: 8em;}
+			table {
+			  font-family: arial, sans-serif;
+			  border-collapse: collapse;
+			  width: 90%;
+			  margin-top: 20px ;
+			  margin-left: auto;
+			  margin-right: auto;
+			}
+			th {
+			  border: 1px solid darkgray;
+			  text-align: left;
+			  height: 24px;
+			  padding: 8px;
+			  background-color: #dddddd;
+			}
+			td {
+			  border: 1px solid darkgray;
+			  text-align: left;
+			  padding: 8px;
+			}
+		</style>
+	</head>
+	<body>
+		<div class="vue-box sbot" style="display: none;" :style="'display: block;'">
+			<!-- ------- 内容部分 ------- -->
+			<div class="s-body">
+				<div class="c-panel">
+					<el-form v-if="m">
+						<table>
+							<tr>
+								<th>边民姓名</th>
+								<td>{{m.peopleName}}</td>
+							</tr>
+							<tr>
+								<th>商户号</th>
+								<td>{{m.mchid}}</td>
+							</tr>
+							<tr>
+								<th>商户系统内部订单号</th>
+								<td>{{m.outTradeNo}}</td>
+							</tr>
+							<tr>
+								<th>微信支付系统生成的订单号</th>
+								<td>{{m.transactionId}}</td>
+							</tr>
+							<tr>
+								<th>充值金额</th>
+								<td>{{m.amount}}</td>
+							</tr>
+							<tr>
+								<th>充值时间</th>
+								<td>{{m.topupTime}}</td>
+							</tr>
+						</table>
+					</el-form>
+				</div>
+			</div>
+			<!-- ------- 底部按钮 ------- -->
+			<div class="s-foot">
+				<el-button type="success" @click="sa.closeCurrIframe()">确定</el-button>
+				<el-button @click="sa.closeCurrIframe()">取消</el-button>
+			</div>
+		</div>
+		<script>
+			var app = new Vue({
+				components: {
+					"sa-info": httpVueLoader('../../sa-frame/com/sa-info.vue')
+				},
+				el: '.vue-box',
+				data: {
+					id: sa.p('id', 0),	// 获取数据ID 
+					m: null
+				},
+				methods: {
+				},
+				mounted: function() {
+					sa.ajax('/level-one-server/TbWalletTopup/getById?id=' + this.id, function(res) {
+						this.m = res.data;
+						if(res.data == null) {
+							sa.alert('未能查找到 id=' + this.id + " 详细数据");
+						}
+					}.bind(this))
+				}
+			})
+			
+		</script>
+	</body>
+</html>

sa-view/tb-wallet-topup/tb-wallet-topup-list.html

@@ -0,0 +1,92 @@
+<!DOCTYPE html>
+<html>
+	<head>
+		<title>服务点充值记录-列表</title>
+		<meta charset="utf-8">
+		<meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" />
+		<!-- 所有的 css & js 资源 -->
+		<link rel="stylesheet" href="../../static/kj/element-ui/theme-chalk/index.css">
+		<link rel="stylesheet" href="../../static/sa.css">
+		<script src="../../static/kj/vue.min.js"></script>
+		<script src="../../static/kj/element-ui/index.js"></script>
+		<script src="../../static/kj/httpVueLoader.js"></script>
+		<script src="../../static/kj/jquery.min.js"></script>
+		<script src="../../static/kj/layer/layer.js"></script>
+		<script src="../../static/sa.js"></script>
+	</head>
+	<body>
+		<div class="vue-box" style="display: none;" :style="'display: block;'">
+			<div class="c-panel">
+				<!-- ------------- 检索参数 ------------- -->
+				<div class="c-title">检索参数</div>
+				<el-form ref="form" :model='p' @submit.native.prevent>
+					<sa-item type="text" name="边民姓名" v-model="p.peopleName" width="8em"></sa-item>
+					<sa-item type="text" name="商户号" v-model="p.mchid" width="7em"></sa-item>
+					<el-button type="primary" icon="el-icon-search" @click="p.pageNo = 1; f5()">查询</el-button>
+					<el-button size="mini" type="info" @click="sa.f5()">重置</el-button>
+				</el-form>
+				<!-- ------------- 数据列表 ------------- -->
+				<el-table class="data-table" ref="data-table" :data="dataList" >
+					<sa-td type="index" name="序号"></sa-td>
+					<sa-td name="边民姓名" prop="peopleName" ></sa-td>
+					<sa-td name="商户号" prop="mchid" ></sa-td>
+					<sa-td name="商户系统内部订单号" prop="outTradeNo" ></sa-td>
+					<sa-td name="微信支付系统生成的订单号" prop="transactionId" ></sa-td>
+					<sa-td name="充值金额" prop="amount" ></sa-td>
+					<sa-td name="充值时间" prop="topupTime" ></sa-td>
+
+					<el-table-column label="操作" fixed="right"  width="160px">
+						<template slot-scope="s">
+							<el-button class="c-btn" type="success" icon="el-icon-view" @click="get(s.row)">查看</el-button>
+							<el-button class="c-btn" type="primary"  @click="getPeople(s.row)">边民信息</el-button>
+						</template>
+					</el-table-column>
+				</el-table>
+				<!-- ------------- 分页 ------------- -->
+				<sa-item type="page" :curr.sync="p.pageNo" :size.sync="p.pageSize" :total="dataCount" @change="f5()"></sa-item>
+			</div>
+		</div>
+		<script>
+			var app = new Vue({
+				components: {
+					"sa-item": httpVueLoader('../../sa-frame/com/sa-item.vue'),  
+					"sa-td": httpVueLoader('../../sa-frame/com/sa-td.vue'),		
+				},
+				el: '.vue-box',
+				data: {
+					p: { // 查询参数  
+						peopleName: '',		// 边民姓名 
+						mchid: '',		// 商户号 
+						pageNo: 1,		// 当前页 
+						pageSize: 10,	// 页大小 
+						sortType: 0		// 排序方式 
+					},
+					dataCount: 0,
+					dataList: [], // 数据集合 
+				},
+				methods: {
+					// 刷新
+					f5: function() {
+						sa.ajax('/level-one-server/TbWalletTopup/getList', sa.removeNull(this.p), function(res) {
+							this.dataList = res.data; // 数据
+							this.dataCount = res.dataCount; // 数据总数 
+							sa.f5TableHeight();		// 刷新表格高度 
+						}.bind(this));
+					},
+					// 查看
+					get: function(data) {
+						sa.showIframe('数据详情', 'tb-wallet-topup-info.html?id=' + data.id, '1050px', '90%');
+					},
+					// 查看 - 根据选中的边民
+					getPeople(data){
+						sa.showIframe('边民信息', '../tb-people/tb-people-info.html?id='+data.peopleId, '90%', '90%');
+					},
+				},
+				created: function() {
+					this.f5();
+					sa.onInputEnter();
+				}
+			})
+		</script>
+	</body>
+</html>