郭盛 / areial · 提交

转到一个项目

作者 郭盛
提交 42b54b22d3a27dc5b7c2c8de37d6e680026ced5c 1 个父辈 4513e2b2
1 个管道 的构建 通过 耗费 0 秒

图片详情

内嵌 并排对比
正在显示 3 个修改的文件 包含 21 行增加 和 16 行删除
... ... @@ -3,11 +3,8 @@
<component name="ChangeListManager">
<list default="true" id="e93f11c2-a7d9-4d35-8b1c-8dd18e7f5fef" name="Default" comment="">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/admin/lang/zh-cn/pic.php" afterPath="$PROJECT_DIR$/application/admin/lang/zh-cn/pic.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/admin/view/pic/add.html" afterPath="$PROJECT_DIR$/application/admin/view/pic/add.html" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/admin/view/pic/edit.html" afterPath="$PROJECT_DIR$/application/admin/view/pic/edit.html" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/api/controller/User.php" afterPath="$PROJECT_DIR$/application/api/controller/User.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/assets/js/backend/pic.js" afterPath="$PROJECT_DIR$/public/assets/js/backend/pic.js" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/api.html" afterPath="$PROJECT_DIR$/public/api.html" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" />
... ... @@ -21,8 +18,8 @@
<file leaf-file-name="User.php" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/application/api/controller/User.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="600">
<caret line="331" column="58" lean-forward="false" selection-start-line="331" selection-start-column="58" selection-end-line="331" selection-end-column="58" />
<state relative-caret-position="527">
<caret line="301" column="31" lean-forward="false" selection-start-line="301" selection-start-column="31" selection-end-line="301" selection-end-column="31" />
<folding>
<element signature="e#38#68#0#PHP" expanded="true" />
<element signature="e#462#1200#0#PHP" expanded="false" />
... ... @@ -34,6 +31,8 @@
<element signature="e#5602#7338#0#PHP" expanded="false" />
<element signature="e#7344#7793#0#PHP" expanded="false" />
<element signature="e#7798#8681#0#PHP" expanded="false" />
<element signature="e#8687#9371#0#PHP" expanded="false" />
<element signature="e#9376#10872#0#PHP" expanded="false" />
</folding>
</state>
</provider>
... ... @@ -108,8 +107,8 @@
</component>
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
<component name="ProjectFrameBounds">
<option name="x" value="253" />
<option name="y" value="32" />
<option name="x" value="534" />
<option name="y" value="81" />
<option name="width" value="1589" />
<option name="height" value="939" />
</component>
... ... @@ -240,7 +239,7 @@
<workItem from="1574122453532" duration="15780000" />
<workItem from="1574141466352" duration="745000" />
<workItem from="1574143209694" duration="3660000" />
<workItem from="1574146994475" duration="8359000" />
<workItem from="1574146994475" duration="8817000" />
</task>
<task id="LOCAL-00001" summary="调试">
<created>1574145133364</created>
... ... @@ -253,7 +252,7 @@
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="56712000" />
<option name="totallyTimeSpent" value="57170000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
... ... @@ -265,7 +264,7 @@
</todo-panel>
</component>
<component name="ToolWindowManager">
<frame x="253" y="32" width="1589" height="939" extended-state="0" />
<frame x="534" y="81" width="1589" height="939" extended-state="0" />
<layout>
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.18574232" sideWeight="0.5" order="1" side_tool="false" content_ui="combo" />
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32912987" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
... ... @@ -682,8 +681,8 @@
</entry>
<entry file="file://$PROJECT_DIR$/application/api/controller/User.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="600">
<caret line="331" column="58" lean-forward="false" selection-start-line="331" selection-start-column="58" selection-end-line="331" selection-end-column="58" />
<state relative-caret-position="527">
<caret line="301" column="31" lean-forward="false" selection-start-line="301" selection-start-column="31" selection-end-line="301" selection-end-column="31" />
<folding>
<element signature="e#38#68#0#PHP" expanded="true" />
<element signature="e#462#1200#0#PHP" expanded="false" />
... ... @@ -695,6 +694,8 @@
<element signature="e#5602#7338#0#PHP" expanded="false" />
<element signature="e#7344#7793#0#PHP" expanded="false" />
<element signature="e#7798#8681#0#PHP" expanded="false" />
<element signature="e#8687#9371#0#PHP" expanded="false" />
<element signature="e#9376#10872#0#PHP" expanded="false" />
</folding>
</state>
</provider>
... ...
... ... @@ -288,9 +288,9 @@ class User extends Api
"time": "1571492001",
"data": {
"id": 4,//图片id,
"title"://标题
"thumbnail": //缩略图,
"water_url": //小样带水印的图片地址,
"url": //高清地址,
"price"://正常价格,
"vip_price"://vip价格,
"content"://图片介绍,
... ... @@ -313,10 +313,12 @@ class User extends Api
$this->error(['code'=>2,'msg'=>'缺少必要参数']);
}
$data = Db::name('pic')
->field('id,title,thumbnail,price,vip_price,water_url,content')
->where('id',$pic_id)
->find();
$data['thumbnail'] = $rule.$data['thumbnail'];
$data['water_url'] = $rule.$data['water_url'];
$data['content'] = strip_tags($data['content']);
$data['is_vip'] = 0;
$this->success('SUCCESS',$data);
}elseif($res['is_vip'] == 1){
... ... @@ -325,11 +327,13 @@ class User extends Api
$this->error(['code'=>2,'msg'=>'缺少必要参数']);
}
$data = Db::name('pic')
->field('id,title,thumbnail,price,vip_price,water_url,content')
->where('id',$pic_id)
->find();
$data['is_vip'] = 1;
$data['thumbnail'] = $rule.$data['thumbnail'];
$data['water_url'] = $rule.$data['water_url'];
$data['content'] = strip_tags($data['content']);
$this->success('SUCCESS',$data);
}
}
... ...
... ... @@ -1975,9 +1975,9 @@
"time": "1571492001",
"data": {
"id": 4,//图片id,
"title"://标题
"thumbnail": //缩略图,
"water_url": //小样带水印的图片地址,
"url": //高清地址,
"price"://正常价格,
"vip_price"://vip价格,
"content"://图片介绍,
... ... @@ -1999,7 +1999,7 @@
<div class="row mt0 footer">
<div class="col-md-6" align="left">
Generated on 2019-11-19 17:22:43 </div>
Generated on 2019-11-19 17:30:17 </div>
<div class="col-md-6" align="right">
<a href="https://www.fastadmin.net" target="_blank">FastAdmin</a>
</div>
... ...