王晓刚 / advertising · 提交

转到一个项目

作者 王晓刚
提交 de3bfcd95a0f01c22dde81bc83563f27549ccb1d 1 个父辈 daa90c21
1 个管道 的构建 失败 耗费 9 秒

同步

内嵌 并排对比
正在显示 15 个修改的文件 包含 303 行增加 和 104 行删除
@@ -2,10 +2,208 @@ @@ -2,10 +2,208 @@
2 <project version="4"> 2 <project version="4">
3 <component name="BookmarkManager"> 3 <component name="BookmarkManager">
4 <bookmark url="file://$PROJECT_DIR$/application/home/view/member/my_information.html" line="118" mnemonic="4" /> 4 <bookmark url="file://$PROJECT_DIR$/application/home/view/member/my_information.html" line="118" mnemonic="4" />
  5 + <bookmark url="remoteDeploymentFS://&lt;aa3c1771-75c3-4a1c-af6a-8e27a9afc38b&gt;/public/assets/js/backend/users.js" line="19" />
5 </component> 6 </component>
6 <component name="ChangeListManager"> 7 <component name="ChangeListManager">
7 <list default="true" id="309ad746-5b2a-4c29-af46-e7925a35765c" name="默认的" comment=""> 8 <list default="true" id="309ad746-5b2a-4c29-af46-e7925a35765c" name="默认的" comment="">
  9 + <change afterPath="$PROJECT_DIR$/public/assets/fonts/PingFang Medium.ttf" afterDir="false" />
  10 + <change beforePath="$PROJECT_DIR$/.gitlab-ci.yml" beforeDir="false" afterPath="$PROJECT_DIR$/.gitlab-ci.yml" afterDir="false" />
