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

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

Browse Source
This commit is contained in:
duan
2024-11-04 15:44:57 +08:00
parent 0d1bde23c3 8f9e06bc84
commit d7a6ba1c62
6 changed files with 28 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
pageCategory/edit-category/edit-category.vue
View File

@@ -71,7 +71,8 @@
</uni-forms-item> -->
</view>
<template v-if="option.type==='edit'">
<!-- <template v-if="option.type==='edit'"> -->
<template v-if="false">
<view class="font-bold u-m-t-32 u-m-b-32">子分类</view>
<view class="block u-p-t-32 u-p-b-32" v-if=" category.childrenList.length">
<view class="u-flex u-text-center u-font-24">
@@ -175,14 +176,14 @@
</template>
</uni-forms>
</view>
<template v-if="option.type==='edit'">
<!-- <template v-if="option.type==='edit'">
<view class="u-flex block u-p-l-20 u-p-r-20 u-p-t-28 u-p-b-28" @click="addcategoryChildren">
<view class="icon icon-add u-m-r-22 ">
</view>
<view class="color-main">添加子分类</view>
</view>
</template>
</template> -->
<view class="save-btn-box">

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

@@ -5,14 +5,14 @@
<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"
<image src="/pageProduct/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"
<image src="/pageProduct/static/images/icon-arrow-down-fill.svg" class="icon-arrow-down-fill"
mode="">
</image>
</view>

1
pageProduct/static/images/icon-arrow-down-fill.svg Normal file
View File

@@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" width="8.42" height="4.945" viewBox="0 0 8.42 4.945"><defs><style>.a{fill:#333;}</style></defs><path class="a" d="M230.634,368.187a.7.7,0,0,0-.513-.187l-7,.047a.7.7,0,0,0-.513.187.676.676,0,0,0,0,.979l3.5,3.5c.047.047.14.093.187.14l.047.047a.731.731,0,0,0,.746-.14l3.5-3.546A.735.735,0,0,0,230.634,368.187Z" transform="translate(-222.4 -368)"/></svg>
Side by Side

After

Width:  |  Height:  |  Size: 390 B

2
pages/shopSetUp/index.vue
View File

@@ -46,7 +46,7 @@
<view class="right">
<view>
<up-checkbox-group><up-checkbox label="免桌位费" v-model:checked="vdata.isTableFee" activeColor="#0FC161" shape="circle" @change="isTableFeeChange"> </up-checkbox></up-checkbox-group>
</view><up-icon name="arrow-right" color="#999999" size="15"></up-icon>
</view></up-icon>
</view>
</view>
<view class="page-cell m">

9
pagesOrder/detail/detail.vue
View File

@@ -221,7 +221,7 @@
if(!canJieZhang){
return
}
const userId=orderDetail.info.userId||''
const memberId=orderDetail.info.memberId||''
clearEmit()
go.to('PAGES_ORDER_PAY', {
tableId: options.tableId|| orderDetail.info.tableId,
@@ -229,7 +229,7 @@
masterId: options.masterId,
orderId: orderDetail.info.id,
discount: 1,
userId
memberId
})
}
@@ -243,8 +243,8 @@
const options = reactive({})
async function init() {
const res = await orderApi.tbOrderInfoDetail(options.id)
if(res.userId){
queryAllShopUser({id:res.userId}).then(res=>{
if(res.memberId){
queryAllShopUser({id:res.memberId}).then(res=>{
if(res.content[0]){
user.value=res.content[0]
}
@@ -320,6 +320,7 @@
//更新选择用户
function setUser(par) {
const submitPar = {
orderId:options.id||'',
masterId: options.masterId,
tableId: options.tableId|| orderDetail.info.tableId,
vipUserId: user.value.id ? user.value.id : '',

25
pagesOrder/pay-order/pay-order.vue
View File

@@ -42,13 +42,18 @@
<view class="u-flex u-row-between u-p-t-30 u-p-b-30 border-bottom">
<view class="u-flex">
<image class="icon" :src="item.icon" mode=""></image>
<text class="u-m-l-10">{{item.payName}}</text>
<text class="u-m-l-10 no-wrap">{{item.payName}}</text>
</view>
<view class="u-flex color-999 u-font-24">
<view class="u-m-r-20" v-if="item.payType=='vipPay'">
<text class="u-m-r-4">{{user.telephone||user.nickName}}</text>
<text>余额：</text>
<text>￥{{user.amount||'0'}}</text>
<view>
<text>会员：</text>
<text class="u-m-r-4">{{user.telephone||user.nickName}}</text>
</view>
<view>
<text>余额：</text>
<text>￥{{user.amount||'0'}}</text>
</view>
</view>
<my-radio @click="changePayType(index,item)"
:modelValue="index==pays.payTypes.selIndex">
@@ -195,7 +200,7 @@
type: data.id ? 0 : 1 //0 设置 1 取消
}).then(res=>{
user.value = data
order.userId=data.id
order.memberId=data.id
})
})
}
@@ -286,7 +291,7 @@
masterId: order.masterId,
orderId: order.id || order.orderId,
payType,
vipUserId: order.userId,
vipUserId: order.memberId,
discount: 1,
code: ''
})
@@ -337,11 +342,11 @@
})
let payCodeUrl = ref('')
async function init() {
const res = await orderApi.tbOrderInfoDetail(order.orderId)
Object.assign(order, res)
if (order.userId) {
const orderRes = await orderApi.tbOrderInfoDetail(order.orderId)
Object.assign(order, orderRes)
if (orderRes.memberId) {
queryAllShopUser({
id: order.userId
id: orderRes.memberId
}).then(res => {
if(res.content[0]){
user.value =res.content[0]