From 762fe382a450a9ceb031f3528a9c45ea46a6d131 Mon Sep 17 00:00:00 2001 From: Jerry Yan <792602257@qq.com> Date: Tue, 10 Sep 2019 15:28:41 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=95=86=E5=93=81=E6=9D=A5?= =?UTF-8?q?=E6=BA=90from=5Fid;0=E5=85=B6=E4=BB=96=EF=BC=8C2=E5=BE=AE?= =?UTF-8?q?=E6=8A=8A=EF=BC=8C3=E5=A4=9F=E5=90=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- js/confirmOrder.js | 26 +++++++++++++++----------- js/details.js | 7 ++++--- js/goodslist.js | 7 +++++-- js/indentcon.js | 20 ++++++++------------ js/recommend.js | 5 +++-- js/shoppingcart.js | 2 +- js/zhugouba.js | 7 ++++--- js/zhuweiba.js | 9 +++++---- 8 files changed, 45 insertions(+), 38 deletions(-) diff --git a/js/confirmOrder.js b/js/confirmOrder.js index 9f5b733..d849522 100644 --- a/js/confirmOrder.js +++ b/js/confirmOrder.js @@ -4,6 +4,13 @@ var aliChannel = null; // 支付宝支付 var channel = null; //支付通道 mui.init(); mui.plusReady(function() { + var self = plus.webview.currentWebview(); + from_id = self.from?self.from:0 + if(from_id==3){ + $("#selectHelpLevel").show(); + }else{ + $("#selectHelpLevel").hide(); + } window.addEventListener('setAddress', function(e) { var addressId = localStorage.getItem('addressId') ? localStorage.getItem('addressId') : 0; if (addressId == 0) { @@ -273,18 +280,15 @@ mui.plusReady(function() { $('.userMoney').html(data.userMoney); // 助购层级获取 - // TODO: ajax - var _zgData = [ - {level_id:1, user_id:2, user_name: "UID2名称", level_name: "第一层"}, - {level_id:2, user_id:4, user_name: "UID4名称", level_name: "第二层"}, - {level_id:3, user_id:6, user_name: "konodioda~~~~~~~~~~~~~6", level_name: "第三层"}, - ] - let _zgHtml = "" - _zgData.forEach(function(each){ - _zgHtml += '
'+ - '

'+each.level_name+'：

'+'

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

' + 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)+'

' + }) + $("#pay_select_level .con_1").html(_zgHtml) }) - $("#pay_select_level .con_1").html(_zgHtml) $('#goodsTotalMoney').html(priceT); } else { mui.alert(data.msg); diff --git a/js/details.js b/js/details.js index cc9ab84..51069c5 100644 --- a/js/details.js +++ b/js/details.js @@ -256,6 +256,7 @@ mui.plusReady(function() { var isMiaosha = self.isMiaosha; var MiaoshaSaleSpec = self.MiaoshaSaleSpec; var specsId = ''; + from_id = self.from_id?self.from_id:0 // //console.log(isMiaosha) // isMiaosha = 1; // MiaoshaSaleSpec = '0'; @@ -662,8 +663,8 @@ mui.plusReady(function() { goodsType:goodsType, goodsId: goodsId, buyNum: buyNum, - goodsSpecId: goodsSpecId - + goodsSpecId: goodsSpecId, + from: from_id }, dataType: 'json', //服务器返回json格式数据 type: 'post', //HTTP请求类型 @@ -686,7 +687,7 @@ mui.plusReady(function() { }, extras: { // goodsId: goodsId - + from: from_id, type: 1 // ..... //自定义扩展参数，可以用来处理页面间传值 diff --git a/js/goodslist.js b/js/goodslist.js index c419697..6217bf4 100644 --- a/js/goodslist.js +++ b/js/goodslist.js @@ -83,6 +83,7 @@ mui.plusReady(function() { catId = self.data_catId; keyword = self.data_keyword; goodsType = self.goodsType?self.goodsType :""; + from_id = self.from_id?self.from_id:0; $('.commoditylistnav').on('tap', '.nav_block', function() { page = 1; count = 1; @@ -121,7 +122,8 @@ mui.plusReady(function() { page: 1, condition: condition, desc: desc, - goodsType :goodsType + goodsType :goodsType, + from: from_id } if (catId) { data.catId = catId; @@ -162,7 +164,8 @@ mui.plusReady(function() { pagesize: 10, page: 1, condition: 2, - desc: 0 + desc: 0, + from: from_id, } if (catId) { data_1.catId = catId; diff --git a/js/indentcon.js b/js/indentcon.js index 06be95e..3964d14 100644 --- a/js/indentcon.js +++ b/js/indentcon.js @@ -263,7 +263,6 @@ mui.plusReady(function() { that.removeAttr('disabled'); return; } - } }) } else { @@ -274,18 +273,15 @@ mui.plusReady(function() { } $('#loginName').html(localStorage.getItem("userName")); // 助购层级获取 - // TODO: ajax - var _zgData = [ - {level_id:1, user_id:2, user_name: "UID2名称", level_name: "第一层"}, - {level_id:2, user_id:4, user_name: "UID4名称", level_name: "第二层"}, - {level_id:3, user_id:6, user_name: "konodioda~~~~~~~~~~~~~6", level_name: "第三层"}, - ] - let _zgHtml = "" - _zgData.forEach(function(each){ - _zgHtml += '
'+ - '

'+each.level_name+'：

'+'

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

