Pre Merge pull request !140 from lifetime have you/master
commit
d9d7e41302
3
.env
3
.env
|
|
@ -8,6 +8,9 @@ SHOPRO_BASE_URL=http://api-dashboard.yudao.iocoder.cn
|
||||||
SHOPRO_DEV_BASE_URL=http://127.0.0.1:48080
|
SHOPRO_DEV_BASE_URL=http://127.0.0.1:48080
|
||||||
### SHOPRO_DEV_BASE_URL = http://yunai.natapp1.cc
|
### SHOPRO_DEV_BASE_URL = http://yunai.natapp1.cc
|
||||||
|
|
||||||
|
# H5访问域名
|
||||||
|
SHOPRO_H5_URL=http://127.0.0.1:3000
|
||||||
|
|
||||||
# 文件上传类型:server - 后端上传, client - 前端直连上传,仅支持 S3 服务
|
# 文件上传类型:server - 后端上传, client - 前端直连上传,仅支持 S3 服务
|
||||||
SHOPRO_UPLOAD_TYPE=server
|
SHOPRO_UPLOAD_TYPE=server
|
||||||
|
|
||||||
|
|
|
||||||
37
App.vue
37
App.vue
|
|
@ -1,37 +0,0 @@
|
||||||
<script setup>
|
|
||||||
import { onLaunch, onShow, onError } from '@dcloudio/uni-app';
|
|
||||||
import { ShoproInit } from './sheep';
|
|
||||||
|
|
||||||
onLaunch(() => {
|
|
||||||
// 延时隐藏原生导航栏
|
|
||||||
setTimeout(() => {
|
|
||||||
uni.hideTabBar();
|
|
||||||
}, 200);
|
|
||||||
|
|
||||||
// 加载Shopro底层依赖
|
|
||||||
ShoproInit();
|
|
||||||
});
|
|
||||||
|
|
||||||
onShow((options) => {
|
|
||||||
// #ifdef APP-PLUS
|
|
||||||
// 获取urlSchemes参数
|
|
||||||
const args = plus.runtime.arguments;
|
|
||||||
if (args) {
|
|
||||||
}
|
|
||||||
|
|
||||||
// 获取剪贴板
|
|
||||||
uni.getClipboardData({
|
|
||||||
success: (res) => {},
|
|
||||||
});
|
|
||||||
// #endif
|
|
||||||
|
|
||||||
// #ifdef MP-WEIXIN
|
|
||||||
// 确认收货回调结果
|
|
||||||
console.log(options, 'options');
|
|
||||||
// #endif
|
|
||||||
});
|
|
||||||
</script>
|
|
||||||
|
|
||||||
<style lang="scss">
|
|
||||||
@import '@/sheep/scss/index.scss';
|
|
||||||
</style>
|
|
||||||
|
|
@ -13,6 +13,7 @@ export const apiPath = import.meta.env.SHOPRO_API_PATH;
|
||||||
export const staticUrl = import.meta.env.SHOPRO_STATIC_URL;
|
export const staticUrl = import.meta.env.SHOPRO_STATIC_URL;
|
||||||
export const tenantId = import.meta.env.SHOPRO_TENANT_ID;
|
export const tenantId = import.meta.env.SHOPRO_TENANT_ID;
|
||||||
export const websocketPath = import.meta.env.SHOPRO_WEBSOCKET_PATH;
|
export const websocketPath = import.meta.env.SHOPRO_WEBSOCKET_PATH;
|
||||||
|
export const h5Url = import.meta.env.SHOPRO_H5_URL;
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
baseUrl,
|
baseUrl,
|
||||||
|
|
@ -20,4 +21,5 @@ export default {
|
||||||
staticUrl,
|
staticUrl,
|
||||||
tenantId,
|
tenantId,
|
||||||
websocketPath,
|
websocketPath,
|
||||||
|
h5Url,
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -4,6 +4,7 @@ import $platform from '@/sheep/platform';
|
||||||
import $router from '@/sheep/router';
|
import $router from '@/sheep/router';
|
||||||
import user from './user';
|
import user from './user';
|
||||||
import sys from './sys';
|
import sys from './sys';
|
||||||
|
import { h5Url } from '@/sheep/config';
|
||||||
|
|
||||||
const app = defineStore({
|
const app = defineStore({
|
||||||
id: 'app',
|
id: 'app',
|
||||||
|
|
@ -72,7 +73,7 @@ const app = defineStore({
|
||||||
this.platform = {
|
this.platform = {
|
||||||
share: {
|
share: {
|
||||||
methods: ['forward', 'poster', 'link'],
|
methods: ['forward', 'poster', 'link'],
|
||||||
linkAddress: 'http://127.0.0.1:3000', // TODO 芋艿:可以考虑改到 .env 那
|
linkAddress: h5Url, // 已交由 .env 接管
|
||||||
posterInfo: {
|
posterInfo: {
|
||||||
user_bg: '/static/img/shop/config/user-poster-bg.png',
|
user_bg: '/static/img/shop/config/user-poster-bg.png',
|
||||||
goods_bg: '/static/img/shop/config/goods-poster-bg.png',
|
goods_bg: '/static/img/shop/config/goods-poster-bg.png',
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue