forked from natuka/web.puabadge.com
修改:新版本构建
This commit is contained in:
1 parent
c7aeb2f6ce
commit
7427056dfd
4 files changed
+11
-36
No files matched your search
+1
-1
@@ -1,7 +1,7 @@
|
|||||||
VITE_APP_PREVIEW=true
|
VITE_APP_PREVIEW=true
|
||||||
# VITE_APP_API_BASE_URL=http://172.16.20.21:20001/api/web/
|
# VITE_APP_API_BASE_URL=http://172.16.20.21:20001/api/web/
|
||||||
# VITE_APP_API_BASE_URL=http://172.16.0.40:20001/api/web/
|
# VITE_APP_API_BASE_URL=http://172.16.0.40:20001/api/web/
|
||||||
VITE_APP_API_BASE_URL=https://wechat-test.api.puabadge.com/web/
|
VITE_APP_API_BASE_URL=https://shop.api.suwa3d.com/api/web/
|
||||||
# VITE_APP_API_BASE_URL=https://wechat-test.api.puabadge.com/web/
|
# VITE_APP_API_BASE_URL=https://wechat-test.api.puabadge.com/web/
|
||||||
# VITE_APP_API_BASE_URL=https://wechat.api.puabadge.com/web/
|
# VITE_APP_API_BASE_URL=https://wechat.api.puabadge.com/web/
|
||||||
# VITE_APP_API_WX_URL=https://wechat.api.puabadge.com/web/
|
# VITE_APP_API_WX_URL=https://wechat.api.puabadge.com/web/
|
||||||
|
|||||||
+1
-1
@@ -1,6 +1,6 @@
|
|||||||
export const proxy = {
|
export const proxy = {
|
||||||
"/api": {
|
"/api": {
|
||||||
target: "https://web.api.suwa3d.com/",
|
target: "https://shop.api.suwa3d.com/api/web/",
|
||||||
// target: 'http://127.0.0.1:28499',
|
// target: 'http://127.0.0.1:28499',
|
||||||
// target: 'http://172.16.0.36:28499',
|
// target: 'http://172.16.0.36:28499',
|
||||||
changeOrigin: true,
|
changeOrigin: true,
|
||||||
|
|||||||
+9
-9
@@ -3,10 +3,10 @@ import { createRouter, createWebHashHistory } from 'vue-router'
|
|||||||
import NProgress from 'nprogress'
|
import NProgress from 'nprogress'
|
||||||
import 'nprogress/nprogress.css'
|
import 'nprogress/nprogress.css'
|
||||||
// 导入路由组件
|
// 导入路由组件
|
||||||
import * as badgeRouter from './badge'
|
// import * as badgeRouter from './badge'
|
||||||
// import * as cartoonRouter from './cartoon'
|
import * as cartoonRouter from './cartoon'
|
||||||
import badge from '@/views/badge/index.vue'
|
// import badge from '@/views/badge/index.vue'
|
||||||
// import cartoon from '@/views/cartoon/index.vue'
|
import cartoon from '@/views/cartoon/index.vue'
|
||||||
import {useStore} from '@/stores'
|
import {useStore} from '@/stores'
|
||||||
import { config } from '@/config/config'
|
import { config } from '@/config/config'
|
||||||
import { localStorage } from '@/utils/local-storage'
|
import { localStorage } from '@/utils/local-storage'
|
||||||
@@ -17,8 +17,8 @@ NProgress.configure({ showSpinner: true, parent: '#app' })
|
|||||||
const routes = [
|
const routes = [
|
||||||
{
|
{
|
||||||
path: '/',
|
path: '/',
|
||||||
name: 'badge',
|
name: 'cartoon',
|
||||||
component: badge,
|
component: cartoon,
|
||||||
meta: {
|
meta: {
|
||||||
needGuard: true,
|
needGuard: true,
|
||||||
title: '首页',
|
title: '首页',
|
||||||
@@ -26,8 +26,8 @@ const routes = [
|
|||||||
},
|
},
|
||||||
]
|
]
|
||||||
|
|
||||||
badgeRouter.mergeRoutes(routes)
|
// badgeRouter.mergeRoutes(routes)
|
||||||
// cartoonRouter.mergeRoutes(routes)
|
cartoonRouter.mergeRoutes(routes)
|
||||||
// 创建路由实例并传递 `routes` 配置
|
// 创建路由实例并传递 `routes` 配置
|
||||||
const router = createRouter({
|
const router = createRouter({
|
||||||
history: createWebHashHistory(process.env.VUE_APP_PUBLIC_PATH),
|
history: createWebHashHistory(process.env.VUE_APP_PUBLIC_PATH),
|
||||||
@@ -56,7 +56,7 @@ router.beforeEach((_to, _from, next) => {
|
|||||||
if (code) {
|
if (code) {
|
||||||
let url = store.redirectUrl()
|
let url = store.redirectUrl()
|
||||||
|
|
||||||
if (_to.path !== '/badge') {
|
if (_to.path !== '/cartoon') {
|
||||||
if (url) {
|
if (url) {
|
||||||
store.setRedirect('')
|
store.setRedirect('')
|
||||||
next(url)
|
next(url)
|
||||||
|
|||||||
@@ -128,31 +128,6 @@
|
|||||||
</div>
|
</div>
|
||||||
<div style="font-size: 12px; color: #888; text-align: center;">{{ toValueWithout("不同主体的照片检测标准不同") }}</div>
|
<div style="font-size: 12px; color: #888; text-align: center;">{{ toValueWithout("不同主体的照片检测标准不同") }}</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="step-line" v-if="prop == '3D真人肖像'">
|
|
||||||
<div class="step-line-item">
|
|
||||||
<div class="step-line-item-title">
|
|
||||||
<span style="display: flex; align-items: center;justify-content: center;">
|
|
||||||
<span style="height: 1px; background: #ccc;width: 50px;"></span>
|
|
||||||
<span style="margin: 0 8px; color: #888;">{{ toValueWithout("照片示例") }}</span>
|
|
||||||
<span style="height: 1px; background: #ccc;width: 50px;"></span>
|
|
||||||
</span>
|
|
||||||
</div>
|
|
||||||
<div class="step-line-item-desc" style="display: flex; align-items: center;justify-content: space-around;padding: 16px 16px 0 16px;">
|
|
||||||
<div class="step-line-item-desc-item">
|
|
||||||
<img src="@/assets/badge/1.png" style="width: 20vw;height: 20vw;border-radius: 8px;" alt="">
|
|
||||||
</div>
|
|
||||||
<div class="step-line-item-desc-item">
|
|
||||||
<img src="@/assets/badge/2.png" style="width: 20vw;height: 20vw;border-radius: 8px;" alt="">
|
|
||||||
</div>
|
|
||||||
<div class="step-line-item-desc-item">
|
|
||||||
<img src="@/assets/badge/3.png" style="width: 20vw;height: 20vw;border-radius: 8px;" alt="">
|
|
||||||
</div>
|
|
||||||
<div class="step-line-item-desc-item">
|
|
||||||
<img src="@/assets/badge/4.png" style="width: 20vw;height: 20vw;border-radius: 8px;" alt="">
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="photo-upload-body">
|
<div class="photo-upload-body">
|
||||||
<div v-if="!picture" class="photo-upload-box">
|
<div v-if="!picture" class="photo-upload-box">
|
||||||
<div class="photo-upload-header" @click="imgShow = true">
|
<div class="photo-upload-header" @click="imgShow = true">
|
||||||
|
|||||||
Reference in new issue
Block a user