王晓刚 / advertising · 提交

转到一个项目

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

商户申请

内嵌 并排对比
正在显示 2 个修改的文件 包含 28 行增加 和 34 行删除
... ... @@ -4,7 +4,9 @@
<bookmark url="file://$PROJECT_DIR$/application/home/view/member/my_information.html" line="118" mnemonic="4" />
</component>
<component name="ChangeListManager">
<list default="true" id="309ad746-5b2a-4c29-af46-e7925a35765c" name="默认的" comment="" />
<list default="true" id="309ad746-5b2a-4c29-af46-e7925a35765c" name="默认的" comment="">
<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" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" />
<option name="SHOW_DIALOG" value="false" />
... ... @@ -34,8 +36,8 @@
<file leaf-file-name="enter_view.html" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/application/home/view/merchant/enter_view.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="298">
<caret line="162" column="28" selection-start-line="162" selection-start-column="28" selection-end-line="162" selection-end-column="42" />
<state relative-caret-position="383">
<caret line="149" column="60" selection-start-line="149" selection-start-column="53" selection-end-line="149" selection-end-column="60" />
</state>
</provider>
</entry>
... ... @@ -360,21 +362,7 @@
<workItem from="1573174620844" duration="32581000" />
<workItem from="1573259331081" duration="30435000" />
<workItem from="1573432217070" duration="2199000" />
<workItem from="1573519427130" duration="9151000" />
</task>
<task id="LOCAL-00520" summary=" 商户申请">
<created>1573290377470</created>
<option name="number" value="00520" />
<option name="presentableId" value="LOCAL-00520" />
<option name="project" value="LOCAL" />
<updated>1573290377470</updated>
</task>
<task id="LOCAL-00521" summary=" 商户申请">
<created>1573290472253</created>
<option name="number" value="00521" />
<option name="presentableId" value="LOCAL-00521" />
<option name="project" value="LOCAL" />
<updated>1573290472253</updated>
<workItem from="1573519427130" duration="9409000" />
</task>
<task id="LOCAL-00522" summary=" 商户申请">
<created>1573290728696</created>
... ... @@ -705,11 +693,25 @@
<option name="project" value="LOCAL" />
<updated>1573540478550</updated>
</task>
<option name="localTasksCounter" value="569" />
<task id="LOCAL-00569" summary=" 商户申请">
<created>1573540563700</created>
<option name="number" value="00569" />
<option name="presentableId" value="LOCAL-00569" />
<option name="project" value="LOCAL" />
<updated>1573540563700</updated>
</task>
<task id="LOCAL-00570" summary=" 商户申请">
<created>1573540668054</created>
<option name="number" value="00570" />
<option name="presentableId" value="LOCAL-00570" />
<option name="project" value="LOCAL" />
<updated>1573540668054</updated>
</task>
<option name="localTasksCounter" value="571" />
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="415458000" />
<option name="totallyTimeSpent" value="415716000" />
</component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
... ... @@ -1100,8 +1102,8 @@
</entry>
<entry file="file://$PROJECT_DIR$/application/home/view/merchant/enter_view.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="298">
<caret line="162" column="28" selection-start-line="162" selection-start-column="28" selection-end-line="162" selection-end-column="42" />
<state relative-caret-position="383">
<caret line="149" column="60" selection-start-line="149" selection-start-column="53" selection-end-line="149" selection-end-column="60" />
</state>
</provider>
</entry>
... ...
... ... @@ -145,13 +145,9 @@
sizeType: ['original', 'compressed'], // 可以指定是原图还是压缩图，默认二者都有
sourceType: ['album', 'camera'], // 可以指定来源是相册还是相机，默认二者都有
success: function (res) {
var html = '';
$(res.localIds).each(function (key, localId) {
console.log(uploadImages(localId,1));
// console.log(html);
uploadImages(localId,1);
});
console.log(html);
$('#dom1').prepend(html);
}
});
});
... ... @@ -161,11 +157,9 @@
sizeType: ['original', 'compressed'], // 可以指定是原图还是压缩图，默认二者都有
sourceType: ['album', 'camera'], // 可以指定来源是相册还是相机，默认二者都有
success: function (res) {
var html = '';
$(res.localIds).each(function (key, localId) {
html += uploadImages(localId,2);
uploadImages(localId,2);
});
$('#dom2').prepend(html);
}
});
});
... ... @@ -190,8 +184,7 @@
" <img src=\"__CDN__/assets/advertising/img/close.png\"/>\n" +
" </div>\n" +
" </div>";
console.log(html);
return html;
$('#dom1').prepend(html);
}else if(type == 2){
var html = "<div class=\"images\">\n" +
" <img src=\""+res.data+"\" class=\"images_two\"/>\n" +
... ... @@ -200,8 +193,7 @@
" <img src=\"__CDN__/assets/advertising/img/close.png\"/>\n" +
" </div>\n" +
" </div>";
console.log(html);
return html;
$('#dom2').prepend(html);
}
}
},
... ...