Merge branch '2.1.0' of http://git.ycjcjy.com/SpaceOfCheng/wechat into 2.1.0

public/index.html

   <meta http-equiv="X-UA-Compatible" content="IE=edge">
   <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no"
     charset="utf-8" />
-  <link rel="stylesheet" href="//at.alicdn.com/t/font_775069_q841vrk4ihm.css">
+  <link rel="stylesheet" href="//at.alicdn.com/t/font_775069_s109s6ry4gl.css">
   <link rel="icon" href="<%= BASE_URL %>favicon.ico">
   <title>
     <%= htmlWebpackPlugin.options.title %>

src/common/css/reset.css

 	display: none;
 }
 
+.van-dialog__message {
+  text-align: center;
+}
+
 .van-dialog__message .van-dialog__message--has-title{
 	text-align: center;
 }

src/components/customerCard/customerCard.vue

       </div>
       <div>
         <div @click="record">领取记录</div>
+        <div @click="history">历史备注</div>
       </div>
     </div>
+    <div class="card-bottom">
+      <span>备注：{{data.Remark}}</span>
+      <span @click="remark">+ 添加备注</span>
+    </div>
   </div>
 </template>
 
     record () {
       this.$emit('record', this.data)
     },
+    remark () {
+      this.$emit('remark', this.data)
+    },
+    history () {
+      this.$emit('history', this.data)
+    }
   }
 }
 </script>
     display: flex;
     padding: 0.15rem;
     justify-content: space-between;
+    align-items: center;
     span:nth-of-type(1) {
       color: #323645;
+      width: 2.3rem;
+      white-space: nowrap;
+      overflow: hidden;
+      text-overflow: ellipsis;
     }
     span:nth-of-type(2) {
       color: #909090;

src/components/myCard/myCard.vue

       <div>
         <h2>{{data.title}}</h2>
         <span class="descs">{{data.desc}}</span>
-        <span>{{data.startDate}}-{{data.endDate}}</span>
+        <span v-if="data.ValidDays">领取后{{data.ValidDays}}天内有效</span>
+        <span v-else>{{data.startDate}}-{{data.endDate}}</span>
       </div>
     </div>
     <div class="card-main flex-h" @click="detail">

src/components/topCaseInfo/index.vue

       <span>{{data.caseName}}</span>
       <a v-if="data.ShowSelect" @click="selectCase">请选择</a>
       <div class="flex-item">
+        <span v-if="data.recommendCode && fromPage === 'sales'">我的推荐码{{data.recommendCode}}</span>
+        <span v-else></span>
         <span>{{userName}}您好！</span>
       </div>
   </div>
 
 export default {
   name: '',
-  props: ['data', 'userName'],
+  props: ['data', 'userName' ,'fromPage'],
   data () {
     return {
 

src/components/topCaseInfo/page.scss

     margin-left: .2rem;
   }
   &>div{
-    text-align: right;
-    margin-right: .2rem;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    margin: 0 .2rem 0 .2rem;
     font-size: 0;
     span{
       font-size: .12rem;

src/pages/sales/cardAndCouponNum/index.vue

         <div>
           <span>{{data.CardName}}</span>
           <span>卡券描述卡券描述卡券描述卡券描述卡券描述</span>
-          <span>{{toolClass.dateFormat(data.StartDate)}} - {{toolClass.dateFormat(data.EndDate)}}</span>
+          <span v-if="data.ValidDays>0">领取后{{data.ValidDays}}天有效</span>
+          <span v-else>{{toolClass.dateFormat(data.StartDate)}} - {{toolClass.dateFormat(data.EndDate)}}</span>
         </div>
       </div>
     </div>

src/pages/sales/customerSearch/index.vue

         <ul>
           <li class="customer-card">
             <div class="list-box">
-              <customerCard v-for="(item,index) in cardList" :key="index" :data='item' @record='record'></customerCard>
+              <customerCard v-for="(item,index) in cardList" :key="index" :data='item' @record='record' @history='history' @remark='remark'></customerCard>
               <!-- <span class="noData" v-if="ajaxOff && !cardList.length">暂无数据</span> -->
               <noMore v-if="ajaxOff && hasPic"></noMore>
             </div>
       </div>
       <div class="mask-bottom"></div>
     </div>
+    <van-dialog
+      v-model="showDialog"
+      show-cancel-button
+      title='添加备注'
+      :before-close="beforeClose">
+      <van-field
+        v-model="message"
+        type="textarea"
+        placeholder="请输入备注"
+        rows="3"
+        autosize/>
+    </van-dialog>
   </div>
 </template>
 
 const { mapActions: caseTableActions } = createNamespacedHelpers('placeOrderForCoffee')
 const { mapState: mapCaseState, mapActions: mapCaseActions } = createNamespacedHelpers('case')
 const { mapActions: mapUserCenterActions } = createNamespacedHelpers('userCenter')
+const { mapState: mpRemarkState, mapActions: mapRemarkActions } = createNamespacedHelpers('remark')
 
 export default {
   name: '',
       mask: true,
       checked: true,
       cardList: [],
+      showDialog: false,
+      remarkCustomerId: ''
     }
   },
   computed: {
     ...mapCaseActions([
       'getCaseTotal',
     ]),
+    ...mapRemarkActions(['setRemark']),
     record (item) {
       // console.log(item)
-      this.$router.push({ name: 'getRecord', query: { name: item.Name, phone: item.Phone, id: item.CustomerId } })
+      this.$router.push({ name: 'getRecord', query: { name: item.Name, phone: item.Phone, id: item.CustomerId } }).then(() => {
+        this.getCustomerList({
+          page: 1,
+          pagesize: 10000,
+          isrecommend: false,
+          key: this.key,
+        }).then((res) => {
+          this.message = null
+          this.cardList = []
+          if (res) {
+            for (var n = 0; n < res.length; n++) {
+              if (res[n].RecommendId === this.userInfo.customer.MapUser) {
+                res[n].showTag = true
+              } else {
+                res[n].showTag = false
+              }
+              this.cardList.push(res[n])
+            }
+          } else {
+            this.hasPic = true
+          }
+          this.mask = false
+          this.ajaxOff = true
+        })
+      })
+    },
+    remark (item) {
+      // console.log(item)
+      this.showDialog = true
+      this.remarkCustomerId = item.CustomerId
+    },
+    history (item) {
+      // console.log(item)
+      this.$router.push({ name: 'history', query: { customerId: item.CustomerId } })
     },
     searchMask () {
       this.getCustomerList({
         caseid: this.topCaseInfoData.caseId
       })
       this.showSelect = false
-    }
+    },
+    beforeClose (action, done) {
+      if (action === 'confirm') {
+        this.setRemark({ salesId: this.userInfo.customer.MapUser, customerId: this.remarkCustomerId, remark: this.message }).then(() => {
+          done()
+        })
+      } else {
+        done()
+      }
+    },
   }
 }
 </script>

src/pages/sales/history/index.vue

 <template>
   <div class="mainPage">
     <div class="top">
-      <topCaseInfo :data="topCaseInfoData" @selectCase="showSelect = true"></topCaseInfo>
+      <topCaseInfo :data="topCaseInfoData" :userName="userInfo.customer.RealName ? userInfo.customer.RealName : userInfo.customer.CustomerName"></topCaseInfo>
     </div>
-    <div class="info">
-      <span><em>姓名</em>：顶顶顶</span>
-      <span><em>手机号</em>：13888888888</span>
+    <div class="info" v-if="list.length > 0">
+      <span><em>姓名</em>：{{list[0].CustomerName}}</span>
+      <span><em>手机号</em>：{{list[0].Phone}}</span>
     </div>
-    <div class="list-content">
-      <div class="list-year">2018年备注记录</div>
+    <div class="list-content" v-if="list.length > 0">
+      <div class="list-year">备注记录</div>
       <div class="list-card" v-for="(item,index) in list" :key="index">
         <div class="point-top"></div>
         <div class="point-bottom"></div>
-        <div class="card-time">7.29</div>
-        <div class="card-content">更多备注信息更多备注信息，更多备注信息更多备注信息更多备注信息更多备注信息。更多备注信息更多备注信息。</div>
+        <div class="card-time">{{toolClass.dateFormat(item.CreateDate,'MM-dd')}}</div>
+        <div class="card-content">{{item.Remark}}</div>
       </div>
     </div>
+    <noMore v-if="list.length <= 0"></noMore>
   </div>
 </template>
 
 <script>
 import topCaseInfo from '../../../components/topCaseInfo/index'
-
+import noMore from '../../../components/noMore/noMore'
+import { mapState, createNamespacedHelpers } from 'vuex'
+const { mapActions: actions } = createNamespacedHelpers('app')
+const { mapState: mapRemarkState, mapActions: mapRemarkActions } = createNamespacedHelpers('remark')
 export default {
   name: '',
   data () {
     return {
-      list: [1,1,1,1,1],
       topCaseInfoData: {
         caseName: '',
         caseId: '',
-        showSelect: false,
-        userName: 'xxx'
+        ShowSelect: false,
       },
     }
   },
   components: {
     topCaseInfo,
+    noMore
+  },
+  computed: {
+    ...mapState({
+      userInfo: x => x.userCenter.userInfo,
+      CaseList: x => x.app.CaseList,
+    }),
+    ...mapRemarkState({
+      list: x => x.remarkList
+    }),
   },
   created () {
-
+    this.getCaseList().then((res) => {
+      this.topCaseInfoData.caseId = this.userInfo.customer.BelongCaseId
+      for (let i = 0; i < this.CaseList.length; i++) {
+        if (this.CaseList[i].CaseId === this.topCaseInfoData.caseId) {
+          this.topCaseInfoData.caseName = this.CaseList[i].CaseName
+        }
+      }
+      this.getRemark({ salesId: this.userInfo.customer.MapUser, customerId: this.$route.query.customerId }).then(() => {
+        console.log(this.list)
+      })
+    })
   },
   methods: {
-    
+    ...actions([
+      'getCaseList',
+    ]),
+    ...mapRemarkActions([
+      'getRemark',
+    ])
   }
 }
 </script>

src/pages/sales/salesGiveOutDetail/index.vue

                   </div>
                   <div class="flex-item">
                     <div>
-                      <span>￥{{item.Price}} * 1</span>
+                      <span>￥{{item.Price}} * {{item.Number}}</span>
                     </div>
                   </div>
                   <span>{{toolClass.dateFormat(item.CreateDate, 'yyyy/MM/dd hh:mm')}}</span>

src/pages/user/bindMobile/bindMobile.vue

           <input type="tel" maxlength="11" placeholder="手机号" v-model="postData.phone">
         </div>
 
-        <div class="recommend">
+        <!-- <div class="recommend">
           <span>推荐人</span>
           <div @click="selectCase">
             <span>{{caseName}}</span>
             <span>{{salesName}}</span>
             <i class="iconfont icon-triangle-bottom"></i>
           </div>
+        </div> -->
+
+        <div class="mobile">
+          <i class="iconfont icon-zhanghu"></i>
+          <input type="tel" placeholder="推荐码" v-model="postData.recommendCode">
         </div>
 
         <div class="sms">
           <div>提交</div>
         </div>
       </div>
-      <transition name="slide">
+      <!-- <transition name="slide">
         <div class="select" v-if="showCase">
           <van-picker
             show-toolbar
             @confirm="onConfirmS"
           />
         </div>
-      </transition>
+      </transition> -->
     </div>
   </div>
 </template>
 import logo from '../../../common/icon/logo.png'
 import { mapState, createNamespacedHelpers } from 'vuex'
 const { mapActions: actions } = createNamespacedHelpers('userCenter')
-let canSubmit
 export default {
   data () {
     return {
       seconds: 61,
       postData: {
         phone: '',
-        case: '',
-        sales: '',
+        // case: '',
+        // sales: '',
+        recommendCode: '',
         captcha: ''
-      }
+      },
+      canSubmit: true
     }
   },
   computed: {
     })
   },
   created () {
-    canSubmit = true
     this.getCaseInfo(1).then(() => {
       this.columns = this.caseInfo.cases
     })
+    console.log(1123)
   },
   methods: {
     ...actions(['getCaseInfo']),
     ...actions(['getCaptcha']),
     ...actions(['submitData']),
-    onConfirmC (value, index) {
-      this.caseName = value.CaseName
-      this.postData.case = value.CaseId
-      this.columnsS = []
-      this.salesName = '选择销售'
-      if (this.caseInfo.sales) {
-        for (let i = 0; i < this.caseInfo.sales.length; i++) {
-          if (this.caseInfo.sales[i].CaseId === this.postData.case) {
-            this.columnsS.push(this.caseInfo.sales[i])
-          }
-        }
-      }
-      if (this.caseInfo.manager) {
-        for (let i = 0; i < this.caseInfo.manager.length; i++) {
-          if (this.caseInfo.manager[i].CaseId === this.postData.case) {
-            this.columnsS.push(this.caseInfo.manager[i])
-          }
-        }
-      }
-      this.showCase = false
-    },
-    onCancelC () {
-      this.showCase = false
-    },
-    onConfirmS (value, index) {
-      this.salesName = value.UserName
-      this.postData.sales = value.UserId
-      this.showSales = false
-    },
-    onCancelS () {
-      this.showSales = false
-    },
-    selectCase () {
-      this.showCase = true
-    },
-    selectSales () {
-      if (!this.postData.case) {
-        this.$toast('请先选择案场')
-        return
-      } else if (this.columnsS.length <= 0) {
-        this.$toast('此案场无销售')
-        return
-      }
-      this.showSales = true
-    },
+    ...actions(['recommendCode']),
+    // onConfirmC (value, index) {
+    //   this.caseName = value.CaseName
+    //   this.postData.case = value.CaseId
+    //   this.columnsS = []
+    //   this.salesName = '选择销售'
+    //   if (this.caseInfo.sales) {
+    //     for (let i = 0; i < this.caseInfo.sales.length; i++) {
+    //       if (this.caseInfo.sales[i].CaseId === this.postData.case) {
+    //         this.columnsS.push(this.caseInfo.sales[i])
+    //       }
+    //     }
+    //   }
+    //   if (this.caseInfo.manager) {
+    //     for (let i = 0; i < this.caseInfo.manager.length; i++) {
+    //       if (this.caseInfo.manager[i].CaseId === this.postData.case) {
+    //         this.columnsS.push(this.caseInfo.manager[i])
+    //       }
+    //     }
+    //   }
+    //   this.showCase = false
+    // },
+    // onCancelC () {
+    //   this.showCase = false
+    // },
+    // onConfirmS (value, index) {
+    //   this.salesName = value.UserName
+    //   this.postData.sales = value.UserId
+    //   this.showSales = false
+    // },
+    // onCancelS () {
+    //   this.showSales = false
+    // },
+    // selectCase () {
+    //   this.showCase = true
+    // },
+    // selectSales () {
+    //   if (!this.postData.case) {
+    //     this.$toast('请先选择案场')
+    //     return
+    //   } else if (this.columnsS.length <= 0) {
+    //     this.$toast('此案场无销售')
+    //     return
+    //   }
+    //   this.showSales = true
+    // },
     sandMsg () {
       if (!this.postData.phone) {
         this.$toast('请先填写手机号')
         return
       }
-      this.getCaptcha(this.postData.phone)
-      this.seconds = 60
-      this.runTime()
+      if (this.postData.recommendCode) {
+        this.recommendCode({ recommendCode: this.postData.recommendCode }).then((res) => {
+          if (res) {
+            this.getCaptcha(this.postData.phone)
+            this.seconds = 60
+            this.runTime()
+          } else {
+            this.$toast('推荐码不正确,请与案场人员核对')
+            return
+          }
+        }).catch((err) => {
+          return
+        })
+      } else {
+        this.getCaptcha(this.postData.phone)
+        this.seconds = 60
+        this.runTime()
+      }
     },
     runTime () {
       setTimeout(() => {
       }, 1000)
     },
     submit () {
-      if (!canSubmit){
+      if (!this.canSubmit) {
         return
       }
-      canSubmit = false
+      this.canSubmit = false
       if (!this.postData.captcha) {
         this.$toast('请填写验证码')
-        canSubmit = true
+        this.canSubmit = true
         return
       }
-      // if (!this.postData.case) {
-      //   this.$toast('请选择案场')
-      //   return
-      // }
-      // if (!this.postData.sales) {
-      //   this.$toast('请选择销售')
-      //   return
-      // }
-      this.submitData(this.postData).then((res) => {
-        if (this.$route.query.isLottery) {
-          setTimeout(() => {
-            const from = this.$route.query.luckshare ? `#/from/${this.$route.query.luckshare}` : ''
-            window.location.href = `${window.location.origin}/game/luckdraw/${from}`
-          }, 2000)
-        } else {
-          setTimeout(() => {
-            // this.$router.push({name: 'userCenter'})
-            window.history.go(-1)
-          }, 2000)
-        }
-      }).catch(() => {
-        console.log(111)
-        canSubmit = true
-      })
+      if (this.postData.recommendCode) {
+        this.recommendCode({ recommendCode: this.postData.recommendCode }).then((res) => {
+          if (res) {
+            this.submitData(this.postData).then((res) => {
+              if (this.$route.query.isLottery) {
+                setTimeout(() => {
+                  const from = this.$route.query.luckshare ? `#/from/${this.$route.query.luckshare}?lotteryId=${this.$route.query.lotteryId}&isnew=1` : `?lotteryId=${this.$route.query.lotteryId}&isnew=1`
+                  window.location.href = `${window.location.origin}/game/luckdraw/${from}`
+                }, 2000)
+              } else {
+                setTimeout(() => {
+                  // this.$router.push({name: 'userCenter'})
+                  window.history.go(-1)
+                }, 2000)
+              }
+            }).catch(() => {
+              console.log(111)
+              this.canSubmit = true
+            })
+          } else {
+            this.$toast('推荐码不正确,请与案场人员核对')
+            this.canSubmit = true
+            return
+          }
+        })
+      } else {
+        this.submitData(this.postData).then((res) => {
+          if (this.$route.query.isLottery) {
+            setTimeout(() => {
+              const from = this.$route.query.luckshare ? `#/from/${this.$route.query.luckshare}?lotteryId=${this.$route.query.lotteryId}&isnew=1` : `?lotteryId=${this.$route.query.lotteryId}&isnew=1`
+              window.location.href = `${window.location.origin}/game/luckdraw/${from}`
+            }, 2000)
+          } else {
+            setTimeout(() => {
+              // this.$router.push({name: 'userCenter'})
+              window.history.go(-1)
+            }, 2000)
+          }
+        }).catch(() => {
+          console.log(111)
+          this.canSubmit = true
+        })
+      }
     }
   }
 }

