sunny преди 1 година
родител
ревизия
6b720a53a1
променени са 6 файла, в които са добавени 44 реда и са изтрити 148 реда
  1. 1 1
      src/api/allApi.js
  2. 1 1
      src/utils/request.js
  3. 7 117
      src/views/HomeView/MyCenter.vue
  4. 32 27
      src/views/HomeView/PointsMall.vue
  5. 1 1
      src/views/HomeView/RedeemView.vue
  6. 2 1
      src/views/HomeView/WelfareList.vue

+ 1 - 1
src/api/allApi.js

@@ -40,7 +40,7 @@ export function notice(query) {
   return request({
     url: '/admin/news/mall/getNotice',
     method: 'get',
-    data: query
+    params: query
   })
 }
 

+ 1 - 1
src/utils/request.js

@@ -25,7 +25,7 @@ service.interceptors.request.use(config => {
 service.interceptors.response.use(
   response => {
     const res = response.data
-    let errmsg = res.message;
+    let errmsg = res.errmsg;
     if (res.errno !== 0) {
       if(res.errno==503){
         MessageBox.alert('超时自动退出系统,请重新登录', '已退出', {

+ 7 - 117
src/views/HomeView/MyCenter.vue

@@ -43,7 +43,8 @@
                     </el-radio-group>
                     <div class="gainList_container content">
                         <div class="gains_wrapper">
-                            <div class="list_wrapper">
+                            <el-empty v-if="secondList.length==0" :image-size="200"></el-empty>
+                            <div v-else class="list_wrapper">
                                 <div class="list">
                                     <div v-for="(item,index) in secondList" :key="index" class="item">
                                         <div class="img-wapper">
@@ -83,7 +84,8 @@
                 <el-tab-pane label="我的礼品劵" name="third">
                     <div class="gainList_container content">
                         <div class="gains_wrapper">
-                            <div class="list_wrapper">
+                            <el-empty v-if="thirdList.length==0" :image-size="200"></el-empty>
+                            <div v-else class="list_wrapper">
                                 <div class="list">
                                     <div v-for="(item,index) in thirdList" :key="index" class="item isVirtual">
                                         <div class="img-wapper">
@@ -137,34 +139,7 @@ export default {
                 },
             ],
             secondList:[
-                {
-                    name:'蓝牙耳机',
-                    "orderId": 0,
-                    "orderSeq": "123",
-                    "orderType": 0,
-                    "orderTypeName": "商务待确认",
-                    "purchaserId": "13525451463",
-                    "deptName": "研发",
-                    "purchaser": "张三",
-                    "contact": "张三",
-                    "contactAddr": "**市",
-                    "contactEmaiL": "@qq.com",
-                    "contactPhone": "13525451463",
-                    "createTime": "2023-04-18 13:29:40",
-                    "skuId": 18,
-                    "skuCount": 1,
-                    "total": 300,
-                    "skuSeq": "123",
-                    "skuType": 0,
-                    "skuTypeName": "积分",
-                    "productAttribute": 0,
-                    "productAttributeName": "实物",
-                    "deliveryType": 0,
-                    "deliveryTypeName": "非邮寄",
-                    "imgUrl": "https://p1-juejin.byteimg.com/tos-cn-i-k3u1fbpfcp/b186b6b25bb44c3b8ee6445432b4ddf5~tplv-k3u1fbpfcp-no-mark:0:0:0:0.image?",
-                    "welfarId": null,
-                    "logs": null
-                }
+               
             ],
             secondTabPosition: 'all',
             secondTabsList: [
@@ -189,20 +164,7 @@ export default {
                     name: '作废',
                 },
             ],
-            thirdList:[
-                {
-                    title:'中秋活动礼品券',
-                    endTime:'2023-10-12',
-                    imgUrl: "https://p1-juejin.byteimg.com/tos-cn-i-k3u1fbpfcp/b186b6b25bb44c3b8ee6445432b4ddf5~tplv-k3u1fbpfcp-no-mark:0:0:0:0.image?",
-                    status:'1',
-                },
-                {
-                    title:'国庆活动礼品券',
-                    endTime:'2023-10-12',
-                    imgUrl: "https://p1-juejin.byteimg.com/tos-cn-i-k3u1fbpfcp/b186b6b25bb44c3b8ee6445432b4ddf5~tplv-k3u1fbpfcp-no-mark:0:0:0:0.image?",
-                    status:'2',
-                },
-            ],
+            thirdList:[],
             options: [{
                 value: '选项1',
                 label: '黄金糕'
@@ -221,57 +183,10 @@ export default {
             }],
             value: '',
             time: '',
-            tableData: [{
-                date: '2016-05-02',
-                name: '王小虎',
-                address: '上海市普陀区金沙江路 1518 弄'
-            }, {
-                date: '2016-05-04',
-                name: '王小虎',
-                address: '上海市普陀区金沙江路 1517 弄'
-            }, {
-                date: '2016-05-01',
-                name: '王小虎',
-                address: '上海市普陀区金沙江路 1519 弄'
-            }],
+            tableData: [],
             currentPage: 4,
             integralRules: '<p>1. 掘金小铺【公益进展】最新公益活动进展在这里,感谢掘友们的大力支持</p> <p>2. 小铺商品春夏限定4月上新啦</p>',
-            curChosed: '1',
             activeName: 'first',
-            goodsList: [
-                {
-                    id: '1',
-                    imgUrl: 'https://p1-juejin.byteimg.com/tos-cn-i-k3u1fbpfcp/b186b6b25bb44c3b8ee6445432b4ddf5~tplv-k3u1fbpfcp-no-mark:0:0:0:0.image?',
-                    name: '苹果耳机AIRPOD',
-                    location: '洛阳',
-                    price: '700w',
-                    lockStock: '0',
-                },
-                {
-                    id: '2',
-                    imgUrl: 'https://p1-juejin.byteimg.com/tos-cn-i-k3u1fbpfcp/b186b6b25bb44c3b8ee6445432b4ddf5~tplv-k3u1fbpfcp-no-mark:0:0:0:0.image?',
-                    name: '苹果耳机AIRPOD',
-                    location: '洛阳',
-                    price: '700w',
-                    lockStock: '0',
-                },
-                {
-                    id: '3',
-                    imgUrl: 'https://p1-juejin.byteimg.com/tos-cn-i-k3u1fbpfcp/b186b6b25bb44c3b8ee6445432b4ddf5~tplv-k3u1fbpfcp-no-mark:0:0:0:0.image?',
-                    name: '苹果耳机AIRPOD',
-                    location: '洛阳',
-                    price: '700w',
-                    lockStock: '0',
-                },
-                {
-                    id: '4',
-                    imgUrl: 'https://p1-juejin.byteimg.com/tos-cn-i-k3u1fbpfcp/b186b6b25bb44c3b8ee6445432b4ddf5~tplv-k3u1fbpfcp-no-mark:0:0:0:0.image?',
-                    name: '苹果耳机AIRPOD',
-                    location: '洛阳',
-                    price: '700w',
-                    lockStock: '0',
-                }
-            ]
         };
     },
     created() {
@@ -324,31 +239,6 @@ export default {
             }
             this.getSecondList(val);
         },
-        getNotice(val) {
-            notice({ noticeType: val }).then(response => {
-                console.log(response.data.data);
-                this.noticeContent = response.data.data.content
-            }).catch(() => {
-                this.goodsList = []
-            })
-        },
-        getList(val) {
-            if (val == 'goodsNotice') {
-                integralList({}).then(response => {
-                    console.log(response.data.data);
-                    this.goodsList = response.data.data
-                }).catch(() => {
-                    this.goodsList = []
-                })
-            } else {
-                festivalList({ welfareId: this.curChosed }).then(response => {
-                    console.log(response.data.data);
-                    this.goodsList = response.data.data
-                }).catch(() => {
-                    this.goodsList = []
-                })
-            }
-        },
 
         handleClick(tab, event) {
             console.log('111');

Файловите разлики са ограничени, защото са твърде много
+ 32 - 27
src/views/HomeView/PointsMall.vue


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

@@ -88,7 +88,7 @@
                             <td>
                                 <div class="prize-info">
                                     <div class="prize-img-container">
-                                        <el-image  class="lazy prize-img" :src="data.imgUrl" alt="prize" lazy></el-image>
+                                        <el-image  class="lazy prize-img" :src="data.imgUrl" alt="prize"></el-image>
                                     </div>
                                     <div class="prize-detail-info">
                                         <h3 class="title">{{ data.name }}</h3>

+ 2 - 1
src/views/HomeView/WelfareList.vue

@@ -5,7 +5,8 @@
         </div>
         <div class="list-content">
             <div class="list-container">
-                <div class="prize-list">
+                <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="图片" class="prize-img">