Commit e99d9044 authored by 黄奎's avatar 黄奎

新增页面

parent 189004a0
...@@ -252,12 +252,6 @@ ...@@ -252,12 +252,6 @@
<img slot="reference" src="../../assets/img/userman/price.png" alt=""> <img slot="reference" src="../../assets/img/userman/price.png" alt="">
</el-popover> </el-popover>
</div> </div>
<div class="express-price"><span>
<span style="color: rgb(144, 147, 153);">(含运费¥{{item.FreightMoney}})
<img v-if="item.PaymentTime==''" @click="EditPrice(item,2)"
src="../../assets/img/userman/edit1.png" alt="">
</span>
</span></div>
<div> <div>
<el-tag effect="dark" type="warning" size="mini">{{item.PaymentWayName}}</el-tag> <el-tag effect="dark" type="warning" size="mini">{{item.PaymentWayName}}</el-tag>
</div> </div>
...@@ -337,7 +331,7 @@ ...@@ -337,7 +331,7 @@
</el-tooltip> </el-tooltip>
</template> </template>
<el-tooltip class="item" effect="dark" content="查看订单详情" placement="top"> <el-tooltip class="item" effect="dark" content="查看订单详情" placement="top">
<img @click="CommonJump('orderDetails',{OrderId:item.OrderId})" class="app-order-icon" <img @click="CommonJump('osOrderDetails',{OrderId:item.OrderId})" class="app-order-icon"
src="../../assets/img/userman/detail.png" alt=""> src="../../assets/img/userman/detail.png" alt="">
</el-tooltip> </el-tooltip>
</div> </div>
......
...@@ -295,41 +295,41 @@ export default new Router({ ...@@ -295,41 +295,41 @@ export default new Router({
name: 'addedautorelease', name: 'addedautorelease',
component: resolve => require(['@/components/education/addedautorelease'], resolve), component: resolve => require(['@/components/education/addedautorelease'], resolve),
}, },
 //网课 教育-资讯管理 //网课 教育-资讯管理
        { {
          path: '/informationManage', path: '/informationManage',
          name: 'informationManage', name: 'informationManage',
          component: resolve => require(['@/components/education/informationManage'], resolve), component: resolve => require(['@/components/education/informationManage'], resolve),
       }, },
        //网课 教育-资讯评价 //网课 教育-资讯评价
       { {
          path:'/informationEvalution', path: '/informationEvalution',
          name: 'informationEvalution', name: 'informationEvalution',
          component: resolve => require(['@/components/education/informationEvalution'], resolve), component: resolve => require(['@/components/education/informationEvalution'], resolve),
       }, },
//网课 教育-课程管理 //网课 教育-课程管理
{ {
path:'/CourseManagement', path: '/CourseManagement',
          name: 'CourseManagement', name: 'CourseManagement',
          component: resolve => require(['@/components/education/CourseManagement'], resolve), component: resolve => require(['@/components/education/CourseManagement'], resolve),
}, },
//网课 教育-新增修改 //网课 教育-新增修改
{ {
path: '/educationEdit', path: '/educationEdit',
          name: 'educationEdit', name: 'educationEdit',
          component: resolve => require(['@/components/education/educationEdit'], resolve), component: resolve => require(['@/components/education/educationEdit'], resolve),
}, },
//网课 教育-订单列表 //网课 教育-订单列表
{ {
path: '/educationOrder', path: '/educationOrder',
          name: 'educationOrder', name: 'educationOrder',
          component: resolve => require(['@/components/education/educationOrder'], resolve), component: resolve => require(['@/components/education/educationOrder'], resolve),
}, },
//网课 教育-订单详情 //网课 教育-订单详情
{ {
path: '/educationOrderDetail', path: '/educationOrderDetail',
          name: 'educationOrderDetail', name: 'educationOrderDetail',
          component: resolve => require(['@/components/education/educationOrderDetail'], resolve), component: resolve => require(['@/components/education/educationOrderDetail'], resolve),
} }
] ]
}, },
...@@ -341,73 +341,79 @@ export default new Router({ ...@@ -341,73 +341,79 @@ export default new Router({
//线下基本设置 //线下基本设置
{ {
path: '/offlineSetup', path: '/offlineSetup',
name: 'offlineSetup', name: 'offlineSetup',
component: resolve => require(['@/components/offlineService/offlineSetup'], resolve), component: resolve => require(['@/components/offlineService/offlineSetup'], resolve),
}, },
//线下 套餐卡列表 //线下 套餐卡列表
{ {
path: '/osMealCardmanage', path: '/osMealCardmanage',
name: 'osMealCardmanage', name: 'osMealCardmanage',
component: resolve => require(['@/components/offlineService/osMealCardmanage'], resolve), component: resolve => require(['@/components/offlineService/osMealCardmanage'], resolve),
}, },
//线下 套餐卡编辑 //线下 套餐卡编辑
{ {
path: '/osAddmealcard', path: '/osAddmealcard',
name: 'osAddmealcard', name: 'osAddmealcard',
component: resolve => require(['@/components/offlineService/osAddmealcard'], resolve), component: resolve => require(['@/components/offlineService/osAddmealcard'], resolve),
}, },
//线下 套餐卡自动发放 //线下 套餐卡自动发放
{ {
path: '/osCardrelease', path: '/osCardrelease',
name: 'osCardrelease', name: 'osCardrelease',
component: resolve => require(['@/components/offlineService/osCardrelease'], resolve), component: resolve => require(['@/components/offlineService/osCardrelease'], resolve),
}, },
//线下 套餐卡自动发放编辑 //线下 套餐卡自动发放编辑
{ {
path: '/osAddcardrelease', path: '/osAddcardrelease',
name: 'osAddcardrelease', name: 'osAddcardrelease',
component: resolve => require(['@/components/offlineService/osAddcardrelease'], resolve), component: resolve => require(['@/components/offlineService/osAddcardrelease'], resolve),
}, },
//线下 套餐卡发放 //线下 套餐卡发放
{ {
path: '/osedgrantCouPon', path: '/osedgrantCouPon',
name: 'osedgrantCouPon', name: 'osedgrantCouPon',
component: resolve => require(['@/components/offlineService/osedgrantCouPon'], resolve), component: resolve => require(['@/components/offlineService/osedgrantCouPon'], resolve),
}, },
//线下服务产品列表 //线下服务产品列表
{ {
path: '/serviceProductList', path: '/serviceProductList',
name: 'serviceProductList', name: 'serviceProductList',
component: resolve => require(['@/components/offlineService/serviceProductList'], resolve), component: resolve => require(['@/components/offlineService/serviceProductList'], resolve),
}, },
//线下 服务产品列表 新增修改 //线下 服务产品列表 新增修改
{ {
path: '/serviceProductEdit', path: '/serviceProductEdit',
name: 'serviceProductEdit', name: 'serviceProductEdit',
component: resolve => require(['@/components/offlineService/serviceProductEdit'], resolve), component: resolve => require(['@/components/offlineService/serviceProductEdit'], resolve),
}, },
//线下服务产品订单列表 //线下服务产品订单列表
{ {
path: '/osOrderList', path: '/osOrderList',
name: 'osOrderList', name: 'osOrderList',
component: resolve => require(['@/components/offlineService/osOrderList'], resolve), component: resolve => require(['@/components/offlineService/osOrderList'], resolve),
},
// 线下服务订单管理 商品详情
{
path: '/osOrderDetails',
name: 'osOrderDetails',
component: resolve => require(['@/components/offlineService/osOrderDetails'], resolve),
}, },
//线下 服务人员管理 //线下 服务人员管理
{ {
path: '/ServiceMannage', path: '/ServiceMannage',
name: 'ServiceMannage', name: 'ServiceMannage',
component: resolve => require(['@/components/offlineService/ServiceMannage'], resolve) component: resolve => require(['@/components/offlineService/ServiceMannage'], resolve)
}, },
//线下 服务人员新增修改 //线下 服务人员新增修改
{ {
path: '/ServiceManageEdit', path: '/ServiceManageEdit',
name: 'ServiceManageEdit', name: 'ServiceManageEdit',
component: resolve => require(['@/components/offlineService/ServiceManageEdit'], resolve) component: resolve => require(['@/components/offlineService/ServiceManageEdit'], resolve)
}, },
{ {
path: '/scheduling', path: '/scheduling',
name: 'scheduling', name: 'scheduling',
component: resolve => require(['@/components/offlineService/scheduling'], resolve) component: resolve => require(['@/components/offlineService/scheduling'], resolve)
}, },
//店铺管理 内容管理 门店管理 //店铺管理 内容管理 门店管理
{ {
...@@ -709,13 +715,13 @@ export default new Router({ ...@@ -709,13 +715,13 @@ export default new Router({
{ {
path: '/CostManagement', path: '/CostManagement',
name: 'CostManagement', name: 'CostManagement',
component:resolve => require(['@/components/orderMan/CostManagement'], resolve), component: resolve => require(['@/components/orderMan/CostManagement'], resolve),
}, },
//出库管理 //出库管理
{ {
path: '/outboundManage', path: '/outboundManage',
name: 'outboundManage', name: 'outboundManage',
component:resolve => require(['@/components/orderMan/outboundManage'], resolve), component: resolve => require(['@/components/orderMan/outboundManage'], resolve),
}, },
// 订单管理 售后订单详情 // 订单管理 售后订单详情
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment