From 2619f38ee19f2eb683a1e9d517a8fe32ac95b86b Mon Sep 17 00:00:00 2001
From: sugar1569 <sugar1569@vip.qq.com>
Date: Fri, 13 May 2022 15:06:13 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=89=8D=E7=AB=AF=E6=BA=90=E7=A0=81?=
 =?UTF-8?q?=E3=80=91=E4=BF=AE=E6=94=B9=E6=B6=88=E6=81=AF=E9=80=9A=E7=9F=A5?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/pages/setting/notification/index.vue  | 101 +++++++++---------
 1 file changed, 51 insertions(+), 50 deletions(-)

diff --git a/template/admin/src/pages/setting/notification/index.vue b/template/admin/src/pages/setting/notification/index.vue
index cf6f46648..4e1776bf5 100644
--- a/template/admin/src/pages/setting/notification/index.vue
+++ b/template/admin/src/pages/setting/notification/index.vue
@@ -2,7 +2,56 @@
   <div class="message">
     <div class="i-layout-page-header">
         <span class="ivu-page-header-title">{{ $route.meta.title }}</span>
-        <div>
+        <div class="ivu-mt">
+          <Alert v-if="industry" type="info" banner closable>
+            <template slot="desc" >
+              <div>
+                <p>
+                  1、请在微信后台设置模版消息主营行业：{{
+                    industry.primary_industry.first_class
+                        ? industry.primary_industry.first_class + "||"
+                        : industry.primary_industry
+                  }}
+                  {{
+                    industry.primary_industry.second_class
+                        ? industry.primary_industry.second_class
+                        : ""
+                  }}
+                  ||  副营行业：{{
+                    industry.secondary_industry.first_class
+                        ? industry.secondary_industry.first_class + "||"
+                        : industry.secondary_industry
+                  }}
+                  {{
+                    industry.secondary_industry.second_class
+                        ? industry.secondary_industry.second_class
+                        : ""
+                  }}
+                </p>
+                <p>2、点击同步按钮会自动在微信后台添加模版消息</p>
+              </div>
+            </template>
+          </Alert>
+          <Row type="flex" class="mb20">
+            <Col v-bind="grid">
+              <Button
+                  v-auth="['app-wechat-template-sync']"
+                  icon="md-list"
+                  type="success"
+                  @click="routineTemplate"
+                  style="margin-left: 20px"
+              >同步小程序订阅消息</Button
+              >
+              <Button
+                  v-auth="['app-wechat-template-sync']"
+                  icon="md-list"
+                  type="success"
+                  @click="wechatTemplate"
+                  style="margin-left: 20px"
+              >同步微信模版消息</Button
+              >
+            </Col>
+          </Row>
           <Tabs v-model="currentTab" @on-click="changeTab">
             <TabPane
               :label="item.label"
@@ -16,55 +65,7 @@
       <div class="ivu-row">
 
         <Card :bordered="false" dis-hover class="ivu-mt">
-          <Alert v-if="industry && currentTab == 1" type="info" banner closable>
-            <template slot="desc" >
-              <div>
-                <p>
-               1、请在微信后台设置模版消息主营行业：{{
-                  industry.primary_industry.first_class
-                      ? industry.primary_industry.first_class + "||"
-                      : industry.primary_industry
-                }}
-                {{
-                  industry.primary_industry.second_class
-                      ? industry.primary_industry.second_class
-                      : ""
-                }}
-                  ||  副营行业：{{
-                  industry.secondary_industry.first_class
-                      ? industry.secondary_industry.first_class + "||"
-                      : industry.secondary_industry
-                }}
-                {{
-                  industry.secondary_industry.second_class
-                      ? industry.secondary_industry.second_class
-                      : ""
-                }}
-                </p>
-                <p>2、点击同步按钮会自动在微信后台添加模版消息</p>
-              </div>
-            </template>
-          </Alert>
-          <Row type="flex" class="mb20" v-if="currentTab == 1">
-            <Col v-bind="grid">
-              <Button
-                v-auth="['app-wechat-template-sync']"
-                icon="md-list"
-                type="success"
-                @click="routineTemplate"
-                style="margin-left: 20px"
-                >同步小程序订阅消息</Button
-              >
-              <Button
-                v-auth="['app-wechat-template-sync']"
-                icon="md-list"
-                type="success"
-                @click="wechatTemplate"
-                style="margin-left: 20px"
-                >同步微信模版消息</Button
-              >
-            </Col>
-          </Row>
+
 
           <Table
             :columns="currentTab == 1 ?columns : columns2"