Merge branch 'lm' of http://git.yujin.shuziyunyao.com/yujin/digital-medicine-front into lm

.env.development

@@ -40,3 +40,4 @@ VITE_APP_SSE = true
 VITE_APP_PACKAGE_SHARE_URL = 'http://dm.share.yujin.shuziyunyao.com/package'
 # 测试版微信小程序扫码域名
 VITE_APP_SHARE_QR_CODE_URL = 'http://dm.share.yujin.shuziyunyao.com'
+VITE_H5_URL = 'https://tlm.yujin.shuziyunyao.com/'

.env.production

@@ -44,3 +44,5 @@ VITE_APP_APPID = '1890328853823459329'
 # 测试版微信小程序扫码域名
 
 VITE_APP_SHARE_QR_CODE_URL = 'https://lm.tcmma.com.cn'
+
+VITE_H5_URL = 'https://t.tcmma.com.cn/'

src/views/auth/userbind/index.vue

@@ -11,6 +11,13 @@
                             <el-option v-for="dict in approval_query_type" :value="dict.value" :label="dict.label"></el-option>
                         </el-select>
                     </el-form-item>
+                    <el-form-item label="是否有管理员" prop="hasAdmin">
+                        <el-select v-model="queryParams.hasAdmin" clearable>
+                            <el-option label="全部" value="" />
+                            <el-option label="是" value="1" />
+                            <el-option label="否" value="0" />
+                        </el-select>
+                    </el-form-item>
                     <el-form-item>
                         <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
                         <el-button icon="Refresh" @click="resetQuery">重置</el-button>
@@ -47,6 +54,11 @@
                         </div>
                     </template>
                 </el-table-column>
+                <el-table-column label="是否有管理员" align="center" prop="hasAdmin" width="90">
+                    <template #default="{ row }">
+                        <dict-tag :options="yes_no" :value="row.hasAdmin"></dict-tag>
+                    </template>
+                </el-table-column>
                 <el-table-column label="统一社会信用代码" align="center" prop="cpyName" width="250">
                     <template #default="scope">
                         <div style="margin-left: 10px;">{{ scope.row.cpyInfo.creditCode }}</div>
@@ -79,16 +91,15 @@ import { bindInfoApproval } from '@/api/settled';
 import { BindInfoCpyListVo, QueryUserBindInfoBo } from '@/api/enterprise/recordCompany/types';
 import { listUserBindInfo } from '@/api/enterprise/recordCompany';
 import { CircleCheck, CircleClose } from '@element-plus/icons-vue';
-
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 const userList = ref<BindInfoCpyListVo[]>([]);
 const loading = ref(true);
 const total = ref(0);
 
 const queryFormRef = ref<ElFormInstance>();
-const { approval_query_type } = toRefs<any>(proxy?.useDict('approval_query_type'));
+const { approval_query_type, yes_no } = toRefs<any>(proxy?.useDict('approval_query_type', 'yes_no'));
 
-const data = reactive<PageData<any, QueryUserBindInfoBo>>({
+const data = reactive<PageData<any, any>>({
     form: {},
     queryParams: {
         pageNum: 1,
@@ -96,6 +107,7 @@ const data = reactive<PageData<any, QueryUserBindInfoBo>>({
         cpyName: undefined,
         userName: undefined,
         keywords: undefined,
+        hasAdmin: undefined,
         status: '0',
         params: {}
     },
@@ -138,9 +150,9 @@ const handleApproval = async (row: any, res: string) => {
         })
             .then(() => {
                 const params = {
-                    approvalType: '2',
+                    approvalType: +row.hasAdmin ? '0' : '1',
                     targetId: row.id,
-                    res
+                    res: res,
                 };
                 approvalAjax(params);
             })

src/views/h5-custom/list/index.vue

@@ -8,6 +8,7 @@
                             <el-form-item label="模版类别" prop="tplType">
                                 <el-select v-model="queryParams.tplType" style="width: 100%;" placeholder="请选择审核状态" clearable>
                                     <el-option v-for="dict in class_type" :key="dict.value" :label="dict.label" :value="dict.value" />
+                                    <el-option label="药食同源" value="11" />
                                 </el-select>
                             </el-form-item>
                         </el-col>
@@ -67,13 +68,7 @@
                 </el-table-column>
             </el-table>
 
-            <pagination
-                v-show="total > 0"
-                :total="total"
-                v-model:page="queryParams.pageNum"
-                v-model:limit="queryParams.pageSize"
-                @pagination="getList"
-            />
+            <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
         </el-card>
     </div>
     <H5ModelLook v-if="showH5Tem" v-model:show="showH5Tem" title="模版预览" :src="temSrc"></H5ModelLook>
@@ -166,7 +161,7 @@ const handleApproval = async (row: any, res: string) => {
 };
 const approvalAjax = async (params: any) => {
     proxy?.$modal.loading('审核中...');
-    const res = await h5TplApprove(params).catch(() => {});
+    const res = await h5TplApprove(params).catch(() => { });
     proxy?.$modal.closeLoading();
     if (!res) return;
     proxy?.$modal.msgSuccess('操作完成');