1

src/components/UserMan/studentList.vue

@@ -234,9 +234,12 @@
             }}</span>
           </template>
         </el-table-column>
-        <el-table-column prop="name" label="是否认证">
+        
+        <el-table-column prop="PointNum" label="点数"></el-table-column>
+        <el-table-column prop="name" label="是否绑定">
           <template slot-scope="scope">
-           
+              <el-tag  effect="dark" size="mini" v-if="scope.row.StudentId>0">绑定</el-tag>
+              <el-tag type="danger" size="mini" effect="dark" v-if="scope.row.StudentId==0">未绑定</el-tag>
           </template>
         </el-table-column>
         <el-table-column prop="CreateDate" width="150" label="加入时间">
@@ -615,7 +618,7 @@ export default {
         msg.Id = 0;
       }
       this.GetLocalFile(
-        "/api/user/GetMemberUserListToExcel",
+        "/api/Education/GetMemberUserListToExcel",
         msg,
         "用户管理.xls"
       );
@@ -641,7 +644,7 @@ export default {
         this.msg.StartTime = "";
         this.msg.EndTime = "";
       }
-      this.apipost("/api/user/GetMemberUserPageList", msg, (res) => {
+      this.apipost("/api/Education/GetMemberUserPageList", msg, (res) => {
         this.loading = false;
         if (res.data.resultCode == 1) {
           this.total = res.data.data.count;
@@ -655,7 +658,7 @@ export default {
     },
     getDown() {
       this.cityOptions = [];
-      this.apipost("/api/user/GetMemberUserExcelEnumList", {}, (res) => {
+      this.apipost("/api/Education/GetEduUserExportEnumList", {}, (res) => {
         this.cities = res.data.data;
         let data = res.data.data;
         data.forEach((item) => {

src/components/education/edactivity.vue

@@ -211,14 +211,19 @@
     <el-dialog title="地图展示" :visible.sync="isShowMap" width="960px">
       <commonMap @map-submit="mapEvent" :address="addMsg.LocationName"></commonMap>
     </el-dialog>
-    <el-dialog title="报名信息" :visible.sync="dialogTableVisible" width="910px">
+    <el-dialog title="报名信息" :visible.sync="dialogTableVisible" width="1100px">
       <el-table :data="joinData" style="width:100%;">
         <el-table-column property="LinkMan" label="联系人" width="100"></el-table-column>
         <el-table-column property="LinkTel" label="联系电话" width="120"></el-table-column>
         <el-table-column property="PeopleNum" label="人数" width="60"></el-table-column>
-        <el-table-column property="Money" label="星星数" width="80"></el-table-column>
-        <el-table-column property="Remark" label="备注" width="200"></el-table-column>
-        <el-table-column property="CreateTimeStr" label="报名时间" width="160"></el-table-column>
+        <el-table-column property="Money" label="付款方式" width="180">
+           <template slot-scope="scope">
+             <span v-if="scope.row.PaymentWay==6">星星支付:{{scope.row.TotalPoint}}点</span>
+             <span v-if="scope.row.PaymentWay==1">现金支付:{{scope.row.Money}}元</span>
+          </template>
+        </el-table-column>
+        <el-table-column property="Remark" label="备注" width="150"></el-table-column>
+        <el-table-column property="PaymentTime" label="报名时间" width="200"></el-table-column>
         <el-table-column label="操作" width="150">
           <template slot-scope="scope">
             <template v-if="scope.row.IsApplyForCancel==1">