渠道码选择素材图片BUG修改0528_0946

UI/src/pages/sellmanage/channelCode.js

@@ -130,7 +130,7 @@ class BirdGridPermissionPage extends React.Component {
     }
     if (editImage == "image") {
       this.setState({
-        imageUrl7: imageList.localUrl==null ? 'http://img01.store.sogou.com/net/a/04/link?appid=100520029&url='+imageList.materialUrl : WXMpAPI+imageList.localUrl
+        imageUrl7: imageList.localUrl==null ? 'http://img01.store.sogou.com/net/a/04/link?appid=100520029&url='+imageList.materialUrl : imageList.localUrl
       })
     }
     if (editValue == "text") {
@@ -145,7 +145,7 @@ class BirdGridPermissionPage extends React.Component {
     } else if (editValue == "miniprogrampage") {
       this.setState({
         editKey: "3",
-        imageUrl9: messageList.localUrl==null ? 'http://img01.store.sogou.com/net/a/04/link?appid=100520029&url='+messageList.materialUrl : WXMpAPI+messageList.localUrl
+        imageUrl9: messageList.localUrl==null ? 'http://img01.store.sogou.com/net/a/04/link?appid=100520029&url='+messageList.materialUrl : messageList.localUrl
       })
     }
     if (data.qrcode_isPermanent == 0) {
@@ -575,7 +575,7 @@ class BirdGridPermissionPage extends React.Component {
         this.setState(
           {
             mediaId4: item.mediaId,
-            imageUrl4: item.localUrl==null ? 'http://img01.store.sogou.com/net/a/04/link?appid=100520029&url='+item.materialUrl : WXMpAPI+item.localUrl,
+            imageUrl4: item.localUrl==null ? 'http://img01.store.sogou.com/net/a/04/link?appid=100520029&url='+item.materialUrl : item.localUrl,
             imgShow4: true,
             imgShow7: true
           },
@@ -637,7 +637,7 @@ class BirdGridPermissionPage extends React.Component {
         this.setState(
           {
             mediaId5: item.mediaId,
-            imageUrl5: item.localUrl==null ? 'http://img01.store.sogou.com/net/a/04/link?appid=100520029&url='+item.materialUrl : WXMpAPI+item.localUrl,
+            imageUrl5: item.localUrl==null ? 'http://img01.store.sogou.com/net/a/04/link?appid=100520029&url='+item.materialUrl : item.localUrl,
             imgShow5: true,
             imgShow8: true
           },
@@ -700,7 +700,7 @@ class BirdGridPermissionPage extends React.Component {
         this.setState(
           {
             mediaId6: item.mediaId,
-            imageUrl6: item.localUrl==null ? 'http://img01.store.sogou.com/net/a/04/link?appid=100520029&url='+item.materialUrl : WXMpAPI+item.localUrl,
+            imageUrl6: item.localUrl==null ? 'http://img01.store.sogou.com/net/a/04/link?appid=100520029&url='+item.materialUrl : item.localUrl,
             imgShow6: true,
             imgShow9: true
           },
@@ -762,7 +762,7 @@ class BirdGridPermissionPage extends React.Component {
         this.setState(
           {
             mediaId1: item.mediaId,
-            imageUrl1: item.localUrl==null ? 'http://img01.store.sogou.com/net/a/04/link?appid=100520029&url='+item.materialUrl : WXMpAPI+item.localUrl,
+            imageUrl1: item.localUrl==null ? 'http://img01.store.sogou.com/net/a/04/link?appid=100520029&url='+item.materialUrl : item.localUrl,
             imgShow1: true
           },
           () => {
@@ -823,7 +823,7 @@ class BirdGridPermissionPage extends React.Component {
         this.setState(
           {
             mediaId2: item.mediaId,
-            imageUrl2: item.localUrl==null ? 'http://img01.store.sogou.com/net/a/04/link?appid=100520029&url='+item.materialUrl : WXMpAPI+item.localUrl,
+            imageUrl2: item.localUrl==null ? 'http://img01.store.sogou.com/net/a/04/link?appid=100520029&url='+item.materialUrl : item.localUrl,
             imgShow2: true
           },
           () => {
@@ -884,7 +884,7 @@ class BirdGridPermissionPage extends React.Component {
         this.setState(
           {
             mediaId3: item.mediaId,
-            imageUrl3: item.localUrl==null ? 'http://img01.store.sogou.com/net/a/04/link?appid=100520029&url='+item.materialUrl : WXMpAPI+item.localUrl,
+            imageUrl3: item.localUrl==null ? 'http://img01.store.sogou.com/net/a/04/link?appid=100520029&url='+item.materialUrl : item.localUrl,
             imgShow3: true
           },
           () => {
@@ -1883,7 +1883,7 @@ class BirdGridPermissionPage extends React.Component {
                     <div key={i} style={{ margin: "10px 20px" }} onClick={e => this.selectImg1(i, e)}>
                       <img
                         style={{ width: "132px", height: "132px", border: i == this.state.select ? "1px solid red" : "" }}
-                        src={item.localUrl==null}
+                        src={item.localUrl}
                       />
                       <p
                         style={{

UI/src/pages/sellmanage/customMenu.js

@@ -73,6 +73,16 @@ class customMenu extends React.Component {
                                     "subButtons": []
                                 }
                             ]
+                        },
+                        {
+                            "type": "click",
+                            "name": "戳我",
+                            "key": "V1001_TODAY_MUSIC",
+                            "url": null,
+                            "mediaId": null,
+                            "appId": null,
+                            "pagePath": null,
+                            "subButtons": []
                         }
                     ],
                     "rule": null,
@@ -137,9 +147,9 @@ class customMenu extends React.Component {
             borderRadius: 0,
             textAlign: "center",
             lineHeight: "36px",
+            top: -1,
             position: "absolute",
-            top: "-1px",
-            left: -1
+            left: 0
         }
         // 子菜单样式，到时候自动生成，每层高度相差36px
         const subMenuCss01 = {
@@ -192,7 +202,7 @@ class customMenu extends React.Component {
             left: -1
         }
         return (
-            // 
+            //
             <div>
                 <Row style={{ background: "black", padding: "10px 10px", margin: "52px" }}>
                     {/* 左边自定义菜单预览页 */}
@@ -200,12 +210,49 @@ class customMenu extends React.Component {
                         <div style={phoneCss}>
                             <div style={headerCss}></div>
                             <div style={contenCss}>
-                                <img src={keydown} style={{ float: "left" }} />
+                                <img src={keydown} style={{ float: "left", width: 32 }} />
                                 {
                                     // 此处根据json数据进行渲染
-                                    // 参考粉丝509
+                                    // 参考粉丝534
+
+                                    self.state.jsonData.menu.buttons.map( (faMenu, index) => {
+                                        let subMenuArray = faMenu.subButtons;
+                                        let plus = [];
+                                        if(subMenuArray.length<6){
+                                            plus = [{name: "anc"}]
+                                        }
+                                        return (
+                                            <div style={menuCss}>
+                                                <Button style={faMenuCss}>{faMenu.name}</Button>
+                                                {
+                                                    subMenuArray.map( (subMenu, i) => {
+                                                        return (
+                                                            <Button style={{
+                                                                width: "96.66px",
+                                                                height: "36px",
+                                                                textAlign: "center",
+                                                                lineHeight: "35px",
+                                                                borderRadius: 0,
+                                                                position: "absolute",
+                                                                top: -(36*i+1),
+                                                                left: 0
+                                                            }}>{subMenu.name}</Button>
+                                                        );
+                                                    })
+                                                }
+                                                {/* {
+                                                    plus.map( () => {
+                                                        return (
+                                                            <Button style={iconCss}><Icon type="plus" /></Button>
+                                                        );
+                                                    })
+                                                } */}
+                                            </div>
+                                        );
+                                    })
+
                                 }
-                                <div style={menuCss}>
+                                {/* <div style={menuCss}>
                                     <Button style={faMenuCss}>菜单1</Button>
                                     <Button style={subMenuCss01}>子菜单1.1</Button>
                                     <Button style={iconCss}><Icon type="plus" /></Button>
@@ -215,7 +262,7 @@ class customMenu extends React.Component {
                                 </div>
                                 <div style={menuCss}>
                                     <Button style={faMenuCss}>菜单3</Button>
-                                </div>
+                                </div> */}
                             </div>
                         </div>
                     </Col>
@@ -228,4 +275,4 @@ class customMenu extends React.Component {
         );
     }
 }
-export default customMenu;
+export default customMenu;

mpwechatApp/mpwechatApp.iml

@@ -221,5 +221,10 @@
     <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml:3.13" level="project" />
     <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml-schemas:3.13" level="project" />
     <orderEntry type="library" name="Maven: org.apache.xmlbeans:xmlbeans:2.6.0" level="project" />
+    <orderEntry type="library" name="Maven: com.squareup.okhttp3:okhttp:4.0.0" level="project" />
+    <orderEntry type="library" name="Maven: com.squareup.okio:okio:2.2.2" level="project" />
+    <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-stdlib:1.2.51" level="project" />
+    <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-stdlib-common:1.2.51" level="project" />
+    <orderEntry type="library" name="Maven: org.jetbrains:annotations:13.0" level="project" />
   </component>
 </module>

mpwechatApp/src/main/java/com/liangjian11/wx/mp/handler/SubscribeHandler.java

@@ -72,8 +72,8 @@ public class SubscribeHandler extends AbstractHandler {
                 String event = wxMessage.getEvent();// 事件类型，SCAN/subscribe
                 String eventKey = wxMessage.getEventKey().substring(wxMessage.getEventKey().indexOf("_")+1);// 事件KEY值，qrscene_为前缀，后面为二维码的参数值(截取)
                 Long subTime = userWxInfo.getSubscribeTime();// 订阅时间，整形
-                String appAppId = String.valueOf(context.get(Config.APPAPPID));//应用Id
-                String appId = String.valueOf(context.get(Config.APPID));
+                String appAppId = (String) context.get(Config.APPAPPID);//应用Id
+                String appId = (String) context.get(Config.APPID);
                 Integer appHostId= (Integer) context.get(Config.APPHOSTID);
                 Integer appPortId= (Integer) context.get(Config.APPPORTID);
                 Long fansId = null;

mpwechatApp/src/main/java/com/liangjian11/wx/mp/service/impl/QrcodeCountServiceImpl.java

@@ -193,6 +193,7 @@ public class QrcodeCountServiceImpl implements QrcodeCountService {
         }
         if(qrcodeId==null){
             return null;
+
         }
         List<QrcodeJoinFans> list = qrcodeJoinFansMapper.queryJoinFansList(qrcodeId, start, end);
         Integer count = qrcodeJoinFansMapper.getJoinFansCount(qrcodeId);