王晓刚 / advertising · 提交

转到一个项目

作者 王晓刚
提交 ef14e461d362d782489d308d52c2fcc9bdf8c7a3 1 个父辈 9c4e6eaf
1 个管道 的构建 通过 耗费 0 秒

后台bug

内嵌 并排对比
正在显示 2 个修改的文件 包含 91 行增加 和 48 行删除
... ... @@ -5,10 +5,8 @@
</component>
<component name="ChangeListManager">
<list default="true" id="309ad746-5b2a-4c29-af46-e7925a35765c" name="默认的" comment="">
<change afterPath="$PROJECT_DIR$/public/assets/advertising/img/choice.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/application/home/view/member/my_withdraw.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/home/view/member/my_withdraw.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/public/assets/advertising/css/record.css" beforeDir="false" afterPath="$PROJECT_DIR$/public/assets/advertising/css/record.css" afterDir="false" />
<change beforePath="$PROJECT_DIR$/application/home/view/index/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/home/view/index/index.html" afterDir="false" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" />
... ... @@ -36,11 +34,20 @@
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name="my_withdraw.html" pinned="false" current-in-tab="true">
<file leaf-file-name="my_withdraw.html" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/application/home/view/member/my_withdraw.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="442">
<caret line="68" column="10" selection-start-line="68" selection-start-column="10" selection-end-line="68" selection-end-column="10" />
<state relative-caret-position="-221">
<caret line="29" column="65" selection-start-line="29" selection-start-column="65" selection-end-line="29" selection-end-column="65" />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="index.html" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/application/home/view/index/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="407">
<caret line="106" column="18" selection-start-line="106" selection-start-column="18" selection-end-line="106" selection-end-column="18" />
</state>
</provider>
</entry>
... ... @@ -70,7 +77,6 @@
</component>
<component name="FindInProjectRecents">
<findStrings>
<find>answer_word</find>
<find>vide</find>
<find>nav_img</find>
<find>btn_more</find>
... ... @@ -100,6 +106,7 @@
<find>与服务器断开连接</find>
<find>与服务器断开连接3</find>
<find>quest_condition</find>
<find>outerScroller</find>
</findStrings>
<replaceStrings>
<replace />
... ... @@ -142,7 +149,6 @@
<option value="$PROJECT_DIR$/public/assets/advertising/css/index.css" />
<option value="$PROJECT_DIR$/application/home/model/Goods.php" />
<option value="$PROJECT_DIR$/application/home/controller/Goods.php" />
<option value="$PROJECT_DIR$/application/home/view/index/index.html" />
<option value="$PROJECT_DIR$/application/home/controller/Share.php" />
<option value="$PROJECT_DIR$/public/assets/advertising/css/public.css" />
<option value="$PROJECT_DIR$/application/admin/view/goods/edit.html" />
... ... @@ -162,6 +168,7 @@
<option value="$PROJECT_DIR$/application/admin/view/dashboard/index.html" />
<option value="$PROJECT_DIR$/public/assets/advertising/css/record.css" />
<option value="$PROJECT_DIR$/application/home/view/member/my_withdraw.html" />
<option value="$PROJECT_DIR$/application/home/view/index/index.html" />
</list>
</option>
</component>
... ... @@ -318,6 +325,14 @@
<item name="application" type="462c0819:PsiDirectoryNode" />
<item name="home" type="462c0819:PsiDirectoryNode" />
<item name="view" type="462c0819:PsiDirectoryNode" />
<item name="index" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="advertising" type="b2602c69:ProjectViewProjectNode" />
<item name="advertising" type="462c0819:PsiDirectoryNode" />
<item name="application" type="462c0819:PsiDirectoryNode" />
<item name="home" type="462c0819:PsiDirectoryNode" />
<item name="view" type="462c0819:PsiDirectoryNode" />
<item name="member" type="462c0819:PsiDirectoryNode" />
</path>
<path>
... ... @@ -426,21 +441,7 @@
<workItem from="1573259331081" duration="30435000" />
<workItem from="1573432217070" duration="2199000" />
<workItem from="1573519427130" duration="17475000" />
<workItem from="1573605070739" duration="15786000" />
</task>
<task id="LOCAL-00589" summary=" 商户申请">
<created>1573544443709</created>
<option name="number" value="00589" />
<option name="presentableId" value="LOCAL-00589" />
<option name="project" value="LOCAL" />
<updated>1573544443709</updated>
</task>
<task id="LOCAL-00590" summary=" 商户申请">
<created>1573544544023</created>
<option name="number" value="00590" />
<option name="presentableId" value="LOCAL-00590" />
<option name="project" value="LOCAL" />
<updated>1573544544023</updated>
<workItem from="1573605070739" duration="16177000" />
</task>
<task id="LOCAL-00591" summary=" 商户申请">
<created>1573544613067</created>
... ... @@ -771,11 +772,25 @@
<option name="project" value="LOCAL" />
<updated>1573628879410</updated>
</task>
<option name="localTasksCounter" value="638" />
<task id="LOCAL-00638" summary="后台bug">
<created>1573631092464</created>
<option name="number" value="00638" />
<option name="presentableId" value="LOCAL-00638" />
<option name="project" value="LOCAL" />
<updated>1573631092464</updated>
</task>
<task id="LOCAL-00639" summary="后台bug">
<created>1573631154536</created>
<option name="number" value="00639" />
<option name="presentableId" value="LOCAL-00639" />
<option name="project" value="LOCAL" />
<updated>1573631154536</updated>
</task>
<option name="localTasksCounter" value="640" />
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="439568000" />
<option name="totallyTimeSpent" value="439959000" />
</component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
... ... @@ -864,13 +879,6 @@
<option name="LAST_COMMIT_MESSAGE" value="后台bug" />
</component>
<component name="editorHistoryManager">
<entry file="file://D:/我的文档/Documents/NetSarang Computer/6/Xftp/Temporary/Doc [2].php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="238">
<caret line="14" column="31" selection-start-line="14" selection-start-column="31" selection-end-line="14" selection-end-column="31" />
</state>
</provider>
</entry>
<entry file="file://D:/我的文档/Documents/NetSarang Computer/6/Xftp/Temporary/Doc [3].php">
<provider selected="true" editor-type-id="text-editor" />
</entry>
... ... @@ -988,13 +996,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/home/view/index/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="510">
<caret line="47" column="8" selection-start-line="47" selection-start-column="8" selection-end-line="47" selection-end-column="8" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/view/goods/edit.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="374">
... ... @@ -1184,10 +1185,20 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/home/view/member/index.html">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/application/home/view/member/my_withdraw.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="442">
<caret line="68" column="10" selection-start-line="68" selection-start-column="10" selection-end-line="68" selection-end-column="10" />
<state relative-caret-position="-221">
<caret line="29" column="65" selection-start-line="29" selection-start-column="65" selection-end-line="29" selection-end-column="65" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/home/view/index/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="407">
<caret line="106" column="18" selection-start-line="106" selection-start-column="18" selection-end-line="106" selection-end-column="18" />
</state>
</provider>
</entry>
... ...
... ... @@ -74,6 +74,7 @@
{include file="public/js" /}
<script src="__CDN__/assets/advertising/js/swiper.min.js"></script>
<script>
var user_id = "{:get_current_user_id()}";
//幻灯片
var swiper = new Swiper('.swiper-container', {
pagination: '.swiper-pagination',
... ... @@ -92,27 +93,58 @@
$(".outerScroller").on("touchstart", function(e) {
startY = e.changedTouches[0].pageY;
$(".refresh_box").text("松手后刷新")
})
});
$(".outerScroller").on("touchmove", function(e) {
endY = e.changedTouches[0].pageY;
disY = endY - startY;
if (disY > 30) {
$(".refresh_box").slideDown("slow");
}
})
});
$(".outerScroller").on("touchend", function(e) {
$(".refresh_box").text("刷新中")
$(".refresh_box").slideUp("slow")
})
$(".refresh_box").text("刷新中");
$(".refresh_box").slideUp("slow");
refresh();
});
function refresh() {
console.log("下拉刷新")
$.ajax({
url:"{:url('home/index/more')}",
type:"POST",
data:{'page':1,'user_id':user_id},
success:function(res){
if(res.code == 1){
if(res.data == ''){
$('.justify_center').html("<div>没有更多了~</div>");
toast('没有更多了~');
return;
}
var html = "";
$(res.data).each(function (key, vo) {
html += "<div class=\"content_single\" onclick=\"detail('"+vo.id+"')\">\n" +
" <div class=\"single_title\">"+vo.goods_name+"</div>\n" +
" <div class=\"single_coupon\">"+vo.exp+"红包券</div>\n" +
" <div class=\"layout justify flex_row align_center\">\n" +
" <div class=\"single_date\">截止日期： "+vo.end_time+"</div>\n" +
" <div class=\"single_btn\">可参与</div>\n" +
" </div>\n" +
" </div>";
});
$('#dom').append(html);
$('#page').val(page);
}else{
toast('与服务器断开连接');
}
},
error:function(){
toast('与服务器断开连接');
}
})
};
//加载更多
$(".load_more").click(function () {
var page = $('#page').val();
page++;
var user_id = "{:get_current_user_id()}";
$.ajax({
url:"{:url('home/index/more')}",
type:"POST",
... ...