Merge remote-tracking branch 'origin/test' into test

application/index/view/setting/index.html

@@ -24,6 +24,7 @@
 
                             <div class="form-group">
                                 <label class="col-sm-3 control-label" style="text-align: right">&nbsp;</label>
+
                                 <div class="col-sm-9" style="text-align: left;">
                                     <button type="button" class="btn btn-primary" id="save">保存修改</button>
                                 </div>

public/resource/js/setting.js

@@ -15,6 +15,7 @@ define (['doT', 'text!temp/setting_template_tpl.html', 'css!style/home.css'], fu
                 Setting.saveSetting();
             });
         },
+        // 引入模板
         getInfo: function () {
             var param = {};
             $.ajax ({
@@ -31,6 +32,7 @@ define (['doT', 'text!temp/setting_template_tpl.html', 'css!style/home.css'], fu
                 }
             });
         },
+        //提交数据
         saveSetting : function () {
             var param = {};
             param.is_privacy= $("input[type='radio']:checked").val();

public/resource/template/setting_template_tpl.html

@@ -27,5 +27,10 @@
         <div class="col-sm-9">
             <input type="number" class="form-control btn5" name="day_num" placeholder="隐号绑定天数" value="[%= it['day_num'] %]">
         </div>
+        <br><br>
+        <label class="col-sm-3 control-label" style="text-align: right">商铺自动下架天数：</label>
+        <div class="col-sm-9">
+            <input type="number" class="form-control btn5" name="shop_day_num" placeholder="商铺自动下架天数" value="[%= it['day_num'] %]">
+        </div>
     </div>
 </script>