Merge branch 'dev' of xiongzhu/raex_front into master

src/views/asset/Consignment.vue

@@ -154,9 +154,9 @@ export default {
             this.$http.post('/asset/getRoyalties?id=' + this.$route.query.id).then(res => {
                 this.royalties = res;
             });
-            // this.$http.post('/asset/getServicecharge?id=' + this.$route.query.id).then(res => {
-            //     this.serviceCharge = res;
-            // });
+            this.$http.post('/asset/getServicecharge?id=' + this.$route.query.id).then(res => {
+                this.serviceCharge = res;
+            });
         });
     },
     methods: {