zhang 4 vuotta sitten
vanhempi
commit
54cc015b58

+ 8 - 8
config/index.js

@@ -12,13 +12,13 @@ module.exports = {
 		assetsPublicPath: '/',
 		// 后端请求地址代理,配置后testIp再之后的页面调用时就直接指代 http://197.82.15.15:8088
 		proxyTable: {
-			'/api': {
-				target: 'http://baibai.natapp1.cc/', // 你请求的第三方接口
-				changeOrigin: true, // 在本地会创建一个虚拟服务端,然后发送请求的数据,并同时接收请求的数据,这样服务端和服务端进行数据的交互就不会有跨域问题
-				pathRewrite: { // 路径重写,
-					'^/api': '/' // 替换target中的请求地址,也就是说以后你在请求http://api.douban.com/v2/XXXXX这个地址的时候直接写成/api即可。
-				}
-			}
+			// '/api': {
+			// 	target: 'http://baibai.natapp1.cc/', // 你请求的第三方接口
+			// 	changeOrigin: true, // 在本地会创建一个虚拟服务端,然后发送请求的数据,并同时接收请求的数据,这样服务端和服务端进行数据的交互就不会有跨域问题
+			// 	pathRewrite: { // 路径重写,
+			// 		'^/api': '/' // 替换target中的请求地址,也就是说以后你在请求http://api.douban.com/v2/XXXXX这个地址的时候直接写成/api即可。
+			// 	}
+			// }
 		},
 
 		// Various Dev Server settings
@@ -59,7 +59,7 @@ module.exports = {
 		// Paths
 		assetsRoot: path.resolve(__dirname, '../dist'),
 		assetsSubDirectory: 'static',
-		assetsPublicPath: '/',
+		assetsPublicPath: '/jiaofei/',
 
 		/**
 		 * Source Maps

+ 1 - 1
package-lock.json

@@ -1,5 +1,5 @@
 {
-  "name": "hot-water-manager-web",
+  "name": "welcome-register-web",
   "version": "1.0.0",
   "lockfileVersion": 1,
   "requires": true,

+ 37 - 83
src/components/fankuijilu/fankuijilu.vue

@@ -25,14 +25,11 @@
       <el-col :span="24" class="third-row">
         <el-table ref="multipleTable" :data="tableData" tooltip-effect="dark" style="width: 100%"
           @selection-change="handleSelectionChange" highlight-current-row>
-          <el-table-column label="订单号" width="240" align="center">
-            <template slot-scope="scope">{{ scope.row.order }}</template>
-          </el-table-column>
-          <el-table-column prop="id" label="学号" width="240"></el-table-column>
-          <el-table-column prop="stuName" label="姓名" width="150"></el-table-column>
-          <el-table-column prop="tel" label="联系方式" width="200"></el-table-column>
-          <el-table-column prop="time" label="时间" width="260"></el-table-column>
-          <el-table-column prop="content" label="内容" width="300" id="content" widshow-overflow-tooltip></el-table-column>
+          <el-table-column prop="id" label="学号" width="260" align="center"></el-table-column>
+          <el-table-column prop="stuName" label="姓名" width="200" align="center"></el-table-column>
+          <el-table-column prop="tel" label="联系方式" width="270"></el-table-column>
+          <el-table-column prop="time" label="时间" width="220"></el-table-column>
+          <el-table-column prop="content" label="内容" width="400" id="content" align="center" widshow-overflow-tooltip></el-table-column>
           <el-table-column label="操作" width="120" id="state">
             <el-button id="show-btn" slot-scope="scope" @click="handleEdit(scope.$index, scope.row)">
               {{scope.row.state}}
@@ -41,7 +38,7 @@
         </el-table>
         <div style="margin-top: 20px" class="table-footer">
           <div class="pages">
-            <el-pagination layout="prev, pager, next" :total="9000"></el-pagination>
+            <el-pagination layout="prev, pager, next" :total="1"></el-pagination>
           </div>
         </div>
       </el-col>
@@ -90,73 +87,10 @@
           }],
           value: '选项1'
         },
-        tableData: [{
-          order: 'KB09010103',
-          id: '20140309010103',
-          stuName: '吴亦凡',
-          tel: '13677988965',
-          time: '2021/08/12 09:25:45',
-          content: '这里是反馈的内容这里是反馈的内容这里是反馈的内容这里是反馈的内容这里是反馈的内容',
-          state: '已受理'
-        }, {
-          order: 'KB09010103',
-          id: '20140309010103',
-          stuName: '吴亦凡',
-          tel: '13677988965',
-          time: '2021/08/12 09:25:45',
-          content: '这里是反馈的内容这里是反馈的内容这里是反馈的内容这里是反馈的内容这里是反馈的内容',
-          state: '未受理'
-        }, {
-          order: 'KB09010103',
-          id: '20140309010103',
-          stuName: '吴亦凡',
-          tel: '13677988965',
-          time: '2021/08/12 09:25:45',
-          content: '这里是反馈的内容',
-          state: '未受理'
-        }, {
-          order: 'KB09010103',
-          id: '20140309010103',
-          stuName: '吴亦凡',
-          tel: '13677988965',
-          time: '2021/08/12 09:25:45',
-          content: '这里是反馈的内容',
-          state: '未受理'
-        }, {
-          order: 'KB09010103',
-          id: '20140309010103',
-          stuName: '吴亦凡',
-          tel: '13677988965',
-          time: '2021/08/12 09:25:45',
-          content: '这里是反馈的内容',
-          state: '未受理'
-        }, {
-          order: 'KB09010103',
-          id: '20140309010103',
-          stuName: '吴亦凡',
-          tel: '13677988965',
-          time: '2021/08/12 09:25:45',
-          content: '这里是反馈的内容',
-          state: '未受理'
-        }, {
-          order: 'KB09010103',
-          id: '20140309010103',
-          stuName: '吴亦凡',
-          tel: '13677988965',
-          time: '2021/08/12 09:25:45',
-          content: '这里是反馈的内容',
-          state: '未受理'
-        }, {
-          order: 'KB09010103',
-          id: '20140309010103',
-          stuName: '吴亦凡',
-          tel: '13677988965',
-          time: '2021/08/12 09:25:45',
-          content: '这里是反馈的内容',
-          state: '未受理'
-        }],
+        tableData: [],
         multipleSelection: [],
-        // font_color: [true,false,false,false,false,false,false,false]
+        // url: 'http://192.168.161.230:9999/tuitionpayment/feedbackmsg/list',  //测试
+        url: 'https://jtishfw.ncjti.edu.cn/jiaofei/backendApi/tuitionpayment/feedbackmsg/list'
       }
     },
     methods: {
@@ -191,14 +125,34 @@
       }
     },
     created: function() {
-      // for(var i=0 ;i<this.tableData.length ;i++){
-      //   // console.log(this.tableData[i].state)
-      //   if(this.tableData[i].state=='支付失败'){
-      //     this.font_color=true
-      //   }else{
-      //     this.font_color=false
-      //   }
-      // }
+      this.user_info = JSON.parse(sessionStorage.getItem('usr_info'))
+      this.user_token = this.user_info.token
+      this.$axios.get(this.url, {
+        headers: {
+          'Content-Type': 'application/x-www-form-urlencoded;charset=utf-8',
+          'Author': 'codingliang',
+          'admin_token': this.user_token
+        }
+      }).then(res => {
+        console.log(res)
+        for (var i = 0; i < res.data.data.list.length; i++) {
+          var list = {}
+          list.id = res.data.data.list[i].feedbackPersonIdentify
+          list.stuName = res.data.data.list[i].feedbackPersonName
+          list.tel = res.data.data.list[i].feedbackPersonPhone
+          list.time = res.data.data.list[i].publishTime
+          list.content = res.data.data.list[i].feedbackInfo
+          if (res.data.data.list[i].status == 2) {
+            list.state = '已处理'
+          } else {
+            list.state = '未处理'
+          }
+          this.tableData.push(list)
+        }
+        // console.log(this.tableData)
+      }).catch(err => {
+        console.log(err)
+      })
     }
   }
 </script>

+ 8 - 2
src/components/index/Index.css

@@ -5,7 +5,7 @@
 }
 
 .menu-left {
-  width: 260px;
+  width: 240px;
   /* width: 100%; */
   height: 100%;
   background: #4393F8;
@@ -50,7 +50,8 @@
 } */
 
 .el-menu-item {
-  padding-left: 67px !important;
+  width: 240px;
+  padding-left: 60px !important;
   height: 60px;
 }
 
@@ -182,6 +183,11 @@
   cursor: pointer;
 }
 
