王晓刚 / advertising · 提交

转到一个项目

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

商户申请

内嵌 并排对比
正在显示 2 个修改的文件 包含 20 行增加 和 20 行删除
@@ -4,7 +4,7 @@ @@ -4,7 +4,7 @@
4 <bookmark url="file://$PROJECT_DIR$/application/home/view/member/my_information.html" line="118" mnemonic="4" /> 4 <bookmark url="file://$PROJECT_DIR$/application/home/view/member/my_information.html" line="118" mnemonic="4" />
5 </component> 5 </component>
6 <component name="ChangeListManager"> 6 <component name="ChangeListManager">
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 </list> 10 </list>
@@ -37,8 +37,8 @@ @@ -37,8 +37,8 @@
37 <file leaf-file-name="enter_view.html" pinned="false" current-in-tab="true"> 37 <file leaf-file-name="enter_view.html" pinned="false" current-in-tab="true">
38 <entry file="file://$PROJECT_DIR$/application/home/view/merchant/enter_view.html"> 38 <entry file="file://$PROJECT_DIR$/application/home/view/merchant/enter_view.html">
39 <provider selected="true" editor-type-id="text-editor"> 39 <provider selected="true" editor-type-id="text-editor">
40 - <state relative-caret-position="272">  
41 - <caret line="192" column="58" selection-start-line="192" selection-start-column="58" selection-end-line="192" selection-end-column="58" /> 40 + <state relative-caret-position="340">
  41 + <caret line="160" column="45" selection-start-line="160" selection-start-column="45" selection-end-line="160" selection-end-column="45" />
42 </state> 42 </state>
43 </provider> 43 </provider>
44 </entry> 44 </entry>
@@ -363,14 +363,7 @@ @@ -363,14 +363,7 @@
363 <workItem from="1573174620844" duration="32581000" /> 363 <workItem from="1573174620844" duration="32581000" />
364 <workItem from="1573259331081" duration="30435000" /> 364 <workItem from="1573259331081" duration="30435000" />
365 <workItem from="1573432217070" duration="2199000" /> 365 <workItem from="1573432217070" duration="2199000" />
366 - <workItem from="1573519427130" duration="12025000" />  
367 - </task>  
368 - <task id="LOCAL-00535" summary=" 商户申请">  
369 - <created>1573292751851</created>  
370 - <option name="number" value="00535" />  
371 - <option name="presentableId" value="LOCAL-00535" />  
372 - <option name="project" value="LOCAL" />  
373 - <updated>1573292751851</updated> 366 + <workItem from="1573519427130" duration="12088000" />
374 </task> 367 </task>
375 <task id="LOCAL-00536" summary=" 商户申请"> 368 <task id="LOCAL-00536" summary=" 商户申请">
376 <created>1573292769617</created> 369 <created>1573292769617</created>
@@ -708,11 +701,18 @@ @@ -708,11 +701,18 @@
708 <option name="project" value="LOCAL" /> 701 <option name="project" value="LOCAL" />
709 <updated>1573543214598</updated> 702 <updated>1573543214598</updated>
710 </task> 703 </task>
711 - <option name="localTasksCounter" value="584" /> 704 + <task id="LOCAL-00584" summary=" 商户申请">
  705 + <created>1573543410564</created>
  706 + <option name="number" value="00584" />
  707 + <option name="presentableId" value="LOCAL-00584" />
  708 + <option name="project" value="LOCAL" />
  709 + <updated>1573543410564</updated>
  710 + </task>
  711 + <option name="localTasksCounter" value="585" />
