From ec45a1e4a8967e93230eeda0857a4b8eb8d6b663 Mon Sep 17 00:00:00 2001
From: WXD-SEASON\season <season.su@yolipai.com>
Date: Thu, 6 Jul 2023 17:49:34 +0800
Subject: [PATCH] 冲突1

---
 packageB/pages/zuhegou/index/index.js | 13 -------------
 1 file changed, 0 insertions(+), 13 deletions(-)

diff --git a/packageB/pages/zuhegou/index/index.js b/packageB/pages/zuhegou/index/index.js
index 0ee20e6..14a7f8f 100644
--- a/packageB/pages/zuhegou/index/index.js
+++ b/packageB/pages/zuhegou/index/index.js
@@ -2078,19 +2078,6 @@ Page({
                   var value2 = b[property];
                   return value1 - value2;
                 }
-
-              th.setData({
-                def_pickpu_list: def_arr,
-                pickpu_list: ee.data.data.pageData
-              });
-
-              //门店分类要排序下
-              function compare(property) {
-                return function (a, b) {
-                  var value1 = a[property];
-                  var value2 = b[property];
-                  return value1 - value2;
-                }
               }
 
               if (newarr.length > 0)
--
libgit2 0.21.4