8 <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> 11 <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
  12 + <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" />
  13 + <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" />
  14 + <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" />
  15 + <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" />
  16 + <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" />
  17 + <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" />
  18 + <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" />
  19 + <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" />
  20 + <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" />
  21 + <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" />
  22 + <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" />
  23 + <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" />
  24 + <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" />
  25 + <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" />
  26 + <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" />
  27 + <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" />
  28 + <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" />
  29 + <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" />
  30 + <change beforePath="$PROJECT_DIR$/addons/ueditor/assets/dialogs/internal.js" beforeDir="false" afterPath="$PROJECT_DIR$/addons/ueditor/assets/dialogs/internal.js" afterDir="false" />
  31 + <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" />
  32 + <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" />
  33 + <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" />
  34 + <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" />
  35 + <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" />
  36 + <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" />
  37 + <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" />
  38 + <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" />
  39 + <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" />
  40 + <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" />
  41 + <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" />
  42 + <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" />
  43 + <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" />
  44 + <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" />
  45 + <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" />
  46 + <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" />
  47 + <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" />
  48 + <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" />
  49 + <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" />
  50 + <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" />
  51 + <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" />
  52 + <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" />
  53 + <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" />
  54 + <change beforePath="$PROJECT_DIR$/addons/ueditor/assets/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/addons/ueditor/assets/index.html" afterDir="false" />
  55 + <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" />
  56 + <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" />
  57 + <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" />
  58 + <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" />
  59 + <change beforePath="$PROJECT_DIR$/addons/ueditor/assets/themes/iframe.css" beforeDir="false" afterPath="$PROJECT_DIR$/addons/ueditor/assets/themes/iframe.css" afterDir="false" />
  60 + <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" />
  61 + <change beforePath="$PROJECT_DIR$/addons/ueditor/config.php" beforeDir="false" afterPath="$PROJECT_DIR$/addons/ueditor/config.php" afterDir="false" />
  62 + <change beforePath="$PROJECT_DIR$/application/admin/view/goods/add.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/admin/view/goods/add.html" afterDir="false" />
  63 + <change beforePath="$PROJECT_DIR$/application/admin/view/goods/edit.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/admin/view/goods/edit.html" afterDir="false" />
  64 + <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" />
  65 + <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" />
  66 + <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" />
  67 + <change beforePath="$PROJECT_DIR$/application/home/controller/Goods.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/home/controller/Goods.php" afterDir="false" />
  68 + <change beforePath="$PROJECT_DIR$/application/home/controller/Member.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/home/controller/Member.php" afterDir="false" />
  69 + <change beforePath="$PROJECT_DIR$/application/home/controller/Question.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/home/controller/Question.php" afterDir="false" />
  70 + <change beforePath="$PROJECT_DIR$/application/home/controller/Share.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/home/controller/Share.php" afterDir="false" />
  71 + <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" />
  72 + <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" />
  73 + <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" />
  74 + <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" />
  75 + <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" />
  76 + <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" />
  77 + <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" />
  78 + <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" />
  79 + <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" />
  80 + <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" />
  81 + <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" />
  82 + <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" />
  83 + <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" />
  84 + <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" />
  85 + <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" />
  86 + <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" />
  87 + <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" />
  88 + <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" />
  89 + <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" />
  90 + <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" />
  91 + <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" />
  92 + <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" />
  93 + <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" />
  94 + <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" />
  95 + <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" />
  96 + <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" />
  97 + <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" />
  98 + <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" />
  99 + <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" />
  100 + <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" />
  101 + <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" />
  102 + <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" />
  103 + <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" />
  104 + <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" />
  105 + <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" />
  106 + <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" />
  107 + <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" />
  108 + <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" />
  109 + <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" />
  110 + <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" />
  111 + <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" />
  112 + <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" />
  113 + <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" />
  114 + <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" />
  115 + <change beforePath="$PROJECT_DIR$/public/assets/addons/ueditor/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/public/assets/addons/ueditor/index.html" afterDir="false" />
  116 + <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" />
  117 + <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" />
  118 + <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" />
  119 + <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" />
  120 + <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" />
  121 + <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" />
  122 + <change beforePath="$PROJECT_DIR$/public/assets/advertising/css/advDetail.css" beforeDir="false" afterPath="$PROJECT_DIR$/public/assets/advertising/css/advDetail.css" afterDir="false" />
  123 + <change beforePath="$PROJECT_DIR$/public/assets/advertising/css/entry.css" beforeDir="false" afterPath="$PROJECT_DIR$/public/assets/advertising/css/entry.css" afterDir="false" />
  124 + <change beforePath="$PROJECT_DIR$/public/assets/advertising/css/index.css" beforeDir="false" afterPath="$PROJECT_DIR$/public/assets/advertising/css/index.css" afterDir="false" />
  125 + <change beforePath="$PROJECT_DIR$/public/assets/advertising/css/input.css" beforeDir="false" afterPath="$PROJECT_DIR$/public/assets/advertising/css/input.css" afterDir="false" />
  126 + <change beforePath="$PROJECT_DIR$/public/assets/advertising/css/myInvite.css" beforeDir="false" afterPath="$PROJECT_DIR$/public/assets/advertising/css/myInvite.css" afterDir="false" />
  127 + <change beforePath="$PROJECT_DIR$/public/assets/advertising/css/personal.css" beforeDir="false" afterPath="$PROJECT_DIR$/public/assets/advertising/css/personal.css" afterDir="false" />
  128 + <change beforePath="$PROJECT_DIR$/public/assets/advertising/css/personalMsg.css" beforeDir="false" afterPath="$PROJECT_DIR$/public/assets/advertising/css/personalMsg.css" afterDir="false" />
  129 + <change beforePath="$PROJECT_DIR$/public/assets/advertising/css/public.css" beforeDir="false" afterPath="$PROJECT_DIR$/public/assets/advertising/css/public.css" afterDir="false" />
  130 + <change beforePath="$PROJECT_DIR$/public/assets/advertising/css/record.css" beforeDir="false" afterPath="$PROJECT_DIR$/public/assets/advertising/css/record.css" afterDir="false" />
  131 + <change beforePath="$PROJECT_DIR$/public/assets/advertising/js/base.js" beforeDir="false" afterPath="$PROJECT_DIR$/public/assets/advertising/js/base.js" afterDir="false" />
  132 + <change beforePath="$PROJECT_DIR$/public/assets/advertising/js/jquery.js" beforeDir="false" afterPath="$PROJECT_DIR$/public/assets/advertising/js/jquery.js" afterDir="false" />
  133 + <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" />
  134 + <change beforePath="$PROJECT_DIR$/public/assets/advertising/js/toast.js" beforeDir="false" afterPath="$PROJECT_DIR$/public/assets/advertising/js/toast.js" afterDir="false" />
  135 + <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" />
  136 + <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" />
  137 + <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" />
  138 + <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" />
  139 + <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" />
  140 + <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" />
  141 + <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" />
  142 + <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" />
  143 + <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" />
  144 + <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" />
  145 + <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" />
  146 + <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" />
  147 + <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" />
  148 + <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" />
  149 + <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" />
  150 + <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" />
  151 + <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" />
  152 + <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" />
  153 + <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" />
  154 + <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" />
  155 + <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" />
  156 + <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" />
  157 + <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" />
  158 + <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" />
  159 + <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" />
  160 + <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" />
  161 + <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" />
  162 + <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" />
  163 + <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" />
  164 + <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" />
  165 + <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" />
  166 + <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" />
  167 + <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" />
  168 + <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" />
  169 + <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" />
  170 + <change beforePath="$PROJECT_DIR$/public/assets/libs/jstree/LICENSE-MIT" beforeDir="false" afterPath="$PROJECT_DIR$/public/assets/libs/jstree/LICENSE-MIT" afterDir="false" />
  171 + <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" />
  172 + <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" />
  173 + <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" />
  174 + <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" />
  175 + <change beforePath="$PROJECT_DIR$/public/wechat/cert/证书使用说明.txt" beforeDir="false" afterPath="$PROJECT_DIR$/public/wechat/cert/证书使用说明.txt" afterDir="false" />
  176 + <change beforePath="$PROJECT_DIR$/thinkphp/library/think/Controller.php" beforeDir="false" afterPath="$PROJECT_DIR$/thinkphp/library/think/Controller.php" afterDir="false" />
  177 + <change beforePath="$PROJECT_DIR$/vendor/aferrandini/phpqrcode/LICENSE" beforeDir="false" afterPath="$PROJECT_DIR$/vendor/aferrandini/phpqrcode/LICENSE" afterDir="false" />
  178 + <change beforePath="$PROJECT_DIR$/vendor/aferrandini/phpqrcode/VERSION" beforeDir="false" afterPath="$PROJECT_DIR$/vendor/aferrandini/phpqrcode/VERSION" afterDir="false" />
  179 + <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" />
  180 + <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" />
  181 + <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" />
  182 + <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" />
  183 + <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" />
  184 + <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" />
  185 + <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" />
  186 + <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" />
  187 + <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" />
  188 + <change beforePath="$PROJECT_DIR$/vendor/endroid/qr-code/.travis.yml" beforeDir="false" afterPath="$PROJECT_DIR$/vendor/endroid/qr-code/.travis.yml" afterDir="false" />
  189 + <change beforePath="$PROJECT_DIR$/vendor/endroid/qr-code/README.md" beforeDir="false" afterPath="$PROJECT_DIR$/vendor/endroid/qr-code/README.md" afterDir="false" />
  190 + <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" />
  191 + <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" />
  192 + <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" />
  193 + <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" />
  194 + <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" />
  195 + <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" />
  196 + <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" />
  197 + <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" />
  198 + <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" />
  199 + <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" />
  200 + <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" />
  201 + <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" />
  202 + <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" />
  203 + <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" />
  204 + <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" />
  205 + <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" />
  206 + <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" />
9 </list> 207 </list>
10 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> 208 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
11 <option name="TRACKING_ENABLED" value="true" /> 209 <option name="TRACKING_ENABLED" value="true" />
@@ -33,11 +231,11 @@ @@ -33,11 +231,11 @@
33 </component> 231 </component>
34 <component name="FileEditorManager"> 232 <component name="FileEditorManager">
35 <leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> 233 <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
36 - <file leaf-file-name="Index.php" pinned="false" current-in-tab="true">  
37 - <entry file="file://$PROJECT_DIR$/application/home/controller/Index.php"> 234 + <file leaf-file-name="Goods.php" pinned="false" current-in-tab="true">
  235 + <entry file="file://$PROJECT_DIR$/application/home/controller/Goods.php">
