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

更改前端页面Order ID

Candy 6 éve
szülő
commit
f9aea6042b

+ 9 - 4
vue-admin-master/package-lock.json

@@ -3691,7 +3691,8 @@
         },
         "ansi-regex": {
           "version": "2.1.1",
-          "bundled": true
+          "bundled": true,
+          "optional": true
         },
         "aproba": {
           "version": "1.2.0",
@@ -4056,7 +4057,8 @@
         },
         "safe-buffer": {
           "version": "5.1.2",
-          "bundled": true
+          "bundled": true,
+          "optional": true
         },
         "safer-buffer": {
           "version": "2.1.2",
@@ -4104,6 +4106,7 @@
         "strip-ansi": {
           "version": "3.0.1",
           "bundled": true,
+          "optional": true,
           "requires": {
             "ansi-regex": "^2.0.0"
           }
@@ -4142,11 +4145,13 @@
         },
         "wrappy": {
           "version": "1.0.2",
-          "bundled": true
+          "bundled": true,
+          "optional": true
         },
         "yallist": {
           "version": "3.0.3",
-          "bundled": true
+          "bundled": true,
+          "optional": true
         }
       }
     },

+ 1 - 30
vue-admin-master/src/routes.js

@@ -39,36 +39,7 @@ let routes = [
             { path: '/user_setting', component: Table, name: 'User Settings' }
         ]
     },
-    {
-        path: '/',
-        component: Home,
-        name: '功能页一',
-        iconCls: 'el-icon-message',//图标样式class
-        children: [
-            // { path: '/table', component: Table, name: 'Table' },
-            { path: '/form', component: Page6, name: '页面3' },
-            { path: '/user', component: Page6, name: '页面4' },
-        ]
-    },
-    {
-        path: '/',
-        component: Home,
-        name: '功能页二',
-        iconCls: 'el-icon-star-off',
-        children: [
-            { path: '/page4', component: Page6, name: '页面4' },
-            { path: '/page5', component: Page6, name: '页面5' }
-        ]
-    },
-    {
-        path: '/',
-        component: Home,
-        name: '图表',
-        iconCls: 'el-icon-picture',
-        children: [
-            { path: '/Page6', component: Page6, name: '页面6' }
-        ]
-    },
+    
 
     // 找不到的时候,提示404页面
     {

+ 2 - 2
vue-admin-master/src/views/Home.vue

@@ -179,8 +179,8 @@
 		.header {
 			height: 60px;
 			line-height: 60px;
-			background: $color-primary;
-			//background: red;
+			//background: $color-primary;
+			background: red;
 			color:#fff;
 			.userinfo {
 				text-align: right;

+ 7 - 6
vue-admin-master/src/views/nav1/Table.vue

@@ -5,7 +5,7 @@
       <el-form :inline="true" :model="filters">
         <div>
           <el-form-item>
-            <el-button>Order ID</el-button>
+            <el-button>Position ID</el-button>
           </el-form-item>
           <el-form-item>
             <el-input v-model="filters.orderid" placeholder="订单号" :disabled="lock_order"></el-input>
@@ -490,12 +490,13 @@
 							this.listLoading = false;
 							this.display_table = true;
 						}else{
-
+							this.total = 0;
+							this.users=[];
+							this.userdata=[];							
 							// 失败就清除所有的用户信息
 							this.$message.error(msg);
 							this.listLoading = false;
-							this.users=[];
-							this.userdata=[];
+							
 
 						}
 					} else {
@@ -828,7 +829,7 @@
 					//this.socket = new WebSocket('ws://47.106.182.13:12382');
 					//this.socket = new WebSocket('ws://154.218.25.112:12381');
 					//this.socket = new WebSocket('ws://120.25.77.133:12382');
-					this.socket = new WebSocket('ws://154.206.44.109:12381');
+					this.socket = new WebSocket('ws://154.206.44.109:12380');
 					//连接成功后的回调函数
                     this.socket.onopen = function () {
 						clearInterval(_that_.reConnect);
@@ -1116,7 +1117,6 @@
 							this.userdata = this.users.slice((this.page-1)*this.page_size,this.page*this.page_size);
 							this.listLoading = false;
 							this.display_table = true;
-							var datas = user;
 							_this.sels = user;
 
 							for (let index = 0; index < _this.sels.length; index++) {
@@ -1176,6 +1176,7 @@
 							// 失败就清除所有的用户信息
 							this.$message.error(msg);
 							this.listLoading = false;
+							this.total =0;
 							this.users=[];
 							this.userdata=[];