~jiangyouyao/beauty-erp.git

			@@ -116,12 +116,12 @@
			<button matrix:btn="vipInfo-projTaocan" onclick="openTc()" type="button" class="btn btn-info btn-sm"><i class="fa fa-cubes"></i> 套餐管理</button>
			<button matrix:btn="vipInfo-projTaocan" onclick="openMoneyCard()" type="button" class="btn btn-info btn-sm"><i class="fa fa-credit-card"></i> 充值卡管理</button>

			<button onclick="importProjUse()" type="button" class="btn btn-info btn-sm"><i class="fa fa-history"></i> 导入项目</button>
			<button onclick="importProjUse()" type="button" class="btn btn-info btn-sm"><i class="fa fa-history"></i> 导入项目</button>

			<button matrix:fn="orderClub" onclick="openOrder()" type="button" class="btn btn-info btn-sm"><i class="fa fa-history"></i> 消费订单</button>
			<button matrix:fn="serviceClub" onclick="openServiceOrder()" type="button" class="btn btn-info btn-sm"><i class="fa fa-history"></i> 服务单</button>
			<button matrix:btn="vipInfo-add" onclick="openAdd()" type="button" class="btn btn-info btn-sm"><i class="fa fa-plus" ></i> 新增</button>
			<button matrix:btn="vipInfo-excelOut" onclick="exportExcel()" type="button" class="btn btn-info btn-sm"><i class="fa fa-download" ></i> 导出</button>
			<button matrix:btn="vipInfo-exportExcel" onclick="exportExcel()" type="button" class="btn btn-info btn-sm"><i class="fa fa-download" ></i> 导出</button>
			<button matrix:btn="vipInfo-allot" onclick="updateVipInfos()" type="button" class="btn btn-info btn-sm"><i class="" ></i>批量设置健康顾问</button>
			<button onclick="skinCheck()" type="button" class="btn btn-info btn-sm"><i class="" ></i>皮肤检测管理</button>
			<button onclick="importVipInfo()" type="button" class="btn btn-info btn-sm"><i class="" ></i>导入会员</button>
			@@ -175,7 +175,6 @@
			function buildOperation(value, row, index) {
			var html = "";
			html += '<a class="text-info" href="javascript:void(0)" onClick="openVipDetail(\''+row.phone+'\')">查看详情</a>  '
			html += '<a class="text-info" href="javascript:void(0)" onClick="openVipDetail2(\''+row.phone+'\')">测试页面</a>  '
			return html;
			}

			@@ -403,20 +402,10 @@
			}

			//导出
			function exportExcel() {
			var name = $("#search-text").attr("name");
			var value = $("#search-text").val();
			var vipType = $("#vipType").val();
			var arrivalWay = $("#arrivalWay").val();
			var vipState = $("#vipState").val();
			var staffId = $("#staffId").val();
			window.location.href = basePath+"/admin/vipInfo/exportExcel?vipType="
			+ encodeURI(encodeURI(vipType)) + "&arrivalWay="
			+ encodeURI(encodeURI(arrivalWay)) + "&"+name+"="
			+ encodeURI(encodeURI(value)) + "&vipState="
			+ encodeURI(encodeURI(vipState))
			+ "&staffId=" + staffId;
			}
			function exportExcel() {
			var param=MForm.toUrlParam("#serchform");
			window.location.href=basePath+"/admin/vipInfo/exportExcel?"+param;
			}

			</script>