运费模板

src/views/hisStore/components/productAfterSalesOrder.vue

@@ -46,6 +46,21 @@
                   {{afterSales.refundAmount}}
                 </span>
             </el-descriptions-item>
+            <el-descriptions-item label="实付金额"  >
+                <span v-if="order!=null && order.payMoney!=null">
+                  ￥{{ Number(order.payMoney).toFixed(2) }}
+                </span>
+                <span v-else-if="order!=null && order.payPrice!=null">
+                  ￥{{ Number(order.payPrice).toFixed(2) }}
+                </span>
+                <span v-else>￥0.00</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="order!=null">
                   {{order.payPostage}}
@@ -182,7 +197,7 @@
         <div style="margin-top: 12px; text-align: right;" v-if="order">
           <div>订单金额：￥{{ goodsTotal.toFixed(2) }}</div>
           <div>运费金额：￥{{ (order.payPostage || 0).toFixed(2) }}</div>
-          <div>实付金额：￥{{ (goodsTotal + (order.payPostage || 0)).toFixed(2) }}</div>
+          <div>实付金额：￥{{ Number(order.payMoney != null ? order.payMoney : (order.payPrice || 0)).toFixed(2) }}</div>
         </div>
         <div style="margin-top: 20px">
           <svg-icon icon-class="marker" style="color: #606266"></svg-icon>

src/views/hisStore/components/productOrder.vue

@@ -350,9 +350,10 @@
               </span>
           </el-descriptions-item>
           <el-descriptions-item label="优惠券"  >
-              <span v-if="order!=null">
+              <span v-if="order!=null && order.couponPrice!=null">
                 ￥{{order.couponPrice.toFixed(2)}}
               </span>
+              <span v-else>￥0.00</span>
           </el-descriptions-item>
           <el-descriptions-item label="积分抵扣"  >
               <span v-if="order!=null">
@@ -408,9 +409,10 @@
               </el-button>
           </el-descriptions-item>
           <el-descriptions-item label="优惠券"  >
-              <span v-if="order!=null">
+              <span v-if="order!=null && order.couponPrice!=null">
                 ￥{{order.couponPrice.toFixed(2)}}
               </span>
+              <span v-else>￥0.00</span>
           </el-descriptions-item>
       </el-descriptions>
 

src/views/hisStore/storeAfterSales/index.vue

@@ -183,6 +183,12 @@
       <el-table-column label="会员手机号" align="center" prop="userPhone" />
       <el-table-column label="产品名称" align="center" prop="productName" :show-overflow-tooltip="true" />
       <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="refundType" />
        <el-table-column label="服务类型" align="center" prop="serviceType" >
           <template slot-scope="scope">

src/views/hisStore/storeOrder/healthStoreList.vue

@@ -525,6 +525,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"/>
@@ -1130,6 +1136,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

@@ -558,6 +558,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="auditTime" />
       <!-- <el-table-column label="支付状态" align="center" prop="paid" /> -->
@@ -1223,7 +1229,7 @@ export default {
         { key: 'payMoney', label: '实付金额', checked: true },
         { key: 'payDelivery', label: '物流代收金额', checked: true },
         { key: 'deductionPrice', label: '抵扣金额', checked: false },
-        { key: 'couponPrice', label: '优惠券金额', checked: false },
+        { key: 'couponPrice', label: '优惠券金额', checked: true },
         { key: 'createTime', label: '下单时间', checked: true },
         { key: 'payTime', label: '支付时间', checked: true },
         { key: 'deliverySendTime', label: '发货时间', checked: false },

src/views/live/components/addBatchPublish.vue

@@ -5,19 +5,21 @@
                     {{ids.length}}个
                 </el-form-item>
                 <el-form-item label="优惠券开始时间" prop="startTime">
-                <el-date-picker clearable size="small" style="width: 200px"
+                <el-date-picker clearable size="small" style="width: 220px"
                     v-model="form.startTime"
-                    type="date"
-                    value-format="yyyy-MM-dd"
-                    placeholder="选择开始时间">
+                    type="datetime"
+                    format="yyyy-MM-dd HH时"
+                    value-format="yyyy-MM-dd HH:00:00"
+                    placeholder="选择开始时间(精确到小时)">
                 </el-date-picker>
                 </el-form-item>
                 <el-form-item label="优惠券结束时间" prop="limitTime">
-                <el-date-picker clearable size="small" style="width: 200px"
+                <el-date-picker clearable size="small" style="width: 220px"
                     v-model="form.limitTime"
-                    type="date"
-                    value-format="yyyy-MM-dd"
-                    placeholder="选择结束时间">
+                    type="datetime"
+                    format="yyyy-MM-dd HH时"
+                    value-format="yyyy-MM-dd HH:00:00"
+                    placeholder="选择结束时间(精确到小时)">
                 </el-date-picker>
                 </el-form-item>
                 <el-form-item label="优惠券领取数量" prop="totalCount">

src/views/live/liveConfig/liveCoupon.vue

@@ -160,6 +160,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-column
             prop="type"
             label="优惠券类型"

src/views/live/liveCoupon/index.vue

@@ -197,19 +197,21 @@
           <el-input v-model="publishForm.title" disabled   />
         </el-form-item>
          <el-form-item label="优惠券开始时间" prop="startTime">
-          <el-date-picker clearable size="small" style="width: 200px"
+          <el-date-picker clearable size="small" style="width: 220px"
             v-model="publishForm.startTime"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="选择开始时间">
+            type="datetime"
+            format="yyyy-MM-dd HH时"
+            value-format="yyyy-MM-dd HH:00:00"
+            placeholder="选择开始时间(精确到小时)">
           </el-date-picker>
         </el-form-item>
         <el-form-item label="优惠券结束时间" prop="limitTime">
-          <el-date-picker clearable size="small" style="width: 200px"
+          <el-date-picker clearable size="small" style="width: 220px"
             v-model="publishForm.limitTime"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="选择结束时间">
+            type="datetime"
+            format="yyyy-MM-dd HH时"
+            value-format="yyyy-MM-dd HH:00:00"
+            placeholder="选择结束时间(精确到小时)">
           </el-date-picker>
         </el-form-item>
         <el-form-item label="优惠券领取数量" prop="totalCount">

src/views/live/liveCouponIssue/index.vue

@@ -53,12 +53,12 @@
       <el-table-column label="优惠券" align="center" prop="couponName" />
       <el-table-column label="优惠券领取开始时间" align="center" prop="startTime" width="180">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.startTime, '{y}-{m}-{d}') }}</span>
+          <span>{{ parseTime(scope.row.startTime, '{y}-{m}-{d} {h}时') }}</span>
         </template>
       </el-table-column>
       <el-table-column label="优惠券领取结束时间" align="center" prop="limitTime" width="180">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.limitTime, '{y}-{m}-{d}') }}</span>
+          <span>{{ parseTime(scope.row.limitTime, '{y}-{m}-{d} {h}时') }}</span>
         </template>
       </el-table-column>
       <el-table-column label="优惠券面值" align="center" prop="couponPrice" />