Merge branch 'master' of http://git.lcpcp.cc/zpj/global-merchant-center

src/App.vue

@@ -14,7 +14,7 @@ export default {
     let isMobile=tools.hasMobile()
     console.log("isMobile:",isMobile)
     if(isMobile){
-      window.location="https://bookings9.com"
+      window.location="https://wap.bookings9.com"
     }
   },
   methods: {},

src/views/Forestage/Tourism/index.vue

@@ -216,11 +216,7 @@ export default {
 		},
 
 		handleGoodsItem(item) {
-       if(this.userInfo.is_opne!==1){
-        tools.error(this.$t('other.text10'))
-        this.getInfo();
-        return false
-      }
+
       if(this.userInfo.vip_id!==item.id){
         return false
       }
@@ -229,6 +225,7 @@ export default {
 		},
 
 		pay() {
+
 			if (this.userInfo.is_opne!==1 || this.userInfo.vip_id!==this.item.id) {
 				tools.error(this.$t('other.text10'))
         this.getInfo()

src/views/Forestage/Tourism/order-sett.vue

@@ -72,7 +72,7 @@ export default {
 
             //  支付失败了
             if (this.orderDetail.status <= 1) {
-              this.$refs.balanceTip.setOpen(true)
+              this.$refs.orderDetail.setOpen(true)
             }
           }
         },1000);

src/views/Forestage/login/forget-password.vue

@@ -6,14 +6,14 @@
               <img class="logo-img mr-10" src="@/assets/img/logo.png" alt="">
               <div class="fw-400 fs-18">{{$t('LoginIndex.forgetPassword')}}</div>
           </div>
-          <input type="text" :placeholder="$t('LoginIndex.syyxhm')" v-model="fromData.email">
+          <input type="text" :placeholder="$t('LoginIndex.syyxhm')" v-model="fromData.email"></input>
           <div class="p-f">
-            <input type="text" :placeholder="$t('LoginIndex.syyxyzm')" v-model="fromData.code">
+            <input type="text" :placeholder="$t('LoginIndex.syyxyzm')" v-model="fromData.code"></input>
             <getCheckCode :value="fromData.email" class="getCheckCode" :type="'retrieve'"></getCheckCode>
           </div>
 
-          <input type="password" :placeholder="$t('LoginIndex.sdxmm')" v-model="fromData.pass">
-          <input type="password" :placeholder="$t('LoginIndex.zcsrxmm')" v-model="fromData.pass_two">
+          <input type="password" :placeholder="$t('LoginIndex.sdxmm')" v-model="fromData.pass"></input>
+          <input type="password" :placeholder="$t('LoginIndex.zcsrxmm')" v-model="fromData.pass_two"></input>
         <div class="align-items-center justify-content-space-between mb-36">
           <div class="align-items-center hand-cursor" @click="toLogin()">
             <div class="fs-14 fc-70">{{$t('LoginIndex.yyzh')}}， </div>

src/views/Forestage/login/login.vue

@@ -6,8 +6,8 @@
               <img class="logo-img mr-10" src="@/assets/img/logo.png" alt="">
               <div class="fw-400 fs-18">{{$t('LoginIndex.userLogin')}}</div>
           </div>
-          <input type="text" :placeholder="$t('LoginIndex.inputId')" v-model="fromData.email">
-          <input type="password" :placeholder="$t('LoginIndex.inputPassword')" v-model="fromData.pass">
+          <input type="text" :placeholder="$t('LoginIndex.inputId')" v-model="fromData.email"></input>
+          <input type="password" :placeholder="$t('LoginIndex.inputPassword')" v-model="fromData.pass"></input>
           <div class="align-items-center justify-content-space-between mb-36">
             <div class="align-items-center hand-cursor" @click="register()">
               <div class="fs-14 fc-70">{{$t('LoginIndex.noUser')}}</div>

src/views/Forestage/login/register.vue

@@ -11,8 +11,8 @@
             <input type="text" :placeholder="$t('LoginIndex.syyxyzm')" v-model="fromData.code">
             <getCheckCode v-model="fromData.email" class="getCheckCode" :type="'register'"></getCheckCode>
           </div>
-        <input type="password" :placeholder="$t('LoginIndex.dlmm')" v-model="fromData.pass">
-          <input type="text" :placeholder="$t('LoginIndex.sryqm')" v-model="fromData.inviteCode">
+        <input type="password" :placeholder="$t('LoginIndex.dlmm')" v-model="fromData.pass"></input>
+          <input type="text" :placeholder="$t('LoginIndex.sryqm')" v-model="fromData.inviteCode"></input>
           <div class="align-items-center justify-content-space-between mb-36">
             <div class="align-items-center hand-cursor" @click="toLogin()">
               <div class="fs-14 fc-70">{{$t('LoginIndex.yyzh')}}， </div>