Commit 02f09d6e authored by baixian's avatar baixian

微官网新版需求上线

parents 84aae436 b2c5dda0
...@@ -11,11 +11,12 @@ ...@@ -11,11 +11,12 @@
<script src="js/console-polyfill.js"></script> <script src="js/console-polyfill.js"></script>
<![endif]--> <![endif]-->
<script charset="utf-8" src="https://map.qq.com/api/js?v=2.exp&key=XSZBZ-5LHCV-5I2P7-UQHPW-6456F-JBB3B"></script> <script charset="utf-8" src="https://map.qq.com/api/js?v=2.exp&key=XSZBZ-5LHCV-5I2P7-UQHPW-6456F-JBB3B"></script>
<script src="/js/ueeditor/ueditor.config.js?20200107" charset="utf-8"></script><script src="/js/ueeditor/ueditor.all.js?20200107" charset="utf-8"></script> <script src="/js/ueeditor/ueditor.config.js?20200107" charset="utf-8"></script><script src="/js/ueeditor/ueditor.all.js?20200107" charset="utf-8"></script>
<script src="js/console-polyfill.js?20200107" charset="utf-8"></script><script src="js/es6-shim.min.js?20200107" charset="utf-8"></script><script src="js/es5-shim.js?20200107" charset="utf-8"></script><script src="js/es5-sham.min.js?20200107" charset="utf-8"></script><script src="js/json3.min.js?20200107" charset="utf-8"></script><script src="js/html5shiv.min.js?20200107" charset="utf-8"></script><script src="js/polyfill.js?20200107" charset="utf-8"></script><script src="lib/vendor.dll.js?20200107" charset="utf-8"></script> <script src="https://cdn.s.shangjiadao.cn/qingxiao/biz/js/console-polyfill.js?20200107" charset="utf-8"></script><script src="https://cdn.s.shangjiadao.cn/qingxiao/biz/js/es6-shim.min.js?20200107" charset="utf-8"></script><script src="https://cdn.s.shangjiadao.cn/qingxiao/biz/js/es5-shim.js?20200107" charset="utf-8"></script><script src="https://cdn.s.shangjiadao.cn/qingxiao/biz/js/es5-sham.min.js?20200107" charset="utf-8"></script><script src="https://cdn.s.shangjiadao.cn/qingxiao/biz/js/json3.min.js?20200107" charset="utf-8"></script><script src="https://cdn.s.shangjiadao.cn/qingxiao/biz/js/html5shiv.min.js?20200107" charset="utf-8"></script><script src="https://cdn.s.shangjiadao.cn/qingxiao/biz/js/polyfill.js?20200107" charset="utf-8"></script><script src="https://cdn.s.shangjiadao.cn/qingxiao/biz/lib/vendor.dll.js?20200107" charset="utf-8"></script>
</head> </head>
</head> </head>
<body> <body>
<div id="root"></div> <div id="root"></div>
<script type="text/javascript" src="/dist/main.1e2883.js"></script></body> <script type="text/javascript" src="https://cdn.s.shangjiadao.cn/qingxiao/biz/dist/main.a9c4c0.js"></script></body>
</html> </html>
...@@ -233,8 +233,8 @@ export default { ...@@ -233,8 +233,8 @@ export default {
width: '15px', width: '15px',
height: '15px', height: '15px',
}, },
activeurl: `${__IMGCDN__}menu/push.png?v=1`, activeurl: `${__IMGCDN__}menu/pushactive.png?v=1`,
notactiveurl: `${__IMGCDN__}menu/pushactive.png`, notactiveurl: `${__IMGCDN__}menu/push.png`,
path: '/sjd/pushsetting', path: '/sjd/pushsetting',
relativePath: ['/sjd/pushsetting'], relativePath: ['/sjd/pushsetting'],
}, },
......
...@@ -918,13 +918,14 @@ export default { ...@@ -918,13 +918,14 @@ export default {
url: signature.host, url: signature.host,
callback: signature.callback, callback: signature.callback,
}; };
document.getElementById('uploadCommon').value = ''; // document.getElementById('uploadCommon').value = '';
const uploadImg = yield call(uploader.uploadVideo, params, (res) => { const uploadImg = yield call(uploader.uploadVideo, params, (res) => {
progressCallBack(res); progressCallBack(res);
}); });
const videoUrl = signature.path; const videoUrl = signature.path;
setTimeout(uploaderLoading); setTimeout(uploaderLoading);
if (JSON.stringify(uploadImg) == '{"status":"ok"}') { if (JSON.stringify(uploadImg) == '{"status":"ok"}') {
document.getElementById('uploadCommon').value = '';
yield put({ yield put({
type: 'updateState', type: 'updateState',
payload: { payload: {
......
...@@ -21,6 +21,8 @@ export default { ...@@ -21,6 +21,8 @@ export default {
title: '', title: '',
created_at: '', created_at: '',
logo: '', logo: '',
app_id: '',
template_config_status: '',
}, },
hasPushAuth: false, hasPushAuth: false,
}, },
...@@ -60,6 +62,7 @@ export default { ...@@ -60,6 +62,7 @@ export default {
title: data.data.title, title: data.data.title,
created_at: data.data.created_at, created_at: data.data.created_at,
logo: data.data.head_img, logo: data.data.head_img,
app_id: data.data.app_id,
template_config_status: data.data.template_config_status, template_config_status: data.data.template_config_status,
}, },
}, },
...@@ -133,6 +136,7 @@ export default { ...@@ -133,6 +136,7 @@ export default {
payload: { payload: {
isEmpty: false, isEmpty: false,
wxInfo: { wxInfo: {
app_id: data.data.app_id,
title: data.data.title, title: data.data.title,
created_at: data.data.created_at, created_at: data.data.created_at,
logo: data.data.head_img, logo: data.data.head_img,
......
...@@ -64,7 +64,7 @@ class PushSetting extends React.Component { ...@@ -64,7 +64,7 @@ class PushSetting extends React.Component {
{item.template_config_status == 2 && <div>状态:配置中<span style={{ paddingLeft: '10px' }} className="hreflink" onClick={this.refreshPushSetting}>刷新状态</span></div>} {item.template_config_status == 2 && <div>状态:配置中<span style={{ paddingLeft: '10px' }} className="hreflink" onClick={this.refreshPushSetting}>刷新状态</span></div>}
{item.template_config_status == 3 && <div>状态:配置成功</div>} {item.template_config_status == 3 && <div>状态:配置成功</div>}
{item.template_config_status == 4 && <div>状态:配置失败,请联系轻校客服 </div>} {item.template_config_status == 4 && <div>状态:配置失败,请联系轻校客服 </div>}
<div ><span id="linkcopy">{ENVIRONMENT == 'pro' ? `https://h5.qingxiao.online/qxbindpush.html?sid=${sid}` : `https://clock-h5.wp53.cn/qxbindpush.html?sid=${sid}`}</span><span style={{ paddingLeft: '10px' }} className="hreflink" data-clipboard-target="#linkcopy" id="btnCopyLink">复制</span></div> <div ><span id="linkcopy">{ENVIRONMENT == 'pro' ? `https://h5.qingxiao.online/qxbindpush.html?sid=${sid}&appid=${item.app_id}` : `https://clock-h5.wp53.cn/qxbindpush.html?sid=${sid}&appid=${item.app_id}`}</span><span style={{ paddingLeft: '10px' }} className="hreflink" data-clipboard-target="#linkcopy" id="btnCopyLink">复制</span></div>
</div> </div>
)} )}
/> />
......
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