diff --git a/view/admin/src/router/index.js b/view/admin/src/router/index.js index c003a3f..fc02aa6 100644 --- a/view/admin/src/router/index.js +++ b/view/admin/src/router/index.js @@ -66,31 +66,31 @@ export const constantRoutes = [ communityRouter, deliveryRouter, statisticRoute, - { - path: roterPre, - component: Layout, - redirect: `${roterPre}/dashboard`, - children: [ - { - path: `${roterPre}/dashboard`, - component: () => import('@/views/dashboard/index'), - name: 'Dashboard', - meta: { title: '控制台', icon: 'dashboard', affix: true } - } - ] - }, + // { + // path: roterPre, + // component: Layout, + // redirect: `${roterPre}/dashboard`, + // children: [ + // { + // path: `${roterPre}/dashboard`, + // component: () => import('@/views/dashboard/index'), + // name: 'Dashboard', + // meta: { title: '控制台', icon: 'dashboard', affix: true } + // } + // ] + // }, { path: '/', component: Layout, - redirect: `${roterPre}/dashboard`, - children: [ - { - path: `${roterPre}/dashboard`, - component: () => import('@/views/dashboard/index'), - name: 'Dashboard', - meta: { title: '控制台', icon: 'dashboard', affix: true } - } - ] + redirect: `${roterPre}/product/examine`, + // children: [ + // { + // path: `${roterPre}/dashboard`, + // component: () => import('@/views/dashboard/index'), + // name: 'Dashboard', + // meta: { title: '控制台', icon: 'dashboard', affix: true } + // } + // ] }, { path: `${roterPre}/login`, diff --git a/view/admin/src/views/order/list/orderDetails.vue b/view/admin/src/views/order/list/orderDetails.vue index 5a93e6f..4560805 100644 --- a/view/admin/src/views/order/list/orderDetails.vue +++ b/view/admin/src/views/order/list/orderDetails.vue @@ -113,10 +113,7 @@
订单总价：
{{ orderDetailList.total_price ? orderDetailList.total_price : '-' }}
-
  • -
    会员商品优惠：
    -
    {{ orderDetailList.svip_discount }}
    -
    • +
  • 支付运费：
    {{ orderDetailList.pay_postage }}
    @@ -125,20 +122,8 @@
    推广人：
    {{ orderDetailList.TopSpread.nickname }}
    • -
  • -
    一级佣金：
    -
    - {{ parseFloat(orderDetailList.extension_one) + parseFloat(orderDetailList.refund_extension_one) }} - (-{{ orderDetailList.refund_extension_one }}) -
    -
    • -
  • -
    二级佣金：
    -
    - {{ parseFloat(orderDetailList.extension_two) + parseFloat(orderDetailList.refund_extension_two) }} - (-{{ orderDetailList.refund_extension_two }}) -
    -
    • + +
    @@ -300,6 +285,26 @@
    + + +
    +
    店铺信息
    + +
    +     diff --git a/view/admin/src/views/order/orderCancellate/index.vue b/view/admin/src/views/order/orderCancellate/index.vue index 0e83454..e63bdec 100644 --- a/view/admin/src/views/order/orderCancellate/index.vue +++ b/view/admin/src/views/order/orderCancellate/index.vue @@ -78,7 +78,7 @@ - + - +
    提交 - 预览 - + --> -
    +
    diff --git a/view/mer/src/views/systemForm/setSystem/modifyStoreInfo.vue b/view/mer/src/views/systemForm/setSystem/modifyStoreInfo.vue index 0380a85..3181563 100644 --- a/view/mer/src/views/systemForm/setSystem/modifyStoreInfo.vue +++ b/view/mer/src/views/systemForm/setSystem/modifyStoreInfo.vue @@ -288,6 +288,14 @@ + + + + + + + +
    @@ -412,7 +420,7 @@ // +---------------------------------------------------------------------- // | Author: CRMEB Team // +---------------------------------------------------------------------- -import { storeGetInfoApi, marginCode, marginRecordLst, marginRefund } from '@/api/setting' +import { storeGetInfoApi, marginCode, marginRecordLst, marginRefund,getArea } from '@/api/setting' import { getBaseInfo, merchantUpdate } from '@/api/user.js' import Maps from '@/components/map/map.vue' import { getToken } from '@/utils/auth' @@ -514,6 +522,7 @@ export default { value1: "", value2: "", merData: { + district_id:null, delivery_way: [], mer_take_name: '', mer_take_phone: '', @@ -523,6 +532,55 @@ export default { mer_take_location: '', id: 0, mer_take_status: 0 }, // 默认数据 + + props: { + lazy: true, + lazyLoad (node, resolve) { + console.log(node) + const { level } = node; + if(level==0){ + getArea(0).then(res=>{ + + let nodes=res.data.map(item=>{ + return{ + value:item.id, + label:item.name, + leaf:false + } + }) + resolve(nodes); + + }) + }else if(level==1){ + getArea(node.value).then(res=>{ + + let nodes=res.data.map(item=>{ + return{ + value:item.id, + label:item.name, + leaf:false + } + }) + resolve(nodes); + + }) + }else if(level==2){ + getArea(node.value).then(res=>{ + + let nodes=res.data.map(item=>{ + return{ + value:item.id, + label:item.name, + leaf:true + } + }) + resolve(nodes); + + }) + } + + } + }, myHeaders: { 'X-Token': getToken() }, uploadedQualifications: [], // 资质图片列表 merPicList:[],//店铺相册 @@ -682,7 +740,7 @@ export default { if (valid) { const dataKey = Object.keys(this.rules) const reqData = {}; - [...dataKey, 'mer_state', 'long', 'lat', 'mini_banner', 'service_phone'].map(item => { + [...dataKey, 'mer_state', 'long', 'lat', 'mini_banner', 'service_phone','district_id'].map(item => { reqData[item] = this.merData[item] }) reqData.type = this.infoType