diff --git a/package.json b/package.json
index 084a967..34b524f 100644
--- a/package.json
+++ b/package.json
@@ -39,7 +39,8 @@
"vue-quill-editor": "^3.0.6",
"vue-router": "3.0.6",
"vue-tree-color": "^2.3.2",
- "vuex": "3.1.0"
+ "vuex": "3.1.0",
+ "vxe-table": "^3.17.11"
},
"devDependencies": {
"@vue/cli-plugin-babel": "4.4.4",
diff --git a/src/components/Delivery/unhandeled.vue b/src/components/Delivery/unhandeled.vue
index a23e93f..b146c7f 100644
--- a/src/components/Delivery/unhandeled.vue
+++ b/src/components/Delivery/unhandeled.vue
@@ -49,161 +49,63 @@
show-icon
/>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
{{ scope.row.orderAmount | numFilter }}
-
-
-
-
+
+
+
+
- {{ scope.row.recProvinceVal }}{{ scope.row.recCityVal
- }}{{ scope.row.recCountyVal }}{{ scope.row.recAddress }}
+ {{ scope.row.recProvinceVal }}{{ scope.row.recCityVal }}{{ scope.row.recCountyVal }}{{ scope.row.recAddress }}
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
item.pkId)
this.orderIdList = selection.map((item) => item.pkOrder)
this.multiple = !selection.length
diff --git a/src/main.js b/src/main.js
index 3b06015..b929a1c 100644
--- a/src/main.js
+++ b/src/main.js
@@ -15,13 +15,14 @@ import 'element-ui/lib/theme-chalk/index.css'
import '../theme/index.css'
import locale from 'element-ui/lib/locale/lang/en' // lang i18n
ElementUI.Dialog.props.closeOnClickModal.default = false
-
+import VxeUITable from 'vxe-table'
+import 'vxe-table/lib/style.css'
import '@/styles/index.scss' // global css
import dataV from '@jiaminghi/data-view'
Vue.use(dataV)
-
+Vue.use(VxeUITable)
import App from './App'
import store from './store'
import router from './router'
diff --git a/vue.config.js b/vue.config.js
index 788cbd7..d01c273 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -44,11 +44,11 @@ module.exports = {
},
proxy: {
'/prod-api': {
- target: 'http://localhost:8080/',
- changeOrigin: true,
- pathRewrite: {
- '^/prod-api': ''
- }
+ target: 'https://t-mana.beida666.com/',
+ changeOrigin: true
+ // pathRewrite: {
+ // '^/prod-api': ''
+ // }
}
}
// proxy: {