commit 2470136b4c0026672fdcd111da8eae5c0c6595ca
author Xia Kaixiang <kaixiang.xia@supwisdom.com> 周四 5月 23 17:29:45 2019 +0800
committer Xia Kaixiang <kaixiang.xia@supwisdom.com> 周一 3月 16 09:56:22 2020 +0800
tree 3618b8ab33f68059365a75ed1b35199332c013a6
parent 27fcb74c82d72aa53f0f210418e05d5933f743d8

id冲突

src/main/resources/templates/system/shop/config.html

diff --git a/src/main/resources/templates/system/shop/config.html b/src/main/resources/templates/system/shop/config.html
index 070295a..afb00d3 100644
--- a/src/main/resources/templates/system/shop/config.html
+++ b/src/main/resources/templates/system/shop/config.html
@@ -47,23 +47,23 @@
 </div>
 
 <!-- 表格状态列 -->
-<script type="text/html" id="consumeenable-tpl-state">
-    <input type="checkbox" lay-filter="consumeenable-tpl-state" value="{{d.shopaccno}}" def-paytype="{{d.paytype}}" lay-skin="switch" lay-text="启用|关闭"
+<script type="text/html" id="shop-consumeenable-tpl-state">
+    <input type="checkbox" lay-filter="shop-consumeenable-tpl-state" value="{{d.shopaccno}}" def-paytype="{{d.paytype}}" lay-skin="switch" lay-text="启用|关闭"
            {{d.consumeEnable=='yes'?'checked':''}}/>
 </script>
-<script type="text/html" id="anonymousenable-tpl-state">
+<script type="text/html" id="shop-anonymousenable-tpl-state">
     {{# if(d.consumeEnable =='yes' ){ }}
-    <input type="checkbox" lay-filter="anonymousenable-tpl-state" value="{{d.shopaccno}}" def-paytype="{{d.paytype}}" lay-skin="switch"
+    <input type="checkbox" lay-filter="shop-anonymousenable-tpl-state" value="{{d.shopaccno}}" def-paytype="{{d.paytype}}" lay-skin="switch"
            lay-text="启用|关闭"
            {{(d.consumeEnable=='yes' && d.anonymousEnable=='yes')?'checked':''}}/>
     {{# }else{ }}
-    <input type="checkbox" lay-filter="anonymousenable-tpl-state" value="{{d.shopaccno}}" def-paytype="{{d.paytype}}" lay-skin="switch"
+    <input type="checkbox" lay-filter="shop-anonymousenable-tpl-state" value="{{d.shopaccno}}" def-paytype="{{d.paytype}}" lay-skin="switch"
            lay-text="启用|关闭"
            {{(d.consumeEnable=='yes' && d.anonymousEnable=='yes')?'checked':''}} disabled/>
     {{# } }}
 </script>
-<script type="text/html" id="reverseenable-tpl-state">
-    <input type="checkbox" lay-filter="reverseenable-tpl-state" value="{{d.shopaccno}}" def-paytype="{{d.paytype}}" lay-skin="switch" lay-text="启用|关闭"
+<script type="text/html" id="shop-reverseenable-tpl-state">
+    <input type="checkbox" lay-filter="shop-reverseenable-tpl-state" value="{{d.shopaccno}}" def-paytype="{{d.paytype}}" lay-skin="switch" lay-text="启用|关闭"
            {{d.reverseEnable=='yes'?'checked':''}}/>
 </script>
 
@@ -142,7 +142,7 @@
                         title: '能否消费',
                         align: 'center',
                         width: 110,
-                        templet: '#consumeenable-tpl-state',
+                        templet: '#shop-consumeenable-tpl-state',
                         sort: true
                     },
                     {
@@ -150,7 +150,7 @@
                         title: '匿名消费',
                         align: 'center',
                         width: 110,
-                        templet: '#anonymousenable-tpl-state',
+                        templet: '#shop-anonymousenable-tpl-state',
                         sort: true
                     },
                     {
@@ -158,7 +158,7 @@
                         title: '能否冲正',
                         align: 'center',
                         width: 110,
-                        templet: '#reverseenable-tpl-state',
+                        templet: '#shop-reverseenable-tpl-state',
                         sort: true
                     },
                     {align: 'center', title: '操作', width: 90, fixed: 'right', templet: function (item) {
@@ -173,7 +173,7 @@
         });
 
         // 修改总状态
-        form.on('switch(consumeenable-tpl-state)', function (obj) {
+        form.on('switch(shop-consumeenable-tpl-state)', function (obj) {
             var token = $("meta[name='_csrf_token']").attr("value");
             admin.go('/shop/updatepaytypestat', {
                 shopaccno: obj.elem.value,
@@ -202,12 +202,12 @@
             });
         });
 
-        form.on('switch(anonymousenable-tpl-state)', function (obj) {
+        form.on('switch(shop-anonymousenable-tpl-state)', function (obj) {
             var token = $("meta[name='_csrf_token']").attr("value");
             updateShopPaytypeState(obj, "anonymous", token);
         });
 
-        form.on('switch(reverseenable-tpl-state)', function (obj) {
+        form.on('switch(shop-reverseenable-tpl-state)', function (obj) {
             var token = $("meta[name='_csrf_token']").attr("value");
             updateShopPaytypeState(obj, "reverse", token);
         });