lex 2 years ago
parent
commit
51c58e6f63

+ 2 - 2
src/helpers/utils.ts

@@ -150,8 +150,8 @@ export function validStudentUrl() {
     returnUrl = 'https://mstuonline.dayaedu.com'
   } else {
     // 默认dev环境
-    // returnUrl = 'http://mstudev.dayaedu.com'
-    returnUrl = 'http://192.168.3.120:9001'
+    returnUrl = 'http://mstutest.dayaedu.com'
+    // returnUrl = 'http://192.168.3.120:9001'
   }
   return returnUrl
 }

+ 2 - 0
src/views/cart/cart-confirm-agin/index.tsx

@@ -21,6 +21,7 @@ import UserAuth from '@/views/order-detail/userAuth'
 import ColResult from '@/components/col-result'
 import { moneyFormat } from '@/helpers/utils'
 import UseCoupons, { couponEnum } from '@/views/order-detail/use-coupons'
+import ColHeader from '@/components/col-header'
 export default defineComponent({
   name: 'cartConfirmAgin',
   setup() {
@@ -90,6 +91,7 @@ export default defineComponent({
     }
     return () => (
       <>
+        <ColHeader />
         {list.length ? (
           <div class={styles.cartConfirm}>
             <div class={styles.cartConfirmBox}>

+ 11 - 8
src/views/cart/cart-confirm/index.tsx

@@ -29,6 +29,7 @@ import {
 import UseCoupons, { couponEnum } from '@/views/order-detail/use-coupons'
 import { addressInfo, resestState } from '@/views/address/address'
 import { orderInfos } from '@/views/order-detail/orderStatus'
+import ColHeader from '@/components/col-header'
 export default defineComponent({
   name: 'cartConfirm',
   setup() {
@@ -78,14 +79,14 @@ export default defineComponent({
     const authPopup = ref(false)
     const orderInfo = ref<any>()
     //修复实名认证头部问题
-    watch(authPopup, (value, oldValue) => {
-      if (authPopup.value) {
-        // 设置是否显示导航栏 0 显示 1 不显示
-        postMessage({ api: 'setBarStatus', content: { status: 0 } })
-      } else {
-        postMessage({ api: 'setBarStatus', content: { status: 1 } })
-      }
-    })
+    // watch(authPopup, (value, oldValue) => {
+    //   if (authPopup.value) {
+    //     // 设置是否显示导航栏 0 显示 1 不显示
+    //     postMessage({ api: 'setBarStatus', content: { status: 0 } })
+    //   } else {
+    //     postMessage({ api: 'setBarStatus', content: { status: 1 } })
+    //   }
+    // })
     // 提交
     const onSubmit = () => {
       if (!address.value?.id) {
@@ -152,10 +153,12 @@ export default defineComponent({
     //认证成功
     const onAuthSuccess = () => {
       authPopup.value = false
+      console.log(state.user.data)
       onSubmit() // 实名成功后自动支付
     }
     return () => (
       <>
+        <ColHeader />
         {loading.value ? null : (
           <div>
             {cartConfirm.cartPromotionItemList.length ? (

+ 3 - 2
src/views/order-detail/userAuth/index.tsx

@@ -47,8 +47,9 @@ export default defineComponent({
           }
         })
         Toast('实名成功')
-        state.user.data.realName = this.form.realName
-        state.user.data.idCardNo = this.form.idCardNo
+
+        state.user.data.student.realName = this.form.realName
+        state.user.data.student.idCardNo = this.form.idCardNo
         setTimeout(() => {
           this.onSuccess()
         }, 500)

+ 0 - 1
src/views/shop-mall/index.tsx

@@ -46,7 +46,6 @@ export default defineComponent({
     this.init()
     // if (browser().ios) {
     document.addEventListener('visibilitychange', event => {
-      postMessage({ api: 'setBarStatus', content: { status: 1 } })
       if (!document.hidden) {
         getCartCount()
         const tabFirst = this.$refs.tabFirst as any