change

src/components/topCaseInfo/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="topCaseInfo flex-h">
     <i class="iconfont icon-dingwei"></i>
-      <span>{{data.CaseName}}</span>
+      <span>{{data.caseName}}</span>
       <a v-if="data.ShowSelect" @click="selectCase">请选择</a>
       <div class="flex-item">
         <span>{{userName}}您好！</span>

src/pages/sales/cardAndCouponNum/index.vue

@@ -87,7 +87,7 @@ export default {
       this.getCouponNum({ id: this.$route.query.id }).then(() => {
         this.getSales({ type: 'sales' }).then(() => {
           this.data = this.cardAndCoupon
-          this.data.CustomerCard = this.data.CustomerCard || []
+          this.data.CustomerCard = this.data.CustomerCoupon || []
         })
       })
     }

src/pages/sales/coffeeIndex/index.vue

@@ -1,266 +0,0 @@
-<template>
-  <div class="mainPage flex-v">
-    <div class="top">
-      <topCaseInfo :data="topCaseInfoData" @selectCase="showSelect = true"></topCaseInfo>
-    </div>
-    <nav class="flex-h">
-      <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 flex-item">
-      <div>
-        <ul>
-          <li :hidden="navActive !== 0" class="placeOrder">
-            <div class="topInfo flex-h">
-              <div class="flex-item">
-                <div>
-                  <span>共计已使用：{{caseTotal.total}}杯</span>
-                </div>
-              </div>
-              <div class="flex-item">
-                <div>
-                  <span>本月已用：{{caseTotal.monthtotal}}杯</span>
-                </div>
-              </div>
-              <a>点单记录</a>
-            </div>
-            <div class="areaListParent flex-h">
-              <div class="flex-item">
-                <div>
-                  <ul class="areaList">
-                    <li v-for="(item,index) in CaseTableList" :key="index">
-                      <div class="title">
-                        <i class="iconfont icon-yinchenglogo"></i>
-                        <span>{{item.AreaName}}</span>
-                      </div>
-                      <ul class="subAreaList flex-h">
-                        <router-link tag="li" class="flex-item flex-h" v-for="(subItem,subIndex) in item.Tables" :key="subIndex" :to="{name: 'placeOrder', query: { tableid: encodeURI(subItem.TableId), tableno: encodeURI(subItem.TableNo), caseid: encodeURI(subItem.CaseId), casename: encodeURI(topCaseInfoData.CaseName), areaid: encodeURI(subItem.AreaId), areaname: encodeURI(item.AreaName)}}">
-                          <caseTableItem :item="subItem" :index="subIndex"></caseTableItem>
-                        </router-link>
-                        <li class="flex-item noData" v-if="item.Tables.length % 2 != 0"></li>
-                      </ul>
-                    </li>
-                  </ul>
-                </div>
-              </div>
-            </div>
-          </li>
-          <li :hidden="navActive !== 1" class="my-card">
-            <div class="list-box">
-              <div class="cardAndCouponInfo flex-h">
-                <div class="flex-item">
-                  <div>
-                    <span>卡券货值总额：</span>
-                    <span>￥1000</span>
-                    <span>万</span>
-                  </div>
-                </div>
-                <router-link :to="{name: 'salesRecord',query: {}}">销售记录</router-link>
-              </div>
-              <myCard v-for="(item,index) in cardList" :key="index" :data='item' @share='share'></myCard>
-            </div>
-          </li>
-          <li :hidden="navActive !== 2" class="customer-card">
-            <div class="list-box">
-              <div class="search-bar flex-h">
-                <span>共15位客户</span>
-                <van-checkbox v-model="checked">
-                  我推荐的客户(8人)
-                  <img
-                    slot="icon"
-                    slot-scope="props"
-                    :src="props.checked ? icon.active : icon.normal"
-                    style="width:.2rem;height:.2rem;bottom: .02rem;position: relative;"
-                  >
-                </van-checkbox>
-                <i class="iconfont icon-sousuo search-icon" @click="searchMask"></i>
-              </div>
-              <customerCard v-for="(item,index) in cardList" :key="index" :data='item' @remark='remark' @history='history' @record='record'></customerCard>
-            </div>
-          </li>
-        </ul>
-      </div>
-    </div>
-    <div class="selectCase" :hidden="!showSelect"></div>
-    <van-picker :hidden="!showSelect"
-      show-toolbar
-      title="选择案场"
-      :columns="caseList"
-      @cancel="showSelect = false"
-      @confirm="selectCase"
-      value-key="value"
-    />
-    <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>
-
-<script>
-import caseTableItem from '../../../components/caseTableItem/index'
-import topCaseInfo from '../../../components/topCaseInfo/index'
-import myCard from '../../../components/myCard/myCard'
-import customerCard from '../../../components/customerCard/customerCard'
-import active from '../../../common/icon/check-box-checked.png'
-import normal from '../../../common/icon/check-box-empty.png'
-import { mapState, createNamespacedHelpers } from 'vuex'
-const { mapActions: actions } = createNamespacedHelpers('app')
-const { mapActions: caseTableActions } = createNamespacedHelpers('placeOrderForCoffee')
-const { mapState: mapCaseState, mapActions: mapCaseActions } = createNamespacedHelpers('case')
-
-export default {
-  name: '',
-  data () {
-    return {
-      icon: {
-        active: active,
-        normal: normal
-      },
-      navActive: 2,
-      checked: true,
-      showDialog: false,
-      message: '',
-      cutNavList: [{
-        value: '城咖啡',
-        id: '1',
-      }, {
-        value: '我的卡券',
-        id: '2',
-      }, {
-        value: '我的客户',
-        id: '3',
-      }],
-      topCaseInfoData: {
-        caseName: '',
-        caseId: '',
-        showSelect: true,
-        userName: 'xxx'
-      },
-      caseInfo: {
-        value: '',
-        id: ''
-      },
-      showSelect: false,
-      caseList: [{
-        value: '案场一',
-        id: ''
-      }, {
-        value: '案场二',
-        id: ''
-      }, {
-        value: '案场三',
-        id: ''
-      }, {
-        value: '案场四',
-        id: ''
-      }],
-      list: [{
-        name: '案场名称1',
-        list: [{}, {}, {}, {}, {}],
-      }, {
-        name: '案场名称2',
-        list: [{}, {}, {}, {}, {}],
-      }],
-      cardList: [
-        {
-          invalid: true
-        },
-        {
-          invalid: false
-        },
-        {
-          invalid: false
-        }
-      ]
-    }
-  },
-  computed: {
-    ...mapState({
-      userInfo: x => x.userCenter.userInfo,
-      CaseList: x => x.app.CaseList,
-      CaseTableList: x => x.placeOrderForCoffee.CaseTableList,
-    }),
-    ...mapCaseState({
-      caseTotal: x => x.caseTotal,
-    })
-  },
-  components: {
-    topCaseInfo,
-    caseTableItem,
-    myCard,
-    customerCard
-  },
-  created () {
-    this.getCaseList().then((res) => {
-      this.topCaseInfoData.CaseName = res.cases[0].CaseName
-      this.topCaseInfoData.CaseId = res.cases[0].CaseId
-      this.getCaseTableList({
-        caseid: this.topCaseInfoData.CaseId
-      })
-      this.getCaseTotal({
-        caseid: this.topCaseInfoData.CaseId
-      })
-    })
-  },
-  methods: {
-    ...actions([
-      'getCaseList',
-    ]),
-    ...caseTableActions([
-      'getCaseTableList',
-    ]),
-    ...mapCaseActions([
-      'getCaseTotal',
-    ]),
-    selectCase (val) { // 选择案场
-      this.topCaseInfoData.CaseName = val.CaseName
-      this.topCaseInfoData.CaseId = val.CaseId
-      this.getCaseTableList({
-        caseid: this.topCaseInfoData.CaseId
-      })
-      this.ShowSelect = false
-    },
-    cutNav (index) { // 切换nav
-      this.navActive = index
-    },
-    share (item) {
-      console.log(item)
-    },
-    remark (item) {
-      console.log(item)
-      this.showDialog = true
-    },
-    history (item) {
-      console.log(item)
-      this.$router.push({ name: 'history' })
-    },
-    record (item) {
-      console.log(item)
-      this.$router.push({ name: 'getRecord' })
-    },
-    searchMask () {
-      this.$router.push({ name: 'customerSearch' })
-    },
-    beforeClose (action, done) {
-      if (action === 'confirm') {
-        setTimeout(done, 1000)
-      } else {
-        done()
-      }
-    }
-  }
-}
-</script>
-
-<!-- Add "scoped" attribute to limit CSS to this component only -->
-<style lang="scss" scoped>
-@import 'page.scss';
-</style>

