diff --git a/src/App.vue b/src/App.vue
index 3682fedb..2df9951e 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -562,11 +562,11 @@
color: #ffffff;
font-size: 14px;
height: 100%;
- --wot-color-theme: #ffcd32;
- --wot-backtop-bg: #ffcd32;
+ --wot-color-theme: #d29e52;
+ --wot-backtop-bg: #d29e52;
--wot-dark-background: #222;
--wot-dark-background2: #222;
- --wot-dark-color: #ffcd32;
+ --wot-dark-color: #d29e52;
--wot-picker-toolbar-title-color: #fff;
// background-image: url(./static/page-bg.png);
// background-repeat: no-repeat;
diff --git a/src/components/bar/arrow-bar.vue b/src/components/bar/arrow-bar.vue
index e7c4b2ca..f1d6e235 100644
--- a/src/components/bar/arrow-bar.vue
+++ b/src/components/bar/arrow-bar.vue
@@ -2,7 +2,7 @@
{{ title }}
-
+
diff --git a/src/components/bar/btn-bar.vue b/src/components/bar/btn-bar.vue
index ffe18ae4..bc986d5e 100644
--- a/src/components/bar/btn-bar.vue
+++ b/src/components/bar/btn-bar.vue
@@ -34,7 +34,7 @@
color = '#f14747';
break;
case 'primary':
- color = '#ffcd32';
+ color = '#D29E52';
break;
}
return `color: ${color};`;
diff --git a/src/im-var.scss b/src/im-var.scss
index 6d337aaf..40555f3a 100644
--- a/src/im-var.scss
+++ b/src/im-var.scss
@@ -1,5 +1,5 @@
// 颜色
-$im-color-primary: #ffcd32;
+$im-color-primary: #d29e52;
$im-color-primary-light-1: mix(#000, $im-color-primary, 10%);
$im-color-primary-light-2: mix(#000, $im-color-primary, 20%);
$im-color-primary-light-3: mix(#000, $im-color-primary, 30%);
diff --git a/src/pages.json b/src/pages.json
index 4788b608..ec3e5978 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -897,7 +897,7 @@
},
"tabBar": {
"color": "#fff",
- "selectedColor": "#ffcd32",
+ "selectedColor": "#D29E52",
"backgroundColor": "#222222",
"borderStyle": "black",
"list": [
diff --git a/src/pages/home/city.vue b/src/pages/home/city.vue
index dcb5be24..9f35156b 100644
--- a/src/pages/home/city.vue
+++ b/src/pages/home/city.vue
@@ -2,7 +2,7 @@
-
+
diff --git a/src/pages/home/detail.vue b/src/pages/home/detail.vue
index a7920895..3759985f 100644
--- a/src/pages/home/detail.vue
+++ b/src/pages/home/detail.vue
@@ -2,7 +2,7 @@
-
+
@@ -29,6 +29,7 @@
@@ -174,15 +176,6 @@
const scrollTop = ref(0);
const userDetail = ref({});
const actionShow = ref(false);
- const actionList = ref([
- {
- name: '选项1',
- },
- {
- name: '选项2',
- color: '#0083ff',
- },
- ]);
onLoad((options: any) => {
const { memberId } = options;
@@ -293,10 +286,25 @@
});
};
- function actionSelect({ item, index }) {
- console.log(item, index);
+ async function actionSelect({ item, index }) {
+ if (index === 0) {
+ await RecentApi.recentOperate({
+ memberId: userDetail.value.member.memberId,
+ memberRecentId: userDetail.value.id,
+ action: 'MEMBER_SHIELD',
+ });
+ return;
+ }
- // toast.show(`当前选中项: ${item.title}, 下标: ${index}`);
+ if (index === 1) {
+ await RecentApi.recentOperate({
+ memberId: userDetail.value.member.memberId,
+ memberRecentId: userDetail.value.id,
+ action: 'RECENT_REPORT',
+ reportType: '1',
+ });
+ return;
+ }
}
// 喜欢
diff --git a/src/pages/home/home.vue b/src/pages/home/home.vue
index b372a31e..229c81c9 100644
--- a/src/pages/home/home.vue
+++ b/src/pages/home/home.vue
@@ -3,7 +3,7 @@
-
+
{{ userCity?.t || '未选择' }}
diff --git a/src/pages/login/login.vue b/src/pages/login/login.vue
index 9ee7832a..c4e499f3 100644
--- a/src/pages/login/login.vue
+++ b/src/pages/login/login.vue
@@ -3,8 +3,8 @@
- 荷塘月色
- • 高端社交圈 •
+ 荷塘月色
+ • 高端社交圈 •
@@ -28,7 +28,7 @@
maxlength="6"
/>
获取验证码
@@ -36,7 +36,7 @@
登 录 / 注 册
@@ -82,14 +82,14 @@
登录即同意《
用户协议
》和《
隐私政策
diff --git a/src/pages/message/chat-box.vue b/src/pages/message/chat-box.vue
index 9e6ac825..856d9b84 100644
--- a/src/pages/message/chat-box.vue
+++ b/src/pages/message/chat-box.vue
@@ -4,11 +4,11 @@
-
+
-
+
@@ -100,8 +100,9 @@
type="primary"
@touchend.prevent="sendTextMessage()"
size="mini"
- >发送
+ 发送
+
@@ -149,6 +150,10 @@
语音消息
+
+
+ 送礼物
+
+
+
+
+
+ 礼物
+
+
+
+ {{ (userWallet.balance / 100.0).toFixed(2).replace(/\.?0+$/, '') }}
+
+
+ 充值
+
+
+
+
+
+
+ {{ item.title }}
+
+ {{ (item.price / 100.0).toFixed(2).replace(/\.?0+$/, '') }}钻石
+
+
+
+
+
+