+#logout{
+  display: flex;
+  align-items: center;
+}
+
 /* top */
 
 /* main */

+ 11 - 5
src/components/index/Index.vue

@@ -52,8 +52,11 @@
             <div class="tx"></div>
             <div class="user-name">管理员</div>
             <div class="shuxian"></div>
-            <div class="logout-btn" @click="logout"></div>
-            <div class="user-name">退出</div>
+            <div id="logout"  @click="logout">
+              <div class="logout-btn"></div>
+              <div class="user-name">退出</div>
+            </div>
+
           </div>
         </el-col>
       </el-row>
@@ -75,7 +78,7 @@
           value: '代发地方',
 
         },
-        now_date: ''
+        now_date: '',
       }
     },
     methods: {
@@ -91,7 +94,10 @@
       logout(done) {
         this.$confirm('确认退出?')
           .then(_ => {
-            done();
+            this.$router.push({
+              path: '/jiaofei/'
+            })
+            sessionStorage.clear()
           })
           .catch(_ => {});
       }
@@ -109,7 +115,7 @@
           _this.now_date = aData.getFullYear() + "-" + month + "-" + date + ' ' + week + " " + aData.getHours() +
             ":" + aData.getMinutes() + ":" + aData.getSeconds();
         }, 1000);
-        console.log(this.now_date) //2019-8-20
+        // console.log(this.now_date) //2019-8-20
       },
     }
 </script>

+ 128 - 94
src/components/login/Login.vue

@@ -1,108 +1,142 @@
 <template>
-	<div class="container">
-		<el-row>
-			<el-col :span="24">
-				<div id="login_form">
+  <div class="container">
+    <el-row>
+      <el-col :span="24">
+        <div id="login_form">
           <div class="title-item">
             <div id="logo"></div>
             <div id="title">学费缴纳对账管理平台</div>
           </div>
