Merge branch 'featrue-social' into feature

11 months ago · cdbc804a2a
6 changed files with 118 additions and 14 deletions
--- a/src/views/modules/volunteer/SiteManagement/add.vue
+++ b/src/views/modules/volunteer/SiteManagement/add.vue
@ -108,11 +108,11 @@
   export default {
      data() {
          return {
+            searchOptions:[],
            optionstype: [
                      { value: 0, label: "实践站" },
                      { value: 1, label: "实践点" },
                      { value: 2, label: "其它" },
-
                ],
              formData:
              {
@ -125,7 +125,6 @@
                  attrs: [],
                  type: "",
                  name: "",
-            
                  address: "",//地址
                  longitude: this.$store.state.user.longitude, //经度
                  latitude: this.$store.state.user.latitude,//纬度
@ -244,10 +243,11 @@
                  format: item.response.data.fileName.split('.').pop(),
                  url: item.response.data.url
              })) : []; // 当e为空时清空fileList
+              console.log(this.fileList, 'sssssb');
              if (e.length > 0) {
-                  console.log(this.fileList,"this.fileList");
+                  console.log(this.fileList,"this.fileListdfgdfg");
                  this.formData.attrs=this.fileList;
-                 console.log(this.formData.attrs,"this.fileList");
+                 console.log(this.formData.attrs,"this.fileListdggfd");
                
              } else {
                  this.formData.coverPic = '';
@ -372,7 +372,6 @@
                  this.formData.address = data.address;
                //   this.searchValue=data.address
                  console.log(this.formData.address," this.formData.address ");
-                  
                  this.searchValue = data.address
                  this.searchOptions = []
                  // console.log('data,this.searchValue ', this.searchValue)
@ -383,12 +382,9 @@
          async remoteMethod(query) {
              console.log(query, "sfsvsdv");
              if (query !== '') {
-  
                  const { msg, data } = await map.searchNearby(query);
                  this.resultList = []
-   
                  if (msg == "success" && data.resultList && data.resultList.length > 0) {
-   
                      if (data.resultList && data.resultList.length > 0) {
                          this.resultList = data.resultList
                          console.log(this.resultList, "this.resultList");
@ -418,6 +414,7 @@
              map.setMarker(lonlat[1], lonlat[0]);
              this.formData.latitude = lonlat[1];
              this.formData.longitude = lonlat[0];
+              this.formData.address = selPosition.address + selPosition.name
              this.searchValue = selPosition.address + selPosition.name
          },
   
--- a/src/views/modules/volunteer/VolManage/index.vue
+++ b/src/views/modules/volunteer/VolManage/index.vue
@ -114,6 +114,7 @@
        tableData: [],
        Record:false,
        fmData:[],
+        volunteerOrgList:[]
      };
    },
    computed: {
@ -128,9 +129,12 @@
  
    },
    mounted() {
+      this.getvolunteerOrg();
      this.getTableData();
+
    },
    methods: {
+         
      //查询列表
      async getTableData() {
        // const url = "http://yapi.elinkservice.cn/mock/245/gov/project/project/project-list";
@ -147,6 +151,7 @@
          console.log("列表请求成功！！！！！！！！！！！！！！");
          this.total = data.total || 0;
          this.tableData = data.list
+
        } else {
        }
      },
--- a/src/views/modules/volunteer/VolManage/see.vue
+++ b/src/views/modules/volunteer/VolManage/see.vue
@ -48,7 +48,8 @@ export default {
        pageSize:10,
        pageNo:1,
        total:0,
-        fmData:{}
+        fmData:{},
+        volunteerOrgList:[]
        
    };
  },
@ -59,6 +60,26 @@ export default {
    }
  },
  methods: {
+               //查看组织列表
+               async getvolunteerOrg() {
+        // const url = "http://yapi.elinkservice.cn/mock/245/gov/project/project/project-list";
+        const url = "/voluntary/volunteerOrg/page";
+
+        let params={
+            pageNo:1,
+            pageSize: 100,
+            orgName:"",
+            serviceType:""
+        }
+        const { data, code, msg } = await requestPost(url,params);
+        if (code === 0) {
+          console.log("列表请求成功！！！！！！！！！！！！！！");
+          this.total = data.total || 0;
+          this.volunteerOrgList = data.list
+          
+        } else {
+        }
+      },
      //查询列表
      async getTableData() {
        // const url = "http://yapi.elinkservice.cn/mock/245/gov/project/project/project-list";
@ -82,6 +103,7 @@ export default {
      },
  },
  created() {
+   this.getvolunteerOrg()
    console.log(this.list,"list");
    this.fmData=this.list
    this.getTableData()
--- a/src/views/modules/volunteer/pointsRedemption/Select.vue
+++ b/src/views/modules/volunteer/pointsRedemption/Select.vue
@ -7,6 +7,9 @@
            <el-form-item label="标题">
                {{ tableData.awardName }}
            </el-form-item>
+            <el-form-item label="级别">
+                {{ tableData.awardLevelName }}
+            </el-form-item>
            <el-form-item label="金额">
               {{ tableData.worthAmount}}
            </el-form-item>
@ -16,6 +19,20 @@
            <el-form-item label="兑换积分">
               {{ tableData.points}}
            </el-form-item>
+            <el-form-item label="星级专属">
+               {{ tableData.starLevelName}}
+            </el-form-item>
+            <el-form-item label="展示图"  v-if="tableData.classKey=='hwjh'">
+               <img  width="100px" height="100px" :src="tableData.imgAttachments[0].url?tableData.imgAttachments[0].url:''" ></img>
+    
+            </el-form-item>
+            <el-form-item label="可兑换次数">
+               {{ tableData.redeemTimesEveryone?tableData.redeemTimesEveryone:'不限'}}
+            </el-form-item>
+            <el-form-item label="有效期至">
+               {{ tableData.expireTime }}
+              
+            </el-form-item>
            <el-form-item label="有效期至">
               {{ tableData.expireTime }}
              
@ -46,6 +63,48 @@ export default {
   name: "see",
    data() {
    return {
+      // serviceLevelList: [
+      //       {
+      //          id: 3,
+      //          name: "市区级"
+      //       },
+      //       {
+      //          id: 4,
+      //          name: "街道级"
+      //       },
+      //       {
+      //          id: 5,
+      //          name: "社区级"
+      //       },
+      //       {
+      //          id: 99,
+      //          name: "市场运营"
+      //       }
+
+      //    ],
+      starList: [
+            {
+               id: 1,
+               name: "一星"
+            },
+            {
+               id: 2,
+               name: "二星"
+            },
+            {
+               id: 3,
+               name: "三星"
+            },
+            {
+               id: 4,
+               name: "四星"
+            },
+            {
+               id: 5,
+               name: "五星"
+            }
+
+         ],
        labelPosition: 'right',
        tableData: [],
        awardId:""
@ -80,6 +139,19 @@ export default {
        if(res.code===0){
          console.log("列表请求成功！！！！！！！！！！！！！！");
          console.log(res.data, "data");
+         //  res.data.starLevel.forEach((item, index) => {
+         
+            this.starList.forEach((item) => {
+              if(item.id==res.data.starLevel){
+                res.data.starLevelName=item.name
+              }
+          })
+         //  this.serviceLevelList.forEach((item) => {
+         //      if(item.id==res.data.awardLevel){
+         //        res.data.awardLevelName=item.name
+         //      }
+         //  })
+         // })
          this.tableData = res.data
          console.log(this.tableData, "this.tableData");
        }
--- a/src/views/modules/volunteer/pointsRedemption/add.vue
+++ b/src/views/modules/volunteer/pointsRedemption/add.vue
@ -79,7 +79,7 @@
            </el-col>
            <el-col :span="12">
               <el-form-item label="级别" required label-width="150px">
-                  <el-select class="item_width_1" v-model="formData.Servicelevel" placeholder="请选择">
+                  <el-select class="item_width_1" v-model="formData.awardLevel" placeholder="请选择">
                     <el-option v-for="item in serviceLevelList" :key="item.id" :label="item.name" :value="item.id">
                     </el-option>
                  </el-select>
@ -192,7 +192,7 @@ export default {
         fileList:[],
         formData: {
            imgAttachments:[],
-            Servicelevel:"",
+            awardLevel:"",
            starLevel:"",
            redeemTimesEveryone:'',
            level:'',
@ -345,6 +345,10 @@ export default {
            this.$message.error('请选择分类');
            return;
         }
+         if (this.formData.awardLevel == '') {
+            this.$message.error('请选择级别');
+            return;
+         }
         if (this.formData.awardName == '') {
            this.$message.error('请输入标题');
            return;
@ -354,7 +358,7 @@ export default {
            return;
         }
         if (this.formData.redeemerOrgId == '') {
-            this.$message.error('请选择发布乏味');
+            this.$message.error('请选择发布范围');
            return;
         }
         const url = "/voluntary/pointsAward/admin/add";
--- a/src/views/modules/volunteer/pointsRedemption/update.vue
+++ b/src/views/modules/volunteer/pointsRedemption/update.vue
@ -79,7 +79,7 @@
        </el-col>
        <el-col :span="12">
           <el-form-item label="级别" required label-width="150px">
-              <el-select class="item_width_1" v-model="formData.Servicelevel" placeholder="请选择">
+              <el-select class="item_width_1" v-model="formData.awardLevel" placeholder="请选择">
                 <el-option v-for="item in serviceLevelList" :key="item.id" :label="item.name" :value="item.id">
                 </el-option>
              </el-select>
@ -183,9 +183,10 @@ import UploadImage from '@/views/modules/plugins/rent/upload-image.vue'

         ],
       formData:{
+         awardLevel:"",
         imgAttachments:[],
         Servicelevel:"",
-         starLevel:"",
+           starLevel:"",
           redeemTimesEveryone:'',
           classKey: "",
           awardName: "",
@ -285,6 +286,9 @@ import UploadImage from '@/views/modules/plugins/rent/upload-image.vue'
          }else{
            this.radio='2'
          }
+          if(this.formData.starLevel==0){
+            this.formData.starLevel=''
+          }
          this.fileList=[{fileUrl:this.formData.imgAttachments[0].url}]