Просмотр исходного кода

商品添加是否显示新品上架图片

sunlupeng 1 год назад
Родитель
Сommit
73f7a6a96c

BIN
src/assets/image/newGoods.png


+ 29 - 5
src/components/SiderInfo.vue

@@ -38,13 +38,13 @@
                         <!-- <div class="label">
                             <span>{{ item.title }}</span>
                         </div> -->
-                        <div class="status" v-if="item.title == '每日答题' && item.joinStatus==1" @click="goFestiveEvents(item.joinStatus)">
+                        <div class="status" v-if="item.title == '每日答题' && item.joinStatus==1" @click="goFestiveEvents(item)">
                             <img width="88.5" height="21" src="../assets/image/day.png" alt="每日答题">
                         </div>
-                        <div class="status" v-if="item.title == '每周竞技' && item.joinStatus==1" @click="goFestiveEvents(item.joinStatus)">
+                        <div class="status" v-if="item.title == '每周竞技' && item.joinStatus==1" @click="goFestiveEvents(item)">
                             <img width="88.5" height="21" src="../assets/image/week.png" alt="每周竞技">
                         </div>
-                        <div class="status" v-if="item.title == '每月抽奖' && item.joinStatus==1" @click="goFestiveEvents(item.joinStatus)">
+                        <div class="status" v-if="item.title == '每月抽奖' && item.joinStatus==1" @click="goFestiveEvents(item)">
                             <img width="88.5" height="21" src="../assets/image/month.png" alt="每月抽奖">
                         </div>
                         <div class="status" v-if="item.joinStatus==0">
@@ -143,10 +143,34 @@ export default {
     },
     methods: {
         goFestiveEvents(val){
-            if(val==1){
+            
+            if(val.title=='每日答题'){
+                this.$router.push({
+                    path: '/home/festiveEvents/answerGame',
+                    query: {
+                        actId:val.actId
+                    }
+                });
+                return;
+            }
+            if(val.title=='每周竞技'){
+                this.$router.push({
+                    path: '/home/festiveEvents/game',
+                    query: {
+                        url: val.activityUrl,
+                        actId:val.actId
+                    }
+                });
+                return;
+            }
+            if(val.title=='每月抽奖'){
                 this.$router.push({
-                    path: '/home/festiveEvents',
+                    path: '/home/festiveEvents/drawCarouselGame',
+                    query: {
+                        actId:val.actId
+                    }
                 });
+                return;
             }
         },
         goToSignIn(){

+ 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('cf9a896371910401e3bbc23bbf8055f5');
+  // setToken('edd24581b47ee3b79ad3bbbbe1c9101c');
   const path = to.path;
   const Authorization = to.query.Authorization
   if (path.indexOf('auth') != -1 && Authorization) { 

+ 1 - 1
src/utils/request.js

@@ -6,7 +6,7 @@ let prodBaseURL = 'https://xiaoyou.dgtis.com/admin';//正式地址
 
 // let prodBaseURL = 'https://malltest.dgtis.com/admin';//阿里云地址
 
-let devBaseURL = 'https://malltest.dgtis.com/admin';//测试地址
+let devBaseURL = 'https://xiaoyou.dgtis.com/admin';//测试地址
 
 // create an axios instance
 const service = axios.create({

+ 2 - 2
src/views/HomeView/AnswerGame/GuoQingQianDao.vue

@@ -64,8 +64,8 @@ export default{
             })
     },
     clickAnswer(){
-        this.isDim = true;
-        this.isConfirmWrapper = true;
+        // this.isDim = true;
+        // this.isConfirmWrapper = true;
         MidAutumnSignIn({actId:this.actId}).then(response=>{
             this.isDim = true;
             this.isConfirmWrapper = true;

+ 10 - 1
src/views/HomeView/PointsMall.vue

@@ -97,6 +97,7 @@
                                 <div class="img-container">
                                     <el-image :src="item.imgUrl" v-if="item.imgUrl" :preview-src-list="item.imgUrls.length==0?[item.imgUrl]:item.imgUrls"
                                         class="prize-img"></el-image>
+                                    <img v-if="item.isNewSku==1" src="../../assets/image/newGoods.png" class="newGoods"></img>
                                 </div>
                                 <div class="content">
                                     <h3 :title="item.name" class="title">{{ item.name }}</h3>
@@ -151,6 +152,7 @@
                                 <div class="img-container">
                                     <el-image :src="item.imgUrl" v-if="item.imgUrl" :preview-src-list="item.imgUrls.length==0?[item.imgUrl]:item.imgUrls"
                                         class="prize-img"></el-image>
+                                    <img v-if="item.isNewSku==1" src="../../assets/image/newGoods.png" class="newGoods"></img>
                                 </div>
                                 <div class="content">
                                     <h3 :title="item.name" class="title">{{ item.name }}</h3>
@@ -662,6 +664,7 @@ button {
 }
 
 .prize-card .img-container {
+    position: relative;
     height: 159px;
     background: #f7f8fa;
     border-radius: 2px 2px 0 0;
@@ -676,7 +679,13 @@ button {
     max-height: 120px;
     max-width: 120px;
 }
-
+.prize-card .img-container .newGoods{
+    position: absolute;
+    width: 50px;
+    height: 50px;
+    bottom: 0px;
+    left: 0px;
+}
 .prize-card .content {
     padding: 0 16px;
 }