运费模板

src/views/hisStore/components/productAfterSalesOrder.vue

@@ -43,6 +43,12 @@
                   {{afterSales.refundAmount}}
                 </span>
             </el-descriptions-item>
+            <el-descriptions-item label="优惠券"  >
+                <span v-if="order!=null && order.couponPrice!=null">
+                  ￥{{ Number(order.couponPrice).toFixed(2) }}
+                </span>
+                <span v-else>￥0.00</span>
+            </el-descriptions-item>
             <el-descriptions-item label="申请类型"  >
                 <span v-if="afterSales!=null">
                   <el-tag prop="serviceType" v-for="(item, index) in serviceTypeOptions"    v-if="afterSales.serviceType==item.dictValue">{{item.dictLabel}}</el-tag>

src/views/hisStore/components/productOrder.vue

@@ -317,6 +317,7 @@
               <span v-if="order!=null">
                 ￥{{ order.couponPrice.toFixed(2) }}
               </span>
+              <span v-else>￥0.00</span>
           </el-descriptions-item>
           <el-descriptions-item label="积分抵扣">
               <span v-if="order!=null">
@@ -369,6 +370,7 @@
             <span v-if="order!=null">
               ￥{{ order.couponPrice.toFixed(2) }}
             </span>
+            <span v-else>￥0.00</span>
           </el-descriptions-item>
         </el-descriptions>
 

src/views/hisStore/storeAfterSales/list.vue

@@ -125,6 +125,12 @@
       <el-table-column label="所属员工" align="center" prop="companyUserNickName" />
       <el-table-column label="会员手机号" align="center" prop="userPhone" />
       <el-table-column label="退款金额" align="center" prop="refundAmount" />
+      <el-table-column label="优惠券" align="center" prop="couponPrice" width="100px">
+        <template slot-scope="scope">
+          <span v-if="scope.row.couponPrice!=null">{{ Number(scope.row.couponPrice).toFixed(2) }}</span>
+          <span v-else>0.00</span>
+        </template>
+      </el-table-column>
        <el-table-column label="退款类型" align="center" prop="serviceType" >
           <template slot-scope="scope">
               <div prop="serviceType" v-for="(item, index) in serviceTypeOptions"    v-if="scope.row.serviceType==item.dictValue">{{item.dictLabel}}</div>

src/views/hisStore/storeOrder/healthStoreList.vue

@@ -517,6 +517,12 @@
           <span v-if="scope.row.payDelivery!=null">{{ scope.row.payDelivery.toFixed(2) }}</span>
         </template>
       </el-table-column>
+      <el-table-column label="优惠券" align="center" prop="couponPrice" width="100px">
+        <template slot-scope="scope">
+          <span v-if="scope.row.couponPrice!=null">{{ scope.row.couponPrice.toFixed(2) }}</span>
+          <span v-else>0.00</span>
+        </template>
+      </el-table-column>
       <el-table-column label="成本价格" align="center" prop="cost" v-if="showFinanceTableField"/>
       <!-- <el-table-column label="结算价格" align="center" prop="fprice"  v-if="showFinanceTableField"/> -->
        <el-table-column label="实付金额" align="center" prop="payMoney"  v-if="showFinanceTableField"/>
@@ -1122,6 +1128,7 @@ export default {
         { key: 'userPhone', label: '收货人电话', checked: true },
         { key: 'userAddress', label: '详细地址', checked: true },
         { key: 'payMoney', label: '实收金额', checked: true },
+        { key: 'couponPrice', label: '优惠券金额', checked: true },
         { key: 'payRemain', label: '物流代收金额', checked: false },
         { key: 'createTime', label: '下单时间', checked: true },
         { key: 'payTime', label: '支付时间', checked: true },

src/views/hisStore/storeOrder/index.vue

@@ -529,6 +529,12 @@
               <span v-if="scope.row.payPrice!=null">{{scope.row.payDelivery.toFixed(2)}}</span>
           </template>
       </el-table-column>
+      <el-table-column label="优惠券" align="center" prop="couponPrice" width="100px">
+          <template slot-scope="scope">
+              <span v-if="scope.row.couponPrice!=null">{{scope.row.couponPrice.toFixed(2)}}</span>
+              <span v-else>0.00</span>
+          </template>
+      </el-table-column>
       <el-table-column label="下单时间" align="center" prop="createTime" />
       <!-- <el-table-column label="支付状态" align="center" prop="paid" /> -->
       <el-table-column label="支付时间" align="center" prop="payTime" width="180" />
@@ -1137,6 +1143,7 @@ export default {
         { key: 'cateName', label: '商品分类', checked: false },
         { key: 'userNickName', label: '微信昵称', checked: false },
         { key: 'payMoney', label: '实收金额', checked: true },
+        { key: 'couponPrice', label: '优惠券金额', checked: true },
         { key: 'payRemain', label: '物流代收金额', checked: false },
         { key: 'payType', label: '支付方式', checked: true },
         { key: 'createTime', label: '下单时间', checked: true },

src/views/live/liveConfig/liveCoupon.vue

@@ -153,6 +153,16 @@
             label="优惠券有效时间"
             class-name="clickable-column"
           ></el-table-column>
+          <el-table-column
+            prop="limitTime"
+            label="领取结束时间"
+            width="160"
+            class-name="clickable-column"
+          >
+            <template slot-scope="scope">
+              <span>{{ scope.row.limitTime ? parseTime(scope.row.limitTime, '{y}-{m}-{d} {h}时') : '-' }}</span>
+            </template>
+          </el-table-column>
         </el-table>
 
         <pagination