增加根据银行显示订单，增加系统设置页面，优化订单选择

src/components/fankuijilu/fankuijilu.css

@@ -5,13 +5,14 @@
   justify-content: space-between;
   align-items: center;
   height: 50px;
-  font-size: 20px;
+  font-size: 18px;
   /* padding: 32px 40px 53px 40px; */
 }
 
 #first-left {
   display: flex;
   flex-direction: row;
+  align-items: center;
   justify-content: space-between;
   width: 130px;
 }
@@ -28,7 +29,7 @@
 .tag {
   /* width: 95px; */
   /* height: 22px; */
-  font-size: 22px;
+  font-size: 18px;
   font-family: Microsoft YaHei-3970(82674968);
   font-weight: 400;
   color: #1A202B;
@@ -60,7 +61,7 @@
 }
 
 .total_balance {
-	font-size: 18px;
+	font-size: 16px;
 	font-family: Microsoft YaHei-3970(82674968);
 	font-weight: 400;
 	color: #333333;
@@ -70,7 +71,7 @@
 >>>.el-form-item__label {
 	margin: 0;
 	padding: 0;
-	font-size: 22px;
+	font-size: 20px;
 	font-family: Microsoft YaHei-3970(82674968);
 	font-weight: 400;
 	color: #333333;
@@ -82,7 +83,7 @@
 	height: 40px;
 	border: 1px solid #4D4D4D;
 	border-radius: 4px;
-	font-size: 20px;
+	font-size: 18px;
   margin-right: 20px;
 }
 
@@ -91,7 +92,7 @@
 	height: 40px;
 	border: 1px solid #4D4D4D;
 	border-radius: 4px;
-	font-size: 20px;
+	font-size: 18px;
 	font-family: Microsoft YaHei-3970(82674968);
 	font-weight: 400;
 	color: #333333;
@@ -103,12 +104,12 @@
 	height: 40px;
 	background: #F88A64;
 	border-radius: 4px;
-	font-size: 18px;
+	font-size: 16px;
   padding-left: 15px;
 }
 
 >>>.el-table__header {
-	font-size: 20px;
+	font-size: 18px;
 	font-family: Microsoft YaHei-3970(82674968);
 	font-weight: 400;
 }
@@ -132,7 +133,7 @@
 >>>.el-table__row .cell {
 	height: 35px;
 	line-height: 35px;
-	font-size: 18px;
+	font-size: 16px;
 	color: #333333;
 }
 
@@ -141,7 +142,7 @@
 	margin: 0 20px 0 0;
 	width: 50px;
 	height: 35px;
-	font-size: 18px;
+	font-size: 16px;
 }
 
 .el-pagination>>>.el-icon {
@@ -150,7 +151,7 @@
 	line-height: 38px;
 	border: 1px solid #626262;
 	border-radius: 2px;
-	font-size: 18px;
+	font-size: 16px;
 }
 
 .el-pagination>>>.number,
@@ -161,19 +162,19 @@
 	line-height: 40px;
 	border: 1px solid #626262;
 	border-radius: 2px;
-	font-size: 18px;
+	font-size: 16px;
 }
 
 .table-footer {
 	display: flex;
 	align-items: center;
-	justify-content: space-between;
+	justify-content: center;
 }
 
 .pages {
 	width: 1000px;
 	display: flex;
-	justify-content: flex-end;
+	justify-content: center;
 }
 
 >>>.el-pager li.active {
@@ -198,7 +199,7 @@
   display: flex;
   justify-content: space-around;
   width: 380px;
-  margin-left: 120px;
+  margin-left: 60px;
 }
 
 .dialog-footer>>>.el-button--default {
@@ -242,7 +243,7 @@
 }
 
 .right-tip {
-	font-size: 20px;
+	font-size: 18px;
 	font-family: Microsoft YaHei-3970(82674968);
 	font-weight: 400;
 	color: #333333;
@@ -282,7 +283,7 @@
 }
 
 .all-money{
-  font-size: 36px;
+  font-size: 34px;
 }
 .el-button--primary{
   border-color: #F88A64;
@@ -330,7 +331,7 @@
 }
 
 .item-text{
-  font-size: 22px;
+  font-size: 18px;
   color: #333333;
 }
 

src/components/fankuijilu/fankuijilu.vue

@@ -41,11 +41,11 @@
             </div>
           </el-table-column>
         </el-table> -->
-        <el-table ref="multipleTable" :data="tableData" tooltip-effect="dark" style="width: 100%" highlight-current-row>
+        <el-table ref="multipleTable" :data="tableData" tooltip-effect="dark" style="width: 100%" :stripe='stripe' highlight-current-row>
           <el-table-column prop="id" label="学号" align="center"></el-table-column>
           <el-table-column prop="stuName" label="姓名" align="center"></el-table-column>
           <el-table-column prop="tel" label="联系方式"></el-table-column>
-          <el-table-column prop="time" label="时间"></el-table-column>
+          <el-table-column prop="time" label="时间" width="200"></el-table-column>
           <el-table-column label="内容" id="content" align="center" widshow-overflow-tooltip>
             <el-popover placement="top-start" trigger="hover" slot-scope="scope"
               :content="scope.row.content">
