Skip to content

Z
zhichan
Commit 37983053 by 宋毅
Options

Merge branch 'igirl-channel-jdweb' of gitlab.gongsibao.com:jiangyong/zhichan… 

Merge branch 'igirl-channel-jdweb' of gitlab.gongsibao.com:jiangyong/zhichan into igirl-channel-jdweb
parents eacbc957 4a658e3b
Showing with 65 additions and 37 deletions
igirl-channel-jdweb/app/front/entry/public/css/pagecom.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/jdtrademark/jdtrademark.css
...@@ -107,7 +107,7 @@ li { ...@@ -107,7 +107,7 @@ li {
} }
.jdtrademark-search>div:nth-last-child(1) { .jdtrademark-search>div:nth-last-child(1) {
box-shadow: 0 2px 4px 0 rgba(0,0,0,.1); box-shadow: 0 2px 4px 0 rgba(0, 0, 0, .1);
margin-top: 28px; margin-top: 28px;
width: 170px; width: 170px;
height: 54px; height: 54px;
...@@ -138,9 +138,11 @@ li { ...@@ -138,9 +138,11 @@ li {
color: rgba(153, 153, 153, 1); color: rgba(153, 153, 153, 1);
text-align: center; text-align: center;
} }
.brand-text>span:not(:nth-child(1)){
.brand-text>span:not(:nth-child(1)) {
margin-left: 45px; margin-left: 45px;
} }
/* 轮播 */ /* 轮播 */
.brandreg-swiper { .brandreg-swiper {
position: relative; position: relative;
...@@ -415,4 +417,19 @@ li { ...@@ -415,4 +417,19 @@ li {
font-weight: 400; font-weight: 400;
color: rgba(120, 128, 133, 1); color: rgba(120, 128, 133, 1);
line-height: 20px; line-height: 20px;
}
.showncllist-enter-active,
.showncllist-leave-active {
transition: all .5s;
}
.showncllist-enter,
.showncllist-leave-to {
opacity: 0;
}
.showncllist-enter-to,
.showncllist-leave {
opacity: 1;
} }
\ No newline at end of file
igirl-channel-jdweb/app/front/vues/pages/jdtrademark/jdtrademark.html
...@@ -9,19 +9,22 @@ ...@@ -9,19 +9,22 @@
商标检索 商标检索
</span> </span>
</div> </div>
<div @mouseleave="typeListShow = !typeListShow"> <div @mouseleave="typeListShow = false">
<input type="text" v-model="searchValue" placeholder="请输入您想检索的商标名称，申请号，申请人等信息"> <input type="text" v-model="searchValue" placeholder="请输入您想检索的商标名称，申请号，申请人等信息">
<div @mouseenter="typeListShow = !typeListShow">全部类别 <i class="el-icon-arrow-down"></i></div> <div @mouseenter="typeListShow = true">全部类别 <i class="el-icon-arrow-down"></i></div>
<div class="jdtrademark-typelist" v-show="typeListShow"> <transition name="showncllist">
<el-checkbox :indeterminate="isIndeterminate" v-model="checkAll" @change="handleCheckAllChange">全选 <div class="jdtrademark-typelist" v-if="typeListShow">
</el-checkbox> <el-checkbox :indeterminate="isIndeterminate" v-model="checkAll" @change="handleCheckAllChange">
<div style="margin: 15px 0;"></div> 全选
<el-checkbox-group v-model="checkedType" @change="handleCheckedCitiesChange">
<el-checkbox v-for="item in typeList" :label="item.code + item.name " :key="item.code">
{{item.code}}{{item.name}}
</el-checkbox> </el-checkbox>
</el-checkbox-group> <div style="margin: 15px 0;"></div>
</div> <el-checkbox-group v-model="checkedType" @change="handleCheckedCitiesChange">
<el-checkbox v-for="item in typeList" :label="item.code + item.name " :key="item.code">
{{item.code}}{{item.name}}
</el-checkbox>
</el-checkbox-group>
</div>
</transition>
</div> </div>
<div @click="goSearch"> <div @click="goSearch">
检索 检索
...@@ -70,7 +73,8 @@ ...@@ -70,7 +73,8 @@
<div> <div>
<div><sup>￥</sup><span>{{item.proPrice}}</span>/件</div> <div><sup>￥</sup><span>{{item.proPrice}}</span>/件</div>
<div class="brandreg-swiper-content-button" <div class="brandreg-swiper-content-button"
:class="{\'brandreg-swiper-content-button-enter\':index==current}" @click="jumpJdProductDetails(item,$event)">立即购买 :class="{\'brandreg-swiper-content-button-enter\':index==current}"
@click="jumpJdProductDetails(item,$event)">立即购买
</div> </div>
</div> </div>
</div> </div>
......
igirl-channel-jdweb/app/front/vues/pages/selftmreg/index.css
...@@ -708,8 +708,8 @@ ...@@ -708,8 +708,8 @@
.message-enter, .message-enter,
.message-leave-to .message-leave-to
/*
/* .fade-leave-active below version 2.1.8 */ .fade-leave-active below version 2.1.8 */
{ {
opacity: 0; opacity: 0;
} }
\ No newline at end of file
igirl-channel-jdweb/app/front/vues/pages/selftmreg/selftmreg.js
...@@ -383,15 +383,20 @@ ...@@ -383,15 +383,20 @@
console.log(this.tm_form_type); console.log(this.tm_form_type);
var obj = this.$root.copyParams("", "getOssConfig", "/action/tmTools/springBoard"); var obj = this.$root.copyParams("", "getOssConfig", "/action/tmTools/springBoard");
this.$root.postReq("/web/trademark/tmqueryCtl/doPost", obj).then(function (d) { this.$root.postReq("/web/trademark/tmqueryCtl/doPost", obj).then(function (d) {
console.log(d, `mmmmmmmmmmmmmmmmmmmmmmm`); if (d.status == 0) {
that.d["key"] = "key"; console.log(d, `mmmmmmmmmmmmmmmmmmmmmmm`);
that.d["Bucket"] = d.data.Bucket; that.d["key"] = "key";
that.d["OSSAccessKeyId"] = d.data.OSSAccessKeyId; that.d["Bucket"] = d.data.Bucket;
that.d["Signature"] = d.data.Signature; that.d["OSSAccessKeyId"] = d.data.OSSAccessKeyId;
that.d["policy"] = d.data.policy; that.d["Signature"] = d.data.Signature;
that.d["success_action_status"] = d.data.success_action_status; that.d["policy"] = d.data.policy;
that.action = d.data.url; that.d["success_action_status"] = d.data.success_action_status;
console.log(that.action, `oooooooooooooooooooooooooooo`); that.action = d.data.url;
console.log(that.action, `oooooooooooooooooooooooooooo`);
} else {
console.log(d.msg);
}
}); });
if (this.$route.query.channelOrder) { if (this.$route.query.channelOrder) {
this.channelOrder = JSON.parse(this.$route.query.channelOrder); this.channelOrder = JSON.parse(this.$route.query.channelOrder);
...@@ -399,8 +404,6 @@ ...@@ -399,8 +404,6 @@
this.channelUser = JSON.parse(this.$route.query.channelUser); this.channelUser = JSON.parse(this.$route.query.channelUser);
console.log(this.$route.query, this.channelInfo, `xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx`); console.log(this.$route.query, this.channelInfo, `xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx`);
} }
}, },
methods: { methods: {
...@@ -1160,15 +1163,17 @@ ...@@ -1160,15 +1163,17 @@
} }
}); });
} }
if (this.form.tmFormType == "4") { if (!agree) {
if (!this.form.colorizedPicUrl) { if (this.form.tmFormType == "4") {
this.$message.warning("请完善信息"); if (!this.form.colorizedPicUrl) {
return; this.$message.warning("请完善信息");
} return;
} else { }
if (!this.form.tmName || !this.form.colorizedPicUrl) { } else {
this.$message.warning("请完善信息"); if (!this.form.tmName || !this.form.colorizedPicUrl) {
return; this.$message.warning("请完善信息");
return;
}
} }
} }
if (formName == "form" || formName == "apply") { if (formName == "form" || formName == "apply") {
...@@ -1360,7 +1365,7 @@ ...@@ -1360,7 +1365,7 @@
this.$refs[flag].d.key = key; this.$refs[flag].d.key = key;
}, },
tobefore(){ tobefore(){
this.toTop(); this.toTop();
this.step = Number(this.step) - 1; this.step = Number(this.step) - 1;
this.step = this.step.toString(); this.step = this.step.toString();
}, },
......
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