Merge branch 'master' into release/3.1

@@ -86,7 +86,6 @@ export default {
         margin-right: 30px;
         margin-right: 30px;
 
 
         .upload-item-img {
         .upload-item-img {
-            border: 1px dashed #dddee1;
             border-radius: 4px;
             border-radius: 4px;
             overflow: hidden;
             overflow: hidden;
             height: 120px;
             height: 120px;

@@ -54,7 +54,7 @@ export default {
 };
 };
 </script>
 </script>
 
 
-<style>
+<style lang="scss">
 .image-purview {
 .image-purview {
     margin: 0 auto;
     margin: 0 auto;
     width: 100px;
     width: 100px;
@@ -66,6 +66,13 @@ export default {
     position: relative;
     position: relative;
     box-shadow: 0 1px 1px rgba(0, 0, 0, 0.2);
     box-shadow: 0 1px 1px rgba(0, 0, 0, 0.2);
     border: 1px solid #e8e8e8;
     border: 1px solid #e8e8e8;
+    align-items: center;
+    justify-content: center;
+    display: flex;
+
+    .ivu-progress {
+        width: 90%;
+    }
 }
 }
 
 
 .image-purview img {
 .image-purview img {

 <template>
 <template>
     <Modal
     <Modal
-        title="在线预览"
+        title="调用图片服务"
         :width="600"
         :width="600"
         v-model="model"
         v-model="model"
         @on-ok="modalOK" 
         @on-ok="modalOK" 

 {
 {
   "name": "yoho-shop-manage",
   "name": "yoho-shop-manage",
-  "version": "1.0.22",
+  "version": "1.0.23",
   "description": "",
   "description": "",
   "main": "app.js",
   "main": "app.js",
   "scripts": {
   "scripts": {