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

src/pages/user/fiveA/index.vue

@@ -58,6 +58,7 @@ export default {
       swiperOption: {
         observer: true,
         loop: true,
+        speed: 1000,
         autoplay: {
           disableOnInteraction: false,
         }

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

@@ -85,14 +85,18 @@ export default {
       swiperOption: {
         observer: true,
         speed: 1000,
+        loop: true,
         autoplay: {
           disableOnInteraction: false,
         }
       },
       swiperOptionMsg: {
         observer: true,
+        observeParents:true,
+        // slidesPerView: 3,
         direction: 'vertical',
         speed: 1000,
+        // loop: true,
         autoplay: {
           disableOnInteraction: false,
         }

src/pages/user/majorProjectsDetail/index.vue

@@ -131,8 +131,9 @@ export default {
         arr = []
       }
       this.courseDetail.CourseImgs = this.courseDetail.CourseImgs || []
-      this.topImage = this.courseDetail.CourseImgs.length > 0 ? this.courseDetail.CourseImgs[0].ImgUrl : ""
+      // this.topImage = this.courseDetail.CourseImgs.length > 0 ? this.courseDetail.CourseImgs[0].ImgUrl : ""
       if (this.courseDetail.CourseImgs.length > 0) {
+        this.courseDetail.CourseImgs.sort(this.getSortFun('asc', 'Sort'))
         this.detailImage = this.courseDetail.CourseImgs
       }
       console.log(this.detailImage)
@@ -153,6 +154,11 @@ export default {
     ...mapProjectActions([
       'getCourseDetailInfo',
     ]),
+    getSortFun (order, sortBy) {
+      var ordAlpah = (order == 'asc') ? '>' : '<'
+      var sortFun = new Function('a', 'b', 'return a.' + sortBy + ordAlpah + 'b.' + sortBy + '?1:-1')
+      return sortFun
+    },
     returnCourseTime (val, endVal) { // 返回课时时间
       val = new Date(val)
       endVal = new Date(endVal)

src/pages/user/receiveChannel/index.vue

@@ -41,7 +41,7 @@
         <pre>{{data.address}}</pre>
       </div>
       <div class="submit" v-if="button && data.TotalCount - data.SentCount > 0" @click="receive">确认领取</div>
-      <div class="submit" v-if="button && data.TotalCount - data.SentCount <= 0">优惠券已领完</div>
+      <div class="submit grays" v-if="button && data.TotalCount - data.SentCount <= 0">优惠券已领完</div>
       <div class="submit" v-if="!button">点击右上角分享给客户</div>
     </div>
   </div>

src/pages/user/receiveChannel/page.scss

@@ -59,5 +59,8 @@
       font-size: .16rem;
       color: #fff;
     }
+    .grays{
+      background: #585858;
+    }
   }
 }

src/store/login/login.js

@@ -38,16 +38,20 @@ export default {
   mutations: {},
   actions: {
     getCaptcha ({ commit }, data) {
-      return new Promise((resolve) => {
+      return new Promise((resolve, reject) => {
         http.getCaptcha(data).then((res) => {
           resolve(res)
+        }).catch((err) => {
+          reject(err)
         })
       })
     },
-    submitData({ commit }, data) {
-      return new Promise((resolve) => {
+    submitData ({ commit }, data) {
+      return new Promise((resolve, reject) => {
         http.submitData(data).then((res) => {
           resolve(res)
+        }).catch((err) => {
+          reject(err)
         })
       })
     }