yuantianjiao 6 lat temu
rodzic
commit
aa99e75ffc

+ 1
- 0
src/pages/user/fiveA/index.vue Wyświetl plik

@@ -58,6 +58,7 @@ export default {
58 58
       swiperOption: {
59 59
         observer: true,
60 60
         loop: true,
61
+        speed: 1000,
61 62
         autoplay: {
62 63
           disableOnInteraction: false,
63 64
         }

+ 4
- 0
src/pages/user/mainPage/indexPage/index.vue Wyświetl plik

@@ -85,14 +85,18 @@ export default {
85 85
       swiperOption: {
86 86
         observer: true,
87 87
         speed: 1000,
88
+        loop: true,
88 89
         autoplay: {
89 90
           disableOnInteraction: false,
90 91
         }
91 92
       },
92 93
       swiperOptionMsg: {
93 94
         observer: true,
95
+        observeParents:true,
96
+        // slidesPerView: 3,
94 97
         direction: 'vertical',
95 98
         speed: 1000,
99
+        // loop: true,
96 100
         autoplay: {
97 101
           disableOnInteraction: false,
98 102
         }

+ 7
- 1
src/pages/user/majorProjectsDetail/index.vue Wyświetl plik

@@ -131,8 +131,9 @@ export default {
131 131
         arr = []
132 132
       }
133 133
       this.courseDetail.CourseImgs = this.courseDetail.CourseImgs || []
134
-      this.topImage = this.courseDetail.CourseImgs.length > 0 ? this.courseDetail.CourseImgs[0].ImgUrl : ""
134
+      // this.topImage = this.courseDetail.CourseImgs.length > 0 ? this.courseDetail.CourseImgs[0].ImgUrl : ""
135 135
       if (this.courseDetail.CourseImgs.length > 0) {
136
+        this.courseDetail.CourseImgs.sort(this.getSortFun('asc', 'Sort'))
136 137
         this.detailImage = this.courseDetail.CourseImgs
137 138
       }
138 139
       console.log(this.detailImage)
@@ -153,6 +154,11 @@ export default {
153 154
     ...mapProjectActions([
154 155
       'getCourseDetailInfo',
155 156
     ]),
157
+    getSortFun (order, sortBy) {
158
+      var ordAlpah = (order == 'asc') ? '>' : '<'
159
+      var sortFun = new Function('a', 'b', 'return a.' + sortBy + ordAlpah + 'b.' + sortBy + '?1:-1')
160
+      return sortFun
161
+    },
156 162
     returnCourseTime (val, endVal) { // 返回课时时间
157 163
       val = new Date(val)
158 164
       endVal = new Date(endVal)

+ 1
- 1
src/pages/user/receiveChannel/index.vue Wyświetl plik

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

+ 3
- 0
src/pages/user/receiveChannel/page.scss Wyświetl plik

@@ -59,5 +59,8 @@
59 59
       font-size: .16rem;
60 60
       color: #fff;
61 61
     }
62
+    .grays{
63
+      background: #585858;
64
+    }
62 65
   }
63 66
 }

+ 7
- 3
src/store/login/login.js Wyświetl plik

@@ -38,16 +38,20 @@ export default {
38 38
   mutations: {},
39 39
   actions: {
40 40
     getCaptcha ({ commit }, data) {
41
-      return new Promise((resolve) => {
41
+      return new Promise((resolve, reject) => {
42 42
         http.getCaptcha(data).then((res) => {
43 43
           resolve(res)
44
+        }).catch((err) => {
45
+          reject(err)
44 46
         })
45 47
       })
46 48
     },
47
-    submitData({ commit }, data) {
48
-      return new Promise((resolve) => {
49
+    submitData ({ commit }, data) {
50
+      return new Promise((resolve, reject) => {
49 51
         http.submitData(data).then((res) => {
50 52
           resolve(res)
53
+        }).catch((err) => {
54
+          reject(err)
51 55
         })
52 56
       })
53 57
     }