王晓刚 / advertising · 提交

转到一个项目

作者 王晓刚
提交 17e52b0127d1ba0304863bcccf2044c9986361df 1 个父辈 2d1176b2
1 个管道 的构建 通过 耗费 2 秒

商户申请

内嵌 并排对比
正在显示 2 个修改的文件 包含 69 行增加 和 213 行删除
... ... @@ -6,7 +6,7 @@
<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/home/controller/Index.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/home/controller/Index.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/application/home/view/merchant/enter_view.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/home/view/merchant/enter_view.html" afterDir="false" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" />
... ... @@ -34,94 +34,15 @@
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name="Goods.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/application/home/controller/Goods.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="164">
<caret line="105" column="56" selection-start-line="105" selection-start-column="56" selection-end-line="105" selection-end-column="56" />
</state>
</provider>
</entry>
</file>
<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="1037">
<caret line="147" column="62" selection-start-line="147" selection-start-column="62" selection-end-line="147" selection-end-column="62" />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="Merchant.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/application/home/controller/Merchant.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="443">
<caret line="113" column="42" selection-start-line="113" selection-start-column="42" selection-end-line="113" selection-end-column="42" />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="MerchantGoods.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/application/admin/controller/MerchantGoods.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="561">
<caret line="298" column="31" selection-start-line="298" selection-start-column="31" selection-end-line="298" selection-end-column="31" />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="enter_view.html" pinned="false" current-in-tab="false">
<file leaf-file-name="enter_view.html" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/application/home/view/merchant/enter_view.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="444">
<caret line="111" column="49" selection-start-line="111" selection-start-column="40" selection-end-line="111" selection-end-column="49" />
<folding>
<element signature="e#5425#10699#0" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="Index.php" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/application/home/controller/Index.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="470">
<caret line="173" column="80" lean-forward="true" selection-start-line="173" selection-start-column="80" selection-end-line="173" selection-end-column="80" />
<state relative-caret-position="558">
<caret line="155" column="40" lean-forward="true" selection-start-line="155" selection-start-column="40" selection-end-line="155" selection-end-column="40" />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="audio_detail.html" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/application/home/view/goods/audio_detail.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="288">
<caret line="316" column="38" selection-start-line="316" selection-start-column="38" selection-end-line="316" selection-end-column="38" />
<folding>
<element signature="n#style#0;n#div#0;n#div#1;n#div#2;n#body#0;n#html#0;n#!!top" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="UserExpLogAudit.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/application/admin/controller/UserExpLogAudit.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="810">
<caret line="155" column="9" selection-start-line="155" selection-start-column="9" selection-end-line="155" selection-end-column="9" />
</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">
<provider selected="true" editor-type-id="text-editor" />
</entry>
</file>
<file leaf-file-name="edit.html" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/application/admin/view/user_money_log_audit/edit.html">
<provider selected="true" editor-type-id="text-editor" />
</entry>
</file>
</leaf>
</component>
<component name="FileTemplateManagerImpl">
... ... @@ -174,7 +95,6 @@
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
<list>
<option value="$PROJECT_DIR$/extend/fast/Auth.php" />
<option value="$PROJECT_DIR$/application/admin/controller/PayView.php" />
<option value="$PROJECT_DIR$/application/home/view/public/NAV.html" />
<option value="$PROJECT_DIR$/application/home/view/user/authorization_view.html" />
... ... @@ -220,11 +140,12 @@
<option value="$PROJECT_DIR$/application/admin/view/user_exp_log_audit/edit.html" />
<option value="D:/我的文档/Documents/NetSarang Computer/6/Xftp/Temporary/Doc [2].php" />
<option value="$PROJECT_DIR$/application/admin/controller/MerchantAudit.php" />
<option value="$PROJECT_DIR$/application/home/view/merchant/enter_view.html" />
<option value="$PROJECT_DIR$/application/home/controller/Merchant.php" />
<option value="$PROJECT_DIR$/application/admin/controller/MerchantGoods.php" />
<option value="$PROJECT_DIR$/application/home/view/goods/audio_detail.html" />
<option value="$PROJECT_DIR$/application/home/controller/Index.php" />
<option value="$PROJECT_DIR$/application/admin/controller/Goods.php" />
<option value="$PROJECT_DIR$/application/home/view/merchant/enter_view.html" />
</list>
</option>
</component>
... ... @@ -350,74 +271,8 @@
<item name="application" type="462c0819:PsiDirectoryNode" />
<item name="home" type="462c0819:PsiDirectoryNode" />
<item name="view" type="462c0819:PsiDirectoryNode" />
<item name="collect" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="advertising" type="b2602c69:ProjectViewProjectNode" />
<item name="advertising" type="462c0819:PsiDirectoryNode" />
<item name="application" type="462c0819:PsiDirectoryNode" />
<item name="home" type="462c0819:PsiDirectoryNode" />
<item name="view" type="462c0819:PsiDirectoryNode" />
<item name="goods" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="advertising" type="b2602c69:ProjectViewProjectNode" />
<item name="advertising" type="462c0819:PsiDirectoryNode" />
<item name="application" type="462c0819:PsiDirectoryNode" />
<item name="home" type="462c0819:PsiDirectoryNode" />
<item name="view" type="462c0819:PsiDirectoryNode" />
<item name="member" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="advertising" type="b2602c69:ProjectViewProjectNode" />
<item name="advertising" type="462c0819:PsiDirectoryNode" />
<item name="application" type="462c0819:PsiDirectoryNode" />
<item name="home" type="462c0819:PsiDirectoryNode" />
<item name="view" type="462c0819:PsiDirectoryNode" />
<item name="merchant" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="advertising" type="b2602c69:ProjectViewProjectNode" />
<item name="advertising" type="462c0819:PsiDirectoryNode" />
<item name="application" type="462c0819:PsiDirectoryNode" />
<item name="home" type="462c0819:PsiDirectoryNode" />
<item name="view" type="462c0819:PsiDirectoryNode" />
<item name="public" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="advertising" type="b2602c69:ProjectViewProjectNode" />
<item name="advertising" type="462c0819:PsiDirectoryNode" />
<item name="application" type="462c0819:PsiDirectoryNode" />
<item name="home" type="462c0819:PsiDirectoryNode" />
<item name="view" type="462c0819:PsiDirectoryNode" />
<item name="share" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="advertising" type="b2602c69:ProjectViewProjectNode" />
<item name="advertising" type="462c0819:PsiDirectoryNode" />
<item name="public" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="advertising" type="b2602c69:ProjectViewProjectNode" />
<item name="advertising" type="462c0819:PsiDirectoryNode" />
<item name="public" type="462c0819:PsiDirectoryNode" />
<item name="assets" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="advertising" type="b2602c69:ProjectViewProjectNode" />
<item name="advertising" type="462c0819:PsiDirectoryNode" />
<item name="public" type="462c0819:PsiDirectoryNode" />
<item name="assets" type="462c0819:PsiDirectoryNode" />
<item name="advertising" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="advertising" type="b2602c69:ProjectViewProjectNode" />
<item name="advertising" type="462c0819:PsiDirectoryNode" />
<item name="public" type="462c0819:PsiDirectoryNode" />
<item name="assets" type="462c0819:PsiDirectoryNode" />
<item name="advertising" type="462c0819:PsiDirectoryNode" />
<item name="css" type="462c0819:PsiDirectoryNode" />
</path>
</expand>
<select />
</subPane>
... ... @@ -433,7 +288,7 @@
<property name="WebServerToolWindowPanel.toolwindow.show.date" value="false" />
<property name="WebServerToolWindowPanel.toolwindow.show.permissions" value="false" />
<property name="WebServerToolWindowPanel.toolwindow.show.size" value="false" />
<property name="last_opened_file_path" value="D:/phpStudy/WWW/marriage" />
<property name="last_opened_file_path" value="$PROJECT_DIR$/../competition" />
<property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
<property name="nodejs_npm_path_reset_for_default_project" value="true" />
<property name="settings.editor.selected.configurable" value="terminal" />
... ... @@ -497,21 +352,7 @@
<workItem from="1573174620844" duration="32581000" />
<workItem from="1573259331081" duration="30435000" />
<workItem from="1573432217070" duration="2199000" />
<workItem from="1573519427130" duration="4978000" />
</task>
<task id="LOCAL-00509" summary=" 商户申请">
<created>1573287603492</created>
<option name="number" value="00509" />
<option name="presentableId" value="LOCAL-00509" />
<option name="project" value="LOCAL" />
<updated>1573287603492</updated>
</task>
<task id="LOCAL-00510" summary=" 商户申请">
<created>1573287663922</created>
<option name="number" value="00510" />
<option name="presentableId" value="LOCAL-00510" />
<option name="project" value="LOCAL" />
<updated>1573287663922</updated>
<workItem from="1573519427130" duration="8068000" />
</task>
<task id="LOCAL-00511" summary=" 商户申请">
<created>1573288157671</created>
... ... @@ -842,11 +683,25 @@
<option name="project" value="LOCAL" />
<updated>1573527356479</updated>
</task>
<option name="localTasksCounter" value="558" />
<task id="LOCAL-00558" summary=" 商户申请">
<created>1573527577439</created>
<option name="number" value="00558" />
<option name="presentableId" value="LOCAL-00558" />
<option name="project" value="LOCAL" />
<updated>1573527577439</updated>
</task>
<task id="LOCAL-00559" summary=" 商户申请">
<created>1573537094775</created>
<option name="number" value="00559" />
<option name="presentableId" value="LOCAL-00559" />
<option name="project" value="LOCAL" />
<updated>1573537094775</updated>
</task>
<option name="localTasksCounter" value="560" />
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="411285000" />
<option name="totallyTimeSpent" value="414375000" />
</component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
... ... @@ -933,16 +788,6 @@
<option name="LAST_COMMIT_MESSAGE" value=" 商户申请" />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/public/white.png">
<provider selected="true" editor-type-id="images" />
</entry>
<entry file="file://$PROJECT_DIR$/application/home/view/merchant/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="527">
<caret line="31" column="57" lean-forward="true" selection-start-line="31" selection-start-column="57" selection-end-line="31" selection-end-column="57" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/bg2.png">
<provider selected="true" editor-type-id="images" />
</entry>
... ... @@ -977,13 +822,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/home/controller/User.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="375">
<caret line="102" column="8" selection-start-line="102" selection-start-column="8" selection-end-line="102" selection-end-column="51" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/home/view/merchant/audit_status.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="538">
... ... @@ -1096,13 +934,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/home/controller/Member.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1785">
<caret line="123" column="66" selection-start-line="123" selection-start-column="66" selection-end-line="123" selection-end-column="66" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/home/view/index/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1241">
... ... @@ -1182,23 +1013,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/home/view/merchant/enter_view.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="444">
<caret line="111" column="49" selection-start-line="111" selection-start-column="40" selection-end-line="111" selection-end-column="49" />
<folding>
<element signature="e#5425#10699#0" />
</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="1037">
<caret line="147" column="62" selection-start-line="147" selection-start-column="62" selection-end-line="147" selection-end-column="62" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/home/controller/Merchant.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="443">
... ... @@ -1232,11 +1046,53 @@
</entry>
<entry file="file://$PROJECT_DIR$/application/home/controller/Index.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="470">
<state relative-caret-position="2765">
<caret line="173" column="80" lean-forward="true" selection-start-line="173" selection-start-column="80" selection-end-line="173" selection-end-column="80" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/home/controller/User.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-289">
<caret line="25" column="40" lean-forward="true" selection-start-line="25" selection-start-column="40" selection-end-line="25" selection-end-column="40" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/common/controller/WechatBase.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="538">
<caret line="70" column="52" selection-start-line="70" selection-start-column="41" selection-end-line="70" selection-end-column="52" />
</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="1037">
<caret line="147" column="62" selection-start-line="147" selection-start-column="62" selection-end-line="147" selection-end-column="62" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/home/controller/Member.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="409">
<caret line="167" column="8" selection-start-line="167" selection-start-column="8" selection-end-line="171" selection-end-column="9" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/controller/Goods.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="612">
<caret line="67" column="46" selection-start-line="67" selection-start-column="46" selection-end-line="67" selection-end-column="46" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/home/view/merchant/enter_view.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="558">
<caret line="155" column="40" lean-forward="true" selection-start-line="155" selection-start-column="40" selection-end-line="155" selection-end-column="40" />
</state>
</provider>
</entry>
</component>
<component name="masterDetails">
<states>
... ...
... ... @@ -141,7 +141,7 @@
wx.ready(function () {
$('.upload_one').click(function () {
wx.chooseImage({
count: 1, // 默认9
count: 5, // 默认9
sizeType: ['original', 'compressed'], // 可以指定是原图还是压缩图，默认二者都有
sourceType: ['album', 'camera'], // 可以指定来源是相册还是相机，默认二者都有
success: function (res) {
... ... @@ -153,7 +153,7 @@
});
$('.upload_two').click(function () {
wx.chooseImage({
count: 1, // 默认9
count: 5, // 默认9
sizeType: ['original', 'compressed'], // 可以指定是原图还是压缩图，默认二者都有
sourceType: ['album', 'camera'], // 可以指定来源是相册还是相机，默认二者都有
success: function (res) {
... ...