java/PlayPai.git

			@@ -504,7 +504,7 @@
			if (UserExt.getUser().getObjectType()==3){
			if (StringUtils.hasLength(sites)){
			useScope = 4;
			sites="";
			storeIds="";
			pointsMerchandise.setUseScope(4);
			}else{
			useScope = 3;

			@@ -221,7 +221,12 @@
			<div class="form-group">
			<div class="form-group">
			<div class="col-sm-12">
			@if(userType!=3){
			<label class="col-sm-3 control-label">*指定场地: </label>
			@}
			@if(userType==3){
			<label class="col-sm-3 control-label">指定场地: </label>
			@}
			<button onclick="siteList1()"
			style="height: 22px;width: 82px;background-color: #4a8ff1;color: white;z-index: 15;position:relative;border: none;margin-top: 1%">
			选择场地

			@@ -18,7 +18,7 @@
			{title: '商品名称', field: 'name', visible: true, align: 'center', valign: 'middle'},
			{title: '兑换地点', field: 'useScope', visible: true, align: 'center', valign: 'middle',
			formatter: function (value, row, index) {
			return {1: "全国", 2: "指定城市", 3: "指定门店"}[value]
			return {1: "全国", 2: "指定城市", 3: "指定门店",4:"指定场地"}[value]
			}
			},
			{title: '用户人群', field: 'userPopulation', visible: true, align: 'center', valign: 'middle',

	cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TGoodsController.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cloud-server-management/src/main/webapp/WEB-INF/view/system/ticket/ticket_add.html	5 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cloud-server-management/src/main/webapp/static/modular/system/tGoodsAudit/tGoods.js	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史