czg_team
/
cashier_admin_app
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'test' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into test

This commit is contained in:
duan 2024-10-17 15:03:14 +08:00
parent 138be3bd75 2548be42bc
commit 35223e9cdc
8 changed files with 59 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.gitignore vendored
View File

@ -1,3 +1,6 @@
unpackage/
unpackage/cache
unpackage/dist
unpackage/res
unpackage/resources
node_modules/
/node_modules/

2
.hbuilderx/launch.json
View File

@ -16,7 +16,7 @@
"type" : "uniCloud"
},
{
"playground" : "standard",
"playground" : "custom",
"type" : "uni-app:app-android"
}
]

2
pageCategory/index/index.vue
View File

@ -1,5 +1,5 @@
<template>
<view class="safe-page">
<view class="safe-page min-page">
<view class="goods-list u-p-30">
<view class="u-m-b-32" v-for="(item,index) in pageData.list" :key="index">
<my-category

4
pageProduct/add-Product/add-Product.vue
View File

@ -1767,7 +1767,9 @@
padding: 0 !important;
min-height: initial !important;
}
::v-deep .uni-easyinput__content-input{
height: inherit;
}
::v-deep .none-label .uni-forms-item .uni-forms-item__label {
padding: 0 !important;
}

2
pageProduct/index/index.vue
View File

@ -1,5 +1,5 @@
<template>
<view class="safe-page">
<view class="safe-page min-page">
<up-sticky>
<view class="bg-fff u-p-l-30 u-p-b-30">
<!-- <view class="myTabs ">

86
pageProduct/invoicing-list/invoicing-list.vue
View File