38 <provider selected="true" editor-type-id="text-editor"> 236 <provider selected="true" editor-type-id="text-editor">
39 - <state relative-caret-position="102">  
40 - <caret line="14" column="24" lean-forward="true" selection-start-line="14" selection-start-column="24" selection-end-line="14" selection-end-column="24" /> 237 + <state relative-caret-position="476">
  238 + <caret line="40" column="50" selection-start-line="40" selection-start-column="50" selection-end-line="40" selection-end-column="50" />
41 </state> 239 </state>
42 </provider> 240 </provider>
43 </entry> 241 </entry>
@@ -94,23 +292,6 @@ @@ -94,23 +292,6 @@
94 <component name="IdeDocumentHistory"> 292 <component name="IdeDocumentHistory">
95 <option name="CHANGED_PATHS"> 293 <option name="CHANGED_PATHS">
96 <list> 294 <list>
97 - <option value="$PROJECT_DIR$/application/home/view/member/my_information.html" />  
98 - <option value="$PROJECT_DIR$/application/home/view/public/head.html" />  
99 - <option value="$PROJECT_DIR$/application/home/view/goods/content_detail.html" />  
100 - <option value="$PROJECT_DIR$/application/admin/controller/UserExpLogAudit.php" />  
101 - <option value="$PROJECT_DIR$/application/admin/view/user_exp_log_audit/edit.html" />  
102 - <option value="D:/我的文档/Documents/NetSarang Computer/6/Xftp/Temporary/Doc [2].php" />  
103 - <option value="$PROJECT_DIR$/application/admin/controller/MerchantAudit.php" />  
104 - <option value="$PROJECT_DIR$/application/admin/controller/MerchantGoods.php" />  
105 - <option value="$PROJECT_DIR$/application/home/view/user/authorization_view.html" />  
106 - <option value="$PROJECT_DIR$/application/home/view/merchant/enter_view.html" />  
107 - <option value="$PROJECT_DIR$/application/home/controller/Merchant.php" />  
108 - <option value="$PROJECT_DIR$/application/home/view/merchant/audit_status.html" />  
109 - <option value="$PROJECT_DIR$/public/assets/advertising/css/index.css" />  
110 - <option value="$PROJECT_DIR$/application/home/model/Goods.php" />  
111 - <option value="$PROJECT_DIR$/application/home/controller/Goods.php" />  
112 - <option value="$PROJECT_DIR$/public/assets/advertising/css/public.css" />  
113 - <option value="$PROJECT_DIR$/application/admin/view/goods/edit.html" />  
114 <option value="$PROJECT_DIR$/application/admin/view/goods/add.html" /> 295 <option value="$PROJECT_DIR$/application/admin/view/goods/add.html" />
115 <option value="$PROJECT_DIR$/application/admin/view/merchant_goods/add.html" /> 296 <option value="$PROJECT_DIR$/application/admin/view/merchant_goods/add.html" />
116 <option value="$PROJECT_DIR$/application/admin/view/merchant_goods/edit.html" /> 297 <option value="$PROJECT_DIR$/application/admin/view/merchant_goods/edit.html" />
@@ -145,6 +326,23 @@ @@ -145,6 +326,23 @@
145 <option value="&lt;aa3c1771-75c3-4a1c-af6a-8e27a9afc38b&gt;/application/home/controller/Index.php" /> 326 <option value="&lt;aa3c1771-75c3-4a1c-af6a-8e27a9afc38b&gt;/application/home/controller/Index.php" />
146 <option value="$PROJECT_DIR$/application/home/controller/Index.php" /> 327 <option value="$PROJECT_DIR$/application/home/controller/Index.php" />
147 <option value="$PROJECT_DIR$/application/common/controller/WechatBase.php" /> 328 <option value="$PROJECT_DIR$/application/common/controller/WechatBase.php" />
  329 + <option value="&lt;aa3c1771-75c3-4a1c-af6a-8e27a9afc38b&gt;/public/assets/js/backend/users.js" />
  330 + <option value="&lt;aa3c1771-75c3-4a1c-af6a-8e27a9afc38b&gt;/application/admin/controller/WithdrawLabel.php" />
  331 + <option value="&lt;aa3c1771-75c3-4a1c-af6a-8e27a9afc38b&gt;/application/admin/view/withdraw_label/index.html" />
  332 + <option value="&lt;aa3c1771-75c3-4a1c-af6a-8e27a9afc38b&gt;/public/assets/js/backend/withdraw_label.js" />
  333 + <option value="&lt;aa3c1771-75c3-4a1c-af6a-8e27a9afc38b&gt;/application/home/view/member/my_withdraw.html" />
  334 + <option value="&lt;aa3c1771-75c3-4a1c-af6a-8e27a9afc38b&gt;/application/admin/view/withdraw_label/add.html" />
  335 + <option value="&lt;aa3c1771-75c3-4a1c-af6a-8e27a9afc38b&gt;/application/admin/view/withdraw_label/edit.html" />
  336 + <option value="&lt;aa3c1771-75c3-4a1c-af6a-8e27a9afc38b&gt;/application/admin/view/merchant_goods/edit.html" />
  337 + <option value="&lt;aa3c1771-75c3-4a1c-af6a-8e27a9afc38b&gt;/application/admin/view/merchant_goods/add.html" />
  338 + <option value="&lt;aa3c1771-75c3-4a1c-af6a-8e27a9afc38b&gt;/application/admin/view/goods_audit/edit.html" />
  339 + <option value="&lt;aa3c1771-75c3-4a1c-af6a-8e27a9afc38b&gt;/application/admin/view/goods/edit.html" />
  340 + <option value="&lt;aa3c1771-75c3-4a1c-af6a-8e27a9afc38b&gt;/application/admin/view/goods/add.html" />
  341 + <option value="&lt;aa3c1771-75c3-4a1c-af6a-8e27a9afc38b&gt;/application/home/controller/Goods.php" />
  342 + <option value="&lt;aa3c1771-75c3-4a1c-af6a-8e27a9afc38b&gt;/application/home/controller/Member.php" />
  343 + <option value="&lt;aa3c1771-75c3-4a1c-af6a-8e27a9afc38b&gt;/application/home/view/member/earnings_log.html" />
  344 + <option value="&lt;aa3c1771-75c3-4a1c-af6a-8e27a9afc38b&gt;/application/home/controller/Question.php" />
  345 + <option value="&lt;aa3c1771-75c3-4a1c-af6a-8e27a9afc38b&gt;/application/home/controller/Share.php" />
