Merge remote-tracking branch 'origin/developer' into developerD

backup.sql

@@ -719,3 +719,16 @@ ALTER TABLE `cm_brand_club_feedback`
 
 
 -- =================================== 2022年6月 认证通ross版本 end =========================================
+-- =================================== 2022年7月 认证通日常sql start =========================================
+CREATE TABLE `cm_brand_product_type_param` (
+    `id` INT NOT NULL AUTO_INCREMENT,
+    `productTypeId` INT NULL COMMENT '设备分类id',
+    `name` VARCHAR(20) NULL COMMENT '参数名称',
+    `content` VARCHAR(250) NULL COMMENT '参数内容',
+    PRIMARY KEY (`id`))
+COMMENT = '认证设备分类参数';
+
+ALTER TABLE `cm_brand_product_type`
+    ADD COLUMN `brandId` INT NULL COMMENT '品牌id' AFTER `authUserId`;
+
+-- =================================== 2022年6月 认证通日常sql end =========================================

src/main/resources/templates/index.html

@@ -144,34 +144,34 @@
                             <div class="swiper-wrapper section_page_main type_08 recommendBox-wrapper recommendBox-wrapperHot clear mfw section_8 max">
                                 <!-- 商品/图片 列表 -->
                                 <a :href="'/product-'+pros.product.productId+'.html'" class="swiper-slide page_main_item hot ad_04" target="_blank" v-for="pros in floor.floorImageList4">
-                                    <img class="page_main_image" src="/img/base/placeholder.png" :data-original="pros.product.image" :alt="pros.name">
-                                    <div class="page_main_type" v-if="pros && pros.product.productType && pros.product.productType === 2">医疗器械</div>
+                                    <img class="page_main_image" src="/img/base/placeholder.png" :data-original="pros.product.image" :alt="pros.product && pros.product.name">
+                                    <div class="page_main_type" v-if="pros.product && pros.product.productType === 2">医疗器械</div>
                                     <div class="page_main_text">
-                                        <span class="tag" v-if="pros.product.beautyActFlag == 1">美博会</span>
-                                        <span v-text="pros.product.name"></span>
+                                        <span class="tag" v-if="pros.product && pros.product.beautyActFlag == 1">美博会</span>
+                                        <span v-text="pros.product && pros.product.name"></span>
                                     </div>
                                     <div class="page_main_price">
                                         <!-- 商品价格 -->
                                         <div class="main_price_text">
                                             <!-- 正常商品 -->
-                                            <template v-if="pros.product.productCategory == 1">
+                                            <template v-if="pros.product && pros.product.productCategory == 1">
                                                 <div class="price_text_tag">
-                                                    <p class="couponTag" v-if="pros.product.couponsLogo">优惠券</p>
+                                                    <p class="couponTag" v-if="pros.product && pros.product.couponsLogo">优惠券</p>
                                                     <!--超级会员价格标签 svipProductFlag 1:超级会员优惠商品 0 不是商超级会员优惠商品-->
-                                                    <template v-if="pros.product.svipProductFlag === 1">
+                                                    <template v-if="pros.product && pros.product.svipProductFlag === 1">
                                                         <div class="svip-tag">
                                                             <div class="svip-icon">SVIP</div>
                                                             <!-- 公开价格 && (个人机构 || 资质机构) && 开通SVIP 可查看价格-->
                                                             <template v-if="showVipPriceTag(pros.product)">
                                                                 <div class="svip-price">
-                                                                    <span v-html="pros.product.svipPriceTag"></span>
+                                                                    <span v-html="pros.product && pros.product.svipPriceTag"></span>
                                                                 </div>
                                                             </template>
                                                         </div>
                                                     </template>
                                                     <template v-else>
-                                                        <p class="listTag" v-if="pros.product.actStatus ==1 && pros.product.promotions">
-                                                            <span v-text="pros.promotions.name"></span>
+                                                        <p class="listTag" v-if="pros.product.actStatus == 1 && pros.product.promotions">
+                                                            <span v-text="pros.product.promotions && pros.product.promotions.name"></span>
                                                             <template v-if="PromotionsFormat(pros.product.promotions)">
                                                                 <!--单品优惠:优惠价-->
                                                                 <span class="price_unit">:￥</span><span class="price_num">{{ pros.product.price | NumFormat }}</span>
@@ -181,15 +181,15 @@
                                                 </div>
                                                 <div class="main_price_login">
                                                     <!--priceFlag 0公开价格 1不公开价格 2仅对会员机构公开-->
-                                                    <template v-if="pros.product.priceFlag == 1">
+                                                    <template v-if="pros.product && pros.product.priceFlag == 1">
                                                         <em class="price_grade"><span>￥</span>价格未公开</em>
                                                     </template>
                                                     <!--机构价仅会员可见 && 用户是普通机构-->
-                                                    <template v-else-if="pros.product.priceFlag==2 && GLOBAL_USER_IDENTITY === 4 && GLOBAL_VIP_FLAG!=1">
+                                                    <template v-else-if="pros.product && pros.product.priceFlag==2 && GLOBAL_USER_IDENTITY === 4 && GLOBAL_VIP_FLAG!=1">
                                                         <em class="price_grade_club"><span>￥</span>会员可见</em>
                                                     </template>
                                                     <!--机构价仅医美机构可见-->
-                                                    <template v-else-if="pros.product.priceFlag==3 && (GLOBAL_CLUB_TYPE !=1)">
+                                                    <template v-else-if="pros.product && pros.product.priceFlag==3 && (GLOBAL_CLUB_TYPE !=1)">
                                                         <em class="price_grade_club red"><span>￥</span>仅医美机构可见</em>
                                                     </template>
                                                     <!-- 资质机构 || (价格全部机构可见 && 普通机构) || (供应商 && 商品为供应商下的商品) || 超级会员用户 -->

src/main/resources/templates/pay/caimei-paylist.html

@@ -87,13 +87,13 @@
                         待付金额：<span class="red">￥{{ paidAmount | NumFormat }}</span>
                     </div>
                     <div class="content-viw">
-                        开户行：<span>广发银行（深圳科苑支行）</span>
+                        开户行：<span>华夏银行深圳分行营业部</span>
                     </div>
                     <div class="content-viw">
-                        户名：<span>周仁声</span>
+                        户名：<span>周倩如</span>
                     </div>
                     <div class="content-viw">
-                        银行卡号：<span>6214 6202 2800 0415 461</span>
+                        银行卡号：<span>6230 2100 9221 2400</span>
                     </div>
                     <div class="content-viw">
                         订单标识：<span v-text="orderIdentificationId"></span><span class="copy" @click="copyOrderBtnSubmitFn">复制</span>

src/main/resources/templates/pay/caimei-payunder.html

@@ -29,13 +29,13 @@
             <div class="pay-bank">
                 <div class="pay-bank-content">
                     <div class="content-viw">
-                        开户行：<span>广发银行（深圳科苑支行）</span>
+                        开户行：<span>华夏银行深圳分行营业部</span>
                     </div>
                     <div class="content-viw">
-                        户名：<span>周仁声</span>
+                        户名：<span>周倩如</span>
                     </div>
                     <div class="content-viw">
-                        银行卡号：<span>6214 6202 2800 0415 461</span>
+                        银行卡号：<span>6230 2100 9221 2400</span>
                     </div>
                     <div class="content-viw">
                         订单标识：<span v-text="orderIdentificationId"></span><span class="copy" @click="copyOrderBtnSubmitFn">复制</span>