-
+
@@ -47,29 +58,12 @@
-
@@ -116,10 +103,6 @@ let id = route.params.id
const uniqidEnd = id.charAt(id.length - 1)
const uniqidIndex = base62ToDecimal(uniqidEnd) % 6
-let aaaaa = ref("")
-
-let reviewsPopoverState = ref(true)
-
onMounted(() => {
getDetails()
clearBottom()
@@ -136,6 +119,7 @@ let option = ref([])
let token = ref("")
let cancelPopoverState = ref(false) // 取消投票弹窗
let isLoaded = ref(false) // 是否加载了
+let haveVotedValue = ref("") // 已投的值
provide("info", info)
provide("islike", islike)
@@ -143,6 +127,7 @@ provide("iscollection", iscollection)
provide("token", token)
provide("qrcode", qrcode)
provide("isLoaded", isLoaded)
+provide("haveVotedValue", haveVotedValue)
const getDetails = () => {
detailsHttp({ uniqid: id }).then(res => {
@@ -153,6 +138,7 @@ const getDetails = () => {
}
let data = res.data
+
info.value = data["info"]
isvote.value = data["isvote"]
iscollection.value = data["iscollection"]
@@ -162,7 +148,13 @@ const getDetails = () => {
qrcode.value = data.share?.qrcode
token.value = data["token"]
seo.value = data.seo
+
isLoaded.value = true
+
+ data["option"].forEach(element => {
+ if (element.selected) haveVotedValue.value = element.value
+ })
+ // haveVotedValue
})
}
@@ -192,6 +184,13 @@ provide("TAHomePage", TAHomePage)
const commentsRef = ref(null)
let voteLoading = false
+// 处理点击投票的中转
+const handleVotesTransfer = index => {
+ const target = option.value[index]
+ if (info.value.status == 1 && isvote.value == 0) handleVote(target.id, index)
+ else handleUnvoteVote(index)
+}
+
// 处理点击投票
const handleVote = (token, index) => {
if (isNeedLogin.value) {
@@ -211,15 +210,21 @@ const handleVote = (token, index) => {
}
let data = res.data
let optionList = data["optionList"] || []
+ optionList.forEach(element => {
+ element["selected"] = 0
+ })
optionList[index]["selected"] = 1
option.value = optionList
isvote.value = 1
info.value.votes = data["votes"]
const value = optionList[index]["value"]
+ haveVotedValue.value = value
commentsRef.value.changeCommentVoteoption(value)
ElMessage.success(res.message)
+
+ if (index != optionList.length - 1) commentsRef.value.reviewsComment(optionList[index]["value"])
})
.finally(() => (voteLoading = false))
}
@@ -256,7 +261,10 @@ const unvoteVote = () => {
}
let data = res.data
let optionList = data["optionList"] || []
- optionList[unvoteVoteIndex]["selected"] = 0
+ // optionList[unvoteVoteIndex]["selected"] = 0
+ optionList.forEach(element => {
+ element["selected"] = 0
+ })
option.value = optionList
isvote.value = 0
info.value.votes = data["votes"]
@@ -312,6 +320,18 @@ const clearBottom = () => {
let topHeadRef = ref(null)
provide("topHeadRef", topHeadRef)
+// 底部导航栏 的 点击评论输入值
+let floorCommentInput = ref("")
+
+// 底部导航栏 的 点击发送评论 type input back
+const floorCommentBtn = type => {
+ if (type == "input") commentsRef.value.bottomNavigationBar(floorCommentInput.value)
+ else floorCommentInput.value = ""
+}
+
+provide("floorCommentInput", floorCommentInput)
+provide("floorCommentBtn", floorCommentBtn)
+
try {
if (process.server) {
await detailsHttp({ uniqid: id }).then(res => {
@@ -500,6 +520,12 @@ try {
margin-top: 3px;
margin-right: 6px;
}
+
+ .option-progress,
+ .option-number,
+ .tick-icon {
+ display: none;
+ }
}
}
.option-area {
@@ -533,6 +559,10 @@ try {
}
}
+ .serial {
+ display: none;
+ }
+
.option-number {
font-size: 11px;
color: #ffffff;
@@ -625,6 +655,7 @@ try {
background-color: rgba(249, 93, 93, 1);
border-color: rgba(249, 93, 93, 1);
color: #fff;
+ margin-left: 20px;
}
&.options-no {
background-color: #fff;
@@ -634,46 +665,4 @@ try {
}
}
}
-
-.automatic-reviews-popup {
- border-radius: 10px;
- .automatic-header {
- padding: 20px;
- border-bottom: 1px dotted #ebebeb;
- .automatic-title {
- font-weight: 650;
- font-size: 18px;
- color: #000000;
- margin-bottom: 12px;
- }
- .automatic-have {
- background-color: rgba(246, 246, 246, 1);
- font-size: 12px;
- color: #aaa;
- width: fit-content;
- }
- }
-
- .automatic-input {
- .el-textarea__inner {
- min-height: 256px !important;
- box-shadow: none;
- padding: 20px;
- resize: none;
- }
- }
- .automatic-bottom {
- justify-content: flex-end;
- padding: 10px;
- .automatic-send {
- background-color: var(--main-color);
- color: #fff;
- font-size: 16px;
- width: 100px;
- height: 40px;
- border-radius: 6px;
- cursor: pointer;
- }
- }
-}
diff --git a/utils/http.js b/utils/http.js
index c8b8f83..cebb408 100644
--- a/utils/http.js
+++ b/utils/http.js
@@ -10,7 +10,7 @@ axios.defaults.withCredentials = true
axios.interceptors.request.use( //响应拦截
async config => {
// 开发时登录用的，可以直接替换小程序的 authorization
- config['headers']['authorization'] = process.env.NODE_ENV !== "production" && "be0e96a37a79c3ab16851b9a4318b03a"
+ config['headers']['authorization'] = process.env.NODE_ENV !== "production" && "8982b87c1dd25cbfde7ea187235351c8"
// config['headers']['authorization'] = "bee67e306e40b7d273d894657043eeb0"
return config;
},
+ 手机查看该投票
+ 
+
+
+ ![]()
+
+
+
+ 
+
+
+
+
@@ -47,29 +58,12 @@
-
@@ -80,6 +74,7 @@ import { ElMessage } from "element-plus"
let isNeedLogin = inject("isNeedLogin")
const goLogin = inject("goLogin")
+const userInfoWin = inject("userInfoWin")
let info = inject("info")
let islike = inject("islike")
@@ -178,6 +173,9 @@ const handleLike = () => {
// 底部转发弹窗显示 状态
let transmitBoxState = ref(false)
+
+const floorCommentInput = inject("floorCommentInput")
+const floorCommentBtn = inject("floorCommentBtn")
+
diff --git a/components/MyPopup.vue b/components/MyPopup.vue
index 2e44582..4b6a53c 100644
--- a/components/MyPopup.vue
+++ b/components/MyPopup.vue
@@ -101,7 +101,6 @@ const getCollect = () => {
showList.value = collectList
// showList.value = showList.value.concat(data.data)
- console.log(collectList.length, data["count"])
if (collectList.length < data["count"]) collectPage++
else collectPage = 0
diff --git a/pages/details/[id].vue b/pages/details/[id].vue
index 02a279b..7c8f988 100644
--- a/pages/details/[id].vue
+++ b/pages/details/[id].vue
@@ -52,43 +52,30 @@
- 
-
-
- 已获
-
+ {{ info.coins }}
- 个寄托币
-
+ ![]()
+
+
-
-
+ 
-
给TA投币
-
- 手机查看该投票
-
-
-
- ![]()
-
-
-
-
-
-
- {{ info.status == 1 && isvote == 0 ? `已有 ${info.votes || 0} 人参与，` : `共有 ${info.votes || 0} 人参与` }} {{ `${isvote == 1 ? "你已投票" : info.status == 1 ? "参与投票即可查看实时结果" : ""}` }}
-
-
-
-
-
- {{ index + 1 }}
- {{ item.value }}
-
-
-
-
-
- 
-
- {{ index + 1 }}
-
- {{ item.value }}
-
-
-
+
+ {{ item.count }}
+
+
-
+
{{ index + 1 }}
+ {{ item.value }}
+
+
+
+
+
+
+ {{ index + 1 }}
+
+ {{ item.value }}
+
+
+
+ {{ item.count }}
+
-
- 说说您的投票理由
- 已投：还是申点其他的保底吧
-
-
- 发送
-