src/pages/sales/coffeeIndex/page.scss

@@ -1,194 +0,0 @@
-.mainPage{
-  .top{
-    position: relative;
-    overflow: hidden;
-  }
-  >nav{
-    width: 100%;
-    position: relative;
-    z-index: 10;
-    background: #fff;
-    box-shadow: 0 0 .1rem .02rem rgba(0, 0, 0, .1);
-    a{
-      text-align: center;
-      line-height: .4rem;
-      font-size: .14rem;
-      color: #ccc;
-      position: relative;
-      &.active{
-        color: #333;
-        &::after{
-          content: '';
-          width: 50%;
-          height: .02rem;
-          background: #fc6243;
-          position: absolute;
-          bottom: 0;
-          left: 50%;
-          transform: translateX(-50%);
-          -webkit-transform: translateX(-50%);
-        }
-      }
-    }
-  }
-  .content{
-    &>div{
-      width: 100%;
-      position: absolute;
-      left: 0;
-      top: 0;
-      bottom: 0;
-      overflow: hidden;
-      &>ul{
-        width: 100%;
-        height: 100%;
-        position: relative;
-        overflow: hidden;
-        &>li{
-          width: 100%;
-          height: 100%;
-          position: relative;
-          overflow-y: scroll;
-          -webkit-overflow-scrolling: touch;
-          transform: translateZ(0);
-          -webkit-transform: translateZ(0);
-          &.placeOrder{
-            .topInfo{
-              align-items: center;
-              margin: .1rem auto 0;
-              >div{
-                >div{
-                  width: 100%;
-                  position: relative;
-                  overflow: hidden;
-                  span{
-                    width: 100%;
-                    display: block;
-                    text-indent: .2rem;
-                    line-height: .3rem;
-                    font-size: .14rem;
-                    color: #666;
-                  }
-                }
-              }
-              a{
-                line-height: .22rem;
-                font-size: .12rem;
-                color: #fc6243;
-                border: .01rem solid #fc6243;
-                padding: 0 .15rem;
-                border-radius: .05rem;
-                margin-right: .2rem;
-              }
-            }
-            .areaListParent{
-              position: relative;
-              overflow: visible;
-              >div{
-                margin: 0 .2rem;
-                position: relative;
-                overflow: visible;
-                >div{
-                  width: 100%;
-                  position: relative;
-                  overflow: visible;
-                  .areaList{
-                    &:last-child{
-                      margin-bottom: .2rem;
-                    }
-                    .title{
-                      font-size: 0;
-                      white-space: nowrap;
-                      margin-top: .22rem;
-                      *{
-                        line-height: .26rem;
-                        font-size: .14rem;
-                      }
-                      i{
-                        color: red;
-                        margin-right: .05rem;
-                      }
-                    }
-                    .subAreaList{
-                      position: relative;
-                      overflow: visible;
-                      flex-wrap: wrap;
-                      -webkit-flex-wrap: wrap;
-                      &>li{
-                        position: relative;
-                        overflow: hidden;
-                        border-radius: .06rem;
-                        background: #fff;
-                        padding: .15rem 0;
-                        box-shadow: 0 0 .1rem .01rem rgba(0, 0, 0, .1);
-                        min-width: 40%;
-                        margin-top: .2rem;
-                        &:nth-child(2n){
-                          margin-left: .2rem;
-                        }
-                        &.noData{
-                          box-shadow: none;
-                          background: none;
-                        }
-                      }
-                    }
-                  }
-                }
-              }
-            }
-          }
-          &.my-card, &.customer-card{
-            .cardAndCouponInfo{
-              align-items: center;
-              margin: .1rem 0 .15rem;
-              div{
-                font-size: 0;
-                white-space: nowrap;
-                span{
-                  line-height: .3rem;
-                  font-size: .13rem;
-                  display: inline-block;
-                  margin-right: .05rem;
-                  &:nth-child(2){
-                    font-size: .16rem;
-                    color: #fc6243;
-                  }
-                }
-              }
-              a{
-                line-height: .24rem;
-                padding: 0 .1rem;
-                box-sizing: border-box;
-                border: .01rem solid #333;
-                color: #333;
-                border-radius: .04rem;
-                font-size: .12rem;
-              }
-            }
-            .list-box{
-              padding: .1rem .2rem .2rem;
-            }
-          }
-          .search-bar{
-            align-items: center;
-            justify-content: space-between;
-            padding: 0 .1rem .1rem;
-            .search-icon{
-              font-size: .18rem;
-              color: #909090;
-            }
-          }
-        }
-      }
-    }
-  }
-  .selectCase{
-    width: 100%;
-    position: absolute;
-    left: 0;
-    top: 0;
-    bottom: 0;
-    background: rgba(0, 0, 0, .3);
-    z-index: 100;
-  }
-}

