update1427

src/common/button/index.js

@@ -0,0 +1,8 @@
+import ElButton from './src/button';
+
+/* istanbul ignore next */
+ElButton.install = function(Vue) {
+  Vue.component(ElButton.name, ElButton);
+};
+
+export default ElButton;

src/common/button/src/button-group.vue

@@ -0,0 +1,10 @@
+<template>
+  <div class="el-button-group">
+    <slot></slot>
+  </div>
+</template>
+<script>
+  export default {
+    name: 'ElButtonGroup'
+  };
+</script>

src/common/button/src/button.vue

@@ -0,0 +1,78 @@
+<template>
+  <button
+    class="el-button"
+    @click="handleClick"
+    :disabled="buttonDisabled || loading"
+    :autofocus="autofocus"
+    :type="nativeType"
+    :class="[
+      type ? 'el-button--' + type : '',
+      buttonSize ? 'el-button--' + buttonSize : '',
+      {
+        'is-disabled': buttonDisabled,
+        'is-loading': loading,
+        'is-plain': plain,
+        'is-round': round,
+        'is-circle': circle
+      }
+    ]"
+  >
+    <i class="el-icon-loading" v-if="loading"></i>
+    <i :class="icon" v-if="icon && !loading"></i>
+    <span v-if="$slots.default"><slot></slot></span>
+  </button>
+</template>
+<script>
+  export default {
+    name: 'ElButton',
+
+    inject: {
+      elForm: {
+        default: ''
+      },
+      elFormItem: {
+        default: ''
+      }
+    },
+
+    props: {
+      type: {
+        type: String,
+        default: 'default'
+      },
+      size: String,
+      icon: {
+        type: String,
+        default: ''
+      },
+      nativeType: {
+        type: String,
+        default: 'button'
+      },
+      loading: Boolean,
+      disabled: Boolean,
+      plain: Boolean,
+      autofocus: Boolean,
+      round: Boolean,
+      circle: Boolean
+    },
+
+    computed: {
+      _elFormItemSize() {
+        return (this.elFormItem || {}).elFormItemSize;
+      },
+      buttonSize() {
+        return this.size || this._elFormItemSize || (this.$ELEMENT || {}).size;
+      },
+      buttonDisabled() {
+        return this.disabled || (this.elForm || {}).disabled;
+      }
+    },
+
+    methods: {
+      handleClick(evt) {
+        this.$emit('click', evt);
+      }
+    }
+  };
+</script>

src/components/shared/popup/index.vue

@@ -31,7 +31,7 @@ export default {
     left: 0;
     right: 0;
     bottom: 0;
-    background-color: rgba(0, 0, 0, 0.6);
+    background-color: rgba(0, 0, 0, 0.5);
     overflow: hidden;
     color: #000;
     display: flex;

src/config/index.js

@@ -8,7 +8,7 @@ const config = {
      */
     staticURL: process.env.VUE_APP_STATIC_DIR,
     urlFill:  process.env.NODE_ENV === "production" ? process.env.VUE_APP_URL_FILL : "", 
-    thumb:require('@/assets/images/default/img_cover_default.png'),
+    thumb:require('@/assets/images/default/img_cover_default.jpg'),
     noresult:require('@/assets/images/icons/img_noresults@2x.png'),
     projectNum: browser.urlQueryValue('id'),
     sceneNum: browser.urlQueryValue('vr'),

src/framework/material/index.vue

@@ -27,6 +27,7 @@ export default {
 .material{
   position: relative;
   background: #EFF2F4;
+  min-height: 100vh;
   .body{
     max-width: 1280px;
     margin: 30px auto 0;

src/framework/showMobile/list.vue

@@ -408,7 +408,7 @@ export default {
             bottom: 0;
             width: 100%;
           }
-           &.active{
+          &.active{
               border: 2px solid #1FE4DC;
           }
         }

src/pages/material.js

@@ -7,16 +7,35 @@ import 'viewerjs/dist/viewer.css'
 import Viewer from 'v-viewer'
 
 
-Vue.use(Viewer,{
-  defaultOptions: {
-    toolbar: 0,
-    title:0,
-    navbar:false
-  }
-})
+import Button from '../common/button/index.js';
 
 
 
+const components = [
+  Button
+]
+
+const install = function(Vue) {
+  Vue.use(Viewer,{
+    defaultOptions: {
+      toolbar: 0,
+      title:0,
+      navbar:false
+    }
+  })
+
+  components.forEach(component => {
+    Vue.component(component.name, component);
+  });
+
+
+};
+
+/* istanbul ignore if */
+if (typeof window !== 'undefined' && window.Vue) {
+  install(window.Vue);
+}
+
 Vue.config.productionTip = false
 
 new Vue({

src/views/material/works/index.vue

@@ -8,7 +8,7 @@
             <i class="iconfont iconbs_search"></i>
             <input
               type="text"
-              placeholder="搜索素材"
+              placeholder="搜索作品"
               v-model="searchKey"
             >
             <i v-if="searchKey" @click="searchKey=''" class="iconfont iconbs_close del"></i>
@@ -230,7 +230,8 @@ export default {
       background: #fff;
       position: relative;
       margin-right: @gap;
-      border-radius: 4px;
+      border-radius: 6px;
+      overflow: hidden;
       &:nth-of-type(5n){
         margin-right: 0;
       }