Merge branch 'main' of http://47.115.223.229:8888/yangjun/hldy_app_mini
This commit is contained in:
commit
e641b36044
|
|
@ -391,10 +391,11 @@
|
||||||
height: 13vw;
|
height: 13vw;
|
||||||
margin-bottom: 0.9vw;
|
margin-bottom: 0.9vw;
|
||||||
margin-left: 0.5vw;
|
margin-left: 0.5vw;
|
||||||
|
// background-color: #fff;
|
||||||
.carditem{
|
.carditem{
|
||||||
width: 27vw;
|
width: 27vw;
|
||||||
height: 13vw;
|
height: 13vw;
|
||||||
background: rgba(245, 246, 248, 1);
|
background-color: #fff;
|
||||||
border-radius: 1.1vw;
|
border-radius: 1.1vw;
|
||||||
position: relative;
|
position: relative;
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
|
|
|
||||||
|
|
@ -2057,13 +2057,13 @@
|
||||||
.contain {
|
.contain {
|
||||||
background-color: rgb(239, 240, 244);
|
background-color: rgb(239, 240, 244);
|
||||||
width: 90vw;
|
width: 90vw;
|
||||||
height: calc(100vh - 5vh);
|
height: calc(100vh - 2vh);
|
||||||
padding: 1vh 2vw 0 0;
|
padding: 1vh 2vw 0 1vw;
|
||||||
display: flex;
|
display: flex;
|
||||||
|
|
||||||
.contain-left {
|
.contain-left {
|
||||||
height: calc(100vh - 3vw);
|
height: 95vh;
|
||||||
width: 30vw;
|
width: 35%;
|
||||||
position: relative;
|
position: relative;
|
||||||
z-index: 99;
|
z-index: 99;
|
||||||
|
|
||||||
|
|
@ -2496,7 +2496,7 @@
|
||||||
z-index: 1;
|
z-index: 1;
|
||||||
height: 95vh;
|
height: 95vh;
|
||||||
width: 60vw;
|
width: 60vw;
|
||||||
margin-left: 2%;
|
margin-left: 3%;
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
|
|
||||||
.contain-right-title {
|
.contain-right-title {
|
||||||
|
|
@ -2567,9 +2567,10 @@
|
||||||
margin-top: 20rpx;
|
margin-top: 20rpx;
|
||||||
|
|
||||||
.middle-Y {
|
.middle-Y {
|
||||||
width: 97%;
|
width: 98%;
|
||||||
height: 100%;
|
height: 100%;
|
||||||
margin-left: 3%;
|
margin-left: 5%;
|
||||||
|
// background-color: red;
|
||||||
|
|
||||||
.middle-Y-father {
|
.middle-Y-father {
|
||||||
display: flex;
|
display: flex;
|
||||||
|
|
@ -2625,11 +2626,11 @@
|
||||||
|
|
||||||
.white-zhezhao {
|
.white-zhezhao {
|
||||||
position: fixed;
|
position: fixed;
|
||||||
height: 100%;
|
height: 105vh;
|
||||||
background-color: #fff;
|
background-color: #fff;
|
||||||
width: 60%;
|
width: 62vw;
|
||||||
top: 0;
|
top:-5vh;
|
||||||
right: 0;
|
right:-3vw;
|
||||||
}
|
}
|
||||||
|
|
||||||
.wuliao-title {
|
.wuliao-title {
|
||||||
|
|
|
||||||
|
|
@ -739,7 +739,7 @@
|
||||||
</view>
|
</view>
|
||||||
</scroll-view>
|
</scroll-view>
|
||||||
<view style="display: flex;justify-content: space-between;width: 100%;">
|
<view style="display: flex;justify-content: space-between;width: 100%;">
|
||||||
<view style="display: flex;">
|
<view style="display: flex;margin-left: -40rpx;">
|
||||||
<view :class="!typechange? `wuliao-title`:`wuliao-title-no`" @click="typechange = 0">
|
<view :class="!typechange? `wuliao-title`:`wuliao-title-no`" @click="typechange = 0">
|
||||||
物料详情
|
物料详情
|
||||||
<view class="wuliao-heng"></view>
|
<view class="wuliao-heng"></view>
|
||||||
|
|
@ -2043,7 +2043,7 @@
|
||||||
|
|
||||||
.contain-left {
|
.contain-left {
|
||||||
height: 95vh;
|
height: 95vh;
|
||||||
width: 30%;
|
width: 35%;
|
||||||
position: relative;
|
position: relative;
|
||||||
z-index: 99;
|
z-index: 99;
|
||||||
|
|
||||||
|
|
@ -2551,9 +2551,11 @@
|
||||||
margin-left: 5%;
|
margin-left: 5%;
|
||||||
|
|
||||||
.middle-Y {
|
.middle-Y {
|
||||||
width: 100%;
|
width: 98%;
|
||||||
height: 100%;
|
height: 100%;
|
||||||
margin-right: 3%;
|
margin-left: 2%;
|
||||||
|
// margin-right: 2%;
|
||||||
|
// background-color: red;
|
||||||
|
|
||||||
.middle-Y-father {
|
.middle-Y-father {
|
||||||
display: flex;
|
display: flex;
|
||||||
|
|
@ -2613,7 +2615,7 @@
|
||||||
background-color: #fff;
|
background-color: #fff;
|
||||||
width: 61vw;
|
width: 61vw;
|
||||||
top:-5vh;
|
top:-5vh;
|
||||||
right:-1vw;
|
right:-3vw;
|
||||||
}
|
}
|
||||||
|
|
||||||
.wuliao-title {
|
.wuliao-title {
|
||||||
|
|
@ -3149,7 +3151,7 @@
|
||||||
top: 0%;
|
top: 0%;
|
||||||
left: 50%;
|
left: 50%;
|
||||||
transform: translate(-50%, 0%);
|
transform: translate(-50%, 0%);
|
||||||
width: 50%;
|
width: 55%;
|
||||||
height: 100%;
|
height: 100%;
|
||||||
border-radius: 40rpx;
|
border-radius: 40rpx;
|
||||||
background-color: #fff;
|
background-color: #fff;
|
||||||
|
|
|
||||||
|
|
@ -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 {
|
export {
|
||||||
camera as default
|
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 {
|
export {
|
||||||
fullcamera as default
|
fullcamera as default
|
||||||
};
|
};
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue