Merge branch 'master' of http://git.dongerkj.com:9095/derkj/NN2020042801

public/themes/admin_simpleboot3/admin/jiameng/add.html

@@ -104,7 +104,7 @@
         </div>
         
         <div class="form-group">
-           <php>$level=array('1'=>'今日之星','2'=>'品牌精选','3'=>'品牌推荐','4'=>'品牌严选','5'=>'默认','6'=>'推荐专题品牌','7'=>'品牌聚焦','8'=>'最新品牌')</php>
+           <php>$level=array('1'=>'今日之星','2'=>'品牌精选','3'=>'品牌推荐','4'=>'品牌严选','5'=>'默认','6'=>'推荐专题品牌','7'=>'品牌聚焦')</php>
             <label for="level" class="col-sm-2 control-label"><span class="form-required">*</span>信息等级</label>
             <div class="col-md-6 col-sm-10">
                 <select name="level" id="" class="form-control">

public/themes/admin_simpleboot3/admin/jiameng/edit.html

@@ -106,12 +106,19 @@
         </div>
         
         <div class="form-group">
+             <php>$level=array('1'=>'今日之星','2'=>'品牌精选','3'=>'品牌推荐','4'=>'品牌严选','5'=>'默认','6'=>'推荐专题品牌','7'=>'品牌聚焦')</php>
             <label for="level" class="col-sm-2 control-label"><span class="form-required">*</span>信息等级</label>
             <div class="col-md-6 col-sm-10">
                 <select name="level" id="" class="form-control">
-                    <?php for($i=0;$i<10;$i++){ ?>
+                <!--     <?php for($i=0;$i<10;$i++){ ?>
                     <option <?php if($i==$info['level']) echo 'selected'; ?> value="{$i}">{$i}级</option>
-                    <?php } ?>
+                    <?php } ?> -->
+
+                    
+                    <foreach name="level" item="vo">
+                            <php>$sexselected=$key==$info['level']?"selected":"";</php>
+                            <option value="{$key}" {$sexselected}>{$vo}</option>
+                    </foreach>
                     
                 </select>
             </div>

public/themes/admin_simpleboot3/admin/know/add.html

@@ -40,14 +40,23 @@
                 <input type="text" class="form-control" id="username" name="username">
             </div>
         </div>
+        
+         <div class="form-group">
+            <label for="title" class="col-2 col-sm-2 control-label"><span class="form-required">*</span>简短描述</label>
+            <div class="col-5 col-md-5 col-sm-5">
+                 <textarea class="form-control" style="height: 76px;" id="description" name="description"></textarea>
+            </div>
+        </div>
+
         <div class="form-group">
-            <label for="title" class="col-2 col-sm-2 control-label"><span class="form-required">*</span>问题描述</label>
+            <label for="title" class="col-2 col-sm-2 control-label"><span class="form-required">*</span>问题内容</label>
             <div class="col-5 col-md-5 col-sm-5">
                 <script id="content" name="content" type="text/plain">    
                 </script>
 
             </div>
         </div>
+
         <div class="form-group">
             <label for="author" class="col-sm-2 control-label">回答者</label>
             <div class="col-md-6 col-sm-10">

public/themes/admin_simpleboot3/admin/know/edit.html

@@ -41,8 +41,15 @@
                 <input type="text" class="form-control" id="username" name="username" value="{$info.username}">
             </div>
         </div>
+         <div class="form-group">
+            <label for="seo_description" class="col-sm-2 control-label">简短描述</label>
+            <div class="col-md-6 col-sm-10">
+            <textarea class="form-control" style="height: 76px;" id="description" name="description">{$info.description} </textarea>
+                
+            </div>
+        </div>
         <div class="form-group">
-            <label for="title" class="col-2 col-sm-2 control-label"><span class="form-required">*</span>问题描述</label>
+            <label for="title" class="col-2 col-sm-2 control-label"><span class="form-required">*</span>问题内容</label>
             <div class="col-5 col-md-5 col-sm-5">
                 <script id="content" name="content" type="text/plain">    {$info.content}
                 </script>

public/themes/admin_simpleboot3/admin/news/add.html

@@ -131,12 +131,12 @@
             <label for="title" class="col-sm-2 control-label">信息等级</label>
             <div class="col-md-6 col-sm-10">
             	<select class="form-control" name="level">
-            		<option value="0">0默认</option>
-            		<option value="1">1新闻首页广告</option>
-            		<option value="2">2新闻首页小图</option>
-            		<option value="3">3首页加盟动态</option>
+            		<option value="0">0无</option>
+            		<option value="1">1首页加盟问答</option>
+            		<!-- <option value="2">2首页加盟课堂</option> -->
+            	<!-- 	<option value="3">3首页加盟动态</option>
             		<option value="4">4首页新闻中心</option>
-            		<option value="5">5首页新闻中心小图</option>
+            		<option value="5">5首页新闻中心小图</option> -->
             	</select>
                 
             </div>

public/themes/admin_simpleboot3/admin/news/edit.html

@@ -149,12 +149,12 @@
             <label for="title" class="col-sm-2 control-label">信息等级</label>
             <div class="col-md-6 col-sm-10">
             	<select class="form-control" name="level">
-            		<option <if condition="$info.level==0"> selected </if> value="0">0默认</option>
-            		<option <if condition="$info.level==1"> selected </if> value="1">1新闻首页广告</option>
-            		<option <if condition="$info.level==2"> selected </if> value="2">2新闻首页小图</option>
-            		<option <if condition="$info.level==3"> selected </if> value="3">3首页加盟动态</option>
+            		<option <if condition="$info.level==0"> selected </if> value="0">0无</option>
+            		<option <if condition="$info.level==1"> selected </if> value="1">1首页加盟问答</option>
+            		<!-- <option <if condition="$info.level==2"> selected </if> value="2">2首页加盟课堂</option> -->
+            	<!-- 	<option <if condition="$info.level==3"> selected </if> value="3">3首页加盟动态</option>
             		<option <if condition="$info.level==4"> selected </if> value="4">4首页新闻中心</option>
-            		<option <if condition="$info.level==5"> selected </if> value="5">5首页新闻中心小图</option>
+            		<option <if condition="$info.level==5"> selected </if> value="5">5首页新闻中心小图</option> -->
             	</select>
                 
             </div>