rj

embed_applications/app/front/vues/pages/brandfind/brandfind.css

@@ -53,6 +53,12 @@
         opacity: 1;
         opacity: 1;
 }
 }
 
 
+.brandfind-search-box .upload-input-img>div{
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+}
+
 .brandfind-search-box .upload-input-img i {
 .brandfind-search-box .upload-input-img i {
         color: #797979;
         color: #797979;
         cursor: pointer;
         cursor: pointer;
@@ -588,7 +594,9 @@
 .brandfind .el-pagination span:not([class*=suffix]) {
 .brandfind .el-pagination span:not([class*=suffix]) {
         min-width: 69px;
         min-width: 69px;
 }
 }
-
+.btn{
+        margin-top: 15px;
+}
 .brandfind .el-pagination.is-background .btn-next,
 .brandfind .el-pagination.is-background .btn-next,
 .brandfind .el-pagination.is-background .btn-prev {
 .brandfind .el-pagination.is-background .btn-prev {
         border-radius: 2px !important;
         border-radius: 2px !important;

embed_applications/app/front/vues/pages/brandfind/brandfind.html

@@ -917,19 +917,19 @@
                         style="position: fixed;width:100%;z-index:999;background-color:rgba(0, 0, 0, 0);top:0;left:0;right:0;bottom: 0;">
                         style="position: fixed;width:100%;z-index:999;background-color:rgba(0, 0, 0, 0);top:0;left:0;right:0;bottom: 0;">
                 </div>
                 </div>
                 <div
                 <div
-                        style="position:fixed;top:50%;left:50%;height:560px;width:600px;margin-left: -300px;margin-top: -250px;border-radius: 4px;z-index: 9999;background-color:white;overflow: hidden;box-shadow:-1px 2px 9px 2px rgba(176,175,175,0.5);">
+                        style="position:fixed;top:50%;left:50%;height:420px;width:450px;margin-left: -225px;margin-top: -210px;border-radius: 4px;z-index: 9999;background-color:white;box-shadow:-1px 2px 9px 2px rgba(176,175,175,0.5);">
                         <div class="cut" style="width:100%;text-align:center;margin: 0 auto;color:#fff;">
                         <div class="cut" style="width:100%;text-align:center;margin: 0 auto;color:#fff;">
                                 <div
                                 <div
-                                        style="width:100%;font-size:18px;background: #fff;height: 80px;line-height: 80px;color: #000;">
+                                        style="width:100%;font-size:14px;background: #fff;height: 50px;line-height: 50px;color: #000;">
 
 
                                         <h3 v-if="!title" style="padding-left: 25px;text-align: left;">把不必要的部分裁剪掉，以保证搜索结果的准确性<i
                                         <h3 v-if="!title" style="padding-left: 25px;text-align: left;">把不必要的部分裁剪掉，以保证搜索结果的准确性<i
-                                                        @click="hideCropper" class="el-icon-close" style="font-weight: 600;cursor:pointer;float: right;margin-right: 10px;
-                                                        margin-top: 30px;">
+                                                        @click="hideCropper" class="el-icon-close" style="font-weight: 600;cursor:pointer;float: right;margin-right: 18px;
+                                                        margin-top: 18px;">
                                                 </i></h3>
                                                 </i></h3>
                                         <h3 v-if="title" style="text-align:center;">{{title}}</h3>
                                         <h3 v-if="title" style="text-align:center;">{{title}}</h3>
                                 </div>
                                 </div>
 
 
-                                <vue-cropper ref="cropper" :img="option.img" :output-size="option.size"
+                                <vue-cropper style="height:307px;" ref="cropper" :img="option.img" :output-size="option.size"
                                         :output-type="option.outputType" :info="true" :full="option.full"
                                         :output-type="option.outputType" :info="true" :full="option.full"
                                         :can-move="option.canMove" :can-move-box="option.canMoveBox"
                                         :can-move="option.canMove" :can-move-box="option.canMoveBox"
                                         :fixed-box="option.fixedBox" :original="option.original"
                                         :fixed-box="option.fixedBox" :original="option.original"
@@ -937,7 +937,7 @@
                                         :auto-crop-height="option.autoCropHeight" :center-box="option.centerBox"
                                         :auto-crop-height="option.autoCropHeight" :center-box="option.centerBox"
                                         @real-time="realTime" :high="option.high" @img-load="imgLoad"></vue-cropper>
                                         @real-time="realTime" :high="option.high" @img-load="imgLoad"></vue-cropper>
                                 <slot></slot>
                                 <slot></slot>
-                                <div style="background:#fff;height: 75px;font-size: 14px;">
+                                <div style="background:#fff;height: 63px;font-size: 14px;">
                                         <label class="btn" style="background: #118EE9;color: #fff;width: 100px; "
                                         <label class="btn" style="background: #118EE9;color: #fff;width: 100px; "
                                                 for="uploads">重新选择</label>
                                                 for="uploads">重新选择</label>
                                         <input type="file" id="uploads" style="position:absolute; clip:rect(0 0 0 0);"
                                         <input type="file" id="uploads" style="position:absolute; clip:rect(0 0 0 0);"

embed_applications/app/front/vues/pages/brandfinddetails/brandfinddetails.html

-<div class="brandfinddetails">
+<div ref="brandfinddetails" class="brandfinddetails">
         <div class="loading-brandfind" v-if="loading" v-loading="true"></div>
         <div class="loading-brandfind" v-if="loading" v-loading="true"></div>
         <div class="brandfinddetails-title">
         <div class="brandfinddetails-title">
                 <div>
                 <div>