From b22ad88f37a822e04e8b4472598adb15516080d6 Mon Sep 17 00:00:00 2001
From: paulGao <paulgao0831@gmail.com>
Date: Thu, 21 Apr 2022 14:58:18 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=A7=BB=E5=8A=A8=E7=AB=AF?=
 =?UTF-8?q?=E6=A5=BC=E5=B1=82=E8=A3=85=E4=BF=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../product/promotion/-promotion-details.vue  |  2 +-
 pages/tabbar/home/template/tpl.js             |  8 ++++++++
 pages/tabbar/home/template/tpl_menu.vue       | 20 ++++++++++++-------
 pages/tabbar/home/template/tpl_title.vue      |  8 +++++++-
 4 files changed, 29 insertions(+), 9 deletions(-)

diff --git a/pages/product/product/promotion/-promotion-details.vue b/pages/product/product/promotion/-promotion-details.vue
index 4ff0e08..d9a52e1 100644
--- a/pages/product/product/promotion/-promotion-details.vue
+++ b/pages/product/product/promotion/-promotion-details.vue
@@ -15,7 +15,7 @@
               <span v-if="res[prom].freeFreightFlag">赠送包邮服务</span>
             </span>
           </div>
-          <div class="res_prom_item" v-if="res[prom].fullRate">
+          <div class="res_prom_item" v-if="res[prom].fullRate && res[prom].fullRateFlag">
             <u-tag text="打折" type="error"></u-tag>
             <span class="pro-text"
               >满{{ res[prom].fullMoney }}元，立享<span class="price"
diff --git a/pages/tabbar/home/template/tpl.js b/pages/tabbar/home/template/tpl.js
index 8b74eb0..e0d8f23 100644
--- a/pages/tabbar/home/template/tpl.js
+++ b/pages/tabbar/home/template/tpl.js
@@ -102,6 +102,14 @@ export function modelNavigateTo(item) {
             url: `/pages/product/shopList`,
           });
           break;
+        case "外部链接":
+          // #ifdef H5
+          window.location.href = val.url;
+          // #endif
+          // #ifdef APP-PLUS
+          plus.runtime.openURL(val.url) //不需要拼接\
+          // #endif
+          break;
       }
 
       break;
diff --git a/pages/tabbar/home/template/tpl_menu.vue b/pages/tabbar/home/template/tpl_menu.vue
index 29f6b6e..d57f44d 100644
--- a/pages/tabbar/home/template/tpl_menu.vue
+++ b/pages/tabbar/home/template/tpl_menu.vue
@@ -1,7 +1,12 @@
 <template>
   <div class="layout">
     <div class="menu-list">
-      <div class="menu-item" @click="modelNavigateTo(item)" v-for="(item, index) in res.list" :key="index">
+      <div
+        class="menu-item"
+        @click="modelNavigateTo(item)"
+        v-for="(item, index) in res.list"
+        :key="index"
+      >
         <div>
           <u-image
             width="88rpx"
@@ -9,7 +14,7 @@
             class="menu-img"
             :src="item.img"
           >
-           <u-loading slot="loading"></u-loading>
+            <u-loading slot="loading"></u-loading>
           </u-image>
         </div>
         <div class="menu-title">{{ item.title }}</div>
@@ -18,15 +23,15 @@
   </div>
 </template>
 <script>
-import {modelNavigateTo} from './tpl'
+import { modelNavigateTo } from "./tpl";
 export default {
-  title:"五列菜单",
+  title: "五列菜单",
   props: ["res"],
-  data () {
+  data() {
     return {
       modelNavigateTo,
-    }
-  }
+    };
+  },
 };
 </script>
 <style lang="scss" scoped>
@@ -34,6 +39,7 @@ export default {
 .menu-list {
   display: flex;
   align-items: center;
+  justify-content: space-between;
   flex-wrap: wrap;
 
   > .menu-item {
diff --git a/pages/tabbar/home/template/tpl_title.vue b/pages/tabbar/home/template/tpl_title.vue
index 2825837..8fdc8c0 100644
--- a/pages/tabbar/home/template/tpl_title.vue
+++ b/pages/tabbar/home/template/tpl_title.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="layout" :style="{textAlign: res.list[0].textAlign}">
+  <div class="layout" :style="{textAlign: res.list[0].textAlign}"  @click="modelNavigateTo(res.list[0])" >
     <div class="background" :style="{ backgroundColor: res.list[0].bk_color}">
       <div class="title" :style="{ color: res.list[0].color }">
         {{ res.list[0].title }}
@@ -13,9 +13,15 @@
 
 
 <script>
+import { modelNavigateTo } from "./tpl";
 export default {
   title: "标题栏",
   props: ["res"],
+  data() {
+    return {
+      modelNavigateTo,
+    };
+  },
   mounted() {},
 };
 </script>