默认提交

+# chmod u+x git.sh
+unset msg
+
+read -p "请输入commit提交的描述: " msg
+
+if [[ $msg == "" ]]; then
+    msg="默认提交"
+fi
+git add -A
+git commit -m $msg
+git push
+git status

@@ -76,6 +76,15 @@ export const constantRouterMap = [{
         }
         }
       },
       },
       {
       {
+        path: '/dictionary/manual',
+        name: 'manual',
+        component: () => import('@/views/dictionary/manual'),
+        meta: {
+          title: '注册会员',
+          icon: ''
+        }
+      },
+      {
         path: '/dictionary/pvpage',
         path: '/dictionary/pvpage',
         name: 'pvpage',
         name: 'pvpage',
         component: () => import('@/views/dictionary/pvpage'),
         component: () => import('@/views/dictionary/pvpage'),

+<template>
+  <div class="page-container">
+    <div class="tool-wrap">
+      <div>
+        <el-form :inline="true" :model="filters">
+          <el-form-item>
+            <el-input @change="changeHandler()" v-model="filters.mobilePhone" placeholder="请输入手机号"></el-input>
+          </el-form-item>
+          <el-form-item>
+            <el-date-picker @change="changeHandler()" v-model="filters.date" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" :picker-options="pickerOptions2">
+            </el-date-picker>
+          </el-form-item>
+          <el-form-item>
+            <el-button type="primary" v-on:click="reqQuery">查询</el-button>
+          </el-form-item>
+        </el-form>
+      </div>
+      <div>
+        <el-button class="reset-btn" @click="showDialog()">导出数据</el-button>
+      </div>
+    </div>
+
+    <el-table :data="totalData.reservationList" highlight-current-row v-loading="listLoading" style="width: 100%;">
+
+      <el-table-column prop="employer" label="单位">
+      </el-table-column>
+      <el-table-column prop="project" label="项目">
+      </el-table-column>
+      <el-table-column prop="name" label="姓名">
+      </el-table-column>
+      <el-table-column prop="mobile" label="联系方式">
+      </el-table-column>
+      <el-table-column prop="email" label="邮箱">
+      </el-table-column>
+      <el-table-column prop="product" label="使用过产品">
+      </el-table-column>
+      <!-- <el-table-column prop="used" label="使用过天宝产品">
+      </el-table-column> -->
+
+      <el-table-column prop="hdp_created" :formatter="formatTableDate" label="申请时间">
+      </el-table-column>
+      <el-table-column prop="openid" label="openid">
+      </el-table-column>
+      <el-table-column prop="nickname" label="昵称">
+      </el-table-column>
+      <el-table-column label="微信头像">
+        <template slot-scope="scope">
+          <div class="avatar-wrap">
+            <img class="avatar" :src="scope.row.avatar" alt="">
+          </div>
+        </template>
+      </el-table-column>
+
+    </el-table>
+
+    <!--工具条-->
+    <el-col :span="24" class="toolbar">
+      <div class="page-tips">总共{{total}}条记录，每页{{pageSize}}条，总共{{pageNum}}页</div>
+      <el-pagination layout="prev, pager, next,jumper" @current-change="handleCurrentChange" :page-size="pageSize" :total="total" style="float:right;">
+      </el-pagination>
+    </el-col>
+
+    <el-dialog class="dialog" center title="导出数据设定" :visible.sync="exportDialogVisible" :close-on-click-modal="false">
+      <span class="tips">导出日期</span>
+      <el-date-picker v-model="exportDate" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" :picker-options="pickerOptions2">
+      </el-date-picker>
+      <div slot="footer" class="dialog-footer">
+        <el-button style="width:120px;" @click.native="exportDialogVisible = false">取消</el-button>
+        <el-button style="width:120px;" type="primary" @click.native="exportHandler()">导出</el-button>
+      </div>
+    </el-dialog>
+
+  </div>
+</template>
+
+<script>
+import { Base64 } from "js-base64";
+import { exportTable } from "./../../api/api.js";
+import { formatDate } from "./../../common/utils.js";
+
+export default {
+  data() {
+    return {
+      exportDate: [
+        new Date().setTime(new Date().getTime() - 3600 * 1000 * 24 * 7),
+        new Date().getTime()
+      ],
+      exportDialogVisible: false,
+      listLoading: false,
+      page: 1,
+      pageSize: 10,
+      total: 0,
+      totalData: {
+        reservationList: []
+      },
+      selDate: [
+        new Date().setTime(new Date().getTime() - 3600 * 1000 * 24 * 7),
+        new Date()
+      ],
+      pickerOptions2: {
+        disabledDate(time) {
+          return time.getTime() > Date.now();
+        }
+      },
+      filters: {
+        mobilePhone: "",
+        date: ""
+      }
+    };
+  },
+  computed: {
+    pageNum() {
+      return Math.ceil(this.total / this.pageSize);
+    },
+    startTime() {
+      let date = this.filters.date;
+      let result = (date && date[0]) || "";
+      if (result) {
+        result = date[0].getTime();
+      }
+      return result;
+    },
+    endTime() {
+      let date = this.filters.date;
+      let result = (date && date[1]) || "";
+      if (result) {
+        result = date[1].getTime() + 1000 * 60 * 60 * 24;
+      }
+      return result;
+    }
+  },
+  methods: {
+    changeHandler() {
+      this.reqQuery();
+    },
+    exportHandler() {
+      let data = {
+        start_time: new Date(this.exportDate[0]).getTime(),
+        end_time: new Date(this.exportDate[1]).getTime() + 1000 * 60 * 60 * 24,
+        mobile_phone: "",
+        startIndex: 0,
+        size: 1000000
+      };
+      var encoder = HDP.getEncoder();
+      var encrypted = encoder.encode(JSON.stringify(data));
+      let params = {
+        appId: "0489fba68acd11e98c527cd30aeb749e",
+        appKey: "9524a3c59a5d4460bd141a2a93a5db17",
+        func: "queryManualList",
+        data: encrypted
+      };
+      exportTable(params);
+    },
+    showDialog() {
+      this.exportDialogVisible = true;
+    },
+    formatTableDate(row, column) {
+      return formatDate.format(
+        new Date(row.hdp_created),
+        "yyyy-MM-dd hh:mm:dd"
+      );
+    },
+    handleCurrentChange(val) {
+      this.page = val;
+      this.reqQuery();
+    },
+    reqQuery() {
+      let _this = this;
+      _this.listLoading = true;
+      let data = {
+        startIndex: (this.page - 1) * this.pageSize,
+        size: this.pageSize,
+        mobile_phone: this.filters.mobilePhone,
+        start_time: this.startTime,
+        end_time: this.endTime
+      };
+      as.queryFunV2("queryManualList", data, res => {
+        console.log("queryManualList res:", res);
+        _this.page = 1;
+        _this.listLoading = false;
+        if (res) {
+          let reservationList = res[0];
+          let total = res[1][0].total;
+          _this.total = total;
+          _this.$set(_this.totalData, "reservationList", reservationList);
+        }
+      });
+    }
+  },
+  mounted() {
+    this.reqQuery();
+  },
+  created() {}
+};
+</script>
+
+<style lang="scss" scoped>
+.page-container {
+  padding: 20px;
+}
+
+.tool-wrap {
+  padding: 24px 0;
+  display: flex;
+  border-bottom: solid 1px #cccccc;
+  justify-content: space-between;
+}
+
+.toolbar {
+  display: flex;
+  justify-content: space-between;
+  .page-tips {
+    height: 32px;
+    line-height: 32px;
+    color: #333333;
+  }
+}
+
+.dialog {
+  .tips {
+    margin-right: 24px;
+  }
+}
+</style>

@@ -152,7 +152,7 @@ export default {
       this.exportDialogVisible = true;
       this.exportDialogVisible = true;
     },
     },
     formatTableDate(row, column) {
     formatTableDate(row, column) {
-      return formatDate.format(new Date(row.hdp_created), "yyyy-MM-dd hh:mm");
+      return formatDate.format(new Date(row.hdp_created), "yyyy-MM-dd hh:mm:dd");
     },
     },
     handleCurrentChange(val) {
     handleCurrentChange(val) {
       this.page = val;
       this.page = val;