优化改动

src/router/index.js

@@ -1852,6 +1852,24 @@ export const constantRoutes = [
     },
     component: (resolve) => require(['@/views/yinnong/done'], resolve)
   },
+  {
+    path: '/yinnong/doneCompleted/done',
+    name: 'yinnongDoneCompletedDone',
+    meta: {
+      title: '我的已办',
+      hidden: true,
+    },
+    component: (resolve) => require(['@/views/yinnong/doneCompleted/done'], resolve)
+  },
+  {
+    path: '/yinnong/doneCompleted/completed',
+    name: 'yinnongDoneCompletedCompleted',
+    meta: {
+      title: '我的待办',
+      hidden: true,
+    },
+    component: (resolve) => require(['@/views/yinnong/doneCompleted/completed'], resolve)
+  },
   {
     path: '/yinnong/advice',
     name: 'yinnongAdvice',

src/views/sunVillage_info/index.vue

@@ -47,6 +47,11 @@
             <div class="title"></div>
             <div class="nav_list">
               <div class="nav_list_box">
+                <van-cell style="border-radius: 6px;">
+                  <template #title>
+                    <p style="font-weight: bold;font-size: 18px;display: inline-block">阳光村务</p>
+                  </template>
+                </van-cell>
                 <router-link :to="{name:'sunVillageInfoListFinance'}" class="nav_item n_1">财务公开榜</router-link>
                 <router-link :to="{name:'sunVillageInfoListTourists'}" class="nav_item n_2">零工公开榜</router-link>
                 <router-link :to="{name:'sunVillageInfoListIssues'}" class="nav_item n_3">重大事项</router-link>
@@ -57,6 +62,71 @@
                 <router-link :to="{name:'sunVillageInfoListRegister'}" class="nav_item n_8">零工登记</router-link>
               </div>
             </div>
+            <div class="nav_list">
+              <div class="nav_box">
+                <van-cell style="border-radius: 6px;">
+                  <template #title>
+                    <p style="font-weight: bold;font-size: 18px;display: inline-block">支出申请</p>
+                  </template>
+                </van-cell>
+                <van-grid :border="false">
+                  <van-grid-item text="银行卡转账" :to="{name:'approvalList'}" >
+                    <div class="icon" slot="default" style="background:#FF4646;" >
+                      <img src="../../../static/images/onlineHome/icon_Y1.png" alt />
+                    </div>
+                    <p style="margin-top: 5px;color: #666666;">银行卡转账</p>
+                  </van-grid-item>
+                  <!--          <van-grid-item text="代管转账" :to="{name:'approvalList4'}" >-->
+                  <!--            <div class="icon" slot="default" style="background:#c568f5;" >-->
+                  <!--              <img src="../../../static/images/onlineHome/icon_Y4.png" alt />-->
+                  <!--            </div>-->
+                  <!--            <p style="margin-top: 5px;color: #666666;">代管转账</p>-->
+                  <!--          </van-grid-item>-->
+                  <van-grid-item text="信用卡还款" :to="{name:'approvalList2'}" >
+                    <div class="icon" slot="default" style="background:#3ac2db;" >
+                      <img src="../../../static/images/onlineHome/icon_Y2.png" alt />
+                    </div>
+                    <p style="margin-top: 5px;color: #666666;">信用卡还款</p>
+                  </van-grid-item>
+                  <!--          <van-grid-item text="现金提现" :to="{name:'approvalList10'}" >-->
+                  <!--            <div class="icon" slot="default" style="background:#FF6464;" >-->
+                  <!--              <img src="../../../static/images/onlineHome/icon_Y6.png" alt />-->
+                  <!--            </div>-->
+                  <!--            <p style="margin-top: 5px;color: #666666;">现金提现</p>-->
+                  <!--          </van-grid-item>-->
+                  <van-grid-item text="备付金支出" :to="{name:'approvalList11'}" >
+                    <div class="icon" slot="default" style="background:#7790FE;" >
+                      <img src="../../../static/images/onlineHome/icon_Y7.png" alt />
+                    </div>
+                    <p style="margin-top: 5px;color: #666666;">备付金支出</p>
+                  </van-grid-item>
+                  <van-grid-item text="汇票支出" :to="{name:'approvalList12'}" >
+                    <div class="icon" slot="default" style="background:#539ffd;" >
+                      <img src="../../../static/images/onlineHome/icon_Y8.png" alt />
+                    </div>
+                    <p style="margin-top: 5px;color: #666666;">汇票支出</p>
+                  </van-grid-item>
+                  <van-grid-item text="收款账户" :to="{name:'collectionList'}" >
+                    <div class="icon" slot="default" style="background:#7dda4f;" >
+                      <img src="../../../static/images/onlineHome/icon_Y9.png" alt />
+                    </div>
+                    <p style="margin-top: 5px;color: #666666;">收款账户</p>
+                  </van-grid-item>
+                  <van-grid-item text="付款账户" :to="{name:'paymentAccountList'}" >
+                    <div class="icon" slot="default" style="background:#FF4646;" >
+                      <img src="../../../static/images/onlineHome/icon_Y10.png" alt />
+                    </div>
+                    <p style="margin-top: 5px;color: #666666;">付款账户</p>
+                  </van-grid-item>
+                  <van-grid-item text="开户行" :to="{name:'yinnongBankOfDepositList'}" >
+                    <div class="icon" slot="default" style="background:#FF6464;" >
+                      <img src="../../../static/images/onlineHome/icon_Y6.png" alt />
+                    </div>
+                    <p style="margin-top: 5px;color: #666666;">开户行</p>
+                  </van-grid-item>
+                </van-grid>
+              </div>
+            </div>
         </div>
         <div class="footer">
             技术支持：北京农燊高科信息技术有限公司
@@ -260,15 +330,31 @@
         .nav_list{
             margin-top: 6vh;
             padding:0 38px;
+          &:nth-child(3){
+            margin-top: 3vh;
+          }
+          .van-cell{
+            background: transparent;
+          }
           .nav_list_box{
             display: flex;
             flex-flow: wrap;
+            box-shadow: 0px 0px 18px rgba(63,68,75,0.2);
+            padding: 0 0 20PX;
+            border-radius: 15PX;
+            overflow: hidden;
+          }
+          .nav_box{
             box-shadow: 0px 0px 18px rgba(63,68,75,0.2);
             margin-bottom: 40PX;
-            padding: 20PX 0;
             border-radius: 15PX;
+            overflow: hidden;
+            /deep/ .van-grid-item__content{
+              background: transparent;
+              padding-top: 0;
+            }
           }
-            .nav_item{
+          .nav_item{
                 width: 25%;
                 /*height: 180px;*/
                 border-radius: 30px;
@@ -316,6 +402,17 @@
                     background-size: 50%;
                 }
             }
+          .icon{
+            padding: 15px;
+            border-radius: 10px;
+            box-sizing: border-box;
+            width: 80px;
+            height: 80px;
+            text-align:center;
+          }
+          .icon img{
+            width:50px;
+          }
         }
     }
     .footer{

src/views/yinnong/doneCompleted/completed.vue

@@ -0,0 +1,157 @@
+<template>
+  <div>
+    <van-nav-bar
+      title="待办事项"
+    />
+    <van-swipe class="my-swipe" :autoplay="3000" indicator-color="white" style="width: 96%;margin: 2%;height:120px;border-radius: 6px;">
+      <van-swipe-item v-for="(image,index) in images" :key="index">
+        <img :src="image" style="width:100%;height: 120px"/>
+      </van-swipe-item>
+    </van-swipe>
+    <van-cell-group @click="goDetail(item)" v-for="(item,index) in taskList" :key="index" style="width: 96%;margin:2%;border-radius: 6px;overflow: hidden;padding-top: 10px;padding-bottom: 10px;box-shadow: 0px 3px 6px 0px rgba(0,0,0,0.16);">
+      <van-cell>
+        <template #title>
+          <van-row style="">
+            <van-col span="23" :offset="1">
+
+              <h3 style="display: inline-block;line-height: 30px;margin-left: 6px;width: 100%;overflow: hidden;">
+                <van-image
+                  height="20"
+                  width="20"
+                  style="vertical-align: middle;margin-right: 10px"
+                  src="../../../../static/images/onlineHome/done.png"></van-image>{{item.projectName}}</h3>
+            </van-col>
+          </van-row>
+        </template>
+      </van-cell>
+      <van-cell>
+        <template #title>
+          <van-row>
+            <van-col span="6" :offset="1">
+              <p style="color: #878787">{{item.createTime?item.createTime.substring(0,10):item.startTime.substring(0,10)}}</p>
+            </van-col>
+            <van-col span="10" :offset="1">
+              <p style="color: #878787">{{item.formData.activityBusinessType}}</p>
+            </van-col>
+            <van-col span="5" :offset="1">
+              <p style="font-size: 14px;font-weight:bold;text-align: right;color: #1D6FE9">{{activeName=='1'?'待审批':'已审批'}}</p>
+            </van-col>
+          </van-row>
+        </template>
+      </van-cell>
+    </van-cell-group>
+    <van-empty v-if="taskList.length<1" description="暂无事项" />
+    <yinnongIndex></yinnongIndex>
+  </div>
+</template>
+
+<script>
+    import onlineHomeIndex from "../../onlineHomeIndex";
+    import yinnongIndex from "../../yinnongIndex";
+    import {ListDone, ListTodo} from "../../../api/onlineHome/done";
+
+    export default {
+      components: {
+        onlineHomeIndex,
+        yinnongIndex
+      },
+        name: "done",
+      data(){
+        return{
+          taskList:[],
+          activeName:this.$route.query.activeName?this.$route.query.activeName:'1',
+          total:0,
+          queryParams: {
+            pageNum: 1,
+            pageSize: 100,
+          },
+          activityBusinessTypeOptions:[],
+          images:['../../../../static/images/onlineHome/tab.jpg'],
+        }
+      },
+      created() {
+        this.getDicts("activity_business_type").then((response) => {
+          this.activityBusinessTypeOptions = response.data;
+          if(this.$route.query.activeName){
+            this.activeName = this.$route.query.activeName
+          }
+          this.getList();
+        });
+        console.log(this.$route.query.fr)
+        if(this.$route.query.fr){
+          this.$cookies.set("from",this.$route.query.fr,"0")
+        }
+
+      },
+      methods: {
+        goOnlineHomeIndex(){
+          if(this.$cookies.get("from")=="my"){
+            this.$router.push({name:"yinnongMy"})
+          }else{
+            this.$router.push({name:"yinnongWorkbench"})
+          }
+        },
+        getList() {
+          this.taskList = []
+          this.$set(this.queryParams, "systemType", '4');
+          ListTodo(this.queryParams).then((response) => {
+            response.rows.map(res => {
+              if(res.tableName?res.tableName.indexOf('house')>0:""){
+                res.tableName = '来自农村宅基地管理系统'
+              }else if(res.tableName?res.tableName.indexOf('sys_seal')>0:""){
+                res.tableName = '来自银农直联审批管理系统'
+              }else if(res.tableName?res.tableName.indexOf('yinnong')>0:""){
+                res.tableName = '来自银农直联审批管理系统'
+              }
+              if(this.activityBusinessTypeOptions){
+                this.activityBusinessTypeOptions.map(t => {
+                  if(t.dictValue == res.formData.activityBusinessType){
+                    res.formData.activityBusinessType = t.dictLabel
+                    this.taskList.push(res)
+                  }
+                });
+              }
+            })
+          })
+        },
+        goDetail(item){
+          console.log(item)
+          let type = item.formData.processKey;
+          switch (type) {
+            case 'baseApply':
+            case 'landscope':
+            case 'accepting':
+              this.$router.push({name:'approvalForm',query: {id:item.formData.id,taskId:item.taskId,instanceId:item.formData.instanceId,type:item.type}})
+              break;
+            case 'toReviewTransferProcess':
+            case 'yinnong_transfer':
+              if(item.formData.transferType == '10'){
+                this.$router.push({name:'approvalApproval10',query: {id:item.formData.id,taskId:item.taskId,type:item.type}})
+                break;
+              }
+              if(item.formData.transferType == '11'){
+                this.$router.push({name:'approvalApproval11',query: {id:item.formData.id,taskId:item.taskId,type:item.type}})
+                break;
+              }
+              if(item.formData.transferType == '12'){
+                this.$router.push({name:'approvalApproval12',query: {id:item.formData.id,taskId:item.taskId,type:item.type}})
+                break;
+              }
+              if(item.formData.transferType != '10'&&item.formData.transferType != '11'&&item.formData.transferType != '12'){
+                this.$router.push({name:'approvalApproval',query: {id:item.formData.id,taskId:item.taskId,type:item.type}})
+                break;
+              }
+          }
+        }
+      },
+    }
+</script>
+
+<style scoped>
+  >>>.my-swipe .van-swipe-item {
+    color: #fff;
+    font-size: 20px;
+    line-height: 144px;
+    text-align: center;
+  }
+</style>

src/views/yinnong/doneCompleted/done.vue

@@ -0,0 +1,157 @@
+<template>
+  <div>
+    <van-nav-bar
+      title="已办事项"
+    />
+    <van-swipe class="my-swipe" :autoplay="3000" indicator-color="white" style="width: 96%;margin: 2%;height:120px;border-radius: 6px;">
+      <van-swipe-item v-for="(image,index) in images" :key="index">
+        <img :src="image" style="width:100%;height: 120px"/>
+      </van-swipe-item>
+    </van-swipe>
+    <van-cell-group @click="goDetail(item)" v-for="(item,index) in taskList" :key="index" style="width: 96%;margin:2%;border-radius: 6px;overflow: hidden;padding-top: 10px;padding-bottom: 10px;box-shadow: 0px 3px 6px 0px rgba(0,0,0,0.16);">
+      <van-cell>
+        <template #title>
+          <van-row style="">
+            <van-col span="23" :offset="1">
+
+              <h3 style="display: inline-block;line-height: 30px;margin-left: 6px;width: 100%;overflow: hidden;">
+                <van-image
+                  height="20"
+                  width="20"
+                  style="vertical-align: middle;margin-right: 10px"
+                  src="../../../../static/images/onlineHome/done.png"></van-image>{{item.projectName}}</h3>
+            </van-col>
+          </van-row>
+        </template>
+      </van-cell>
+      <van-cell>
+        <template #title>
+          <van-row>
+            <van-col span="6" :offset="1">
+              <p style="color: #878787">{{item.createTime?item.createTime.substring(0,10):item.startTime.substring(0,10)}}</p>
+            </van-col>
+            <van-col span="10" :offset="1">
+              <p style="color: #878787">{{item.formData.activityBusinessType}}</p>
+            </van-col>
+            <van-col span="5" :offset="1">
+              <p style="font-size: 14px;font-weight:bold;text-align: right;color: #1D6FE9">{{activeName=='1'?'待审批':'已审批'}}</p>
+            </van-col>
+          </van-row>
+        </template>
+      </van-cell>
+    </van-cell-group>
+    <van-empty v-if="taskList.length<1" description="暂无事项" />
+    <yinnongIndex></yinnongIndex>
+  </div>
+</template>
+
+<script>
+    import onlineHomeIndex from "../../onlineHomeIndex";
+    import yinnongIndex from "../../yinnongIndex";
+    import {ListDone, ListTodo} from "../../../api/onlineHome/done";
+
+    export default {
+      components: {
+        onlineHomeIndex,
+        yinnongIndex
+      },
+        name: "done",
+      data(){
+        return{
+          taskList:[],
+          activeName:this.$route.query.activeName?this.$route.query.activeName:'1',
+          total:0,
+          queryParams: {
+            pageNum: 1,
+            pageSize: 100,
+          },
+          activityBusinessTypeOptions:[],
+          images:['../../../../static/images/onlineHome/tab.jpg'],
+        }
+      },
+      created() {
+        this.getDicts("activity_business_type").then((response) => {
+          this.activityBusinessTypeOptions = response.data;
+          if(this.$route.query.activeName){
+            this.activeName = this.$route.query.activeName
+          }
+          this.getList();
+        });
+        console.log(this.$route.query.fr)
+        if(this.$route.query.fr){
+          this.$cookies.set("from",this.$route.query.fr,"0")
+        }
+
+      },
+      methods: {
+        goOnlineHomeIndex(){
+          if(this.$cookies.get("from")=="my"){
+            this.$router.push({name:"yinnongMy"})
+          }else{
+            this.$router.push({name:"yinnongWorkbench"})
+          }
+        },
+        getList() {
+          this.taskList = []
+          this.$set(this.queryParams, "systemType", '4');
+          ListDone(this.queryParams).then((response) => {
+            response.rows.map(res => {
+              if(res.tableName?res.tableName.indexOf('house')>0:""){
+                res.tableName = '来自农村宅基地管理系统'
+              }else if(res.tableName?res.tableName.indexOf('sys_seal')>0:""){
+                res.tableName = '来自银农直联审批管理系统'
+              }else if(res.tableName?res.tableName.indexOf('yinnong')>0:""){
+                res.tableName = '来自银农直联审批管理系统'
+              }
+              if(this.activityBusinessTypeOptions){
+                this.activityBusinessTypeOptions.map(t => {
+                  if(t.dictValue == res.formData.activityBusinessType){
+                    res.formData.activityBusinessType = t.dictLabel
+                    this.taskList.push(res)
+                  }
+                });
+              }
+            })
+          })
+        },
+        goDetail(item){
+          console.log(item)
+          let type = item.formData.processKey;
+          switch (type) {
+            case 'baseApply':
+            case 'landscope':
+            case 'accepting':
+              this.$router.push({name:'approvalForm',query: {id:item.formData.id,taskId:item.taskId,instanceId:item.formData.instanceId,type:item.type}})
+              break;
+            case 'toReviewTransferProcess':
+            case 'yinnong_transfer':
+              if(item.formData.transferType == '10'){
+                this.$router.push({name:'approvalApproval10',query: {id:item.formData.id,taskId:item.taskId,type:item.type}})
+                break;
+              }
+              if(item.formData.transferType == '11'){
+                this.$router.push({name:'approvalApproval11',query: {id:item.formData.id,taskId:item.taskId,type:item.type}})
+                break;
+              }
+              if(item.formData.transferType == '12'){
+                this.$router.push({name:'approvalApproval12',query: {id:item.formData.id,taskId:item.taskId,type:item.type}})
+                break;
+              }
+              if(item.formData.transferType != '10'&&item.formData.transferType != '11'&&item.formData.transferType != '12'){
+                this.$router.push({name:'approvalApproval',query: {id:item.formData.id,taskId:item.taskId,type:item.type}})
+                break;
+              }
+          }
+        }
+      },
+    }
+</script>
+
+<style scoped>
+  >>>.my-swipe .van-swipe-item {
+    color: #fff;
+    font-size: 20px;
+    line-height: 144px;
+    text-align: center;
+  }
+</style>

src/views/yinnong/my.vue

@@ -19,16 +19,16 @@
         </van-cell>
       </van-row>
       <van-cell-group style="width: 96%;margin:-50px 2% 2% 2%;border-radius: 6px;overflow: hidden;padding-top: 20px;padding-bottom: 20px;box-shadow: 0px 3px 6px 0px rgba(0,0,0,0.16);">
-        <van-cell title="我的业务" is-link :to="{path:'done',query:{fr:'my'}}">
-          <template #icon>
-            <van-image
-              fit="contain"
-              height="22"
-              style="margin-right: 15px"
-              src="../../../static/images/onlineHome/myIcon2.png"
-            />
-          </template>
-        </van-cell>
+<!--        <van-cell title="我的业务" is-link :to="{path:'done',query:{fr:'my'}}">-->
+<!--          <template #icon>-->
+<!--            <van-image-->
+<!--              fit="contain"-->
+<!--              height="22"-->
+<!--              style="margin-right: 15px"-->
+<!--              src="../../../static/images/onlineHome/myIcon2.png"-->
+<!--            />-->
+<!--          </template>-->
+<!--        </van-cell>-->
         <!-- <van-cell title="画像（个人/农户）" is-link :to="{path:'personalPicture',params:{id:'1'}}">
           <template #icon>
             <van-image
@@ -59,16 +59,16 @@
             />
           </template>
         </van-cell> -->
-        <van-cell title="投诉" is-link to="advice">
-          <template #icon>
-            <van-image
-              fit="contain"
-              height="22"
-              style="margin-right: 15px"
-              src="../../../static/images/onlineHome/myIcon6.png"
-            />
-          </template>
-        </van-cell>
+<!--        <van-cell title="投诉" is-link to="advice">-->
+<!--          <template #icon>-->
+<!--            <van-image-->
+<!--              fit="contain"-->
+<!--              height="22"-->
+<!--              style="margin-right: 15px"-->
+<!--              src="../../../static/images/onlineHome/myIcon6.png"-->
+<!--            />-->
+<!--          </template>-->
+<!--        </van-cell>-->
         <van-cell title="修改密码" is-link to="password">
           <template #icon>
             <van-image

src/views/yinnong/workbench.vue

@@ -40,19 +40,19 @@
           <img :src="image" style="width:100%;height: 120px"/>
         </van-swipe-item>
       </van-swipe>
-      <van-row style="min-height: 100px;" class="indexCard">
-        <van-cell style="border-radius: 6px;" is-link :to="{path:'done',query:{fr:'workbench'}}">
-          <template #title>
-            <p style="display:inline-block;background: #EC4B2C;height:20px;width: 20px;border-radius: 2px;margin-right: 10px;float: left"></p>
-            <p style="font-weight: bold;font-size: 18px;display: inline-block;">待办</p>
-          </template>
-          <template #label>
-            <p style="padding-left: 10px;">
-              {{taskList&&taskList.length>0?taskList[0].projectName+'等，共'+taskList.length+'条':'暂无待办事项'}}
-            </p>
-          </template>
-        </van-cell>
-      </van-row>
+<!--      <van-row style="min-height: 100px;" class="indexCard">-->
+<!--        <van-cell style="border-radius: 6px;" is-link :to="{path:'done',query:{fr:'workbench'}}">-->
+<!--          <template #title>-->
+<!--            <p style="display:inline-block;background: #EC4B2C;height:20px;width: 20px;border-radius: 2px;margin-right: 10px;float: left"></p>-->
+<!--            <p style="font-weight: bold;font-size: 18px;display: inline-block;">待办</p>-->
+<!--          </template>-->
+<!--          <template #label>-->
+<!--            <p style="padding-left: 10px;">-->
+<!--              {{taskList&&taskList.length>0?taskList[0].projectName+'等，共'+taskList.length+'条':'暂无待办事项'}}-->
+<!--            </p>-->
+<!--          </template>-->
+<!--        </van-cell>-->
+<!--      </van-row>-->
       <van-row  class="indexCard">
         <van-cell style="border-radius: 6px;">
           <template #title>

src/views/yinnongIndex.vue

@@ -2,7 +2,9 @@
   <div class="app-container">
     <router-view />
     <van-tabbar route :placeholder="true" >
-      <van-tabbar-item replace to="/yinnong/publicity" icon="bullhorn-o">公示</van-tabbar-item>
+<!--      <van-tabbar-item replace to="/yinnong/publicity" icon="bullhorn-o">公示</van-tabbar-item>-->
+      <van-tabbar-item replace to="/yinnong/doneCompleted/completed" icon="todo-list-o">待办</van-tabbar-item>
+      <van-tabbar-item replace to="/yinnong/doneCompleted/done" icon="completed">已办</van-tabbar-item>
       <van-tabbar-item replace to="/yinnong/workbench" icon="apps-o">工作台</van-tabbar-item>
       <!-- <van-tabbar-item replace to="/yinnong/home" icon="wap-home-o">家园</van-tabbar-item> -->
       <van-tabbar-item replace to="/yinnong/my" icon="manager-o">我的</van-tabbar-item>

src/views/yinnongLogin.vue

@@ -35,10 +35,12 @@
           <div class="clear"></div>
           <div style="margin: 50px 16px 16px;">
             <van-button block type="info" native-type="submit" @click="handleLogin">登录</van-button>
-            <p style="text-align: center;margin-top: 20px;color:#878787 " @click="showMessagePop">短信验证码登录</p>
+<!--            <p style="text-align: center;margin-top: 20px;color:#878787 " @click="showMessagePop">短信验证码登录</p>-->
           </div>
         </van-form>
-        <van-form style="margin:50px 0;" v-if="showMessage">
+      </van-tab>
+      <van-tab title="短信验证码登录" name="2">
+        <van-form style="margin:50px 0;">
           <van-field
             v-model="formData.mobile"
             name="请输入手机号"
@@ -58,62 +60,60 @@
           </van-field>
           <div style="margin: 50px 16px 16px;">
             <van-button block type="info" native-type="submit" @click="getSmsCode">获取验证码</van-button>
-            <p style="text-align: center;margin-top: 20px;color:#878787 " @click="showMessagePop">密码登录</p>
+<!--            <p style="text-align: center;margin-top: 20px;color:#878787 " @click="showMessagePop">密码登录</p>-->
           </div>
         </van-form>
-      </van-tab>
-      <van-tab title="注册" name="2">
-        <van-form style="margin:50px 0;">
-          <van-field
-            v-model="formData.memberName"
-            name="请输入姓名"
-            placeholder="请输入姓名"
-            :rules="[{ required: true, message: '' }]"
-          />
-          <van-field
-            v-model="formData.idcard"
-            name="请输入身份证号"
-            style="margin-top: 20px"
-            placeholder="请输入身份证号"
-            :rules="[{ required: true, message: '' }]"
-          />
-          <van-field
-            v-model="formData.mobile"
-            name="请输入手机号"
-            style="margin-top: 20px"
-            placeholder="请输入手机号"
-            :rules="[{ required: true, message: '' }]"
-          />
-           <van-field
-            v-model="formData.code"
-            center
-            clearable
-            label="验证码"
-            placeholder="图形验证码"
-          >
-            <template #button>
-              <img style="width: 100px" :src="codeUrl" @click="getCode" />
-            </template>
-          </van-field>
-          <van-field
-            v-model="formData.smsCode"
-            style="margin-top: 20px"
-            placeholder="请输入验证码"
-            :rules="[{ required: true, message: '' }]"
-          >
-            <template #button>
-              <!-- <van-button size="mini" type="info" @click="getRegisterSmsCode" >获取验证码</van-button> -->
-              <div  class="registerSmsBtn" @click="getRegisterSmsCode">{{
-                computeTime > 0 ? `(${computeTime}s)已发送` : "获取短信码"
-              }}</div>
+<!--        <van-form style="margin:50px 0;">-->
+<!--          <van-field-->
+<!--            v-model="formData.memberName"-->
+<!--            name="请输入姓名"-->
+<!--            placeholder="请输入姓名"-->
+<!--            :rules="[{ required: true, message: '' }]"-->
+<!--          />-->
+<!--          <van-field-->
+<!--            v-model="formData.idcard"-->
+<!--            name="请输入身份证号"-->
+<!--            style="margin-top: 20px"-->
+<!--            placeholder="请输入身份证号"-->
+<!--            :rules="[{ required: true, message: '' }]"-->
+<!--          />-->
+<!--          <van-field-->
+<!--            v-model="formData.mobile"-->
+<!--            name="请输入手机号"-->
+<!--            style="margin-top: 20px"-->
+<!--            placeholder="请输入手机号"-->
+<!--            :rules="[{ required: true, message: '' }]"-->
+<!--          />-->
+<!--           <van-field-->
+<!--            v-model="formData.code"-->
+<!--            center-->
+<!--            clearable-->
+<!--            label="验证码"-->
+<!--            placeholder="图形验证码"-->
+<!--          >-->
+<!--            <template #button>-->
+<!--              <img style="width: 100px" :src="codeUrl" @click="getCode" />-->
+<!--            </template>-->
+<!--          </van-field>-->
+<!--          <van-field-->
+<!--            v-model="formData.smsCode"-->
+<!--            style="margin-top: 20px"-->
+<!--            placeholder="请输入验证码"-->
+<!--            :rules="[{ required: true, message: '' }]"-->
+<!--          >-->
+<!--            <template #button>-->
+<!--              &lt;!&ndash; <van-button size="mini" type="info" @click="getRegisterSmsCode" >获取验证码</van-button> &ndash;&gt;-->
+<!--              <div  class="registerSmsBtn" @click="getRegisterSmsCode">{{-->
+<!--                computeTime > 0 ? `(${computeTime}s)已发送` : "获取短信码"-->
+<!--              }}</div>-->
 
 
-            </template>
-          </van-field>
-          <div style="margin: 50px 16px 16px;">
-            <van-button block type="info" native-type="submit" @click="registerSubmit">注册</van-button>
-          </div>
-        </van-form>
+<!--            </template>-->
+<!--          </van-field>-->
+<!--          <div style="margin: 50px 16px 16px;">-->
+<!--            <van-button block type="info" native-type="submit" @click="registerSubmit">注册</van-button>-->
+<!--          </div>-->
+<!--        </van-form>-->
       </van-tab>
     </van-tabs>
     <van-popup v-model="showKeyboard" :style="{ height: '100%',width:'100%' }" >
@@ -307,7 +307,7 @@ export default {
         this.$store
           .dispatch("SmsLogin", this.formData)
           .then(() => {
-            this.$router.push({ path: "/yinnongIndex" }).catch(() => {});
+            this.$router.push({ path: "/yinnong/doneCompleted/completed" }).catch(() => {});
           })
           .catch((error) => {
             this.loading = false;
@@ -342,7 +342,7 @@ export default {
         this.$store
           .dispatch("Login", this.formData)
           .then(() => {
-            this.$router.push({ path: "/yinnong/workbench" }).catch(() => {});
+            this.$router.push({ path: "/yinnong/doneCompleted/completed" }).catch(() => {});
           })
           .catch((error) => {
             console.log(error)
@@ -429,7 +429,7 @@ export default {
               this.$dialog.alert({
                   message: '您的初始密码：'+res.password,
               }).then(() => {
-                  this.$router.push({ path: "/yinnong/workbench" }).catch(() => {});
+                  this.$router.push({ path: "/yinnong/doneCompleted/completed" }).catch(() => {});
               });
             }
           })