From 064363587292c429075273db1cc40b23ea4a847e Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期六, 17 九月 2022 15:31:22 +0800
Subject: [PATCH] 2022-09-17
---
src/views/sso/index.jsx | 2 +-
src/tabviews/custom/components/table/edit-table/normalTable/index.scss | 1 +
src/menu/components/card/cardcellcomponent/dragaction/index.scss | 1 +
src/api/index.js | 11 ++++++++---
src/tabviews/custom/index.jsx | 8 ++++----
src/tabviews/custom/components/card/cardcellList/index.scss | 1 +
src/tabviews/custom/components/share/normalTable/index.scss | 1 +
src/tabviews/zshare/normalTable/index.scss | 2 +-
src/views/login/index.jsx | 2 +-
9 files changed, 19 insertions(+), 10 deletions(-)
diff --git a/src/api/index.js b/src/api/index.js
index 3db610c..f4b19fa 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -201,7 +201,7 @@
/**
* @description 娓稿鐧诲綍
*/
- getTouristMsg (appid, openid, memberid, scanId) {
+ getTouristMsg (binding_type, appid, openid, memberid, scanId) {
let _SessionUid = localStorage.getItem('SessionUid')
if (!_SessionUid) { // 鎵嬪姩娓呴櫎SessionUid鏃讹紝瀹炴椂鐢熸垚
@@ -218,11 +218,16 @@
}
param.LText = md5(window.btoa(_SessionUid + param.timestamp))
- param.secretkey = md5(param.LText + 'mingke' + param.timestamp)
+
+ // param.secretkey = md5(param.LText + 'mingke' + param.timestamp) // v_type 涓虹┖鏃�
+ let solt = md5((window.GLOB.appkey + window.btoa(window.GLOB.appkey + 'mingke') + 'mingke').toLowerCase()).slice(-6).toUpperCase()
+
+ param.v_type = 'Y'
+ param.secretkey = md5(param.LText + solt + param.timestamp)
param.appkey = window.GLOB.appkey || ''
- if (appid) {
+ if (binding_type === 'mk') {
param.binding_type = 'mk'
param.thd_party_member_id = memberid
param.thd_party_openid = openid
diff --git a/src/menu/components/card/cardcellcomponent/dragaction/index.scss b/src/menu/components/card/cardcellcomponent/dragaction/index.scss
index 3683516..d3ea903 100644
--- a/src/menu/components/card/cardcellcomponent/dragaction/index.scss
+++ b/src/menu/components/card/cardcellcomponent/dragaction/index.scss
@@ -114,6 +114,7 @@
background-size: cover;
background-position: center center;
background-repeat: no-repeat;
+ background-color: #e9e9e9;
}
.ant-mk-icon {
vertical-align: top;
diff --git a/src/tabviews/custom/components/card/cardcellList/index.scss b/src/tabviews/custom/components/card/cardcellList/index.scss
index eb77a1e..11dec19 100644
--- a/src/tabviews/custom/components/card/cardcellList/index.scss
+++ b/src/tabviews/custom/components/card/cardcellList/index.scss
@@ -155,6 +155,7 @@
background-size: cover;
background-position: center center;
background-repeat: no-repeat;
+ background-color: #e9e9e9;
}
.ant-mk-picture.scale {
cursor: zoom-in;
diff --git a/src/tabviews/custom/components/share/normalTable/index.scss b/src/tabviews/custom/components/share/normalTable/index.scss
index cdc9b52..d9c7c76 100644
--- a/src/tabviews/custom/components/share/normalTable/index.scss
+++ b/src/tabviews/custom/components/share/normalTable/index.scss
@@ -100,6 +100,7 @@
position: relative;
background-position: center center;
background-size: cover;
+ background-color: #e9e9e9;
margin: 2px;
}
.ant-mk-picture.scale {
diff --git a/src/tabviews/custom/components/table/edit-table/normalTable/index.scss b/src/tabviews/custom/components/table/edit-table/normalTable/index.scss
index 754dda6..519c26e 100644
--- a/src/tabviews/custom/components/table/edit-table/normalTable/index.scss
+++ b/src/tabviews/custom/components/table/edit-table/normalTable/index.scss
@@ -78,6 +78,7 @@
position: relative;
background-position: center center;
background-size: cover;
+ background-color: #e9e9e9;
margin: 2px;
}
.ant-mk-picture.scale {
diff --git a/src/tabviews/custom/index.jsx b/src/tabviews/custom/index.jsx
index ceea329..6f41f64 100644
--- a/src/tabviews/custom/index.jsx
+++ b/src/tabviews/custom/index.jsx
@@ -1038,13 +1038,13 @@
}
if (sessionStorage.getItem('dataM') === 'true') { // 鏁版嵁鏉冮檺
- component.setting.dataresource = component.setting.dataresource.replace(/\$@/ig, '/*').replace(/@datam@/ig, 'Y')
+ component.setting.dataresource = component.setting.dataresource.replace(/\$@/ig, '/*').replace(/@datam@/ig, '\'Y\'')
component.setting.dataresource = component.setting.dataresource.replace(/@\$/ig, '*/')
- _customScript = _customScript.replace(/\$@/ig, '/*').replace(/@datam@/ig, 'Y')
+ _customScript = _customScript.replace(/\$@/ig, '/*').replace(/@datam@/ig, '\'Y\'')
_customScript = _customScript.replace(/@\$/ig, '*/')
} else {
- component.setting.dataresource = component.setting.dataresource.replace(/@\$|\$@/ig, '').replace(/@datam@/ig, '')
- _customScript = _customScript.replace(/@\$|\$@/ig, '').replace(/@datam@/ig, '')
+ component.setting.dataresource = component.setting.dataresource.replace(/@\$|\$@/ig, '').replace(/@datam@/ig, '\'\'')
+ _customScript = _customScript.replace(/@\$|\$@/ig, '').replace(/@datam@/ig, '\'\'')
}
regs.forEach(cell => {
diff --git a/src/tabviews/zshare/normalTable/index.scss b/src/tabviews/zshare/normalTable/index.scss
index 31344f4..484fe09 100644
--- a/src/tabviews/zshare/normalTable/index.scss
+++ b/src/tabviews/zshare/normalTable/index.scss
@@ -175,7 +175,7 @@
padding: 5px;
}
.mk-picture {
- background-color: #d9d9d9;
+ background-color: #e9e9e9;
background-position: center center;
background-size: cover;
}
diff --git a/src/views/login/index.jsx b/src/views/login/index.jsx
index b4f267e..9803a5f 100644
--- a/src/views/login/index.jsx
+++ b/src/views/login/index.jsx
@@ -214,7 +214,7 @@
}
authLogin = (appid, openid, memberid, scanId) => {
- Api.getTouristMsg(appid, openid, memberid, scanId).then(res => {
+ Api.getTouristMsg('mk', appid, openid, memberid, scanId).then(res => {
if (res.status) {
sessionStorage.setItem('UserID', res.UserID)
sessionStorage.setItem('LoginUID', res.LoginUID)
diff --git a/src/views/sso/index.jsx b/src/views/sso/index.jsx
index 05b6b59..60f8efa 100644
--- a/src/views/sso/index.jsx
+++ b/src/views/sso/index.jsx
@@ -24,7 +24,7 @@
}
authLogin = (appid, openid, memberid, scanId) => {
- Api.getTouristMsg(appid, openid, memberid, scanId).then(res => {
+ Api.getTouristMsg('mk', appid, openid, memberid, scanId).then(res => {
if (res.status) {
sessionStorage.setItem('UserID', res.UserID)
sessionStorage.setItem('LoginUID', res.LoginUID)
--
Gitblit v1.8.0