Skip to content

Z
zhichan
Commit a1a0d9c6 by 刘泽奇
Options

123

parent 7d4b3c5c
Showing with 47 additions and 75 deletions
igirl-channel-jdweb/app/front/entry/index.ejs
...@@ -54,48 +54,11 @@ ...@@ -54,48 +54,11 @@
<div id="app" v-loading.fullscreen.lock="loading" element-loading-background="rgba(0, 0, 0, 0.8)" class="app-main" <div id="app" v-loading.fullscreen.lock="loading" element-loading-background="rgba(0, 0, 0, 0.8)" class="app-main"
style="visibility:hidden"> style="visibility:hidden">
<div class="jc_hd"></div> <div class="jc_hd" v-if="headerHidden"></div>
<div id="admin-warpper" v-if="0">
<div></div>
<div class="admin-menu">
<el-menu default-active="2" class="el-menu-vertical-demo" @open="handleOpen" @close="handleClose"
background-color="#545c64" text-color="#fff" active-text-color="#ffd04b">
<el-submenu index="1">
<template slot="title">
<i class="el-icon-location"></i>
<span>导航一</span>
</template>
<el-menu-item-group>
<template slot="title">分组一</template>
<el-menu-item index="1-1">选项1</el-menu-item>
<el-menu-item index="1-2">选项2</el-menu-item>
</el-menu-item-group>
<el-menu-item-group title="分组2">
<el-menu-item index="1-3">选项3</el-menu-item>
</el-menu-item-group>
<el-submenu index="1-4">
<template slot="title">选项4</template>
<el-menu-item index="1-4-1">选项1</el-menu-item>
</el-submenu>
</el-submenu>
<el-menu-item index="2">
<i class="el-icon-menu"></i>
<span slot="title">导航二</span>
</el-menu-item>
</el-menu>
</div>
<div class="admin-content">
<transition name="slide-fade"> <transition name="slide-fade">
<router-view>
</router-view>
</transition>
</div>
</div>
<transition name="slide-fade" v-else>
<router-view></router-view> <router-view></router-view>
</transition> </transition>
<div class="jdc-footer"></div> <div class="jdc-footer" v-if="headerHidden"></div>
</div> </div>
......
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/entry/public/js/index.js
...@@ -156,10 +156,12 @@ axios.get("/web/common/metaCtl/getRouteConfig").then(d => { ...@@ -156,10 +156,12 @@ axios.get("/web/common/metaCtl/getRouteConfig").then(d => {
showPhoneNum: false, showPhoneNum: false,
rsData: [], rsData: [],
channelPath: "", channelPath: "",
channelUserId:"", channelUserId: "",
headerHidden: true,
}; };
}, },
created() { created() {
$(window).resize(() => { $(window).resize(() => {
$("#app").css("min-height", $(window).height()); $("#app").css("min-height", $(window).height());
}); });
...@@ -170,6 +172,17 @@ axios.get("/web/common/metaCtl/getRouteConfig").then(d => { ...@@ -170,6 +172,17 @@ axios.get("/web/common/metaCtl/getRouteConfig").then(d => {
}, },
mounted() { mounted() {
this.$nextTick(() => {
if (location.hash.split('/')[1] == "jd") {
console.log("zzzzzzzzzzzzzzz", location.hash.split('/')[1], this.headerHidden);
this.headerHidden = true;
} else {
this.headerHidden = false;
console.log("zzzzzzzzzzzzzzz", location.hash.split('/')[1], this.headerHidden);
}
})
var self = this; var self = this;
if (!this.currentUser) { if (!this.currentUser) {
this.logins.push({ "icon": "el-icon-location-outline", "title": "登录", "type": "text", key: "login", "isOnGrid": true }); this.logins.push({ "icon": "el-icon-location-outline", "title": "登录", "type": "text", key: "login", "isOnGrid": true });
...@@ -184,13 +197,12 @@ axios.get("/web/common/metaCtl/getRouteConfig").then(d => { ...@@ -184,13 +197,12 @@ axios.get("/web/common/metaCtl/getRouteConfig").then(d => {
getChannelPath() { getChannelPath() {
var from = this.$route.path; var from = this.$route.path;
var path = from.split('/')[1]; var path = from.split('/')[1];
console.log(path);
this.$root.channelPath = path; this.$root.channelPath = path;
return path; return path;
}, },
// 处理参数方法 // 处理参数方法
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 = this.$root.getChannelPath();
data.actionType = actionType; data.actionType = actionType;
......
igirl-channel-jdweb/app/front/vues/pages/jdindentlist/jdindentlist.css
.jdindentlist-header { .jdindentlist-header {
width: 100%; width: 100%;
height: 50px; height: 0px;
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
align-items: center; align-items: center;
......
igirl-channel-jdweb/app/front/vues/pages/jdindentlist/jdindentlist.html
...@@ -57,7 +57,7 @@ ...@@ -57,7 +57,7 @@
<el-input v-model="name" placeholder="请输入内容"></el-input> <el-input v-model="name" placeholder="请输入内容"></el-input>
</div> </div>
<div><span>交付状态：</span> <div><span>交付状态：</span>
<el-select v-model="deliveryStatus" placeholder="请选择"> <el-select v-model="checkedStatus" placeholder="请选择">
<el-option v-for="item in DeliveryStatus" :key="item.value" :label="item.label" <el-option v-for="item in DeliveryStatus" :key="item.value" :label="item.label"
:value="item.value"> :value="item.value">
</el-option> </el-option>
...@@ -127,6 +127,7 @@ ...@@ -127,6 +127,7 @@
:page-size="10" background layout="prev, pager, next,jumper" :total="countPage"> :page-size="10" background layout="prev, pager, next,jumper" :total="countPage">
</el-pagination> </el-pagination>
</div> </div>
</div> </div>
</div> </div>
<el-drawer title="上传材料" custom-class="jdindentdetail-drawer" size="58.3333%" <el-drawer title="上传材料" custom-class="jdindentdetail-drawer" size="58.3333%"
...@@ -315,13 +316,13 @@ ...@@ -315,13 +316,13 @@
<div class="jdindentlist-inquire"> <div class="jdindentlist-inquire">
<div class="jdindentlist-inquire-form"> <div class="jdindentlist-inquire-form">
<div><span>订单编号：</span> <div><span>订单编号：</span>
<el-input v-model="channelServiceNo" placeholder="请输入内容"></el-input> <el-input v-model="icbcChannelServiceNo" placeholder="请输入内容"></el-input>
</div> </div>
<div><span>交付单号：</span> <div><span>业务单号：</span>
<el-input v-model="deliveryOrderNo" placeholder="请输入内容"></el-input> <el-input v-model="icbcDeliveryOrderNo" placeholder="请输入内容"></el-input>
</div> </div>
<div><span>业务类型：</span> <div><span>支付状态：</span>
<el-select v-model="itemName" placeholder="请选择"> <el-select v-model="icbcItemName" placeholder="请选择">
<el-option v-for="item in businessType" :key="item.value" :label="item.label" <el-option v-for="item in businessType" :key="item.value" :label="item.label"
:value="item.value"> :value="item.value">
</el-option> </el-option>
...@@ -329,33 +330,28 @@ ...@@ -329,33 +330,28 @@
</div> </div>
<div><span>下单时间：</span> <div><span>下单时间：</span>
<div class="block"> <div class="block">
<span class="demonstration"></span> <span class="Demonstration"></span>
<el-date-picker v-model="CreateDate" @change="dateChecked(CreateDate)" type="daterange" <el-date-picker v-model="icbcCreateDate" @change="icbcDateChecked(icbcCreateDate)"
align="right" start-placeholder="起始" end-placeholder="结束" type="daterange" align="right" start-placeholder="起始" end-placeholder="结束"
:picker-options="pickerOptions"> :picker-options="pickerOptions">
</el-date-picker> </el-date-picker>
</div> </div>
</div> </div>
<div><span>商标名称：</span> <div><span>注册地区：</span>
<el-input v-model="tmName" placeholder="请输入内容"></el-input> <el-cascader v-model="regionValue" :options="region" @change="checkedCity">
</div> </el-cascader>
<div><span>申请人：</span>
<el-input v-model="name" placeholder="请输入内容"></el-input>
</div> </div>
<div><span>交付状态：</span> <div><span>公司类型：</span>
<el-select v-model="deliveryStatus" placeholder="请选择"> <el-input v-model="icbcName" placeholder="请输入内容"></el-input>
<el-option v-for="item in DeliveryStatus" :key="item.value" :label="item.label"
:value="item.value">
</el-option>
</el-select>
</div> </div>
<div><span>交付状态：</span> <div><span>流程状态：</span>
<el-select v-model="deliveryStatus" placeholder="请选择"> <el-select v-model="icbcCheckedStatus" placeholder="请选择">
<el-option v-for="item in DeliveryStatus" :key="item.value" :label="item.label" <el-option v-for="item in icbcDeliveryStatus" :key="item.value" :label="item.label"
:value="item.value"> :value="item.value">
</el-option> </el-option>
</el-select> </el-select>
</div> </div>
<!-- <div><span>付款状态：</span> <!-- <div><span>付款状态：</span>
<el-select v-model="paymentStatus" placeholder="请选择"> <el-select v-model="paymentStatus" placeholder="请选择">
<el-option v-for="item in options" :key="item.value" :label="item.label" <el-option v-for="item in options" :key="item.value" :label="item.label"
...@@ -365,8 +361,8 @@ ...@@ -365,8 +361,8 @@
</div> --> </div> -->
</div> </div>
<div> <div>
<el-button @click="find()">查询</el-button> <el-button @click="icbcFind()">查询</el-button>
<el-button @click="reset()">重置</el-button> <el-button @click="icbcReset()">重置</el-button>
</div> </div>
</div> </div>
<div class="jdindentlist-null" v-if="!tableData"> <div class="jdindentlist-null" v-if="!tableData">
......
igirl-channel-jdweb/app/front/vues/pages/jdtrademark/jdtrademark.js
...@@ -185,7 +185,7 @@ ...@@ -185,7 +185,7 @@
}, },
goSearch(){ goSearch(){
this.$router.push({ this.$router.push({
path: "jdbycquerytm", path: "/jd/jdbycquerytm",
query: { query: {
checkedNcl: JSON.stringify(this.checkedType), checkedNcl: JSON.stringify(this.checkedType),
tminput: this.searchValue, tminput: this.searchValue,
......
igirl-channel-jdweb/app/front/vues/pages/selftmreg/index.css
...@@ -513,7 +513,7 @@ ...@@ -513,7 +513,7 @@
} }
.pointsRule ul li { .pointsRule ul li {
width: 32%; width: 24%;
display: list-item; display: list-item;
text-align: center; text-align: center;
float: left; float: left;
...@@ -674,6 +674,7 @@ ...@@ -674,6 +674,7 @@
height: 4px; height: 4px;
width: 4px; width: 4px;
color: #0F8EE9; color: #0F8EE9;
transform: translateY(-3px);
} }
.step3-submit button { .step3-submit button {
......
igirl-channel-jdweb/app/front/vues/pages/selftmreg/selftmreg.html
...@@ -26,8 +26,8 @@ ...@@ -26,8 +26,8 @@
:style="pointsRuleColor(2)">填写申请人信息</span><i :style="pointsRuleBackColor(2)"></i></a></li> :style="pointsRuleColor(2)">填写申请人信息</span><i :style="pointsRuleBackColor(2)"></i></a></li>
<li :style="pointsRuleBackColor(3)"><a><em class="before"></em><span <li :style="pointsRuleBackColor(3)"><a><em class="before"></em><span
:style="pointsRuleColor(3)">确认订单</span><i :style="pointsRuleBackColor(3)"></i></a></li> :style="pointsRuleColor(3)">确认订单</span><i :style="pointsRuleBackColor(3)"></i></a></li>
<!-- <li :style="pointsRuleBackColor(4)"><a><em class="before"></em><span <li :style="pointsRuleBackColor(4)"><a><em class="before"></em><span
:style="pointsRuleColor(4)">提交订单</span></a></li> --> :style="pointsRuleColor(4)">提交订单</span></a></li>
</ul> </ul>
</div> </div>
</div> </div>
......
igirl-channel-jdweb/app/front/vues/pages/selftmreg/selftmreg.js
...@@ -64,7 +64,7 @@ ...@@ -64,7 +64,7 @@
}; };
return { return {
listPath: { listPath: {
path: '/1688/jdtrademark', path: '/jd/jdtrademark',
query: { query: {
channelUserId: this.$route.query.channelUserId, channelUserId: this.$route.query.channelUserId,
deliveryOrderNo: this.deliveryOrderNo, deliveryOrderNo: this.deliveryOrderNo,
...@@ -318,9 +318,9 @@ ...@@ -318,9 +318,9 @@
var that = this; var that = this;
var itemCode = this.$router.history.current.query.itemCode || 'zzsbzc'; var itemCode = this.$router.history.current.query.itemCode || 'zzsbzc';
var orderParams = this.$router.history.current.query.orderParams; var orderParams = this.$router.history.current.query.orderParams;
if (this.$route.query.channelUserId != "") { if (this.$route.query.channelUserId) {
this.$root.channelUserId = this.$route.query.channelUserId; this.$root.channelUserId = this.$route.query.channelUserId;
console.log(this.$route.query.channelUserId, "11111111111"); console.log(this.$route.query.channelUserId, "11111111111ddd",);
} }
if (orderParams) { if (orderParams) {
this.form = orderParams.tm; this.form = orderParams.tm;
......
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