Merge branch 'main' of http://47.115.223.229:8888/yangjun/hldy_app_mini
This commit is contained in:
commit
6c45585477
|
|
@ -4,6 +4,9 @@
|
|||
<view class="contitem tp" @click="housedex++">
|
||||
<image src="/static/index/warehouse/home/warehouse.png" mode="aspectFill"></image>
|
||||
</view>
|
||||
<view class="hldy tp">
|
||||
<donghua width="16vw" height="8.6vw" :links="logoval.url" :playing="true" />
|
||||
</view>
|
||||
<view class="route tp">
|
||||
<image src="/static/index/warehouse/home/carrhate.gif" mode="aspectFill" style="z-index: 4;"></image>
|
||||
</view>
|
||||
|
|
@ -34,7 +37,7 @@
|
|||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
import { ref, onMounted, onBeforeUnmount, computed, nextTick, defineProps } from 'vue';
|
||||
import { ref, onMounted, reactive , onBeforeUnmount, computed, nextTick, defineProps } from 'vue';
|
||||
|
||||
const housedex = ref(0);
|
||||
const lastTap = ref(0)
|
||||
|
|
@ -184,6 +187,15 @@
|
|||
height: '13vw'
|
||||
},
|
||||
])
|
||||
const logoval = reactive({
|
||||
url: genPaths(
|
||||
'/static/index/warehouse/home',
|
||||
'logo',
|
||||
3, // 张数
|
||||
'png',
|
||||
1, // 起始索引为 1
|
||||
false // 不补零
|
||||
)})
|
||||
</script>
|
||||
|
||||
<style scoped lang="less">
|
||||
|
|
@ -198,8 +210,8 @@
|
|||
.itemact1 {
|
||||
width: 22.3vw;
|
||||
height: 13.6vw;
|
||||
bottom: 8.8vw;
|
||||
left: 11.6vw;
|
||||
bottom: 9.8vw;
|
||||
left: 12.6vw;
|
||||
z-index: 31;
|
||||
}
|
||||
|
||||
|
|
@ -261,8 +273,8 @@
|
|||
white-space: nowrap;
|
||||
z-index: 70;
|
||||
&:nth-child(1){
|
||||
top: 38vw;
|
||||
left: 19.5vw;
|
||||
top: 36.5vw;
|
||||
left: 20.5vw;
|
||||
}
|
||||
&:nth-child(2){
|
||||
top: 28vw;
|
||||
|
|
@ -297,7 +309,7 @@
|
|||
height: 4.4vw;
|
||||
position: absolute;
|
||||
top: 2vw;
|
||||
left: 25%;
|
||||
left: 30%;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -359,6 +371,13 @@
|
|||
left: 28.2vw;
|
||||
z-index: 50;
|
||||
}
|
||||
|
||||
.hldy{
|
||||
position: fixed;
|
||||
left: 6.7vw;
|
||||
bottom: 3.7vw;
|
||||
|
||||
}
|
||||
.home{
|
||||
width: 100vw;
|
||||
height: 100vh;
|
||||
|
|
|
|||
|
|
@ -54,8 +54,7 @@
|
|||
<view @click.stop="crk(v,index)" @touchend.stop>出入库</view>
|
||||
<view @click.stop="addcar(v)" v-if="v.isAdd!=1" @touchend.stop>
|
||||
<view>
|
||||
<text>加购</text>
|
||||
<text>物车</text>
|
||||
加购物车
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
|
|
@ -192,25 +191,29 @@
|
|||
width: 7vw;
|
||||
height: 100%;
|
||||
font-weight: 400;
|
||||
font-size: 1.3vw;
|
||||
font-size: 1.5vw;
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
flex-wrap: wrap;
|
||||
writing-mode: vertical-rl;
|
||||
text-orientation: upright;
|
||||
text-align: center;
|
||||
|
||||
&:nth-child(2) {
|
||||
background: #1083F8;
|
||||
color: #fff;
|
||||
|
||||
view {
|
||||
width: 3.8vw;
|
||||
height: 3.8vw;
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
flex-wrap: wrap;
|
||||
flex-direction: column;
|
||||
margin-top: -0.7vw;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
&:nth-child(1) {
|
||||
background: #C2C4C9;
|
||||
color: #555555;
|
||||
|
|
|
|||
|
|
@ -54,8 +54,7 @@
|
|||
<view @click.stop="crk(v,index)" @touchend.stop>出入库</view>
|
||||
<view @click.stop="addcar(v,index)" v-if="v.isAdd!=1" @touchend.stop>
|
||||
<view>
|
||||
<text>加购</text>
|
||||
<text>物车</text>
|
||||
加购物车
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
|
|
@ -199,11 +198,13 @@
|
|||
width: 7vw;
|
||||
height: 100%;
|
||||
font-weight: 400;
|
||||
font-size: 1.3vw;
|
||||
font-size: 1.5vw;
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
flex-wrap: wrap;
|
||||
writing-mode: vertical-rl;
|
||||
text-orientation: upright;
|
||||
text-align: center;
|
||||
|
||||
&:nth-child(2) {
|
||||
background: #1083F8;
|
||||
|
|
@ -215,8 +216,7 @@
|
|||
display: flex;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
flex-wrap: wrap;
|
||||
flex-direction: column;
|
||||
margin-top: -0.7vw;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -272,35 +272,34 @@
|
|||
display: inline-block;
|
||||
|
||||
>view {
|
||||
margin-top: 0.5vw;
|
||||
margin-top: 0.25vw;
|
||||
|
||||
&:nth-child(4) {
|
||||
width: 100%;
|
||||
height: 3.4vw;
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
|
||||
>view {
|
||||
width: 33.3%;
|
||||
height: 100%;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
position: relative;
|
||||
align-items: center;
|
||||
margin-top:1vw;
|
||||
|
||||
&:nth-child(1) {
|
||||
width: 30%;
|
||||
text-align: left;
|
||||
align-items: left;
|
||||
}
|
||||
|
||||
&:nth-child(2) {
|
||||
width: 40%;
|
||||
text-align: center;
|
||||
align-items: center;
|
||||
}
|
||||
|
||||
&:nth-child(3) {
|
||||
width: 30%;
|
||||
text-align: right;
|
||||
align-items: right;
|
||||
}
|
||||
|
||||
&:nth-child(2)::after {
|
||||
|
|
@ -339,7 +338,7 @@
|
|||
font-weight: 400;
|
||||
font-size: 1.4vw;
|
||||
color: #777777;
|
||||
margin-top: 0.35vw;
|
||||
margin-top: 0.25vw;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -63,7 +63,7 @@
|
|||
<view @click.stop="addcar(v,index)" @touchend.stop>编辑</view>
|
||||
<view @click.stop="del(v,index)" v-if="v.isAdd!=1" @touchend.stop>
|
||||
<view>
|
||||
<text>删除</text>
|
||||
删除
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
|
|
@ -248,11 +248,13 @@
|
|||
width: 7vw;
|
||||
height: 100%;
|
||||
font-weight: 400;
|
||||
font-size: 1.3vw;
|
||||
font-size: 1.5vw;
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
flex-wrap: wrap;
|
||||
writing-mode: vertical-rl;
|
||||
text-orientation: upright;
|
||||
text-align: center;
|
||||
|
||||
&:nth-child(2) {
|
||||
background: #1083F8;
|
||||
|
|
@ -264,12 +266,8 @@
|
|||
display: flex;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
flex-wrap: wrap;
|
||||
flex-direction: column;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
&:nth-child(1) {
|
||||
background: #C2C4C9;
|
||||
color: #555555;
|
||||
|
|
|
|||
|
|
@ -54,8 +54,7 @@
|
|||
<view @click.stop @touchend.stop>出入库</view>
|
||||
<view @click.stop="addcar(v)" v-if="v.isAdd!=1" @touchend.stop>
|
||||
<view>
|
||||
<text>加购</text>
|
||||
<text>物车</text>
|
||||
加购物车
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
|
|
@ -67,7 +66,7 @@
|
|||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
import { ref, onMounted, reactive, onBeforeUnmount, computed, nextTick, defineProps ,defineComponent} from 'vue';
|
||||
import { ref, onMounted, reactive, onBeforeUnmount, computed, nextTick, defineProps ,defineComponent,watch} from 'vue';
|
||||
import { queryInvoicingList,queryWlInfoByWlId,addShoppingCartList,queryShoppingCartList } from '../api/lunpan.js'
|
||||
const props = defineProps({
|
||||
InvoicingList: {
|
||||
|
|
@ -83,6 +82,13 @@
|
|||
required: true,
|
||||
},
|
||||
})
|
||||
watch(
|
||||
()=>props.show,
|
||||
()=>{
|
||||
if(props.show==false){
|
||||
props.InvoicingList[0].scrollleft = 0;
|
||||
}
|
||||
})
|
||||
const emit = defineEmits(['addcartory','tolower','solleft'])
|
||||
const serverUrl = ref('')
|
||||
onMounted(()=>{
|
||||
|
|
@ -186,25 +192,29 @@
|
|||
width: 7vw;
|
||||
height: 100%;
|
||||
font-weight: 400;
|
||||
font-size: 1.3vw;
|
||||
font-size: 1.5vw;
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
flex-wrap: wrap;
|
||||
writing-mode: vertical-rl;
|
||||
text-orientation: upright;
|
||||
text-align: center;
|
||||
|
||||
&:nth-child(2) {
|
||||
background: #1083F8;
|
||||
color: #fff;
|
||||
|
||||
view {
|
||||
width: 3.8vw;
|
||||
height: 3.8vw;
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
flex-wrap: wrap;
|
||||
flex-direction: column;
|
||||
margin-top: -0.7vw;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
&:nth-child(1) {
|
||||
background: #C2C4C9;
|
||||
color: #555555;
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
<view>
|
||||
<view class="serchs guodu" :style="tx?'':'width:95vw'">
|
||||
<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"
|
||||
@click="search(0)"></image>
|
||||
</view>
|
||||
|
|
@ -49,15 +49,10 @@
|
|||
<view class="lcar">
|
||||
<image :src="'/static/index/procurement/k.png'" mode="aspectFill"></image>
|
||||
<view class="nm">纸尿裤-拉拉裤纸拉拉裤纸拉拉裤纸拉拉裤纸</view>
|
||||
<view class="jx">
|
||||
<image src="/static/index/procurement/l0.png" mode="aspectFill"></image>
|
||||
<text>待进行</text>
|
||||
</view>
|
||||
</view>
|
||||
<view class="rcar">
|
||||
|
||||
<view class="tm">10:00 - 10:10</view>
|
||||
<view class="wul">物料采购</view>
|
||||
<view class="tm">10:00 - 10:10</view>
|
||||
<view class="zhxng">
|
||||
<view>
|
||||
<image src="/static/index/procurement/xz.png" mode="aspectFill"></image>
|
||||
|
|
@ -72,6 +67,10 @@
|
|||
<view class="iacts">开始服务</view>
|
||||
<view>服务结束</view>
|
||||
</view>
|
||||
<view class="jx">
|
||||
<image src="/static/index/procurement/l0.png" mode="aspectFill"></image>
|
||||
<text>待进行</text>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
</view>
|
||||
|
|
@ -84,7 +83,7 @@
|
|||
</view>
|
||||
<view class="fiedright">
|
||||
<view @click="uni.navigateTo({ url:'/pages/procurement/materialcar' })">
|
||||
<image src="/static/index/procurement/gc.png" mode="aspectFill"></image>
|
||||
<image src="/static/index/procurement/gc1.png" mode="aspectFill"></image>
|
||||
<text v-if="carnum>0">{{carnum>99?'99+':carnum}}</text>
|
||||
</view>
|
||||
<view @click="uni.navigateTo({ url:'/pages/procurement/purchaseorder' })">
|
||||
|
|
@ -484,6 +483,12 @@
|
|||
padding: 0 1vw;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
.rcar {
|
||||
width: 19vw;
|
||||
position: relative;
|
||||
|
||||
>.jx {
|
||||
width: 4.6vw;
|
||||
height: 1.9vw;
|
||||
|
|
@ -515,10 +520,6 @@
|
|||
}
|
||||
}
|
||||
|
||||
.rcar {
|
||||
width: 19vw;
|
||||
}
|
||||
|
||||
.shjs {
|
||||
width: 100%;
|
||||
margin-top: 0.8vw;
|
||||
|
|
@ -753,7 +754,7 @@
|
|||
}
|
||||
}
|
||||
.back{
|
||||
width: 8vw;
|
||||
width: 7.3vw;
|
||||
height: 3.3vw;
|
||||
border-radius: 1.6vw;
|
||||
border: 1px solid rgba(85, 85, 85, 0.5);
|
||||
|
|
@ -787,7 +788,7 @@
|
|||
display: flex;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
width: 8vw;
|
||||
width: 7vw;
|
||||
height: 3.3vw;
|
||||
margin: 0 0 0 1.2vw;
|
||||
background: rgba(255, 255, 255, 0.6);
|
||||
|
|
@ -797,7 +798,7 @@
|
|||
}
|
||||
|
||||
.shx {
|
||||
width: 8.2vw;
|
||||
width: 7.3vw;
|
||||
height: 3.3vw;
|
||||
background: #FFFFFF;
|
||||
border-radius: 1.65vw;
|
||||
|
|
@ -809,13 +810,13 @@
|
|||
justify-content: center;
|
||||
align-items: center;
|
||||
box-shadow: 0.5rpx 5rpx 5rpx #dadee1;
|
||||
margin: 0 0 0 1.2vw;
|
||||
margin: 0 0 0 0.7vw;
|
||||
color: #555555;
|
||||
|
||||
image {
|
||||
width: 1.5vw;
|
||||
height: 1.3vw;
|
||||
margin: 0 0.5vw;
|
||||
margin: 0 0.5vw 0 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Binary file not shown.
|
Before Width: | Height: | Size: 1.2 KiB After Width: | Height: | Size: 1022 B |
Binary file not shown.
|
Before Width: | Height: | Size: 1.1 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 1.5 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 1.2 KiB After Width: | Height: | Size: 1.6 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 1022 B |
Binary file not shown.
|
After Width: | Height: | Size: 1.6 KiB |
|
|
@ -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
|
||||
};
|
||||
|
|
|
|||
|
|
@ -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 {
|
||||
fullcamera as default
|
||||
};
|
||||
|
|
|
|||
Loading…
Reference in New Issue