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

public/index.html

@@ -6,7 +6,7 @@
   <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_w203meltjv9.css">
+  <link rel="stylesheet" href="//at.alicdn.com/t/font_775069_5i50qqneuws.css">
   <link rel="icon" href="<%= BASE_URL %>favicon.ico">
   <title>
     <%= htmlWebpackPlugin.options.title %>

src/pages/sales/coffeeIndex/index.vue

@@ -61,6 +61,19 @@
           </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:.25rem;height:.25rem"
+                  >
+                </van-checkbox>
+                <i class="iconfont icon-sousuo search-icon" @click="searchMask"></i>
+              </div>
               <customerCard v-for="(item,index) in cardList" :key="index" :data='item' @share='share'></customerCard>
             </div>
           </li>
@@ -76,6 +89,13 @@
       @confirm="selectCase"
       value-key="value"
     />
+    <div v-if="!mask" class="search-mask">
+      <div class="mask-top">
+        <input type="text">
+        <i class="iconfont icon-sousuo search-icon" @click="searchMask"></i>
+      </div>
+      <div class="mask-bottom"></div>
+    </div>
   </div>
 </template>
 
@@ -84,6 +104,8 @@ 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')
@@ -93,7 +115,13 @@ export default {
   name: '',
   data () {
     return {
-      navActive: 1,
+      icon: {
+        active: active,
+        normal: normal
+      },
+      mask: false,
+      navActive: 2,
+      checked: true,
       cutNavList: [{
         value: '城咖啡',
         id: '1',
@@ -199,6 +227,9 @@ export default {
     },
     share (item) {
       console.log(item)
+    },
+    searchMask () {
+      this.mask = true
     }
   }
 }
@@ -206,5 +237,5 @@ export default {
 
 <!-- Add "scoped" attribute to limit CSS to this component only -->
 <style lang="scss" scoped>
-@import "page.scss";
+@import 'page.scss';
 </style>

src/pages/sales/coffeeIndex/page.scss

@@ -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;
+            }
+          }
         }
       }
     }
@@ -182,4 +191,32 @@
     background: rgba(0, 0, 0, .3);
     z-index: 100;
   }
+  .search-mask{
+    width: 100%;
+    height: 100%;
+    position: fixed;
+    top: 0;
+    left: 0;
+    background: #fff;
+    z-index: 999;
+    display: flex;
+    flex-flow: column nowrap;
+    .mask-bottom{
+      flex: 1
+    }
+    .mask-top{
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      padding: .1rem .2rem;
+      input{
+        width: 100%;
+        height: .5rem;
+        background: #eee;
+      }
+      i{
+        font-size: .24rem;
+      }
+    }
+  }
 }

src/pages/sales/router.js

@@ -45,7 +45,6 @@ const router = new Router({
 })
 
 router.beforeEach((to, from, next) => {
-
   next()
 })
 

src/util/ajax.js

@@ -59,8 +59,8 @@ const ajax = (...args) => {
         toolClass.getCode(result.appid)
       } else if (code === 406) {
         console.log(router.history.current.name)
-        if (router.history.current.name !== 'bindMobile'){
-          router.push({ name:'bindMobile' })
+        if (router.history.current.name !== 'bindMobile') {
+          router.push({ name: 'bindMobile' })
         }
       } else {
         console.log(message)