修复

.env.development

@@ -6,8 +6,8 @@ ENV = 'development'
 
 # 苏州园区志愿服务活动区块链平台/开发环境
 # VUE_APP_BASE_API = 'https://vue.ruoyi.vip/prod-api'
-VUE_APP_BASE_API = 'http://39.101.188.84:9034'
-# VUE_APP_BASE_API = 'http://192.168.0.117:9034'
+# VUE_APP_BASE_API = 'http://39.101.188.84:9034'
+VUE_APP_BASE_API = 'http://192.168.0.117:9034'
 
 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true

src/api/system/dict/type.js

@@ -1,60 +1,67 @@
-import request from '@/utils/request'
+import request from "@/utils/request";
 
 // 查询字典类型列表
 export function listType(query) {
   return request({
-    url: '/system/dict/type/list',
-    method: 'get',
-    params: query
-  })
+    url: "/system/dict/type/list",
+    method: "get",
+    params: query,
+  });
+}
+export function listType2(query) {
+  return request({
+    url: "/system/dict/type/personList",
+    method: "get",
+    params: query,
+  });
 }
 
 // 查询字典类型详细
 export function getType(dictId) {
   return request({
-    url: '/system/dict/type/' + dictId,
-    method: 'get'
-  })
+    url: "/system/dict/type/" + dictId,
+    method: "get",
+  });
 }
 
 // 新增字典类型
 export function addType(data) {
   return request({
-    url: '/system/dict/type',
-    method: 'post',
-    data: data
-  })
+    url: "/system/dict/type",
+    method: "post",
+    data: data,
+  });
 }
 
 // 修改字典类型
 export function updateType(data) {
   return request({
-    url: '/system/dict/type',
-    method: 'put',
-    data: data
-  })
+    url: "/system/dict/type",
+    method: "put",
+    data: data,
+  });
 }
 
 // 删除字典类型
 export function delType(dictId) {
   return request({
-    url: '/system/dict/type/' + dictId,
-    method: 'delete'
-  })
+    url: "/system/dict/type/" + dictId,
+    method: "delete",
+  });
 }
 
 // 刷新字典缓存
 export function refreshCache() {
   return request({
-    url: '/system/dict/type/refreshCache',
-    method: 'delete'
-  })
+    url: "/system/dict/type/refreshCache",
+    method: "delete",
+  });
 }
 
 // 获取字典选择框列表
 export function optionselect() {
   return request({
-    url: '/system/dict/type/optionselect',
-    method: 'get'
-  })
-}
+    url: "/system/dict/type/optionselect",
+    method: "get",
+  });
+}

src/utils/request.js

@@ -6,6 +6,7 @@ import errorCode from "@/utils/errorCode";
 import { tansParams, blobValidate } from "@/utils/ruoyi";
 import cache from "@/plugins/cache";
 import { saveAs } from "file-saver";
+import router from "@/router";
 
 let downloadLoadingInstance;
 // 是否显示重新登录

src/views/login.vue

