dever 3 years ago
parent
commit
2a2c5fc820

+ 25 - 23
app/factory/assets/pc/html/setGoods.html

@@ -252,39 +252,41 @@
     // 一键删除
     function delGoods()
     {
-        var key = mini.get("key").getValue();
-        if (key == '请输入商品名称') {
-            key = '';
-        }
-        if (key) {
-            key = key.toLowerCase();
-        }
-        for (var i in tree.data) {
-            if (typeof(tree.data[i].children) == 'object') {
-                if (tree.data[i].children.length > 0) {
-                    for (var j in tree.data[i].children) {
+        if (confirm('确定删除吗?')) {
+            var key = mini.get("key").getValue();
+            if (key == '请输入商品名称') {
+                key = '';
+            }
+            if (key) {
+                key = key.toLowerCase();
+            }
+            for (var i in tree.data) {
+                if (typeof(tree.data[i].children) == 'object') {
+                    if (tree.data[i].children.length > 0) {
+                        for (var j in tree.data[i].children) {
+                            if (key) {
+                                var name = tree.data[i].children[j].name;
+                                if (name.indexOf(key) != -1) {
+                                    unsetGoods(tree.data[i].children[j]);
+                                }
+                            } else {
+                                unsetGoods(tree.data[i].children[j]);
+                            }
+                        }
+                    } else {
                         if (key) {
-                            var name = tree.data[i].children[j].name;
+                            var name = tree.data[i].name;
                             if (name.indexOf(key) != -1) {
-                                unsetGoods(tree.data[i].children[j]);
+                                unsetGoods(tree.data[i]);
                             }
                         } else {
-                            unsetGoods(tree.data[i].children[j]);
-                        }
-                    }
-                } else {
-                    if (key) {
-                        var name = tree.data[i].name;
-                        if (name.indexOf(key) != -1) {
                             unsetGoods(tree.data[i]);
                         }
-                    } else {
-                        unsetGoods(tree.data[i]);
                     }
                 }
             }
+            setTotal();
         }
-        setTotal();
     }
 
     function unsetGoods(node)

+ 27 - 25
app/shop/assets/pc/html/setGoods.html

@@ -256,39 +256,41 @@
     // 一键删除
     function delGoods()
     {
-        var key = mini.get("key").getValue();
-        if (key == '请输入商品名称') {
-            key = '';
-        }
-        if (key) {
-            key = key.toLowerCase();
-        }
-        for (var i in tree.data) {
-            if (typeof(tree.data[i].children) == 'object') {
-                if (tree.data[i].children.length > 0) {
-                    for (var j in tree.data[i].children) {
+        if (confirm('确定删除吗?')) {
+            var key = mini.get("key").getValue();
+            if (key == '请输入商品名称') {
+                key = '';
+            }
+            if (key) {
+                key = key.toLowerCase();
+            }
+            for (var i in tree.data) {
+                if (typeof(tree.data[i].children) == 'object') {
+                    if (tree.data[i].children.length > 0) {
+                        for (var j in tree.data[i].children) {
+                            if (key) {
+                                var name = tree.data[i].children[j].name;
+                                if (name.indexOf(key) != -1) {
+                                    unsetGoods(tree.data[i].children[j]);
+                                }
+                            } else {
+                                unsetGoods(tree.data[i].children[j]);
+                            }
+                        }
+                    } else {
                         if (key) {
-                            var name = tree.data[i].children[j].name;
+                            var name = tree.data[i].name;
                             if (name.indexOf(key) != -1) {
-                                unsetGoods(tree.data[i].children[j]);
+                                unsetGoods(tree.data[i]);
                             }
                         } else {
-                            unsetGoods(tree.data[i].children[j]);
-                        }
-                    }
-                } else {
-                    if (key) {
-                        var name = tree.data[i].name;
-                        if (name.indexOf(key) != -1) {
                             unsetGoods(tree.data[i]);
                         }
-                    } else {
-                        unsetGoods(tree.data[i]);
                     }
                 }
             }
+            setTotal();
         }
-        setTotal();
     }
 
     function unsetGoods(node)
@@ -393,12 +395,12 @@
 
     function del(id)
     {
-        if (confirm('确定删除吗?')) {
+        //if (confirm('确定删除吗?')) {
             goods[id].del = 2;
             goods[id].num = 0;
             get(id).remove();
             setTotal();
-        }
+        //}
     }
 
     function setTotal()

+ 25 - 23
app/store/assets/pc/html/setGoods.html

@@ -286,39 +286,41 @@
     // 一键删除
     function delGoods()
     {
-        var key = mini.get("key").getValue();
-        if (key == '请输入商品名称') {
-            key = '';
-        }
-        if (key) {
-            key = key.toLowerCase();
-        }
-        for (var i in tree.data) {
-            if (typeof(tree.data[i].children) == 'object') {
-                if (tree.data[i].children.length > 0) {
-                    for (var j in tree.data[i].children) {
+        if (confirm('确定删除吗?')) {
+            var key = mini.get("key").getValue();
+            if (key == '请输入商品名称') {
+                key = '';
+            }
+            if (key) {
+                key = key.toLowerCase();
+            }
+            for (var i in tree.data) {
+                if (typeof(tree.data[i].children) == 'object') {
+                    if (tree.data[i].children.length > 0) {
+                        for (var j in tree.data[i].children) {
+                            if (key) {
+                                var name = tree.data[i].children[j].name;
+                                if (name.indexOf(key) != -1) {
+                                    unsetGoods(tree.data[i].children[j]);
+                                }
+                            } else {
+                                unsetGoods(tree.data[i].children[j]);
+                            }
+                        }
+                    } else {
                         if (key) {
-                            var name = tree.data[i].children[j].name;
+                            var name = tree.data[i].name;
                             if (name.indexOf(key) != -1) {
-                                unsetGoods(tree.data[i].children[j]);
+                                unsetGoods(tree.data[i]);
                             }
                         } else {
-                            unsetGoods(tree.data[i].children[j]);
-                        }
-                    }
-                } else {
-                    if (key) {
-                        var name = tree.data[i].name;
-                        if (name.indexOf(key) != -1) {
                             unsetGoods(tree.data[i]);
                         }
-                    } else {
-                        unsetGoods(tree.data[i]);
                     }
                 }
             }
+            setTotal();
         }
-        setTotal();
     }
 
     function unsetGoods(node)

+ 27 - 25
app/store/assets/pc/html/setGoodsNum.html

@@ -242,39 +242,41 @@
     // 一键删除
     function delGoods()
     {
-        var key = mini.get("key").getValue();
-        if (key == '请输入商品名称') {
-            key = '';
-        }
-        if (key) {
-            key = key.toLowerCase();
-        }
-        for (var i in tree.data) {
-            if (typeof(tree.data[i].children) == 'object') {
-                if (tree.data[i].children.length > 0) {
-                    for (var j in tree.data[i].children) {
+        if (confirm('确定删除吗?')) {
+            var key = mini.get("key").getValue();
+            if (key == '请输入商品名称') {
+                key = '';
+            }
+            if (key) {
+                key = key.toLowerCase();
+            }
+            for (var i in tree.data) {
+                if (typeof(tree.data[i].children) == 'object') {
+                    if (tree.data[i].children.length > 0) {
+                        for (var j in tree.data[i].children) {
+                            if (key) {
+                                var name = tree.data[i].children[j].name;
+                                if (name.indexOf(key) != -1) {
+                                    unsetGoods(tree.data[i].children[j]);
+                                }
+                            } else {
+                                unsetGoods(tree.data[i].children[j]);
+                            }
+                        }
+                    } else {
                         if (key) {
-                            var name = tree.data[i].children[j].name;
+                            var name = tree.data[i].name;
                             if (name.indexOf(key) != -1) {
-                                unsetGoods(tree.data[i].children[j]);
+                                unsetGoods(tree.data[i]);
                             }
                         } else {
-                            unsetGoods(tree.data[i].children[j]);
-                        }
-                    }
-                } else {
-                    if (key) {
-                        var name = tree.data[i].name;
-                        if (name.indexOf(key) != -1) {
                             unsetGoods(tree.data[i]);
                         }
-                    } else {
-                        unsetGoods(tree.data[i]);
                     }
                 }
             }
+            setTotal();
         }
-        setTotal();
     }
 
     function unsetGoods(node)
@@ -356,12 +358,12 @@
 
     function del(id)
     {
-        if (confirm('确定删除吗?')) {
+        //if (confirm('确定删除吗?')) {
             goods[id].del = 2;
             goods[id].num = 0;
             get(id).remove();
             setTotal();
-        }
+        //}
     }
 
     function setTotal()