王晓刚 / advertising · 提交

转到一个项目

作者 王晓刚
提交 d6b62cf94d4bee7a812a75d6d4dd90e2acc458c6 1 个父辈 bce9e46c
1 个管道 的构建 通过 耗费 1 秒

商户申请

内嵌 并排对比
正在显示 3 个修改的文件 包含 32 行增加 和 31 行删除
@@ -44,20 +44,20 @@ @@ -44,20 +44,20 @@
44 </provider> 44 </provider>
45 </entry> 45 </entry>
46 </file> 46 </file>
47 - <file leaf-file-name="enter_view.html" pinned="false" current-in-tab="false"> 47 + <file leaf-file-name="enter_view.html" pinned="false" current-in-tab="true">
48 <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">
49 <provider selected="true" editor-type-id="text-editor"> 49 <provider selected="true" editor-type-id="text-editor">
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" /> 50 + <state relative-caret-position="238">
  51 + <caret line="14" column="25" selection-start-line="14" selection-start-column="25" selection-end-line="14" selection-end-column="25" />
52 </state> 52 </state>
53 </provider> 53 </provider>
54 </entry> 54 </entry>
55 </file> 55 </file>
56 - <file leaf-file-name="entry.css" pinned="false" current-in-tab="true"> 56 + <file leaf-file-name="entry.css" pinned="false" current-in-tab="false">
57 <entry file="file://$PROJECT_DIR$/public/assets/advertising/css/entry.css"> 57 <entry file="file://$PROJECT_DIR$/public/assets/advertising/css/entry.css">
58 <provider selected="true" editor-type-id="text-editor"> 58 <provider selected="true" editor-type-id="text-editor">
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" /> 59 + <state relative-caret-position="697">
  60 + <caret line="65" column="4" lean-forward="true" selection-start-line="65" selection-start-column="4" selection-end-line="65" selection-end-column="21" />
61 </state> 61 </state>
62 </provider> 62 </provider>
63 </entry> 63 </entry>
@@ -202,8 +202,8 @@ @@ -202,8 +202,8 @@
202 <option value="$PROJECT_DIR$/application/home/controller/Member.php" /> 202 <option value="$PROJECT_DIR$/application/home/controller/Member.php" />
203 <option value="$PROJECT_DIR$/application/home/view/merchant/audit_status.html" /> 203 <option value="$PROJECT_DIR$/application/home/view/merchant/audit_status.html" />
204 <option value="$PROJECT_DIR$/application/home/controller/Merchant.php" /> 204 <option value="$PROJECT_DIR$/application/home/controller/Merchant.php" />
205 - <option value="$PROJECT_DIR$/application/home/view/merchant/enter_view.html" />  
206 <option value="$PROJECT_DIR$/public/assets/advertising/css/entry.css" /> 205 <option value="$PROJECT_DIR$/public/assets/advertising/css/entry.css" />
  206 + <option value="$PROJECT_DIR$/application/home/view/merchant/enter_view.html" />
