合并冲突

.env.development

@@ -1,6 +1,8 @@
+VUE_APP_ENV = '物业(测试)'
+
 # just a flag
-VUE_APP_ENV = '物业'
 NODE_ENV = 'production'
+
 # base api
 #枚苑正式
-VUE_APP_BASE_API = 'http://8.131.69.197:22000'
+VUE_APP_BASE_API = 'http://8.131.69.197:22000'

.env.production

@@ -1,6 +1,8 @@
+VUE_APP_ENV = '物业(测试)'
+
 # just a flag
-VUE_APP_ENV = '物业'
 NODE_ENV = 'production'
+
 # base api
 #枚苑正式
-VUE_APP_BASE_API = 'http://8.131.69.197:22000'
+VUE_APP_BASE_API = 'http://8.131.69.197:22000'

.env.staging

@@ -1,6 +1,8 @@
+VUE_APP_ENV = '物业(测试)'
+
 # just a flag
-VUE_APP_ENV = '物业'
 NODE_ENV = 'production'
+
 # base api
 #枚苑正式
-VUE_APP_BASE_API = 'http://8.131.69.197:22000'
+VUE_APP_BASE_API = 'http://8.131.69.197:22000'

package.json

@@ -8,13 +8,7 @@
     "dev": "vue-cli-service serve --open",
     "serve": "vue-cli-service serve --open",
     "build:prod": "vue-cli-service build",
-    "build:stage": "vue-cli-service build --mode staging",
-    "preview": "node build/index.js --preview",
-    "lint": "eslint --ext .js,.vue src",
-    "test:unit": "jest --clearCache && vue-cli-service test:unit",
-    "test:ci": "npm run lint && npm run test:unit",
-    "svgo": "svgo -f src/icons/svg --config=src/icons/svgo.yml",
-    "new": "plop"
+    "build:stage": "vue-cli-service build --mode staging"
   },
   "husky": {
     "hooks": {

src/components/receiptPrinting.vue

@@ -29,6 +29,8 @@
               ? "车位费"
               : data.category
           }}
+          <br />
+          {{data.carportid}}
         </td>
         <td style="padding: 0 10px">月</td>
         <td style="padding: 0 10px">{{ data.contracttab.lengthdate }}</td>