148 </list> 346 </list>
149 </option> 347 </option>
150 </component> 348 </component>
@@ -243,26 +441,6 @@ @@ -243,26 +441,6 @@
243 <item name="home" type="462c0819:PsiDirectoryNode" /> 441 <item name="home" type="462c0819:PsiDirectoryNode" />
244 <item name="controller" type="462c0819:PsiDirectoryNode" /> 442 <item name="controller" type="462c0819:PsiDirectoryNode" />
245 </path> 443 </path>
246 - <path>  
247 - <item name="advertising" type="b2602c69:ProjectViewProjectNode" />  
248 - <item name="advertising" type="462c0819:PsiDirectoryNode" />  
249 - <item name="application" type="462c0819:PsiDirectoryNode" />  
250 - <item name="index" type="462c0819:PsiDirectoryNode" />  
251 - </path>  
252 - <path>  
253 - <item name="advertising" type="b2602c69:ProjectViewProjectNode" />  
254 - <item name="advertising" type="462c0819:PsiDirectoryNode" />  
255 - <item name="application" type="462c0819:PsiDirectoryNode" />  
256 - <item name="index" type="462c0819:PsiDirectoryNode" />  
257 - <item name="controller" type="462c0819:PsiDirectoryNode" />  
258 - </path>  
259 - <path>  
260 - <item name="advertising" type="b2602c69:ProjectViewProjectNode" />  
261 - <item name="advertising" type="462c0819:PsiDirectoryNode" />  
262 - <item name="application" type="462c0819:PsiDirectoryNode" />  
263 - <item name="index" type="462c0819:PsiDirectoryNode" />  
264 - <item name="lang" type="462c0819:PsiDirectoryNode" />  
265 - </path>  
266 </expand> 444 </expand>
267 <select /> 445 <select />
268 </subPane> 446 </subPane>
@@ -278,7 +456,7 @@ @@ -278,7 +456,7 @@
278 <property name="WebServerToolWindowPanel.toolwindow.show.date" value="false" /> 456 <property name="WebServerToolWindowPanel.toolwindow.show.date" value="false" />
279 <property name="WebServerToolWindowPanel.toolwindow.show.permissions" value="false" /> 457 <property name="WebServerToolWindowPanel.toolwindow.show.permissions" value="false" />
280 <property name="WebServerToolWindowPanel.toolwindow.show.size" value="false" /> 458 <property name="WebServerToolWindowPanel.toolwindow.show.size" value="false" />
281 - <property name="last_opened_file_path" value="$PROJECT_DIR$/../competition" /> 459 + <property name="last_opened_file_path" value="D:/phpStudy/WWW/weight" />
282 <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" /> 460 <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
283 <property name="nodejs_npm_path_reset_for_default_project" value="true" /> 461 <property name="nodejs_npm_path_reset_for_default_project" value="true" />
284 <property name="settings.editor.selected.configurable" value="terminal" /> 462 <property name="settings.editor.selected.configurable" value="terminal" />
@@ -288,11 +466,11 @@ @@ -288,11 +466,11 @@
288 <recent name="D:\wamp\www\advertising\public\assets\js\backend" /> 466 <recent name="D:\wamp\www\advertising\public\assets\js\backend" />
289 </key> 467 </key>
290 <key name="CopyFile.RECENT_KEYS"> 468 <key name="CopyFile.RECENT_KEYS">
  469 + <recent name="D:\wamp\www\advertising\public\assets\fonts" />