src/pages/user/bindMobile/page.scss

     }
     .box{
       width: 3.25rem;
-      height: 3.34rem;
+      height: 3.5rem;
       background:rgba(255,255,255,1);
       border-radius:8px;
       padding: .2rem;
         font-size: .16rem;
         font-weight: bold;
         text-align: center;
-        padding-bottom: .24rem;
       }
       .mobile,.sms{
         width: 2.85rem;
         display: flex;
         align-items: center;
         position: relative;
+        margin-top: .2rem;
         i{
           color: rgba(168,182,200,1);
           padding: .14rem;
         }
       }
       .submit{
-        margin-top: .24rem;
+        margin-top: .2rem;
         width: 2.85rem;
         height: .48rem;
         border-radius:25px;

src/pages/user/mainPage/coffeeIndex/index.vue

 <template>
   <div class="mainPage flex-v">
     <div class="top">
-      <topCaseInfo :data="topCaseInfoData" :userName="userInfo.customer.RealName ? userInfo.customer.RealName : userInfo.customer.Name" @selectCase="showVanPicker"></topCaseInfo>
+      <topCaseInfo :data="topCaseInfoData" :fromPage='fromPage' :userName="userInfo.customer.RealName ? userInfo.customer.RealName : userInfo.customer.Name" @selectCase="showVanPicker"></topCaseInfo>
     </div>
-    <nav class="flex-h" v-if="userInfo.customer.MapUser !== ''">
-      <a class="flex-item" v-for="(item,index) in cutNavList" :key="index" v-if="userInfo.customer.UserTypeId !== 'manager' || item.id !== '4'" :class="{'active': navActive === index}" @click="cutNav(index)">{{item.value}}</a>
+    <nav class="flex-h" v-if="userInfo.customer.MapUser !== '' && fromPage === 'sales'">
+      <a class="flex-item" v-for="(item,index) in cutNavList" :key="index" :class="{'active': navActive === index}" @click="cutNav(index)">{{item.value}}</a>
     </nav>
       <div class="content">
         <div>
           <ul>
             <li :hidden="navActive !== 0 && userInfo.customer.MapUser !== ''" class="placeOrder">
-              <div class="topInfo flex-h" v-if="userInfo.customer.MapUser !== ''">
+              <div class="topInfo flex-h" v-if="userInfo.customer.MapUser !== '' && fromPage === 'sales'">
                 <div class="flex-item">
                   <div>
                     <span>共计已使用：{{caseTotal.total}}杯</span>
                   </van-checkbox>
                   <i class="iconfont icon-sousuo search-icon" @click="searchMask"></i>
                 </div>
-                <customerCard v-for="(item,index) in postCustomerData.isrecommend ? myRecommendUserList : data[3].list" :key="index" :data='item' @record='record'></customerCard>
+                <customerCard v-for="(item,index) in postCustomerData.isrecommend ? myRecommendUserList : data[3].list" :key="index" :data='item' @record='record' @history='history' @remark='remark'></customerCard>
                 <noMore v-if="data[3].hasPic"></noMore>
               </div>
             </li>
 const { mapActions: actions } = createNamespacedHelpers('app')
 const { mapActions: caseTableActions } = createNamespacedHelpers('placeOrderForCoffee')
 const { mapState: mapCaseState, mapActions: mapCaseActions } = createNamespacedHelpers('case')
+const { mapState: mpRemarkState, mapActions: mapRemarkActions } = createNamespacedHelpers('remark')
 const { mapState: mapCardState, mapActions: mapCardActions } = createNamespacedHelpers('myCard')
 const { mapActions: mapUserCenterActions } = createNamespacedHelpers('userCenter')
 const wx = require('weixin-js-sdk')
   name: '',
   data () {
     return {
+      fromPage: '',
       myRecommendUserList: [],
       forbidList: [],
       postCustomerData: {
         caseName: '',
         caseId: '',
         ShowSelect: false,
+        recommendCode: ''
       },
       caseInfo: {
         value: '',
           pagesize: 1,
           list: []
         }
-      ]
+      ],
+      remarkCustomerId: ''
     }
   },
   computed: {
     }),
     ...mapCaseState({
       caseTotal: x => x.caseTotal,
+      choosedCase: x => x.choosedCase
     }),
     ...mapCardState({
       cardList: x => x.cardList
     noMore
   },
   created () {
-    if (!this.userInfo.customer.MapUser) {
+    this.fromPage = sessionStorage.getItem('from')
+    if (!this.userInfo.customer.MapUser || (this.userInfo.customer.MapUser && this.fromPage !== 'sales')) {
       this.topCaseInfoData.ShowSelect = true
     }
     if (this.userInfo.customer.MapUser !== '') {
                 SentCount: res.list[n].SentCount,
                 usedCount: res.list[n].UsedCount,
                 CardId: res.list[n].CouponId,
-                CustomerList: res.list[n].CustomerCoupon || []
+                CustomerList: res.list[n].CustomerCoupon || [],
+                ValidDays: res.list[n].ValidDays
               })
             }
             var count = 0
           }
         })
       })
+      this.getRecommendCode().then((res) => {
+        this.topCaseInfoData.recommendCode = res
+      })
     } else {
 
     }
       'getMyCouponList',
       'getForbidInfo',
       'getCustomerList',
