Skip to content

Z
zhichan
Commit 2a1c4d54 by 兰国旗
Options

Merge branch 'gsb-marketplat-mag' of gitlab.gongsibao.com:jiangyong/zhichan into gsb-marketplat-mag

parents 892b06ad 69093dc3
Showing with 16 additions and 5 deletions
gsb-marketplat-mag/app/base/db/dao.base.js
......@@ -102,7 +102,7 @@ class Dao {
if (search) {
Object.keys(search).forEach(k => {
// console.log(search[k], ":search[k]search[k]search[k]");
if ((search[k] && search[k] != 'undefined' && search[k] != "") || search[k] === 0) {
if ((search[k] && search[k] != 'undefined' && search[k] != "") || search[k] === 0 || k=="channel_only_code") {
if ((k.indexOf("Date") >= 0 || k.indexOf("_at") >= 0)) {
if (search[k] != "" && search[k]) {
var stdate = new Date(search[k][0]);
......@@ -119,6 +119,9 @@ class Dao {
else if (k.indexOf("channelCode") >= 0) {
qc.where[k] = search[k];
}
else if (k.indexOf("only_code") >= 0) {
qc.where[k] = search[k];
}
else if (k.indexOf("Type") >= 0) {
qc.where[k] = search[k];
}
......
gsb-marketplat-mag/app/base/db/models/aggregation/needinfo.js
......@@ -18,6 +18,7 @@ module.exports = (db, DataTypes) => {
}
},
channel_code:DataTypes.STRING,//渠道编码
channel_only_code:DataTypes.STRING,//渠道唯一编码
channel_name:DataTypes.STRING,//渠道名称
page_code:DataTypes.STRING,//页面编码
page_name:DataTypes.STRING,//页面名称
......
gsb-marketplat-mag/app/base/db/models/configmag/launchchannel.js
......@@ -6,6 +6,7 @@
*/
module.exports = (db, DataTypes) => {
return db.define("launchchannel", {
only_code:DataTypes.STRING(255),//渠道唯一码
code: DataTypes.STRING(100),//表单编码
name: DataTypes.STRING(100),//表单名称
notes: DataTypes.STRING(255),//备注
......
gsb-marketplat-mag/app/base/service/impl/configmag/launchchannelSve.js
......@@ -31,7 +31,9 @@ class LaunchchannelService extends ServiceBase {
if (searchResult) {
return system.getResultFail(-1,'渠道已存在，请勿重复添加');
}
var onlyCode = await this.getBusUid();
let channelData = {
only_code:onlyCode,
name: pobj.name,
code: pobj.code,
user_id: pobj.userid,
......
gsb-marketplat-mag/app/front/entry/public/css/chunk-a142fab8.6014cc43.css 0 → 100644
.ivu-modal-wrap{z-index:9999!important}
\ No newline at end of file
gsb-marketplat-mag/app/front/entry/public/index.html
<!DOCTYPE html><html><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><meta content=yes name=apple-mobile-web-app-capable><meta name=viewport content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no"><link rel=icon href=/ccc.png><link rel=stylesheet href=//at.alicdn.com/t/font_1996389_21r6b2e5cqci.css><title></title><link href=/css/chunk-04497344.c9ab9860.css rel=prefetch><link href=/css/chunk-07f86704.515669ca.css rel=prefetch><link href=/css/chunk-0c20b306.305956e2.css rel=prefetch><link href=/css/chunk-0c2187ca.de0e14cf.css rel=prefetch><link href=/css/chunk-0fb760a4.5c30cb40.css rel=prefetch><link href=/css/chunk-1021e4ee.17ba2048.css rel=prefetch><link href=/css/chunk-14b9857b.0dc416de.css rel=prefetch><link href=/css/chunk-29ebb6f1.d1f69246.css rel=prefetch><link href=/css/chunk-2c359864.0dc416de.css rel=prefetch><link href=/css/chunk-2d3eb0f5.a10dee7d.css rel=prefetch><link href=/css/chunk-3008061c.6014cc43.css rel=prefetch><link href=/css/chunk-3385141a.0dc416de.css rel=prefetch><link href=/css/chunk-3cca9940.6014cc43.css rel=prefetch><link href=/css/chunk-48aa254a.d360cbd2.css rel=prefetch><link href=/css/chunk-5a40d679.305956e2.css rel=prefetch><link href=/css/chunk-5da45f03.c6303bcf.css rel=prefetch><link href=/css/chunk-6cc861f3.6014cc43.css rel=prefetch><link href=/css/chunk-7aa7c901.e69a02d6.css rel=prefetch><link href=/css/chunk-9dc7e768.305956e2.css rel=prefetch><link href=/css/chunk-a1670dde.70decc8e.css rel=prefetch><link href=/css/chunk-cc77621c.8797b2b5.css rel=prefetch><link href=/js/chunk-04497344.0c8a3138.js rel=prefetch><link href=/js/chunk-07f86704.67d612a5.js rel=prefetch><link href=/js/chunk-0c20b306.728fdf52.js rel=prefetch><link href=/js/chunk-0c2187ca.f9f84370.js rel=prefetch><link href=/js/chunk-0fb760a4.def58650.js rel=prefetch><link href=/js/chunk-1021e4ee.d40517f9.js rel=prefetch><link href=/js/chunk-14b9857b.ae43b7c1.js rel=prefetch><link href=/js/chunk-1f11ec07.b7a911e5.js rel=prefetch><link href=/js/chunk-29ebb6f1.3760df0c.js rel=prefetch><link href=/js/chunk-2c359864.f1f45686.js rel=prefetch><link href=/js/chunk-2d210f61.6e56960a.js rel=prefetch><link href=/js/chunk-2d3eb0f5.878af947.js rel=prefetch><link href=/js/chunk-3008061c.d9225a5f.js rel=prefetch><link href=/js/chunk-3385141a.16d7705b.js rel=prefetch><link href=/js/chunk-3cca9940.f6b28725.js rel=prefetch><link href=/js/chunk-48aa254a.64498aea.js rel=prefetch><link href=/js/chunk-5a40d679.97098616.js rel=prefetch><link href=/js/chunk-5a4e13d5.6ebd883c.js rel=prefetch><link href=/js/chunk-5da45f03.c18ae604.js rel=prefetch><link href=/js/chunk-6cc861f3.38766ea9.js rel=prefetch><link href=/js/chunk-780401d4.2594e2ad.js rel=prefetch><link href=/js/chunk-7aa7c901.e44a9b51.js rel=prefetch><link href=/js/chunk-9dc7e768.5dc43ead.js rel=prefetch><link href=/js/chunk-a1670dde.7fb32135.js rel=prefetch><link href=/js/chunk-cc77621c.209c3f4a.js rel=prefetch><link href=/js/chunk-d710b6d2.9eff4b27.js rel=prefetch><link href=/css/app.e3db6847.css rel=preload as=style><link href=/css/chunk-vendors.a0428467.css rel=preload as=style><link href=/js/app.bb02aef6.js rel=preload as=script><link href=/js/chunk-vendors.d7daa525.js rel=preload as=script><link href=/css/chunk-vendors.a0428467.css rel=stylesheet><link href=/css/app.e3db6847.css rel=stylesheet></head><body><noscript><strong>We're sorry but iview-admin doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=/js/chunk-vendors.d7daa525.js></script><script src=/js/app.bb02aef6.js></script></body></html>
\ No newline at end of file
<!DOCTYPE html><html><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><meta content=yes name=apple-mobile-web-app-capable><meta name=viewport content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no"><link rel=icon href=/ccc.png><link rel=stylesheet href=//at.alicdn.com/t/font_1996389_21r6b2e5cqci.css><title></title><link href=/css/chunk-04497344.c9ab9860.css rel=prefetch><link href=/css/chunk-07f86704.515669ca.css rel=prefetch><link href=/css/chunk-0c20b306.305956e2.css rel=prefetch><link href=/css/chunk-0c2187ca.de0e14cf.css rel=prefetch><link href=/css/chunk-0fb760a4.5c30cb40.css rel=prefetch><link href=/css/chunk-1021e4ee.17ba2048.css rel=prefetch><link href=/css/chunk-14b9857b.0dc416de.css rel=prefetch><link href=/css/chunk-29ebb6f1.d1f69246.css rel=prefetch><link href=/css/chunk-2c359864.0dc416de.css rel=prefetch><link href=/css/chunk-2d3eb0f5.a10dee7d.css rel=prefetch><link href=/css/chunk-3008061c.6014cc43.css rel=prefetch><link href=/css/chunk-3385141a.0dc416de.css rel=prefetch><link href=/css/chunk-3cca9940.6014cc43.css rel=prefetch><link href=/css/chunk-48aa254a.d360cbd2.css rel=prefetch><link href=/css/chunk-5a40d679.305956e2.css rel=prefetch><link href=/css/chunk-5da45f03.c6303bcf.css rel=prefetch><link href=/css/chunk-6cc861f3.6014cc43.css rel=prefetch><link href=/css/chunk-7aa7c901.e69a02d6.css rel=prefetch><link href=/css/chunk-9dc7e768.305956e2.css rel=prefetch><link href=/css/chunk-a142fab8.6014cc43.css rel=prefetch><link href=/css/chunk-a1670dde.70decc8e.css rel=prefetch><link href=/css/chunk-cc77621c.8797b2b5.css rel=prefetch><link href=/js/chunk-04497344.0c8a3138.js rel=prefetch><link href=/js/chunk-07f86704.67d612a5.js rel=prefetch><link href=/js/chunk-0c20b306.728fdf52.js rel=prefetch><link href=/js/chunk-0c2187ca.f9f84370.js rel=prefetch><link href=/js/chunk-0fb760a4.def58650.js rel=prefetch><link href=/js/chunk-1021e4ee.d40517f9.js rel=prefetch><link href=/js/chunk-14b9857b.ae43b7c1.js rel=prefetch><link href=/js/chunk-1f11ec07.b7a911e5.js rel=prefetch><link href=/js/chunk-29ebb6f1.3760df0c.js rel=prefetch><link href=/js/chunk-2c359864.f1f45686.js rel=prefetch><link href=/js/chunk-2d210f61.6e56960a.js rel=prefetch><link href=/js/chunk-2d3eb0f5.878af947.js rel=prefetch><link href=/js/chunk-3008061c.e8c7ed02.js rel=prefetch><link href=/js/chunk-3385141a.16d7705b.js rel=prefetch><link href=/js/chunk-3cca9940.f6b28725.js rel=prefetch><link href=/js/chunk-48aa254a.64498aea.js rel=prefetch><link href=/js/chunk-5a40d679.97098616.js rel=prefetch><link href=/js/chunk-5a4e13d5.6ebd883c.js rel=prefetch><link href=/js/chunk-5da45f03.c18ae604.js rel=prefetch><link href=/js/chunk-6cc861f3.38766ea9.js rel=prefetch><link href=/js/chunk-780401d4.2594e2ad.js rel=prefetch><link href=/js/chunk-7aa7c901.e44a9b51.js rel=prefetch><link href=/js/chunk-9dc7e768.5dc43ead.js rel=prefetch><link href=/js/chunk-a142fab8.f67a1531.js rel=prefetch><link href=/js/chunk-a1670dde.7fb32135.js rel=prefetch><link href=/js/chunk-cc77621c.209c3f4a.js rel=prefetch><link href=/js/chunk-d710b6d2.9eff4b27.js rel=prefetch><link href=/css/app.e3db6847.css rel=preload as=style><link href=/css/chunk-vendors.a0428467.css rel=preload as=style><link href=/js/app.c15744d1.js rel=preload as=script><link href=/js/chunk-vendors.d7daa525.js rel=preload as=script><link href=/css/chunk-vendors.a0428467.css rel=stylesheet><link href=/css/app.e3db6847.css rel=stylesheet></head><body><noscript><strong>We're sorry but iview-admin doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=/js/chunk-vendors.d7daa525.js></script><script src=/js/app.c15744d1.js></script></body></html>
\ No newline at end of file
gsb-marketplat-mag/app/front/entry/public/js/app.bb02aef6.js deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
gsb-marketplat-mag/app/front/entry/public/js/app.c15744d1.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
gsb-marketplat-mag/app/front/entry/public/js/chunk-3008061c.d9225a5f.js → gsb-marketplat-mag/app/front/entry/public/js/chunk-3008061c.e8c7ed02.js
(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-3008061c"],{"2d3b":function(e,t,n){"use strict";var a=n("d2d9"),o=n.n(a);o.a},"391e":function(e,t,n){"use strict";var a=function(){var e=this,t=e.$createElement,n=e._self._c||t;return n("div",{attrs:{id:"framediv"}},[e._t("default",null,{adjustHeight:e.frameHeight})],2)},o=[],i=n("9ee1"),r=i["a"],u=n("9ca4"),c=Object(u["a"])(r,a,o,!1,null,null,null);t["a"]=c.exports},"9ee1":function(e,t,n){"use strict";(function(e){n("163d");t["a"]={name:"pagespace_page",prop:{tweak:Number},data:function(){return{frameHeight:0,advalue:this.tweak?this.tweak:0}},components:{},mounted:function(){var t=this;this.setHeight(),e(window).resize((function(){t.setHeight()}))},methods:{setHeight:function(){var t=this;this.$nextTick((function(){var n=e("#framediv"),a=n.get()[0]||0,o=window.innerHeight-a.offsetTop-t.advalue;t.frameHeight=o,t.$emit("sizechange",t.frameHeight)}))}}}}).call(this,n("a336"))},d2d9:function(e,t,n){},df6e:function(e,t,n){"use strict";n.r(t);var a=function(){var e=this,t=e.$createElement,n=e._self._c||t;return n("PageSpace",{scopedSlots:e._u([{key:"default",fn:function(t){var a=t.adjustHeight;return[n("BizTable",{ref:"bt",attrs:{formatCol:e.formatCol,tblheight:a-120,metaName:"need_info",packageName:"aggregation",modelName:"needinfo",isMulti:"",savebefore:e.savebefore,editbefore:e.beforedit,addbefore:e.beforeadd},on:{formevent:e.onformevent,onexec:e.onexec}})]}}])})},o=[],i=n("06d3"),r=n("391e"),u={name:"needinfo_page",data:function(){return{}},components:{BizTable:i["a"],PageSpace:r["a"]},methods:{onformevent:function(e,t){},savebefore:function(e,t,n){return n(t)},beforeadd:function(e,t){return t({value:!0,message:null})},beforedit:function(e,t){return t({value:!0,message:null})},beforesave:function(e,t,n){return n(t)},onexec:function(e,t){"auth"==e&&this.$router.push({name:"role_auth",query:{roleid:t.id,rolecode:t.code}})},formatCol:function(e,t,n){return"created_at"==t?"<span>".concat(new Date(e[t]).toLocaleString(),"</span>"):"pic_url"==t?'<img src="'.concat(e[t],'" style="width:50px;height:50px"></img>'):"pic_size"==t?"<span>".concat((e[t]/1024).toFixed(1)," KB</span>"):e[t]}}},c=u,s=(n("2d3b"),n("9ca4")),f=Object(s["a"])(c,a,o,!1,null,null,null);t["default"]=f.exports}}]);
\ No newline at end of file
(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-3008061c"],{"2d3b":function(e,t,n){"use strict";var a=n("d2d9"),o=n.n(a);o.a},"391e":function(e,t,n){"use strict";var a=function(){var e=this,t=e.$createElement,n=e._self._c||t;return n("div",{attrs:{id:"framediv"}},[e._t("default",null,{adjustHeight:e.frameHeight})],2)},o=[],i=n("9ee1"),r=i["a"],c=n("9ca4"),u=Object(c["a"])(r,a,o,!1,null,null,null);t["a"]=u.exports},"9ee1":function(e,t,n){"use strict";(function(e){n("163d");t["a"]={name:"pagespace_page",prop:{tweak:Number},data:function(){return{frameHeight:0,advalue:this.tweak?this.tweak:0}},components:{},mounted:function(){var t=this;this.setHeight(),e(window).resize((function(){t.setHeight()}))},methods:{setHeight:function(){var t=this;this.$nextTick((function(){var n=e("#framediv"),a=n.get()[0]||0,o=window.innerHeight-a.offsetTop-t.advalue;t.frameHeight=o,t.$emit("sizechange",t.frameHeight)}))}}}}).call(this,n("a336"))},d2d9:function(e,t,n){},df6e:function(e,t,n){"use strict";n.r(t);var a=function(){var e=this,t=e.$createElement,n=e._self._c||t;return n("PageSpace",{scopedSlots:e._u([{key:"default",fn:function(t){var a=t.adjustHeight;return[n("BizTable",{ref:"bt",attrs:{formatCol:e.formatCol,tblheight:a-120,metaName:"need_info",packageName:"aggregation",modelName:"needinfo",isMulti:"",savebefore:e.savebefore,editbefore:e.beforedit,addbefore:e.beforeadd},on:{formevent:e.onformevent,onexec:e.onexec}})]}}])})},o=[],i=n("06d3"),r=n("391e"),c={name:"needinfo_page",data:function(){return{}},components:{BizTable:i["a"],PageSpace:r["a"]},mounted:function(){var e=this;this.$nextTick((function(){e.$refs.bt.$refs.searchform.formModel["channel_only_code"]=0})),this.getProductType()},methods:{onformevent:function(e,t){},savebefore:function(e,t,n){return n(t)},beforeadd:function(e,t){return t({value:!0,message:null})},beforedit:function(e,t){return t({value:!0,message:null})},beforesave:function(e,t,n){return n(t)},onexec:function(e,t){"auth"==e&&this.$router.push({name:"role_auth",query:{roleid:t.id,rolecode:t.code}})},formatCol:function(e,t,n){return"created_at"==t?"<span>".concat(new Date(e[t]).toLocaleString(),"</span>"):"pic_url"==t?'<img src="'.concat(e[t],'" style="width:50px;height:50px"></img>'):"pic_size"==t?"<span>".concat((e[t]/1024).toFixed(1)," KB</span>"):e[t]}}},u=c,s=(n("2d3b"),n("9ca4")),f=Object(s["a"])(u,a,o,!1,null,null,null);t["default"]=f.exports}}]);
\ No newline at end of file
gsb-marketplat-mag/app/front/entry/public/js/chunk-a142fab8.f67a1531.js 0 → 100644
(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-a142fab8"],{3841:function(e,t,n){},"391e":function(e,t,n){"use strict";var a=function(){var e=this,t=e.$createElement,n=e._self._c||t;return n("div",{attrs:{id:"framediv"}},[e._t("default",null,{adjustHeight:e.frameHeight})],2)},o=[],i=n("9ee1"),r=i["a"],c=n("9ca4"),u=Object(c["a"])(r,a,o,!1,null,null,null);t["a"]=u.exports},"43cc":function(e,t,n){"use strict";var a=n("3841"),o=n.n(a);o.a},"9ee1":function(e,t,n){"use strict";(function(e){n("163d");t["a"]={name:"pagespace_page",prop:{tweak:Number},data:function(){return{frameHeight:0,advalue:this.tweak?this.tweak:0}},components:{},mounted:function(){var t=this;this.setHeight(),e(window).resize((function(){t.setHeight()}))},methods:{setHeight:function(){var t=this;this.$nextTick((function(){var n=e("#framediv"),a=n.get()[0]||0,o=window.innerHeight-a.offsetTop-t.advalue;t.frameHeight=o,t.$emit("sizechange",t.frameHeight)}))}}}}).call(this,n("a336"))},f275:function(e,t,n){"use strict";n.r(t);var a=function(){var e=this,t=e.$createElement,n=e._self._c||t;return n("PageSpace",{scopedSlots:e._u([{key:"default",fn:function(t){var a=t.adjustHeight;return[n("BizTable",{ref:"bt",attrs:{formatCol:e.formatCol,tblheight:a-120,metaName:"need_info_all",packageName:"aggregation",modelName:"needinfo",isMulti:"",savebefore:e.savebefore,editbefore:e.beforedit,addbefore:e.beforeadd},on:{formevent:e.onformevent,onexec:e.onexec}})]}}])})},o=[],i=n("06d3"),r=n("391e"),c={name:"needinfo_page",data:function(){return{}},components:{BizTable:i["a"],PageSpace:r["a"]},methods:{onformevent:function(e,t){},savebefore:function(e,t,n){return n(t)},beforeadd:function(e,t){return t({value:!0,message:null})},beforedit:function(e,t){return t({value:!0,message:null})},beforesave:function(e,t,n){return n(t)},onexec:function(e,t){"auth"==e&&this.$router.push({name:"role_auth",query:{roleid:t.id,rolecode:t.code}})},formatCol:function(e,t,n){return"created_at"==t?"<span>".concat(new Date(e[t]).toLocaleString(),"</span>"):"pic_url"==t?'<img src="'.concat(e[t],'" style="width:50px;height:50px"></img>'):"pic_size"==t?"<span>".concat((e[t]/1024).toFixed(1)," KB</span>"):e[t]}}},u=c,s=(n("43cc"),n("9ca4")),f=Object(s["a"])(u,a,o,!1,null,null,null);t["default"]=f.exports}}]);
\ No newline at end of file
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