ytj

src/pages/user/placeOrderDetail/index.vue

@@ -223,7 +223,7 @@ export default {
           //   window.history.go(-2)
           // })
         }).catch(() => {
-          this.ajaxOff = true
+          this.ajaxoff = true
         })
       }
     },

src/pages/user/placeOrderForCourse/index.vue

@@ -236,6 +236,7 @@ export default {
         }
         item.select = true
       } else {
+        this.showCoupon = ''
         item.select = false
       }
     },

src/pages/user/rush/index.vue

@@ -49,9 +49,8 @@
 <script>
 import logo from '../../../common/icon/qrCode.jpg'
 import { mapState, createNamespacedHelpers } from 'vuex'
-const { mapActions: actions } = createNamespacedHelpers('app')
 const { mapState: mapRushState, mapActions: mapRushActions } = createNamespacedHelpers('rush')
-const { mapState: mapUserState } = createNamespacedHelpers('userCenter')
+const { mapState: mapUserState, mapActions: mapUserActions } = createNamespacedHelpers('userCenter')
 export default {
   data () {
     return {
@@ -71,10 +70,19 @@ export default {
     }
   },
   created () {
-    console.log(1)
-    console.log(this.userInfo)
+    if (location.search && this.toolClass.UrlSearch(location.search).code) {
+      this.code = this.toolClass.UrlSearch(location.search).code
+    } else {
+      this.code = null
+    }
+    this.getUserInfo({ org: this.org, code: this.code }).then(() => {
+      console.log(this.userInfo)
+    })
     this.AddNewFlashBuyCustomer({ flashBuyId: this.$route.query.flashBuyId }).then(() => {
       this.getRush({ flashBuyId: this.$route.query.flashBuyId }).then((res) => {
+        if (!res.flashBuy) {
+          this.$toast('活动已不存在')
+        }
         this.used = res.flashCustomer.IsAttend === 1 ? false : true
         this.newCustomer = res.flashCustomer.IsNew === 1 ? true : false
         let start = new Date(this.detail.StartDate).getTime()
@@ -89,10 +97,14 @@ export default {
     }),
     ...mapUserState({
       userInfo: x => x.userInfo
+    }),
+    ...mapState({
+      org: x => x.app.orgId
     })
   },
   methods: {
     ...mapRushActions(['setRush', 'getRush', 'AddNewFlashBuyCustomer', 'IsNewCustomer', 'UpdateFlashBuyCustomer']),
+    ...mapUserActions(['getUserInfo']),
     timing (startTime, endTime) {
       this.Interval = setInterval(() => {
         let nowTime = new Date().getTime()
@@ -158,4 +170,7 @@ export default {
 .rule img {
   width: 100%;
 }
+.rule p {
+  color: #9d876d;
+}
 </style>

src/pages/user/rush/page.scss

@@ -25,7 +25,8 @@
     text-align: center;
     font-size: .16rem;
     color: #9D876D;
-    padding-bottom: .2rem
+    padding-bottom: .2rem;
+    font-weight: bold;
   }
   .video-or-cover{
     width: 100%;
@@ -59,7 +60,7 @@
       margin-bottom: .05rem;
     }
     div:nth-of-type(2){
-      color: #585858;
+      color: #9D876D;
       font-size: .14rem;
     }
   }