cxc/yshopb2c-qd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

yshop1.7发布,后台升級eladmin2.4(前端,后台权限,代码生成器等重构),修复商品分类等一些问题

Browse Source
This commit is contained in:
hupeng
2020-01-07 23:32:27 +08:00
parent 24753759f4
commit b6cc8046db
451 changed files with 13868 additions and 8883 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
src/views/wechat/config/form.vue
View File

@ -1,47 +1,47 @@
<template>
<el-dialog :append-to-body="true" :close-on-click-modal="false" :before-close="cancel" :visible.sync="dialog" :title="isAdd ? '新增' : '编辑'" width="500px">
<el-form ref="form" :model="form" :rules="rules" size="small" label-width="80px">
<el-form-item label="字段名称" >
<el-input v-model="form.menuName" style="width: 370px;"/>
<el-form-item label="字段名称">
<el-input v-model="form.menuName" style="width: 370px;" />
</el-form-item>
<el-form-item label="类型(文本框,单选按钮...)" >
<el-input v-model="form.type" style="width: 370px;"/>
<el-form-item label="类型(文本框,单选按钮...)">
<el-input v-model="form.type" style="width: 370px;" />
</el-form-item>
<el-form-item label="表单类型" >
<el-input v-model="form.inputType" style="width: 370px;"/>
<el-form-item label="表单类型">
<el-input v-model="form.inputType" style="width: 370px;" />
</el-form-item>
<el-form-item label="配置分类id" >
<el-input v-model="form.configTabId" style="width: 370px;"/>
<el-form-item label="配置分类id">
<el-input v-model="form.configTabId" style="width: 370px;" />
</el-form-item>
<el-form-item label="规则 单选框和多选框" >
<el-input v-model="form.parameter" style="width: 370px;"/>
<el-form-item label="规则 单选框和多选框">
<el-input v-model="form.parameter" style="width: 370px;" />
</el-form-item>
<el-form-item label="上传文件格式1单图2多图3文件" >
<el-input v-model="form.uploadType" style="width: 370px;"/>
<el-form-item label="上传文件格式1单图2多图3文件">
<el-input v-model="form.uploadType" style="width: 370px;" />
</el-form-item>
<el-form-item label="规则" >
<el-input v-model="form.required" style="width: 370px;"/>
<el-form-item label="规则">
<el-input v-model="form.required" style="width: 370px;" />
</el-form-item>
<el-form-item label="多行文本框的宽度" >
<el-input v-model="form.width" style="width: 370px;"/>
<el-form-item label="多行文本框的宽度">
<el-input v-model="form.width" style="width: 370px;" />
</el-form-item>
<el-form-item label="多行文框的高度" >
<el-input v-model="form.high" style="width: 370px;"/>
<el-form-item label="多行文框的高度">
<el-input v-model="form.high" style="width: 370px;" />
</el-form-item>
<el-form-item label="默认值" >
<el-input v-model="form.value" style="width: 370px;"/>
<el-form-item label="默认值">
<el-input v-model="form.value" style="width: 370px;" />
</el-form-item>
<el-form-item label="配置名称" >
<el-input v-model="form.info" style="width: 370px;"/>
<el-form-item label="配置名称">
<el-input v-model="form.info" style="width: 370px;" />
</el-form-item>
<el-form-item label="配置简介" >
<el-input v-model="form.desc" style="width: 370px;"/>
<el-form-item label="配置简介">
<el-input v-model="form.desc" style="width: 370px;" />
</el-form-item>
<el-form-item label="排序" >
<el-input v-model="form.sort" style="width: 370px;"/>
<el-form-item label="排序">
<el-input v-model="form.sort" style="width: 370px;" />
</el-form-item>
<el-form-item label="是否隐藏" >
<el-input v-model="form.status" style="width: 370px;"/>
<el-form-item label="是否隐藏">
<el-input v-model="form.status" style="width: 370px;" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">

51
src/views/wechat/config/index.vue
View File

