From 0422d4982cb80590698e804a510600741522c978 Mon Sep 17 00:00:00 2001 From: Jerry Yan <792602257@qq.com> Date: Mon, 23 Sep 2019 15:07:29 +0800 Subject: [PATCH] =?UTF-8?q?'=E5=8A=A9=E8=B4=AD=E5=88=97=E8=A1=A8=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E5=8A=9F=E8=83=BD=E5=AE=9E=E7=8E=B0'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- js/confirmOrder.js | 28 ++++++++++------ js/details.js | 4 +-- js/indent.js | 16 +++++++++- js/indentcon.js | 31 +++++++++++------- js/my_help_sale.js | 80 ++++++++++++++++++++++++++++++++++++++++++++-- js/shoppingcart.js | 4 +-- js/zhugouba.js | 2 +- 7 files changed, 135 insertions(+), 30 deletions(-) diff --git a/js/confirmOrder.js b/js/confirmOrder.js index d849522..4a0f4c6 100644 --- a/js/confirmOrder.js +++ b/js/confirmOrder.js @@ -5,7 +5,7 @@ var channel = null; //支付通道 mui.init(); mui.plusReady(function() { var self = plus.webview.currentWebview(); - from_id = self.from?self.from:0 + from_id = self.from?self.from:1 if(from_id==3){ $("#selectHelpLevel").show(); }else{ @@ -161,7 +161,8 @@ mui.plusReady(function() { mui.ajax(qlgUrl('app/carts/settlement'), { data: { - type: type + type: type, + from: from_id }, dataType: 'json', //服务器返回json格式数据 type: 'post', //HTTP请求类型 @@ -280,15 +281,20 @@ mui.plusReady(function() { $('.userMoney').html(data.userMoney); // 助购层级获取 - JZL.ajax(qlgUrl('app/user_level/TreeList'),function(res){ - var _zgData = JSON.parse(res); - let _zgHtml = "" - _zgData.forEach(function(each){ - _zgHtml += '
'+ - '

'+each.level+':

'+'

'+each.userName.substr(0, 12)+'

' + if(from_id == '3'){ + $("#selectHelpLevel").show(); + JZL.ajax(qlgUrl('app/user_level/TreeList'),{},function(_zgData){ + let _zgHtml = "" + for (let levelId in _zgData) { + let each = _zgData[levelId] + _zgHtml += '
'+ + '

'+each.level+':

'+'

'+each.userName.substr(0, 12)+'

' + } + $("#pay_select_level .con_1").html(_zgHtml) }) - $("#pay_select_level .con_1").html(_zgHtml) - }) + }else{ + $("#selectHelpLevel").hide(); + } $('#goodsTotalMoney').html(priceT); } else { mui.alert(data.msg); @@ -560,6 +566,8 @@ mui.plusReady(function() { invoiceId: 0, invoiceClient: '', recordId: userCoupon, + goodsType: from_id, + from: from_id, } if(document.getElementById("displayHelpLevel").dataset["level_id"] !== undefined){ data_send["helpLevel"] = document.getElementById("displayHelpLevel").dataset["level_id"] diff --git a/js/details.js b/js/details.js index 66e1ccd..348b9e6 100644 --- a/js/details.js +++ b/js/details.js @@ -663,7 +663,7 @@ mui.plusReady(function() { alert('请选择商品分类!'); return } - if(goodsType==2 & $(this).hasClass('engwc')) { + if(goodsType==2 & from_id!=3 & $(this).hasClass('engwc')) { mui.alert ("助微吧商品不能加入购物车") return; } @@ -675,7 +675,7 @@ mui.plusReady(function() { "HYH-Token": token }, data: { - goodsType:goodsType, + goodsType:from_id, goodsId: goodsId, buyNum: buyNum, goodsSpecId: goodsSpecId, diff --git a/js/indent.js b/js/indent.js index 1131288..939d682 100644 --- a/js/indent.js +++ b/js/indent.js @@ -13,7 +13,6 @@ mui.plusReady(function() { var data_href = self.data_href; if(data_href == 'all') { $('.title').html('全部订单'); - } if(data_href == 'waitPay') { $('.title').html('待付款'); @@ -30,6 +29,21 @@ mui.plusReady(function() { if(data_href == 'abnormal') { $('.title').html('退款/售后'); } + if(data_href == 'zgall') { + $('.title').html('助购吧全部订单'); + } + if(data_href == 'zgwaitDeliver') { + $('.title').html('助购吧待发货'); + } + if(data_href == 'zgwaitReceive') { + $('.title').html('助购吧待收货'); + } + if(data_href == 'zgwaitAppraise') { + $('.title').html('助购吧待评价'); + } + if(data_href == 'zgabnormal') { + $('.title').html('助购吧退款售后'); + } localStorage.setItem('order_class', data_href); var bSize = 64 + (+localStorage.getItem('ipxSizeTop')) + 'px'; var sub = plus.webview.create('indentcon.html', data_href, { diff --git a/js/indentcon.js b/js/indentcon.js index 3964d14..802bcd7 100644 --- a/js/indentcon.js +++ b/js/indentcon.js @@ -79,7 +79,7 @@ function getData(page) { } } html += '
' + this.shopName + + '" data-goodsType="' + this.goodsType + '" data-helpUserId="' + this.helpUserId + '" data-helpUserName="' + this.helpUser.userName + '">
' + this.shopName + '
商家电话:' + this.phone + '
' + shopConfirmHtml + '
' + this.status + '
'+ - '

'+each.level+':

'+'

'+each.userName.substr(0, 12)+'

' + if(goodsType == '3'){ + var helpUserId = $(this).parent().parent().attr('data-helpUserId'); + var helpUserName = $(this).parent().parent().attr('data-helpUserName'); + $("#selectHelpLevel").show().data("user_id", helpUserId).data("user_name", helpUserName); + $("#displayHelpLevel").text(helpUserName) + JZL.ajax(qlgUrl('app/user_level/TreeList'),{},function(_zgData){ + let _zgHtml = "" + for (let levelId in _zgData) { + let each = _zgData[levelId] + _zgHtml += '
'+ + '

'+each.level+':

'+'

'+each.userName.substr(0, 12)+'

