Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
groupPurchase-miniapp
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
彭佳妮(贵阳日报)
groupPurchase-miniapp
Commits
942f6224
Commit
942f6224
authored
Aug 19, 2024
by
陈宗胤(贵阳日报)
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
环境变量修改
parent
79dfb43f
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
14 additions
and
7 deletions
+14
-7
.env.development
.env.development
+4
-1
FoodDetails.vue
src/Components/index/FoodDetails.vue
+2
-0
index.vue
src/pages/index/index.vue
+1
-0
confirmOrder.vue
src/pages/shop/confirmOrder.vue
+4
-4
vite.config.ts
vite.config.ts
+3
-2
No files found.
.env.development
View file @
942f6224
...
@@ -4,5 +4,8 @@ VITE_APP_ENV = 'development'
...
@@ -4,5 +4,8 @@ VITE_APP_ENV = 'development'
# URL路径
# URL路径
VITE_APP_BASE_URL = '/api'
VITE_APP_BASE_URL = '/api'
# 照片url路径
# 照片url路径
(开发环境)
VITE_APP_IMG_URL = 'http://file.rhhzkj.com:8080'
VITE_APP_IMG_URL = 'http://file.rhhzkj.com:8080'
# 照片url路径(正式环境)
# VITE_APP_IMG_URL = 'https://file.rddyz.com'
src/Components/index/FoodDetails.vue
View file @
942f6224
...
@@ -131,6 +131,7 @@ const toShop = (id) => {
...
@@ -131,6 +131,7 @@ const toShop = (id) => {
display
:
flex
;
display
:
flex
;
align-items
:
center
;
align-items
:
center
;
margin
:
20rpx
0
;
margin
:
20rpx
0
;
flex-wrap
:
wrap
;
view
{
view
{
margin-right
:
8rpx
;
margin-right
:
8rpx
;
display
:
inline-block
;
display
:
inline-block
;
...
@@ -140,6 +141,7 @@ const toShop = (id) => {
...
@@ -140,6 +141,7 @@ const toShop = (id) => {
font-size
:
18rpx
;
font-size
:
18rpx
;
color
:
#abaaaa
;
color
:
#abaaaa
;
background-color
:
rgba
(
243
,
243
,
243
,
1
);
background-color
:
rgba
(
243
,
243
,
243
,
1
);
margin-bottom
:
5rpx
;
}
}
}
}
.groupPurchasePrice
{
.groupPurchasePrice
{
...
...
src/pages/index/index.vue
View file @
942f6224
...
@@ -272,6 +272,7 @@ const getCouponMainList = () => {
...
@@ -272,6 +272,7 @@ const getCouponMainList = () => {
const
receive
=
(
data
)
=>
{
const
receive
=
(
data
)
=>
{
if
(
data
.
couponType
===
'mch'
&&
data
.
numState
===
0
)
{
if
(
data
.
couponType
===
'mch'
&&
data
.
numState
===
0
)
{
receiveCoupon
([
data
.
couponYzfId
]).
then
((
res
)
=>
{
receiveCoupon
([
data
.
couponYzfId
]).
then
((
res
)
=>
{
data
.
numState
=
1
;
xma
.
showToast
({
xma
.
showToast
({
title
:
'领取成功!'
,
title
:
'领取成功!'
,
icon
:
'none'
,
icon
:
'none'
,
...
...
src/pages/shop/confirmOrder.vue
View file @
942f6224
...
@@ -286,14 +286,14 @@ const submitOrder = debounce(() => {
...
@@ -286,14 +286,14 @@ const submitOrder = debounce(() => {
tradeType
:
selectType
.
value
,
tradeType
:
selectType
.
value
,
};
};
xma
.
showLoading
({
xma
.
showLoading
({
title
:
'正在支付'
,
title
:
'正在支付'
,
mask
:
true
,
mask
:
true
,
})
})
;
groupBuyCreate
(
params
).
then
((
res
)
=>
{
groupBuyCreate
(
params
).
then
((
res
)
=>
{
if
(
res
.
code
===
0
)
{
if
(
res
.
code
===
0
)
{
const
{
paymentUrl
,
outTradeNo
}
=
res
.
data
.
result
;
const
{
paymentUrl
,
outTradeNo
}
=
res
.
data
.
result
;
outTradeNos
.
value
=
outTradeNo
;
outTradeNos
.
value
=
outTradeNo
;
xma
.
hideLoading
()
xma
.
hideLoading
()
;
window
.
location
.
href
=
paymentUrl
;
window
.
location
.
href
=
paymentUrl
;
// 设置一个延时器
// 设置一个延时器
const
start
=
Date
.
now
();
const
start
=
Date
.
now
();
...
...
vite.config.ts
View file @
942f6224
...
@@ -42,14 +42,15 @@ export default defineConfig({
...
@@ -42,14 +42,15 @@ export default defineConfig({
proxy
:
{
proxy
:
{
'/api'
:
{
'/api'
:
{
target
:
'http://test.rhhzkj.com:8080'
,
target
:
'http://test.rhhzkj.com:8080'
,
// target: 'https://api.rddyz.com',
changeOrigin
:
true
,
changeOrigin
:
true
,
rewrite
:
(
path
)
=>
path
.
replace
(
/^
\/
api/
,
''
),
rewrite
:
(
path
)
=>
path
.
replace
(
/^
\/
api/
,
''
),
},
},
'/ws/geocoder'
:
{
'/ws/geocoder'
:
{
target
:
'https://apis.map.qq.com'
,
target
:
'https://apis.map.qq.com'
,
changeOrigin
:
true
,
changeOrigin
:
true
,
bypass
:
(
req
,
res
,
options
)
=>
res
.
setHeader
(
"x-req-proxyUr1"
,
options
.
target
+
req
.
url
)
bypass
:
(
req
,
res
,
options
)
=>
res
.
setHeader
(
'x-req-proxyUr1'
,
options
.
target
+
req
.
url
),
}
}
,
},
},
},
},
});
});
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment