Merge branch 'main' of http://47.115.223.229:8888/yangjun/hldy_app_mini
This commit is contained in:
commit
eb43b90dc3
|
|
@ -77,7 +77,7 @@ import { ref, onMounted, onBeforeUnmount, computed, nextTick, watch, reactive }
|
|||
if(props.show==true){
|
||||
let obj = {
|
||||
nuId:uni.getStorageSync('nuId'),
|
||||
elderId:uni.getStorageSync('NUall').elderId,
|
||||
elderId:uni.getStorageSync('elderId'),
|
||||
wlId:props.objtake.wlId
|
||||
}
|
||||
queryMaterialInfo(obj).then(res=>{
|
||||
|
|
|
|||
|
|
@ -106,7 +106,7 @@
|
|||
if(props.show==true){
|
||||
let obj = {
|
||||
nuId:uni.getStorageSync('nuId'),
|
||||
elderId:uni.getStorageSync('NUall').elderId,
|
||||
elderId:uni.getStorageSync('elderId'),
|
||||
wlId:props.objtake.wlId,
|
||||
}
|
||||
queryMaterialInfo(obj).then(res=>{
|
||||
|
|
@ -133,7 +133,7 @@
|
|||
const qglog = ()=>{
|
||||
let obj = {
|
||||
nuId:uni.getStorageSync('nuId'),
|
||||
elderId:uni.getStorageSync('NUall').elderId,
|
||||
elderId:uni.getStorageSync('elderId'),
|
||||
wlId:props.objtake.wlId,
|
||||
pageNo:pageNo.value,
|
||||
pageSize:20
|
||||
|
|
|
|||
|
|
@ -329,7 +329,7 @@
|
|||
canpull: true,
|
||||
searchContent: "",
|
||||
status: "1,2,4,5",
|
||||
elderId: uni.getStorageSync('NUall').elderId,
|
||||
elderId: uni.getStorageSync('elderId'),
|
||||
nuId: uni.getStorageSync('nuId')
|
||||
})
|
||||
|
||||
|
|
@ -450,7 +450,7 @@
|
|||
let data = {
|
||||
qldNo: plsbuy.value[lefttarget.value].qldNo,
|
||||
nuId: uni.getStorageSync('nuId'),
|
||||
elderId: uni.getStorageSync('NUall').elderId,
|
||||
elderId: uni.getStorageSync('elderId'),
|
||||
nuName: uni.getStorageSync('nuName'),
|
||||
elderName: uni.getStorageSync(`NUall`).elderInfo.name
|
||||
|
||||
|
|
@ -491,7 +491,7 @@
|
|||
const shouhuo = () => {
|
||||
let param = {
|
||||
qldNo: plsbuy.value[lefttarget.value].qldNo,
|
||||
elderId: uni.getStorageSync('NUall').elderId,
|
||||
elderId: uni.getStorageSync('elderId'),
|
||||
nuId: uni.getStorageSync('nuId')
|
||||
}
|
||||
confirmReceipt(param).then((res : any) => {
|
||||
|
|
|
|||
|
|
@ -265,7 +265,7 @@
|
|||
canpull: true,
|
||||
searchContent: "",
|
||||
status: "3",
|
||||
elderId: uni.getStorageSync('NUall').elderId,
|
||||
elderId: uni.getStorageSync('elderId'),
|
||||
nuId: uni.getStorageSync('nuId')
|
||||
})
|
||||
|
||||
|
|
@ -389,7 +389,7 @@
|
|||
let data = {
|
||||
qldNo: plsbuy.value[lefttarget.value].qldNo,
|
||||
nuId: uni.getStorageSync('nuId'),
|
||||
elderId: uni.getStorageSync('NUall').elderId,
|
||||
elderId: uni.getStorageSync('elderId'),
|
||||
nuName: uni.getStorageSync('nuName'),
|
||||
elderName: uni.getStorageSync(`NUall`).elderInfo.name
|
||||
|
||||
|
|
|
|||
|
|
@ -130,7 +130,7 @@
|
|||
pageSize: 1,
|
||||
searchContent: "",
|
||||
status: "3",
|
||||
elderId: uni.getStorageSync('NUall').elderId,
|
||||
elderId: uni.getStorageSync('elderId'),
|
||||
nuId: uni.getStorageSync('nuId')
|
||||
}
|
||||
queryQld(plzinfo0).then((res : any) => {
|
||||
|
|
@ -145,7 +145,7 @@
|
|||
pageSize: 1,
|
||||
searchContent: "",
|
||||
status: "4",
|
||||
elderId: uni.getStorageSync('NUall').elderId,
|
||||
elderId: uni.getStorageSync('elderId'),
|
||||
nuId: uni.getStorageSync('nuId')
|
||||
}
|
||||
queryQld(plzinfo1).then((res : any) => {
|
||||
|
|
@ -185,7 +185,7 @@
|
|||
|
||||
let data = {
|
||||
nuId: uni.getStorageSync('nuId'),
|
||||
elderId: uni.getStorageSync('NUall').elderId,
|
||||
elderId: uni.getStorageSync('elderId'),
|
||||
nuName: uni.getStorageSync('nuName'),
|
||||
}
|
||||
console.log("?????",data)
|
||||
|
|
|
|||
|
|
@ -1,4 +0,0 @@
|
|||
export type Link = {
|
||||
url : string;
|
||||
targetUrl : string;
|
||||
};
|
||||
|
|
@ -1,10 +1,6 @@
|
|||
<template>
|
||||
<view>
|
||||
<view class="flex">
|
||||
<!-- <leftcontent :list="tabbrarr" @navurl="navurl"></leftcontent> -->
|
||||
<!-- 主页 -->
|
||||
<!-- <index :isShow="menuop" v-if="!ckindex" /> -->
|
||||
<!-- <material></material> -->
|
||||
<view class="left">
|
||||
<leftcontent :list="tabbrarr" @navurl="navurl"></leftcontent>
|
||||
</view>
|
||||
|
|
|
|||
|
|
@ -353,7 +353,7 @@
|
|||
canpull: true,
|
||||
searchContent: "",
|
||||
status: "1,4,5",
|
||||
// elderId: uni.getStorageSync('NUall').elderId,
|
||||
// elderId: uni.getStorageSync('elderId'),
|
||||
// nuId: uni.getStorageSync('nuId')
|
||||
})
|
||||
|
||||
|
|
@ -518,7 +518,7 @@
|
|||
// const shouhuo = () => {
|
||||
// // let param = {
|
||||
// // qldNo: plsbuy.value[lefttarget.value].qldNo,
|
||||
// // elderId: uni.getStorageSync('NUall').elderId,
|
||||
// // elderId: uni.getStorageSync('elderId'),
|
||||
// // nuId: uni.getStorageSync('nuId')
|
||||
// // }
|
||||
// // confirmReceipt(param).then((res : any) => {
|
||||
|
|
@ -592,7 +592,7 @@
|
|||
let data = {
|
||||
qldNo: manyselect.value ? selectarray.value.join(',') : plsbuy.value[lefttarget.value].qldNo,
|
||||
nuId: uni.getStorageSync('nuId'),
|
||||
// elderId: uni.getStorageSync('NUall').elderId,
|
||||
// elderId: uni.getStorageSync('elderId'),
|
||||
nuName: uni.getStorageSync('nuName'),
|
||||
// elderName: uni.getStorageSync(`NUall`).elderInfo.name
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
// 全局请求封装
|
||||
const base_url = 'https://www.focusnu.com/opeapi'
|
||||
// const base_url = 'http://192.168.2.37:8081/opeapi'
|
||||
// const base_url = 'https://www.focusnu.com/opeapi'
|
||||
const base_url = 'http://192.168.2.37:8081/opeapi'
|
||||
// const base_url = 'http://localhost:8091/opeapi'
|
||||
// 请求超出时间
|
||||
const timeout = 5000
|
||||
|
|
|
|||
|
|
@ -574,7 +574,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
|
|||
)
|
||||
]);
|
||||
}
|
||||
const camera = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["styles", [_style_0]], ["__file", "D:/项目/hldy_app_mini/pages/camera.nvue"]]);
|
||||
const camera = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["styles", [_style_0]], ["__file", "D:/hldy_app_mini/pages/camera.nvue"]]);
|
||||
export {
|
||||
camera as default
|
||||
};
|
||||
|
|
|
|||
|
|
@ -578,7 +578,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
|
|||
)
|
||||
]);
|
||||
}
|
||||
const fullcamera = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["styles", [_style_0]], ["__file", "D:/项目/hldy_app_mini/pages/fullcamera.nvue"]]);
|
||||
const fullcamera = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["styles", [_style_0]], ["__file", "D:/hldy_app_mini/pages/fullcamera.nvue"]]);
|
||||
export {
|
||||
fullcamera as default
|
||||
};
|
||||
|
|
|
|||
Loading…
Reference in New Issue