Merge branch 'developer' into developerA

src/main/resources/templates/product/detail.html

@@ -59,8 +59,8 @@
                     <div class="row price"><span class="l">采美价</span><i>：</i>
                         <template v-if="GLOBAL_USER_ID && GLOBAL_USER_ID>0">
                             <!--用户身份 0、个人 1、协销 2、会员机构 3、供应商 4,普通机构-->
-                            <em v-if="priceObj.priceFlag==1">￥价格未公开</em>
-                            <em v-else-if="priceObj.priceFlag==2 && priceObj.userIdentity==4">￥会员可见</em>
+                            <em v-if="priceObj.priceFlag==1" v-text="'￥价格未公开'"></em>
+                            <em v-else-if="priceObj.priceFlag==2 && priceObj.userIdentity==4" v-text="'￥会员可见'"></em>
                             <template v-else-if="(priceObj.priceFlag==0 && priceObj.userIdentity!=3) || priceObj.userIdentity==2 || (priceObj.userIdentity==3 && priceObj.shopId==GLOBAL_SHOP_ID)">
                                 <em v-if="priceObj.actStatus==1 && promotions && promotions.type==1 && promotions.mode==1" class="p">
                                     <del v-text="'￥'+parseFloat(priceObj.originalPrice).toFixed(2)"></del>
@@ -85,8 +85,8 @@
                                     <span>
                                         <em class="t"><i>价格</i><i>起订量</i></em>
                                         <em v-for="l in ladderList">
-                                            <i class="p">¥{{toFloat(l.buyPrice)}}</i>
-                                            <i>{{l.numRange}}</i>
+                                            <i class="p" v-text="'¥'+toFloat(l.buyPrice)"></i>
+                                            <i v-text="l.numRange"></i>
                                         </em>
                                         <em @click="hideThisLadder($event)" class="close">了解</em>
                                     </span>
@@ -99,11 +99,11 @@
                                 <div class="promotion mFixed">
                                     <div>
                                         <p class="t">
-                                            <em v-if="promotions.type==1 && promotions.mode==1">{{priceObj.priceFlag==1?'价格未公开':(promotions.name+'：¥'+toFloat(promotions.touchPrice))}}</em>
-                                            <em v-if="promotions.mode==2">{{promotions.name+'，满 ¥'+toFloat(promotions.touchPrice)+' 减 ¥'+toFloat(promotions.reducedPrice)}}</em>
-                                            <em v-if="promotions.mode==3">{{promotions.name+'，满 ¥'+toFloat(promotions.touchPrice)+' 赠送商品'}}</em>
+                                            <em v-if="promotions.type==1 && promotions.mode==1" v-text="priceObj.priceFlag==1?'价格未公开':(promotions.name+'：¥'+toFloat(promotions.touchPrice))"></em>
+                                            <em v-if="promotions.mode==2" v-text="promotions.name+'，满 ¥'+toFloat(promotions.touchPrice)+' 减 ¥'+toFloat(promotions.reducedPrice)"></em>
+                                            <em v-if="promotions.mode==3" v-text="promotions.name+'，满 ¥'+toFloat(promotions.touchPrice)+' 赠送商品'"></em>
                                         </p>
-                                        <p>促销时间：<em v-if="promotions.status==1">不限时</em><em v-else>{{promotions.beginTime.substr(0,10)+' ~ '+promotions.endTime.substr(0,10)}}</em></p>
+                                        <p>促销时间：<em v-if="promotions.status==1">不限时</em><em v-else v-text="promotions.beginTime.substr(0,10)+' ~ '+promotions.endTime.substr(0,10)"></em></p>
                                         <p v-if="promotions.type==2" class="r"><a class="more" :href="'/product/promotions.html?id='+promotions.id">更多凑单商品>>></a></p>
                                         <template v-if="promotions.mode==3">
                                             <p>赠品：</p>
@@ -144,7 +144,7 @@
                         <span class="l">优惠券</span>
                         <i>：</i>
                         <span class="coupon-tags">
-                            <em class="couponTag" v-for="(coupon, index) in productCoupon" :key="index">满{{ coupon.touchPrice }}减{{ coupon.couponAmount }} </em>
+                            <em class="couponTag" v-for="(coupon, index) in productCoupon" :key="index" v-text="'满'+coupon.touchPrice+'减'+coupon.couponAmount"></em>
                             <em class="couponTag-more" @click="showPopup">更多></em>
                         </span>
                     </div>
@@ -242,8 +242,8 @@
                 <div class="item" v-if="tabsIndex == 1">
                     <table>
                         <tr v-for="pa in parameters">
-                            <td> {{ pa.paramsName }}</td>
-                            <td> {{ pa.paramsContent }}</td>
+                            <td v-text="pa.paramsName"></td>
+                            <td v-text="pa.paramsContent"></td>
                         </tr>
                     </table>
                 </div>
@@ -254,8 +254,8 @@
                     <div th:utext="${product.serviceInfo}"></div>
                 </div>
                 <div class="item" v-if="tabsIndex == 3">
-                    <div><p class="tl">培训方式: <span class="sm">{{ trainingMethodText }}</span></p></div>
-                    <div><p class="tl">培训费用: <span class="sm">{{ trainingType }}</span></p></div>
+                    <div><p class="tl">培训方式: <span class="sm" v-text="trainingMethodText"></span></p></div>
+                    <div><p class="tl">培训费用: <span class="sm" v-text="trainingType"></span></p></div>
                 </div>
 <!--                <div class="item">-->
 <!--                <div style="text-align: left;margin: 10px 0">-->