6
0

306 کامیت‌ها 4fc45ffca3 ... e87bf4ef03

نویسنده SHA1 پیام تاریخ
  zqwang e87bf4ef03 Merge remote-tracking branch 'origin/test' into test 2 سال پیش
  zqwang 9aec3d0c8f Merge branch 'wx-kw' into test 2 سال پیش
  zqwang e22b8e80fe Merge branch 'wx-kw' into test 2 سال پیش
  admin 90289052fb Merge branch 'feature-wechat' of qk:zy_duanju/duanju_manage into test 2 سال پیش
  admin f5b6ad567d Merge branch 'feature-wechat' of qk:zy_duanju/duanju_manage into test 2 سال پیش
  liuzejian ac0e4ded88 Merge branch 'liuzj-1001016-dev' into test 2 سال پیش
  admin 1361a47443 Merge branch 'feature-wechat' of qk:zy_duanju/duanju_manage into test 2 سال پیش
  liuzejian 983046edde Merge remote-tracking branch 'origin/test' into test 2 سال پیش
  liuzejian f4d6411d51 Merge branch 'liuzj-1001016-dev' into test 2 سال پیش
  liuzejian 8ff7bed7fd Merge branch 'liuzj-1001012-dev' into test 2 سال پیش
  zqwang 4f08f0cdc9 Merge branch 'wx-kw' into test 2 سال پیش
  zqwang a0f4f562dd Merge branch 'wx-kw' into test 2 سال پیش
  zqwang 8ccf96194d Merge branch 'wx-kw' into test 2 سال پیش
  zqwang 1e6d4312b7 Merge branch 'wx-kw' into test 2 سال پیش
  zqwang 436192718e Merge branch 'wx-kw' into test 2 سال پیش
  zqwang 85cc5adb98 Merge branch 'wx-kw' into test 2 سال پیش
  zqwang cb79c7b0ca Merge branch 'wx-kw' into test 2 سال پیش
  zqwang 155eb97c24 Merge branch 'wx-kw' into test 2 سال پیش
  zqwang d762c6bb5d Merge remote-tracking branch 'origin/test' into test 2 سال پیش
  zqwang 38245df7d4 Merge branch 'wx-kw' into test 2 سال پیش
  zqwang 7d7dc4bb3b Merge branch 'wx-kw' into test 2 سال پیش
  liuzejian 9913245909 Merge branch 'liuzj-1001016-dev' into test 2 سال پیش
  liuzejian 1e117a00de Merge remote-tracking branch 'origin/test' into test 2 سال پیش
  liuzejian 807958b6c5 Merge branch 'liuzj-1001016-dev' into test 2 سال پیش
  liuzejian 1cc8d42acc Merge branch 'liuzj-1001016-dev' into test 2 سال پیش
  liuzejian 10d7e10ee7 Merge branch 'liuzj-1001016-dev' into test 2 سال پیش
  zqwang 97775528e0 Merge branch 'wx-kw' into test 2 سال پیش
  liuzejian 46ded8bac3 Merge branch 'liuzj-1001016-dev' into test 2 سال پیش
  liuzejian e69543cf75 Merge branch 'liuzj-1001016-dev' into test 2 سال پیش
  liuzejian 691fdb1b67 Merge branch 'liuzj-1001016-dev' into test 2 سال پیش
  liuzejian 62dfefa9b1 Merge branch 'liuzj-1001016-dev' into test 2 سال پیش
  liuzejian 5731756bd4 Merge branch 'liuzj-1001016-dev' into test 2 سال پیش
  liuzejian aab68102c0 Merge branch 'liuzj-1001016-dev' into test 2 سال پیش
  liuzejian 93b1b30464 Merge branch 'liuzj-1001016-dev' into test 2 سال پیش
  liuzejian e41b752e11 Merge branch 'liuzj-1001016-dev' into test 2 سال پیش
  liuzejian 2f94f4686e Merge remote-tracking branch 'origin/test' into test 2 سال پیش
  liuzejian 4fc100283d Merge branch 'liuzj-1001016-dev' into test 2 سال پیش
  zqwang 52641097f1 Merge branch 'wx-kw' into test 2 سال پیش
  zqwang bfe8b67d6a Merge branch 'wx-kw' into test 2 سال پیش
  zqwang 38430ea624 Merge branch 'wx-kw' into test 2 سال پیش
  zqwang 01db05bcb9 Merge branch 'wx-kw' into test 2 سال پیش
  zqwang e7b7bab8c5 Merge branch 'wx-kw' into test 2 سال پیش
  zqwang 31bdaa0f25 Merge branch 'wx-kw' into test 2 سال پیش
  zqwang 521ce078f4 Merge branch 'wx-kw' into test 2 سال پیش
  zqwang 3fa4f0de2a Merge branch 'wx-kw' into test 2 سال پیش
  liuzejian 8ec79a8585 Merge branch 'liuzj-1001016-dev' into test 2 سال پیش
  zqwang 2ca9b26a00 Merge branch 'wx-kw' into test 2 سال پیش
  zqwang 7701de1e7e Merge branch 'wx-kw' into test 2 سال پیش
  zqwang 6cd253229a Merge branch 'wx-kw' into test 2 سال پیش
  zqwang 7a8b64d2c2 Merge branch 'wx-kw' into test 2 سال پیش
  admin 1e72698c62 Merge branch 'feature-wechat' of qk:zy_duanju/duanju_manage into test 2 سال پیش
  zqwang 7b6ae9d7d8 Merge branch 'wx-kw' into test 2 سال پیش
  admin f88c9b104c Merge branch 'feature-wechat' of qk:zy_duanju/duanju_manage into test 2 سال پیش
  zqwang 223c4edff1 Merge branch 'wx-kw' into test 2 سال پیش
  zqwang cc3c1fb0bd Merge branch 'wx-kw' into test 2 سال پیش
  zqwang 0cff80c4d3 Merge branch 'wx-kw' into test 2 سال پیش
  zqwang a18a21069b Merge branch 'wx-kw' into test 2 سال پیش
  zqwang 2049c0726d Merge branch 'wx-kw' into test 2 سال پیش
  liuzejian 0c2c407731 Merge branch 'test' of qk:zy_duanju/duanju_manage into test 2 سال پیش
  liuzejian e562c851c5 Merge branch 'liuzj-1001016-dev' into test 2 سال پیش
  liuzejian fb0fb1571f Merge branch 'liuzj-1001016-dev' into test 2 سال پیش
  liuzejian 9f10f22bf9 Merge branch 'liuzj-1001016-dev' into test 2 سال پیش
  liuzejian dfaad8cc71 Merge branch 'liuzj-1001016-dev' into test 2 سال پیش
  liuzejian fcfc1aeb8f Merge branch 'liuzj-1001016-dev' into test 2 سال پیش
  liuzejian 2534ad4b32 Merge branch 'liuzj-1001016-dev' into test 2 سال پیش
  zqwang 585cd7f55b Merge branch 'wx-kw' into test 2 سال پیش
  liuzejian a8d61088f2 Merge branch 'liuzj-1001016-dev' into test 2 سال پیش
  liuzejian f89d00851f Merge branch 'liuzj-1001016-dev' into test 2 سال پیش
  admin a4dc5f2874 Merge branch 'feature-wechat' of qk:zy_duanju/duanju_manage into test 2 سال پیش
  liuzejian db66689411 Merge branch 'liuzj-1001016-dev' into test 2 سال پیش
  liuzejian b00398f4a2 Merge branch 'liuzj-1001016-dev' into test 2 سال پیش
  liuzejian fd3b17bb8c Merge remote-tracking branch 'origin/test' into test 2 سال پیش
  liuzejian c973681da2 Merge branch 'liuzj-1001025-dev' into test 2 سال پیش
  liuzejian bb6b0c87ad Merge branch 'liuzj-1001025-dev' into test 2 سال پیش
  liuzejian cdc01d3fd9 Merge branch 'liuzj-1001025-dev' into test 2 سال پیش
  liuzejian 283618eb28 Merge remote-tracking branch 'origin/test' into test 2 سال پیش
  liuzejian aa7ca20c57 Merge branch 'liuzj-1001025-dev' into test 2 سال پیش
  liuzejian e2604f7410 测试 2 سال پیش
  liuzejian 62dd479c0d Merge branch 'feature-wechat' into test 2 سال پیش
  liuzejian c6c8663e0a Merge branch 'liuzj-1001016-dev' into test 2 سال پیش
  zqwang 6a03242f05 Merge branch 'test' of 121.36.198.49:zy_duanju/duanju_manage into test 2 سال پیش
  zqwang a05f39f10b Merge branch 'wx-kw' into test 2 سال پیش
  zqwang b57777ff0e Merge branch 'wzq-tx-fix' into test 2 سال پیش
  zqwang a77b9b1266 Merge branch 'wzq-tx-fix' into test 2 سال پیش
  zqwang c01ab4ce3f Merge branch 'wzq-tx-fix' into test 2 سال پیش
  zqwang a1f064a0b4 Merge branch 'wzq-tx-fix' into test 2 سال پیش
  liuzejian 99018ee1af Merge branch 'liuzj-1000975-dev' into test 2 سال پیش
  liuzejian 9b3d43b8c2 fix 路由地址 2 سال پیش
  liuzejian cdd24bb890 Merge branch 'liuzj-weixin-tishen-dev' into test 2 سال پیش
  liuzejian 278de2dc13 Merge branch 'liuzj-1000975-dev' into test 2 سال پیش
  liuzejian 44b287dc11 Merge branch 'liuzj-weixin-tishen-dev' into test 2 سال پیش
  liuzejian cc24551390 Merge branch 'liuzj-weixin-tishen-dev' into test 2 سال پیش
  liuzejian 07c02bd6cb Merge branch 'liuzj-1000967-dev' into test 2 سال پیش
  liuzejian 983cf90d28 Merge remote-tracking branch 'origin/test' into test 2 سال پیش
  liuzejian bde57b3645 Merge branch 'liuzj-1000967-dev' into test 2 سال پیش
  liuzejian c2002720a7 Merge branch 'liuzj-1000967-dev' into test 2 سال پیش
  liuzejian 2c371e1679 Merge branch 'liuzj-1000967-dev' into test 2 سال پیش
  liuzejian 3f60cafa47 取消授权 2 سال پیش
  liuzejian baeb040ceb 已绑定公众号,显示出来 2 سال پیش
  liuzejian 49f1cad6c5 已绑定公众号,显示出来 2 سال پیش
  liuzejian 48456c3d2f 授权成功页面调整 2 سال پیش
  liuzejian a03b291311 获取授权小程序的nick_name 2 سال پیش
  liuzejian 9bac4f227d model 继承 2 سال پیش
  liuzejian 71cafd0f13 授权返回json 2 سال پیش
  liuzejian 26699f8df8 设置路由的权限 2 سال پیش
  liuzejian 0960a73225 直接返回授权链接 2 سال پیش
  liuzejian 4125ccce98 Merge branch 'liuzj-weixin-tishen-dev' into test 2 سال پیش
  liuzejian 2d9e275dd7 Merge branch 'liuzj-1000975-dev' into test 2 سال پیش
  liuzejian 3bb8bf6a7a Merge remote-tracking branch 'origin/test' into test 2 سال پیش
  liuzejian dcc87003c7 Merge branch 'liuzj-1000975-dev' into test 2 سال پیش
  liuzejian c5d17d28e4 Merge branch 'liuzj-1000975-dev' into test 2 سال پیش
  liuzejian 8c92f1ea92 Merge branch 'liuzj-1000967-dev' into test 2 سال پیش
  liuzejian e4509cad6c Merge branch 'liuzj-1000975-dev' into test 2 سال پیش
  liuzejian 57fb9b55be Merge branch 'liuzj-1000975-dev' into test 2 سال پیش
  liuzejian 0438283731 Merge branch 'liuzj-1000975-dev' into test 2 سال پیش
  liuzejian 31cb649b80 Merge branch 'liuzj-1000975-dev' into test 2 سال پیش
  liuzejian 153ffd83c6 Merge branch 'liuzj-1000975-dev' into test 2 سال پیش
  liuzejian b81f3844e9 Merge branch 'liuzj-1000975-dev' into test 2 سال پیش
  liuzejian 728ce4f53e Merge branch 'liuzj-1000975-dev' into test 2 سال پیش
  liuzejian aa245dfe18 Merge branch 'liuzj-weixin-tishen-dev' into test 2 سال پیش
  liuzejian b8ec86ed44 Merge branch 'liuzj-1000975-dev' into test 2 سال پیش
  liuzejian 7c18a8221e Merge branch 'liuzj-1000975-dev' into test 2 سال پیش
  liuzejian e64dc9a392 Merge branch 'liuzj-weixin-tishen-dev' into test 2 سال پیش
  liuzejian 730efdbd30 Merge branch 'liuzj-weixin-tishen-dev' into test 2 سال پیش
  liuzejian d3e92bab78 Merge branch 'liuzj-weixin-tishen-dev' into test 2 سال پیش
  liuzejian e10d27cb05 Merge branch 'liuzj-1000975-dev' into test 2 سال پیش
  zqwang ea0e22048a Merge branch 'wzq-tj-xyh' into test 2 سال پیش
  liuzejian 07776944cf Merge branch 'liuzj-1000967-dev' into test 2 سال پیش
  liuzejian 34be001bbd Merge branch 'liuzj-1000967-dev' into test 2 سال پیش
  liuzejian 0eb223f3b6 Merge branch 'liuzj-1000967-dev' into test 2 سال پیش
  liuzejian 70411c9c10 Merge branch 'liuzj-weixin-tishen-dev' into test 2 سال پیش
  liuzejian bcb10a16ac Merge branch 'liuzj-weixin-tishen-dev' into test 2 سال پیش
  liuzejian dcac302214 Merge branch 'liuzj-weixin-tishen-dev' into test 2 سال پیش
  liuzejian f6141c8c39 Merge branch 'liuzj-weixin-tishen-dev' into test 2 سال پیش
  liuzejian 9ad601b22e Merge branch 'liuzj-weixin-tishen-dev' into test 2 سال پیش
  liuzejian a929560f1a Merge branch 'liuzj-weixin-tishen-dev' into test 2 سال پیش
  liuzejian ce16ff6ae6 Merge branch 'liuzj-1000967-dev' into test 2 سال پیش
  zqwang 9e425c0656 Merge remote-tracking branch 'origin/wzq-tj-xyh' into test 2 سال پیش
  liuzejian d5e4e96764 Merge branch 'liuzj-1000967-dev' into test 2 سال پیش
  admin 9e8cba2e9f Merge branch 'master' of qk:zy_duanju/duanju_manage into test 2 سال پیش
  admin d69e62ea61 Merge branch 'test' of qk:zy_duanju/duanju_manage into test 2 سال پیش
  admin 9f59a922e2 Merge branch 'test' of qk:zy_duanju/duanju_manage into test 2 سال پیش
  admin dfe1874c1e Merge branch 'test' of qk:zy_duanju/duanju_manage into test 2 سال پیش
  admin cccea845bf Merge branch 'test' of qk:zy_duanju/duanju_manage into test 2 سال پیش
  admin c6ee08b475 Merge branch 'test' of qk:zy_duanju/duanju_manage into test 2 سال پیش
  admin 13b8ed6142 Merge branch 'test' of qk:zy_duanju/duanju_manage into test 2 سال پیش
  admin de789c3bf6 Merge branch 'test' of qk:zy_duanju/duanju_manage into test 2 سال پیش
  admin 6c42556596 Merge branch 'test' of qk:zy_duanju/duanju_manage into test 2 سال پیش
  admin aee48ef306 Merge branch 'test' of qk:zy_duanju/duanju_manage into test 2 سال پیش
  admin 7927ef968c Merge branch 'test' of qk:zy_duanju/duanju_manage into test 2 سال پیش
  admin 629f694836 Merge branch 'test' of qk:zy_duanju/duanju_manage into test 2 سال پیش
  admin 5eef23d38e Merge branch 'test' of qk:zy_duanju/duanju_manage into test 2 سال پیش
  admin 35e92fb1ba Merge branch 'test' of qk:zy_duanju/duanju_manage into test 2 سال پیش
  admin b8445c33ba Merge branch 'test' of qk:zy_duanju/duanju_manage into test 2 سال پیش
  admin 3783be3eaf Merge branch 'test' of qk:zy_duanju/duanju_manage into test 2 سال پیش
  admin 51f5f07dfd Merge branch 'test' of qk:zy_duanju/duanju_manage into test 2 سال پیش
  admin 1015c60d85 Merge branch 'test' of qk:zy_duanju/duanju_manage into test 2 سال پیش
  admin 3cbd1937bc Merge branch 'test' of qk:zy_duanju/duanju_manage into test 2 سال پیش
  admin 91cdaa884f Merge branch 'test' of qk:zy_duanju/duanju_manage into test 2 سال پیش
  admin 31ac0cc388 Merge branch 'test' of qk:zy_duanju/duanju_manage into test 2 سال پیش
  admin 41df574983 Merge branch 'test' of qk:zy_duanju/duanju_manage into test 2 سال پیش
  admin c467b5078b Merge branch 'test' of qk:zy_duanju/duanju_manage into test 2 سال پیش
  admin d5c2d7bb64 Merge branch 'test' of qk:zy_duanju/duanju_manage into test 2 سال پیش
  admin 195e2bc536 Merge branch 'test' of qk:zy_duanju/duanju_manage into test 2 سال پیش
  admin 916c96adfd Merge branch 'wzq-skyh' of qk:zy_duanju/duanju_manage into test 2 سال پیش
  zqwang 1715a3da50 Merge branch 'wzq-skyh' of 121.36.198.49:zy_duanju/duanju_manage into test 2 سال پیش
  liuzejian 6691c9a1bb Merge branch 'stable' into liuzj-1000979-dev 2 سال پیش
  liuzejian 286e7c98de 染色规则配置 2 سال پیش
  zhaoyang f76b6d769b Merge branch 'master' into stable 2 سال پیش
  zqwang 0db4ead11f 暂存 2 سال پیش
  zqwang 6f964fb476 解决冲突 2 سال پیش
  zqwang d7cde1e4db 结算更新 2 سال پیش
  zqwang 8c25b2e689 频道删除 2 سال پیش
  zqwang 1e4a30614b 频道删除 2 سال پیش
  zqwang 79e0a6cf01 频道删除 2 سال پیش
  zqwang bfbb78cdd4 频道管理 2 سال پیش
  zqwang c2a99e7651 更新轮播图 2 سال پیش
  zqwang 49ff48f712 更新轮播图 2 سال پیش
  zqwang 27ace29b50 更新 2 سال پیش
  liuzejian 717b0438db 上下架 2 سال پیش
  liuzejian 8ef6ea9af6 首页列表配置 2 سال پیش
  liuzejian 17c864d414 Merge branch 'liuzj-pay-dev' into liuzj-fist-page-dev 2 سال پیش
  liuzejian 70f4fcc4cb 优化导入 2 سال پیش
  liuzejian 2754e0e1d9 Merge branch 'liuzj-youhuashi-fix' into stable 2 سال پیش
  zqwang 4235232a16 Merge branch 'order' into stable 2 سال پیش
  liuzejian d6be31a34d Merge branch 'liuzj-permission-dev' into test 2 سال پیش
  liuzejian 021fc9c42a Merge branch 'liuzj-permission-dev' into test 2 سال پیش
  zqwang b569dc81e6 Merge branch 'order' into test 2 سال پیش
  zqwang c8182b1441 Merge branch 'order' into test 2 سال پیش
  zqwang 3316b7403d Merge branch 'order' into test 2 سال پیش
  liuzejian 7a24feb9c7 Merge branch 'liuzj-permission-dev' into test 2 سال پیش
  admin 73f8544474 Merge branch 'test' of qk:zy_duanju/duanju_manage into test 2 سال پیش
  admin 1d3823a73e Merge branch 'master' of qk:zy_duanju/duanju_manage into test 2 سال پیش
  zqwang c9bd39f5d7 Merge branch 'order' into test 2 سال پیش
  zqwang d09217961e Merge branch 'order' into test 2 سال پیش
  zhaoyang 18776b4dac allocation miniprogram fix 2 سال پیش
  liuzejian 57a55d6545 视频下载地址,是用源文件 2 سال پیش
  liuzejian f3d3446765 Merge branch 'liuzj-permission-dev' into test 2 سال پیش
  liuzejian aba2639fcf Merge branch 'liuzj-permission-dev' into test 2 سال پیش
  liuzejian 5edcc85ea4 Merge branch 'liuzj-permission-dev' into test 2 سال پیش
  liuzejian bab7b964ef Merge branch 'liuzj-permission-dev' into test 2 سال پیش
  zqwang 6ab281cb8a Merge branch 'order' into test 2 سال پیش
  zqwang 695c5db659 Merge branch 'order' into test 2 سال پیش
  zqwang 17bda237da Merge branch 'order' into test 2 سال پیش
  zqwang 852cccf86b Merge branch 'order' into test 2 سال پیش
  zqwang 6c733dbd2e Merge branch 'order' into test 2 سال پیش
  zqwang e0be34d6d4 Merge branch 'order' into test 2 سال پیش
  zqwang 0d3de12b13 Merge branch 'order' into test 2 سال پیش
  zqwang 2e15dabb58 Merge branch 'order' into test 2 سال پیش
  zqwang 89d62da6a7 Merge branch 'order' into test 2 سال پیش
  zqwang 2c39f3fcb7 Merge branch 'order' into test 2 سال پیش
  zqwang a3b4152cf0 Merge branch 'order' into test 2 سال پیش
  liuzejian f576f180dd Merge branch 'liuzj-permission-dev' into test 2 سال پیش
  zqwang 6d36f6a160 Merge branch 'order' into test 2 سال پیش
  zqwang 6b0ce28ff9 Merge branch 'order' into test 2 سال پیش
  zqwang 53b7954f1d Merge branch 'order' into test 2 سال پیش
  zqwang dc1ad67661 Merge branch 'order' into test 2 سال پیش
  zqwang b00b1c07cc Merge branch 'order' into test 2 سال پیش
  liuzejian 9743c580d6 Merge branch 'liuzj-permission-dev' into test 2 سال پیش
  liuzejian f44622f0f9 Merge branch 'liuzj-permission-dev' into test 2 سال پیش
  liuzejian c9e25f58b7 Merge branch 'liuzj-permission-dev' into test 2 سال پیش
  zqwang d1ddaae132 Merge branch 'order' into test 2 سال پیش
  liuzejian d643457162 Merge branch 'liuzj-permission-dev' into test 2 سال پیش
  liuzejian d225603f9f Merge branch 'liuzj-permission-dev' into test 2 سال پیش
  liuzejian 60b475d610 Merge branch 'liuzj-permission-dev' into test 2 سال پیش
  liuzejian 7010a9af01 Merge branch 'liuzj-permission-dev' into test 2 سال پیش
  liuzejian dbdbb467a3 Merge branch 'liuzj-permission-dev' into test 2 سال پیش
  liuzejian 40e10304e4 Merge branch 'liuzj-permission-dev' into test 2 سال پیش
  liuzejian 75ee4259e2 Merge branch 'liuzj-permission-dev' into test 2 سال پیش
  liuzejian b2572bfc8e Merge branch 'liuzj-permission-dev' into test 2 سال پیش
  liuzejian ae9e252e0a Merge branch 'liuzj-permission-dev' into test 2 سال پیش
  zqwang 7d8218c15e 优化师选择选,推广选择项增加小程序参数 2 سال پیش
  zqwang 8c41cf43eb 优化师选择选,推广选择项增加小程序参数 2 سال پیش
  zqwang c2dbb31d61 阅读记录 2 سال پیش
  zqwang 08e2745b57 用户详情充值记录分页 2 سال پیش
  zqwang 7ac80d3ae5 用户详情充值记录分页 2 سال پیش
  zqwang ebd5a9d583 更新用户订单分页 2 سال پیش
  zqwang 61a4abef4f 更新 2 سال پیش
  zqwang 8bf3aa33a1 去除空格 2 سال پیش
  zqwang 6c8fa3e550 更新 2 سال پیش
  zqwang b0f45e0bbe 更新 2 سال پیش
  zqwang 07c16ff8e8 创建 2 سال پیش
  zqwang b4e52d4fae 结算模块修正 2 سال پیش
  zqwang e9a6cd4174 用户充值记录增加账户属性隔离 2 سال پیش
  liuzejian 459d1a12c3 Merge branch 'liuzj-permission-dev' into test 2 سال پیش
  zqwang d571cf3ed6 Merge branch 'test' of 121.36.198.49:zy_duanju/duanju_manage into test 2 سال پیش
  zqwang 3734cb0ae7 Merge branch 'master' into test 2 سال پیش
  zqwang 87c16f5f5c Merge branch 'master' into test 2 سال پیش
  zqwang 577c48e25f :wq 2 سال پیش
  zqwang 836d3f7029 Merge branch 'wzq-sj' into test 2 سال پیش
  admin a31579932d Merge branch 'test' of qk:zy_duanju/duanju_manage into test 2 سال پیش
  admin 07b185e9ac Merge branch 'master' of qk:zy_duanju/duanju_manage into test 2 سال پیش
  zqwang 6979dfd87c Merge branch 'wzq_user-detail' into test 2 سال پیش
  zqwang 2b8d74d977 Merge branch 'wzq_user-detail' into test 2 سال پیش
  liuzejian 7f5a304877 Merge branch 'liuzj-permission-dev' into test 2 سال پیش
  liuzejian bcfc7b9964 Merge branch 'liuzj-permission-dev' into test 2 سال پیش
  admin b526919411 Merge branch 'master' of qk:zy_duanju/duanju_manage into test 2 سال پیش
  liuzejian 90752c6850 Merge branch 'liuzj-permission-dev' into test 2 سال پیش
  liuzejian 6db01eb019 Merge branch 'liuzj-permission-dev' into test 2 سال پیش
  liuzejian 712e38d8bf Merge branch 'liuzj-permission-dev' into test 2 سال پیش
  liuzejian afb2157a9b Merge branch 'liuzj-permission-dev' into test 2 سال پیش
  liuzejian 020b9d842c Merge branch 'liuzj-permission-dev' into test 2 سال پیش
  liuzejian 5ece488d61 Merge branch 'liuzj-permission-dev' into test 2 سال پیش
  liuzejian 8fffda13f7 Merge branch 'liuzj-permission-dev' into test 2 سال پیش
  liuzejian f391c37743 Merge branch 'liuzj-permission-dev' into test 2 سال پیش
  liuzejian a801ee0fd1 Merge branch 'liuzj-permission-dev' into test 2 سال پیش
  liuzejian e75ca62372 Merge branch 'liuzj-permission-dev' into test 2 سال پیش
  liuzejian 0023a3c67c Merge branch 'liuzj-permission-dev' into test 2 سال پیش
  liuzejian f3484d4363 Merge branch 'liuzj-permission-dev' into test 2 سال پیش
  liuzejian 43775ead58 Merge branch 'liuzj-permission-dev' into test 2 سال پیش
  liuzejian 9f26c40a32 Merge branch 'liuzj-permission-dev' into test 2 سال پیش
  tgz 328c3250e6 去除无用md 2 سال پیش
  liuzejian ef34d16898 Merge branch 'liuzj-permission-dev' into test 2 سال پیش
  liuzejian 897b345253 Merge branch 'test' of qk:zy_duanju/duanju_manage into test 2 سال پیش
  liuzejian ed54edb64f Merge branch 'liuzj-permission-dev' into test 2 سال پیش
  liuzejian 8c69a98c00 Merge branch 'liuzj-permission-dev' into test 2 سال پیش
  liuzejian 395887643c Merge branch 'liuzj-permission-dev' into test 2 سال پیش
  zhaoyang d5b53554f9 pay template 2 سال پیش
  zhaoyang 39fbb64f9e pay template 2 سال پیش
  zhaoyang 7b4b35d465 merge 2 سال پیش
  zhaoyang 5f4efc7647 pay template 2 سال پیش
  zhaoyang 78922e2913 miniprogram index paginate 2 سال پیش
  zhaoyang 975e0f69bf comment fix 2 سال پیش
  zhaoyang 56e0384132 comment fix 2 سال پیش
  zhaoyang 92c49d7ad8 comment 2 سال پیش
  zhaoyang 6f85886aed fix message 2 سال پیش
  zhaoyang 4a843fa286 miniprogram update fix 2 سال پیش
  zhaoyang a42d014adb allocation miniprogram 2 سال پیش
  zhaoyang fb1aaa4e36 allocation miniprogram 2 سال پیش
  zhaoyang 6e5cfe4a01 fix error 2 سال پیش
  zhaoyang 47ffb0f937 manage 2 سال پیش
  zhaoyang 06a40478e7 test 2 سال پیش
  zhaoyang 4206ffaae0 test 2 سال پیش
  zhaoyang d1097cee85 test 2 سال پیش
  zhaoyang e21bce9c0a test 2 سال پیش
  zhaoyang 1dff38e032 test 2 سال پیش
  zhaoyang f9b7ebcbcd commflict 2 سال پیش
  zhaoyang 75960088d0 miniprogram 2 سال پیش
  zhaoyang 25ddff0110 init miniprogram 2 سال پیش
  zqwang 71f5d8d83e 新增Cp管理 2 سال پیش
  zqwang 15c41b16d7 Merge branch 'liuzj-permission-dev' of 121.36.198.49:zy_duanju/duanju_manage into cp 2 سال پیش
  zqwang 4f9a0856a5 更新 2 سال پیش
  zqwang 3ebc92e63b 创建短剧cp管理模块 2 سال پیش
  zqwang 9db59a00d9 删除文件 2 سال پیش
  zqwang d8c7ab9516 创建模块 2 سال پیش
  liuzejian f92dbe8241 init 2 سال پیش
1فایلهای تغییر یافته به همراه2 افزوده شده و 2 حذف شده
  1. 2 2
      modules/WechatPlatform/Services/WechatMenuService.php

+ 2 - 2
modules/WechatPlatform/Services/WechatMenuService.php

@@ -97,7 +97,7 @@ class WechatMenuService extends BaseService
             // myLog('wx-meun')->info(['res' => $res]);
             $wxMenuId = getProp($res, 'menuid', "");
             $res = $app->menu->create($val->content, $matchRule);
-            myLog('wx-meun')->info(['res' => $res,'mid' => $wxMenuId]);
+            // myLog('wx-meun')->info(['res' => $res,'mid' => $wxMenuId]);
             if ($wxMenuId) {
                 WechatAccountMenuDetail::query()->where('id', $val->id)->update(['wx_menuid' => $wxMenuId]);
             }
@@ -332,7 +332,7 @@ class WechatMenuService extends BaseService
             $sql->where('title', "like", "%" . $param['title'] . "%");
         }
         if (getProp($param, 'type')) {
-            $sql->where('user_id', $param['type']);
+            $sql->where('type', $param['type']);
         }
         if (getProp($param, 'miniprogram_id')) {
             $sql->where('miniprogram_id', $param['miniprogram_id']);