Browse Source

fix;修改问题 样式

dxj
杜贤金 1 year ago
parent
commit
9141a87a2f
  1. 18
      .env.lsp
  2. 1
      package.json
  3. 24
      src/components/AppRecharge/index.vue
  4. 2
      src/views/task/components/BasicTask/index.d.ts
  5. 14
      src/views/task/components/BasicTask/index.vue
  6. 2
      src/views/task/components/TaskList/index.d.ts
  7. 3
      src/views/task/components/TaskList/index.vue

18
.env.lsp

@ -0,0 +1,18 @@
# 公共地址
VITE_GLOB_BASE_URL = "http://192.168.1.134:9872"
# 本地MQTT地址
VITE_GLOB_MQTT_HOST = "192.168.1.231"
VITE_GLOB_MQTT_PORT = 8083
VITE_GLOB_MQTT_PROTOCOL = "ws"
# 本地MQTT用户名
VITE_GLOB_MQTT_USERNAME = "serverAdmin"
# 本地MQTT密码
VITE_GLOB_MQTT_PASSWORD = "EnpfgI9yuSwi"
# 接口授权标识
VITE_GLOB_APP_AUTHORIZATION = "ZmFsY29uOmZhbGNvbl9zZWNyZXQ="

1
package.json

@ -11,6 +11,7 @@
"dev": "vite --host --mode development", "dev": "vite --host --mode development",
"dev:prod": "vite --host --mode production", "dev:prod": "vite --host --mode production",
"dev:zxh": "vite --host --mode zxh", "dev:zxh": "vite --host --mode zxh",
"dev:lsp": "vite --host --mode lsp",
"build": "vue-tsc && vite build", "build": "vue-tsc && vite build",
"preview": "vite preview", "preview": "vite preview",
"lint": "eslint .", "lint": "eslint .",

24
src/components/AppRecharge/index.vue

@ -220,9 +220,15 @@ function separator(num: number | string) {
</div> </div>
<div class="marquee"> <div class="marquee">
<div class="content"> <div class="content">
<span>152****0062 2024/1/23 开通了至尊礼遇卡</span> <span>152****0062 2024/1/25开通了至尊礼遇卡</span>
<span>178****6455 2024/1/12 开通了年套餐</span> <span>178****6455 2024/1/24开通了年套餐</span>
<span>195****2519 2024/1/1开通了日套餐</span> <span>151****2519 2024/1/23开通了日套餐</span>
<span>178****0062 2024/1/22开通了至尊礼遇卡</span>
<span>178****6556 2024/1/21开通了年套餐</span>
<span>131****9871 2024/1/20开通了日套餐</span>
<span>198****2091 2024/1/19开通了至尊礼遇卡</span>
<span>138****4848 2024/1/18开通了年套餐</span>
<span>195****2519 2024/1/17开通了日套餐</span>
</div> </div>
</div> </div>
</div> </div>
@ -408,11 +414,11 @@ function separator(num: number | string) {
margin: 20px auto; margin: 20px auto;
height: 1px; height: 1px;
border: 1px solid #ede0d9; border: 1px solid #ede0d9;
.colorLine { // .colorLine {
width: 17%; // width: 17%;
height: 1px; // height: 1px;
background-color: #a46443; // background-color: #a46443;
} // }
} }
.broadcastBox { .broadcastBox {
width: 95%; width: 95%;
@ -436,7 +442,7 @@ function separator(num: number | string) {
animation: scrolling 10s linear infinite; animation: scrolling 10s linear infinite;
span { span {
display: inline-block; display: inline-block;
margin-right: 100px; margin-right: 50px;
padding: 0 20px; padding: 0 20px;
background: #fbe6c4; background: #fbe6c4;
border-radius: 4px; border-radius: 4px;

2
src/views/task/components/BasicTask/index.d.ts vendored

@ -10,5 +10,7 @@ interface TaskType {
points: number points: number
status: number status: number
id: string id: string
receiveCount: number
finishEnableCount: number
} }
export { SignType, TaskType } export { SignType, TaskType }

14
src/views/task/components/BasicTask/index.vue

@ -156,8 +156,8 @@ function handleInvite() {
<div v-show="item.status === 2 " class="accomplish"> <div v-show="item.status === 2 " class="accomplish">
已获得{{ item.points }}点数 已获得{{ item.points }}点数
</div> </div>
<div v-show="item.status !== 2 && item.name !== '邀请注册' " class="unfinished"> <div v-show="item.status !== 2" class="unfinished">
{{ item.status === 1 ? 1 : 0 }}/1 {{ item.receiveCount }}/{{ item.finishEnableCount }}
</div> </div>
</div> </div>
<div class="earn-list-right"> <div class="earn-list-right">
@ -170,13 +170,13 @@ function handleInvite() {
</div> </div>
<div v-if="item.name === '邀请注册'" class="flex"> <div v-if="item.name === '邀请注册'" class="flex">
<div v-if="item.status === 1" class="add-dot-btn invite" style="margin-right: 3px;" @click="handleGetDot(item.id)"> <div v-show="item.status === 1" class="add-dot-btn invite" style="margin-right: 3px;" @click="handleGetDot(item.id)">
领取 领取
</div> </div>
<div v-if="item.status !== 2" class="add-dot-btn invite" @click="handleInvite"> <div v-show="item.status !== 2" class="add-dot-btn invite" @click="handleInvite">
去邀请 去邀请
</div> </div>
<div v-if="item.status === 2" class="add-dot-btn accomplish"> <div v-show="item.status === 2" class="add-dot-btn accomplish">
已完成 已完成
</div> </div>
</div> </div>
@ -184,10 +184,10 @@ function handleInvite() {
<div v-show="item.status === 2" class="add-dot-btn accomplish"> <div v-show="item.status === 2" class="add-dot-btn accomplish">
已完成 已完成
</div> </div>
<div v-if="item.status === 1" class="add-dot-btn invite" @click="handleGetDot(item.id)"> <div v-show="item.status === 1" class="add-dot-btn invite" @click="handleGetDot(item.id)">
领取 领取
</div> </div>
<div v-if="item.status === 0" class="add-dot-btn unfinished"> <div v-show="item.status === 0" class="add-dot-btn unfinished">
未完成 未完成
</div> </div>
</div> </div>

2
src/views/task/components/TaskList/index.d.ts vendored

@ -3,4 +3,6 @@ export interface TaskType {
points: number points: number
status: number status: number
id: string id: string
receiveCount: number
finishEnableCount: number
} }

3
src/views/task/components/TaskList/index.vue

@ -28,6 +28,7 @@ const props = defineProps({
}) })
const emit = defineEmits(['updateList']) const emit = defineEmits(['updateList'])
const reactiveList: ComputedRef<TaskType[]> = computed(() => props.list) const reactiveList: ComputedRef<TaskType[]> = computed(() => props.list)
console.log(reactiveList, 'reactiveList')
const userStore = useUserStore() const userStore = useUserStore()
// //
@ -83,7 +84,7 @@ const dynamicStyle = computed(() => {
已获得{{ item.points }}点数 已获得{{ item.points }}点数
</div> </div>
<div v-show="item.status !== 2" class="unfinished"> <div v-show="item.status !== 2" class="unfinished">
{{ item.status === 1 ? 1 : 0 }}/1 {{ item.receiveCount }}/{{ item.finishEnableCount }}
</div> </div>
</div> </div>
<div class="earn-list-right"> <div class="earn-list-right">

Loading…
Cancel
Save