From 576a60fdc8632b8c8e402ec2eb0e8ff4cf2b208f Mon Sep 17 00:00:00 2001
From: shane <88386378@qq.com>
Date: Thu, 8 Jul 2021 16:45:56 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B9=BF=E5=91=8A=E5=A2=9E=E5=8A=A0=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../property/addAdvert/addAdvert.html          | 18 ++++++++++++++++++
 .../components/property/addAdvert/addAdvert.js | 11 +++++++++++
 .../property/editAdvert/editAdvert.html        | 18 ++++++++++++++++++
 .../property/editAdvert/editAdvert.js          | 11 +++++++++++
 .../property/advertManage/advertManage.html    |  4 +++-
 .../property/advertManage/advertManage.js      |  1 +
 6 files changed, 62 insertions(+), 1 deletion(-)

diff --git a/public/components/property/addAdvert/addAdvert.html b/public/components/property/addAdvert/addAdvert.html
index 1503beef9..bcc77be95 100755
--- a/public/components/property/addAdvert/addAdvert.html
+++ b/public/components/property/addAdvert/addAdvert.html
@@ -41,6 +41,24 @@
                                     </select>
                                 </div>
                             </div>
+                            <div class="form-group row">
+                                <label class="col-sm-2 col-form-label">发布类型</label>
+                                <div class="col-sm-10">
+                                    <select class="custom-select" v-model="addAdvertInfo.advertType">
+                                        <option selected disabled value="">必填，请选择发布类型</option>
+                                        <option value="1">站内</option>
+                                        <option value="2">站外</option>
+                                        <option value="3">不跳转</option>
+                                    </select>
+                                </div>
+                            </div>
+                            <div class="form-group row">
+                                <label class="col-sm-2 col-form-label">跳转路径</label>
+                                <div class="col-sm-10">
+                                    <input v-model="addAdvertInfo.pageUrl" type="text" placeholder="请填写跳转路径"
+                                           class="form-control">
+                                </div>
+                            </div>
                             <div class="form-group row">
                                 <label class="col-sm-2 col-form-label">播放顺序</label>
                                 <div class="col-sm-10">
diff --git a/public/components/property/addAdvert/addAdvert.js b/public/components/property/addAdvert/addAdvert.js
index 693065f9c..8dfdb67ec 100755
--- a/public/components/property/addAdvert/addAdvert.js
+++ b/public/components/property/addAdvert/addAdvert.js
@@ -16,6 +16,8 @@
                 startTime: '',
                 endTime: '',
                 floorId: '',
+                advertType: '',
+                pageUrl: '',
                 floorNum: '',
                 floorName: '',
                 unitId: '',
@@ -135,6 +137,13 @@
                             errInfo: "投放位置格式错误"
                         },
                     ],
+                    'addAdvertInfo.advertType': [
+                        {
+                            limit: "required",
+                            param: "",
+                            errInfo: "发布类型不能为空"
+                        }
+                    ],
                     'addAdvertInfo.seq': [
                         {
                             limit: "required",
@@ -226,6 +235,8 @@
                     seq: '',
                     startTime: '',
                     endTime: '',
+                    advertType: '',
+                    pageUrl: '',
                     floorId: '',
                     floorNum: '',
                     floorName: '',
diff --git a/public/components/property/editAdvert/editAdvert.html b/public/components/property/editAdvert/editAdvert.html
index 83c26087b..3fe79a6b2 100755
--- a/public/components/property/editAdvert/editAdvert.html
+++ b/public/components/property/editAdvert/editAdvert.html
@@ -42,6 +42,24 @@
                                     </select>
                                 </div>
                             </div>
+                            <div class="form-group row">
+                                <label class="col-sm-2 col-form-label">发布类型</label>
+                                <div class="col-sm-10">
+                                    <select class="custom-select" v-model="editAdvertInfo.advertType">
+                                        <option selected disabled value="">必填，请选择发布类型</option>
+                                        <option value="1">站内</option>
+                                        <option value="2">站外</option>
+                                        <option value="3">不跳转</option>
+                                    </select>
+                                </div>
+                            </div>
+                            <div class="form-group row">
+                                <label class="col-sm-2 col-form-label">跳转路径</label>
+                                <div class="col-sm-10">
+                                    <input v-model="editAdvertInfo.pageUrl" type="text" placeholder="请填写跳转路径"
+                                           class="form-control">
+                                </div>
+                            </div>
                             <div class="form-group row">
                                 <label class="col-sm-2 col-form-label">播放顺序</label>
                                 <div class="col-sm-10">
diff --git a/public/components/property/editAdvert/editAdvert.js b/public/components/property/editAdvert/editAdvert.js
index 69c835f0d..fd9c009f4 100755
--- a/public/components/property/editAdvert/editAdvert.js
+++ b/public/components/property/editAdvert/editAdvert.js
@@ -11,6 +11,8 @@
                 locationObjName: '',
                 state: '',
                 seq: '',
+                advertType: '',
+                pageUrl: '',
                 startTime: '',
                 endTime: '',
                 floorId: '',
@@ -127,6 +129,13 @@
                             errInfo: "广告分类格式错误"
                         },
                     ],
+                    'editAdvertInfo.advertType': [
+                        {
+                            limit: "required",
+                            param: "",
+                            errInfo: "发布类型不能为空"
+                        }
+                    ],
                     'editAdvertInfo.locationTypeCd': [
                         {
                             limit: "required",
@@ -259,6 +268,8 @@
                     locationObjId: '',
                     state: '',
                     seq: '',
+                    advertType: '',
+                    pageUrl: '',
                     startTime: '',
                     endTime: '',
                     floorId: '',
diff --git a/public/pages/property/advertManage/advertManage.html b/public/pages/property/advertManage/advertManage.html
index 06cf1fde8..7ea5baf5f 100755
--- a/public/pages/property/advertManage/advertManage.html
+++ b/public/pages/property/advertManage/advertManage.html
@@ -70,17 +70,19 @@
                                 <th class="text-center">广告ID</th>
                                 <th class="text-center">广告名称</th>
                                 <th class="text-center">投放位置</th>
+                                <th class="text-center">发布类型</th>
                                 <th class="text-center">投放时间</th>
                                 <th class="text-center">结束时间</th>
                                 <th class="text-center">创建时间</th>
                                 <th class="text-center">操作</th>
                             </tr>
                         </thead>
-                        <tbody>
+                        <tbody> 
                             <tr v-for="advert in advertManageInfo.adverts">
                                 <td class="text-center">{{advert.advertId}}</td>
                                 <td class="text-center">{{advert.adName}}</td>
                                 <td class="text-center">{{advert.locationObjName}}</td>
+                                <td class="text-center">{{advertManageInfo.advertTypeName[advert.advertType]}}</td>
                                 <td class="text-center">{{advert.startTime}}</td>
                                 <td class="text-center">{{advert.endTime}}</td>
                                 <td class="text-center">{{advert.createTime}}</td>
diff --git a/public/pages/property/advertManage/advertManage.js b/public/pages/property/advertManage/advertManage.js
index 81dc3a792..d32c035e7 100755
--- a/public/pages/property/advertManage/advertManage.js
+++ b/public/pages/property/advertManage/advertManage.js
@@ -7,6 +7,7 @@
     vc.extends({
         data: {
             advertManageInfo: {
+                advertTypeName:["","站内","站外","不跳转"],
                 adverts: [],
                 total: 0,
                 records: 1,