-					<el-form label-width="0px" :model="ruleForm" status-icon :rules="rules" ref="ruleForm"
-						class="demo-ruleForm">
-						<el-form-item prop="uname">
-							<el-input placeholder="请输入账号" maxlength="16" v-model="ruleForm.uname"
-								prefix-icon="el-icon-login-user"></el-input>
-						</el-form-item>
-						<el-form-item prop="upass">
-							<el-input placeholder="请输入密码" maxlength="16" type="password" v-model="ruleForm.upass"
-								prefix-icon="el-icon-login-pass"></el-input>
-						</el-form-item>
-						<el-form-item>
-							<!-- <el-button type="primary" @click="submitForm('ruleForm')">登 陆</el-button> -->
+          <el-form label-width="0px" :model="ruleForm" status-icon :rules="rules" ref="ruleForm" class="demo-ruleForm">
+            <el-form-item prop="uname">
+              <el-input placeholder="请输入账号" maxlength="16" v-model="ruleForm.uname" prefix-icon="el-icon-login-user">
+              </el-input>
+            </el-form-item>
+            <el-form-item prop="upass">
+              <el-input placeholder="请输入密码" maxlength="16" type="password" v-model="ruleForm.upass"
+                prefix-icon="el-icon-login-pass"></el-input>
+            </el-form-item>
+            <el-form-item>
+              <!-- <el-button type="primary" @click="submitForm('ruleForm')">登 陆</el-button> -->
               <el-button type="primary" @click="onSubmit()">登 陆</el-button>
-						</el-form-item>
-					</el-form>
-				</div>
-			</el-col>
-		</el-row>
-	</div>
+            </el-form-item>
+          </el-form>
+        </div>
+      </el-col>
+    </el-row>
+  </div>
 </template>
 
 <script>
-	export default {
-		data() {
-			var checkName = (rule, value, callback) => {
-				console.log(rule, value, callback);
-				if (!value) {
-					return callback(new Error('请输入账号'));
-				}
-				setTimeout(() => {
-					if (value.length < 6) {
-						callback(new Error('账号长度不小于6位'));
-					} else {
-						callback();
-					}
-				}, 30);
-			};
-			var validatePass = (rule, value, callback) => {
-				console.log(rule, value, callback);
-				if (value === '') {
-					callback(new Error('请输入密码'));
-				} else {
-					callback();
-				}
-			};
-			return {
-				ruleForm: {
-					uname: '',
-					upass: ''
-				},
-				rules: {
-					uname: [{
-						validator: checkName,
-						trigger: 'blur'
-					}],
-					upass: [{
-						validator: validatePass,
-						trigger: 'blur'
-					}]
-				}
-			};
-		},
-		methods: {
-			onSubmit() {
-        this.$router.push({path:'/index'})
-			},
-			// submitForm(formName) {
-			// 	let self = this;
-			// 	this.$refs[formName].validate((valid) => {
-			// 		this.loading = true;
-			// 		requset.api_login(self.form)
-			// 			.then(resp => {
-			// 				this.loading = false;
-			// 				if (resp.data.code == 200) {
-			// 					let token = resp.data.data.token.access_token;
-			// 					//存储用户名到数据库。
-			// 					db.set("userName", resp.data.data.user.name);
-			// 					//发送登录成功的action
-			// 					this.loginAction(token);
-			// 					this.$message("验证成功!");
-			// 					this.$router.replace('/'); //跳转到首页
-			// 				} else {
-			// 					this.$message({
-			// 						showClose: true,
-			// 						message: resp.data.msg,
-			// 						type: 'error'
-			// 					});
-			// 				}
+  export default {
+    data() {
+      var checkName = (rule, value, callback) => {
+        console.log(rule, value, callback);
+        if (!value) {
+          return callback(new Error('请输入账号'));
+        }
+        setTimeout(() => {
+          if (value.length < 5) {
+            callback(new Error('账号长度不小于5位'));
+          } else {
+            callback();
+          }
+        }, 30);
+      };
+      var validatePass = (rule, value, callback) => {
+        console.log(rule, value, callback);
+        if (value === '') {
+          callback(new Error('请输入密码'));
+        } else {
+          callback();
+        }
+      };
+      return {
+        ruleForm: {
+          uname: '',
+          upass: ''
+        },
+        rules: {
+          uname: [{
+            validator: checkName,
+            trigger: 'blur'
+          }],
+          upass: [{
+            validator: validatePass,
+            trigger: 'blur'
+          }]
+        },
+        // url: 'http://192.168.161.230:9999/tuitionpayment/admininfo/login',  //测试
+        url: 'https://jtishfw.ncjti.edu.cn/jiaofei/backendApi/tuitionpayment/admininfo/login',
+        user_info: {}
+      };
+    },
+    methods: {
+      onSubmit() {
+        // console.log(this.ruleForm.uname)
+        this.$axios.post(this.url + '?' + this.$qs.stringify({
+            userName: this.ruleForm.uname,
+            password: this.ruleForm.upass
+            // userName: 'admin',
+            // password: '123456'
+          }), {
+            headers: {
+              'Content-Type': 'application/x-www-form-urlencoded;charset=utf-8',
+              'Author': 'codingliang'
+            }
+          })
+          .then(res => {
+            // console.log(res.data.code)
+            if (res.data.code == 1) {
+              this.user_info.userName = this.ruleForm.uname
+              this.user_info.password = this.ruleForm.upass
+              // this.user_info.userName = 'admin'
+              // this.user_info.password = '12345'
+              this.user_info.token = res.data.data.token
+              let user_info_Str = JSON.stringify(this.user_info)
+              sessionStorage.setItem('usr_info', user_info_Str)
+              this.$router.push({
+                path: '/index'
+              })
+            }else{
+              this.$message.error('用户名或密码错误');
+            }
+          })
+          .catch(err => {
+            console.log(err)
 
-			// 			})
-			// 	});
-			// }
-		}
-	}
+          })
+      },
+      // submitForm(formName) {
+      // 	let self = this;
+      // 	this.$refs[formName].validate((valid) => {
+      // 		this.loading = true;
+      // 		requset.api_login(self.form)
+      // 			.then(resp => {
+      // 				this.loading = false;
+      // 				if (resp.data.code == 200) {
+      // 					let token = resp.data.data.token.access_token;
+      // 					//存储用户名到数据库。
+      // 					db.set("userName", resp.data.data.user.name);
+      // 					//发送登录成功的action
+      // 					this.loginAction(token);
+      // 					this.$message("验证成功!");
+      // 					this.$router.replace('/'); //跳转到首页
+      // 				} else {
+      // 					this.$message({
+      // 						showClose: true,
+      // 						message: resp.data.msg,
+      // 						type: 'error'
+      // 					});
+      // 				}
+
+      // 			})
+      // 	});
+      // }
+    }
+  }
 </script>
 
 <style scoped>
-	@import url("./login.css");
+  @import url("./login.css");
 </style>

+ 70 - 111
src/components/orderList/orderList.vue

@@ -7,14 +7,14 @@
           <div class="tag">订单管理</div>
         </div>
         <div id="first-right">
-          <el-button type="primary" class="first-right-btn">导出已缴表单</el-button>
+          <el-button type="primary" class="first-right-btn" @click="downLoadFile">导出已缴表单</el-button>
         </div>
       </el-col>
     </el-row>
     <hr style="background-color: #CCCCCC;height: 1px;border: 0;margin-top: 32px;">
     <el-row>
       <el-col :span="24" class="second-row">
-        <div class="total_balance">总金额:<span class="all-money">15898</span> 元</div>
+        <div class="total_balance">总金额:<span class="all-money">{{all_money}}</span> 元</div>
         <el-form :inline="true" :model="formInline" class="demo-form-inline">
           <el-form-item label="关键字:" class="shuibiaoId">
             <el-input v-model="formInline.user" placeholder="请输入订单号或者班级"></el-input>
@@ -43,49 +43,14 @@
               </el-tag>
             </template>
           </el-table-column>
-          <!--  <el-table-column label="状态" align="center" width="200">
-						<el-button id="show-btn" slot-scope="scope" @click="handleEdit(scope.$index, scope.row)"> {{scope.row.state}}
-						</el-button>
-					</el-table-column> -->
         </el-table>
         <div style="margin-top: 20px" class="table-footer">
           <div class="pages">
-            <el-pagination layout="prev, pager, next" :total="9000"></el-pagination>
+            <el-pagination layout="prev, pager, next" :total="1"></el-pagination>
           </div>
         </div>
       </el-col>
     </el-row>
-    <el-row>
-      <el-col :span="24" class="forth-row">
-        <!-- 编辑对话框 -->
-        <el-dialog title="充值记录" :visible.sync="editdialogFormVisible" width="640px" top="0vh" class="my-dialog">
-          <hr
-            style="width: 100%; position: absolute; top: 60px; left: 0px;background-color: #CCCCCC;height: 1px;border: 0;">
-          <div class="right-tip">共计:14578元</div>
-          <el-form :inline="true" :model="formInline" class="demo-form-inline">
-            <el-form-item label="筛选条件:">
-              <el-select v-model="formInline.region" placeholder="月份">
-                <el-option label="1月" value="shanghai"></el-option>
-                <el-option label="2月" value="beijing"></el-option>
-              </el-select>
-            </el-form-item>
-          </el-form>
-          <el-table ref="multipleTable" :data="tableData" tooltip-effect="dark" style="width: 100%"
-            @selection-change="handleSelectionChange" highlight-current-row>
-            <el-table-column align="center" label="时间">
-              <template slot-scope="scope">{{ scope.row.id }}</template>
-            </el-table-column>
-            <el-table-column align="center" prop="balance" label="金额" show-overflow-tooltip>
-            </el-table-column>
-          </el-table>
-          <div slot="footer" class="dialog-footer">
-            <div class="dialog-pages">
-              <el-pagination layout="prev, pager, next" :total="9000"></el-pagination>
-            </div>
-          </div>
-        </el-dialog>
-      </el-col>
-    </el-row>
   </div>
 </template>
 
@@ -112,72 +77,14 @@
           }],
           value: '选项1'
         },
-        tableData: [{
-          order: 'KB09010103',
-          id: '20140309010103',
-          stuName: '吴亦凡',
-          class: '跳水二班',
-          money: '14789',
-          time: '2021/08/12 09:25:45',
-          state: '支付失败'
-        }, {
-          order: 'KB09010103',
-          id: '20140309010103',
-          stuName: '吴亦凡',
-          class: '跳水二班',
-          money: '14789',
-          time: '2021/08/12 09:25:45',
-          state: '支付成功'
-        }, {
-          order: 'KB09010103',
-          id: '20140309010103',
-          stuName: '吴亦凡',
-          class: '跳水二班',
-          money: '14789',
-          time: '2021/08/12 09:25:45',
-          state: '支付成功'
-        }, {
-          order: 'KB09010103',
-          id: '20140309010103',
-          stuName: '吴亦凡',
-          class: '跳水二班',
-          money: '14789',
-          time: '2021/08/12 09:25:45',
-          state: '支付成功'
-        }, {
-          order: 'KB09010103',
-          id: '20140309010103',
-          stuName: '吴亦凡',
-          class: '跳水二班',
-          money: '14789',
-          time: '2021/08/12 09:25:45',
-          state: '支付成功'
-        }, {
-          order: 'KB09010103',
-          id: '20140309010103',
-          stuName: '吴亦凡',
-          class: '跳水二班',
-          money: '14789',
-          time: '2021/08/12 09:25:45',
-          state: '支付成功'
-        }, {
-          order: 'KB09010103',
-          id: '20140309010103',
-          stuName: '吴亦凡',
-          class: '跳水二班',
-          money: '14789',
-          time: '2021/08/12 09:25:45',
-          state: '支付成功'
-        }, {
-          order: 'KB09010103',
-          id: '20140309010103',
-          stuName: '吴亦凡',
-          class: '跳水二班',
-          money: '14789',
-          time: '2021/08/12 09:25:45',
-          state: '支付成功'
-        }],
+        tableData: [],
         multipleSelection: [],
+        user_token: '',
+        all_money: 0,
+        // down_url: 'http://192.168.161.230:9999/tuitionpayment/payorder/downloadResult',  //测试
+        // url: 'http://192.168.161.230:9999/tuitionpayment/payorder/list',  //测试
+        down_url: 'https://jtishfw.ncjti.edu.cn/jiaofei/backendApi/tuitionpayment/payorder/downloadResult',
+        url: 'https://jtishfw.ncjti.edu.cn/jiaofei/backendApi/tuitionpayment/payorder/list',
         // font_color: [true,false,false,false,false,false,false,false]
       }
     },
@@ -210,17 +117,69 @@
       handleDelete(index, row) {
         this.delDialogVisible = true
         console.log(index, row)
+      },
+      downLoadFile() {
+        this.$axios.get(this.down_url, {
+          headers: {
+            'Content-Type': 'application/x-www-form-urlencoded;charset=utf-8',
+            'Author': 'codingliang',
+            'admin_token': this.user_token
+          },
+          responseType: 'blob'
+        }).then(res => {
+          console.log(res)
+          this.download(res.data)
+        }).catch(err => {
+          console.log(err)
+        })
+      },
+      //下载文件
+      download(data) {
+        if (!data) {
+          return
+        }
+        let url = window.URL.createObjectURL(new Blob([data]))
+        let link = document.createElement('a')
+        link.style.display = 'none'
+        link.href = url
+        link.setAttribute('download', 'excel.xlsx')
+        document.body.appendChild(link)
+        link.click()
       }
     },
     created: function() {
-      // for(var i=0 ;i<this.tableData.length ;i++){
-      //   // console.log(this.tableData[i].state)
-      //   if(this.tableData[i].state=='支付失败'){
-      //     this.font_color=true
-      //   }else{
-      //     this.font_color=false
-      //   }
-      // }
+      this.user_info = JSON.parse(sessionStorage.getItem('usr_info'))
+      this.user_token = this.user_info.token
+      this.$axios.get(this.url, {
+        headers: {
+          'Content-Type': 'application/x-www-form-urlencoded;charset=utf-8',
+          'Author': 'codingliang',
+          'admin_token': this.user_token
+        }
+      }).then(res => {
+        console.log(res)
+        for (var i = 0; i < res.data.data.page.list.length; i++) {
+          var list = {}
+          list.order = res.data.data.page.list[i].orderNo
+          list.id = res.data.data.page.list[i].payerIdentify
+          list.stuName = res.data.data.page.list[i].studentName
+          list.class = res.data.data.page.list[i].className
+          list.money = res.data.data.page.list[i].orderAmount
+
+          this.all_money += list.money
+
+          list.time = res.data.data.page.list[i].finishTime
+          if (res.data.data.page.list[i].status == 2) {
+            list.state = '支付成功'
+          } else {
+            list.state = '支付失败'
+          }
+          this.tableData.push(list)
+        }
+        // console.log(this.tableData)
+      }).catch(err => {
+        console.log(err)
+      })
     }
   }
 </script>

+ 6 - 0
src/components/payNameList/payNameList.css

@@ -14,6 +14,7 @@
   display: flex;
   flex-direction: row;
   justify-content: space-between;
+  align-items: center;
   width: 130px;
 }
 
@@ -315,4 +316,9 @@
   height: 17px;
 }
 
+>>>.el-button--primary{
+  background-color: #F88A64;
+  border-color: #F88A64;
+}
+
 /* dev-mgr */

+ 156 - 172
src/components/payNameList/payNameList.vue

@@ -1,7 +1,7 @@
 <template>
-	<div>
-		<el-row>
-			<el-col :span="24" class="first-row">
+  <div>
+    <el-row>
+      <el-col :span="24" class="first-row">
         <div id="first-left">
           <div id="logo"></div>
           <div class="tag">缴费名单</div>
@@ -12,186 +12,170 @@
             <el-link>模板下载</el-link>
           </div>
         </div>
-			</el-col>
-		</el-row>
+      </el-col>
+    </el-row>
     <hr style="background-color: #CCCCCC;height: 1px;border: 0;margin-top: 32px;">
