zhangdan %!s(int64=4) %!d(string=hai) anos
pai
achega
b76e985c75

+ 4 - 6
src/views/appSetting/bannerSetting.vue

@@ -14,11 +14,9 @@
       <!-- 广告图位置 -->
       <span slot="position" slot-scope="text">{{ $refs.position.getNameByCode(text) }}</span>
       <span slot="action" slot-scope="text, record">
-        <template>
-          <a-icon type="eye" id="bannerSetting-handleDel" :style="{ fontSize: '20px', color: '#e29e14', padding: '0 10px' }" @click="handleEdit(record, 1)" />
-          <a-icon type="edit" id="bannerSetting-handleEdit" v-if="record.status == '0'" style="font-size: 20px;color: #1890FF;padding: 0 10px;" @click="handleEdit(record, 0)" />
-          <a-icon type="delete" id="bannerSetting-delect" v-if="record.status == '0'" style="font-size: 20px;color: red;padding: 0 10px;" @click="delect(record)" />
-        </template>
+        <a-icon type="eye" id="bannerSetting-handleDel" :style="{ fontSize: '20px', color: '#e29e14', padding: '0 10px' }" @click="handleEdit(record, 1)" />
+        <a-icon type="edit" id="bannerSetting-handleEdit" v-if="record.status == '0'" style="font-size: 20px;color: #1890FF;padding: 0 10px;" @click="handleEdit(record, 0)" />
+        <a-icon type="delete" id="bannerSetting-delect" v-if="record.status == '0'" style="font-size: 20px;color: red;padding: 0 10px;" @click="delect(record)" />
       </span>
       <span slot="status" slot-scope="text, record">
         <a-switch
@@ -97,7 +95,7 @@
           </a-radio-group>
         </a-form-item>
         <a-form-item label="上传图片" :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol">
-          <div style="border: 1px solid #eee;overflow: hidden;padding: 8px 8px 0;">
+          <div style="border: 1px solid #eee;overflow: hidden;padding: 8px ;">
             <Upload
               v-if="title != '查看详情'"
               id="bannerSetting-photoPath"

+ 5 - 5
src/views/appSetting/editionSetting.vue

@@ -51,7 +51,7 @@ export default {
         },
         {
           title: '创建时间',
-          width: 200,
+          width: 100,
           dataIndex: 'createDate',
           align: 'center'
         },
@@ -70,7 +70,7 @@ export default {
         },
         {
           title: '升级内容',
-          width: 200,
+          width: 100,
           dataIndex: 'upgradeContent',
           align: 'center',
           ellipsis: true, // 内容超过宽度 自动出现省略号
@@ -79,16 +79,16 @@ export default {
         },
         {
           title: '下载地址',
-          width: 200,
+          width: 100,
           dataIndex: 'downloadUrl',
           align: 'center',
           customRender: (text) => {
             return text || '--'
-					  }
+          }
         },
         {
           title: '更新时间',
-          width: 200,
+          width: 100,
           dataIndex: 'publicDate',
           align: 'center'
         },

+ 1 - 1
src/views/power/role/roleList.vue

@@ -203,7 +203,7 @@ export default {
       const _this = this
       this.$confirm({
         title: '警告',
-		centered: true,
+        centered: true,
         content: '删除后无法恢复,确认删除?',
         okText: '确定',
         cancelText: '取消',

+ 0 - 4
src/views/power/user/userList.vue

@@ -59,10 +59,6 @@
           @change="changeFlagHandle(text, record)"
           id="userList-changeFlagHandle" />
       </span>
-      <!-- <div slot="roleNames" slot-scope="text, record" :title="record.roleNames">
-        <span v-if="record.roleNames">{{ record.roleNames.substr(0,12) + '...' }}</span>
-        <span v-else>无</span>
-      </div> -->
       <span slot="action" slot-scope="text, record">
         <a-icon
           type="edit"