712 <servers /> 712 <servers />
713 </component> 713 </component>
714 <component name="TimeTrackingManager"> 714 <component name="TimeTrackingManager">
715 - <option name="totallyTimeSpent" value="418332000" /> 715 + <option name="totallyTimeSpent" value="418395000" />
716 </component> 716 </component>
717 <component name="ToolWindowManager"> 717 <component name="ToolWindowManager">
718 <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" /> 718 <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
@@ -1103,8 +1103,8 @@ @@ -1103,8 +1103,8 @@
1103 </entry> 1103 </entry>
1104 <entry file="file://$PROJECT_DIR$/application/home/view/merchant/enter_view.html"> 1104 <entry file="file://$PROJECT_DIR$/application/home/view/merchant/enter_view.html">
1105 <provider selected="true" editor-type-id="text-editor"> 1105 <provider selected="true" editor-type-id="text-editor">
1106 - <state relative-caret-position="272">  
1107 - <caret line="192" column="58" selection-start-line="192" selection-start-column="58" selection-end-line="192" selection-end-column="58" /> 1106 + <state relative-caret-position="340">
  1107 + <caret line="160" column="45" selection-start-line="160" selection-start-column="45" selection-end-line="160" selection-end-column="45" />
1108 </state> 1108 </state>
1109 </provider> 1109 </provider>
1110 </entry> 1110 </entry>
@@ -157,7 +157,7 @@ @@ -157,7 +157,7 @@
157 sizeType: ['original', 'compressed'], // 可以指定是原图还是压缩图，默认二者都有 157 sizeType: ['original', 'compressed'], // 可以指定是原图还是压缩图，默认二者都有
158 sourceType: ['album', 'camera'], // 可以指定来源是相册还是相机，默认二者都有 158 sourceType: ['album', 'camera'], // 可以指定来源是相册还是相机，默认二者都有
159 success: function (res) { 159 success: function (res) {
160 - alert(JSON.stringify(res)); 160 + // alert(JSON.stringify(res));
161 // let successUp = 0; //成功个数 161 // let successUp = 0; //成功个数
162 // let failUp = 0; //失败个数 162 // let failUp = 0; //失败个数
163 let i = 0; //第几个 163 let i = 0; //第几个
@@ -177,7 +177,7 @@ @@ -177,7 +177,7 @@
177 }); 177 });
178 178
179 function uploadImages(localId,length,i,type) { 179 function uploadImages(localId,length,i,type) {
180 - console.log('555555555555555555') 180 + // console.log('555555555555555555')
181 wx.uploadImage({ 181 wx.uploadImage({
182 localId: localId[i], 182 localId: localId[i],
183 isShowProgressTips: 1, 183 isShowProgressTips: 1,
@@ -190,7 +190,7 @@ @@ -190,7 +190,7 @@
190 success:function(res){ 190 success:function(res){
191 console.log(res); 191 console.log(res);
192 if(res.code == 1){ 192 if(res.code == 1){
193 - alert('99999999999') 193 + // alert('99999999999')
194 if(type == 1){ 194 if(type == 1){
195 var html = "<div class=\"images\">\n" + 195 var html = "<div class=\"images\">\n" +
196 " <img src=\""+res.data+"\" class=\"images_one\"/>\n" + 196 " <img src=\""+res.data+"\" class=\"images_one\"/>\n" +
@@ -202,7 +202,7 @@ @@ -202,7 +202,7 @@
202 $('#dom1').prepend(html); 202 $('#dom1').prepend(html);
203 i++; 203 i++;
204 if(i < length) { 204 if(i < length) {
205 - alert('6666666666666666666') 205 + // alert('6666666666666666666')
206 // 还有图片 206 // 还有图片
207 uploadImages(localId,length,i,1); 207 uploadImages(localId,length,i,1);
208 } 208 }
@@ -217,7 +217,7 @@ @@ -217,7 +217,7 @@
217 $('#dom2').prepend(html); 217 $('#dom2').prepend(html);
218 i++; 218 i++;
219 if(i < length) { 219 if(i < length) {
220 - alert('777777777777') 220 + // alert('777777777777')
221 // 还有图片 221 // 还有图片
222 uploadImages(localId,length,i,2); 222 uploadImages(localId,length,i,2);
223 } 223 }