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

src/components/customerCard/customerCard.vue

@@ -1,5 +1,8 @@
 <template>
   <div class="card-content">
+    <div class="tag">
+      <span>我推荐</span>
+    </div>
     <div class="card-top flex-h">
       <div class="flex-h">
         <img :src="data.Headimgurl" alt="">
@@ -44,6 +47,32 @@ export default {
   border-radius: 0.08rem;
   overflow: hidden;
   margin-bottom: 0.2rem;
+  position: relative;
+  .tag {
+    position: absolute;
+    top: 0;
+    left: 0;
+    transform: rotate(-45deg);
+    width: 0.8rem;
+    height: 0.8rem;
+    top: -0.42rem;
+    left: -0.42rem;
+    background: linear-gradient(
+      138deg,
+      rgba(255, 149, 41, 1) 0%,
+      rgba(255, 63, 41, 1) 100%
+    );
+    span {
+      position: absolute;
+      bottom: 2px;
+      left: 50%;
+      transform: translateX(-50%);
+      color: #fff;
+      font-size: .12rem;
+      width: 100%;
+      text-align: center;
+    }
+  }
   .card-top {
     padding: 0.3rem 0.1rem;
     > div:nth-of-type(1) {
@@ -57,7 +86,7 @@ export default {
       div {
         span {
           display: block;
-          padding: .02rem 0;
+          padding: 0.02rem 0;
         }
       }
     }
@@ -67,26 +96,26 @@ export default {
       align-items: center;
       justify-content: center;
       flex: 1;
-      padding-left: .15rem;
-      div{
-        color: #FC6243;
-        font-size: .12rem;
-        padding: 0.02rem .15rem;
-        border: 1px solid #FC6243;
+      padding-left: 0.15rem;
+      div {
+        color: #fc6243;
+        font-size: 0.12rem;
+        padding: 0.02rem 0.15rem;
+        border: 1px solid #fc6243;
         border-radius: 20px;
         margin: 0.05rem 0;
       }
     }
   }
-  .card-bottom{
-    background: #F2F2F2;
+  .card-bottom {
+    background: #f2f2f2;
     display: flex;
-    padding: .15rem;
+    padding: 0.15rem;
     justify-content: space-between;
-    span:nth-of-type(1){
+    span:nth-of-type(1) {
       color: #323645;
     }
-    span:nth-of-type(2){
+    span:nth-of-type(2) {
       color: #909090;
     }
   }

src/components/myCard/myCard.vue

@@ -77,20 +77,20 @@ export default {
     opacity: 0.5;
   }
   .card-top {
-    height: 0.88rem;
+    height: 1rem;
     padding: 0.1rem;
     box-sizing: border-box;
     .descs {
       overflow: hidden;
       text-overflow: ellipsis;
       display: -webkit-box;
-      -webkit-line-clamp: 1;
+      -webkit-line-clamp: 2;
       -webkit-box-orient: vertical;
-      height: .16rem;
+      height: .32rem;
       line-height: .16rem;
     }
     div:nth-of-type(1) {
-      width: 1.2rem;
+      width: 1.15rem;
       position: relative;
       .logo {
         width: 85%;
@@ -123,10 +123,9 @@ export default {
         font-size: 0.16rem;
       }
       span {
-        display: block;
         color: #323645;
-        font-size: 12px;
-        padding-top: 0.03rem;
+        font-size: 12px;      
+        padding-top: 0.05rem;
       }
     }
   }

src/pages/sales/customerSearch/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="mainPage flex-v">
     <div class="top">
-      <topCaseInfo :data="topCaseInfoData" :userName="userInfo.customer !== undefined ? userInfo.customer.CustomerName : ''"></topCaseInfo>
+      <topCaseInfo :data="topCaseInfoData" :userName="userInfo.customer !== undefined ? userInfo.customer.Name : ''"></topCaseInfo>
     </div>
     <div class="content flex-item">
       <div>

src/pages/sales/getRecord/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="mainPage flex-v">
     <div class="top">
-      <topCaseInfo :data="topCaseInfoData" :userName="userInfo.customer !== undefined ? userInfo.customer.CustomerName : ''" @selectCase="showSelect = true"></topCaseInfo>
+      <topCaseInfo :data="topCaseInfoData" :userName="userInfo.customer !== undefined ? userInfo.customer.Name : ''" @selectCase="showSelect = true"></topCaseInfo>
     </div>
     <div class="info">
       <span><em>姓名：</em>{{user.name}}</span>

src/pages/sales/login/index.vue

@@ -14,7 +14,7 @@
           <div class="sms" style="margin-top:.2rem;">
             <i class="iconfont icon-mima"></i>
             <input type="number" maxlength="6" placeholder="验证码" v-model="postData.captcha">
-            <div class="sand" v-if="seconds === 61" @click="sandMsg">发送验证码</div>
+            <div class="sand color" v-if="seconds === 61" @click="sandMsg">发送验证码</div>
             <div class="sand" v-else>{{seconds}}后可重发</div>
           </div>
         </div>

src/pages/sales/login/page.scss

@@ -1,5 +1,5 @@
 .mainPage {
-  background: url("../../../common/icon/bg.jpg") no-repeat 0 -0.8rem;
+  background: url("../../../common/icon/bg.jpg") no-repeat 0 0;
   background-size: 100% calc(100% + 90px);
   position: relative;
   input::-webkit-input-placeholder {
@@ -67,6 +67,10 @@
           line-height: .24rem;
           position: absolute;
           right: .1rem;
+          &.color{
+            border:1px solid #DADADA;
+            color: #DADADA;
+          }
         }
       }
       .recommend{

src/pages/sales/salesGiveOutDetail/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="mainPage flex-v">
     <div class="top">
-      <topCaseInfo :data="topCaseInfoData" :userName="userInfo.customer !== undefined ? userInfo.customer.CustomerName : ''" @selectCase="showVanPicker"></topCaseInfo>
+      <topCaseInfo :data="topCaseInfoData" :userName="userInfo.customer !== undefined ? userInfo.customer.Name : ''" @selectCase="showVanPicker"></topCaseInfo>
     </div>
     <div class="flex-item flex-v body" v-if="data.allCard">
       <span>销售姓名：<em>{{data.RealName}}</em></span>

src/pages/sales/salesRecord/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="mainPage flex-v">
     <div class="top">
-      <topCaseInfo :data="topCaseInfoData" :userName="userInfo.customer !== undefined ? userInfo.customer.CustomerName : ''" @selectCase="showVanPicker"></topCaseInfo>
+      <topCaseInfo :data="topCaseInfoData" :userName="userInfo.customer !== undefined ? userInfo.customer.Name : ''" @selectCase="showVanPicker"></topCaseInfo>
     </div>
     <div class="flex-item body">
       <div>

src/pages/user/bindMobile/bindMobile.vue

@@ -25,7 +25,7 @@
         <div class="sms">
           <i class="iconfont icon-mima"></i>
           <input type="number" maxlength="6" placeholder="验证码" v-model="postData.captcha">
-          <div class="sand" v-if="seconds === 61" @click="sandMsg">发送验证码</div>
+          <div class="sand color" v-if="seconds === 61" @click="sandMsg">发送验证码</div>
           <div class="sand" v-else>{{seconds}}后可重发</div>
         </div>
 

src/pages/user/bindMobile/page.scss

@@ -1,5 +1,5 @@
 .mainPage {
-  background: url("../../../common/icon/bg.jpg") no-repeat 0 -0.8rem;
+  background: url("../../../common/icon/bg.jpg") no-repeat 0 0;
   background-size: 100% calc(100% + 90px);
   position: relative;
   input::-webkit-input-placeholder {
@@ -67,6 +67,10 @@
           line-height: .24rem;
           position: absolute;
           right: .1rem;
+          &.color{
+            border:1px solid #DADADA;
+            color: #DADADA;
+          }
         }
       }
       .recommend{

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

@@ -1,7 +1,7 @@
 <template>
   <div class="mainPage flex-v">
     <div class="top">
-      <topCaseInfo :data="topCaseInfoData" :userName="userInfo.customer !== undefined ? userInfo.customer.CustomerName : ''" @selectCase="showVanPicker"></topCaseInfo>
+      <topCaseInfo :data="topCaseInfoData" :userName="userInfo.customer !== undefined ? 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>
@@ -282,8 +282,8 @@ export default {
               price: res.list[n].Price,
               title: res.list[n].CouponName,
               desc: res.list[n].Share.UseRule,
-              startDate: this.toolClass.dateFormat(res.list[n].StartDate, 'YYYY年MM月DD日'),
-              endDate: this.toolClass.dateFormat(res.list[n].EndDate, 'YYYY年MM月DD日'),
+              startDate: this.toolClass.dateFormat(res.list[n].StartDate, 'yyyy年MM月dd日'),
+              endDate: this.toolClass.dateFormat(res.list[n].EndDate, 'yyyy年MM月dd日'),
               totalCount: res.list[n].TotalCount,
               SentCount: res.list[n].SentCount,
               usedCount: res.list[n].UsedCount,
@@ -306,8 +306,8 @@ export default {
               price: res.list[n].Price,
               title: res.list[n].CardName,
               desc: res.list[n].Share.CardUseRule,
-              startDate: this.toolClass.dateFormat(res.list[n].StartDate),
-              endDate: this.toolClass.dateFormat(res.list[n].EndDate),
+              startDate: this.toolClass.dateFormat(res.list[n].StartDate, 'yyyy年MM月dd日'),
+              endDate: this.toolClass.dateFormat(res.list[n].EndDate, 'yyyy年MM月dd日'),
               totalCount: res.list[n].TotalCount,
               SentCount: res.list[n].SentCount,
               usedCount: res.list[n].UsedCount,

src/pages/user/majorProjects/index.vue

@@ -133,9 +133,9 @@ export default {
     ...mapProjectState({
       projectInfo: x => x.projectInfo
     }),
-    MySwiper () {
-      return this.$refs.mySwiper.swiper
-    },
+    // MySwiper () {
+    //   return this.$refs.mySwiper.swiper
+    // },
   },
   components: {
     courseItem,

src/pages/user/majorProjects/page.scss

@@ -24,6 +24,10 @@
         top: 0;
         bottom: 0;
       }
+      img{
+        width: 100%;
+        height: 100%;
+      }
     }
   }
   .items{