王晓刚 / advertising · 提交

转到一个项目

作者 王晓刚
提交 35c76212617999ae17c056c71ffaa2abead54c5f 1 个父辈 ecf0b5fb
1 个管道 的构建 通过 耗费 0 秒

权限调试

内嵌 并排对比
正在显示 2 个修改的文件 包含 33 行增加 和 70 行删除
... ... @@ -2,12 +2,7 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="309ad746-5b2a-4c29-af46-e7925a35765c" name="默认的" comment="">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/application/admin/controller/MerchantAudit.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/admin/controller/MerchantAudit.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/application/admin/view/goods/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/admin/view/goods/index.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/application/admin/view/user_money_log_audit/edit.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/admin/view/user_money_log_audit/edit.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/public/assets/js/backend/goods.js" beforeDir="false" afterPath="$PROJECT_DIR$/public/assets/js/backend/goods.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/public/assets/js/backend/goods_audit.js" beforeDir="false" afterPath="$PROJECT_DIR$/public/assets/js/backend/goods_audit.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/application/admin/controller/PayView.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/admin/controller/PayView.php" afterDir="false" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" />
... ... @@ -21,53 +16,23 @@
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name="UserExpLogAudit.php" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/application/admin/controller/UserExpLogAudit.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="334">
<caret line="121" lean-forward="true" selection-start-line="121" selection-end-line="121" />
<folding>
<element signature="e#40#74#0#PHP" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="UserMoneyLogAudit.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/application/admin/controller/UserMoneyLogAudit.php">
<file leaf-file-name="PayView.php" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/application/admin/controller/PayView.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="776">
<caret line="178" column="5" lean-forward="true" selection-start-line="82" selection-start-column="4" selection-end-line="178" selection-end-column="5" />
<state relative-caret-position="527">
<caret line="69" column="15" selection-start-line="69" selection-start-column="15" selection-end-line="69" selection-end-column="15" />
<folding>
<element signature="e#40#74#0#PHP" expanded="true" />
<element signature="e#129#163#0#PHP" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="user_exp_log_audit.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/public/assets/js/backend/user_exp_log_audit.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="303">
<caret line="31" column="61" selection-start-line="31" selection-start-column="61" selection-end-line="31" selection-end-column="61" />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="edit.html" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/application/admin/view/user_exp_log_audit/edit.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="102">
<caret line="6" column="35" selection-start-line="6" selection-start-column="35" selection-end-line="6" selection-end-column="35" />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="index.html" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/application/admin/view/user_exp_log_audit/index.html">
<file leaf-file-name="MerchantAudit.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/application/admin/controller/MerchantAudit.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="340">
<caret line="20" column="33" lean-forward="true" selection-start-line="20" selection-start-column="33" selection-end-line="20" selection-end-column="33" />
<state relative-caret-position="544">
<caret line="139" column="68" selection-start-line="139" selection-start-column="68" selection-end-line="139" selection-end-column="68" />
</state>
</provider>
</entry>
... ... @@ -112,7 +77,6 @@
<option value="$PROJECT_DIR$/public/assets/js/backend/user_money_log.js" />
<option value="$PROJECT_DIR$/application/admin/view/user_money_log_audit/index.html" />
<option value="$PROJECT_DIR$/public/assets/js/backend/user_money_log_audit.js" />
<option value="$PROJECT_DIR$/application/admin/controller/PayView.php" />
<option value="$PROJECT_DIR$/application/extra/wechat.php" />
<option value="$PROJECT_DIR$/application/admin/controller/UserMoneyLogAudit.php" />
<option value="$PROJECT_DIR$/application/admin/view/goods/add.html" />
... ... @@ -127,7 +91,6 @@
<option value="$PROJECT_DIR$/public/assets/js/backend/goods_audit.js" />
<option value="$PROJECT_DIR$/application/admin/view/order/index.html" />
<option value="$PROJECT_DIR$/application/admin/controller/MerchantGoods.php" />
<option value="$PROJECT_DIR$/application/admin/controller/MerchantAudit.php" />
<option value="$PROJECT_DIR$/application/admin/controller/Order.php" />
<option value="$PROJECT_DIR$/application/admin/view/order/edit.html" />
<option value="$PROJECT_DIR$/public/assets/js/backend/order.js" />
... ... @@ -142,6 +105,8 @@
<option value="$PROJECT_DIR$/application/admin/view/user_money_log_audit/edit.html" />
<option value="$PROJECT_DIR$/application/admin/view/user_exp_log_audit/edit.html" />
<option value="$PROJECT_DIR$/application/admin/controller/UserExpLogAudit.php" />
<option value="$PROJECT_DIR$/application/admin/controller/MerchantAudit.php" />
<option value="$PROJECT_DIR$/application/admin/controller/PayView.php" />
</list>
</option>
</component>
... ... @@ -352,7 +317,7 @@
<workItem from="1572087949120" duration="1641000" />
<workItem from="1572223206994" duration="28857000" />
<workItem from="1572309778506" duration="26117000" />
<workItem from="1572395935540" duration="25703000" />
<workItem from="1572395935540" duration="27417000" />
</task>
<task id="LOCAL-00001" summary="数据库配置">
<created>1571972429395</created>
... ... @@ -596,7 +561,7 @@
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="210928000" />
<option name="totallyTimeSpent" value="212642000" />
</component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
... ... @@ -731,16 +696,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/controller/PayView.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="544">
<caret line="52" column="55" selection-start-line="52" selection-start-column="24" selection-end-line="52" selection-end-column="55" />
<folding>
<element signature="e#129#163#0#PHP" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/extra/wechat.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="833">
... ... @@ -943,13 +898,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/controller/MerchantAudit.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="323">
<caret line="21" column="45" selection-start-line="21" selection-start-column="45" selection-end-line="21" selection-end-column="89" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/view/merchant_audit/edit.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="748">
... ... @@ -1046,14 +994,31 @@
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/controller/UserExpLogAudit.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="334">
<caret line="121" lean-forward="true" selection-start-line="121" selection-end-line="121" />
<state relative-caret-position="453">
<caret line="131" column="44" lean-forward="true" selection-start-line="131" selection-start-column="44" selection-end-line="131" selection-end-column="44" />
<folding>
<element signature="e#40#74#0#PHP" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/controller/MerchantAudit.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="544">
<caret line="139" column="68" selection-start-line="139" selection-start-column="68" selection-end-line="139" selection-end-column="68" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/controller/PayView.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="527">
<caret line="69" column="15" selection-start-line="69" selection-start-column="15" selection-end-line="69" selection-end-column="15" />
<folding>
<element signature="e#129#163#0#PHP" expanded="true" />
</folding>
</state>
</provider>
</entry>
</component>
<component name="masterDetails">
<states>
... ...
... ... @@ -66,8 +66,6 @@ class PayView extends Backend
public function pay(){
$order_id = $this->request->param('order_id',0,'intval');
$data = Db::name('order')->where(['id'=>$order_id])->find();
dump($data);
exit();
$pay = new Pay();
$code_url = $pay->index($data);
if(empty($code_url)){
... ...