Compare commits

..

No commits in common. "1249773ad7c29e55f0b58cdfa31302b673fb9635" and "c4a809510aec2e4e582892ef344f41c43810e2dc" have entirely different histories.

14 changed files with 73 additions and 103 deletions

View File

@ -4,9 +4,6 @@
<view class="contitem tp" @click="housedex++"> <view class="contitem tp" @click="housedex++">
<image src="/static/index/warehouse/home/warehouse.png" mode="aspectFill"></image> <image src="/static/index/warehouse/home/warehouse.png" mode="aspectFill"></image>
</view> </view>
<view class="hldy tp">
<donghua width="16vw" height="8.6vw" :links="logoval.url" :playing="true" />
</view>
<view class="route tp"> <view class="route tp">
<image src="/static/index/warehouse/home/carrhate.gif" mode="aspectFill" style="z-index: 4;"></image> <image src="/static/index/warehouse/home/carrhate.gif" mode="aspectFill" style="z-index: 4;"></image>
</view> </view>
@ -37,7 +34,7 @@
</template> </template>
<script setup lang="ts"> <script setup lang="ts">
import { ref, onMounted, reactive , onBeforeUnmount, computed, nextTick, defineProps } from 'vue'; import { ref, onMounted, onBeforeUnmount, computed, nextTick, defineProps } from 'vue';
const housedex = ref(0); const housedex = ref(0);
const lastTap = ref(0) const lastTap = ref(0)
@ -187,15 +184,6 @@
height: '13vw' height: '13vw'
}, },
]) ])
const logoval = reactive({
url: genPaths(
'/static/index/warehouse/home',
'logo',
3, //
'png',
1, // 1
false //
)})
</script> </script>
<style scoped lang="less"> <style scoped lang="less">
@ -210,8 +198,8 @@
.itemact1 { .itemact1 {
width: 22.3vw; width: 22.3vw;
height: 13.6vw; height: 13.6vw;
bottom: 9.8vw; bottom: 8.8vw;
left: 12.6vw; left: 11.6vw;
z-index: 31; z-index: 31;
} }
@ -273,8 +261,8 @@
white-space: nowrap; white-space: nowrap;
z-index: 70; z-index: 70;
&:nth-child(1){ &:nth-child(1){
top: 36.5vw; top: 38vw;
left: 20.5vw; left: 19.5vw;
} }
&:nth-child(2){ &:nth-child(2){
top: 28vw; top: 28vw;
@ -309,7 +297,7 @@
height: 4.4vw; height: 4.4vw;
position: absolute; position: absolute;
top: 2vw; top: 2vw;
left: 30%; left: 25%;
} }
} }
@ -371,13 +359,6 @@
left: 28.2vw; left: 28.2vw;
z-index: 50; z-index: 50;
} }
.hldy{
position: fixed;
left: 6.7vw;
bottom: 3.7vw;
}
.home{ .home{
width: 100vw; width: 100vw;
height: 100vh; height: 100vh;

View File

@ -54,7 +54,8 @@
<view @click.stop="crk(v,index)" @touchend.stop>出入库</view> <view @click.stop="crk(v,index)" @touchend.stop>出入库</view>
<view @click.stop="addcar(v)" v-if="v.isAdd!=1" @touchend.stop> <view @click.stop="addcar(v)" v-if="v.isAdd!=1" @touchend.stop>
<view> <view>
加购物车 <text>加购</text>
<text>物车</text>
</view> </view>
</view> </view>
</view> </view>
@ -187,34 +188,30 @@
position: absolute; position: absolute;
top: 0; top: 0;
right:-14vw; right:-14vw;
>view { >view{
width: 7vw; width: 7vw;
height: 100%; height: 100%;
font-weight: 400; font-weight: 400;
font-size: 1.5vw; font-size: 1.3vw;
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
writing-mode: vertical-rl; flex-wrap: wrap;
text-orientation: upright; &:nth-child(2){
text-align: center;
&:nth-child(2) {
background: #1083F8; background: #1083F8;
color: #fff; color: #fff;
view{
view {
width: 3.8vw; width: 3.8vw;
height: 3.8vw; height: 3.8vw;
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
margin-top: -0.7vw; flex-wrap: wrap;
flex-direction: column;
} }
} }
&:nth-child(1){
&:nth-child(1) {
background: #C2C4C9; background: #C2C4C9;
color: #555555; color: #555555;
} }

View File

@ -40,7 +40,7 @@
<text>{{v.upperLimit}}</text> <text>{{v.upperLimit}}</text>
<text>物料上限 </text> <text>物料上限 </text>
</view> </view>
<view > <view>
<text>{{v.lowerLimit}}</text> <text>{{v.lowerLimit}}</text>
<text> 物料下限</text> <text> 物料下限</text>
</view> </view>
@ -54,7 +54,8 @@
<view @click.stop="crk(v,index)" @touchend.stop>出入库</view> <view @click.stop="crk(v,index)" @touchend.stop>出入库</view>
<view @click.stop="addcar(v,index)" v-if="v.isAdd!=1" @touchend.stop> <view @click.stop="addcar(v,index)" v-if="v.isAdd!=1" @touchend.stop>
<view> <view>
加购物车 <text>加购</text>
<text>物车</text>
</view> </view>
</view> </view>
</view> </view>
@ -198,13 +199,11 @@
width: 7vw; width: 7vw;
height: 100%; height: 100%;
font-weight: 400; font-weight: 400;
font-size: 1.5vw; font-size: 1.3vw;
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
writing-mode: vertical-rl; flex-wrap: wrap;
text-orientation: upright;
text-align: center;
&:nth-child(2) { &:nth-child(2) {
background: #1083F8; background: #1083F8;
@ -216,7 +215,8 @@
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
margin-top: -0.7vw; flex-wrap: wrap;
flex-direction: column;
} }
} }
@ -272,34 +272,35 @@
display: inline-block; display: inline-block;
>view { >view {
margin-top: 0.25vw; margin-top: 0.5vw;
&:nth-child(4) { &:nth-child(4) {
width: 100%; width: 100%;
height: 3.4vw; height: 3.4vw;
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
>view { >view {
width: 33.3%; width: 33.3%;
height: 100%; height: 100%;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
position: relative; position: relative;
margin-top:1vw; align-items: center;
&:nth-child(1) { &:nth-child(1) {
width: 30%; width: 30%;
align-items: left; text-align: left;
} }
&:nth-child(2) { &:nth-child(2) {
width: 40%; width: 40%;
align-items: center; text-align: center;
} }
&:nth-child(3) { &:nth-child(3) {
width: 30%; width: 30%;
align-items: right; text-align: right;
} }
&:nth-child(2)::after { &:nth-child(2)::after {
@ -338,7 +339,7 @@
font-weight: 400; font-weight: 400;
font-size: 1.4vw; font-size: 1.4vw;
color: #777777; color: #777777;
margin-top: 0.25vw; margin-top: 0.35vw;
} }
} }

View File

@ -63,7 +63,7 @@
<view @click.stop="addcar(v,index)" @touchend.stop>编辑</view> <view @click.stop="addcar(v,index)" @touchend.stop>编辑</view>
<view @click.stop="del(v,index)" v-if="v.isAdd!=1" @touchend.stop> <view @click.stop="del(v,index)" v-if="v.isAdd!=1" @touchend.stop>
<view> <view>
删除 <text>删除</text>
</view> </view>
</view> </view>
</view> </view>
@ -248,13 +248,11 @@
width: 7vw; width: 7vw;
height: 100%; height: 100%;
font-weight: 400; font-weight: 400;
font-size: 1.5vw; font-size: 1.3vw;
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
writing-mode: vertical-rl; flex-wrap: wrap;
text-orientation: upright;
text-align: center;
&:nth-child(2) { &:nth-child(2) {
background: #1083F8; background: #1083F8;
@ -266,8 +264,12 @@
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
flex-wrap: wrap;
flex-direction: column;
} }
} }
&:nth-child(1) { &:nth-child(1) {
background: #C2C4C9; background: #C2C4C9;
color: #555555; color: #555555;

View File

@ -54,7 +54,8 @@
<view @click.stop @touchend.stop>出入库</view> <view @click.stop @touchend.stop>出入库</view>
<view @click.stop="addcar(v)" v-if="v.isAdd!=1" @touchend.stop> <view @click.stop="addcar(v)" v-if="v.isAdd!=1" @touchend.stop>
<view> <view>
加购物车 <text>加购</text>
<text>物车</text>
</view> </view>
</view> </view>
</view> </view>
@ -66,7 +67,7 @@
</template> </template>
<script setup lang="ts"> <script setup lang="ts">
import { ref, onMounted, reactive, onBeforeUnmount, computed, nextTick, defineProps ,defineComponent,watch} from 'vue'; import { ref, onMounted, reactive, onBeforeUnmount, computed, nextTick, defineProps ,defineComponent} from 'vue';
import { queryInvoicingList,queryWlInfoByWlId,addShoppingCartList,queryShoppingCartList } from '../api/lunpan.js' import { queryInvoicingList,queryWlInfoByWlId,addShoppingCartList,queryShoppingCartList } from '../api/lunpan.js'
const props = defineProps({ const props = defineProps({
InvoicingList: { InvoicingList: {
@ -82,13 +83,6 @@
required: true, required: true,
}, },
}) })
watch(
()=>props.show,
()=>{
if(props.show==false){
props.InvoicingList[0].scrollleft = 0;
}
})
const emit = defineEmits(['addcartory','tolower','solleft']) const emit = defineEmits(['addcartory','tolower','solleft'])
const serverUrl = ref('') const serverUrl = ref('')
onMounted(()=>{ onMounted(()=>{
@ -188,34 +182,30 @@
position: absolute; position: absolute;
top: 0; top: 0;
right:-14vw; right:-14vw;
>view { >view{
width: 7vw; width: 7vw;
height: 100%; height: 100%;
font-weight: 400; font-weight: 400;
font-size: 1.5vw; font-size: 1.3vw;
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
writing-mode: vertical-rl; flex-wrap: wrap;
text-orientation: upright; &:nth-child(2){
text-align: center;
&:nth-child(2) {
background: #1083F8; background: #1083F8;
color: #fff; color: #fff;
view{
view {
width: 3.8vw; width: 3.8vw;
height: 3.8vw; height: 3.8vw;
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
margin-top: -0.7vw; flex-wrap: wrap;
flex-direction: column;
} }
} }
&:nth-child(1){
&:nth-child(1) {
background: #C2C4C9; background: #C2C4C9;
color: #555555; color: #555555;
} }

View File

@ -2,7 +2,7 @@
<view> <view>
<view class="serchs guodu" :style="tx?'':'width:95vw'"> <view class="serchs guodu" :style="tx?'':'width:95vw'">
<view class="ipt"> <view class="ipt">
<input type="text" placeholder="物料名称/物料编码/物料简拼" v-model="form.wlParamInfo" @confirm="search"/> <input type="text" placeholder="物料名称/物料编码/物料简拼" v-model="form.wlParamInfo" @confirm="search()"/>
<image src="/static/index/procurement/x.png" mode="aspectFill" v-if="form.wlParamInfo" <image src="/static/index/procurement/x.png" mode="aspectFill" v-if="form.wlParamInfo"
@click="search(0)"></image> @click="search(0)"></image>
</view> </view>
@ -49,10 +49,15 @@
<view class="lcar"> <view class="lcar">
<image :src="'/static/index/procurement/k.png'" mode="aspectFill"></image> <image :src="'/static/index/procurement/k.png'" mode="aspectFill"></image>
<view class="nm">纸尿裤-拉拉裤纸拉拉裤纸拉拉裤纸拉拉裤纸</view> <view class="nm">纸尿裤-拉拉裤纸拉拉裤纸拉拉裤纸拉拉裤纸</view>
<view class="jx">
<image src="/static/index/procurement/l0.png" mode="aspectFill"></image>
<text>待进行</text>
</view>
</view> </view>
<view class="rcar"> <view class="rcar">
<view class="wul">物料采购</view>
<view class="tm">10:00 - 10:10</view> <view class="tm">10:00 - 10:10</view>
<view class="wul">物料采购</view>
<view class="zhxng"> <view class="zhxng">
<view> <view>
<image src="/static/index/procurement/xz.png" mode="aspectFill"></image> <image src="/static/index/procurement/xz.png" mode="aspectFill"></image>
@ -67,10 +72,6 @@
<view class="iacts">开始服务</view> <view class="iacts">开始服务</view>
<view>服务结束</view> <view>服务结束</view>
</view> </view>
<view class="jx">
<image src="/static/index/procurement/l0.png" mode="aspectFill"></image>
<text>待进行</text>
</view>
</view> </view>
</view> </view>
@ -83,7 +84,7 @@
</view> </view>
<view class="fiedright"> <view class="fiedright">
<view @click="uni.navigateTo({ url:'/pages/procurement/materialcar' })"> <view @click="uni.navigateTo({ url:'/pages/procurement/materialcar' })">
<image src="/static/index/procurement/gc1.png" mode="aspectFill"></image> <image src="/static/index/procurement/gc.png" mode="aspectFill"></image>
<text v-if="carnum>0">{{carnum>99?'99+':carnum}}</text> <text v-if="carnum>0">{{carnum>99?'99+':carnum}}</text>
</view> </view>
<view @click="uni.navigateTo({ url:'/pages/procurement/purchaseorder' })"> <view @click="uni.navigateTo({ url:'/pages/procurement/purchaseorder' })">
@ -483,12 +484,6 @@
padding: 0 1vw; padding: 0 1vw;
} }
}
.rcar {
width: 19vw;
position: relative;
>.jx { >.jx {
width: 4.6vw; width: 4.6vw;
height: 1.9vw; height: 1.9vw;
@ -520,6 +515,10 @@
} }
} }
.rcar {
width: 19vw;
}
.shjs { .shjs {
width: 100%; width: 100%;
margin-top: 0.8vw; margin-top: 0.8vw;
@ -754,7 +753,7 @@
} }
} }
.back{ .back{
width: 7.3vw; width: 8vw;
height: 3.3vw; height: 3.3vw;
border-radius: 1.6vw; border-radius: 1.6vw;
border: 1px solid rgba(85, 85, 85, 0.5); border: 1px solid rgba(85, 85, 85, 0.5);
@ -788,7 +787,7 @@
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
width: 7vw; width: 8vw;
height: 3.3vw; height: 3.3vw;
margin: 0 0 0 1.2vw; margin: 0 0 0 1.2vw;
background: rgba(255, 255, 255, 0.6); background: rgba(255, 255, 255, 0.6);
@ -798,7 +797,7 @@
} }
.shx { .shx {
width: 7.3vw; width: 8.2vw;
height: 3.3vw; height: 3.3vw;
background: #FFFFFF; background: #FFFFFF;
border-radius: 1.65vw; border-radius: 1.65vw;
@ -810,13 +809,13 @@
justify-content: center; justify-content: center;
align-items: center; align-items: center;
box-shadow: 0.5rpx 5rpx 5rpx #dadee1; box-shadow: 0.5rpx 5rpx 5rpx #dadee1;
margin: 0 0 0 0.7vw; margin: 0 0 0 1.2vw;
color: #555555; color: #555555;
image { image {
width: 1.5vw; width: 1.5vw;
height: 1.3vw; height: 1.3vw;
margin: 0 0.5vw 0 0; margin: 0 0.5vw;
} }
} }
} }

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1022 B

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1022 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.6 KiB

View File

@ -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
}; };

View File

@ -577,7 +577,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
}; };