王晓刚 / advertising · 提交

转到一个项目

作者 王晓刚
提交 76bd6c53d170bc699bea9963d10ca9f8e20c9544 1 个父辈 7f169bba
1 个管道 的构建 通过 耗费 1 秒

商户申请

内嵌 并排对比
正在显示 2 个修改的文件 包含 97 行增加 和 80 行删除
... ... @@ -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/view/goods/content_detail.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/home/view/goods/content_detail.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/application/home/controller/Member.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/home/controller/Member.php" afterDir="false" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" />
... ... @@ -34,11 +34,11 @@
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name="Member.php" pinned="false" current-in-tab="false">
<file leaf-file-name="Member.php" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/application/home/controller/Member.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="765">
<caret line="52" column="32" selection-start-line="52" selection-start-column="32" selection-end-line="52" selection-end-column="32" />
<state relative-caret-position="561">
<caret line="126" column="36" selection-start-line="126" selection-start-column="36" selection-end-line="126" selection-end-column="36" />
</state>
</provider>
</entry>
... ... @@ -46,8 +46,17 @@
<file leaf-file-name="Index.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/application/home/controller/Index.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="204">
<caret line="20" column="14" selection-start-line="20" selection-start-column="8" selection-end-line="20" selection-end-column="14" />
<state relative-caret-position="306">
<caret line="26" column="41" lean-forward="true" selection-start-line="26" selection-start-column="41" selection-end-line="26" selection-end-column="41" />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="my_information.html" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/application/home/view/member/my_information.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="935">
<caret line="124" column="34" lean-forward="true" selection-start-line="121" selection-start-column="12" selection-end-line="124" selection-end-column="34" />
</state>
</provider>
</entry>
... ... @@ -61,11 +70,29 @@
</provider>
</entry>
</file>
<file leaf-file-name="content_detail.html" pinned="false" current-in-tab="true">
<file leaf-file-name="content_detail.html" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/application/home/view/goods/content_detail.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="373">
<caret line="173" column="30" selection-start-line="173" selection-start-column="30" selection-end-line="173" selection-end-column="30" />
<state relative-caret-position="203">
<caret line="182" column="14" lean-forward="true" selection-start-line="182" selection-start-column="14" selection-end-line="182" selection-end-column="14" />
</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="424">
<caret line="284" column="26" selection-start-line="284" selection-start-column="26" selection-end-line="284" selection-end-column="26" />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="video_detail.html" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/application/home/view/goods/video_detail.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="141">
<caret line="190" column="44" lean-forward="true" selection-start-line="190" selection-start-column="44" selection-end-line="190" selection-end-column="44" />
</state>
</provider>
</entry>
... ... @@ -147,7 +174,6 @@
<option value="$PROJECT_DIR$/application/home/view/member/my_wallet.html" />
<option value="$PROJECT_DIR$/application/home/controller/demo.xml" />
<option value="$PROJECT_DIR$/public/assets/advertising/css/record.css" />
<option value="$PROJECT_DIR$/application/home/view/goods/audio_detail.html" />
<option value="$PROJECT_DIR$/application/home/view/member/my_withdraw.html" />
<option value="$PROJECT_DIR$/application/home/view/member/withdraw_information.html" />
<option value="$PROJECT_DIR$/public/assets/advertising/css/public.css" />
... ... @@ -167,12 +193,13 @@
<option value="$PROJECT_DIR$/application/home/view/merchant/enter_view.html" />
<option value="$PROJECT_DIR$/public/assets/advertising/css/entry.css" />
<option value="$PROJECT_DIR$/application/home/view/member/index.html" />
<option value="$PROJECT_DIR$/application/home/controller/Member.php" />
<option value="$PROJECT_DIR$/application/home/view/public/nav.html" />
<option value="$PROJECT_DIR$/application/home/controller/Index.php" />
<option value="$PROJECT_DIR$/application/home/view/index/index.html" />
<option value="$PROJECT_DIR$/public/assets/advertising/css/swiper.min.css" />
<option value="$PROJECT_DIR$/application/home/view/goods/content_detail.html" />
<option value="$PROJECT_DIR$/application/home/view/goods/audio_detail.html" />
<option value="$PROJECT_DIR$/application/home/controller/Member.php" />
</list>
</option>
</component>
... ... @@ -307,22 +334,6 @@
<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="index" 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>
... ... @@ -451,21 +462,7 @@
<workItem from="1573000530976" duration="6061000" />
<workItem from="1573087576825" duration="5555000" />
<workItem from="1573174620844" duration="32581000" />
<workItem from="1573259331081" duration="20715000" />
</task>
<task id="LOCAL-00455" summary="商户申请">
<created>1573268313373</created>
<option name="number" value="00455" />
<option name="presentableId" value="LOCAL-00455" />
<option name="project" value="LOCAL" />
<updated>1573268313373</updated>
</task>
<task id="LOCAL-00456" summary="商户申请">
<created>1573268366755</created>
<option name="number" value="00456" />
<option name="presentableId" value="LOCAL-00456" />
<option name="project" value="LOCAL" />
<updated>1573268366755</updated>
<workItem from="1573259331081" duration="22666000" />
</task>
<task id="LOCAL-00457" summary="商户申请">
<created>1573269211342</created>
... ... @@ -796,11 +793,25 @@
<option name="project" value="LOCAL" />
<updated>1573283953933</updated>
</task>
<option name="localTasksCounter" value="504" />
<task id="LOCAL-00504" summary=" 商户申请">
<created>1573284036394</created>
<option name="number" value="00504" />
<option name="presentableId" value="LOCAL-00504" />
<option name="project" value="LOCAL" />
<updated>1573284036394</updated>
</task>
<task id="LOCAL-00505" summary=" 商户申请">
<created>1573284984083</created>
<option name="number" value="00505" />
<option name="presentableId" value="LOCAL-00505" />
<option name="project" value="LOCAL" />
<updated>1573284984083</updated>
</task>
<option name="localTasksCounter" value="506" />
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="394388000" />
<option name="totallyTimeSpent" value="396339000" />
</component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
... ... @@ -901,13 +912,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/home/view/goods/video_detail.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="272">
<caret line="196" column="12" lean-forward="true" selection-start-line="196" selection-start-column="12" selection-end-line="236" selection-end-column="13" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/assets/advertising/js/qqmap-wx-jssdk.js">
<provider selected="true" editor-type-id="text-editor" />
</entry>
... ... @@ -939,13 +943,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/home/view/goods/audio_detail.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="652">
<caret line="237" column="27" selection-start-line="237" selection-start-column="27" selection-end-line="237" selection-end-column="27" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/assets/advertising/css/index.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="555">
... ... @@ -1129,13 +1126,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/home/view/member/my_information.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="357">
<caret line="124" column="34" lean-forward="true" selection-start-line="121" selection-start-column="12" selection-end-line="124" selection-end-column="34" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/assets/advertising/img/sun_02@2x.png">
<provider selected="true" editor-type-id="images" />
</entry>
... ... @@ -1168,38 +1158,59 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/home/controller/Member.php">
<entry file="file://$PROJECT_DIR$/public/assets/advertising/css/swiper.min.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="765">
<caret line="52" column="32" selection-start-line="52" selection-start-column="32" selection-end-line="52" selection-end-column="32" />
<state relative-caret-position="306">
<caret line="234" column="23" selection-start-line="234" selection-start-column="23" selection-end-line="234" selection-end-column="23" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/home/controller/Index.php">
<entry file="file://$PROJECT_DIR$/application/home/view/index/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="204">
<caret line="20" column="14" selection-start-line="20" selection-start-column="8" selection-end-line="20" selection-end-column="14" />
<state relative-caret-position="1241">
<caret line="73" column="9" lean-forward="true" selection-start-line="73" selection-start-column="9" selection-end-line="73" selection-end-column="9" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/assets/advertising/css/swiper.min.css">
<entry file="file://$PROJECT_DIR$/application/home/view/goods/video_detail.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="306">
<caret line="234" column="23" selection-start-line="234" selection-start-column="23" selection-end-line="234" selection-end-column="23" />
<state relative-caret-position="141">
<caret line="190" column="44" lean-forward="true" selection-start-line="190" selection-start-column="44" selection-end-line="190" selection-end-column="44" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/home/view/index/index.html">
<entry file="file://$PROJECT_DIR$/application/home/view/goods/audio_detail.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1241">
<caret line="73" column="9" lean-forward="true" selection-start-line="73" selection-start-column="9" selection-end-line="73" selection-end-column="9" />
<state relative-caret-position="424">
<caret line="284" column="26" selection-start-line="284" selection-start-column="26" selection-end-line="284" selection-end-column="26" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/home/view/goods/content_detail.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="373">
<caret line="173" column="30" selection-start-line="173" selection-start-column="30" selection-end-line="173" selection-end-column="30" />
<state relative-caret-position="203">
<caret line="182" column="14" lean-forward="true" selection-start-line="182" selection-start-column="14" selection-end-line="182" selection-end-column="14" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/home/controller/Index.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="306">
<caret line="26" column="41" lean-forward="true" selection-start-line="26" selection-start-column="41" selection-end-line="26" selection-end-column="41" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/home/view/member/my_information.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="935">
<caret line="124" column="34" lean-forward="true" selection-start-line="121" selection-start-column="12" selection-end-line="124" selection-end-column="34" />
</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="561">
<caret line="126" column="36" selection-start-line="126" selection-start-column="36" selection-end-line="126" selection-end-column="36" />
</state>
</provider>
</entry>
... ...
... ... @@ -129,7 +129,7 @@
success(res);
},
cancel: function (res) {
alert('必须同意授权获取地理位置才能获得奖励哦');
toast('必须同意授权获取地理位置才能获得奖励哦');
}
});
$('.upload').click(function () {
... ... @@ -206,6 +206,12 @@
}else if(nickname == ''){
toast('请输入昵称');
return false;
}else if(year == ''){
toast('请选择年份');
return false;
}else if(day == ''){
toast('请选择生日日期');
return false;
}
$.ajax({
url:"{:url('home/member/update_information')}",
... ...