Browse Source

修改bug

chenrui 11 tháng trước cách đây
mục cha
commit
a4e5ccf1b9

+ 2 - 2
src/views/promotionManagement/promotionInfo/detailModal.vue

@@ -70,10 +70,10 @@
             </a-form-model-item>
             <a-form-model-item label="券有效期" prop="validType" >
               <span>
-                {{ form.promoRule&&form.promoRule.validType?form.promoRule.validType==='FIXED'?'固定日期':'期限时间':'--' }}
+                {{ form.promoRule&&form.promoRule.validType?form.promoRule.validType==='FIXED'?'固定日期':'领取后,立即生效,':'--' }}
               </span>
               <span class="timeBox" v-if="form.promoRule.validType==='FIXED'">{{ form.promoRule.validStartDate }}~{{ form.promoRule.validEndDate }}</span>
-              <span class="timeBox" v-else>领取后,立即生效,有效期{{ form.promoRule.validDays }}天</span>
+              <span class="timeBox" v-else>有效期{{ form.promoRule.validDays }}天</span>
             </a-form-model-item>
             <a-form-model-item label="券适用范围" prop="range" >
               全部产品

+ 1 - 1
src/views/promotionManagement/promotionInfo/edit.vue

@@ -222,7 +222,7 @@
                   :disabled-date="disabledDate"
                   :placeholder="['开始时间', '结束时间']" />
                 <span style="width:40%;margin-left:10px;" v-show="sellForm.validType==='LIMIT'">
-                  领取后,立即生效,有效期<a-input-number
+                  有效期<a-input-number
                     style="margin:0 5px;"
                     v-model="sellForm.validDays"
                     :step="1"

+ 1 - 1
src/views/salesManagement/salesQuery/detail.vue

@@ -66,7 +66,7 @@
               折后总售价:<strong>{{ detailData&&(detailData.discountedAmount || detailData.discountedAmount==0) ? toThousands(detailData.discountedAmount) : '--' }}</strong>;
               折扣:<strong>{{ detailData&&(detailData.discountRate || detailData.discountRate==0) ? detailData.discountRate+'%' : '--' }}</strong>;
               折扣金额:<strong>{{ detailData&&(detailData.discountAmount || detailData.discountAmount==0) ? toThousands(detailData.discountAmount) : '--' }}</strong>;
-              <span v-if="detailData&&detailData.sourceType&&detailData.sourceType==='XPRH_PURCHASE'"> 已发放券金额:<strong>{{ detailData&&(detailData.totalGiveAmount || detailData.totalGiveAmount==0) ? toThousands(detailData.totalGiveAmount) : '--' }}</strong>;</span>
+              <span v-if="detailData&&detailData.sourceType&&detailData.sourceType==='XPRH_PURCHASE'"> 券金额:<strong>{{ detailData&&(detailData.totalGiveAmount || detailData.totalGiveAmount==0) ? toThousands(detailData.totalGiveAmount) : '--' }}</strong>;</span>
             </div>
             <div>
               <a-checkbox v-model="showCost" v-if="$hasPermissions('M_ShowAllCost')" id="salesQuery-cost">成本价</a-checkbox>