Commit 2f9e1947 authored by zhengke's avatar zhengke

个人空间支付

parent 01c26226
...@@ -181,7 +181,11 @@ ...@@ -181,7 +181,11 @@
</div> </div>
</div> </div>
</div> </div>
<OrderReview v-if="orderVisible && activeOrderId==''" :default-type="2" @close="()=>orderVisible=false"></OrderReview> <OrderReview v-if="orderVisible && activeOrderId==''"
:default-type="2"
:spaceFound="1"
@close="()=>orderVisible=false"
@success="createEnterpriseHandler"></OrderReview>
<CreateEnterprise :order-id="activeOrderId" v-if="orderVisible && activeOrderId!=''" @close="()=>orderVisible=false"></CreateEnterprise> <CreateEnterprise :order-id="activeOrderId" v-if="orderVisible && activeOrderId!=''" @close="()=>orderVisible=false"></CreateEnterprise>
<invite-member v-if="showAddMember" :show-type="1" @close="()=>showAddMember=false"></invite-member> <invite-member v-if="showAddMember" :show-type="1" @close="()=>showAddMember=false"></invite-member>
<join-enterprise></join-enterprise> <join-enterprise></join-enterprise>
......
...@@ -74,7 +74,8 @@ ...@@ -74,7 +74,8 @@
</div> </div>
</div> </div>
</div> </div>
<Success v-if="dialogVisible" :PayDatas="PaySuccessDatas" @close="dialogVisible=false,close()"></Success> <Success v-if="dialogVisible" :PayDatas="PaySuccessDatas" :spaceFound="props.spaceFound"
@success="success"></Success>
</template> </template>
<script lang="ts" setup> <script lang="ts" setup>
...@@ -100,11 +101,16 @@ const props = defineProps({ ...@@ -100,11 +101,16 @@ const props = defineProps({
showEnterprise:{ showEnterprise:{
type:Boolean, type:Boolean,
default:true default:true
} },
spaceFound: {
type: Number,
default:0
},
}) })
const emit = defineEmits<{ const emit = defineEmits<{
(event: 'close'): void (event: 'close'): void,
(event: 'success'): void
}>() }>()
const {userInfo} = storeToRefs(useUserStore()) const {userInfo} = storeToRefs(useUserStore())
...@@ -205,8 +211,12 @@ const setPaymentQrCode = async ()=>{ ...@@ -205,8 +211,12 @@ const setPaymentQrCode = async ()=>{
} }
qrLoading.value=false qrLoading.value=false
} }
const close = ()=>{ const success = () => {
dialogVisible.value = false
stopTimerHandler() stopTimerHandler()
if(props.spaceFound) emit('success')
}
const close = ()=>{
emit('close') emit('close')
} }
......
...@@ -37,21 +37,21 @@ ...@@ -37,21 +37,21 @@
import { ref, onMounted } from 'vue' import { ref, onMounted } from 'vue'
import { useRouter } from 'vue-router'; import { useRouter } from 'vue-router';
const props = defineProps({ const props = defineProps({
PayDatas: {} as any PayDatas: {} as any,
spaceFound: 0 as any // 0 产品中心支付 1个人空间支付
}) })
const emit = defineEmits<{ const emit = defineEmits<{
(event: 'close'): void (event: 'success'): void
}>() }>()
const router = useRouter(); const router = useRouter();
const goUrl = () =>{ const goUrl = () =>{
emit('close') emit('success')
if(props.PayDatas.VipType==2&&props.PayDatas.OrderType==1){ if(!props.spaceFound){
let url
if(props.PayDatas.VipType==2&&props.PayDatas.OrderType==1) url = `/space/0/1`
else url = `/space`
router.push({ router.push({
path: `/space/0/1` path: url
})
}else{
router.push({
path: `/space`
}) })
} }
} }
......
...@@ -186,6 +186,7 @@ const { userInfo } = storeToRefs(useUser) ...@@ -186,6 +186,7 @@ const { userInfo } = storeToRefs(useUser)
const dialogVisible = ref(false) const dialogVisible = ref(false)
const UploadResults = ref({} as any) const UploadResults = ref({} as any)
const fileList = ref<UploadUserFile[]>([]) const fileList = ref<UploadUserFile[]>([])
const loading = ref(false)
const closeUploadRes = () => { const closeUploadRes = () => {
UploadResults.value = {} UploadResults.value = {}
...@@ -201,7 +202,7 @@ const goDownload = (type:any) =>{ ...@@ -201,7 +202,7 @@ const goDownload = (type:any) =>{
} }
//导入文件地址 //导入文件地址
const getUploadActionUrl=()=>{ const getUploadActionUrl=()=>{
loading.value = true
let uid=userInfo.value.id; let uid=userInfo.value.id;
const url=domainManager().domainUrl.replace("common","file")+`?cmd=dmc_post_LocalFileUpload&Type=19&fileType=1&PPTEmployeeId=${encodeURIComponent(uid)}` const url=domainManager().domainUrl.replace("common","file")+`?cmd=dmc_post_LocalFileUpload&Type=19&fileType=1&PPTEmployeeId=${encodeURIComponent(uid)}`
return url; return url;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment