cxc/yshopb2c-uniapp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

合并冲突

Browse Source
This commit is contained in:
anhaogxs
2021-03-27 12:16:30 +08:00
parent 347fc6dbad
commit efda8a537d
30 changed files with 34 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
config/index.js
View File

@ -1,8 +1,8 @@
// export const VUE_APP_API_URL = 'http://natapp.xinxintuan.co/api'; // export const VUE_APP_API_URL = 'http://natapp.xinxintuan.co/api';
// export const VUE_APP_API_URL = 'https://wxapi.yixiang.co/api'; export const VUE_APP_API_URL = 'https://wxapi.yixiang.co/api';
// export const VUE_APP_API_URL = 'http://192.168.31.223:8008/api'; // export const VUE_APP_API_URL = 'http://192.168.31.223:8008/api';
// export const VUE_APP_API_URL = 'http://natapp.xinxintuan.co/api'; // export const VUE_APP_API_URL = 'http://natapp.xinxintuan.co/api';
export const VUE_APP_API_URL = 'https://tapi.xinxintuan.co/api' // export const VUE_APP_API_URL = 'https://tapi.xinxintuan.co/api'
// export const VUE_APP_API_URL = 'https://h5api.xinxintuan.co/api'; // export const VUE_APP_API_URL = 'https://h5api.xinxintuan.co/api';
// export const VUE_APP_API_URL = 'https://h5api.xinxintuan.co/api'; // export const VUE_APP_API_URL = 'https://h5api.xinxintuan.co/api';
export const VUE_APP_RESOURCES_URL = 'https://wx.yixiang.co/static' export const VUE_APP_RESOURCES_URL = 'https://wx.yixiang.co/static'

BIN
icons/1024x1024.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 304 KiB

BIN
icons/120x120.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.1 KiB

BIN
icons/144x144.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.1 KiB

BIN
icons/152x152.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.4 KiB

BIN
icons/167x167.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.9 KiB

BIN
icons/180x180.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 6.6 KiB

BIN
icons/192x192.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 7.0 KiB

BIN
icons/20x20.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 470 B

BIN
icons/29x29.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 778 B

BIN
icons/40x40.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
icons/58x58.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.7 KiB

BIN
icons/60x60.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.7 KiB

BIN
icons/72x72.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.2 KiB

BIN
icons/76x76.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.3 KiB

BIN
icons/80x80.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.5 KiB

BIN
icons/87x87.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.8 KiB

BIN
icons/96x96.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.2 KiB

64
manifest.json
View File

@ -81,51 +81,51 @@
"splashscreen" : { "splashscreen" : {
"ios" : { "ios" : {
"iphone" : { "iphone" : {
"portrait-896h@3x" : "unpackage/res/splash/1242+2688.png", "portrait-896h@3x" : "splash/1242+2688.png",
"portrait-896h@2x" : "unpackage/res/splash/828+1792.png", "portrait-896h@2x" : "splash/828+1792.png",
"iphonex" : "unpackage/res/splash/1125+2436.png", "iphonex" : "splash/1125+2436.png",
"retina55" : "unpackage/res/splash/1142+2208.png", "retina55" : "splash/1142+2208.png",
"retina47" : "unpackage/res/splash/750+1334.png", "retina47" : "splash/750+1334.png",
"retina40" : "unpackage/res/splash/640+1136.png", "retina40" : "splash/640+1136.png",
"retina35" : "unpackage/res/splash/640+960.png" "retina35" : "splash/640+960.png"
} }
}, },
"android" : { "android" : {
"hdpi" : "unpackage/res/splash/480+762.png", "hdpi" : "splash/480+762.png",
"xhdpi" : "unpackage/res/splash/720+1242.png", "xhdpi" : "splash/720+1242.png",
"xxhdpi" : "unpackage/res/splash/1080+1882.png" "xxhdpi" : "splash/1080+1882.png"
}, },
"iosStyle" : "common" "iosStyle" : "common"
}, },
"icons" : { "icons" : {
"android" : { "android" : {
"hdpi" : "unpackage/res/icons/72x72.png", "hdpi" : "icons/72x72.png",
"xhdpi" : "unpackage/res/icons/96x96.png", "xhdpi" : "icons/96x96.png",
"xxhdpi" : "unpackage/res/icons/144x144.png", "xxhdpi" : "icons/144x144.png",
"xxxhdpi" : "unpackage/res/icons/192x192.png" "xxxhdpi" : "icons/192x192.png"
}, },
"ios" : { "ios" : {
"appstore" : "unpackage/res/icons/1024x1024.png", "appstore" : "icons/1024x1024.png",
"ipad" : { "ipad" : {
"app" : "unpackage/res/icons/76x76.png", "app" : "icons/76x76.png",
"app@2x" : "unpackage/res/icons/152x152.png", "app@2x" : "icons/152x152.png",
"notification" : "unpackage/res/icons/20x20.png", "notification" : "icons/20x20.png",
"notification@2x" : "unpackage/res/icons/40x40.png", "notification@2x" : "icons/40x40.png",
"proapp@2x" : "unpackage/res/icons/167x167.png", "proapp@2x" : "icons/167x167.png",
"settings" : "unpackage/res/icons/29x29.png", "settings" : "icons/29x29.png",
"settings@2x" : "unpackage/res/icons/58x58.png", "settings@2x" : "icons/58x58.png",
"spotlight" : "unpackage/res/icons/40x40.png", "spotlight" : "icons/40x40.png",
"spotlight@2x" : "unpackage/res/icons/80x80.png" "spotlight@2x" : "icons/80x80.png"
}, },
"iphone" : { "iphone" : {
"app@2x" : "unpackage/res/icons/120x120.png", "app@2x" : "icons/120x120.png",
"app@3x" : "unpackage/res/icons/180x180.png", "app@3x" : "icons/180x180.png",
"notification@2x" : "unpackage/res/icons/40x40.png", "notification@2x" : "icons/40x40.png",
"notification@3x" : "unpackage/res/icons/60x60.png", "notification@3x" : "icons/60x60.png",
"settings@2x" : "unpackage/res/icons/58x58.png", "settings@2x" : "icons/58x58.png",
"settings@3x" : "unpackage/res/icons/87x87.png", "settings@3x" : "icons/87x87.png",
"spotlight@2x" : "unpackage/res/icons/80x80.png", "spotlight@2x" : "icons/80x80.png",
"spotlight@3x" : "unpackage/res/icons/120x120.png" "spotlight@3x" : "icons/120x120.png"
} }
} }
} }

BIN
splash/1024+1024.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.0 MiB

BIN
splash/1080+1882.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.8 MiB

BIN
splash/1125+2436.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 7.8 MiB

BIN
splash/1142+2208.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 7.9 MiB

BIN
splash/1242+2688.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 9.6 MiB

BIN
splash/480+762.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.0 MiB

BIN
splash/640+1136.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.1 MiB

BIN
splash/640+960.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.8 MiB

BIN
splash/720+1242.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.6 MiB

BIN
splash/750+1334.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.9 MiB

BIN
splash/828+1792.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.3 MiB