Skip to content

Z
zhichan
Commit f9b3062b by 刘泽奇
Options

123

parent 113e197f
Showing with 164 additions and 151 deletions
igirl-channel-jdweb/app/front/entry/public/css/cropper.css
......@@ -3,139 +3,144 @@
padding: 0;
} */
.cut {
width: 400px;
height: 400px;
margin: 30px auto;
}
.c-item {
max-width: 600px;
margin: 10px auto;
margin-top: 20px;
}
.content {
margin: auto;
max-width: 1200px;
margin-bottom: 100px;
}
.test-button {
display: flex;
flex-wrap: wrap;
align-content: center;
justify-content: center;
}
.btn {
display: inline-block;
line-height: 1;
white-space: nowrap;
cursor: pointer;
background: #fff;
border: 1px solid #c0ccda;
color: #1f2d3d;
text-align: center;
box-sizing: border-box;
outline: none;
margin:20px 10px 0px 0px;
padding: 9px 15px;
font-size: 14px;
border-radius: 4px;
color: #fff;
background-color: #50bfff;
border-color: #50bfff;
transition: all .2s ease;
text-decoration: none;
user-select: none;
}
.des {
line-height: 30px;
}
code.language-html {
padding: 10px 20px;
margin: 10px 0px;
display: block;
background-color: #333;
color: #fff;
overflow-x: auto;
font-family: Consolas, Monaco, Droid, Sans, Mono, Source, Code, Pro, Menlo, Lucida, Sans, Type, Writer, Ubuntu, Mono;
border-radius: 5px;
white-space: pre;
}
.show-info {
margin-bottom: 50px;
}
.show-info h2 {
line-height: 50px;
}
/*.title, .title:hover, .title-focus, .title:visited {
.cut {
width: 400px;
height: 400px;
margin: 30px auto;
}
.cut .btn {
line-height: 18px;
}
.c-item {
max-width: 600px;
margin: 10px auto;
margin-top: 20px;
}
.content {
margin: auto;
max-width: 1200px;
margin-bottom: 100px;
}
.test-button {
display: flex;
flex-wrap: wrap;
align-content: center;
justify-content: center;
}
.btn {
display: inline-block;
line-height: 1;
white-space: nowrap;
cursor: pointer;
background: #fff;
border: 1px solid #c0ccda;
color: #1f2d3d;
text-align: center;
box-sizing: border-box;
outline: none;
margin: 20px 10px 0px 0px;
padding: 9px 15px;
font-size: 14px;
border-radius: 4px;
color: #fff;
background-color: #50bfff;
border-color: #50bfff;
transition: all .2s ease;
text-decoration: none;
user-select: none;
}
.des {
line-height: 30px;
}
code.language-html {
padding: 10px 20px;
margin: 10px 0px;
display: block;
background-color: #333;
color: #fff;
overflow-x: auto;
font-family: Consolas, Monaco, Droid, Sans, Mono, Source, Code, Pro, Menlo, Lucida, Sans, Type, Writer, Ubuntu, Mono;
border-radius: 5px;
white-space: pre;
}
.show-info {
margin-bottom: 50px;
}
.show-info h2 {
line-height: 50px;
}
/*.title, .title:hover, .title-focus, .title:visited {
color: black;
}*/
.cropper_title {
display: block;
text-decoration: none;
text-align: center;
line-height: 1.5;
margin: 20px 0px;
background-image: -webkit-linear-gradient(left,#3498db,#f47920 10%,#d71345 20%,#f7acbc 30%,#ffd400 40%,#3498db 50%,#f47920 60%,#d71345 70%,#f7acbc 80%,#ffd400 90%,#3498db);
color: transparent;
-webkit-background-clip: text;
background-size: 200% 100%;
animation: slide 5s infinite linear;
font-size: 40px;
}
.test {
height: 500px;
}
.model {
position: fixed;
z-index: 10;
width: 100vw;
height: 100vh;
overflow: auto;
top: 0;
left: 0;
background: rgba(0, 0, 0, 0.8);
}
.model-show {
display: flex;
justify-content: center;
align-items: center;
width: 100vw;
height: 100vh;
}
.model img {
display: block;
margin: auto;
max-width: 80%;
user-select: none;
background-position: 0px 0px, 10px 10px;
background-size: 20px 20px;
background-image: linear-gradient(45deg, #eee 25%, transparent 25%, transparent 75%, #eee 75%, #eee 100%),linear-gradient(45deg, #eee 25%, white 25%, white 75%, #eee 75%, #eee 100%);
}
.c-item {
display: block;
user-select: none;
}
@keyframes slide {
0% {
background-position: 0 0;
}
100% {
background-position: -100% 0;
}
}
.cropper_title {
display: block;
text-decoration: none;
text-align: center;
line-height: 1.5;
margin: 20px 0px;
background-image: -webkit-linear-gradient(left, #3498db, #f47920 10%, #d71345 20%, #f7acbc 30%, #ffd400 40%, #3498db 50%, #f47920 60%, #d71345 70%, #f7acbc 80%, #ffd400 90%, #3498db);
color: transparent;
-webkit-background-clip: text;
background-size: 200% 100%;
animation: slide 5s infinite linear;
font-size: 40px;
}
.test {
height: 500px;
}
.model {
position: fixed;
z-index: 10;
width: 100vw;
height: 100vh;
overflow: auto;
top: 0;
left: 0;
background: rgba(0, 0, 0, 0.8);
}
.model-show {
display: flex;
justify-content: center;
align-items: center;
width: 100vw;
height: 100vh;
}
.model img {
display: block;
margin: auto;
max-width: 80%;
user-select: none;
background-position: 0px 0px, 10px 10px;
background-size: 20px 20px;
background-image: linear-gradient(45deg, #eee 25%, transparent 25%, transparent 75%, #eee 75%, #eee 100%), linear-gradient(45deg, #eee 25%, white 25%, white 75%, #eee 75%, #eee 100%);
}
.c-item {
display: block;
user-select: none;
}
@keyframes slide {
0% {
background-position: 0 0;
}
100% {
background-position: -100% 0;
}
}
\ No newline at end of file
igirl-channel-jdweb/app/front/entry/public/css/ele/darkblue.css
This source diff could not be displayed because it is too large. You can view the blob instead.
igirl-channel-jdweb/app/front/vues/pages/jdbycquerytm/jdbycquerytm.html
......@@ -924,11 +924,10 @@
</div>
</div>
<div class="result-warp-zw" v-if="!a && total == 0">
<div class="result-warp-zw" v-if="c3 && querydata.length == 0">
<img src="/imgs/wushuju.png" alt="">
<div>很抱歉，没有查询到您要搜索的内容 </br>同时您也可以使用同义关键词或减少筛选范围再进行尝试。</div>
</div>
<div class="result-warp" v-if="1" style="margin-bottom:20px">
<div class="item-left">
<el-collapse :data="querydata">
......@@ -1230,7 +1229,7 @@
</div>
</div>
<!-- 相机弹出层 -->
<div v-if="show">
<div v-show="show">
<div
style="position: fixed;width:100%;z-index:999;background-color:black;top:0;left:0;right:0;bottom: 0;opacity: 0.5;">
</div>
......@@ -1249,7 +1248,7 @@
:auto-crop-height="option.autoCropHeight" :center-box="option.centerBox"
@real-time="realTime" :high="option.high" @img-load="imgLoad"></vue-cropper>
<slot></slot>
<div>
<div style="margin-top:30px;font-size: 14px;">
<label class="btn" for="uploads">重新选择</label>
<input type="file" id="uploads" style="position:absolute; clip:rect(0 0 0 0);"
accept="image/png, image/jpeg, image/gif, image/jpg" @change="uploadImg($event, 1)">
......
igirl-channel-jdweb/app/front/vues/pages/jdbycquerytm/jdbycquerytm.js
......@@ -2373,7 +2373,7 @@
var obj = this.$root.copyParams(obj, "getCompanyInfoNoUser", "/action/tmQuery/springBoard");
that.$root.postReq("/web/trademark/tmqueryCtl/doPost", obj).then(function (d) {
loading.close();
console.log(d,"ccccccccccccccccccccccccccccccc");
console.log(d, "ccccccccccccccccccccccccccccccc");
if (d.status == 0) {
if (d.data) {
that.companyInfo = d.data;
......@@ -2582,25 +2582,30 @@
var aLink = document.createElement('a');
var that = this;
aLink.download = 'demo';
console.log(this.$refs, "xxxxxxxxxxxxxxxxxx");
console.log(this.$refs.cropper.getCropData, "xxxxxxxxxxxxxxxxxx");
this.$refs.cropper.getCropData((data) => {
console.log(data, '111111111111111111');
var imgObj = { base64: data };
var obj = this.$root.copyParams(imgObj, "getCropperPic", "/action/tmQuery/springBoard");
this.$root.postReq("/web/trademark/tmqueryCtl/doPost", obj).then(function (d) {
console.log("dddddddddddddgetCropperPic");
console.log(d);
that.show = false;
if (d) {
that.imageUrl = d;
if (d && d.status == 0) {
that.imageUrl = d.data;
that.tag.name = that.picName;
console.log("dddddddddddddgetCropperPic",imageUrl,"mmmmmmmmmmmmmmmmmmmmmmmm");
console.log("dddddddddddddgetCropperPic", that.imageUrl, "mmmmmmmmmmmmmmmmmmmmmmmm");
that.imagequery();
} else {
console.log(d.msg);
}
}).then(()=>{
}).catch(function (e) {
console.log(e);
});
});
if (this.activeName == "five") {
this.a = false;
this.b = true;
......@@ -2695,14 +2700,17 @@
$("#wave-container").removeClass("animate-wave-container-hover");
});
var that = this;
this.$root.getReq("/web/trademark/tmqueryCtl/getOssConfig", "").then(function (d) {
that.imagedata["key"] = "key";
that.imagedata["Bucket"] = d.Bucket;
that.imagedata["OSSAccessKeyId"] = d.OSSAccessKeyId;
that.imagedata["Signature"] = d.Signature;
that.imagedata["policy"] = d.policy;
that.imagedata["success_action_status"] = d.success_action_status;
that.action = d.url;
var obj = this.$root.copyParams("", "getOssConfig", "/action/tmTools/springBoard");
this.$root.postReq("/web/trademark/tmqueryCtl/doPost", obj).then(function (d) {
console.log(d, `mmmmmmmmmmmmmmmmmmmmmmm`);
that.d["key"] = "key";
that.d["Bucket"] = d.data.Bucket;
that.d["OSSAccessKeyId"] = d.data.OSSAccessKeyId;
that.d["Signature"] = d.data.Signature;
that.d["policy"] = d.data.policy;
that.d["success_action_status"] = d.data.success_action_status;
that.action = d.data.url;
console.log(that.action, `oooooooooooooooooooooooooooo`);
});
this.headers = [];
this.headers["商标名称"] = "sbmc";
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment