作者 王晓刚
1 个管道 的构建 失败 耗费 9 秒

同步

... ... @@ -2,10 +2,208 @@
<project version="4">
<component name="BookmarkManager">
<bookmark url="file://$PROJECT_DIR$/application/home/view/member/my_information.html" line="118" mnemonic="4" />
<bookmark url="remoteDeploymentFS://&lt;aa3c1771-75c3-4a1c-af6a-8e27a9afc38b&gt;/public/assets/js/backend/users.js" line="19" />
</component>
<component name="ChangeListManager">
<list default="true" id="309ad746-5b2a-4c29-af46-e7925a35765c" name="默认的" comment="">
<change afterPath="$PROJECT_DIR$/public/assets/fonts/PingFang Medium.ttf" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.gitlab-ci.yml" beforeDir="false" afterPath="$PROJECT_DIR$/.gitlab-ci.yml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/addons/ueditor/assets/dialogs/anchor/anchor.html" beforeDir="false" afterPath="$PROJECT_DIR$/addons/ueditor/assets/dialogs/anchor/anchor.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/addons/ueditor/assets/dialogs/attachment/attachment.css" beforeDir="false" afterPath="$PROJECT_DIR$/addons/ueditor/assets/dialogs/attachment/attachment.css" afterDir="false" />
<change beforePath="$PROJECT_DIR$/addons/ueditor/assets/dialogs/attachment/attachment.html" beforeDir="false" afterPath="$PROJECT_DIR$/addons/ueditor/assets/dialogs/attachment/attachment.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/addons/ueditor/assets/dialogs/background/background.css" beforeDir="false" afterPath="$PROJECT_DIR$/addons/ueditor/assets/dialogs/background/background.css" afterDir="false" />
<change beforePath="$PROJECT_DIR$/addons/ueditor/assets/dialogs/background/background.html" beforeDir="false" afterPath="$PROJECT_DIR$/addons/ueditor/assets/dialogs/background/background.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/addons/ueditor/assets/dialogs/background/background.js" beforeDir="false" afterPath="$PROJECT_DIR$/addons/ueditor/assets/dialogs/background/background.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/addons/ueditor/assets/dialogs/charts/charts.html" beforeDir="false" afterPath="$PROJECT_DIR$/addons/ueditor/assets/dialogs/charts/charts.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/addons/ueditor/assets/dialogs/emotion/emotion.css" beforeDir="false" afterPath="$PROJECT_DIR$/addons/ueditor/assets/dialogs/emotion/emotion.css" afterDir="false" />
<change beforePath="$PROJECT_DIR$/addons/ueditor/assets/dialogs/emotion/emotion.html" beforeDir="false" afterPath="$PROJECT_DIR$/addons/ueditor/assets/dialogs/emotion/emotion.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/addons/ueditor/assets/dialogs/emotion/emotion.js" beforeDir="false" afterPath="$PROJECT_DIR$/addons/ueditor/assets/dialogs/emotion/emotion.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/addons/ueditor/assets/dialogs/gmap/gmap.html" beforeDir="false" afterPath="$PROJECT_DIR$/addons/ueditor/assets/dialogs/gmap/gmap.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/addons/ueditor/assets/dialogs/help/help.css" beforeDir="false" afterPath="$PROJECT_DIR$/addons/ueditor/assets/dialogs/help/help.css" afterDir="false" />
<change beforePath="$PROJECT_DIR$/addons/ueditor/assets/dialogs/help/help.html" beforeDir="false" afterPath="$PROJECT_DIR$/addons/ueditor/assets/dialogs/help/help.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/addons/ueditor/assets/dialogs/help/help.js" beforeDir="false" afterPath="$PROJECT_DIR$/addons/ueditor/assets/dialogs/help/help.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/addons/ueditor/assets/dialogs/image/image.css" beforeDir="false" afterPath="$PROJECT_DIR$/addons/ueditor/assets/dialogs/image/image.css" afterDir="false" />
<change beforePath="$PROJECT_DIR$/addons/ueditor/assets/dialogs/image/image.html" beforeDir="false" afterPath="$PROJECT_DIR$/addons/ueditor/assets/dialogs/image/image.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/addons/ueditor/assets/dialogs/image/image.js" beforeDir="false" afterPath="$PROJECT_DIR$/addons/ueditor/assets/dialogs/image/image.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/addons/ueditor/assets/dialogs/insertframe/insertframe.html" beforeDir="false" afterPath="$PROJECT_DIR$/addons/ueditor/assets/dialogs/insertframe/insertframe.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/addons/ueditor/assets/dialogs/internal.js" beforeDir="false" afterPath="$PROJECT_DIR$/addons/ueditor/assets/dialogs/internal.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/addons/ueditor/assets/dialogs/link/link.html" beforeDir="false" afterPath="$PROJECT_DIR$/addons/ueditor/assets/dialogs/link/link.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/addons/ueditor/assets/dialogs/map/map.html" beforeDir="false" afterPath="$PROJECT_DIR$/addons/ueditor/assets/dialogs/map/map.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/addons/ueditor/assets/dialogs/music/music.css" beforeDir="false" afterPath="$PROJECT_DIR$/addons/ueditor/assets/dialogs/music/music.css" afterDir="false" />
<change beforePath="$PROJECT_DIR$/addons/ueditor/assets/dialogs/music/music.html" beforeDir="false" afterPath="$PROJECT_DIR$/addons/ueditor/assets/dialogs/music/music.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/addons/ueditor/assets/dialogs/music/music.js" beforeDir="false" afterPath="$PROJECT_DIR$/addons/ueditor/assets/dialogs/music/music.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/addons/ueditor/assets/dialogs/scrawl/scrawl.css" beforeDir="false" afterPath="$PROJECT_DIR$/addons/ueditor/assets/dialogs/scrawl/scrawl.css" afterDir="false" />
<change beforePath="$PROJECT_DIR$/addons/ueditor/assets/dialogs/scrawl/scrawl.html" beforeDir="false" afterPath="$PROJECT_DIR$/addons/ueditor/assets/dialogs/scrawl/scrawl.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/addons/ueditor/assets/dialogs/scrawl/scrawl.js" beforeDir="false" afterPath="$PROJECT_DIR$/addons/ueditor/assets/dialogs/scrawl/scrawl.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/addons/ueditor/assets/dialogs/searchreplace/searchreplace.html" beforeDir="false" afterPath="$PROJECT_DIR$/addons/ueditor/assets/dialogs/searchreplace/searchreplace.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/addons/ueditor/assets/dialogs/searchreplace/searchreplace.js" beforeDir="false" afterPath="$PROJECT_DIR$/addons/ueditor/assets/dialogs/searchreplace/searchreplace.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/addons/ueditor/assets/dialogs/snapscreen/snapscreen.html" beforeDir="false" afterPath="$PROJECT_DIR$/addons/ueditor/assets/dialogs/snapscreen/snapscreen.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/addons/ueditor/assets/dialogs/spechars/spechars.html" beforeDir="false" afterPath="$PROJECT_DIR$/addons/ueditor/assets/dialogs/spechars/spechars.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/addons/ueditor/assets/dialogs/spechars/spechars.js" beforeDir="false" afterPath="$PROJECT_DIR$/addons/ueditor/assets/dialogs/spechars/spechars.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/addons/ueditor/assets/dialogs/template/config.js" beforeDir="false" afterPath="$PROJECT_DIR$/addons/ueditor/assets/dialogs/template/config.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/addons/ueditor/assets/dialogs/template/template.css" beforeDir="false" afterPath="$PROJECT_DIR$/addons/ueditor/assets/dialogs/template/template.css" afterDir="false" />
<change beforePath="$PROJECT_DIR$/addons/ueditor/assets/dialogs/template/template.html" beforeDir="false" afterPath="$PROJECT_DIR$/addons/ueditor/assets/dialogs/template/template.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/addons/ueditor/assets/dialogs/template/template.js" beforeDir="false" afterPath="$PROJECT_DIR$/addons/ueditor/assets/dialogs/template/template.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/addons/ueditor/assets/dialogs/video/video.css" beforeDir="false" afterPath="$PROJECT_DIR$/addons/ueditor/assets/dialogs/video/video.css" afterDir="false" />
<change beforePath="$PROJECT_DIR$/addons/ueditor/assets/dialogs/video/video.html" beforeDir="false" afterPath="$PROJECT_DIR$/addons/ueditor/assets/dialogs/video/video.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/addons/ueditor/assets/dialogs/video/video.js" beforeDir="false" afterPath="$PROJECT_DIR$/addons/ueditor/assets/dialogs/video/video.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/addons/ueditor/assets/dialogs/webapp/webapp.html" beforeDir="false" afterPath="$PROJECT_DIR$/addons/ueditor/assets/dialogs/webapp/webapp.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/addons/ueditor/assets/dialogs/wordimage/wordimage.html" beforeDir="false" afterPath="$PROJECT_DIR$/addons/ueditor/assets/dialogs/wordimage/wordimage.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/addons/ueditor/assets/dialogs/wordimage/wordimage.js" beforeDir="false" afterPath="$PROJECT_DIR$/addons/ueditor/assets/dialogs/wordimage/wordimage.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/addons/ueditor/assets/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/addons/ueditor/assets/index.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/addons/ueditor/assets/lang/en/en.js" beforeDir="false" afterPath="$PROJECT_DIR$/addons/ueditor/assets/lang/en/en.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/addons/ueditor/assets/lang/zh-cn/zh-cn.js" beforeDir="false" afterPath="$PROJECT_DIR$/addons/ueditor/assets/lang/zh-cn/zh-cn.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/addons/ueditor/assets/themes/default/css/ueditor.css" beforeDir="false" afterPath="$PROJECT_DIR$/addons/ueditor/assets/themes/default/css/ueditor.css" afterDir="false" />
<change beforePath="$PROJECT_DIR$/addons/ueditor/assets/themes/default/dialogbase.css" beforeDir="false" afterPath="$PROJECT_DIR$/addons/ueditor/assets/themes/default/dialogbase.css" afterDir="false" />
<change beforePath="$PROJECT_DIR$/addons/ueditor/assets/themes/iframe.css" beforeDir="false" afterPath="$PROJECT_DIR$/addons/ueditor/assets/themes/iframe.css" afterDir="false" />
<change beforePath="$PROJECT_DIR$/addons/ueditor/assets/third-party/codemirror/codemirror.js" beforeDir="false" afterPath="$PROJECT_DIR$/addons/ueditor/assets/third-party/codemirror/codemirror.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/addons/ueditor/config.php" beforeDir="false" afterPath="$PROJECT_DIR$/addons/ueditor/config.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/application/admin/view/goods/add.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/admin/view/goods/add.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/application/admin/view/goods/edit.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/admin/view/goods/edit.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/application/admin/view/goods_audit/edit.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/admin/view/goods_audit/edit.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/application/admin/view/merchant_goods/add.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/admin/view/merchant_goods/add.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/application/admin/view/merchant_goods/edit.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/admin/view/merchant_goods/edit.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/application/home/controller/Goods.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/home/controller/Goods.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/application/home/controller/Member.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/home/controller/Member.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/application/home/controller/Question.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/home/controller/Question.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/application/home/controller/Share.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/home/controller/Share.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/application/home/view/member/earnings_log.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/home/view/member/earnings_log.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/application/home/view/member/my_withdraw.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/home/view/member/my_withdraw.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/public/assets/addons/ueditor/dialogs/anchor/anchor.html" beforeDir="false" afterPath="$PROJECT_DIR$/public/assets/addons/ueditor/dialogs/anchor/anchor.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/public/assets/addons/ueditor/dialogs/attachment/attachment.css" beforeDir="false" afterPath="$PROJECT_DIR$/public/assets/addons/ueditor/dialogs/attachment/attachment.css" afterDir="false" />
<change beforePath="$PROJECT_DIR$/public/assets/addons/ueditor/dialogs/attachment/attachment.html" beforeDir="false" afterPath="$PROJECT_DIR$/public/assets/addons/ueditor/dialogs/attachment/attachment.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/public/assets/addons/ueditor/dialogs/background/background.css" beforeDir="false" afterPath="$PROJECT_DIR$/public/assets/addons/ueditor/dialogs/background/background.css" afterDir="false" />
<change beforePath="$PROJECT_DIR$/public/assets/addons/ueditor/dialogs/background/background.html" beforeDir="false" afterPath="$PROJECT_DIR$/public/assets/addons/ueditor/dialogs/background/background.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/public/assets/addons/ueditor/dialogs/background/background.js" beforeDir="false" afterPath="$PROJECT_DIR$/public/assets/addons/ueditor/dialogs/background/background.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/public/assets/addons/ueditor/dialogs/charts/charts.html" beforeDir="false" afterPath="$PROJECT_DIR$/public/assets/addons/ueditor/dialogs/charts/charts.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/public/assets/addons/ueditor/dialogs/emotion/emotion.css" beforeDir="false" afterPath="$PROJECT_DIR$/public/assets/addons/ueditor/dialogs/emotion/emotion.css" afterDir="false" />
<change beforePath="$PROJECT_DIR$/public/assets/addons/ueditor/dialogs/emotion/emotion.html" beforeDir="false" afterPath="$PROJECT_DIR$/public/assets/addons/ueditor/dialogs/emotion/emotion.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/public/assets/addons/ueditor/dialogs/emotion/emotion.js" beforeDir="false" afterPath="$PROJECT_DIR$/public/assets/addons/ueditor/dialogs/emotion/emotion.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/public/assets/addons/ueditor/dialogs/gmap/gmap.html" beforeDir="false" afterPath="$PROJECT_DIR$/public/assets/addons/ueditor/dialogs/gmap/gmap.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/public/assets/addons/ueditor/dialogs/help/help.css" beforeDir="false" afterPath="$PROJECT_DIR$/public/assets/addons/ueditor/dialogs/help/help.css" afterDir="false" />
<change beforePath="$PROJECT_DIR$/public/assets/addons/ueditor/dialogs/help/help.html" beforeDir="false" afterPath="$PROJECT_DIR$/public/assets/addons/ueditor/dialogs/help/help.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/public/assets/addons/ueditor/dialogs/help/help.js" beforeDir="false" afterPath="$PROJECT_DIR$/public/assets/addons/ueditor/dialogs/help/help.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/public/assets/addons/ueditor/dialogs/image/image.css" beforeDir="false" afterPath="$PROJECT_DIR$/public/assets/addons/ueditor/dialogs/image/image.css" afterDir="false" />
<change beforePath="$PROJECT_DIR$/public/assets/addons/ueditor/dialogs/image/image.html" beforeDir="false" afterPath="$PROJECT_DIR$/public/assets/addons/ueditor/dialogs/image/image.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/public/assets/addons/ueditor/dialogs/image/image.js" beforeDir="false" afterPath="$PROJECT_DIR$/public/assets/addons/ueditor/dialogs/image/image.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/public/assets/addons/ueditor/dialogs/insertframe/insertframe.html" beforeDir="false" afterPath="$PROJECT_DIR$/public/assets/addons/ueditor/dialogs/insertframe/insertframe.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/public/assets/addons/ueditor/dialogs/internal.js" beforeDir="false" afterPath="$PROJECT_DIR$/public/assets/addons/ueditor/dialogs/internal.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/public/assets/addons/ueditor/dialogs/link/link.html" beforeDir="false" afterPath="$PROJECT_DIR$/public/assets/addons/ueditor/dialogs/link/link.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/public/assets/addons/ueditor/dialogs/map/map.html" beforeDir="false" afterPath="$PROJECT_DIR$/public/assets/addons/ueditor/dialogs/map/map.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/public/assets/addons/ueditor/dialogs/music/music.css" beforeDir="false" afterPath="$PROJECT_DIR$/public/assets/addons/ueditor/dialogs/music/music.css" afterDir="false" />
<change beforePath="$PROJECT_DIR$/public/assets/addons/ueditor/dialogs/music/music.html" beforeDir="false" afterPath="$PROJECT_DIR$/public/assets/addons/ueditor/dialogs/music/music.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/public/assets/addons/ueditor/dialogs/music/music.js" beforeDir="false" afterPath="$PROJECT_DIR$/public/assets/addons/ueditor/dialogs/music/music.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/public/assets/addons/ueditor/dialogs/scrawl/scrawl.css" beforeDir="false" afterPath="$PROJECT_DIR$/public/assets/addons/ueditor/dialogs/scrawl/scrawl.css" afterDir="false" />
<change beforePath="$PROJECT_DIR$/public/assets/addons/ueditor/dialogs/scrawl/scrawl.html" beforeDir="false" afterPath="$PROJECT_DIR$/public/assets/addons/ueditor/dialogs/scrawl/scrawl.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/public/assets/addons/ueditor/dialogs/scrawl/scrawl.js" beforeDir="false" afterPath="$PROJECT_DIR$/public/assets/addons/ueditor/dialogs/scrawl/scrawl.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/public/assets/addons/ueditor/dialogs/searchreplace/searchreplace.html" beforeDir="false" afterPath="$PROJECT_DIR$/public/assets/addons/ueditor/dialogs/searchreplace/searchreplace.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/public/assets/addons/ueditor/dialogs/searchreplace/searchreplace.js" beforeDir="false" afterPath="$PROJECT_DIR$/public/assets/addons/ueditor/dialogs/searchreplace/searchreplace.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/public/assets/addons/ueditor/dialogs/snapscreen/snapscreen.html" beforeDir="false" afterPath="$PROJECT_DIR$/public/assets/addons/ueditor/dialogs/snapscreen/snapscreen.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/public/assets/addons/ueditor/dialogs/spechars/spechars.html" beforeDir="false" afterPath="$PROJECT_DIR$/public/assets/addons/ueditor/dialogs/spechars/spechars.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/public/assets/addons/ueditor/dialogs/spechars/spechars.js" beforeDir="false" afterPath="$PROJECT_DIR$/public/assets/addons/ueditor/dialogs/spechars/spechars.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/public/assets/addons/ueditor/dialogs/template/config.js" beforeDir="false" afterPath="$PROJECT_DIR$/public/assets/addons/ueditor/dialogs/template/config.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/public/assets/addons/ueditor/dialogs/template/template.css" beforeDir="false" afterPath="$PROJECT_DIR$/public/assets/addons/ueditor/dialogs/template/template.css" afterDir="false" />
<change beforePath="$PROJECT_DIR$/public/assets/addons/ueditor/dialogs/template/template.html" beforeDir="false" afterPath="$PROJECT_DIR$/public/assets/addons/ueditor/dialogs/template/template.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/public/assets/addons/ueditor/dialogs/template/template.js" beforeDir="false" afterPath="$PROJECT_DIR$/public/assets/addons/ueditor/dialogs/template/template.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/public/assets/addons/ueditor/dialogs/video/video.css" beforeDir="false" afterPath="$PROJECT_DIR$/public/assets/addons/ueditor/dialogs/video/video.css" afterDir="false" />
<change beforePath="$PROJECT_DIR$/public/assets/addons/ueditor/dialogs/video/video.html" beforeDir="false" afterPath="$PROJECT_DIR$/public/assets/addons/ueditor/dialogs/video/video.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/public/assets/addons/ueditor/dialogs/video/video.js" beforeDir="false" afterPath="$PROJECT_DIR$/public/assets/addons/ueditor/dialogs/video/video.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/public/assets/addons/ueditor/dialogs/webapp/webapp.html" beforeDir="false" afterPath="$PROJECT_DIR$/public/assets/addons/ueditor/dialogs/webapp/webapp.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/public/assets/addons/ueditor/dialogs/wordimage/wordimage.html" beforeDir="false" afterPath="$PROJECT_DIR$/public/assets/addons/ueditor/dialogs/wordimage/wordimage.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/public/assets/addons/ueditor/dialogs/wordimage/wordimage.js" beforeDir="false" afterPath="$PROJECT_DIR$/public/assets/addons/ueditor/dialogs/wordimage/wordimage.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/public/assets/addons/ueditor/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/public/assets/addons/ueditor/index.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/public/assets/addons/ueditor/lang/en/en.js" beforeDir="false" afterPath="$PROJECT_DIR$/public/assets/addons/ueditor/lang/en/en.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/public/assets/addons/ueditor/lang/zh-cn/zh-cn.js" beforeDir="false" afterPath="$PROJECT_DIR$/public/assets/addons/ueditor/lang/zh-cn/zh-cn.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/public/assets/addons/ueditor/themes/default/css/ueditor.css" beforeDir="false" afterPath="$PROJECT_DIR$/public/assets/addons/ueditor/themes/default/css/ueditor.css" afterDir="false" />
<change beforePath="$PROJECT_DIR$/public/assets/addons/ueditor/themes/default/dialogbase.css" beforeDir="false" afterPath="$PROJECT_DIR$/public/assets/addons/ueditor/themes/default/dialogbase.css" afterDir="false" />
<change beforePath="$PROJECT_DIR$/public/assets/addons/ueditor/themes/iframe.css" beforeDir="false" afterPath="$PROJECT_DIR$/public/assets/addons/ueditor/themes/iframe.css" afterDir="false" />
<change beforePath="$PROJECT_DIR$/public/assets/addons/ueditor/third-party/codemirror/codemirror.js" beforeDir="false" afterPath="$PROJECT_DIR$/public/assets/addons/ueditor/third-party/codemirror/codemirror.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/public/assets/advertising/css/advDetail.css" beforeDir="false" afterPath="$PROJECT_DIR$/public/assets/advertising/css/advDetail.css" afterDir="false" />
<change beforePath="$PROJECT_DIR$/public/assets/advertising/css/entry.css" beforeDir="false" afterPath="$PROJECT_DIR$/public/assets/advertising/css/entry.css" afterDir="false" />
<change beforePath="$PROJECT_DIR$/public/assets/advertising/css/index.css" beforeDir="false" afterPath="$PROJECT_DIR$/public/assets/advertising/css/index.css" afterDir="false" />
<change beforePath="$PROJECT_DIR$/public/assets/advertising/css/input.css" beforeDir="false" afterPath="$PROJECT_DIR$/public/assets/advertising/css/input.css" afterDir="false" />
<change beforePath="$PROJECT_DIR$/public/assets/advertising/css/myInvite.css" beforeDir="false" afterPath="$PROJECT_DIR$/public/assets/advertising/css/myInvite.css" afterDir="false" />
<change beforePath="$PROJECT_DIR$/public/assets/advertising/css/personal.css" beforeDir="false" afterPath="$PROJECT_DIR$/public/assets/advertising/css/personal.css" afterDir="false" />
<change beforePath="$PROJECT_DIR$/public/assets/advertising/css/personalMsg.css" beforeDir="false" afterPath="$PROJECT_DIR$/public/assets/advertising/css/personalMsg.css" afterDir="false" />
<change beforePath="$PROJECT_DIR$/public/assets/advertising/css/public.css" beforeDir="false" afterPath="$PROJECT_DIR$/public/assets/advertising/css/public.css" afterDir="false" />
<change beforePath="$PROJECT_DIR$/public/assets/advertising/css/record.css" beforeDir="false" afterPath="$PROJECT_DIR$/public/assets/advertising/css/record.css" afterDir="false" />
<change beforePath="$PROJECT_DIR$/public/assets/advertising/js/base.js" beforeDir="false" afterPath="$PROJECT_DIR$/public/assets/advertising/js/base.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/public/assets/advertising/js/jquery.js" beforeDir="false" afterPath="$PROJECT_DIR$/public/assets/advertising/js/jquery.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/public/assets/advertising/js/qqmap-wx-jssdk.js" beforeDir="false" afterPath="$PROJECT_DIR$/public/assets/advertising/js/qqmap-wx-jssdk.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/public/assets/advertising/js/toast.js" beforeDir="false" afterPath="$PROJECT_DIR$/public/assets/advertising/js/toast.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/public/assets/advertising/mui/city.data-3.js" beforeDir="false" afterPath="$PROJECT_DIR$/public/assets/advertising/mui/city.data-3.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/public/assets/advertising/mui/mui.min.css" beforeDir="false" afterPath="$PROJECT_DIR$/public/assets/advertising/mui/mui.min.css" afterDir="false" />
<change beforePath="$PROJECT_DIR$/public/assets/advertising/mui/mui.min.js" beforeDir="false" afterPath="$PROJECT_DIR$/public/assets/advertising/mui/mui.min.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/public/assets/advertising/mui/mui.picker.min.css" beforeDir="false" afterPath="$PROJECT_DIR$/public/assets/advertising/mui/mui.picker.min.css" afterDir="false" />
<change beforePath="$PROJECT_DIR$/public/assets/advertising/mui/mui.picker.min.js" beforeDir="false" afterPath="$PROJECT_DIR$/public/assets/advertising/mui/mui.picker.min.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/public/assets/js/require-backend.min.js" beforeDir="false" afterPath="$PROJECT_DIR$/public/assets/js/require-backend.min.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/public/assets/libs/art-template/demo/basic.html" beforeDir="false" afterPath="$PROJECT_DIR$/public/assets/libs/art-template/demo/basic.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/public/assets/libs/art-template/demo/compile.html" beforeDir="false" afterPath="$PROJECT_DIR$/public/assets/libs/art-template/demo/compile.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/public/assets/libs/art-template/demo/debug-syntax.html" beforeDir="false" afterPath="$PROJECT_DIR$/public/assets/libs/art-template/demo/debug-syntax.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/public/assets/libs/art-template/demo/debug.html" beforeDir="false" afterPath="$PROJECT_DIR$/public/assets/libs/art-template/demo/debug.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/public/assets/libs/art-template/demo/helper.html" beforeDir="false" afterPath="$PROJECT_DIR$/public/assets/libs/art-template/demo/helper.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/public/assets/libs/art-template/demo/include.html" beforeDir="false" afterPath="$PROJECT_DIR$/public/assets/libs/art-template/demo/include.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/public/assets/libs/art-template/demo/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/public/assets/libs/art-template/demo/index.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/public/assets/libs/art-template/demo/template-native/basic.html" beforeDir="false" afterPath="$PROJECT_DIR$/public/assets/libs/art-template/demo/template-native/basic.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/public/assets/libs/art-template/demo/template-native/compile.html" beforeDir="false" afterPath="$PROJECT_DIR$/public/assets/libs/art-template/demo/template-native/compile.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/public/assets/libs/art-template/demo/template-native/debug-syntax.html" beforeDir="false" afterPath="$PROJECT_DIR$/public/assets/libs/art-template/demo/template-native/debug-syntax.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/public/assets/libs/art-template/demo/template-native/debug.html" beforeDir="false" afterPath="$PROJECT_DIR$/public/assets/libs/art-template/demo/template-native/debug.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/public/assets/libs/art-template/demo/template-native/helper.html" beforeDir="false" afterPath="$PROJECT_DIR$/public/assets/libs/art-template/demo/template-native/helper.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/public/assets/libs/art-template/demo/template-native/include.html" beforeDir="false" afterPath="$PROJECT_DIR$/public/assets/libs/art-template/demo/template-native/include.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/public/assets/libs/art-template/demo/template-native/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/public/assets/libs/art-template/demo/template-native/index.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/public/assets/libs/art-template/demo/template-native/tag.html" beforeDir="false" afterPath="$PROJECT_DIR$/public/assets/libs/art-template/demo/template-native/tag.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/public/assets/libs/art-template/test/js/doT.js" beforeDir="false" afterPath="$PROJECT_DIR$/public/assets/libs/art-template/test/js/doT.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/public/assets/libs/art-template/test/js/easytemplate.js" beforeDir="false" afterPath="$PROJECT_DIR$/public/assets/libs/art-template/test/js/easytemplate.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/public/assets/libs/art-template/test/js/jquery.tmpl.js" beforeDir="false" afterPath="$PROJECT_DIR$/public/assets/libs/art-template/test/js/jquery.tmpl.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/public/assets/libs/art-template/test/js/tmpl.js" beforeDir="false" afterPath="$PROJECT_DIR$/public/assets/libs/art-template/test/js/tmpl.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/public/assets/libs/art-template/test/test-speed.html" beforeDir="false" afterPath="$PROJECT_DIR$/public/assets/libs/art-template/test/test-speed.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/public/assets/libs/bootstrap-select/dist/css/bootstrap-select.css" beforeDir="false" afterPath="$PROJECT_DIR$/public/assets/libs/bootstrap-select/dist/css/bootstrap-select.css" afterDir="false" />
<change beforePath="$PROJECT_DIR$/public/assets/libs/bootstrap-select/dist/css/bootstrap-select.min.css" beforeDir="false" afterPath="$PROJECT_DIR$/public/assets/libs/bootstrap-select/dist/css/bootstrap-select.min.css" afterDir="false" />
<change beforePath="$PROJECT_DIR$/public/assets/libs/fastadmin-addtabs/jquery.addtabs.js" beforeDir="false" afterPath="$PROJECT_DIR$/public/assets/libs/fastadmin-addtabs/jquery.addtabs.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/public/assets/libs/fastadmin-cxselect/README.md" beforeDir="false" afterPath="$PROJECT_DIR$/public/assets/libs/fastadmin-cxselect/README.md" afterDir="false" />
<change beforePath="$PROJECT_DIR$/public/assets/libs/fastadmin-cxselect/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/public/assets/libs/fastadmin-cxselect/index.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/public/assets/libs/fastadmin-cxselect/js/jquery.cxselect.js" beforeDir="false" afterPath="$PROJECT_DIR$/public/assets/libs/fastadmin-cxselect/js/jquery.cxselect.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/public/assets/libs/fastadmin-cxselect/js/jquery.cxselect.min.js" beforeDir="false" afterPath="$PROJECT_DIR$/public/assets/libs/fastadmin-cxselect/js/jquery.cxselect.min.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/public/assets/libs/fastadmin-dragsort/jquery.dragsort.js" beforeDir="false" afterPath="$PROJECT_DIR$/public/assets/libs/fastadmin-dragsort/jquery.dragsort.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/public/assets/libs/fastadmin-dragsort/readme.md" beforeDir="false" afterPath="$PROJECT_DIR$/public/assets/libs/fastadmin-dragsort/readme.md" afterDir="false" />
<change beforePath="$PROJECT_DIR$/public/assets/libs/jstree/LICENSE-MIT" beforeDir="false" afterPath="$PROJECT_DIR$/public/assets/libs/jstree/LICENSE-MIT" afterDir="false" />
<change beforePath="$PROJECT_DIR$/public/assets/libs/jstree/src/themes/default-dark/style.less" beforeDir="false" afterPath="$PROJECT_DIR$/public/assets/libs/jstree/src/themes/default-dark/style.less" afterDir="false" />
<change beforePath="$PROJECT_DIR$/public/assets/libs/jstree/src/themes/default/style.less" beforeDir="false" afterPath="$PROJECT_DIR$/public/assets/libs/jstree/src/themes/default/style.less" afterDir="false" />
<change beforePath="$PROJECT_DIR$/public/assets/libs/jstree/src/themes/responsive.less" beforeDir="false" afterPath="$PROJECT_DIR$/public/assets/libs/jstree/src/themes/responsive.less" afterDir="false" />
<change beforePath="$PROJECT_DIR$/public/assets/libs/tableExport.jquery.plugin/tableExport.js" beforeDir="false" afterPath="$PROJECT_DIR$/public/assets/libs/tableExport.jquery.plugin/tableExport.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/public/wechat/cert/证书使用说明.txt" beforeDir="false" afterPath="$PROJECT_DIR$/public/wechat/cert/证书使用说明.txt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/thinkphp/library/think/Controller.php" beforeDir="false" afterPath="$PROJECT_DIR$/thinkphp/library/think/Controller.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/vendor/aferrandini/phpqrcode/LICENSE" beforeDir="false" afterPath="$PROJECT_DIR$/vendor/aferrandini/phpqrcode/LICENSE" afterDir="false" />
<change beforePath="$PROJECT_DIR$/vendor/aferrandini/phpqrcode/VERSION" beforeDir="false" afterPath="$PROJECT_DIR$/vendor/aferrandini/phpqrcode/VERSION" afterDir="false" />
<change beforePath="$PROJECT_DIR$/vendor/aferrandini/phpqrcode/lib/PHPQRCode/QRbitstream.php" beforeDir="false" afterPath="$PROJECT_DIR$/vendor/aferrandini/phpqrcode/lib/PHPQRCode/QRbitstream.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/vendor/aferrandini/phpqrcode/lib/PHPQRCode/QRencode.php" beforeDir="false" afterPath="$PROJECT_DIR$/vendor/aferrandini/phpqrcode/lib/PHPQRCode/QRencode.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/vendor/aferrandini/phpqrcode/lib/PHPQRCode/QRimage.php" beforeDir="false" afterPath="$PROJECT_DIR$/vendor/aferrandini/phpqrcode/lib/PHPQRCode/QRimage.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/vendor/aferrandini/phpqrcode/lib/PHPQRCode/QRinput.php" beforeDir="false" afterPath="$PROJECT_DIR$/vendor/aferrandini/phpqrcode/lib/PHPQRCode/QRinput.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/vendor/aferrandini/phpqrcode/lib/PHPQRCode/QRmask.php" beforeDir="false" afterPath="$PROJECT_DIR$/vendor/aferrandini/phpqrcode/lib/PHPQRCode/QRmask.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/vendor/aferrandini/phpqrcode/lib/PHPQRCode/QRrs.php" beforeDir="false" afterPath="$PROJECT_DIR$/vendor/aferrandini/phpqrcode/lib/PHPQRCode/QRrs.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/vendor/aferrandini/phpqrcode/lib/PHPQRCode/QRspec.php" beforeDir="false" afterPath="$PROJECT_DIR$/vendor/aferrandini/phpqrcode/lib/PHPQRCode/QRspec.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/vendor/aferrandini/phpqrcode/lib/PHPQRCode/QRsplit.php" beforeDir="false" afterPath="$PROJECT_DIR$/vendor/aferrandini/phpqrcode/lib/PHPQRCode/QRsplit.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/vendor/aferrandini/phpqrcode/lib/PHPQRCode/QRtools.php" beforeDir="false" afterPath="$PROJECT_DIR$/vendor/aferrandini/phpqrcode/lib/PHPQRCode/QRtools.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/vendor/endroid/qr-code/.travis.yml" beforeDir="false" afterPath="$PROJECT_DIR$/vendor/endroid/qr-code/.travis.yml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/vendor/endroid/qr-code/README.md" beforeDir="false" afterPath="$PROJECT_DIR$/vendor/endroid/qr-code/README.md" afterDir="false" />
<change beforePath="$PROJECT_DIR$/vendor/phpoffice/phpspreadsheet/docs/assets/ClassDiagrams/Architecture.cd" beforeDir="false" afterPath="$PROJECT_DIR$/vendor/phpoffice/phpspreadsheet/docs/assets/ClassDiagrams/Architecture.cd" afterDir="false" />
<change beforePath="$PROJECT_DIR$/vendor/phpoffice/phpspreadsheet/docs/assets/ClassDiagrams/ClassDiagrams.csproj" beforeDir="false" afterPath="$PROJECT_DIR$/vendor/phpoffice/phpspreadsheet/docs/assets/ClassDiagrams/ClassDiagrams.csproj" afterDir="false" />
<change beforePath="$PROJECT_DIR$/vendor/phpoffice/phpspreadsheet/docs/assets/ClassDiagrams/ClassDiagrams.csproj.user" beforeDir="false" afterPath="$PROJECT_DIR$/vendor/phpoffice/phpspreadsheet/docs/assets/ClassDiagrams/ClassDiagrams.csproj.user" afterDir="false" />
<change beforePath="$PROJECT_DIR$/vendor/phpoffice/phpspreadsheet/docs/assets/ClassDiagrams/ClassDiagrams.sln" beforeDir="false" afterPath="$PROJECT_DIR$/vendor/phpoffice/phpspreadsheet/docs/assets/ClassDiagrams/ClassDiagrams.sln" afterDir="false" />
<change beforePath="$PROJECT_DIR$/vendor/phpoffice/phpspreadsheet/docs/assets/ClassDiagrams/Classes/IReader.cs" beforeDir="false" afterPath="$PROJECT_DIR$/vendor/phpoffice/phpspreadsheet/docs/assets/ClassDiagrams/Classes/IReader.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/vendor/phpoffice/phpspreadsheet/docs/assets/ClassDiagrams/Classes/IWriter.cs" beforeDir="false" afterPath="$PROJECT_DIR$/vendor/phpoffice/phpspreadsheet/docs/assets/ClassDiagrams/Classes/IWriter.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/vendor/phpoffice/phpspreadsheet/docs/assets/ClassDiagrams/Classes/PHPExcel.cs" beforeDir="false" afterPath="$PROJECT_DIR$/vendor/phpoffice/phpspreadsheet/docs/assets/ClassDiagrams/Classes/PHPExcel.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/vendor/phpoffice/phpspreadsheet/docs/assets/ClassDiagrams/Classes/PHPExcel_IOFactory.cs" beforeDir="false" afterPath="$PROJECT_DIR$/vendor/phpoffice/phpspreadsheet/docs/assets/ClassDiagrams/Classes/PHPExcel_IOFactory.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/vendor/phpoffice/phpspreadsheet/docs/assets/ClassDiagrams/Classes/PHPExcel_Reader_Excel2007.cs" beforeDir="false" afterPath="$PROJECT_DIR$/vendor/phpoffice/phpspreadsheet/docs/assets/ClassDiagrams/Classes/PHPExcel_Reader_Excel2007.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/vendor/phpoffice/phpspreadsheet/docs/assets/ClassDiagrams/Classes/PHPExcel_Reader_Excel5.cs" beforeDir="false" afterPath="$PROJECT_DIR$/vendor/phpoffice/phpspreadsheet/docs/assets/ClassDiagrams/Classes/PHPExcel_Reader_Excel5.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/vendor/phpoffice/phpspreadsheet/docs/assets/ClassDiagrams/Classes/PHPExcel_Reader_Serialized.cs" beforeDir="false" afterPath="$PROJECT_DIR$/vendor/phpoffice/phpspreadsheet/docs/assets/ClassDiagrams/Classes/PHPExcel_Reader_Serialized.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/vendor/phpoffice/phpspreadsheet/docs/assets/ClassDiagrams/Classes/PHPExcel_Writer_Excel2007.cs" beforeDir="false" afterPath="$PROJECT_DIR$/vendor/phpoffice/phpspreadsheet/docs/assets/ClassDiagrams/Classes/PHPExcel_Writer_Excel2007.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/vendor/phpoffice/phpspreadsheet/docs/assets/ClassDiagrams/Classes/PHPExcel_Writer_Serialized.cs" beforeDir="false" afterPath="$PROJECT_DIR$/vendor/phpoffice/phpspreadsheet/docs/assets/ClassDiagrams/Classes/PHPExcel_Writer_Serialized.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/vendor/phpoffice/phpspreadsheet/docs/assets/ClassDiagrams/Classes/Worksheet.cs" beforeDir="false" afterPath="$PROJECT_DIR$/vendor/phpoffice/phpspreadsheet/docs/assets/ClassDiagrams/Classes/Worksheet.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/vendor/phpoffice/phpspreadsheet/docs/assets/ClassDiagrams/ReaderWriter.cd" beforeDir="false" afterPath="$PROJECT_DIR$/vendor/phpoffice/phpspreadsheet/docs/assets/ClassDiagrams/ReaderWriter.cd" afterDir="false" />
<change beforePath="$PROJECT_DIR$/vendor/phpoffice/phpspreadsheet/samples/Reader/sampleData/example1.tsv" beforeDir="false" afterPath="$PROJECT_DIR$/vendor/phpoffice/phpspreadsheet/samples/Reader/sampleData/example1.tsv" afterDir="false" />
<change beforePath="$PROJECT_DIR$/vendor/phpoffice/phpspreadsheet/samples/templates/SylkTest.slk" beforeDir="false" afterPath="$PROJECT_DIR$/vendor/phpoffice/phpspreadsheet/samples/templates/SylkTest.slk" afterDir="false" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" />
... ... @@ -33,11 +231,11 @@
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name="Index.php" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/application/home/controller/Index.php">
<file leaf-file-name="Goods.php" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/application/home/controller/Goods.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="102">
<caret line="14" column="24" lean-forward="true" selection-start-line="14" selection-start-column="24" selection-end-line="14" selection-end-column="24" />
<state relative-caret-position="476">
<caret line="40" column="50" selection-start-line="40" selection-start-column="50" selection-end-line="40" selection-end-column="50" />
</state>
</provider>
</entry>
... ... @@ -94,23 +292,6 @@
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
<list>
<option value="$PROJECT_DIR$/application/home/view/member/my_information.html" />
<option value="$PROJECT_DIR$/application/home/view/public/head.html" />
<option value="$PROJECT_DIR$/application/home/view/goods/content_detail.html" />
<option value="$PROJECT_DIR$/application/admin/controller/UserExpLogAudit.php" />
<option value="$PROJECT_DIR$/application/admin/view/user_exp_log_audit/edit.html" />
<option value="D:/我的文档/Documents/NetSarang Computer/6/Xftp/Temporary/Doc [2].php" />
<option value="$PROJECT_DIR$/application/admin/controller/MerchantAudit.php" />
<option value="$PROJECT_DIR$/application/admin/controller/MerchantGoods.php" />
<option value="$PROJECT_DIR$/application/home/view/user/authorization_view.html" />
<option value="$PROJECT_DIR$/application/home/view/merchant/enter_view.html" />
<option value="$PROJECT_DIR$/application/home/controller/Merchant.php" />
<option value="$PROJECT_DIR$/application/home/view/merchant/audit_status.html" />
<option value="$PROJECT_DIR$/public/assets/advertising/css/index.css" />
<option value="$PROJECT_DIR$/application/home/model/Goods.php" />
<option value="$PROJECT_DIR$/application/home/controller/Goods.php" />
<option value="$PROJECT_DIR$/public/assets/advertising/css/public.css" />
<option value="$PROJECT_DIR$/application/admin/view/goods/edit.html" />
<option value="$PROJECT_DIR$/application/admin/view/goods/add.html" />
<option value="$PROJECT_DIR$/application/admin/view/merchant_goods/add.html" />
<option value="$PROJECT_DIR$/application/admin/view/merchant_goods/edit.html" />
... ... @@ -145,6 +326,23 @@
<option value="&lt;aa3c1771-75c3-4a1c-af6a-8e27a9afc38b&gt;/application/home/controller/Index.php" />
<option value="$PROJECT_DIR$/application/home/controller/Index.php" />
<option value="$PROJECT_DIR$/application/common/controller/WechatBase.php" />
<option value="&lt;aa3c1771-75c3-4a1c-af6a-8e27a9afc38b&gt;/public/assets/js/backend/users.js" />
<option value="&lt;aa3c1771-75c3-4a1c-af6a-8e27a9afc38b&gt;/application/admin/controller/WithdrawLabel.php" />
<option value="&lt;aa3c1771-75c3-4a1c-af6a-8e27a9afc38b&gt;/application/admin/view/withdraw_label/index.html" />
<option value="&lt;aa3c1771-75c3-4a1c-af6a-8e27a9afc38b&gt;/public/assets/js/backend/withdraw_label.js" />
<option value="&lt;aa3c1771-75c3-4a1c-af6a-8e27a9afc38b&gt;/application/home/view/member/my_withdraw.html" />
<option value="&lt;aa3c1771-75c3-4a1c-af6a-8e27a9afc38b&gt;/application/admin/view/withdraw_label/add.html" />
<option value="&lt;aa3c1771-75c3-4a1c-af6a-8e27a9afc38b&gt;/application/admin/view/withdraw_label/edit.html" />
<option value="&lt;aa3c1771-75c3-4a1c-af6a-8e27a9afc38b&gt;/application/admin/view/merchant_goods/edit.html" />
<option value="&lt;aa3c1771-75c3-4a1c-af6a-8e27a9afc38b&gt;/application/admin/view/merchant_goods/add.html" />
<option value="&lt;aa3c1771-75c3-4a1c-af6a-8e27a9afc38b&gt;/application/admin/view/goods_audit/edit.html" />
<option value="&lt;aa3c1771-75c3-4a1c-af6a-8e27a9afc38b&gt;/application/admin/view/goods/edit.html" />
<option value="&lt;aa3c1771-75c3-4a1c-af6a-8e27a9afc38b&gt;/application/admin/view/goods/add.html" />
<option value="&lt;aa3c1771-75c3-4a1c-af6a-8e27a9afc38b&gt;/application/home/controller/Goods.php" />
<option value="&lt;aa3c1771-75c3-4a1c-af6a-8e27a9afc38b&gt;/application/home/controller/Member.php" />
<option value="&lt;aa3c1771-75c3-4a1c-af6a-8e27a9afc38b&gt;/application/home/view/member/earnings_log.html" />
<option value="&lt;aa3c1771-75c3-4a1c-af6a-8e27a9afc38b&gt;/application/home/controller/Question.php" />
<option value="&lt;aa3c1771-75c3-4a1c-af6a-8e27a9afc38b&gt;/application/home/controller/Share.php" />
</list>
</option>
</component>
... ... @@ -243,26 +441,6 @@
<item name="home" type="462c0819:PsiDirectoryNode" />
<item name="controller" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="advertising" type="b2602c69:ProjectViewProjectNode" />
<item name="advertising" type="462c0819:PsiDirectoryNode" />
<item name="application" type="462c0819:PsiDirectoryNode" />
<item name="index" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="advertising" type="b2602c69:ProjectViewProjectNode" />
<item name="advertising" type="462c0819:PsiDirectoryNode" />
<item name="application" type="462c0819:PsiDirectoryNode" />
<item name="index" type="462c0819:PsiDirectoryNode" />
<item name="controller" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="advertising" type="b2602c69:ProjectViewProjectNode" />
<item name="advertising" type="462c0819:PsiDirectoryNode" />
<item name="application" type="462c0819:PsiDirectoryNode" />
<item name="index" type="462c0819:PsiDirectoryNode" />
<item name="lang" type="462c0819:PsiDirectoryNode" />
</path>
</expand>
<select />
</subPane>
... ... @@ -278,7 +456,7 @@
<property name="WebServerToolWindowPanel.toolwindow.show.date" value="false" />
<property name="WebServerToolWindowPanel.toolwindow.show.permissions" value="false" />
<property name="WebServerToolWindowPanel.toolwindow.show.size" value="false" />
<property name="last_opened_file_path" value="$PROJECT_DIR$/../competition" />
<property name="last_opened_file_path" value="D:/phpStudy/WWW/weight" />
<property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
<property name="nodejs_npm_path_reset_for_default_project" value="true" />
<property name="settings.editor.selected.configurable" value="terminal" />
... ... @@ -288,11 +466,11 @@
<recent name="D:\wamp\www\advertising\public\assets\js\backend" />
</key>
<key name="CopyFile.RECENT_KEYS">
<recent name="D:\wamp\www\advertising\public\assets\fonts" />
<recent name="D:\wamp\www\advertising\application\home" />
<recent name="D:\wamp\www\advertising\application\admin\view\users" />
<recent name="D:\wamp\www\advertising\public\assets\advertising\img" />
<recent name="D:\wamp\www\advertising\application\admin\view\goods_audit" />
<recent name="D:\wamp\www\advertising\application\home\view\merchant" />
</key>
</component>
<component name="RunDashboard">
... ... @@ -344,7 +522,7 @@
<workItem from="1573432217070" duration="2199000" />
<workItem from="1573519427130" duration="17475000" />
<workItem from="1573605070739" duration="29138000" />
<workItem from="1573691027933" duration="8424000" />
<workItem from="1573691027933" duration="20447000" />
</task>
<task id="LOCAL-00631" summary="后台bug">
<created>1573628001595</created>
... ... @@ -693,7 +871,7 @@
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="461344000" />
<option name="totallyTimeSpent" value="473367000" />
</component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
... ... @@ -707,7 +885,7 @@
<window_info anchor="bottom" id="Version Control" order="7" show_stripe_button="false" />
<window_info anchor="bottom" id="Terminal" order="7" weight="0.32997763" />
<window_info anchor="bottom" id="运行" order="7" />
<window_info anchor="right" id="Remote Host" order="3" weight="0.15778251" />
<window_info anchor="right" id="Remote Host" order="3" visible="true" weight="0.15778251" />
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.15245202" />
<window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
<window_info anchor="right" id="Database" order="3" weight="0.32995737" />
... ... @@ -784,20 +962,6 @@
<option name="LAST_COMMIT_MESSAGE" value="后台bug" />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/application/admin/view/slide/add.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="136">
<caret line="8" column="8" selection-start-line="8" selection-start-column="4" selection-end-line="13" selection-end-column="13" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/view/slide/edit.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="221">
<caret line="13" column="13" lean-forward="true" selection-start-line="8" selection-start-column="4" selection-end-line="13" selection-end-column="13" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/assets/js/backend/slide.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="476">
... ... @@ -1018,13 +1182,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/home/view/index/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="453">
<caret line="103" column="52" selection-start-line="103" selection-start-column="52" selection-end-line="103" selection-end-column="52" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/home/controller/Question.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="657">
... ... @@ -1055,13 +1212,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/home/controller/Goods.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="221">
<caret line="22" column="22" lean-forward="true" selection-start-line="22" selection-start-column="22" selection-end-line="22" selection-end-column="22" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/thinkphp/library/think/Controller.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="255">
... ... @@ -1093,6 +1243,13 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/home/view/index/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="487">
<caret line="105" column="29" selection-start-line="105" selection-start-column="29" selection-end-line="105" selection-end-column="29" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/home/controller/Index.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="102">
... ... @@ -1100,6 +1257,23 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/home/model/Goods.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="170">
<caret line="15" column="20" selection-start-line="15" selection-start-column="20" selection-end-line="15" selection-end-column="20" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/.gitlab-ci.yml">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/application/home/controller/Goods.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="476">
<caret line="40" column="50" selection-start-line="40" selection-start-column="50" selection-end-line="40" selection-end-column="50" />
</state>
</provider>
</entry>
</component>
<component name="masterDetails">
<states>
... ...
... ... @@ -63,12 +63,18 @@
<textarea id="c-content" class="form-control editor" rows="5" name="row[content]" cols="50"></textarea>
</div>
</div>
<div class="form-group view_time">
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('最短观看时间')}:</label>
<div class="col-xs-12 col-sm-8">
<input id="c-view_time" class="form-control" name="row[view_time]" type="number" value="0">
</div>
</div>
<div class="form-group view_time">
<label class="control-label col-xs-12 col-sm-2">{:__('重新答题时间')}:</label>
<div class="col-xs-12 col-sm-8">
<input id="c-anew_time" class="form-control" name="row[anew_time]" type="number" value="0">
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('限制性别')}:</label>
<div class="col-xs-12 col-sm-8">
... ...
... ... @@ -70,6 +70,12 @@
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('重新答题时间')}:</label>
<div class="col-xs-12 col-sm-8">
<input id="c-anew_time" class="form-control" name="row[anew_time]" type="number" value="{$row.anew_time}">
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('限制性别')}:</label>
<div class="col-xs-12 col-sm-8">
... ...
... ... @@ -70,6 +70,12 @@
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('重新答题时间')}:</label>
<div class="col-xs-12 col-sm-8">
<input id="c-anew_time" class="form-control" name="row[anew_time]" type="number" value="{$row.anew_time}">
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('限制性别')}:</label>
<div class="col-xs-12 col-sm-8">
... ...
... ... @@ -70,6 +70,12 @@
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('重新答题时间')}:</label>
<div class="col-xs-12 col-sm-8">
<input id="c-anew_time" class="form-control" name="row[anew_time]" type="number" value="0">
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('限制性别')}:</label>
<div class="col-xs-12 col-sm-8">
... ...
... ... @@ -70,6 +70,12 @@
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('重新答题时间')}:</label>
<div class="col-xs-12 col-sm-8">
<input id="c-anew_time" class="form-control" name="row[anew_time]" type="number" value="{$row.anew_time}">
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('限制性别')}:</label>
<div class="col-xs-12 col-sm-8">
... ...
... ... @@ -107,7 +107,7 @@ class Goods extends WechatBase
$question[$key]['answer'] = $user_question_answer;
}
//判断是否处于重新答题倒计时状态
$question_error = Db::name('user_question_answer')->where(['user_id'=>$this->user_id,'goods_id'=>$goods_id])->find();
$question_error = Db::name('user_question_answer')->where(['user_id'=>$this->user_id,'goods_id'=>$goods_id,'is_correct'=>"0"])->find();
$time = !empty($question_error['resettime']) ? $question_error['resettime']-time() : 0;
$data['time'] = $time;
$data['question'] = $question;
... ...
... ... @@ -46,7 +46,7 @@ class Member extends WechatBase
//今日获得的红包券
$beginToday = mktime(0,0,0,date('m'),date('d'),date('Y'));
$endToday = mktime(0,0,0,date('m'),date('d')+1,date('Y'))-1;
$today_exp = Db::name('user_exp_log')->where(['user_id'=>$this->user_id,'type'=>['in',[4,5]]])->where('createtime',['>',$beginToday],['<>',$endToday])->sum('exp');
$today_exp = Db::name('user_exp_log')->where(['user_id'=>$this->user_id,'type'=>['in',[4,5,6]]])->where('createtime',['>',$beginToday],['<>',$endToday])->sum('exp');
$user['today_exp'] = $today_exp;
$this->assign('user',$user);
$this->assign('title','个人中心');
... ... @@ -165,10 +165,10 @@ class Member extends WechatBase
//转换为人民币
$exp_ratio = Db::name('exp_ratio')->where(['id'=>1])->find();
$user['rmb'] = round($user['exp']*$exp_ratio['ratio']*0.01,2);
$arr = [10,20,30,40,50];
$data = [];
foreach($arr as $key => $a){
$data[$a] = $a*$exp_ratio['ratio']/0.01;
$data = Db::name('withdraw_label')->order('weigh desc,id desc')->select();
$data = collection($data)->toArray();
foreach($data as $key => $vo){
$data[$key]['exp'] = $vo['rmb']*$exp_ratio['ratio']/0.01;
}
$this->assign('user',$user);
$this->assign('data',$data);
... ... @@ -269,7 +269,7 @@ class Member extends WechatBase
if(empty($user)){
$this->error('查无此人');
}
$data = Db::name('user_exp_log')->where(['type'=>['in',[4,5]],'user_id'=>$this->user_id])->order('id desc')->page(1,5)->select();
$data = Db::name('user_exp_log')->where(['type'=>['in',[4,5,6]],'user_id'=>$this->user_id])->order('id desc')->page(1,5)->select();
$exp_ratio = Db::name('exp_ratio')->where(['id'=>1])->find();
foreach($data as $key => $vo){
$data[$key]['createtime'] = date('Y年m月d日 H:i');
... ... @@ -295,7 +295,7 @@ class Member extends WechatBase
if(empty($user_id)){
$this->error('缺少必要参数');
}
$data = Db::name('user_exp_log')->where(['type'=>['in',[4,5]],'user_id'=>$user_id])->order('id desc')->page($page,$pageNum)->select();
$data = Db::name('user_exp_log')->where(['type'=>['in',[4,5,6]],'user_id'=>$user_id])->order('id desc')->page($page,$pageNum)->select();
$exp_ratio = Db::name('exp_ratio')->where(['id'=>1])->find();
foreach($data as $key => $vo){
$data[$key]['createtime'] = date('Y年m月d日 H:i');
... ...
... ... @@ -122,7 +122,7 @@ class Question extends WechatBase
}else{
$question_error[] = $question_key;
$is_correct = 0;
$arr['resettime'] = time() + 300;
$arr['resettime'] = time() + $goods['anew_time'];
$resettime = $arr['resettime'] - time();
}
$arr['user_id'] = $user_id;
... ... @@ -143,7 +143,7 @@ class Question extends WechatBase
if(empty($question_error)){
//全部正确获取红包券
//判断是否获取过该广告的红包
$user_exp_log = Db::name('user_exp_log')->where(['type'=>4,'goods_id'=>$goods_id])->find();
$user_exp_log = Db::name('user_exp_log')->where(['type'=>4,'goods_id'=>$goods_id,'user_id'=>$user_id])->find();
if(!empty($user_exp_log)){
Db::rollback();
$this->error('您已获得过该广告的奖励');
... ...
... ... @@ -95,11 +95,13 @@ class Share extends WechatBase
$image->water($avatar_url,[311,46.5],100)
->water(ROOT_PATH."public/bg$type.png")
->water($url,[212,600],100)
->text("$user[nickname]",'./assets/fonts/PingFang Medium.ttf',20,'#ffffff',\think\Image::WATER_NORTH,[0,130])
->save($savePath."poster_$user[id].png");
}else{
$image->water($avatar_url,[311,46.5],100)
->water(ROOT_PATH."public/bg$type.png")
->water($url,[212,622],100)
->text("$user[nickname]",'./assets/fonts/PingFang Medium.ttf',20,'#ffffff',\think\Image::WATER_NORTH,[0,130])
->save($savePath."poster_$user[id].png");
}
return "/uploads/poster$type/poster_$user[id].png";
... ...
... ... @@ -17,6 +17,8 @@
参与答题
{elseif condition='$vo.type eq 5'}
下级答题
{elseif condition='$vo.type eq 6'}
商户消费
{/if}
</div>
<div class="record_num">+{$vo.rmb}元</div>
... ...
... ... @@ -23,9 +23,9 @@
<div class="width_drawal_tips">提现金额</div>
<div class="choice_with_drawal layout align_center justify flex_row flex_wrap">
{foreach name="$data" item="vo"}
<div class="choice_single layout align_center justify_center flex_diection" data-exp="{$vo}" data-rmb="{$key}">
<div class="choice_money">{$key}元</div>
<div class="choice_coupon">消耗{$vo}红包券</div>
<div class="choice_single layout align_center justify_center flex_diection" data-exp="{$vo.exp}" data-rmb="{$vo.rmb}">
<div class="choice_money">{$vo.rmb}元</div>
<div class="choice_coupon">消耗{$vo.exp}红包券</div>
<div class="choice_img">
<img src="__CDN__/assets/advertising/img/choice.png" alt="" />
</div>
... ...
... ... @@ -147,24 +147,22 @@ html {
.invite_qr_code {
width: 6.86rem;
height: 11rem;
margin: 0 auto;
z-index: 3;
border-radius: 0.16rem;
position: fixed;
top: 1rem;
top: 50%;
left: 50%;
transform: translateX(-50%);
-webkit-transform: translateX(-50%);
-moz-transform: translateX(-50%);
-ms-transform: translateX(-50%);
-o-transform: translateX(-50%);
transform: translate(-50%,-50%);
-webkit-transform: translate(-50%,-50%);
-moz-transform: translate(-50%,-50%);
-ms-transform: translate(-50%,-50%);
-o-transform: translate(-50%,-50%);
display: none;
}
.invite_code {
width: 100%;
height: 9.8rem;
background-color: #FB7A17;
}
... ... @@ -178,4 +176,4 @@ html {
font-size: 0.32rem;
border-radius: 0.16rem;
margin-top: 0.4rem;
}
\ No newline at end of file
}
... ...
不能预览此文件类型
... ... @@ -74,13 +74,6 @@ class Controller
*/
protected function _initialize()
{
$user_id = get_current_user_id();
if(!empty($user_id)){
$data = Db::name('user')->where(['id'=>$user_id])->find();
if($data['status'] == 'hidden'){
$this->error('您已被拉黑');
}
}
}
/**
... ...