src/pages/sales/customerSearch/index.vue

@@ -42,8 +42,8 @@ export default {
   data () {
     return {
       topCaseInfoData: {
-        CaseName: '',
-        CaseId: '',
+        caseName: '',
+        caseId: '',
         ShowSelect: false,
       },
       icon: {
@@ -73,8 +73,12 @@ export default {
   },
   created () {
     this.getCaseList().then((res) => {
-      this.topCaseInfoData.CaseName = res.cases[0].CaseName
-      this.topCaseInfoData.CaseId = res.cases[0].CaseId
+      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
+        }
+      }
     })
   },
   methods: {
@@ -110,6 +114,17 @@ export default {
         this.ajaxOff = true
       })
     },
+    showVanPicker () {
+      this.showSelect = true
+    },
+    selectCase (val) { // 选择案场
+      this.topCaseInfoData.caseName = val.CaseName
+      this.topCaseInfoData.caseId = val.CaseId
+      this.getCaseTableList({
+        caseid: this.topCaseInfoData.caseId
+      })
+      this.showSelect = false
+    }
   }
 }
 </script>

src/pages/sales/getRecord/index.vue

@@ -64,10 +64,9 @@ export default {
       cardList: [],
       couponList: [],
       topCaseInfoData: {
-        CaseName: '',
-        CaseId: '',
-        showSelect: false,
-        userName: ''
+        caseName: '',
+        caseId: '',
+        showSelect: false
       },
     }
   },
