6/10合并最新代码

This commit is contained in:
Zy
2026-06-10 09:17:56 +08:00
parent 43d7d1b911
commit f2c5012a28
8 changed files with 63 additions and 36 deletions

View File

@@ -14,19 +14,17 @@
// 获取 uniPush 2.0 CID // 获取 uniPush 2.0 CID
function getPushCID() { function getPushCID() {
uni.getPushClientId({ uni.getPushClientId({
success: (res) => { success: res => {
console.log('推送初始化成功') console.log('推送初始化成功')
console.log('CID =', res.cid) console.log('CID =', res.cid)
// 存起来备用 // 存起来备用
uni.setStorageSync('push_cid', res.cid) uni.setStorageSync('push_cid', res.cid)
}, },
fail: (err) => { fail: err => {
console.error('获取推送 CID 失败', err) console.error('获取推送 CID 失败', err)
} }
}) })
} }
</script> </script>
<style> <style>

View File

@@ -3,7 +3,7 @@
* @Author: Zy * @Author: Zy
* @Date: 2026-05-15 11:37:01 * @Date: 2026-05-15 11:37:01
* @LastEditor: Zy * @LastEditor: Zy
* @LastEditTime: 2026-05-19 16:32:46 * @LastEditTime: 2026-06-09 11:19:15
*/ */
import request, { import request, {
get, get,
@@ -80,3 +80,24 @@ export function getVillageHouseList_keyword(data, searchValue = '') {
export function uploadFile(file) { export function uploadFile(file) {
return post('/resource/oss/upload', file) return post('/resource/oss/upload', file)
} }
/**
* @typedef pushData data
* @property {string} userid 用户id
* @property {string} channel resident 居民端 buttler 管家端
* @property {string} title 推送标题
* @property {string} content 推送内容
*/
/**
* @description: 单推接口
* @param {pushData} data
* @return
*/
export function PushSingle(data) {
return post("/api/push/single", {
userid: 'xxx',
channel: "buttler",
title: data.title,
content: data.content
})
}

View File

@@ -61,7 +61,7 @@
</view> </view>
</template> </template>
<script setup lang="ts"> <script setup>
import { ref } from 'vue' import { ref } from 'vue'
import { onShow } from '@dcloudio/uni-app' import { onShow } from '@dcloudio/uni-app'
import TabsComponents from '@/components/tabs/tabs.vue' import TabsComponents from '@/components/tabs/tabs.vue'
@@ -76,7 +76,7 @@ const statusTabs = [
}, },
{ {
name: '待处理', name: '待处理',
value: 0 value: 3
}, },
{ {
name: '已完成', name: '已完成',
@@ -84,7 +84,7 @@ const statusTabs = [
} }
] ]
// 切换状态(全部/待分配/待解决/已完成)筛选 // 切换状态(全部/待分配/待解决/已完成)筛选
const switchStatus = (value: number) => { const switchStatus = value => {
activeStatus.value = value activeStatus.value = value
if (value === -1) { if (value === -1) {
querySearch.value.status = undefined querySearch.value.status = undefined
@@ -146,7 +146,7 @@ function resetList() {
} }
// actions // actions
function handleComplaint(id: string) { function handleComplaint(id) {
uni.navigateTo({ uni.navigateTo({
url: '/pageSubPack/complaint/Details_handle?id=' + id url: '/pageSubPack/complaint/Details_handle?id=' + id
}) })

View File

@@ -68,7 +68,11 @@
</view> </view>
<!-- submit --> <!-- submit -->
<view v-if="complainInfo.status === '0'" class="action_btn" @tap="handleSelecthouse"> <view
v-if="complainInfo.status === '0' || complainInfo.status === '1'"
class="action_btn"
@tap="handleSelecthouse"
>
<text>处理</text> <text>处理</text>
</view> </view>
</view> </view>

View File

@@ -12,11 +12,10 @@
<view class="areabox"> <view class="areabox">
<textarea <textarea
style="width: 100%; height: 100%; overflow: hidden" style="width: 100%; height: 100%; overflow: hidden"
:value="form.handleContent" v-model="form.handleContent"
:maxlength="-1" :maxlength="-1"
auto-height auto-height
placeholder="请输入" placeholder="请输入"
@blur="handleBlur"
placeholder-style="font-size:28rpx;" placeholder-style="font-size:28rpx;"
/> />
</view> </view>

View File

@@ -29,7 +29,7 @@
lower-threshold="60" lower-threshold="60"
@scrolltolower="scrolltolower" @scrolltolower="scrolltolower"
> >
<radio-group @change="radioChange"> <radio-group @change="radioChange" v-if="searchlist.length > 0">
<label v-for="(item, index) in searchlist" :key="index"> <label v-for="(item, index) in searchlist" :key="index">
<view <view
class="item flex items-center justify-between" class="item flex items-center justify-between"
@@ -55,6 +55,9 @@
</view> </view>
</label> </label>
</radio-group> </radio-group>
<view class="nodata" v-else>
<text>暂无数据</text>
</view>
</scroll-view> </scroll-view>
<!-- submit --> <!-- submit -->

View File

@@ -42,6 +42,7 @@ import { ref } from 'vue'
import { onLoad } from '@dcloudio/uni-app' import { onLoad } from '@dcloudio/uni-app'
import filePicker from '@/components/filePicker/filePicker.vue' import filePicker from '@/components/filePicker/filePicker.vue'
import { ticketComputed } from '@/api/ticket.js' import { ticketComputed } from '@/api/ticket.js'
import { PushSingle } from '@/api/common.js'
const form = ref({ const form = ref({
id: '', id: '',
descrition: '', descrition: '',
@@ -65,6 +66,7 @@ function handleSelecthouse() {
ticketComputed(obj) ticketComputed(obj)
.then(() => { .then(() => {
uni.navigateBack() uni.navigateBack()
PushSingle()
}) })
.catch(() => { .catch(() => {
uni.showToast({ uni.showToast({