|
|
@@ -1,9 +1,6 @@
|
|
|
<template>
|
|
|
<view class="container">
|
|
|
- <up-navbar
|
|
|
- class="inde-nav-bar"
|
|
|
- :bgColor="navBgColor"
|
|
|
- >
|
|
|
+ <up-navbar class="inde-nav-bar" :bgColor="navBgColor">
|
|
|
<template #left>
|
|
|
<view></view>
|
|
|
</template>
|
|
|
@@ -24,7 +21,15 @@
|
|
|
<view class="user-detail">
|
|
|
<view class="name-vip" v-if="appStore.isLogin">
|
|
|
<text class="name">{{ appStore.$userInfo?.nickname }}</text>
|
|
|
- <image class="vip-tag" v-if="appStore.$userInfo?.svip && !(appStore?.$wxConfig?.auditModeEnabled)" mode="widthFix" :src="HTTP_REQUEST_URL_IMG+'sviplogo.png'"></image>
|
|
|
+ <image
|
|
|
+ class="vip-tag"
|
|
|
+ v-if="
|
|
|
+ appStore.$userInfo?.svip &&
|
|
|
+ !appStore?.$wxConfig?.storeAuditModeEnabled
|
|
|
+ "
|
|
|
+ mode="widthFix"
|
|
|
+ :src="HTTP_REQUEST_URL_IMG + 'sviplogo.png'"
|
|
|
+ ></image>
|
|
|
</view>
|
|
|
<view
|
|
|
class="name-vip"
|
|
|
@@ -41,11 +46,18 @@
|
|
|
<view class="item" @click="handleFaceDetect">
|
|
|
{{ appStore.$userInfo?.realNameVerified ? "已实名" : "未实名" }}
|
|
|
</view>
|
|
|
- <view class="item" v-if="userInfoAddres !== ''">IP：
|
|
|
+ <view class="item" v-if="userInfoAddres !== ''"
|
|
|
+ >IP：
|
|
|
{{ userInfoAddres }}
|
|
|
</view>
|
|
|
|
|
|
- <view class="item" v-if="appStore.$userInfo?.sex && appStore.$userInfo?.sex !== 0 ">{{ sexMap[appStore.$userInfo?.sex] }}·{{ appStore.$userInfo?.age }}岁</view>
|
|
|
+ <view
|
|
|
+ class="item"
|
|
|
+ v-if="appStore.$userInfo?.sex && appStore.$userInfo?.sex !== 0"
|
|
|
+ >{{ sexMap[appStore.$userInfo?.sex] }}·{{
|
|
|
+ appStore.$userInfo?.age
|
|
|
+ }}岁</view
|
|
|
+ >
|
|
|
</view>
|
|
|
</view>
|
|
|
</view>
|
|
|
@@ -60,23 +72,42 @@
|
|
|
</view>
|
|
|
</view>
|
|
|
|
|
|
-
|
|
|
<!-- 会员开通提示 v-if="!userInfo.isVip"-->
|
|
|
- <view class="vip-promote" v-if="!(appStore?.$wxConfig?.auditModeEnabled)">
|
|
|
- <image class="vipBG" :src="HTTP_REQUEST_URL_IMG+'vipBG.png'" mode="scaleToFill"></image>
|
|
|
+ <view class="vip-promote" v-if="!appStore?.$wxConfig?.storeAuditModeEnabled">
|
|
|
+ <image
|
|
|
+ class="vipBG"
|
|
|
+ :src="HTTP_REQUEST_URL_IMG + 'vipBG.png'"
|
|
|
+ mode="scaleToFill"
|
|
|
+ ></image>
|
|
|
<view class="vip-text">
|
|
|
<view class="title">
|
|
|
- <image class="vipIcon" :src="HTTP_REQUEST_URL_IMG+'setting/vipIcon.png'" mode="widthFix"></image>
|
|
|
- <text v-if="!appStore.$userInfo?.svip">开通<text class="bigText">会员</text>享受更多<text class="bigText">权益</text></text>
|
|
|
+ <image
|
|
|
+ class="vipIcon"
|
|
|
+ :src="HTTP_REQUEST_URL_IMG + 'setting/vipIcon.png'"
|
|
|
+ mode="widthFix"
|
|
|
+ ></image>
|
|
|
+ <text v-if="!appStore.$userInfo?.svip"
|
|
|
+ >开通<text class="bigText">会员</text>享受更多<text
|
|
|
+ class="bigText"
|
|
|
+ >权益</text
|
|
|
+ ></text
|
|
|
+ >
|
|
|
<text v-else>前往查看<text class="bigText">权益</text></text>
|
|
|
</view>
|
|
|
- <button class="open-vip" @click="goVIP">{{appStore.$userInfo?.svip ? '去查看':'去开通'}}<image class="bofang" :src="HTTP_REQUEST_URL_IMG+'setting/bofang.png'" mode="widthFix"></image></button>
|
|
|
+ <button class="open-vip" @click="goVIP">
|
|
|
+ {{ appStore.$userInfo?.svip ? "去查看" : "去开通"
|
|
|
+ }}<image
|
|
|
+ class="bofang"
|
|
|
+ :src="HTTP_REQUEST_URL_IMG + 'setting/bofang.png'"
|
|
|
+ mode="widthFix"
|
|
|
+ ></image>
|
|
|
+ </button>
|
|
|
</view>
|
|
|
</view>
|
|
|
</view>
|
|
|
|
|
|
<!-- 钱包余额 -->
|
|
|
- <view class="wallet-section">
|
|
|
+ <view class="wallet-section" v-if="!appStore?.$wxConfig?.storeAuditModeEnabled">
|
|
|
<view class="wallet-header">
|
|
|
<view>
|
|
|
<view class="wallet-title">钱包余额（元）</view>
|
|
|
@@ -86,9 +117,8 @@
|
|
|
<view
|
|
|
class="transaction-detail"
|
|
|
@click="viewTransactionDetail"
|
|
|
- v-if="!(appStore?.$wxConfig?.auditModeEnabled)"
|
|
|
>
|
|
|
- <text style="margin-right: 10rpx">交易明细</text>
|
|
|
+ <text style="margin-right: 10rpx">进入钱包</text>
|
|
|
<uni-icons type="right" size="16" color="#666666"></uni-icons>
|
|
|
</view>
|
|
|
</view>
|
|
|
@@ -118,7 +148,7 @@
|
|
|
</view>
|
|
|
</view>
|
|
|
|
|
|
- <view
|
|
|
+ <!-- <view
|
|
|
class="wallet-actions"
|
|
|
v-if="tradeList && tradeList.length > 0 && showIcons"
|
|
|
>
|
|
|
@@ -132,37 +162,72 @@
|
|
|
@click="goDetail(tradeList[1].jumpUrl)"
|
|
|
>{{ tradeList[1].iconName }}</view
|
|
|
>
|
|
|
- </view>
|
|
|
+ </view> -->
|
|
|
|
|
|
- <view class="functions" v-if="useList&&useList.length>0&&showIcons">
|
|
|
- <view class="function-item" v-for="item in useList" :key="item.iconName" @click="goDetail(item.jumpUrl)">
|
|
|
+ <view class="functions" v-if="useList && useList.length > 0">
|
|
|
+ <view
|
|
|
+ class="function-item"
|
|
|
+ v-for="item in useList"
|
|
|
+ :key="item.iconName"
|
|
|
+ @click="goDetail(item.jumpUrl)"
|
|
|
+ >
|
|
|
<view class="function-icon">
|
|
|
- <image class="img" :src="item.src" mode="widthFix"></image>
|
|
|
+ <image
|
|
|
+
|
|
|
+ :src="item.iconUrl"
|
|
|
+ mode="widthFix"
|
|
|
+ :style="{ width: (item.iconSize || '60') + 'rpx' }"
|
|
|
+ ></image>
|
|
|
</view>
|
|
|
<text class="function-name">{{ item.iconName }}</text>
|
|
|
</view>
|
|
|
</view>
|
|
|
</view>
|
|
|
|
|
|
-
|
|
|
<!-- 最近访问 -->
|
|
|
<view class="recent-visit" v-if="recentStores.length > 0">
|
|
|
<view class="section-header">
|
|
|
<text class="section-title">最近访问</text>
|
|
|
- <view class="more" @click="handleFunctionClick({pageUrl:'/pages/users/browsing_history/index'})">查看更多<uni-icons style="margin-left: 10rpx;" type="right" size="16" color="#666666"></uni-icons></view>
|
|
|
+ <view
|
|
|
+ class="more"
|
|
|
+ @click="
|
|
|
+ handleFunctionClick({
|
|
|
+ pageUrl: '/pages/users/browsing_history/index',
|
|
|
+ })
|
|
|
+ "
|
|
|
+ >查看更多<uni-icons
|
|
|
+ style="margin-left: 10rpx"
|
|
|
+ type="right"
|
|
|
+ size="16"
|
|
|
+ color="#666666"
|
|
|
+ ></uni-icons
|
|
|
+ ></view>
|
|
|
</view>
|
|
|
|
|
|
<view class="store-list">
|
|
|
- <template v-for="(store,storeIndex) in recentStores" :key="store.id">
|
|
|
- <view class="store-item" v-if="storeIndex == 0" @click="viewStore(store)">
|
|
|
- <view class="store-logo">
|
|
|
- <image class="img" :src="store.merchantLogo" mode="aspectFill"></image>
|
|
|
- </view>
|
|
|
- <view class="store-info">
|
|
|
- <text class="store-name">{{ store.merchantName }}</text>
|
|
|
- <text class="store-desc">{{ store.merchantDescribe }}</text>
|
|
|
- </view>
|
|
|
- <uni-icons style="margin-left: auto;" type="right" size="16" color="#666666"></uni-icons>
|
|
|
+ <template v-for="(store, storeIndex) in recentStores" :key="store.id">
|
|
|
+ <view
|
|
|
+ class="store-item"
|
|
|
+ v-if="storeIndex == 0"
|
|
|
+ @click="viewStore(store)"
|
|
|
+ >
|
|
|
+ <view class="store-logo">
|
|
|
+ <image
|
|
|
+ class="img"
|
|
|
+ :src="store.merchantLogo"
|
|
|
+ mode="aspectFill"
|
|
|
+ ></image>
|
|
|
+ </view>
|
|
|
+ <view class="store-info">
|
|
|
+ <text class="store-name">{{ store.merchantName }}</text>
|
|
|
+ <text class="store-desc">{{ store.merchantDescribe }}</text>
|
|
|
+ </view>
|
|
|
+ <uni-icons
|
|
|
+ style="margin-left: auto"
|
|
|
+ type="right"
|
|
|
+ size="16"
|
|
|
+ color="#666666"
|
|
|
+ ></uni-icons>
|
|
|
</view>
|
|
|
</template>
|
|
|
</view>
|
|
|
@@ -205,7 +270,11 @@
|
|
|
|
|
|
<view class="functions">
|
|
|
<template v-for="func in commonFunctions" :key="func.name">
|
|
|
- <view class="function-item" @click="handleFunctionClick(func)" v-if="func.show">
|
|
|
+ <view
|
|
|
+ class="function-item"
|
|
|
+ @click="handleFunctionClick(func)"
|
|
|
+ v-if="func.show"
|
|
|
+ >
|
|
|
<view class="function-icon">
|
|
|
<image class="img" :src="func.src" mode="widthFix"></image>
|
|
|
</view>
|
|
|
@@ -237,7 +306,7 @@
|
|
|
</view>
|
|
|
</view>
|
|
|
</up-popup>
|
|
|
-
|
|
|
+
|
|
|
<!-- 自定义 tabBar -->
|
|
|
<customTabBar :current="3" :showBackTop="false" />
|
|
|
</view>
|
|
|
@@ -401,7 +470,7 @@ const userInfoAddres = computed(() => {
|
|
|
onShow(async () => {
|
|
|
// 隐藏原生 tabBar
|
|
|
uni.hideTabBar();
|
|
|
-
|
|
|
+
|
|
|
if (appStore.isLogin) {
|
|
|
await appStore.USERINFO();
|
|
|
logoutShow.value = true;
|
|
|
@@ -444,36 +513,37 @@ watch(
|
|
|
(newVal) => {
|
|
|
const configDate = newVal || appStore.$wxConfig;
|
|
|
wxConfig.value = configDate;
|
|
|
- const list = JSON.parse(configDate.essentialFunctions);
|
|
|
- console.log('list',list)
|
|
|
- if (list[0].status == false) {
|
|
|
- showIcons.value = false;
|
|
|
- } else {
|
|
|
- showIcons.value = true;
|
|
|
- }
|
|
|
- tradeList.value = [list[0], list[1]];
|
|
|
- useList.value = [
|
|
|
- {
|
|
|
- ...list[2],
|
|
|
- src: `${HTTP_REQUEST_URL_IMG}setting/mailiao.png`,
|
|
|
- },
|
|
|
- {
|
|
|
- ...list[3],
|
|
|
- src: `${HTTP_REQUEST_URL_IMG}setting/mailiao2.png`,
|
|
|
- },
|
|
|
- {
|
|
|
- ...list[4],
|
|
|
- src: `${HTTP_REQUEST_URL_IMG}setting/cunliao.png`,
|
|
|
- iconName: "存料",
|
|
|
- },
|
|
|
- {
|
|
|
- ...list[5],
|
|
|
- src: `${HTTP_REQUEST_URL_IMG}setting/tiliao.png`,
|
|
|
- },
|
|
|
- ];
|
|
|
+ const list = JSON.parse(configDate.storeCommonTools || "[]");
|
|
|
+ console.log("list", list);
|
|
|
+ useList.value = list;
|
|
|
+ // if (list[0].status == false) {
|
|
|
+ // showIcons.value = false;
|
|
|
+ // } else {
|
|
|
+ // showIcons.value = true;
|
|
|
+ // }
|
|
|
+ // tradeList.value = [list[0], list[1]];
|
|
|
+ // useList.value = [
|
|
|
+ // {
|
|
|
+ // ...list[2],
|
|
|
+ // src: `${HTTP_REQUEST_URL_IMG}setting/mailiao.png`,
|
|
|
+ // },
|
|
|
+ // {
|
|
|
+ // ...list[3],
|
|
|
+ // src: `${HTTP_REQUEST_URL_IMG}setting/mailiao2.png`,
|
|
|
+ // },
|
|
|
+ // {
|
|
|
+ // ...list[4],
|
|
|
+ // src: `${HTTP_REQUEST_URL_IMG}setting/cunliao.png`,
|
|
|
+ // iconName: "存料",
|
|
|
+ // },
|
|
|
+ // {
|
|
|
+ // ...list[5],
|
|
|
+ // src: `${HTTP_REQUEST_URL_IMG}setting/tiliao.png`,
|
|
|
+ // },
|
|
|
+ // ];
|
|
|
console.log(tradeList.value);
|
|
|
},
|
|
|
- { deep: true, immediate: true }
|
|
|
+ { deep: true, immediate: true },
|
|
|
);
|
|
|
|
|
|
// 编辑资料
|
|
|
@@ -495,17 +565,17 @@ const openVip = () => {
|
|
|
// 查看会员权益
|
|
|
const goVIP = () => {
|
|
|
// uni.navigateTo({ url: "/pages/users/VIP/VIP" });
|
|
|
- goDetail("/pages/users/VIP/VIP")
|
|
|
+ goDetail("/pages/users/VIP/VIP");
|
|
|
};
|
|
|
|
|
|
// 查看交易明细
|
|
|
const viewTransactionDetail = () => {
|
|
|
- console.log(isLogin)
|
|
|
+ console.log(isLogin);
|
|
|
if (!appStore.isLogin) {
|
|
|
toLogin();
|
|
|
} else {
|
|
|
// uni.navigateTo({ url: "/pages/users/vault/index" });
|
|
|
- goDetail("/pages/users/vault/index1")
|
|
|
+ goDetail("/pages/users/vault/index1");
|
|
|
}
|
|
|
};
|
|
|
|
|
|
@@ -607,7 +677,7 @@ const handleFunctionClick = (item) => {
|
|
|
} else if (url === "logout") {
|
|
|
handleLogOut();
|
|
|
} else {
|
|
|
- console.log(url)
|
|
|
+ console.log(url);
|
|
|
uni.navigateTo({ url });
|
|
|
}
|
|
|
};
|
|
|
@@ -678,10 +748,9 @@ function handleFaceDetect() {
|
|
|
// #ifndef APP-PLUS
|
|
|
if (appStore.userInfo.realNameVerified || !isOwner.value) return;
|
|
|
uni.navigateTo({
|
|
|
- url: "/pages/users/face_detect/index"
|
|
|
+ url: "/pages/users/face_detect/index",
|
|
|
});
|
|
|
// #endif
|
|
|
-
|
|
|
}
|
|
|
</script>
|
|
|
|
|
|
@@ -707,9 +776,9 @@ function handleFaceDetect() {
|
|
|
display: flex;
|
|
|
justify-content: space-between;
|
|
|
align-items: center;
|
|
|
- margin-bottom: 20rpx;
|
|
|
+ margin: 24rpx 0;
|
|
|
}
|
|
|
-.user-detail{
|
|
|
+.user-detail {
|
|
|
display: flex;
|
|
|
flex-direction: column;
|
|
|
justify-content: center;
|
|
|
@@ -744,7 +813,7 @@ function handleFaceDetect() {
|
|
|
margin-left: 16rpx;
|
|
|
}
|
|
|
|
|
|
-.vip-expire{
|
|
|
+.vip-expire {
|
|
|
font-size: 28rpx;
|
|
|
color: #666;
|
|
|
margin-bottom: 14rpx;
|
|
|
@@ -830,7 +899,7 @@ function handleFaceDetect() {
|
|
|
/* 钱包余额 */
|
|
|
.wallet-section {
|
|
|
background: #fff;
|
|
|
- margin: -176rpx 20rpx 20rpx;
|
|
|
+ margin: -150rpx 20rpx 20rpx;
|
|
|
border-radius: 24rpx;
|
|
|
padding: 32rpx;
|
|
|
}
|
|
|
@@ -1000,9 +1069,9 @@ function handleFaceDetect() {
|
|
|
}
|
|
|
|
|
|
.store-logo {
|
|
|
- width: 100rpx;
|
|
|
- height: 100rpx;
|
|
|
- margin-right: 16rpx;
|
|
|
+ width: 100rpx;
|
|
|
+ height: 100rpx;
|
|
|
+ margin-right: 16rpx;
|
|
|
.img {
|
|
|
width: 100rpx;
|
|
|
height: 100rpx;
|
|
|
@@ -1088,7 +1157,7 @@ function handleFaceDetect() {
|
|
|
padding: 0 16rpx;
|
|
|
line-height: 40rpx;
|
|
|
margin-right: 16rpx;
|
|
|
- background: #FEF8E6;
|
|
|
+ background: #fef8e6;
|
|
|
border-radius: 8rpx;
|
|
|
|
|
|
&:last-child {
|
calm
HHE-5476
ext.liuqiwen3