Merge branch 'feature/upload' into release/3.1

@@ -23,7 +23,7 @@
                     action="/Api/upload/image">
                 <Icon type="ios-cloud-upload-outline" title="上传图片"></Icon>
             </Upload>
-            <Icon type="ios-cloud-outline" v-if="skn" title="在线浏览" @click.native="browseOnline"></Icon>
+            <Icon type="ios-cloud-outline" v-if="skn" title="调用图片服务" @click.native="browseOnline"></Icon>
         </div>
 
         <modal-skn-image v-model="sknImageModel" :skn="skn" @selected="selected"></modal-skn-image>

@@ -5,7 +5,7 @@
         v-model="model"
         @on-ok="modalOK" 
         @on-cancel="modalCancel"
-        ok-text="保存">
+        ok-text="确定">
         <div class="image-skn-image">
             <div
                 class="image" 
@@ -15,6 +15,9 @@
                 @click="selected(image)">
                 <img :src="image.fileName" alt="" />
             </div>
+            <div class="no-data" v-if="!imageList.length">
+                未获取到图片
+            </div>
         </div>
     </Modal>
 </template>
@@ -81,7 +84,7 @@ export default {
 <style lang="scss">
 .image-skn-image {
     overflow: auto;
-    height: 300px;
+    height: 200px;
 
     .image {
         float: left;
@@ -105,6 +108,14 @@ export default {
             height: 100%;
         }
     }
+
+    .no-data {
+        font-size: 14px;
+        height: 200px;
+        line-height: 200px;
+        text-align: center;
+        color: #bbbec4;
+    }
 }
 </style>