Merge branch 'featrue-social' into feature

src/views/modules/volunteer/VolManage/activeRecord.vue

@@ -30,7 +30,10 @@
         </el-table-column>
         <el-table-column prop="title" header-align="center" align="center" label="活动标题" :show-overflow-tooltip="true">
         </el-table-column>
-        . <el-table-column prop="strTime" header-align="center" align="center" label="活动时间" :show-overflow-tooltip="true">
+         <el-table-column prop="strTime" header-align="center" align="center" label="活动时间" :show-overflow-tooltip="true">
+        <template slot-scope="scope">
+          {{scope.row.strTime}}-{{scope.row.endTime}}
+        </template>
         </el-table-column>
         <el-table-column prop="statusType" header-align="center" align="center" label="状态" :show-overflow-tooltip="true">
         </el-table-column>
@@ -69,8 +72,8 @@ export default {
           Stutas:'',
         },
         optionsStatus: [
-          { value: '1', label: '打卡' },
+          { value: 1, label: '打卡' },
-          { value: '0', label: '未打卡' },
+          { value: 0, label: '未打卡' },
         ],
         pageNo: 1,
         pageSize: 10,
@@ -100,7 +103,8 @@ export default {
           pageNo:this.pageNo,
           userId:this.fmData.userId,
           searchContent:this.SearchForm.content,
-          signFlag:this.SearchForm.Stutas
+          signFlag:this.SearchForm.Stutas,
+          // state:""
           
         }
         const { data, code, msg } = await requestPost(url,params);

src/views/modules/volunteer/VolManage/index.vue

@@ -114,7 +114,6 @@
         tableData: [],
         Record:false,
         fmData:[],
-        volunteerOrgList:[]
       };
     },
     computed: {
@@ -129,17 +128,13 @@
   
     },
     mounted() {
-      this.getvolunteerOrg();
       this.getTableData();
-
     },
     methods: {
-         
       //查询列表
       async getTableData() {
         // const url = "http://yapi.elinkservice.cn/mock/245/gov/project/project/project-list";
         const url = "/voluntary/volunteerInfo/page";
-
         let params={
           pageSize:this.pageSize,
           pageNo:this.pageNo,
@@ -151,7 +146,6 @@
           console.log("列表请求成功！！！！！！！！！！！！！！");
           this.total = data.total || 0;
           this.tableData = data.list
-
         } else {
         }
       },

src/views/modules/volunteer/VolManage/see.vue

@@ -23,7 +23,7 @@
                {{ tableData.createdTime}}
             </el-form-item>
             <el-form-item label="加入的志愿者组织" label-width="150px">
-               {{ tableData.Nickname}}
+               {{ tableData.volunteerOrgNamea}}
             </el-form-item>
             <el-form-item label="积分" label-width="80px" >
                {{ tableData.points}}
@@ -74,8 +74,8 @@ export default {
         const { data, code, msg } = await requestPost(url,params);
         if (code === 0) {
           console.log("列表请求成功！！！！！！！！！！！！！！");
-          this.total = data.total || 0;
           this.volunteerOrgList = data.list
+          console.log(this.volunteerOrgList,"volunteerOrsadasddgList");
           
         } else {
         }
@@ -96,6 +96,11 @@ export default {
         if (code === 0) {
           console.log("列表请求成功！！！！！！！！！！！！！！");
           this.tableData = data.list[0]
+          this.volunteerOrgList.forEach(item=>{
+            if (item.id=this.tableData.volunteerOrgId) {
+              this.tableData.volunteerOrgName=item.orgName
+            }
+          })
           console.log(this.tableData,"r");
           
         } else {

src/views/modules/volunteer/pointsRedemption/Select.vue

@@ -13,9 +13,9 @@
             <el-form-item label="金额">
                {{ tableData.worthAmount}}
             </el-form-item>
-            <el-form-item v-if="tableData.classKey == 'zkq'||tableData.classKey == 'mjq'||tableData.classKey == 'cxdjq'" label="折扣卷">
+            <!-- <el-form-item v-if="tableData.classKey == 'zkq'||tableData.classKey == 'mjq'||tableData.classKey == 'cxdjq'" label="折扣卷">
                {{ tableData.worthAmount}}
-            </el-form-item>
+            </el-form-item> -->
             <el-form-item label="兑换积分">
                {{ tableData.points}}
             </el-form-item>
@@ -33,10 +33,10 @@
                {{ tableData.expireTime }}
               
             </el-form-item>
-            <el-form-item label="有效期至">
+            <!-- <el-form-item label="有效期至">
                {{ tableData.expireTime }}
               
-            </el-form-item>
+            </el-form-item> -->
     
             <el-form-item label="库存">
                {{ tableData.stockQty}}

src/views/modules/volunteer/pointsRedemption/update.vue

@@ -70,7 +70,7 @@
            </el-col>
     
         <el-col :span="12">
-           <el-form-item label="星级专属" required label-width="150px">
+           <el-form-item label="星级专属"  label-width="150px">
               <el-select class="item_width_1" v-model="formData.starLevel" placeholder="请选择" clearable>
                  <el-option v-for="item in starList" :key="item.id" :label="item.name" :value="item.id" clearable>
                  </el-option>