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

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

Browse Source
This commit is contained in:
YeMingfei666
2024-11-23 09:36:22 +08:00
parent 0f2e791557 8dfd42f20a
commit 0906ab8523
5 changed files with 32 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
pageBwc/index/index.vue
View File

@@ -1,23 +1,23 @@
<template>
<view class="boxconstant">
<view class="boxconstantbox"
style="border-radius: 18px 18px 0 0;padding:32rpx 24rpx 0 24rpx;border-bottom: 2rpx solid #E5E5E5;">
style="border-radius: 18px 18px 0 0;padding:32rpx 24rpx;border-bottom: 2rpx solid #E5E5E5;">
<view class="boxconstantbox_one">
充值设置
</view>
<view class="boxconstantbox_tow">
<text>用户消费结账时，成功充值</text>
<input class="number" v-model="form.rechargeTimes"></input>
<input class="text" type="number" v-model="form.rechargeTimes" />
<text>倍的金额本单即可享受免单</text>
</view>
</view>
<view class="boxconstantbox" style="padding:32rpx 24rpx 0 24rpx; border-radius: 0 0 18px 18px;">
<view class="boxconstantbox" style="border-radius: 0 0 18px 18px;">
<view class="boxconstantbox_one">
充值门槛
</view>
<view class="boxconstantbox_tow">
<text>订单支付金额需满</text>
<input class="number" v-model="form.rechargeThreshold"></input>
<input class="text" type="number" v-model="form.rechargeThreshold"></input>
<text> 元，才能使用</text>
</view>
</view>
@@ -28,11 +28,11 @@
<up-switch v-model="form.enable" size="18"></up-switch>
</view>
<view class="boxconstantbox"
style="margin-top:24rpx; padding:32rpx 24rpx 0 24rpx; border-radius: 0 0 18px 18px;">
style="margin-top:24rpx; padding:32rpx 24rpx; border-radius: 0 0 18px 18px;">
<view class="boxconstantbox_one">
充值说明
</view>
<view class="boxconstantbox_tow">
<view>
<up-textarea v-model="form.rechargeDesc" placeholder="请输入内容"></up-textarea>
</view>
</view>
@@ -71,7 +71,7 @@
useTypeList: [],
childShopIdList: '',
});
const getlist = async () => {
let res = await get()
console.log(res)
@@ -83,9 +83,9 @@
title: '保存成功'
})
Object.assign(form, res)
setTimeout(()=>{
setTimeout(() => {
uni.navigateBack()
},1500)
}, 1500)
}
onShow(() => {
getlist()
@@ -113,21 +113,22 @@
}
.boxconstantbox_tow {
display: flex;
justify-content: flex-start;
align-items: center;
flex-wrap: wrap;
padding-bottom: 24rpx;
font-family: Source Han Sans CN, Source Han Sans CN;
font-weight: 400;
font-size: 28rpx;
color: #333333;
box-sizing: border-box;
// display: flex;
// justify-content: flex-start;
// align-items: center;
// flex-wrap: wrap;
// align-content: flex-start;
.text {
display:inline-flex;
text-align: center;
margin: 0 12rpx;
width: 118rpx;
height: 48rpx;
line-height: 48rpx;
background: #FFFFFF;
border-radius: 8rpx 8rpx 8rpx 8rpx;
border: 2rpx solid #E5E5E5;

15
pageCoupon/discountCoupons.vue
View File

@@ -8,9 +8,9 @@
</view>
</view>
<view class="item">
<view class="lable">使用门槛</view>
<view class="lable">使用门槛2</view>
<view class="value">
<view>满</view><input v-model="formData.fullAmount" placeholder="填写金额" border="none"></input><view>元</view>，<view>减</view><input v-model="formData.discountAmount" placeholder="填写金额" border="none"></input><view>元</view>
<view>满</view><input v-model="formData.fullAmount" type="number" placeholder="填写金额" border="none"></input><view>元</view>，<view>减</view><input v-model="formData.discountAmount" type="number" placeholder="填写金额" border="none"></input><view>元</view>
</view>
</view>
</view>
@@ -35,13 +35,15 @@
<view class="item">
<view class="lable">有效期（天）</view>
<view class="value">
<up-input v-model="formData.validDays" placeholder="填写天数" border="none"></up-input>
<up-input v-model="formData.validDays" type="number" placeholder="填写天数" border="none"></up-input>
</view>
</view>
<view class="item">
<view class="lable">隔天生效<up-icon @click="modalShow(1)" name="question-circle" color="#999" size="20" style="margin-left: 10rpx;"></up-icon></view>
<view class="lable">隔天生效
<!-- <up-icon @click="modalShow(1)" name="question-circle" color="#999" size="20" style="margin-left: 10rpx;"></up-icon> -->
</view>
<view class="value">
<view>隔</view><input v-model="formData.daysToTakeEffect" placeholder="填写天数" border="none" ></input><view>天生效</view>
<view>隔</view><input v-model="formData.daysToTakeEffect" type="number" placeholder="填写天数" border="none" ></input><view>天生效</view>
</view>
</view>
<view class="item">
@@ -79,7 +81,7 @@
<view class="card">
<view class="item">
<view class="lable">总发放数量
<up-icon @click="modalShow(2)" name="question-circle" color="#999" size="20" style="margin-left: 10rpx;"></up-icon>
<!-- <up-icon @click="modalShow(2)" name="question-circle" color="#999" size="20" style="margin-left: 10rpx;"></up-icon> -->
</view>
<view class="value">
<up-input v-model="formData.number" placeholder="填写数量" border="none" clearable ></up-input>
@@ -311,6 +313,7 @@
height: 150rpx;
width: 100%;
background-color: #fff;
z-index: 9;
>button {
width: 530rpx;
margin: 30rpx 0;

4
pageCoupon/editCertificate.vue
View File

@@ -10,13 +10,13 @@
<view class="item">
<view class="lable">使用门槛</view>
<view class="value">
<view>满</view><input v-model="formData.fullAmount" placeholder="填写金额" border="none"></input><view>元，可用</view>
<view>满</view><input v-model="formData.fullAmount" type="number" placeholder="填写金额" border="none"></input><view>元，可用</view>
</view>
</view>
<view class="item">
<view class="lable">总发放数量</view>
<view class="value">
<up-input v-model="formData.number" placeholder="填写数量" border="none" clearable ></up-input>
<up-input v-model="formData.number" type="number" placeholder="填写数量" border="none" clearable ></up-input>
</view>
</view>
</view>

8
pageCoupon/index.vue
View File

@@ -36,10 +36,10 @@
<view v-if="item.type == 1"> 满 {{ item.fullAmount }} 元减 {{ item.discountAmount }} 元 </view>
<view v-if="item.type == 2"> 满 {{ item.fullAmount }} 元可用 </view>
</view>
<view>
<!-- <view>
<view> 领取方式 </view>
<view> 用户不可自行领取 </view>
</view>
</view> -->
<view v-if="item.type == 1">
<view> 有效期 </view>
<view> 领券后{{ item.validDays }}天过期 </view>
@@ -197,7 +197,7 @@
padding: 32rpx 28rpx;
background-color: #fff;
position: fixed;
top: 79rpx;
top: 0rpx;
z-index: 999;
.tag-item {
display: inline-block;
@@ -253,7 +253,7 @@
/* height: 544rpx; */
margin: 32rpx auto 0;
margin-bottom: 32rpx;
padding: 122rpx 28rpx 182rpx 28rpx;
padding: 70rpx 28rpx 182rpx 28rpx;
}
.couponContent {
/* background-color: #f9f9f9; */

1
pageWorkControl/index/index.vue
View File

@@ -120,7 +120,6 @@
<view class="constantboxitem" v-for="(item,index) in tableData.data" :key="index"
@click="toDetail(item)">
<view class="head">{{item.dutyId|| '无'}}</view>
<view class="head">班次</view>
<view class="head">{{item.staffName || '无'}}</view>
<view class="head">{{item.startTime|| '无'}}</view>
<view class="head">{{item.endTime|| '无'}}</view>