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

src/project/fd/AppPointsReview/integralAdd.vue

@@ -19,7 +19,8 @@
     <div class="item mar-b32">
       <div class="left"><span class="tips">*</span>事件类型</div>
       <div class="right">
-        <AiSelect :list="dictList" v-model="form.applyItemId"></AiSelect>
+        <AiSelect :list="dictList" v-model="form.applyItemId" @data="selectType" v-if="dictList.length"></AiSelect>
+        <span v-else class="color-999">请选择</span>
       </div>
     </div>
     <div class="item mar-b32">
@@ -76,7 +77,7 @@ export default {
         phone: '',
         idNumber: '',
         applyItemId: '',
-        applyIntegral: 0,
+        applyIntegral: '',
         applyItemName: '',
         content: '',
         files: [],
@@ -100,19 +101,10 @@ export default {
       this.getDetail()
     }
     this.$dict.load(['clapEventStatus'])
-    this.getType()
   },
   onShow() {
     document.title = '积分代申请'
   },
-  watch: {
-    'form.applyItemId'(v) {
-      if(v) {
-        this.form.applyItemName = this.list.filter(e=> (e.id==v))[0].ruleName
-        this.form.applyIntegral = this.list.filter(e => (e.id == v))[0].integral
-      }
-    }
-  },
   methods: {
     submit() {
       if(this.flag) return
@@ -152,9 +144,13 @@ export default {
         }
       })
     },
+    selectType(selecteds) {
+      this.form.applyItemName = this.list.filter(e=> (e.id==selecteds[0].value))[0].ruleName
+      this.form.applyIntegral = this.list.filter(e => (e.id == selecteds[0].value))[0].integral
+    },
     // 事件类型
     getType() {
-      this.$http.post(`/app/appintegralrule/listByFD`).then(res=> {
+      this.$http.post(`/app/appintegralrule/listByFdGirdMember?openId=${this.form.userId}`).then(res=> {
         if(res?.data) {
           this.list = res.data
           this.dictList = res.data.map(v => {
@@ -187,6 +183,11 @@ export default {
       this.form.idNumber = v?.[0]?.idNumber || ""
       this.form.girdId = v?.[0]?.girdId || ""
       this.form.girdName = v?.[0]?.girdName || ""
+      this.form.applyIntegral = ''
+      this.form.applyItemId = ''
+      this.form.applyItemName = ''
+      this.dictList = []
+      this.getType()
     },
   }
 }