@@ -70,7 +70,7 @@
     <el-row>
       <el-col :span="24" class="forth-row">
         <!-- 编辑对话框 -->
-        <el-dialog title="" :visible.sync="editdialogFormVisible" width="640px" height="487px" top="0vh"
+        <el-dialog title="" :visible.sync="editdialogFormVisible" width="540px" height="387px" top="0vh"
           class="my-dialog">
           <div id="center">
             <div id="logo-center"></div>
@@ -80,7 +80,7 @@
           </div>
           <span slot="footer" class="dialog-footer">
             <el-button type="primary" @click="handleSelect">确 定</el-button>
-            <el-button @click="editdialogFormVisible = false">取 消</el-button>
+            <el-button @click="cancelSelect">取 消</el-button>
           </span>
         </el-dialog>
       </el-col>
@@ -92,13 +92,13 @@
   export default {
     data() {
       return {
-        editdialogFormVisible: false,
-        selectName: '',
-        tableData: [],
-        multipleSelection: [],
-        pageSize: 10,
-        totalCount: 0,
-        index: 0
+        editdialogFormVisible: false, //弹框  
+        selectName: '', //搜索内容
+        tableData: [], //所有传入数据
+        pageSize: 10, //每页数量
+        totalCount: 0, //搜索总数
+        index: 0, 
+        stripe: true
       }
     },
     created: function() {
@@ -119,11 +119,28 @@
         this.index = index
         // console.log(index, row)
       },
+      //确定处理反馈信息
+      handleSelect() {
+        this.editdialogFormVisible = false
+        this.handleInfo(this.$Api.fankuiHandle + this.tableData[this.index].idNo)
+      },
+      //取消选择
+      cancelSelect(){
+        this.editdialogFormVisible = false
+        this.$message.info("取消处理")
+      },
+      //搜索
+      onSubmit() {
+        // console.log(this.selectName)
+        this.tableData = []
+        this.getTableData(this.$Api.fankui, 1, this.selectName)
+      },
       //获取反馈数据列表
-      getTableData(url, index) {
+      getTableData(url, index, keyword) {
         this.$axios.get(url + '?' + this.$qs.stringify({
           'curPage': index,
-          'pageSize': this.pageSize
+          'pageSize': this.pageSize,
+          'keyword': keyword
         }), {
           headers: {
             'Content-Type': 'application/x-www-form-urlencoded;charset=utf-8',
@@ -153,11 +170,6 @@
           console.log(err)
         })
       },
-      //确定处理反馈信息
-      handleSelect() {
-        this.editdialogFormVisible = false
-        this.handleInfo(this.$Api.fankuiHandle + this.tableData[this.index].idNo)
-      },
       //修改信息
       handleInfo(url) {
         this.$axios.defaults.headers.common['Content-Type'] = 'application/x-www-form-urlencoded;charset=utf-8';
@@ -167,15 +179,13 @@
             console.log(this.index)
             if (res.data.message == '执行成功') {
               // console.log(this.tableData[this.index].state)
+              this.$message.success("处理成功")
               this.tableData[this.index].state = '已处理'
             }
           }).catch(err => {
             console.log(err)
           })
       },
-      onSubmit() {
-        console.log('submit!')
-      },
       handleOpen(key, keyPath) {
         console.log(key, keyPath)
       },

src/components/index/Index.css

@@ -33,7 +33,7 @@
   /* width: 193px; */
   height: 34px;
   line-height: 34px;
-  font-size: 20px;
+  font-size: 18px;
   font-family: Microsoft YaHei-3970(82674968);
   /* font-weight: bold; */
   color: #FFFFFF;
@@ -74,7 +74,7 @@
 .el-menu-item span {
   height: 20px;
   padding-left: 6px;
-  font-size: 20px;
+  font-size: 18px;
   font-family: Microsoft YaHei-3970(82674968);
   font-weight: 400;
   color: #FFFFFF;
@@ -125,7 +125,7 @@
   width: 358px;
   height: 90px;
   line-height: 90px;
-  font-size: 30px;
+  font-size: 28px;
   font-family: Microsoft YaHei-3970(82674968);
   font-weight: bold;
   color: #333333;
@@ -160,7 +160,7 @@
 }
 
 .date-item {
-  font-size: 20px;
+  font-size: 18px;
   color: #53575A;
 }
 
@@ -175,7 +175,7 @@
   width: 43px;
   height: 54px;
   line-height: 54px;
-  font-size: 14px;
+  font-size: 12px;
   font-family: Microsoft YaHei-3970(82674968);
   font-weight: 400;
   color: #333333;

src/components/index/Index.vue

@@ -35,6 +35,12 @@
                 <span slot="title">反馈记录</span>
               </el-menu-item>
             </router-link>
+            <router-link to="shezhi" @click.native="refresh">
+              <el-menu-item index="/index/shezhi">
+                <i class="el-icon-shezhi"></i>
+                <span slot="title">系统设置</span>
+              </el-menu-item>
+            </router-link>
           </el-menu>
         </el-col>
       </el-row>

src/components/login/Login.vue

@@ -71,7 +71,6 @@
     },
     methods: {
       onSubmit() {
-        // console.log(this.ruleForm.uname)
         this.getLogin(this.$Api.login)
       },
       //登录
@@ -104,32 +103,6 @@
             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>

src/components/login/login.css

@@ -40,7 +40,7 @@
 	width: 431px;
 	height: 42px;
 	line-height: 42px;
-	font-size: 42px;
+	font-size: 40px;
 	font-family: Microsoft YaHei;
 	font-weight: bold;
 	color: #3CADFD;
@@ -64,7 +64,7 @@
 	height: 58px;
 	background: #F6F7FB;
 	border-radius: 29px;
-	font-size: 18px;
+	font-size: 16px;
 }
 
 .el-form-item>>>.el-icon-login-user{
@@ -86,7 +86,7 @@
 	background: linear-gradient(180deg, #4393F8, #535EF0);
 	box-shadow: 1px 4px 16px 0px rgba(84, 136, 254, 0.25);
 	border-radius: 29px;
-	font-size: 24px;
+	font-size: 22px;
 	font-family: Microsoft YaHei-3970(82674968);
 	font-weight: 400;
 	color: #FFFFFF;

src/components/orderList/orderList.css

@@ -5,7 +5,7 @@
   justify-content: space-between;
   align-items: center;
   height: 50px;
-  font-size: 20px;
+  font-size: 18px;
   /* padding: 32px 40px 53px 40px; */
 }
 
@@ -14,7 +14,7 @@
   flex-direction: row;
   justify-content: space-between;
   align-items: center;
-  width: 380px;
+  width: 650px;
 }
 
 #logo {