291 <recent name="D:\wamp\www\advertising\application\home" /> 470 <recent name="D:\wamp\www\advertising\application\home" />
292 <recent name="D:\wamp\www\advertising\application\admin\view\users" /> 471 <recent name="D:\wamp\www\advertising\application\admin\view\users" />
293 <recent name="D:\wamp\www\advertising\public\assets\advertising\img" /> 472 <recent name="D:\wamp\www\advertising\public\assets\advertising\img" />
294 <recent name="D:\wamp\www\advertising\application\admin\view\goods_audit" /> 473 <recent name="D:\wamp\www\advertising\application\admin\view\goods_audit" />
295 - <recent name="D:\wamp\www\advertising\application\home\view\merchant" />  
296 </key> 474 </key>
297 </component> 475 </component>
298 <component name="RunDashboard"> 476 <component name="RunDashboard">
@@ -344,7 +522,7 @@ @@ -344,7 +522,7 @@
344 <workItem from="1573432217070" duration="2199000" /> 522 <workItem from="1573432217070" duration="2199000" />
345 <workItem from="1573519427130" duration="17475000" /> 523 <workItem from="1573519427130" duration="17475000" />
346 <workItem from="1573605070739" duration="29138000" /> 524 <workItem from="1573605070739" duration="29138000" />
347 - <workItem from="1573691027933" duration="8424000" /> 525 + <workItem from="1573691027933" duration="20447000" />
348 </task> 526 </task>
349 <task id="LOCAL-00631" summary="后台bug"> 527 <task id="LOCAL-00631" summary="后台bug">
350 <created>1573628001595</created> 528 <created>1573628001595</created>
@@ -693,7 +871,7 @@ @@ -693,7 +871,7 @@
693 <servers /> 871 <servers />
694 </component> 872 </component>
695 <component name="TimeTrackingManager"> 873 <component name="TimeTrackingManager">
696 - <option name="totallyTimeSpent" value="461344000" /> 874 + <option name="totallyTimeSpent" value="473367000" />
697 </component> 875 </component>
698 <component name="ToolWindowManager"> 876 <component name="ToolWindowManager">
699 <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" /> 877 <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
@@ -707,7 +885,7 @@ @@ -707,7 +885,7 @@
707 <window_info anchor="bottom" id="Version Control" order="7" show_stripe_button="false" /> 885 <window_info anchor="bottom" id="Version Control" order="7" show_stripe_button="false" />
708 <window_info anchor="bottom" id="Terminal" order="7" weight="0.32997763" /> 886 <window_info anchor="bottom" id="Terminal" order="7" weight="0.32997763" />
709 <window_info anchor="bottom" id="运行" order="7" /> 887 <window_info anchor="bottom" id="运行" order="7" />
710 - <window_info anchor="right" id="Remote Host" order="3" weight="0.15778251" /> 888 + <window_info anchor="right" id="Remote Host" order="3" visible="true" weight="0.15778251" />
711 <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.15245202" /> 889 <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.15245202" />
712 <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" /> 890 <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
713 <window_info anchor="right" id="Database" order="3" weight="0.32995737" /> 891 <window_info anchor="right" id="Database" order="3" weight="0.32995737" />
@@ -784,20 +962,6 @@ @@ -784,20 +962,6 @@
784 <option name="LAST_COMMIT_MESSAGE" value="后台bug" /> 962 <option name="LAST_COMMIT_MESSAGE" value="后台bug" />
785 </component> 963 </component>
786 <component name="editorHistoryManager"> 964 <component name="editorHistoryManager">
787 - <entry file="file://$PROJECT_DIR$/application/admin/view/slide/add.html">  
788 - <provider selected="true" editor-type-id="text-editor">  
789 - <state relative-caret-position="136">  
790 - <caret line="8" column="8" selection-start-line="8" selection-start-column="4" selection-end-line="13" selection-end-column="13" />  
791 - </state>  
792 - </provider>  
793 - </entry>  
794 - <entry file="file://$PROJECT_DIR$/application/admin/view/slide/edit.html">  
795 - <provider selected="true" editor-type-id="text-editor">  
796 - <state relative-caret-position="221">  
797 - <caret line="13" column="13" lean-forward="true" selection-start-line="8" selection-start-column="4" selection-end-line="13" selection-end-column="13" />  
798 - </state>  
799 - </provider>  
800 - </entry>  
801 <entry file="file://$PROJECT_DIR$/public/assets/js/backend/slide.js"> 965 <entry file="file://$PROJECT_DIR$/public/assets/js/backend/slide.js">
802 <provider selected="true" editor-type-id="text-editor"> 966 <provider selected="true" editor-type-id="text-editor">
803 <state relative-caret-position="476"> 967 <state relative-caret-position="476">
@@ -1018,13 +1182,6 @@ @@ -1018,13 +1182,6 @@
1018 </state> 1182 </state>
1019 </provider> 1183 </provider>
1020 </entry> 1184 </entry>
1021 - <entry file="file://$PROJECT_DIR$/application/home/view/index/index.html">  
1022 - <provider selected="true" editor-type-id="text-editor">  
1023 - <state relative-caret-position="453">  
1024 - <caret line="103" column="52" selection-start-line="103" selection-start-column="52" selection-end-line="103" selection-end-column="52" />  
1025 - </state>  
1026 - </provider>  
1027 - </entry>  
1028 <entry file="file://$PROJECT_DIR$/application/home/controller/Question.php"> 1185 <entry file="file://$PROJECT_DIR$/application/home/controller/Question.php">
1029 <provider selected="true" editor-type-id="text-editor"> 1186 <provider selected="true" editor-type-id="text-editor">
1030 <state relative-caret-position="657"> 1187 <state relative-caret-position="657">
@@ -1055,13 +1212,6 @@ @@ -1055,13 +1212,6 @@
1055 </state> 1212 </state>
1056 </provider> 1213 </provider>
1057 </entry> 1214 </entry>
1058 - <entry file="file://$PROJECT_DIR$/application/home/controller/Goods.php">  
1059 - <provider selected="true" editor-type-id="text-editor">  
1060 - <state relative-caret-position="221">  
1061 - <caret line="22" column="22" lean-forward="true" selection-start-line="22" selection-start-column="22" selection-end-line="22" selection-end-column="22" />  
1062 - </state>  
1063 - </provider>  
1064 - </entry>  
1065 <entry file="file://$PROJECT_DIR$/thinkphp/library/think/Controller.php"> 1215 <entry file="file://$PROJECT_DIR$/thinkphp/library/think/Controller.php">
1066 <provider selected="true" editor-type-id="text-editor"> 1216 <provider selected="true" editor-type-id="text-editor">
1067 <state relative-caret-position="255"> 1217 <state relative-caret-position="255">
@@ -1093,6 +1243,13 @@ @@ -1093,6 +1243,13 @@
1093 </state> 1243 </state>
1094 </provider> 1244 </provider>
1095 </entry> 1245 </entry>
  1246 + <entry file="file://$PROJECT_DIR$/application/home/view/index/index.html">
  1247 + <provider selected="true" editor-type-id="text-editor">
  1248 + <state relative-caret-position="487">
  1249 + <caret line="105" column="29" selection-start-line="105" selection-start-column="29" selection-end-line="105" selection-end-column="29" />
  1250 + </state>
  1251 + </provider>
  1252 + </entry>
1096 <entry file="file://$PROJECT_DIR$/application/home/controller/Index.php"> 1253 <entry file="file://$PROJECT_DIR$/application/home/controller/Index.php">
1097 <provider selected="true" editor-type-id="text-editor"> 1254 <provider selected="true" editor-type-id="text-editor">
1098 <state relative-caret-position="102"> 1255 <state relative-caret-position="102">
@@ -1100,6 +1257,23 @@ @@ -1100,6 +1257,23 @@
1100 </state> 1257 </state>
1101 </provider> 1258 </provider>
1102 </entry> 1259 </entry>
  1260 + <entry file="file://$PROJECT_DIR$/application/home/model/Goods.php">
  1261 + <provider selected="true" editor-type-id="text-editor">
  1262 + <state relative-caret-position="170">
  1263 + <caret line="15" column="20" selection-start-line="15" selection-start-column="20" selection-end-line="15" selection-end-column="20" />
  1264 + </state>
  1265 + </provider>
  1266 + </entry>
  1267 + <entry file="file://$PROJECT_DIR$/.gitlab-ci.yml">
  1268 + <provider selected="true" editor-type-id="text-editor" />
  1269 + </entry>
  1270 + <entry file="file://$PROJECT_DIR$/application/home/controller/Goods.php">
  1271 + <provider selected="true" editor-type-id="text-editor">
  1272 + <state relative-caret-position="476">
  1273 + <caret line="40" column="50" selection-start-line="40" selection-start-column="50" selection-end-line="40" selection-end-column="50" />
  1274 + </state>
  1275 + </provider>
  1276 + </entry>
