sunlupeng hace 1 año
padre
commit
04c5d9fe38

+ 2 - 2
public/index.html

@@ -21,7 +21,7 @@
     ></script>
     <% } %>
     <!-- built files will be auto injected -->
-    <script src="http://47.103.79.143:8181/ua-parser.min.js"></script>
-    <script src="http://47.103.79.143:8181/embedded.js?siteCode=freesite"></script>
+    <script src="https://kefu-resource.dgtis.com/ua-parser.min.js"></script>
+<script src="https://kefu-resource.dgtis.com/embedded.js?siteCode=freesite"></script>
   </body>
 </html>

BIN
src/assets/image/day.png


BIN
src/assets/image/month.png


BIN
src/assets/image/week.png


BIN
src/assets/image/weikaiqi.png


BIN
src/assets/image/yicanyu.png


+ 33 - 11
src/components/SiderInfo.vue

@@ -33,14 +33,25 @@
         </div>
         <div class="sidebar-block banner-block" v-for="(item,index) in activitykist" :key="index">
             <div class="banner banner">
-                <img :src="item.sideImgUrl" width="240" height="200" class="banner-image">
+                <img :src="item.sideImgUrl" class="banner-image">
                     <div class="ctrl-box">
-                        <div class="label">
+                        <!-- <div class="label">
                             <span>{{ item.title }}</span>
+                        </div> -->
+                        <div class="status" v-if="item.title == '每日答题' && item.joinStatus==1" @click="goFestiveEvents(item.joinStatus)">
+                            <img width="118" height="28" src="../assets/image/day.png" alt="每日答题">
                         </div>
-                        <div class="status" @click="goFestiveEvents(item.joinStatus)">
-                            <span v-if="item.joinStatus==1" style="color: #1e80ff;">未参加</span>
-                            <span v-else>{{ item.joinStatus==2?'已参加':'未开启' }}</span>
+                        <div class="status" v-if="item.title == '每周竞技' && item.joinStatus==1" @click="goFestiveEvents(item.joinStatus)">
+                            <img width="118" height="28" src="../assets/image/week.png" alt="每周竞技">
+                        </div>
+                        <div class="status" v-if="item.title == '每月抽奖' && item.joinStatus==1" @click="goFestiveEvents(item.joinStatus)">
+                            <img width="118" height="28" src="../assets/image/month.png" alt="每月抽奖">
+                        </div>
+                        <div class="status" v-if="item.joinStatus==0">
+                            <img width="118" height="28" src="../assets/image/weikaiqi.png" alt="未开启">
+                        </div>
+                        <div class="status" v-if="item.joinStatus==2">
+                            <img width="118" height="28" src="../assets/image/yicanyu.png" alt="已参与">
                         </div>
                     </div>
                 </div>
@@ -66,12 +77,23 @@
                 <div class="banner banner">
                     <img :src="item.sideImgUrl" width="240" height="200" class="banner-image">
                     <div class="ctrl-box">
-                        <div class="label">
+                        <!-- <div class="label">
                             <span>{{ item.title }}</span>
+                        </div> -->
+                        <div class="status" v-if="item.title == '每日答题' && item.joinStatus==1" @click="goFestiveEvents(item.joinStatus)">
+                            <img width="118" height="28" src="../assets/image/day.png" alt="每日答题">
+                        </div>
+                        <div class="status" v-if="item.title == '每周竞技' && item.joinStatus==1" @click="goFestiveEvents(item.joinStatus)">
+                            <img width="118" height="28" src="../assets/image/week.png" alt="每周竞技">
                         </div>
-                        <div class="status" @click="goFestiveEvents(item.joinStatus)">
-                            <span v-if="item.joinStatus==1" style="color: #1e80ff;">未参加</span>
-                            <span v-else>{{ item.joinStatus==2?'已参加':'未开启' }}</span>
+                        <div class="status" v-if="item.title == '每月抽奖' && item.joinStatus==1" @click="goFestiveEvents(item.joinStatus)">
+                            <img width="118" height="28" src="../assets/image/month.png" alt="每月抽奖">
+                        </div>
+                        <div class="status" v-if="item.joinStatus==0">
+                            <img width="118" height="28" src="../assets/image/weikaiqi.png" alt="未开启">
+                        </div>
+                        <div class="status" v-if="item.joinStatus==2">
+                            <img width="118" height="28" src="../assets/image/yicanyu.png" alt="已参与">
                         </div>
                     </div>
                 </div>
@@ -377,7 +399,7 @@ a {
     position: absolute;
     left: 20px;
     top: 70px;
-    line-height: 32px;
+    /* line-height: 32px;
     height: 32px;
     width: 100px;
     text-align: center;
@@ -387,7 +409,7 @@ a {
     background-color: #fff;
     border: 1px solid #fff;
     border-radius: 6px;
-    font-weight: 500;
+    font-weight: 500; */
 }
 /* .banner .ctrl-box .label:hover {
     background-color: rgba(0, 0, 0, .4);

+ 1 - 1
src/permission.js

@@ -4,7 +4,7 @@ import { getToken, setToken } from '@/utils/auth' // getToken from cookie
 import { lockStatus,unlock } from "@/api/allApi";
 //路由跳转之前
 router.beforeEach((to, _from, next) => {
-  // setToken('daa8211a2224d6addda4eda860d38c53');
+  setToken('6c024900bee174e8628a0016513d7cd6');
   const path = to.path;
   const Authorization = to.query.Authorization
   if (path.indexOf('auth') != -1 && Authorization) { 

+ 2 - 2
src/views/HomeView/GoodsDetail.vue

@@ -12,13 +12,13 @@
                 <div class="goods-image">
                     <!-- 左侧大图-->
                     <div class="middle" ref="target">
-                        <img style="width: 100%;" :src="imageList[activeIndex]" alt="" />
+                        <img style=" width: 400px;height: 400px;" :src="imageList[activeIndex]" alt="" />
                     </div>
                     <!-- 小图列表 -->
                     <ul class="small">
                         <li v-for="(img, i) in imageList" :key="i" v-if="i<5" @mouseenter="enterhandler(i)"
                             :class="{ active: i == activeIndex }">
-                            <img style="width: 100%;" :src="img" alt="" />
+                            <img style="width: 68px;height: 68px;" :src="img" alt="" />
                         </li>
                     </ul>
                 </div>

+ 2 - 2
src/views/HomeView/RedeemView.vue

@@ -13,13 +13,13 @@
                 <div class="goods-image">
                     <!-- 左侧大图-->
                     <div class="middle" ref="target">
-                        <img style="width: 100%;" :src="imageList[activeIndex]" alt="" />
+                        <img style="width: 400px;height: 400px;" :src="imageList[activeIndex]" alt="" />
                     </div>
                     <!-- 小图列表 -->
                     <ul class="small">
                         <li v-for="(img, i) in imageList" :key="i" v-if="i<5" @mouseenter="enterhandler(i)"
                             :class="{ active: i == activeIndex }">
-                            <img style="width: 100%;" :src="img" alt="" />
+                            <img style="width: 68px;height: 68px;" :src="img" alt="" />
                         </li>
                     </ul>
                 </div>