细节优化

src/common/model/Links.js

@@ -263,7 +263,7 @@ const other = {
       id: '0b0147a',
       title: '自定义路径',
       type: LINK_TYPE_CUSTOM,
-      alert: '仅支持跳转内部页面路径，例如: pages/index/index',
+      alert: '仅支持跳转内部页面路径，例如：pages/index/index',
       param: {
         path: '',
         queryStr: {}

src/components/Modal/UserModal/UserModal.vue

@@ -245,7 +245,8 @@ export default {
     },
 
     // 确认搜索
-    handleSearch () {
+    handleSearch (e) {
+      e.preventDefault()
       this.searchForm.validateFields((error, values) => {
         if (!error) {
           this.queryParam = { ...this.queryParam, ...values }

src/utils/util.js

@@ -1,3 +1,6 @@
+
+import _ from 'lodash'
+
 export function timeFix () {
   const time = new Date()
   const hour = time.getHours()
@@ -214,3 +217,14 @@ export function buildUrL (path, query) {
   }
   return path
 }
+
+/**
+ * 合并表单数据 (用于form-model)
+ * @param {object} detail 表单数据 (后端返回)
+ * @param {object} defaultData 默认数据
+ * @returns {object}
+ */
+export function assignFormData (detail, defaultData) {
+  const filterData = _.pick(detail, _.keys(defaultData))
+  return Object.assign({}, defaultData, filterData)
+}

src/views/page/modules/editor/modules/SImage.vue

@@ -5,7 +5,7 @@
       <div class="image-box" :style="{ width: `${width}px`, height: `${height}px` }">
         <img :src="imgUrl" alt />
         <div class="update-box-black"></div>
-        <div class="uodate-repalce" @click="handleSelectImage">替换</div>
+        <div class="uodate-repalce" @click="handleSelectImage">选择</div>
       </div>
     </a-tooltip>
     <!-- 文件选择器 -->
@@ -98,6 +98,8 @@ export default {
     justify-content: center;
     align-items: center;
     border-radius: 4px;
+    background-image: url('~@/assets/img/default-image.png');
+    background-size: cover;
 
     .update-box-black {
       background: #000;

src/views/page/modules/editor/modules/SLink.vue

@@ -1,11 +1,11 @@
 <template>
-  <div class="select-link">
+  <div class="select-link" :style="{ fontSize: fontSize + 'px' }">
     <template v-if="!sLink">
       <a class="choice" @click="handleSelectLink()">选择链接</a>
     </template>
-    <div class="flex flex-x-between" v-else>
+    <div class="flex" v-else>
       <span class="link-title">{{ sLink.title }}</span>
-      <a class="choice" @click="handleSelectLink()">修改</a>
+      <a class="choice ml-10" @click="handleSelectLink()">修改</a>
     </div>
     <LinkModal ref="LinkModal" @handleSubmit="handleSubmit" />
   </div>
@@ -27,7 +27,9 @@ export default {
   },
   props: {
     // 选中的链接
-    value: PropTypes.object.def({})
+    value: PropTypes.object.def({}),
+    // 文字大小
+    fontSize: PropTypes.integer.def(12),
   },
   data () {
     return {
@@ -79,12 +81,11 @@ export default {
 .select-link {
   flex: 1;
   min-width: 150px;
+  // font-size: 12px;
 }
 .choice,
 .link-title {
   display: block;
-  line-height: 32px;
   white-space: nowrap;
-  font-size: 12px;
 }
 </style>

src/views/page/modules/editor/modules/SLink2.vue

@@ -2,7 +2,7 @@
   <div class="select-link">
     <a-tooltip>
       <template slot="title">设置跳转的链接</template>
-      <a class="choice" @click="handleSelectLink()">链接</a>
+      <a class="choice" :style="{ color: color }" @click="handleSelectLink()">{{ text }}</a>
     </a-tooltip>
     <LinkModal ref="LinkModal" @handleSubmit="handleSubmit" />
   </div>
@@ -24,7 +24,11 @@ export default {
   },
   props: {
     // 选中的链接
-    value: PropTypes.object.def({})
+    value: PropTypes.object.def({}),
+    // 链接文字
+    text: PropTypes.string.def('链接'),
+    // 链接颜色
+    color: '#fff',
   },
   data () {
     return {

src/views/page/modules/editor/style.less

@@ -6,7 +6,7 @@
   min-height: 648px;
   padding: 10px 15px;
   background: #f8f9fa;
-  overflow: hidden;
+  // overflow: hidden;
 
   // 标题
   &-title {
@@ -124,6 +124,7 @@
         &-row {
           display: flex;
           margin-bottom: 6px;
+          line-height: 32px;
 
           &:last-child {
             margin-bottom: 0;
@@ -171,6 +172,7 @@
     /deep/.box {
       left: -152px;
       top: 35px;
+      z-index: 9999;
     }
   }
 

src/views/setting/payment/template/Update.vue

@@ -385,6 +385,7 @@
 
 <script>
 import { cloneDeep } from 'lodash'
+import { assignFormData } from '@/utils/util'
 import InputFile from '@/components/InputFile'
 import * as Api from '@/api/setting/payment/template'
 import { PaymentMethodEnum } from '@/common/enum/setting/payment'
@@ -483,7 +484,7 @@ export default {
       Api.detail(this.templateId)
         .then(result => {
           // 当前记录
-          this.record = { ...defaultData, ...result.data.detail }
+          this.record = assignFormData(result.data.detail, defaultData)
         })
         .finally(() => this.isLoading = false)
     },