Merge branch 'master' of http://git.dgtis.com/sunlupeng/pointsMall into pre

public/drawCarousel.html

@@ -182,9 +182,9 @@
     <div class="rules" @click="showRules">
       抽奖<br>规则
     </div>
-    <div class="recordBtn" @click="showRecordList">
+    <!-- <div class="recordBtn" @click="showRecordList">
       获奖<br>名单
-    </div>
+    </div> -->
     <!-- <div class="recordBtn" @click="showRecordList">
       <img src="https://xiaoyou.dgtis.com/images/image/2023/09/06/lt1vbg426idwq725ysdm.png" alt="抽奖记录">
     </div> -->
@@ -435,9 +435,9 @@
           return new Promise((resolve, reject) => {
             $.ajax({
               type: type,
-              url: 'http://192.168.100.208:9083/admin' + url, //本地
+              // url: 'http://192.168.100.208:9083/admin' + url, //本地
               // url: "http://47.103.79.143:9085/admin" + url,//测试环境
-              // url:"https://xiaoyou.dgtis.com/admin"+ url,//正式环境
+              url:"https://xiaoyou.dgtis.com/admin"+ url,//正式环境
               data: data,
               contentType: type === 'post' ? false : true,
               processData: type === 'post' ? false : true,

src/main.js

@@ -9,9 +9,9 @@ import './assets/css/global.css';
 import './assets/icon/iconfont.css';
 import './permission' // permission control
 
-// const prodUrl = 'https://xiaoyou.dgtis.com/admin/storage/create';//正式地址
+const prodUrl = 'https://xiaoyou.dgtis.com/admin/storage/create';//正式地址
 
-const prodUrl = 'http://47.103.79.143:9085/admin/storage/create';//阿里云地址
+// const prodUrl = 'http://47.103.79.143:9085/admin/storage/create';//阿里云地址
 
 const devUrl = 'http://47.103.79.143:9085/admin/storage/create';//测试地址
 

src/permission.js

@@ -33,9 +33,9 @@ router.beforeEach((to, _from, next) => {
       
     }else{
       
-      // const prodHref = 'http://dgt.dgtis.com/oneportal/login';//正式地址
+      const prodHref = 'http://dgt.dgtis.com/oneportal/login';//正式地址
 
-      const prodHref = 'http://dgtcloud.dgtis.com/oneportal/login';//阿里云地址
+      // const prodHref = 'http://dgtcloud.dgtis.com/oneportal/login';//阿里云地址
       
       const devHref = 'http://192.168.100.208:8080/oneportal/login';//测试地址
 

src/utils/request.js

@@ -2,9 +2,9 @@ import axios from 'axios'
 import { Message, MessageBox } from 'element-ui'
 import { getToken } from '@/utils/auth'
 
-// let prodBaseURL = 'https://xiaoyou.dgtis.com/admin';//正式地址
+let prodBaseURL = 'https://xiaoyou.dgtis.com/admin';//正式地址
 
-let prodBaseURL = 'http://47.103.79.143:9085/admin';//阿里云地址
+// let prodBaseURL = 'http://47.103.79.143:9085/admin';//阿里云地址
 
 let devBaseURL = 'http://192.168.100.208:9083/admin';//测试地址
 
@@ -40,9 +40,9 @@ service.interceptors.response.use(
           type: 'error'
         }).then(() => {
             
-            // const prodHref = 'http://dgt.dgtis.com/oneportal/login';//正式地址
+            const prodHref = 'http://dgt.dgtis.com/oneportal/login';//正式地址
 
-            const prodHref = 'http://dgtcloud.dgtis.com/oneportal/login';//阿里云地址
+            // const prodHref = 'http://dgtcloud.dgtis.com/oneportal/login';//阿里云地址
           
             const devHref = 'http://192.168.100.208:8080/oneportal/login'; //测试地址
 

src/views/HomeView/AnswerGame/AnswerGame.vue

@@ -117,6 +117,8 @@ export default{
                 console.log(response.data.data);
                 this.questions = response.data.data.questions;
                 this.roomId = response.data.data.roomId;
+                this.timerCountdown();
+                this.isShowItem = true;
             })
     },
     getHomeData(){
@@ -189,8 +191,6 @@ export default{
     },
     clickAnswer(){
         this.getQuestionList();
-            this.isShowItem = true;
-            this.timerCountdown();
         // if(this.top){
         //     this.$message({
         //         message: '今日已答题！',

src/views/HomeView/EarnPoints.vue

@@ -90,7 +90,6 @@
                   <el-table :data="props.row.logs" border size="mini">
                     <el-table-column min-width="120" align="center" prop="auditor" label="处理人"></el-table-column>
                     <el-table-column min-width="160" align="center" prop="comment" label="处理结果"></el-table-column>
-                    <!-- <el-table-column min-width="120" align="center" prop="statusName" label="状态"></el-table-column> -->
                     <el-table-column min-width="180" align="center" prop="createTime" label="处理时间"></el-table-column>
                   </el-table>
                   <span style="color: #1e80ff;cursor: pointer;" slot="reference">{{ props.row.statusName }}</span>
@@ -105,7 +104,6 @@
               </template>
             </el-table-column>
           </el-table>
-          <!-- 分页 -->
           <div class="myPage">
             <el-pagination @size-change="handleSizeChangeCite" @current-change="handleCurrentChangeCite"
               :current-page="currentPage" :page-sizes="[10, 20, 30, 40]" :page-size="10"

src/views/HomeView/MyCenter.vue

@@ -144,7 +144,7 @@
                         type="date"
                         placeholder="答题日期">
                         </el-date-picker>
-                        <el-button size="small" style="margin-right: 30px;" type="primary" @click="handleFilter">查询</el-button>
+                        <el-button size="small" style="margin-right: 30px;" type="primary" @click="handleFilterAnswerList">查询</el-button>
                         <el-empty v-if="answerList.length==0" :image-size="200"></el-empty>
                         <div v-else>
                             <el-table size="small" :data="answerList" border style="margin-top: 30px;width: 960px">
@@ -155,7 +155,7 @@
                                 <el-table-column align="center" prop="rownum" label="当前排名"></el-table-column>
                             </el-table>
                             <div class="myPage">
-                                <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
+                                <el-pagination @size-change="handleSizeChangeAnswerList" @current-change="handleCurrentChangeAnswerList"
                                     :current-page="currentPage" :page-sizes="[10, 20, 30, 40]" :page-size="10"
                                     layout="total, sizes, prev, pager, next, jumper" :total="total">
                                 </el-pagination>
@@ -172,7 +172,7 @@
                         type="date"
                         placeholder="抽奖日期">
                         </el-date-picker>
-                        <el-button size="small" style="margin-right: 30px;" type="primary" @click="handleFilter">查询</el-button>
+                        <el-button size="small" style="margin-right: 30px;" type="primary" @click="handleFilterPrizeList">查询</el-button>
                         <el-empty v-if="prizeList.length==0" :image-size="200"></el-empty>
                         <div v-else>
                             <el-table size="small" :data="prizeList" border style="margin-top: 30px;width: 960px">
@@ -182,7 +182,7 @@
                                 <el-table-column align="center" prop="prizeName" label="奖品"></el-table-column>
                             </el-table>
                             <div class="myPage">
-                                <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
+                                <el-pagination @size-change="handleSizeChangePrizeList" @current-change="handleCurrentChangePrizeList"
                                     :current-page="currentPage" :page-sizes="[10, 20, 30, 40]" :page-size="10"
                                     layout="total, sizes, prev, pager, next, jumper" :total="total">
                                 </el-pagination>
@@ -348,19 +348,37 @@ export default {
         handleFilter() {
             this.listQuery.page = 1
             this.getFirstList();
-            this.getAnswerList();
-            this.getPrizeList();
         },
         handleSizeChange(val) {
             this.listQuery.limit = val;
             this.getFirstList();
-            this.getAnswerList();
-            this.getPrizeList();
         },
         handleCurrentChange(val) {
             this.listQuery.page = val;
             this.getFirstList();
+        },
+        handleFilterAnswerList() {
+            this.listQuery.page = 1
+            this.getAnswerList();
+        },
+        handleSizeChangeAnswerList(val) {
+            this.listQuery.limit = val;
             this.getAnswerList();
+        },
+        handleCurrentChangeAnswerList(val) {
+            this.listQuery.page = val;
+            this.getAnswerList();
+        },
+        handleFilterPrizeList() {
+            this.listQuery.page = 1
+            this.getPrizeList();
+        },
+        handleSizeChangePrizeList(val) {
+            this.listQuery.limit = val;
+            this.getPrizeList();
+        },
+        handleCurrentChangePrizeList(val) {
+            this.listQuery.page = val;
             this.getPrizeList();
         },
         handleClickTabs(val) {

src/views/HomeView/PointsMall.vue

@@ -68,7 +68,8 @@
                                         class="prize-img"></el-image>
                                 </div>
                                 <div class="content">
-                                    <h3 style="color: #1e80ff;" :title="item.name" class="title" @click="handleClickGood(item.skuId)">{{ item.name }}</h3>
+                                    <h3 :title="item.name" class="title">{{ item.name }}</h3>
+                                    <!-- <h3 style="color: #1e80ff;" :title="item.name" class="title" @click="handleClickGood(item.skuId)">{{ item.name }}</h3> -->
                                     <p class="desc"><span v-if="item.deliveryTypeName">{{ item.deliveryTypeName }}</span></p>
                                     <p class="redeem-info">
                                         <span title="积分" class="price">
@@ -121,7 +122,8 @@
                                         class="prize-img"></el-image>
                                 </div>
                                 <div class="content">
-                                    <h3 style="color: #1e80ff;" :title="item.name" class="title" @click="handleClickGood(item.skuId)">{{ item.name }}</h3>
+                                    <h3 :title="item.name" class="title">{{ item.name }}</h3>
+                                    <!-- <h3 style="color: #1e80ff;" :title="item.name" class="title" @click="handleClickGood(item.skuId)">{{ item.name }}</h3> -->
                                     <p class="desc"><span v-if="item.deliveryTypeName">{{ item.deliveryTypeName }}</span></p>
                                     <p class="redeem-info">
                                         <span title="福利券" class="price">

src/views/HomeView/RedeemView.vue

@@ -109,7 +109,8 @@
                                             class="prize-img"></el-image>
                                     </div>
                                     <div class="prize-detail-info">
-                                        <h3 style="color: #1e80ff;" class="title" @click="handleClickGood(data.skuDesc)">{{ data.name }}</h3>
+                                        <h3 class="title">{{ data.name }}</h3>
+                                        <!-- <h3 style="color: #1e80ff;" class="title" @click="handleClickGood(data.skuDesc)">{{ data.name }}</h3> -->
                                         <!-- <p class="desc">
                                             <span v-if="data.location">{{ data.location }}</span>
                                         </p> -->
@@ -173,7 +174,8 @@
                                             class="prize-img"></el-image>
                                     </div>
                                     <div class="prize-detail-info">
-                                        <h3 style="color: #1e80ff;" class="title" @click="handleClickGood(data.skuDesc)">{{ data.name }}</h3>
+                                        <h3 class="title">{{ data.name }}</h3>
+                                        <!-- <h3 style="color: #1e80ff;" class="title" @click="handleClickGood(data.skuDesc)">{{ data.name }}</h3> -->
                                         <!-- <p class="desc">
                                             <span v-if="data.location">{{ data.location }}</span>
                                         </p> -->

src/views/HomeView/SignIn.vue

@@ -17,7 +17,7 @@
               <div class="figure-card">
                 <div class="figure" style="color: #1e80ff;">{{ continuousSignCount?continuousSignCount:0 }}</div>
                 <div class="attention">
-                  <span class="text">本月连续签到天数</span>
+                  <span class="text">本月工作日签到天数</span>
                 </div>
               </div>
               <div class="figure-card">