Skip to content

Z
zhichan
Commit 9121d8bc by 宋毅
Options

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

parents c8b5a00a 9d08bf2f
Showing with 152 additions and 23 deletions
igirl-channel-web/app/base/controller/impl/trademark/tmqueryCtl.js
...@@ -62,6 +62,7 @@ class tmqueryCtl extends CtlBase { ...@@ -62,6 +62,7 @@ class tmqueryCtl extends CtlBase {
}//获取渠道订单信息 }//获取渠道订单信息
return result; return result;
} catch (e) { } catch (e) {
console.log(e.stack,"操作error...................");
return system.getResult(null, "操作失败"); return system.getResult(null, "操作失败");
} }
} }
......
igirl-channel-web/app/config/routes/web.js
...@@ -22,7 +22,6 @@ module.exports = function (app) { ...@@ -22,7 +22,6 @@ module.exports = function (app) {
var skipUrl = result.skipUrl + "?itemCode=" + result.itemCode + "&channelUser=" + JSON.stringify(result.data.channelUser) + "&channelOrder=" + JSON.stringify(result.data.channelOrder) + "&channelParams=" + result.channelParams; var skipUrl = result.skipUrl + "?itemCode=" + result.itemCode + "&channelUser=" + JSON.stringify(result.data.channelUser) + "&channelOrder=" + JSON.stringify(result.data.channelOrder) + "&channelParams=" + result.channelParams;
res.redirect(skipUrl); res.redirect(skipUrl);
}); });
app.get("/", async function (req, res) { app.get("/", async function (req, res) {
console.log(req.hostname); console.log(req.hostname);
var appinfo = await metaCtl.getAppInfo(req); var appinfo = await metaCtl.getAppInfo(req);
......
igirl-channel-web/app/config/settings.js
...@@ -12,7 +12,7 @@ var ENVINPUT = { ...@@ -12,7 +12,7 @@ var ENVINPUT = {
APP_ENV: process.env.APP_ENV ? process.env.APP_ENV : "dev" APP_ENV: process.env.APP_ENV ? process.env.APP_ENV : "dev"
}; };
var settings = { var settings = {
env: "dev",//ENVINPUT.APP_ENV, env: ENVINPUT.APP_ENV,
appKey: "bfe73612fa024822941e3e1ecd9a06e1", appKey: "bfe73612fa024822941e3e1ecd9a06e1",
paasKey: "wx76a324c5d201d1a4", paasKey: "wx76a324c5d201d1a4",
secret: "1671ab5405fa49c8b5dd0b0c55c279b8", secret: "1671ab5405fa49c8b5dd0b0c55c279b8",
......
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/vues/pages/jdindentdetail/jdindentdetail.html
...@@ -8,13 +8,14 @@ ...@@ -8,13 +8,14 @@
</div> </div>
</div> --> </div> -->
<div class="jdindentdetail"> <div class="jdindentdetail">
<!-- <div class="jdindentdetail-nav"> <div class="jdindentdetail-nav">
<span>当前位置：</span> <span>当前位置：</span>
<el-breadcrumb separator-class="el-icon-arrow-right"> <el-breadcrumb separator-class="el-icon-arrow-right">
<el-breadcrumb-item :to="{ path: \'/1688/jdindentlist?deliveryOrderNo=\' + deliveryOrderNo }">我的订单</el-breadcrumb-item> <el-breadcrumb-item :to="{ path: \'/1688/jdindentlist?deliveryOrderNo=\' + deliveryOrderNo }">交付中心
</el-breadcrumb-item>
<el-breadcrumb-item>订单详情</el-breadcrumb-item> <el-breadcrumb-item>订单详情</el-breadcrumb-item>
</el-breadcrumb> </el-breadcrumb>
</div> --> </div>
<div class="jdindentdetail-main"> <div class="jdindentdetail-main">
<div class="jdindentdetail-flow"> <div class="jdindentdetail-flow">
<div class="jdindentdetail-main-title"> <div class="jdindentdetail-main-title">
...@@ -84,13 +85,8 @@ ...@@ -84,13 +85,8 @@
<div class="jdindentdetail-main-receipt"> <div class="jdindentdetail-main-receipt">
官方回执文件: 官方回执文件:
<span>{{item.officialTypeName}}</span> <span>{{item.officialTypeName}}</span>
<!-- <span>商标注册申请书</span>
<span>商标注册申请受理通知书</span>
<span>商标注册申请初步审定公告通知书</span> -->
</div> </div>
</div> </div>
<div class="jdindentdetail-main-infohr"></div> <div class="jdindentdetail-main-infohr"></div>
...@@ -472,8 +468,9 @@ ...@@ -472,8 +468,9 @@
<span>JPG</span>，大小不能超过<span>10M</span></div> <span>JPG</span>，大小不能超过<span>10M</span></div>
</el-form-item> </el-form-item>
<el-form-item class="gsb_items"> <el-form-item class="gsb_items">
<div class="title special">上传材料：代理委托书<span @click="createWTS" <div class="title special">上传材料：代理委托书
style="color:#0F8EE9;font-size:13px;cursor:pointer;position: absolute;top: 70%;left: 51%;line-height: 0px;border-bottom: 1px solid #0F8EE9;height: 5px;">生成委托书</span> <!-- <span @click="createWTS"
style="color:#0F8EE9;font-size:13px;cursor:pointer;position: absolute;top: 70%;left: 51%;line-height: 0px;border-bottom: 1px solid #0F8EE9;height: 5px;">生成委托书</span> -->
</div> </div>
<div class="upload-box" v-loading="loading2" @mouseover="mouseOverDemo(2,\'b\')" <div class="upload-box" v-loading="loading2" @mouseover="mouseOverDemo(2,\'b\')"
@mouseleave="mouseLeaveDemo(2,\'b\')"> @mouseleave="mouseLeaveDemo(2,\'b\')">
...@@ -508,8 +505,8 @@ ...@@ -508,8 +505,8 @@
</el-form-item> </el-form-item>
<el-form-item class="gsb_items" label=""> <el-form-item class="gsb_items" label="">
<div class="title">上传材料：优先权证明 <a <div class="title">上传材料：优先权证明
href="http://gsb-zc.oss-cn-beijing.aliyuncs.com/yzq_201908281849646526xujnsedjnqwdoni.doc" <a href="http://gsb-zc.oss-cn-beijing.aliyuncs.com/yzq_201908281849646526xujnsedjnqwdoni.doc"
style="width:95px;color:#0F8EE9;font-size:13px;cursor:pointer;position: absolute;top: 70%;left: 37%;line-height: 0px;border-bottom: 1px solid #0F8EE9;height: 5px;">下载优先权证明</a> style="width:95px;color:#0F8EE9;font-size:13px;cursor:pointer;position: absolute;top: 70%;left: 37%;line-height: 0px;border-bottom: 1px solid #0F8EE9;height: 5px;">下载优先权证明</a>
</div> </div>
<div class="upload-box" v-loading="loading3" @mouseover="mouseOverDemo(3,\'c\')" <div class="upload-box" v-loading="loading3" @mouseover="mouseOverDemo(3,\'c\')"
......
igirl-channel-web/app/front/vues/pages/jdindentlist/jdindentlist.html
...@@ -109,7 +109,7 @@ ...@@ -109,7 +109,7 @@
style="position: fixed;width:100%;z-index:999;background-color:black;top:0;left:0;right:0;bottom: 0;opacity: 0.5;"> style="position: fixed;width:100%;z-index:999;background-color:black;top:0;left:0;right:0;bottom: 0;opacity: 0.5;">
</div> </div>
<div style="position:fixed;height:400px;top:20%;left:20%;right:25%;z-index: 9999;background-color:white;"> <div style="position:fixed;height:400px;top:20%;left:20%;right:25%;z-index: 9999;background-color:white;">
<div> <div style="width:80%;margin:0 auto;box-sizing: border-box;">
<h4 style="text-align:left;margin-left:2%;">上传资料</h4> <h4 style="text-align:left;margin-left:2%;">上传资料</h4>
<div style="padding:20px 0;text-align: center"> <div style="padding:20px 0;text-align: center">
<el-form ref="stuff" :model="stuff" class="demo-ruleForm" label-width="0"> <el-form ref="stuff" :model="stuff" class="demo-ruleForm" label-width="0">
...@@ -124,7 +124,7 @@ ...@@ -124,7 +124,7 @@
<gsb-upload flag="yyzz" ref="yyzz" :d="d" @setKey="setKey" :action="action" <gsb-upload flag="yyzz" ref="yyzz" :d="d" @setKey="setKey" :action="action"
filetype="image/jpeg" :ifshowlist="false" @uploadsuccess="uploadsuccess" filetype="image/jpeg" :ifshowlist="false" @uploadsuccess="uploadsuccess"
@error="error"> @error="error">
<el-button type="primary" @click="loadingKey = 0">营业执照上传</el-button> <el-button style="padding:12px 14px;" type="" @click="loadingKey = 0">营业执照上传</el-button>
</gsb-upload> </gsb-upload>
</el-form-item> </el-form-item>
<el-form-item style="float:left;width:25%;text-align:center" <el-form-item style="float:left;width:25%;text-align:center"
...@@ -139,7 +139,7 @@ ...@@ -139,7 +139,7 @@
<gsb-upload flag="sfz" ref="sfz" :d="d" @setKey="setKey" :action="action" <gsb-upload flag="sfz" ref="sfz" :d="d" @setKey="setKey" :action="action"
filetype="image/jpeg" :ifshowlist="false" @uploadsuccess="uploadsuccess" filetype="image/jpeg" :ifshowlist="false" @uploadsuccess="uploadsuccess"
@error="error"> @error="error">
<el-button type="primary" @click="loadingKey = 1">身份证明上传</el-button> <el-button style="padding:12px 14px;" type="" @click="loadingKey = 1">身份证明上传</el-button>
</gsb-upload> </gsb-upload>
</el-form-item> </el-form-item>
<el-form-item style="float:left;width:25%;text-align:center" label=""> <el-form-item style="float:left;width:25%;text-align:center" label="">
...@@ -153,7 +153,7 @@ ...@@ -153,7 +153,7 @@
<gsb-upload flag="wts" ref="wts" :d="d" @setKey="setKey" :action="action" <gsb-upload flag="wts" ref="wts" :d="d" @setKey="setKey" :action="action"
filetype="image/jpeg" :ifshowlist="false" @uploadsuccess="uploadsuccess" filetype="image/jpeg" :ifshowlist="false" @uploadsuccess="uploadsuccess"
@error="error"> @error="error">
<el-button type="primary" @click="loadingKey = 2">代理委托书上传</el-button> <el-button style="padding:12px 14px;" type="" @click="loadingKey = 2">代理委托书上传</el-button>
</gsb-upload> </gsb-upload>
</el-form-item> </el-form-item>
<el-form-item style="float:left;width:25%;text-align:center" label=""> <el-form-item style="float:left;width:25%;text-align:center" label="">
...@@ -166,7 +166,7 @@ ...@@ -166,7 +166,7 @@
<gsb-upload flag="yxq" ref="yxq" :d="d" @setKey="setKey" :action="action" <gsb-upload flag="yxq" ref="yxq" :d="d" @setKey="setKey" :action="action"
filetype="image/jpeg" :ifshowlist="false" @uploadsuccess="uploadsuccess" filetype="image/jpeg" :ifshowlist="false" @uploadsuccess="uploadsuccess"
@error="error"> @error="error">
<el-button type="primary" @click="loadingKey = 3">优先权文件上传</el-button> <el-button style="padding:12px 14px;" type="" @click="loadingKey = 3">优先权文件上传</el-button>
</gsb-upload> </gsb-upload>
</el-form-item> </el-form-item>
<div style="clear:both;"></div> <div style="clear:both;"></div>
......
igirl-channel-web/app/front/vues/pages/jdindentlist/jdindentlist.js
...@@ -131,6 +131,21 @@ ...@@ -131,6 +131,21 @@
sfs: [ sfs: [
{ field: 'totalSum', label: '订单金额' }, { field: 'totalSum', label: '订单金额' },
], ],
form: {
tmFormType: 3,
name: "",
picUrl: "",
colorizedPicUrl: "",
selecttype: "自主选择",
totalPublicExpense: 0,
totalTaxes: 0,
totalSum: 0,
totalDiscounts: 0,
totalServiceCharge: 0,
totalProfitSum: 0,
remark: "",
sveItemRateConfig: "",
},
form1: { form1: {
title: "", title: "",
taxNum: "", taxNum: "",
...@@ -389,6 +404,120 @@ ...@@ -389,6 +404,120 @@
that.stuff.descUrl = obj.result that.stuff.descUrl = obj.result
} }
}, },
setKey(name, flag){
name = name.substring(name.length - 5);
var myDate = new Date();
var key = "zc_" + flag + Math.round(Math.random() * 10000) + myDate.getTime() + myDate.getFullYear() + myDate.getMonth() + myDate.getDate() + ".jpg";
this.$refs[flag].d.key = key;
},
btnvisbleMethod(row, btn){
if (btn.key == "invoiceapply") {
if (row.orderPayStatus == "yfk" && row.invoiceApplyStatus == "1" && row.isIinvoice == 1) {
return true;
} else {
return false;
}
}
if (btn.key == "mydetail") {
if (row.sveItemCode == "zzsbzc" || row.sveItemCode == "dlrfzzc" || row.sveItemCode == "dbsbzc") {
return true;
} else {
return false;
}
}
if (btn.key == "myicpdetail") {
if (row.sveItemCode == "CP201910231025EaQM0b") {
return true;
} else {
return false;
}
}
if (btn.key == "myedit") {
if (row.orderPayStatus == "ddqx" || row.orderPayStatus == "tkclz" || row.orderPayStatus == "ytk") {
return false;
} else if (row.sveItemCode == "dlrfzzc" && (row.orderStatus == "1" || row.orderStatus == "2" || row.orderStatus == "3" || row.orderStatus == "4" || row.orderStatus == "6")) {
return true;
} else if (row.sveItemCode == "zzsbzc" && (row.orderStatus == "1" || row.orderStatus == "2" || row.orderStatus == "3" || row.orderStatus == "4" || row.orderStatus == "6")) {
return true;
} else if (row.sveItemCode == "dbsbzc" && (row.orderStatus == "1" || row.orderStatus == "2" || row.orderStatus == "3" || row.orderStatus == "4" || row.orderStatus == "6")) {
return true;
} else {
return false;
}
}
if (btn.key == "ptsjedit") {
if (row.orderSource == "ptsj" && row.orderPayStatus == "dfk" && this.currentUser && row.createuser_id == this.currentUser.id) {
return true;
} else {
return false;
}
}
if (btn.key == "topay") {
if (row.orderPayStatus == "dfk") {
return true;
} else {
return false;
}
}
if (btn.key == "cancelorder") {
if ((row.sveItemCode == "dlrfzzc" || row.sveItemCode == "zzsbzc" || row.sveItemCode == "dbsbzc") && row.orderPayStatus == "dfk") {
return true;
} else {
return false;
}
}
if (btn.key == "uploadstuff") {
if (row.orderPayStatus == "ddqx" || row.orderPayStatus == "tkclz" || row.orderPayStatus == "ytk") {
return false;
} else if ((row.sveItemCode == "dlrfzzc" || row.sveItemCode == "zzsbzc" || row.sveItemCode == "dbsbzc") && (row.orderStatus == "1" || row.orderStatus == "2" || row.orderStatus == "3" || row.orderStatus == "4" || row.orderStatus == "6")) {
return true;
} else {
return false;
}
}
if (btn.key == "mydelete") {
if (row.orderPayStatus == "dfk" && row.createuser_id == this.currentUser.id) {
return true;
} else {
return false;
}
}
return true;
},
onColFormater(row, column, cellvalue, index){
if (column.property == "created_at") {
var date = new Date(row["created_at"]);
var time = date.toLocaleDateString();
return time;
}
if (column.property == "customerinfo.name") {
if (!row.customerinfo) {
return "---";
} else {
return row.customerinfo.name;
}
}
if (column.property == "name") {
if (!row["name"]) {
return "---";
} else {
return row.name;
}
}
if (column.property == "nclOneCodesNum") {
if (!row["nclOneCodesNum"]) {
return "---";
} else {
return row.nclOneCodesNum;
}
}
return cellvalue;
},
error(err){ error(err){
this.$message.warning(`上传失败，请重新上传`); this.$message.warning(`上传失败，请重新上传`);
}, },
......
igirl-channel-web/app/front/vues/pages/jdregscheme/jdregscheme.html
...@@ -4,10 +4,10 @@ ...@@ -4,10 +4,10 @@
style="background:rgba(249,249,249,1);padding: 30px" label-width="120px"> style="background:rgba(249,249,249,1);padding: 30px" label-width="120px">
<div class="selftmreg_main" style="width: 96%;margin: 0 auto;padding:0 50px;background: #fff"> <div class="selftmreg_main" style="width: 96%;margin: 0 auto;padding:0 50px;background: #fff">
<div class="jdregscheme-nav" style="padding-top: 20px"> <div class="jdregscheme-nav" style="padding-top: 20px">
<!-- <span style="float: left;line-height: 22px;color:rgba(130,130,130,1);">当前位置：</span> <!-- <span style="float: left;line-height: 22px;color:rgba(130,130,130,1);">当前位置：</span> -->
<el-breadcrumb separator-class="el-icon-arrow-right" style="float: left;line-height:22px"> <!-- <el-breadcrumb separator-class="el-icon-arrow-right" style="float: left;line-height:22px">
<el-breadcrumb-item><a style="color:rgba(130,130,130,1);">我的订单</a></el-breadcrumb-item> <el-breadcrumb-item><a style="color:rgba(130,130,130,1);">我的订单</a></el-breadcrumb-item>
<el-breadcrumb-item :to="{ path: \'/\' }"> <el-breadcrumb-item :to="{ path: \'/1688/jdindentlist\' }">
<a style="font-weight:800">确认注册方案</a> <a style="font-weight:800">确认注册方案</a>
</el-breadcrumb-item> </el-breadcrumb-item>
</el-breadcrumb> --> </el-breadcrumb> -->
......
igirl-channel-web/app/front/vues/pages/jdregscheme/jdregscheme.js
...@@ -131,7 +131,7 @@ ...@@ -131,7 +131,7 @@
this.apply.centerDialogVisible = true; this.apply.centerDialogVisible = true;
}, },
AgreedForm(){ AgreedForm(){
this.$router.push({ path: "/1688/jdindentdetail"}); this.$router.push({ path: "/1688/jdindentlist"});
} }
}, },
vname: "gsb-jdregscheme" vname: "gsb-jdregscheme"
......
igirl-channel-web/package-lock.json
This source diff could not be displayed because it is too large. You can view the blob instead.
igirl-channel-web/package.json
...@@ -29,6 +29,9 @@ ...@@ -29,6 +29,9 @@
"express": "^4.16.2", "express": "^4.16.2",
"express-session": "^1.15.6", "express-session": "^1.15.6",
"gm": "^1.23.1", "gm": "^1.23.1",
"gulp-concat": "^2.6.1",
"gulp-if": "^3.0.0",
"gulp-minify-css": "^1.2.4",
"method-override": "^2.3.10", "method-override": "^2.3.10",
"morgan": "^1.9.0", "morgan": "^1.9.0",
"multer": "^1.3.0", "multer": "^1.3.0",
......
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