@@ -95,8 +95,8 @@ export default {
     return {
       codeUrl: "",
       loginForm: {
-        username: "admin",
-        password: "admin123",
+        username: "",
+        password: "",
         rememberMe: false,
         code: "",
         uuid: "",

src/views/volunteer/addressGl/index.vue

@@ -7,11 +7,11 @@
       label-width="80px"
       class="user-address"
     >
-      <el-form-item label="姓名" prop="nickName">
-        <el-input v-model="form.nickName"></el-input>
+      <el-form-item label="姓名" prop="consigneeName">
+        <el-input v-model="form.consigneeName"></el-input>
       </el-form-item>
-      <el-form-item label="手机号" prop="phonenumber">
-        <el-input v-model="form.phonenumber"></el-input>
+      <el-form-item label="手机号" prop="consigneePhonenumber">
+        <el-input v-model="form.consigneePhonenumber"></el-input>
       </el-form-item>
       <el-form-item label="详细地址" prop="address">
         <el-input v-model="form.address" type="textarea" :rows="3"></el-input>
@@ -30,8 +30,10 @@ export default {
     return {
       form: {},
       rules: {
-        nickName: [{ required: true, message: "请输入姓名", trigger: "blur" }],
-        phonenumber: [
+        consigneeName: [
+          { required: true, message: "请输入姓名", trigger: "blur" },
+        ],
+        consigneePhonenumber: [
           { required: true, message: "请输入手机号", trigger: "blur" },
         ],
         address: [

src/views/volunteer/userbq/dictGl/data.vue

@@ -85,34 +85,70 @@
           icon="el-icon-close"
           size="mini"
           @click="handleClose"
-        >关闭</el-button>
+          >关闭</el-button
+        >
       </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+      <right-toolbar
+        :showSearch.sync="showSearch"
+        @queryTable="getList"
+      ></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="dataList" @selection-change="handleSelectionChange">
+    <el-table
+      v-loading="loading"
+      :data="dataList"
+      @selection-change="handleSelectionChange"
+    >
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="字典编码" align="center" prop="dictCode" />
       <el-table-column label="字典标签" align="center" prop="dictLabel">
         <template slot-scope="scope">
-          <span v-if="(scope.row.listClass == '' || scope.row.listClass == 'default') && (scope.row.cssClass == '' || scope.row.cssClass == null)">{{ scope.row.dictLabel }}</span>
-          <el-tag v-else :type="scope.row.listClass == 'primary' ? '' : scope.row.listClass" :class="scope.row.cssClass">{{ scope.row.dictLabel }}</el-tag>
+          <span
+            v-if="
+              (scope.row.listClass == '' || scope.row.listClass == 'default') &&
+              (scope.row.cssClass == '' || scope.row.cssClass == null)
+            "
+            >{{ scope.row.dictLabel }}</span
+          >
+          <el-tag
+            v-else
+            :type="scope.row.listClass == 'primary' ? '' : scope.row.listClass"
+            :class="scope.row.cssClass"
+            >{{ scope.row.dictLabel }}</el-tag
+          >
         </template>
       </el-table-column>
       <el-table-column label="字典键值" align="center" prop="dictValue" />
       <el-table-column label="字典排序" align="center" prop="dictSort" />
       <el-table-column label="状态" align="center" prop="status">
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status"/>
+          <dict-tag
+            :options="dict.type.sys_normal_disable"
+            :value="scope.row.status"
+          />
         </template>
       </el-table-column>
-      <el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true" />
-      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+      <el-table-column
+        label="备注"
+        align="center"
+        prop="remark"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="创建时间"
+        align="center"
+        prop="createTime"
+        width="180"
+      >
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column
+        label="操作"
+        align="center"
+        class-name="small-padding fixed-width"
+      >
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -120,7 +156,8 @@
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['system:dict:edit']"
-          >修改</el-button>
+            >修改</el-button
+          >
           <!-- <el-button
             size="mini"
             type="text"
@@ -133,7 +170,7 @@
     </el-table>
 
     <pagination
-      v-show="total>0"
+      v-show="total > 0"
       :total="total"
       :page.sync="queryParams.pageNum"
       :limit.sync="queryParams.pageSize"
@@ -156,7 +193,11 @@
           <el-input v-model="form.cssClass" placeholder="请输入样式属性" />
         </el-form-item>
         <el-form-item label="显示排序" prop="dictSort">
-          <el-input-number v-model="form.dictSort" controls-position="right" :min="0" />
+          <el-input-number
+            v-model="form.dictSort"
+            controls-position="right"
+            :min="0"
+          />
         </el-form-item>
         <el-form-item label="回显样式" prop="listClass">
           <el-select v-model="form.listClass">
@@ -174,11 +215,16 @@
               v-for="dict in dict.type.sys_normal_disable"
               :key="dict.value"
               :label="dict.value"
-            >{{dict.label}}</el-radio>
+              >{{ dict.label }}</el-radio
+            >
           </el-radio-group>
         </el-form-item>
         <el-form-item label="备注" prop="remark">
-          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容"></el-input>
+          <el-input
+            v-model="form.remark"
+            type="textarea"
+            placeholder="请输入内容"
+          ></el-input>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -190,12 +236,21 @@
 </template>
 
 <script>
-import { listData, getData, delData, addData, updateData } from "@/api/system/dict/data";
-import { optionselect as getDictOptionselect, getType } from "@/api/system/dict/type";
+import {
+  listData,
+  getData,
+  delData,
+  addData,
+  updateData,
+} from "@/api/system/dict/data";
+import {
+  optionselect as getDictOptionselect,
+  getType,
+} from "@/api/system/dict/type";
 
 export default {
   name: "Data",
-  dicts: ['sys_normal_disable'],
+  dicts: ["sys_normal_disable"],
   data() {
     return {
       // 遮罩层
@@ -222,28 +277,28 @@ export default {
       listClassOptions: [
         {
           value: "default",
-          label: "默认"
+          label: "默认",
         },
         {
           value: "primary",
-          label: "主要"
+          label: "主要",
         },
         {
           value: "success",
-          label: "成功"
+          label: "成功",
         },
         {
           value: "info",
-          label: "信息"
+          label: "信息",
         },
         {
           value: "warning",
-          label: "警告"
+          label: "警告",
         },
         {
           value: "danger",
-          label: "危险"
-        }
+          label: "危险",
+        },
       ],
       // 类型数据字典
       typeOptions: [],
@@ -253,22 +308,22 @@ export default {
         pageSize: 10,
         dictName: undefined,
         dictType: undefined,
-        status: undefined
+        status: undefined,
       },
       // 表单参数
       form: {},
       // 表单校验
       rules: {
         dictLabel: [
-          { required: true, message: "数据标签不能为空", trigger: "blur" }
+          { required: true, message: "数据标签不能为空", trigger: "blur" },
         ],
         dictValue: [
-          { required: true, message: "数据键值不能为空", trigger: "blur" }
+          { required: true, message: "数据键值不能为空", trigger: "blur" },
         ],
         dictSort: [
-          { required: true, message: "数据顺序不能为空", trigger: "blur" }
-        ]
-      }
+          { required: true, message: "数据顺序不能为空", trigger: "blur" },
+        ],
+      },
     };
   },
   created() {
@@ -279,7 +334,7 @@ export default {
   methods: {
     /** 查询字典类型详细 */
     getType(dictId) {
-      getType(dictId).then(response => {
+      getType(dictId).then((response) => {
         this.queryParams.dictType = response.data.dictType;
         this.defaultDictType = response.data.dictType;
         this.getList();
@@ -287,14 +342,14 @@ export default {
     },
     /** 查询字典类型列表 */
     getTypeList() {
-      getDictOptionselect().then(response => {
+      getDictOptionselect().then((response) => {
         this.typeOptions = response.data;
       });
     },
     /** 查询字典数据列表 */
     getList() {
       this.loading = true;
-      listData(this.queryParams).then(response => {
+      listData(this.queryParams).then((response) => {
         this.dataList = response.rows;
         this.total = response.total;
         this.loading = false;
@@ -312,10 +367,10 @@ export default {
         dictLabel: undefined,
         dictValue: undefined,
         cssClass: undefined,
-        listClass: 'default',
+        listClass: "default",
         dictSort: 0,
         status: "0",
-        remark: undefined
+        remark: undefined,
       };
       this.resetForm("form");
     },
@@ -344,34 +399,40 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.dictCode)
-      this.single = selection.length!=1
-      this.multiple = !selection.length
+      this.ids = selection.map((item) => item.dictCode);
+      this.single = selection.length != 1;
+      this.multiple = !selection.length;
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
-      const dictCode = row.dictCode || this.ids
-      getData(dictCode).then(response => {
+      const dictCode = row.dictCode || this.ids;
+      getData(dictCode).then((response) => {
         this.form = response.data;
         this.open = true;
         this.title = "修改字典数据";
       });
     },
     /** 提交按钮 */
-    submitForm: function() {
-      this.$refs["form"].validate(valid => {
+    submitForm: function () {
+      this.$refs["form"].validate((valid) => {
         if (valid) {
           if (this.form.dictCode != undefined) {
-            updateData(this.form).then(response => {
-              this.$store.dispatch('dict/removeDict', this.queryParams.dictType);
+            updateData(this.form).then((response) => {
+              this.$store.dispatch(
+                "dict/removeDict",
+                this.queryParams.dictType
+              );
               this.$modal.msgSuccess("修改成功");
               this.open = false;
               this.getList();
             });
           } else {
-            addData(this.form).then(response => {
-              this.$store.dispatch('dict/removeDict', this.queryParams.dictType);
+            addData(this.form).then((response) => {
+              this.$store.dispatch(
+                "dict/removeDict",
+                this.queryParams.dictType
+              );
               this.$modal.msgSuccess("新增成功");
               this.open = false;
               this.getList();
@@ -383,20 +444,28 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const dictCodes = row.dictCode || this.ids;
-      this.$modal.confirm('是否确认删除字典编码为"' + dictCodes + '"的数据项？').then(function() {
-        return delData(dictCodes);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-        this.$store.dispatch('dict/removeDict', this.queryParams.dictType);
-      }).catch(() => {});
+      this.$modal
+        .confirm('是否确认删除字典编码为"' + dictCodes + '"的数据项？')
+        .then(function () {
+          return delData(dictCodes);
+        })
+        .then(() => {
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+          this.$store.dispatch("dict/removeDict", this.queryParams.dictType);
+        })
+        .catch(() => {});
     },
     /** 导出按钮操作 */
     handleExport() {
-      this.download('system/dict/data/export', {
-        ...this.queryParams
-      }, `data_${new Date().getTime()}.xlsx`)
-    }
-  }
+      this.download(
+        "system/dict/data/export",
+        {
+          ...this.queryParams,
+        },
+        `data_${new Date().getTime()}.xlsx`
+      );
+    },
+  },
 };
-</script>
+</script>

src/views/volunteer/userbq/dictGl/index.vue

@@ -102,40 +102,80 @@
           size="mini"
           @click="handleRefreshCache"
           v-hasPermi="['system:dict:remove']"
-        >刷新缓存</el-button>
+          >刷新缓存</el-button
+        >
       </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+      <right-toolbar
+        :showSearch.sync="showSearch"
+        @queryTable="getList"
+      ></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="typeList" @selection-change="handleSelectionChange">
+    <el-table
+      v-loading="loading"
+      :data="typeList"
+      @selection-change="handleSelectionChange"
+    >
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="字典编号" align="center" prop="dictId" />
-      <el-table-column label="字典名称" align="center" prop="dictName" :show-overflow-tooltip="true" >
-          <template slot-scope="scope">
-          <router-link :to="'/volunteer/zyzsjgl/zdgl/' + scope.row.dictId" class="link-type">
+      <el-table-column
+        label="字典名称"
+        align="center"
+        prop="dictName"
+        :show-overflow-tooltip="true"
+      >
+        <template slot-scope="scope">
+          <router-link
+            :to="'/volunteer/zyzsjgl/zdgl/' + scope.row.dictId"
+            class="link-type"
+          >
             <span>{{ scope.row.dictName }}</span>
           </router-link>
         </template>
       </el-table-column>
-      <!-- <el-table-column label="字典类型" align="center" :show-overflow-tooltip="true">
+      <el-table-column
+        label="字典类型"
+        align="center"
+        :show-overflow-tooltip="true"
+      >
         <template slot-scope="scope">
-          <router-link :to="'/volunteer/zyzsjgl/zdgl/' + scope.row.dictId" class="link-type">
+          <router-link
+            :to="'/volunteer/zyzsjgl/zdgl/' + scope.row.dictId"
+            class="link-type"
+          >
             <span>{{ scope.row.dictType }}</span>
           </router-link>
         </template>
-      </el-table-column> -->
+      </el-table-column>
       <el-table-column label="状态" align="center" prop="status">
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status"/>
+          <dict-tag
+            :options="dict.type.sys_normal_disable"
+            :value="scope.row.status"
+          />
         </template>
       </el-table-column>
-      <el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true" />
-      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+      <el-table-column
+        label="备注"
+        align="center"
+        prop="remark"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="创建时间"
+        align="center"
+        prop="createTime"
+        width="180"
+      >
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column
+        label="操作"
+        align="center"
+        class-name="small-padding fixed-width"
+      >
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -143,7 +183,8 @@
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['system:dict:edit']"
-          >修改</el-button>
+            >修改</el-button
+          >
           <!-- <el-button
             size="mini"
             type="text"
@@ -156,7 +197,7 @@
     </el-table>
 
     <pagination
-      v-show="total>0"
+      v-show="total > 0"
       :total="total"
       :page.sync="queryParams.pageNum"
       :limit.sync="queryParams.pageSize"
@@ -178,11 +219,16 @@
               v-for="dict in dict.type.sys_normal_disable"
               :key="dict.value"
               :label="dict.value"
-            >{{dict.label}}</el-radio>
+              >{{ dict.label }}</el-radio
+            >
           </el-radio-group>
         </el-form-item>
         <el-form-item label="备注" prop="remark">
-          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容"></el-input>
+          <el-input
+            v-model="form.remark"
+            type="textarea"
+            placeholder="请输入内容"
+          ></el-input>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -194,12 +240,19 @@
 </template>
 
 <script>
-import { listType, getType, delType, addType, updateType, refreshCache } from "@/api/system/dict/type";
-import delgdata from "./data.vue"
+import {
+  listType2,
+  getType,
+  delType,
+  addType,
+  updateType,
+  refreshCache,
+} from "@/api/system/dict/type";
+import delgdata from "./data.vue";
 export default {
   name: "Dict",
-  dicts: ['sys_normal_disable'],
-  components:{delgdata},
+  dicts: ["sys_normal_disable"],
+  components: { delgdata },
   data() {
     return {
       // 遮罩层
@@ -228,19 +281,19 @@ export default {
         pageSize: 10,
         dictName: undefined,
         dictType: undefined,
-        status: 0
+        status: undefined,
       },
       // 表单参数
       form: {},
       // 表单校验
       rules: {
         dictName: [
-          { required: true, message: "字典名称不能为空", trigger: "blur" }
+          { required: true, message: "字典名称不能为空", trigger: "blur" },
         ],
         dictType: [
-          { required: true, message: "字典类型不能为空", trigger: "blur" }
-        ]
-      }
+          { required: true, message: "字典类型不能为空", trigger: "blur" },
+        ],
+      },
     };
   },
   created() {
@@ -250,7 +303,8 @@ export default {
     /** 查询字典类型列表 */
     getList() {
       this.loading = true;
-      listType(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
+      listType2(this.addDateRange(this.queryParams, this.dateRange)).then(
+        (response) => {
           this.typeList = response.rows;
           this.total = response.total;
           this.loading = false;
@@ -268,8 +322,8 @@ export default {
         dictId: undefined,
         dictName: undefined,
         dictType: undefined,
-        status: "0",
-        remark: undefined
+        status: undefined,
+        remark: undefined,
       };
       this.resetForm("form");
     },
@@ -292,32 +346,32 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.dictId)
-      this.single = selection.length!=1
-      this.multiple = !selection.length
+      this.ids = selection.map((item) => item.dictId);
+      this.single = selection.length != 1;
+      this.multiple = !selection.length;
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
-      const dictId = row.dictId || this.ids
-      getType(dictId).then(response => {
+      const dictId = row.dictId || this.ids;
+      getType(dictId).then((response) => {
         this.form = response.data;
         this.open = true;
         this.title = "修改字典类型";
       });
     },
     /** 提交按钮 */
-    submitForm: function() {
-      this.$refs["form"].validate(valid => {
+    submitForm: function () {
+      this.$refs["form"].validate((valid) => {
         if (valid) {
           if (this.form.dictId != undefined) {
-            updateType(this.form).then(response => {
+            updateType(this.form).then((response) => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
               this.getList();
             });
           } else {
-            addType(this.form).then(response => {
+            addType(this.form).then((response) => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
               this.getList();
@@ -329,26 +383,34 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const dictIds = row.dictId || this.ids;
-      this.$modal.confirm('是否确认删除字典编号为"' + dictIds + '"的数据项？').then(function() {
-        return delType(dictIds);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
+      this.$modal
+        .confirm('是否确认删除字典编号为"' + dictIds + '"的数据项？')
+        .then(function () {
+          return delType(dictIds);
+        })
+        .then(() => {
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        })
+        .catch(() => {});
     },
     /** 导出按钮操作 */
     handleExport() {
-      this.download('system/dict/type/export', {
-        ...this.queryParams
-      }, `type_${new Date().getTime()}.xlsx`)
+      this.download(
+        "system/dict/type/export",
+        {
+          ...this.queryParams,
+        },
+        `type_${new Date().getTime()}.xlsx`
+      );
     },
     /** 刷新缓存按钮操作 */
     handleRefreshCache() {
       refreshCache().then(() => {
         this.$modal.msgSuccess("刷新成功");
-        this.$store.dispatch('dict/cleanDict');
+        this.$store.dispatch("dict/cleanDict");
       });
-    }
-  }
+    },
+  },
 };
-</script>
+</script>

src/views/volunteer/yzczs/myycxhd/index.vue

@@ -23,6 +23,7 @@
         align="center"
         prop="activityTime"
       />
+      <el-table-column label="活动积分" align="center" prop="points" />
       <el-table-column label="状态" align="center" prop="status">
         <template slot-scope="scope">
           {{ scope.row.issuanceStatus ? "已发放" : "未发放" }}
@@ -98,7 +99,7 @@
           </div>
           <div class="info-item">
             <div class="item-lable">详细地址:</div>
-            <div class="item-value">{{ form.address }}</div>
+            <div class="item-value">{{ form.mailmailAddress }}</div>
           </div>
         </div>
       </div>
@@ -262,6 +263,7 @@ export default {
       tableData: [],
       total: 1,
       queryParams: {
+        UId: null,
         name: undefined,
         // creType: 1, //1:一次性证书发放,2：个性化证书发放
         pageNum: 1,
@@ -270,6 +272,7 @@ export default {
     };
   },
   created() {
+    this.queryParams.UId = this.$store.getters.userId;
     // //给表格一个固定值
     this.$nextTick(() => {
       this.tableHeigth =
@@ -326,7 +329,11 @@ export default {
     },
     //点击制造或者电子验证收货信息是否完整
     isComplete() {
-      if (!this.form.userName || !this.form.address || !this.form.phonenumber) {
+      if (
+        !this.form.userName ||
+        !this.form.mailmailAddress ||
+        !this.form.phonenumber
+      ) {
         this.$modal.msgError("请前往地址管理中添加详细地址！");
         return false;
       } else {

src/views/volunteer/yzczs/myycxzs/index.vue

@@ -23,6 +23,8 @@
         align="center"
         prop="activityTime"
       />
+      <el-table-column label="活动积分" align="center" prop="points" />
+
       <el-table-column label="状态" align="center" prop="status">
         <template slot-scope="scope">
           {{ scope.row.issuanceStatus ? "已发放" : "未发放" }}
@@ -99,7 +101,7 @@
           </div>
           <div class="info-item">
             <div class="item-lable">详细地址:</div>
-            <div class="item-value">{{ form.address }}</div>
+            <div class="item-value">{{ form.mailAddress }}</div>
           </div>
         </div>
       </div>
@@ -332,7 +334,11 @@ export default {
     },
     //点击制造或者电子验证收货信息是否完整
     isComplete() {
-      if (!this.form.userName || !this.form.address || !this.form.phonenumber) {
+      if (
+        !this.form.userName ||
+        !this.form.mailAddress ||
+        !this.form.phonenumber
+      ) {
         this.$modal.msgError("请前往地址管理中添加详细地址！");
         return false;
       } else {

src/views/volunteer/yzczs/ycxzsff/index.vue

@@ -99,7 +99,7 @@
           </div>
           <div class="info-item">
             <div class="item-lable">详细地址:</div>
-            <div class="item-value">{{ form.address }}</div>
+            <div class="item-value">{{ form.mailAddress }}</div>
           </div>
         </div>
       </div>
@@ -327,7 +327,11 @@ export default {
     },
     //点击制造或者电子验证收货信息是否完整
     isComplete() {
-      if (!this.form.userName || !this.form.address || !this.form.phonenumber) {
+      if (
+        !this.form.userName ||
+        !this.form.mailAddress ||
+        !this.form.phonenumber
+      ) {
         this.$modal.msgError("请前往地址管理中添加详细地址！");
         return false;
       } else {