Merge branch 'master' of https://g.civnet.cn:8443/ReactWeb5/maintenance

src/pages/platformCenter/integratedLogin/AddModal.jsx

@@ -127,7 +127,7 @@ const AddModal = props => {
           // setImageUrl(window.location.origin + `/${pickItem.iconUrl}`);
           if (!pickItem.iconUrl.includes('images')) {
             setImageUrl(getImg(pickItem.iconUrl));
-            setIm(getImg(pickItem.iconUrl));
+            setIm(pickItem.iconUrl);
           } else {
             if (
               pickItem.iconUrl.startsWith('CityTemp') ||
@@ -137,6 +137,7 @@ const AddModal = props => {
             } else {
               setImageUrl(window.location.origin + `/${pickItem.iconUrl}`);
             }
+            setIm(pickItem.iconUrl);
           }
           // }
         } else {
@@ -601,12 +602,12 @@ const AddModal = props => {
     if (props) {
       if (!props.path.includes('images')) {
         setImageUrl(getImg(props.path));
-        setIm(getImg(props.path));
-        setKeepImgeUrl(getImg(props.path));
+        setIm(props.path);
+        setKeepImgeUrl(props.path);
       } else {
         setImageUrl(window.location.origin + `/${props.path}`);
-        setIm(window.location.origin + `/${props.path}`);
-        setKeepImgeUrl(window.location.origin + `/${props.path}`);
+        setIm(props.path);
+        setKeepImgeUrl(props.path);
       }
       // setImageUrl(window.location.origin + `/${props.path}`);
       // setIm(props.path);
@@ -786,10 +787,10 @@ const AddModal = props => {
             </Item>
           </Col>
         </Row>
-        <Item label="身份验证" name="siteType">
+        <Item label="站点类型" name="siteType">
           <Radio.Group onChange={onChangeIdentity} value={identity}>
-            <Radio value={0}>被动</Radio>
-            <Radio value={1}>主动</Radio>
+            <Radio value={0}>第三方接入</Radio>
+            <Radio value={1}>集成SaaS平台</Radio>
           </Radio.Group>
         </Item>
 

src/pages/platformCenter/integratedLogin/Integrate.jsx

@@ -184,9 +184,9 @@ const Integrate = () => {
       align: 'center',
       render: record => {
         if (record === 0) {
-          return <Tag color="success">被动</Tag>;
+          return <Tag color="success">第三方接入</Tag>;
         }
-        return <Tag color="processing">主动</Tag>;
+        return <Tag color="processing">集成SaaS平台</Tag>;
       },
     },
     {

src/pages/platformCenter/integratedLogin/PreviewModal.jsx

@@ -19,6 +19,9 @@ const PreviewModal = props => {
   const [keepGroupName, setKeepGroupName] = useState([]);
 
   useEffect(() => {
+    console.log(imageUrl);
+    console.log(keepImgeUrl);
+    debugger
     console.log(type);
     console.log(process.env, 'process.env.PROXY');
     setPickItem('');

src/pages/platformCenter/messageManage/schemeDetail/schemeDetail.jsx

@@ -191,6 +191,7 @@ const EditModal = props => {
         web_path: template.WebFunctionPath,
         message_template: template.MsgTemplateID,
         enterprise_template: aa,
+        WorkWeiXinPath: template.WorkWeiXinPath,
       });
       setImageUrl(template.WebIcon ? `${window.location.origin}/${template.WebIcon}` : '');
       setIm(template.WebIcon ? template.WebIcon : '');
@@ -383,6 +384,7 @@ const EditModal = props => {
         WorkWeiXinTemplateId: aa,
         WebIcon: fv.webIcon,
         Title: fv.Title,
+        WorkWeiXinPath: fv.WorkWeiXinPath,
       };
 
       UpdateMessageConfig(a).then(res => {
@@ -448,6 +450,7 @@ const EditModal = props => {
         WorkWeiXinTemplateId: bb,
         WebIcon: fv.webIcon,
         Title: fv.Title,
+        WorkWeiXinPath: fv.WorkWeiXinPath,
       };
       InsertMessageConfig(b).then(res => {
         if (res.code === 0) {
@@ -948,7 +951,7 @@ const EditModal = props => {
                             onClick={
                               currentTrench.isWEBShow
                                 ? () => {
-                                  pictruePreview();
+                                    pictruePreview();
                                   }
                                 : ''
                             }
@@ -1128,6 +1131,13 @@ const EditModal = props => {
                           ))}
                         </Select>
                       </Item>
+                      <Item label="功能路径" name="WorkWeiXinPath" labelCol={{ span: 5 }}>
+                        <Input
+                          style={{ width: '97%' }}
+                          placeholder="请输入功能路径"
+                          disabled={!currentTrench.isEnterpriseWXShow}
+                        />
+                      </Item>
                     </div>
                   </div>
                 }