Merge remote-tracking branch 'origin/master'

pageMy/my/resume/skill.vue

@@ -93,13 +93,19 @@ export default {
             },
             comfirm: function() {
                 if (this.id) {
-				uni.$emit('setworkTypes', { detail: { id: this.id, label: this.label, parentLabel: this.$route.query.parentLabel } })
+                    uni.$emit('setworkTypes', {
+                        detail: {
+                            id: this.id,
+                            label: this.label,
+                            parentLabel: this.$route.query.parentLabel
+                        }
+                    })
                     uni.navigateBack({
                         delta: this.layer
                     })
                 } else {
                     uni.showToast({
-					title: "请选择地点",
+                        title: "请选择类别",
                         icon: "none"
                     })
                 }

pageMy/my/resume/skillLevel.vue

@@ -121,7 +121,8 @@ export default {
             },
             comfirm: function() {
                 if (this.id) {
-				uni.$emit('setSkill', { detail: { 
+                    uni.$emit('setSkill', {
+                        detail: {
                             id: this.id,
                             label: this.label,
                             parentLabel: this.$route.query.parentLabel,
@@ -133,7 +134,7 @@ export default {
                     })
                 } else {
                     uni.showToast({
-					title: "请选择地点",
+                        title: "请选择类别",
                         icon: "none"
                     })
                 }

vue.config.js

@@ -3,11 +3,10 @@ module.exports = {
         port: 1887,
         proxy: {
             '/api': {
-                target: 'http://192.168.1.101:8200',
+                target: 'http://10.165.0.173:8000',
                 ws: true,
-                changeOrigin: true,
                 pathRewrite: {
-                    "^/api/jobslink-api": "/"
+                    '^/api': '/'
                 }
             },
             '/qq/map': {