fix
This commit is contained in:
parent
fa7a811dd7
commit
4b11f7a242
132
src/App.vue
132
src/App.vue
@ -16,74 +16,74 @@ export default {
|
|||||||
// const token = window?.plus?.storage.getItem("token");
|
// const token = window?.plus?.storage.getItem("token");
|
||||||
// uni.setStorageSync("token", token);
|
// uni.setStorageSync("token", token);
|
||||||
// console.log("App Show", uni.getStorageSync("token"));
|
// console.log("App Show", uni.getStorageSync("token"));
|
||||||
const params = new URLSearchParams(window.location.search); //属性包含当前 URL 的查询字符串部分
|
// const params = new URLSearchParams(window.location.search); //属性包含当前 URL 的查询字符串部分
|
||||||
state.id = params.get("id");
|
// state.id = params.get("id");
|
||||||
state.pid = params.get("pid");
|
// state.pid = params.get("pid");
|
||||||
console.log(state);
|
// console.log(state);
|
||||||
|
|
||||||
const paintingDetail = async () => {
|
// const paintingDetail = async () => {
|
||||||
loading.value = true;
|
// loading.value = true;
|
||||||
console.log("state", state);
|
// console.log("state", state);
|
||||||
const res = await pbDetail({
|
// const res = await pbDetail({
|
||||||
id: state.id,
|
// id: state.id,
|
||||||
pid: state.pid,
|
// pid: state.pid,
|
||||||
});
|
// });
|
||||||
if (res.status === 0) {
|
// if (res.status === 0) {
|
||||||
console.log("成功拉1");
|
// console.log("成功拉1");
|
||||||
state.boxRelBucketStatus = res.data.boxRelBucketStatus;
|
// state.boxRelBucketStatus = res.data.boxRelBucketStatus;
|
||||||
console.log("boxRelBucketStatus", state.boxRelBucketStatus);
|
// console.log("boxRelBucketStatus", state.boxRelBucketStatus);
|
||||||
if (res.data.pbStatus == 1) {
|
// if (res.data.pbStatus == 1) {
|
||||||
console.log("成功拉2");
|
// console.log("成功拉2");
|
||||||
uni.navigateTo({
|
// uni.navigateTo({
|
||||||
url: "/pages/index/index?id=" + state.id + "&pid=" + state.pid,
|
// url: "/pages/index/index?id=" + state.id + "&pid=" + state.pid,
|
||||||
success: () => {
|
// success: () => {
|
||||||
loading.value = false;
|
// loading.value = false;
|
||||||
},
|
// },
|
||||||
fail: () => {
|
// fail: () => {
|
||||||
loading.value = false;
|
// loading.value = false;
|
||||||
showMessage({ type: "default", message: "跳转失败" });
|
// showMessage({ type: "default", message: "跳转失败" });
|
||||||
},
|
// },
|
||||||
});
|
// });
|
||||||
} else {
|
// } else {
|
||||||
if (
|
// if (
|
||||||
res.data.boxRelBucketStatus == 3 &&
|
// res.data.boxRelBucketStatus == 3 &&
|
||||||
res.data.locateAddress == "公司内"
|
// res.data.locateAddress == "公司内"
|
||||||
) {
|
// ) {
|
||||||
uni.navigateTo({
|
// uni.navigateTo({
|
||||||
url: "/pages/painting/index?id=" + state.id + "&pid=" + state.pid,
|
// url: "/pages/painting/index?id=" + state.id + "&pid=" + state.pid,
|
||||||
success: () => {
|
// success: () => {
|
||||||
loading.value = false;
|
// loading.value = false;
|
||||||
},
|
// },
|
||||||
fail: () => {
|
// fail: () => {
|
||||||
loading.value = false;
|
// loading.value = false;
|
||||||
showMessage({ type: "default", message: "跳转失败" });
|
// showMessage({ type: "default", message: "跳转失败" });
|
||||||
},
|
// },
|
||||||
});
|
// });
|
||||||
} else {
|
// } else {
|
||||||
uni.setStorageSync("data", res.data);
|
// uni.setStorageSync("data", res.data);
|
||||||
console.log();
|
// console.log();
|
||||||
uni.navigateTo({
|
// uni.navigateTo({
|
||||||
url:
|
// url:
|
||||||
"/pages/detail/index?id=" +
|
// "/pages/detail/index?id=" +
|
||||||
state.id +
|
// state.id +
|
||||||
"&pid=" +
|
// "&pid=" +
|
||||||
state.pid +
|
// state.pid +
|
||||||
"&boxRelBucketStatus=" +
|
// "&boxRelBucketStatus=" +
|
||||||
state.boxRelBucketStatus,
|
// state.boxRelBucketStatus,
|
||||||
|
|
||||||
success: () => {
|
// success: () => {
|
||||||
loading.value = false;
|
// loading.value = false;
|
||||||
},
|
// },
|
||||||
fail: () => {
|
// fail: () => {
|
||||||
loading.value = false;
|
// loading.value = false;
|
||||||
showMessage({ type: "default", message: "跳转失败" });
|
// showMessage({ type: "default", message: "跳转失败" });
|
||||||
},
|
// },
|
||||||
});
|
// });
|
||||||
}
|
// }
|
||||||
}
|
// }
|
||||||
}
|
// }
|
||||||
};
|
// };
|
||||||
paintingDetail();
|
// paintingDetail();
|
||||||
},
|
},
|
||||||
onHide: function () {
|
onHide: function () {
|
||||||
console.log("App Hide");
|
console.log("App Hide");
|
||||||
|
|||||||
@ -21,12 +21,18 @@
|
|||||||
>
|
>
|
||||||
<span
|
<span
|
||||||
style="font-weight: bold; text-align: center"
|
style="font-weight: bold; text-align: center"
|
||||||
v-if="state.data.boxRelBucketStatus == 2 || state.data.boxRelBucketStatus == 4"
|
v-if="
|
||||||
|
state.data.boxRelBucketStatus == 2 ||
|
||||||
|
state.data.boxRelBucketStatus == 4
|
||||||
|
"
|
||||||
>画筒号：{{ state.data.pid }}</span
|
>画筒号：{{ state.data.pid }}</span
|
||||||
>
|
>
|
||||||
<span
|
<span
|
||||||
style="font-weight: bold; text-align: center; margin-top: 20rpx"
|
style="font-weight: bold; text-align: center; margin-top: 20rpx"
|
||||||
v-if="state.data.boxRelBucketStatus == 2 || state.data.boxRelBucketStatus == 4"
|
v-if="
|
||||||
|
state.data.boxRelBucketStatus == 2 ||
|
||||||
|
state.data.boxRelBucketStatus == 4
|
||||||
|
"
|
||||||
>所在位置：{{ state.data.locateAddress }}</span
|
>所在位置：{{ state.data.locateAddress }}</span
|
||||||
>
|
>
|
||||||
<view class="painting-box">
|
<view class="painting-box">
|
||||||
@ -34,7 +40,10 @@
|
|||||||
<span style="margin-top: 20rpx">画家：{{ state.data.drawerName }}</span>
|
<span style="margin-top: 20rpx">画家：{{ state.data.drawerName }}</span>
|
||||||
<span style="margin-top: 20rpx">预览图：</span>
|
<span style="margin-top: 20rpx">预览图：</span>
|
||||||
<view class="image-container">
|
<view class="image-container">
|
||||||
<up-image :src="state.data.drawThumbnail" @click="enlarge(state.data.drawThumbnail)"></up-image>
|
<up-image
|
||||||
|
:src="state.data.drawThumbnail"
|
||||||
|
@click="enlarge(state.data.drawThumbnail)"
|
||||||
|
></up-image>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
@ -64,7 +73,8 @@
|
|||||||
throttleTime="5"
|
throttleTime="5"
|
||||||
@click="backScan"
|
@click="backScan"
|
||||||
v-if="
|
v-if="
|
||||||
(state.data.boxRelBucketStatus == 2 || state.data.boxRelBucketStatus == 4) &&
|
(state.data.boxRelBucketStatus == 2 ||
|
||||||
|
state.data.boxRelBucketStatus == 4) &&
|
||||||
runTimeEnv()
|
runTimeEnv()
|
||||||
"
|
"
|
||||||
>返回继续扫码</up-button
|
>返回继续扫码</up-button
|
||||||
@ -94,7 +104,7 @@ const state = reactive({
|
|||||||
drawThumbnail: "",
|
drawThumbnail: "",
|
||||||
locateAddress: "",
|
locateAddress: "",
|
||||||
boxUid: "",
|
boxUid: "",
|
||||||
data:{},
|
data: {},
|
||||||
});
|
});
|
||||||
onShow(() => {
|
onShow(() => {
|
||||||
uni.setNavigationBarTitle({
|
uni.setNavigationBarTitle({
|
||||||
@ -106,28 +116,28 @@ onLoad((options) => {
|
|||||||
if (token) {
|
if (token) {
|
||||||
document.querySelector(".uni-page-head-hd").style.display = "none";
|
document.querySelector(".uni-page-head-hd").style.display = "none";
|
||||||
}
|
}
|
||||||
// state.id = options.id;
|
state.id = options.id;
|
||||||
// state.pid = options.pid;
|
state.pid = options.pid;
|
||||||
// state.boxRelBucketStatus = options.boxRelBucketStatus;
|
state.boxRelBucketStatus = options.boxRelBucketStatus;
|
||||||
// paintingDetail();
|
paintingDetail();
|
||||||
state.data = uni.getStorageSync('data')
|
state.data = uni.getStorageSync("data");
|
||||||
getBtngetRules();
|
getBtngetRules();
|
||||||
console.log('state.data',state.data)
|
console.log("state.data", state.data);
|
||||||
});
|
});
|
||||||
// const paintingDetail = async () => {
|
const paintingDetail = async () => {
|
||||||
// loading.value = true;
|
loading.value = true;
|
||||||
// const res = await pbDetail({
|
const res = await pbDetail({
|
||||||
// id: state.id,
|
id: state.id,
|
||||||
// pid: state.pid,
|
pid: state.pid,
|
||||||
// });
|
});
|
||||||
// if (res.status === 0) {
|
if (res.status === 0) {
|
||||||
// state.drawName = res.data.drawName;
|
state.drawName = res.data.drawName;
|
||||||
// state.drawerName = res.data.drawerName;
|
state.drawerName = res.data.drawerName;
|
||||||
// state.drawThumbnail = res.data.drawThumbnail;
|
state.drawThumbnail = res.data.drawThumbnail;
|
||||||
// state.locateAddress = res.data.locateAddress;
|
state.locateAddress = res.data.locateAddress;
|
||||||
// state.boxUid = res.data.boxUid;
|
state.boxUid = res.data.boxUid;
|
||||||
// }
|
}
|
||||||
// };
|
};
|
||||||
const doneSet = async () => {
|
const doneSet = async () => {
|
||||||
loading.value = true;
|
loading.value = true;
|
||||||
const res = await outbound({
|
const res = await outbound({
|
||||||
|
|||||||
@ -117,7 +117,6 @@ const isCode = ref(false);
|
|||||||
const haveCode = ref(false);
|
const haveCode = ref(false);
|
||||||
onLoad((options) => {
|
onLoad((options) => {
|
||||||
if (options.id && options.pid) {
|
if (options.id && options.pid) {
|
||||||
|
|
||||||
state.id = options.id;
|
state.id = options.id;
|
||||||
state.pid = options.pid;
|
state.pid = options.pid;
|
||||||
// 已经登录了
|
// 已经登录了
|
||||||
@ -148,12 +147,10 @@ const paintingDetail = async () => {
|
|||||||
pid: state.pid,
|
pid: state.pid,
|
||||||
});
|
});
|
||||||
if (res.status === 0) {
|
if (res.status === 0) {
|
||||||
|
|
||||||
state.boxRelBucketStatus = res.data.boxRelBucketStatus;
|
state.boxRelBucketStatus = res.data.boxRelBucketStatus;
|
||||||
console.log("boxRelBucketStatus", state.boxRelBucketStatus);
|
console.log("boxRelBucketStatus", state.boxRelBucketStatus);
|
||||||
if (res.data.pbStatus == 1) {
|
if (res.data.pbStatus == 1) {
|
||||||
|
uni.redirectTo({
|
||||||
uni.navigateTo({
|
|
||||||
url: "/pages/index/index?id=" + state.id + "&pid=" + state.pid,
|
url: "/pages/index/index?id=" + state.id + "&pid=" + state.pid,
|
||||||
success: () => {
|
success: () => {
|
||||||
loading.value = false;
|
loading.value = false;
|
||||||
@ -168,7 +165,7 @@ const paintingDetail = async () => {
|
|||||||
res.data.boxRelBucketStatus == 3 &&
|
res.data.boxRelBucketStatus == 3 &&
|
||||||
res.data.locateAddress == "公司内"
|
res.data.locateAddress == "公司内"
|
||||||
) {
|
) {
|
||||||
uni.navigateTo({
|
uni.redirectTo({
|
||||||
url: "/pages/painting/index?id=" + state.id + "&pid=" + state.pid,
|
url: "/pages/painting/index?id=" + state.id + "&pid=" + state.pid,
|
||||||
success: () => {
|
success: () => {
|
||||||
loading.value = false;
|
loading.value = false;
|
||||||
@ -179,10 +176,15 @@ const paintingDetail = async () => {
|
|||||||
},
|
},
|
||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
uni.setStorageSync('data',res.data)
|
uni.setStorageSync("data", res.data);
|
||||||
uni.navigateTo({
|
uni.redirectTo({
|
||||||
url:
|
url:
|
||||||
"/pages/detail/index?id="+ state.id + "&pid=" + state.pid+'&boxRelBucketStatus='+state.boxRelBucketStatus,
|
"/pages/detail/index?id=" +
|
||||||
|
state.id +
|
||||||
|
"&pid=" +
|
||||||
|
state.pid +
|
||||||
|
"&boxRelBucketStatus=" +
|
||||||
|
state.boxRelBucketStatus,
|
||||||
success: () => {
|
success: () => {
|
||||||
loading.value = false;
|
loading.value = false;
|
||||||
},
|
},
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user