diff --git a/buyer/src/api/crowdfunding.js b/buyer/src/api/crowdfunding.js
new file mode 100644
index 0000000000000000000000000000000000000000..3781802e92575398c05fe548c8a8b52d86f59a1b
--- /dev/null
+++ b/buyer/src/api/crowdfunding.js
@@ -0,0 +1,65 @@
+/**
+ * 众筹活动相关API
+ */
+
+import request from '@/utils/request'
+
+/**
+ * 分页列表
+ * @param params
+ */
+export function getList(params) {
+  return request({
+    url: '/buyer/promotions/crowdfunding',
+    method: 'get',
+    params
+  })
+}
+
+/**
+ * 查询详情
+ * @param id
+ */
+export function getDetail(id) {
+  return request({
+    url: `/buyer/promotions/crowdfunding/${id}`,
+    method: 'get'
+  })
+}
+
+/**
+ * 立即购买
+ * @param crowdfunding_id
+ * @param num
+ */
+export function buy(crowdfunding_id, num) {
+  return request({
+    url: `/buyer/crowdfunding/buy`,
+    method: 'get',
+    params: { crowdfunding_id, num },
+    needToken: true
+  })
+}
+
+/**
+ * 获取购物车
+ */
+export function getCart() {
+  return request({
+    url: `/buyer/crowdfunding/cart`,
+    method: 'get',
+    needToken: true
+  })
+}
+
+/**
+ * 提交订单
+ */
+export function createTrade() {
+  return request({
+    url: `/buyer/crowdfunding/trade`,
+    method: 'post',
+    needToken: true,
+    params: { client: 'PC' }
+  })
+}
diff --git a/buyer/src/views/-index/-search-bar.vue b/buyer/src/views/-index/-search-bar.vue
index 6729128a5bf1e47a204bc4fdc9458cdf11ba822e..76f4ae3e83662dc4cf80bb89f14ec86b04ea5b79 100644
--- a/buyer/src/views/-index/-search-bar.vue
+++ b/buyer/src/views/-index/-search-bar.vue
@@ -71,7 +71,7 @@ export default {
   top: -160px;
   height: 60px;
   width: 100%;
-  z-index: 99;
+  z-index: 10000;
   transition: top 0.3s ease-out;
   background-color: #fff;
   &.show {
diff --git a/buyer/src/views/checkout/index.vue b/buyer/src/views/checkout/index.vue
index f9b7705cdd377b8b62eec3bdf7ee9ae868a04049..7a6539de02a2ae06c88f9ed6cb59d00529d0de3a 100644
--- a/buyer/src/views/checkout/index.vue
+++ b/buyer/src/views/checkout/index.vue
@@ -105,6 +105,7 @@
 import Vue from 'vue'
 import * as CheckoutComponents from './components'
 import * as API_Trade from '@/api/trade'
+import * as API_Crowdfunding from '@/api/crowdfunding'
 import { Input } from 'element-ui'
 import { mapGetters } from 'vuex'
 
@@ -131,6 +132,8 @@ export default {
       selectedAddress: '',
       // 跳转过来的是立即购买还是购物车结算
       way: this.$route.query.way || 'CART',
+      crowdfundingShowFlag: this.$route.query.crowdfundingShowFlag || false,
+      crowdfundingId: this.$route.query.crowdfundingId || null,
       // 是否为虚拟订单
       isVirtualOrder: false,
       // 订单是否包含供应商货品
@@ -230,8 +233,9 @@ export default {
         order_way: this.addressType // 0- 个人下单 1-企业采购
       }
 
+      const fun = this.crowdfundingShowFlag ? API_Crowdfunding.createTrade() : API_Trade.createTrade('PC', this.way)
       /** 先调用创建订单接口，再跳转到收银台 */
-      API_Trade.createTrade(params).then(response => {
+      fun.then(response => {
         this.$store.dispatch('cart/getCartDataAction')
         this.$router.push({ path: '/checkout/cashier?trade_sn=' + response.trade_sn })
       }).catch(error => {
@@ -265,7 +269,8 @@ export default {
     },
     /** 获取购物清单 */
     GET_Inventories() {
-      API_Trade.getCarts('checked', this.way).then(response => {
+      const fun = this.crowdfundingShowFlag ? API_Crowdfunding.getCart() : API_Trade.getCarts('checked', this.way)
+      fun.then(response => {
         this.inventoryList = response.cart_list
         this.isVirtualOrder = response.cart_list.some(sku => {
           return sku.sku_list.some(goods => goods.goods_type === 'VIRTUAL') || sku.group_list.some(group => group.sku_list.some(goods => goods.goods_type === 'VIRTUAL'))
diff --git a/buyer/src/views/crowdfunding.vue b/buyer/src/views/crowdfunding.vue
new file mode 100644
index 0000000000000000000000000000000000000000..39d3221fff8afbb8bb7d38420c316cf5bfdd1682
--- /dev/null
+++ b/buyer/src/views/crowdfunding.vue
@@ -0,0 +1,308 @@
+<template>
+  <div id="crowdfunding" class="w">
+    <div class="title-crowdfunding">
+      <span></span>
+      <h3>众筹活动</h3>
+      <span></span>
+    </div>
+    <div v-if="!crowdfunding.data || crowdfunding.data.length === 0" class="no-crowdfunding">暂无众筹活动</div>
+    <div v-else class="crowdfunding-list">
+      <div
+        v-for="(crowdfunding, index) in crowdfunding.data"
+        :key="index"
+        class="crowdfunding-item"
+      >
+        <div class="crowdfunding-top">
+          <div class="crowdfunding-img">
+            <img :src="crowdfunding.goods_sku.thumbnail" alt="图片">
+          </div>
+          <div class="crowdfunding-info">
+            <div class="crowdfunding-title">
+              <strong>
+                {{ crowdfunding.goods_sku.goods_name }}
+              </strong>
+            </div>
+            <div class="crowdfunding-progress">
+              <el-progress :percentage="crowdfunding.price_percent_int > 100 ? 100 : crowdfunding.price_percent_int" :stroke-width="20" :format="() => formatProgressText(crowdfunding.price_percent_int)"/>
+            </div>
+            <div class="crowdfunding-price-box">
+              <div class="crowdfunding-price">￥{{ crowdfunding.curr_price }}</div>
+              <el-button class="crowdfunding-button" @click="toGoodsDetail(crowdfunding)">
+                <span v-if="crowdfunding.front_status === 0">立即支持</span>
+                <span v-else>查看详情</span>
+              </el-button>
+            </div>
+          </div>
+        </div>
+        <el-divider></el-divider>
+        <div class="crowdfunding-bottom">
+          <div class="item1">已筹{{ crowdfunding.already_goods_count }}个商品</div>
+          <div class="item2">已筹{{ crowdfunding.already_price }}元</div>
+          <div class="item3">
+            <span v-if="crowdfunding.front_status === 0">剩余{{ formatRemainTime(crowdfunding.remain_second) }}</span>
+            <span v-else>已结束</span>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="crowdfunding-page">
+      <el-pagination
+        v-if="crowdfunding"
+        @current-change="handleCurrentPageChange"
+        :current-page.sync="crowdfunding.page_no"
+        :page-size="crowdfunding.page_size"
+        layout="total, prev, pager, next"
+        :total="crowdfunding.data_total">
+      </el-pagination>
+    </div>
+  </div>
+</template>
+
+<script>
+import Vue from 'vue'
+import * as API_Crowdfunding from '@/api/crowdfunding'
+import { Pagination } from 'element-ui'
+import { Progress } from 'element-ui'
+import { Divider } from 'element-ui'
+
+Vue.use(Pagination)
+Vue.use(Progress)
+Vue.use(Divider)
+
+export default {
+  name: 'crowdfunding',
+  head() {
+    return {
+      title: `众筹活动-${this.site.title}`
+    }
+  },
+  data() {
+    return {
+      loading: false,
+      finished: false,
+      params: {
+        page_no: 1,
+        page_size: 10
+      },
+      crowdfunding: {}
+    }
+  },
+  mounted() {
+    this.GET_Crowdfunding()
+  },
+  methods: {
+    /** 加载数据 */
+    handleCurrentPageChange(page_no) {
+      this.params.page_no = page_no
+      this.GET_Crowdfunding()
+    },
+    /** 去众筹商品详情页 */
+    toGoodsDetail(crowdfunding) {
+      this.$router.push({ path: '/goods/' + crowdfunding.goods_id, query: { crowdfundingId: crowdfunding.id } })
+    },
+    /** 获取众筹活动列表 */
+    GET_Crowdfunding() {
+      API_Crowdfunding.getList(this.params).then(response => {
+        this.crowdfunding = response
+      })
+    },
+    getSkuList(val) {
+      const _val = typeof val === 'string' ? JSON.parse(val) : val
+      if (_val) {
+        let _specs = []
+        _val.forEach(elem => {
+          _specs.push(elem.spec_value)
+        })
+        _specs = _specs.join('/')
+        return _specs
+      }
+      return ''
+    },
+    formatProgressText(percent) {
+      if (percent > 999) {
+        percent = 999
+      }
+      return percent + '%'
+    },
+    formatRemainTime(second) {
+      const days = Math.floor(second / 86400)
+      const hours = Math.floor((second % 86400) / 3600)
+      const minutes = Math.floor(((second % 86400) % 3600) / 60)
+      const seconds = Math.floor(((second % 86400) % 3600) % 60)
+      if (days > 0) {
+        return days + '天'
+      }
+      if (hours > 0) {
+        return hours + '小时'
+      }
+      if (minutes > 0) {
+        return minutes + '分钟'
+      }
+      return seconds + '秒'
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+@import "../assets/styles/color";
+/deep/ .el-progress {
+  .el-progress-bar {
+    width: 94%;
+    .el-progress-bar__inner {
+      background: linear-gradient(to right, rgb(255, 153, 22), rgb(247, 76, 63))
+    }
+  }
+  .el-progress__text{
+    color: rgb(249, 93, 53);
+    font-weight: 700;
+  }
+}
+/deep/ .el-divider--horizontal{
+  margin: 0;
+  width: 550px;
+  margin-left: 15px;
+}
+.title-crowdfunding {
+  height: 35px;
+  line-height: 1;
+  margin: 20px auto;
+  text-align: center;
+  span {
+    display: inline-block;
+    width: 35px;
+    height: 18px;
+    background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACMAAAA0CAMAAAA31HFIAAADIWlUWHRYTUw6Y29tLmFkb2JlLnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQiPz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENvcmUgNS41LWMwMTQgNzkuMTUxNDgxLCAyMDEzLzAzLzEzLTEyOjA5OjE1ICAgICAgICAiPiA8cmRmOlJERiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtbG5zOnhtcE1NPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvbW0vIiB4bWxuczpzdFJlZj0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL3NUeXBlL1Jlc291cmNlUmVmIyIgeG1wOkNyZWF0b3JUb29sPSJBZG9iZSBQaG90b3Nob3AgQ0MgKFdpbmRvd3MpIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkRGNjc3ODIxNzJCMzExRTc5M0NGODAyNjQxQjQwREMxIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkRGNjc3ODIyNzJCMzExRTc5M0NGODAyNjQxQjQwREMxIj4gPHhtcE1NOkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6REY2Nzc4MUY3MkIzMTFFNzkzQ0Y4MDI2NDFCNDBEQzEiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6REY2Nzc4MjA3MkIzMTFFNzkzQ0Y4MDI2NDFCNDBEQzEiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/eHBhY2tldCBlbmQ9InIiPz4ii86lAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAADxQTFRFR3BM/yYd/yYd/yYdERERERERERERERERNRMSERER/yYd/yYd/yYd/////313/+fm/2BZ/66r/5WR/1FK729jUAAAAAx0Uk5TAJHuEDMlRkwDLORpnbioYwAAAJhJREFUOMvtkssSgyAMRQOixDY81P//V2npCyeELpxpF5zNncFjmBsFOIlxmm8x2xxTEfkQrLUIgFIk1+RXyrgPMI85SfsEucPzeo2t+KqXyU2keFZAIaB/r07n16DS9EIr9ldWVKA4R5eO5hw6wDre0xJX55bonFsrTnrkQ9xCpCDNkZ3hfRfVnCs1ew0Xau7nsMHKnv+KHfpCDWFb2K2VAAAAAElFTkSuQmCC) 0 0 no-repeat;
+    overflow: hidden;
+    vertical-align: middle;
+  }
+  h3 {
+    display: inline-block;
+    margin: 0 5px;
+    color: #111;
+    font-size: 18px;
+    line-height: 35px;
+    vertical-align: middle;
+  }
+}
+.crowdfunding-list {
+  display: block;
+  overflow: hidden;
+}
+.crowdfunding-item {
+  position: relative;
+  display: block;
+  float: left;
+  height: 245px;
+  border: 1px solid #f2f2f2;
+  background: #fff;
+  box-shadow: 0 10px 20px 0 rgba(0, 0, 0, .04);
+  margin: 0 20px 20px 0;
+  width: 580px;
+  overflow: visible;
+  border-radius: 20px;
+  //&:nth-child(3n) {
+  //  margin-right: 0;
+  //}
+  //&:hover .crowdfunding-img {
+  //  transform: translateX(5px);
+  //}
+  .crowdfunding-top {
+    height: 200px;
+    .crowdfunding-img {
+      float: left;
+      //width: 170px;
+      //height: 170px;
+      margin: 15px;
+      img {
+        width: 170px;
+        height: 170px;
+        border-radius: 5%;
+      }
+    }
+    .crowdfunding-info {
+      position: relative;
+      float: left;
+      z-index: 2;
+      width: 380px;
+      height: 120px;
+      padding: 10px 0 15px;
+      color: #333;
+      outline: 0;
+      margin-top: 10px;
+      .crowdfunding-title {
+        margin-bottom: 20px;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+        font: 400 15px arial;
+      }
+      .crowdfunding-progress {
+        width: 380px;
+        color: rgba(51, 51, 51, 0.5);
+      }
+      .crowdfunding-price-box {
+        .crowdfunding-price{
+          float: left;
+          margin-top: 50px;
+          font-size: 28px;
+          font-weight: 700;
+        }
+        .crowdfunding-button{
+          width: 130px;
+          height: 45px;
+          float: left;
+          margin-top: 38px;
+          margin-left: 150px;
+          color: rgb(221, 188, 154);
+          background-color: rgb(26, 25, 25);
+          border-radius: 35px;
+          font-size: 22px;
+          padding: 0;
+        }
+
+      }
+      strong {
+        display: inline-block;
+        font: 400 22px arial;
+        vertical-align: top;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+      }
+    }
+  }
+  .crowdfunding-bottom {
+    margin: 12px 15px 0 15px;
+    color: rgb(158, 147, 136);
+    font-size: 18px;
+    .item1 {
+      width: 183px;
+      float: left;
+      text-align: left;
+    }
+    .item2 {
+      width: 183px;
+      float: left;
+      text-align: center;
+    }
+    .item3 {
+      width: 183px;
+      float: left;
+      text-align: right;
+    }
+  }
+
+}
+.no-crowdfunding {
+  text-align: center;
+  font-size: 18px;
+  font-weight: 400;
+  line-height: 100px;
+}
+.crowdfunding-page {
+  text-align: right;
+  clear: both;
+  padding: 20px 0;
+}
+</style>
diff --git a/buyer/src/views/goods/-goods-info.vue b/buyer/src/views/goods/-goods-info.vue
index d90c54d0369ac929f0f7fba493f8bd34d93c26dd..1b733777213033f02def2c5a0152f79610014172 100644
--- a/buyer/src/views/goods/-goods-info.vue
+++ b/buyer/src/views/goods/-goods-info.vue
@@ -9,6 +9,31 @@
         </h1>
       </div>
       <div class="pro-details">
+        <div v-if="crowdfundingShowFlag">
+          <goods-prom-bar
+            title="众筹活动"
+            :end-time="crowdfundingDetail.end_time - parseInt(new Date() / 1000)"
+            @count-end="handleCountEnd"
+          >
+            <i class="iconfont ea-icon-prom-tag" slot="icon"></i>
+          </goods-prom-bar>
+          <div class="crowdfunding-info">
+            <div class="crowdfunding-top">
+              <div class="item1">
+                已筹<span class="num">{{ crowdfundingDetail.already_price }}</span>元,
+                已筹商品数量<span class="num">{{ crowdfundingDetail.already_goods_count }}</span>
+              </div>
+            </div>
+            <div class="crowdfunding-progress">
+              <el-progress :percentage="crowdfundingDetail.price_percent_int > 100 ? 100 : crowdfundingDetail.price_percent_int" :stroke-width="4" :format="() => formatProgressText(crowdfundingDetail.price_percent_int)"/>
+            </div>
+            <div class="crowdfunding-bottom">
+              <div class="item1">
+                <span class="num">{{ crowdfundingDetail.already_people_count }}</span>人支持
+              </div>
+            </div>
+          </div>
+        </div>
         <div v-if="seckill && showSeckill" class="seckill-container">
           <goods-prom-bar
             title="限时抢购"
@@ -78,9 +103,10 @@
             </div>
           </div>
           <!-- 促销活动 -->
-          <goods-promotions :promotions="promotions"  />
+          <goods-promotions v-if="!crowdfundingShowFlag" :promotions="promotions"  />
         </div>
         <goods-coupons
+          v-if="!crowdfundingShowFlag"
           :goods="goodsInfo"
           :selectedSku="selectedSku"
           :is-snapshot="snapshot" />
@@ -97,7 +123,7 @@
 
         <!--  配送地区选择 -->
         <goods-ship
-          v-if="goods_type !== 'VIRTUAL'"
+          v-if="goods_type !== 'VIRTUAL' && !crowdfundingShowFlag"
           :goods-id="goods.goods_id"
           @in-stock-change="handleInStockChange"/>
       </div>
@@ -144,7 +170,7 @@
         <router-link :to="'/goods/' + goods.goods_id">点此查看最新商品详情</router-link>
       </div>
       <template v-else>
-        <div class="pro-list buy-num">
+        <div v-if="!crowdfundingEndFlag" class="pro-list buy-num">
           <div class="pro-title">购买数量</div>
           <div class="pro-content">
             <div v-if="!noSkuForSelectSpecs" class="count-num">
@@ -163,12 +189,21 @@
 
         <div class="buy-btns">
           <button
+            v-if="!crowdfundingShowFlag"
             type="button"
             class="buy-btn buy"
             :class="{disabled: buyNowBtnDisabled}"
             @click="handleBuyNow"
           >立即购买</button>
           <button
+            v-else
+            type="button"
+            class="buy-btn buy"
+            :class="[(!in_store || crowdfundingEndFlag) && 'disabled']"
+            @click="handleBuyNow"
+          >立即支持</button>
+          <button
+            v-if="!crowdfundingShowFlag"
             type="button"
             class="buy-btn add"
             :class="{disabled: addCartBtnDisabled}"
@@ -194,6 +229,7 @@ import { RegExp } from '~/ui-utils'
 import * as API_Goods from '@/api/goods'
 import * as API_Trade from '@/api/trade'
 import * as API_Promotions from '@/api/promotions'
+import * as API_Crowdfunding from '@/api/crowdfunding'
 import Storage from '@/utils/storage'
 import GoodsCoupons from './-goods-coupons'
 import GoodsPromotions from './-goods-promotions'
@@ -209,7 +245,7 @@ Vue.use(Popover)
 Vue.component('goods-prom-bar', GoodsPromBar)
 export default {
   name: 'goods-info',
-  props: ['goods', 'orderPrice', 'snapshot'],
+  props: ['goods', 'orderPrice', 'snapshot', 'crowdfundingShowFlagProp', 'crowdfundingEndFlagProp', 'crowdfundingDetail'],
   components: {
     GoodsCoupons,
     GoodsPromotions,
@@ -247,6 +283,8 @@ export default {
       activity_id: '',
       // 活动类型
       promotion_type: '',
+      crowdfundingShowFlag: false,
+      crowdfundingEndFlag: false,
       // 限时抢购信息
       seckill: '',
       // 是否显示限时抢购信息
@@ -301,7 +339,16 @@ export default {
       }
 
       const { goods_id } = this.goods
-      const skus = await API_Goods.getGoodsSkus(goods_id)
+      let skus = await API_Goods.getGoodsSkus(goods_id)
+      if (this.crowdfundingShowFlagProp) {
+        const crowdfundingSkus = skus.filter(sku => sku.sku_id === this.crowdfundingDetail.sku_id)
+        if (crowdfundingSkus.length > 0) {
+          crowdfundingSkus[0].price = this.crowdfundingDetail.curr_price
+          skus = crowdfundingSkus
+          this.crowdfundingShowFlag = true
+          this.crowdfundingEndFlag = this.crowdfundingEndFlagProp
+        }
+      }
       const specList = []
       const priceList = []
       skus.sort((a, b) => a.sku_sort - b.sku_sort).forEach(sku => {
@@ -543,16 +590,23 @@ export default {
     /** 立即购买 */
     handleBuyNow() {
       if (this.buyNowBtnDisabled) return
-      if (!this.in_store || !this.isLogin()) return
+      if (!this.in_store || this.crowdfundingEndFlag || !this.isLogin()) return
 
       this.getActivityId()
       const { buyNum, activity_id, promotion_type } = this
       if (!this.handleCheckNum()) return
       const { sku_id } = this.selectedSku
-      API_Trade.buyNow(sku_id, buyNum, activity_id, promotion_type).then(response => {
-        this.$store.dispatch('cart/getCartDataAction')
-        this.$router.push({ path: '/checkout', query: { way: 'BUY_NOW' } })
-      })
+      if (this.crowdfundingShowFlag) {
+        API_Crowdfunding.buy(this.crowdfundingDetail.id, buyNum).then(response => {
+          this.$store.dispatch('cart/getCartDataAction')
+          this.$router.push({ path: '/checkout', query: { way: 'crowdfunding', crowdfundingShowFlag: true, crowdfundingId: this.crowdfundingDetail.id } })
+        })
+      } else {
+        API_Trade.buyNow(sku_id, buyNum, activity_id, promotion_type).then(response => {
+          this.$store.dispatch('cart/getCartDataAction')
+          this.$router.push({ path: '/checkout', query: { way: 'BUY_NOW' } })
+        })
+      }
     },
 
     /** 加入购物车 */
@@ -630,6 +684,7 @@ export default {
       this.in_store = in_store
     },
     handleCountEnd() {
+      this.crowdfundingEndFlag = true
       this.showSeckill = false
       this.$alert('活动已结束，商品已恢复原价。', function() {
         location.reload()
@@ -677,6 +732,14 @@ export default {
       word-break: break-all;
       width: 520px;
     }
+    .crowdfundingTag{
+      background-color: theme.$color-theme;
+      font-size: 14px;
+      color: white;
+      padding: 5px;
+      margin-left: 5px;
+      border-radius: 5px;
+    }
     .goods-tag {
       padding: 1px 4px;
       color: #f42424;
@@ -912,6 +975,38 @@ export default {
   }
 }
 
+.crowdfunding-info {
+  margin-top: 10px;
+  margin-left: 10px;
+  margin-bottom: 50px;
+  .crowdfunding-progress {
+    width: 100%;
+  }
+  .num{
+    display: inline;
+    font-size: 20px;
+    color: theme.$color-main;
+  }
+  .crowdfunding-top {
+    margin-top: 5px;
+    //color: $color-main;
+    font-size: 13px;
+    .item1 {
+      width: 183px;
+      float: left;
+      text-align: left;
+    }
+  }
+  .crowdfunding-bottom {
+    margin-top: 5px;
+    font-size: 13px;
+    .item1 {
+      //width: 183px;
+      float: left;
+      text-align: left;
+    }
+  }
+}
 
 .pro-content {
   em.hl_red_bg {
diff --git a/buyer/src/views/goods/-goods-prom-bar.vue b/buyer/src/views/goods/-goods-prom-bar.vue
index 7cb8b22d1dfa5e3f9e5081684b2bb7b2f4143e90..a320c6a4b2b97bf4832f44dfcb6cac35b5207180 100644
--- a/buyer/src/views/goods/-goods-prom-bar.vue
+++ b/buyer/src/views/goods/-goods-prom-bar.vue
@@ -5,11 +5,16 @@
       <strong>{{ title }}</strong>
     </div>
     <div class="prom-time" v-if="!is_snapshot">
-      距离结束
-      <template v-if="day > 0">
-        <span>{{ day }}</span>天
+      <template v-if="endFlag">
+        <div style="font-size: 14px">已结束</div>
+      </template>
+      <template v-else>
+        距离结束
+        <template v-if="day > 0">
+          <span>{{ day }}</span>天
+        </template>
+        <span>{{ hours }}</span>:<span>{{ minutes }}</span>:<span>{{ seconds }}</span>
       </template>
-      <span>{{ hours }}</span>:<span>{{ minutes }}</span>:<span>{{ seconds }}</span>
     </div>
   </div>
 </template>
@@ -27,7 +32,8 @@ export default {
       hours: '00',
       minutes: '00',
       seconds: '00',
-      is_snapshot: this.$route.name === 'goods-snapshot'
+      is_snapshot: this.$route.name === 'goods-snapshot',
+      endFlag: false
     }
   },
   mounted() {
@@ -36,9 +42,15 @@ export default {
   methods: {
     contDown(times) {
       let end_ime = times
+      if (end_ime <= 0) {
+        this.endFlag = true
+        this.$emit('count-end')
+        return
+      }
       this.timer = setInterval(() => {
         if (end_ime <= 0) {
           clearInterval(this.timer)
+          this.endFlag = true
           this.$emit('count-end')
         } else {
           const time = Foundation.countTimeDown(end_ime)
diff --git a/buyer/src/views/goods/_id.vue b/buyer/src/views/goods/_id.vue
index 581e5ce574c9dc60e48ca81cdbde7c1de778300e..d82e0ba6d28dabb507fcf46612d7327bc5f9fbc1 100644
--- a/buyer/src/views/goods/_id.vue
+++ b/buyer/src/views/goods/_id.vue
@@ -26,7 +26,7 @@
             :images="goods.gallery_list"
             :goods-video="goods.goods_video"/>
           <!--商品信息【包括规格、优惠券、促销等】-->
-          <goods-info  :goods="goods" @spec-img-change="handleShowSpecImg"/>
+          <goods-info  :goods="goods" @spec-img-change="handleShowSpecImg" :crowdfunding-show-flag-prop="crowdfundingShowFlag" :crowdfunding-end-flag="crowdfundingEndFlag" :crowdfunding-detail="crowdfundingDetail"/>
         </div>
       </div>
       <div class="details">
@@ -73,6 +73,7 @@ import Vue from 'vue'
 import * as API_Common from '@/api/common'
 import * as API_Goods from '@/api/goods'
 import * as API_Shop from '@/api/shop'
+import * as API_Crowdfunding from '@/api/crowdfunding'
 import * as GoodsComponents from './components'
 import Storage from '@/utils/storage'
 import { Pagination } from 'element-ui'
@@ -113,7 +114,15 @@ export default {
       // 商品是否可查看
       canView: true,
       // 店铺基本信息
-      shopBaseInfo: {}
+      shopBaseInfo: {},
+      // 是否显示众筹
+      crowdfundingShowFlag: false,
+      // 众筹是否已结束
+      crowdfundingEndFlag: false,
+      // 众筹id
+      crowdfundingId: null,
+      // 众筹详情
+      crowdfundingDetail: null
     }
   },
   watch: {
@@ -128,6 +137,9 @@ export default {
   },
   methods: {
     async init() {
+      // 众筹参数
+      this.crowdfundingId = this.$route.query.crowdfundingId
+      await this.getCrowdfunding()
       await this.getGoodsDetail()
       // 如果商品可以查看
       if (this.canView) {
@@ -182,6 +194,25 @@ export default {
           params: { statusCode: 500, message: '商品已不存在' + e }
         })
       }
+    },
+    /** 获取众筹详情 */
+    async getCrowdfunding() {
+      if (!this.crowdfundingId) return
+      API_Crowdfunding.getDetail(this.crowdfundingId).then(res => {
+        this.crowdfundingDetail = res
+        if (this.crowdfundingDetail) {
+          // 活动状态是进行中，需要显示众筹活动
+          if (this.crowdfundingDetail.front_status === 0) {
+            this.crowdfundingShowFlag = true
+            this.crowdfundingEndFlag = false
+          }
+          // 活动已结束，需要显示众筹活动
+          if (this.crowdfundingDetail.front_status === 1) {
+            this.crowdfundingShowFlag = true
+            this.crowdfundingEndFlag = true
+          }
+        }
+      })
     }
   },
   destroyed() {
diff --git a/manager-admin/src/api/crowdfunding.js b/manager-admin/src/api/crowdfunding.js
new file mode 100644
index 0000000000000000000000000000000000000000..ef788c3528e1da3c84c7abd7a196532601cb442c
--- /dev/null
+++ b/manager-admin/src/api/crowdfunding.js
@@ -0,0 +1,90 @@
+/**
+ * 众筹活动相关API
+ */
+
+import request from '@/utils/request'
+
+/**
+ * 分页列表
+ * @param params
+ */
+export function getList(params) {
+  return request({
+    url: '/admin/promotion/crowdfunding',
+    method: 'get',
+    params
+  })
+}
+
+/**
+ * 添加
+ * @param params
+ */
+export function add(params) {
+  return request({
+    url: '/admin/promotion/crowdfunding',
+    method: 'post',
+    headers: { 'Content-Type': 'application/json' },
+    data: params
+  })
+}
+
+/**
+ * 查询详情
+ * @param id
+ */
+export function getDetail(id) {
+  return request({
+    url: `/admin/promotion/crowdfunding/${id}`,
+    method: 'get'
+  })
+}
+
+/**
+ * 修改企业
+ * @param id
+ * @param params
+ */
+export function edit(id, params) {
+  return request({
+    url: `/admin/promotion/crowdfunding/${id}`,
+    method: 'put',
+    headers: { 'Content-Type': 'application/json' },
+    data: params
+  })
+}
+
+/**
+ * 删除
+ * @param id
+ */
+export function del(id) {
+  return request({
+    url: `/admin/promotion/crowdfunding/${id}`,
+    method: 'delete'
+  })
+}
+
+/**
+ * 终止
+ * @param id
+ */
+export function stop(id) {
+  return request({
+    url: `/admin/promotion/crowdfunding/${id}/stop`,
+    method: 'put'
+  })
+}
+
+/**
+ * 终止
+ * @param id
+ * @param flag
+ */
+export function updateEndShowFlag(id, flag) {
+  return request({
+    url: `/admin/promotion/crowdfunding/${id}/updateEndShowFlag?flag=${flag}`,
+    method: 'put'
+  })
+}
+
diff --git a/manager-admin/src/lang/en.js b/manager-admin/src/lang/en.js
index d362da2cf8d07d03c7f494e2f6afe5b2d76a6daf..3fe5f91baf974d7849a188cbd76775208dbb0982 100644
--- a/manager-admin/src/lang/en.js
+++ b/manager-admin/src/lang/en.js
@@ -112,6 +112,10 @@ export default {
     viewSignIn: 'View Sign In',
     editSignIn: 'Edit Sign In',
     signInRecord: 'Sign In Record',
+    crowdfunding: 'crowdfunding',
+    addCrowdfunding: 'Add Crowdfunding',
+    editCrowdfunding: 'Edit Crowdfunding',
+    viewCrowdfunding: 'View Crowdfunding',
 
     page: 'Page Manage',
     decorationSetting: 'Decoration Setting',
diff --git a/manager-admin/src/lang/zh.js b/manager-admin/src/lang/zh.js
index e5ef7f0d8064804c71b16ccf50a186b264e06ce9..2d6a678018472353a343a164d529610c7952c0ee 100644
--- a/manager-admin/src/lang/zh.js
+++ b/manager-admin/src/lang/zh.js
@@ -104,6 +104,10 @@ export default {
     viewSignIn: '查看签到活动',
     editSignIn: '修改签到活动',
     signInRecord: '签到记录',
+    crowdfunding: '众筹活动',
+    addCrowdfunding: '添加众筹活动',
+    editCrowdfunding: '编辑众筹活动',
+    viewCrowdfunding: '查看众筹活动',
 
     page: '页面设置',
     decorationSetting: '装修',
diff --git a/manager-admin/src/router/index.js b/manager-admin/src/router/index.js
index 47879a8747296e96de6c9d493ca8301e242e4639..95f1d4a5396e13077ab11f491e331c4b07050ff4 100644
--- a/manager-admin/src/router/index.js
+++ b/manager-admin/src/router/index.js
@@ -204,7 +204,16 @@ const asyncRouters = [
       { path: 'coupon-list', component: () => import('@/views/promotions/coupon-manage/couponList'), name: 'couponList', meta: { title: 'couponList' }},
       { path: 'coupon', component: () => import('@/views/promotions/coupon-manage/coupon'), name: 'coupon', meta: { title: 'coupon' }, hidden: true },
       { path: 'couponUpdate', component: () => import('@/views/promotions/coupon-manage/coupon'), name: 'couponUpdate', meta: { title: 'couponUpdate' }, hidden: true },
-      { path: 'receive-list/:id', component: () => import('@/views/promotions/coupon-manage/ReceiveList'), name: 'ReceiveList', hidden: true, meta: { title: 'ReceiveList' }}
+      { path: 'receive-list/:id', component: () => import('@/views/promotions/coupon-manage/ReceiveList'), name: 'ReceiveList', hidden: true, meta: { title: 'ReceiveList' }},
+      { path: 'sign-in', component: () => import('@/views/promotions/sign-in-manage/signIn'), name: 'signIn', meta: { title: 'signIn' }},
+      { path: 'add-sign-in', component: () => import('@/views/promotions/sign-in-manage/addSignIn'), name: 'addSignIn', hidden: true, meta: { title: 'addSignIn' }},
+      { path: 'view-sign-in/:id', component: () => import('@/views/promotions/sign-in-manage/addSignIn'), name: 'viewSignIn', hidden: true, meta: { title: 'viewSignIn' }},
+      { path: 'edit-sign-in/:id', component: () => import('@/views/promotions/sign-in-manage/addSignIn'), name: 'editSignIn', hidden: true, meta: { title: 'editSignIn' }},
+      { path: 'sign-in-record', component: () => import('@/views/promotions/sign-in-manage/signInRecord'), name: 'signInRecord', hidden: true, meta: { title: 'signInRecord' }},
+      { path: 'crowdfunding', component: () => import('@/views/promotions/crowdfunding-manage'), name: 'crowdfunding', meta: { title: 'crowdfunding' }},
+      { path: 'add-crowdfunding', component: () => import('@/views/promotions/crowdfunding-manage/form'), name: 'addCrowdfunding', hidden: true, meta: { title: 'addCrowdfunding' }},
+      { path: 'view-crowdfunding', component: () => import('@/views/promotions/crowdfunding-manage/form'), name: 'viewCrowdfunding', hidden: true, meta: { title: 'viewCrowdfunding' }},
+      { path: 'edit-crowdfunding', component: () => import('@/views/promotions/crowdfunding-manage/form'), name: 'editCrowdfunding', hidden: true, meta: { title: 'editCrowdfunding' }}
     ]
   },
   // 售前售后
diff --git a/manager-admin/src/views/promotions/crowdfunding-manage/form.vue b/manager-admin/src/views/promotions/crowdfunding-manage/form.vue
new file mode 100644
index 0000000000000000000000000000000000000000..7ca80c1f8a8c862e6fd37efe24bb2682ee3e1672
--- /dev/null
+++ b/manager-admin/src/views/promotions/crowdfunding-manage/form.vue
@@ -0,0 +1,414 @@
+<template>
+  <div class="add-sign-in-wrap">
+    <div class="tips-info">
+      <h4>操作提示</h4>
+      <ul>
+        <li>众筹有开始和结束时间，在结束时间前达到目标值就算众筹成功，在结束时间点没有达到目标值就算众筹失败，钱退回。</li>
+        <li>众筹需要设置总金额，总金额达到设定的比例就算众筹成功。</li>
+        <li>众筹单价按阶梯来，比如前100个商品众筹单价为200元；101-200个商品众筹单价为220元；201个以上的商品众筹单价为240元。</li>
+        <li>金额达到目标值也可以继续众筹，直到活动结束。</li>
+      </ul>
+    </div>
+
+    <div class="sign-in-container">
+      <div class="form-box">
+        <el-form
+        :model="form"
+        :rules="formRules"
+        ref="formRef"
+        label-width="140px"
+        :status-icon="false"
+        label-position="right"
+        :disabled="disabled">
+          <el-divider>基础设置</el-divider>
+          <el-form-item label="活动名称" prop="name">
+            <el-input size="medium" v-model="form.name"></el-input>
+          </el-form-item>
+          <el-form-item label="活动时间" prop="timeRange">
+            <el-date-picker
+              v-model="form.timeRange"
+              size="medium"
+              style="width: 400px"
+              type="datetimerange"
+              align="center"
+              :editable="false"
+              unlink-panels
+              range-separator="-"
+              start-placeholder="开始时间"
+              end-placeholder="结束时间"
+              value-format="timestamp"
+              :default-time="[MixinDefaultTime, MixinDefaultTime]"
+              :picker-options="{disabledDate(time) { return time.getTime()  <  (Date.now() - 8.64E7) }}">
+            </el-date-picker>
+          </el-form-item>
+          <el-form-item label="众筹总金额" prop="total_price">
+            <el-input size="medium" v-model="form.total_price"></el-input>
+          </el-form-item>
+          <el-form-item label="众筹成功比例" prop="price_ratio">
+            <el-input size="medium" v-model="form.price_ratio">
+              <template slot="append">%</template>
+            </el-input>
+          </el-form-item>
+          <el-form-item label="活动描述" prop="description">
+            <el-input type="textarea" size="medium" v-model="form.description" clearable></el-input>
+          </el-form-item>
+          <el-divider>商品设置</el-divider>
+          <el-form-item label="众筹商品">
+            <en-table-layout
+              toolbar
+              pagination
+              :tableData="goodsTableData">
+              <div slot="toolbar" class="inner-toolbar">
+                <div class="toolbar-btns" v-if="!disabled">
+                  <el-button type="primary" @click="handlerSelectGoods" >选择商品</el-button>
+                </div>
+              </div>
+              <template slot="table-columns">
+                <el-table-column label="商品名称">
+                  <template slot-scope="scope">
+                    <a :href="isO2O ? 'javascript:void(0)' : `${MixinBuyerDomain}/goods/${scope.row.goods_id}`" :target="isO2O ? '' : '_blank'" style="color: #00a2d4;">{{ scope.row.goods_name }}</a>
+                  </template>
+                </el-table-column>
+                <!-- 商品规格 -->
+                <el-table-column label="规格">
+                  <template slot-scope="scope">
+                    <div class="sku-list">
+                      <span v-if="scope.row.spec_list">{{ getSkuList(scope.row.spec_list) }}</span>
+                      <span v-else>{{ getSkuList(scope.row.specs) }}</span>
+                    </div>
+                  </template>
+                </el-table-column>
+                <el-table-column label="价格">
+                  <template slot-scope="scope">
+                      <span>{{ scope.row.price }}</span>
+                  </template>
+                </el-table-column>
+              </template>
+            </en-table-layout>
+          </el-form-item>
+          <el-divider>价格阶梯</el-divider>
+          <el-form-item label="价格阶梯">
+            <el-button v-if="!disabled" type="primary" @click="handleAddPriceStep" icon="el-icon-circle-plus-outline">新增阶梯</el-button>
+            <el-table :data="form.price_step_list" :header-cell-style="{ textAlign: 'center' }">
+              <el-table-column label="序号" width="50" align="center">
+                <template slot-scope="scope">{{ scope.$index + 1 }}</template>
+              </el-table-column>
+              <el-table-column label="门槛商品数">
+                <template slot-scope="scope">
+                  <el-form-item :prop="'price_step_list.'+scope.$index+'.threshold'" :rules="formRules.price_step_list.threshold">
+                    <el-input :disabled="scope.$index === 0" v-model="scope.row.threshold" style="width: 100%" placeholder="请输入门槛商品数"></el-input>
+                  </el-form-item>
+                </template>
+              </el-table-column>
+              <el-table-column label="众筹单价">
+                <template slot-scope="scope">
+                  <el-form-item :prop="'price_step_list.'+scope.$index+'.price'" :rules="formRules.price_step_list.price">
+                    <el-input v-model="scope.row.price" placeholder="请输入众筹单价" style="width: 100%"></el-input>
+                  </el-form-item>
+                </template>
+              </el-table-column>
+              <el-table-column v-if="!disabled" label="操作" align="center">
+                <template slot-scope="scope">
+                  <el-button v-if="scope.$index !== 0" type="text" @click="handleDeletePriceStep(scope.$index)">删除</el-button>
+                </template>
+              </el-table-column>
+            </el-table>
+          </el-form-item>
+        </el-form>
+        <div class="confirm-btn">
+          <el-button size="medium" @click="handlerCallback">返回</el-button>
+          <el-button size="medium" type="primary" @click="handlerSubmit" v-if="!disabled">保存</el-button>
+        </div>
+      </div>
+    </div>
+    <!--商品选择器-->
+    <en-goods-sku-picker
+      :sku="true"
+      :limit="1"
+      :show="dialogGoodsShow"
+      :defaultData="skuIds"
+      @confirm="handleGoodsPickerConfirm"
+      @close="dialogGoodsShow = false"/>
+  </div>
+</template>
+
+<script>
+  import * as API_Crowdfunding from '@/api/crowdfunding'
+  import { cloneObj } from '@/utils'
+  import { GoodsSkuPicker } from '@/components'
+  import { RegExp } from '~/ui-utils'
+
+  export default {
+    name: 'addCrowdfunding',
+    components: {
+      [GoodsSkuPicker.name]: GoodsSkuPicker
+    },
+    data() {
+      return {
+        form: {},
+        skuIds: [],
+        formRules: {
+          name: [this.MixinRequired('请填写活动名称！')],
+          timeRange: [this.MixinRequired('请选择活动时间！')],
+          total_price: [
+            this.MixinRequired('请填写活动金额！'),
+            {
+              validator: (rule, value, callback) => {
+                if (!RegExp.money.test(value)) {
+                  callback(new Error('请填写正确的金额！'))
+                } else {
+                  callback()
+                }
+              }
+            }
+          ],
+          price_ratio: [
+            this.MixinRequired('请填写众筹成功比例！'),
+            {
+              validator: (rule, value, callback) => {
+                if (!RegExp.money.test(value)) {
+                  callback(new Error('请填写正确的比例！'))
+                } else {
+                  callback()
+                }
+              }
+            }
+          ],
+          price_step_list: {
+            threshold: [
+              this.MixinRequired('请填写门槛人数！'),
+              {
+                validator: (rule, value, callback) => {
+                  if (!RegExp.positiveInteger.test(value)) {
+                    callback(new Error('请填写正确的数量！'))
+                  } else {
+                    callback()
+                  }
+                }
+              }
+            ],
+            price: [
+              this.MixinRequired('请填写众筹价格！'),
+              {
+                validator: (rule, value, callback) => {
+                  if (!RegExp.money.test(value)) {
+                    callback(new Error('请填写正确的金额！'))
+                  } else {
+                    callback()
+                  }
+                }
+              }
+            ]
+          }
+        },
+        disabled: false,
+        goodsTableData: [],
+        dialogGoodsShow: false
+      }
+    },
+    watch: {
+      $route: {
+        handler(val) {
+          if (val.name === 'viewCrowdfunding' || val.name === 'editCrowdfunding' || val.name === 'addCrowdfunding') {
+            this.disabled = val.name === 'viewCrowdfunding'
+            this.id = val.query.id
+
+            if (val.name === 'addCrowdfunding') {
+              this.form = {
+                price_step_list: [{ threshold: 0, price: null }]
+              }
+              this.goodsTableData = []
+              this.skuIds = []
+            } else {
+              this.getDetail()
+            }
+          }
+        },
+        immediate: true
+      }
+    },
+    mounted() {
+    },
+    methods: {
+      /** 获取规格列表 */
+      getSkuList(val) {
+        const _val = typeof val === 'string' ? JSON.parse(val) : val
+        if (_val) {
+          let _specs = []
+          _val.forEach(elem => {
+            _specs.push(elem.spec_value)
+          })
+          _specs = _specs.join('/')
+          return _specs
+        }
+        return '/'
+      },
+      /** 保存商品选择器选择的商品 */
+      handleGoodsPickerConfirm(val) {
+        const _val = val
+        this.goodsTableData = cloneObj(_val)
+        this.form.sku_id = this.goodsTableData[0].sku_id
+        this.skuIds = [this.form.sku_id]
+      },
+      /** 商品选择 */
+      handlerSelectGoods() {
+        this.dialogGoodsShow = true
+      },
+      /** 获取活动详情 */
+      getDetail() {
+        API_Crowdfunding.getDetail(this.id).then(res => {
+          this.form = res
+          this.form.timeRange = [parseInt(res.start_time) * 1000, parseInt(res.end_time) * 1000]
+          this.goodsTableData = [res.goods_sku]
+          this.skuIds = [res.sku_id]
+        })
+      },
+      /** 保存提交 */
+      handlerSubmit() {
+        this.$refs['formRef'].validate((valid) => {
+          if (valid) {
+            const form = cloneObj(this.form)
+            form.start_time = form.timeRange[0] / 1000
+            form.end_time = form.timeRange[1] / 1000
+            delete form.timeRange
+            if (this.id) {
+              // 修改
+              API_Crowdfunding.edit(this.id, form).then(res => {
+                this.$message.success('修改成功')
+                this.$router.push({ name: 'crowdfunding' })
+              })
+            } else {
+              // 新增
+              API_Crowdfunding.add(form).then(res => {
+                this.$message.success('保存成功')
+                this.$router.push({ name: 'crowdfunding' })
+              })
+            }
+          }
+        })
+      },
+      handlerCallback() {
+        this.$router.push({ name: 'crowdfunding' })
+      },
+      // 添加阶梯价格
+      handleAddPriceStep() {
+        this.form.price_step_list.push({
+          threshold: null,
+          price: null
+        })
+      },
+      // 删除阶梯价格
+      handleDeletePriceStep(index) {
+        this.form.price_step_list.splice(index, 1)
+      }
+    }
+  }
+</script>
+<style lang="scss" scoped>
+.add-sign-in-wrap {
+  .sign-in-container {
+    background: #fff;
+    margin-top: 20px;
+    padding: 20px;
+    display: flex;
+    .bg-icon {
+      width: 350px;
+      height: 780px;
+      margin: 0 30px
+    }
+    .goods-image{
+      width:50px;
+      height:50px;
+    }
+    .confirm-btn {
+      text-align: center;
+      padding-top: 10px;
+      margin-top: 10px;
+      border-top: 1px dashed #DCDFE6;
+    }
+    .form-box {
+      width: 60%;
+      font-size: 14px;
+      font-weight: 700;
+      color: #606266;
+      padding: 0 30px;
+      .btn-box {
+        padding-left: 50px;
+      }
+      .text {
+        width: 80px;
+        text-align: center;
+      }
+      .el-input, .el-textarea {
+        width: 400px;
+      }
+    }
+    .item-border {
+      border-bottom: 1px dashed #DCDFE6;
+    }
+    .sign-item {
+      padding: 20px 0 20px 50px;
+      display: flex;
+      align-items: center;
+      .rewards-item {
+        display: flex;
+        align-items: center;
+        .el-select {
+          width: 200px;
+        }
+        .el-input {
+          width: 200px;
+        }
+        .right-item {
+          margin-left: 20px;
+          .gift {
+            margin-bottom: 10px;
+          }
+        }
+      }
+      ::v-deep .avatar-uploader .el-upload {
+        border: 1px dashed #d9d9d9;
+        border-radius: 6px;
+        cursor: pointer;
+        position: relative;
+        overflow: hidden;
+      }
+      ::v-deep .avatar-uploader .el-upload:hover {
+        border-color: #409EFF;
+      }
+      .avatar-uploader-icon {
+        font-size: 28px;
+        color: #8c939d;
+        width: 80px;
+        height: 80px;
+        line-height: 80px;
+        text-align: center;
+      }
+      .avatar {
+        width: 80px;
+        height: 80px;
+        display: block;
+      }
+
+    }
+    .point-box {
+      padding: 10px 0 10px 0;
+      border-bottom: 1px dashed #DCDFE6;
+      .el-input {
+        width: 200px;
+      }
+    }
+  }
+  .tips-info {
+    font-size: 14px;
+    background: #fff;
+    color: #31708f;
+    padding: 1px 10px;
+    margin-bottom: 10px;
+    border-radius: 4px;
+    li {
+      line-height: 24px;
+    }
+  }
+}
+</style>
diff --git a/manager-admin/src/views/promotions/crowdfunding-manage/index.vue b/manager-admin/src/views/promotions/crowdfunding-manage/index.vue
new file mode 100644
index 0000000000000000000000000000000000000000..aec7ecb7494ea4eb303951f6d2c8c377789851e0
--- /dev/null
+++ b/manager-admin/src/views/promotions/crowdfunding-manage/index.vue
@@ -0,0 +1,239 @@
+<template>
+  <div>
+    <en-table-layout
+      :tableData="tableData.data"
+      :loading="loading"
+    >
+      <div slot="toolbar" class="inner-toolbar">
+        <div class="toolbar-btns">
+          <el-button size="mini" type="primary" icon="el-icon-circle-plus-outline" @click="handleAdd">添加</el-button>
+        </div>
+        <div class="toolbar-search">
+          <en-table-search
+            @search="searchEvent"
+            @advancedSearch="advancedSearchEvent"
+            advanced
+            advancedWidth="465"
+            placeholder="请输入活动名称"
+          >
+            <template slot="advanced-content">
+              <el-form ref="advancedForm" :model="advancedForm" label-width="80px">
+                <el-form-item label="活动状态">
+                  <el-select v-model="advancedForm.status" placeholder="请选择" clearable>
+                    <el-option label="未开始" value="NotStart"/>
+                    <el-option label="进行中" value="Underway"/>
+                    <el-option label="手动终止" value="Stop"/>
+                    <el-option label="等待结算" value="WaitSettlement"/>
+                    <el-option label="众筹成功" value="Success"/>
+                    <el-option label="众筹失败" value="Fail"/>
+                  </el-select>
+                </el-form-item>
+              </el-form>
+            </template>
+          </en-table-search>
+        </div>
+      </div>
+
+      <template slot="table-columns">
+        <el-table-column label="活动名称">
+          <template slot-scope="scope">{{ scope.row.name }}</template>
+        </el-table-column>
+        <el-table-column label="众筹总金额">
+          <template slot-scope="scope">￥{{ scope.row.total_price | unitPrice }}</template>
+        </el-table-column>
+        <el-table-column label="众筹成功比例">
+          <template slot-scope="scope">{{ scope.row.price_ratio }}%</template>
+        </el-table-column>
+        <el-table-column label="开始时间">
+          <template slot-scope="scope">{{ scope.row.start_time | unixToDate }}</template>
+        </el-table-column>
+        <el-table-column label="结束时间">
+          <template slot-scope="scope">{{ scope.row.end_time | unixToDate }}</template>
+        </el-table-column>
+        <el-table-column prop="status" label="状态">
+          <template slot-scope="scope">{{ scope.row.status_text }}</template>
+        </el-table-column>
+        <el-table-column label="活动结束展示" key="end_show_flag">
+          <template slot-scope="scope">
+            <el-switch v-model="scope.row.end_show_flag"
+                       :active-value="true"
+                       :inactive-value="false"
+                       @change="handleUpdateEndShowFlag(scope.row)"
+            />
+          </template>
+        </el-table-column>
+        <el-table-column prop="price_percent" label="众筹进度">
+          <template slot-scope="scope">{{ scope.row.price_percent }}%</template>
+        </el-table-column>
+        <el-table-column label="操作" min-width="200">
+          <template slot-scope="scope">
+            <el-button
+              size="mini"
+              type="primary"
+              v-if="scope.row.allowable.edit"
+              @click="handleEdit(scope.row)">编辑</el-button>
+            <el-button
+              size="mini"
+              type="primary"
+              @click="handlerView(scope.row)">查看</el-button>
+            <el-button
+              v-if="scope.row.allowable.stop"
+              size="mini"
+              type="danger"
+              @click="handleClose(scope.row)">终止</el-button>
+            <el-button
+              v-if="scope.row.allowable.delete"
+              size="mini"
+              type="danger"
+              @click="handleDelete(scope.row)">删除</el-button>
+          </template>
+        </el-table-column>
+      </template>
+
+      <el-pagination
+        v-if="tableData"
+        slot="pagination"
+        @size-change="handlePageSizeChange"
+        @current-change="handlePageCurrentChange"
+        :current-page="tableData.page_no"
+        :page-sizes="[10, 20, 50, 100]"
+        :page-size="tableData.page_size"
+        layout="total, sizes, prev, pager, next, jumper"
+        :total="tableData.data_total">
+      </el-pagination>
+    </en-table-layout>
+  </div>
+</template>
+
+<script>
+  import * as API_Crowdfunding from '@/api/crowdfunding'
+
+  export default {
+    name: 'crowdfunding',
+    data() {
+      return {
+        /** 列表loading状态 */
+        loading: false,
+        /** 列表参数 */
+        params: {
+          page_no: 1,
+          page_size: 10
+        },
+
+        /** 列表数据 */
+        tableData: '',
+
+        /** 高级搜索数据 */
+        advancedForm: {}
+      }
+    },
+    watch: {
+      $route: {
+        handler(val) {
+          if (val.name === 'crowdfunding') {
+            this.getList()
+          }
+        },
+        immediate: true
+      }
+    },
+    methods: {
+      /** 分页大小发生改变 */
+      handlePageSizeChange(size) {
+        this.params.page_size = size
+        this.getList()
+      },
+
+      /** 分页页数发生改变 */
+      handlePageCurrentChange(page) {
+        this.params.page_no = page
+        this.getList()
+      },
+
+      /** 添加众筹活动 */
+      handleAdd() {
+        this.$router.push({
+          name: 'addCrowdfunding'
+        })
+      },
+      /** 查看活动详情 */
+      handlerView(row) {
+        this.$router.push({
+          name: 'viewCrowdfunding',
+          query: { id: row.id }
+        })
+      },
+
+      /** 关闭活动 */
+      handleClose(row) {
+        this.$confirm('确认要终止吗？终止后将自动取消该活动的所有订单。', '提示').then(() => {
+          API_Crowdfunding.stop(row.id).then(() => {
+            this.$message.success('操作成功')
+            this.getList()
+          })
+        }).catch(() => {})
+      },
+      /** 删除活动 */
+      handleDelete(row) {
+        this.$confirm('确认要删除这个活动吗？', '提示').then(() => {
+          API_Crowdfunding.del(row.id).then(res => {
+            this.$message.success('删除成功！')
+            this.getList()
+          })
+        }).catch(() => {})
+      },
+
+      /** 修改活动 */
+      handleEdit(row) {
+        this.$router.push({
+          name: 'editCrowdfunding',
+          query: { id: row.id }
+        })
+      },
+
+      /** 搜索事件触发 */
+      searchEvent(data) {
+        this.params.page_no = 1
+        this.params.name = data
+        if (!data) delete this.params.name
+        this.getList()
+      },
+
+      /** 高级搜索事件触发 */
+      advancedSearchEvent() {
+        this.params = {
+          ...this.params,
+          ...this.advancedForm
+        }
+        this.params.page_no = 1
+        this.getList()
+      },
+
+      /** 获取活动列表 */
+      getList() {
+        this.loading = true
+        API_Crowdfunding.getList(this.params).then(response => {
+          this.loading = false
+          this.tableData = response
+        }).catch(() => { this.loading = false })
+      },
+      /** 禁用/启用 */
+      async handleUpdateEndShowFlag(row) {
+        try {
+          await API_Crowdfunding.updateEndShowFlag(row.id, row.end_show_flag)
+          this.$message.success('操作成功！')
+          // 刷新列表
+          await this.getList()
+        } catch (e) {
+          // 取消或更新失败，恢复按钮
+          row.end_show_flag = !row.end_show_flag
+        }
+      }
+    }
+  }
+</script>
+<style type="text/scss" lang="scss">
+  .el-dialog__title {
+    font-size:17px;
+  }
+</style>
diff --git a/manager-seller/src/views/dashboard/index.vue b/manager-seller/src/views/dashboard/index.vue
index 6ba27a54fdcdb5897a85bcae2a5fbd6e9d2bc548..58f3ae2a7af72bf84ae2912a799d0a86e56f9660 100644
--- a/manager-seller/src/views/dashboard/index.vue
+++ b/manager-seller/src/views/dashboard/index.vue
@@ -225,6 +225,7 @@
 </template>
 
 <script>
+  import * as echarts from 'echarts'
   import * as API_Dashboard from '@/api/dashboard'
   import * as API_shop from '@/api/shop'
 
@@ -256,7 +257,7 @@
     },
     mounted() {
       this.$nextTick(() => {
-        this.turnoverChart = this.$echarts.init(document.getElementById('turnoverChart'))
+        this.turnoverChart = echarts.init(document.getElementById('turnoverChart'))
       })
       const end = new Date()
       const start = new Date()
@@ -306,7 +307,7 @@
       },
       /** 上传成功后的钩子 更换图片 置空存储数组*/
       uploaded(response) {
-        this.shop_info.shop_logo = response.url
+        this.shopInfo.shop_logo = response.url
         this.fileList = []
         API_shop.updateShopLogo({ logo: response.url }).then(() => {
           this.$message.success('店铺LOGO修改成功')