1103 </component> 1277 </component>
1104 <component name="masterDetails"> 1278 <component name="masterDetails">
1105 <states> 1279 <states>
@@ -63,12 +63,18 @@ @@ -63,12 +63,18 @@
63 <textarea id="c-content" class="form-control editor" rows="5" name="row[content]" cols="50"></textarea> 63 <textarea id="c-content" class="form-control editor" rows="5" name="row[content]" cols="50"></textarea>
64 </div> 64 </div>
65 </div> 65 </div>
66 - <div class="form-group view_time"> 66 + <div class="form-group">
67 <label class="control-label col-xs-12 col-sm-2">{:__('最短观看时间')}:</label> 67 <label class="control-label col-xs-12 col-sm-2">{:__('最短观看时间')}:</label>
68 <div class="col-xs-12 col-sm-8"> 68 <div class="col-xs-12 col-sm-8">
69 <input id="c-view_time" class="form-control" name="row[view_time]" type="number" value="0"> 69 <input id="c-view_time" class="form-control" name="row[view_time]" type="number" value="0">
70 </div> 70 </div>
71 </div> 71 </div>
  72 + <div class="form-group view_time">
  73 + <label class="control-label col-xs-12 col-sm-2">{:__('重新答题时间')}:</label>
  74 + <div class="col-xs-12 col-sm-8">
  75 + <input id="c-anew_time" class="form-control" name="row[anew_time]" type="number" value="0">
  76 + </div>
  77 + </div>
72 <div class="form-group"> 78 <div class="form-group">
73 <label class="control-label col-xs-12 col-sm-2">{:__('限制性别')}:</label> 79 <label class="control-label col-xs-12 col-sm-2">{:__('限制性别')}:</label>
74 <div class="col-xs-12 col-sm-8"> 80 <div class="col-xs-12 col-sm-8">
@@ -70,6 +70,12 @@ @@ -70,6 +70,12 @@
70 </div> 70 </div>
71 </div> 71 </div>
72 <div class="form-group"> 72 <div class="form-group">
  73 + <label class="control-label col-xs-12 col-sm-2">{:__('重新答题时间')}:</label>
  74 + <div class="col-xs-12 col-sm-8">
  75 + <input id="c-anew_time" class="form-control" name="row[anew_time]" type="number" value="{$row.anew_time}">
  76 + </div>
  77 + </div>
  78 + <div class="form-group">
73 <label class="control-label col-xs-12 col-sm-2">{:__('限制性别')}:</label> 79 <label class="control-label col-xs-12 col-sm-2">{:__('限制性别')}:</label>
74 <div class="col-xs-12 col-sm-8"> 80 <div class="col-xs-12 col-sm-8">
75 81
@@ -70,6 +70,12 @@ @@ -70,6 +70,12 @@
70 </div> 70 </div>
71 </div> 71 </div>
72 <div class="form-group"> 72 <div class="form-group">
  73 + <label class="control-label col-xs-12 col-sm-2">{:__('重新答题时间')}:</label>
  74 + <div class="col-xs-12 col-sm-8">
  75 + <input id="c-anew_time" class="form-control" name="row[anew_time]" type="number" value="{$row.anew_time}">
  76 + </div>
  77 + </div>
  78 + <div class="form-group">
73 <label class="control-label col-xs-12 col-sm-2">{:__('限制性别')}:</label> 79 <label class="control-label col-xs-12 col-sm-2">{:__('限制性别')}:</label>
74 <div class="col-xs-12 col-sm-8"> 80 <div class="col-xs-12 col-sm-8">
75 81
@@ -70,6 +70,12 @@ @@ -70,6 +70,12 @@
70 </div> 70 </div>
71 </div> 71 </div>
72 <div class="form-group"> 72 <div class="form-group">
  73 + <label class="control-label col-xs-12 col-sm-2">{:__('重新答题时间')}:</label>
  74 + <div class="col-xs-12 col-sm-8">
  75 + <input id="c-anew_time" class="form-control" name="row[anew_time]" type="number" value="0">
  76 + </div>
  77 + </div>
  78 + <div class="form-group">
73 <label class="control-label col-xs-12 col-sm-2">{:__('限制性别')}:</label> 79 <label class="control-label col-xs-12 col-sm-2">{:__('限制性别')}:</label>
74 <div class="col-xs-12 col-sm-8"> 80 <div class="col-xs-12 col-sm-8">
75 81
@@ -70,6 +70,12 @@ @@ -70,6 +70,12 @@
70 </div> 70 </div>
71 </div> 71 </div>
72 <div class="form-group"> 72 <div class="form-group">
  73 + <label class="control-label col-xs-12 col-sm-2">{:__('重新答题时间')}:</label>
  74 + <div class="col-xs-12 col-sm-8">
  75 + <input id="c-anew_time" class="form-control" name="row[anew_time]" type="number" value="{$row.anew_time}">
  76 + </div>
  77 + </div>
  78 + <div class="form-group">
