git stashMerge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop-ui

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

buyer/src/pages/promotion/seckill.vue

@@ -44,7 +44,7 @@
         </div>
         <div class="goods-seckill-btn" :class="{'goods-seckill-btn-gray' : nowHour < list[currIndex].timeLine}">{{nowHour >= list[currIndex].timeLine ? '立即抢购' : '即将开始'}}</div>
         <div class="goods-show-num">
-          已售<Progress style="width:110px"  class="ml_10" :percent="Math.ceil(item.salesNum/item.quantity)" />
+          已售<Progress style="width:110px"  class="ml_10" :percent="Math.ceil(item.salesNum/(item.quantity+item.salesNum))" />
         </div>
         <div class="goods-show-seller">
           <span>{{ item.storeName }}</span>

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",

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",