1

.idea/workspace.xml

@@ -3,13 +3,9 @@
   <component name="ChangeListManager">
     <list default="true" id="1a36929e-c054-4875-a943-593a74e55fa4" name="Default Changelist" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/application/operate/controller/Demand.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/operate/controller/Demand.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/application/operate/controller/PlatformDemand.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/operate/controller/PlatformDemand.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/application/operate/controller/SupplierGoods.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/operate/controller/SupplierGoods.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/application/operate/view/activity/form.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/operate/view/activity/form.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/application/operate/view/platform_demand/form.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/operate/view/platform_demand/form.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/application/operate/view/supplier/form.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/operate/view/supplier/form.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/application/operate/view/supplier_goods/form.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/operate/view/supplier_goods/form.html" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/mall/controller/FreightTemplate.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/mall/controller/FreightTemplate.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/mall/view/freight_template/form.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/mall/view/freight_template/form.html" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/mall/view/store_goods/form.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/mall/view/store_goods/form.html" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -176,7 +172,7 @@
       <workItem from="1666659002848" duration="14268000" />
       <workItem from="1666746114555" duration="18673000" />
       <workItem from="1666833605829" duration="20099000" />
-      <workItem from="1666919224277" duration="2432000" />
+      <workItem from="1666919224277" duration="2605000" />
     </task>
     <servers />
   </component>

application/mall/controller/FreightTemplate.php

@@ -146,11 +146,12 @@ class FreightTemplate extends Controller
         }
     }
 
-    protected function _form_result()
+    protected function _form_result($id)
     {
-
+        $this->success('操作成功', 'javascript:history.back()');
     }
 
 
 
+
 }

application/mall/view/freight_template/form.html

@@ -127,7 +127,7 @@
             {notempty name='vo.id'}<input type='hidden' value='{$vo.id}' name='id'>{/notempty}
             <div class="layui-form-item text-center">
                 <button class="layui-btn" type='submit'>保 存</button>
-                <a class="layui-btn layui-btn-danger" type='button'  data-open="{:url('index')}"  >取消编辑</a>
+                <button class="layui-btn layui-btn-danger" type='button' onclick="history.go(-1)" data-close>返回</button>
             </div>
         </div>
     </form>

application/mall/view/store_goods/form.html

@@ -238,8 +238,8 @@
 
                         <div class="layui-form-item text-center">
                             {notempty name='vo.id'}<input type="hidden" name="id" value="{$vo.id}">{/notempty}
-                            <button class="layui-btn layui-btn-danger" ng-click="hsitoryBack()" type="button">取消编辑</button>
                             <button class="layui-btn" type="submit">保存商品</button>
+                            <button class="layui-btn layui-btn-danger" type='button' onclick="history.go(-1)" data-close>返回</button>
                         </div>
 
                     </div>