Merge branch 'master' of http://git.luyuan.tk/pplokijuhyg/deguodaigou into pplok

2019-12-24 15:02:17 +08:00
parent a10a1b0c08 260785c6fe
commit 68a7aea72c
365 changed files with 9339 additions and 9254 deletions
--- a/pages/undetermined/undetermined.js
+++ b/pages/undetermined/undetermined.js
@@ -1,5 +1,8 @@
 // pages/undetermined/undetermined.js
+<<<<<<< HEAD
 import bin from "../../utils/bin"
+=======
+>>>>>>> 260785c6fe0a4997462040f4f8890f1da9a0deb6
 Page({

    /**
--- a/pages/undetermined/undetermined.json
+++ b/pages/undetermined/undetermined.json
@@ -1,6 +1,6 @@
-{
-  "usingComponents": {
-    "content":"../components/particulars/content/index",
-    "orderchooseaddr":"../components/particulars/orderchooseaddr/index"
-  }
+{
+  "usingComponents": {
+    "content":"../components/particulars/content/index",
+    "orderchooseaddr":"../components/particulars/orderchooseaddr/index"
+  }
 }
--- a/pages/undetermined/undetermined.wxss
+++ b/pages/undetermined/undetermined.wxss
@@ -1 +1 @@
-page{background-color:#FBFBFB}
+page{background-color:#FBFBFB}