@@ -29,7 +29,7 @@
 .tag {
   /* width: 95px; */
   /* height: 22px; */
-  font-size: 22px;
+  font-size: 18px;
   font-family: Microsoft YaHei-3970(82674968);
   font-weight: 400;
   color: #1A202B;
@@ -47,10 +47,10 @@
 >>>.first-right-btn {
   width: 150px;
   height: 46px;
-  font-size: 20px;
+  font-size: 18px;
   border-radius: 5px;
-  padding-left: 15px;
-  padding-top: 10px;
+  padding-left: 18px;
+  padding-top: 11px;
 }
 
 .second-row {
@@ -78,7 +78,7 @@
 }
 
 .total_balance {
-	font-size: 18px;
+	font-size: 16px;
 	font-family: Microsoft YaHei-3970(82674968);
 	font-weight: 400;
 	color: #333333;
@@ -88,7 +88,7 @@
 >>>.el-form-item__label {
 	margin: 0;
 	padding: 0;
-	font-size: 22px;
+	font-size: 20px;
 	font-family: Microsoft YaHei-3970(82674968);
 	font-weight: 400;
 	color: #333333;
@@ -100,7 +100,7 @@
 	height: 40px;
 	border: 1px solid #4D4D4D;
 	border-radius: 4px;
-	font-size: 20px;
+	font-size: 18px;
 }
 
 .order>>>.el-input__inner {
@@ -108,7 +108,7 @@
 	height: 40px;
 	border: 1px solid #4D4D4D;
 	border-radius: 4px;
-	font-size: 20px;
+	font-size: 18px;
 }
 
 .el-button {
@@ -117,11 +117,11 @@
 	height: 40px;
 	background: #F88A64;
 	border-radius: 4px;
-	font-size: 18px;
+	font-size: 16px;
 }
 
 >>>.el-table__header {
-	font-size: 20px;
+	font-size: 18px;
 	font-family: Microsoft YaHei-3970(82674968);
 	font-weight: 400;
 }
@@ -145,7 +145,7 @@
 >>>.el-table__row .cell {
 	height: 35px;
 	line-height: 35px;
-	font-size: 18px;
+	font-size: 16px;
 	color: #333333;
 }
 
@@ -154,7 +154,7 @@
 	margin: 0 20px 0 0;
 	width: 50px;
 	height: 35px;
-	font-size: 18px;
+	font-size: 16px;
 }
 
 .el-pagination>>>.el-icon {
@@ -163,7 +163,7 @@
 	line-height: 38px;
 	border: 1px solid #626262;
 	border-radius: 2px;
-	font-size: 18px;
+	font-size: 16px;
 }
 
 .el-pagination>>>.number,
@@ -174,19 +174,19 @@
 	line-height: 40px;
 	border: 1px solid #626262;
 	border-radius: 2px;
-	font-size: 18px;
+	font-size: 16px;
 }
 
 .table-footer {
 	display: flex;
 	align-items: center;
-	justify-content: space-between;
+	justify-content: center;
 }
 
 .pages {
 	width: 1000px;
 	display: flex;
-	justify-content: flex-end;
+	justify-content: center;
 }
 
 >>>.el-pager li.active {
@@ -244,7 +244,7 @@
 }
 
 .right-tip {
-	font-size: 20px;
+	font-size: 18px;
 	font-family: Microsoft YaHei-3970(82674968);
 	font-weight: 400;
 	color: #333333;

src/components/orderList/orderList.vue

@@ -6,7 +6,13 @@
           <div id="logo"></div>
           <div class="tag">订单管理</div>
           <div>
-            <el-select v-model="formInline.value" class="selectDate" placeholder="请选择" @change="selectTime">
+            <el-select v-model="form.value" class="selectDate" placeholder="请选择查找银行" @change="selectBank">
+              <el-option v-for="item in form.options" :key="item.value" :label="item.label" :value="item.value">
+              </el-option>
+            </el-select>
+          </div>
+          <div>
+            <el-select v-model="formInline.value" class="selectDate" placeholder="请选择查找时间" @change="selectTime">
               <el-option v-for="item in formInline.options" :key="item.value" :label="item.label" :value="item.value">
               </el-option>
             </el-select>
@@ -49,16 +55,17 @@
             </template>
           </el-table-column>
           </el-table> -->
-          <el-table ref="multipleTable" :data="tableData" tooltip-effect="dark" style="width: 100%" highlight-current-row>
-          <el-table-column label="订单号" align="center">
+          <el-table ref="multipleTable" :data="tableData" tooltip-effect="dark" :stripe='stripe' style="width: 100%" highlight-current-row>
+          <el-table-column label="订单号" align="center" width="200">
             <template slot-scope="scope">{{ scope.row.order }}</template>
           </el-table-column>
-          <el-table-column prop="id" label="学号"></el-table-column>
+          <el-table-column prop="id" label="学号" width="200"></el-table-column>
           <el-table-column prop="stuName" label="姓名"></el-table-column>
-          <el-table-column prop="class" label="班级"></el-table-column>
-          <el-table-column prop="money" label="金额(元)"></el-table-column>
-          <el-table-column prop="time" label="时间" widshow-overflow-tooltip></el-table-column>
-          <el-table-column label="状态" align="center">
+          <el-table-column prop="class" label="班级" width="160"></el-table-column>
+          <el-table-column prop="money" label="金额(元)" width="100"></el-table-column>
+          <el-table-column prop="method" label="支付渠道"></el-table-column>
+          <el-table-column prop="time" label="时间" width="200"></el-table-column>
+          <el-table-column label="状态" align="center" width="80">
             <template slot-scope="scope">
               <el-tag :type="scope.row.state === '支付失败' ? 'danger' : 'success'" disable-transitions>{{scope.row.state}}
               </el-tag>
@@ -126,7 +133,22 @@
             label: '按日期选择'
           }],
           value: ''
-        },
+        },//时间列表
+        form: {
+          user: '',
+          options: [{
+            value: 'all',
+            label: '全部'
+          }, {
+            value: 'jianhang',
+            label: '建行支付'
+          }, {
+            value: 'nongshang',
+            label: '农商行支付'
+          }],
+          value: ''
+        },//银行列表
+        user_info:'',
         tableData: [], //订单数据
         user_token: '', //token
         all_money: 0, //总钱数
@@ -135,8 +157,12 @@
         selectOrder: '', //查找订单号或姓名
         monthValue: '', //选择的月份
         dayValue: '', //选择的日期
+        timeValue: '', //选择的时间，flag为2时值为monthValue，flag为3时值为dayValue
         flag: 1, //选择的状态
         datestr: '', //选择的时间
+        stripe: true,
+        bankValue: '', //选择的银行
+        index: 1, //第几页
       }
     },
     created: function() {
@@ -147,10 +173,27 @@
     methods: {
       //分页
       handleCurrentChange(val) {
-        this.currentPage = val;
+        this.index = val;
         this.tableData = []
         this.all_money = 0
-        this.getTableData(this.$Api.orderList, this.flag, val)
+        this.getTableData(this.$Api.orderList, this.flag, this.index,)
+      },
+      //选择银行
+      selectBank(val){
+        console.log(val)
+        if(val == 'jianhang'){
+          this.bankValue = 1
+          this.tableData = []
+          this.getTableData(this.$Api.orderList, this.flag, this.index, this.selectOrder, this.timeValue, this.bankValue)
+        }else if(val == 'nongshang'){
+          this.bankValue = 2
+          this.tableData = []
+          this.getTableData(this.$Api.orderList, this.flag, this.index, this.selectOrder, this.timeValue, this.bankValue)
+        }else{
+          this.bankValue = ''
+          this.tableData = []
+          this.getTableData(this.$Api.orderList, this.flag, this.index, this.selectOrder, this.timeValue, this.bankValue)
+        }
       },
       //选择时间
       selectTime(val) {
@@ -168,7 +211,7 @@
           this.tableData = []
           this.all_money = 0
           this.flag = 1
-          this.getTableData(this.$Api.orderList, this.flag)
+          this.getTableData(this.$Api.orderList, this.flag, this.index, this.selectOrder, this.timeValue, this.bankValue)
         }
       },
       //选择月份按钮
@@ -178,7 +221,7 @@
           this.btnChangeEnableMonth = false
         }
       },
-      //确定选择日期
+      //确定日期按钮
       handleSelectDay(){
         if (this.dayValue != '') {
           this.btnChangeEnableDay = false
@@ -186,23 +229,27 @@
       },
       //确定选择月份
       selectMonth(val) {
-        console.log(this.monthValue)
+        // console.log(this.monthValue)
         this.formInline.value = this.monthValue
         this.editdialogFormVisible = false
         this.tableData = []
         this.all_money = 0
-        this.getTableData(this.$Api.orderList, this.flag, 1, '', this.monthValue)
+        this.timeValue = this.monthValue
+        this.getTableData(this.$Api.orderList, this.flag, this.index, this.selectOrder, this.timeValue, this.bankValue)
         this.$message.success("选择成功")
+        // console.log(this.flag+'   '+this.timeValue)
       },
       //确定选择日期
       selectDay() {
-        console.log(this.dayValue)
+        // console.log(this.dayValue)
         this.formInline.value = this.dayValue
         this.editdialogFormVisible = false
         this.tableData = []
         this.all_money = 0
-        this.getTableData(this.$Api.orderList, this.flag, 1, '', this.dayValue)
+        this.timeValue = this.dayValue
+        this.getTableData(this.$Api.orderList, this.flag, this.index, this.selectOrder, this.timeValue, this.bankValue)
         this.$message.success("选择成功")
+        // console.log(this.flag+'    '+this.timeValue)
       },
       //退出选择
       selectLogout() {
@@ -221,16 +268,17 @@
         // console.log(this.selectOrder)
         this.tableData = []
         this.all_money = 0
-        this.getTableData(this.$Api.orderList, this.flag, 1, this.selectOrder)
+        this.getTableData(this.$Api.orderList, this.flag, this.index, this.selectOrder, this.timeValue, this.bankValue)
       },
       //获取订单数据
-      getTableData(url, flag, index, key, dateStr) {
+      getTableData(url, flag, index, key, dateStr, payMethod) {
         this.$axios.get(url + '?' + this.$qs.stringify({
           'flag': flag,
           'curPage': index,
           'pageSize': this.pageSize,
           'keyword': key,
-          'dateStr': dateStr
+          'dateStr': dateStr,
+          'payMethod': payMethod
         }), {
           headers: {
             'Content-Type': 'application/x-www-form-urlencoded;charset=utf-8',
@@ -238,7 +286,7 @@
             'admin_token': this.user_token
           }
         }).then(res => {
-          // console.log(res)
+          console.log(res)
           this.totalCount = res.data.data.page.totalCount
           for (var i = 0; i < res.data.data.page.list.length; i++) {
             var list = {}
@@ -247,7 +295,11 @@
             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
-
+            if(res.data.data.page.list[i].payMethod == 1){
+              list.method = "建行支付"
+            }else if(res.data.data.page.list[i].payMethod == 2){
+              list.method = "农商行支付"
+            }
             // this.all_money = (this.all_money + list.money).toFixed(2)
             this.all_money = this.all_money + list.money
 
@@ -303,8 +355,7 @@
         document.body.appendChild(link)
         link.click()
       }
-    },
-
+    }
   }
 </script>
 

src/components/payNameList/payNameList.css

@@ -6,7 +6,7 @@
   justify-content: space-between;
   /* align-items: center; */
   height: 50px;
-  font-size: 20px;
+  font-size: 18px;
   /* padding: 32px 40px 53px 40px; */
 }
 
@@ -30,7 +30,7 @@
 .tag {
   /* width: 95px; */
   /* height: 22px; */
-  font-size: 22px;
+  font-size: 18px;
   font-family: Microsoft YaHei-3970(82674968);
   font-weight: 400;
   color: #000000;
@@ -39,7 +39,7 @@
 
 .font{
   color: #4392F7;
-  font-size: 20px;
+  font-size: 18px;
 }
 
 >>>#first-right {
@@ -53,10 +53,10 @@
 >>>.first-right-btn {
   width: 110px;
   height: 46px;
-  font-size: 20px;
+  font-size: 18px;
   border-radius: 5px;
-  padding-left: 15px;
-  padding-top: 10px;
+  padding-left: 18px;
+  padding-top: 11px;
 }
 
 .second-row {
@@ -84,7 +84,7 @@
 }
 
 .total_balance {
-  font-size: 22px;
+  font-size: 20px;
   font-family: Microsoft YaHei-3970(82674968);
   font-weight: 400;
   color: #333333;
@@ -93,19 +93,27 @@
 >>>.el-form-item__label {
   margin: 0;
   padding: 0;
-  font-size: 22px;
+  font-size: 20px;
   font-family: Microsoft YaHei-3970(82674968);
   font-weight: 400;
   color: #333333;
   line-height: 40px;
 }
 
+.selectDate>>>.el-input__inner {
+	width: 240px;
+	height: 40px;
+	border: 1px solid #4D4D4D;
+	border-radius: 4px;
+	font-size: 18px;
+}
+
 .shuibiaoId>>>.el-input__inner {
   width: 240px;
   height: 40px;
   border: 1px solid #4D4D4D;
   border-radius: 4px;
-  font-size: 20px;
+  font-size: 18px;
 }
 
 .shuibiaoId{
@@ -117,24 +125,15 @@
   height: 40px;
   border: 1px solid #4D4D4D;
   border-radius: 4px;
-  font-size: 20px;
+  font-size: 18px;
   font-family: Microsoft YaHei-3970(82674968);
   font-weight: 400;
   color: #333333;
   line-height: 54px;
 }
 
-/* .el-button {
-  margin: 0 60px 0 40px;
-  width: 100px;
-  height: 40px;
-  background: #298DEF;
-  border-radius: 4px;
-  font-size: 18px;
-} */
-
 >>>.el-table__header {
-  font-size: 20px;
+  font-size: 18px;
   font-family: Microsoft YaHei-3970(82674968);
   font-weight: 400;
 }
@@ -158,7 +157,7 @@
 >>>.el-table__row .cell {
   height: 35px;
   line-height: 35px;
-  font-size: 18px;
+  font-size: 16px;
   color: #333333;
 }
 
@@ -170,7 +169,7 @@
   line-height: 38px;
   border: 1px solid #626262;
   border-radius: 2px;
-  font-size: 18px;
+  font-size: 16px;
 }
 
 .el-pagination>>>.number,
@@ -181,20 +180,21 @@
   line-height: 40px;
   border: 1px solid #626262;
   border-radius: 2px;
-  font-size: 18px;
+  font-size: 16px;
 }
 
 .table-footer {
   display: flex;
   align-items: center;
-  justify-content: space-between;
+  justify-content: center;
+  /* justify-content: space-between; */
 }
 
 .pages {
   /* width: 1000px; */
   width: 56%;
   display: flex;
-  justify-content: flex-end;
+  justify-content: center;
 }
 
 >>>.el-pager li.active {

src/components/payNameList/payNameList.vue

@@ -12,7 +12,6 @@
           </el-upload>
           <div class="first-right-text">
             <el-link type="primary" @click="downLoadFile">模板下载</el-link>
-            <!-- <a class="font" href="../../../static/template.xlsx" target="_blank" download="缴费名单模板.xlsx">模板下载</a> -->
           </div>
         </div>
       </el-col>
@@ -47,8 +46,9 @@
             </el-button>
           </el-table-column>
           </el-table> -->
-        <el-table ref="multipleTable" :data="tableData" tooltip-effect="dark" style="width: 100%" highlight-current-row>
-          <el-table-column label="学号" align="center">
+        <el-table ref="multipleTable" :data="tableData" tooltip-effect="dark" style="width: 100%" :stripe='stripe'
+          v-loading="loading" highlight-current-row>
+          <el-table-column label="学号" align="center" width="200">
             <template slot-scope="scope">{{ scope.row.id }}</template>
           </el-table-column>
           <el-table-column prop="stuName" label="姓名"></el-table-column>
@@ -98,8 +98,8 @@
         totalCount: 0, //名单数量总数
         selectName: '', //搜索名称
         fileList: [], //文件路径
-        url: '',
-        headers: {},
+        stripe: true, //表格条纹
+        loading: false, //表格加载状态
       }
     },
     created: function() {
@@ -109,63 +109,11 @@
       this.getTableData(this.$Api.paylist)
     },
     methods: {
-      /**
-       * 导入xls文件
-       * @param {Object} param
-       */
-      uploadXLS(param) {
-        console.log(param);
-        let form = new FormData();
-        form.append('file', param.file);
-        this.$axios({
-            method: "post",
-            url: this.$Api.upLoadFile,
-            headers: {
-              'Content-type': 'multipart/form-data',
-              'admin_token': this.user_token
-            },
-            data: form
-          })
-          .then(res => {
-            this.$message.success('文件上传成功！')
-          })
-          .catch(err => {
-            this.$message.error('文件上传失败')
-          })
-      },
-      //下载模板文件
-      downLoadFile() {
-        this.$confirm('是否下载缴费名单模板?', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }).then(() => {
-          window.location.href = '../../../static/缴费名单模板.xlsx'
-          this.$message({
-            type: 'success',
-            message: '下载成功!'
-          });
-        }).catch(() => {
-          this.$message({
-            type: 'info',
-            message: '取消下载'
-          });
-        });
-
-      },
       //搜索
       onSubmit() {
         this.tableData = []
         this.getTableData(this.$Api.paylist, 1, this.selectName)
       },
