fix: 解决冲突

package-lock.json

@@ -4926,6 +4926,26 @@
         }
       }
     },
+    "node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15": {
+      "name": "vue-loader",
+      "version": "15.10.1",
+      "resolved": "https://registry.npmmirror.com/vue-loader/-/vue-loader-15.10.1.tgz",
+      "integrity": "sha512-SaPHK1A01VrNthlix6h1hq4uJu7S/z0kdLUb6klubo738NeQoLbS6V9/d8Pv19tU0XdQKju3D1HSKuI8wJ5wMA==",
+      "dev": true,
+      "dependencies": {
+        "@vue/component-compiler-utils": "^3.1.0",
+        "hash-sum": "^1.0.2",
+        "loader-utils": "^1.1.0",
+        "vue-hot-reload-api": "^2.3.0",
+        "vue-style-loader": "^4.1.0"
+      }
+    },
+    "node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/node_modules/hash-sum": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmmirror.com/hash-sum/-/hash-sum-1.0.2.tgz",
+      "integrity": "sha512-fUs4B4L+mlt8/XAtSOGMUO1TXmAelItBPtJG7CyHJfYTdDjwisntGO2JQz7oUsatOY9o68+57eziUVNw/mRHmA==",
+      "dev": true
+    },
     "node_modules/@vue/cli-service/node_modules/acorn": {
       "version": "8.8.2",
       "resolved": "https://registry.npmmirror.com/acorn/-/acorn-8.8.2.tgz",
@@ -5083,20 +5103,6 @@
       "version": "3.2.47",
       "integrity": "sha512-BHGyyGN3Q97EZx0taMQ+OLNuZcW3d37ZEVmEAyeoA9ERdGvm9Irc/0Fua8SNyOtV1w6BS4q25wbMzJujO9HIfQ=="
     },
