Merge branch 'build' of http://git.sinoecare.com/sinoecare/digital_village_v2/dvcp_v2_webapp into build

packages/conv/AppReportAiWill/components/Detail.vue

@@ -32,7 +32,7 @@
               </ai-wrapper>
             </template>
           </ai-card>
-          <ai-evaluation :bid="form.id" :info.sync="evaluation"/>
+          <ai-evaluation :bid="detail.id" :info.sync="evaluation"/>
         </div>
         <div class="rightZone">
           <ai-card title="办理进度">
@@ -200,11 +200,11 @@ export default {
 
   computed: {
     ...mapState(['user']),
-    process: v => [v.processList, v.evaluation.id ? {
+    process: v => [v.evaluation.id ? {
       systemExplain: `${v.evaluation.createUserName}完成评价 (${v.evaluation.score}星评价)`,
       doTime: v.evaluation.createTime,
       doExplain: v.evaluation.rateText
-    } : null].flat().filter(Boolean)
+    } : null, v.processList].flat().filter(Boolean)
   },
 
   created() {

project/pingchang/apps/AppCommunityMember/Add.vue

@@ -79,7 +79,7 @@
                 ></el-input>
               </el-form-item>
               <el-form-item label="活动介绍" prop="content" style="width: 100%">
-                <ai-editor v-model="form.content" :instance="instance" @validate="v=>valid=!v"/>
+                <ai-editor v-model="form.content" :instance="instance" />
               </el-form-item>
             </div>
           </template>
@@ -130,7 +130,7 @@ export default {
         stopSignupTime: [{ required: true, message: '请选择截止时间', trigger: 'change' }],
         contactPerson: [{ required: true, message: '请输入联系人', trigger: 'change' }],
         contactPhone: [{ required: true, message: '请输入联系电话', trigger: 'change' }],
-        content: [{ required: true, message: '请输入活动介绍', trigger: 'change' }],
+        content: [{ required: true, message: '请输入活动介绍', trigger: 'blur' }],
       },
       form: {
         areaId: '',
@@ -149,7 +149,7 @@ export default {
   created() {
     console.log(this.user)
     this.dict.load("education", "sex", "nation", "developStatus")
-    this.disabledLevel = this.user.info.areaList.length - 1
+    this.disabledLevel = this.user.info.areaList.length
     this.form.areaId = this.user.info.areaId
   },
   methods: {

project/pingchang/apps/AppCommunityMember/Statistics.vue

@@ -168,12 +168,7 @@ export default {
         { prop: "sex", label: "性别", align: "center", dict: "sex" },
         { prop: "partyOrg", label: "所属组织", align: "center" },
         { prop: "signupCount", label: "报名次数", align: "center", width: 150 },
-        {
-          prop: "partakeCount",
-          label: "参与次数",
-          align: "center",
-          width: 150,
-        },
+        { prop: "partakeCount", label: "参与次数", align: "center", width: 150 },
       ],
     };
   },