-      // //提示
-      // getMessage() {
-      //   setTimeout(this.$message({
-      //     showClose: true,
-      //     message: '登录成功',
-      //     type: 'success'
-      //   }),3000)
-      // },
       //分页
       handleCurrentChange(val) {
         this.currentPage = val;
@@ -192,6 +140,24 @@
           })
         }
       },
+      //下载模板文件
+      downLoadFile() {
+        this.$confirm('是否下载缴费名单模板?', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+        }).then(() => {
+          window.location.href = '../../../static/缴费名单模板.xlsx'
+          this.$message({
+            type: 'success',
+            message: '下载成功!'
+          });
+        }).catch(() => {
+          this.$message({
+            type: 'info',
+            message: '取消下载'
+          });
+        });
+      },
       //获取订单列表数据
       getTableData(url, index, key) {
         // console.log(index)
@@ -222,7 +188,39 @@
         }).catch(err => {
           console.log(err)
         })
-      }
+      },
+      /**
+       * 导入xls文件
+       * @param {Object} param
+       */
+      uploadXLS(param) {
+        // console.log(param);
+        this.loading = true
+        let form = new FormData();
+        form.append('file', param.file);
+        this.$axios({
+            method: "post",
+            url: this.$Api.upLoadFile,
+            headers: {
+              'Content-type': 'multipart/form-data',
+              'admin_token': this.user_token
+            },
+            data: form
+          })
+          .then(res => {
+            // console.log(res)
+            this.loading = false
+            this.$message.success('文件上传成功！')
+            let _this = this
+            setTimeout(() => {
+              _this.$router.go(0)
+            }, 1500)
+            // this.$message.success('文件上传成功！')
+          })
+          .catch(err => {
+            this.$message.error('文件上传失败')
+          })
+      },
     }
   }
 </script>

src/components/shezhi/shezhi.css

@@ -0,0 +1,32 @@
+.container{
+  width: 100%;
+  height: 100%;
+}
+
+.first-row {
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+  align-items: center;
+  height: 50px;
+  font-size: 18px;
+  width: 320px;
+}
+
+.tag {
+  /* width: 95px; */
+  /* height: 22px; */
+  font-size: 18px;
+  font-family: Microsoft YaHei-3970(82674968);
+  font-weight: 400;
+  color: #1A202B;
+  /* line-height: 54px; */
+}
+
+.selectDate>>>.el-input__inner {
+	width: 240px;
+	height: 40px;
+	border: 1px solid #4D4D4D;
+	border-radius: 4px;
+	font-size: 18px;
+}

src/components/shezhi/shezhi.vue

@@ -0,0 +1,89 @@
+<template>
+  <div class="container">
+    <div class="first-row">
+      <div class="tag">订单管理</div>
+      <div>
+        <el-select v-model="form.value" class="selectDate" placeholder="请选择查找银行" @change="selectMethod">
+          <el-option v-for="item in form.options" :key="item.value" :label="item.label" :value="item.value">
+          </el-option>
+        </el-select>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+  export default {
+    data() {
+      return {
+        form: {
+          user: '',
+          options: [{
+            value: 'jianhang',
+            label: '建行支付'
+          }, {
+            value: 'nongshang',
+            label: '农商行支付'
+          }],
+          value: ''
+        }, //银行列表
+        user_token: '', //token
+        user_info: '',
+        method: ''
+      }
+    },
+    created: function() {
+      this.user_info = JSON.parse(sessionStorage.getItem('usr_info'))
+      this.user_token = this.user_info.token
+      this.getTableData(this.$Api.payMethod)
+    },
+    methods: {
+      //确定支付方式
+      selectMethod(val) {
+        // console.log(val)
+        if (val == 'jianhang') {
+          this.method = 1
+        } else {
+          this.method = 2
+        }
+        // console.log(this.$Api.setPayMethod)
+        this.setPayMethod(this.$Api.setPayMethod, this.method)
+      },
+      //获取订单数据
+      getTableData(url) {
+        this.$axios.get(url + '?' + this.$qs.stringify({}), {
+          headers: {
+            'Content-Type': 'application/x-www-form-urlencoded;charset=utf-8',
+            'admin_token': this.user_token
+          }
+        }).then(res => {
+          // console.log(res)
+          if (res.data.data[0].currentPay == "1") {
+            console.log(res.data.data[0].payMethodName)
+            this.form.value = res.data.data[0].payMethodName
+          } else if (res.data.data[1].currentPay == "1") {
+            console.log(res.data.data[1].payMethodName)
+            this.form.value = res.data.data[1].payMethodName
+          }
+        }).catch(err => {
+          console.log(err)
+        })
+      },
+      setPayMethod(url, method) {
+        this.$axios.defaults.headers.common['Content-Type'] = 'application/x-www-form-urlencoded;charset=utf-8';
+        this.$axios.defaults.headers.common['admin_token'] = this.user_token;
+        this.$axios.put(url + method + '/currentPay')
+          .then(res => {
+            // console.log(res)
+            this.$message.success("支付方式已设置成" + (this.method == 1 ? '建行支付' : '农商行支付'))
+          }).catch(err => {
+            console.log(err)
+          })
+      }
+    },
+  }
+</script>
+
+<style>
+  @import url("shezhi.css");
+</style>

src/components/wrongOrder/wrongOrder.css

@@ -5,7 +5,7 @@
   justify-content: space-between;
   align-items: center;
   height: 50px;
-  font-size: 20px;
+  font-size: 18px;
   /* padding: 32px 40px 53px 40px; */
 }
 
