Skip to content

Z
zhichan
Commit 37d914a2 by 兰国旗
Options

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

parents b43124e6 127636f3
Showing with 20 additions and 7 deletions
gsb-marketplat-mag/app/base/api/impl/action/templateconfig.js
...@@ -53,7 +53,7 @@ class Templateconfig extends APIBase { ...@@ -53,7 +53,7 @@ class Templateconfig extends APIBase {
break; break;
case "getFormList": // 获取表单列表 case "getFormList": // 获取表单列表
var actionBody = pobj.actionBody || {}; var actionBody = pobj.actionBody || {};
actionBody["company_id"] = pobj.company_id; actionBody["company_id"] = pobj.company_id || "";
opResult = await this.forminfoSve.getFormList(pobj.actionBody); opResult = await this.forminfoSve.getFormList(pobj.actionBody);
break; break;
case "getTemplateAndLinkInfo": // 根据链接参数获取模板链接信息 case "getTemplateAndLinkInfo": // 根据链接参数获取模板链接信息
......
gsb-marketplat-mag/app/base/db/impl/configmag/forminfoDao.js
...@@ -7,7 +7,7 @@ class ForminfoDao extends Dao{ ...@@ -7,7 +7,7 @@ class ForminfoDao extends Dao{
extraWhere(qobj, qw, qc) { extraWhere(qobj, qw, qc) {
if(!qobj.company_id){ if(!qobj.company_id){
qw["company_id"] = ""; // qw["company_id"] = "";
}else{ }else{
qw["company_id"] = Number(qobj.company_id); qw["company_id"] = Number(qobj.company_id);
} }
......
gsb-marketplat-mag/app/base/service/impl/configmag/launchchannelSve.js
...@@ -31,7 +31,7 @@ class LaunchchannelService extends ServiceBase { ...@@ -31,7 +31,7 @@ class LaunchchannelService extends ServiceBase {
if (searchResult) { if (searchResult) {
return system.getResultFail(-1,'渠道已存在，请勿重复添加'); return system.getResultFail(-1,'渠道已存在，请勿重复添加');
} }
var onlyCode = await this.getBusUid(); var onlyCode = await this.getBusUid2();
let channelData = { let channelData = {
only_code:onlyCode, only_code:onlyCode,
name: pobj.name, name: pobj.name,
......
gsb-marketplat-mag/app/base/service/sve.base.js
...@@ -96,6 +96,19 @@ class ServiceBase { ...@@ -96,6 +96,19 @@ class ServiceBase {
var timStr = moment().format("YYYYMMDDHHmm"); var timStr = moment().format("YYYYMMDDHHmm");
return prefix + timStr + uidStr; return prefix + timStr + uidStr;
} }
async getBusUid2(prefix) {
prefix = (prefix || "");
if (prefix) {
prefix = prefix.toUpperCase();
}
var prefixlength = prefix.length;
var subLen = 20 - prefixlength;
var uidStr = "";
if (subLen > 0) {
uidStr = await this.getUidInfo(subLen, 60);
}
return prefix + uidStr;
}
/* /*
len：返回长度 len：返回长度
radix：参与计算的长度，最大为62 radix：参与计算的长度，最大为62
......
gsb-marketplat-mag/app/front/entry/public/css/chunk-7aa7c901.e69a02d6.css → gsb-marketplat-mag/app/front/entry/public/css/chunk-5a91d059.961557f4.css
.demo-upload-list{display:inline-block;width:60px;height:60px;text-align:center;line-height:60px;border:1px solid transparent;border-radius:4px;overflow:hidden;background:#fff;position:relative;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.2);box-shadow:0 1px 1px rgba(0,0,0,.2);margin-right:4px}.ivu-message,.ivu-notice{z-index:9999!important}.demo-upload-list img{width:100%;height:100%}.demo-upload-list-cover{display:none;position:absolute;top:0;bottom:0;left:0;right:0;background:rgba(0,0,0,.6)}.demo-upload-list:hover .demo-upload-list-cover{display:block}.demo-upload-list-cover i{color:#fff;font-size:20px;cursor:pointer;margin:0 2px}.upload-img button[data-v-382f162a]{width:90px;height:32px;background:#1890ff;border-radius:1px;outline:none;border:none;-webkit-box-sizing:border-box;box-sizing:border-box;color:#fff;cursor:pointer}.upload-img .box[data-v-382f162a]{display:-webkit-box;display:-ms-flexbox;display:flex;-ms-flex-wrap:wrap;flex-wrap:wrap;margin-top:20px;min-width:580px}.upload-img .box .image-box[data-v-382f162a]{width:108px;height:90px;-webkit-box-sizing:border-box;box-sizing:border-box;border-radius:1px;padding:10px 0;margin-bottom:10px;background:#f3f3f3}.upload-img .box .image-box img[data-v-382f162a]{width:100%;height:100%}.upload-img .box .checkedActive[data-v-382f162a]{background:#eff7ff;border:1px solid #1890ff}.upload-img .box .image-box[data-v-382f162a]:not(:nth-child(5n+1)){margin-left:10px}.ivu-modal-wrap[data-v-67ffb18a]{z-index:9999!important}.show_piclist>li[data-v-67ffb18a]{width:200px;height:200px;display:inline-block;margin-left:20px}.show_piclist>li>img[data-v-67ffb18a]{width:100%;height:100%}.pic-icon[data-v-67ffb18a]{display:inline-block;width:35px;height:35px;vertical-align:middle;margin-right:20px}.pic-icon img[data-v-67ffb18a]{width:100%;height:100%}.add-input>li:hover i[data-v-67ffb18a]{display:inline-block!important} .demo-upload-list{display:inline-block;width:60px;height:60px;text-align:center;line-height:60px;border:1px solid transparent;border-radius:4px;overflow:hidden;background:#fff;position:relative;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.2);box-shadow:0 1px 1px rgba(0,0,0,.2);margin-right:4px}.ivu-message,.ivu-notice{z-index:9999!important}.demo-upload-list img{width:100%;height:100%}.demo-upload-list-cover{display:none;position:absolute;top:0;bottom:0;left:0;right:0;background:rgba(0,0,0,.6)}.demo-upload-list:hover .demo-upload-list-cover{display:block}.demo-upload-list-cover i{color:#fff;font-size:20px;cursor:pointer;margin:0 2px}.upload-img button[data-v-382f162a]{width:90px;height:32px;background:#1890ff;border-radius:1px;outline:none;border:none;-webkit-box-sizing:border-box;box-sizing:border-box;color:#fff;cursor:pointer}.upload-img .box[data-v-382f162a]{display:-webkit-box;display:-ms-flexbox;display:flex;-ms-flex-wrap:wrap;flex-wrap:wrap;margin-top:20px;min-width:580px}.upload-img .box .image-box[data-v-382f162a]{width:108px;height:90px;-webkit-box-sizing:border-box;box-sizing:border-box;border-radius:1px;padding:10px 0;margin-bottom:10px;background:#f3f3f3}.upload-img .box .image-box img[data-v-382f162a]{width:100%;height:100%}.upload-img .box .checkedActive[data-v-382f162a]{background:#eff7ff;border:1px solid #1890ff}.upload-img .box .image-box[data-v-382f162a]:not(:nth-child(5n+1)){margin-left:10px}.ivu-modal-wrap[data-v-1f5336d0]{z-index:9999!important}.show_piclist>li[data-v-1f5336d0]{width:200px;height:200px;display:inline-block;margin-left:20px}.show_piclist>li>img[data-v-1f5336d0]{width:100%;height:100%}.pic-icon[data-v-1f5336d0]{display:inline-block;width:35px;height:35px;vertical-align:middle;margin-right:20px}.pic-icon img[data-v-1f5336d0]{width:100%;height:100%}.add-input>li:hover i[data-v-1f5336d0]{display:inline-block!important}
\ No newline at end of file \ 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-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> <!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-5a91d059.961557f4.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-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-5a91d059.9c2a1013.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-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.b17a6315.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.b17a6315.js></script></body></html>
\ No newline at end of file \ No newline at end of file
gsb-marketplat-mag/app/front/entry/public/js/app.b17a6315.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/app.c15744d1.js deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
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