From 8c9ec65045d861a1082a6929a8f3413b3c5cd7f6 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期日, 28 八月 2022 00:35:41 +0800
Subject: [PATCH] 2022-08-28
---
public/options.json | 12 ++++++------
src/menu/components/share/actioncomponent/actionform/index.jsx | 3 +++
src/templates/zshare/formconfig.jsx | 3 +++
src/menu/components/share/actioncomponent/formconfig.jsx | 9 ++++++---
src/templates/sharecomponent/actioncomponent/actionform/index.jsx | 4 ++++
src/tabviews/zshare/actionList/normalbutton/index.jsx | 13 +++++--------
6 files changed, 27 insertions(+), 17 deletions(-)
diff --git a/public/options.json b/public/options.json
index c56afb8..7cd79e6 100644
--- a/public/options.json
+++ b/public/options.json
@@ -1,20 +1,20 @@
{
- "appId": "202104131808068631B24E716878D4DEDBB6D",
- "appkey": "20210413175253507D1D53824539942FDA833",
+ "appId": "202108312122504607B107A83F55B40C98CCF",
+ "appkey": "20210831212235413F287EC3BF489424496C8",
"mainSystemApi": "http://sso.mk9h.cn/cloud/webapi/dostars",
"systemType": "",
"externalDatabase": "false",
"lineColor": "",
"filter": "false",
- "defaultApp": "mk",
+ "defaultApp": "css_wx_app",
"defaultLang": "zh-CN",
- "WXAppID": "",
+ "WXAppID": "wx4d8a34c8d4494872",
"WXminiAppID": "",
"debugger": false,
"licenseKey": "",
"probation": "",
"keepPassword": "true",
"platforms": ["H5", "wechat", "android", "ios", "wxMiniProgram"],
- "host": "https://demo.mk9h.cn",
- "service": "mes/"
+ "host": "http://demo.mk9h.cn",
+ "service": "erp_new/"
}
\ No newline at end of file
diff --git a/src/menu/components/share/actioncomponent/actionform/index.jsx b/src/menu/components/share/actioncomponent/actionform/index.jsx
index a071d66..a6125a5 100644
--- a/src/menu/components/share/actioncomponent/actionform/index.jsx
+++ b/src/menu/components/share/actioncomponent/actionform/index.jsx
@@ -429,6 +429,9 @@
} else if (_funcType === 'pay') {
shows.push('payType', 'Ot', 'execSuccess', 'execError', 'syncComponent', 'openmenu')
reOptions.Ot = requireOptions.filter(op => ['requiredSgl'].includes(op.value))
+ } else if (_funcType === 'refund') {
+ shows.push('Ot', 'execSuccess', 'execError', 'syncComponent', 'openmenu')
+ reOptions.Ot = requireOptions.filter(op => ['requiredSgl'].includes(op.value))
}
}
diff --git a/src/menu/components/share/actioncomponent/formconfig.jsx b/src/menu/components/share/actioncomponent/formconfig.jsx
index 46fd198..d30ff14 100644
--- a/src/menu/components/share/actioncomponent/formconfig.jsx
+++ b/src/menu/components/share/actioncomponent/formconfig.jsx
@@ -91,15 +91,16 @@
let pageTemps = [
{ value: 'billprint', text: '鍗曟嵁鎵撳嵃' },
- { value: 'pay', text: Formdict['model.pay'] },
- { value: 'custom', text: Formdict['header.form.custom'] }
+ { value: 'pay', text: '鏀粯' },
+ { value: 'custom', text: '鑷畾涔�' }
]
const isApp = ['pc', 'mob'].includes(appType)
let funTypes = [
{ value: 'print', text: '鏍囩鎵撳嵃' },
- { value: 'changeuser', text: '鍒囨崲鐢ㄦ埛' },
+ { value: 'refund', text: '閫�娆�' },
{ value: 'closetab', text: '鏍囩鍏抽棴' },
+ { value: 'changeuser', text: '鍒囨崲鐢ㄦ埛' },
{ value: 'megvii', text: '鏃疯闈㈡澘鏈�' },
{ value: 'filezip', text: '鏂囦欢鍘嬬缉鍖�' },
]
@@ -121,6 +122,7 @@
funTypes = [
{ value: 'scan', text: '鎵爜' },
{ value: 'pay', text: '鏀粯' },
+ { value: 'refund', text: '閫�娆�' },
{ value: 'resetPwd', text: '淇敼瀵嗙爜'},
{ value: 'mkBinding', text: '寮�閫氭壂鐮佺櫥褰�' },
{ value: 'mkUnBinding', text: '鐢ㄦ埛瑙ｇ粦' },
@@ -137,6 +139,7 @@
} else if (appType === 'pc') {
opentypes = opentypes.filter(item => item.value !== 'tab')
funTypes = [
+ { value: 'refund', text: '閫�娆�' },
{ value: 'changeuser', text: '鍒囨崲鐢ㄦ埛' },
]
pageTemps = [
diff --git a/src/tabviews/zshare/actionList/normalbutton/index.jsx b/src/tabviews/zshare/actionList/normalbutton/index.jsx
index 02499a5..9ced478 100644
--- a/src/tabviews/zshare/actionList/normalbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/normalbutton/index.jsx
@@ -238,7 +238,7 @@
let _this = this
let data = record || selectedData || []
-
+
if (btn.Ot !== 'notRequired' && data.length === 0) {
// 闇�瑕侀�夋嫨琛屾椂锛屾牎楠屾暟鎹�
notification.warning({
@@ -1928,11 +1928,8 @@
_param.miniprogram.pagepath = `/pages/index/index?MenuId=${verify.wxNoteLinkMenuId}`
}
}
-
- let keys = []
+
verify.wxNoteKeys.forEach(item => {
- keys.push(item.key)
-
_param.data[item.key] = {value: '', color: item.color}
})
@@ -1948,9 +1945,9 @@
m.client_msg_id = item.send_id
}
- keys.forEach(key => {
- if (item[key] !== undefined) {
- m.data[key].value = item[key]
+ verify.wxNoteKeys.forEach(note => {
+ if (item[note.value] !== undefined) {
+ m.data[note.key].value = item[note.value]
}
})
diff --git a/src/templates/sharecomponent/actioncomponent/actionform/index.jsx b/src/templates/sharecomponent/actioncomponent/actionform/index.jsx
index 4c0320f..c034b51 100644
--- a/src/templates/sharecomponent/actioncomponent/actionform/index.jsx
+++ b/src/templates/sharecomponent/actioncomponent/actionform/index.jsx
@@ -302,6 +302,10 @@
shows.push('refreshTab')
} else if (_funcType === 'megvii') {
shows.push('subFunc', 'progress')
+ } else if (_funcType === 'refund') {
+ shows.push('Ot', 'execSuccess', 'execError')
+
+ reOptions.Ot = requireOptions.filter(op => op.value === 'requiredSgl')
} else if (_funcType === 'filezip') {
reOptions.Ot = requireOptions
reRequired.innerFunc = false
diff --git a/src/templates/zshare/formconfig.jsx b/src/templates/zshare/formconfig.jsx
index d573604..7f7cc56 100644
--- a/src/templates/zshare/formconfig.jsx
+++ b/src/templates/zshare/formconfig.jsx
@@ -980,6 +980,9 @@
value: 'print',
text: '鏍囩鎵撳嵃'
}, {
+ value: 'refund',
+ text: '閫�娆�'
+ }, {
value: 'changeuser',
text: '鍒囨崲鐢ㄦ埛'
}, {
--
Gitblit v1.8.0