11

src/components/index/SignUp/ConfirmSignUp.vue

@@ -16,7 +16,7 @@
           <div class="qrcode" ref="qrCodeUrl"></div>
         </div>
         <div>请使用<span>微信</span>扫一扫，扫描二维码支付</div>
-        <div>手机完成支付后，请等待系统处理，在此之前请勿关闭窗口</div>
+        <div>付款码为动态码，仅支持通过本页面进行扫描付款操作，不支持另存图片后扫描支付。</div>
       </div>
       <div v-if="!isShowqr">
         <div class="info_2" style="color: #000; font-size: 18px">

src/request/index/homework.js

@@ -24,6 +24,15 @@ export function PostWorkStudentOss(data) {
     data
   })
 }
+//下载
+export function downloadTeacherWork(data) {
+  data['identity'] = store.state.indexIdentity;
+  return request({
+    method: 'post',
+    url: 'web/download/downloadTeacherWork',
+    params: data
+  })
+}
 //删除图片
 export function delPic(data) {
   data['identity'] = store.state.indexIdentity;

src/request/index/network.js

@@ -32,6 +32,7 @@ instance.interceptors.request.use(
     if (config.method === "post" && !config.notQs) {
       console.log(config)
       config.data = qs.stringify(config.data);
+      // config.data = config.data;
     }
     if (config.url.indexOf(SERVER_URL) === -1) {
       // console.log("upload");

src/store/common.js

 
 export function tansParams(params) {
-    let result = ''
-    Object.keys(params).forEach((key) => {
-     if (!Object.is(params[key], undefined) && !Object.is(params[key], null) && !Object.is(JSON.stringify(params[key]), '{}')) {
-      result += encodeURIComponent(key) + '=' + encodeURIComponent(params[key]) + '&'
-     }
-    })
+    // let result = ''
+    let result = params
+    // Object.keys(params).forEach((key) => {
+    //  if (!Object.is(params, undefined) && !Object.is(params, null) && !Object.is(JSON.stringify(params), '{}')) {
+    //   result += encodeURIComponent(key) + '=' + encodeURIComponent(params[key]) + '&'
+    //  }
+    // })
     return result
    }
\ No newline at end of file

src/views/index/Info/Index.vue

@@ -11,7 +11,7 @@
             }"
             >首页</el-breadcrumb-item
           >
-          <el-breadcrumb-item>活动管理</el-breadcrumb-item>
+          <el-breadcrumb-item>个人信息</el-breadcrumb-item>
         </el-breadcrumb>
       </div>
     </el-header>
@@ -94,7 +94,7 @@ export default {
   watch: {},
   created() {
     // this.ToSignUp(this.index);
-    this.ToSignUp();
+    this.ToSignUp(this.index);
     //  this.$refs.child.signUpInit();
   },
   mounted() {
@@ -110,7 +110,7 @@ export default {
       console.log(index, "index");
       let code = this.$store.state.indexIdentity;
       this.campindex_type = index;
-      console.log(this.$route);
+
       // if (this.campindex_type == 0) {
       //   this.$router.push("Info/personalInfo?code=" + code);
       // } else
@@ -187,8 +187,8 @@ export default {
     .bg-top {
       height: 24px;
       background-color: #f8f8f8;
-      padding: 20px 0 5px 0;
-      padding-left: 120px;
+      padding: 30px 0 0 0;
+      padding-left: 50px;
     }
   }
 
@@ -196,7 +196,7 @@ export default {
   //   height: calc(100% - 100px);
   // }
   .index-container {
-    padding: 150px 0 70px 0;
+    padding: 130px 0 70px 0;
     display: flex;
     flex-flow: row;
 

src/views/index/Info/personalInfo.vue

@@ -619,10 +619,14 @@ export default {
         this.selectCitySchool = this.getCurrentCityLists(
           this.addressForm.certificate_province
         );
+        if ( res.data.info.certificate_address) {
            this.county = res.data.info.certificate_address.split("-")[0];
             this.certificate_address =
           res.data.info.certificate_address.split("-")[1];
         // console.log(res.data.info.certificate_address.split("-"))
+        }
+      
+       
       });
     },
     //获取近10年的年份

src/views/index/camp/Certificate.vue

@@ -24,7 +24,7 @@
           <el-button @click="getCertifi">获得营地证书</el-button>
         </div>
       </div>
-
+<!-- 
       <div class="pay_bottom">
         <div>注意事项：</div>
         <div>
@@ -33,7 +33,7 @@
         <div>
           2、支付确认后，将不能再修改姓名和身份证号，请在支付前核对信息。
         </div>
-      </div>
+      </div> -->
     </div>
     <!-- 确认收货地址对话框  -->
     <el-dialog

src/views/index/camp/Homework.vue

@@ -29,14 +29,21 @@
           <div v-html="item.work_context">></div>
 
           <div class="time flex">
-            <div>发布时间：{{ item.create_time }}</div>
+            <div>发布时间：{{ item.start_time }}</div>
             <div>截止日期：{{ item.end_time }}</div>
           </div>
         </div>
       </div>
     </div>
-    <div>
-      <el-pagination layout="prev, pager, next" :total="50"> </el-pagination>
+    <div class="pagination">
+      <el-pagination
+        layout="prev, pager, next"
+        :page-size="pageSize"
+        :total="this.homeworkList.length"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+      >
+      </el-pagination>
     </div>
     <!-- 下载作业 -->
     <refer
@@ -61,6 +68,8 @@ export default {
   },
   data() {
     return {
+      pageSize: 1,
+      currentPage: 1,
       homeworkList: {},
       dialogVisibleFu: false,
       work_context: "",
@@ -74,23 +83,36 @@ export default {
   },
   watch: {},
   methods: {
+    handleSizeChange(val) {
+      this.pageSize = val;
+      // console.log(`每页 ${val} 条`);
+    },
+    handleCurrentChange(val) {
+      this.currentPage = val;
+      // console.log(`当前页: ${val}`);
+      this.getTeacherWork();
+    },
     // 子组件触发，关闭确认报名弹框
     closeDialog(val, type) {
       this.dialogVisibleFu = val;
-      // if (type) {
-      //   clearInterval(this.timer);
-      // }
     },
     toRefer(item) {
+      //time_out：提交作业时间状态
+      if (item.time_out == 1) {
         this.dialogVisibleFu = true;
         // console.log(item.work_num,'val')
         this.work_context = item.work_context;
         this.enclosure_url = item.enclosure_url;
         this.work_num = item.work_num;
         this.student_status = item.student_status;
+      } else if (item.time_out == 2) {
+        return this.$message.error("填写作业时间未开始");
+      } else if (item.time_out == 3) {
+        return this.$message.error("填写作业时间已截止");
+      }
     },
     getTeacherWork() {
-      getTeacherWork({ page: 1 }).then((res) => {
+      getTeacherWork({ page: this.currentPage }).then((res) => {
         console.log(res, "getTeacherWork");
         if (res.data.code != 200) {
           return this.$message.error(res.data.message);
@@ -147,7 +169,7 @@ export default {
   }
 
   .home_content {
-    padding-bottom: 200px;
+    padding-bottom: 20px;
     font-size: 13px;
 
     .each_content {
@@ -184,6 +206,10 @@ export default {
       }
     }
   }
+  .pagination {
+    position: relative;
+    float: right;
+  }
 }
 </style>