@@ -82,8 +81,12 @@ export default {
   },
   created () {
     this.getCaseList().then((res) => {
-      this.topCaseInfoData.CaseName = res.cases[0].CaseName
-      this.topCaseInfoData.CaseId = res.cases[0].CaseId
+      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.getCustomerCardList({
       id: this.user.id,
@@ -125,6 +128,17 @@ export default {
     cutNav (index) {
       this.activeIndex = index
     },
+    showVanPicker () {
+      this.showSelect = true
+    },
+    selectCase (val) { // 选择案场
+      this.topCaseInfoData.caseName = val.CaseName
+      this.topCaseInfoData.caseId = val.CaseId
+      this.getCaseTableList({
+        caseid: this.topCaseInfoData.caseId
+      })
+      this.showSelect = false
+    }
   }
 }
 </script>

src/pages/sales/placeOrder/index.vue

@@ -1,338 +0,0 @@
-<template>
-  <div class="mainPage flex-v">
-    <div class="flex-item flex-v">
-      <div class="banner">
-        <img src="" class="centerLabel cover" alt="">
-        <div class="bannerInfo flex-h">
-          <div class="flex-item">
-            <div>
-              <span>项目名称：{{caseName}}</span>
-            </div>
-          </div>
-          <span>{{userInfo.customer != undefined ? userInfo.customer.CustomerName : ''}}您好！</span>
-        </div>
-      </div>
-      <div class="tableInfo flex-h">
-        <div class="flex-item">
-          <div>
-            <span>桌号：{{postData.info.TableNo}}</span>
-            <!-- <span>本月已用：150杯</span> -->
-          </div>
-        </div>
-        <router-link :to="{name: 'coffeeIndex', query: {}}">返回选择桌号</router-link>
-      </div>
-      <div class="content flex-item flex-h">
-        <div class="slideMenus">
-          <div>
-            <ul>
-              <li v-for="(item,index) in menuList" :key="index" :class="{'active': slideMenusActive == index}" @click="cutMenu(index)">
-                <span>{{item.value}}</span>
-                <span>{{item.eValue}}</span>
-              </li>
-            </ul>
-          </div>
-        </div>
-        <div class="flex-item">
-          <div>
-            <swiper :options="swiperOption" ref="mySwiper">
-              <swiper-slide class="swiper-slide" v-for="(item,index) in menuList" :key="index">
-                <div class="flex-v">
-                  <h4>{{item.value + ' ' + item.eValue}}</h4>
-                  <div class="flex-item">
-                    <div>
-                      <swiper :options="subSwiperOption" ref="mySubSwiper">
-                        <swiper-slide class="swiper-slide" v-for="(subItem,subIndex) in item.list" :key="subIndex">
-                          <orderItem :data="subItem" @returnData="calcMenus" @selectSpec="selectSpec"></orderItem>
-                        </swiper-slide>
-                      </swiper>
-                    </div>
-                  </div>
-                </div>
-              </swiper-slide>
-            </swiper>
-          </div>
-        </div>
-      </div>
-    </div>
-    <div class="flex-h">
-      <div class="flex-item">
-        <div>
-          <span>总计</span>
-          <span>{{totalNum}}</span>
-          <span>杯</span>
-          <span>共</span>
-          <span>{{totalPrice}}</span>
-          <span>元</span>
-          <i class="iconfont" :class="{'icon-jiantou-up': !showCalcMenu,'icon-jiantou-down': showCalcMenu}" @click="showCalcMenu = true"></i>
-        </div>
-      </div>
-      <a @click="showCalcMenu = true">下单</a>
-    </div>
-    <orderPopup :show="showPopup" :data="currentSpec" @closePopup="closePopup" @returnData="calcMenus"></orderPopup>
-    <calcMenu :show="showCalcMenu" :totalNum="totalCupNum" :data="settlementList" @returnData="calcMenus" @emptyMenus="emptyMenus" @closeCalcMenu="closeCalcMenu" @placeOrder="placeOrder"></calcMenu>
-  </div>
-</template>
-
-<script>
-import { mapState, createNamespacedHelpers } from 'vuex'
-const { mapActions: caseTableActions } = createNamespacedHelpers('placeOrderForCoffee')
-import orderItem from '../../../components/orderItem/index'
-import orderPopup from '../../../components/orderPopup/index'
-import calcMenu from '../../../components/calcMenu/index'
-import { swiper, swiperSlide } from 'vue-awesome-swiper'
-import 'swiper/dist/css/swiper.css'
-
-export default {
-  name: '',
-  data () {
-    const _self = this
-    return {
-      caseName: decodeURI(this.$route.query.casename),
-      totalCupNum: 0, // 共计使用杯数
-      showCalcMenu: false, // 显隐已点菜单弹窗
-      currentSpec: null, // 当前选择规格
-      showPopup: false, // 显隐选规格弹窗
-      totalNum: 0, // 总杯数
-      totalPrice: 0, // 总价格
-      settlementList: [], // 商品选择清单
-      slideMenusActive: 0, // 左侧菜单选中索引值
-      menuList: [],
-      postData: {
-        info: {
-          CaseId: decodeURI(_self.$route.query.caseid),
-          AreaId: decodeURI(_self.$route.query.areaid),
-          AreaName: decodeURI(_self.$route.query.areaname),
-          TableId: decodeURI(_self.$route.query.tableid),
-          TableNo: decodeURI(_self.$route.query.tableno),
-          Amount: 0,// String(_self.returnAmount()[0]), // 订单金额
-          OrdersNum: 0, // Number(_self.returnAmount()[1]),
-          Remark: '',
-        },
-        detail: [],
-        coupon: [],
-      },
-      swiperOption: {
-        observer: true,
-        direction: 'vertical',
-        on: {
-          transitionEnd () {
-            _self.slideMenusActive = this.activeIndex
-          },
-        }
-      },
-      subSwiperOption: {
-        observer: true,
-        direction: 'vertical',
-        nested: true,
-        slidesPerView: 'auto',
-        freeMode: true,
-        freeModeMomentumVelocityRatio: 2,
-      },
-    }
-  },
-  computed: {
-    ...mapState({
-      userInfo: x => x.userCenter.userInfo,
-      goodsTypeList: x => x.placeOrderForCoffee.goodsTypeList,
-      goodsList: x => x.placeOrderForCoffee.goodsList
-    }),
-    MySwiper () {
-      return this.$refs.mySwiper.swiper
-    },
-    MySubSwiper () {
-      return this.$refs.mySubSwiper.swiper
-    },
-  },
-  components: {
-    swiper,
-    swiperSlide,
-    orderItem,
-    orderPopup,
-    calcMenu,
-  },
-  created () {
-    this.getGoodsTypeList({
-      caseid: this.postData.info.CaseId,
-    }).then((res) => {
-      // console.log(JSON.stringify(res))
-      this.getGoodsList({
-        caseid: this.postData.info.CaseId,
-      }).then((res) => {
-        // console.log(JSON.stringify(res))
-        this.mapArr()
-      })
-    })
-  },
-  methods: {
-    ...caseTableActions([
-      'getGoodsTypeList',
-      'getGoodsList',
-      'toPay',
-    ]),
-    toPayer () { // 下单
-      this.postData.info.Amount = String(this.returnAmount()[0])
-      this.postData.info.OrdersNum = Number(this.returnAmount()[1])
-      this.postData.info.OrgId = this.orgId
-      this.postData.info.UserId = this.userInfo.CustomerId
-      this.postData.info.UserName = this.userInfo.CustomerName
-      this.postData.info.PayType = this.postData.coupon.length ? 'coupon' : 'vip'
-      var orderInfo = this.settlementList
-      this.postData.detail = []
-      for (var n = 0; n < orderInfo.length; n++) {
-        this.postData.detail.push({
-          GoodsId: orderInfo[n].id,
-          GoodsName: orderInfo[n].name,
-          SpecId: orderInfo[n].specId,
-          SpecName: orderInfo[n].specName,
-          Number: orderInfo[n].defaultNum === null ? orderInfo[n].num - 0 : orderInfo[n].defaultNum - 0,
-          Price: orderInfo[n].defaultNum === null ? String(orderInfo[n].price) : String(orderInfo[n].defaultPrice),
-        })
-      }
-      console.log(JSON.stringify(this.postData))
-      this.toPay({
-        info: JSON.stringify(this.postData.info),
-        detail: JSON.stringify(this.postData.detail),
-        coupon: JSON.stringify(this.postData.coupon)
-      }).then((res) => {
-        this.$dialog.alert({
-          message: '下单成功！'
-        }).then(() => {
-          window.history.go(-2)
-        })
-      })
-    },
-    returnAmount () { // 返回总金额  
-      var amount = 0, num = 0
-      for (var n = 0; n < this.settlementList.length; n++) {
-        if (this.settlementList[n].defaultPrice === null) {
-          amount += this.settlementList[n].price * this.settlementList[n].num
-          num += this.settlementList[n].num
-        } else {
-          amount += this.settlementList[n].defaultPrice * this.settlementList[n].defaultNum
-          num += this.settlementList[n].defaultNum
-        }
-      }
-      return [amount, num]
-    },
-    mapArr () { // 匹配商品规格
-      var aArr = this.goodsTypeList, bArr = this.goodsList
-      for (var n = 0; n < aArr.length; n++) {
-        aArr[n].list = []
-        for (var a = 0; a < bArr.length; a++) {
-          if (aArr[n].TypeId === bArr[a].TypeId) {
-            aArr[n].list.push(bArr[a])
-          }
-        }
-      }
-      this.menuList = []
-      for (var x = 0; x < aArr.length; x++) {
-        this.menuList.push({
-          value: aArr[x].TypeName,
-          eValue: aArr[x].EnglishName,
-          id: aArr[x].TypeId,
-          status: aArr[x].Status,
-          list: []
-        })
-        for (var y = 0; y < aArr[x].list.length; y++) {
-          this.menuList[x].list.push({
-            img: aArr[x].list[y].Images,
-            name: aArr[x].list[y].GoodsName,
-            id: aArr[x].list[y].GoodsId,
-            spec: [],
-            status: aArr[x].list[y].Status,
-            price: aArr[x].list[y].Price,
-          })
-          if(aArr[x].list[y].Specs !== null){
-            for (var z = 0; z < aArr[x].list[y].Specs.length; z++) {
-              this.menuList[x].list[y].spec.push({
-                value: aArr[x].list[y].Specs[z].SpecName,
-                id: aArr[x].list[y].Specs[z].SpecId,
-                num: 0,
-                status: aArr[x].list[y].Specs[z].Status,
-                price: aArr[x].list[y].Specs[z].GoodsPrice,
-              })
-            }
-          }
-        }
-      }
-      // console.log(JSON.stringify(this.menuList))
-    },
-    placeOrder () { // 下单
-      this.toPayer()
-    },
-    closeCalcMenu () { // 关闭已选菜单
-      this.showCalcMenu = false
-    },
-    emptyMenus () { // 清空菜单
-      this.settlementList = []
-    },
-    closePopup () { // 关闭规格弹窗
-      this.showPopup = false
-      this.currentSpec = null
-    },
-    selectSpec (val) { // 选规格
-      this.currentSpec = val
-      this.showPopup = true
-    },
-    cutMenu (index) { // 切换菜单
-      this.MySwiper.slideTo(index, 300)
-    },
-    calcMenus (val) { // 计算清单
-      var bool = true, arr = this.settlementList.slice()
-      if (val.specId === null) {
-        for (var n = 0; n < arr.length; n++) {
-          if (arr[n].id === val.id && arr[n].specId === null) {
-            bool = false
-            arr[n] = val
-          }
-        }
-        if (bool) {
-          arr.push(val)
-        }
-      } else {
-        for (var n = 0; n < arr.length; n++) {
-          if (arr[n].specId === val.specId) {
-            bool = false
-            arr[n] = val
-          }
-        }
-        if (bool) {
-          arr.push(val)
-        }
-      }
-      for (var n = 0; n < arr.length; n++) {
-        if (arr[n].num === 0 || arr[n].defaultNum === 0) {
-          arr.splice(n, 1)
-        }
-      }
-      this.settlementList = arr
-      // console.log(JSON.stringify(this.settlementList))
-      this.calcTotalNum()
-    },
-    calcTotalNum () { // 计算总数量、价格
-      var num = 0, price = 0
-      if (!this.settlementList.length) {
-        this.totalNum = 0
-        this.totalPrice = 0
-        return
-      }
-      for (var n = 0; n < this.settlementList.length; n++) {
-        if (this.settlementList[n].specId === null) {
-          num += this.settlementList[n].defaultNum
-          price += this.settlementList[n].defaultPrice * this.settlementList[n].defaultNum
-        } else {
-          num += this.settlementList[n].num
-          price += this.settlementList[n].price * this.settlementList[n].num
-        }
-      }
-      this.totalNum = num
-      this.totalPrice = price
-    },
-  }
-}
-</script>
-
-<!-- Add "scoped" attribute to limit CSS to this component only -->
-<style lang="scss" scoped>
-@import 'page.scss';
-</style>

src/pages/sales/placeOrder/page.scss

@@ -1,241 +0,0 @@
-.mainPage{
-  &>div.flex-item{
-    position: relative;
-    z-index: 1;
-    .banner{
-      width: 100%;
-      position: relative;
-      overflow: hidden;
-      padding-bottom: 35%;
-      background: #eee;
-      img{
-        z-index: 1;
-      }
-      .bannerInfo{
-        width: 100%;
-        position: absolute;
-        left: 0;
-        bottom: 0;
-        z-index: 2;
-        &>div{
-          margin-left: .2rem;
-          &>div{
-            width: 100%;
-            font-size: 0;
-            white-space: nowrap;
-            span{
-              overflow: hidden;
-              text-overflow: ellipsis;
-              white-space: nowrap;
-              font-size: .15rem;
-              color: #fff;
-              line-height: .4rem;
-            }
-          }
-        }
-        &>span{
-          font-size: .15rem;
-          color: #fff;
-          line-height: .4rem;
-          margin-right: .2rem;
-          margin-left: .1rem;
-        }
-      }
-    }
-    .tableInfo{
-      align-items: center;
-      border-bottom: .01rem solid #eee;
-      &>div{
-        margin-left: .2rem;
-        &>div{
-          width: 100%;
-          position: relative;
-          overflow: hidden;
-          font-size: 0;
-          white-space: nowrap;
-          text-overflow: ellipsis;
-          span{
-            display: inline-block;
-            line-height: .4rem;
-            font-size: .13rem;
-            margin-right: .1rem;
-          }
-        }
-      }
-      &>a{
-        line-height: .22rem;
-        font-size: .13rem;
-        color: #fc6243;
-        border: .01rem solid #fc6243;
-        border-radius: .04rem;
-        padding: 0 .05rem;
-        margin-right: .2rem;
-      }
-    }
-    .content{
-      .slideMenus{
-        width: 24%;
-        min-width: .9rem;
-        position: relative;
-        overflow: hidden;
-        &>div{
-          width: 100%;
-          position: absolute;
-          left: 0;
-          top: 0;
-          bottom: 0;
-          overflow-y: scroll;
-          -webkit-overflow-scrolling: touch;
-          transform: translateZ(0);
-          -webkit-transform: translateZ(0);
-          background: #f7f7f7;
-          ul{
-            width: 100%;
-            overflow: hidden;
-            position: relative;
-            &>li{
-              width: 100%;
-              position: relative;
-              overflow: hidden;
-              padding: .18rem 0;
-              &.active{
-                background: #fff;
-              }
-              span{
-                width: 100%;
-                display: block;
-                text-align: center;
-                line-height: .22rem;
-                font-size: .14rem;
-              }
-            }
-          }
-        }
-      }
-      &>div.flex-item{
-        &>div{
-          width: 100%;
-          position: absolute;
-          left: 0;
-          top: 0;
-          bottom: 0;
-          overflow: hidden;
-          &>div{
-            width: 100%;
-            position: absolute;
-            left: 0;
-            top: 0;
-            bottom: 0;
-            overflow: hidden;
-            &>div{
-                &>.swiper-slide{
-                  &>div{
-                    width: 100%;
-                    position: absolute;
-                    left: 0;
-                    top: 0;
-                    bottom: 0;
-                    overflow: hidden;
-                    &>h4{
-                      width: 100%;
-                      display: block;
-                      line-height: .24rem;
-                      font-size: .11rem;
-                      text-indent: .1rem;
-                      margin-top: .1rem;
-                    }
-                    &>div{
-                      &>div{
-                        width: 100%;
-                        position: absolute;
-                        left: 0;
-                        top: 0;
-                        bottom: 0;
-                        overflow: hidden;
-                        &>div{
-                          width: 100%;
-                          position: absolute;
-                          left: 0;
-                          top: 0;
-                          bottom: 0;
-                          .swiper-slide{
-                            height: auto !important;
-                            padding: .15rem 0;
-                            position: relative;
-                            &::after{
-                              content: '';
-                              width: 100%;
-                              height: .01rem;
-                              background: #eee;
-                              position: absolute;
-                              left: 0;
-                              bottom: 0;
-                              z-index: 1;
-                            }
-                            &::before{
-                              content: '';
-                              width: .36rem;
-                              height: .01rem;
-                              background: #fff;
-                              position: absolute;
-                              left: 0;
-                              bottom: 0;
-                              z-index: 2;
-                            }
-                          }
-                        }
-                      }
-                    }
-                    .menuItem{
-                      width: 100%;
-                      position: relative;
-                      overflow: hidden;
-                    }
-                  }
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-  &>div.flex-h{
-    padding: .1rem 0;
-    box-shadow: 0 0 .1rem .01rem rgba(0, 0, 0, .05);
-    position: relative;
-    z-index: 100;
-    a{
-      line-height: .4rem;
-      background: #fc6243;
-      color: #fff;
-      padding: 0 .5rem;
-      border-radius: .4rem;
-      font-size: .15rem;
-      margin-right: .2rem;
-    }
-    div{
-      font-size: 0;
-      white-space: nowrap;
-      span{
-        display: inline-block;
-        line-height: .4rem;
-        vertical-align: middle;
-        font-size: .13rem;
-        margin-left: .05rem;
-        &:first-child{
-          margin-left: .2rem;
-        }
-        &:nth-child(2){
-          font-size: .18rem;
-        }
-      }
-      i{
-        display: inline-block;
-        line-height: .4rem;
-        vertical-align: middle;
-        font-size: .13rem;
-        margin-left: .1rem;
-      }
-    }
-  }
-}

src/pages/sales/router.js

@@ -2,8 +2,6 @@ import Vue from 'vue'
 import Router from 'vue-router'
 
 import login from './login/index' // 登录
-import coffeeIndex from './coffeeIndex/index' // 点单首页
-import placeOrder from './placeOrder/index' // 城咖啡-点单
 import salesRecord from './salesRecord/index' // 销售记录
 import salesGiveOutDetail from './salesGiveOutDetail/index' // 销售发放详情
 import cardAndCouponNum from './cardAndCouponNum/index' // 卡券数量信息
@@ -19,16 +17,6 @@ const router = new Router({
     name: 'login',
     component: login,
     children: []
-  }, { // 点单首页
-    path: '/coffeeIndex',
-    name: 'coffeeIndex',
-    component: coffeeIndex,
-    children: []
-  }, { // 城咖啡-点单
-    path: '/placeOrder',
-    name: 'placeOrder',
-    component: placeOrder,
-    children: []
   }, { // 销售记录
     path: '/salesRecord',
     name: 'salesRecord',

src/pages/sales/salesGiveOutDetail/index.vue

@@ -1,18 +1,18 @@
 <template>
   <div class="mainPage flex-v">
     <div class="top">
-      <topCaseInfo :data="topCaseInfoData" @selectCase="showSelect = true"></topCaseInfo>
+      <topCaseInfo :data="topCaseInfoData" :userName="userInfo.customer !== undefined ? userInfo.customer.CustomerName : ''" @selectCase="showVanPicker"></topCaseInfo>
     </div>
     <div class="flex-item flex-v body" v-if="data.allCard">
       <span>销售姓名：<em>{{data.RealName}}</em></span>
       <ul class="flex-h">
         <li class="flex-item" :class="{'active': activeIndex === 0}" @click="cutNav(0)">
           <span>饮品</span>
-          <span>（已赠送{{data.CustomerCard.length + data.CustomerCoupon.length}}杯）</span>  
+          <span>（已赠送{{data.OrdersDetail.length}}杯）</span>  
         </li> 
         <li class="flex-item" :class="{'active': activeIndex === 1}" @click="cutNav(1)">
           <span>卡券</span>
-          <span>（已发出{{data.OrdersDetail.length}}张）</span>  
+          <span>（已发出{{data.CustomerCard.length + data.CustomerCoupon.length}}张）</span>  
         </li> 
       </ul>
       <div class="flex-item">
@@ -31,13 +31,13 @@
                       <span>￥{{item.Price}} * 1</span>
                     </div>
                   </div>
-                  <span>{{toolClass.dateFormat(item.ReceiveDate)}}</span>
+                  <span>{{toolClass.dateFormat(item.CreateDate)}}</span>
                 </li>
               </ul>
             </li>
             <li :hidden="activeIndex === 0">
               <ul class="list">
-                <router-link tag="li" class="flex-h" v-for="(item,index) in data.allCard" :key="index" :to="{name: 'cardAndCouponNum', query: { id: item.CardId || item.CaseId, type:item.CardId ? 'card' : 'coupon' }}">
+                <router-link tag="li" class="flex-h" v-for="(item,index) in data.allCard" :key="index" :to="{name: 'cardAndCouponNum', query: { id: item.CardId || item.CouponId, type:item.CardId ? 'card' : 'coupon' }}">
                   <div class="flex-item">
                     <div>
                       <span>{{item.CustomerCardName || item.CustomerCouponName}}</span>
@@ -61,8 +61,9 @@
 
 <script>
 import topCaseInfo from '../../../components/topCaseInfo/index'
-import { createNamespacedHelpers } from 'vuex'
+import { mapState, createNamespacedHelpers } from 'vuex'
 const { mapState: mapForbidState, mapActions: mapForbidActions } = createNamespacedHelpers('forbid')
+const { mapActions: actions } = createNamespacedHelpers('app')
 
 export default {
   name: '',
@@ -72,13 +73,16 @@ export default {
       topCaseInfoData: {
         caseName: '',
         caseId: '',
-        showSelect: false,
-        userName: 'xxx'
+        showSelect: false
       },
       data: {}
     }
   },
   computed: {
+    ...mapState({
+      userInfo: x => x.userCenter.userInfo,
+      CaseList: x => x.app.CaseList,
+    }),
     ...mapForbidState({
       salesCardList: x => x.salesCardList
     })
@@ -87,6 +91,14 @@ export default {
     topCaseInfo,
   },
   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.getSalesCardList({ id: this.$route.query.id }).then(() => {
       this.data = this.salesCardList
       this.data.CustomerCard = this.data.CustomerCard ? this.data.CustomerCard : []
@@ -96,12 +108,23 @@ export default {
     })
   },
   methods: {
+    ...actions([
+      'getCaseList',
+    ]),
     ...mapForbidActions(['getSalesCardList']),
     cutNav (index) {
       this.activeIndex = index
     },
-    dateFomart (date) {
-      return this.toolClass.dateFormat(date)
+    showVanPicker () {
+      this.showSelect = true
+    },
+    selectCase (val) { // 选择案场
+      this.topCaseInfoData.caseName = val.CaseName
+      this.topCaseInfoData.caseId = val.CaseId
+      this.getCaseTableList({
+        caseid: this.topCaseInfoData.caseId
+      })
+      this.showSelect = false
     }
   }
 }

src/pages/sales/salesRecord/index.vue

@@ -21,14 +21,12 @@ import salesRecordItem from '../../../components/salesRecordItem/index'
 import { mapState, createNamespacedHelpers } from 'vuex'
 const { mapState: mapForbidState, mapActions: mapForbidActions } = createNamespacedHelpers('forbid')
 const { mapActions: actions } = createNamespacedHelpers('app')
-const { mapActions: caseTableActions } = createNamespacedHelpers('placeOrderForCoffee')
-const { mapState: mapCaseState, mapActions: mapCaseActions } = createNamespacedHelpers('case')
 export default {
   name: '',
   data () {
     return {
       topCaseInfoData: {
-        CaseName: '',
+        caseName: '',
         caseId: '',
         showSelect: false
       },
@@ -43,10 +41,6 @@ export default {
     ...mapState({
       userInfo: x => x.userCenter.userInfo,
       CaseList: x => x.app.CaseList,
-      CaseTableList: x => x.placeOrderForCoffee.CaseTableList,
-    }),
-    ...mapCaseState({
-      caseTotal: x => x.caseTotal,
     }),
     ...mapForbidState({
       salesList: x => x.salesList,
@@ -55,8 +49,12 @@ export default {
   },
   created () {
     this.getCaseList().then((res) => {
-      this.topCaseInfoData.CaseName = res.cases[0].CaseName
-      this.topCaseInfoData.CaseId = res.cases[0].CaseId
+      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.init()
   },
@@ -64,9 +62,6 @@ export default {
     ...actions([
       'getCaseList',
     ]),
-    ...mapCaseActions([
-      'getCaseTotal',
-    ]),
     fibdata (item) {
       const couponfib = this.forbidList.filter(x => x.UserId === item.UserId && x.ForbidType === 'coupon').length > 0 ? true : false
       const orderfib = this.forbidList.filter(x => x.UserId === item.UserId && x.ForbidType === 'order').length > 0 ? true : false
@@ -79,10 +74,10 @@ export default {
       this.showSelect = true
     },
     selectCase (val) { // 选择案场
-      this.topCaseInfoData.CaseName = val.CaseName
-      this.topCaseInfoData.CaseId = val.CaseId
+      this.topCaseInfoData.caseName = val.CaseName
+      this.topCaseInfoData.caseId = val.CaseId
       this.getCaseTableList({
-        caseid: this.topCaseInfoData.CaseId
+        caseid: this.topCaseInfoData.caseId
       })
       this.showSelect = false
     },

src/pages/user/App.vue

@@ -6,13 +6,16 @@
 
 <script>
 import '../../common/css/reset.css'
+import logo from '../../common/icon/indexlogo.jpg'
+import wxsdk from '../../util/share'
 import { mapState, createNamespacedHelpers } from 'vuex'
 const { mapActions: actions } = createNamespacedHelpers('userCenter')
 export default {
   name: 'app',
   data () {
     return {
-      showPage: false
+      showPage: false,
+      logo
     }
   },
   components: {},
@@ -23,7 +26,6 @@ export default {
     })
   },
   created () {
-    // console.log('creatde')
     if (location.search && this.toolClass.UrlSearch(location.search).code) {
       this.code = this.toolClass.UrlSearch(location.search).code
     } else {
@@ -32,6 +34,12 @@ export default {
     this.getUserInfo({ org: this.org, code: this.code }).then(() => {
       this.showPage = true
     })
+    wxsdk({ url: encodeURIComponent(window.location.href.split('#')[0]) }, {
+      title: '城的空间',
+      desc: '城的空间',
+      link: `${window.location.origin}${window.location.pathname}/user.html#/mainPage/indexPage`,
+      thu_image: `${window.location.origin}${window.location.pathname}${logo}`
+    })
     // 计算距离方法
     console.log(this.toolClass.getGreatCircleDistance(117.225495, 39.133713, 117.225962, 39.132573))
   },

src/pages/user/card/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="mainPage">
-    <nav class="flex-h">
+    <nav class="flex-h" v-if='false'>
       <a class="flex-item" v-for="(item,index) in nav" :key="index" :class="{'active':index==active}" @click="change(item,index)">{{item}}</a>
     </nav>
     <scroll ref='scroll' :isloading='isloading' class='wrapper' :data='data[active].list' :pullUpLoad='pullUpLoadObj' :startY='parseInt(startY)' @pullingUp='getList'>

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

@@ -33,7 +33,7 @@
                           <span>{{item.AreaName}}</span>
                         </div>
                         <ul class="subAreaList flex-h">
-                          <router-link tag="li" class="flex-item flex-h" v-for="(subItem,subIndex) in item.Tables" :key="subIndex" :to="{name: 'placeOrder', query: { tableid: encodeURI(subItem.TableId), tableno: encodeURI(subItem.TableNo), caseid: encodeURI(subItem.CaseId), casename: encodeURI(topCaseInfoData.CaseName), areaid: encodeURI(subItem.AreaId), areaname: encodeURI(item.AreaName)}}">
+                          <router-link tag="li" class="flex-item flex-h" v-for="(subItem,subIndex) in item.Tables" :key="subIndex" :to="{name: 'placeOrder', query: { tableid: encodeURI(subItem.TableId), tableno: encodeURI(subItem.TableNo), caseid: encodeURI(subItem.CaseId), casename: encodeURI(topCaseInfoData.caseName), areaid: encodeURI(subItem.AreaId), areaname: encodeURI(item.AreaName)}}">
                             <caseTableItem :item="subItem" :index="subIndex"></caseTableItem>
                           </router-link>
                           <li class="flex-item noData" v-if="(item.Tables || []).length % 2 != 0"></li>
@@ -124,6 +124,8 @@ import myCard from '../../../../components/myCard/myCard'
 import customerCard from '../../../../components/customerCard/customerCard'
 import active from '../../../../common/icon/check-box-checked.png'
 import normal from '../../../../common/icon/check-box-empty.png'
+import logo from '../../../../common/icon/indexlogo.jpg'
+import wxsdk from '../../../../util/share'
 import { mapState, createNamespacedHelpers } from 'vuex'
 const { mapActions: actions } = createNamespacedHelpers('app')
 const { mapActions: caseTableActions } = createNamespacedHelpers('placeOrderForCoffee')
@@ -165,6 +167,7 @@ export default {
       navActive: 0,
       showDialog: false,
       message: '',
+      logo,
       cutNavList: [{
         value: '城咖啡',
         id: '1',
@@ -179,8 +182,8 @@ export default {
         id: '4',
       }],
       topCaseInfoData: {
-        CaseName: '',
-        CaseId: '',
+        caseName: '',
+        caseId: '',
         ShowSelect: false,
       },
       caseInfo: {
@@ -326,14 +329,7 @@ export default {
       })
     }
     this.getCaseList().then((res) => {
-      this.topCaseInfoData.CaseName = res.cases[0].CaseName
-      this.topCaseInfoData.CaseId = res.cases[0].CaseId
-      this.getCaseTableList({
-        caseid: this.topCaseInfoData.CaseId
-      })
-      this.getCaseTotal({
-        caseid: this.topCaseInfoData.CaseId
-      })
+      this.locationMapping()
     })
   },
   methods: {
@@ -375,10 +371,10 @@ export default {
       this.showSelect = true
     },
     selectCase (val) { // 选择案场
-      this.topCaseInfoData.CaseName = val.CaseName
-      this.topCaseInfoData.CaseId = val.CaseId
+      this.topCaseInfoData.caseName = val.CaseName
+      this.topCaseInfoData.caseId = val.CaseId
       this.getCaseTableList({
-        caseid: this.topCaseInfoData.CaseId
+        caseid: this.topCaseInfoData.caseId
       })
       this.showSelect = false
     },
@@ -430,6 +426,40 @@ export default {
     searchMask () {
       window.location.href = this.getUrl('customerSearch')
     },
+    locationMapping () {
+      wxsdk({ url: encodeURIComponent(window.location.href.split('#')[0]) }, {
+        title: '城的空间',
+        desc: '城的空间',
+        link: `${window.location.origin}${window.location.pathname}/user.html#/mainPage/indexPage`,
+        thu_image: `${window.location.origin}${window.location.pathname}${logo}`
+      }).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 < this.CaseList.length; i++) {
+              let result = this.CaseList[i].Coordinate.split(",")
+              let latitude2 = parseFloat(result[0])
+              let longitude2 = parseFloat(result[1])
+              if (this.toolClass.getGreatCircleDistance(latitude1, longitude1, latitude2, longitude2) < 500) {
+                this.topCaseInfoData.caseName = this.CaseList[i].CaseName
+                this.topCaseInfoData.caseId = this.CaseList[i].CaseId
+                this.getCaseTableList({
+                  caseid: this.topCaseInfoData.caseId
+                })
+                this.getCaseTotal({
+                  caseid: this.topCaseInfoData.caseId
+                })
+              }
+            }
+            if (!this.topCaseInfoData.caseId || !this.topCaseInfoData.caseName){
+              this.topCaseInfoData.caseName = '当前位置无案场'
+            }
+          }
+        })
+      })
+    },
     beforeClose (action, done) {
       if (action === 'confirm') {
         setTimeout(done, 1000)

src/pages/user/receive/index.vue

@@ -140,11 +140,11 @@ export default {
       return `${rnd}${timestamp}`
     },
     sdk (info) {
-      let logo = this.logo.substring(2, this.logo.length)
+      let logo = this.data.Images[0].CouponImageUrl ? this.data.Images[0].CouponImageUrl : this.data.Images[0].CardImageUrl
       wxsdk({ url: encodeURIComponent(window.location.href.split('#')[0]) }, {
         title: '领取卡券',
         desc: info,
-        link: `${window.location.origin}${window.location.pathname}#/receiveShared/${this.$route.query.id}/${this.$route.query.salesid}/${this.$route.query.type}/receive`,
+        link: `${window.location.origin}${window.location.pathname}/user.html#/receiveShared/${this.$route.query.id}/${this.$route.query.salesid}/${this.$route.query.type}/receive`,
         thu_image: `${window.location.origin}${window.location.pathname}${logo}`
       })
     }

src/pages/user/receiveChannel/index.vue

@@ -131,11 +131,11 @@ export default {
       }
     },
     sdk (info) {
-      let logo = this.logo.substring(2, this.logo.length)
+      let logo = this.data.Images[0].CouponImageUrl ? this.data.Images[0].CouponImageUrl : this.data.Images[0].CardImageUrl
       wxsdk({ url: encodeURIComponent(window.location.href.split('#')[0]) }, {
         title: '领取卡券',
         desc: info,
-        link: `${window.location.origin}${window.location.pathname}#/receiveChannelShared/${this.$route.query.id}/${this.$route.query.type}/receive`,
+        link: `${window.location.origin}${window.location.pathname}/user.html#/receiveChannelShared/${this.$route.query.id}/${this.$route.query.type}/receive`,
         thu_image: `${window.location.origin}${window.location.pathname}${logo}`
       })
     }

src/store/forbid/index.js

@@ -110,7 +110,7 @@ export default {
         })
       })
     },
-    getCouponNum (context, data) {
+    getCouponNum (context, data) { 
       return new Promise((resolve, reject) => {
         Ajax(api.director.getCouponNum.url, {
           method: api.director.getCouponNum.method,

src/util/ajax.js

@@ -29,7 +29,6 @@ Axios.interceptors.request.use((config) => {
   config.headers.authorization = token()
   // 处理请求data,若为get请求，拼到url后面，若为post请求，直接添加到body中
   config.urlData = { ...config.urlData, org: 'MQ' }
-  let urlData = qs.stringify(config.urlData)
   let queryData = qs.stringify(config.queryData)
   // 判断是通过斜杠传参还是通过query传参
   if (config.url.indexOf(':') > -1) {

src/util/api.js

@@ -148,6 +148,14 @@ const $api = {
       method: 'get',
       url: `${baseUrl}${wechat}/user/detail/:id`
     },
+    getCardNum: {
+      method: 'get',
+      url: `${baseUrl}${wechat}/card/detail/:id`
+    },
+    getCouponNum: {
+      method: 'get',
+      url: `${baseUrl}${wechat}/coupon/detail/:id`
+    },
   },
   sales: {
     getCardList: { // 获取我的卡列表

src/util/share.js

@@ -30,15 +30,15 @@ function wxsdk (params, config) {
           'onMenuShareQQ',
           'onMenuShareWeibo',
           'onMenuShareQZone',
-          'openLocation'
+          'openLocation',
+          'getLocation'
         ]
       })
       wx.ready(function () {
         wx.onMenuShareTimeline(shareData)
         wx.onMenuShareAppMessage(shareData)
-        resolve()
+        resolve('success')
       })
-      // resolve(res)
     }).catch((err) => {
       reject(err)
     })

src/util/util.js

@@ -44,10 +44,10 @@ const toolClass = {
   /**
    * caculate the great circle distance
    * 经纬度计算距离
-   * @param {Object} lat1 精度1
-   * @param {Object} lng1 纬度1
-   * @param {Object} lat2 精度2
-   * @param {Object} lng2 纬度2
+   * @param {Object} lat1 纬度1
+   * @param {Object} lng1 精度1
+   * @param {Object} lat2 纬度2
+   * @param {Object} lng2 精度2
    */
 
   getGreatCircleDistance: (lat1, lng1, lat2, lng2) => {