1

view/admin/src/views/order/list/orderDetails.vue

@@ -292,15 +292,15 @@
               <ul class="list">
                 <li class="item">
                   <div>商户名称：</div>
-                  <div class="value"></div>
+                  <div class="value">{{orderDetailList.merchant?orderDetailList.merchant.mer_name:''}}</div>
                 </li>
                 <li class="item">
                   <div>商户类型：</div>
-                  <div class="value"></div>
+                  <div class="value">{{orderDetailList.merchant?getLable(orderDetailList.merchant.category_id):''}}</div>
                 </li>
                 <li class="item">
                   <div>商户类别：</div>
-                  <div class="value"></div>
+                  <div class="value">{{orderDetailList.merchant?orderDetailList.merchant.type_name:''}}</div>
                 </li>
               </ul>
             </div>
@@ -389,6 +389,9 @@ import {
   orderLogApi,
   getChildrenOrderApi
 } from '@/api/order';
+import {
+  getMerCateApi
+} from "@/api/merchant";
 export default {
   props: {
     drawer: {
@@ -435,9 +438,16 @@ export default {
         },
       },
       orderImg: require('@/assets/images/order_icon.png'),
-
+      merCateList:[]
     };
   },
+  mounted(){
+    getMerCateApi().then(res => {
+        this.merCateList = res.data
+    }).catch(res => {
+        this.$message.error(res.message)
+    })
+  },
   filters: {
   },
   methods: {
@@ -469,6 +479,16 @@ export default {
     toSendGoods() {
       this.sendGoods = true;
     },
+    getLable(id){
+      let arr = this.merCateList.filter(item=>{
+        return item.value==id
+      })
+      if(arr.length>0){
+        return arr[0].label
+      }else{
+        return ''
+      }
+    },
     getDelivery() {
       orderDeliveryApi(this.orderId)
         .then((res) => {

view/admin/src/views/order/orderCancellate/index.vue

@@ -159,6 +159,15 @@
           </template>
         </el-table-column>
         <el-table-column prop="verify_time" label="核销时间" min-width="150" />
+        <el-table-column label="操作" min-width="90" fixed="right" align="center">
+          <template slot-scope="scope">
+            <el-button
+              type="text"
+              size="small"
+              @click="onOrderDetail(scope.row)"
+            >订单详情</el-button>
+          </template>
+        </el-table-column>
       </el-table>
       <div class="block">
         <el-pagination
@@ -254,6 +263,16 @@ export default {
     this.getList('');
   },
   methods: {
+     // 订单详情
+     onOrderDetail(row) {
+     
+      this.$router.push({
+        name: "OrderList",
+        query: {
+          order_sn: row.order_sn,
+        },
+      });
+    },
     // 导出
     exportOrder() {
       exportOrderApi({

view/mer/src/router/index.js

@@ -81,31 +81,31 @@ export const constantRoutes = [
       }
     ]
   },
-  {
-    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/list`,
+    // children: [
+    //   {
+    //     path: `${roterPre}/dashboard`,
+    //     component: () => import('@/views/dashboard/index'),
+    //     name: 'Dashboard',
+    //     meta: { title: '控制台', icon: 'dashboard', affix: true }
+    //   }
+    // ]
   },
   {
     path: `${roterPre}/login`,

view/mer/src/store/modules/user.js

@@ -69,8 +69,11 @@ const actions = {
   getMenus({ commit }) {
     return new Promise((resolve, reject) => {
       getMenusApi().then(response => {
-        commit('SET_MENU_LIST', response.data)
-        localStorage.setItem('MenuList', JSON.stringify(response.data))
+        let menus = response.data.filter(item=>{
+          return item.route.indexOf('/merchant/dashboard')==-1
+        })
+        commit('SET_MENU_LIST', menus)
+        localStorage.setItem('MenuList', JSON.stringify(menus))
         resolve(response)
       }).catch(error => {
         this.$message.error(error.message)