最新需求优化

src/views/modules/activity/add.vue

@@ -172,6 +172,9 @@
                   <el-form-item label="爱心值对应内容" v-if="moreForm.activityLimit==1">
                     <el-input v-model="moreForm.loveValueContent" style="width: 820px;" placeholder="请输入"></el-input>
                   </el-form-item>
+                  <el-form-item label="可获得义工时长"  prop="volunteerHours" v-if="basicForm.typeId==='1977564860095348737'">
+                    <el-input v-model="moreForm.volunteerHours" style="width: 820px;" placeholder="请输入(h)"></el-input>
+                  </el-form-item>
                   <el-form-item label="报名次数限制">
                     <div class="adfac">
                       <el-input min="1" type="number" v-model="moreForm.timesLimit" style="width: 391px;" placeholder="请输入"></el-input>
@@ -306,6 +309,7 @@ export default {
         activityLimit: 1,
         valueLimit: '',
         loveValueContent: '',
+        volunteerHours: 0,
         timesLimit: '',
         contact: '',
         contactPhone: '',
@@ -318,15 +322,15 @@ export default {
         joinMode: [
           { required: true, message: '请选择参与方式', trigger: 'change' }
         ],
+        volunteerHours: [
+          { required: true, message: '请输入可获得的义工时长', trigger: 'blur' }
+        ],
         contact: [
           { required: true, message: '请输入负责人', trigger: 'blur' }
         ],
         contactPhone: [
           { required: true, message: '请输入负责人电话', trigger: 'blur' },
           { pattern: /^1[3456789]\d{9}$/, message: '请输入正确的电话号码', trigger: 'blur' }
-        ],
-        state: [
-          { required: true, message: '请选择上架活动', trigger: 'change' }
         ]
       }
     }

src/views/modules/activity/classify.vue

@@ -17,7 +17,8 @@
           </div>
           <el-table :data="dataList" border cell-class-name="vertical-top-cell" v-loading="loading" empty-text="暂无活动分类" style="margin-top: 12px;">
             <el-table-column prop="categoryName" label="分类名称"></el-table-column>
-            <el-table-column prop="categoryNo" label="分类编码"></el-table-column>
+            <el-table-column prop="activityCount" label="关联活动数"></el-table-column>
+            <!-- <el-table-column prop="categoryNo" label="分类编码"></el-table-column> -->
             <!-- <el-table-column prop="enable" label="状态">
               <template #default="scope">
                 <div>{{ scope.row.enable?'启用':'停用' }}</div>
@@ -38,9 +39,9 @@
           <el-form-item label="分类名称" prop="categoryName">
             <el-input v-model="form.categoryName" placeholder="请输入分类名称"></el-input>
           </el-form-item>
-          <el-form-item label="分类编码" prop="categoryNo">
+          <!-- <el-form-item label="分类编码" prop="categoryNo">
             <el-input v-model="form.categoryNo" placeholder="请输入分类编码"></el-input>
-          </el-form-item>
+          </el-form-item> -->
           <!-- <el-form-item label="状态" prop="enable">
             <el-radio v-model="form.enable" :label="1">启用</el-radio>
             <el-radio v-model="form.enable" :label="0">停用</el-radio>
@@ -77,13 +78,13 @@ export default {
       rules: {
         categoryName: [
           { required: true, message: '请输入分类名称', trigger: 'blur' }
-        ],
-        categoryNo: [
-          { required: true, message: '请输入分类编码', trigger: 'blur' }
-        ],
-        enable: [
-          { required: true, message: '请选择状态', trigger: 'change' }
         ]
+        // categoryNo: [
+        //   { required: true, message: '请输入分类编码', trigger: 'blur' }
+        // ],
+        // enable: [
+        //   { required: true, message: '请选择状态', trigger: 'change' }
+        // ]
       }
     }
   },

src/views/modules/member/components/activityRecord.vue

@@ -4,24 +4,27 @@
       <el-table-column prop="xxx" label="序号" width="70">
         <template slot-scope="scope">{{ scope.$index + 1 }}</template>
       </el-table-column>
-      <el-table-column prop="memberName" label="会员姓名" width="100"></el-table-column>
-      <el-table-column prop="age" label="会员年龄" width="100">
+      <el-table-column prop="memberName" label="会员姓名" width="130"></el-table-column>
+      <el-table-column prop="age" label="会员年龄" width="120">
         <template slot-scope="scope">{{ scope.row.age }}岁</template>
       </el-table-column>
-      <el-table-column prop="activityId" label="活动ID" width="200"></el-table-column>
-      <el-table-column prop="typeName" label="活动类型" width="120"></el-table-column>
-      <el-table-column prop="activityName" label="活动名称" width="200"></el-table-column>
-      <el-table-column prop="loveValueContent" label="公益支持内容" width="300"></el-table-column>
+      <el-table-column prop="activityId" label="活动ID" width="220"></el-table-column>
+      <el-table-column prop="typeName" label="活动类型" width="150"></el-table-column>
+      <el-table-column prop="activityName" label="活动名称" width="400"></el-table-column>
+      <el-table-column prop="loveValueContent" label="公益支持内容" width="400"></el-table-column>
       <el-table-column prop="activityStartTime" label="活动时间" width="200"></el-table-column>
