Forráskód Böngészése

订单页面添加,图标大小修改

zhh 6 éve
szülő
commit
621d682c6c

+ 3 - 3
src/components/SvgIcon/index.vue

@@ -33,9 +33,9 @@ export default {
 
 <style scoped>
 .svg-icon {
-  width: 1em;
-  height: 1em;
-  vertical-align: -0.15em;
+  width: 1.2em;
+  height: 1.2em;
+  vertical-align: -0.18em;
   fill: currentColor;
   overflow: hidden;
 }

A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 0 - 0
src/icons/svg/order-return-reason.svg


+ 1 - 0
src/icons/svg/order-return.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1539332248248" class="icon" style="" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="7595" xmlns:xlink="http://www.w3.org/1999/xlink" width="64" height="64"><defs><style type="text/css"></style></defs><path d="M984.1664 326.2464v-2.4576a27.8528 27.8528 0 0 0-0.8192-3.8912v-1.3312L908.3904 98.7136A70.144 70.144 0 0 0 841.9328 51.2H182.0672a70.144 70.144 0 0 0-66.4576 47.616L40.96 318.5664v1.3312a27.8528 27.8528 0 0 0-0.8192 3.8912v621.056A28.0576 28.0576 0 0 0 67.6864 972.8h888.6272a28.0576 28.0576 0 0 0 28.0576-28.0576V327.68s-0.1024-1.024-0.2048-1.4336zM168.7552 116.6336a14.0288 14.0288 0 0 1 13.312-9.5232h659.8656a14.0288 14.0288 0 0 1 13.312 9.5232l61.952 182.784H106.8032z m759.5008 800.1536H95.744v-561.152h832.512z" fill="" p-id="7596"></path><path d="M399.36 756.5312A28.0576 28.0576 0 1 0 438.8864 716.8l-52.5312-52.5312h317.44a28.0576 28.0576 0 1 0 0-56.1152H389.12l52.5312-52.6336a28.0576 28.0576 0 0 0-39.6288-39.6288l-102.4 102.4a28.0576 28.0576 0 0 0 0 39.6288z" fill="" p-id="7597"></path></svg>

A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 0 - 0
src/icons/svg/order-setting.svg


+ 1 - 0
src/icons/svg/order.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1539331790189" class="icon" style="" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2148" xmlns:xlink="http://www.w3.org/1999/xlink" width="32" height="32"><defs><style type="text/css"></style></defs><path d="M260.654545 67.490909v51.2h-6.981818c-18.618182 0-37.236364 0-55.854545 2.327273-46.545455 4.654545-83.781818 44.218182-86.109091 93.090909v628.363636c0 20.945455 2.327273 39.563636 11.636364 58.181818 23.272727 48.872727 62.836364 74.472727 116.363636 74.472728h546.909091c58.181818 0 104.727273-32.581818 121.018182-86.109091 4.654545-13.963636 6.981818-27.927273 6.981818-41.890909V225.745455c0-46.545455-25.6-83.781818-67.490909-97.745455-11.636364-4.654545-23.272727-4.654545-34.909091-4.654545h-48.872727V74.472727c51.2-6.981818 100.072727-6.981818 144.290909 27.927273 34.909091 27.927273 53.527273 62.836364 55.854545 107.054545v633.018182c0 55.854545-18.618182 102.4-60.509091 137.309091-32.581818 30.254545-72.145455 41.890909-116.363636 44.218182H239.709091c-76.8 0-130.327273-37.236364-162.909091-104.727273-11.636364-23.272727-13.963636-46.545455-13.963636-72.145454V225.745455C62.836364 167.563636 88.436364 123.345455 139.636364 93.090909c11.636364-13.963636 27.927273-18.618182 46.545454-20.945454 23.272727-2.327273 48.872727-2.327273 74.472727-4.654546z" p-id="2149"></path><path d="M372.363636 0h276.945455v46.545455h-116.363636v46.545454h93.090909v46.545455h-232.727273V93.090909h93.090909V46.545455h-116.363636c2.327273-16.290909 2.327273-30.254545 2.327272-46.545455zM274.618182 365.381818v-41.890909s2.327273-2.327273 4.654545-2.327273h474.763637v46.545455c-162.909091-2.327273-321.163636-2.327273-479.418182-2.327273zM274.618182 523.636364v-44.218182h477.090909v44.218182H274.618182zM749.381818 640v44.218182H272.290909v-44.218182h477.090909z" p-id="2150"></path></svg>

A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 0 - 1
src/icons/svg/product-list.svg


+ 29 - 2
src/router/index.js

@@ -55,7 +55,7 @@ export const constantRouterMap = [
         name: 'updateProduct',
         component: () => import('@/views/pms/product/update'),
         meta: {title: '修改商品', icon: 'product-add'},
-        hidden:true
+        hidden: true
       },
       {
         path: 'productRecycle',
@@ -140,7 +140,34 @@ export const constantRouterMap = [
       }
     ]
   },
