Skip to content

Z
zhichan
Commit cb0e4470 by 刘泽奇
Options

123

parent 4921df69
Showing with 96 additions and 45 deletions
igirl-channel-web/app/front/entry/index.ejs
......@@ -78,6 +78,7 @@
</span>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item icon="el-icon-s-order" command="myIndent">我的订单</el-dropdown-item>
<el-dropdown-item icon="el-icon-s-order" v-if="superAdmin" command="goSuperAdmin">后台管理</el-dropdown-item>
<el-dropdown-item icon="el-icon-bicycle" command="loginOut">退出登录</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
......
igirl-channel-web/app/front/entry/public/js/index.js
......@@ -36,6 +36,7 @@ const store = new Vuex.Store({
curSelRow: {},
reqUrl: "",
channelName: "",
reqQuery: "",
},
});
Vue.mixin({
......@@ -82,6 +83,7 @@ axios.get("/web/common/metaCtl/getRouteConfig").then(d => {
}
if (to.path.includes('login')) {
store.state.reqUrl = from.path;
store.state.reqQuery = from.query;
console.log(to, from, store.state.reqUrl);
}
next();
......@@ -178,7 +180,8 @@ axios.get("/web/common/metaCtl/getRouteConfig").then(d => {
isLogin: false,
logoImg: null,
homeUrl: "",
footerText:"",
footerText: "",
superAdmin: null,
};
},
created() {
......@@ -191,10 +194,10 @@ axios.get("/web/common/metaCtl/getRouteConfig").then(d => {
},
mounted() {
this.$nextTick(() => {
this.handleHeader();
});
console.log($.fn.jquery, "vvvvvvvvvvvvvvvvv");
var self = this;
......@@ -242,6 +245,14 @@ axios.get("/web/common/metaCtl/getRouteConfig").then(d => {
break;
}
},
goSuperAdmin() {
this.$router.push({
path: `/${this.channelName}/OAjdlist`,
query: {
channelUserId: this.$root.channelUserId
}
})
},
myIndent() {
this.$router.push({
path: `/${this.channelName}/jdindentlist`,
......@@ -262,6 +273,9 @@ axios.get("/web/common/metaCtl/getRouteConfig").then(d => {
case 'myIndent':
this.myIndent();
break;
case 'goSuperAdmin':
this.goSuperAdmin();
break;
default:
break;
}
......
igirl-channel-web/app/front/vues/pages/jdindentdetail/jdindentdetail.js
......@@ -333,11 +333,14 @@
receiptVoucher: {},
user_Name: "",
channelFrom: "",
treeStatus: {
unfold: ['颜料油漆', '媒染剂'],
checked: [],
}
}
},
mounted: function() {
var that = this;
console.log(this.$route.query.channelUserId, this.deliveryOrderNo, 'ggggggggggggggggggggggggggggggggggg');
var obj = this.$root.copyParams("", "getOssConfig", "/action/tmTools/springBoard");
this.$root.postReq("/web/trademark/tmqueryCtl/doPost", obj).then(function (d) {
that.d["key"] = "key";
......@@ -431,34 +434,56 @@
watch: {
nclOne: {
handler(newVal, oldVal){
if (newVal.length > 0) {
if (newVal.length > 1) {
if (this.$refs.tree) {
this.$refs.tree.setChecked(newVal[1], false);
this.$refs.tree.setChecked(newVal[1].nclThree[0], false);
newVal.pop();
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);
}
switch (this.$root.channelName) {
case 'bw':
if (newVal.length > 1) {
if (this.$refs.tree) {
this.$refs.tree.setChecked(newVal[1], false);
this.$refs.tree.setChecked(newVal[1].nclThree[0], false);
newVal.pop();
this.message.show = !this.message.show;
this.message.info = "只能修改当前类别";
var timer = setTimeout(() => {
this.message.show = false;
clearTimeout(timer);
}, 2000);
}
};
break;
default:
/*京东模式 最多智能选择十项 */
if (newVal.length > 0) {
if (newVal.length > 1) {
if (this.$refs.tree) {
this.$refs.tree.setChecked(newVal[1], false);
this.$refs.tree.setChecked(newVal[1].nclThree[0], false);
newVal.pop();
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);
}
}
break;
}
},
deep: true
}
......@@ -583,12 +608,16 @@
});
},
showDialog(from, index){
this.dialogTableVisible = true;
this.nclIndex = index;
console.log(this.nclInfo);
console.log(this.nclInfo, ",,,,,,,,,,,,,,,,,,,,,,,,", this.ncldata);
this.nclOne = this.nclInfo.slice(index, index + 1);
console.log(this.nclOne);
let data = [];
this.nclOne.map((i, idx) => {
console.log(i);
});
console.log(this.nclOne, "///////////////////////////");
console.log(this.nclIndex);
this.dialogTableVisible = true;
switch (from) {
case 1:
this.headerInfo = "商标信息";
......@@ -679,6 +708,7 @@
this.$root.postReq("/web/trademark/tmqueryCtl/doPost", getNclByLikeNameAndNcl).then(function (d) {
if (d.status == 0) {
that.ncldata = d.data;
console.log(that.ncldata);
}
that.nclSearchLoading = false;
}).catch(function (e) {
......
igirl-channel-web/app/front/vues/pages/login/login.html
......@@ -92,8 +92,8 @@
</div>
<!-- 重置密码 -->
<div class="login-div" v-show="b">
<div class="login-content">
<div class="login-content-title">
<div class="login-content" style="width:361.97px;">
<div class="login-content-title" style="width:100%;">
重置密码
</div>
<div class="login-content-input">
......@@ -102,8 +102,9 @@
<el-input v-model="form3.mobile" placeholder="请输入手机号码"></el-input>
</el-form-item>
<el-form-item prop="code">
<el-input style="width:140px;" v-model="form3.code" placeholder="请输入验证码"></el-input>
<el-button id="resetCode" type="primary" style="width:135px;" @click="obtaincode2">获取验证码</el-button>
<el-input style="width:176px;" v-model="form3.code" placeholder="请输入验证码"></el-input>
<el-button id="resetCode" type="primary" style="width:135px;float: right" @click="obtaincode2">获取验证码
</el-button>
</el-form-item>
<el-form-item prop="password">
<el-input type="password" v-model="form3.password" placeholder="请设置6-18位密码"></el-input>
......
igirl-channel-web/app/front/vues/pages/login/login.js
......@@ -106,8 +106,7 @@
},
created: function() {
console.log(this.pfooterinfo);
if (this.$root.channelName == "bw"){
if (this.$root.channelName == "bw") {
this.loginUrl = "/imgs/loginbg.png";
}
},
......@@ -228,6 +227,7 @@
console.log(d.msg);
this.$root.loading = false;
if (d.status == 0) {
if (d.data.isAdmin) this.$root.superAdmin = d.data.isAdmin;
$.cookie('channelUserId', d.data.channelUserId);
$.cookie('userName', d.data.userName);
$.cookie('userpin', d.data.userpin);
......@@ -241,7 +241,7 @@
} else {
this.$router.push({
path: `${this.$store.state.reqUrl}`,
query: { channelUserId: d.data.channelUserId }
query: { channelUserId: d.data.channelUserId, ...that.$store.state.reqQuery }
})
}
console.log("返回信息", d)
......@@ -276,6 +276,7 @@
if (valid) {
var userInfo = that.$root.copyParams(obj, "userPinByLgoin", "/auth/accessAuth/springBoard");
console.log(userInfo, 'mmmmmmmmmmmmmmmmmmmmmm');
console.log(that.$store.state.reqQuery, "lllllllllllllllllllllllllllllllllllllllll");
this.$root.loading = true;
this.$root.postReq("/web/trademark/tmqueryCtl/doPost", userInfo).then((d) => {
this.$root.loading = false;
......@@ -294,7 +295,7 @@
} else {
this.$router.push({
path: `${this.$store.state.reqUrl}`,
query: { channelUserId: d.data.channelUserId }
query: { channelUserId: d.data.channelUserId, ...that.$store.state.reqQuery }
})
}
console.log("返回信息", d)
......
igirl-channel-web/app/front/vues/pages/nowbuy/nowbuy.js
......@@ -82,9 +82,7 @@
}
},
goOrder(){
if ($.cookie('userpin') && $.cookie('userpin') != "") {
this.$router.push(`/${this.$root.channelName}/login`);
}
this.$refs.apply.validate((v) => {
console.log(v);
if (v) {
......@@ -102,7 +100,9 @@
this.$root.postReq("/web/trademark/tmqueryCtl/doPost", obj).then((d) => {
console.log("---------submitOrder-------");
if (d.status == '-99') {
localStorage.OtherOrderParams = this.params;
this.$message.warning("未登录");
this.$router.push({ path: `/${this.$root.channelName}/login`, });
return
}
if (d.status == 0) {
......
igirl-channel-web/app/front/vues/pages/register/register.js
......@@ -108,7 +108,7 @@
},
created: function() {
console.log(this.pfooterinfo);
if (this.$root.channelName == "bw"){
if (this.$root.channelName == "bw") {
this.loginUrl = "/imgs/loginbg.png";
}
},
......@@ -189,7 +189,7 @@
*/
},
checklogin1(){
var that = this;
var obj = {
......@@ -204,6 +204,10 @@
this.$root.postReq("/web/trademark/tmqueryCtl/doPost", userInfo).then((d) => {
console.log("返回信息", d.msg);
if (d.status == 0) {
this.$message({
message: '注册成功!',
type: 'success'
});
this.$router.push(`/${this.$root.channelName}/login`);
console.log("返回信息", d)
} else if (d.status == 2030) {
......
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