@@ -28,7 +28,7 @@
 .tag {
   /* width: 95px; */
   /* height: 22px; */
-  font-size: 22px;
+  font-size: 18px;
   font-family: Microsoft YaHei-3970(82674968);
   font-weight: 400;
   color: #1A202B;
@@ -60,7 +60,7 @@
 }
 
 .total_balance {
-	font-size: 18px;
+	font-size: 16px;
 	font-family: Microsoft YaHei-3970(82674968);
 	font-weight: 400;
 	color: #333333;
@@ -70,7 +70,7 @@
 >>>.el-form-item__label {
 	margin: 0;
 	padding: 0;
-	font-size: 22px;
+	font-size: 20px;
 	font-family: Microsoft YaHei-3970(82674968);
 	font-weight: 400;
 	color: #333333;
@@ -82,7 +82,7 @@
 	height: 40px;
 	border: 1px solid #4D4D4D;
 	border-radius: 4px;
-	font-size: 20px;
+	font-size: 18px;
   margin-right: 20px;
 }
 
@@ -91,7 +91,7 @@
 	height: 40px;
 	border: 1px solid #4D4D4D;
 	border-radius: 4px;
-	font-size: 20px;
+	font-size: 18px;
 	font-family: Microsoft YaHei-3970(82674968);
 	font-weight: 400;
 	color: #333333;
@@ -103,12 +103,12 @@
 	height: 40px;
 	background: #F88A64;
 	border-radius: 4px;
-	font-size: 18px;
+	font-size: 16px;
   padding-left: 15px;
 }
 
 >>>.el-table__header {
-	font-size: 20px;
+	font-size: 18px;
 	font-family: Microsoft YaHei-3970(82674968);
 	font-weight: 400;
 }
@@ -132,7 +132,7 @@
 >>>.el-table__row .cell {
 	height: 35px;
 	line-height: 35px;
-	font-size: 18px;
+	font-size: 16px;
 	color: #333333;
 }
 
@@ -141,7 +141,7 @@
 	margin: 0 20px 0 0;
 	width: 50px;
 	height: 35px;
-	font-size: 18px;
+	font-size: 16px;
 }
 
 .el-pagination>>>.el-icon {
@@ -150,7 +150,7 @@
 	line-height: 38px;
 	border: 1px solid #626262;
 	border-radius: 2px;
-	font-size: 18px;
+	font-size: 16px;
 }
 
 .el-pagination>>>.number,
@@ -161,19 +161,19 @@
 	line-height: 40px;
 	border: 1px solid #626262;
 	border-radius: 2px;
-	font-size: 18px;
+	font-size: 16px;
 }
 
 .table-footer {
 	display: flex;
 	align-items: center;
-	justify-content: space-between;
+	justify-content: center;
 }
 
 .pages {
 	width: 1000px;
 	display: flex;
-	justify-content: flex-end;
+	justify-content: center;
 }
 
 >>>.el-pager li.active {
@@ -242,7 +242,7 @@
 }
 
 .right-tip {
-	font-size: 20px;
+	font-size: 18px;
 	font-family: Microsoft YaHei-3970(82674968);
 	font-weight: 400;
 	color: #333333;
@@ -281,9 +281,6 @@
 	font-size: 14px;
 }
 
-.all-money{
-  font-size: 36px;
-}
 .el-button--primary{
   border-color: #F88A64;
 }
@@ -330,7 +327,7 @@
 }
 
 .item-text{
-  font-size: 22px;
+  font-size: 20px;
   color: #333333;
 }
 

src/components/wrongOrder/wrongOrder.vue

@@ -51,7 +51,7 @@
             </el-button>
           </el-table-column>
         </el-table> -->
-        <el-table ref="multipleTable" :data="tableData" tooltip-effect="dark" style="width: 100%"
+        <el-table ref="multipleTable" :data="tableData" tooltip-effect="dark" style="width: 100%" :stripe='stripe'
           @selection-change="handleSelectionChange" highlight-current-row>
           <el-table-column label="订单号" align="center">
             <template slot-scope="scope">{{ scope.row.order }}</template>
@@ -131,7 +131,7 @@
         },
         tableData: [],
         multipleSelection: [],
-        // font_color: [true,false,false,false,false,false,false,false]
+        stripe: true
       }
     },
     methods: {

src/interface/index.js

@@ -23,7 +23,13 @@ let online_url = {
     fankui: base + "tuitionpayment/feedbackmsg/list",
 
     //反馈信息处理
-    fankuiHandle: base + "tuitionpayment/feedbackmsg/info/"
+    fankuiHandle: base + "tuitionpayment/feedbackmsg/info/",
+
+    //支付方式列表
+    payMethod: base + "payMethodSetting/list",
+    
+    //设置支付方式
+    setPayMethod: base + "payMethodSetting/"
 
 }
 

src/router/index.js

@@ -6,7 +6,7 @@ import PNL from '@/components/payNameList/payNameList'
 import OrderList from '@/components/orderList/orderList'
 import WrongOrder from '@/components/wrongOrder/wrongOrder'
 import FKJL from '@/components/fankuijilu/fankuijilu'
-
+import sheZhi from '@/components/shezhi/shezhi.vue'
 
 Vue.use(Router)
 
@@ -36,6 +36,10 @@ export default new Router({
 			path: 'fkjl',
 			name: 'FKJL',
 			component: FKJL
+		},{
+			path: 'shezhi',
+			name: 'sheZhi',
+			component: sheZhi
 		}]
 	}]
 })