diff --git a/project/fengdu/app/AppIntegratingRules/components/List.vue b/project/fengdu/app/AppIntegratingRules/components/List.vue
index 8c29cbc1..74bf234a 100644
--- a/project/fengdu/app/AppIntegratingRules/components/List.vue
+++ b/project/fengdu/app/AppIntegratingRules/components/List.vue
@@ -1,159 +1,425 @@
 <template>
-  <ai-list class="notice">
-    <template slot="title">
-      <ai-title title="积分规则" isShowBottomBorder isShowArea :hideLevel="hideLevel-1" v-model="search.areaId" @change="changeArea">
-      </ai-title>
-    </template>
+  <ai-list class="gridScoreRules">
+    <ai-title
+      slot="title"
+      title="积分规则"
+      isShowBottomBorder>
+    </ai-title>
     <template slot="content">
-      <ai-search-bar class="search-bar">
+      <ai-search-bar>
         <template #left>
-          <el-button size="small" type="primary" icon="iconfont iconAdd" @click="toAdd('')">我要发帖</el-button>
-          <el-date-picker
-            v-model="dateList"
-            @change="search.current = 1,getList()"
-            type="daterange"
-            size="small"
-            value-format="yyyy-MM-dd"
-            range-separator="至"
-            start-placeholder="开始日期"
-            end-placeholder="结束日期">
-          </el-date-picker>
-        </template>
-        <template #right>
-          <el-input
-            v-model="search.createUserName"
-            class="search-input"
-            size="small"
-            v-throttle="() => {search.current = 1, getList()}"
-            placeholder="请输入发帖人"
-            clearable
-            @clear="search.current = 1, search.createUserName = '', getList()"
-            suffix-icon="iconfont iconSearch">
-          </el-input>
+          <el-button type="primary" icon="iconfont iconAdd" @click="dialog = true">&nbsp;添加</el-button>
+          <el-cascader size="small" v-model="systemRuleIdList" :options="rulesOps" placeholder="请选择事件/类型" clearable :props="rulesProps"
+                        @change="handleTypeSearch" ref="eventTypeSearch"/>
+          <ai-select v-model="search.status" @change="(page.current = 1), getList()" placeholder="请选择状态" :selectList="$dict.getDict('integralRuleStatus')">
+          </ai-select>
         </template>
       </ai-search-bar>
       <ai-table
         :tableData="tableData"
         :col-configs="colConfigs"
