angelo
/
web-retail-admin
3
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'test' of 47.94.45.65:angelo/web-retail-admin into base-online

This commit is contained in:
woody 2025-07-09 10:32:24 +08:00
parent 702f96615f a46814e6c8
commit 22440e6963
4 changed files with 103 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

116
src/views/configManage/paySet/index.vue
View File

@ -7,37 +7,79 @@
<template> <template>
<div class="page"> <div class="page">
<div class="topbox"> <div class="topbox">
<div class="levelList_i" <div
:class="tabActive == item.id ? 'act' : ''"
v-for="(item, index) in topList" v-for="(item, index) in topList"
:key="index" :key="index"
@click.prevent="handleLink(item.id)"> class="levelList_i"
:class="tabActive == item.id ? 'act' : ''"
@click.prevent="handleLink(item.id)"
>
{{ item.name }} {{ item.name }}
</div> </div>
</div> </div>
<div class="main"> <div class="main">
<div class="contain"> <div class="contain">
<div class="tit">{{'支付配置'}}</div> <div class="tit">{{ '支付配置' }}</div>
<div class="xian"></div> <div class="xian" />
<div class="pod"> <div class="pod">
<!-- <el-checkbox v-model="formData.pay4"-->
<el-checkbox v-model="formData.pay81" <!-- border>京东银行卡</el-checkbox>-->
border>新汇付PC微信扫码支付</el-checkbox> <el-checkbox
<el-checkbox v-model="formData.pay82" v-model="formData.pay5"
border>新汇付PC支付宝扫码支付</el-checkbox> border
<el-checkbox v-model="formData.pay83" >京东收银台（H5）</el-checkbox>
border>新汇付H5微信支付</el-checkbox> <el-checkbox
<el-checkbox v-model="formData.pay84" v-model="formData.pay6"
border>新汇付H5支付宝支付</el-checkbox> border
>京东收银台（PC）</el-checkbox>
<!-- <el-checkbox v-model="formData.pay11"-->
<!-- border>宝付微信</el-checkbox>-->
<!-- <el-checkbox v-model="formData.pay12"-->
<!-- border>宝付微信扫码</el-checkbox>-->
<!-- <el-checkbox v-model="formData.pay13"-->
<!-- border>汇付微信</el-checkbox>-->
<!-- <el-checkbox v-model="formData.pay15"-->
<!-- border>汇付银行卡</el-checkbox>-->
<!-- <el-checkbox v-model="formData.pay20"-->
<!-- border>微信APP</el-checkbox>-->
<el-checkbox
v-model="formData.pay32"
border
>通联微信</el-checkbox>
<el-checkbox
v-model="formData.pay33"
border
>通联银行卡</el-checkbox>
<!-- <el-checkbox v-model="formData.pay71"-->
<!-- border>快钱APP微信</el-checkbox>-->
<!-- <el-checkbox v-model="formData.pay72"-->
<!-- border>快钱APP支付宝</el-checkbox>-->
<!-- <el-checkbox v-model="formData.pay73"-->
<!-- border>快钱微信扫码</el-checkbox>-->
<!-- <el-checkbox v-model="formData.pay74"-->
<!-- border>快钱支付宝扫码</el-checkbox>-->
<el-checkbox
v-model="formData.pay81"
border
>新汇付PC微信扫码</el-checkbox>
<el-checkbox
v-model="formData.pay82"
border
>新汇付PC支付宝扫码</el-checkbox>
</div> </div>
</div> </div>
<div class="footer"> <div class="footer">
<el-button size="small" <el-button
class="thebtn2"> {{ '取消' }}</el-button> size="small"
<el-button size="small" class="thebtn2"
> {{ '取消' }}</el-button>
<el-button
size="small"
class="thebtn1"
style="background-color: #c8161d"
@click="submit()" @click="submit()"
class="thebtn1" style="background-color: #c8161d"> {{ '确认' }}</el-button> > {{ '确认' }}</el-button>
</div> </div>
</div> </div>
</div> </div>
@ -46,23 +88,35 @@
import * as api from '@/api/financialCase.js' import * as api from '@/api/financialCase.js'
export default { export default {
name: 'jcsz', name: 'Jcsz',
data() { data() {
return { return {
tabActive: 0, tabActive: 0,
formData: { formData: {
// pay4: false,
pay5: false,
pay6: false,
// pay11: false,
// pay12: false,
// pay13: false,
// pay15: false,
pay20: false,
pay32: false,
pay33: false,
// pay71: false,
// pay72: false,
// pay73: false,
// pay74: false,
pay81: false, pay81: false,
pay82: false, pay82: false
pay83: false,
pay84: false
}, },
topList: [ topList: [
{ {
name: '支付配置', name: '支付配置',
id: 0, id: 0
}, }
], ],
checkboxGroup: [], checkboxGroup: []
} }
}, },
mounted() { mounted() {
@ -90,12 +144,12 @@ export default {
if (res.code == 200) { if (res.code == 200) {
this.$message({ this.$message({
message: res.msg, message: res.msg,
type: 'success', type: 'success'
}) })
} }
}) })
}, }
}, }
} }
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">
@ -182,7 +236,11 @@ export default {
background: rgba(0, 0, 0, 0.1); background: rgba(0, 0, 0, 0.1);
} }
.pod { .pod {
padding: 20px; // padding: 20px;
padding: 10px;
display: flex;
flex-wrap: wrap;
// gap: 20px;
} }
.footer { .footer {
height: 68px; height: 68px;

7
src/views/goodsManage/goodsList/goodsEdit/jcsz.vue
View File

@ -134,7 +134,7 @@
style="width: 100%" style="width: 100%"
:controls="false" :controls="false"
clearable clearable
:disabled="methods == 0" :disabled="methods == 0 || form.areaIncomeType == 1"
:placeholder="'请输入'" :placeholder="'请输入'"
> >
<template v-if="form.areaIncomeType == 1" slot="append"> <template v-if="form.areaIncomeType == 1" slot="append">
@ -1155,6 +1155,8 @@ export default {
handleAreaIncomeTypeChange(val) { handleAreaIncomeTypeChange(val) {
if (val == 1) { if (val == 1) {
this.form.areaIncome = 0.5 this.form.areaIncome = 0.5
} else {
this.form.areaIncome = ''
} }
}, },
// getWaresSort() { // getWaresSort() {
@ -1450,7 +1452,8 @@ export default {
}, },
selSpecial(e) { selSpecial(e) {
if (e == 43) { if (e == 43) {
this.$set(this.form, 'areaIncomeType', 2) this.$set(this.form, 'areaIncomeType', 1)
this.$set(this.form, 'areaIncome', 0.5)
} }
this.get_hierarchy_list(e) this.get_hierarchy_list(e)
console.log( console.log(

7
src/views/goodsManage/goodsRelease/jcsz.vue
View File

@ -128,7 +128,7 @@
style="width: 100%" style="width: 100%"
:controls="false" :controls="false"
clearable clearable
:disabled="methods == 0" :disabled="methods == 0 || form.areaIncomeType == 1"
:placeholder="'请输入'" :placeholder="'请输入'"
> >
<template v-if="form.areaIncomeType == 1" slot="append"> <template v-if="form.areaIncomeType == 1" slot="append">
@ -1052,6 +1052,8 @@ export default {
handleAreaIncomeTypeChange(val) { handleAreaIncomeTypeChange(val) {
if (val == 1) { if (val == 1) {
this.form.areaIncome = 0.5 this.form.areaIncome = 0.5
} else {
this.form.areaIncome = ''
} }
}, },
// getWaresSort() { // getWaresSort() {
@ -1244,7 +1246,8 @@ export default {
}, },
selSpecial(e) { selSpecial(e) {
if (e == 43) { if (e == 43) {
this.$set(this.form, 'areaIncomeType', 2) this.$set(this.form, 'areaIncomeType', 1)
this.$set(this.form, 'areaIncome', 0.5)
} }
this.get_hierarchy_list(e) this.get_hierarchy_list(e)
if ( if (

6
vue.config.js
View File

@ -44,9 +44,9 @@ module.exports = {
}, },
proxy: { proxy: {
'/prod-api': { '/prod-api': {
target: 'http://t-app.beida777.com', target: 'http://192.168.0.86:8080',
changeOrigin: true changeOrigin: true,
// pathRewrite: { '^/prod-api': '' } pathRewrite: { '^/prod-api': '' }
} }
} }
}, },