' + } + $("#pay_select_level .con_1").html(_zgHtml) }) - $("#pay_select_level .con_1").html(_zgHtml) - }) + }else{ + $("#selectHelpLevel").hide(); + } }) $('.bg').on('tap', '.mui-icon-left-nav', function() { @@ -330,10 +339,10 @@ mui.plusReady(function() { orderNo: orderNo } if(document.getElementById("displayHelpLevel").dataset["level_id"] !== undefined){ - data_send["helpLevel"] = document.getElementById("displayHelpLevel").dataset["level_id"] + data_ljfk["helpLevel"] = document.getElementById("displayHelpLevel").dataset["level_id"] } if(document.getElementById("displayHelpLevel").dataset["user_id"] !== undefined){ - data_send["helpUserId"] = document.getElementById("displayHelpLevel").dataset["user_id"] + data_ljfk["helpUserId"] = document.getElementById("displayHelpLevel").dataset["user_id"] } that.attr('disabled', 'disabled'); mui.ajax(hyhUrl('app/orders/succeed'), { diff --git a/js/my_help_sale.js b/js/my_help_sale.js index 30b27ca..8a997c1 100644 --- a/js/my_help_sale.js +++ b/js/my_help_sale.js @@ -9,7 +9,7 @@ mui.plusReady(function(){ ''+each.level+'
') } }) - + $("#userName").text(localStorage.getItem("userName")) JZL.ajax(qlgUrl('app/users/getIndex'), {}, function(data) { // console.log(data); //服务器返回响应,根据响应结果,分析是否登录成功; @@ -31,9 +31,9 @@ mui.plusReady(function(){ $("#myHelpSaleOrder").on("tap", function(){ mui.openWindow({ url: 'indent.html', - id: 'all', + id: 'zgall', extras: { - data_href: 'all' + data_href: 'zgall' }, createNew: false, //是否重复创建同样id的webview,默认为false:不重复创建,直接显示 waiting: { @@ -42,6 +42,80 @@ mui.plusReady(function(){ } }) }) + $(".waitSend").on("tap", function(){ + mui.openWindow({ + url: 'indent.html', + id: 'zgwaitDeliver', + extras: { + data_href: 'zgwaitDeliver' + }, + createNew: false, //是否重复创建同样id的webview,默认为false:不重复创建,直接显示 + waiting: { + autoShow: true, //自动显示等待框,默认为true + title: '正在加载...', //等待对话框上显示的提示内容 + } + }) + }) + $(".waitDeliver").on("tap", function(){ + mui.openWindow({ + url: 'indent.html', + id: 'zgwaitReceive', + extras: { + data_href: 'zgwaitReceive' + }, + createNew: false, //是否重复创建同样id的webview,默认为false:不重复创建,直接显示 + waiting: { + autoShow: true, //自动显示等待框,默认为true + title: '正在加载...', //等待对话框上显示的提示内容 + } + }) + }) + $(".waitAppraise").on("tap", function(){ + mui.openWindow({ + url: 'indent.html', + id: 'zgwaitAppraise', + extras: { + data_href: 'zgwaitAppraise' + }, + createNew: false, //是否重复创建同样id的webview,默认为false:不重复创建,直接显示 + waiting: { + autoShow: true, //自动显示等待框,默认为true + title: '正在加载...', //等待对话框上显示的提示内容 + } + }) + }) + $(".abnormal").on("tap", function(){ + mui.openWindow({ + url: 'indent.html', + id: 'zgabnormal', + extras: { + data_href: 'zgabnormal' + }, + createNew: false, //是否重复创建同样id的webview,默认为false:不重复创建,直接显示 + waiting: { + autoShow: true, //自动显示等待框,默认为true + title: '正在加载...', //等待对话框上显示的提示内容 + } + }) + }) + $(".helpSaleCart").on("tap", function(){ + mui.openWindow({ + url: "shoppingcart.html", + id: "shoppingcart.html_3", + extras: { + from_id: 3, + }, + waiting: { + autoShow: true, //自动显示等待框,默认为true + title: '正在加载...', //等待对话框上显示的提示内容 + options: { + // width: waiting - dialog - widht, //等待框背景区域宽度,默认根据内容自动计算合适宽度 + // height: waiting - dialog - height, //等待框背景区域高度,默认根据内容自动计算合适高度 + // ...... + } + } + }) + }) $("#toHelpSale").on("tap", function(){ JZL.openWindow('zhugouba.html', 'zhugouba.html'); }) diff --git a/js/shoppingcart.js b/js/shoppingcart.js index 8a82562..58ce80a 100644 --- a/js/shoppingcart.js +++ b/js/shoppingcart.js @@ -574,8 +574,8 @@ mui.plusReady(function() { extras: { // data_id: data_id - type: 0 - + type: 0, + from: from_id // ..... //自定义扩展参数,可以用来处理页面间传值 }, createNew: false, //是否重复创建同样id的webview,默认为false:不重复创建,直接显示 diff --git a/js/zhugouba.js b/js/zhugouba.js index 21e7641..92a245f 100644 --- a/js/zhugouba.js +++ b/js/zhugouba.js @@ -328,5 +328,5 @@ mui("body").on('tap', '.bc_img', function() { var goodsId = $(this).attr('data-goodsId'); var shopId = $(this).parent().parent().attr('data-shopId'); var goodsType=$(this).attr('data-goodsType') - JZL.openWindow('details.html', 'details.html' + goodsId, {data_id: goodsId,shopId: shopId,goodsType : goodsType, from_id:3}); + JZL.openWindow('details.html', 'details.html' + goodsId, {data_id: goodsId,shopId: shopId,goodsType : 3, from_id:3}); })