Jelajahi Sumber

Merge branch 'develop_cuxiao' of http://git.chelingzhu.com/jianguan-web/jg-ocs-html into develop_cuxiao

lilei 1 tahun lalu
induk
melakukan
6d8a5b180f

+ 1 - 1
src/views/promotionRulesManagement/dealerPromotions/detail.vue

@@ -62,7 +62,7 @@
               <span v-else-if="record.gateType==='MIN_AMOUNT'">
                 购买门槛产品满最低金额{{ record.gateAmount }}元,不限制配额。
               </span>
-              <span v-else>购买满{{ record.gateAmount }}元门槛产品,可使用 {{ record.quotaAmount }}元配额,采购规则中的正价商品</span>
+              <span v-else>购买满{{ record.gateAmount }}元门槛产品,可使用 {{ record.quotaAmount }}元配额,采购规则中的{{ record.promotionRuleType!='PROMO_PROD'?'正价':'特价' }}商品</span>
             </div>
             <span v-else>--</span>
           </template>

+ 1 - 1
src/views/promotionRulesManagement/dealerPromotions/detailModal.vue

@@ -23,7 +23,7 @@
           <div v-if="form.gateFlag==='1'">
             <span v-if="form.gateType==='RATIO_AMOUNT'">购买门槛产品金额{{ form.gateAmount*100 }}%作为配额 </span>
             <span v-if="form.gateType==='MIN_AMOUNT'">购买门槛产品满最低金额{{ form.gateAmount }}元,不限制配额。</span>
-            <span v-if="form.gateType==='FIXED_AMOUNT'">购买满{{ form.gateAmount }}元门槛产品,可使用{{ form.quotaAmount }}元配额,采购规则中的正价商品(配额算销售额)</span>
+            <span v-if="form.gateType==='FIXED_AMOUNT'">购买满{{ form.gateAmount }}元门槛产品,可使用{{ form.quotaAmount }}元配额,采购规则中的{{ form.promotionRuleType!='PROMO_PROD'?'正价':'特价' }}商品(配额算销售额)</span>
           </div>
         </a-form-model-item>
         <!-- 买产品送产品 -->

+ 2 - 2
src/views/promotionRulesManagement/dealerPromotions/specialOfferModal.vue

@@ -46,7 +46,7 @@
               allowClear></v-select>
             <div v-if="form.gateType==='RATIO_AMOUNT'">
               购买门槛产品金额 <a-input-number v-model="form.gateAmount" :min="0" :max="999999" :precision="2" size="small"/> %作为配额
-              <a-tooltip title="如:填写100%,则购买10000元门槛产品,可享受10000配额购买价产品,根据门槛金额动态调整配额">
+              <a-tooltip title="如:填写100%,则购买10000元门槛产品,可享受10000配额购买价产品,根据门槛金额动态调整配额">
                 <a-icon type="question-circle" theme="filled" :style="{ fontSize: '14px', color: 'gray' }"/>
               </a-tooltip>
             </div>
@@ -58,7 +58,7 @@
               <a-input-number v-model="form.gateAmount" :max="999999" :min="0" :precision="2" size="small"/>
               元门槛产品,可使用
               <a-input-number v-model="form.quotaAmount" :max="999999" :min="0" :precision="2" size="small"/>
-              元配额,采购规则中的价商品(配额算销售额)
+              元配额,采购规则中的价商品(配额算销售额)
             </div>
           </div>
         </a-form-model-item>