-		<el-row>
-			<el-col :span="24" class="second-row">
-				<div class="total_balance">关键字:</div>
-				<el-form :inline="true" :model="formInline" class="demo-form-inline">
-					<el-form-item class="shuibiaoId">
-						<el-input v-model="formInline.user" placeholder="请输入姓名或学号"></el-input>
-					</el-form-item>
-					<el-form-item>
-						<el-button type="primary" @click="onSubmit">搜索</el-button>
-					</el-form-item>
-				</el-form>
-			</el-col>
-		</el-row>
-		<el-row>
-			<el-col :span="24" class="third-row">
-				<el-table ref="multipleTable" :data="tableData" tooltip-effect="dark" style="width: 100%"
-					@selection-change="handleSelectionChange" highlight-current-row>
-					<el-table-column label="学号" width="300" align="center">
-						<template slot-scope="scope">{{ scope.row.id }}</template>
-					</el-table-column>
-					<el-table-column prop="stuName" label="姓名"  width="180"></el-table-column>
+    <el-row>
+      <el-col :span="24" class="second-row">
+        <div class="total_balance">关键字:</div>
+        <el-form :inline="true" :model="formInline" class="demo-form-inline">
+          <el-form-item class="shuibiaoId">
+            <el-input v-model="formInline.user" placeholder="请输入姓名或学号"></el-input>
+          </el-form-item>
+          <el-form-item>
+            <el-button type="primary" @click="onSubmit">搜索</el-button>
+          </el-form-item>
+        </el-form>
+      </el-col>
+    </el-row>
+    <el-row>
+      <el-col :span="24" class="third-row">
+        <el-table ref="multipleTable" :data="tableData" tooltip-effect="dark" style="width: 100%"
+          @selection-change="handleSelectionChange" highlight-current-row>
+          <el-table-column label="学号" width="300" align="center">
+            <template slot-scope="scope">{{ scope.row.id }}</template>
+          </el-table-column>
+          <el-table-column prop="stuName" label="姓名" width="180"></el-table-column>
           <el-table-column prop="institute" label="学院" width="260"></el-table-column>
           <el-table-column prop="major" label="专业" width="220"></el-table-column>
           <el-table-column prop="class" label="班级" width="220"></el-table-column>
-					<el-table-column prop="money" label="缴费余额(元)" width="220" widshow-overflow-tooltip></el-table-column>
-					<el-table-column label="操作" align="center" width="120">
-						<el-button class="show-btn" slot-scope="scope" @click="handleEdit(scope.$index, scope.row)">详情
-						</el-button>
-					</el-table-column>
-				</el-table>
-				<div style="margin-top: 20px" class="table-footer">
-					<div class="pages">
-						<el-pagination layout="prev, pager, next" :total="9000"></el-pagination>
-					</div>
-				</div>
-			</el-col>
-		</el-row>
-		<el-row>
-			<el-col :span="24" class="forth-row">
-				<!-- 编辑对话框 -->
-				<el-dialog title="详情" :visible.sync="editdialogFormVisible" width="520px" top="0vh" class="my-dialog">
-					<div class="right-tip">关于缴费金额的包含费用</div>
+          <el-table-column prop="money" label="缴费余额(元)" width="220" widshow-overflow-tooltip></el-table-column>
+          <el-table-column label="操作" align="center" width="120">
+            <el-button class="show-btn" slot-scope="scope" @click="handleEdit(scope.$index, scope.row)">详情
+            </el-button>
+          </el-table-column>
+        </el-table>
+        <div style="margin-top: 20px" class="table-footer">
+          <div class="pages">
+            <el-pagination layout="prev, pager, next" :total="1"></el-pagination>
+          </div>
+        </div>
+      </el-col>
+    </el-row>
+    <el-row>
+      <el-col :span="24" class="forth-row">
+        <!-- 编辑对话框 -->
+        <el-dialog title="详情" :visible.sync="editdialogFormVisible" width="520px" top="0vh" class="my-dialog">
+          <div class="right-tip">关于缴费金额的包含费用</div>
           <hr style="background-color: #CCCCCC;height: 1px;border: 0;margin-top: 20px;">
           <div id="money_list">
-            <div class="view-balance">学费:{{ e_money }}元</div>
-            <div class="view-balance">住宿费:{{ e_money }}元</div>
-            <div class="view-balance">预收材料费:{{ e_money }}元</div>
-            <div class="view-balance">体检费:{{ e_money }}元</div>
-            <div class="view-balance">保险费:{{ e_money }}元</div>
-            <div class="view-balance">空调租赁费:{{ e_money }}元</div>
-            <div class="view-balance">军训服:{{ e_money }}元</div>
-            <div class="view-balance">生活用品:{{ e_money }}元</div>
+            <p v-for="(user,i) in payItemDetail">{{user}}</p>
           </div>
-				</el-dialog>
-			</el-col>
-		</el-row>
-	</div>
+        </el-dialog>
+      </el-col>
+    </el-row>
+  </div>
 </template>
 
 <script>
-	export default {
-		data() {
-			return {
-				editdialogFormVisible: false,
-				delDialogVisible: false,
-				form: {
-					id: 'KB580002652',
-					drom: '18',
-					room: '118'
-				},
-				formLabelWidth: '120px',
-				formInline: {
-					user: '',
-					options: [{
-						value: '选项1',
-						label: '全部'
-					}, {
-						value: '选项2',
-						label: '黄金糕'
-					}],
-					value: '选项1'
-				},
-				tableData: [{
-					id: '20140309010103',
-					stuName: '全红禅',
-          institute: '跳水学院',
-          major: '跳水研究',
-          class: '跳水一班',
-					money: '21900'
-				}, {
-					id: '20140309010103',
-					stuName: '全红禅',
-					institute: '跳水学院',
-					major: '跳水研究',
-					class: '跳水一班',
-					money: '21900'
-				}, {
-					id: '20140309010103',
-					stuName: '全红禅',
-					institute: '跳水学院',
-					major: '跳水研究',
-					class: '跳水一班',
-					money: '21900'
-				}, {
-					id: '20140309010103',
-					stuName: '全红禅',
-					institute: '跳水学院',
-					major: '跳水研究',
-					class: '跳水一班',
-					money: '21900'
-				}, {
-					id: '20140309010103',
-					stuName: '全红禅',
-					institute: '跳水学院',
-					major: '跳水研究',
-					class: '跳水一班',
-					money: '21900'
-				}, {
-					id: '20140309010103',
-					stuName: '全红禅',
-					institute: '跳水学院',
-					major: '跳水研究',
-					class: '跳水一班',
-					money: '21900'
-				}, {
-					id: '20140309010103',
-					stuName: '全红禅',
-					institute: '跳水学院',
-					major: '跳水研究',
-					class: '跳水一班',
-					money: '21900'
-				}, {
-					id: '20140309010103',
-					stuName: '全红禅',
-					institute: '跳水学院',
-					major: '跳水研究',
-					class: '跳水一班',
-					money: '21900'
-				}],
-				multipleSelection: [],
-        e_money: '5980'
-			}
-		},
-		methods: {
-			onSubmit() {
-				console.log('submit!')
-			},
-			handleOpen(key, keyPath) {
-				console.log(key, keyPath)
-			},
-			handleClose(key, keyPath) {
-				console.log(key, keyPath)
-			},
-			toggleSelection(rows) {
-				if (rows) {
-					rows.forEach(row => {
-						this.$refs.multipleTable.toggleRowSelection(row)
-					})
-				} else {
-					this.$refs.multipleTable.clearSelection()
-				}
-			},
-			handleSelectionChange(val) {
-				this.multipleSelection = val
-			},
-			handleEdit(index, row) {
-				this.editdialogFormVisible = true
-				console.log(index, row)
-			},
-			handleDelete(index, row) {
-				this.delDialogVisible = true
-				console.log(index, row)
-			}
-		}
-	}
+  export default {
+    data() {
+      return {
+        editdialogFormVisible: false,
+        delDialogVisible: false,
+        form: {
+          id: 'KB580002652',
+          drom: '18',
+          room: '118'
+        },
+        formLabelWidth: '120px',
+        formInline: {
+          user: '',
+          options: [{
+            value: '选项1',
+            label: '全部'
+          }, {
+            value: '选项2',
+            label: '黄金糕'
+          }],
+          value: '选项1'
+        },
+        tableData: [], //主页数据
+        payItemDetail: [], //详细数据
+        multipleSelection: [],
+        e_money: '5980',
+        user_info: {},
+        user_token: '',
+        // url: 'http://192.168.161.230:9999/tuitionpayment/payableinfo/list',  //测试
+        url:'https://jtishfw.ncjti.edu.cn/jiaofei/backendApi/tuitionpayment/payableinfo/list'
+      }
+    },
+    methods: {
+      onSubmit() {
+        console.log('submit!')
+      },
+      handleOpen(key, keyPath) {
+        console.log(key, keyPath)
+      },
+      handleClose(key, keyPath) {
+        console.log(key, keyPath)
+      },
+      toggleSelection(rows) {
+        if (rows) {
+          rows.forEach(row => {
+            this.$refs.multipleTable.toggleRowSelection(row)
+          })
+        } else {
+          this.$refs.multipleTable.clearSelection()
+        }
+      },
+      handleSelectionChange(val) {
+        this.multipleSelection = val
+      },
+      handleEdit(index, row) {
+        this.editdialogFormVisible = true
+        // console.log(index,row)
+        var itemDetail = [] //临时数组
+        var detail = row.payItemDetail.split('\\')
+        // console.log(detail.length)
+        for (var j = 0; j < detail.length; j++) {
+          this.payItemDetail[j] = detail[j]
+        }
+        console.log(this.payItemDetail)
+      },
+      handleDelete(index, row) {
+        this.delDialogVisible = true
+        console.log(index, row)
+      }
+    },
+    created: function() {
+      this.user_info = JSON.parse(sessionStorage.getItem('usr_info'))
+      // console.log(this.user_info)
+      if( this.user_info == null || this.user_info.userName != 'admin' || this.user_info.password != '123456'){
+        this.$router.push({
+          path: '/jiaofei/'
+        })
+      }
+      this.user_token = this.user_info.token
+      this.$axios.get( this.url, {
+        headers: {
+          'Content-Type': 'application/x-www-form-urlencoded;charset=utf-8',
+          'Author': 'codingliang',
+          'admin_token': this.user_token
+        }
+      }).then(res => {
+        // console.log(res)
+        // console.log(res.data.data.list.length)
+        for (var i = 0; i < res.data.data.list.length; i++) {
+          var list = {} //外层数据
+          // var list2 = {} //详细数据
+          list.id = res.data.data.list[i].studentNo
+          list.stuName = res.data.data.list[i].studentName
+          list.institute = res.data.data.list[i].collegeName
+          list.major = res.data.data.list[i].majorName
+          list.class = res.data.data.list[i].className
+          list.money = res.data.data.list[i].realPayAmount
+          list.payItemDetail = res.data.data.list[i].payItemDetail
+          this.tableData.push(list)
+        }
+        // console.log(this.tableData)
+      }).catch(err => {
+        console.log(err)
+      })
+    }
+  }
 </script>
 
 <style scoped>
