diff --git a/sino-activity/src/main/java/com/sinosoft/activity/domain/DrawConfig.java b/sino-activity/src/main/java/com/sinosoft/activity/domain/DrawConfig.java
index 3bf55369c..5c72d2a69 100644
--- a/sino-activity/src/main/java/com/sinosoft/activity/domain/DrawConfig.java
+++ b/sino-activity/src/main/java/com/sinosoft/activity/domain/DrawConfig.java
@@ -60,7 +60,7 @@ public class DrawConfig extends BaseEntity
     private Long AVAILABLENUMBER;
 
     /** 状态 */
-    @Excel(name = "状态" ,readConverterExp="1=启用,2=禁用")
+    @Excel(name = "状态" ,readConverterExp="1=启用,2=停用")
     private String STATUS;
 
     /** 创建时间 */
diff --git a/sino-activity/src/main/java/com/sinosoft/activity/domain/DrawInfo.java b/sino-activity/src/main/java/com/sinosoft/activity/domain/DrawInfo.java
index 8dab0e21a..6d6f019fc 100644
--- a/sino-activity/src/main/java/com/sinosoft/activity/domain/DrawInfo.java
+++ b/sino-activity/src/main/java/com/sinosoft/activity/domain/DrawInfo.java
@@ -62,7 +62,7 @@ public class DrawInfo extends DrawRule
     private Date LASTUPDATETIMESTAMP;
 
     /** 状态 */
-    @Excel(name = "状态" ,readConverterExp="1=启用,2=禁用")
+    @Excel(name = "状态" ,readConverterExp="1=启用,2=停用")
     private String STATUS;
 
     /** 是否需要更新缓存 */
diff --git a/sino-activity/src/main/resources/templates/activity/info/add.html b/sino-activity/src/main/resources/templates/activity/info/add.html
index bb2402dd9..d7cb4194f 100644
--- a/sino-activity/src/main/resources/templates/activity/info/add.html
+++ b/sino-activity/src/main/resources/templates/activity/info/add.html
@@ -110,7 +110,7 @@
                     <div class="form-group">
                         <label class="col-sm-4 control-label is-required">时间段限制次数：</label>
                         <div class="col-sm-8">
-                            <input name="DAILYNUMBER" placeholder="活动名称" class="form-control" type="text" maxlength="30">
+                            <input name="DAILYNUMBER" placeholder="时间段限制次数" class="form-control" type="text" maxlength="30">
                         </div>
                     </div>
                 </div>
@@ -183,14 +183,19 @@
 
         /**获取奖品及信息列表*/
         $(document).ready(function() {
-            var job= "<option value=''>所有</option>";
+            var job= "";
             $.ajax({
 
                     url:prefix + "/prizeInfo",
                     success: function (data) {
 
                         for(var i in data){
-                            job += "<option value='"+data[i].prizecode+"'>"+data[i].prizename+"</option>"
+                            if (job.length==0){
+                                job = "<option value='"+data[i].prizecode+"'>"+data[i].prizename+"</option>"
+                            }
+                            else{
+                                job += "<option value='"+data[i].prizecode+"'>"+data[i].prizename+"</option>"
+                            }
                         }
                         $("#firstawardprize").html(job);
                         $("#willdrawawardprize").html(job);
diff --git a/sino-activity/src/main/resources/templates/activity/info/configAdd.html b/sino-activity/src/main/resources/templates/activity/info/configAdd.html
index 7b1597330..44b55a24c 100644
--- a/sino-activity/src/main/resources/templates/activity/info/configAdd.html
+++ b/sino-activity/src/main/resources/templates/activity/info/configAdd.html
@@ -130,14 +130,22 @@
 
     /**获取奖品及信息列表*/
     $(document).ready(function() {
-        var job= "<option value=''>所有</option>";
+        var job= "";
         $.ajax({
 
                 url:prefix + "/prizeInfo",
                 success: function (data) {
 
                     for(var i in data){
-                        job += "<option value='"+data[i].prizecode+"'>"+data[i].prizename+"</option>"
+                        if(job.length==0){
+                            job += "<option value='"+data[i].prizecode+"'>"+data[i].prizename+"</option>"
+
+                        }else{
+                            job += "<option value='"+data[i].prizecode+"'>"+data[i].prizename+"</option>"
+
+                        }
+
+
                     }
                     $("#PRIZECODE").html(job);
                 },
diff --git a/sino-activity/src/main/resources/templates/activity/info/configEdit.html b/sino-activity/src/main/resources/templates/activity/info/configEdit.html
index 17a454502..7adc2e90a 100644
--- a/sino-activity/src/main/resources/templates/activity/info/configEdit.html
+++ b/sino-activity/src/main/resources/templates/activity/info/configEdit.html
@@ -14,7 +14,7 @@
                     <label class="col-sm-4 control-label is-required">奖项名称：</label>
                     <div class="col-sm-8">
                         <select name="PRIZELEVEL" class="form-control" th:with="type=${@dict.getType('prizeLevel')}">
-                            <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                            <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{PRIZELEVEL}"></option>
                         </select>
                     </div>
                 </div>
@@ -71,7 +71,7 @@
                     <label class="col-sm-4 control-label is-required">奖品发放制度：</label>
                     <div class="col-sm-8">
                         <select name="AWARDTYPE" class="form-control" th:with="type=${@dict.getType('AWARDTYPE')}">
-                            <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                            <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{AWARDTYPE}"></option>
                         </select>
                     </div>
                 </div>
@@ -91,7 +91,7 @@
                     <label class="col-sm-4 control-label is-required">领取方式：</label>
                     <div class="col-sm-8">
                         <select name="AWARDMETHOD" class="form-control" th:with="type=${@dict.getType('AWARDMETHOD')}">
-                            <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                            <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{AWARDMETHOD}"></option>
                         </select>
                     </div>
                 </div>
@@ -101,7 +101,7 @@
                     <label class="col-sm-4 control-label is-required">状态：</label>
                     <div class="col-sm-8">
                         <select name="STATUS" class="form-control" th:with="type=${@dict.getType('start_stop')}">
-                            <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                            <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{STATUS}"></option>
                         </select>
                     </div>
                 </div>
@@ -132,17 +132,27 @@
     $(document).ready(function() {
         var PRIZECODE = [[${drawConfig.PRIZECODE}]];
 
-        var job= "<option value=''>所有</option>";
+        var job= "";
         $.ajax({
 
                 url:prefix + "/prizeInfo",
                 success: function (data) {
 
                     for(var i in data){
-                        if(data[i].prizecode==PRIZECODE){
+                        if (job.length==0){
+
+                            if(data[i].prizecode==PRIZECODE){
+                                job = "<option value='"+data[i].prizecode+"' selected=\"selected\">"+data[i].prizename+"</option>"
+                            }
+                            job = "<option value='"+data[i].prizecode+"' >"+data[i].prizename+"</option>"
+
+                        }else{
+                            if(data[i].prizecode==PRIZECODE){
                             job += "<option value='"+data[i].prizecode+"' selected=\"selected\">"+data[i].prizename+"</option>"
                         }
                         job += "<option value='"+data[i].prizecode+"' >"+data[i].prizename+"</option>"
+                        }
+
 
                     }
                     $("#PRIZECODE").html(job);
diff --git a/sino-activity/src/main/resources/templates/activity/info/configList.html b/sino-activity/src/main/resources/templates/activity/info/configList.html
index beb8a410c..5f6364b93 100644
--- a/sino-activity/src/main/resources/templates/activity/info/configList.html
+++ b/sino-activity/src/main/resources/templates/activity/info/configList.html
@@ -11,11 +11,11 @@
 				<div class="select-list">
 				<ul>
 						<li >
-							<label>奖品代码：</label>
+							<label>活动编码：</label>
 							<input type="text" name="DRAWCODE"   th:value="${DRAWCODE}"  readonly/>
 						</li>
 						<li >
-							<label>奖品名称：</label>
+							<label>活动名称：</label>
 							<input type="text" name="DRAWNAME"   th:value="${DRAWNAME}" readonly/>
 						</li>
 					</ul>
diff --git a/sino-activity/src/main/resources/templates/activity/info/edit.html b/sino-activity/src/main/resources/templates/activity/info/edit.html
index 64f4dece1..518ff5f26 100644
--- a/sino-activity/src/main/resources/templates/activity/info/edit.html
+++ b/sino-activity/src/main/resources/templates/activity/info/edit.html
@@ -112,7 +112,7 @@
                         <div class="form-group">
                             <label class="col-sm-4 control-label is-required">时间段限制次数：</label>
                             <div class="col-sm-8">
-                                <input name="DAILYNUMBER" th:field="*{DAILYNUMBER}" placeholder="活动名称" class="form-control" type="text" maxlength="30">
+                                <input name="DAILYNUMBER" th:field="*{DAILYNUMBER}" placeholder="时间段限制次数" class="form-control" type="text" maxlength="30">
                             </div>
                         </div>
                     </div>
@@ -196,27 +196,43 @@
             var WILLDRAWAWARDPRIZE = [[${drawInfo.WILLDRAWAWARDPRIZE}]];
             var FIRSTAWARDPRIZE = [[${drawInfo.FIRSTAWARDPRIZE}]];
 
-            var job= "<option value=''>所有</option>";
-            var jobj= "<option value=''>所有</option>";
+            var job= "";
+            var jobj= "";
             $.ajax({
 
                     url:prefix + "/prizeInfo",
                     success: function (data) {
 
                         for(var i in data){
-                            if(data[i].prizecode==WILLDRAWAWARDPRIZE){
-                            job += "<option value='"+data[i].prizecode+"' selected=\"selected\">"+data[i].prizename+"</option>"
-                            }
-                            job += "<option value='"+data[i].prizecode+"' >"+data[i].prizename+"</option>"
+                            if (job.length==0){
+                                if(data[i].prizecode==WILLDRAWAWARDPRIZE){
+                                    job = "<option value='"+data[i].prizecode+"' selected=\"selected\">"+data[i].prizename+"</option>"
+                                }
+                                job = "<option value='"+data[i].prizecode+"' >"+data[i].prizename+"</option>"
 
+                            }
+                            else{
+                                if(data[i].prizecode==WILLDRAWAWARDPRIZE){
+                                    job += "<option value='"+data[i].prizecode+"' selected=\"selected\">"+data[i].prizename+"</option>"
+                                }
+                                job += "<option value='"+data[i].prizecode+"' >"+data[i].prizename+"</option>"
+                        }
                         }
                         $("#willdrawawardprize").html(job);
                         for(var i in data){
-                            if(data[i].prizecode==FIRSTAWARDPRIZE){
-                                jobj += "<option value='"+data[i].prizecode+"' selected=\"selected\">"+data[i].prizename+"</option>"
-                            }
-                            jobj += "<option value='"+data[i].prizecode+"' >"+data[i].prizename+"</option>"
+                            if(jobj.length==0){
+                                if(data[i].prizecode==FIRSTAWARDPRIZE){
+                                    jobj = "<option value='"+data[i].prizecode+"' selected=\"selected\">"+data[i].prizename+"</option>"
+                                }
+                                jobj = "<option value='"+data[i].prizecode+"' >"+data[i].prizename+"</option>"
 
+                            }else{
+
+                                if(data[i].prizecode==FIRSTAWARDPRIZE){
+                                    jobj += "<option value='"+data[i].prizecode+"' selected=\"selected\">"+data[i].prizename+"</option>"
+                                }
+                                jobj += "<option value='"+data[i].prizecode+"' >"+data[i].prizename+"</option>"
+                            }
                         }
                         $("#firstawardprize").html(jobj);
 
diff --git a/sino-activity/src/main/resources/templates/activity/info/info.html b/sino-activity/src/main/resources/templates/activity/info/info.html
index e810fb908..b33093807 100644
--- a/sino-activity/src/main/resources/templates/activity/info/info.html
+++ b/sino-activity/src/main/resources/templates/activity/info/info.html
@@ -80,16 +80,16 @@
 
                 {
                     field: 'drawtype',
-                    title: '抽奖活动类型',
+                    title: '活动类型',
                     visible: false
                 },
                 {
                     field: 'drawname',
-                    title: '抽奖活动名称'
+                    title: '活动名称'
                 },
                 {
                     field: 'drawcode',
-                    title: '抽奖活动代码',
+                    title: '活动编码',
                 },
                 {
                     field: 'expeno',
@@ -166,7 +166,7 @@
         DRAWCODE = (drawcode.length) >0 ?drawcode :null;
         DRAWNAME  = (drawname.length) >0? drawname :null;
         var url = prefix +'/prizeDetail/' + DRAWCODE +"/" + encodeURIComponent(encodeURIComponent(DRAWNAME));;
-        $.modal.openInFoFull("奖品维护", url)
+        $.modal.openInFoFull("奖项维护", url)
     }
 </script>
 </body>