From efc537a45b90eb5792f3607d43f578aa1d52a429 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Mon, 5 Sep 2022 11:08:44 +0800
Subject: [PATCH] =?UTF-8?q?=E6=85=A7=E6=B2=BB=E7=90=86=E8=AE=BE=E7=BD=AE?=
 =?UTF-8?q?=E5=AE=8C=E6=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AppQyWxConfig/components/AiSelectCard.vue | 17 ++++-
 packages/core/AppQyWxConfig/list.vue          | 71 ++++++++++++-------
 2 files changed, 63 insertions(+), 25 deletions(-)

diff --git a/packages/core/AppQyWxConfig/components/AiSelectCard.vue b/packages/core/AppQyWxConfig/components/AiSelectCard.vue
index ebf883d5..78d26941 100644
--- a/packages/core/AppQyWxConfig/components/AiSelectCard.vue
+++ b/packages/core/AppQyWxConfig/components/AiSelectCard.vue
@@ -1,7 +1,9 @@
 <template>
   <section class="AiSelectCard" flex>
     <div class="checkCard" v-for="op in list" :key="op[props.value]" :class="{checked:op.dictValue==value}">
-      <el-image :src="op.thumb"/>
+      <el-image :src="op.thumb">
+        <div class="defaultThumb" slot="error"/>
+      </el-image>
       <el-row type="flex" class="bottomPane">
         <b class="label fill" v-text="op[props.label]"/>
         <el-button type="text" @click.stop="$emit('change',op[props.value])">使用</el-button>
@@ -51,6 +53,10 @@ export default {
       user-select: none;
     }
 
+    & > .el-image {
+      width: inherit;
+    }
+
     &.checked:before {
       position: absolute;
       content: "应用中";
@@ -69,6 +75,15 @@ export default {
       padding: 0 16px;
       border-top: 1px solid #eee;
     }
+
+    .defaultThumb {
+      background-image: url("https://cdn.cunwuyun.cn/theme/thumb/web_blue.png");
+      background-repeat: no-repeat;
+      background-position: center;
+      background-size: 360px 206px;
+      width: inherit;
+      height: 206px;
+    }
   }
 }
 </style>
diff --git a/packages/core/AppQyWxConfig/list.vue b/packages/core/AppQyWxConfig/list.vue
index 852e8f15..3e7d55cd 100644
--- a/packages/core/AppQyWxConfig/list.vue
+++ b/packages/core/AppQyWxConfig/list.vue
@@ -134,38 +134,61 @@
       </el-input>
       <div id="searchPlaceOutput"/>
     </ai-dialog>
-    <ai-dialog title="系统信息设置" :visible.sync="sysInfoDialog" width="600px" @onConfirm="submitSystemInfo"
+    <ai-dialog title="系统信息设置" :visible.sync="sysInfoDialog" width="1200px" @onConfirm="submitSystemInfo"
                @closed="sysInfo={}">
       <el-form size="small" label-width="140px">
-        <el-form-item label="页签标题">
-          <el-input v-model="sysInfo.title" placeholder="请输入..." clearable/>
-        </el-form-item>
         <el-form-item label="系统标题">
           <el-input v-model="sysInfo.fullTitle" placeholder="请输入..." clearable/>
         </el-form-item>
+        <el-form-item label="favicon">
+          <el-input v-model="sysInfo.favicon" placeholder="浏览器页签图标" clearable/>
+        </el-form-item>
         <el-form-item label="logo">
-          <el-input v-model="sysInfo.logo" placeholder="请输入..." clearable/>
+          <el-row type="flex">
+            <el-input v-model="sysInfo.logo" placeholder="请输入..." clearable/>
+            <el-input class="mar-l10" v-model="sysInfo.logoText" placeholder="logo文字">
+              <template #prepend>logo文字</template>
+            </el-input>
+          </el-row>
         </el-form-item>
-        <el-form-item label="登录页左上角标题">
-          <el-input v-model="sysInfo.name" placeholder="请输入..." clearable/>
-        </el-form-item>
-        <el-form-item label="登录页副标题">
-          <el-input type="textarea" rows="5" v-model="sysInfo.desc" placeholder="请输入..." clearable/>
-        </el-form-item>
-
-        <el-form-item label="版权所有">
-          <el-input v-model="sysInfo.recordDesc" placeholder="请输入..." clearable/>
-        </el-form-item>
-        <el-form-item label="备案号">
-          <el-input v-model="sysInfo.recordNo" placeholder="请输入..." clearable/>
-        </el-form-item>
-        <el-form-item label="备案跳转链接">
-          <el-input v-model="sysInfo.recordURL" placeholder="请输入..." clearable/>
-        </el-form-item>
-        <el-form-item label="框架版本">
-          <!--edition ：版本，标准版：standard、上架版：saas-->
-          <el-input v-model="sysInfo.edition" placeholder="请输入..." clearable/>
+        <el-form-item label="登录页">
+          <el-row type="flex" class="mar-b10">
+            <el-input v-model="sysInfo.loginLogo" placeholder="登录页左上角logo,带/代表图片" clearable>
+              <template #prepend>左页首logo</template>
+            </el-input>
+            <el-input class="mar-l10" v-model="sysInfo.loginLogoText" placeholder="logo文字" clearable>
+              <template #prepend>logo文字</template>
+            </el-input>
+          </el-row>
+          <el-row type="flex">
+            <el-input v-model="sysInfo.name" placeholder="左上角标题" clearable>
+              <template #prepend>左上角标题</template>
+            </el-input>
+            <el-input class="mar-l10" v-model="sysInfo.title" placeholder="左上角副标题" clearable>
+              <template #prepend>左上角副标题</template>
+            </el-input>
+          </el-row>
+          <el-input class="mar-t10" type="textarea" rows="5" v-model="sysInfo.desc" placeholder="副标题" clearable/>
         </el-form-item>
+        <el-row type="flex">
+          <div class="fill">
+            <el-form-item label="版权所有">
+              <el-input v-model="sysInfo.recordDesc" placeholder="请输入..." clearable/>
+            </el-form-item>
+            <el-form-item label="备案号">
+              <el-input v-model="sysInfo.recordNo" placeholder="请输入..." clearable/>
+            </el-form-item>
+          </div>
+          <div class="fill">
+            <el-form-item label="框架版本">
+              <!--edition ：版本，标准版：standard、上架版：saas 简易版(不带扫码):simple -->
+              <el-input v-model="sysInfo.edition" placeholder="请输入..." clearable/>
+            </el-form-item>
+            <el-form-item label="备案跳转链接">
+              <el-input v-model="sysInfo.recordURL" placeholder="请输入..." clearable/>
+            </el-form-item>
+          </div>
+        </el-row>
       </el-form>
     </ai-dialog>
   </section>