Merge branch 'master' of http://16.162.42.175:8014/guanli/ngds-backend-ele

src/layout/components/Navbar.vue

@@ -16,12 +16,11 @@
           <size-select id="size-select" class="right-menu-item hover-effect" />
         </el-tooltip> -->
         <div style="float:left;"> {{ $t('navbar.nowTime') }} ：{{ nowDateTime }}   {{ $t('navbar.nowPeriod') }}：{{periodNum}} </div>
-
-        <lang-select class="right-menu-item hover-effect" />
-
       </template>
 
-      <el-dropdown class="avatar-container right-menu-item hover-effect" trigger="click">
+			<lang-select class="right-menu-item hover-effect" />
+
+			<el-dropdown class="avatar-container right-menu-item hover-effect" trigger="click">
         <div class="avatar-wrapper">
           <img src="@/assets/avatar/avatar.gif" class="user-avatar" alt="">
           <i class="el-icon-caret-bottom" />
@@ -112,7 +111,7 @@ export default {
         obj.nowTime += 1
       }, 1000)
     },
-    
+
   }
 }
 </script>

src/router/index.js

@@ -38,7 +38,7 @@ import configRouter from '@/router/modules/config'
  */
 export const constantRoutes = [
   {
-    path: '/', 
+    path: '/',
     redirect: '/login'
   },
   {
@@ -217,7 +217,7 @@ export const constantRoutes = [
     ]
   },
   {
-    path: '/modify-password/:adminName', 
+    path: '/modify-password/:adminName',
     hidden: true,
     component: () => import('@/views/login/modify-password'),
     name: 'modify-password'
@@ -281,37 +281,7 @@ export const asyncRoutes = [
   memberRouter,
   // 设置
   configRouter,
-  {
-    path: '/example',
-    component: Layout,
-    redirect: '/example/list',
-    name: 'Example',
-    meta: {
-      title: 'example',
-      icon: 'el-icon-s-help'
-    },
-    children: [
-      {
-        path: 'create',
-        component: () => import('@/views/example/create'),
-        name: 'CreateArticle',
-        meta: { title: 'createArticle', icon: 'edit' }
-      },
-      {
-        path: 'edit/:id(\\d+)',
-        component: () => import('@/views/example/edit'),
-        name: 'EditArticle',
-        meta: { title: 'editArticle', noCache: true, activeMenu: '/example/list' },
-        hidden: true
-      },
-      {
-        path: 'list',
-        component: () => import('@/views/example/list'),
-        name: 'ArticleList',
-        meta: { title: 'articleList', icon: 'list' }
-      }
-    ]
-  },
+
   {
     path: '/ad',
     component: Layout,

src/utils/index.js

@@ -400,7 +400,8 @@ export function getMedia() {
  * @returns {number}
  */
 export function getScreenWidth() {
-  return window.screen.width
+  // return window.screen.width // 当前屏幕宽度(分辨率值)
+  return window.document.body.offsetWidth  // 返回当前网页宽度
 }
 
 /**
@@ -408,7 +409,8 @@ export function getScreenWidth() {
  * @returns {number}
  */
 export function getScreenHeight() {
-  return window.screen.height
+  // return window.screen.height  // 当前屏幕高度(分辨率值)
+  return window.document.body.offsetHeight  // 返回当前网页高度
 }
 
 /**

src/views/admin/index.vue

@@ -121,7 +121,7 @@ import FilterUser from '@/components/FilterUser'
 import permission from '@/utils/permission'
 import Pagination from '@/components/Pagination'
 import filterHelper from '@/utils/filterHelper'
-import {getOperatingSystem} from "@/utils"
+import {getOperatingSystem, getScreenWidth} from "@/utils"
 
 export default {
   name: 'DecLevel',
@@ -159,12 +159,13 @@ export default {
   },
   mounted() {
     this.getData()
-    let system =  getOperatingSystem()
-    if (system == "Android" || system == 'ios') {
-      this.fixedColumn = false
-    } else {
-      this.fixedColumn = 'right'
-    }
+    // let system =  getOperatingSystem()
+    // if (system == "Android" || system == 'ios') {
+    //   this.fixedColumn = false
+    // } else {
+    //   this.fixedColumn = 'right'
+    // }
+		this.fixedColumn = getScreenWidth() < 500 ? false : 'right'
   },
   methods: {
     checkSelectable(row) {

src/views/admin/role.vue

@@ -75,7 +75,7 @@ import FilterUser from '@/components/FilterUser'
 import permission from '@/utils/permission'
 import Pagination from '@/components/Pagination'
 import filterHelper from '@/utils/filterHelper'
-import {getOperatingSystem} from "@/utils"
+import {getOperatingSystem, getScreenWidth} from "@/utils"
 
 export default {
   name: 'Role',
@@ -109,12 +109,13 @@ export default {
   },
   mounted() {
     this.getData()
-    let system =  getOperatingSystem()
-    if (system == "Android" || system == 'ios') {
-      this.fixedColumn = false
-    } else {
-      this.fixedColumn = 'right'
-    }
+    // let system =  getOperatingSystem()
+    // if (system == "Android" || system == 'ios') {
+    //   this.fixedColumn = false
+    // } else {
+    //   this.fixedColumn = 'right'
+    // }
+		this.fixedColumn = getScreenWidth() < 500 ? false : 'right'
   },
   methods: {
     handleSelectionChange(val) {

src/views/bonus/period.vue

@@ -65,7 +65,7 @@
             <!-- 完成 -->{{ $t('bonus.complete') }}：{{getWatTime(scope.row.SENT_AT)}}
           </template>
         </el-table-column>
-        <el-table-column fixed="right" :label="$t('common.action')" width=""><!-- 操作 -->
+        <el-table-column :fixed="fixed" :label="$t('common.action')" width=""><!-- 操作 -->
           <template slot-scope="scope">
 <!--            <el-button v-if="scope.row.IS_CAN_CLOSE && permission.hasPermission(`bonus/close-period`)" class="button" type="primary"-->
 <!--                       @click.native="trialCalcHandle(scope.row.PERIOD_NUM)" >-->
@@ -170,6 +170,7 @@ import Pagination from '@/components/Pagination'
 import filterHelper from '../../utils/filterHelper'
 import { fetchPeriod,fetchAutoWithdraw,fetchRecordList,fetchAutoCalc,fetchPerfOrderList,fetchInitData,fetchCalcPerfPeriod,fetchPullPerfPeriod,fetchCalcBonus,fetchSyncCalcRecord,fetchPullBonus,fetchClosePeriod,fetchCalcPeriod,fetchPerfPeriod,fetchSendPeriod } from '@/api/bonus'
 import ElementUI from 'element-ui'
+import {getScreenWidth} from "@/utils";
 
 export default {
   name: 'bonus-period',
@@ -241,7 +242,8 @@ export default {
         resource: '',
         desc: ''
       },
-      formLabelWidth: '120px'
+      formLabelWidth: '120px',
+			fixed: getScreenWidth() < 500 ? false : 'right',
     };
 
   },

src/views/example/components/ArticleDetail.vue

@@ -1,291 +0,0 @@
-<template>
-  <div class="createPost-container">
-    <el-form ref="postForm" :model="postForm" :rules="rules" class="form-container">
-      <sticky :z-index="10" :class-name="'sub-navbar '+postForm.status">
-        <CommentDropdown v-model="postForm.comment_disabled" />
-        <PlatformDropdown v-model="postForm.platforms" />
-        <SourceUrlDropdown v-model="postForm.source_uri" />
-        <el-button v-loading="loading" style="margin-left: 10px;" type="success" @click="submitForm">
-          Publish
-        </el-button>
-        <el-button v-loading="loading" type="warning" @click="draftForm">
-          Draft
-        </el-button>
-      </sticky>
-
-      <div class="createPost-main-container">
-        <el-row>
-          <Warning />
-
-          <el-col :span="24">
-            <el-form-item style="margin-bottom: 40px;" prop="title">
-              <MDinput v-model="postForm.title" :maxlength="100" name="name" required>
-                Title
-              </MDinput>
-            </el-form-item>
-
-            <div class="postInfo-container">
-              <el-row>
-                <el-col :span="8">
-                  <el-form-item label-width="60px" label="Author:" class="postInfo-container-item">
-                    <el-select v-model="postForm.author" :remote-method="getRemoteUserList" filterable default-first-option remote placeholder="Search user">
-                      <el-option v-for="(item,index) in userListOptions" :key="item+index" :label="item" :value="item" />
-                    </el-select>
-                  </el-form-item>
-                </el-col>
-
-                <el-col :span="10">
-                  <el-form-item label-width="120px" label="Publish Time:" class="postInfo-container-item">
-                    <el-date-picker v-model="displayTime" type="datetime" format="yyyy-MM-dd HH:mm:ss" placeholder="Select date and time" />
-                  </el-form-item>
-                </el-col>
-
-                <el-col :span="6">
-                  <el-form-item label-width="90px" label="Importance:" class="postInfo-container-item">
-                    <el-rate
-                      v-model="postForm.importance"
-                      :max="3"
-                      :colors="['#99A9BF', '#F7BA2A', '#FF9900']"
-                      :low-threshold="1"
-                      :high-threshold="3"
-                      style="display:inline-block"
-                    />
-                  </el-form-item>
-                </el-col>
-              </el-row>
-            </div>
-          </el-col>
-        </el-row>
-
-        <el-form-item style="margin-bottom: 40px;" label-width="70px" label="Summary:">
-          <el-input v-model="postForm.content_short" :rows="1" type="textarea" class="article-textarea" autosize placeholder="Please enter the content" />
-          <span v-show="contentShortLength" class="word-counter">{{ contentShortLength }}words</span>
-        </el-form-item>
-
-        <el-form-item prop="content" style="margin-bottom: 30px;">
-          <Tinymce ref="editor" v-model="postForm.content" :height="400" />
-        </el-form-item>
-
-        <el-form-item prop="image_uri" style="margin-bottom: 30px;">
-          <Upload v-model="postForm.image_uri" />
-        </el-form-item>
-      </div>
-    </el-form>
-  </div>
-</template>
-
-<script>
-import Tinymce from '@/components/Tinymce'
-import Upload from '@/components/Upload/SingleImage3'
-import MDinput from '@/components/MDinput'
-import Sticky from '@/components/Sticky' // 粘性header组件
-import { validURL } from '@/utils/validate'
-import { fetchArticle } from '@/api/article'
-import { searchUser } from '@/api/remote-search'
-import Warning from './Warning'
-import { CommentDropdown, PlatformDropdown, SourceUrlDropdown } from './Dropdown'
-
-const defaultForm = {
-  status: 'draft',
-  title: '', // 文章题目
-  content: '', // 文章内容
-  content_short: '', // 文章摘要
-  source_uri: '', // 文章外链
-  image_uri: '', // 文章图片
-  display_time: undefined, // 前台展示时间
-  id: undefined,
-  platforms: ['a-platform'],
-  comment_disabled: false,
-  importance: 0
-}
-
-export default {
-  name: 'ArticleDetail',
-  components: { Tinymce, MDinput, Upload, Sticky, Warning, CommentDropdown, PlatformDropdown, SourceUrlDropdown },
-  props: {
-    isEdit: {
-      type: Boolean,
-      default: false
-    }
-  },
-  data() {
-    const validateRequire = (rule, value, callback) => {
-      if (value === '') {
-        this.$message({
-          message: rule.field + '为必传项',
-          type: 'error'
-        })
-        callback(new Error(rule.field + '为必传项'))
-      } else {
-        callback()
-      }
-    }
-    const validateSourceUri = (rule, value, callback) => {
-      if (value) {
-        if (validURL(value)) {
-          callback()
-        } else {
-          this.$message({
-            message: '外链url填写不正确',
-            type: 'error'
-          })
-          callback(new Error('外链url填写不正确'))
-        }
-      } else {
-        callback()
-      }
-    }
-    return {
-      postForm: Object.assign({}, defaultForm),
-      loading: false,
-      userListOptions: [],
-      rules: {
-        image_uri: [{ validator: validateRequire }],
-        title: [{ validator: validateRequire }],
-        content: [{ validator: validateRequire }],
-        source_uri: [{ validator: validateSourceUri, trigger: 'blur' }]
-      },
-      tempRoute: {}
-    }
-  },
-  computed: {
-    contentShortLength() {
-      return this.postForm.content_short.length
-    },
-    lang() {
-      return this.$store.getters.language
-    },
-    displayTime: {
-      // set and get is useful when the data
-      // returned by the back end api is different from the front end
-      // back end return => "2013-06-25 06:59:25"
-      // front end need timestamp => 1372114765000
-      get() {
-        return (+new Date(this.postForm.display_time))
-      },
-      set(val) {
-        this.postForm.display_time = new Date(val)
-      }
-    }
-  },
-  created() {
-    if (this.isEdit) {
-      const id = this.$route.params && this.$route.params.id
-      this.fetchData(id)
-    }
-
-    // Why need to make a copy of this.$route here?
-    // Because if you enter this page and quickly switch tag, may be in the execution of the setTagsViewTitle function, this.$route is no longer pointing to the current page
-    // https://github.com/PanJiaChen/vue-element-admin/issues/1221
-    this.tempRoute = Object.assign({}, this.$route)
-  },
-  methods: {
-    fetchData(id) {
-      fetchArticle(id).then(response => {
-        this.postForm = response.data
-
-        // just for test
-        this.postForm.title += `   Article Id:${this.postForm.id}`
-        this.postForm.content_short += `   Article Id:${this.postForm.id}`
-
-        // set tagsview title
-        this.setTagsViewTitle()
-
-        // set page title
-        this.setPageTitle()
-      }).catch(err => {
-        console.log(err)
-      })
-    },
-    setTagsViewTitle() {
-      const title = this.lang === 'zh' ? '编辑文章' : 'Edit Article'
-      const route = Object.assign({}, this.tempRoute, { title: `${title}-${this.postForm.id}` })
-      this.$store.dispatch('tagsView/updateVisitedView', route)
-    },
-    setPageTitle() {
-      const title = 'Edit Article'
-      document.title = `${title} - ${this.postForm.id}`
-    },
-    submitForm() {
-      console.log(this.postForm)
-      this.$refs.postForm.validate(valid => {
-        if (valid) {
-          this.loading = true
-          this.$notify({
-            title: '成功',
-            message: '发布文章成功',
-            type: 'success',
-            duration: 2000
-          })
-          this.postForm.status = 'published'
-          this.loading = false
-        } else {
-          console.log('error submit!!')
-          return false
-        }
-      })
-    },
-    draftForm() {
-      if (this.postForm.content.length === 0 || this.postForm.title.length === 0) {
-        this.$message({
-          message: '请填写必要的标题和内容',
-          type: 'warning'
-        })
-        return
-      }
-      this.$message({
-        message: '保存成功',
-        type: 'success',
-        showClose: true,
-        duration: 1000
-      })
-      this.postForm.status = 'draft'
-    },
-    getRemoteUserList(query) {
-      searchUser(query).then(response => {
-        if (!response.data.items) return
-        this.userListOptions = response.data.items.map(v => v.name)
-      })
-    }
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-@import "~@/styles/mixin.scss";
-
-.createPost-container {
-  position: relative;
-
-  .createPost-main-container {
-    padding: 40px 45px 20px 50px;
-
-    .postInfo-container {
-      position: relative;
-      @include clearfix;
-      margin-bottom: 10px;
-
-      .postInfo-container-item {
-        float: left;
-      }
-    }
-  }
-
-  .word-counter {
-    width: 40px;
-    position: absolute;
-    right: 10px;
-    top: 0px;
-  }
-}
-
-.article-textarea ::v-deep {
-  textarea {
-    padding-right: 40px;
-    resize: none;
-    border: none;
-    border-radius: 0px;
-    border-bottom: 1px solid #bfcbd9;
-  }
-}
-</style>

src/views/example/components/Dropdown/Comment.vue

@@ -1,41 +0,0 @@
-<template>
-  <el-dropdown :show-timeout="100" trigger="click">
-    <el-button plain>
-      {{ !comment_disabled?'Comment: opened':'Comment: closed' }}
-      <i class="el-icon-caret-bottom el-icon--right" />
-    </el-button>
-    <el-dropdown-menu slot="dropdown" class="no-padding">
-      <el-dropdown-item>
-        <el-radio-group v-model="comment_disabled" style="padding: 10px;">
-          <el-radio :label="true">
-            Close comment
-          </el-radio>
-          <el-radio :label="false">
-            Open comment
-          </el-radio>
-        </el-radio-group>
-      </el-dropdown-item>
-    </el-dropdown-menu>
-  </el-dropdown>
-</template>
-
-<script>
-export default {
-  props: {
-    value: {
-      type: Boolean,
-      default: false
-    }
-  },
-  computed: {
-    comment_disabled: {
-      get() {
-        return this.value
-      },
-      set(val) {
-        this.$emit('input', val)
-      }
-    }
-  }
-}
-</script>

src/views/example/components/Dropdown/Platform.vue

@@ -1,46 +0,0 @@
-<template>
-  <el-dropdown :hide-on-click="false" :show-timeout="100" trigger="click">
-    <el-button plain>
-      Platfroms({{ platforms.length }})
-      <i class="el-icon-caret-bottom el-icon--right" />
-    </el-button>
-    <el-dropdown-menu slot="dropdown" class="no-border">
-      <el-checkbox-group v-model="platforms" style="padding: 5px 15px;">
-        <el-checkbox v-for="item in platformsOptions" :key="item.key" :label="item.key">
-          {{ item.name }}
-        </el-checkbox>
-      </el-checkbox-group>
-    </el-dropdown-menu>
-  </el-dropdown>
-</template>
-
-<script>
-export default {
-  props: {
-    value: {
-      required: true,
-      default: () => [],
-      type: Array
-    }
-  },
-  data() {
-    return {
-      platformsOptions: [
-        { key: 'a-platform', name: 'a-platform' },
-        { key: 'b-platform', name: 'b-platform' },
-        { key: 'c-platform', name: 'c-platform' }
-      ]
-    }
-  },
-  computed: {
-    platforms: {
-      get() {
-        return this.value
-      },
-      set(val) {
-        this.$emit('input', val)
-      }
-    }
-  }
-}
-</script>

src/views/example/components/Dropdown/SourceUrl.vue

@@ -1,38 +0,0 @@
-<template>
-  <el-dropdown :show-timeout="100" trigger="click">
-    <el-button plain>
-      Link
-      <i class="el-icon-caret-bottom el-icon--right" />
-    </el-button>
-    <el-dropdown-menu slot="dropdown" class="no-padding no-border" style="width:400px">
-      <el-form-item label-width="0px" style="margin-bottom: 0px" prop="source_uri">
-        <el-input v-model="source_uri" placeholder="Please enter the content">
-          <template slot="prepend">
-            URL
-          </template>
-        </el-input>
-      </el-form-item>
-    </el-dropdown-menu>
-  </el-dropdown>
-</template>
-
-<script>
-export default {
-  props: {
-    value: {
-      type: String,
-      default: ''
-    }
-  },
-  computed: {
-    source_uri: {
-      get() {
-        return this.value
-      },
-      set(val) {
-        this.$emit('input', val)
-      }
-    }
-  }
-}
-</script>

src/views/example/components/Dropdown/index.js

@@ -1,3 +0,0 @@
-export { default as CommentDropdown } from './Comment'
-export { default as PlatformDropdown } from './Platform'
-export { default as SourceUrlDropdown } from './SourceUrl'

src/views/example/components/Warning.vue

@@ -1,10 +0,0 @@
-<template>
-  <aside>
-    {{ $t('example.warning') }}
-    <a
-      href="https://panjiachen.github.io/vue-element-admin-site/guide/essentials/tags-view.html"
-      target="_blank"
-    >Document</a>
-  </aside>
-</template>
-

src/views/example/create.vue

@@ -1,13 +0,0 @@
-<template>
-  <article-detail :is-edit="false" />
-</template>
-
-<script>
-import ArticleDetail from './components/ArticleDetail'
-
-export default {
-  name: 'CreateArticle',
-  components: { ArticleDetail }
-}
-</script>
-

src/views/example/edit.vue

@@ -1,13 +0,0 @@
-<template>
-  <article-detail :is-edit="true" />
-</template>
-
-<script>
-import ArticleDetail from './components/ArticleDetail'
-
-export default {
-  name: 'EditForm',
-  components: { ArticleDetail }
-}
-</script>
-

src/views/example/list.vue

@@ -1,112 +0,0 @@
-<template>
-  <div class="app-container">
-    <el-table v-loading="listLoading" :data="list" border fit highlight-current-row style="width: 100%">
-      <el-table-column align="center" label="ID" width="80">
-        <template slot-scope="scope">
-          <span>{{ scope.row.id }}</span>
-        </template>
-      </el-table-column>
-
-      <el-table-column width="180px" align="center" label="Date">
-        <template slot-scope="scope">
-          <span>{{ scope.row.timestamp | parseTime('{y}-{m}-{d} {h}:{i}') }}</span>
-        </template>
-      </el-table-column>
-
-      <el-table-column width="120px" align="center" label="Author">
-        <template slot-scope="scope">
-          <span>{{ scope.row.author }}</span>
-        </template>
-      </el-table-column>
-
-      <el-table-column width="100px" label="Importance">
-        <template slot-scope="scope">
-          <svg-icon v-for="n in +scope.row.importance" :key="n" icon-class="star" class="meta-item__icon" />
-        </template>
-      </el-table-column>
-
-      <el-table-column class-name="status-col" label="Status" width="110">
-        <template slot-scope="{row}">
-          <el-tag :type="row.status | statusFilter">
-            {{ row.status }}
-          </el-tag>
-        </template>
-      </el-table-column>
-
-      <el-table-column min-width="300px" label="Title">
-        <template slot-scope="{row}">
-          <router-link :to="'/example/edit/'+row.id" class="link-type">
-            <span>{{ row.title }}</span>
-          </router-link>
-        </template>
-      </el-table-column>
-
-      <el-table-column align="center" label="Actions" width="120">
-        <template slot-scope="scope">
-          <router-link :to="'/example/edit/'+scope.row.id">
-            <el-button type="primary" size="small" icon="el-icon-edit">
-              Edit
-            </el-button>
-          </router-link>
-        </template>
-      </el-table-column>
-    </el-table>
-
-    <pagination v-show="total>0" :total="total" :page.sync="listQuery.page" :limit.sync="listQuery.limit" @pagination="getList" />
-  </div>
-</template>
-
-<script>
-import { fetchList } from '@/api/article'
-import Pagination from '@/components/Pagination' // Secondary package based on el-pagination
-
-export default {
-  name: 'ArticleList',
-  components: { Pagination },
-  filters: {
-    statusFilter(status) {
-      const statusMap = {
-        published: 'success',
-        draft: 'info',
-        deleted: 'danger'
-      }
-      return statusMap[status]
-    }
-  },
-  data() {
-    return {
-      list: null,
-      total: 0,
-      listLoading: true,
-      listQuery: {
-        page: 1,
-        limit: 20
-      }
-    }
-  },
-  created() {
-    this.getList()
-  },
-  methods: {
-    getList() {
-      this.listLoading = true
-      fetchList(this.listQuery).then(response => {
-        this.list = response.data.items
-        this.total = response.data.total
-        this.listLoading = false
-      })
-    }
-  }
-}
-</script>
-
-<style scoped>
-.edit-input {
-  padding-right: 100px;
-}
-.cancel-btn {
-  position: absolute;
-  right: 15px;
-  top: 10px;
-}
-</style>

src/views/finance/balance-audit-list.vue

@@ -148,17 +148,17 @@
       </div>
     </div>
   </template>
-  
+
   <script>
     import tool from '@/utils/tool'
-    import {getOperatingSystem} from "@/utils"
+		import {getOperatingSystem, getScreenWidth} from "@/utils"
     import FilterUser from '@/components/FilterUser'
     import baseInfo from '@/utils/baseInfo'
     import permission from '@/utils/permission'
     import Pagination from '@/components/Pagination'
     import filterHelper from '@/utils/filterHelper'
     import { getChangeBalanceType, balanceAuditList, balanceAuditListExport, balanceAuditDelete, multPoint, balanceAudit, balanceAuditGet, balanceAuditPass } from '@/api/finance'
-  
+
     export default {
       name: 'leo-balance-audit-table',
       components: {FilterUser,Pagination},
@@ -168,13 +168,13 @@
           this.dealTypes = response.data.dealTypes
           this.getData()
         })
-        let system =  getOperatingSystem()
-        if (system == "Android" || system == 'ios') {
-          this.fixedColumn = false
-        } else {
-          this.fixedColumn = 'right'
-        }
-        
+        // let system =  getOperatingSystem()
+        // if (system == "Android" || system == 'ios') {
+        //   this.fixedColumn = false
+        // } else {
+        //   this.fixedColumn = 'right'
+        // }
+				this.fixedColumn = getScreenWidth() < 500 ? false : 'right'
       },
       data() {
         return {
@@ -332,7 +332,7 @@
         },
         // 审核拒绝
         handleAudit(row = null, status, minus = false) {
-          let obj = this  
+          let obj = this
           let title = this.$t('financial.handleAuditDefaultNotice')  //确定要通过审核（会员账户不允许为负数）？备注：
           if (status === 'reject') {
             title = this.$t('financial.handleAuditRejectNotice') //确定要拒绝审核？备注
@@ -403,8 +403,8 @@
                 message: err,
                 type: 'error'
               })
-            })  
-            
+            })
+
           })
         },
         handleSelectionChange(val) {
@@ -467,7 +467,7 @@
       }
     }
   </script>
-  
+
   <style scoped>
   /deep/ .form-dialog .el-input {
     width:100% !important;
@@ -476,4 +476,3 @@
     width:100% !important;
   }
   </style>
-  

src/views/finance/withdraw.vue

@@ -89,7 +89,7 @@
           </el-table-column>
         </el-table>
         <div class="white-box-footer">
-  
+
           <el-dropdown size="small" trigger="click" @command="handleMuli"
                        v-if="filterStatus!=='-1' && filterStatus!=='6' && filterStatus!=='7' && (permission.hasPermission(`finance/withdraw-status`))">
             <el-button type="primary" size="small">
@@ -113,7 +113,7 @@
   <!--            <el-dropdown-item command="3">Batch set to be paid</el-dropdown-item>&lt;!&ndash; 批量设为待付款 &ndash;&gt;-->
   <!--          </el-dropdown-menu>-->
           </el-dropdown>
-  
+
           <el-button type="success" size="small" @click="handleExport"
                      v-show="permission.hasPermission(`finance/transfer-list-export`)">{{ $t('common.exportExcel') }}
           </el-button>
@@ -197,7 +197,7 @@
       </div>
     </div>
   </template>
-  
+
   <script>
   import permission from '@/utils/permission'
   import { withdrawList, withdrawExport, multPoint, postWithdrawStatus } from '@/api/finance'
@@ -206,19 +206,19 @@
   import baseInfo from '@/utils/baseInfo'
   import Pagination from '@/components/Pagination'
   import filterHelper from '@/utils/filterHelper'
-  import {getOperatingSystem} from "@/utils"
+	import {getOperatingSystem, getScreenWidth} from "@/utils"
 
   export default {
     name: 'finance_withdraw',
     components: {FilterUser, Pagination},
-  
+
     data () {
       return {
         fixedColumn:false, // 固定,当手机端不固定,pc固定
         activeName: 'all',
         tableHeaders: null,
         baseDecLevels: baseInfo.decLevels(),
-  
+
         allData: null,
         tableData: null,
         loading: true,
@@ -298,12 +298,13 @@
     },
     mounted () {
       this.getData()
-      let system =  getOperatingSystem()
-      if (system == "Android" || system == 'ios') {
-        this.fixedColumn = false
-      } else {
-        this.fixedColumn = 'right'
-      }
+			this.fixedColumn = getScreenWidth() < 500 ? false : 'right'
+      // let system =  getOperatingSystem()
+      // if (system == "Android" || system == 'ios') {
+      //   this.fixedColumn = false
+      // } else {
+      //   this.fixedColumn = 'right'
+      // }
       // if (permission.hasPermission(`finance/withdraw-7`)) {
       //   this.activeName = 'seven'
       // }
@@ -329,7 +330,7 @@
       //   this.activeName = 'all'
       // }
     },
-  
+
     methods: {
       handleMuli (command) {
         if (this.multipleSelection.length < 1) {
@@ -552,11 +553,10 @@
     }
   }
   </script>
-  
+
   <style scoped>
   /deep/ .el-date-editor.el-input {
     width:100% !important;
   }
- 
+
   </style>
-  

src/views/shop/index.vue

@@ -41,7 +41,7 @@
             </template></el-table-column>-->
         </el-table>
         <div class="white-box-footer">
-  
+
          <!-- <el-dropdown size="small" trigger="click">
               <el-button type="primary" size="small">
                   所选数据<i class="el-icon-arrow-down el-icon&#45;&#45;right"></i>
@@ -53,7 +53,7 @@
           <el-button type="primary" size="small" @click="handlestate" icon="el-icon-plus" v-if="permission.hasPermission(`shop/goods-add`)">
             <!-- 商品添加 -->{{ $t('shop.addProduct') }}
           </el-button>
-  
+
           <el-button type="success" size="small" @click="handleExport" v-show="permission.hasPermission(`shop/goods-list-export`)">{{ $t('common.exportExcel') }}</el-button>
           <!-- <el-button-group>
             <el-button type="success" size="mini" @click.native="handleup(scope.row.ID)">上架</el-button>
@@ -138,7 +138,7 @@
             <el-form-item :label="$t('shop.order')"> <!-- 排序 -->
               <el-input v-model="form.sort"></el-input>
             </el-form-item>
-            
+
             <el-form-item :label="$t('shop.uploadImages')"> <!-- 上传图片 -->
               <div class='up_load'>
                 <Upload
@@ -159,9 +159,9 @@
       </el-dialog>
     </div>
   </template>
-  
+
   <script>
-  import {getOperatingSystem} from "@/utils"
+	import {getOperatingSystem, getScreenWidth} from "@/utils"
   import tool from '@/utils/tool'
   import baseInfo from '@/utils/baseInfo'
   import FilterUser from '@/components/FilterUser'
@@ -177,14 +177,15 @@
     mounted () {
       this.getData()
       // this.$refs.up_load.successImageUrl='';
-      let system =  getOperatingSystem()
-      if (system == "Android" || system == 'ios') {
-        this.fixedColumn = false
-      } else {
-        this.fixedColumn = 'right'
-      }
+      // let system =  getOperatingSystem()
+      // if (system == "Android" || system == 'ios') {
+      //   this.fixedColumn = false
+      // } else {
+      //   this.fixedColumn = 'right'
+      // }
+			this.fixedColumn = getScreenWidth() < 500 ? false : 'right'
     },
-  
+
     data () {
       return {
         fixedColumn:false, // 固定,当手机端不固定,pc固定
@@ -321,7 +322,7 @@
             vueObj.form.taxRate = response.data.goodsInfo.TAX_RATE
             vueObj.form.coverOrigin = response.data.goodsInfo.COVER
             vueObj.form.cover = tool.getArImage(response.data.goodsInfo.COVER, '/files/')
-    
+
             this.$forceUpdate()
         }).catch(err => {
 
@@ -340,7 +341,7 @@
         //     }
         // })
         // this.form.sellType=sen_sell;
-  
+
         let sen_gift = []
         this.GiftTypeArr.map((item, index) => {
           if (item.checked) {
@@ -364,7 +365,7 @@
           })
         })
       },
-  
+
       handleDel (id = null) {
         let obj = this
         this.$confirm(this.$t('common.deleteTips'), this.$t('common.hint'), { // '确定删除选定的数据？', '提示'
@@ -447,7 +448,7 @@
             })
         })
       },
-  
+
       handleExport () {
         this.$confirm(this.$t('financial.exportNotice'), this.$t('common.hint'), { // 确定要导出当前数据吗？`, '提示'
           confirmButtonText: this.$t('common.confirm'), // 确定
@@ -485,15 +486,15 @@
       // },
     }
   }
-  
+
   </script>
-  
+
   <style scoped>
       .table-box .el-form-item__label {
           width: 100px;
           color: #99a9bf;
       }
-  
+
       .table-box .el-form-item {
           width: 30%;
           margin-right: 0;
@@ -504,11 +505,10 @@
         text-align: left;
       }
       @media (max-width:862px) {
-        /deep/ img { 
+        /deep/ img {
           width: 100px !important;
           height: 60px !important;
         }
       }
-      
+
   </style>
-  

src/views/shop/order-list.vue

@@ -57,26 +57,27 @@
       </el-dialog>
     </div>
   </template>
-  
+
   <script>
-  import {getOperatingSystem} from "@/utils"
+	import {getOperatingSystem, getScreenWidth} from "@/utils"
   import tool from '@/utils/tool'
   import FilterUser from '@/components/FilterUser'
   import permission from '@/utils/permission'
   import Pagination from '@/components/Pagination'
   import filterHelper from '@/utils/filterHelper'
   import { orderList, orderListExport, orderListExportPdf, deleteOrder } from '@/api/shop'
-  
+
   export default {
     name: 'shop_order-list',
     components: {FilterUser, Pagination},
     mounted () {
-      let system =  getOperatingSystem()
-      if (system == "Android" || system == 'ios') {
-        this.fixedColumn = false
-      } else {
-        this.fixedColumn = 'right'
-      }
+      // let system =  getOperatingSystem()
+      // if (system == "Android" || system == 'ios') {
+      //   this.fixedColumn = false
+      // } else {
+      //   this.fixedColumn = 'right'
+      // }
+			this.fixedColumn = getScreenWidth() < 500 ? false : 'right'
       this.getData()
     },
     data () {
@@ -167,7 +168,7 @@
           })
           return false
         }
-  
+
         // 提取订单ID
         let orderSnList = this.multipleSelection.map((item) => item.SN.value || '')
         // 去重
@@ -179,7 +180,7 @@
           })
           return false
         }
-  
+
         this.$confirm(this.$t('financial.exportNotice'), this.$t('common.hint'), { // `确定要导出当前数据吗？`, '提示'
           confirmButtonText: this.$t('common.confirm'), // 确定
           cancelButtonText: this.$t('common.cancel'), // 取消
@@ -234,7 +235,7 @@
     }
   }
   </script>
-  
+
   <style >
   @media (max-width: 720px) {
   .el-message-box {
@@ -242,4 +243,3 @@
   }
 }
   </style>
-  

src/views/user/member-list.vue

@@ -287,8 +287,10 @@ export default {
 			closeUserData: null,
 			screenWidth: getScreenWidth() > 500 ? '500px' : getScreenWidth() + 'px',
 			labelPosition: getScreenWidth() >= 500 ? 'right' : 'top',
-			leftFixed: ['Android', 'ios'].includes(getOperatingSystem()) ? false : 'left',
-			fixed: ['Android', 'ios'].includes(getOperatingSystem()) ? false : 'right',
+			leftFixed: getScreenWidth() < 500 ? false : 'left',
+			fixed: getScreenWidth() < 500 ? false : 'right',
+			// leftFixed: ['Android', 'ios'].includes(getOperatingSystem()) ? false : 'left',
+			// fixed: ['Android', 'ios'].includes(getOperatingSystem()) ? false : 'right',
 		}
 	},
 	methods: {