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

Merge branch 'dev' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into ymf

This commit is contained in:
YeMingfei666 2024-08-23 14:32:07 +08:00
parent eaaf7f5c60 d0f567209b
commit d275c5ea3c
2 changed files with 23 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/views/shop/components/addStaff.vue
View File

@ -16,9 +16,19 @@
<el-form-item label="登录密码">
<el-input type="password" v-model="form.password" placeholder="请输入登录密码，不填默认123456" />
</el-form-item>
<el-form-item label="最大优惠金额">
<el-input-number v-model="form.maxDiscountAmount" controls-position="right" :min="0"
:max="100000"></el-input-number>
<el-form-item label="优惠类型">
<el-radio-group v-model="form.discountType" @change="form.maxDiscountAmount = 0">
<el-radio-button label="1">折扣</el-radio-button>
<el-radio-button label="0">金额</el-radio-button>
</el-radio-group>
</el-form-item>
<el-form-item label="最大优惠金额" v-if="form.discountType == 0">
<el-input-number v-model="form.maxDiscountAmount" controls-position="right" :min="0" :max="100000"
:step="0.1" style="width: 200px;"></el-input-number>
</el-form-item>
<el-form-item label="最低优惠折扣" v-if="form.discountType == 1">
<el-input-number v-model="form.maxDiscountAmount" controls-position="right" :min="0" :max="9.9"
:step="0.1" style="width: 200px;"></el-input-number>
</el-form-item>
<el-form-item label="角色" prop="roleId">
<el-select v-model="form.roleId" placeholder="请选择角色">
@ -54,6 +64,7 @@ export default {
name: '',
code: '',
account: '',
discountType: '1',
maxDiscountAmount: '',
status: 1,
isPc: 1,

19
src/views/user_manage/components/addActive.vue
View File

@ -30,14 +30,13 @@
</el-button>
</div>
<div class="shop_list">
<div class="item_wrap" v-for="(item, index) in productIds" :key="item.id">
<div style="display: flex;align-items: center;margin-top: 6px;">
<div class="name">{{ item.name }}</div>
<el-input style="width: 120px;" v-model="item.num" placeholder='请填写数量'
@input="checkIfNum(item)"></el-input>
<el-button type="text" @click="productIds.splice(index, 1)"
style="margin-left: 20px;">删除</el-button>
</div>
<div class="item_wrap" style="display: flex;align-items: center;margin-top: 6px;"
v-for="(item, index) in productIds" :key="item.id">
<div class="name">{{ item.name }}</div>
<el-input style="width: 120px;" v-model="item.num" placeholder='请填写数量'
@input="checkIfNum(item)"></el-input>
<el-button type="text" @click="productIds.splice(index, 1)"
style="margin-left: 20px;">删除</el-button>
</div>
</div>
</el-form-item>
@ -176,8 +175,8 @@ export default {
</script>
<style scoped lang="scss">
.shop_list {
display: flex;
flex-wrap: wrap;
// display: flex;/
// flex-wrap: wrap;
.item_wrap {
$size: 80px;