feat: 修改api地址
This commit is contained in:
@@ -1,7 +1,7 @@
|
|||||||
# 版本号
|
# 版本号
|
||||||
SHOPRO_VERSION=v2.4.1
|
SHOPRO_VERSION=v2.4.1
|
||||||
# 后端接口 - 正式环境(通过 process.env.NODE_ENV 非 development)
|
# 后端接口 - 正式环境(通过 process.env.NODE_ENV 非 development)
|
||||||
SHOPRO_BASE_URL=http://www.qflyqzy.net:48090
|
SHOPRO_BASE_URL=https://yougou.api.qflyqzy.net
|
||||||
# SHOPRO_BASE_URL=https://yougoutest.api.riananyoumu.com
|
# SHOPRO_BASE_URL=https://yougoutest.api.riananyoumu.com
|
||||||
|
|
||||||
# 后端接口 - 测试环境(通过 process.env.NODE_ENV = development)
|
# 后端接口 - 测试环境(通过 process.env.NODE_ENV = development)
|
||||||
@@ -16,7 +16,7 @@ SHOPRO_BASE_URL=http://www.qflyqzy.net:48090
|
|||||||
#SHOPRO_DEV_BASE_URL=http://192.168.101.58:48090
|
#SHOPRO_DEV_BASE_URL=http://192.168.101.58:48090
|
||||||
|
|
||||||
# 服务器
|
# 服务器
|
||||||
# SHOPRO_DEV_BASE_URL=http://www.qflyqzy.net:48090
|
# SHOPRO_DEV_BASE_URL=https://yougou.api.qflyqzy.net
|
||||||
|
|
||||||
# SHOPRO_DEV_BASE_URL=https://www.qflyqzy.net/yg-api
|
# SHOPRO_DEV_BASE_URL=https://www.qflyqzy.net/yg-api
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"prompt" : "template",
|
"prompt" : "template",
|
||||||
"title" : "用户协议和隐私政策",
|
"title" : "用户协议和隐私政策",
|
||||||
"message" : "欢迎使用本应用,我们非常重视您的个人信息和隐私保护。在使用服务之前,请仔细阅读<a href='http://www.qflyqzy.net/h5/pages/index/user_agreement'>《用户协议》</a>和<a href='http://www.qflyqzy.net/h5/pages/index/privacy_agreement'>《隐私政策》</a>。我们将按照您同意的条款使用您的个人信息,以便为您提供服务。",
|
"message" : "欢迎使用本应用,我们非常重视您的个人信息和隐私保护。在使用服务之前,请仔细阅读<a href='http://yougou.h5.qflyqzy.net/pages/index/user_agreement'>《用户协议》</a>和<a href='http://yougou.h5.qflyqzy.net/pages/index/user_agreement'>《隐私政策》</a>。我们将按照您同意的条款使用您的个人信息,以便为您提供服务。",
|
||||||
"buttonAccept" : "同意并接受",
|
"buttonAccept" : "同意并接受",
|
||||||
"buttonRefuse" : "退出应用",
|
"buttonRefuse" : "退出应用",
|
||||||
"styles" : {
|
"styles" : {
|
||||||
|
|||||||
+11
-3
@@ -2,8 +2,8 @@
|
|||||||
"name" : "优购商城",
|
"name" : "优购商城",
|
||||||
"appid" : "__UNI__8B19741",
|
"appid" : "__UNI__8B19741",
|
||||||
"description" : "",
|
"description" : "",
|
||||||
"versionName" : "1.6.0",
|
"versionName" : "1.6.3",
|
||||||
"versionCode" : 160,
|
"versionCode" : 163,
|
||||||
"transformPx" : false,
|
"transformPx" : false,
|
||||||
"app-plus" : {
|
"app-plus" : {
|
||||||
"privacy" : {
|
"privacy" : {
|
||||||
@@ -24,7 +24,8 @@
|
|||||||
"VideoPlayer" : {},
|
"VideoPlayer" : {},
|
||||||
"Payment" : {},
|
"Payment" : {},
|
||||||
"OAuth" : {},
|
"OAuth" : {},
|
||||||
"Share" : {}
|
"Share" : {},
|
||||||
|
"Maps" : {}
|
||||||
},
|
},
|
||||||
"distribute" : {
|
"distribute" : {
|
||||||
"android" : {
|
"android" : {
|
||||||
@@ -74,6 +75,13 @@
|
|||||||
"appid" : "wx23b0c321b5d74d63",
|
"appid" : "wx23b0c321b5d74d63",
|
||||||
"UniversalLinks" : ""
|
"UniversalLinks" : ""
|
||||||
}
|
}
|
||||||
|
},
|
||||||
|
"maps" : {
|
||||||
|
"amap" : {
|
||||||
|
"name" : "",
|
||||||
|
"appkey_ios" : "",
|
||||||
|
"appkey_android" : ""
|
||||||
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"icons" : {
|
"icons" : {
|
||||||
|
|||||||
@@ -248,7 +248,7 @@
|
|||||||
|
|
||||||
const goRecord = () => {
|
const goRecord = () => {
|
||||||
uni.navigateTo({
|
uni.navigateTo({
|
||||||
url: '/pages/home/liquidationRecord',
|
url: `/pages/home/liquidationRecord?type=${liquidationType.value}`,
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
<template>
|
<template>
|
||||||
<s-pages title="变现记录" :pink_bg="true">
|
<s-pages :title="pageTitle" :pink_bg="true">
|
||||||
<card_mescroll ref="cardPages" @upCallback="getList" :height="height">
|
<card_mescroll ref="cardPages" @upCallback="getList" :height="height">
|
||||||
<view class="bg24 radius12 m-x-42 p-y-28 p-x-40" v-if="detailList.length">
|
<view class="bg24 radius12 m-x-42 p-y-28 p-x-40" v-if="detailList.length">
|
||||||
<view
|
<view
|
||||||
@@ -41,6 +41,8 @@
|
|||||||
let detailList = ref([]);
|
let detailList = ref([]);
|
||||||
let height = ref('100%');
|
let height = ref('100%');
|
||||||
const tokenLoading = ref(false);
|
const tokenLoading = ref(false);
|
||||||
|
const recordType = ref(1);
|
||||||
|
const pageTitle = ref('变现记录');
|
||||||
let sysInfo = uni.getSystemInfoSync();
|
let sysInfo = uni.getSystemInfoSync();
|
||||||
height.value = sysInfo.windowHeight - sysInfo.statusBarHeight - uni.upx2px(88) + 'px';
|
height.value = sysInfo.windowHeight - sysInfo.statusBarHeight - uni.upx2px(88) + 'px';
|
||||||
let cardPages = ref(null);
|
let cardPages = ref(null);
|
||||||
@@ -124,6 +126,7 @@
|
|||||||
const res = await api.walletLiquidationRecordPage({
|
const res = await api.walletLiquidationRecordPage({
|
||||||
pageNo: mescroll.num,
|
pageNo: mescroll.num,
|
||||||
pageSize: mescroll.size,
|
pageSize: mescroll.size,
|
||||||
|
type: recordType.value,
|
||||||
});
|
});
|
||||||
if (res.code === 0) {
|
if (res.code === 0) {
|
||||||
const data = res.data?.list || [];
|
const data = res.data?.list || [];
|
||||||
@@ -135,7 +138,14 @@
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
onLoad(() => {});
|
onLoad((options) => {
|
||||||
|
const nextType = Number(options?.type || 1);
|
||||||
|
recordType.value = nextType === 2 ? 2 : 1;
|
||||||
|
pageTitle.value = recordType.value === 2 ? '无双变现记录' : '变现记录';
|
||||||
|
uni.setNavigationBarTitle({
|
||||||
|
title: pageTitle.value,
|
||||||
|
});
|
||||||
|
});
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<style scoped lang="scss">
|
<style scoped lang="scss">
|
||||||
|
|||||||
+5
-14
@@ -11,6 +11,7 @@
|
|||||||
<uni-icons type="more-filled" color="#fff" size="34rpx" />
|
<uni-icons type="more-filled" color="#fff" size="34rpx" />
|
||||||
</view>
|
</view>
|
||||||
<view v-if="showLiquidationMenu" class="more-menu">
|
<view v-if="showLiquidationMenu" class="more-menu">
|
||||||
|
<view class="more-menu-item" @click.stop="goLiquidation">去变现</view>
|
||||||
<view class="more-menu-item" @click.stop="goWushuangLiquidation">无双变现</view>
|
<view class="more-menu-item" @click.stop="goWushuangLiquidation">无双变现</view>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
@@ -23,7 +24,6 @@
|
|||||||
<view class="num m-l-34" @click="jumpPage('提现', '/pages/home/pay/withdraw')">
|
<view class="num m-l-34" @click="jumpPage('提现', '/pages/home/pay/withdraw')">
|
||||||
{{ $fen2yuan(money_obj?.withdrawAmount || 0) }}
|
{{ $fen2yuan(money_obj?.withdrawAmount || 0) }}
|
||||||
</view>
|
</view>
|
||||||
<view class="withdraw_btn" @click="jumpPage('变现', '/pages/home/liquidation')">去变现</view>
|
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
@@ -92,6 +92,10 @@
|
|||||||
function toggleLiquidationMenu() {
|
function toggleLiquidationMenu() {
|
||||||
showLiquidationMenu.value = !showLiquidationMenu.value;
|
showLiquidationMenu.value = !showLiquidationMenu.value;
|
||||||
}
|
}
|
||||||
|
function goLiquidation() {
|
||||||
|
showLiquidationMenu.value = false;
|
||||||
|
jumpPage('变现', '/pages/home/liquidation?type=1&title=去变现');
|
||||||
|
}
|
||||||
function goWushuangLiquidation() {
|
function goWushuangLiquidation() {
|
||||||
showLiquidationMenu.value = false;
|
showLiquidationMenu.value = false;
|
||||||
uni.navigateTo({
|
uni.navigateTo({
|
||||||
@@ -182,19 +186,6 @@
|
|||||||
align-items: center;
|
align-items: center;
|
||||||
}
|
}
|
||||||
|
|
||||||
.withdraw_btn {
|
|
||||||
margin-left: auto;
|
|
||||||
height: 44rpx;
|
|
||||||
padding: 0 18rpx;
|
|
||||||
line-height: 44rpx;
|
|
||||||
font-size: 24rpx;
|
|
||||||
font-weight: 500;
|
|
||||||
color: #ffffff;
|
|
||||||
border: 2rpx solid rgba(255, 255, 255, 0.55);
|
|
||||||
border-radius: 22rpx;
|
|
||||||
background: rgba(255, 255, 255, 0.16);
|
|
||||||
box-sizing: border-box;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -308,22 +308,24 @@
|
|||||||
const openThirdPartyService = (item) => {
|
const openThirdPartyService = (item) => {
|
||||||
if (!item?.url) return;
|
if (!item?.url) return;
|
||||||
const title = encodeURIComponent(item.title || item.name || '第三方服务');
|
const title = encodeURIComponent(item.title || item.name || '第三方服务');
|
||||||
const targetUrl = encodeURIComponent(item.url);
|
const rawUrl = String(item.url || '').trim();
|
||||||
if (typeof plus !== 'undefined' && plus?.runtime) {
|
const targetUrl = encodeURIComponent(rawUrl);
|
||||||
|
const openWebview = () => {
|
||||||
uni.navigateTo({
|
uni.navigateTo({
|
||||||
url: `/pages/public/webview?title=${title}&url=${targetUrl}`,
|
url: `/pages/public/webview?title=${title}&url=${targetUrl}`,
|
||||||
});
|
});
|
||||||
|
};
|
||||||
|
if (typeof plus !== 'undefined' && plus?.runtime) {
|
||||||
|
openWebview();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (typeof window !== 'undefined' && typeof window.open === 'function') {
|
if (typeof window !== 'undefined' && typeof window.open === 'function') {
|
||||||
const opened = window.open(item.url, '_blank');
|
const opened = window.open(rawUrl, '_blank');
|
||||||
if (opened) return;
|
if (opened) return;
|
||||||
window.location.href = item.url;
|
window.location.href = rawUrl;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
uni.navigateTo({
|
openWebview();
|
||||||
url: `/pages/public/webview?title=${title}&url=${targetUrl}`,
|
|
||||||
});
|
|
||||||
};
|
};
|
||||||
const updateAvatar = async (avatar) => {
|
const updateAvatar = async (avatar) => {
|
||||||
if (!avatar) return;
|
if (!avatar) return;
|
||||||
|
|||||||
@@ -17,10 +17,19 @@
|
|||||||
|
|
||||||
const url = ref();
|
const url = ref();
|
||||||
const title = ref();
|
const title = ref();
|
||||||
|
const safeDecode = (value) => {
|
||||||
|
const text = String(value || '');
|
||||||
|
if (!text) return '';
|
||||||
|
try {
|
||||||
|
return decodeURIComponent(text);
|
||||||
|
} catch (e) {
|
||||||
|
return text;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
onLoad((e) => {
|
onLoad((e) => {
|
||||||
url.value = e.url;
|
url.value = safeDecode(e.url);
|
||||||
title.value = e.title;
|
title.value = safeDecode(e.title);
|
||||||
console.log(e);
|
console.log(e);
|
||||||
});
|
});
|
||||||
</script>
|
</script>
|
||||||
|
|||||||
@@ -63,8 +63,6 @@
|
|||||||
current.value = e.detail.current;
|
current.value = e.detail.current;
|
||||||
};
|
};
|
||||||
|
|
||||||
const HOME_DEFAULT_TAB_STORAGE_KEY = 'home.goods.defaultTabName';
|
|
||||||
|
|
||||||
const parsePath = (raw) => {
|
const parsePath = (raw) => {
|
||||||
const s = typeof raw === 'string' ? raw : '';
|
const s = typeof raw === 'string' ? raw : '';
|
||||||
const [p] = s.split('?');
|
const [p] = s.split('?');
|
||||||
@@ -88,20 +86,11 @@
|
|||||||
if (!opened) {
|
if (!opened) {
|
||||||
const message =
|
const message =
|
||||||
'您尚未开通AI店铺,无法查看购物车。请先开通AI店铺后再进行购买。';
|
'您尚未开通AI店铺,无法查看购物车。请先开通AI店铺后再进行购买。';
|
||||||
uni.setStorageSync(HOME_DEFAULT_TAB_STORAGE_KEY, '会员优选');
|
|
||||||
uni.showToast({
|
uni.showToast({
|
||||||
title: message,
|
title: message,
|
||||||
icon: 'none',
|
icon: 'none',
|
||||||
duration: 2500,
|
duration: 2500,
|
||||||
});
|
});
|
||||||
setTimeout(() => {
|
|
||||||
uni.switchTab({
|
|
||||||
url: '/pages/index/index',
|
|
||||||
fail: () => {
|
|
||||||
uni.reLaunch({ url: '/pages/index/index' });
|
|
||||||
},
|
|
||||||
});
|
|
||||||
}, 1000);
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
|
|||||||
Reference in New Issue
Block a user