王晓刚 / advertising · 提交

转到一个项目

作者 王晓刚
提交 7f677e55f7d2c9a6c449bbbec3d8ea2f595ecc73 1 个父辈 542f1059
1 个管道 的构建 通过 耗费 0 秒

商户申请

内嵌 并排对比
正在显示 3 个修改的文件 包含 45 行增加 和 44 行删除
@@ -7,6 +7,7 @@ @@ -7,6 +7,7 @@
7 <list default="true" id="309ad746-5b2a-4c29-af46-e7925a35765c" name="默认的" comment=""> 7 <list default="true" id="309ad746-5b2a-4c29-af46-e7925a35765c" name="默认的" comment="">
8 <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> 8 <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
9 <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" /> 9 <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" />
  10 + <change beforePath="$PROJECT_DIR$/public/assets/advertising/css/entry.css" beforeDir="false" afterPath="$PROJECT_DIR$/public/assets/advertising/css/entry.css" afterDir="false" />
10 </list> 11 </list>
11 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> 12 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
12 <option name="TRACKING_ENABLED" value="true" /> 13 <option name="TRACKING_ENABLED" value="true" />
@@ -43,20 +44,20 @@ @@ -43,20 +44,20 @@
43 </provider> 44 </provider>
44 </entry> 45 </entry>
45 </file> 46 </file>
46 - <file leaf-file-name="enter_view.html" pinned="false" current-in-tab="true"> 47 + <file leaf-file-name="enter_view.html" pinned="false" current-in-tab="false">
47 <entry file="file://$PROJECT_DIR$/application/home/view/merchant/enter_view.html"> 48 <entry file="file://$PROJECT_DIR$/application/home/view/merchant/enter_view.html">
48 <provider selected="true" editor-type-id="text-editor"> 49 <provider selected="true" editor-type-id="text-editor">
49 - <state relative-caret-position="170">  
50 - <caret line="13" column="31" selection-start-line="13" selection-start-column="31" selection-end-line="13" selection-end-column="31" /> 50 + <state relative-caret-position="391">
  51 + <caret line="41" column="46" selection-start-line="41" selection-start-column="46" selection-end-line="41" selection-end-column="46" />
51 </state> 52 </state>
52 </provider> 53 </provider>
53 </entry> 54 </entry>
54 </file> 55 </file>
55 - <file leaf-file-name="entry.css" pinned="false" current-in-tab="false"> 56 + <file leaf-file-name="entry.css" pinned="false" current-in-tab="true">
56 <entry file="file://$PROJECT_DIR$/public/assets/advertising/css/entry.css"> 57 <entry file="file://$PROJECT_DIR$/public/assets/advertising/css/entry.css">
57 <provider selected="true" editor-type-id="text-editor"> 58 <provider selected="true" editor-type-id="text-editor">
58 - <state relative-caret-position="1037">  
59 - <caret line="61" column="13" selection-start-line="61" selection-start-column="13" selection-end-line="61" selection-end-column="13" /> 59 + <state relative-caret-position="578">
  60 + <caret line="46" column="15" selection-start-line="46" selection-start-column="11" selection-end-line="46" selection-end-column="15" />
60 </state> 61 </state>
61 </provider> 62 </provider>
62 </entry> 63 </entry>
@@ -64,8 +65,8 @@ @@ -64,8 +65,8 @@
64 <file leaf-file-name="public.css" pinned="false" current-in-tab="false"> 65 <file leaf-file-name="public.css" pinned="false" current-in-tab="false">
65 <entry file="file://$PROJECT_DIR$/public/assets/advertising/css/public.css"> 66 <entry file="file://$PROJECT_DIR$/public/assets/advertising/css/public.css">
66 <provider selected="true" editor-type-id="text-editor"> 67 <provider selected="true" editor-type-id="text-editor">
67 - <state relative-caret-position="164">  
68 - <caret line="126" column="8" selection-start-line="126" selection-start-column="1" selection-end-line="126" selection-end-column="8" /> 68 + <state relative-caret-position="657">
  69 + <caret line="74" column="9" selection-start-line="74" selection-start-column="1" selection-end-line="74" selection-end-column="9" />
69 </state> 70 </state>
70 </provider> 71 </provider>
71 </entry> 72 </entry>
@@ -201,8 +202,8 @@ @@ -201,8 +202,8 @@
201 <option value="$PROJECT_DIR$/application/home/controller/Member.php" /> 202 <option value="$PROJECT_DIR$/application/home/controller/Member.php" />
202 <option value="$PROJECT_DIR$/application/home/view/merchant/audit_status.html" /> 203 <option value="$PROJECT_DIR$/application/home/view/merchant/audit_status.html" />
203 <option value="$PROJECT_DIR$/application/home/controller/Merchant.php" /> 204 <option value="$PROJECT_DIR$/application/home/controller/Merchant.php" />
204 - <option value="$PROJECT_DIR$/public/assets/advertising/css/entry.css" />  
205 <option value="$PROJECT_DIR$/application/home/view/merchant/enter_view.html" /> 205 <option value="$PROJECT_DIR$/application/home/view/merchant/enter_view.html" />
  206 + <option value="$PROJECT_DIR$/public/assets/advertising/css/entry.css" />
206 </list> 207 </list>
207 </option> 208 </option>
208 </component> 209 </component>
@@ -433,28 +434,7 @@ @@ -433,28 +434,7 @@
433 <workItem from="1573000530976" duration="6061000" /> 434 <workItem from="1573000530976" duration="6061000" />
434 <workItem from="1573087576825" duration="5555000" /> 435 <workItem from="1573087576825" duration="5555000" />
435 <workItem from="1573174620844" duration="32581000" /> 436 <workItem from="1573174620844" duration="32581000" />
436 - <workItem from="1573259331081" duration="5964000" />  
437 - </task>  
438 - <task id="LOCAL-00394" summary="我的分享">  
439 - <created>1573211040562</created>  
440 - <option name="number" value="00394" />  
441 - <option name="presentableId" value="LOCAL-00394" />  
442 - <option name="project" value="LOCAL" />  
443 - <updated>1573211040562</updated>  
444 - </task>  
445 - <task id="LOCAL-00395" summary="我的分享">  
446 - <created>1573211066172</created>  
447 - <option name="number" value="00395" />  
448 - <option name="presentableId" value="LOCAL-00395" />  
449 - <option name="project" value="LOCAL" />  
450 - <updated>1573211066172</updated>  
451 - </task>  
452 - <task id="LOCAL-00396" summary="我的分享">  
453 - <created>1573211091157</created>  
454 - <option name="number" value="00396" />  
455 - <option name="presentableId" value="LOCAL-00396" />  
456 - <option name="project" value="LOCAL" />  
457 - <updated>1573211091157</updated> 437 + <workItem from="1573259331081" duration="6261000" />
458 </task> 438 </task>
459 <task id="LOCAL-00397" summary="我的分享"> 439 <task id="LOCAL-00397" summary="我的分享">
460 <created>1573211119461</created> 440 <created>1573211119461</created>
@@ -778,11 +758,32 @@ @@ -778,11 +758,32 @@
778 <option name="project" value="LOCAL" /> 758 <option name="project" value="LOCAL" />
779 <updated>1573265763020</updated> 759 <updated>1573265763020</updated>
780 </task> 760 </task>
781 - <option name="localTasksCounter" value="443" /> 761 + <task id="LOCAL-00443" summary="商户申请">
  762 + <created>1573265829709</created>
  763 + <option name="number" value="00443" />
  764 + <option name="presentableId" value="LOCAL-00443" />
  765 + <option name="project" value="LOCAL" />
  766 + <updated>1573265829709</updated>
  767 + </task>
  768 + <task id="LOCAL-00444" summary="商户申请">
  769 + <created>1573265867614</created>
  770 + <option name="number" value="00444" />
  771 + <option name="presentableId" value="LOCAL-00444" />
  772 + <option name="project" value="LOCAL" />
  773 + <updated>1573265867614</updated>
  774 + </task>
  775 + <task id="LOCAL-00445" summary="商户申请">
  776 + <created>1573265954868</created>
  777 + <option name="number" value="00445" />
  778 + <option name="presentableId" value="LOCAL-00445" />
  779 + <option name="project" value="LOCAL" />
  780 + <updated>1573265954868</updated>
  781 + </task>
  782 + <option name="localTasksCounter" value="446" />
782 <servers /> 783 <servers />
783 </component> 784 </component>
784 <component name="TimeTrackingManager"> 785 <component name="TimeTrackingManager">
785 - <option name="totallyTimeSpent" value="379637000" /> 786 + <option name="totallyTimeSpent" value="379934000" />
786 </component> 787 </component>
787 <component name="ToolWindowManager"> 788 <component name="ToolWindowManager">
788 <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" /> 789 <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
@@ -1185,22 +1186,22 @@ @@ -1185,22 +1186,22 @@
1185 </entry> 1186 </entry>
1186 <entry file="file://$PROJECT_DIR$/public/assets/advertising/css/public.css"> 1187 <entry file="file://$PROJECT_DIR$/public/assets/advertising/css/public.css">
1187 <provider selected="true" editor-type-id="text-editor"> 1188 <provider selected="true" editor-type-id="text-editor">
1188 - <state relative-caret-position="164">  
1189 - <caret line="126" column="8" selection-start-line="126" selection-start-column="1" selection-end-line="126" selection-end-column="8" /> 1189 + <state relative-caret-position="657">
  1190 + <caret line="74" column="9" selection-start-line="74" selection-start-column="1" selection-end-line="74" selection-end-column="9" />
1190 </state> 1191 </state>
1191 </provider> 1192 </provider>
1192 </entry> 1193 </entry>
1193 - <entry file="file://$PROJECT_DIR$/public/assets/advertising/css/entry.css"> 1194 + <entry file="file://$PROJECT_DIR$/application/home/view/merchant/enter_view.html">
1194 <provider selected="true" editor-type-id="text-editor"> 1195 <provider selected="true" editor-type-id="text-editor">
1195 - <state relative-caret-position="1037">  
1196 - <caret line="61" column="13" selection-start-line="61" selection-start-column="13" selection-end-line="61" selection-end-column="13" /> 1196 + <state relative-caret-position="391">
  1197 + <caret line="41" column="46" selection-start-line="41" selection-start-column="46" selection-end-line="41" selection-end-column="46" />
1197 </state> 1198 </state>
1198 </provider> 1199 </provider>
1199 </entry> 1200 </entry>
1200 - <entry file="file://$PROJECT_DIR$/application/home/view/merchant/enter_view.html"> 1201 + <entry file="file://$PROJECT_DIR$/public/assets/advertising/css/entry.css">
1201 <provider selected="true" editor-type-id="text-editor"> 1202 <provider selected="true" editor-type-id="text-editor">
1202 - <state relative-caret-position="170">  
1203 - <caret line="13" column="31" selection-start-line="13" selection-start-column="31" selection-end-line="13" selection-end-column="31" /> 1203 + <state relative-caret-position="578">
  1204 + <caret line="46" column="15" selection-start-line="46" selection-start-column="11" selection-end-line="46" selection-end-column="15" />
1204 </state> 1205 </state>
1205 </provider> 1206 </provider>
1206 </entry> 1207 </entry>
@@ -39,7 +39,7 @@ @@ -39,7 +39,7 @@
39 <div class="submit_title">简介</div> 39 <div class="submit_title">简介</div>
40 <textarea name="" id="brief" cols="30" rows="5" placeholder="请填写商家简介">{$data.brief}</textarea> 40 <textarea name="" id="brief" cols="30" rows="5" placeholder="请填写商家简介">{$data.brief}</textarea>
41 </div> 41 </div>
42 - <div class="submit_single layout flex_row"> 42 + <div class="submit_single clearfix">
43 <div class="submit_title"> 43 <div class="submit_title">
44 营业执照<i>*</i> 44 营业执照<i>*</i>
45 </div> 45 </div>
@@ -30,6 +30,7 @@ @@ -30,6 +30,7 @@
30 margin-right: 0.26rem; 30 margin-right: 0.26rem;
31 font-size: 0.28rem; 31 font-size: 0.28rem;
32 color: #06121E; 32 color: #06121E;
  33 + float: left;
33 } 34 }
34 35
35 .submit_title i { 36 .submit_title i {
@@ -41,10 +42,9 @@ @@ -41,10 +42,9 @@
41 } 42 }
42 43
43 .submit_img { 44 .submit_img {
44 - /*width: 1.8rem;*/  
45 - /*height: 1.8rem;*/  
46 position: relative; 45 position: relative;
47 border-radius: 0.08rem; 46 border-radius: 0.08rem;
  47 + float: left;
48 } 48 }
49 49
50 .submited_img { 50 .submited_img {