-	@import url("payNameList.css");
+  @import url("payNameList.css");
 </style>

+ 4 - 84
src/components/wrongOrder/wrongOrder.vue

@@ -33,13 +33,13 @@
           <el-table-column prop="class" label="班级" width="180"></el-table-column>
           <el-table-column prop="money" label="金额(元)" width="130"></el-table-column>
           <el-table-column prop="time" label="时间" width="250"></el-table-column>
-          <el-table-column label="状态" width="140" align="center">
+          <el-table-column label="学校状态" width="140" align="center">
             <template slot-scope="scope">
               <el-tag :type="scope.row.school_state === '支付失败' ? 'danger' : 'success'" disable-transitions>{{scope.row.school_state}}
               </el-tag>
             </template>
           </el-table-column>
-          <el-table-column label="状态" width="140" align="center">
+          <el-table-column label="银行状态" width="140" align="center">
             <template slot-scope="scope">
               <el-tag :type="scope.row.bank_state === '支付失败' ? 'danger' : 'success'" disable-transitions>{{scope.row.bank_state}}
               </el-tag>
@@ -53,7 +53,7 @@
         </el-table>
         <div style="margin-top: 20px" class="table-footer">
           <div class="pages">
-            <el-pagination layout="prev, pager, next" :total="9000"></el-pagination>
+            <el-pagination layout="prev, pager, next" :total="1"></el-pagination>
           </div>
         </div>
       </el-col>
@@ -101,87 +101,7 @@
           }],
           value: '选项1'
         },
-        tableData: [{
-          order: 'KB09010103',
-          id: '20140309010103',
-          stuName: '吴亦凡',
-          class: '跳水二班',
-          money: '14789',
-          time: '2021/08/12 09:25:45',
-          school_state: '支付成功',
-          bank_state: '支付失败',
-          state: '已处理'
-        }, {
-          order: 'KB09010103',
-          id: '20140309010103',
-          stuName: '吴亦凡',
-          class: '跳水二班',
-          money: '14789',
-          time: '2021/08/12 09:25:45',
-          school_state: '支付成功',
-          bank_state: '支付失败',
-          state: '已处理'
-        }, {
-          order: 'KB09010103',
-          id: '20140309010103',
-          stuName: '吴亦凡',
-          class: '跳水二班',
-          money: '14789',
-          time: '2021/08/12 09:25:45',
-          school_state: '支付成功',
-          bank_state: '支付失败',
-          state: '已处理'
-        }, {
-          order: 'KB09010103',
-          id: '20140309010103',
-          stuName: '吴亦凡',
-          class: '跳水二班',
-          money: '14789',
-          time: '2021/08/12 09:25:45',
-          school_state: '支付成功',
-          bank_state: '支付失败',
-          state: '已处理'
-        }, {
-          order: 'KB09010103',
-          id: '20140309010103',
-          stuName: '吴亦凡',
-          class: '跳水二班',
-          money: '14789',
-          time: '2021/08/12 09:25:45',
-          school_state: '支付成功',
-          bank_state: '支付失败',
-          state: '已处理'
-        }, {
-          order: 'KB09010103',
-          id: '20140309010103',
-          stuName: '吴亦凡',
-          class: '跳水二班',
-          money: '14789',
-          time: '2021/08/12 09:25:45',
-          school_state: '支付成功',
-          bank_state: '支付失败',
-          state: '已处理'
-        }, {
-          order: 'KB09010103',
-          id: '20140309010103',
-          stuName: '吴亦凡',
-          class: '跳水二班',
-          money: '14789',
-          time: '2021/08/12 09:25:45',
-          school_state: '支付成功',
-          bank_state: '支付失败',
-          state: '已处理'
-        }, {
-          order: 'KB09010103',
-          id: '20140309010103',
-          stuName: '吴亦凡',
-          class: '跳水二班',
-          money: '14789',
-          time: '2021/08/12 09:25:45',
-          school_state: '支付成功',
-          bank_state: '支付失败',
-          state: '已处理'
-        }],
+        tableData: [],
         multipleSelection: [],
         // font_color: [true,false,false,false,false,false,false,false]
       }

+ 9 - 4
src/main.js

@@ -6,14 +6,19 @@ import router from './router'
 import ElementUI from 'element-ui';
 import 'element-ui/lib/theme-chalk/index.css';
 import echarts from 'echarts'
-import axios from 'axios'; /* 引入axios进行地址访问*/
+import axios from "axios"
+import qs from "qs"
 
+// axios.defaults.timeout = 3000 //响应时间
+// axios.defaults.headers.post['Content-Type'] = 'multipart/form-data'; //配置请求头
+// axios.defaults.baseURL = process.env.NODE_HOST; // 配置接口地址
+// axios.defaults.baseURL='http://baibai.natapp1.cc'
+console.log(process.env.NODE_ENV)
+// alert('环境:' + process.env.NODE_ENV)
 
 Vue.use(ElementUI);
 
-axios.defaults.headers['Content-Type'] = 'application/x-www-form-urlencoded'
-// axios.defaults.baseURL='http://baibai.natapp1.cc'
-
+Vue.prototype.$qs = qs;
 Vue.prototype.$axios = axios;
 Vue.prototype.$echarts = echarts
 

+ 1 - 0
src/store/index.js

@@ -1,6 +1,7 @@
 import Vue from 'vue'
 import Vuex from 'vuex'
 
+
 Vue.use(Vuex);
 let store = new Vuex.Store({
 	state: {