Merge remote-tracking branch 'origin/dev' into dev

packages/conv/creditScore/AppGridMemberScore/AppGridMemberScore.vue

@@ -5,7 +5,7 @@
 </template>
 
 <script>
-import girdScoreManage from "./components/girdScoreManage.vue"
+import gridScoreManage from "./components/gridScoreManage.vue"
 import gridScoreRules from "./components/gridScoreRules.vue"
 import gridScoreStatistics from './components/gridScoreStatistics.vue'
 import gridScoreDetail from './components/gridScoreDetail.vue'
@@ -14,7 +14,7 @@ import gmScore from './components/gmScore.vue'
 export default {
   name: 'AppGridMemberScore',
   label: "网格员积分",
-  components: { gmScore, girdScoreManage, gridScoreRules, gridScoreStatistics, gridScoreDetail},
+
   props: {
     instance: Function,
     dict: Object,
@@ -24,15 +24,15 @@ export default {
   computed: {
     currentPage() {
       let {hash} = this.$route
-      return hash == "#girdScoreManage" ? girdScoreManage :
+      return hash == "#gridScoreDetail" ? gridScoreDetail :
               hash == "#gridScoreRules" ? gridScoreRules :
-                  hash == "#gridScoreStatistics" ? gridScoreStatistics : 
-                    hash == "#gridScoreDetail" ? gridScoreDetail: gmScore
+                hash == "#gridScoreStatistics" ? gridScoreStatistics : 
+                  hash == "#gridScoreManage" ? gridScoreManage : gmScore
     }
   },
   components: {
     gmScore,
-    girdScoreManage,
+    gridScoreManage,
     gridScoreRules,
     gridScoreStatistics,
     gridScoreDetail,
@@ -41,11 +41,10 @@ export default {
   methods: {
     onChange(data) {
       let {type, params: query} = data,
-          hash = ["girdScoreManage", "gridScoreRules","gridScoreStatistics"].includes(type) ? "" : "#" + type
+          hash = ["gridScoreManage", "gridScoreRules","gridScoreStatistics"].includes(type) ? "" : "#" + type
       this.$router.push({hash, query})
     }
   }
-  
 }
 </script>
 

packages/conv/creditScore/AppGridMemberScore/components/gmScore.vue

@@ -19,9 +19,9 @@
 </template>
 
 <script>
-import girdScoreManage from "./girdScoreManage"
-import gridScoreRules from "./gridScoreRules"
-import gridScoreStatistics from './gridScoreStatistics'
+import girdScoreManage from "./gridScoreManage.vue"
+import gridScoreRules from "./gridScoreRules.vue"
+import gridScoreStatistics from './gridScoreStatistics.vue'
 import {mapState} from 'vuex'
 
 export default {

packages/conv/creditScore/AppGridMemberScore/components/gridScoreManage.vue

@@ -1,5 +1,5 @@
 <template>
-  <section class="girdScoreManage">
+  <section class="gridScoreManage">
     <ai-list>
       <template #content>
         <ai-search-bar>
@@ -82,7 +82,7 @@
 <script>
 import { mapState } from "vuex";
 export default {
-  name: "girdScoreManage",
+  name: "gridScoreManage",
   label: "积分管理",
   props: {
     instance: Function,
@@ -155,6 +155,7 @@ export default {
           // id
         }
       })
+      console.log('跳转');
     }
   },
 
@@ -162,11 +163,7 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-.girdScoreManage {
+.gridScoreManage {
   height: 100%;
-  // ::v-deep .searchLeftZone,
-  // ::v-deep .searchRightZone {
-  //   display: flex;
-  // }
 }
 </style>