Merge branch '11/24SAAS' of http://git.dayaedu.com/yonge/dy-admin-manager into 11/24SAAS

src/components/ImageCropper/CropperModal.vue

@@ -31,7 +31,7 @@
 </template>
 <script>
 import { VueCropper } from 'vue-cropper'
-import { uploadFileWithBase64 } from '@/api/appTenant'
+import { uploadFileWithBase64, uploadFile } from '@/api/appTenant'
 export default {
   name: 'CropperModal',
   components: {
@@ -86,14 +86,20 @@ export default {
       const that = this
       that.confirmLoading = true
       // 获取截图的base64 数据 getCropBlob getCropData
-      this.$refs.cropper.getCropData(async (data) => {
+      this.$refs.cropper.getCropBlob(async (data) => {
         const name = (this.options.name ? this.options.name.split('.')[0] : +new Date()) + '.png'
         let form = new FormData()
-	      form.append('base64Str', data)
-        form.append('fileName', name)
-        form.append('extName', 'png')
+         form.append('file', this.blobToFile(data), name)
+	      // form.append('base64Str', data)
+        // form.append('fileName', name)
+        // form.append('extName', 'png')
         try {
-          const res = await uploadFileWithBase64(form)
+          const res = await uploadFile(form)
+	      // form.append('base64Str', data)
+        // form.append('fileName', name)
+        // form.append('extName', 'png')
+        // try {
+        //   const res = await uploadFileWithBase64(form)
           that.$emit('cropper-ok', res)
         } catch(err) {
           that.$message.error(err)

src/views/contentManager/contentOperation.vue

@@ -708,7 +708,7 @@ export default {
     },
     onCancel () {
       // 是否是平台功能
-      const isPlat = this.type == 4 || this.type == 6 || this.type == 7 ? true : false
+      const isPlat = this.type == 4 || this.type == 6  ? true : false
       this.$store.dispatch('delVisitedViews', this.$route)
       this.$router.push({
         path: isPlat ? "/platformIndex" : "/contentManager/contentManager",

src/views/login/index.vue

@@ -304,10 +304,16 @@ $light_gray: #eee;
 .login-container {
   min-height: 100%;
   width: 100%;
-  // background-color: $bg;
-  background: url("../../assets/images/base/login-bg.png") no-repeat 100% 100%;
+  background: url("../../assets/images/base/login-bg-1.png") no-repeat 100% 100%;
   background-size: cover;
   overflow: hidden;
+  // height: 100vh;
+  // background-image: url("../../assets/images/base/login-bg.png");
+  // display: flex;
+  // align-items: center;
+  // justify-content: center;
+  // background-size: cover;
+  // background-repeat: no-repeat;
 
   .login-form {
     position: relative;

src/views/organManager/components/organInfo.vue

@@ -45,7 +45,7 @@
             <div
               class="tips"
               v-show="!isDisabled"
-              style="line-height: 1;color: red;"
+              style="line-height: 1.3;color: red;"
             >
               仅支持图片格式：png，大小：2MB；
             </div>
@@ -93,8 +93,9 @@
             <div
               class="tips"
               v-show="!isDisabled && tenantInfo != 'SETTING'"
-              style="line-height: 1;color: red;"
+              style="line-height: 1.3;color: red;"
             >
+              请上传透明背景PNG格式公章图片；<br/>
               仅支持图片格式：png，大小：2MB；
             </div>
           </div>
@@ -131,8 +132,9 @@
             <div
               class="tips"
               v-show="!isDisabled && tenantInfo != 'SETTING'"
-              style="line-height: 1;color: red;"
+              style="line-height: 1.3;color: red;"
             >
+              请上传透明背景PNG格式公章图片；<br/>
               仅支持图片格式：png，大小：2MB；
             </div>
           </div>
@@ -657,6 +659,10 @@ export default {
 .el-textarea {
   width: 300px !important;
 }
+.el-textarea, /deep/.el-textarea__inner {
+  height: 108px !important;
+  min-height: 108px !important;
+}
 // .avatar {
 //   width: 72px;
 //   height: 72px;

src/views/organManager/organOperation.vue

@@ -5,7 +5,7 @@
       <el-page-header @back="onCancel" :content="title"></el-page-header>
     </h2>
     <div class="m-core" style="overflow: hidden">
-      <div style="display: block;overflow: hidden;" v-if="payType != 'look'">
+      <div style="display: block;overflow: hidden; margin-bottom: 15px;" v-if="payType != 'look'">
         <el-col :span="12" :lg="14" :md="20" :sm="20" :xs="24">
           <el-steps :active="active" finish-status="success" simple align-center>
             <el-step title="机构信息" ></el-step>

src/views/tenantSetting/groupRecordManager.vue

@@ -22,12 +22,12 @@
             v-model.trim="searchForm.queryCondition"
           ></el-input>
         </el-form-item>
-        <el-form-item prop="order">
+        <el-form-item prop="orderNo">
           <el-input
             placeholder="订单号"
             clearable
             type="text"
-            v-model.trim="searchForm.order"
+            v-model.trim="searchForm.orderNo"
           ></el-input>
         </el-form-item>
         <el-form-item prop="createTimer">
@@ -108,7 +108,7 @@ import { dealStatus } from "@/utils/searchArray";
 import { getTimes } from "@/utils";
 const initSearch = {
   queryCondition: null,
-  order: null,
+  orderNo: null,
   createTimer: [],
 };
 export default {