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

yshop1.7.2发布:新增小程序支付与登录,后台新增小程序跳转页面,升级swagger-bootstrap,swaager统一配置迁移到common(防止注解冲突)

Browse Source
This commit is contained in:
hupeng
2020-01-09 16:11:33 +08:00
parent 9faa866880
commit 509669fe9f
9 changed files with 53 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/views/home.vue
View File

@ -52,6 +52,21 @@ export default {
...mapGetters([
'roles'
])
},
created() {
this.open()
},
methods: {
open() {
this.$notify({
title: '公众号演示',
dangerouslyUseHTMLString: true,
message: '<img src="https://image.dayouqiantu.cn/qrcode_for_gh_95df5a2881cc_258.jpg">',
duration: 0
});
}
}
}
</script>

12
src/views/shop/set/form.vue
View File

@ -1,14 +1,17 @@
<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 ref="form" :model="form" :rules="rules" size="small" label-width="120px">
<el-form-item label="标题">
<el-input v-model="form.name" style="width: 370px;" />
<el-input v-model="form.name" style="width: 300px;" />
</el-form-item>
<el-form-item label="跳转url">
<el-input v-model="form.url" style="width: 370px;" />
<el-input v-model="form.url" style="width: 300px;" />
</el-form-item>
<el-form-item label="小程序跳转page">
<el-input v-model="form.wxapp_url" style="width: 300px;" />
</el-form-item>
<el-form-item label="图片(750*375)">
<pic-upload v-model="form.pic" style="width: 500px;" />
<pic-upload v-model="form.pic" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
@ -38,6 +41,7 @@ export default {
groupName: 'routine_home_banner',
name: '',
url: '',
wxapp_url: '',
pic: '',
sort: '',
status: ''

2
src/views/shop/set/index.vue
View File

@ -21,6 +21,7 @@
<el-table-column prop="id" label="ID" />
<el-table-column prop="map.name" label="标题" />
<el-table-column prop="map.url" label="链接url" />
<el-table-column prop="map.wxapp_url" label="小程序跳转page" />
<el-table-column ref="table" label="图片">
<template slot-scope="scope">
<a :href="scope.row.map.pic" style="color: #42b983" target="_blank"><img :src="scope.row.map.pic" alt="点击打开" class="el-avatar"></a>
@ -113,6 +114,7 @@ export default {
groupName: data.groupName,
name: data.map.name,
url: data.map.url,
wxapp_url: data.map.wxapp_url,
pic: data.map.pic
}
_this.dialog = true

2
src/views/shop/set/menu.vue
View File

@ -21,6 +21,7 @@
<el-table-column prop="id" label="ID" />
<el-table-column prop="map.name" label="分类名称" />
<el-table-column prop="map.url" label="链接url" />
<el-table-column prop="map.wxapp_url" label="小程序跳转page" />
<el-table-column ref="table" label="分类图标">
<template slot-scope="scope">
<a :href="scope.row.map.pic" style="color: #42b983" target="_blank"><img :src="scope.row.map.pic" alt="点击打开" class="el-avatar"></a>
@ -113,6 +114,7 @@ export default {
groupName: data.groupName,
name: data.map.name,
url: data.map.url,
wxapp_url: data.map.wxapp_url,
pic: data.map.pic
}
_this.dialog = true

12
src/views/shop/set/menuform.vue
View File

@ -1,14 +1,17 @@
<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 ref="form" :model="form" :rules="rules" size="small" label-width="120px">
<el-form-item label="分类名称">
<el-input v-model="form.name" style="width: 370px;" />
<el-input v-model="form.name" style="width: 300px;" />
</el-form-item>
<el-form-item label="跳转url">
<el-input v-model="form.url" style="width: 370px;" />
<el-input v-model="form.url" style="width: 300px;" />
</el-form-item>
<el-form-item label="小程序跳转page">
<el-input v-model="form.wxapp_url" style="width: 300px;" />
</el-form-item>
<el-form-item label="分类图标(90*90)">
<pic-upload v-model="form.pic" style="width: 500px;" />
<pic-upload v-model="form.pic" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
@ -38,6 +41,7 @@ export default {
groupName: 'routine_home_menus',
name: '',
url: '',
wxapp_url: '',
pic: '',
sort: '',
status: ''

2
src/views/shop/set/roll.vue
View File

@ -21,6 +21,7 @@
<el-table-column prop="id" label="ID" />
<el-table-column prop="map.info" label="滚动文字" />
<el-table-column prop="map.url" label="链接url" />
<el-table-column prop="map.wxapp_url" label="小程序跳转page" />
<el-table-column v-if="checkPermission(['admin','YXSYSTEMGROUPDATA_ALL','YXSYSTEMGROUPDATA_EDIT','YXSYSTEMGROUPDATA_DELETE'])" label="操作" width="150px" align="center">
<template slot-scope="scope">
<el-button v-permission="['admin','YXSYSTEMGROUPDATA_ALL','YXSYSTEMGROUPDATA_EDIT']" size="mini" type="primary" icon="el-icon-edit" @click="edit(scope.row)" />
@ -109,6 +110,7 @@ export default {
title: data.map.title,
info: data.map.info,
url: data.map.url,
wxapp_url: data.map.wxapp_url,
pic: data.map.pic
}
_this.dialog = true

10
src/views/shop/set/rollform.vue
View File

@ -1,11 +1,14 @@
<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="100px">
<el-form ref="form" :model="form" :rules="rules" size="small" label-width="120px">
<el-form-item label="滚动文字">
<el-input v-model="form.info" style="width: 370px;" />
<el-input v-model="form.info" style="width: 300px;" />
</el-form-item>
<el-form-item label="跳转url">
<el-input v-model="form.url" style="width: 370px;" />
<el-input v-model="form.url" style="width: 300px;" />
</el-form-item>
<el-form-item label="小程序跳转page">
<el-input v-model="form.wxapp_url" style="width: 300px;" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
@ -34,6 +37,7 @@ export default {
id: '',
groupName: 'routine_home_roll_news',
info: '',
wxapp_url: '',
url: ''
},
rules: {

2
src/views/shop/set/usermenu.vue
View File

@ -21,6 +21,7 @@
<el-table-column prop="id" label="ID" />
<el-table-column prop="map.name" label="菜单名" />
<el-table-column prop="map.url" label="链接url" />
<el-table-column prop="map.wxapp_url" label="小程序跳转page" />
<el-table-column ref="table" label="图标">
<template slot-scope="scope">
<a :href="scope.row.map.pic" style="color: #42b983" target="_blank"><img :src="scope.row.map.pic" alt="点击打开" class="el-avatar"></a>
@ -113,6 +114,7 @@ export default {
groupName: data.groupName,
name: data.map.name,
url: data.map.url,
wxapp_url: data.map.wxapp_url,
pic: data.map.pic
}
_this.dialog = true

10
src/views/shop/set/usermenuform.vue
View File

@ -1,11 +1,14 @@
<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 ref="form" :model="form" :rules="rules" size="small" label-width="120px">
<el-form-item label="菜单名">
<el-input v-model="form.name" style="width: 370px;" />
<el-input v-model="form.name" style="width: 300px;" />
</el-form-item>
<el-form-item label="跳转url">
<el-input v-model="form.url" style="width: 370px;" />
<el-input v-model="form.url" style="width: 300px;" />
</el-form-item>
<el-form-item label="小程序跳转page">
<el-input v-model="form.wxapp_url" style="width: 300px;" />
</el-form-item>
<el-form-item label="图标(52*52)">
<pic-upload v-model="form.pic" style="width: 500px;" />
@ -38,6 +41,7 @@ export default {
groupName: 'routine_my_menus',
name: '',
url: '',
wxapp_url: '',
pic: '',
sort: '',
status: ''