' + 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)+'

' + }) + $("#pay_select_level .con_1").html(_zgHtml) }) - $("#pay_select_level .con_1").html(_zgHtml) }) $('.bg').on('tap', '.mui-icon-left-nav', function() { diff --git a/js/recommend.js b/js/recommend.js index 771ed3b..2a0cf82 100644 --- a/js/recommend.js +++ b/js/recommend.js @@ -6,7 +6,7 @@ mui.plusReady(function() { // tj.show(); // mui.alert(e.target.attributes["data-id"].nodeValue); var data_id = this.attributes["data-goodsId"].nodeValue; - var goodsType =$(this).attr('data-goodsType') + var goodsType =$(this).attr('data-goodsType'); // //console.log(this.attributes["data-id"].nodeValue); mui.openWindow({ url: 'details.html', @@ -19,7 +19,8 @@ mui.plusReady(function() { }, extras: { data_id: data_id, - goodsType : goodsType?goodsType :"" + goodsType : goodsType?goodsType :"", + from_id: from_id?from_id:0 // ..... //自定义扩展参数，可以用来处理页面间传值 }, createNew: false, //是否重复创建同样id的webview，默认为false:不重复创建，直接显示 diff --git a/js/shoppingcart.js b/js/shoppingcart.js index 572da1e..f6ac590 100644 --- a/js/shoppingcart.js +++ b/js/shoppingcart.js @@ -109,7 +109,7 @@ mui.plusReady(function() { $(this).children().removeClass('check_0').addClass('check_1'); } }) - if($('.check2 .check_0').length > 0){ + if($('.check2 .check_1').length===0 && $('.check2 .check_0').length > 0){ $(".js .checks").removeClass('check_1').addClass('check_0'); }else{ $(".js .checks").removeClass('check_0').addClass('check_1'); diff --git a/js/zhugouba.js b/js/zhugouba.js index 92aa99c..21e7641 100644 --- a/js/zhugouba.js +++ b/js/zhugouba.js @@ -27,6 +27,7 @@ var isjiazai = 1; var nowPage = 1; var isLoading = false; mui.plusReady(function() { + from_id=3; getLocation(); function getLocation() { if (navigator.geolocation) { @@ -106,7 +107,7 @@ mui.plusReady(function() { mui('.con').on('tap', '.bc_img', function() { var goodsId = $(this).attr('data-goodsId'); - JZL.openWindow('details.html', 'details.html' + goodsId, {data_id: goodsId}); + JZL.openWindow('details.html', 'details.html' + goodsId, {data_id: goodsId, from_id:3, from_id:3}); }) function getShopList(nowPage, pageSize) { @@ -319,7 +320,7 @@ $('.header').on('blur', '#keyword', function() { $(".header").on('tap', '.search button', function(e) { var searchName = $('#keyword').val(); // JZL.openWindow('shopsList.html', 'shopsList.html', {data_keyword: searchName,goodsType:2}); - JZL.openWindow('goodslist.html', 'goodslist.html', {data_keyword: searchName,goodsType :2}); + JZL.openWindow('goodslist.html', 'goodslist.html', {data_keyword: searchName,goodsType :2, from_id:3}); $('#keyword').val("") }); //跳转商品详情页 @@ -327,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}); + JZL.openWindow('details.html', 'details.html' + goodsId, {data_id: goodsId,shopId: shopId,goodsType : goodsType, from_id:3}); }) diff --git a/js/zhuweiba.js b/js/zhuweiba.js index 3898568..22aa752 100644 --- a/js/zhuweiba.js +++ b/js/zhuweiba.js @@ -27,6 +27,7 @@ var isjiazai = 1; var nowPage = 1; var isLoading = false; mui.plusReady(function() { + from_id: 2 getLocation(); function getLocation() { if (navigator.geolocation) { @@ -106,7 +107,7 @@ mui.plusReady(function() { mui('.con').on('tap', '.bc_img', function() { var goodsId = $(this).attr('data-goodsId'); - JZL.openWindow('details.html', 'details.html' + goodsId, {data_id: goodsId}); + JZL.openWindow('details.html', 'details.html' + goodsId, {data_id: goodsId, from_id: 2}); }) function getShopList(nowPage, pageSize) { @@ -188,7 +189,7 @@ mui.plusReady(function() { // var goodsId = $(this).attr('data-goodsId'); var shopName = $(this).attr("data-shopName"); var shopId = $(this).attr("data-shopId"); - JZL.openWindow('storeout.html', 'storeout.html', {shopName: shopName,shopId: shopId}); + JZL.openWindow('storeout.html', 'storeout.html', {shopName: shopName,shopId: shopId, from_id:2}); }) }) @@ -320,7 +321,7 @@ $('.header').on('blur', '#keyword', function() { $(".header").on('tap', '.search button', function(e) { var searchName = $('#keyword').val(); // JZL.openWindow('shopsList.html', 'shopsList.html', {data_keyword: searchName,goodsType:2}); - JZL.openWindow('goodslist.html', 'goodslist.html', {data_keyword: searchName,goodsType :2}); + JZL.openWindow('goodslist.html', 'goodslist.html', {data_keyword: searchName,goodsType :2, from_id:2}); $('#keyword').val("") }); //跳转商品详情页 @@ -328,5 +329,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}); + JZL.openWindow('details.html', 'details.html' + goodsId, {data_id: goodsId,shopId: shopId,goodsType : goodsType, from_id:2}); })