-    "node_modules/@vue/vue-loader-v15": {
-      "name": "vue-loader",
-      "version": "15.10.1",
-      "resolved": "https://registry.npmmirror.com/vue-loader/-/vue-loader-15.10.1.tgz",
-      "integrity": "sha512-SaPHK1A01VrNthlix6h1hq4uJu7S/z0kdLUb6klubo738NeQoLbS6V9/d8Pv19tU0XdQKju3D1HSKuI8wJ5wMA==",
-      "dev": true,
-      "dependencies": {
-        "@vue/component-compiler-utils": "^3.1.0",
-        "hash-sum": "^1.0.2",
-        "loader-utils": "^1.1.0",
-        "vue-hot-reload-api": "^2.3.0",
-        "vue-style-loader": "^4.1.0"
-      }
-    },
     "node_modules/@vue/web-component-wrapper": {
       "version": "1.3.0",
       "integrity": "sha512-Iu8Tbg3f+emIIMmI2ycSI8QcEuAUgPTgHwesDU1eKMLE4YC/c/sFbGc70QgMq31ijRftV0R7vCm9co6rldCeOA==",
@@ -5566,7 +5572,6 @@
     "node_modules/anymatch": {
       "version": "3.1.3",
       "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==",
-      "devOptional": true,
       "dependencies": {
         "normalize-path": "^3.0.0",
         "picomatch": "^2.0.4"
@@ -6054,7 +6059,6 @@
     "node_modules/binary-extensions": {
       "version": "2.2.0",
       "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==",
-      "devOptional": true,
       "engines": {
         "node": ">=8"
       }
@@ -6190,7 +6194,6 @@
     "node_modules/braces": {
       "version": "3.0.2",
       "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
-      "devOptional": true,
       "dependencies": {
         "fill-range": "^7.0.1"
       },
@@ -6529,7 +6532,6 @@
     "node_modules/chokidar": {
       "version": "3.5.3",
       "integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==",
-      "devOptional": true,
       "dependencies": {
         "anymatch": "~3.1.2",
         "braces": "~3.0.2",
@@ -6550,7 +6552,6 @@
       "version": "5.1.2",
       "resolved": "https://registry.npmmirror.com/glob-parent/-/glob-parent-5.1.2.tgz",
       "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
-      "devOptional": true,
       "dependencies": {
         "is-glob": "^4.0.1"
       },
@@ -6943,6 +6944,7 @@
     "node_modules/consolidate": {
       "version": "0.15.1",
       "integrity": "sha512-DW46nrsMJgy9kqAbPt5rKaCr7uFtpo4mSUvLHIUbJEjm0vo+aY5QLwBUq3FK4tRnJr/X0Psc0C4jf/h+HtXSMw==",
+      "deprecated": "Please upgrade to consolidate v1.0.0+ as it has been modernized with several long-awaited fixes implemented. Maintenance is supported by Forward Email at https://forwardemail.net ; follow/watch https://github.com/ladjs/consolidate for updates and release changelog",
       "dependencies": {
         "bluebird": "^3.1.1"
       },
@@ -9026,7 +9028,6 @@
     "node_modules/fill-range": {
       "version": "7.0.1",
       "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
-      "devOptional": true,
       "dependencies": {
         "to-regex-range": "^5.0.1"
       },
@@ -9251,7 +9252,6 @@
       "version": "2.3.2",
       "resolved": "https://registry.npmmirror.com/fsevents/-/fsevents-2.3.2.tgz",
       "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
-      "dev": true,
       "hasInstallScript": true,
       "optional": true,
       "os": [
@@ -10110,7 +10110,6 @@
     "node_modules/is-binary-path": {
       "version": "2.1.0",
       "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
-      "devOptional": true,
       "dependencies": {
         "binary-extensions": "^2.0.0"
       },
@@ -10194,7 +10193,6 @@
     "node_modules/is-extglob": {
       "version": "2.1.1",
       "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
-      "devOptional": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -10236,7 +10234,6 @@
     "node_modules/is-glob": {
       "version": "4.0.3",
       "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
-      "devOptional": true,
       "dependencies": {
         "is-extglob": "^2.1.1"
       },
@@ -10267,7 +10264,6 @@
     "node_modules/is-number": {
       "version": "7.0.0",
       "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
-      "devOptional": true,
       "engines": {
         "node": ">=0.12.0"
       }
@@ -13517,7 +13513,6 @@
     "node_modules/picomatch": {
       "version": "2.3.1",
       "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
-      "devOptional": true,
       "engines": {
         "node": ">=8.6"
       }
@@ -14419,7 +14414,6 @@
     "node_modules/prettier": {
       "version": "2.8.4",
       "integrity": "sha512-vIS4Rlc2FNh0BySk3Wkd6xmwxB0FpOndW5fisM5H8hsZSxU2VWVB5CWIkIjWvrHjIhxk2g3bfMKM87zNTrZddw==",
-      "devOptional": true,
       "bin": {
         "prettier": "bin-prettier.js"
       },
@@ -14873,7 +14867,6 @@
     "node_modules/readdirp": {
       "version": "3.6.0",
       "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
-      "devOptional": true,
       "dependencies": {
         "picomatch": "^2.2.1"
       },
@@ -17008,7 +17001,6 @@
     "node_modules/to-regex-range": {
       "version": "5.0.1",
       "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
-      "devOptional": true,
       "dependencies": {
         "is-number": "^7.0.0"
       },
@@ -17555,6 +17547,7 @@
     "node_modules/w3c-hr-time": {
       "version": "1.0.2",
       "integrity": "sha512-z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ==",
+      "deprecated": "Use your platform's native performance.now() and performance.timeOrigin.",
       "dev": true,
       "dependencies": {
         "browser-process-hrtime": "^1.0.0"
@@ -17721,7 +17714,7 @@
       "version": "1.2.13",
       "resolved": "https://registry.npmmirror.com/fsevents/-/fsevents-1.2.13.tgz",
       "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==",
-      "deprecated": "fsevents 1 will break on node v14+ and could be using insecure binaries. Upgrade to fsevents 2.",
+      "deprecated": "The v1 package contains DANGEROUS / INSECURE binaries. Upgrade to safe fsevents v2",
       "hasInstallScript": true,
       "optional": true,
       "os": [
@@ -22237,6 +22230,27 @@
         "whatwg-fetch": "^3.6.2"
       },
       "dependencies": {
+        "@vue/vue-loader-v15": {
+          "version": "npm:vue-loader@15.10.1",
+          "resolved": "https://registry.npmmirror.com/vue-loader/-/vue-loader-15.10.1.tgz",
+          "integrity": "sha512-SaPHK1A01VrNthlix6h1hq4uJu7S/z0kdLUb6klubo738NeQoLbS6V9/d8Pv19tU0XdQKju3D1HSKuI8wJ5wMA==",
+          "dev": true,
+          "requires": {
+            "@vue/component-compiler-utils": "^3.1.0",
+            "hash-sum": "^1.0.2",
+            "loader-utils": "^1.1.0",
+            "vue-hot-reload-api": "^2.3.0",
+            "vue-style-loader": "^4.1.0"
+          },
+          "dependencies": {
+            "hash-sum": {
+              "version": "1.0.2",
+              "resolved": "https://registry.npmmirror.com/hash-sum/-/hash-sum-1.0.2.tgz",
+              "integrity": "sha512-fUs4B4L+mlt8/XAtSOGMUO1TXmAelItBPtJG7CyHJfYTdDjwisntGO2JQz7oUsatOY9o68+57eziUVNw/mRHmA==",
+              "dev": true
+            }
+          }
+        },
         "acorn": {
           "version": "8.8.2",
           "resolved": "https://registry.npmmirror.com/acorn/-/acorn-8.8.2.tgz",
@@ -22369,19 +22383,6 @@
       "version": "3.2.47",
       "integrity": "sha512-BHGyyGN3Q97EZx0taMQ+OLNuZcW3d37ZEVmEAyeoA9ERdGvm9Irc/0Fua8SNyOtV1w6BS4q25wbMzJujO9HIfQ=="
     },
-    "@vue/vue-loader-v15": {
-      "version": "npm:vue-loader@15.10.1",
-      "resolved": "https://registry.npmmirror.com/vue-loader/-/vue-loader-15.10.1.tgz",
-      "integrity": "sha512-SaPHK1A01VrNthlix6h1hq4uJu7S/z0kdLUb6klubo738NeQoLbS6V9/d8Pv19tU0XdQKju3D1HSKuI8wJ5wMA==",
-      "dev": true,
-      "requires": {
-        "@vue/component-compiler-utils": "^3.1.0",
-        "hash-sum": "^1.0.2",
-        "loader-utils": "^1.1.0",
-        "vue-hot-reload-api": "^2.3.0",
-        "vue-style-loader": "^4.1.0"
-      }
-    },
     "@vue/web-component-wrapper": {
       "version": "1.3.0",
       "integrity": "sha512-Iu8Tbg3f+emIIMmI2ycSI8QcEuAUgPTgHwesDU1eKMLE4YC/c/sFbGc70QgMq31ijRftV0R7vCm9co6rldCeOA==",
@@ -22804,7 +22805,6 @@
     "anymatch": {
       "version": "3.1.3",
       "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==",
-      "devOptional": true,
       "requires": {
         "normalize-path": "^3.0.0",
         "picomatch": "^2.0.4"
@@ -23188,8 +23188,7 @@
     },
     "binary-extensions": {
       "version": "2.2.0",
-      "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==",
-      "devOptional": true
+      "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA=="
     },
     "bindings": {
       "version": "1.5.0",
@@ -23313,7 +23312,6 @@
     "braces": {
       "version": "3.0.2",
       "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
-      "devOptional": true,
       "requires": {
         "fill-range": "^7.0.1"
       }
@@ -23616,7 +23614,6 @@
     "chokidar": {
       "version": "3.5.3",
       "integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==",
-      "devOptional": true,
       "requires": {
         "anymatch": "~3.1.2",
         "braces": "~3.0.2",
@@ -23632,7 +23629,6 @@
           "version": "5.1.2",
           "resolved": "https://registry.npmmirror.com/glob-parent/-/glob-parent-5.1.2.tgz",
           "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
-          "devOptional": true,
           "requires": {
             "is-glob": "^4.0.1"
           }
@@ -25630,7 +25626,6 @@
     "fill-range": {
       "version": "7.0.1",
       "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
-      "devOptional": true,
       "requires": {
         "to-regex-range": "^5.0.1"
       }
@@ -25809,7 +25804,6 @@
       "version": "2.3.2",
       "resolved": "https://registry.npmmirror.com/fsevents/-/fsevents-2.3.2.tgz",
       "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
-      "dev": true,
       "optional": true
     },
     "function-bind": {
@@ -26488,7 +26482,6 @@
     "is-binary-path": {
       "version": "2.1.0",
       "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
-      "devOptional": true,
       "requires": {
         "binary-extensions": "^2.0.0"
       }
@@ -26547,8 +26540,7 @@
     },
     "is-extglob": {
       "version": "2.1.1",
-      "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
-      "devOptional": true
+      "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ=="
     },
     "is-file-esm": {
       "version": "1.0.0",
@@ -26578,7 +26570,6 @@
     "is-glob": {
       "version": "4.0.3",
       "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
-      "devOptional": true,
       "requires": {
         "is-extglob": "^2.1.1"
       }
@@ -26599,8 +26590,7 @@
     },
     "is-number": {
       "version": "7.0.0",
-      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
-      "devOptional": true
+      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng=="
     },
     "is-path-inside": {
       "version": "3.0.3",
@@ -29255,8 +29245,7 @@
     },
     "picomatch": {
       "version": "2.3.1",
-      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
-      "devOptional": true
+      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA=="
     },
     "pify": {
       "version": "2.3.0",
@@ -29939,8 +29928,7 @@
     },
     "prettier": {
       "version": "2.8.4",
-      "integrity": "sha512-vIS4Rlc2FNh0BySk3Wkd6xmwxB0FpOndW5fisM5H8hsZSxU2VWVB5CWIkIjWvrHjIhxk2g3bfMKM87zNTrZddw==",
-      "devOptional": true
+      "integrity": "sha512-vIS4Rlc2FNh0BySk3Wkd6xmwxB0FpOndW5fisM5H8hsZSxU2VWVB5CWIkIjWvrHjIhxk2g3bfMKM87zNTrZddw=="
     },
     "pretty-error": {
       "version": "4.0.0",
@@ -30319,7 +30307,6 @@
     "readdirp": {
       "version": "3.6.0",
       "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
-      "devOptional": true,
       "requires": {
         "picomatch": "^2.2.1"
       }
@@ -32032,7 +32019,6 @@
     "to-regex-range": {
       "version": "5.0.1",
       "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
-      "devOptional": true,
       "requires": {
         "is-number": "^7.0.0"
       }

src/pages.json

@@ -21,11 +21,7 @@
       "path": "pages/tabbar/message/index",
       "style": {
         "navigationBarTitleText": "消息",
-<<<<<<< HEAD
-        "navigationStyle": "custom"
-=======
         "navigationStyle":"custom"
->>>>>>> 5c64821b583febbe84eb9ada69db507c9555ff73
       }
     },
     {

src/pages/business/detail/index.vue

@@ -1,6 +1,5 @@
 <template>
   <view class="detail">
-<<<<<<< HEAD
     <!-- 轮播图 -->
     <view class="carousel-map">
       <u-swiper
@@ -71,10 +70,12 @@
         }"
         itemStyle="padding-left: 15px; padding-right: 15px; height: 40px;"
       />
-      <view class="list"  @click="$Router.push('/pages/business/service/index')">
+      <view class="list" @click="$Router.push('/pages/business/service/index')">
         <Image src="https://cdn.uviewui.com/uview/album/1.jpg"></Image>
         <view>
-          <view class="item-text">【养车】标题标题标题标题标题标题标题标题……</view>
+          <view class="item-text"
+            >【养车】标题标题标题标题标题标题标题标题……</view
+          >
           <view class="item-flex">
             <view class="star">
               <u-rate :count="count" v-model="value" :size="14" />
@@ -85,7 +86,8 @@
           </view>
           <view class="list-item">
             <view>
-              <view class="price">券后价
+              <view class="price"
+                >券后价
                 <text class="price-item">￥</text>
                 <text class="price-count">19</text>
               </view>
@@ -104,7 +106,9 @@
       <view class="list">
         <Image src="https://cdn.uviewui.com/uview/album/8.jpg"></Image>
         <view>
-          <view class="item-text">【养车】标题标题标题标题标题标题标题标题……</view>
+          <view class="item-text"
+            >【养车】标题标题标题标题标题标题标题标题……</view
+          >
           <view class="item-flex">
             <view class="star">
               <u-rate :count="count" v-model="value" :size="14" />
@@ -115,7 +119,8 @@
           </view>
           <view class="list-item">
             <view>
-              <view class="price">券后价
+              <view class="price"
+                >券后价
                 <text class="price-item">￥</text>
                 <text class="price-count">19</text>
               </view>
@@ -134,7 +139,9 @@
       <view class="list">
         <Image src="https://cdn.uviewui.com/uview/album/2.jpg"></Image>
         <view>
-          <view class="item-text">【养车】标题标题标题标题标题标题标题标题……</view>
+          <view class="item-text"
+            >【养车】标题标题标题标题标题标题标题标题……</view
+          >
           <view class="item-flex">
             <view class="star">
               <u-rate :count="count" v-model="value" :size="14" />
@@ -145,7 +152,8 @@
           </view>
           <view class="list-item">
             <view>
-              <view class="price">券后价
+              <view class="price"
+                >券后价
                 <text class="price-item">￥</text>
                 <text class="price-count">19</text>
               </view>
@@ -164,7 +172,9 @@
       <view class="list">
         <Image src="https://cdn.uviewui.com/uview/album/4.jpg"></Image>
         <view>
-          <view class="item-text">【养车】标题标题标题标题标题标题标题标题……</view>
+          <view class="item-text"
+            >【养车】标题标题标题标题标题标题标题标题……</view
+          >
           <view class="item-flex">
             <view class="star">
               <u-rate :count="count" v-model="value" :size="14" />
@@ -175,7 +185,8 @@
           </view>
           <view class="list-item">
             <view>
-              <view class="price">券后价
+              <view class="price"
+                >券后价
                 <text class="price-item">￥</text>
                 <text class="price-count">19</text>
               </view>
@@ -194,7 +205,9 @@
       <view class="list">
         <Image src="https://cdn.uviewui.com/uview/album/6.jpg"></Image>
         <view>
-          <view class="item-text">【养车】标题标题标题标题标题标题标题标题……</view>
+          <view class="item-text"
+            >【养车】标题标题标题标题标题标题标题标题……</view
+          >
           <view class="item-flex">
             <view class="star">
               <u-rate :count="count" v-model="value" :size="14" />
@@ -205,7 +218,8 @@
           </view>
           <view class="list-item">
             <view>
-              <view class="price">券后价
+              <view class="price"
+                >券后价
                 <text class="price-item">￥</text>
                 <text class="price-count">19</text>
               </view>
@@ -221,21 +235,6 @@
           </view>
         </view>
       </view>
-=======
-    <view class="detailItem">
-      <u-swiper
-        :list="list6"
-        :autoplay="false"
-        indicatorStyle="right: 20px"
-        class="swiper"
-      >
-        <view slot="indicator" class="indicator-num">
-          <text class="indicator-num__text"
-            >{{ currentNum + 1 }}/{{ list6.length }}</text
-          >
-        </view>
-      </u-swiper>
->>>>>>> 5c64821b583febbe84eb9ada69db507c9555ff73
     </view>
   </view>
 </template>
@@ -244,21 +243,13 @@
 export default {
   data() {
     return {
-<<<<<<< HEAD
       count: 5,
       value: 3,
       list3: [
-=======
-      id: null, // 商家id
-      currentNum: 0,
-      list6: [
-        'https://cdn.uviewui.com/uview/swiper/swiper2.png',
->>>>>>> 5c64821b583febbe84eb9ada69db507c9555ff73
         'https://cdn.uviewui.com/uview/swiper/swiper3.png',
         'https://cdn.uviewui.com/uview/swiper/swiper2.png',
         'https://cdn.uviewui.com/uview/swiper/swiper1.png',
       ],
-<<<<<<< HEAD
       list1: [
         { name: '全部' },
         { name: '养车' },
@@ -274,20 +265,6 @@ export default {
     click(item) {
       console.log('item', item);
     },
-=======
-    };
-  },
-  onLoad(option) {
-    if (option.id) this.id = option.id;
-    this.getBusinessInfo(this.id);
-    this.getBusinessComment(this.id);
-  },
-  methods: {
-    // 获取商家详情信息
-    getBusinessInfo(id) {},
-    // 获取商家评论信息
-    getBusinessComment(id) {},
->>>>>>> 5c64821b583febbe84eb9ada69db507c9555ff73
   },
 };
 </script>
@@ -298,7 +275,6 @@ export default {
   background-color: #efefef;
 }
 
-<<<<<<< HEAD
 // 轮播图
 .carousel-map {
   background-color: #fff;
@@ -436,36 +412,36 @@ export default {
         }
       }
     }
-    .list-item{
+    .list-item {
       display: flex;
       justify-content: space-between;
-      .price{
+      .price {
         font-size: 32rpx;
         font-weight: bold;
         color: #fa3534;
-        .price-item{
+        .price-item {
           font-size: 24rpx;
           margin-left: 10rpx;
         }
-        .price-count{
+        .price-count {
           font-size: 44rpx;
         }
       }
-      .gate-rate{
+      .gate-rate {
         color: #c9c9c9;
         font-size: 26rpx;
         margin: 16rpx 0 0 40rpx;
-        .gate-rate-item{
-          text-decoration:line-through;
+        .gate-rate-item {
+          text-decoration: line-through;
         }
       }
-      .appoint{
+      .appoint {
         width: 80px;
         height: 32px;
         display: flex;
         margin-top: 20px;
         font-size: 14px;
-        .appoint-item{
+        .appoint-item {
           width: 40px;
           height: 32px;
           line-height: 32px;
@@ -475,7 +451,7 @@ export default {
           border-radius: 16px 0 0 16px;
           border: 1px solid #ec5729;
         }
-        .Buy{
+        .Buy {
           width: 40px;
           height: 32px;
           color: #fff;
@@ -489,18 +465,4 @@ export default {
     }
   }
 }
-=======
-  &__text {
-    color: #ffffff;
-    font-size: 12px;
-  }
-}
-.detailItem {
-  height: 400rpx;
-  background-color: pink;
-  .u-swiper__wrapper__item__wrapper__image.data-v-7b038a67 {
-    height: 100%;
-  }
-}
->>>>>>> 5c64821b583febbe84eb9ada69db507c9555ff73
 </style>

src/pages/tabbar/home/index.vue

@@ -1,7 +1,5 @@
 <template>
   <view class="home">
-<<<<<<< HEAD
-=======
     <view class="nav-bar" v-if="opacity == 1">
       <u-navbar :bgColor="'#ffffff'">
         <view slot="left">
@@ -17,7 +15,6 @@
         </view>
       </u-navbar>
     </view>
->>>>>>> 5c64821b583febbe84eb9ada69db507c9555ff73
     <!-- 顶部导航 -->
     <view
       class="home-header"
@@ -29,11 +26,7 @@
       </view>
       <view
         class="search-item"
-<<<<<<< HEAD
-        @tap="$Router.push('/pages/client/search/index')"
-=======
         @click="Router.push('/pages/client/search/index')"
->>>>>>> 5c64821b583febbe84eb9ada69db507c9555ff73
       >
         <u-search
           placeholder="请输入搜索内容"
@@ -49,19 +42,11 @@
     <!-- 商品分类 -->
     <view class="home-list">
       <u-grid :border="false" col="5">
-<<<<<<< HEAD
-        <u-grid-item v-for="(listItem, listIndex) in list1" :key="listIndex" @tap="$Router.push(listItem.url)">
-          <u-icon
-            :customStyle="{ paddingTop: 20 + 'rpx' }"
-            :name="listItem.name"
-            :size="20"
-=======
         <u-grid-item v-for="(listItem, listIndex) in list1" :key="listIndex">
           <u-icon
             :customStyle="{ paddingTop: 20 + 'rpx' }"
             :name="listItem.name"
             :size="25"
->>>>>>> 5c64821b583febbe84eb9ada69db507c9555ff73
           ></u-icon>
           <text class="grid-text">{{ listItem.title }}</text>
         </u-grid-item>
@@ -70,12 +55,7 @@
     </view>
     <!-- 热门推荐 -->
     <view class="hot">
-<<<<<<< HEAD
-      <u-cell :border="false" value="查看更多" isLink 
-      @tap="$Router.push('/pages/business/hot/index')">
-=======
       <u-cell :border="false" value="查看更多" isLink>
->>>>>>> 5c64821b583febbe84eb9ada69db507c9555ff73
         <view slot="title" class="hot-title"> 热门推荐 </view>
       </u-cell>
       <block v-if="homeData.recommendMerchants.length > 0">
@@ -102,12 +82,7 @@
     </view>
     <!-- 附近商家 -->
     <view class="near">
-<<<<<<< HEAD
-      <u-cell :border="false" value="查看更多" isLink 
-      @tap="$Router.push('/pages/business/nearby/index')">
-=======
       <u-cell :border="false" value="查看更多" isLink>
->>>>>>> 5c64821b583febbe84eb9ada69db507c9555ff73
         <view slot="title" class="near-title"> 附近商家 </view>
       </u-cell>
       <block v-if="homeData.nearbyMerchants.length > 0">
@@ -159,7 +134,7 @@ export default {
         {
           name: 'photo',
           title: '养车',
-          url: '/pages/business/classify/index'
+          url: '/pages/business/classify/index',
         },
         {
           name: 'lock',

src/pages/tabbar/message/index.vue

@@ -1,9 +1,5 @@
 <template>
-<<<<<<< HEAD
-  <view class="messages">
-=======
   <view>
->>>>>>> 5c64821b583febbe84eb9ada69db507c9555ff73
     <u-navbar>
       <view slot="left"></view>
       <view slot="center">
@@ -22,7 +18,10 @@
       </view>
       <!-- 消息通知 -->
       <view class="message">
-        <image src="/static/images/home-select.png" style="width: 40px; height: 40px" />
+        <image
+          src="/static/images/home-select.png"
+          style="width: 40px; height: 40px"
+        />
         <view class="business">
           <view class="businessItem">商家</view>
           <view class="messages">您好，请问有什么需要帮助的吗？</view>
@@ -92,7 +91,7 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-.messages{
+.messages {
   min-height: 100vh;
   background-color: #fff;
 }