上传代码

mallApp/package-lock.json

@@ -5161,8 +5161,7 @@
         "ansi-regex": {
           "version": "2.1.1",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "aproba": {
           "version": "1.2.0",
@@ -5586,8 +5585,7 @@
         "safe-buffer": {
           "version": "5.1.2",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "safer-buffer": {
           "version": "2.1.2",
@@ -5643,7 +5641,6 @@
           "version": "3.0.1",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "ansi-regex": "^2.0.0"
           }
@@ -5687,14 +5684,12 @@
         "wrappy": {
           "version": "1.0.2",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "yallist": {
           "version": "3.1.1",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         }
       }
     },
@@ -9594,10 +9589,18 @@
         "mime-types": "~2.1.19",
         "oauth-sign": "~0.9.0",
         "performance-now": "^2.1.0",
+        "qs": "~6.5.2",
         "safe-buffer": "^5.1.2",
         "tough-cookie": "~2.4.3",
         "tunnel-agent": "^0.6.0",
         "uuid": "^3.3.2"
+      },
+      "dependencies": {
+        "qs": {
+          "version": "6.5.2",
+          "resolved": "http://mvn.cloudmigrate.cn:8081/repository/yunqian-npm-group/qs/-/qs-6.5.2.tgz",
+          "integrity": "sha1-yzroBuh0BERYTvFUzo7pjUA/PjY="
+        }
       }
     },
     "request-promise-core": {

mallApp/src/components/app-tabbar.vue

@@ -65,12 +65,7 @@ export default {
   },
   methods: {
     switchTab (index, item) {
-<<<<<<< HEAD
       this.currentTabIndex = index
-=======
-      console.log(index)
-      // this.currentTabIndex = index
->>>>>>> 339a92d956f95bd2b23eeb2feffe8a4642a7f51d
       uni.switchTab({
         url: item.pagePath
       })