From 80e17e0bb74ded85b72030cf8ebed11e54ebd022 Mon Sep 17 00:00:00 2001
From: huangzhen <huangzhen@rd3.ngsoft.com>
Date: Thu, 5 Sep 2024 10:55:42 +0800
Subject: [PATCH] =?UTF-8?q?update=20@=E6=A8=A1=E7=89=88=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 build/webpack.base.js                    |  3 ++-
 build/webpack.com.js                     |  2 --
 src/views/pages/comProduct/index.vue     |  4 ++--
 src/views/templates/cmsDetail/index.vue  | 10 +++++-----
 src/views/templates/cmsList/index.vue    |  9 +++++----
 src/views/templates/cmsVoucher/index.vue |  4 ++--
 6 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/build/webpack.base.js b/build/webpack.base.js
index b33fa9d..6d2c968 100644
--- a/build/webpack.base.js
+++ b/build/webpack.base.js
@@ -7,7 +7,7 @@ const HtmlWebpackPlugin = require("html-webpack-plugin");
 const { VantResolver } = require('@vant/auto-import-resolver');
 const AutoImport = require('unplugin-auto-import/webpack');
 const Components = require('unplugin-vue-components/webpack');
-
+const CssMinimizerPlugin = require("css-minimizer-webpack-plugin");
 
 module.exports = {
   entry: path.join(__dirname, '../src/main.ts'), // 入口文件
@@ -96,6 +96,7 @@ module.exports = {
         },
         extractComments: false, // 不从代码中提取注释
       }),
+      new CssMinimizerPlugin(),
     ],
   },
   resolve: {
diff --git a/build/webpack.com.js b/build/webpack.com.js
index 47b5efa..4c33869 100644
--- a/build/webpack.com.js
+++ b/build/webpack.com.js
@@ -2,7 +2,6 @@ const CompressionPlugin = require("compression-webpack-plugin");
 const path = require("path");
 const { VueLoaderPlugin } = require("vue-loader");
 const TerserPlugin = require("terser-webpack-plugin");
-const CssMinimizerPlugin = require("css-minimizer-webpack-plugin");
 
 module.exports = {
   mode: 'production', // 生产模式,会开启 tree-shaking 和 压缩代码，以及其他优化
@@ -68,7 +67,6 @@ module.exports = {
         },
         extractComments: false, // 不从代码中提取注释
       }),
-      new CssMinimizerPlugin(),
     ],
   },
   resolve: {
diff --git a/src/views/pages/comProduct/index.vue b/src/views/pages/comProduct/index.vue
index 9d52e85..d4a14f2 100644
--- a/src/views/pages/comProduct/index.vue
+++ b/src/views/pages/comProduct/index.vue
@@ -54,8 +54,8 @@
         </li>
       </template>
     </ul>
-    <!-- 遮罩 loading -->
-    <van-overlay class="overlayLoadBody" :show="overlayLoad">
+    <!-- 遮罩 loading (模版开发 通过 v-if 控制) -->
+    <van-overlay class="overlayLoadBody" :show="true" v-if="overlayLoad">
       <div class="overlayLoadBox">
         <van-loading size="24px" vertical color="#0094ff">领取中</van-loading>
       </div>
diff --git a/src/views/templates/cmsDetail/index.vue b/src/views/templates/cmsDetail/index.vue
index ec7e79c..b05f659 100644
--- a/src/views/templates/cmsDetail/index.vue
+++ b/src/views/templates/cmsDetail/index.vue
@@ -11,7 +11,7 @@
     </div>
     <p class="line"/>
     <img class="defaultInputImg" v-if="!pageData" :src="cssData.defaultInputImg" alt="">
-    <div v-if="!((pageData.degital.product_type === 2) && (pageData.degital.card_show === 2))" class="inputBox">
+    <div v-if="pageData && !((pageData.degital.product_type === 2) && (pageData.degital.card_show === 2))" class="inputBox">
       <van-cell-group inset>
         <van-field v-model="inputVal" label="账号" placeholder="请输入手机号" />
         <van-field
@@ -32,10 +32,10 @@
     <p class="line"/>
     <div
       @click="receive"
-      :class="['detailBtn', pageData.goods.err_code && 'btnPlacingAshes']"
+      :class="['detailBtn', pageData && pageData.goods.err_code && 'btnPlacingAshes']"
       :style="{ color: cssData.btnColor, backgroundColor: cssData.btnBgc }"
     >
-      {{ pageData.goods.err_code ? 'code文案' : '立即兑换' }}
+      {{ pageData && pageData.goods.err_code ? 'code文案' : '立即兑换' }}
     </div>
     <img v-if="cssData.activityDescType === 1 && cssData.bottomImg.length" class="bottomImg" :src="cssData.bottomImg[0].url" alt="">
     <img v-if="cssData.activityDescType === 2 && cssData.floatImg" @click="changePopComStatus" class="floatImg" :src="cssData.floatImg" alt="">
@@ -46,8 +46,8 @@
       <p class="title">活动规则</p>
       <div v-if="cssData.floatText" class="description-2" v-html="cssData.floatText"></div>
     </div>
-    <!-- 遮罩 loading -->
-    <van-overlay class="overlayLoadBody" :show="overlayLoad">
+    <!-- 遮罩 loading (模版开发 通过 v-if 控制) -->
+    <van-overlay class="overlayLoadBody" :show="true" v-if="overlayLoad">
       <div class="overlayLoadBox">
         <van-loading size="24px" vertical color="#0094ff">领取中</van-loading>
       </div>
diff --git a/src/views/templates/cmsList/index.vue b/src/views/templates/cmsList/index.vue
index 740c9c7..273540c 100644
--- a/src/views/templates/cmsList/index.vue
+++ b/src/views/templates/cmsList/index.vue
@@ -1,7 +1,7 @@
 <template>
   <van-loading class="pageNoneLoading_Vant" v-if="loadingStatus" size="24px" color="#0094ff" vertical>加载中...</van-loading>
   <div v-else class="cmsListWrapper">
-    <img @click="jumpBanner" class="bannerTop" :src="cssData.bannerTop.length ? cssData.bannerTop[0].url : 'https://lsxdmgoss.oss-cn-chengdu.aliyuncs.com/MarketingSystem/image/front/goodstop.png'" alt="">
+    <img @click="jumpBanner" class="bannerTop" :src="cssData.bannerTop.length ? cssData.bannerTop[0].url : cssData.bannerTopDefault" alt="">
     <div class="content">
       <div v-if="cssData.contentType === 1" class="carouselBox">
         <img v-if="!pageData" class="carouselImg" :src="cssData.carouselImg" alt="">
@@ -52,9 +52,9 @@
       </ul>
     </div>
     <div
-      @click="jumpDetail(pageData[initialSlide])"
+      @click="jumpDetail(pageData && pageData[initialSlide])"
       v-if="cssData.contentType === 1"
-      :class="['btn', pageData[initialSlide].goods.err_code && 'btnPlacingAshes']"
+      :class="['btn', pageData && pageData[initialSlide].goods.err_code && 'btnPlacingAshes']"
       :style="{ color: cssData.btnColor, backgroundColor: cssData.btnBgc }"
     >
       立即兑换
@@ -107,7 +107,8 @@ export default {
       pageData: null,
       cssData: {
         bannerUrl: '',
-        bannerTop: [{ name: '', url: 'https://lsxdmgoss.oss-cn-chengdu.aliyuncs.com/MarketingSystem/image/front/goodstop.png'}],
+        bannerTop: [],
+        bannerTopDefault: 'https://lsxdmgoss.oss-cn-chengdu.aliyuncs.com/MarketingSystem/image/front/goodstop.png',
         btnColor: 'rgb(255, 255, 255)',
         btnBgc: 'rgb(250, 205, 106)',
         contentType: 1, // 样式：1 轮播 2 列表 3 矩阵
diff --git a/src/views/templates/cmsVoucher/index.vue b/src/views/templates/cmsVoucher/index.vue
index 015c35d..4e2e348 100644
--- a/src/views/templates/cmsVoucher/index.vue
+++ b/src/views/templates/cmsVoucher/index.vue
@@ -180,8 +180,8 @@
         <p v-html="info.instruction" v-if="info.instruction"></p>
       </div>
     </div>
-    <!-- 遮罩 loading -->
-    <van-overlay class="overlayLoadBody" :show="overlayLoad">
+    <!-- 遮罩 loading (模版开发 通过 v-if 控制) -->
+    <van-overlay class="overlayLoadBody" :show="true" v-if="overlayLoad">
       <div class="overlayLoadBox">
         <van-loading size="24px" vertical color="#0094ff">领取中</van-loading>
       </div>