From c9cd588912691638496b39fa6af625a144395fd7 Mon Sep 17 00:00:00 2001 From: yvan.ni Date: Wed, 17 Apr 2024 18:47:01 +0800 Subject: [PATCH] oa单测试的优化 --- packageE/pages/togoin/togoin.js | 5 +++++ pages/goods/goodsInfo/goodsInfo.js | 432 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- 2 files changed, 228 insertions(+), 209 deletions(-) diff --git a/packageE/pages/togoin/togoin.js b/packageE/pages/togoin/togoin.js index 35ef6ca..265671c 100644 --- a/packageE/pages/togoin/togoin.js +++ b/packageE/pages/togoin/togoin.js @@ -90,6 +90,8 @@ Page({ return app.my_warnning("登录需要授权手机号码！", 0, this); return false; } + if(this.data.sub) return false; + this.setData({ sub: 1 }); var sessionKey = getApp().globalData.sessionKey; var openid = getApp().globalData.openid; var r = getApp().globalData.getu; @@ -389,13 +391,16 @@ Page({ } else { + th.setData({ sub: 0 }); return app.my_warnning("授权登入失败,请稍后再试!", 0, that); } }, failStatus: function (t) { + th.setData({ sub: 0 }); return app.my_warnning("授权登入失败,请稍后再试!", 0, that); }, fail: function (t) { + th.setData({ sub: 0 }); return i.clearAuth(), i.alertLoginErrorAndGoHome(), !1; } }); diff --git a/pages/goods/goodsInfo/goodsInfo.js b/pages/goods/goodsInfo/goodsInfo.js index 018b237..5366f27 100644 --- a/pages/goods/goodsInfo/goodsInfo.js +++ b/pages/goods/goodsInfo/goodsInfo.js @@ -1048,79 +1048,64 @@ Page({ this.wait_for_store_config(); - //先检验一下商品的活动情况 - this.check_gd_prom_new(function () { - //-- 8是预售 -- - if (ee.data.prom_type == 8) { - getApp().goto("/packageC/pages/presell/goodsInfo/goodsInfo?goods_id=" + ee.data.gid + "&prom_id=" + ee.data.prom_id); - return false; - } + setTimeout(()=>{ + //先检验一下商品的活动情况 + this.check_gd_prom_new(function () { - //-- 9是幸运购 -- - if (ee.data.prom_type == 9) { - var lk_url = "/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo?goods_id=" + ee.data.gid + "&group_id=" + ee.data.prom_id + "&prom_type=9"; - getApp().goto(lk_url); - return false; - } + //-- 8是预售 -- + if (ee.data.prom_type == 8) { + getApp().goto("/packageC/pages/presell/goodsInfo/goodsInfo?goods_id=" + ee.data.gid + "&prom_id=" + ee.data.prom_id); + return false; + } - i.get("/api/weshop/goods/get/" + o.stoid + "/" + ee.data.gid, { - failRollback: !0, - success: function (t) { - console.log(t); - // t.data.data.prom_type=0 - if (t.data.code == 0) { - if (t.data.data && t.data.data.prom_type == 4) { - if (ee.data.prom_type4 == 1) { - t.data.data.prom_type = 0 + //-- 9是幸运购 -- + if (ee.data.prom_type == 9) { + var lk_url = "/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo?goods_id=" + ee.data.gid + "&group_id=" + ee.data.prom_id + "&prom_type=9"; + getApp().goto(lk_url); + return false; + } + + i.get("/api/weshop/goods/get/" + o.stoid + "/" + ee.data.gid, { + failRollback: !0, + success: function (t) { + console.log(t); + // t.data.data.prom_type=0 + if (t.data.code == 0) { + if (t.data.data && t.data.data.prom_type == 4) { + if (ee.data.prom_type4 == 1) { + t.data.data.prom_type = 0 + } } - } - var p_fail=0; + var p_fail=0; - if (t.data.data.is_on_sale != 1 ) { - p_fail=1; - wx.showModal({ - title: '商品已经下架', - showCancel: !1, - complete: function () { + if (t.data.data.is_on_sale != 1 ) { + p_fail=1; + wx.showModal({ + title: '商品已经下架', + showCancel: !1, + complete: function () { let pages = getCurrentPages(); if (pages[pages.length - 2]) { wx.navigateBack(); } else { getApp().goto('/pages/index/index/index') } - } - }); - - } + } + }); - ee.init(gid); + } - var timestamp = Date.parse(new Date()); - timestamp = timestamp / 1000; - if (t.data.data.on_time > timestamp && !p_fail) { - wx.showModal({ - title: '商品还未上架', - showCancel: !1, - complete: function () { - let pages = getCurrentPages(); - if (pages[pages.length - 2]) { - wx.navigateBack(); - } else { - getApp().goto('/pages/index/index/index') - } - } - }); - } + ee.init(gid); - if (t.data.data.down_time > 0 && !p_fail) { - if (t.data.data.down_time < timestamp ) { + var timestamp = Date.parse(new Date()); + timestamp = timestamp / 1000; + if (t.data.data.on_time > timestamp && !p_fail) { wx.showModal({ - title: '商品已经到期下架', + title: '商品还未上架', showCancel: !1, complete: function () { - let pages = getCurrentPages(); if (pages[pages.length - 2]) { wx.navigateBack(); @@ -1130,199 +1115,217 @@ Page({ } }); } - } + if (t.data.data.down_time > 0 && !p_fail) { + if (t.data.data.down_time < timestamp ) { + wx.showModal({ + title: '商品已经到期下架', + showCancel: !1, + complete: function () { - //动态获取商品名称 - // wx.setNavigationBarTitle({ - // title: t.data.data.goods_name, - // }); + let pages = getCurrentPages(); + if (pages[pages.length - 2]) { + wx.navigateBack(); + } else { + getApp().goto('/pages/index/index/index') + } + } + }); + } + } - ee.setData({gtitle:t.data.data.goods_name}) + //动态获取商品名称 + // wx.setNavigationBarTitle({ + // title: t.data.data.goods_name, + // }); - var p_type = parseInt(ee.data.prom_type ? ee.data.prom_type : 0); + ee.setData({gtitle:t.data.data.goods_name}) - //-- 判断是不是组合购活动,必须要登录后才能判断 -- - if (getApp().globalData.userInfo && t.data.data.prom_type == 7 && [1, 2, 4, 6, 8, 9].indexOf(p_type) == -1) { - //获取活动信息 - var url = "/api/weshop/prom/zhbuy/get/" + os.stoid + "/" + - t.data.data.prom_id + "/" + getApp().globalData.user_id; - getApp().request.get(url, { - success: function (e) { - if (e.data.code == 0 && e.data.data) { - if (ut.gettimestamp() < e.data.data.start_time) { - return false; - } - if (e.data.data.is_end == 0 && ut.gettimestamp() < e.data.data.end_time) { - //-- 获取商品列表 -- - th.setData({ - zh_act: e.data.data - }); - th.getUserBuyPromNum(e.data.data.id) - } + var p_type = parseInt(ee.data.prom_type ? ee.data.prom_type : 0); + + //-- 判断是不是组合购活动,必须要登录后才能判断 -- + if (getApp().globalData.userInfo && t.data.data.prom_type == 7 && [1, 2, 4, 6, 8, 9].indexOf(p_type) == -1) { + //获取活动信息 + var url = "/api/weshop/prom/zhbuy/get/" + os.stoid + "/" + + t.data.data.prom_id + "/" + getApp().globalData.user_id; + getApp().request.get(url, { + success: function (e) { + if (e.data.code == 0 && e.data.data) { + if (ut.gettimestamp() < e.data.data.start_time) { + return false; + } + if (e.data.data.is_end == 0 && ut.gettimestamp() < e.data.data.end_time) { + //-- 获取商品列表 -- + th.setData({ + zh_act: e.data.data + }); + th.getUserBuyPromNum(e.data.data.id) + } + + } } - } - }); - } + }); + } - //-- 把商品的赋值,同时给活动赋值 -- - ee.data.fir_goods = JSON.parse(JSON.stringify(t.data.data)); - // if (t.data.data.prom_type && t.data.data.prom_id && !ee.data.prom_type) { - // ee.data.prom_type = t.data.data.prom_type; - // ee.data.prom_id = t.data.data.prom_id; - // } + //-- 把商品的赋值,同时给活动赋值 -- + ee.data.fir_goods = JSON.parse(JSON.stringify(t.data.data)); + // if (t.data.data.prom_type && t.data.data.prom_id && !ee.data.prom_type) { + // ee.data.prom_type = t.data.data.prom_type; + // ee.data.prom_id = t.data.data.prom_id; + // } - - t.data.data.on_time = ut.formatTime(t.data.data.on_time, 'yyyy-MM-dd hh:mm:ss'); - var cur_price = t.data.data.shop_price; - if (getApp().globalData.userInfo && getApp().globalData.userInfo.card_field) { - var cfile = getApp().globalData.userInfo.card_field; - if (t.data.data[cfile]) { - cur_price = t.data.data[cfile]; + t.data.data.on_time = ut.formatTime(t.data.data.on_time, 'yyyy-MM-dd hh:mm:ss'); + + var cur_price = t.data.data.shop_price; + if (getApp().globalData.userInfo && getApp().globalData.userInfo.card_field) { + var cfile = getApp().globalData.userInfo.card_field; + if (t.data.data[cfile]) { + cur_price = t.data.data[cfile]; + } } - } - var txt = (cur_price / t.data.data.market_price * 10).toFixed(2).toString(); - txt = parseFloat(txt); + var txt = (cur_price / t.data.data.market_price * 10).toFixed(2).toString(); + txt = parseFloat(txt); - t.data.data['disc'] = txt; + t.data.data['disc'] = txt; - if (t.data.data.original_img.indexOf(o.imghost) == -1) - t.data.data.original_img = o.imghost + t.data.data.original_img; + if (t.data.data.original_img.indexOf(o.imghost) == -1) + t.data.data.original_img = o.imghost + t.data.data.original_img; - /* -----商品详情--- - if (t.data.data.goods_content == null) t.data.data.goods_content = ""; - if (!t.data.data.goods_content) t.data.data.goods_content = " "; - a.wxParse("content", "html", ut.format_content(t.data.data.goods_content), ee, 6); - e.wxParseAddFullImageUrl(ee, "content");--*/ + /* -----商品详情--- + if (t.data.data.goods_content == null) t.data.data.goods_content = ""; + if (!t.data.data.goods_content) t.data.data.goods_content = " "; + a.wxParse("content", "html", ut.format_content(t.data.data.goods_content), ee, 6); + e.wxParseAddFullImageUrl(ee, "content");--*/ - getApp().deal_iframe(a,e,'content',t.data.data.goods_content,ee); + getApp().deal_iframe(a,e,'content',t.data.data.goods_content,ee); - //if (ee.data.prom_type) { - t.data.data.prom_type = ee.data.prom_type; - t.data.data.prom_id = ee.data.prom_id; + //if (ee.data.prom_type) { + t.data.data.prom_type = ee.data.prom_type; + t.data.data.prom_id = ee.data.prom_id; - //只有是普通商品的时候，才要给商品赋值指定门店 - if ([1, 2, 4, 6, 8, 9].indexOf(parseInt(ee.data.prom_type))<0 && t.data.data.pick_up_lists && t.data.data.pick_up_lists.length) { - t.data.data.pickup_ids = t.data.data.pick_up_lists; - } - //} - ee.setData({ - data: t.data.data, - sele_g: t.data.data, - userInfo: getApp().globalData.userInfo, - front_g: ut.deep_cp(t.data.data), - }); + //只有是普通商品的时候，才要给商品赋值指定门店 + if ([1, 2, 4, 6, 8, 9].indexOf(parseInt(ee.data.prom_type))<0 && t.data.data.pick_up_lists && t.data.data.pick_up_lists.length) { + t.data.data.pickup_ids = t.data.data.pick_up_lists; + } + //} + ee.setData({ + data: t.data.data, + sele_g: t.data.data, + userInfo: getApp().globalData.userInfo, + front_g: ut.deep_cp(t.data.data), + }); - //一件代发商品不去计算优惠 - //if (!ee.data.fir_goods.whsle_id && ee.data.prom_type != 1 && ee.data.prom_type != 4 && ee.data.prom_type != 6 && ee.data.prom_type != 2) { - if (!ee.data.fir_goods.whsle_id && ee.data.prom_type != 1 && ee.data.prom_type != 4 && ee.data.prom_type != 6 && ee.data.prom_type != 2) { + //一件代发商品不去计算优惠 + //if (!ee.data.fir_goods.whsle_id && ee.data.prom_type != 1 && ee.data.prom_type != 4 && ee.data.prom_type != 6 && ee.data.prom_type != 2) { + if (!ee.data.fir_goods.whsle_id && ee.data.prom_type != 1 && ee.data.prom_type != 4 && ee.data.prom_type != 6 && ee.data.prom_type != 2) { ee.check_is_youhui(ee.data.gid); - } - - //获取统一条形码,普通商品和优惠促销的商品 - if (ee.data.data.prom_type == 0 || ee.data.data.prom_type == 3 || ee.data.data.prom_type == 5 || ee.data.data.prom_type == 7 || ee.data.data.prom_type == 9 || ee.data.data.prom_type == 10) { - ee.get_sto(); - ee.get_sku(o.stoid, t.data.data, gid); - ee.check_has_flash(); - - } else { - var gg = "", - item = t.data.data; + } - if (item.goods_spec == "null" || item.goods_spec == null) item.goods_spec = ""; - if (item.goods_color == "null" || item.goods_color == null) item.goods_color = ""; + //获取统一条形码,普通商品和优惠促销的商品 + if (ee.data.data.prom_type == 0 || ee.data.data.prom_type == 3 || ee.data.data.prom_type == 5 || ee.data.data.prom_type == 7 || ee.data.data.prom_type == 9 || ee.data.data.prom_type == 10) { + ee.get_sto(); + ee.get_sku(o.stoid, t.data.data, gid); + ee.check_has_flash(); - if (item.goods_spec != "" && item.goods_color != "") { - gg = item.goods_spec + "/" + item.goods_color; - } else if (item.goods_spec != "" || item.goods_color != "") { - gg = item.goods_spec + item.goods_color; } else { - gg = "规格1"; + var gg = "", + item = t.data.data; + + if (item.goods_spec == "null" || item.goods_spec == null) item.goods_spec = ""; + if (item.goods_color == "null" || item.goods_color == null) item.goods_color = ""; + + if (item.goods_spec != "" && item.goods_color != "") { + gg = item.goods_spec + "/" + item.goods_color; + } else if (item.goods_spec != "" || item.goods_color != "") { + gg = item.goods_spec + item.goods_color; + } else { + gg = "规格1"; + } + t.data.data.gg = gg; + var uu = []; + uu.push(t.data.data); + ee.setData({ + sku_g: uu, + }); } - t.data.data.gg = gg; - var uu = []; - uu.push(t.data.data); - ee.setData({ - sku_g: uu, - }); - } - ee.data.g_buy_num = new Map(); + ee.data.g_buy_num = new Map(); - //再返回的时候，prom_id要以f_prom_act为准 - var c_prom_id=ee.data.data.prom_id; - if(ee.data.f_prom_act) c_prom_id=ee.data.f_prom_act.id; + //再返回的时候，prom_id要以f_prom_act为准 + var c_prom_id=ee.data.data.prom_id; + if(ee.data.f_prom_act) c_prom_id=ee.data.f_prom_act.id; - //-- 增加相同的活动 -- - ee.check_prom(gid, ee.data.data.prom_type, c_prom_id); + //-- 增加相同的活动 -- + ee.check_prom(gid, ee.data.data.prom_type, c_prom_id); - var th = ee; - if (ee.data.cat_name == '') { - //过去国别，分类，品牌的名称 - i.get("/api/weshop/goodscategory/get/" + o.stoid + "/" + th.data.data.cat_id, { - success: function (t) { - var dd = t.data.data; - if (t.data.code == 0) { - th.setData({ - cat_name: dd.name - }); + var th = ee; + if (ee.data.cat_name == '') { + //过去国别，分类，品牌的名称 + i.get("/api/weshop/goodscategory/get/" + o.stoid + "/" + th.data.data.cat_id, { + success: function (t) { + var dd = t.data.data; + if (t.data.code == 0) { + th.setData({ + cat_name: dd.name + }); + } } - } - }); - //过去国别，分类，品牌的名称 - i.get("/api/weshop/brand/get/" + o.stoid + "/" + th.data.data.brand_id, { - success: function (t) { - var dd = t.data.data; - if (t.data.code == 0) { - th.setData({ - brand_name: dd.name - }); + }); + //过去国别，分类，品牌的名称 + i.get("/api/weshop/brand/get/" + o.stoid + "/" + th.data.data.brand_id, { + success: function (t) { + var dd = t.data.data; + if (t.data.code == 0) { + th.setData({ + brand_name: dd.name + }); + } } - } - }); - //过去国别，分类，品牌的名称 - i.get("/api/weshop/nation/get/" + o.stoid + "/" + th.data.data.nation_id, { - success: function (t) { - var dd = t.data.data; - if (t.data.code == 0) { - th.setData({ - nation_name: dd.name - }); + }); + //过去国别，分类，品牌的名称 + i.get("/api/weshop/nation/get/" + o.stoid + "/" + th.data.data.nation_id, { + success: function (t) { + var dd = t.data.data; + if (t.data.code == 0) { + th.setData({ + nation_name: dd.name + }); + } } + }); + } + + } else { + wx.showModal({ + title: t.data.msg, + showCancel: !1, + complete: function () { + wx.navigateBack(); } }); } - } else { - wx.showModal({ - title: t.data.msg, - showCancel: !1, - complete: function () { - wx.navigateBack(); - } - }); - } - - console.log('bbbbbbbbbbbbbb'); - console.log(th.data.prom_type); + console.log('bbbbbbbbbbbbbb'); + console.log(th.data.prom_type); - setTimeout(() => { - console.log('cccc'); - console.log(th.data.prom_type); - console.log(th.data.sele_g); + setTimeout(() => { + console.log('cccc'); + console.log(th.data.prom_type); + console.log(th.data.sele_g); - }, 1500) + }, 1500) - } - }); - }) + } + }); + }) + },1500) console.log('aaaaaaaaaa'); console.log(this.data.prom_type); @@ -5433,7 +5436,8 @@ Page({ data: { store_id: os.stoid, user_id: user_id, - goods_id: gd.goods_id, isnew:1 + goods_id: gd.goods_id, isnew:1, + timetype:gd.viplimited_timetype }, success: function (t) { if (t.data.code == 0) { @@ -5461,7 +5465,8 @@ Page({ user_id: user_id, goods_id: gd.goods_id, prom_type: gd.prom_type, - prom_id: gd.prom_id, isnew:1 + prom_id: gd.prom_id, isnew:1, + timetype:gd.viplimited_timetype }, //-----获取----- success: function (tt) { @@ -8334,8 +8339,9 @@ Page({ user_id: user_id, goods_id: gid, prom_type: 3, - prom_id: fir_act.prom_id, isnew:1 + prom_id: fir_act.prom_id, isnew:1, }; + var gd_limit_rs=await getApp().promiseGet('/api/weshop/ordergoods/getUserBuyGoodsNum',{data:lrs}); var pro_by_num=0; if(gd_limit_rs && gd_limit_rs.data.code==0){ @@ -9025,6 +9031,10 @@ Page({ con_weixin: function () { getApp().con_wx(this); }, + customer_chat: function () { + var goods_id=this.data.front_g.goods_id; + getApp().customer_chat(goods_id); + }, get_normal(gid) { @@ -9093,6 +9103,9 @@ Page({ }) }, + + + //-- 检验商品的活动情况 -- check_gd_prom_new: async function (func) { @@ -9286,6 +9299,7 @@ Page({ // 0关闭（如果有设置热线电话，则显示拨打热线电话）、 // 1小程序客服、 // 2企业微信客服 + // 3商城聊天系统 if (this.data.sys_switch) { let csType = this.data.sys_switch.weapp_customertype; if (csType == 0) { -- libgit2 0.21.4