Merge branch 'feature/yujt_propertyInit'

src/views/modules/heart/actuserrelation.vue

@@ -78,7 +78,7 @@
             <el-button
               type="text"
               size="small"
-              v-if="scope.row.status == 0"
+              v-if="scope.row.status == 0 && scope.row.actStatus == 1"
               @click="addOrUpdateHandle(scope.row.id)"
             >审核</el-button>
             <!-- <el-button  type="text" size="small" :disabled="scope.row.status ==='0'? false :true" @click="addOrUpdateHandle(scope.row.id)">审核</el-button> -->

src/views/modules/points/volunteerinfo-points-adjust.vue

@@ -65,7 +65,7 @@
       <el-form-item label="积分调整 :"
                     prop="operatePoints">
         <el-input-number v-model="dataForm.operatePoints"
-                         :min="0"></el-input-number>
+                         :min="0" :max="1000"></el-input-number>
       </el-form-item>
     </el-form>
     <template slot="footer">