207 </list> 207 </list>
208 </option> 208 </option>
209 </component> 209 </component>
@@ -434,21 +434,7 @@ @@ -434,21 +434,7 @@
434 <workItem from="1573000530976" duration="6061000" /> 434 <workItem from="1573000530976" duration="6061000" />
435 <workItem from="1573087576825" duration="5555000" /> 435 <workItem from="1573087576825" duration="5555000" />
436 <workItem from="1573174620844" duration="32581000" /> 436 <workItem from="1573174620844" duration="32581000" />
437 - <workItem from="1573259331081" duration="6261000" />  
438 - </task>  
439 - <task id="LOCAL-00397" summary="我的分享">  
440 - <created>1573211119461</created>  
441 - <option name="number" value="00397" />  
442 - <option name="presentableId" value="LOCAL-00397" />  
443 - <option name="project" value="LOCAL" />  
444 - <updated>1573211119461</updated>  
445 - </task>  
446 - <task id="LOCAL-00398" summary="我的分享">  
447 - <created>1573211160222</created>  
448 - <option name="number" value="00398" />  
449 - <option name="presentableId" value="LOCAL-00398" />  
450 - <option name="project" value="LOCAL" />  
451 - <updated>1573211160222</updated> 437 + <workItem from="1573259331081" duration="6569000" />
452 </task> 438 </task>
453 <task id="LOCAL-00399" summary="我的分享"> 439 <task id="LOCAL-00399" summary="我的分享">
454 <created>1573211196026</created> 440 <created>1573211196026</created>
@@ -779,11 +765,25 @@ @@ -779,11 +765,25 @@
779 <option name="project" value="LOCAL" /> 765 <option name="project" value="LOCAL" />
780 <updated>1573265954868</updated> 766 <updated>1573265954868</updated>
781 </task> 767 </task>
782 - <option name="localTasksCounter" value="446" /> 768 + <task id="LOCAL-00446" summary="商户申请">
  769 + <created>1573266139399</created>
  770 + <option name="number" value="00446" />
  771 + <option name="presentableId" value="LOCAL-00446" />
  772 + <option name="project" value="LOCAL" />
  773 + <updated>1573266139400</updated>
  774 + </task>
  775 + <task id="LOCAL-00447" summary="商户申请">
  776 + <created>1573266333163</created>
  777 + <option name="number" value="00447" />
  778 + <option name="presentableId" value="LOCAL-00447" />
  779 + <option name="project" value="LOCAL" />
  780 + <updated>1573266333164</updated>
  781 + </task>
  782 + <option name="localTasksCounter" value="448" />
783 <servers /> 783 <servers />
784 </component> 784 </component>
785 <component name="TimeTrackingManager"> 785 <component name="TimeTrackingManager">
786 - <option name="totallyTimeSpent" value="379934000" /> 786 + <option name="totallyTimeSpent" value="380242000" />
787 </component> 787 </component>
788 <component name="ToolWindowManager"> 788 <component name="ToolWindowManager">
789 <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" />
@@ -1191,17 +1191,17 @@ @@ -1191,17 +1191,17 @@
1191 </state> 1191 </state>
1192 </provider> 1192 </provider>
1193 </entry> 1193 </entry>
1194 - <entry file="file://$PROJECT_DIR$/application/home/view/merchant/enter_view.html"> 1194 + <entry file="file://$PROJECT_DIR$/public/assets/advertising/css/entry.css">
1195 <provider selected="true" editor-type-id="text-editor"> 1195 <provider selected="true" editor-type-id="text-editor">
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" /> 1196 + <state relative-caret-position="697">
  1197 + <caret line="65" column="4" lean-forward="true" selection-start-line="65" selection-start-column="4" selection-end-line="65" selection-end-column="21" />
1198 </state> 1198 </state>
1199 </provider> 1199 </provider>
1200 </entry> 1200 </entry>
1201 - <entry file="file://$PROJECT_DIR$/public/assets/advertising/css/entry.css"> 1201 + <entry file="file://$PROJECT_DIR$/application/home/view/merchant/enter_view.html">
1202 <provider selected="true" editor-type-id="text-editor"> 1202 <provider selected="true" editor-type-id="text-editor">
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" /> 1203 + <state relative-caret-position="238">
  1204 + <caret line="14" column="25" selection-start-line="14" selection-start-column="25" selection-end-line="14" selection-end-column="25" />
1205 </state> 1205 </state>
1206 </provider> 1206 </provider>
1207 </entry> 1207 </entry>
@@ -12,7 +12,7 @@ @@ -12,7 +12,7 @@
12 width: 1.6rem; 12 width: 1.6rem;
13 height: 1.6rem; 13 height: 1.6rem;
14 float: left; 14 float: left;
15 - padding-left: 0.1rem; 15 + padding:0 0.1rem;
16 } 16 }
17 </style> 17 </style>
18 18
@@ -63,6 +63,7 @@ @@ -63,6 +63,7 @@
63 padding: 0.37rem; 63 padding: 0.37rem;
64 background-color: #eee; 64 background-color: #eee;
65 float: left; 65 float: left;
  66 + padding:0 0.1rem;
66 } 67 }
67 68
68 .submit_img_input { 69 .submit_img_input {