@ -1,41 +1,44 @@
<template>
<view class="color-333 u-font-28">
<view class="fixed-top bg-fff u-flex u-p-l-30 u-row-between">
<view class="u-flex ">
<view class="u-flex u-p-t-30 u-p-b-30 u-flex-1 u-row-center" @tap="timeToggle">
<text class="u-m-r-12 no-wrap">筛选时间</text>
<image src="/pageInvoicing/static/images/icon-arrow-down-fill.svg" class="icon-arrow-down-fill"
mode="">
</image>
<up-sticky offset-top="0">
<view class=" bg-fff u-flex u-p-l-30 u-row-between">
<view class="u-flex ">
<view class="u-flex u-p-t-30 u-p-b-30 u-flex-1 u-row-center" @tap="timeToggle">
<text class="u-m-r-12 no-wrap" :class="{'color-main':filters.time.start&&filters.time.end}">筛选时间</text>
<image src="/pageInvoicing/static/images/icon-arrow-down-fill.svg" class="icon-arrow-down-fill"
mode="">
</image>
</view>
<view class="u-flex u-m-l-60 u-p-t-30 u-p-b-30 u-flex-1 u-row-center" @tap="showTypesToggle">
<text class="u-m-r-12" v-if="types.active===''"> 选择类型</text>
<text class="u-m-r-12 no-wrap color-main" v-else>{{types.list[types.active].text}}</text>
<image src="/pageInvoicing/static/images/icon-arrow-down-fill.svg" class="icon-arrow-down-fill"
mode="">
</image>
</view>
</view>
<view class="u-flex u-m-l-60 u-p-t-30 u-p-b-30 u-flex-1 u-row-center" @tap="showTypesToggle">
<text class="u-m-r-12" v-if="types.active===''"> 选择类型</text>
<text class="u-m-r-12 no-wrap color-main" v-else>{{types.list[types.active].text}}</text>
<image src="/pageInvoicing/static/images/icon-arrow-down-fill.svg" class="icon-arrow-down-fill"
mode="">
</image>
<!-- <view style="width: 164rpx;"></view> -->
<!-- <view class="search-box">
<view class="search-btn u-flex" @tap="showSearch" :style="{width:search.show?'694rpx':'164rpx'}">
<image src="@/static/iconImg/icon-search.svg" class="input-icon" />
<view class="u-flex-1 u-p-l-10"><input v-model="search.keyword" @confirm="searchConfirm" type="text"
placeholder-style="font-size:28rpx;" placeholder="搜索" /></view>
<view @tap.stop="hideSearch" v-if="search.show">取消</view>
</view>
</view> -->
<view :style="{height:types.show?typesHeight:0}" class="tranistion types overflow-hide">
<view @tap="changeTypesActive(index)" class="u-flex u-p-l-30 lh30 u-p-r-30 u-row-between"
v-for="(item,index) in types.list" :key="index">
<view>{{item.text}}</view>
<uni-icons v-if="types.active===index" type="checkmarkempty" :color="color.ColorMain"></uni-icons>
</view>
<view :style="{height: types.bottomHeight+'px'}"></view>
</view>
</view>
<!-- <view style="width: 164rpx;"></view> -->
<!-- <view class="search-box">
<view class="search-btn u-flex" @tap="showSearch" :style="{width:search.show?'694rpx':'164rpx'}">
<image src="@/static/iconImg/icon-search.svg" class="input-icon" />
<view class="u-flex-1 u-p-l-10"><input v-model="search.keyword" @confirm="searchConfirm" type="text"
placeholder-style="font-size:28rpx;" placeholder="搜索" /></view>
<view @tap.stop="hideSearch" v-if="search.show">取消</view>
</view>
</view> -->
<view :style="{height:types.show?typesHeight:0}" class="tranistion types overflow-hide">
<view @tap="changeTypesActive(index)" class="u-flex u-p-l-30 lh30 u-p-r-30 u-row-between"
v-for="(item,index) in types.list" :key="index">
<view>{{item.text}}</view>
<uni-icons v-if="types.active===index" type="checkmarkempty" :color="color.ColorMain"></uni-icons>
</view>
<view :style="{height: types.bottomHeight+'px'}"></view>
</view>
</view>
</up-sticky>
<view class=" min-page bg-gray list u-p-30">
<view class="u-flex u-m-b-30" v-if="filters.time.start&&filters.time.end">
@ -49,7 +52,7 @@
</view>
</view>
<view class="recoreds color-fff ">
<!-- <view class="recoreds color-fff ">
<view class="u-font-32">详情记录</view>
<view class="u-flex u-row-between u-m-t-48">
<view class="u-flex u-flex-col u-row-center u-col-center">
@ -57,9 +60,9 @@
<view class="u-font-32 u-m-t-10 font-bold">{{pageData.changeSum}}</view>
</view>
</view>
</view>
</view> -->
<template v-if="pageData.list.length">
<view class="u-m-b-28 u-m-t-28" v-for="(item,index) in pageData.list" :key="index">
<view class="u-m-b-28 " v-for="(item,index) in pageData.list" :key="index">
<list-item :data="item"></list-item>
</view>
<my-pagination :size="pageData.size" :totalElements="pageData.totalElements"
@ -209,7 +212,11 @@
const pageData = reactive({
query: {
page: 0,
size: 10
size: 10,
productId:'',
column:'/api/tbProductStockDetail/stock/count',
shopId:uni.getStorageSync('shopId'),
createdAt:[]
},
productId:'',
totalElements: 0,
@ -242,9 +249,9 @@
})
onLoad(opt => {
pageData.productId = opt ? opt.productId : ''
pageData.query.productId = opt ? opt.productId : ''
init()
getSum()
// getSum()
})
</script>
@ -317,6 +324,5 @@
}
.list {
margin-top: 52px;
}
</style>

6
pageWorkControl/index/index.vue
View File

@ -140,10 +140,10 @@
<my-button bgColor="#333" color="#fff" borderRadius="100rpx 0 0 100rpx" shape="circle" plain type="primary"
@tap="toSetting">设置</my-button>
</view> -->
<view class="u-flex-1">
<!-- <my-button borderRadius="0 100rpx 100rpx 0" shape="circle" type="primary" @tap="jiaoban">开始交班</my-button> -->
<!-- <view class="u-flex-1">
<my-button borderRadius="0 100rpx 100rpx 0" shape="circle" type="primary" @tap="jiaoban">开始交班</my-button>
<my-button borderRadius="100rpx" shape="circle" type="primary" @tap="jiaoban">开始交班</my-button>
</view>
</view> -->
</view>
<!-- 交班开班时间选择 -->

BIN
unpackage/debug/android_debug.apk Normal file
View File

Binary file not shown.