Merge branch 'feature/promote_company_merge' of wmtx/platform into master

优化

Application/Admin/Controller/PromoteCompanyController.class.php

@@ -623,7 +623,7 @@ class PromoteCompanyController extends ThinkController
 
             $promoteCompanyService = new PromoteCompanyService();
 
-            $oldData = M('promote_company', 'tab_')->field(['id', 'company_belong'])->where(['id' => $save['company_id']])->find();
+            $oldData = M('promote_company', 'tab_')->field(['id', 'company_belong'])->where(['id' => $save['id']])->find();
             $isNewDeposit = false;
             if (!in_array($oldData['company_belong'], [1, 2]) && in_array($save['company_belong'], [1, 2])) {
                 $isNewDeposit = true;

Application/Admin/View/Partner/show.html

@@ -359,7 +359,7 @@
                 </div>
                 <div class="form-item cf">
                     <!--<input class="submit_btn ajax-post" type="button" value="保存" id="submit"  target-form="form-horizontal" style="margin-left:210px;">-->
-                    <a class="submit_btn " alt="返回上一页" title="返回上一页" href="javascript:window.history.back();" >
+                    <a class="submit_btn " alt="返回上一页" title="返回上一页" href="{:U('Partner/lists')}" >
                         返回
                     </a>
                 </div>

Application/Admin/View/PromoteCompany/add.html

@@ -609,7 +609,7 @@
                 </div>
                 <div class="form-item cf" style="margin-bottom: 40px;">
                     <input class="submit_btn" type="button" value="保存" id="submit"  target-form="form-horizontal" style="margin-left:210px;">
-                    <a class="submit_btn " alt="返回上一页" title="返回上一页" href="javascript:window.history.back();" >
+                    <a class="submit_btn " alt="返回上一页" title="返回上一页" href="{:U('PromoteCompany/lists')}" >
                         返回
                     </a>
                 </div>

Application/Admin/View/PromoteCompany/edit.html

@@ -625,7 +625,7 @@
                 </div>
                 <div class="form-item cf" style="margin-bottom: 40px;">
                     <input class="submit_btn" type="button" value="保存" id="submit"  target-form="form-horizontal" style="margin-left:210px;">
-                    <a class="submit_btn " alt="返回上一页" title="返回上一页" href="javascript:history.back(-1);" >
+                    <a class="submit_btn " alt="返回上一页" title="返回上一页" href="{:U('PromoteCompany/lists')}" >
                         返回
                     </a>
                 </div>

Application/Admin/View/PromoteCompany/view.html

@@ -637,7 +637,7 @@
                     </div>
                 </div>
                 <div class="form-item cf" style="margin-bottom: 40px;">
-                    <a class="submit_btn " alt="返回上一页" title="返回上一页" href="javascript:history.back(-1);" >
+                    <a class="submit_btn " alt="返回上一页" title="返回上一页" href="{:U('PromoteCompany/lists')}" >
                         返回
                     </a>
                 </div>