ytj

src/common/css/reset.css

@@ -73,4 +73,8 @@ select option {
 
 .van-toast i{
 	color: white;
+}
+
+::-webkit-scrollbar {
+	display: none;
 }

src/components/myCard/myCard.vue

@@ -31,7 +31,7 @@
         <span>40</span>
       </div>
     </div>
-    <div class="card-bottom" @click.stop="share">
+    <div v-if='canShare' class="card-bottom" @click.stop="share">
       分享卡券
     </div>
   </div>
@@ -54,6 +54,10 @@ export default {
     data: {
       type: Object,
       default: () => { }
+    },
+    canShare: {
+      type: Boolean,
+      default: true
     }
   },
   methods: {
@@ -149,6 +153,7 @@ export default {
     background-color: #fc6243;
     text-align: center;
     color: #fff;
+    border-radius: 0 0 .08rem .08rem;
   }
 }
 </style>

src/components/scroll/scroll.vue

@@ -7,7 +7,7 @@
       <slot name="pullup" v-if="isloading" :pullUpLoad="pullUpLoad" :isPullUpLoad="isPullUpLoad">
         <div class="pullup-wrapper" v-if="pullUpLoad">
           <div class="before-trigger" v-if="!isPullUpLoad">
-            <span>{{pullUpTxt}}</span>
+            <!-- <span>{{pullUpTxt}}</span> -->
           </div>
           <div class="after-trigger" v-else>
             <loading></loading>

src/pages/user/card/index.vue

@@ -11,33 +11,36 @@
         </div>
         <div v-if="active == 1">
           <div class="fitness-card" v-for="(item,index) in data[1].list" :key='index'>
-            <div :class="{'opacity' : item.useType == '已失效' || item.useType == '已使用', 'gray': item.useType == '已使用'}" @click="toCardDetail(item)">
+            <div :class="{'opacity' : item.CardStatus == 'expire' || item.CardStatus == 'used', 'gray': item.CardStatus == 'used'}" @click="toCardDetail(item)">
               <div class="card-top">
                 <div class="top-left">
                   <img :src="logo" alt="">
                   <div class="price">
                     <span>￥</span>
-                    <h1>{{item.price}}</h1>
+                    <h1>{{parseInt(item.Price)}}</h1>
                     <span>元</span>
                   </div>
                 </div>
                 <div class="top-right">
                   <img :src="Line3" alt="">
-                  <div>{{item.title}}</div>
-                  <div>{{item.desc}}</div>
+                  <div>{{item.CustomerGymName}}</div>
+                  <div>{{item.CardShareInfo}}</div>
                 </div>
               </div>
               <div class="card-bottom">
                 <img :src="line" alt="">
-                <div class="time">有效期:{{item.time}}</div>
-                <div class="status" :class="{'gray-location' : item.useType == '已使用'}">
-                  <span>{{item.tag}}</span>
+                <div class="time">有效期：{{toolClass.dateFormat(item.EndDate)}}</div>
+                <div class="status" :class="{'gray-location' : item.CardStatus == 'used'}">
+                  <span v-if="item.GymType == 'year'">年卡</span>
+                  <span v-if="item.GymType == 'quarter'">季卡</span>
+                  <span v-if="item.GymType == 'month'">月卡</span>
+                  <span v-if="item.GymType == 'once'">次卡</span>
                 </div>
               </div>
             </div>
             <div class="useType">
-              <img :src="used" alt="已使用" v-if="item.useType == '已使用'" width="100%" height="100%">
-              <img :src="failure" alt="已失效" v-if="item.useType == '已失效'" width="100%" height="100%">
+              <img :src="used" alt="已使用" v-if="item.CardStatus == 'used'" width="100%" height="100%">
+              <img :src="failure" alt="已失效" v-if="item.CardStatus == 'expire'" width="100%" height="100%">
             </div>
           </div>
           <noMore v-if="data[active].hasPic"></noMore>
@@ -57,6 +60,8 @@ import failure from '../../../common/icon/inv.png'
 import scroll from '../../../components/scroll/scroll'
 import noMore from '../../../components/noMore/noMore'
 import discounts from '../../../components/discounts/discounts'
+import { createNamespacedHelpers } from 'vuex'
+const { mapState: mapCardState, mapActions: mapCardActions } = createNamespacedHelpers('card')
 export default {
   data () {
     return {
@@ -70,11 +75,12 @@ export default {
       pullUpLoadThreshold: 40,
       startY: 0,
       isloading: true,
-      hasMore: true,
       data: [
         {
           hasPic: false,
           hasMore: true,
+          page: 1,
+          pageSize: 1,
           list: [
             {
               title: '小小外交官体验卡',
@@ -102,32 +108,9 @@ export default {
         {
           hasPic: false,
           hasMore: true,
-          list: [
-            {
-              title: '会所健身体验卡',
-              desc: '适用于游泳',
-              time: '2018年02月17日-2018年3月17日',
-              price: '120',
-              useType: '未使用',
-              tag: '年卡'
-            },
-            {
-              title: '会所健身体验卡',
-              desc: '适用于游泳',
-              time: '2018年02月17日-2018年3月17日',
-              price: '120',
-              useType: '已使用',
-              tag: '季卡'
-            },
-            {
-              title: '会所健身体验卡',
-              desc: '适用于游泳',
-              time: '2018年02月17日-2018年3月17日',
-              price: '120',
-              useType: '已失效',
-              tag: '次卡'
-            }
-          ]
+          page: 0,
+          pageSize: 10,
+          list: []
         }
       ],
       line
@@ -149,28 +132,54 @@ export default {
           }
         }
         : false
-    }
+    },
+    ...mapCardState({
+      gymCardList: x => x.gymCardList
+    })
+  },
+  created () {
+    this.change('', 0)
   },
   methods: {
+    ...mapCardActions(['getgymCardList']),
     change (item, index) {
       this.active = index
+      this.getList('change')
     },
     toUse (item) {
       // console.log(item)
     },
-    getList () {
-      // console.log(111)
+    getList (param) {
+      if (this.active === 0) {
+
+      } else {
+        if (param === 'change') {
+          this.data[this.active].page = 0
+        }
+        if (this.data[this.active].hasMore) {
+          this.getgymCardList({ page: this.data[this.active].page, pageSize: this.data[this.active].pageSize }).then((res) => {
+            this.data[this.active].list = this.data[this.active].list.concat(this.gymCardList)
+            this.data[this.active].page++
+            if (this.gymCardList.length < this.data[this.active].pageSize) {
+              this.data[this.active].hasMore = false
+            }
+            if (this.data[this.active].list.length <= 0) {
+              this.data[this.active].hasPic = true
+            }
+          })
+        }
+      }
     },
     toCardDetail (item) {
-      this.$router.push({ name: 'cardDetail' })
+      this.$router.push({ name: 'cardDetail', query: { CustomerGymId: item.CustomerGymId } })
     },
     toCouponsDetail () {
-      this.$router.push({ name: 'couponsDetail' })
+      this.$router.push({ name: 'couponsDetail'})
     }
   }
 }
 </script>
 
 <style lang="scss" scoped>
-@import "page.scss";
+@import 'page.scss';
 </style>

src/pages/user/cardDetail/index.vue

@@ -9,22 +9,18 @@
         </div>
         <div>
           <span>有效时间</span>
-          <span>{{time}}</span>
+          <span>{{toolClass.dateFormat(gymCardDetail.EndDate)}}</span>
         </div>
       </div>
       <div class="rule">
         <div>使用规则</div>
-        <div>1. 此卡不可兑换现金，不可与其他优惠活动同时使用。 </div>
-        <div>2. 此卡不可多人使用，一人记一次。 </div>
-        <div>3. 非会员可凭此卡享受对应课程。 </div>
-        <div>4. 截止日期至{{time}}。 </div>
+        <div>{{gymCardDetail.CardUseRule}}</div>
       </div>
       <div class="line">
         <img :src="Artboard" alt="" width="100%">
       </div>
       <div class="qr-code" style="margin-top:.1rem;">
-        <div class="number">核销编码: 3423487682734</div>
-        <qrCode :msg='msg'></qrCode>
+        <qrCode :msg='msg' v-if="msg"></qrCode>
       </div>
     </div>
   </div>
@@ -33,25 +29,38 @@
 <script>
 import qrCode from '../../../components/qrCodeCard/qrCodeCard'
 import Artboard from '../../../common/icon/Artboard.png'
+import { createNamespacedHelpers } from 'vuex'
+const { mapState: mapCardState, mapActions: mapCardActions } = createNamespacedHelpers('card')
 export default {
   data () {
     return {
-      msg: {
-        course_type: 800
-      },
+      msg: '',
       Artboard,
       time: '2018年3月17日'
     }
   },
   methods: {
 
+  },
+  computed: {
+    ...mapCardState({
+      gymCardDetail: x => x.gymCardDetail
+    })
   },
   components: {
     qrCode
+  },
+  created () {
+    this.getgymCardDetail({ customerGymId: this.$route.query.CustomerGymId }).then(() => {
+      this.msg = this.gymCardDetail.CustomerGymId
+    })
+  },
+  methods: {
+    ...mapCardActions(['getgymCardDetail'])
   }
 }
 </script>
 
 <style lang="scss" scoped>
-@import "page.scss";
+@import 'page.scss';
 </style>

src/pages/user/coupons/index.vue

@@ -22,8 +22,6 @@ import discounts from '../../../components/discounts/discounts'
 export default {
   data () {
     return {
-      nav: ['课程体验卡', '健身卡'],
-      active: 0,
       logo,
       Line3,
       used,

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

@@ -4,70 +4,99 @@
       <topCaseInfo :data="topCaseInfoData" :userName="userInfo.customer !== undefined ? userInfo.customer.CustomerName : ''" @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 !== '3'" :class="{'active': navActive === index}" @click="cutNav(index)">{{item.value}}</a>
+      <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>
-    <div class="content flex-item">
-      <div>
-        <ul>
-          <li :hidden="navActive !== 0 && userInfo.customer.MapUser !== ''" class="placeOrder">
-            <div class="topInfo flex-h" v-if="userInfo.customer.MapUser !== ''">
-              <div class="flex-item">
-                <div>
-                  <span>共计已使用：{{caseTotal.total}}杯</span>
+    <scroll ref='scroll' :isloading='isloading' class='wrapper' :data='data[navActive].list' :pullUpLoad='pullUpLoadObj' :startY='parseInt(startY)' @pullingUp='getList'>
+      <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="flex-item">
+                  <div>
+                    <span>共计已使用：{{caseTotal.total}}杯</span>
+                  </div>
+                </div>
+                <div class="flex-item">
+                  <div>
+                    <span>本月已用：{{caseTotal.monthtotal}}杯</span>
+                  </div>
                 </div>
+                <router-link :to="{name: 'orderList'}">点单记录</router-link>
               </div>
-              <div class="flex-item">
-                <div>
-                  <span>本月已用：{{caseTotal.monthtotal}}杯</span>
+              <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>
-              <router-link :to="{name: 'orderList'}">点单记录</router-link>
-            </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>
+            </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>
+                  <a @click="toSalesHistory">销售记录</a>
                 </div>
+                <myCard v-for="(item,index) in data[1].list" :key="index" :data='item' @share='share'></myCard>
               </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>
+            </li>
+            <li :hidden="navActive !== 2" 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>
+                  <a @click="toSalesHistory">销售记录</a>
+                </div>
+                <myCard v-for="(item,index) in data[2].list" :key="index" :data='item' @share='share'></myCard>
+              </div>
+            </li>
+            <li :hidden="navActive !== 3" 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>
-                <a @click="toSalesHistory">销售记录</a>
-                <!-- <router-link :to="{name: 'salesRecord',query: {}}">销售记录</router-link> -->
+                <customerCard v-for="(item,index) in data[3].list" :key="index" :data='item' @share='share'></customerCard>
               </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">
-              <customerCard v-for="(item,index) in cardList" :key="index" :data='item' @share='share'></customerCard>
-            </div>
-          </li>
-        </ul>
+            </li>
+          </ul>
+        </div>
       </div>
-    </div>
+    </scroll>
     <div class="selectCase" :hidden="!showSelect"></div>
     <van-picker :hidden="!showSelect"
       show-toolbar
@@ -77,33 +106,66 @@
       @confirm="selectCase"
       value-key="CaseName"
     />
+    <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 scroll from '../../../../components/scroll/scroll'
 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')
+const { mapState: mapCustomerState, mapActions: mapCustomerActions } = createNamespacedHelpers('myCustomer')
+const { mapState: mapCardState, mapActions: mapCardActions } = createNamespacedHelpers('myCard')
 
 export default {
   name: '',
   data () {
     return {
+      pullUpLoad: true,
+      pullUpLoadThreshold: 40,
+      startY: 0,
+      isloading: true,
+      icon: {
+        active: active,
+        normal: normal
+      },
+      active,
+      normal,
       navActive: 0,
+      checked: true,
+      showDialog: false,
+      message: '',
       cutNavList: [{
         value: '城咖啡',
         id: '1',
       }, {
-        value: '我的卡券',
+        value: '我的卡',
         id: '2',
       }, {
-        value: '我的客户',
+        value: '我的券',
         id: '3',
+      }, {
+        value: '我的客户',
+        id: '4',
       }],
       topCaseInfoData: {
         CaseName: '',
@@ -122,20 +184,116 @@ export default {
         name: '案场名称2',
         list: [{}, {}, {}, {}, {}],
       }],
-      cardList: [
+      data: [
         {
-          invalid: true
+          hasPic: false,
+          hasMore: true,
+          page: 1,
+          pageSize: 1,
+          list: []
         },
         {
-          invalid: false
+          hasPic: false,
+          hasMore: true,
+          page: 1,
+          pageSize: 1,
+          list: [
+            {
+              title: '小小外交官体验卡',
+              desc: '凭此体验券可让一位小朋友体验一次 适用于小小外交官课程',
+              time: '2018年02月17日',
+              useType: '未使用',
+              tag: '共享'
+            },
+            {
+              title: '小小外交官体验卡',
+              desc: '凭此体验券可让一位小朋友体验一次 适用于小小外交官课程',
+              time: '2018年02月17日',
+              useType: '已使用',
+              tag: '商品'
+            },
+            {
+              title: '小小外交官体验卡',
+              desc: '凭此体验券可让一位小朋友体验一次 适用于小小外交官课程',
+              time: '2018年02月17日',
+              useType: '已失效',
+              tag: '商品'
+            }
+          ]
         },
         {
-          invalid: false
+          hasPic: false,
+          hasMore: true,
+          page: 1,
+          pageSize: 1,
+          list: [
+            {
+              title: '小小外交官体验卡',
+              desc: '凭此体验券可让一位小朋友体验一次 适用于小小外交官课程',
+              time: '2018年02月17日',
+              useType: '未使用',
+              tag: '共享'
+            },
+            {
+              title: '小小外交官体验卡',
+              desc: '凭此体验券可让一位小朋友体验一次 适用于小小外交官课程',
+              time: '2018年02月17日',
+              useType: '已使用',
+              tag: '商品'
+            },
+            {
+              title: '小小外交官体验卡',
+              desc: '凭此体验券可让一位小朋友体验一次 适用于小小外交官课程',
+              time: '2018年02月17日',
+              useType: '已失效',
+              tag: '商品'
+            }
+          ]
+        },
+        {
+          hasPic: false,
+          hasMore: true,
+          page: 1,
+          pageSize: 1,
+          list: [
+            {
+              title: '小小外交官体验卡',
+              desc: '凭此体验券可让一位小朋友体验一次 适用于小小外交官课程',
+              time: '2018年02月17日',
+              useType: '未使用',
+              tag: '共享'
+            },
+            {
+              title: '小小外交官体验卡',
+              desc: '凭此体验券可让一位小朋友体验一次 适用于小小外交官课程',
+              time: '2018年02月17日',
+              useType: '已使用',
+              tag: '商品'
+            },
+            {
+              title: '小小外交官体验卡',
+              desc: '凭此体验券可让一位小朋友体验一次 适用于小小外交官课程',
+              time: '2018年02月17日',
+              useType: '已失效',
+              tag: '商品'
+            }
+          ]
         }
       ]
     }
   },
   computed: {
+    pullUpLoadObj: function () {
+      return this.pullUpLoad
+        ? {
+          threshold: parseInt(this.pullUpLoadThreshold),
+          txt: {
+            more: this.pullUpLoadMoreTxt,
+            noMore: this.pullUpLoadNoMoreTxt
+          }
+        }
+        : false
+    },
     ...mapState({
       userInfo: x => x.userCenter.userInfo,
       CaseList: x => x.app.CaseList,
@@ -144,12 +302,19 @@ export default {
     ...mapCaseState({
       caseTotal: x => x.caseTotal,
     }),
+    ...mapCustomerState({
+      customerList: x => x.customerList
+    }),
+    ...mapCardState({
+      cardList: x => x.cardList
+    })
   },
   components: {
     topCaseInfo,
     caseTableItem,
     myCard,
-    customerCard
+    customerCard,
+    scroll
   },
   created () {
     this.getCaseList().then((res) => {
@@ -161,6 +326,9 @@ export default {
       this.getCaseTotal({
         caseid: this.topCaseInfoData.CaseId
       })
+      this.getCustomerList().then(() => {
+
+      })
     })
   },
   methods: {
@@ -173,6 +341,8 @@ export default {
     ...mapCaseActions([
       'getCaseTotal',
     ]),
+    ...mapCustomerActions(['getCustomerList']),
+    ...mapCardActions(['getCardList']),
     toSalesHistory () {
       console.log(this.getUrl('salesRecord'))
       window.location.href = this.getUrl('salesRecord')
@@ -194,9 +364,54 @@ export default {
     },
     cutNav (index) { // 切换nav
       this.navActive = index
+      console.log(this.navActive)
+      // this.getList('change')
+    },
+    getList (param) {
+      if (this.navActive === 0) {
+        return
+      } else {
+        if (param === 'change') {
+          this.data[this.active].page = 0
+        }
+        if (this.data[this.active].hasMore) {
+          // this.getgymCardList({ page: this.data[this.active].page, pageSize: this.data[this.active].pageSize }).then((res) => {
+          //   this.data[this.active].list = this.data[this.active].list.concat(this.gymCardList)
+          //   this.data[this.active].page++
+          //   if (this.gymCardList.length < this.data[this.active].pageSize) {
+          //     this.data[this.active].hasMore = false
+          //   }
+          //   if (this.data[this.active].list.length <= 0) {
+          //     this.data[this.active].hasPic = true
+          //   }
+          // })
+        }
+      }
     },
     share (item) {
       console.log(item)
+    },
+    remark (item) {
+      console.log(item)
+      this.showDialog = true
+    },
+    history (item) {
+      console.log(item)
+      window.location.href = this.getUrl('history')
+    },
+    record (item) {
+      console.log(item)
+      window.location.href = this.getUrl('getRecord')
+    },
+    searchMask () {
+      window.location.href = this.getUrl('customerSearch')
+    },
+    beforeClose (action, done) {
+      if (action === 'confirm') {
+        setTimeout(done, 1000)
+      } else {
+        done()
+      }
     }
   }
 }

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

@@ -48,7 +48,7 @@
           width: 100%;
           height: 100%;
           position: relative;
-          overflow-y: scroll;
+          // overflow-y: scroll;
           -webkit-overflow-scrolling: touch;
           transform: translateZ(0);
           -webkit-transform: translateZ(0);
@@ -169,6 +169,15 @@
               padding: .1rem .2rem .2rem;
             }
           }
+          .search-bar{
+            align-items: center;
+            justify-content: space-between;
+            padding: 0 .1rem .1rem;
+            .search-icon{
+              font-size: .18rem;
+              color: #909090;
+            }
+          }
         }
       }
     }

src/store/card/index.js

@@ -0,0 +1,51 @@
+import Ajax from '../../util/ajax'
+import api from '../../util/api'
+
+// 请求数据
+export default {
+  namespaced: true,
+  state: {
+    gymCardList: [],
+    gymCardDetail: ''
+  },
+  mutations: {
+    setgymCardList (state, data) { // 设置页面信息
+      state.gymCardList = data.list
+    },
+    setgymCardDetail (state, data) {
+      state.gymCardDetail = data
+    }
+  },
+  actions: {
+    getgymCardList (context, data) { // 获取课程详情信息
+      return new Promise((resolve) => {
+        Ajax(api.user.gymCard.url, {
+          method: api.user.gymCard.method,
+          queryData: {
+            ...data
+          }
+        }).then(res => {
+          context.commit('setgymCardList', res)
+          resolve(res)
+        }).catch((err) => {
+          reject(err)
+        })
+      })
+    },
+    getgymCardDetail (context, data) { // 获取课程详情信息
+      return new Promise((resolve, reject) => {
+        Ajax(api.user.gymCardDetail.url, {
+          method: api.user.gymCardDetail.method,
+          urlData: {
+            ...data
+          }
+        }).then(res => {
+          context.commit('setgymCardDetail', res)
+          resolve(res)
+        }).catch((err) => {
+          reject(err)
+        })
+      })
+    }
+  }
+}

src/store/index.js

@@ -19,6 +19,9 @@ export const modules = {
   case: () => require('./case/case').default,
   goodsOrder: () => require('./goods/order').default,
   login: () => require('./login/login').default,
+  myCustomer: () => require('./myCustomer/index').default,
+  myCard: () => require('./myCard/index').default,
+  card: () => require('./card/index').default
 }
 
 Object.keys(modules).forEach((modKey) => {

src/store/myCard/index.js

@@ -0,0 +1,29 @@
+import Ajax from '../../util/ajax'
+import api from '../../util/api'
+
+// 请求数据
+export default {
+  namespaced: true,
+  state: {
+    cardList: []
+  },
+  mutations: {
+    setCustomerList (state, data) { // 设置页面信息
+      state.cardList = data
+    }
+  },
+  actions: {
+    getCustomerList (context) { // 获取课程详情信息
+      return new Promise((resolve) => {
+        Ajax(api.card.myCustomer.url, {
+          method: api.card.myCustomer.method
+        }).then(res => {
+          context.commit('setCustomerList', res)
+          resolve(res)
+        }).catch((err) => {
+          reject(err)
+        })
+      })
+    }
+  }
+}

src/store/myCustomer/index.js

@@ -0,0 +1,29 @@
+import Ajax from '../../util/ajax'
+import api from '../../util/api'
+
+// 请求数据
+export default {
+  namespaced: true,
+  state: {
+    customerList: []
+  },
+  mutations: {
+    setCustomerList (state, data) { // 设置页面信息
+      state.customerList = data
+    }
+  },
+  actions: {
+    getCustomerList (context) { // 获取课程详情信息
+      return new Promise((resolve) => {
+        Ajax(api.card.myCustomer.url, {
+          method: api.card.myCustomer.method
+        }).then(res => {
+          context.commit('setCustomerList', res)
+          resolve(res)
+        }).catch((err) => {
+          reject(err)
+        })
+      })
+    }
+  }
+}

src/util/api.js

@@ -63,6 +63,12 @@ const $api = {
       url: `${baseUrl}${wechat}/order/course`
     },
   },
+  card:{
+    myCustomer:{ // 我的客户
+      method: 'get',
+      url: `${baseUrl}${wechat}/customer/user`
+    }
+  },
   user: {
     info: { // 获取用户信息
       method: 'get',
@@ -96,6 +102,14 @@ const $api = {
       method: 'get',
       url: `${baseUrl}${wechat}/course/user/:id`
     },
+    gymCard: { // 获取健身卡列表
+      method: 'get',
+      url: `${baseUrl}${wechat}/gymcard`
+    },
+    gymCardDetail: { // 获取健身卡列表
+      method: 'get',
+      url: `${baseUrl}${wechat}/gymcard/:customerGymId`
+    },
   },
   login: { // 主管、销售端登陆
     login: {

src/util/share.js

@@ -0,0 +1,45 @@
+import axios from 'axios'
+import api from './api'
+
+function wxsdk (params, config) {
+  const wx = require('weixin-js-sdk')
+
+  const shareData = {
+    title: config.title, // 分享标题
+    desc: config.desc, // 分享标题
+    link: config.link, // 分享链接，该链接域名或路径必须与当前页面对应的公众号JS安全域名一致
+    imgUrl: config.thu_image // 分享图标
+  }
+  // 初始化
+  return new Promise(function (resolve) {
+    axios.post(api.common.shareWx.url + '?url=' + params.url)
+      .then(function (res) {
+        let result = JSON.parse(res.data)
+        wx.config({
+          debug: false, // 开启调试模式,调用的所有api的返回值会在客户端alert出来，若要查看传入的参数，可以在pc端打开，参数信息会通过log打出，仅在pc端时才会打印。
+          appId: result.appId, // 必填，公众号的唯一标识
+          timestamp: result.timestamp, // 必填，生成签名的时间戳
+          nonceStr: result.noncestr, // 必填，生成签名的随机串
+          signature: result.signature, // 必填，签名，见附录1
+          jsApiList: [
+            'onMenuShareTimeline',
+            'onMenuShareAppMessage',
+            'onMenuShareQQ',
+            'onMenuShareWeibo',
+            'onMenuShareQZone',
+            'openLocation'
+          ]
+        })
+        wx.ready(function () {
+          wx.onMenuShareTimeline(shareData)
+          wx.onMenuShareAppMessage(shareData)
+          // resolve()
+        })
+      })
+      .catch(function (error) {
+        console.log(error)
+      })
+  })
+}
+
+export default wxsdk

vue.config.js

@@ -25,9 +25,10 @@ module.exports = {
       // '/api-v2': {
       '/api': {
         // target: 'https://dp.huiju360.com.cn/hj_operations',
-        target: 'http://192.168.0.62:8080', //wf
-        // target: 'http://192.168.0.11', //ys
-        // target: 'http://dev.ycjcjy.com', //frp
+        target: 'http://192.168.0.62:8080', // wf
+        // target: 'http://192.168.0.125:8080', // hyq
+        // target: 'http://192.168.0.11', // ys
+        // target: 'http://dev.ycjcjy.com', // frp
         changeOrigin: true, // 如果接口跨域，需要进行这个参数配置
         // pathRewrite: {
         //   '^/api': '/api-v2/api'