环境变量修改

parent 79dfb43f
...@@ -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'
...@@ -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 {
......
...@@ -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',
......
...@@ -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();
......
...@@ -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),
} },
}, },
}, },
}); });
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment