diff --git a/build.sh b/build.sh
new file mode 100644
index 00000000..bd6b5059
--- /dev/null
+++ b/build.sh
@@ -0,0 +1,20 @@
+#代码目录
+code_path=$PWD
+
+git checkout master
+git pull
+
+cd ${code_path}/manager
+rm -rf ./dist
+yarn install
+yarn build
+
+cd ${code_path}/seller
+rm -rf ./dist
+yarn install
+yarn build
+
+cd ${code_path}/buyer
+rm -rf ./dist
+yarn install
+yarn build
\ No newline at end of file
diff --git a/buyer/src/pages/promotion/seckill.vue b/buyer/src/pages/promotion/seckill.vue
index 76ba4993..49b7291f 100644
--- a/buyer/src/pages/promotion/seckill.vue
+++ b/buyer/src/pages/promotion/seckill.vue
@@ -44,7 +44,7 @@
{{nowHour >= list[currIndex].timeLine ? '立即抢购' : '即将开始'}}
{{ item.storeName }}
diff --git a/manager/src/views/seller/bill/bill-detail.vue b/manager/src/views/seller/bill/bill-detail.vue
index bba01586..40f12827 100644
--- a/manager/src/views/seller/bill/bill-detail.vue
+++ b/manager/src/views/seller/bill/bill-detail.vue
@@ -246,6 +246,24 @@ export default {
},
},
+ {
+ title: "平台优惠券补贴金额",
+ key: "siteCouponCommission",
+ render: (h, params) => {
+ if(params.row.siteCouponCommission == null){
+ return h(
+ "div",
+ "-"
+ );
+ }else{
+ return h(
+ "div",
+ this.$options.filters.unitPrice(params.row.siteCouponCommission, "¥")
+ );
+ }
+
+ },
+ },
{
title: "分销金额",
key: "distributionRebate",
diff --git a/seller/src/views/shop/bill/billDetail.vue b/seller/src/views/shop/bill/billDetail.vue
index c2e086c9..c16d6024 100644
--- a/seller/src/views/shop/bill/billDetail.vue
+++ b/seller/src/views/shop/bill/billDetail.vue
@@ -248,6 +248,24 @@ export default {
}
},
},
+ {
+ title: "平台优惠券补贴金额",
+ key: "siteCouponCommission",
+ render: (h, params) => {
+ if(params.row.siteCouponCommission == null){
+ return h(
+ "div",
+ "-"
+ );
+ }else{
+ return h(
+ "div",
+ this.$options.filters.unitPrice(params.row.siteCouponCommission, "¥")
+ );
+ }
+
+ },
+ },
{
title: "分销金额",
key: "distributionRebate",