Skip to content

Z
zhichan
Commit 8968153a by 宋毅
Options

Merge branch 'igirl-channel-web' of gitlab.gongsibao.com:jiangyong/zhichan into igirl-channel-web

parents 6c3fbd4c b41072b0
Showing with 124 additions and 120 deletions
igirl-channel-web/app/front/entry/index.ejs
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
<meta charset="utf-8"> <meta charset="utf-8">
<meta name="keywords" content="PAAS 开放平台"> <meta name="keywords" content="PAAS 开放平台">
<meta name="baidu-site-verification" content="lATAxZAm8y" /> <meta name="baidu-site-verification" content="lATAxZAm8y" />
<meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests">
<meta name="viewport" content="width=device-width, initial-scale=0.8, maximum-scale=0.8, user-scalable=1"> <meta name="viewport" content="width=device-width, initial-scale=0.8, maximum-scale=0.8, user-scalable=1">
<title id="idtitle"></title> <title id="idtitle"></title>
<!-- <%=app?app.name:'应用未启用'%> --> <!-- <%=app?app.name:'应用未启用'%> -->
...@@ -76,11 +77,10 @@ ...@@ -76,11 +77,10 @@
</span> </span>
<el-dropdown-menu slot="dropdown"> <el-dropdown-menu slot="dropdown">
<el-dropdown-item icon="el-icon-plus">我的订单</el-dropdown-item> <el-dropdown-item icon="el-icon-plus">我的订单</el-dropdown-item>
<el-dropdown-item icon="el-icon-circle-plus">我的账号</el-dropdown-item>
<el-dropdown-item icon="el-icon-circle-plus">退出登录</el-dropdown-item> <el-dropdown-item icon="el-icon-circle-plus">退出登录</el-dropdown-item>
</el-dropdown-menu> </el-dropdown-menu>
</el-dropdown> </el-dropdown>
<span @click="loginOut" v-if="user_Name">退出</span> <!-- <span @click="loginOut" v-if="user_Name">退出</span> -->
</div> </div>
<div v-else> <div v-else>
<router-link class="commonchannel-login" :to="'/'+channelName+'/login'">登录</router-link> <router-link class="commonchannel-login" :to="'/'+channelName+'/login'">登录</router-link>
......
igirl-channel-web/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-web/app/front/entry/public/js/index.js
...@@ -163,7 +163,7 @@ axios.get("/web/common/metaCtl/getRouteConfig").then(d => { ...@@ -163,7 +163,7 @@ axios.get("/web/common/metaCtl/getRouteConfig").then(d => {
jdSelfHeaderShow: true, jdSelfHeaderShow: true,
commonHeader: true, commonHeader: true,
commonFooter: true, commonFooter: true,
user_Name: "123xxxxxxxxxxx", user_Name: "",
channelMessage: "", channelMessage: "",
}; };
...@@ -219,6 +219,9 @@ axios.get("/web/common/metaCtl/getRouteConfig").then(d => { ...@@ -219,6 +219,9 @@ axios.get("/web/common/metaCtl/getRouteConfig").then(d => {
case '1688': case '1688':
title.innerText = "1688商标注册服务"; title.innerText = "1688商标注册服务";
break; break;
case 'gsbhome':
title.innerText = "公司宝商标注册服务";
break;
default: default:
title.innerText = "启服通"; title.innerText = "启服通";
break; break;
...@@ -292,13 +295,12 @@ axios.get("/web/common/metaCtl/getRouteConfig").then(d => { ...@@ -292,13 +295,12 @@ axios.get("/web/common/metaCtl/getRouteConfig").then(d => {
this.jdSelfFooterShow = false; this.jdSelfFooterShow = false;
break; break;
} }
}); });
}, },
// 处理参数方法 // 处理参数方法
copyParams(actionBody, actionType, url, isUser = "no", isDecryptUser = "no") { copyParams(actionBody, actionType, url, isUser = "no", isDecryptUser = "no") {
var data = this.commonParams; var data = this.commonParams;
data.actionProcess = this.$root.getChannelPath(); data.actionProcess = 'jd' || this.channelName;
data.actionType = actionType; data.actionType = actionType;
data.actionBody = actionBody || {}; data.actionBody = actionBody || {};
data.requrl = this.host + url; data.requrl = this.host + url;
...@@ -332,7 +334,6 @@ axios.get("/web/common/metaCtl/getRouteConfig").then(d => { ...@@ -332,7 +334,6 @@ axios.get("/web/common/metaCtl/getRouteConfig").then(d => {
$(".spechorizotal .nav_color:hover").css("color", "#2692FF"); $(".spechorizotal .nav_color:hover").css("color", "#2692FF");
} else { } else {
this.popupsType = true; this.popupsType = true;
} }
// setTimeout(()=>{ // setTimeout(()=>{
......
igirl-channel-web/app/front/vues/pages/bwselftmreg/bwselftmreg.js
...@@ -365,54 +365,16 @@ ...@@ -365,54 +365,16 @@
watch: { watch: {
nclOne: { nclOne: {
handler(newVal, oldVal){ handler(newVal, oldVal){
this.form.totalSum = (newVal.length * this.form.totalPrices).toFixed(2); this.form.totalSum = 0;
/*大类 */ console.log(newVal.length, 1111111111111, oldVal.length);
if (newVal.length > 0) { newVal.map((item, index) => {
if (newVal.length > 1) { if (item.nclThree.length > 10) {
this.$refs.tree.setChecked(newVal[1], false); this.form.totalSum += Number(item.nclThree.length * 30);
this.$refs.tree.setChecked(newVal[1].nclThree[0], false); } else {
newVal.pop(); this.form.totalSum += Number(300);
this.message.show = !this.message.show;
this.message.info = "只能选择同一个类别";
var timer = setTimeout(() => {
this.message.show = false;
clearTimeout(timer);
}, 2000);
};
/*小类 */
if (newVal[0].nclThree.length > 10) {
this.$refs.tree.setChecked(newVal[0].nclThree[10], false);
newVal[0].nclThree.pop();
console.log(newVal, newVal[0].nclThree, `xxxxxxxxxxxxxxxxxxxxxxxxxxxxx`);
this.message.show = !this.message.show;
this.message.info = "最多只能选择10项";
var timer2 = setTimeout(() => {
this.message.show = false;
clearTimeout(timer2);
}, 2000);
} }
});
}
/*
console.log(this, newVal.length, '???????????????????');
if (newVal.length > 0) {
newVal.forEach((item, index) => {
if (item.nclThree.length > 10) {
this.$refs.tree.setChecked(item.nclThree[10], false);
item.nclThree.pop();
console.log(newVal, item.nclThree, `xxxxxxxxxxxxxxxxxxxxxxxxxxxxx`);
this.message.show = !this.message.show;
this.message.info = "最多只能选择10项";
var timer2 = setTimeout(() => {
this.message.show = false;
clearTimeout(timer2);
}, 2000);
}
});
}
*/
}, },
deep: true deep: true
} }
...@@ -981,13 +943,20 @@ ...@@ -981,13 +943,20 @@
}) })
}, },
handleCheckChange(obj, a, b) { handleCheckChange(obj, a, b) {
console.log(obj, a, b, this.nclOne, '1233333333333333333333344444444444444444444'); /**
*
*
* console.log(obj, a, b, this.nclOne, '1233333333333333333333344444444444444444444', dataRecieve);
*/
let dataRecieve = this.$refs.tree.getCheckedNodes(); let dataRecieve = this.$refs.tree.getCheckedNodes();
if (obj.type) { if (obj.type) {
return return
} }
/*let ppncl = this.ppnclArr;*/ /*let ppncl = this.ppnclArr;*/
let ppncl = this.$refs.tree.getNode(obj).parent.parent.data; let ppncl = this.$refs.tree.getNode(obj).parent.parent.data;
console.log(ppncl);
let key = (dataRecieve.length - 1); let key = (dataRecieve.length - 1);
let eData = null; let eData = null;
......
igirl-channel-web/app/front/vues/pages/jdtrademark/jdtrademark.html
...@@ -81,7 +81,7 @@ ...@@ -81,7 +81,7 @@
<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}" :class="{\'brandreg-swiper-content-button-enter\':index==current}"
@click="jumpJdProductDetails(item,$event)">立即购买 @click="jumpJdProductDetails(item)">立即购买
</div> </div>
</div> </div>
</div> </div>
......
igirl-channel-web/app/front/vues/pages/jdtrademark/jdtrademark.js
...@@ -157,7 +157,7 @@ ...@@ -157,7 +157,7 @@
methods: { methods: {
/*全选 */ /*全选 */
goIndentList(){ goIndentList(){
location.href="https://oauth2.jdcloud.com/authorize?response_type=token&redirect_uri=https://tm.plus.jdcloud.com/jdtm/getUser&state=jdindentlist&client_id=9491577327154697"; location.href = "https://oauth2.jdcloud.com/authorize?response_type=token&redirect_uri=https://tm.plus.jdcloud.com/jdtm/getUser&state=jdindentlist&client_id=9491577327154697";
}, },
handleCheckAllChange(val) { handleCheckAllChange(val) {
if (val) { if (val) {
...@@ -195,32 +195,62 @@ ...@@ -195,32 +195,62 @@
} }
}); });
}, },
jumpJdProductDetails(code, e){ jumpJdProductDetails(code){
switch (this.$root.channelName) {
if (code.channelItemCode) { case "jd":
switch (code.itemCode) { if (code.channelItemCode) {
case "zzsbzc": switch (code.itemCode) {
location.href="https://oauth2.jdcloud.com/authorize?response_type=token&redirect_uri=https://tm.plus.jdcloud.com/jdtm/getUser&state=selftmreg&client_id=9491577327154697"; case "zzsbzc":
/*this.$router.push({ path: "/jd/selftmreg", query: {} });*/ location.href = "https://oauth2.jdcloud.com/authorize?response_type=token&redirect_uri=https://tm.plus.jdcloud.com/jdtm/getUser&state=selftmreg&client_id=9491577327154697";
break; /*this.$router.push({ path: "/jd/selftmreg", query: {} });*/
case "fzsbzc": break;
case "fzsbzc":
case "dbsbzc": case "dbsbzc":
let productId = code.channelItemCode.split('-')[1]; let productId = code.channelItemCode.split('-')[1];
console.log(code.channelItemCode.split('-'),"xxxxxxxxxxxxxx"); console.log(code.channelItemCode.split('-'), "xxxxxxxxxxxxxx");
window.open(`https://market.jdcloud.com/service/details/${productId}`); window.open(`https://market.jdcloud.com/service/details/${productId}`);
break; break;
default: default:
break; break;
} }
} else { } else {
return return
} }
break;
case "bw":
if (code.channelItemCode) {
switch (code.itemCode) {
case "zzsbzc":
this.$router.push({
path: `/${this.$root.channelName}/bwselftmreg`, query: {
sdsId: code.channelItemCode
}
});
/*this.$router.push({ path: "/jd/selftmreg", query: {} });*/
break;
case "fzsbzc":
case "dbsbzc":
this.$router.push({
path: `/${this.$root.channelName}/servicedetails`, query: {
sdsId: code.channelItemCode
}
});
break;
default:
break;
}
} else {
return
}
break;
default:
break;
}
console.log(code, e);
} }
}, },
vname: "gsb-jdtrademark" vname: "gsb-jdtrademark"
......
igirl-channel-web/app/front/vues/pages/nowbuy/nowbuy.html
...@@ -3,15 +3,15 @@ ...@@ -3,15 +3,15 @@
<div class="nowbuy-main"> <div class="nowbuy-main">
<div class="nowbuy-nav"> <!-- <div class="nowbuy-nav">
<div class="tm-body-breadcrumb" style="margin-bottom: 15px;"><span @click="tiaozhuan(\'/\',\'首页\')" <div class="tm-body-breadcrumb" style="margin-bottom: 15px;"><span @click="tiaozhuan(1)"
style="cursor: pointer;">首页</span> style="cursor: pointer;">首页</span>
<i class="el-icon-arrow-right"></i> <i class="el-icon-arrow-right"></i>
<span style="font-weight:600;cursor: pointer;font-weight: 300;" <span style="font-weight:600;cursor: pointer;font-weight: 300;"
@click="tiaozhuan( \'/servicedetails\',\'服务详情\',)">{{serviceName||\'担保商标注册\'}}</span> @click="tiaozhuan(2)">{{serviceName||\'担保商标注册\'}}</span>
<i class="el-icon-arrow-right">下单</i> <i class="el-icon-arrow-right">下单</i>
</div> </div>
</div> </div> -->
<div class="nowbuy-title"> <div class="nowbuy-title">
<div> <div>
购买服务 购买服务
......
igirl-channel-web/app/front/vues/pages/nowbuy/nowbuy.js
...@@ -59,7 +59,7 @@ ...@@ -59,7 +59,7 @@
totalSum: null, totalSum: null,
}, },
}, },
serviceName:"", serviceName: "",
} }
}, },
...@@ -87,19 +87,19 @@ ...@@ -87,19 +87,19 @@
this.params.itemCode = this.tableData[0].code; this.params.itemCode = this.tableData[0].code;
this.$root.postReq("/web/orderCtl/createOtherOrder", this.params).then((d) => { this.$root.postReq("/web/orderCtl/createOtherOrder", this.params).then((d) => {
console.log("---------submitOrder-------"); console.log("---------submitOrder-------");
if (this.$store.state.currentUser == null){ if (this.$store.state.currentUser == null) {
this.$message.warning("未登录"); this.$message.warning("未登录");
return return
} }
if (d.code == 1) { if (d.code == 1) {
this.$root.pushx({ this.$root.pushx({
title: "订单支付", title: "订单支付",
name: "/orderpay", name: "/orderpay",
params: { orderNum: d.data.code } params: { orderNum: d.data.code }
}); });
} else { } else {
this.$message.warning(d.msg); this.$message.warning(d.msg);
} }
}).catch((e) => { }).catch((e) => {
console.log(e); console.log(e);
}) })
...@@ -119,15 +119,22 @@ ...@@ -119,15 +119,22 @@
} }
}); });
}, },
tiaozhuan(path, name, params) { tiaozhuan(code) {
this.$root.pushx({ switch (code) {
title: name, case 1:
name: path, this.$router.push({
params: { path: `/${this.$root.channelName}/jdtrademark?`
isDirectJump: 1, });
sdsId: this.$route.query.sdsId break;
} case 2:
}); this.$router.push({
path: `/${this.$root.channelName}/servicedetails`
});
break;
default:
break;
}
}, },
}, },
computed: { computed: {
......
igirl-channel-web/app/front/vues/pages/register/register.html
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
</div> --> </div> -->
<div class="login-div" v-if="a"> <div class="login-div" v-if="a">
<div class="login-content" style="width: 380px; <div class="login-content" style="width: 380px;
height: 508px; height: 430px;
background: rgba(255,255,255,1); background: rgba(255,255,255,1);
border: 1px solid rgba(151,151,151,1);"> border: 1px solid rgba(151,151,151,1);">
<div class="logins-title"> <div class="logins-title">
...@@ -17,10 +17,7 @@ ...@@ -17,10 +17,7 @@
<!-- 验证码登录 --> <!-- 验证码登录 -->
<div v-if="activeIndex==1" class="login-content-inputs"> <div v-if="activeIndex==1" class="login-content-inputs">
<el-form ref="form1" :rules="rules1" :model="form1" label-width="0px" key="1"> <el-form ref="form1" :rules="rules1" :model="form1" label-width="0px" key="1">
<el-form-item>
<el-input v-model="form1.username" placeholder="请输入企业名称"> <i slot="prefix"
class="el-input__icon el-icon-tickets"></i></el-input>
</el-form-item>
<el-form-item prop="mobile"> <el-form-item prop="mobile">
<el-input v-model="form1.mobile" placeholder="请输入11位手机号码"><i slot="prefix" <el-input v-model="form1.mobile" placeholder="请输入11位手机号码"><i slot="prefix"
class="el-input__icon el-icon-mobile-phone"></i></el-input> class="el-input__icon el-icon-mobile-phone"></i></el-input>
......
igirl-channel-web/app/front/vues/pages/servicedetails/servicedetails.html
<div class="sds-container" style="background-color:white"> <div class="sds-container" style="background-color:white">
<div style="width:1200px;color:#000;margin:0 auto;padding-top:20px;padding-bottom:30px;min-height:1000px"> <div style="width:1200px;color:#000;margin:0 auto;padding-top:20px;padding-bottom:30px;min-height:1000px">
<div class="tm-body-breadcrumb" style="margin-bottom: 15px;"><span @click="tiaozhuan(\'/\',\'首页\')" <div class="tm-body-breadcrumb" style="margin-bottom: 15px;"><span @click="tiaozhuan()"
style="cursor: pointer;">首页</span> <i class="el-icon-arrow-right"></i> style="cursor: pointer;">首页</span> <i class="el-icon-arrow-right"></i>
<span style="font-weight:600;">服务详情页</span> <span style="font-weight:600;">服务详情页</span>
</div> </div>
<div class="sds-img"> <div class="sds-img">
<img :src="serviceItem.mobilePic" alt="" style="width:100%;height:100%"> <img :src="serviceItem.picUrl" alt="" style="width:100%;height:100%">
</div> </div>
<div class="sds-info"> <div class="sds-info">
<h3>{{serviceItem.name}}</h3> <h3>{{serviceItem.itemName}}</h3>
<h5>{{serviceItem.shortDesc}}</h5> <h5>{{serviceItem.shortDesc}}</h5>
<div class="sds-t"> <div class="sds-t">
<span style="color:#999;font-size:12px;margin:12px">服务费：</span> <b <span style="color:#999;font-size:12px;margin:12px">服务费：</span> <b
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
style="color:#ff5135;font-size:18px">&yen;&nbsp;{{serviceItem.price?serviceItem.price.toFixed(2):0}}</b> style="color:#ff5135;font-size:18px">&yen;&nbsp;{{serviceItem.price?serviceItem.price.toFixed(2):0}}</b>
</div> </div>
<div class="sds-operate"> <div class="sds-operate">
<span class="sds-op2" @click="showneed()">立即办理</span> <span class="sds-op2" @click="showneed()">提交需求</span>
<span class="sds-op1" @click="sdsOp2()">立即购买</span> <span class="sds-op1" @click="sdsOp2()">立即购买</span>
</div> </div>
<p>服务承诺：全流程服务 全程公开透明</p> <p>服务承诺：全流程服务 全程公开透明</p>
......
igirl-channel-web/app/front/vues/pages/servicedetails/servicedetails.js
...@@ -333,27 +333,27 @@ ...@@ -333,27 +333,27 @@
}, },
mounted() { mounted() {
this.getServiceItemInfo(); this.getServiceItemInfo();
setTimeout(() => { scrollTo(0, 0);
$(".spechorizotal .nav_color").css("color", "black");
}, 2000);
/*$("#idtitle").text("服务详情");*/ /*$("#idtitle").text("服务详情");*/
}, },
created() { created() {
}, },
methods: { methods: {
tiaozhuan(path, name) { tiaozhuan() {
this.$root.pushx({ this.$router.push({
title: name, path: `/${this.$root.channelName}/jdtrademark`
name: path
}); });
}, },
getServiceItemInfo(){ getServiceItemInfo(){
var sdsId = window.location.href.split("sdsId=")[1]; var sdsId = window.location.href.split("sdsId=")[1];
var that = this; var that = this;
this.$root.getReq("/web/serviceitemCtl/findOneById", { id: sdsId }).then(function (d) { let obj = this.$root.copyParams({ channelUserId: "123", channelItemCode: sdsId }, "getProductDetail", "/action/tmOrder/springBoard");
if (d.code == 1) { this.$root.postReq("/web/trademark/tmqueryCtl/doPost", obj).then(function (d) {
if (d.status == 0) {
that.serviceItem = d.data; that.serviceItem = d.data;
console.log("返回信息", d.data) console.log("返回信息", { ...d.data })
} else {
console.log(d.msg);
} }
}) })
}, },
...@@ -370,7 +370,7 @@ ...@@ -370,7 +370,7 @@
window.open("https://wpa.qq.com/msgrd?v=3&uin="+this.$root.contextCompany().serviceqq+"&site=qq&menu=yes"); window.open("https://wpa.qq.com/msgrd?v=3&uin="+this.$root.contextCompany().serviceqq+"&site=qq&menu=yes");
*/ */
let routeUrl = this.$router.resolve({ let routeUrl = this.$router.resolve({
path: "/nowbuy", path: `/${this.$root.channelName}/nowbuy`,
query: { query: {
isDirectJump: 1, isDirectJump: 1,
num: this.num, num: this.num,
......
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