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

src/project/fengdu/AppNewFarmerBank/integralAdd.vue

@@ -38,6 +38,7 @@
 </template>
 
 <script>
+import {mapActions, mapState} from "vuex";
 export default {
   name: "integralAdd",
   appName: '积分申请',
@@ -60,13 +61,18 @@ export default {
       id: '',
     }
   },
+  computed: {
+    ...mapState(['user']),
+  },
   onLoad(o) {
     if(o.id) {
       this.id = o.id
       this.getDetail()
     }
     this.$dict.load(['clapEventStatus'])
-    this.getType()
+    this.getAuth()
+    this.form.girdId = this.user.girdId
+    this.form.girdName = this.user.girdName
   },
   watch: {
     'form.applyItemId'(v) {
@@ -77,6 +83,7 @@ export default {
     }
   },
   methods: {
+    ...mapActions(['getUserInfo']),
     submit() {
       if(this.flag) return
 
@@ -113,7 +120,7 @@ export default {
     },
     // 事件类型
     getType() {
-      this.$instance.post(`/app/appintegralrule/listByFdNew`).then(res=> {
+      this.$instance.post(`/app/appintegralrule/listByFdAndGirdInfo`).then(res=> {
         if(res?.data) {
           this.list = res.data
           this.dictList = res.data.map(v => {
@@ -139,6 +146,12 @@ export default {
         }
       })
     },
+    getAuth() {
+      this.$nextTick(() => {
+        this.getUserInfo('qujing')
+        this.getType()
+      })
+    },
   }
 }
 </script>