Loki/yudao-ui-admin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

对商城的进一步适配

Browse Source
This commit is contained in:
Loki
2022-05-09 17:18:05 +08:00
parent 05fdb1d9e7
commit 5c2091ddce
51 changed files with 267 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/views/bxg/activity/bargain/index.vue
+1 -2
View File
@@ -88,7 +88,7 @@ import checkPermission from '@/utils/permission'
import initData from '@/mixins/crud'
import { del } from '@/api/bxg/yxStoreBargain'
import eForm from './form'
import { formatTimeTwo, parseTime } from '@/utils/index'
import { formatTimeTwo } from '@/utils/index'
export default {
components: { eForm },
mixins: [initData],
@@ -103,7 +103,6 @@ export default {
})
},
methods: {
parseTime,
formatTimeTwo,
checkPermission,
beforeInit() {
src/views/bxg/activity/combination/index.vue
+3 -4
View File
@@ -103,7 +103,7 @@
import checkPermission from '@/utils/permission'
import initData from '@/mixins/crud'
import { del, onsale } from '@/api/bxg/yxStoreCombination'
import { formatTimeTwo, parseTime } from '@/utils/index'
import { formatTimeTwo } from '@/utils/index'
export default {
components: { },
mixins: [initData],
@@ -122,12 +122,11 @@ export default {
},
methods: {
toAddURL(){
this.$router.push({ path: '/activity/combinationAdd' })
this.$router.push({ path: 'bxg/activity/combinationAdd' })
},
toUpdateURL(id){
this.$router.push({ path: '/activity/combinationEdit/'+id })
this.$router.push({ path: 'bxg/activity/combinationEdit/'+id })
},
parseTime,
formatTimeTwo,
checkPermission,
beforeInit() {
src/views/bxg/activity/combinlist/index.vue
+1 -2
View File
@@ -77,7 +77,7 @@
import initData from '@/mixins/crud'
import { del } from '@/api/bxg/yxStorePink'
import eForm from './form'
import { formatTimeTwo, parseTime } from '@/utils/index'
import { formatTimeTwo } from '@/utils/index'
export default {
components: { eForm },
mixins: [initData],
@@ -95,7 +95,6 @@
})
},
methods: {
parseTime,
formatTimeTwo,
checkPermission,
beforeInit() {
src/views/bxg/activity/seckill/index.vue
+1 -2
View File
@@ -88,7 +88,7 @@
import checkPermission from '@/utils/permission'
import initData from '@/mixins/crud'
import { del } from '@/api/bxg/yxStoreSeckill'
import { formatTimeTwo, parseTime } from '@/utils/index'
import { formatTimeTwo } from '@/utils/index'
export default {
mixins: [initData],
data() {
@@ -111,7 +111,6 @@ export default {
toUpdateURL(id){
this.$router.push({ path: '/activity/secKillEdit/'+id })
},
parseTime,
formatTimeTwo,
checkPermission,
beforeInit() {
src/views/bxg/dashboard/PanelGroupT.vue
+8 -8
View File
@@ -3,7 +3,7 @@
<el-row :gutter="24" class="dashboard-console-grid">
<el-col v-bind="grid" class="ivu-mb">
<el-card :bordered="false">
<router-link :to="{ path: '/shop/cate' }">
<router-link :to="{ path: 'bxg/shop/goods' }">
<i class="el-icon-goods" style="color: #69c0ff" />
<p>商品管理</p>
</router-link>
@@ -11,7 +11,7 @@
</el-col>
<el-col v-bind="grid" class="ivu-mb">
<el-card :bordered="false">
<router-link :to="{ path: '/member/member' }">
<router-link :to="{ path: 'bxg/member/member' }">
<i class="el-icon-user" style="color: #95de64" />
<p>会员管理</p>
</router-link>
@@ -19,7 +19,7 @@
</el-col>
<el-col v-bind="grid" class="ivu-mb">
<el-card :bordered="false">
<router-link :to="{ path: '/order/order' }">
<router-link :to="{ path: 'bxg/order/order' }">
<i class="el-icon-s-order" style="color: #ff9c6e" />
<p>订单管理</p>
</router-link>
@@ -27,7 +27,7 @@
</el-col>
<el-col v-bind="grid" class="ivu-mb">
<el-card :bordered="false">
<router-link :to="{ path: '/syscoupon/coupon' }">
<router-link :to="{ path: 'bxg/syscoupon/coupon' }">
<i class="el-icon-s-ticket" style="color: #b37feb" />
<p>电子券管理</p>
</router-link>
@@ -35,7 +35,7 @@
</el-col>
<el-col v-bind="grid" class="ivu-mb">
<el-card :bordered="false">
<router-link :to="{ path: '/activity/combination' }">
<router-link :to="{ path: 'bxg/activity/combination' }">
<i class="el-icon-postcard" style="color: #ffd666" />
<p>营销管理</p>
</router-link>
@@ -43,7 +43,7 @@
</el-col>
<el-col v-bind="grid" class="ivu-mb">
<el-card :bordered="false">
<router-link :to="{ path: '/promoter/promoterconfig' }">
<router-link :to="{ path: 'bxg/promoter/promoterconfig' }">
<i class="el-icon-notebook-1" style="color: #5cdbd3" />
<p>分销管理</p>
</router-link>
@@ -51,7 +51,7 @@
</el-col>
<el-col v-bind="grid" class="ivu-mb">
<el-card :bordered="false">
<router-link :to="{ path: '/price/extract' }">
<router-link :to="{ path: 'bxg/price/extract' }">
<i class="el-icon-s-finance" style="color: #ff85c0" />
<p>财务管理</p>
</router-link>
@@ -59,7 +59,7 @@
</el-col>
<el-col v-bind="grid" class="ivu-mb">
<el-card :bordered="false">
<router-link :to="{ path: '/store/storeinfo' }">
<router-link :to="{ path: 'bxg/store/storeinfo' }">
<i class="el-icon-office-building" style="color: #ffc069" />
<p>门店管理</p>
</router-link>
src/views/bxg/shop/cate/index.vue
+1 -1
View File
@@ -74,7 +74,7 @@ import picUpload from '@/components/pic-upload'
import MaterialList from '@/components/material'
// crud交由presenter持有
const defaultCrud = CRUD({ title: '分类', url: 'api/yxStoreCategory', sort: 'sort,desc', crudMethod: { ...crudDept }})
const defaultCrud = CRUD({ title: '分类', url: 'bxg/api/yxStoreCategory', sort: 'sort,desc', crudMethod: { ...crudDept }})
const defaultForm = { id: null, cateName: null, pid: 0, isShow: 1 , sort: 1}
export default {
name: 'Dept',
src/views/bxg/shop/goods/form.vue
+1 -1
View File
@@ -736,7 +736,7 @@ export default {
type: 'success'
});
setTimeout(() => {
this.$router.push({ path: '/shop/goods' });
this.$router.push({ path: '/bxg/goods' });
}, 500);
}).catch(res => {
// this.$message({
src/views/bxg/shop/goods/index.vue
+2 -2
View File
@@ -130,10 +130,10 @@ export default {
},
methods: {
toAddURL(){
this.$router.push({ path: '/shop/goodsAdd' })
this.$router.push({ path: '/bxg/shop/goodsAdd' })
},
toUpdateURL(id){
this.$router.push({ path: '/shop/goodsEdit/'+id })
this.$router.push({ path: '/bxg/shop/goodsEdit/'+id })
},
dataFilter(val){
this.value=val
src/views/bxg/shop/goods/index2.vue
+1 -1
View File
@@ -48,7 +48,7 @@
<el-table-column v-if="checkPermission(['admin','YXSTOREPRODUCT_ALL','YXSTOREPRODUCT_EDIT','YXSTOREPRODUCT_DELETE'])" label="操作" width="150px" align="center">
<template slot-scope="scope">
<el-button v-permission="['admin','YXSTOREPRODUCT_ALL','YXSTOREPRODUCT_EDIT']" size="mini" type="primary" icon="el-icon-edit">
<router-link :to="'/shop/goodsEdit/'+scope.row.id">
<router-link :to="'/bxg/shop/goodsEdit/'+scope.row.id">
编辑
</router-link>
</el-button>
src/views/bxg/shop/order/detail.vue
+3 -1
View File
@@ -401,7 +401,9 @@ import eRemark from './remark'
components: {eForm, eRefund, editOrder, eRemark},
data() {
return {
orderStatus:null,
orderStatus:{
cacheKeyCreateOrder:""
},
isAdd: false,
id: null,
order: {
src/views/bxg/shop/order/detail1.vue
+4 -3
View File
@@ -89,7 +89,7 @@
<script>
import { add, edit, express,
getNowOrderStatus } from '@/api/bxg/yxStoreOrder'
import {formatTimeTwo, parseTime} from '@/utils/index'
import {formatTimeTwo} from '@/utils/index'
export default {
props: {
isAdd: {
@@ -99,7 +99,9 @@ export default {
},
data() {
return {
orderStatus:null,
orderStatus:{
cacheKeyCreateOrder:""
},
loading: false, dialog: false, expressInfo: [],
form: {
id: '',
@@ -168,7 +170,6 @@ export default {
}
},
methods: {
parseTime,
cancel() {
this.dialog = false
},
src/views/bxg/shop/order/index.vue
+1 -1
View File
@@ -339,7 +339,7 @@
},
methods: {
toDetailURL(id){
this.$router.push({ path: '/order/detail/'+id })
this.$router.push({ path: '/bxg/order/detail/'+id })
},
formatTime,
checkPermission,
src/views/bxg/shop/order/print.vue
+1 -2
View File
@@ -55,7 +55,7 @@
</template>
<script>
import { formatTime, parseTime, formatTimeTwo } from '@/utils/index'
import { formatTime, formatTimeTwo } from '@/utils/index'
export default {
props: {
printList: {
@@ -77,7 +77,6 @@ export default {
},
methods: {
formatTime,
parseTime,
formatTimeTwo,
cancel() {
this.dialog = false
src/views/bxg/shop/shippingTemplates/index.vue
+1 -1
View File
@@ -55,7 +55,7 @@ import MaterialList from "@/components/material";
import add from './form'
// crud交由presenter持有
const defaultCrud = CRUD({ title: '运费模板', url: 'api/yxShippingTemplates', sort: 'id,desc', crudMethod: { ...crudYxShippingTemplates }})
const defaultCrud = CRUD({ title: '运费模板', url: 'bxg/api/yxShippingTemplates', sort: 'id,desc', crudMethod: { ...crudYxShippingTemplates }})
const defaultForm = { id: null, name: null, type: null, regionInfo: null, appoint: null, appointInfo: null, createTime: null, updateTime: null, isDel: null, sort: null }
export default {
name: 'YxShippingTemplates',
src/views/bxg/shop/store/index.vue
+1 -2
View File
@@ -109,10 +109,9 @@
import udOperation from '@crud/UD.operation'
import pagination from '@crud/Pagination'
import MaterialList from '@/components/material'
import { parseTime } from '@/utils/index'
// crud交由presenter持有
const defaultCrud = CRUD({ title: '门店', url: 'api/yxSystemStore', sort: 'id,desc', crudMethod: { ...crudYxSystemStore }})
const defaultCrud = CRUD({ title: '门店', url: 'bxg/api/yxSystemStore', sort: 'id,desc', crudMethod: { ...crudYxSystemStore }})
const defaultForm = { id: null, name: null, introduction: null, phone: null, address: null, detailedAddress: null, image: null, latitude:
null, longitude: null, validTime: null, dayTime: null, addTime: null, isShow: 1, imageArr: [], validTimeArr: [], dayTimeArr: [new Date(),new Date()] }
export default {
src/views/bxg/shop/storeProductRule/index.vue
+1 -1
View File
@@ -47,7 +47,7 @@ import MaterialList from "@/components/material"
import add from './form'
// crud交由presenter持有
const defaultCrud = CRUD({ title: 'sku规则', url: 'api/yxStoreProductRule', sort: 'id,desc', crudMethod: { ...crudYxStoreProductRule }})
const defaultCrud = CRUD({ title: 'sku规则', url: 'bxg/api/yxStoreProductRule', sort: 'id,desc', crudMethod: { ...crudYxStoreProductRule }})
const defaultForm = { id: null, ruleName: null, ruleValue: null, createTime: null, updateTime: null, isDel: null }
export default {
name: 'YxStoreProductRule',
src/views/bxg/shop/storestaff/index.vue
+1 -1
View File
@@ -98,7 +98,7 @@ import crudYxSystemStore from '@/api/bxg/yxSystemStore'
import { formatTimeTwo } from '@/utils/index'
// crud交由presenter持有
const defaultCrud = CRUD({ title: '门店店员', url: 'api/yxSystemStoreStaff', sort: 'id,desc', crudMethod: { ...crudYxSystemStoreStaff }})
const defaultCrud = CRUD({ title: '门店店员', url: 'bxg/api/yxSystemStoreStaff', sort: 'id,desc', crudMethod: { ...crudYxSystemStoreStaff }})
const defaultForm = { user: {uid: null,nickname: null,avatar: null}, id: null, uid: null, avatar: null, storeId: null, staffName: null, phone: null, verifyStatus: 1, status: null, addTime: null, nickname: null, storeName: null }
export default {
name: 'YxSystemStoreStaff',
src/views/bxg/shop/user/detail.vue
-2
View File
@@ -60,7 +60,6 @@
<script>
import { add, edit, getSpread } from '@/api/bxg/yxUser'
import { parseTime } from '@/utils/index'
export default {
props: {
// isAdd: {
@@ -91,7 +90,6 @@ export default {
handleClick(tab, event) {
this.spread(this.form.uid)
},
parseTime,
cancel() {
this.dialog = false
},
src/views/bxg/tools/storage/local/index.vue
+1 -1
View File
@@ -125,7 +125,7 @@ import crudOperation from '@crud/CRUD.operation'
import pagination from '@crud/Pagination'
// crud交由presenter持有
const defaultCrud = CRUD({ title: '文件', url: 'api/localStorage', crudMethod: { ...crudFile }})
const defaultCrud = CRUD({ title: '文件', url: 'bxg/api/localStorage', crudMethod: { ...crudFile }})
const defaultForm = { id: null, name: '' }
export default {
components: { pagination, crudOperation, rrOperation },
src/views/bxg/tools/storage/qiniu/index.vue
+1 -1
View File
@@ -90,7 +90,7 @@ import crudOperation from '@crud/CRUD.operation'
import pagination from '@crud/Pagination'
// crud交由presenter持有
const defaultCrud = CRUD({ title: '七牛云文件', url: 'api/qiNiuContent', crudMethod: { ...crudQiNiu }})
const defaultCrud = CRUD({ title: '七牛云文件', url: 'bxg/api/qiNiuContent', crudMethod: { ...crudQiNiu }})
export default {
components: { eForm, pagination, crudOperation, rrOperation },
mixins: [presenter(defaultCrud), header(), crud()],