Merge branch 'master' of http://git.jhcs888.com/zpj/zh-E-admin

src/components/htmlWangeditor/index.vue

@@ -85,7 +85,7 @@ export default {
     //       }
     //     },
     //     refreshSTSTokenInterval: 900000,
-    //     bucket: 'jhnewshop'
+    //     bucket: 'cqzhw'
     //   })
     //   this.aliOss = client
     // },

src/components/input_from/img_upload.vue

@@ -133,7 +133,7 @@ export default {
           }
         },
         refreshSTSTokenInterval: 900000,
-        bucket: 'jhnewshop'
+        bucket: 'cqzhw'
       })
       this.aliOss = client
     },

src/views/admin/template/add-edit.vue

@@ -136,7 +136,7 @@
             }
           },
           refreshSTSTokenInterval: 900000,
-          bucket: "jhnewshop",
+          bucket: "cqzhw",
         })
         this.aliOss = client
       },