ytj

src/pages/sales/login/index.vue

@@ -1,7 +1,6 @@
 <template>
   <div class="mainPage" v-if="showPage">
     <div class="mask">
-      <!-- <img :src="logo" class="logo" alt=""> -->
       <div class="centerLabel" style="width:100%;">
         <div class="box" style="margin:0 auto;">
           <div class="title">登录</div>
@@ -52,7 +51,6 @@
 </template>
 
 <script>
-import logo from '../../../common/icon/logo.png'
 import { createNamespacedHelpers } from 'vuex'
 const { mapActions: actions } = createNamespacedHelpers('userCenter')
 const { mapActions: mapLoginActions } = createNamespacedHelpers('login')
@@ -60,7 +58,6 @@ const { mapState: mapUserState } = createNamespacedHelpers('userCenter')
 export default {
   data () {
     return {
-      logo,
       showPage: false,
       showCase: false,
       showSales: false,
@@ -117,19 +114,17 @@ export default {
         this.$toast('验证码格式不正确')
         return
       }
-      // console.log(this.postData)
       this.submitData(this.postData).then((res) => {
-        // this.$toast(res)
         setTimeout(() => {
-          window.location.href = this.getUrl('mainPage/coffeeIndex')
+          window.location.replace(this.getUrl('mainPage/coffeeIndex'))
         }, 2000)
       })
     }
   },
   created () {
     if (this.userInfo.customer.MapUser) {
-      window.location.href = this.getUrl('mainPage/coffeeIndex')
-      return
+      window.location.replace(this.getUrl('mainPage/coffeeIndex'))
+      // window.location.href = this.getUrl('mainPage/coffeeIndex')
     } else {
       this.showPage = true
     }

src/pages/user/cardDetail/index.vue

@@ -5,7 +5,6 @@
       <div class="message">
         <div>
           <span>{{info.CustomerCardName}}</span>
-          <!-- <span class="sub">(可在银城会所健身房和游泳池使用)</span> -->
         </div>
         <div>
           <span>有效时间</span>

src/pages/user/gymCardDetail/index.vue

@@ -5,7 +5,7 @@
       <div class="message">
         <div>
           <span>会所健身体验卡</span>
-          <span class="sub">(可在银城会所健身房和游泳池使用)</span>
+          <span class="sub">(可在城的空间健身房和游泳池使用)</span>
         </div>
         <div>
           <span>有效时间</span>

src/pages/user/mainPage/index.vue

@@ -26,7 +26,7 @@ export default {
     return {
       tabBar: [{
         pathName: 'indexPage',
-        name: '会所'
+        name: '城的空间'
       }, {
         pathName: 'coffeeIndex',
         name: '城咖啡'

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

@@ -28,7 +28,7 @@
             <img src="../../../../common/icon/userCenter-icon-2.png" width="100%" height="100%" alt="">
           </div>
           <span>卡券</span>
-          <span>{{Nums.cardsnum || 0}}张未使用</span>
+          <span>0张未使用</span>
         </div>
         <div class="flex-item privilege-item" @click="toVip">
           <div class="img-box">

src/pages/user/placeOrder/index.vue

@@ -269,7 +269,8 @@ export default {
         message: '返回页面将清空当前选择的商品，确定要返回吗?'
       }).then(() => {
         // this.$router.push({ name: 'coffeeIndex' })
-        window.history.go(-1)
+        // window.history.go(-1)
+        this.$router.go(-1)
       })
     },
     placeOrder (Remark) { // 下单

src/pages/user/receive/index.vue

@@ -8,7 +8,13 @@
       <div class="title" v-if="$route.query.type === 'card'">{{data.CardName}}</div>
       <div class="title" v-else>{{data.CouponName}}</div>
       <div class="video" v-if='video'>
-        <video :src="data.VideoUrl" width="100%" height="100%"></video>
+        <video width="100%" height="100%" preload="auto" controls="controls" x5-playsinline="true">
+          <source :src="data.VideoUrl" type="video/mp4">
+          <source :src="data.VideoUrl" type="video/avi">
+          <source :src="data.VideoUrl" type="video/wma">
+          <source :src="data.VideoUrl" type="video/rmvb">
+          <source :src="data.VideoUrl" type="video/rm">
+        </video>
       </div>
       <div class="text">
         <div>

src/pages/user/receiveChannel/index.vue

@@ -16,7 +16,13 @@
       <div class="title" v-if="$route.query.type === 'card'">{{data.CardName}}</div>
       <div class="title" v-else>{{data.CouponName}}</div>
       <div class="video" v-if='video'>
-        <video :src="data.VideoUrl" height="100%" width="100%" preload="auto" ></video>
+        <video width="100%" height="100%" preload="auto" x5-playsinline="true" controls="controls">
+          <source :src="data.VideoUrl" type="video/mp4">
+          <source :src="data.VideoUrl" type="video/avi">
+          <source :src="data.VideoUrl" type="video/wma">
+          <source :src="data.VideoUrl" type="video/rmvb">
+          <source :src="data.VideoUrl" type="video/rm">
+        </video>
       </div>
       <div class="text">
         <div>