商户申请

@@ -38,7 +38,7 @@
         <entry file="file://$PROJECT_DIR$/application/home/view/merchant/enter_view.html">
         <entry file="file://$PROJECT_DIR$/application/home/view/merchant/enter_view.html">
           <provider selected="true" editor-type-id="text-editor">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="272">
             <state relative-caret-position="272">
-              <caret line="168" column="28" selection-start-line="168" selection-start-column="28" selection-end-line="168" selection-end-column="28" />
+              <caret line="168" column="36" selection-start-line="168" selection-start-column="36" selection-end-line="168" selection-end-column="36" />
             </state>
             </state>
           </provider>
           </provider>
         </entry>
         </entry>
@@ -363,14 +363,7 @@
       <workItem from="1573174620844" duration="32581000" />
       <workItem from="1573174620844" duration="32581000" />
       <workItem from="1573259331081" duration="30435000" />
       <workItem from="1573259331081" duration="30435000" />
       <workItem from="1573432217070" duration="2199000" />
       <workItem from="1573432217070" duration="2199000" />
-      <workItem from="1573519427130" duration="10519000" />
-    </task>
-    <task id="LOCAL-00529" summary="    商户申请">
-      <created>1573292342095</created>
-      <option name="number" value="00529" />
-      <option name="presentableId" value="LOCAL-00529" />
-      <option name="project" value="LOCAL" />
-      <updated>1573292342095</updated>
+      <workItem from="1573519427130" duration="10696000" />
     </task>
     </task>
     <task id="LOCAL-00530" summary="    商户申请">
     <task id="LOCAL-00530" summary="    商户申请">
       <created>1573292402639</created>
       <created>1573292402639</created>
@@ -708,11 +701,18 @@
       <option name="project" value="LOCAL" />
       <option name="project" value="LOCAL" />
       <updated>1573541821981</updated>
       <updated>1573541821981</updated>
     </task>
     </task>
-    <option name="localTasksCounter" value="578" />
+    <task id="LOCAL-00578" summary="    商户申请">
+      <created>1573541908339</created>
+      <option name="number" value="00578" />
+      <option name="presentableId" value="LOCAL-00578" />
+      <option name="project" value="LOCAL" />
+      <updated>1573541908340</updated>
+    </task>
+    <option name="localTasksCounter" value="579" />
     <servers />
     <servers />
   </component>
   </component>
   <component name="TimeTrackingManager">
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="416826000" />
+    <option name="totallyTimeSpent" value="417003000" />
   </component>
   </component>
   <component name="ToolWindowManager">
   <component name="ToolWindowManager">
     <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
     <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
@@ -1104,7 +1104,7 @@
     <entry file="file://$PROJECT_DIR$/application/home/view/merchant/enter_view.html">
     <entry file="file://$PROJECT_DIR$/application/home/view/merchant/enter_view.html">
       <provider selected="true" editor-type-id="text-editor">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="272">
         <state relative-caret-position="272">
-          <caret line="168" column="28" selection-start-line="168" selection-start-column="28" selection-end-line="168" selection-end-column="28" />
+          <caret line="168" column="36" selection-start-line="168" selection-start-column="36" selection-end-line="168" selection-end-column="36" />
         </state>
         </state>
       </provider>
       </provider>
     </entry>
     </entry>

@@ -165,7 +165,7 @@
                     });
                     });
                 });
                 });
                 function uploadImages(localId,type) {
                 function uploadImages(localId,type) {
-                    // alert('555555555555555555')
+                    alert('555555555555555555')
                     wx.uploadImage({
                     wx.uploadImage({
                         localId: localId,
                         localId: localId,
                         isShowProgressTips: 1,
                         isShowProgressTips: 1,