-      <el-table-column label="活动地点" width="150">
+      <el-table-column label="活动地点" width="200">
         <template slot-scope="scope">{{ scope.row.provinceName }}{{ scope.row.cityName }}</template>
       </el-table-column>
-      <el-table-column prop="signupState" label="活动状态" width="100">
+      <el-table-column prop="signupState" label="活动状态" width="150">
         <template slot-scope="scope">{{ statusDict[scope.row.signupState] }}</template>
       </el-table-column>
-      <el-table-column prop="loveValue" label="捐献爱心值" width="120">
+      <el-table-column prop="loveValue" label="捐献爱心值" width="150">
         <template slot-scope="scope">{{ scope.row.valueLimit==2?0:(scope.row.loveValue||0) }}</template>
       </el-table-column>
+      <el-table-column prop="volunteerHours" label="获得义工时长" width="150">
+        <template slot-scope="scope">{{ scope.row.volunteerHours||0 }}小时</template>
+      </el-table-column>
       <el-table-column label="操作" fixed="right" width="120">
         <template slot-scope="scope">
           <el-button type="text" v-if="scope.row.signupState==3" @click="handleReview(scope.row)">查看档案</el-button>

src/views/modules/member/components/onlySelfTicket.vue

@@ -11,6 +11,7 @@
           <div :class="{'stategreen':scope.row.state===0}">{{ stateDict[scope.row.state] }}</div>
         </template>
       </el-table-column>
+      <el-table-column prop="expiredTime" label="过期时间"></el-table-column>
       <el-table-column prop="updateDate" label="使用时间"></el-table-column>
       <el-table-column prop="remark" label="备注"></el-table-column>
     </el-table>

src/views/modules/member/query.vue

@@ -54,7 +54,7 @@
             <el-table-column prop="xxx" label="序号" width="70">
               <template #default="{ $index }">{{ ($index + 1) + (queryParams.page - 1) * queryParams.limit }}</template>
             </el-table-column>
-            <el-table-column prop="xxx" label="会员信息" width="180">
+            <el-table-column prop="xxx" label="会员信息" width="220">
               <template #default="{ row }">
                 <div class="userinfo adfac">
                   <img :src="row.avatarPath||require('@/assets/img/default_avatar.png')">
@@ -65,23 +65,26 @@
                 </div>
               </template>
             </el-table-column>
-            <el-table-column prop="uniqueNo" label="善行少年编号" width="220"></el-table-column>
-            <el-table-column prop="channelName" label="渠道方" width="150"></el-table-column>
-            <el-table-column prop="realName" label="用户名"></el-table-column>
-            <el-table-column prop="phoneCopy" label="手机号"></el-table-column>
+            <el-table-column prop="uniqueNo" label="善行少年编号" width="270"></el-table-column>
+            <el-table-column prop="channelName" label="渠道方" width="180"></el-table-column>
+            <el-table-column prop="realName" label="用户名" width="150"></el-table-column>
+            <el-table-column prop="phoneCopy" label="手机号" width="180"></el-table-column>
             <!-- <el-table-column prop="welfareName" label="家庭公益名称" width="130"></el-table-column>
             <el-table-column prop="welfareSlogan" label="家庭公益口号" width="130"></el-table-column> -->
-            <el-table-column prop="totalConsumeLove" label="累计捐献爱心值" width="140">
+            <el-table-column prop="totalConsumeLove" label="累计捐献爱心值" width="170">
               <template #default="{ row }">{{ row.totalConsumeLove||0 }}</template>
             </el-table-column>
-            <el-table-column prop="totalImportLove" label="累计导入爱心值" width="140"></el-table-column>
-            <el-table-column prop="welfareCount" label="参与公益次数" width="130">
+            <el-table-column prop="totalImportLove" label="累计导入爱心值" width="170"></el-table-column>
+            <el-table-column prop="welfareCount" label="参与公益次数" width="160">
               <template #default="{ row }">{{ row.welfareCount||0 }}次</template>
             </el-table-column>
-            <el-table-column prop="userLevel" label="会员等级">
+            <el-table-column prop="userLevel" label="会员等级" width="160">
               <template #default="{ row }">Lv.{{ row.userLevel||0 }}</template>
             </el-table-column>
-            <el-table-column label="操作" width="180" fixed="right">
+            <el-table-column prop="couponNum" label="待使用专享券" width="160">
+              <template #default="{ row }">{{ row.couponNum||0 }}张</template>
+            </el-table-column>
+            <el-table-column label="操作" width="200" fixed="right">
               <template #default="scope">
                   <el-button link type="text" @click="handleDetail(scope.row)" v-if="$hasPermission('core:appuser:detail')">会员详情</el-button>
                   <!-- <el-button link type="text" @click="handleCreateCode(scope.row)" v-if="$hasPermission('core:appuser:code')">生成邀请码</el-button> -->

src/views/pages/login.vue

@@ -113,3 +113,9 @@ export default {
   }
 }
 </script>
+<style lang="scss" scoped>
+  ::v-deep .el-form-item__content{
+    line-height: inherit !important;
+
+  }
+</style>