@ -1,43 +1,42 @@
<template>
<div class="app-container">
<el-form ref="form" :model="form" :rules="rules" size="small" label-width="150px">
<el-form-item label="AppID" >
<el-input v-model="form.wechat_appid" style="width: 370px;"/>
<el-form-item label="AppID">
<el-input v-model="form.wechat_appid" style="width: 370px;" />
</el-form-item>
<el-form-item label="AppSecret" >
<el-form-item label="AppSecret">
<el-input v-model="form.wechat_appsecret" style="width: 370px;" type="password" />
</el-form-item>
<el-form-item label="微信验证TOKEN" >
<el-input v-model="form.wechat_token" style="width: 370px;"/>
<el-form-item label="微信验证TOKEN">
<el-input v-model="form.wechat_token" style="width: 370px;" />
</el-form-item>
<el-form-item label="EncodingAESKey" >
<el-input v-model="form.wechat_encodingaeskey" style="width: 370px;"/>
<el-form-item label="EncodingAESKey">
<el-input v-model="form.wechat_encodingaeskey" style="width: 370px;" />
</el-form-item>
<el-form-item label="微信服务器地址" >
<el-input v-model="form.api" :disabled="true" style="width: 370px;"/>
<el-form-item label="微信服务器地址">
<el-input v-model="form.api" :disabled="true" style="width: 370px;" />
</el-form-item>
<el-form-item label="微信分享图片" >
<pic-upload v-model="form.wechat_share_img" style="width: 370px;"/>
<el-form-item label="微信分享图片">
<pic-upload v-model="form.wechat_share_img" style="width: 370px;" />
</el-form-item>
<el-form-item label="微信分享标题" >
<el-input v-model="form.wechat_share_title" style="width: 370px;"/>
<el-form-item label="微信分享标题">
<el-input v-model="form.wechat_share_title" style="width: 370px;" />
</el-form-item>
<el-form-item label="微信分享简介" >
<el-input v-model="form.wechat_share_synopsis" style="width: 370px;" rows="5" type="textarea"/>
<el-form-item label="微信分享简介">
<el-input v-model="form.wechat_share_synopsis" style="width: 370px;" rows="5" type="textarea" />
</el-form-item>
<el-form-item label="" >
<el-button type="primary" @click="doSubmit">提交</el-button>
<el-form-item label="">
<el-button type="primary" @click="doSubmit">提交</el-button>
</el-form-item>
</el-form>
</div>
</template>
<script>
import checkPermission from '@/utils/permission'
import initData from '@/mixins/initData'
import initData from '@/mixins/crud'
import { del, add, get } from '@/api/yxSystemConfig'
import eForm from './form'
import picUpload from '@/components/pic-upload'
@ -70,10 +69,10 @@ export default {
}
},
created() {
get().then(rese=>{
let newObj = {}
rese.content.map(function (key,value) {
let keyName = key.menuName;
get().then(rese => {
const newObj = {}
rese.content.map(function(key, value) {
const keyName = key.menuName
newObj[keyName] = key.value
})
@ -84,12 +83,12 @@ export default {
checkPermission,
doSubmit() {
add(this.form).then(res => {
Message({message: '设置成功',type: 'success'})
Message({ message: '设置成功', type: 'success' })
}).catch(err => {
//this.loading = false
// this.loading = false
console.log(err.response.data.message)
})
},
}
}
}

39
src/views/wechat/config/pay.vue
View File

@ -1,35 +1,33 @@
<template>
<div class="app-container">
<el-form ref="form" :model="form" :rules="rules" size="small" label-width="150px">
<el-form-item label="AppID" >
<el-input v-model="form.wxpay_appId" style="width: 370px;"/>
<el-form-item label="AppID">
<el-input v-model="form.wxpay_appId" style="width: 370px;" />
</el-form-item>
<el-form-item label="商户id" >
<el-form-item label="商户id">
<el-input v-model="form.wxpay_mchId" style="width: 370px;" type="password" />
</el-form-item>
<el-form-item label="商户密钥" >
<el-form-item label="商户密钥">
<el-input v-model="form.wxpay_mchKey" style="width: 370px;" type="password" />
</el-form-item>
<el-form-item label="微信证书" >
<file-upload v-model="form.wxpay_keyPath" style="width: 500px;"/>
</el-form-item>
<el-form-item label="" >
<el-button type="primary" @click="doSubmit">提交</el-button>
<el-form-item label="">
<el-button type="primary" @click="doSubmit">提交</el-button>
</el-form-item>
</el-form>
</div>
</template>
<script>
import checkPermission from '@/utils/permission'
import initData from '@/mixins/initData'
import initData from '@/mixins/crud'
import { del, add, get } from '@/api/yxSystemConfig'
import eForm from './form'
import fileUpload from '@/components/file-upload'
import picUpload from '@/components/pic-upload'
import { Message } from 'element-ui'
export default {
components: { eForm, fileUpload },
components: { eForm, picUpload },
mixins: [initData],
data() {
return {
@ -37,18 +35,17 @@ export default {
form: {
wxpay_appId: '',
wxpay_mchId: '',
wxpay_mchKey: '',
wxpay_keyPath: ''
wxpay_mchKey: ''
},
rules: {
}
}
},
created() {
get().then(rese=>{
let newObj = {}
rese.content.map(function (key,value) {
let keyName = key.menuName;
get().then(rese => {
const newObj = {}
rese.content.map(function(key, value) {
const keyName = key.menuName
newObj[keyName] = key.value
})
@ -59,12 +56,12 @@ export default {
checkPermission,
doSubmit() {
add(this.form).then(res => {
Message({message: '设置成功',type: 'success'})
Message({ message: '设置成功', type: 'success' })
}).catch(err => {
//this.loading = false
// this.loading = false
console.log(err.response.data.message)
})
},
}
}
}

24
src/views/wechat/config/point.vue
View File

@ -1,12 +1,12 @@
<template>
<div class="app-container">
<el-form ref="form" :model="form" :rules="rules" size="small" label-width="150px">
<el-form-item label="积分抵用比例" >
<el-input v-model="form.integral_ratio" style="width: 370px;"/>
<el-form-item label="积分抵用比例">
<el-input v-model="form.integral_ratio" style="width: 370px;" />
<p style="color: red">积分抵用比例(1积分抵多少金额)</p>
</el-form-item>
<el-form-item label="" >
<el-button type="primary" @click="doSubmit">提交</el-button>
<el-form-item label="">
<el-button type="primary" @click="doSubmit">提交</el-button>
</el-form-item>
</el-form>
</div>
@ -14,7 +14,7 @@
<script>
import checkPermission from '@/utils/permission'
import initData from '@/mixins/initData'
import initData from '@/mixins/crud'
import { del, add, get } from '@/api/yxSystemConfig'
import eForm from './form'
import picUpload from '@/components/pic-upload'
@ -33,10 +33,10 @@ export default {
}
},
created() {
get().then(rese=>{
let newObj = {}
rese.content.map(function (key,value) {
let keyName = key.menuName;
get().then(rese => {
const newObj = {}
rese.content.map(function(key, value) {
const keyName = key.menuName
newObj[keyName] = key.value
})
@ -47,12 +47,12 @@ export default {
checkPermission,
doSubmit() {
add(this.form).then(res => {
Message({message: '设置成功',type: 'success'})
Message({ message: '设置成功', type: 'success' })
}).catch(err => {
//this.loading = false
// this.loading = false
console.log(err.response.data.message)
})
},
}
}
}

42
src/views/wechat/config/promoter.vue
View File

@ -1,29 +1,29 @@
<template>
<div class="app-container">
<el-form ref="form" :model="form" :rules="rules" size="small" label-width="150px">
<el-form-item label="分销模式" >
<el-form-item label="分销模式">
<el-radio v-model="form.store_brokerage_statu" :label="1">指定分销</el-radio>
<el-radio v-model="form.store_brokerage_statu" :label="2">人人分销</el-radio>
</el-form-item>
<el-form-item label="一级返佣比例" >
<el-input v-model="form.store_brokerage_ratio" style="width: 370px;"/>
<el-form-item label="一级返佣比例">
<el-input v-model="form.store_brokerage_ratio" style="width: 370px;" />
<p style="color: red">订单交易成功后给上级返佣的比例0 - 100,例:5 = 反订单金额的5%</p>
</el-form-item>
<el-form-item label="二级返佣比例" >
<el-input v-model="form.store_brokerage_two" style="width: 370px;"/>
<el-form-item label="二级返佣比例">
<el-input v-model="form.store_brokerage_two" style="width: 370px;" />
<p style="color: red">订单交易成功后给上级返佣的比例0 - 100,例:5 = 反订单金额的5%</p>
</el-form-item>
<el-form-item label="提现最低金额" >
<el-input v-model="form.user_extract_min_price" style="width: 370px;"/>
<el-form-item label="提现最低金额">
<el-input v-model="form.user_extract_min_price" style="width: 370px;" />
</el-form-item>
<el-form-item label="H5地址" >
<el-input v-model="form.site_url" style="width: 370px;"/>
<el-form-item label="H5地址">
<el-input v-model="form.site_url" style="width: 370px;" />
</el-form-item>
<el-form-item label="API地址" >
<el-input v-model="form.api_url" style="width: 370px;"/>
<el-form-item label="API地址">
<el-input v-model="form.api_url" style="width: 370px;" />
</el-form-item>
<el-form-item label="" >
<el-button type="primary" @click="doSubmit">提交</el-button>
<el-form-item label="">
<el-button type="primary" @click="doSubmit">提交</el-button>
</el-form-item>
</el-form>
</div>
@ -31,7 +31,7 @@
<script>
import checkPermission from '@/utils/permission'
import initData from '@/mixins/initData'
import initData from '@/mixins/crud'
import { del, add, get } from '@/api/yxSystemConfig'
import eForm from './form'
import picUpload from '@/components/pic-upload'
@ -55,10 +55,10 @@ export default {
}
},
created() {
get().then(rese=>{
let newObj = {}
rese.content.map(function (key,value) {
let keyName = key.menuName;
get().then(rese => {
const newObj = {}
rese.content.map(function(key, value) {
const keyName = key.menuName
newObj[keyName] = key.value
})
this.form = newObj
@ -69,12 +69,12 @@ export default {
checkPermission,
doSubmit() {
add(this.form).then(res => {
Message({message: '设置成功',type: 'success'})
Message({ message: '设置成功', type: 'success' })
}).catch(err => {
//this.loading = false
// this.loading = false
console.log(err.response.data.message)
})
},
}
}
}

27
src/views/wechat/config/wxapp.vue
View File

@ -1,25 +1,24 @@
<template>
<div class="app-container">
<el-form ref="form" :model="form" :rules="rules" size="small" label-width="150px">
<el-form-item label="AppID" >
<el-input v-model="form.wxapp_appId" style="width: 370px;"/>
<el-form-item label="AppID">
<el-input v-model="form.wxapp_appId" style="width: 370px;" />
</el-form-item>
<el-form-item label="小程序密钥" >
<el-form-item label="小程序密钥">
<el-input v-model="form.wxapp_secret" style="width: 370px;" type="password" />
</el-form-item>
<el-form-item label="" >
<el-button type="primary" @click="doSubmit">提交</el-button>
<el-form-item label="">
<el-button type="primary" @click="doSubmit">提交</el-button>
</el-form-item>
</el-form>
</div>
</template>
<script>
import checkPermission from '@/utils/permission'
import initData from '@/mixins/initData'
import initData from '@/mixins/crud'
import { del, add, get } from '@/api/yxSystemConfig'
import eForm from './form'
import picUpload from '@/components/pic-upload'
@ -39,10 +38,10 @@ export default {
}
},
created() {
get().then(rese=>{
let newObj = {}
rese.content.map(function (key,value) {
let keyName = key.menuName;
get().then(rese => {
const newObj = {}
rese.content.map(function(key, value) {
const keyName = key.menuName
newObj[keyName] = key.value
})
@ -53,12 +52,12 @@ export default {
checkPermission,
doSubmit() {
add(this.form).then(res => {
Message({message: '设置成功',type: 'success'})
Message({ message: '设置成功', type: 'success' })
}).catch(err => {
//this.loading = false
// this.loading = false
console.log(err.response.data.message)
})
},
}
}
}