-        :total="total"
-        style="margin-top: 6px;"
-        :current.sync="search.current"
-        :size.sync="search.size"
-        @getList="getList">
-        <el-table-column slot="options" width="180px" fixed="right" label="操作" align="center">
+        :total="page.total"
+        :dict="dict"
+        :current.sync="page.current"
+        :size.sync="page.size"
+          @getList="getList()">
+        <el-table-column slot="integral" label="分值" align="center">
+          <template slot-scope="{ row }">
+            <span>{{ row.integral > 0 ? "+" : "" }}{{ row.integral }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column slot="options" label="操作" align="center" fixed="right" width="160">
           <template slot-scope="{ row }">
             <div class="table-options">
-              <el-button type="text" @click="toDetail(row.id)">详情</el-button>
+              <el-button type="text" @click="changeStatus(row.id, 0)" v-if="row.status == 1">停用</el-button>
+              <el-button type="text" @click="changeStatus(row.id, 1)" v-else>启用</el-button>
+              <el-button type="text" @click="toEdit(row)">编辑</el-button>
               <el-button type="text" @click="remove(row.id)">删除</el-button>
             </div>
           </template>
         </el-table-column>
       </ai-table>
+      <ai-dialog :title="dialogTitle" :visible.sync="dialog" @onConfirm="onConfirm" @close="closed" width="900px">
+        <div class="form_div" v-if="dialog">
+          <el-form ref="DialogForm" :model="form" :rules="formRules" size="small" label-suffix="：" label-width="150px">
+            <el-form-item label="事件类型" prop="systemRuleId">
+              <el-cascader v-model="form.systemRuleId" ref="cascaderArr" :props="etOps" clearable placeholder="请选择" @change="handleTypeForm" :options="rulesOps"/>
+            </el-form-item>
+            <el-form-item label="自定义事件" prop="ruleName">
+              <ai-select v-model="form.ruleName" placeholder="请选择自定义事件" :selectList="$dict.getDict('appIntegralApplyEventType')">
+            </ai-select>
+            </el-form-item>
+
+            <el-form-item label="规则">
+              <div>常规</div>
+            </el-form-item>
+            <el-form-item label="周期范围" prop="scoringCycle">
+              <ai-select v-model="form.scoringCycle" :selectList="$dict.getDict('integralRuleScoringCycle')" :disabled="isOneAndTen"/>
+            </el-form-item>
+            <el-form-item label="奖励次数">
+              <el-input type="number" placeholder="请输入,周期范围内,不填写表示不限制" v-model.number="form.numberLimit" clearable :disabled="isOneAndTen"/>
+            </el-form-item>
+
+            <el-form-item label="积分分值" prop="integral">
+              <el-input placeholder="请输入" v-model="form.integral" clearable/>
+            </el-form-item>
+
+            <el-form-item label="有效地区" prop="areaId" required>
+              <ai-area-select
+                clearable
+                @fullname="v => form.areaName = v"
+                :disabled-level="$store.state.user.info.areaList.length - 1"
+                always-show
+                :instance="instance"
+                v-model="form.areaId">
+              </ai-area-select>
+            </el-form-item>
+          </el-form>
+        </div>
+      </ai-dialog>
     </template>
   </ai-list>
 </template>
 
 <script>
-  import { mapState } from 'vuex'
   export default {
-    name: 'List',
-
+    name: "gridScoreRules",
+    label: "积分规则",
     props: {
       instance: Function,
-      dict: Object
+      dict: Object,
+      permissions: Function,
     },
-
-    data () {
+    data() {
+      var validcode = (rule, value, callback) => {
+        if (value) {
+          if (value != 0) {
+            if (!/^([+-]?([1-9]{1}\d*)|(0{1}))(\.\d{1,2})?$/.test(value)) {
+              callback(new Error('请输入积分分值，可输入正数、负数、最多保留两位小数'))
+            } else {
+              callback();
+            }
+          } else {
+            callback(new Error('请输入有效的积分分值'));
+          }
+        } else {
+          callback(new Error('请输入积分分值'));
+        }
+      }
       return {
         search: {
-          current: 1,
-          size: 10,
-          createUserName: '',
-          areaId: ''
+          status: "",
+          systemRuleId: "",
+          ruleName: ""
         },
-        total: 10,
+        systemRuleIdList: [],
+        page: {current: 1, size: 10, total: 0},
         colConfigs: [
-          { prop: 'content',  label: '内容', align: 'left', 'show-overflow-tooltip': true },
-          { prop: 'commentCount',  label: '评论数', align: 'center', width: '120' },
-          { prop: 'appreciateCount',  label: '点赞数', align: 'center', width: '120' },
-          { prop: 'sharedCount',  label: '分享数', align: 'center', width: '120' },
-          { prop: 'createUserName',  label: '发帖人', align: 'center', width: '120' },
-          { prop: 'createUserAreaName',  label: '所在地区', align: 'center', width: '120' },
-          { prop: 'createTime',  label: '创建时间', align: 'center', width: '180' },
-          { slot: 'options'},
+          {
+            prop: "parentRuleName",
+            label: "类型",
+            dict: "integralRuleEventType",
+          },
+          {prop: "ruleName", label: "事件", dict: "integralRuleEvent", align: "center"},
+          {prop: "ruleType", label: "规则", dict: "integralRuleRuleType", align: "center"},
+          {
+            prop: "scoringCycle",
+            label: "周期范围",
+            align: "center",
+            dict: "integralRuleScoringCycle",
+            render: (h, {row}) => {
+              return h(
+                  "span",
+                  {},
+                  row.numberLimit.length
+                      ? $dict.getLabel("integralRuleScoringCycle", row.scoringCycle)
+                      : $dict.getLabel("integralRuleScoringCycle", row.scoringCycle) +
+                      row.numberLimit +
+                      "次"
+              );
+            },
+          },
+          {slot: "integral", label: "积分分值", align: "center"},
+          {
+            prop: "validRangeData",
+            label: "有效地区",
+            align: "center",
+            format: v => JSON.parse(v).areaName
+          },
+          {
+            prop: "status",
+            label: "状态",
+            align: "center",
+            dict: "integralRuleStatus",
+          },
+          {slot: "options", label: "操作", align: "center"},
         ],
         tableData: [],
-        dateList: [],
+        dialog: false,
+        form: {
+          ruleType: "0",
+          systemRuleId: "",
+          ruleName: "",
+          scoringCycle: "",
+          numberLimit: "",
+          integral: "",
+          validRangeType: "2",
+          validRangeData: "",
+          areaName: '',
+          areaId: ''
+        },
+        formRules: {
+          systemRuleId: [
+            {required: true, message: "请选择事件/类型", trigger: "change"},
+          ],
+          ruleName: [
+            {required: true, message: "请输入自定义事件", trigger: "change"},
+          ],
+          scoringCycle: [
+            {required: true, message: "请选择周期范围", trigger: "change"},
+          ],
+          integral: [{required: true, validator: validcode, trigger: "blur"},],
+          areaId: [
+            {required: true, message: "请选择地区", trigger: "change"},
+          ],
+        },
+        rulesOps: [],
+        rulesProps: {
+          label: "ruleName",
+          value: "id",
+          checkStrictly: true,
+        },
+        radio: 0,
+        treeObj: {
+          treeList: [],
+          defaultProps: {
+            label: "girdName",
+            value: "id",
+            children: 'children',
+            isLeaf: 'leaf'
+          },
+        },
+        treeSelected: {},
+        girdInfoList: [],
+        rulueType: "0",
+        girdNameList: [],
+        list: [],
+        isOneAndTen: false,
+      };
+    },
+    created() {
+      this.form.areaId = this.$store.state.user.info.areaId
+      this.$dict.load("integralRuleStatus", "integralRuleRuleType", "integralRuleScoringCycle",
+          "integralRuleEvent", "integralRuleEventType", 'appIntegralApplyEventType').then(() => {
+        this.getList();
+        this.getRulesList();
+      });
+    },
+    methods: {
+      getList() {
+        this.instance
+        .post(`/app/appintegralrule/listByAppletFD`, null, {
+          params: {
+            ...this.search,
+            ...this.page,
+          },
+        })
+        .then((res) => {
+          if (res?.data) {
+            this.tableData = res.data.records;
+            this.page.total = res.data.total;
+          }
+        });
+      },
+      closed () {
+        this.form.ruleType = '0'
+        this.form.systemRuleId = ''
+        this.form.ruleName = ''
+        this.form.scoringCycle = ''
+        this.form.numberLimit = ''
+        this.form.integral = ''
+        this.form.validRangeType = '2'
+        this.form.validRangeData = ''
+        this.form.areaName = this.$store.state.user.info.areaName
+        this.form.areaId = this.$store.state.user.info.areaId
+      },
+      toEdit(row) {
+        this.form = {...row}
+        if (this.form?.validRangeData) {
+          this.form.areaName = JSON.parse(this.form.validRangeData).areaName
+          this.form.areaId = JSON.parse(this.form.validRangeData).areaId
+        }
+        this.$nextTick(() => {
+          this.dialog = true;
+        });
+      },
+      remove(id) {
+        this.$confirm("删除后不可恢复，是否要删除该规则？", {
+          type: "error",
+        }).then(() => {
+          this.instance
+          .post(`/app/appintegralrule/delete?ids=${id}`)
+          .then((res) => {
+            if (res.code == 0) {
+              this.$message.success("删除成功！");
+              this.getList();
+            }
+          });
+        });
+      },
+      changeStatus(id, status) {
+        let text = status == 1 ? "启用" : "停用";
+        this.$confirm(`确定${text}该条规则？`).then(() => {
+          this.instance
+          .post(`/app/appintegralrule/enableStatus?id=${id}`)
+          .then((res) => {
+            if (res.code == 0) {
+              this.$message.success(`${text}成功！`);
+              this.getList();
+            }
+          });
+        });
+      },
+      onConfirm() {
+        this.$refs.DialogForm.validate((valid) => {
+          if (valid) {
+            let formData = this.$copy(this.form);
+            // formData.ladderRule = JSON.stringify(formData.ladderRule)
+            formData.integral = formData.integral || 0;
+            this.instance
+            .post(`/app/appintegralrule/addOrUpdate`, {
+              ...formData,
+              appCodeType: '2',
+              validRangeData: JSON.stringify({
+                areaName: this.form.areaName,
+                areaId: this.form.areaId
+              })
+            })
+            .then((res) => {
+              if (res.code == 0) {
+                this.$message.success(
+                    `${this.isEdit ? "编辑成功" : "添加成功"}`
+                );
+                this.dialog = false;
+                this.getList();
+                this.closed();
+                this.girdInfoList = []
+                this.girdNameList = []
+              }
+            });
+          } else {
+            return false;
+          }
+        });
+      },
+      handleTypeSearch(v) {
+        this.systemRuleIdList = v
+        this.search.systemRuleId = v?.[v.length - 1];
+        this.search.ruleName = this.$refs.eventTypeSearch.getCheckedNodes()[0]?.label
+        this.page.current = 1;
+        this.$refs.eventTypeSearch.dropDownVisible = false;
+        this.getList();
+      },
+      handleTypeForm(v) {
+        if (this.dialog) {
+          if(v[0] == '1' || v[0]== '10') {
+            this.form.scoringCycle = '0'
+            this.form.numberLimit = '1'
+            this.isOneAndTen = true
+          } else {
+            this.form.scoringCycle = ''
+            this.form.numberLimit = ''
+            this.isOneAndTen = false
+          }
+          this.form.systemRuleId = v?.[v.length - 1];
+        }
+      },
+      handleDelete(i) {
+        this.$confirm("是否要删除该规则?")
+        .then(() => {
+          this.form.ladderRule.splice(i, 1);
+        })
+        .catch(() => 0);
+      },
+      checkIntegral(v) {
+        return /\.\d{2,}$/.test(v) ? Math.abs(v).toFixed(1) : Math.abs(v);
+      },
+      getRulesList() {
+        this.instance
+        .post(`/app/appintegralsystemrule/listByAppletFD?current=1&size=3000`)
+        .then((res) => {
+          if (res?.data) {
+            this.rulesOps = this.toTree(res.data.records)
+            this.rulesOps.push({
+              ruleName: "积分申请",
+              id: "积分申请",
+            });
+          }
+        });
+      },
+      // 转树形结构
+      toTree(data) {
+        let result = [];
+        if (!Array.isArray(data)) {
+          return result;
+        }
+        let map = {};
+        data.forEach((item) => {
+          map[item.id] = item;
+        });
+        data.forEach((item) => {
+          let parent = map[item.parentRuleId];
+          if (parent) {
+            (parent.children || (parent.children = [])).push(item);
+          } else {
+            result.push(item);
+          }
+        });
+        return result;
       }
     },
     computed: {
-      ...mapState(['user']),
-      hideLevel() {
-        return this.user.info.areaList?.length || 0
+      isEdit() {
+        return !!this.form.id;
+      },
+      dialogTitle() {
+        return this.isEdit ? "编辑积分规则" : "添加积分规则";
+      },
+      etOps() {
+        return {
+          value: "id",
+          label: "ruleName",
+        };
       },
     },
-
-    created() {
-      this.search.areaId = this.user.info.areaId
-      this.getList()
-    },
-
-    methods: {
-      getList() {
-        this.instance.post(`/app/appneighborhoodassistance/list`, null, {
-          params: {
-            ...this.search,
-            createUserAreaId: this.search.areaId,
-            beginDate: this.dateList[0] || '',
-            endDate: this.dateList[1] || '',
-          }
-        }).then(res => {
-          if (res.code == 0) {
-            this.tableData = res.data.records
-            this.total = res.data.total
-          }
-        })
-      },
-
-      changeArea () {
-        this.search.current = 1
-
-        this.$nextTick(() => {
-          this.getList()
-        })
-      },
-
-      remove (id) {
-        this.$confirm('确定删除该帖子？').then(() => {
-          this.instance.post(`/app/appneighborhoodassistance/delete?id=${id}`).then(res => {
-            if (res.code == 0) {
-              this.$message.success('删除成功！')
-              this.getList()
-            }
-          })
-        })
-      },
-
-      toDetail (id) {
-        this.$emit('change', {
-          type: 'Detail',
-          params: {
-            id: id || ''
-          }
-        })
-      },
-
-      toAdd(id) {
-        this.$emit('change', {
-          type: 'Add',
-          params: {
-            id: id || ''
-          }
-        })
-      }
-    }
   }
 </script>
 
 <style lang="scss" scoped>
+  .gridScoreRules {
+    height: 100%;
+    background: #f3f6f9;
+
+    :deep( .ai-list__content--right ){
+      width: 100%;
+    }
+
+    // :deep( .searchRightZone ){
+    //   display: flex;
+    // }
+
+    :deep( .ai-dialog ){
+      .el-cascader {
+        width: 100%;
+      }
+
+      .tableInput {
+        & > input {
+          text-align: center;
+          border: none;
+          background: transparent;
+        }
+      }
+    }
+  }
 </style>
diff --git a/project/fengdu/app/AppIntegratingTask/components/Add.vue b/project/fengdu/app/AppIntegratingTask/components/Add.vue
index ecd6b669..c4a95e52 100644
--- a/project/fengdu/app/AppIntegratingTask/components/Add.vue
+++ b/project/fengdu/app/AppIntegratingTask/components/Add.vue
@@ -1,138 +1,107 @@
 <template>
-  <section class="activitiesAdd">
-    <ai-detail v-show="id && !isEdit">
-      <template slot="title">
-        <ai-title title="活动详情" isShowBack isShowBottomBorder @onBackClick="cancel(false)"></ai-title>
-      </template>
-      <template slot="content">
-        <ai-card :title="info.title">
-          <template #right>
-            <span style="color:#2266FF;cursor: pointer;font-size: 12px;" class="iconfont iconEdit" v-if="isEdit==false && info.status==0" @click="update">修改</span>
-          </template>
-          <template #content v-if="isEdit == false">
-            <ai-wrapper>
-              <ai-info-item label="活动名称" :value="info.title"></ai-info-item>
-              <ai-info-item label="创建人" :value="info.createUserName"></ai-info-item>
-              <ai-info-item label="活动说明" isLine :value="info.detail"></ai-info-item>
-              <ai-info-item label="活动地点" :value="info.address"></ai-info-item>
-              <ai-info-item label="标绘地址" isLine><div id="mapDetail"></div></ai-info-item>
-              <ai-info-item label="活动状态">
-                {{ dict.getLabel('tfx_activityStatus',info.status) }}
-              </ai-info-item>
-              <ai-info-item label="打卡范围">{{ info.clockRange }}米</ai-info-item>
-              <ai-info-item label="进场打卡时间">{{ info.intoBegintime }}至{{ info.intoEndtime}}</ai-info-item>
-              <ai-info-item label="进场得积分">{{ info.intoIntegral }}分</ai-info-item>
-              <ai-info-item label="离场打卡时间">{{ info.exitBegintime }}至{{ info.exitEndtime}}</ai-info-item>
-              <ai-info-item label="离场得积分">{{ info.exitIntegral }}分</ai-info-item>
-            </ai-wrapper>
-          </template>
-        </ai-card>
-      </template>
-    </ai-detail>
-    <ai-detail v-show="!id || isEdit==true">
-      <ai-title slot="title" :title="id? '编辑活动':'创建活动'" isShowBottomBorder isShowBack @onBackClick="cancel(true)"/>
-      <template slot="content">
-        <ai-card title="基本信息">
-          <template #content>
-              <el-form class="ai-form" ref="form" :model="form" :rules="formRules" size="small"  label-width="120px">
+  <ai-detail class="activitiesAdd">
+    <ai-title slot="title" :title="id? '编辑活动':'创建活动'" isShowBottomBorder isShowBack @onBackClick="cancel(true)"/>
+    <template slot="content">
+      <ai-card title="基本信息">
+        <template #content>
+          <el-form class="ai-form" ref="form" :model="form" :rules="formRules" size="small"  label-width="120px">
 
-                <el-form-item label="活动名称" prop="title" style="width: 100%">
-                  <el-input v-model="form.title" placeholder="请输入" show-word-limit maxlength="64"></el-input>
-                </el-form-item>
+            <el-form-item label="活动名称" prop="title" style="width: 100%">
+              <el-input v-model="form.title" placeholder="请输入" show-word-limit maxlength="64"></el-input>
+            </el-form-item>
 
-                <el-form-item label="活动说明" style="width: 100%">
-                  <el-input type="textarea" :rows="5" v-model="form.detail" placeholder="请输入" show-word-limit maxlength="500"></el-input>
-                </el-form-item>
-                <el-form-item label="活动图片" prop="files" :rules="[{required: true, message: '请上传封面图片', trigger: 'change'}]" style="width: 100%;">
-                  <ai-uploader
-                    :instance="instance"
-                    v-model="form.files"
-                    :limit="9">
-                  </ai-uploader>
-                </el-form-item>
-                <el-form-item prop="areaId" style="width: 100%;" label="选择地区" :rules="[{required: true, message: '请选择地区', trigger: 'change'}]">
-                  <ai-area-select
-                    clearable
-                    @fullname="v => form.areaName = v"
-                    :disabled-level="$store.state.user.info.areaList.length - 1"
-                    always-show
-                    :instance="instance"
-                    v-model="form.areaId">
-                  </ai-area-select>
-                </el-form-item>
-                <el-form-item label="活动地点" style="width: 100%;">
-                  <el-input v-model="form.address" disabled>
-                    <template slot="append">
-                      <el-button @click="showMap = true">选择位置</el-button>
-                    </template>
-                  </el-input>
-                </el-form-item>
-                <el-form-item label="积分类型" prop="type" style="width: 100%">
-                  <el-radio-group v-model="form.type">
-                    <el-radio label="0">打卡得积分</el-radio>
-                    <el-radio label="1">报名得积分</el-radio>
-                  </el-radio-group>
-                </el-form-item>
-                <el-form-item label="打卡范围" prop="clockRange" style="width: 100%">
-                  <el-input type="number" v-model="form.clockRange" placeholder="请输入" >
-                    <template slot="append">米</template>
-                  </el-input>
-                </el-form-item>
+            <el-form-item label="活动说明" style="width: 100%">
+              <el-input type="textarea" :rows="5" v-model="form.detail" placeholder="请输入" show-word-limit maxlength="500"></el-input>
+            </el-form-item>
+            <el-form-item label="活动图片" prop="files" :rules="[{required: true, message: '请上传封面图片', trigger: 'change'}]" style="width: 100%;">
+              <ai-uploader
+                :instance="instance"
+                v-model="form.files"
+                :limit="9">
+              </ai-uploader>
+            </el-form-item>
+            <el-form-item prop="areaId" style="width: 100%;" label="选择地区" :rules="[{required: true, message: '请选择地区', trigger: 'change'}]">
+              <ai-area-select
+                clearable
+                @fullname="v => form.areaName = v"
+                :disabled-level="$store.state.user.info.areaList.length - 1"
+                always-show
+                :instance="instance"
+                v-model="form.areaId">
+              </ai-area-select>
+            </el-form-item>
+            <el-form-item label="活动地点" style="width: 100%;">
+              <el-input v-model="form.address" disabled>
+                <template slot="append">
+                  <el-button @click="showMap = true">选择位置</el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+            <el-form-item label="积分类型" prop="type" style="width: 100%">
+              <el-radio-group v-model="form.type">
+                <el-radio label="0">打卡得积分</el-radio>
+                <el-radio label="1">报名得积分</el-radio>
+              </el-radio-group>
+            </el-form-item>
+            <el-form-item label="打卡范围" prop="clockRange" style="width: 100%">
+              <el-input type="number" v-model="form.clockRange" placeholder="请输入" >
+                <template slot="append">米</template>
+              </el-input>
+            </el-form-item>
 
-                <el-form-item :label="form.type === '0' ? '进场打卡时间' : '进场时间'" prop="intoTime">
-                  <el-date-picker  style="width: 100%" v-model="form.intoTime" type="datetimerange" start-placeholder="开始日期" :picker-options="timeOption"
-                  end-placeholder="结束日期" value-format="yyyy-MM-dd HH:mm:ss" ></el-date-picker>
-                </el-form-item>
+            <el-form-item :label="form.type === '0' ? '进场打卡时间' : '进场时间'" prop="intoTime">
+              <el-date-picker  style="width: 100%" v-model="form.intoTime" type="datetimerange" start-placeholder="开始日期" :picker-options="timeOption"
+              end-placeholder="结束日期" value-format="yyyy-MM-dd HH:mm:ss" ></el-date-picker>
+            </el-form-item>
 
-                <el-form-item v-if="form.type === '0'" label="进场得积分" prop="intoIntegral">
-                  <el-input v-model="form.intoIntegral" type="number" placeholder="请输入" style="width: 100%">
-                    <template slot="append">积分</template>
-                  </el-input>
-                </el-form-item>
+            <el-form-item v-if="form.type === '0'" label="进场得积分" prop="intoIntegral">
+              <el-input v-model="form.intoIntegral" type="number" placeholder="请输入" style="width: 100%">
+                <template slot="append">积分</template>
+              </el-input>
+            </el-form-item>
 
-                <el-form-item :label="form.type === '1' ? '离场打卡时间' : '离场时间'" prop="exitTime">
-                  <el-date-picker style="width: 100%" v-model="form.exitTime" type="datetimerange" start-placeholder="开始日期" :picker-options="timeOption"
-                    end-placeholder="结束日期" value-format="yyyy-MM-dd HH:mm:ss">
-                  </el-date-picker>
-                </el-form-item>
+            <el-form-item :label="form.type === '1' ? '离场打卡时间' : '离场时间'" prop="exitTime">
+              <el-date-picker style="width: 100%" v-model="form.exitTime" type="datetimerange" start-placeholder="开始日期" :picker-options="timeOption"
+                end-placeholder="结束日期" value-format="yyyy-MM-dd HH:mm:ss">
+              </el-date-picker>
+            </el-form-item>
 
-                <el-form-item v-if="form.type === '0'" label="离场得积分" prop="exitIntegral">
-                  <el-input v-model="form.exitIntegral" type="number" placeholder="请输入" style="width: 100%">
-                    <template slot="append">积分</template>
-                  </el-input>
-                </el-form-item>
-                <el-form-item v-if="form.type === '1'" label="报名得积分" prop="enrollIntegral">
-                  <el-input v-model="form.enrollIntegral" type="number" placeholder="请输入" style="width: 100%">
-                    <template slot="append">积分</template>
-                  </el-input>
-                </el-form-item>
+            <el-form-item v-if="form.type === '0'" label="离场得积分" prop="exitIntegral">
+              <el-input v-model="form.exitIntegral" type="number" placeholder="请输入" style="width: 100%">
+                <template slot="append">积分</template>
+              </el-input>
+            </el-form-item>
+            <el-form-item v-if="form.type === '1'" label="报名得积分" prop="enrollIntegral">
+              <el-input v-model="form.enrollIntegral" type="number" placeholder="请输入" style="width: 100%">
+                <template slot="append">积分</template>
+              </el-input>
+            </el-form-item>
+          </el-form>
+            <ai-dialog title="地图" :visible.sync="showMap" @opened="initMap" width="800px" class="mapDialog" @onConfirm="selectMap">
+              <div id="map"></div>
+              <el-form label-width="80px" style="padding: 10px 20px 0 20px;">
+                <el-row type="flex" justify="space-between">
+                  <el-form-item label="经度">
+                    <el-input disabled size="small" v-model="placeDetail.lng"></el-input>
+                  </el-form-item>
+                  <el-form-item label="纬度">
+                    <el-input disabled size="small" v-model="placeDetail.lat"></el-input>
+                  </el-form-item>
+                </el-row>
               </el-form>
-          </template>
-        </ai-card>
-      </template>
-      <template #footer>
-        <el-button class="delete-btn footer-btn" @click="cancel(false)">取消</el-button>
-        <el-button class="footer-btn" type="primary" @click="confirm()">保存</el-button>
-      </template>
-    </ai-detail>
-    <ai-dialog title="地图" :visible.sync="showMap" @opened="initMap" width="800px" class="mapDialog" @onConfirm="selectMap">
-      <div id="map"></div>
-      <el-form label-width="80px" style="padding: 10px 20px 0 20px;">
-        <el-row type="flex" justify="space-between">
-          <el-form-item label="经度">
-            <el-input disabled size="small" v-model="placeDetail.lng"></el-input>
-          </el-form-item>
-          <el-form-item label="纬度">
-            <el-input disabled size="small" v-model="placeDetail.lat"></el-input>
-          </el-form-item>
-        </el-row>
-      </el-form>
-      <el-input id="searchPlaceInput" size="medium" class="searchPlaceInput" clearable v-model="searchPlace" autocomplete="on" @change="placeSearch.search(searchPlace)" placeholder="请输入关键字">
-        <el-button type="primary" slot="append" @click="placeSearch.search(searchPlace)">搜索</el-button>
-      </el-input>
-      <div id="searchPlaceOutput" />
-    </ai-dialog>
-  </section>
+              <el-input id="searchPlaceInput" size="medium" class="searchPlaceInput" clearable v-model="searchPlace" autocomplete="on" @change="placeSearch.search(searchPlace)" placeholder="请输入关键字">
+                <el-button type="primary" slot="append" @click="placeSearch.search(searchPlace)">搜索</el-button>
+              </el-input>
+              <div id="searchPlaceOutput" />
+            </ai-dialog>
+        </template>
+      </ai-card>
+    </template>
+    <template #footer>
+      <el-button class="delete-btn footer-btn" @click="cancel(false)">取消</el-button>
+      <el-button class="footer-btn" type="primary" @click="confirm()">保存</el-button>
+    </template>
+  </ai-detail>
 </template>
 
 <script>
diff --git a/project/fengdu/app/AppIntegratingTask/components/Detail.vue b/project/fengdu/app/AppIntegratingTask/components/Detail.vue
index dc485f13..a04c16ea 100644
--- a/project/fengdu/app/AppIntegratingTask/components/Detail.vue
+++ b/project/fengdu/app/AppIntegratingTask/components/Detail.vue
@@ -1,69 +1,36 @@
 <template>
-  <ai-detail class="detail">
+  <ai-detail class="activitiesAdd">
     <template slot="title">
-      <ai-title title="帖子详情" isShowBack isShowBottomBorder @onBackClick="cancel(false)">
-      </ai-title>
+      <ai-title title="活动详情" isShowBack isShowBottomBorder @onBackClick="cancel(false)"></ai-title>
     </template>
     <template slot="content">
-      <ai-card title="帖子信息">
+      <ai-card title="基本信息">
         <template #content>
-          <div class="talk-info">
-            <div class="user">
-              <img :src="info.createUserAvatar" alt="">
-              <div class="info">
-                <h2>{{info.createUserName}}</h2>
-                <div class="time-flex">
-                  <span class="area-name">{{info.publishDepartName}}</span>
-                  <span>{{info.createTime}}</span>
-                </div>
-              </div>
-            </div>
-            <div class="content">
-              <span v-if="info.themeId">#【{{info.themeInfo.title}}】</span>{{info.content}}
-            </div>
-            <ai-uploader :instance="instance" disabled v-model="info.files">
-            </ai-uploader>
-          </div>
-        </template>
-      </ai-card>
-      <ai-card title="评论信息">
-        <template #content>
-          <div class="comment-list" v-if="commontList.length">
-            <div class="title">评论</div>
-            <div class="item" v-for="(item, index) in commontList" :key="index">
-              <div class="user">
-                <img :src="item.createUserAvatar" alt="">
-                <div class="info-flex">
-                  <h2>{{item.createUserName}}</h2>
-                  <span>{{item.createTime}}</span>
-                </div>
-              </div>
-              <div class="content-flex">
-                <p>{{item.content}}</p>
-                <div @click="delCommontOrReply('评论', item.id)">删除</div>
-              </div>
-              <div class="reply-list" v-if="item.replyList && item.replyList.length && item.isShowReply">
-                <div class="reply-item" v-for="(reply, indexs) in item.replyList" :key="indexs">
-                  <div class="reply-user">
-                    <img :src="item.createUserAvatar" alt="">
-                    <div  class="reply-name">
-                      <span>{{reply.createUserName}}</span>回复<span>{{item.createUserName}}</span>
-                    </div>
-                    <span class="reply-time">{{reply.createTime}}</span>
-                  </div>
-                  <div class="content-flex">
-                    <p>{{reply.content}}</p>
-                    <div @click="delCommontOrReply('回复', reply.id)">删除</div>
-                  </div>
-                </div>
-              </div>
-              <div class="reply-more" @click="item.isShowReply = !item.isShowReply" :class="[item.isShowReply ? 'active' : '']">
-                <span class="line"></span>{{item.isShowReply ? '收起' : `展开${item.replyList.length}条回复`}}
-                <i class="el-icon-arrow-down"></i>
-              </div>
-            </div>
-          </div>
-          <ai-empty v-else>暂无评论</ai-empty>
+          <ai-wrapper>
+            <ai-info-item label="活动名称" :value="info.title"></ai-info-item>
+            <ai-info-item label="创建人" :value="info.createUserName"></ai-info-item>
+            <ai-info-item label="活动说明" isLine :value="info.detail"></ai-info-item>
+            <ai-info-item label="活动图片" isLine>
+              <ai-uploader
+                disabled
+                :instance="instance"
+                :value="info.files">
+                </ai-uploader>
+            </ai-info-item>
+            <ai-info-item label="活动说明" isLine :value="info.areaName"></ai-info-item>
+            <ai-info-item label="活动地点" :value="info.address"></ai-info-item>
+            <ai-info-item label="标绘地址" isLine><div id="mapDetail"></div></ai-info-item>
+            <ai-info-item label="积分类型" isLine :value="info.type === '0' ? '打卡得积分' : '报名得积分'"></ai-info-item>
+            <ai-info-item label="活动状态">
+              {{ dict.getLabel('tfx_activityStatus',info.status) }}
+            </ai-info-item>
+            <ai-info-item label="打卡范围">{{ info.clockRange }}米</ai-info-item>
+            <ai-info-item :label="info.type === '0' ? '进场打卡时间' : '进场时间'">{{ info.intoBegintime }}至{{ info.intoEndtime}}</ai-info-item>
+            <ai-info-item v-if="info.type === '0'" label="进场得积分">{{ info.intoIntegral }}分</ai-info-item>
+            <ai-info-item :label="info.type === '0' ? '离场打卡时间' : '离场时间'">{{ info.exitBegintime }}至{{ info.exitEndtime}}</ai-info-item>
+            <ai-info-item v-if="info.type === '0'" label="离场得积分">{{ info.exitIntegral }}分</ai-info-item>
+            <ai-info-item v-if="info.type === '1'" label="报名得积分">{{ info.enrollIntegral }}分</ai-info-item>
+          </ai-wrapper>
         </template>
       </ai-card>
     </template>
@@ -71,224 +38,92 @@
 </template>
 
 <script>
+  import AMapLoader from '@amap/amap-jsapi-loader'
   export default {
-    name: 'Detail',
-
     props: {
       instance: Function,
       dict: Object,
-      params: Object
+      params: Object,
     },
 
     data () {
       return {
-        commontList: [],
+        id: '',
         info: {},
-      }
-    },
-
-    computed: {
-      getAvatar(row){
-        return row.avatar||row.photo||'https://cdn.cunwuyun.cn/dvcp/h5/defaultAvatar.png'
+        mapDetail: null,
+        map: null
       }
     },
 
     created () {
-      this.getInfo()
-      this.getList()
+      this.id = this.params.id
+      this.$dict.load('tfx_activityStatus').then(() => {
+        this.getDetail()
+      })
     },
 
     methods: {
-      getList() {
-        this.instance.post(`/app/appneighborhoodassistance/commontList?id=${this.params.id}&size=100`).then(res => {
-          if (res.code == 0) {
-            res.data.records.map((item) => {
-              item.isShowReply = false
-            })
-            this.commontList = res.data.records
-          }
-        })
-      },
-
-      getInfo () {
-        this.instance.post(`/app/appneighborhoodassistance/queryDetailById?id=${this.params.id}`).then(res => {
-          if (res.code == 0) {
-            if (res.data) {
-              this.info = res.data
-            }
-          }
-        })
-      },
-
-      cancel () {
+      cancel (isRefresh) {
         this.$emit('change', {
           type: 'List',
-          isRefresh: true
+          isRefresh: !!isRefresh
         })
       },
 
-      delCommontOrReply(text, id) {
-        this.$confirm(`确定删除该${text}？`).then(() => {
-          this.instance.post(`/app/appneighborhoodassistance/delComment?id=${id}`).then(res => {
-            if (res.code == 0) {
-              this.$message.success('删除成功！')
-              this.getList()
-            }
+      getMap(lng,lat,address) {
+        AMapLoader.load({
+          key: '54a02a43d9828a8f9cd4f26fe281e74e',
+          version: '2.0',
+          plugins: ['AMap.PlaceSearch', 'AMap.AutoComplete', 'AMap.Geocoder'],
+        }).then((AMap) => {
+          this.mapDetail = new AMap.Map(document.getElementById("mapDetail"), {
+            resizeEnable: true,
+            zooms: [6, 20],
+            center:[104.067923463,30.6799428454],
+            zoom: 11,
           })
+          let marker = new AMap.Marker({
+            position: new AMap.LngLat(lng,lat),
+            title: address
+          })
+          this.mapDetail.add(marker);
         })
       },
+
+      update() {
+        this.isEdit = true
+        this.getDetail()
+      },
+
+      getDetail() {
+        this.instance.post(`/app/appintegraltask/queryDetailById?id=${this.params.id}`).then((res) => {
+          if(res.data) {
+            this.info = res.data
+            this.getMap(this.info.lng, this.info.lat, this.info.address)
+          }
+        })
+      }
     }
   }
 </script>
 
-<style scoped lang="scss">
-.detail {
-  .talk-info {
-    .user {
-      display: flex;
-      margin-bottom: 8px;
-      img {
-        width: 60px;
-        height: 60px;
-        margin-right: 16px;
-        border-radius: 50%;
-      }
-      .info {
-        width: calc(100% - 76px);
-        h2 {
-          font-size: 20px;
-          line-height: 30px;
-          font-weight: 400;
-        }
-        .time-flex {
-          display: flex;
-          justify-content: space-between;
-          color: #999;
-          font-size: 14px;
-          line-height: 30px;
-          .area-name {
-            color: #666;
-          }
-        }
-      }
+<style lang="scss" scope>
+  .activitiesAdd {
+    height: 100%;
+
+    :deep( .amap-logo ){
+      display: none!important;
     }
-    .content {
-      font-size: 16px;
-      line-height: 32px;
-      word-break: break-all;
-      span {
-        color: #26f;
-      }
+    :deep( .amap-copyright ){
+      display: none!important;
+    }
+
+    :deep( .el-date-editor .el-input ){
+      width: 100%;
+    }
+
+    .amap-container {
+      height: 380px;
     }
   }
-  .comment-list {
-    .title {
-      color: #333;
-      font-size: 16px;
-      font-weight: 700;
-      line-height: 40px;
-      margin-bottom: 8px;
-    }
-    .item {
-      border-bottom: 1px solid #ddd;
-      padding-bottom: 16px;
-      .user {
-        display: flex;
-        margin-bottom: 8px;
-        img {
-          width: 60px;
-          height: 60px;
-          margin-right: 16px;
-          border-radius: 50%;
-        }
-        .info-flex {
-          width: calc(100% - 76px);
-          display: flex;
-          justify-content: space-between;
-          line-height: 60px;
-          h2 {
-            font-size: 20px;
-            font-weight: 400;
-          }
-          span {
-            color: #999;
-            font-size: 14px;
-          }
-        }
-      }
-      .content-flex {
-        display: flex;
-        font-size: 16px;
-        line-height: 30px;
-        margin-bottom: 8px;
-        padding-left: 76px;
-        p {
-          width: calc(100% - 50px);
-          word-break: break-all;
-        }
-        div {
-          color: #26f;
-          width: 50px;
-          text-align: right;
-          cursor: pointer;
-        }
-      }
-      .reply-list {
-        padding-left: 100px;
-        .reply-item {
-          margin-bottom: 8px;
-          .reply-user {
-            font-size: 14px;
-            img {
-              width: 50px;
-              height: 50px;
-              border-radius: 50%;
-              vertical-align: middle;
-            }
-            .reply-name {
-              display: inline-block;
-              color: #333;
-              width: 300px;
-              span {
-                display: inline-block;
-                color: #666;
-                margin: 0 8px;
-              }
-            }
-            .reply-time {
-              color: #999;
-            }
-          }
-          .content-flex {
-            font-size: 14px;
-            line-height: 24px;
-            padding-left: 58px;
-          }
-        }
-      }
-      .reply-more {
-        font-size: 14px;
-        line-height: 28px;
-        color: #333;
-        .line {
-          display: inline-block;
-          width: 120px;
-          border-top: 1px solid #eee;
-          vertical-align: middle;
-          margin-right: 8px;
-        }
-
-        .el-icon-arrow-down {
-          transition: all ease 0.5s;
-          transform: rotate(0);
-          margin-left: 8px;
-        }
-
-        &.active .el-icon-arrow-down {
-          transform: rotate(180deg);
-        }
-      }
-    }
-  }
-}
 </style>
diff --git a/project/fengdu/app/AppIntegratingTask/components/List.vue b/project/fengdu/app/AppIntegratingTask/components/List.vue
index bed9907c..80134c37 100644
--- a/project/fengdu/app/AppIntegratingTask/components/List.vue
+++ b/project/fengdu/app/AppIntegratingTask/components/List.vue
@@ -31,11 +31,13 @@
             </div>
           </template>
         </el-table-column>
-        <el-table-column slot="options" label="操作" fixed="right" align="center">
+        <el-table-column slot="options" label="操作" fixed="right" align="center" width="140px">
           <template slot-scope="{ row }">
-            <el-button type="text" @click.native="toAdd(row.id)">详情</el-button>
-            <el-button type="text" :disabled="row.status ==2" @click.native="stopBtn(row.id)">结束</el-button>
-            <el-button type="text" @click.native="handleDelete(row.id)">删除</el-button>
+            <div class="table-options">
+              <el-button type="text" @click.native="toDetail(row.id)">详情</el-button>
+              <el-button type="text" :disabled="row.status ==2" @click.native="stopBtn(row.id)">结束</el-button>
+              <el-button type="text" @click.native="handleDelete(row.id)">删除</el-button>
+            </div>
           </template>
         </el-table-column>
       </ai-table>
@@ -111,6 +113,15 @@
         })
       },
 
+      toDetail (id) {
+        this.$emit('change', {
+          type: 'Detail',
+          params: {
+            id: id || '',
+          }
+        })
+      },
+
       toAdd(id) {
         this.$emit('change', {
           type: 'Add',