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

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

This commit is contained in:
YeMingfei666 2024-11-11 10:07:36 +08:00
parent 7f265b7583 6f9a35f4d7
commit e0e5f703a1
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pageConsumables/components/my-date-pickerview.vue
View File

@ -24,7 +24,7 @@
<picker-view-column>
<view class="item" v-for="(item,index) in days" :key="index">{{item}}日</view>
</picker-view-column>
<picker-view-column>
<!-- <picker-view-column>
<view class="item" v-for="(item,index) in hours" :key="index">{{item}}时</view>
</picker-view-column>
<picker-view-column>
@ -32,7 +32,7 @@
</picker-view-column>
<picker-view-column>
<view class="item" v-for="(item,index) in seconds" :key="index">{{item}}秒</view>
</picker-view-column>
</picker-view-column> -->
</picker-view>
<view class="u-text-center color-999">至</view>
<picker-view :immediate-change="true" :value="value1" @pickend="pickend1" @change="bindChange1"
@ -46,7 +46,7 @@
<picker-view-column>
<view class="item" v-for="(item,index) in days1" :key="index">{{item}}日</view>
</picker-view-column>
<picker-view-column>
<!-- <picker-view-column>
<view class="item" v-for="(item,index) in hours" :key="index">{{item}}时</view>
</picker-view-column>
<picker-view-column>
@ -54,7 +54,7 @@
</picker-view-column>
<picker-view-column>
<view class="item" v-for="(item,index) in seconds" :key="index">{{item}}秒</view>
</picker-view-column>
</picker-view-column> -->
</picker-view>
<!-- 站位 -->

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

@ -846,7 +846,7 @@
},
{
minLength: 1,
maxLength: 20,
maxLength: 40,
errorMessage: '商品名称长度在 {minLength} 到 {maxLength} 个字符',
}
]
@ -1375,7 +1375,7 @@
for (let i of FormData.specificationsGroup.selectSpec) {
if (i.selectSpecResult.length) {
skuSnap.push({
label: i.name,
name: i.name,
value: i.selectSpecResult.join(',')
})
}

10
pages/index/index.vue
View File

@ -164,11 +164,11 @@
icon: '/static/indexImg/icon-line-up.svg',
pageUrl: 'PAGES_LINE_UP'
},
{
title: '霸王餐',
icon: '/static/indexImg/icon-bwc.svg',
pageUrl: 'PAGES_BWC'
},
// {
// title: '霸王餐',
// icon: '/static/indexImg/icon-bwc.svg',
// pageUrl: 'PAGES_BWC'
// },
// {
// title: '成员管理',
// icon: '/static/indexImg/icon-staff.svg',