+      'getRecommendCode'
     ]),
     ...actions([
       'getCaseList',
     ...mapCaseActions([
       'getCaseTotal',
       'getCaseConf',
+      'changeChoosedCase'
     ]),
     ...mapCardActions(['getCardList']),
+    ...mapRemarkActions(['setRemark']),
     checkCanDo () {
       const _that = this
       return this.forbidList.filter(x => x.UserId === _that.userInfo.customer.MapUser && x.ForbidType === 'coupon').length > 0
       }
     },
     returnInvalid (item, type) {
+      console.log(item)
+      if (item.ValidDays && item.ValidDays > 0) {
+        return false
+      }
       for (var n = 0; n < this.forbidList.length; n++) {
         if (this.forbidList[n].UserId === this.userInfo.customer.CustomerId && this.forbidList[n].ForbidType === type) {
           return true
         caseid: this.topCaseInfoData.caseId
       })
       this.showSelect = false
+      this.changeChoosedCase({ CaseName: val.CaseName, CaseId: val.CaseId })
     },
     cutNav (index) { // 切换nav
       this.navActive = index
     remark (item) {
       // console.log(item)
       this.showDialog = true
+      this.remarkCustomerId = item.CustomerId
     },
     history (item) {
       // console.log(item)
-      window.location.href = this.getUrl('history')
+      window.location.href = this.getUrl(`history?customerId=${item.CustomerId}`)
     },
     record (item) {
       // console.log(item)
           })
         }
       } else {
-        wxsdk({ url: encodeURIComponent(window.location.href.split('#')[0]) }, {
-          title: '城的空间',
-          desc: '城的空间',
-          link: `${window.location.origin}${window.location.pathname}#/mainPage/indexPage`,
-          thu_image: `https://spaceofcheng.oss-cn-beijing.aliyuncs.com/indexlogo.jpg?x-oss-process=style/wxicon`
-        }).then(() => {
-          wx.getLocation({
-            type: 'gcj02', // 默认为wgs84的gps坐标，如果要返回直接给openLocation用的火星坐标，可传入'gcj02'
-            success: function (res) {
-              let latitude1 = res.latitude // 纬度，浮点数，范围为90 ~ -90
-              let longitude1 = res.longitude // 经度，浮点数，范围为180 ~ -180。
-              for (let i = 0; i < that.CaseList.length; i++) {
-                let result = that.CaseList[i].Coordinate.split(",")
-                let latitude2 = parseFloat(result[0])
-                let longitude2 = parseFloat(result[1])
-                if (that.toolClass.getGreatCircleDistance(latitude1, longitude1, latitude2, longitude2) < 500) {
-                  that.topCaseInfoData.caseName = that.CaseList[i].CaseName
-                  that.topCaseInfoData.caseId = that.CaseList[i].CaseId
-                  that.getCaseTableList({
-                    caseid: that.topCaseInfoData.caseId
-                  })
-                  if (this.userInfo.customer.MapUser !== '') {
-                    that.getCaseTotal({
+        // console.log(this.choosedCase)
+        if (this.choosedCase.CaseId) {
+          that.topCaseInfoData.caseName = this.choosedCase.CaseName
+          that.topCaseInfoData.caseId = this.choosedCase.CaseId
+          // that.getCaseTableList({
+          //   caseid: that.topCaseInfoData.caseId
+          // })
+          // if (this.userInfo.customer.MapUser !== '') {
+          //   that.getCaseTotal({
+          //     caseid: that.topCaseInfoData.caseId
+          //   })
+          // }
+        } else {
+          wxsdk({ url: encodeURIComponent(window.location.href.split('#')[0]) }, {
+            title: '城的空间',
+            desc: '城的空间',
+            link: `${window.location.origin}${window.location.pathname}#/mainPage/indexPage`,
+            thu_image: `https://spaceofcheng.oss-cn-beijing.aliyuncs.com/indexlogo.jpg?x-oss-process=style/wxicon`
+          }).then(() => {
+            wx.getLocation({
+              type: 'gcj02', // 默认为wgs84的gps坐标，如果要返回直接给openLocation用的火星坐标，可传入'gcj02'
+              success: function (res) {
+                let latitude1 = res.latitude // 纬度，浮点数，范围为90 ~ -90
+                let longitude1 = res.longitude // 经度，浮点数，范围为180 ~ -180。
+                for (let i = 0; i < that.CaseList.length; i++) {
+                  let result = that.CaseList[i].Coordinate.split(",")
+                  let latitude2 = parseFloat(result[0])
+                  let longitude2 = parseFloat(result[1])
+                  if (that.toolClass.getGreatCircleDistance(latitude1, longitude1, latitude2, longitude2) < 500) {
+                    that.topCaseInfoData.caseName = that.CaseList[i].CaseName
+                    that.topCaseInfoData.caseId = that.CaseList[i].CaseId
+                    that.getCaseTableList({
                       caseid: that.topCaseInfoData.caseId
                     })
+                    if (this.userInfo.customer.MapUser !== '') {
+                      that.getCaseTotal({
+                        caseid: that.topCaseInfoData.caseId
+                      })
+                    }
                   }
                 }
+                if (!that.topCaseInfoData.caseId || !that.topCaseInfoData.caseName) {
+                  that.$toast('当前位置无案场')
+                  that.topCaseInfoData.caseName = '当前位置无案场'
+                }
               }
-              if (!that.topCaseInfoData.caseId || !that.topCaseInfoData.caseName) {
-                that.$toast('当前位置无案场')
-                that.topCaseInfoData.caseName = '当前位置无案场'
-              }
-            }
+            })
           })
-        })
+        }
       }
     },
     beforeClose (action, done) {
       if (action === 'confirm') {
-        setTimeout(done, 1000)
+        this.setRemark({ salesId: this.userInfo.customer.MapUser, customerId: this.remarkCustomerId, remark: this.message }).then(() => {
+          this.getCustomerList({
+            ...this.postCustomerData
+          }).then((res) => {
+            this.message = null
+            this.data[3].list = []
+            if (res) {
+              for (var n = 0; n < res.length; n++) {
+                if (res[n].RecommendId === this.userInfo.customer.MapUser) {
+                  this.myRecommendUserList.push(res[n])
+                  res[n].showTag = true
+                } else {
+                  res[n].showTag = false
+                }
+                this.data[3].list.push(res[n])
+              }
+            } else {
+              this.data[3].hasPic = true
+            }
+          })
+          done()
+        })
       } else {
         done()
       }
     toOrders (subItem, item) {
       const _that = this
       this.getCaseConf({ caseid: subItem.CaseId }).then(res => {
-        if (this.checkCanOrder()) {
+        if (this.checkCanOrder() && sessionStorage.getItem('from') === 'sales') {
           _that.$toast('您的点单功能已被关闭！')
           return
         }

src/pages/user/mainPage/index.vue

         <router-view></router-view>
       </div>
     </div>
-    <nav class="flex-h">
+    <nav class="flex-h" :style="{paddingBottom: isIphoneX ? '.1rem' : '0'}">
       <router-link :to="{name:item.pathName,query:{}}" v-if="showTabBar" class="flex-item" active-class="active" v-for="(item, index) in tabBar" :key="index">
         <div>
           <img v-if="index==0" class="centerLabel" src="../../../common/icon/tabBar-icon-1.png" alt="">
 </template>
 
 <script>
-import { mapState } from 'vuex'
+import { mapState, mapActions } from 'vuex'
 export default {
   name: '',
   data () {
     return {
+      isIphoneX: false,
       tabBar: [{
         pathName: 'indexPage',
         name: '城的空间'
   components: {
   },
   created () {
+    var aHeight = document.documentElement.clientHeight,
+      aWidth = document.documentElement.clientWidth
+    if (aHeight === 724 && aWidth === 375) {
+      this.isIphoneX = true
+    }
     if (!this.userInfo.customer.MapUser || !this.$route.query.hideTabbar) {
       this.showTabBar = true
     }
-  },
-  methods: {
+    if (this.$route.query.hideTabbar) {
+      sessionStorage.setItem('from', 'sales')
+    }
   }
 }
 </script>

src/pages/user/mainPage/userCenter/index.vue

           <span>卡券</span>
           <span>0张未使用</span>
         </div>
-        <div class="flex-item privilege-item" @click="toVip">
+        <div class="flex-item privilege-item" @click="toVipDetail">
+          <i class="iconfont icon-01" @click.stop="toVip"></i>
           <div class="img-box">
             <img src="../../../../common/icon/userCenter-icon-3.png" width="100%" height="100%" alt="">
           </div>
           <span>VIP卡</span>
-          <span>￥{{(Nums.account || {}).Amount || 0}} <i class="iconfont icon-jiantou-right" style="font-size: 0.1rem;"></i></span>
+          <span>￥{{Nums.vipbalance}} <i class="iconfont icon-jiantou-right" style="font-size: 0.1rem;"></i></span>
         </div>
       </div>
 
       this.user = this.userInfo.customer
       if (this.user.AccountInfo) {
         this.AccountInfo = JSON.parse(this.user.AccountInfo)
+
+        
       }
       this.headimgurl = this.user.Headimgurl
     })
     toVip () {
       this.$router.push({ name: 'vip' })
     },
+    toVipDetail() {
+      this.$router.push({ name: 'vipDetail' })
+    },
     toCard () {
       this.$router.push({ name: 'card' })
     },
       this.$router.push({ name: 'bindMobile' })
     },
     toGoodsOrder () {
-      this.$router.push({ name: 'orderList' })
+      this.$router.push({ name: 'orderList', query: { from: 'c' } })
     },
     toBodyCheck () {
       var url = window.location.pathname

src/pages/user/mainPage/userCenter/page.scss

   box-shadow:0px 2px 12px 0px rgba(219,219,219,0.5);
   border-radius:8px;
   box-sizing: border-box;
-
   .privilege-item {
     display: flex;
     flex-flow: column nowrap;
     justify-content: center;
     align-items: center;
+    position: relative;
+    .icon-01{
+      position: absolute;
+      top: .05rem;
+      right: .05rem;
+      font-size: .18rem;
+    }
     .img-box {
       width: 0.24rem;
       height: 0.18rem;

src/pages/user/majorProjectsDetail/index.vue

       message: x => x.index.message,
       project: x => x.index.project,
       cms: x => x.index.cms,
+      user: x => x.userCenter.userInfo
     }),
     ...mapProjectState({
       courseDetail: x => x.courseDetail
         this.courseDetail.CourseImgs.sort(this.getSortFun('asc', 'Sort'))
         this.detailImage = this.courseDetail.CourseImgs
       }
-      console.log(this.detailImage)
+      // console.log(this.detailImage)
       this.courseTimeList = arr.sort(function (a, b) { return new Date(a.BeginDate).getTime() > new Date(b.BeginDate).getTime() ? 1 : -1 })
       let nowDate = Date.now()
       let endData = new Date(this.courseDetail.EndDate).getTime()
   methods: {
     ...mapProjectActions([
       'getCourseDetailInfo',
+      'placeCourseOrderBefore',
     ]),
     getSortFun (order, sortBy) {
       var ordAlpah = (order == 'asc') ? '>' : '<'
       if (nowDate > endData) {
         this.$toast('该课程已过期')
       } else {
-        this.$router.push({ name: 'placeOrderForCourse', query: { id: this.courseDetail.CourseId } })
+        this.placeCourseOrderBefore({
+          order: {
+            CourseId: this.courseDetail.CourseId,
+            CaseId: this.courseDetail.CaseId,
+            CustomerId: this.user.CustomerId,
+            Price: this.courseDetail.Price
+          },
+          customercouponid: ''
+        }).then((res) => {
+          // console.log(JSON.stringify(res))
+          this.$router.push({ name: 'placeOrderForCourse', query: { id: this.courseDetail.CourseId, ordersid: res.OrdersId } })
+        })
       }
     },
     openMap () {

src/pages/user/orderList/index.vue

     this.getCustomerGoodsOrder({
       page: this.page,
       pagesize: this.pagesize,
+      from: this.$route.query.from || ''
     }).then((res) => {
       // console.log(JSON.stringify(res))
-      if(res.list === null){
+      if (res.list === null) {
         this.noData = true
       }
     })
       Math.ceil(this.orders.pagenum / this.orders.pagesize) > this.page ? this.hasMore = true : this.hasMore = false
       // this.list.length <= 8 ? this.hasMore = true : this.hasMore = false
       if (this.hasMore) {
-        this.page = this.page+1
+        this.page = this.page + 1
         setTimeout(() => {
           _that.getCustomerGoodsOrder({
             page: _that.page,
             pagesize: _that.pagesize,
+            from: this.$route.query.from || ''
           })
         }, 1000)
       } else {
 
 <!-- Add "scoped" attribute to limit CSS to this component only -->
 <style lang="scss" scoped>
-@import "page.scss";
+@import 'page.scss';
 </style>

src/pages/user/placeOrder/index.vue

         <div class="flex-item">
           <div>
             <span>桌号：{{tableNo}}</span>
-            <span v-if="userInfo.customer.MapUser !== ''">本月已用：{{caseTotal.monthtotal}}杯</span>
+            <span v-if="userInfo.customer.MapUser !== '' && fromPage === 'sales'">本月已用：{{caseTotal.monthtotal}}杯</span>
           </div>
         </div>
         <a @click="reback">返回选择桌号</a>
       </div>
       <a @click="toPlaceOrder">下单</a>
     </div>
-    <orderPopup :show="showPopup" :data="currentSpec" @closePopup="closePopup" @returnData="calcMenus"></orderPopup>
+    <orderPopup v-if="showPopup" :show="showPopup" :data="currentSpec" @closePopup="closePopup" @returnData="calcMenus"></orderPopup>
     <calcMenu :show="showCalcMenu" :totalNum="sumNum + caseTotal.total" :data="selGoods" @returnData="calcMenus" @emptyMenus="emptyMenus" @closeCalcMenu="closeCalcMenu" @placeOrder="placeOrder"></calcMenu>
     <div class="successPopup" v-if="showSuccessPopup">
       <div>
     calcMenu,
   },
   created () {
+    this.fromPage = sessionStorage.getItem('from')
     this.getGoodsTypeList({
       caseid: this.caseId,
     }).then((res) => {
     ...caseTableActions([
       'getGoodsTypeList',
       'getGoodsList',
+      'toPayBefore',
       'toPay',
     ]),
     ...mapCaseActions([
     ]),
     toPlaceOrder () { // 下单 
       if (this.selGoods.length) {
-        if (this.userInfo.customer.MapUser === '') {
-          this.$router.push({ name: 'placeOrderDetail', query: { info: JSON.stringify(this.selGoods), caseid: encodeURI(this.caseId), areaid: encodeURI(this.areaId), areaname: encodeURI(this.areaName), areaid: encodeURI(this.areaId), tableid: encodeURI(this.tableId), tableno: encodeURI(this.tableNo) } })
+        if (this.userInfo.customer.MapUser === '' || (this.userInfo.customer.MapUser !== '' && sessionStorage.getItem('from') !== 'sales')) {
+          if (this.ajaxOff) {
+            this.ajaxOff = false
+            this.postData.info.OrgId = this.orgId
+            this.postData.info.UserId = this.userInfo.CustomerId
+            this.postData.info.UserName = this.userInfo.customer.CustomerName
+            this.postData.info.PayType = 'sys user'
+            this.postData.info.Remark = ''
+            this.postData.from = sessionStorage.getItem('from') ? sessionStorage.getItem('from') : ''
+            var orderInfo = this.selGoods
+            this.postData.detail = []
+            var amount = 0
+            var num = 0
+            for (var n = 0; n < orderInfo.length; n++) {
+              this.postData.detail.push({
+                GoodsId: orderInfo[n].id,
+                GoodsName: orderInfo[n].name,
+                SpecId: orderInfo[n].spec,
+                SpecName: orderInfo[n].specname,
+                Number: orderInfo[n].num - 0,
+                Price: String(orderInfo[n].price - 0),
+              })
+              amount += (orderInfo[n].price - 0) * orderInfo[n].num
+              num += orderInfo[n].num - 0
+            }
+            this.postData.info.Amount = String(amount)
+            this.postData.info.OrdersNum = num
+            // console.log(JSON.stringify(this.postData))
+            this.toPayBefore({
+              info: JSON.stringify(this.postData.info),
+              detail: JSON.stringify(this.postData.detail),
+              customercouponid: '',
+              from: this.postData.from
+            }).then((res) => {
+              // console.log(JSON.stringify(res))
+              this.ajaxOff = true
+              this.$router.push({ name: 'placeOrderDetail', query: { info: JSON.stringify(this.selGoods), caseid: encodeURI(this.caseId), areaid: encodeURI(this.areaId), areaname: encodeURI(this.areaName), areaid: encodeURI(this.areaId), tableid: encodeURI(this.tableId), tableno: encodeURI(this.tableNo), ordersid: res.OrdersId } })
+            }).catch(() => {
+              this.ajaxOff = true
+            })
+          }
         } else {
           this.showCalcMenu = true
         }
       })
     },
     placeOrder (Remark) { // 下单
-      if(this.ajaxOff){
+      if (this.ajaxOff) {
         this.ajaxOff = false
         this.postData.info.OrgId = this.orgId
         this.postData.info.UserId = this.userInfo.CustomerId
         this.postData.info.UserName = this.userInfo.customer.CustomerName
         this.postData.info.PayType = 'sys user'
         this.postData.info.Remark = Remark
+        this.postData.from = sessionStorage.getItem('from') ? sessionStorage.getItem('from') : ''
         var orderInfo = this.selGoods
         this.postData.detail = []
         var amount = 0
         this.toPay({
           info: JSON.stringify(this.postData.info),
           detail: JSON.stringify(this.postData.detail),
-          coupon: JSON.stringify(this.postData.coupon)
+          customercouponid: '',
+          from: this.postData.from
         }).then((res) => {
           this.ajaxOff = true
           this.showCalcMenu = false
           // }).then(() => {
 
           // })
+        }).catch(() => {
+          this.ajaxOff = true
         })
       }
     },
 <!-- Add "scoped" attribute to limit CSS to this component only -->
 <style lang="scss" scoped>
 @import 'page.scss';
-</style>
-
-<style>
-.van-dialog__message {
-  text-align: center;
-}
-</style>
+</style>

src/pages/user/placeOrderDetail/index.vue

     toPayer () { // 下单
       if (this.ajaxoff) {
         this.ajaxoff = false
-        this.postData.info.OrgId = this.orgId
-        this.postData.info.UserId = this.userInfo.CustomerId
-        this.postData.info.UserName = this.userInfo.customer.CustomerName
-        this.postData.info.PayType = this.postData.customercouponid === '' ? 'coupon' : 'vip'
-        var orderInfo = JSON.parse(this.$route.query.info)
-        this.postData.detail = []
-        var amount = 0
-        var num = 0
-        for (var n = 0; n < orderInfo.length; n++) {
-          this.postData.detail.push({
-            GoodsId: orderInfo[n].id,
-            GoodsName: orderInfo[n].name,
-            SpecId: orderInfo[n].spec,
-            SpecName: orderInfo[n].specname,
-            Number: orderInfo[n].num - 0,
-            Price: String(orderInfo[n].price - 0),
-          })
-          amount += (orderInfo[n].price - 0) * orderInfo[n].num
-          num += orderInfo[n].num - 0
-        }
-        this.postData.info.Amount = String(amount)
-        this.postData.info.OrdersNum = num
-        console.log(JSON.stringify(this.postData))
         this.toPay({
-          info: JSON.stringify(this.postData.info),
-          detail: JSON.stringify(this.postData.detail),
+          id: this.$route.query.ordersid,
+          remark: this.postData.info.Remark,
           customercouponid: this.postData.customercouponid
         }).then((res) => {
           this.showSuccessPopup = true
           //   window.history.go(-2)
           // })
         }).catch(() => {
-          // this.ajaxoff = true
+          this.ajaxOff = true
         })
       }
     },

src/pages/user/placeOrderForCourse/index.vue

   },
   created () {
     this.getCouponList().then((res) => {
+      res = res || []
       this.getCourseDetailInfo({ id: this.$route.query.id }).then((result) => {
         var arr = result.CourseDetail, caseid = result.CaseId
         // console.log(arr)
         return false
       }
       this.placeOrderForCourse({
-        order: {
-          CourseId: this.courseDetail.CourseId,
-          CaseId: this.courseDetail.CaseId,
-          CustomerId: this.user.CustomerId,
-          Price: this.courseDetail.Price
-        },
-        customercouponid: this.postData.customercouponid
+        id: this.$route.query.ordersid,
+        payload: {
+          customercouponid: this.postData.customercouponid,
+        }
       }).then((res) => {
         // console.log(JSON.stringify(res))
         this.$dialog.alert({
 <!-- Add "scoped" attribute to limit CSS to this component only -->
 <style lang="scss" scoped>
 @import 'page.scss';
-</style>
-
-<style lang="scss">
-.van-dialog{
-  width: 60% !important;
-}
-</style>
+</style>

src/pages/user/receive/index.vue

           <i class="icon-kaquan iconfont"></i>
           <span>卡券有效期</span>
         </div>
-        <pre>有效期至{{toolClass.dateFormat(data.EndDate,'yyyy-MM-dd')}}，请在有效期结束前使用， 过期作废；</pre>
+        <pre v-if="data.ValidDays>0">领取后{{data.ValidDays}}天有效，请在有效期结束前使用， 过期作废；</pre>
+        <pre v-else>有效期至{{toolClass.dateFormat(data.EndDate,'yyyy-MM-dd')}}，请在有效期结束前使用， 过期作废；</pre>
       </div>
       <div class="text">
         <div>
           this.sdk(this.data.Share.CouponShareInfo)
         })
       }
+      if (this.$route.query.isAuto === 'auto') {
+        setTimeout(() => {
+          this.receive()
+        }, 1000)
+      }
     },
     receive () {
       if (this.$route.query.type === 'card') {

src/pages/user/router.js

 import bindMobile from './bindMobile/bindMobile' // 绑定手机号
 import lessonOrder from './lessonOrder/index' // 我的订单
 import vip from './vip/index' // vip卡说明
+import vipDetail from './vipDetail/index' // vip卡说明
 import card from './card/index' // 卡
 import coupons from './coupons/index' // 优惠券
 import lessonDetail from './lessonDetail/index' // 课程详情
 import receive from './receive/index' // 领取页面
 import receiveResults from './receiveResults/index' // 领取结果页面
 import receiveChannel from './receiveChannel/index' // 渠道领取页面
+import rush from './rush/index' // 抢购
 
 Vue.use(Router)
 
     name: 'vip',
     component: vip,
     children: []
+  }, { // vip卡详情
+    path: '/vipDetail',
+    name: 'vipDetail',
+    component: vipDetail,
+    children: []
   }, { // 卡
     path: '/card',
     name: 'card',
     path: '/receiveChannelShared/:id/:type/:sharetype',
     name: 'receiveChannel',
     component: receiveChannel
+  }, { // 抢购
+    path: '/rush',
+    name: 'rush',
+    component: rush
   }],
   linkActiveClass: 'active',
 })

src/pages/user/rush/index.vue

+<template>
+  <div class="mainPage" v-if="showPage">
+    <div class="top-time" v-if="timeStatus<2">
+      <span v-if="timeStatus === 0">距抢购开始</span>
+      <span v-if="timeStatus === 1">距抢购结束</span>
+      <span class="time">{{day}}</span>
+      <span>天</span>
+      <span class="time">{{hour}}</span>
+      <span>时</span>
+      <span class="time">{{minute}}</span>
+      <span>分</span>
+      <span class="time">{{second}}</span>
+      <span>秒</span>
+    </div>
+    <div class="content">
+      <div class="title">{{detail.FlashBuyName}}</div>
+      <!-- <div class="video-or-cover">
+        <video v-if="video" width="100%" height="100%" preload="auto" x5-playsinline="true" controls="controls" :poster="type === 'card' ? data.Images[0].CardImageUrl : data.Images[0].CouponImageUrl">
+          <source :src="data.VideoUrl" type="video/mp4">
+          <source :src="data.VideoUrl" type="video/avi">
+          <source :src="data.VideoUrl" type="video/wma">
+          <source :src="data.VideoUrl" type="video/rmvb">
+          <source :src="data.VideoUrl" type="video/rm">
+        </video>
+        <img v-else src="" width="100%" height="100%">
+      </div> -->
+      <pre class="rule" v-html="detail.FlashBuyInfo"></pre>
+      <div class="scope-of-time">
+        <div>活动时间</div>
+        <div>{{toolClass.dateFormat(detail.StartDate)}} ~ {{toolClass.dateFormat(detail.EndDate)}}</div>
+      </div>
+    </div>
+    <div class="sign-in" v-if="timeStatus !== 2 && newCustomer && detail.AttendantType === 'no'" @click="signIn">立即注册</div>
+    <div class="submit">
+      <div :class="{light:timeStatus === 1}" @click="submit()" v-if="!used">{{btnText[timeStatus]}}</div>
+      <div v-else>已抢购</div>
+    </div>
+    <div class="success-box" v-if="showDialog">
+      <div class="success">
+        <span>恭喜您！抢购成功</span>
+        <img :src="logo" alt="">
+        <span>长按二维码关注“城的空间”，进入会员中心查看吧</span>
+        <div @click="showDialog = false">确定</div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import logo from '../../../common/icon/qrCode.jpg'
+import { mapState, createNamespacedHelpers } from 'vuex'
+const { mapActions: actions } = createNamespacedHelpers('app')
+const { mapState: mapRushState, mapActions: mapRushActions } = createNamespacedHelpers('rush')
+export default {
+  data () {
+    return {
+      logo,
+      day: '00',
+      hour: '00',
+      minute: '00',
+      second: '00',
+      hasTime: false,
+      timeStatus: 0, // 0、未开始 1、进行中 2、已结束 3、已抢购
+      btnText: ['立即抢购', '立即抢购', '已结束', '已抢购'],
+      Interval: null,
+      showDialog: false,
+      used: false,
+      showPage: false,
+      newCustomer: false
+    }
+  },
+  created () {
+    this.AddNewFlashBuyCustomer({ flashBuyId: this.$route.query.flashBuyId }).then(() => {
+      this.getRush({ flashBuyId: this.$route.query.flashBuyId }).then((res) => {
+        if (res.userInfo) {
+          this.used = true
+          this.newCustomer = res
+        }
+        let start = new Date(this.detail.StartDate).getTime()
+        let end = new Date(this.detail.EndDate).getTime()
+        this.timing(start, end)
+      })
+    })
+  },
+  computed: {
+    ...mapRushState({
+      detail: item => item.rushDetail
+    })
+  },
+  methods: {
+    ...mapRushActions(['setRush', 'getRush', 'AddNewFlashBuyCustomer', 'IsNewCustomer', 'UpdateFlashBuyCustomer']),
+    timing (startTime, endTime) {
+      this.Interval = setInterval(() => {
+        let nowTime = new Date().getTime()
+        if (nowTime >= endTime) {
+          clearInterval(this.Interval)
+          this.timeStatus = 2
+          this.showPage = true
+          return
+        } else if (nowTime <= startTime) {
+          let time = Math.floor((startTime - nowTime) / 1000)
+          this.getTime(time)
+          this.timeStatus = 0
+          this.showPage = true
+        } else if (nowTime >= startTime && nowTime <= endTime) {
+          let time = Math.floor((endTime - nowTime) / 1000)
+          this.getTime(time)
+          this.timeStatus = 1
+          this.showPage = true
+        }
+      }, 1000)
+    },
+    getTime (time) {
+      let second = time % 60
+      let minute = ((time % (60 * 60)) - second) / 60
+      let hour = ((time % (60 * 60 * 24)) - (minute * 60) - second) / (60 * 60)
+      let day = Math.floor(time / (60 * 60 * 24))
+      this.second = second < 10 ? '0' + second : second
+      this.minute = minute < 10 ? '0' + minute : minute
+      this.hour = hour < 10 ? '0' + hour : hour
+      this.day = day < 10 ? '0' + day : day
+    },
+    submit () {
+      if (this.newCustomer && this.detail.AttendantType !== 'no') {
+        this.signIn()
+        return
+      }
+      if (this.timeStatus !== 1) {
+        return
+      }
+      this.setRush({ id: this.detail.FlashBuyId }).then(() => {
+        this.UpdateFlashBuyCustomer({ flashBuyId: this.$route.query.flashBuyId })
+        this.showDialog = true
+      })
+    },
+    signIn () {
+      this.$router.push({ name: 'bindMobile' })
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+@import 'page.scss';
+</style>

src/pages/user/rush/page.scss

+.top-time{
+  height: .4rem;
+  width: 100%;
+  background: #fff;
+  box-shadow:0px 0px 14px 0px rgba(199,199,199,0.5);
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  span{
+    margin: .02rem;
+    padding: .02rem .05rem;
+    display: block;
+  }
+  .time{
+    background: #69563F;
+    border-radius: 2px;
+    color: #fff;
+  }
+}
+.content{
+  padding: .24rem .2rem .6rem;
+  box-sizing: border-box;
+  .title{
+    text-align: center;
+    font-size: .16rem;
+    color: #9D876D;
+    padding-bottom: .2rem
+  }
+  .video-or-cover{
+    width: 100%;
+    height: 2.22rem;
+    margin-bottom: .1rem;
+  }
+  .rule{
+    padding-bottom: .2rem;
+    white-space:pre-line;
+    text-align: left;
+    line-height: .18rem;
+    color: #585858;
+  }
+  .scope-of-time{
+    div:nth-of-type(1){
+      width: .66rem;
+      height: .26rem;
+      background:rgba(157,135,109,.3);
+      border-radius:.13rem;
+      text-align: center;
+      line-height: .26rem;
+      font-size: .12rem;
+      color: #69563F;
+      margin-bottom: .05rem;
+    }
+    div:nth-of-type(2){
+      color: #585858;
+      font-size: .14rem;
+    }
+  }
+}
+.submit{
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  position: fixed;
+  bottom: 0;
+  left: 0;
+  z-index: 2;
+  width: 100%;
+  height: .6rem;
+  div{
+    width: 3.35rem;
+    height: .4rem;
+    color: #fff;
+    font-size: .16rem;
+    background: #aaa;
+    text-align: center;
+    line-height: .4rem;
+    border-radius: .2rem;
+  }
+  .light{
+    background: #9D876D;
+  }
+}
+.success-box{
+  position: fixed;
+  display: flex;
+  z-index: 999;
+  background: rgba(0,0,0,.2);
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  .success{
+    display: flex;
+    flex-flow: column nowrap;
+    justify-content: center;
+    align-items: center;
+    position: absolute;
+    top: 50%;
+    left: 50%;
+    width: 2.8rem;
+    height: 2.2rem;
+    border-radius: .2rem;
+    padding: .2rem .1rem;
+    transform: translate(-50%,-50%);
+    background: #fff;
+    span{
+      font-size: .14rem;
+    }
+    img{
+      width: .8rem;
+      height: .8rem;
+      margin: .15rem;
+    }
+    div{
+      width: .9rem;
+      height: .3rem;
+      background: #9D876D;
+      color: white;
+      font-size: .14rem;
+      border-radius: .08rem;
+      text-align: center;
+      line-height: .3rem;
+    }
+  }
+}
+.sign-in{
+  position: fixed;
+  bottom: .8rem;
+  right: .4rem;
+  width: .5rem;
+  height: .5rem;
+  background: #BAE0F6;
+  color: #fff;
+  font-size: .12rem;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  border-radius: 50%;
+}

src/pages/user/vipDetail/index.vue

+<template>
+  <div class="mainPage">
+    <swiper :options="swiperOption" ref="mySwiper" class="inner" v-if="detail.length > 0">
+      <swiper-slide class="swiper-slide" v-for="(item,index) in detail" :key="index">
+        <div class="vip-box">
+          <div class="vip-header">
+            <img :src='vipBg' width="100%" height="100%">
+            <div>
+              <span class="balance">￥ <span>{{item.Balance}}</span></span>
+              <span class="date">vip有效日期：{{toolClass.dateFormat(item.BeginDate, 'yyyy-MM-dd')}} ~ {{toolClass.dateFormat(item.EndDate, 'yyyy-MM-dd')}}</span>
+            </div>
+          </div>
+          <div class="vip-detail-list">
+            <div class="title">账单明细</div>
+            <div class="list-box">
+              <div class="list" v-for="(items,indexs) in item.Changes" :key="indexs">
+                <span>{{items.SourceName}}</span>
+                <span>{{items.FloatType}}{{items.Amount}}</span>
+                <span class="date">{{toolClass.dateFormat(items.CreateDate)}}</span>
+              </div>
+            </div>
+          </div>
+        </div>
+      </swiper-slide>
+    </swiper>
+    <div class="swiper-pagination" v-if="detail.length > 0"></div>
+    <noMore v-if='detail.length <= 0'></noMore>
+  </div>
+</template>
+
+<script>
+import vipBg from '../../../common/icon/vipBg.jpg'
+import { swiper, swiperSlide } from 'vue-awesome-swiper'
+import 'swiper/dist/css/swiper.css'
+import noMore from '../../../components/noMore/noMore'
+import { createNamespacedHelpers } from 'vuex'
+const { mapState: mapVipState, mapActions: mapVipActions } = createNamespacedHelpers('vip')
+export default {
+  data () {
+    return {
+      vipBg,
+      swiperOption: {
+        observer: true,
+        pagination: {
+          el: '.swiper-pagination',
+          type: 'bullets',
+          //type: 'fraction',
+          //type : 'progressbar',
+          //type : 'custom',
+          clickable: true, //此参数设置为true时，点击分页器的指示点分页器会控制Swiper切换。
+        },
+      }
+    }
+  },
+  components: {
+    swiper,
+    swiperSlide,
+    noMore
+  },
+  created () {
+    this.getVipDetail().then((res) => {
+      console.log(this.detail)
+    })
+  },
+  computed: {
+    MySwiper () {
+      return this.$refs.mySwiper.swiper
+    },
+    ...mapVipState({
+      detail: item => item.vipDetails
+    })
+  },
+  methods: {
+    ...mapVipActions(['getVipDetail'])
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+@import 'page.scss';
+</style>
+
+<style>
+.swiper-pagination > span {
+  margin: 0 0.025rem;
+}
+</style>

src/pages/user/vipDetail/page.scss

+.inner{
+  height: 100%;
+}
+.vip-box{
+  width: 100%;
+  height: 100%;
+  padding: .25rem .2rem;
+  box-sizing: border-box;
+  display: flex;
+  flex-flow: column nowrap;
+  .vip-header{
+    width: 100%;
+    position: relative;
+    margin-bottom: .4rem;
+    box-shadow: 0 0 .05rem .05rem #eee;
+    border-radius: .1rem;
+    height: 1.8rem;
+    overflow: hidden;
+    img{
+      position: absolute;
+      top: 0;
+      left: 0;
+    }
+    div{
+      position: absolute;
+      bottom: .2rem;
+      left: .2rem;
+      width: 80%;
+      display: flex;
+      flex-flow: column nowrap;
+      justify-content: center;
+      align-items: flex-start;
+      .balance{
+        color: #FC6243;
+        padding-bottom: .1rem;
+        font-weight: bold;
+        span{
+          font-size: .24rem;
+          font-weight: bold;
+          color: #FC6243;
+        }
+      }
+      .date{
+        color: #6D6D6D;
+      }
+    }
+  }
+  .vip-detail-list{
+    flex: 1;
+    display: flex;
+    flex-flow: column nowrap;
+    .title{
+      font-size: .16rem;
+      font-weight: bold;
+      padding-bottom: .15rem;
+    }
+    .list-box{
+      flex: 1;
+      overflow-y: scroll;
+      overflow-x: hidden;
+      .list{
+        display: flex;
+        align-items: center;
+        padding: .05rem 0 ;
+        border-bottom: 1px solid rgba(242,242,242,1);
+        span{
+          width: 30%;
+          overflow: hidden;
+          text-overflow: ellipsis;
+          white-space: nowrap;
+          margin-right: .05rem;
+        }
+        .date{
+          color: #999;
+          text-align: right;
+          flex: 1;
+        }
+      }
+    }
+  }
+}
+.swiper-pagination{
+  bottom: .2rem;
+  left: 50%;
+  transform: translateX(-50%);
+}

src/store/case/case.js

   state: {
     caseTotal: {},
     caseConf: {},
+    choosedCase: {}
   },
   mutations: {
     setCaseTotal (state, data) { // 获取案场下单数量信息
     setCaseConf (state, data) { // 获取案场下单数量信息
       state.caseConf = data
     },
+    setChoosedCase (state, data) { // 获取案场下单数量信息
+      state.choosedCase = data
+    },
   },
   actions: {
     getCaseTotal ({ commit }, { caseid }) {
         })
       })
     },
-    getCaseConf ({ commit },{ caseid }) {
+    getCaseConf ({ commit }, { caseid }) {
       return new Promise((resolve, reject) => {
         Ajax(api.case.conf.url, {
           method: api.case.conf.method,
           reject(err)
         })
       })
+    },
+    changeChoosedCase ({ commit }, data) {
+      commit("setChoosedCase", data)
     }
   }
 }

src/store/index.js

   forbid: () => require('./forbid/index').default,
   share: () => require('./share/index').default,
   bodyCheck: () => require('./bodyCheck/index').default,
+  vip: () => require('./vip/index').default,
+  remark: () => require('./remark/index').default,
+  rush: () => require('./rush/index').default,
 }
 
 Object.keys(modules).forEach((modKey) => {

src/store/majorProjects/majorProjects.js

     }
   },
   actions: {
-    placeOrderForCourse (context, { order, customercouponid }) { // 课程下单
+    placeCourseOrderBefore (context, { order, customercouponid }) { // 课程预下单
       return new Promise((resolve, reject) => {
-        Ajax(api.majorProjects.placeCourseOrder.url, {
-          method: api.majorProjects.placeCourseOrder.method,
+        Ajax(api.majorProjects.placeCourseOrderBefore.url, {
+          method: api.majorProjects.placeCourseOrderBefore.method,
           data: {
             info: window.JSON.stringify(order),
             customercouponid,
         })
       })
     },
+    placeOrderForCourse (context, { id, payload }) { // 课程下单
+      return new Promise((resolve, reject) => {
+        Ajax(api.majorProjects.placeCourseOrder.url, {
+          method: api.majorProjects.placeCourseOrder.method,
+          urlData: {
+            id,
+          },
+          data: {
+            customercouponid: payload.customercouponid
+          }
+        }).then(res => {
+          resolve(res)
+        }).catch((err) => {
+          reject(err)
+        })
+      })
+    },
     getProjectInfo (context, { id }) { // 获取课程列表
       return new Promise((resolve) => {
         Ajax(api.majorProjects.getCourseList.url, {

src/store/placeOrderForCoffee/index.js

         })
       })
     },
-    toPay (context, { info, detail, customercouponid }) { // 下单
+    toPayBefore (context, { info, detail, customercouponid, from }) { // 预下单
       return new Promise((resolve, reject) => {
-        Ajax(api.caseForCoffee.placeGoodsOrder.url, {
-          method: api.caseForCoffee.placeGoodsOrder.method,
+        Ajax(api.caseForCoffee.placeGoodsOrderBefore.url, {
+          method: api.caseForCoffee.placeGoodsOrderBefore.method,
           data: {
             info,
             detail,
             customercouponid,
+            from
           },
         }).then(res => {
           resolve(res)
         })
       })
     },
+    toPay (context, payload) { // 下单
+      return new Promise((resolve, reject) => {
+        Ajax(api.caseForCoffee.placeGoodsOrder.url, {
+          method: api.caseForCoffee.placeGoodsOrder.method,
+          urlData: {
+            id: payload.id
+          },
+          data: {
+            remark: payload.remark,
+            customercouponid: payload.customercouponid
+          }
+        }).then(res => {
+          resolve(res)
+        }).catch(() => {
+          reject()
+        })
+      })
+    },
     getCouponList (context) { // 获取优惠券列表
       return new Promise((resolve) => {
         Ajax(api.caseForCoffee.getCouponList.url, {

src/store/remark/index.js

+import Ajax from '../../util/ajax'
+import api from '../../util/api'
+
+// 请求数据
+export default {
+  namespaced: true,
+  state: {
+    remarkList: []
+  },
+  mutations: {
+    setRemark (state, data) {
+      state.remarkList = data.list || []
+    }
+  },
+  actions: {
+    getRemark (context, data) {
+      return new Promise((resolve, reject) => {
+        Ajax({
+          ...api.remark.getRemark,
+          urlData: { ...data },
+          queryData: {
+            page: 1,
+            pagesize: 10000
+          }
+        }).then(res => {
+          context.commit('setRemark', res)
+          resolve(res)
+        }).catch((err) => {
+          reject(err)
+        })
+      })
+    },
+    setRemark (context, data) {
+      return new Promise((resolve, reject) => {
+        Ajax({
+          ...api.remark.setRemark,
+          data: {
+            SalesId: data.salesId,
+            CustomerId: data.customerId,
+            Remark: data.remark
+          }
+        }).then(res => {
+          resolve(res)
+        }).catch((err) => {
+          reject(err)
+        })
+      })
+    }
+  }
+}

src/store/rush/index.js

+import Ajax from '../../util/ajax'
+import api from '../../util/api'
+
+// 请求数据
+export default {
+  namespaced: true,
+  state: {
+    rushDetail: {}
+  },
+  mutations: {
+    setDetail (state, data) {
+      state.rushDetail = data.flashBuy || {}
+    }
+  },
+  actions: {
+    getRush (context, data) {
+      return new Promise((resolve, reject) => {
+        Ajax({
+          ...api.rush.getRush,
+          urlData: { ...data }
+        }).then(res => {
+          context.commit('setDetail', res)
+          resolve(res)
+        }).catch((err) => {
+          reject(err)
+        })
+      })
+    },
+    setRush (context, data) {
+      return new Promise((resolve, reject) => {
+        Ajax({
+          ...api.rush.setRush,
+          urlData: { ...data }
+        }).then(res => {
+          resolve(res)
+        }).catch((err) => {
+          reject(err)
+        })
+      })
+    },
+    IsNewCustomer (context) {
+      return new Promise((resolve, reject) => {
+        Ajax({
+          ...api.rush.IsNewCustomer
+        }).then(res => {
+          resolve(res)
+        }).catch((err) => {
+          reject(err)
+        })
+      })
+    },
+    AddNewFlashBuyCustomer (context, data) {
+      return new Promise((resolve, reject) => {
+        Ajax({
+          ...api.rush.AddNewFlashBuyCustomer,
+          urlData: { ...data }
+        }).then(res => {
+          resolve(res)
+        }).catch((err) => {
+          reject(err)
+        })
+      })
+    },
+    UpdateFlashBuyCustomer (context, data) {
+      return new Promise((resolve, reject) => {
+        Ajax({
+          ...api.rush.UpdateFlashBuyCustomer,
+          urlData: { ...data }
+        }).then(res => {
+          resolve(res)
+        }).catch((err) => {
+          reject(err)
+        })
+      })
+    }
+  }
+}

src/store/userCenter/userCenter.js

         })
       })
     },
+    recommendCode (context, data) {
+      return new Promise((resolve) => {
+        Ajax({
+          ...api.user.recommendCode, 
+          urlData: { ...data }
+        }).then(res => {
+          resolve(res)
+        }).catch((err) => {
+          reject(err)
+        })
+      })
+    },
     submitData (context, data) {
-      return new Promise((resolve,reject) => {
+      return new Promise((resolve, reject) => {
         http.submitData(data).then((res) => {
           resolve(res)
         }).catch(() => {
           reject()
         })
       })
+    },
+    getRecommendCode (context) {
+      return new Promise((resolve) => {
+        Ajax({
+          ...api.user.code
+        }).then(res => {
+          resolve(res)
+        }).catch((err) => {
+          reject(err)
+        })
+      })
     }
   }
 }

src/store/vip/index.js

+import Ajax from '../../util/ajax'
+import api from '../../util/api'
+
+// 请求数据
+export default {
+  namespaced: true,
+  state: {
+    vipDetails: []
+  },
+  mutations: {
+    setVip (state, data) {
+      state.vipDetails = data || []
+    }
+  },
+  actions: {
+    getVipDetail (context) {
+      console.log(context)
+      return new Promise((resolve, reject) => {
+        Ajax({
+          ...api.user.getVip
+        }).then(res => {
+          context.commit('setVip', res)
+          resolve(res)
+        }).catch((err) => {
+          reject(err)
+        })
+      })
+    }
+  }
+}

src/util/api.js

       method: 'get',
       url: `${baseUrl}${guest}/goods`
     },
-    placeGoodsOrder: { // 商品下单
+    placeGoodsOrderBefore: { // 商品预下单
       method: 'post',
       url: `${baseUrl}${wechat}/order/goods`
     },
+    placeGoodsOrder: { // 商品下单
+      method: 'put',
+      url: `${baseUrl}${wechat}/order/goods/:id`
+    },
     getCouponList: { // 获取优惠券列表
       method: 'get',
       url: `${baseUrl}${wechat}/customer/coupon`
       method: 'get',
       url: `${baseUrl}${guest}/course/:id`
     },
-    placeCourseOrder: { // 课程下单
+    placeCourseOrderBefore: { // 课程预下单
       method: 'post',
       url: `${baseUrl}${wechat}/order/course`
     },
+    placeCourseOrder: { // 课程下单
+      method: 'put',
+      url: `${baseUrl}${wechat}/order/course/:id`
+    },
   },
   card: {
     myCustomer: { // 我的客户
       method: 'get',
       url: `${baseUrl}${guest}/captcha`
     },
+    recommendCode: { // 验证推荐码
+      method: 'get',
+      url: `${baseUrl}${guest}/customerremark/:recommendCode`
+    },
     getCaseList: { // 获取案场信息
       method: 'get',
       url: `${baseUrl}${guest}/case`
     getNum: { // 获取卡券数
       method: 'get',
       url: `${baseUrl}${wechat}/customer/info`
+    },
+    getVip: { // vip卡详情
+      method: 'get',
+      url: `${baseUrl}${wechat}/vip`
+    },
+    code: { // 获取我的推荐码
+      method: 'get',
+      url: `${baseUrl}${wechat}/user/code`
     }
   },
   director: {
       url: `${baseUrl}${wechat}/GetCheckByUser`
     }
   },
+  remark: {
+    setRemark: {
+      method: 'post',
+      url: `${baseUrl}${wechat}/customerremark`
+    },
+    getRemark: {
+      method: 'get',
+      url: `${baseUrl}${wechat}/customerremark/:salesId/:customerId`
+    }
+  },
+  rush: {
+    setRush: {
+      method: 'post',
+      url: `${baseUrl}${wechat}/flashbuy/:id`
+    },
+    getRush: {
+      method: 'get',
+      url: `${baseUrl}${wechat}/flashbuy/flash/:flashBuyId`
+    },
+    IsNewCustomer: { // 是否为新用户
+      method: 'get',
+      url: `${baseUrl}${wechat}/flashbuy/newcustomer`
+    },
+    AddNewFlashBuyCustomer: { 
+      method: 'post',
+      url: `${baseUrl}${wechat}/flashbuy/customer/:flashBuyId`
+    },
+    UpdateFlashBuyCustomer: { 
+      method: 'put',
+      url: `${baseUrl}${wechat}/flashbuy/customer/:flashBuyId`
+    }
+  }
 }
 export default $api

vue.config.js

       },
     },
     // compress: true,
+    devtool: 'source-map',
     disableHostCheck: true,   // That solved it
   }
 }