73 <label class="control-label col-xs-12 col-sm-2">{:__('限制性别')}:</label> 79 <label class="control-label col-xs-12 col-sm-2">{:__('限制性别')}:</label>
74 <div class="col-xs-12 col-sm-8"> 80 <div class="col-xs-12 col-sm-8">
75 81
@@ -107,7 +107,7 @@ class Goods extends WechatBase @@ -107,7 +107,7 @@ class Goods extends WechatBase
107 $question[$key]['answer'] = $user_question_answer; 107 $question[$key]['answer'] = $user_question_answer;
108 } 108 }
109 //判断是否处于重新答题倒计时状态 109 //判断是否处于重新答题倒计时状态
110 - $question_error = Db::name('user_question_answer')->where(['user_id'=>$this->user_id,'goods_id'=>$goods_id])->find(); 110 + $question_error = Db::name('user_question_answer')->where(['user_id'=>$this->user_id,'goods_id'=>$goods_id,'is_correct'=>"0"])->find();
111 $time = !empty($question_error['resettime']) ? $question_error['resettime']-time() : 0; 111 $time = !empty($question_error['resettime']) ? $question_error['resettime']-time() : 0;
112 $data['time'] = $time; 112 $data['time'] = $time;
113 $data['question'] = $question; 113 $data['question'] = $question;
@@ -46,7 +46,7 @@ class Member extends WechatBase @@ -46,7 +46,7 @@ class Member extends WechatBase
46 //今日获得的红包券 46 //今日获得的红包券
47 $beginToday = mktime(0,0,0,date('m'),date('d'),date('Y')); 47 $beginToday = mktime(0,0,0,date('m'),date('d'),date('Y'));
48 $endToday = mktime(0,0,0,date('m'),date('d')+1,date('Y'))-1; 48 $endToday = mktime(0,0,0,date('m'),date('d')+1,date('Y'))-1;
49 - $today_exp = Db::name('user_exp_log')->where(['user_id'=>$this->user_id,'type'=>['in',[4,5]]])->where('createtime',['>',$beginToday],['<>',$endToday])->sum('exp'); 49 + $today_exp = Db::name('user_exp_log')->where(['user_id'=>$this->user_id,'type'=>['in',[4,5,6]]])->where('createtime',['>',$beginToday],['<>',$endToday])->sum('exp');
50 $user['today_exp'] = $today_exp; 50 $user['today_exp'] = $today_exp;
51 $this->assign('user',$user); 51 $this->assign('user',$user);
52 $this->assign('title','个人中心'); 52 $this->assign('title','个人中心');
@@ -165,10 +165,10 @@ class Member extends WechatBase @@ -165,10 +165,10 @@ class Member extends WechatBase
165 //转换为人民币 165 //转换为人民币
166 $exp_ratio = Db::name('exp_ratio')->where(['id'=>1])->find(); 166 $exp_ratio = Db::name('exp_ratio')->where(['id'=>1])->find();
167 $user['rmb'] = round($user['exp']*$exp_ratio['ratio']*0.01,2); 167 $user['rmb'] = round($user['exp']*$exp_ratio['ratio']*0.01,2);
168 - $arr = [10,20,30,40,50];  
169 - $data = [];  
170 - foreach($arr as $key => $a){  
171 - $data[$a] = $a*$exp_ratio['ratio']/0.01; 168 + $data = Db::name('withdraw_label')->order('weigh desc,id desc')->select();
  169 + $data = collection($data)->toArray();
  170 + foreach($data as $key => $vo){
  171 + $data[$key]['exp'] = $vo['rmb']*$exp_ratio['ratio']/0.01;
172 } 172 }
173 $this->assign('user',$user); 173 $this->assign('user',$user);
174 $this->assign('data',$data); 174 $this->assign('data',$data);
@@ -269,7 +269,7 @@ class Member extends WechatBase @@ -269,7 +269,7 @@ class Member extends WechatBase
269 if(empty($user)){ 269 if(empty($user)){
270 $this->error('查无此人'); 270 $this->error('查无此人');
271 } 271 }
272 - $data = Db::name('user_exp_log')->where(['type'=>['in',[4,5]],'user_id'=>$this->user_id])->order('id desc')->page(1,5)->select(); 272 + $data = Db::name('user_exp_log')->where(['type'=>['in',[4,5,6]],'user_id'=>$this->user_id])->order('id desc')->page(1,5)->select();
273 $exp_ratio = Db::name('exp_ratio')->where(['id'=>1])->find(); 273 $exp_ratio = Db::name('exp_ratio')->where(['id'=>1])->find();
274 foreach($data as $key => $vo){ 274 foreach($data as $key => $vo){
275 $data[$key]['createtime'] = date('Y年m月d日 H:i'); 275 $data[$key]['createtime'] = date('Y年m月d日 H:i');
@@ -295,7 +295,7 @@ class Member extends WechatBase @@ -295,7 +295,7 @@ class Member extends WechatBase
295 if(empty($user_id)){ 295 if(empty($user_id)){
296 $this->error('缺少必要参数'); 296 $this->error('缺少必要参数');
297 } 297 }
298 - $data = Db::name('user_exp_log')->where(['type'=>['in',[4,5]],'user_id'=>$user_id])->order('id desc')->page($page,$pageNum)->select(); 298 + $data = Db::name('user_exp_log')->where(['type'=>['in',[4,5,6]],'user_id'=>$user_id])->order('id desc')->page($page,$pageNum)->select();
299 $exp_ratio = Db::name('exp_ratio')->where(['id'=>1])->find(); 299 $exp_ratio = Db::name('exp_ratio')->where(['id'=>1])->find();
300 foreach($data as $key => $vo){ 300 foreach($data as $key => $vo){
301 $data[$key]['createtime'] = date('Y年m月d日 H:i'); 301 $data[$key]['createtime'] = date('Y年m月d日 H:i');
@@ -122,7 +122,7 @@ class Question extends WechatBase @@ -122,7 +122,7 @@ class Question extends WechatBase
122 }else{ 122 }else{
123 $question_error[] = $question_key; 123 $question_error[] = $question_key;
124 $is_correct = 0; 124 $is_correct = 0;
125 - $arr['resettime'] = time() + 300; 125 + $arr['resettime'] = time() + $goods['anew_time'];
126 $resettime = $arr['resettime'] - time(); 126 $resettime = $arr['resettime'] - time();
127 } 127 }
128 $arr['user_id'] = $user_id; 128 $arr['user_id'] = $user_id;
@@ -143,7 +143,7 @@ class Question extends WechatBase @@ -143,7 +143,7 @@ class Question extends WechatBase
143 if(empty($question_error)){ 143 if(empty($question_error)){
144 //全部正确获取红包券 144 //全部正确获取红包券
145 //判断是否获取过该广告的红包 145 //判断是否获取过该广告的红包
146 - $user_exp_log = Db::name('user_exp_log')->where(['type'=>4,'goods_id'=>$goods_id])->find(); 146 + $user_exp_log = Db::name('user_exp_log')->where(['type'=>4,'goods_id'=>$goods_id,'user_id'=>$user_id])->find();
147 if(!empty($user_exp_log)){ 147 if(!empty($user_exp_log)){
148 Db::rollback(); 148 Db::rollback();
149 $this->error('您已获得过该广告的奖励'); 149 $this->error('您已获得过该广告的奖励');
@@ -95,11 +95,13 @@ class Share extends WechatBase @@ -95,11 +95,13 @@ class Share extends WechatBase
95 $image->water($avatar_url,[311,46.5],100) 95 $image->water($avatar_url,[311,46.5],100)
96 ->water(ROOT_PATH."public/bg$type.png") 96 ->water(ROOT_PATH."public/bg$type.png")
97 ->water($url,[212,600],100) 97 ->water($url,[212,600],100)
  98 + ->text("$user[nickname]",'./assets/fonts/PingFang Medium.ttf',20,'#ffffff',\think\Image::WATER_NORTH,[0,130])
98 ->save($savePath."poster_$user[id].png"); 99 ->save($savePath."poster_$user[id].png");
99 }else{ 100 }else{
100 $image->water($avatar_url,[311,46.5],100) 101 $image->water($avatar_url,[311,46.5],100)
101 ->water(ROOT_PATH."public/bg$type.png") 102 ->water(ROOT_PATH."public/bg$type.png")
102 ->water($url,[212,622],100) 103 ->water($url,[212,622],100)
  104 + ->text("$user[nickname]",'./assets/fonts/PingFang Medium.ttf',20,'#ffffff',\think\Image::WATER_NORTH,[0,130])
103 ->save($savePath."poster_$user[id].png"); 105 ->save($savePath."poster_$user[id].png");
104 } 106 }
105 return "/uploads/poster$type/poster_$user[id].png"; 107 return "/uploads/poster$type/poster_$user[id].png";
@@ -17,6 +17,8 @@ @@ -17,6 +17,8 @@
17 参与答题 17 参与答题
18 {elseif condition='$vo.type eq 5'} 18 {elseif condition='$vo.type eq 5'}
19 下级答题 19 下级答题
  20 + {elseif condition='$vo.type eq 6'}
  21 + 商户消费
20 {/if} 22 {/if}
21 </div> 23 </div>
22 <div class="record_num">+{$vo.rmb}元</div> 24 <div class="record_num">+{$vo.rmb}元</div>
@@ -23,9 +23,9 @@ @@ -23,9 +23,9 @@
23 <div class="width_drawal_tips">提现金额</div> 23 <div class="width_drawal_tips">提现金额</div>
24 <div class="choice_with_drawal layout align_center justify flex_row flex_wrap"> 24 <div class="choice_with_drawal layout align_center justify flex_row flex_wrap">
25 {foreach name="$data" item="vo"} 25 {foreach name="$data" item="vo"}
26 - <div class="choice_single layout align_center justify_center flex_diection" data-exp="{$vo}" data-rmb="{$key}">  
27 - <div class="choice_money">{$key}元</div>  
28 - <div class="choice_coupon">消耗{$vo}红包券</div> 26 + <div class="choice_single layout align_center justify_center flex_diection" data-exp="{$vo.exp}" data-rmb="{$vo.rmb}">
  27 + <div class="choice_money">{$vo.rmb}元</div>
  28 + <div class="choice_coupon">消耗{$vo.exp}红包券</div>
29 <div class="choice_img"> 29 <div class="choice_img">
30 <img src="__CDN__/assets/advertising/img/choice.png" alt="" /> 30 <img src="__CDN__/assets/advertising/img/choice.png" alt="" />
31 </div> 31 </div>
@@ -147,24 +147,22 @@ html { @@ -147,24 +147,22 @@ html {
147 147
148 .invite_qr_code { 148 .invite_qr_code {
149 width: 6.86rem; 149 width: 6.86rem;
150 - height: 11rem;  
151 margin: 0 auto; 150 margin: 0 auto;
152 z-index: 3; 151 z-index: 3;
153 border-radius: 0.16rem; 152 border-radius: 0.16rem;
154 position: fixed; 153 position: fixed;
155 - top: 1rem; 154 + top: 50%;
156 left: 50%; 155 left: 50%;
157 - transform: translateX(-50%);  
158 - -webkit-transform: translateX(-50%);  
159 - -moz-transform: translateX(-50%);  
160 - -ms-transform: translateX(-50%);  
161 - -o-transform: translateX(-50%); 156 + transform: translate(-50%,-50%);
  157 + -webkit-transform: translate(-50%,-50%);
  158 + -moz-transform: translate(-50%,-50%);
  159 + -ms-transform: translate(-50%,-50%);
  160 + -o-transform: translate(-50%,-50%);
162 display: none; 161 display: none;
163 } 162 }
164 163
165 .invite_code { 164 .invite_code {
166 width: 100%; 165 width: 100%;
167 - height: 9.8rem;  
168 background-color: #FB7A17; 166 background-color: #FB7A17;
169 } 167 }
170 168
@@ -178,4 +176,4 @@ html { @@ -178,4 +176,4 @@ html {
178 font-size: 0.32rem; 176 font-size: 0.32rem;
179 border-radius: 0.16rem; 177 border-radius: 0.16rem;
180 margin-top: 0.4rem; 178 margin-top: 0.4rem;
181 -}  
  179 +}
不能预览此文件类型
@@ -74,13 +74,6 @@ class Controller @@ -74,13 +74,6 @@ class Controller
74 */ 74 */
75 protected function _initialize() 75 protected function _initialize()
76 { 76 {
77 - $user_id = get_current_user_id();  
78 - if(!empty($user_id)){  
79 - $data = Db::name('user')->where(['id'=>$user_id])->find();  
80 - if($data['status'] == 'hidden'){  
81 - $this->error('您已被拉黑');  
82 - }  
83 - }  
84 } 77 }
85 78
86 /** 79 /**