yjt

src/components/myCard/myCard.vue

@@ -74,7 +74,7 @@ export default {
   margin-bottom: 0.2rem;
   &.invalid {
     filter: grayscale(100%);
-    opacity: .5;
+    opacity: 0.5;
   }
   .card-top {
     height: 0.88rem;
@@ -84,8 +84,10 @@ export default {
       overflow: hidden;
       text-overflow: ellipsis;
       display: -webkit-box;
-      -webkit-line-clamp: 2;
+      -webkit-line-clamp: 1;
       -webkit-box-orient: vertical;
+      height: .16rem;
+      line-height: .16rem;
     }
     div:nth-of-type(1) {
       width: 1.2rem;

src/pages/sales/salesGiveOutDetail/index.vue

@@ -31,7 +31,7 @@
                       <span>￥{{item.Price}} * 1</span>
                     </div>
                   </div>
-                  <span>{{toolClass.dateFormat(item.CreateDate)}}</span>
+                  <span>{{toolClass.dateFormat(item.CreateDate, 'yyyy/MM/dd hh:mm')}}</span>
                 </li>
               </ul>
             </li>
@@ -48,7 +48,7 @@
                       <span>￥{{item.Price}} * 1</span>
                     </div>
                   </div>
-                  <span>{{toolClass.dateFormat(item.ReceiveDate)}}</span>
+                  <span>{{toolClass.dateFormat(item.ReceiveDate, 'yyyy/MM/dd hh:mm')}}</span>
                 </router-link>
               </ul>
             </li>

src/pages/sales/salesGiveOutDetail/page.scss

@@ -92,9 +92,11 @@
                   flex:1;
                 }
                 >div{
+                  flex: 1;
                   span{
                     width: 100%;
                     display: block;
+                    text-align: center;
                   }
                   margin-left: .1rem;
                   &:first-child{
@@ -102,7 +104,7 @@
                   }
                   &:nth-child(2){
                     span{
-                      text-align: center;
+                      text-align: left;
                     }
                   }
                 }

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

@@ -68,7 +68,7 @@
                       <span>￥{{couponTotalCount}}</span>
                     </div>
                   </div>
-                  <a @click="toSalesHistory">销售记录</a>
+                  <a @click="toSalesHistory" v-if="userInfo.customer.UserTypeId == 'manager'">销售记录</a>
                 </div>
                 <myCard v-for="(item,index) in data[2].list" :key="index" :data='item' @share='shareCoupon'></myCard>
               </div>
@@ -77,7 +77,7 @@
               <div class="list-box">
                 <div class="search-bar flex-h">
                   <span>共{{this.data[3].list.length}}位客户</span>
-                  <van-checkbox v-model="postCustomerData.isrecommend">
+                  <!-- <van-checkbox v-model="postCustomerData.isrecommend">
                     我推荐的客户({{myRecommendUserList.length}}人)
                     <img
                       slot="icon"
@@ -85,7 +85,7 @@
                       :src="postCustomerData.isrecommend ? icon.active : icon.normal"
                       style="width:.2rem;height:.2rem;bottom: .02rem;position: relative;"
                     >
-                  </van-checkbox>
+                  </van-checkbox> -->
                   <i class="iconfont icon-sousuo search-icon" @click="searchMask"></i>
                 </div>
                 <customerCard v-for="(item,index) in postCustomerData.isrecommend ? myRecommendUserList : data[3].list" :key="index" :data='item' @record='record'></customerCard>
@@ -279,8 +279,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),
-              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,
@@ -431,40 +431,49 @@ export default {
           caseid: that.topCaseInfoData.caseId
         })
       }
-      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 < that.CaseList.length; i++) {
-              let result = that.CaseList[i].Coordinate.split(",")
-              let latitude2 = parseFloat(result[0])
-              let longitude2 = parseFloat(result[1])
-              if (that.toolClass.getGreatCircleDistance(latitude1, longitude1, latitude2, longitude2) < 500) {
-                that.topCaseInfoData.caseName = that.CaseList[i].CaseName
-                that.topCaseInfoData.caseId = that.CaseList[i].CaseId
-                that.getCaseTableList({
-                  caseid: that.topCaseInfoData.caseId
-                })
-                if (this.userInfo.customer.MapUser !== '') {
-                  that.getCaseTotal({
+      if (this.userInfo.customer.MapUser !== '') {
+        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
+          }
+        }
+      } else {
+        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 < that.CaseList.length; i++) {
+                let result = that.CaseList[i].Coordinate.split(",")
+                let latitude2 = parseFloat(result[0])
+                let longitude2 = parseFloat(result[1])
+                if (that.toolClass.getGreatCircleDistance(latitude1, longitude1, latitude2, longitude2) < 500) {
+                  that.topCaseInfoData.caseName = that.CaseList[i].CaseName
+                  that.topCaseInfoData.caseId = that.CaseList[i].CaseId
+                  that.getCaseTableList({
                     caseid: that.topCaseInfoData.caseId
                   })
+                  if (this.userInfo.customer.MapUser !== '') {
+                    that.getCaseTotal({
+                      caseid: that.topCaseInfoData.caseId
+                    })
+                  }
                 }
               }
+              if (!that.topCaseInfoData.caseId || !that.topCaseInfoData.caseName) {
+                that.topCaseInfoData.caseName = '当前位置无案场'
+              }
             }
-            if (!that.topCaseInfoData.caseId || !that.topCaseInfoData.caseName) {
-              that.topCaseInfoData.caseName = '当前位置无案场'
-            }
-          }
+          })
         })
-      })
+      }
     },
     beforeClose (action, done) {
       if (action === 'confirm') {

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

@@ -180,7 +180,7 @@
           .search-bar{
             align-items: center;
             justify-content: space-between;
-            padding: 0 .1rem .1rem;
+            padding: 0 .1rem .1rem; 
             .search-icon{
               font-size: .18rem;
               color: #909090;

src/pages/user/majorProjects/index.vue

@@ -2,11 +2,12 @@
   <div class="mainPage">
     <div class="banner">
       <div>
-        <swiper :options="swiperOption" ref="mySwiper">
+        <!-- <swiper :options="swiperOption" ref="mySwiper">
           <swiper-slide class="swiper-slide" v-for="(item,index) in projectInfo.CmsCaseImgs" :key="index">
             <img :src='item.CaseImageUrl' class="cover" alt="">
           </swiper-slide>
-        </swiper>
+        </swiper> -->
+        <img :src="projectInfo.CmsCaseImgs[0].CaseImageUrl" alt="">
       </div>
     </div>
     <p>{{projectInfo.DetailContent}}</p>

src/util/api.js

@@ -1,5 +1,5 @@
-// const baseUrl = '/api-v2'
-const baseUrl = '/api'
+const baseUrl = '/api-v2'
+// const baseUrl = '/api'
 const wechat = '/wechat/:org'
 const guest = '/guest/:org'