diff --git a/.idea/CoPilot.iml b/.idea/CoPilot.iml new file mode 100644 index 00000000..24643cc3 --- /dev/null +++ b/.idea/CoPilot.iml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 00000000..28a804d8 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 00000000..b75416f5 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 00000000..94a25f7f --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml new file mode 100644 index 00000000..bb01031a --- /dev/null +++ b/.idea/workspace.xml @@ -0,0 +1,78 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1568117044403 + + + + + + + + + \ No newline at end of file diff --git a/1.html b/1.html new file mode 100644 index 00000000..cc650f7f --- /dev/null +++ b/1.html @@ -0,0 +1,22 @@ + + + + + + + + + + + Hello, world! + + +

Hello, world!

+ + + + + + + + \ No newline at end of file diff --git a/build/build.js b/build/build.js index 6b8add10..c0f02e5d 100644 --- a/build/build.js +++ b/build/build.js @@ -1,3 +1,5 @@ + + require('./check-versions')() process.env.NODE_ENV = 'production' diff --git a/build/webpack.base.conf.js b/build/webpack.base.conf.js index cd79c65d..5704fc6e 100644 --- a/build/webpack.base.conf.js +++ b/build/webpack.base.conf.js @@ -28,15 +28,15 @@ module.exports = { }, module: { rules: [ - { - test: /\.(js|vue)$/, - loader: 'eslint-loader', - enforce: "pre", - include: [resolve('src'), resolve('test')], - options: { - formatter: require('eslint-friendly-formatter') - } - }, + // { + // test: /\.(js|vue)$/, + // loader: 'eslint-loader', + // enforce: "pre", + // include: [resolve('src'), resolve('test')], + // options: { + // formatter: require('eslint-friendly-formatter') + // } + // }, { test: /\.vue$/, loader: 'vue-loader', diff --git a/index.html b/index.html index d452776c..719cbf73 100644 --- a/index.html +++ b/index.html @@ -32,6 +32,9 @@ + + + + + + + + + + + + + + + + diff --git a/src/components/views/Dashboard.vue b/src/components/views/Dashboard.vue index fb5b24ab..365528d3 100644 --- a/src/components/views/Dashboard.vue +++ b/src/components/views/Dashboard.vue @@ -3,7 +3,7 @@
-
+
@@ -37,14 +37,14 @@
@@ -78,6 +78,195 @@
+ + +
+
+
+
+

月度生产报告

+ +
+ +
+ + +
+ +
+
+ +
+
+
+

+ 生产量: 1 一月, 2014 - 30 六月, 2014 +

+ +
+ + +
+ +
+ +
+

+ Goal Completion +

+ +
+ Add Products to Cart + 160/200 + +
+
+
+
+ +
+ Complete Purchase + 310/400 + +
+
+
+
+ +
+ Visit Premium Page + 480/800 + +
+
+
+
+ +
+ Send Inquiries + 250/500 + +
+
+
+
+ +
+ +
+ +
+ +
+
+
+
+ 17% +
$35,210.43
+ TOTAL REVENUE +
+ +
+ +
+
+ 0% +
$10,390.90
+ TOTAL COST +
+ +
+ +
+
+ 20% +
$24,813.53
+ TOTAL PROFIT +
+ +
+ +
+
+ 18% +
1200
+ GOAL COMPLETIONS +
+ +
+
+ +
+ +
+ +
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + +
@@ -118,110 +307,582 @@
+ + + + + + + + + + + + + + + + + + +
+
+

最新情况

+ +
+ + +
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
作物ID作物名状态数量
OR9842西红柿Shipped +
60
+
OR1848土豆Pending +
60
+
OR7429茄子Delivered +
60
+
OR7429青菜Processing +
60
+
OR1848西红柿Pending +
60
+
OR7429西红柿Delivered +
60
+
OR9842西红柿Shipped +
60
+
+
+ +
+ +
+ Place New Order + View All Orders +
+ +
+ +
+ + + + +
+
+

最近售出的作物

+ +
+ + +
+
+ +
+ +
+ +
+ View All Products +
+ +
+ +
+ + + + +
+ + \ No newline at end of file diff --git a/src/components/views/Setting.vue b/src/components/views/Setting.vue index d8b33d33..d0410ac0 100644 --- a/src/components/views/Setting.vue +++ b/src/components/views/Setting.vue @@ -1,120 +1,76 @@ diff --git a/src/components/views/Tables.vue b/src/components/views/Tables.vue index d3d4b4cc..e620d308 100644 --- a/src/components/views/Tables.vue +++ b/src/components/views/Tables.vue @@ -1,11 +1,11 @@ diff --git a/src/components/views/Tasks.vue b/src/components/views/Tasks.vue index 461580ed..90d5fd35 100644 --- a/src/components/views/Tasks.vue +++ b/src/components/views/Tasks.vue @@ -1,7 +1,17 @@ +