Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/platform_rule

Application/Admin/Controller/ToolController.class.php

@@ -21,6 +21,7 @@ class ToolController extends ThinkController {
     {
         $name   = $_POST['name'];
         $config = I('config');
+
         $data   = array('config'=>json_encode($config),'template'=>$_POST['template'],'status'=>$_POST['status']);
         $map['name']=$name;
 

Application/Admin/View/Tool/payset.html

@@ -1710,10 +1710,18 @@
                   </label></span>
                             <span class="notice-text" style="margin-left:5px;margin-right: 15px;width: 70px;">支付宝</span>
  					-->
-				  <span class="form_checkbox">
-                    <label><input name="config[wxp]" type="checkbox" value="1" <eq name="heepay['wxp']" value="1">checked="checked"</eq> class="">
+<!--				  <span class="form_checkbox">-->
+<!--                    <label><input name="config[wxp]" type="checkbox" value="1" <eq name="heepay['wxp']" value="1">checked="checked"</eq> class="">-->
+<!--                  </label></span>-->
+<!--                  <span class="notice-text" style="margin-left:5px;margin-right: 15px;width: 70px;">微信小程序</span>-->
+                          <span class="form_checkbox">
+                    <label><input name="config[alipay]" type="checkbox" value="1" <eq name="heepay['alipay']" value="1">checked="checked"</eq> class="">
                   </label></span>
-                  <span class="notice-text" style="margin-left:5px;margin-right: 15px;width: 70px;">微信小程序</span>
+                          <span class="notice-text" style="margin-left:5px;margin-right: 15px;width: 70px;">支付宝</span>
+                          <span class="form_checkbox">
+                    <label><input name="config[wxpay]" type="checkbox" value="1" <eq name="heepay['wxpay']" value="1">checked="checked"</eq> class="">
+                  </label></span>
+                          <span class="notice-text" style="margin-left:5px;margin-right: 15px;width: 70px;">微信</span>
 
                         </td>
                     </tr>