-
+  {
+    path: '/oms',
+    component: Layout,
+    redirect: '/oms/order',
+    name: 'oms',
+    meta: {title: '订单', icon: 'order'},
+    children: [{
+      path: 'order',
+      name: 'order',
+      component: () => import('@/views/oms/order/index'),
+      meta: {title: '订单列表', icon: 'product-list'}
+    }, {
+      path: 'orderSetting',
+      name: 'orderSetting',
+      component: () => import('@/views/oms/order/setting'),
+      meta: {title: '订单设置', icon: 'order-setting'}
+    }, {
+      path: 'returnApply',
+      name: 'returnApply',
+      component: () => import('@/views/oms/apply/index'),
+      meta: {title: '退货申请处理', icon: 'order-return'}
+    }, {
+      path: 'returnReason',
+      name: 'returnReason',
+      component: () => import('@/views/oms/apply/reason'),
+      meta: {title: '退货原因设置', icon: 'order-return-reason'}
+    }]
+  },
   {path: '*', redirect: '/404', hidden: true}
 ]
 

+ 4 - 4
src/views/login/index.vue

@@ -22,8 +22,8 @@
         </el-button>
       </el-form-item>
       <div class="tips">
-        <span style="margin-right:20px;">username: test</span>
-        <span> password: 123</span>
+        <span style="margin-right:20px;">username: admin</span>
+        <span> password: 123456</span>
       </div>
     </el-form>
   </div>
@@ -51,8 +51,8 @@ export default {
     }
     return {
       loginForm: {
-        username: 'test',
-        password: '123'
+        username: 'admin',
+        password: '123456'
       },
       loginRules: {
         username: [{ required: true, trigger: 'blur', validator: validateUsername }],

+ 13 - 0
src/views/oms/apply/index.vue

@@ -0,0 +1,13 @@
+<template> 
+  <div> {{msg}}</div>
+</template>
+<script>
+  export default {
+    data() {
+      return {msg: '退货申请列表'}
+    }
+  }
+</script>
+<style></style>
+
+

+ 13 - 0
src/views/oms/apply/reason.vue

@@ -0,0 +1,13 @@
+<template> 
+  <div> {{msg}}</div>
+</template>
+<script>
+  export default {
+    data() {
+      return {msg: '退货原因列表'}
+    }
+  }
+</script>
+<style></style>
+
+

+ 66 - 0
src/views/oms/order/index.vue

@@ -0,0 +1,66 @@
+<template> 
+  <div class="app-container">
+    <el-card class="filter-container" shadow="never">
+      <div>
+        <i class="el-icon-search"></i>
+        <span>筛选搜索</span>
+        <el-button
+          style="float:right"
+          type="primary"
+          size="small">
+          查询搜索
+        </el-button>
+        <el-button
+          style="float:right;margin-right: 15px"
+          size="small">
+          重置
+        </el-button>
+      </div>
+      <div style="margin-top: 15px">
+        <el-form :inline="true" :model="listQuery" size="small" label-width="140px">
+          <el-form-item label="输入搜索:">
+            <el-input v-model="listQuery.orderSn" style="width: 203px" placeholder="订单编号"></el-input>
+          </el-form-item>
+          <el-form-item label="收货人:">
+            <el-input v-model="listQuery.receiverKeyword" style="width: 203px" placeholder="收货人姓名/手机号码"></el-input>
+          </el-form-item>
+          <el-form-item label="提交时间:">
+            <el-date-picker
+              v-model="listQuery.createTime"
+              value-format="timestamp"
+              type="datetime"
+              placeholder="选择开始时间">
+            </el-date-picker>
+          </el-form-item>
+        </el-form>
+      </div>
+    </el-card>
+    <el-card class="operate-container" shadow="never">
+
+    </el-card>
+    <div class="table-container"></div>
+    <div class="batch-operate-container"></div>
+    <div class="pagination-container"></div>
+  </div>
+</template>
+<script>
+  const defaultListQuery = {
+    pageNum: 1,
+    pageSize: 5,
+    orderSn: null,
+    receiverKeyword: null,
+    status: null,
+    orderType: null,
+    sourceType: null,
+    createTime: null,
+  };
+  export default {
+    name: "orderList",
+    data() {
+      return {listQuery: Object.assign({}, defaultListQuery)}
+    }
+  }
+</script>
+<style></style>
+
+

+ 13 - 0
src/views/oms/order/setting.vue

@@ -0,0 +1,13 @@
+<template> 
+  <div> {{msg}}</div>
+</template>
+<script>
+  export default {
+    data() {
+      return {msg: '订单设置'}
+    }
+  }
+</script>
+<style></style>
+
+

Nem az összes módosított fájl került megjelenítésre, mert túl sok fájl változott