Browse Source

修复已知问题

master
科技小王子 8 months ago
parent
commit
7fff65b4e4
  1. 4
      nuxt.config.ts
  2. 28
      pages/item/components/PageBanner.vue
  3. 6
      pages/passport/login.vue
  4. 0
      pages/plug/components/CardList.vue
  5. 0
      pages/plug/components/PageBanner.vue
  6. 0
      pages/plug/detail/[plugId].vue
  7. 0
      pages/plug/detail/components/Header.vue
  8. 0
      pages/plug/index.vue
  9. 6
      pages/user/auth.vue
  10. 2
      pages/user/components/Auth.vue
  11. 6
      pages/user/index.vue
  12. 6
      pages/user/order.vue
  13. 6
      pages/user/password.vue

4
nuxt.config.ts

@ -33,10 +33,10 @@ export default defineNuxtConfig({
public: {
// 开发环境配置
// tenantId: '5',
// apiServer: 'http://127.0.0.1:30000/api',
apiServer: 'http://127.0.0.1:30000/api',
// 生产环境
apiServer: 'https://common-api.websoft.top/api',
// apiServer: 'https://common-api.websoft.top/api',
globalTitle: '网宿软件',
domain: 'websoft.top'
},

28
pages/item/components/PageBanner.vue

@ -49,22 +49,22 @@
<el-space class="mt-4">
<!-- 1. 未购买 -->
<el-button
v-if="!form.isBuy && !form.price"
type="success"
@click="onBuy(form)"
>
立即开通
</el-button>
<!-- <el-button-->
<!-- v-if="!form.isBuy && !form.price"-->
<!-- type="success"-->
<!-- @click="onBuy(form)"-->
<!-- >-->
<!-- 立即开通-->
<!-- </el-button>-->
<!-- 2. 已购买 -->
<el-button
v-else
type="warning"
@click="installPlug"
>
立即安装
</el-button>
<!-- <el-button-->
<!-- v-else-->
<!-- type="warning"-->
<!-- @click="installPlug"-->
<!-- >-->
<!-- 立即安装-->
<!-- </el-button>-->
<!-- 3. 其他按钮 -->
<template v-for="(item,index) in form.links" :key="index">

6
pages/passport/login.vue

@ -212,10 +212,10 @@ const checkUser = async () => {
const {data: hasUser } = await useServerRequest<ApiResult<CaptchaResult>>('/existence',{baseURL: runtimeConfig.public.apiServer,method: "get",params: {
field: 'phone', value: form.phone
}});
if(hasUser.value?.code == 0){
if(hasUser.value?.code == 0 || loginBar.value){
await sendCode();
}
if(hasUser.value?.code != 0){
if(hasUser.value?.code != 0 && loginBar.value){
ElMessage.error('该手机号码未注册');
}
};
@ -324,6 +324,7 @@ const onSubmitBySms = async () => {
* 账号密码注册
*/
const onRegister = async () => {
form.isAgree = false;
const {data: response} = await useServerRequest<ApiResult<LoginResult>>('/register',{baseURL: runtimeConfig.public.apiServer,method: "post",body: {
companyName: '应用名称',
username: form.phone,
@ -333,7 +334,6 @@ const onRegister = async () => {
email: form.email,
isSuperAdmin: true
}})
//
if(response.value?.code == 0){
console.log(response.value)

0
pages/market/components/CardList.vue → pages/plug/components/CardList.vue

0
pages/market/components/PageBanner.vue → pages/plug/components/PageBanner.vue

0
pages/market/detail/[plugId].vue → pages/plug/detail/[plugId].vue

0
pages/market/detail/components/Header.vue → pages/plug/detail/components/Header.vue

0
pages/market/index.vue → pages/plug/index.vue

6
pages/user/auth.vue

@ -29,6 +29,12 @@ const config = useConfigInfo();
const merchantApply = ref<ShopMerchantApply>();
const reload = async () => {
// ()
const token = localStorage.getItem('token');
if (!token || token == '') {
navigateTo('/passport/login');
return false;
}
const {data: response} = await useServerRequest<ApiResult<ShopMerchantApply>>('/shop/shop-merchant-apply/getByUserId', {baseURL: runtimeConfig.public.apiServer})
if (response.value?.data) {
merchantApply.value = response.value.data;

2
pages/user/components/Auth.vue

@ -15,7 +15,7 @@
</el-tabs>
<!-- 已完成认证 -->
<template v-if="form.status === 1">
<template v-if="form.merchantCode == ''">
<template v-if="form.type == 0">
<el-result
icon="success"
title="个人认证已通过"

6
pages/user/index.vue

@ -71,6 +71,12 @@ const onSubmit = async () => {
}
const reload = async () => {
// ()
const token = localStorage.getItem('token');
if (!token || token == '') {
navigateTo('/passport/login');
return false;
}
const {data: response} = await useServerRequest<ApiResult<User>>('/auth/user', {baseURL: runtimeConfig.public.apiServer})
if (response.value?.data) {
userInfo.value = response.value?.data;

6
pages/user/order.vue

@ -68,6 +68,12 @@ const onSubmit = async () => {
}
const reload = async () => {
// ()
const token = localStorage.getItem('token');
if (!token || token == '') {
navigateTo('/passport/login');
return false;
}
const {data: response} = await useServerRequest<ApiResult<User>>('/auth/user',{baseURL: runtimeConfig.public.apiServer})
if(response.value?.data){
userInfo.value = response.value?.data;

6
pages/user/password.vue

@ -115,6 +115,12 @@ const onDone = (index: string) => {
}
const reload = async () => {
// ()
const token = localStorage.getItem('token');
if (!token || token == '') {
navigateTo('/passport/login');
return false;
}
const {data: response} = await useServerRequest<ApiResult<User>>('/auth/user', {baseURL: runtimeConfig.public.apiServer})
if (response.value?.data) {
userInfo.value = response.value?.data;

Loading…
Cancel
Save