修改

src/api/allApi.js

@@ -65,7 +65,7 @@ export function integralList(query) {
   return request({
     url: '/mall-sku/integral/user/list',
     method: 'get',
-    data:query
+    params:query
   })
 }
 

src/components/SiderInfo.vue

@@ -23,7 +23,7 @@
             <div class="info">
                 <div class="info-item">
                     <div class="item-title">部门：</div>
-                    <div :title="dataInfo.deptName" class="item-content text-overflow">{{ dataInfo.deptName }}</div>
+                    <div :title="dataInfo.deptName" class="item-content" style="line-height: 1.5rem;">{{ dataInfo.deptName }}</div>
                 </div>
                 <div class="info-item">
                     <div class="item-title">积分：</div>
@@ -47,7 +47,7 @@
             <div class="info">
                 <div class="info-item">
                     <div class="item-title">部门：</div>
-                    <div :title="dataInfo.deptName" class="item-content text-overflow">{{ dataInfo.deptName }}</div>
+                    <div :title="dataInfo.deptName" class="item-content" style="line-height: 1.5rem;">{{ dataInfo.deptName }}</div>
                 </div>
                 <div class="info-item">
                     <div class="item-title">积分：</div>

src/permission.js

@@ -16,9 +16,9 @@ router.beforeEach((to, _from, next) => {
       next();
     }else{
       //本地地址
-      // location.href = 'http://192.168.100.208:8080/oneportal/login';
+      location.href = 'http://192.168.100.208:8080/oneportal/login';
       //发布地址
-      location.href = 'http://dgtcloud.dgtis.com/oneportal/login';
+      // location.href = 'http://dgtcloud.dgtis.com/oneportal/login';
     }
   }  
 })

src/utils/request.js

@@ -5,9 +5,9 @@ import { getToken } from '@/utils/auth'
 // create an axios instance
 const service = axios.create({
   //本地测试地址
-  // baseURL: 'http://192.168.100.208:9083/admin', 
+  baseURL: 'http://192.168.100.208:9083/admin', 
   //发布地址
-  baseURL: 'http://47.103.79.143:9085/admin', 
+  // baseURL: 'http://47.103.79.143:9085/admin', 
   timeout: 10000 // request timeout
 })
 
@@ -36,9 +36,9 @@ service.interceptors.response.use(
           type: 'error'
         }).then(() => {
             //本地地址
-            // location.href = 'http://192.168.100.208:8080/oneportal/login';
+            location.href = 'http://192.168.100.208:8080/oneportal/login';
             //发布地址
-            location.href = 'http://dgtcloud.dgtis.com/oneportal/login';
+            // location.href = 'http://dgtcloud.dgtis.com/oneportal/login';
         })
       }else{
         Message({

src/views/HomeView/FestiveEvents.vue

@@ -16,7 +16,8 @@
                             <p class="desc"><span>{{ item.startTime }} ~ {{ item.endTime }}</span></p>
                         </div>
                         <div class="btn-container">
-                            <button v-if="item.status==9" class="ui-btn default medium btn">活动已结束</button>
+                            <button v-if="item.status==1" class="ui-btn default medium btn">活动未开始</button>
+                            <button v-else-if="item.status==3" class="ui-btn default medium btn">活动已结束</button>
                             <button v-else @click="handleClickReceive(item.activityUrl)"
                                 class="ui-btn primary medium btn">
                                 立即参与

src/views/HomeView/Index.vue

@@ -6,7 +6,9 @@
                     <el-empty :image-size="200" v-if="bannerList.length < 1"></el-empty>
                     <el-carousel arrow="never" indicator-position="none" height="207px" trigger="click" :interval="5000" v-if="bannerList.length > 0">
                     <el-carousel-item v-for="(item, index) in bannerList" :key="index">
-                        <router-link to="/productTrials"><img style="width: 100%; height: 100%" :src="item.url" /></router-link>
+                        <!-- <router-link to="/productTrials"> -->
+                            <img style="width: 100%; height: 100%" :src="item.url" />
+                        <!-- </router-link> -->
                     </el-carousel-item>
                     </el-carousel>
                 </div>

src/views/HomeView/MsgDetail.vue

@@ -84,6 +84,7 @@ export default{
     background-size: 20px 20px;
     background-position: 50%;
     padding-top: 0!important;
+    min-height: 280px;
 }
 .markdown-body img {
     max-width: 100%;

src/views/HomeView/PointsMall.vue

@@ -26,12 +26,15 @@
         <div class="myTabs" style="background: #fff;">
             <el-tabs style="padding: 0 20px 40px 20px;" v-model="activeName" @tab-click="handleClick">
                 <el-tab-pane label="积分兑换" name="goodsNotice">
+                    <el-input clearable style="width: 200px;" size="small" v-model="goodsName" placeholder="物品名称"></el-input>
+                    <el-button size="small" style="margin-left: 30px;" type="primary" @click="getList('goodsNotice')">查询</el-button>
                     <div class="list-container">
                         <el-empty v-if="goodsList.length==0" :image-size="200"></el-empty>
                         <div v-else class="prize-list">
                             <div v-for="(item, index) in goodsList" :key="index" class="prize-card prize-item">
                                 <div class="img-container">
-                                    <img :src="item.imgUrl" alt="prize" class="prize-img">
+                                    <el-image :src="item.imgUrl" :preview-src-list="[item.imgUrl]" class="prize-img"></el-image>
+                                    <!-- <img :src="item.imgUrl" class="prize-img"> -->
                                 </div>
                                 <div class="content">
                                     <h3 :title="item.name" class="title">{{ item.name }}</h3>
@@ -53,6 +56,8 @@
                     </div>
                 </el-tab-pane>
                 <el-tab-pane label="礼品兑换" name="giftNotice">
+                    <el-input clearable style="width: 200px;" size="small" v-model="giftName" placeholder="物品名称"></el-input>
+                    <el-button size="small" style="margin-left: 30px;" type="primary" @click="getList('giftNotice')">查询</el-button>
                     <el-empty v-if="goodsList.length==0" :image-size="200"></el-empty>
                     <div v-else>
                         <div class="tab-list">
@@ -65,7 +70,8 @@
                             <div class="prize-list">
                                 <div v-for="(item, index) in goodsList" :key="index" class="prize-card prize-item">
                                     <div class="img-container">
-                                        <img :src="item.imgUrl" alt="prize" class="prize-img">
+                                        <el-image :src="item.imgUrl" :preview-src-list="[item.imgUrl]" class="prize-img"></el-image>
+                                        <!-- <img :src="item.imgUrl" alt="prize" class="prize-img"> -->
                                     </div>
                                     <div class="content">
                                         <h3 :title="item.name" class="title">{{ item.name }}</h3>
@@ -99,6 +105,8 @@ export default {
     data() {
         return {
             // tab 列表
+            goodsName:'',
+            giftName:'',
             choseList: [],
             curChosed: '',
             activeName: 'goodsNotice',
@@ -151,14 +159,14 @@ export default {
         },
         getList(val) {
             if (val == 'goodsNotice') {
-                integralList({}).then(response => {
+                integralList({name:this.goodsName}).then(response => {
                     console.log(response.data.data);
                     this.goodsList = response.data.data
                 }).catch(() => {
                     this.goodsList = []
                 })
             } else {
-                festivalList({welfareId:this.curChosed}).then(response => {
+                festivalList({welfareId:this.curChosed,name:this.giftName}).then(response => {
                     console.log(response.data.data);
                     this.goodsList = response.data.data
                 }).catch(() => {

src/views/HomeView/SignIn.vue

@@ -47,7 +47,7 @@
           <div class="info">
             <div class="info-item">
               <div class="item-title">部门：</div>
-              <div :title="dataInfo.deptName" class="item-content text-overflow">{{ dataInfo.deptName }}</div>
+              <div :title="dataInfo.deptName" class="item-content" style="line-height: 1.5rem;">{{ dataInfo.deptName }}</div>
             </div>
             <div class="info-item">
               <div class="item-title">积分：</div>
@@ -73,7 +73,7 @@
           <div class="info">
             <div class="info-item">
               <div class="item-title">部门：</div>
-              <div :title="dataInfo.deptName" class="item-content">{{ dataInfo.deptName }}</div>
+              <div :title="dataInfo.deptName" class="item-content" style="line-height: 1.5rem;">{{ dataInfo.deptName }}</div>
             </div>
             <div class="info-item">
               <div class="item-title">积分：</div>