郭盛 / areial · 提交

转到一个项目

作者 郭盛
提交 41075dd25c22778ac6e6156d8cd7c0097e5a95bb 1 个父辈 18a4b4e7
1 个管道 的构建 通过 耗费 12 秒

修改图片多余字段

内嵌 并排对比
正在显示 7 个修改的文件 包含 124 行增加 和 155 行删除
... ... @@ -5,8 +5,11 @@
</component>
<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/controller/Pic.php" afterPath="$PROJECT_DIR$/application/admin/controller/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" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" />
... ... @@ -20,8 +23,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="218">
<caret line="730" column="13" lean-forward="true" selection-start-line="730" selection-start-column="13" selection-end-line="730" selection-end-column="13" />
<state relative-caret-position="-1653">
<caret line="688" column="55" lean-forward="true" selection-start-line="688" selection-start-column="55" selection-end-line="688" selection-end-column="55" />
<folding>
<element signature="e#535#1273#0#PHP" expanded="false" />
<element signature="e#1278#2941#0#PHP" expanded="false" />
... ... @@ -50,7 +53,6 @@
<element signature="e#18462#19038#0#PHP" expanded="false" />
<element signature="e#19043#19655#0#PHP" expanded="false" />
<element signature="e#19661#20377#0#PHP" expanded="false" />
<element signature="e#20643#25263#0#PHP" expanded="false" />
<element signature="e#25278#26208#0#PHP" expanded="false" />
<element signature="e#26213#31354#0#PHP" expanded="false" />
<element signature="e#31360#31737#0#PHP" expanded="false" />
... ... @@ -110,26 +112,6 @@
</provider>
</entry>
</file>
<file leaf-file-name="standard_5.php" pinned="false" current-in-tab="false">
<entry file="jar://$APPLICATION_HOME_DIR$/plugins/php/lib/php.jar!/stubs/standard/standard_5.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="578">
<caret line="1121" column="9" lean-forward="false" selection-start-line="1121" selection-start-column="9" selection-end-line="1121" selection-end-column="9" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="verify.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/application/extra/verify.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="369">
<caret line="19" column="39" lean-forward="false" selection-start-line="19" selection-start-column="39" selection-end-line="19" selection-end-column="39" />
<folding />
</state>
</provider>
</entry>
</file>
</leaf>
</component>
<component name="FileTemplateManagerImpl">
... ... @@ -204,15 +186,15 @@
<option value="$PROJECT_DIR$/application/api/controller/Notify.php" />
<option value="$PROJECT_DIR$/application/admin/controller/Video.php" />
<option value="$PROJECT_DIR$/application/api/controller/a.php" />
<option value="$PROJECT_DIR$/public/assets/js/backend/pic.js" />
<option value="$PROJECT_DIR$/application/admin/controller/Pic.php" />
<option value="$PROJECT_DIR$/application/admin/lang/zh-cn/pic.php" />
<option value="$PROJECT_DIR$/application/api/controller/Pay.php" />
<option value="$PROJECT_DIR$/application/admin/view/pic/add.html" />
<option value="$PROJECT_DIR$/application/admin/view/pic/edit.html" />
<option value="$PROJECT_DIR$/application/admin/view/video/add.html" />
<option value="$PROJECT_DIR$/application/admin/view/video/edit.html" />
<option value="$PROJECT_DIR$/application/extra/verify.php" />
<option value="$PROJECT_DIR$/public/assets/js/backend/pic.js" />
<option value="$PROJECT_DIR$/application/admin/view/pic/add.html" />
<option value="$PROJECT_DIR$/application/admin/view/pic/edit.html" />
<option value="$PROJECT_DIR$/application/admin/controller/Pic.php" />
<option value="$PROJECT_DIR$/application/api/controller/User.php" />
</list>
</option>
... ... @@ -231,9 +213,9 @@
<sorting>DEFINITION_ORDER</sorting>
</component>
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
<component name="ProjectFrameBounds" extendedState="1">
<option name="x" value="213" />
<option name="y" value="71" />
<component name="ProjectFrameBounds">
<option name="x" value="163" />
<option name="y" value="42" />
<option name="width" value="1652" />
<option name="height" value="930" />
</component>
... ... @@ -253,7 +235,6 @@
</navigator>
<panes>
<pane id="Scope" />
<pane id="Scratches" />
<pane id="ProjectPane">
<subPane>
<expand>
... ... @@ -279,34 +260,11 @@
<item name="api" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="controller" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
<path>
<item name="areial" type="b2602c69:ProjectViewProjectNode" />
<item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="application" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="extra" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
<path>
<item name="areial" type="b2602c69:ProjectViewProjectNode" />
<item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="public" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
<path>
<item name="areial" type="b2602c69:ProjectViewProjectNode" />
<item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="public" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="uploads" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
<path>
<item name="areial" type="b2602c69:ProjectViewProjectNode" />
<item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="public" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="uploads" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="20200224" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
</expand>
<select />
</subPane>
</pane>
<pane id="Scratches" />
</panes>
</component>
<component name="PropertiesComponent">
... ... @@ -316,12 +274,6 @@
<property name="settings.editor.selected.configurable" value="preferences.keymap" />
</component>
<component name="RecentsManager">
<key name="MoveFile.RECENT_KEYS">
<recent name="D:\htdocs\areial\public\uploads\20191120" />
<recent name="D:\htdocs\areial\public\uploads" />
<recent name="D:\htdocs\areial\public\cert" />
<recent name="D:\htdocs\areial\public\uploads\20191118" />
</key>
<key name="CopyFile.RECENT_KEYS">
<recent name="D:\htdocs\areial\public\assets\js" />
<recent name="D:\htdocs\areial\public\assets\libs\bootstrap-table\dist\extensions" />
... ... @@ -329,6 +281,12 @@
<recent name="D:\htdocs\areial\extend" />
<recent name="D:\htdocs\areial\public\uploads\20191118" />
</key>
<key name="MoveFile.RECENT_KEYS">
<recent name="D:\htdocs\areial\public\uploads\20191120" />
<recent name="D:\htdocs\areial\public\uploads" />
<recent name="D:\htdocs\areial\public\cert" />
<recent name="D:\htdocs\areial\public\uploads\20191118" />
</key>
</component>
<component name="RunDashboard">
<option name="ruleStates">
... ... @@ -461,6 +419,7 @@
<workItem from="1585528700995" duration="1288000" />
<workItem from="1585557924309" duration="618000" />
<workItem from="1585565173117" duration="2442000" />
<workItem from="1585613706476" duration="1757000" />
</task>
<task id="LOCAL-00001" summary="调试">
<created>1574145133364</created>
... ... @@ -529,7 +488,7 @@
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="646946000" />
<option name="totallyTimeSpent" value="648703000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
... ... @@ -541,17 +500,16 @@
</todo-panel>
</component>
<component name="ToolWindowManager">
<frame x="213" y="71" width="1652" height="930" extended-state="1" />
<editor active="true" />
<frame x="163" y="42" width="1652" height="930" extended-state="0" />
<layout>
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.16645728" sideWeight="0.5" order="1" side_tool="false" content_ui="combo" />
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.16645728" 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" />
<window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32876712" sideWeight="0.5" order="0" side_tool="true" content_ui="tabs" />
<window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4654088" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Terminal" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.46532157" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="true" content_ui="tabs" />
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
<window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
... ... @@ -808,13 +766,6 @@
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/api/controller/a.php" />
<entry file="file://$PROJECT_DIR$/public/assets/js/backend/pic.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="525">
<caret line="39" column="148" lean-forward="false" selection-start-line="39" selection-start-column="148" selection-end-line="39" selection-end-column="148" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/assets/js/backend/video.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="364">
... ... @@ -822,13 +773,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/controller/Pic.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="129">
<caret line="227" column="35" lean-forward="true" selection-start-line="227" selection-start-column="35" selection-end-line="227" selection-end-column="35" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/lang/zh-cn/pic.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="150">
... ... @@ -906,20 +850,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/view/pic/edit.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="190">
<caret line="99" column="21" lean-forward="true" selection-start-line="99" selection-start-column="21" selection-end-line="99" selection-end-column="21" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/view/pic/add.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1315">
<caret line="99" column="21" lean-forward="true" selection-start-line="99" selection-start-column="21" selection-end-line="99" selection-end-column="21" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/controller/Video.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="298">
... ... @@ -966,6 +896,19 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/uploads/20200224/FnP4bjIl2npbQgozzDqWFF8jSgyX.jpg">
<provider selected="true" editor-type-id="images">
<state />
</provider>
</entry>
<entry file="jar://$APPLICATION_HOME_DIR$/plugins/php/lib/php.jar!/stubs/standard/standard_5.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="578">
<caret line="1121" column="9" lean-forward="false" selection-start-line="1121" selection-start-column="9" selection-end-line="1121" selection-end-column="9" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/extra/verify.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="369">
... ... @@ -974,23 +917,50 @@
</state>
</provider>
</entry>
<entry file="jar://$APPLICATION_HOME_DIR$/plugins/php/lib/php.jar!/stubs/standard/standard_5.php">
<entry file="file://$PROJECT_DIR$/public/assets/js/backend/pic.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="578">
<caret line="1121" column="9" lean-forward="false" selection-start-line="1121" selection-start-column="9" selection-end-line="1121" selection-end-column="9" />
<state relative-caret-position="250">
<caret line="28" column="63" lean-forward="true" selection-start-line="28" selection-start-column="63" selection-end-line="28" selection-end-column="63" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/uploads/20200224/FnP4bjIl2npbQgozzDqWFF8jSgyX.jpg">
<provider selected="true" editor-type-id="images">
<state />
<entry file="file://$PROJECT_DIR$/application/admin/view/pic/edit.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1550">
<caret line="62" column="10" lean-forward="true" selection-start-line="62" selection-start-column="10" selection-end-line="62" selection-end-column="10" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/view/pic/add.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="329">
<caret line="63" column="4" lean-forward="false" selection-start-line="63" selection-start-column="8" selection-end-line="76" selection-end-column="14" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/controller/Pic.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1060">
<caret line="162" column="37" lean-forward="false" selection-start-line="162" selection-start-column="37" selection-end-line="162" selection-end-column="37" />
<folding>
<element signature="e#691#2392#0#PHP" expanded="false" />
<element signature="e#2424#5392#0#PHP" expanded="false" />
<element signature="e#5424#8624#0#PHP" expanded="false" />
<element signature="e#8630#8874#0#PHP" expanded="false" />
<element signature="e#8880#9137#0#PHP" expanded="false" />
<element signature="e#9143#9408#0#PHP" expanded="false" />
<element signature="e#9415#9663#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/api/controller/User.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="218">
<caret line="730" column="13" lean-forward="true" selection-start-line="730" selection-start-column="13" selection-end-line="730" selection-end-column="13" />
<state relative-caret-position="-1653">
<caret line="688" column="55" lean-forward="true" selection-start-line="688" selection-start-column="55" selection-end-line="688" selection-end-column="55" />
<folding>
<element signature="e#535#1273#0#PHP" expanded="false" />
<element signature="e#1278#2941#0#PHP" expanded="false" />
... ... @@ -1019,7 +989,6 @@
<element signature="e#18462#19038#0#PHP" expanded="false" />
<element signature="e#19043#19655#0#PHP" expanded="false" />
<element signature="e#19661#20377#0#PHP" expanded="false" />
<element signature="e#20643#25263#0#PHP" expanded="false" />
<element signature="e#25278#26208#0#PHP" expanded="false" />
<element signature="e#26213#31354#0#PHP" expanded="false" />
<element signature="e#31360#31737#0#PHP" expanded="false" />
... ...
... ... @@ -120,7 +120,7 @@ class Pic extends Backend
if ($params) {
$params = $this->preExcludeFields($params);
$params['type_ids'] =','.$params['type_ids'].',';
// $params['type_ids'] =','.$params['type_ids'].',';
$params['pictype_ids'] =','.$params['pictype_ids'].',';
if ($this->dataLimit && $this->dataLimitFieldAutoFill) {
$params[$this->dataLimitField] = $this->auth->id;
... ... @@ -182,7 +182,7 @@ class Pic extends Backend
$params['code'] = '';
}
$params['type_ids'] =','.$params['type_ids'].',';
// $params['type_ids'] =','.$params['type_ids'].',';
//如果内容关键字和地名关键字都为空
if($params['text_ids'] == '' && $params['address_ids'] == ''){
$this->error('请选择关键字标签');
... ...
... ... @@ -49,32 +49,32 @@
<ul class="row list-inline plupload-preview" id="p-thumbnail"></ul>
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Type_ids')}:</label>
<div class="col-xs-12 col-sm-8">
<input id="c-type_ids" data-rule="required" data-source="type/index" data-multiple="true" data-field="area_name" class="form-control selectpage" name="row[type_ids]" type="text" value="">
</div>
</div>
<!--<div class="form-group">-->
<!--<label class="control-label col-xs-12 col-sm-2">{:__('Type_ids')}:</label>-->
<!--<div class="col-xs-12 col-sm-8">-->
<!--<input id="c-type_ids" data-rule="required" data-source="type/index" data-multiple="true" data-field="area_name" class="form-control selectpage" name="row[type_ids]" type="text" value="">-->
<!--</div>-->
<!--</div>-->
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Pictype_ids')}:</label>
<div class="col-xs-12 col-sm-8">
<input id="c-pictype_ids" data-rule="required" data-source="pictype/index" data-multiple="true" data-field="typename" class="form-control selectpage" name="row[pictype_ids]" type="text" value="">
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Water_url')}:</label>
<div class="col-xs-12 col-sm-8">
<div class="input-group">
<input id="c-water_url" data-rule="required" class="form-control" size="35" name="row[water_url]" type="text" placeholder="请上传小样图片">
<div class="input-group-addon no-border no-padding">
<span><button type="button" id="plupload-water_url" class="btn btn-danger plupload" data-input-id="c-water_url" data-mimetype="image/gif,image/jpeg,image/png,image/jpg,image/bmp" data-multiple="false" data-preview-id="p-water_url"><i class="fa fa-upload"></i> {:__('Upload')}</button></span>
<span><button type="button" id="fachoose-water_url" class="btn btn-primary fachoose" data-input-id="c-water_url" data-mimetype="image/*" data-multiple="false"><i class="fa fa-list"></i> {:__('Choose')}</button></span>
</div>
<span class="msg-box n-right"></span>
</div>
<ul class="row list-inline plupload-preview" id="p-water_url"></ul>
</div>
</div>
<!--<div class="form-group">-->
<!--<label class="control-label col-xs-12 col-sm-2">{:__('Water_url')}:</label>-->
<!--<div class="col-xs-12 col-sm-8">-->
<!--<div class="input-group">-->
<!--<input id="c-water_url" data-rule="required" class="form-control" size="35" name="row[water_url]" type="text" placeholder="请上传小样图片">-->
<!--<div class="input-group-addon no-border no-padding">-->
<!--<span><button type="button" id="plupload-water_url" class="btn btn-danger plupload" data-input-id="c-water_url" data-mimetype="image/gif,image/jpeg,image/png,image/jpg,image/bmp" data-multiple="false" data-preview-id="p-water_url"><i class="fa fa-upload"></i> {:__('Upload')}</button></span>-->
<!--<span><button type="button" id="fachoose-water_url" class="btn btn-primary fachoose" data-input-id="c-water_url" data-mimetype="image/*" data-multiple="false"><i class="fa fa-list"></i> {:__('Choose')}</button></span>-->
<!--</div>-->
<!--<span class="msg-box n-right"></span>-->
<!--</div>-->
<!--<ul class="row list-inline plupload-preview" id="p-water_url"></ul>-->
<!--</div>-->
<!--</div>-->
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Url')}:</label>
<div class="col-xs-12 col-sm-8">
... ... @@ -84,7 +84,7 @@
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Price')}:</label>
<div class="col-xs-12 col-sm-8">
{:build_radios('row[price]', ['800'=>__('800'), '1500'=>__('1200'),'3000'=>__('3000')])}
{:build_radios('row[price]', ['800'=>__('800'), '1800'=>__('1800'),'3000'=>__('3000')])}
</div>
</div>
<!--<div class="form-group">-->
... ...
... ... @@ -49,32 +49,32 @@
<ul class="row list-inline plupload-preview" id="p-image"></ul>
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Type_ids')}:</label>
<div class="col-xs-12 col-sm-8">
<input id="c-type_ids" data-rule="required" data-source="type/index" data-multiple="true" data-field="area_name" class="form-control selectpage" name="row[type_ids]" type="text" value="{$row.type_ids}">
</div>
</div>
<!--<div class="form-group">-->
<!--<label class="control-label col-xs-12 col-sm-2">{:__('Type_ids')}:</label>-->
<!--<div class="col-xs-12 col-sm-8">-->
<!--<input id="c-type_ids" data-rule="required" data-source="type/index" data-multiple="true" data-field="area_name" class="form-control selectpage" name="row[type_ids]" type="text" value="{$row.type_ids}">-->
<!--</div>-->
<!--</div>-->
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Pictype_ids')}:</label>
<div class="col-xs-12 col-sm-8">
<input id="c-pictype_ids" data-rule="required" data-source="pictype/index" data-multiple="true" data-field="typename" class="form-control selectpage" name="row[pictype_ids]" type="text" value="{$row.pictype_ids}">
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Water_url')}:</label>
<div class="col-xs-12 col-sm-8">
<div class="input-group">
<input id="c-water_url" data-rule="required" class="form-control" size="35" name="row[water_url]" value="{$row.water_url}" type="text" placeholder="请上传小样图片">
<div class="input-group-addon no-border no-padding">
<span><button type="button" id="plupload-water_url" class="btn btn-danger plupload" data-input-id="c-water_url" data-mimetype="image/gif,image/jpeg,image/png,image/jpg,image/bmp" data-multiple="false" data-preview-id="p-water_url"><i class="fa fa-upload"></i> {:__('Upload')}</button></span>
<span><button type="button" id="fachoose-water_url" class="btn btn-primary fachoose" data-input-id="c-water_url" data-mimetype="image/*" data-multiple="false"><i class="fa fa-list"></i> {:__('Choose')}</button></span>
</div>
<span class="msg-box n-right"></span>
</div>
<ul class="row list-inline plupload-preview" id="p-water_url"></ul>
</div>
</div>
<!--<div class="form-group">-->
<!--<label class="control-label col-xs-12 col-sm-2">{:__('Water_url')}:</label>-->
<!--<div class="col-xs-12 col-sm-8">-->
<!--<div class="input-group">-->
<!--<input id="c-water_url" data-rule="required" class="form-control" size="35" name="row[water_url]" value="{$row.water_url}" type="text" placeholder="请上传小样图片">-->
<!--<div class="input-group-addon no-border no-padding">-->
<!--<span><button type="button" id="plupload-water_url" class="btn btn-danger plupload" data-input-id="c-water_url" data-mimetype="image/gif,image/jpeg,image/png,image/jpg,image/bmp" data-multiple="false" data-preview-id="p-water_url"><i class="fa fa-upload"></i> {:__('Upload')}</button></span>-->
<!--<span><button type="button" id="fachoose-water_url" class="btn btn-primary fachoose" data-input-id="c-water_url" data-mimetype="image/*" data-multiple="false"><i class="fa fa-list"></i> {:__('Choose')}</button></span>-->
<!--</div>-->
<!--<span class="msg-box n-right"></span>-->
<!--</div>-->
<!--<ul class="row list-inline plupload-preview" id="p-water_url"></ul>-->
<!--</div>-->
<!--</div>-->
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Url')}:</label>
<div class="col-xs-12 col-sm-8">
... ... @@ -84,7 +84,7 @@
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Price')}:</label>
<div class="col-xs-12 col-sm-8">
{:build_radios('row[price]', ['800'=>__('800'), '1500'=>__('1500'),'3000'=>__('3000元')],$row['price'])}
{:build_radios('row[price]', ['800'=>__('800'), '1800'=>__('1800'),'3000'=>__('3000元')],$row['price'])}
</div>
</div>
<!--<div class="form-group">-->
... ...
... ... @@ -672,11 +672,11 @@ class User extends Api
unset($data['keyword'][$k]);
}
}
$base_url = $data['water_url'];
$base_url = $data['thumbnail'];
$click_num = $data['click_num'] + 1;
Db::name('pic')->where('id',$pic_id)->update(['click_num'=>$click_num]);
$data['accredit'] = $rule.$accredit['thumbnail'];
$qiniu_url = $rule.$data['water_url'];
$qiniu_url = $rule.$data['thumbnail'];
$a = file_get_contents($qiniu_url);
$path = './uploads/'.explode('/',$base_url)[2].'/';
if(!file_exists($path)) {
... ... @@ -729,12 +729,12 @@ class User extends Api
unset($data['keyword'][$k]);
}
}
$base_url = $data['water_url'];
$base_url = $data['thumbnail'];
$click_num = $data['click_num'] + 1;
Db::name('pic')->where('id',$pic_id)->update(['click_num'=>$click_num]);
$data['is_vip'] = 1;
$data['accredit'] = $rule.$accredit['thumbnail'];
$qiniu_url = $rule.$data['water_url'];
$qiniu_url = $rule.$data['thumbnail'];
$a = file_get_contents($qiniu_url);
$path = './uploads/'.explode('/',$base_url)[2].'/';
if(!file_exists($path)){
... ...
... ... @@ -7679,7 +7679,7 @@
<div class="row mt0 footer">
<div class="col-md-6" align="left">
Generated on 2020-03-30 09:02:44 </div>
Generated on 2020-03-31 09:12:39 </div>
<div class="col-md-6" align="right">
<a href="https://www.fastadmin.net" target="_blank">FastAdmin</a>
</div>
... ...
... ... @@ -33,9 +33,9 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
{field: 'address_ids', title: __('Address_ids'),searchList:$.getJSON('pic/address')},
{field: 'keyword', title: __('Keyword'),operate:false},
{field: 'thumbnail', title: __('Thumbnail'),operate:false, events: Table.api.events.image,formatter: Table.api.formatter.image},
{field: 'type_ids', title: __('Type_ids'),searchList:$.getJSON('pic/type')},
// {field: 'type_ids', title: __('Type_ids'),searchList:$.getJSON('pic/type')},
{field: 'pictype_ids', title: __('Pictype_ids'),searchList:$.getJSON('pic/pictype')},
{field: 'water_url', title: __('Water_url'),operate:false, events: Table.api.events.image,formatter: Table.api.formatter.image},
// {field: 'water_url', title: __('Water_url'),operate:false, events: Table.api.events.image,formatter: Table.api.formatter.image},
{field: 'url', title: __('Url'),operate:false, formatter: Table.api.formatter.url},
{field: 'price', title: __('Price'),formatter: Table.api.formatter.label,searchList:{'800': '800', '1500': '1500','3000':'3000'}},
{field: 'buy_num', title: __('Buy_num'),operate:false},
... ...