yangjun
/
hldy_app_mini
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' of http://47.115.223.229:8888/yangjun/hldy_app_mini

This commit is contained in:
wangweidong 2025-12-08 09:29:38 +08:00
parent feba4b6e9c e4b3689f5e
commit 04fce9951c
7 changed files with 67 additions and 223 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

148
component/public/errorshow.vue
View File

@ -1,112 +1,86 @@
<!-- 使用示例 已经全局暴露了，直接用-->
<!-- <errorshow :show="openerror" font="确定将本次请领清单中的所有物料都移除吗？" @close="openerror=false" /> -->
<template> <template>
<view> <view>
<view class="addall" v-if="show"> <view class="addall" v-if="show">
<view>温馨提示1111</view> <image class="addallimge" src="/static/error.png" mode="aspectFill"></image>
<view> <view class="addallfont">{{ font }}</view>
<image src="/static/index/procurement/ddj.png" mode="aspectFill"></image> <view class="qd" @click="onClose">确定</view>
</view>
<view style="text-align: center;">{{ font }}</view>
<view>
<view @click="$emit('back')">取消</view>
<view class="qd" @click="$emit('right')">确定</view>
</view>
</view> </view>
<view class="mengban" v-if="show" @click="$emit('back')"></view>
<view class="mengban" v-if="show" @click="onClose"></view>
</view> </view>
</template> </template>
<script> <script setup>
const props = defineProps({
export default { show: {
props: { type: Boolean,
show: { default: false
type: Boolean,
default: false
},
font: {
type: String,
default: ''
},
}, },
font: {
methods: { type: String,
default: ''
} }
})
const emit = defineEmits(['close'])
function onClose() {
emit('close')
} }
</script> </script>
<style scoped lang="less"> <style scoped lang="less">
.addall { .addall {
width: 42.4vw; width: 30vw;
height: 26vw;
background: #FFFFFF; background: #FFFFFF;
box-shadow: 0rpx 0rpx 1.3vw 0rpx rgba(163, 167, 182, 0.16); box-shadow: 0rpx 0rpx 1.3vw 0rpx rgba(163, 167, 182, 0.16);
border-radius: 1.6vw; border-radius: 1.9vw;
position: fixed; position: fixed;
top: 0; top: 50%;
left: 0; left: 50%;
right: 0; transform: translate(-50%, -50%);
bottom: 0; padding: 3vw 4vw;
margin: auto;
padding: 2.8vw;
z-index: 9120; z-index: 9120;
display: flex;
flex-direction: column;
>view { .addallimge {
&:nth-child(4) { width: 4.3vw;
width: 22vw; height: 4.3vw;
display: flex; margin: 1vw auto 1.5vw auto;
justify-content: space-around; }
margin: 1.8vw auto 0;
view { .addallfont {
width: 8.2vw; width: 23vw;
height: 3.3vw; font-weight: 400;
background: #EDEDEF; font-size: 1.3vw;
border-radius: 1.6vw; color: #888888;
font-weight: 400; line-height: 1.7vw;
font-size: 1.6vw; flex-wrap: wrap;
color: #888888; margin-bottom: 4vw;
display: flex; }
justify-content: center;
align-items: center;
border: 1px solid #EDEDEF;
}
.qd { .qd {
background: linear-gradient(0deg, #CAE0F9, #E9F4FF); background: linear-gradient(0deg, #CAE0F9, #E9F4FF);
border: 1px solid rgba(3, 133, 250, 0.34); border: 1px solid rgba(3, 133, 250, 0.34);
color: #0385FA; color: #0385FA;
} position: absolute;
} right: 3vw;
bottom: 2vw;
&:nth-child(3) { width: 6.3vw;
width: 33vw; height: 3vw;
height: 3.4vw; border-radius: 1.6vw;
font-weight: 400; font-weight: 400;
font-size: 1.3vw; font-size: 1.4vw;
color: #888888; display: flex;
line-height: 1.7vw; justify-content: center;
margin: 0.4vw auto 0; align-items: center;
}
&:nth-child(2) {
width: 7.6vw;
height: 7.6vw;
margin: 1.1vw auto 0;
image {
width: 100%;
height: 100%;
}
}
&:nth-child(1) {
font-weight: 400;
font-size: 1.6vw;
color: #333333;
}
} }
} }
.mengban { .mengban {
width: 100vw; width: 100vw;
height: 100vh; height: 100vh;
@ -114,6 +88,6 @@
top: 0; top: 0;
left: 0; left: 0;
z-index: 9100; z-index: 9100;
background: RGBA(239, 240, 244, 0.55); background: rgba(239, 240, 244, 0.55);
} }
</style> </style>

127
component/public/toastPlugin.js
View File

@ -1,127 +0,0 @@
// // src/plugins/toastPlugin.js
// import { createApp, reactive, h } from 'vue'
// import ToastHost from './errorshow.vue' // 路径按项目调整
// const defaultOpt = {
// title: '',
// duration: 1500,
// type: 'text', // 'text' | 'dialog'
// mask: true,
// maskClosable: true,
// success: null,
// complete: null
// }
// function createToastService() {
// const state = reactive({
// show: false,
// title: '',
// duration: defaultOpt.duration,
// type: defaultOpt.type,
// mask: defaultOpt.mask,
// maskClosable: defaultOpt.maskClosable,
// success: null,
// complete: null,
// _timer: null,
// // dialog 专用（可扩展）
// confirmText: '确定',
// cancelText: '取消'
// })
// function clearTimer() {
// if (state._timer) {
// clearTimeout(state._timer)
// state._timer = null
// }
// }
// function showToast(options = {}) {
// const opt = Object.assign({}, defaultOpt, options)
// clearTimer()
// state.title = opt.title == null ? '' : String(opt.title)
// state.duration = Number(opt.duration) || defaultOpt.duration
// state.type = opt.type
// state.mask = !!opt.mask
// state.maskClosable = opt.maskClosable !== undefined ? !!opt.maskClosable : true
// state.success = typeof opt.success === 'function' ? opt.success : null
// state.complete = typeof opt.complete === 'function' ? opt.complete : null
// state.confirmText = opt.confirmText || '确定'
// state.cancelText = opt.cancelText || '取消'
// state.show = true
// return new Promise((resolve) => {
// if (state.type === 'text') {
// state._timer = setTimeout(() => {
// hideToast()
// if (state.complete) try { state.complete() } catch(e){/*ignore*/}
// resolve()
// }, state.duration)
// } else {
// // dialog 不自动关闭，等待按键或 maskClosable
// // 但为了安全可以选择不自动超时
// // resolve 将在按钮或 mask 关闭时调用
// }
// })
// }
// function hideToast(by = 'complete') {
// clearTimer()
// state.show = false
// // 执行回调
// if (by === 'success' && state.success) {
// try { state.success() } catch(e) {}
// }
// if (state.complete) {
// try { state.complete() } catch(e) {}
// }
// // 清理
// state.success = null
// state.complete = null
// state.title = ''
// state.type = defaultOpt.type
// }
// // dialog 按钮触发
// function onConfirm() {
// hideToast('success')
// }
// function onCancel() {
// hideToast('complete')
// }
// return {
// state,
// showToast,
// hideToast,
// onConfirm,
// onCancel
// }
// }
// // 插件安装函数
// export default {
// install: (app, options = {}) => {
// const service = createToastService()
// // programmatically mount the host component once
// const container = document.createElement('div')
// document.body.appendChild(container)
// const toastApp = createApp({
// render() {
// return h(ToastHost, { service })
// }
// })
// toastApp.mount(container)
// // 全局方法
// app.config.globalProperties.$errorshow = service.showToast
// // 兼容直接使用 window.uni.showToast
// if (typeof window !== 'undefined') {
// window.uni = window.uni || {}
// window.uni.$errorshow = service.showToast
// }
// // 可选：返回 service 以便调试
// app.provide('toastService', service)
// }
// }

4
main.js
View File

@ -19,7 +19,7 @@ import {
createSSRApp createSSRApp
} from 'vue' } from 'vue'
import donghua from '@/component/public/donghua.vue' import donghua from '@/component/public/donghua.vue'
// import errorshow from '@/component/public/toastPlugin.js' import errorshow from '@/component/public/errorshow.vue'
import tanchuang from '@/pages/procurement/components/tanchuang.vue'; import tanchuang from '@/pages/procurement/components/tanchuang.vue';
// import arrowkeys from '@/component/public/newgame/arrowkeys.vue' // import arrowkeys from '@/component/public/newgame/arrowkeys.vue'
export function createApp() { export function createApp() {
@ -29,6 +29,8 @@ export function createApp() {
app.use(uView) app.use(uView)
app.component('donghua', donghua) app.component('donghua', donghua)
app.component('tanchuang', tanchuang) app.component('tanchuang', tanchuang)
app.component('errorshow', errorshow)
// app.component('arrowkeys', arrowkeys) // app.component('arrowkeys', arrowkeys)
return { return {

1
pages/Warehouse/warehome.vue
View File

@ -96,6 +96,7 @@
<view :style="moverStyle"> <view :style="moverStyle">
<image style="width: 100%;height: 100%;" :src="cararray[cartarget]" mode="widthFix"></image> <image style="width: 100%;height: 100%;" :src="cararray[cartarget]" mode="widthFix"></image>
</view> </view>
</view> </view>
</template> </template>

2
pages/procurement/purchaseorder.vue
View File

@ -23,7 +23,7 @@
<view class="more-one" @click="share"> <view class="more-one" @click="share">
分享 分享
</view> </view>
<view class="more-one" v-if="Number(v.status)<=1" @click="bebad(v)"> <view class="more-one" v-if="Number(v.status)<=0" @click="bebad(v)">
作废 作废
</view> </view>
</view> </view>

8
pages/watch/index.vue
View File

@ -225,6 +225,7 @@
</specialDrawerVue> --> </specialDrawerVue> -->
<!-- <arrowkeys @movecard="movecard" :getblue="getblue" :moveleft="5" /> --> <!-- <arrowkeys @movecard="movecard" :getblue="getblue" :moveleft="5" /> -->
<joysticknew @movecard="movecamera" v-show="!cameratarget.includes(5)" /> <joysticknew @movecard="movecamera" v-show="!cameratarget.includes(5)" />
</view> </view>
</template> </template>
@ -232,19 +233,12 @@
<script setup lang="ts"> <script setup lang="ts">
import { ref, onMounted, onBeforeUnmount, computed, reactive } from 'vue'; import { ref, onMounted, onBeforeUnmount, computed, reactive } from 'vue';
import { onShow, onLoad, onHide } from "@dcloudio/uni-app" import { onShow, onLoad, onHide } from "@dcloudio/uni-app"
// import specialDrawerVue from '../../component/public/specialDrawer.vue';
// import bigroll from './drawer/index.vue';
import { movedirection, queryPadPageList } from './api/lunpan.js' import { movedirection, queryPadPageList } from './api/lunpan.js'
import joysticknew from '@/component/public/newgame/joysticknew.vue'; import joysticknew from '@/component/public/newgame/joysticknew.vue';
const cameraArray = ref([]) const cameraArray = ref([])
onLoad(() => { onLoad(() => {
cameraArray.value = cameraSmall; cameraArray.value = cameraSmall;
// const info = uni.getSystemInfoSync()
// console.log('屏幕宽度：', info.screenWidth)
// console.log('屏幕高度：', info.screenHeight)
// console.log('可用窗口宽度：', info.windowWidth)
// console.log('可用窗口高度：', info.windowHeight)
}) })
const zyupgrade = ref(null); const zyupgrade = ref(null);
const menuIndex = ref(-1); const menuIndex = ref(-1);

BIN
static/error.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 9.3 KiB