From 8cb0d999629928484b17db962391ecaf190ff749 Mon Sep 17 00:00:00 2001
From: duan <1004387497@qq.com>
Date: Thu, 21 Nov 2024 10:44:36 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E5=BC=80=E7=A5=A8=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/application/index.vue | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/views/application/index.vue b/src/views/application/index.vue
index edf3745..ebb48f2 100644
--- a/src/views/application/index.vue
+++ b/src/views/application/index.vue
@@ -22,7 +22,7 @@
             </div>
         </div>
         <!-- 弹窗 -->
-        <el-dialog :title="title" :visible.sync="dialogVisible" width="30%" :before-close="handleClose">
+        <el-dialog :title="title" :visible.sync="dialogVisible" width="30%" >
             <el-form :model="forms">
                 <el-form-item label="账号：" label-width="60px">
                     <el-input v-model="forms.account" :disabled="title != '绑定数点票账号'" autocomplete="off"></el-input>
@@ -72,9 +72,6 @@ export default {
     methods: {
         upPop() {
             this.dialogVisible = true
-        },
-        handleClose() {
-
         },
         sumbitEvent() {
             if (this.forms.account) {

From f7e4fd77aa4a443c0ca7559019d6cebfeb4cc6d6 Mon Sep 17 00:00:00 2001
From: duan <1004387497@qq.com>
Date: Thu, 21 Nov 2024 14:50:55 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E8=90=A5=E9=94=80?=
 =?UTF-8?q?=E4=B8=AD=E5=BF=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/marketing/index.vue | 109 ++++++++++++++++++++++++++++++++++
 1 file changed, 109 insertions(+)
 create mode 100644 src/views/marketing/index.vue

diff --git a/src/views/marketing/index.vue b/src/views/marketing/index.vue
new file mode 100644
index 0000000..0199326
--- /dev/null
+++ b/src/views/marketing/index.vue
@@ -0,0 +1,109 @@
+<template>
+    <div class="app-container">
+        <div class="title">营销中心</div>
+        <div class="list">
+            <div class="item" v-for="item in list" :key="item.id" @click="to(item)">
+                <img :src="item.coverImg" class="icon">
+                <div class="info">
+                    <div class="name">{{ item.name }}</div>
+                    <div class="intro">
+                        {{ item.value }}
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script>
+import { appCenterGet } from "@/api/application";
+export default {
+    data() {
+        return {
+            list: [],
+        }
+    },
+    mounted() {
+        this.appCenterGet()
+    },
+    methods: {
+        // 跳转
+        to(item) {
+            localStorage.setItem('applocation', JSON.stringify(item))
+            this.$router.push({
+                name: item.absUrl
+            })
+        },
+        // 获取应用列表
+        async appCenterGet() {
+            try {
+                const res = await appCenterGet({
+                    type:'market'
+                })
+                this.list = res
+            } catch (error) {
+                console.log(error);
+            }
+        },
+
+
+    }
+}
+</script>
+
+<style scoped lang="scss">
+.title {
+    font-size: 24px;
+    font-weight: bold;
+    padding-top: 10px;
+}
+
+.list {
+    padding: 20px 0;
+    display: flex;
+    flex-wrap: wrap;
+    gap: 14px;
+
+    .item {
+        width: 400px;
+        background-color: #f5f5f5;
+        display: flex;
+        align-items: center;
+        padding: 14px;
+
+        &:hover {
+            cursor: pointer;
+
+            .info {
+                .name {
+                    color: #39D47A;
+                }
+
+                .intro {
+                    color: #39D47A;
+                }
+            }
+        }
+
+        .icon {
+            width: 40px;
+            height: 40px;
+            object-fit: cover;
+        }
+
+        .info {
+            flex: 1;
+            padding-left: 10px;
+
+            .name {
+                font-weight: bold;
+            }
+
+            .intro {
+                color: #999;
+                margin-top: 4px;
+            }
+        }
+    }
+}
+</style>
\ No newline at end of file

From f266501a7b5ae895d9935c229f40008148032678 Mon Sep 17 00:00:00 2001
From: gyq <875626088@qq.com>
Date: Fri, 22 Nov 2024 14:31:32 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E5=95=86=E5=93=81?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=A4=9A=E8=A7=84=E6=A0=BC=E6=93=8D=E4=BD=9C?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/product/index.vue | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/views/product/index.vue b/src/views/product/index.vue
index 3499939..38bbe20 100644
--- a/src/views/product/index.vue
+++ b/src/views/product/index.vue
@@ -189,11 +189,13 @@
               style="margin-left: 20px !important;">
               <el-button type="text" icon="el-icon-edit">编辑</el-button>
             </router-link> -->
-            <el-button type="text" icon="el-icon-edit" @click="toPath('/product/add_shop', scope.row)">编辑</el-button>
-            <el-popconfirm title="确定删除吗？" @confirm="delTableHandle([scope.row.id])">
-              <el-button type="text" icon="el-icon-delete" style="margin-left: 20px !important;"
-                slot="reference">删除</el-button>
-            </el-popconfirm>
+            <div style="display: flex;gap: 10px;">
+              <el-button type="text" icon="el-icon-edit" @click="toPath('/product/add_shop', scope.row)"
+                v-if="scope.row.typeEnum">编辑</el-button>
+              <el-popconfirm title="确定删除吗？" @confirm="delTableHandle([scope.row.id])">
+                <el-button type="text" icon="el-icon-delete" slot="reference">删除</el-button>
+              </el-popconfirm>
+            </div>
           </template>
         </el-table-column>
       </el-table>
@@ -244,7 +246,7 @@ import { tbProductListV2, tbShopCategoryGet, tbProductDelete, tbProductIsHot, up
 import { hasPermission } from '@/utils/limits.js'
 
 export default {
-  name:'product',
+  name: 'product',
   components: {
     BindCons,
     StockHistory