Merge remote-tracking branch 'origin/master'

.env.prod-myhk

@@ -1,7 +1,7 @@
 # 页面标题
 VUE_APP_TITLE =木易华康互联网医院管理系统
 # 首页菜单标题
-VUE_APP_TITLE_INDEX =木易华康互联网医院
+VUE_APP_TITLE_INDEX =康复e站
 # 公司名称
 VUE_APP_COMPANY_NAME =福州市木易华康医药有限公司
 # ICP备案号

src/api/his/hfpayConfig.js

@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 查询汇付多支付配置列表
+export function listHfpayConfig(query) {
+  return request({
+    url: '/his/hfpayConfig/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询汇付多支付配置详细
+export function getHfpayConfig(id) {
+  return request({
+    url: '/his/hfpayConfig/' + id,
+    method: 'get'
+  })
+}
+
+// 新增汇付多支付配置
+export function addHfpayConfig(data) {
+  return request({
+    url: '/his/hfpayConfig',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改汇付多支付配置
+export function updateHfpayConfig(data) {
+  return request({
+    url: '/his/hfpayConfig',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除汇付多支付配置
+export function delHfpayConfig(id) {
+  return request({
+    url: '/his/hfpayConfig/' + id,
+    method: 'delete'
+  })
+}
+
+// 导出汇付多支付配置
+export function exportHfpayConfig(query) {
+  return request({
+    url: '/his/hfpayConfig/export',
+    method: 'get',
+    params: query
+  })
+}

src/api/qw/externalContact.js

@@ -51,3 +51,12 @@ export function exportExternalContact(query) {
     params: query
   })
 }
+
+// 导出企业微信客户unionId
+export function exportUnionId(query) {
+  return request({
+    url: '/qw/externalContact/exportUnionId',
+    method: 'get',
+    params: query
+  })
+}

src/views/course/videoResource/index.vue

@@ -1688,11 +1688,14 @@ export default {
       this.uploadQueue.push(tempVideo);
       this.videoList.unshift(tempVideo);
 
-      // 获取视频时长
+       // 获取视频时长
       const video = document.createElement('video');
       video.preload = 'metadata';
       video.onloadedmetadata = () => {
-        tempVideo.duration = Math.round(video.duration);
+        const index = this.videoList.findIndex(item => item.tempId === tempVideo.tempId);
+        if (index !== -1) {
+          tempVideo.duration = Math.round(video.duration);
+        }
       };
       video.src = URL.createObjectURL(file);
 

src/views/his/hfpayConfig/index.vue

@@ -0,0 +1,326 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="85px">
+      <el-form-item label="appId" prop="appId">
+        <el-input
+          v-model="queryParams.appId"
+          placeholder="请输入appId"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="汇付产品号" prop="hfProductId">
+        <el-input
+          v-model="queryParams.hfProductId"
+          placeholder="请输入汇付产品号"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['his:hfpayConfig:add']"
+        >新增</el-button>
+      </el-col>
+      <!-- <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['his:hfpayConfig:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['his:hfpayConfig:remove']"
+        >删除</el-button>
+      </el-col> -->
+      <!-- <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          :loading="exportLoading"
+          @click="handleExport"
+          v-hasPermi="['his:hfpayConfig:export']"
+        >导出</el-button>
+      </el-col> -->
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table border v-loading="loading" :data="hfpayConfigList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="appId" align="center" prop="appId" />
+      <el-table-column label="汇付产品号" align="center" prop="hfProductId" />
+      <el-table-column label="系统号" align="center" prop="hfSysId" />
+      <el-table-column label="商户号" align="center" prop="huifuId" />
+      <el-table-column label="支付回调地址" align="center" prop="hfPayNotifyUrl" />
+      <el-table-column label="大额支付回调地址" align="center" prop="hfPayOnlineNotifyUrl" />
+      <el-table-column label="退款回调地址" align="center" prop="hfRefundNotifyUrl" />
+      <el-table-column label="大额退款回调地址" align="center" prop="hfOnlineRefundNotifyUrl" />
+      <el-table-column label="商户私钥" align="center" prop="hfRsaPrivateKey" />
+      <el-table-column label="汇付公钥" align="center" prop="hfRsaPublicKey" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['his:hfpayConfig:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['his:hfpayConfig:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改汇付多支付配置对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="125px">
+        <el-form-item label="appId" prop="appId">
+          <el-input v-model="form.appId" placeholder="请输入appId" />
+        </el-form-item>
+        <el-form-item label="汇付产品号" prop="hfProductId">
+          <el-input v-model="form.hfProductId" placeholder="请输入汇付产品号" />
+        </el-form-item>
+        <el-form-item label="系统号" prop="hfSysId">
+          <el-input v-model="form.hfSysId" placeholder="请输入系统号" />
+        </el-form-item>
+        <el-form-item label="商户号" prop="huifuId">
+          <el-input v-model="form.huifuId" placeholder="请输入商户号" />
+        </el-form-item>
+        <el-form-item label="支付回调地址" prop="hfPayNotifyUrl">
+          <el-input v-model="form.hfPayNotifyUrl" placeholder="请输入支付回调地址" />
+        </el-form-item>
+        <el-form-item label="大额支付回调地址" prop="hfPayOnlineNotifyUrl">
+          <el-input v-model="form.hfPayOnlineNotifyUrl" placeholder="请输入大额支付回调地址" />
+        </el-form-item>
+        <el-form-item label="退款回调地址" prop="hfRefundNotifyUrl">
+          <el-input v-model="form.hfRefundNotifyUrl" placeholder="请输入退款回调地址" />
+        </el-form-item>
+        <el-form-item label="大额退款回调地址" prop="hfOnlineRefundNotifyUrl">
+          <el-input v-model="form.hfOnlineRefundNotifyUrl" placeholder="请输入大额退款回调地址" />
+        </el-form-item>
+        <el-form-item label="商户私钥" prop="hfRsaPrivateKey">
+          <el-input v-model="form.hfRsaPrivateKey" type="textarea" placeholder="请输入商户私钥" />
+        </el-form-item>
+        <el-form-item label="汇付公钥" prop="hfRsaPublicKey">
+          <el-input v-model="form.hfRsaPublicKey" type="textarea" placeholder="请输入汇付公钥" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listHfpayConfig, getHfpayConfig, delHfpayConfig, addHfpayConfig, updateHfpayConfig, exportHfpayConfig } from "@/api/his/hfpayConfig";
+
+export default {
+  name: "HfpayConfig",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 汇付多支付配置表格数据
+      hfpayConfigList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        appId: null,
+        hfProductId: null,
+        hfSysId: null,
+        huifuId: null,
+        hfPayNotifyUrl: null,
+        hfPayOnlineNotifyUrl: null,
+        hfRefundNotifyUrl: null,
+        hfOnlineRefundNotifyUrl: null,
+        hfRsaPrivateKey: null,
+        hfRsaPublicKey: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询汇付多支付配置列表 */
+    getList() {
+      this.loading = true;
+      listHfpayConfig(this.queryParams).then(response => {
+        this.hfpayConfigList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        appId: null,
+        hfProductId: null,
+        hfSysId: null,
+        huifuId: null,
+        hfPayNotifyUrl: null,
+        hfPayOnlineNotifyUrl: null,
+        hfRefundNotifyUrl: null,
+        hfOnlineRefundNotifyUrl: null,
+        hfRsaPrivateKey: null,
+        hfRsaPublicKey: null,
+        createTime: null,
+        updateTime: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加汇付多支付配置";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getHfpayConfig(id).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改汇付多支付配置";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateHfpayConfig(this.form).then(response => {
+              this.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addHfpayConfig(this.form).then(response => {
+              this.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$confirm('是否确认删除汇付多支付配置编号为"' + ids + '"的数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return delHfpayConfig(ids);
+        }).then(() => {
+          this.getList();
+          this.msgSuccess("删除成功");
+        }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$confirm('是否确认导出所有汇付多支付配置数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(() => {
+          this.exportLoading = true;
+          return exportHfpayConfig(queryParams);
+        }).then(response => {
+          this.download(response.msg);
+          this.exportLoading = false;
+        }).catch(() => {});
+    }
+  }
+};
+</script>

src/views/qw/externalContact/index.vue

@@ -222,6 +222,17 @@
           v-hasPermi="['qw:externalContact:export']"
         >导出</el-button>
       </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          :loading="exportUnionidLoading"
+          @click="handleExportUnionId"
+          v-hasPermi="['qw:externalContact:export']"
+        >导出unionid</el-button>
+      </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
@@ -402,7 +413,7 @@
 </template>
 
 <script>
-import { listExternalContact, getExternalContact, delExternalContact, addExternalContact, updateExternalContact, exportExternalContact } from "@/api/qw/externalContact";
+import { listExternalContact, getExternalContact, delExternalContact, addExternalContact, updateExternalContact, exportExternalContact, exportUnionId } from "@/api/qw/externalContact";
 import {getCompanyList} from "@/api/company/company";
 import {getAllUserlist} from "@/api/company/companyUser";
 import {getQwUserInfo} from "@/api/qw/qwUser";
@@ -420,6 +431,7 @@ export default {
       loading: false,
       // 导出遮罩层
       exportLoading: false,
+      exportUnionidLoading: false,
       //等级状态
       ratingUpFall: [],
       // 性别字典
@@ -908,7 +920,29 @@ export default {
           this.download(response.msg);
           this.exportLoading = false;
         }).catch(() => {});
-    }
+    },
+    /** 导出Unionid按钮操作 */
+    handleExportUnionId() {
+      //验证是否选择企业
+      if(!this.queryParams.companyId){
+        return this.$message.warning({
+          message: "请先选择企业！",
+          duration: 3000
+        })
+      }
+      const queryParams = this.queryParams;
+      this.$confirm('是否确认导出所有企业微信客户unionid数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(() => {
+          this.exportUnionidLoading = true;
+          return exportUnionId(queryParams);
+        }).then(response => {
+          this.download(response.msg);
+          this.exportUnionidLoading = false;
+        }).catch(() => {});
+    },
   }
 };
 </script>

src/views/qw/qwCompany/index.vue

@@ -174,9 +174,12 @@
         <el-form-item label="应用回调地接" prop="notifyUrl" >
           <el-input v-model="form.notifyUrl" placeholder="请输入应用回调地接" :readonly="true"/>
         </el-form-item>
-		<el-form-item label="应用id" prop="serverAgentId" >
-		  <el-input v-model="form.serverAgentId" placeholder="请输入serverAgentId" />
-		</el-form-item>
+        <el-form-item label="应用id" prop="serverAgentId" >
+          <el-input v-model="form.serverAgentId" placeholder="请输入serverAgentId" />
+        </el-form-item>
+        <el-form-item label="小程序id" prop="miniAppId" >
+          <el-input v-model="form.miniAppId" placeholder="请输入小程序id" />
+        </el-form-item>
         <el-form-item label="企业可信IP" >
           <div>42.194.245.189;119.29.195.254;129.204.130.233;43.138.187.210;129.204.76.229;159.75.239.132119.29.249.66;122.152.230.82</div>
         </el-form-item>