Commit c9cd588912691638496b39fa6af625a144395fd7
1 parent
0c40d7c3
oa单测试的优化
Showing
2 changed files
with
228 additions
and
209 deletions
packageE/pages/togoin/togoin.js
| @@ -90,6 +90,8 @@ Page({ | @@ -90,6 +90,8 @@ Page({ | ||
| 90 | return app.my_warnning("登录需要授权手机号码！", 0, this); | 90 | return app.my_warnning("登录需要授权手机号码！", 0, this); |
| 91 | return false; | 91 | return false; |
| 92 | } | 92 | } |
| 93 | + if(this.data.sub) return false; | ||
| 94 | + this.setData({ sub: 1 }); | ||
| 93 | var sessionKey = getApp().globalData.sessionKey; | 95 | var sessionKey = getApp().globalData.sessionKey; |
| 94 | var openid = getApp().globalData.openid; | 96 | var openid = getApp().globalData.openid; |
| 95 | var r = getApp().globalData.getu; | 97 | var r = getApp().globalData.getu; |
| @@ -389,13 +391,16 @@ Page({ | @@ -389,13 +391,16 @@ Page({ | ||
| 389 | 391 | ||
| 390 | 392 | ||
| 391 | } else { | 393 | } else { |
| 394 | + th.setData({ sub: 0 }); | ||
| 392 | return app.my_warnning("授权登入失败,请稍后再试!", 0, that); | 395 | return app.my_warnning("授权登入失败,请稍后再试!", 0, that); |
| 393 | } | 396 | } |
| 394 | }, | 397 | }, |
| 395 | failStatus: function (t) { | 398 | failStatus: function (t) { |
| 399 | + th.setData({ sub: 0 }); | ||
| 396 | return app.my_warnning("授权登入失败,请稍后再试!", 0, that); | 400 | return app.my_warnning("授权登入失败,请稍后再试!", 0, that); |
| 397 | }, | 401 | }, |
| 398 | fail: function (t) { | 402 | fail: function (t) { |
| 403 | + th.setData({ sub: 0 }); | ||
| 399 | return i.clearAuth(), i.alertLoginErrorAndGoHome(), !1; | 404 | return i.clearAuth(), i.alertLoginErrorAndGoHome(), !1; |
| 400 | } | 405 | } |
| 401 | }); | 406 | }); |
pages/goods/goodsInfo/goodsInfo.js
| @@ -1048,79 +1048,64 @@ Page({ | @@ -1048,79 +1048,64 @@ Page({ | ||
| 1048 | 1048 | ||
| 1049 | 1049 | ||
| 1050 | this.wait_for_store_config(); | 1050 | this.wait_for_store_config(); |
| 1051 | - //先检验一下商品的活动情况 | ||
| 1052 | - this.check_gd_prom_new(function () { | ||
| 1053 | 1051 | ||
| 1054 | - //-- 8是预售 -- | ||
| 1055 | - if (ee.data.prom_type == 8) { | ||
| 1056 | - getApp().goto("/packageC/pages/presell/goodsInfo/goodsInfo?goods_id=" + ee.data.gid + "&prom_id=" + ee.data.prom_id); | ||
| 1057 | - return false; | ||
| 1058 | - } | 1052 | + setTimeout(()=>{ |
| 1053 | + //先检验一下商品的活动情况 | ||
| 1054 | + this.check_gd_prom_new(function () { | ||
| 1059 | 1055 | ||
| 1060 | - //-- 9是幸运购 -- | ||
| 1061 | - if (ee.data.prom_type == 9) { | ||
| 1062 | - var lk_url = "/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo?goods_id=" + ee.data.gid + "&group_id=" + ee.data.prom_id + "&prom_type=9"; | ||
| 1063 | - getApp().goto(lk_url); | ||
| 1064 | - return false; | ||
| 1065 | - } | 1056 | + //-- 8是预售 -- |
| 1057 | + if (ee.data.prom_type == 8) { | ||
| 1058 | + getApp().goto("/packageC/pages/presell/goodsInfo/goodsInfo?goods_id=" + ee.data.gid + "&prom_id=" + ee.data.prom_id); | ||
| 1059 | + return false; | ||
| 1060 | + } | ||
| 1066 | 1061 | ||
| 1067 | - i.get("/api/weshop/goods/get/" + o.stoid + "/" + ee.data.gid, { | ||
| 1068 | - failRollback: !0, | ||
| 1069 | - success: function (t) { | ||
| 1070 | - console.log(t); | ||
| 1071 | - // t.data.data.prom_type=0 | ||
| 1072 | - if (t.data.code == 0) { | ||
| 1073 | - if (t.data.data && t.data.data.prom_type == 4) { | ||
| 1074 | - if (ee.data.prom_type4 == 1) { | ||
| 1075 | - t.data.data.prom_type = 0 | 1062 | + //-- 9是幸运购 -- |
| 1063 | + if (ee.data.prom_type == 9) { | ||
| 1064 | + var lk_url = "/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo?goods_id=" + ee.data.gid + "&group_id=" + ee.data.prom_id + "&prom_type=9"; | ||
| 1065 | + getApp().goto(lk_url); | ||
| 1066 | + return false; | ||
| 1067 | + } | ||
| 1068 | + | ||
| 1069 | + i.get("/api/weshop/goods/get/" + o.stoid + "/" + ee.data.gid, { | ||
| 1070 | + failRollback: !0, | ||
| 1071 | + success: function (t) { | ||
| 1072 | + console.log(t); | ||
| 1073 | + // t.data.data.prom_type=0 | ||
| 1074 | + if (t.data.code == 0) { | ||
| 1075 | + if (t.data.data && t.data.data.prom_type == 4) { | ||
| 1076 | + if (ee.data.prom_type4 == 1) { | ||
| 1077 | + t.data.data.prom_type = 0 | ||
| 1078 | + } | ||
| 1076 | } | 1079 | } |
| 1077 | - } | ||
| 1078 | 1080 | ||
| 1079 | - var p_fail=0; | 1081 | + var p_fail=0; |
| 1080 | 1082 | ||
| 1081 | - if (t.data.data.is_on_sale != 1 ) { | ||
| 1082 | - p_fail=1; | ||
| 1083 | - wx.showModal({ | ||
| 1084 | - title: '商品已经下架', | ||
| 1085 | - showCancel: !1, | ||
| 1086 | - complete: function () { | 1083 | + if (t.data.data.is_on_sale != 1 ) { |
| 1084 | + p_fail=1; | ||
| 1085 | + wx.showModal({ | ||
| 1086 | + title: '商品已经下架', | ||
| 1087 | + showCancel: !1, | ||
| 1088 | + complete: function () { | ||
| 1087 | let pages = getCurrentPages(); | 1089 | let pages = getCurrentPages(); |
| 1088 | if (pages[pages.length - 2]) { | 1090 | if (pages[pages.length - 2]) { |
| 1089 | wx.navigateBack(); | 1091 | wx.navigateBack(); |
| 1090 | } else { | 1092 | } else { |
| 1091 | getApp().goto('/pages/index/index/index') | 1093 | getApp().goto('/pages/index/index/index') |
| 1092 | } | 1094 | } |
| 1093 | - } | ||
| 1094 | - }); | ||
| 1095 | - | ||
| 1096 | - } | 1095 | + } |
| 1096 | + }); | ||
| 1097 | 1097 | ||
| 1098 | - ee.init(gid); | 1098 | + } |
| 1099 | 1099 | ||
| 1100 | - var timestamp = Date.parse(new Date()); | ||
| 1101 | - timestamp = timestamp / 1000; | ||
| 1102 | - if (t.data.data.on_time > timestamp && !p_fail) { | ||
| 1103 | - wx.showModal({ | ||
| 1104 | - title: '商品还未上架', | ||
| 1105 | - showCancel: !1, | ||
| 1106 | - complete: function () { | ||
| 1107 | - let pages = getCurrentPages(); | ||
| 1108 | - if (pages[pages.length - 2]) { | ||
| 1109 | - wx.navigateBack(); | ||
| 1110 | - } else { | ||
| 1111 | - getApp().goto('/pages/index/index/index') | ||
| 1112 | - } | ||
| 1113 | - } | ||
| 1114 | - }); | ||
| 1115 | - } | 1100 | + ee.init(gid); |
| 1116 | 1101 | ||
| 1117 | - if (t.data.data.down_time > 0 && !p_fail) { | ||
| 1118 | - if (t.data.data.down_time < timestamp ) { | 1102 | + var timestamp = Date.parse(new Date()); |
| 1103 | + timestamp = timestamp / 1000; | ||
| 1104 | + if (t.data.data.on_time > timestamp && !p_fail) { | ||
| 1119 | wx.showModal({ | 1105 | wx.showModal({ |
| 1120 | - title: '商品已经到期下架', | 1106 | + title: '商品还未上架', |
| 1121 | showCancel: !1, | 1107 | showCancel: !1, |
| 1122 | complete: function () { | 1108 | complete: function () { |
| 1123 | - | ||
| 1124 | let pages = getCurrentPages(); | 1109 | let pages = getCurrentPages(); |
| 1125 | if (pages[pages.length - 2]) { | 1110 | if (pages[pages.length - 2]) { |
| 1126 | wx.navigateBack(); | 1111 | wx.navigateBack(); |
| @@ -1130,199 +1115,217 @@ Page({ | @@ -1130,199 +1115,217 @@ Page({ | ||
| 1130 | } | 1115 | } |
| 1131 | }); | 1116 | }); |
| 1132 | } | 1117 | } |
| 1133 | - } | ||
| 1134 | 1118 | ||
| 1119 | + if (t.data.data.down_time > 0 && !p_fail) { | ||
| 1120 | + if (t.data.data.down_time < timestamp ) { | ||
| 1121 | + wx.showModal({ | ||
| 1122 | + title: '商品已经到期下架', | ||
| 1123 | + showCancel: !1, | ||
| 1124 | + complete: function () { | ||
| 1135 | 1125 | ||
| 1136 | - //动态获取商品名称 | ||
| 1137 | - // wx.setNavigationBarTitle({ | ||
| 1138 | - // title: t.data.data.goods_name, | ||
| 1139 | - // }); | 1126 | + let pages = getCurrentPages(); |
| 1127 | + if (pages[pages.length - 2]) { | ||
| 1128 | + wx.navigateBack(); | ||
| 1129 | + } else { | ||
| 1130 | + getApp().goto('/pages/index/index/index') | ||
| 1131 | + } | ||
| 1132 | + } | ||
| 1133 | + }); | ||
| 1134 | + } | ||
| 1135 | + } | ||
| 1140 | 1136 | ||
| 1141 | - ee.setData({gtitle:t.data.data.goods_name}) | ||
| 1142 | 1137 | ||
| 1138 | + //动态获取商品名称 | ||
| 1139 | + // wx.setNavigationBarTitle({ | ||
| 1140 | + // title: t.data.data.goods_name, | ||
| 1141 | + // }); | ||
| 1143 | 1142 | ||
| 1144 | - var p_type = parseInt(ee.data.prom_type ? ee.data.prom_type : 0); | 1143 | + ee.setData({gtitle:t.data.data.goods_name}) |
| 1145 | 1144 | ||
| 1146 | - //-- 判断是不是组合购活动,必须要登录后才能判断 -- | ||
| 1147 | - if (getApp().globalData.userInfo && t.data.data.prom_type == 7 && [1, 2, 4, 6, 8, 9].indexOf(p_type) == -1) { | ||
| 1148 | - //获取活动信息 | ||
| 1149 | - var url = "/api/weshop/prom/zhbuy/get/" + os.stoid + "/" + | ||
| 1150 | - t.data.data.prom_id + "/" + getApp().globalData.user_id; | ||
| 1151 | - getApp().request.get(url, { | ||
| 1152 | - success: function (e) { | ||
| 1153 | - if (e.data.code == 0 && e.data.data) { | ||
| 1154 | - if (ut.gettimestamp() < e.data.data.start_time) { | ||
| 1155 | - return false; | ||
| 1156 | - } | ||
| 1157 | - if (e.data.data.is_end == 0 && ut.gettimestamp() < e.data.data.end_time) { | ||
| 1158 | - //-- 获取商品列表 -- | ||
| 1159 | - th.setData({ | ||
| 1160 | - zh_act: e.data.data | ||
| 1161 | - }); | ||
| 1162 | - th.getUserBuyPromNum(e.data.data.id) | ||
| 1163 | - } | ||
| 1164 | 1145 | ||
| 1146 | + var p_type = parseInt(ee.data.prom_type ? ee.data.prom_type : 0); | ||
| 1147 | + | ||
| 1148 | + //-- 判断是不是组合购活动,必须要登录后才能判断 -- | ||
| 1149 | + if (getApp().globalData.userInfo && t.data.data.prom_type == 7 && [1, 2, 4, 6, 8, 9].indexOf(p_type) == -1) { | ||
| 1150 | + //获取活动信息 | ||
| 1151 | + var url = "/api/weshop/prom/zhbuy/get/" + os.stoid + "/" + | ||
| 1152 | + t.data.data.prom_id + "/" + getApp().globalData.user_id; | ||
| 1153 | + getApp().request.get(url, { | ||
| 1154 | + success: function (e) { | ||
| 1155 | + if (e.data.code == 0 && e.data.data) { | ||
| 1156 | + if (ut.gettimestamp() < e.data.data.start_time) { | ||
| 1157 | + return false; | ||
| 1158 | + } | ||
| 1159 | + if (e.data.data.is_end == 0 && ut.gettimestamp() < e.data.data.end_time) { | ||
| 1160 | + //-- 获取商品列表 -- | ||
| 1161 | + th.setData({ | ||
| 1162 | + zh_act: e.data.data | ||
| 1163 | + }); | ||
| 1164 | + th.getUserBuyPromNum(e.data.data.id) | ||
| 1165 | + } | ||
| 1166 | + | ||
| 1167 | + } | ||
| 1165 | } | 1168 | } |
| 1166 | - } | ||
| 1167 | - }); | ||
| 1168 | - } | 1169 | + }); |
| 1170 | + } | ||
| 1169 | 1171 | ||
| 1170 | - //-- 把商品的赋值,同时给活动赋值 -- | ||
| 1171 | - ee.data.fir_goods = JSON.parse(JSON.stringify(t.data.data)); | ||
| 1172 | - // if (t.data.data.prom_type && t.data.data.prom_id && !ee.data.prom_type) { | ||
| 1173 | - // ee.data.prom_type = t.data.data.prom_type; | ||
| 1174 | - // ee.data.prom_id = t.data.data.prom_id; | ||
| 1175 | - // } | 1172 | + //-- 把商品的赋值,同时给活动赋值 -- |
| 1173 | + ee.data.fir_goods = JSON.parse(JSON.stringify(t.data.data)); | ||
| 1174 | + // if (t.data.data.prom_type && t.data.data.prom_id && !ee.data.prom_type) { | ||
| 1175 | + // ee.data.prom_type = t.data.data.prom_type; | ||
| 1176 | + // ee.data.prom_id = t.data.data.prom_id; | ||
| 1177 | + // } | ||
| 1176 | 1178 | ||
| 1177 | 1179 | ||
| 1178 | - | ||
| 1179 | - t.data.data.on_time = ut.formatTime(t.data.data.on_time, 'yyyy-MM-dd hh:mm:ss'); | ||
| 1180 | 1180 | ||
| 1181 | - var cur_price = t.data.data.shop_price; | ||
| 1182 | - if (getApp().globalData.userInfo && getApp().globalData.userInfo.card_field) { | ||
| 1183 | - var cfile = getApp().globalData.userInfo.card_field; | ||
| 1184 | - if (t.data.data[cfile]) { | ||
| 1185 | - cur_price = t.data.data[cfile]; | 1181 | + t.data.data.on_time = ut.formatTime(t.data.data.on_time, 'yyyy-MM-dd hh:mm:ss'); |
| 1182 | + | ||
| 1183 | + var cur_price = t.data.data.shop_price; | ||
| 1184 | + if (getApp().globalData.userInfo && getApp().globalData.userInfo.card_field) { | ||
| 1185 | + var cfile = getApp().globalData.userInfo.card_field; | ||
| 1186 | + if (t.data.data[cfile]) { | ||
| 1187 | + cur_price = t.data.data[cfile]; | ||
| 1188 | + } | ||
| 1186 | } | 1189 | } |
| 1187 | - } | ||
| 1188 | - var txt = (cur_price / t.data.data.market_price * 10).toFixed(2).toString(); | ||
| 1189 | - txt = parseFloat(txt); | 1190 | + var txt = (cur_price / t.data.data.market_price * 10).toFixed(2).toString(); |
| 1191 | + txt = parseFloat(txt); | ||
| 1190 | 1192 | ||
| 1191 | - t.data.data['disc'] = txt; | 1193 | + t.data.data['disc'] = txt; |
| 1192 | 1194 | ||
| 1193 | - if (t.data.data.original_img.indexOf(o.imghost) == -1) | ||
| 1194 | - t.data.data.original_img = o.imghost + t.data.data.original_img; | 1195 | + if (t.data.data.original_img.indexOf(o.imghost) == -1) |
| 1196 | + t.data.data.original_img = o.imghost + t.data.data.original_img; | ||
| 1195 | 1197 | ||
| 1196 | - /* -----商品详情--- | ||
| 1197 | - if (t.data.data.goods_content == null) t.data.data.goods_content = ""; | ||
| 1198 | - if (!t.data.data.goods_content) t.data.data.goods_content = " "; | ||
| 1199 | - a.wxParse("content", "html", ut.format_content(t.data.data.goods_content), ee, 6); | ||
| 1200 | - e.wxParseAddFullImageUrl(ee, "content");--*/ | 1198 | + /* -----商品详情--- |
| 1199 | + if (t.data.data.goods_content == null) t.data.data.goods_content = ""; | ||
| 1200 | + if (!t.data.data.goods_content) t.data.data.goods_content = " "; | ||
| 1201 | + a.wxParse("content", "html", ut.format_content(t.data.data.goods_content), ee, 6); | ||
| 1202 | + e.wxParseAddFullImageUrl(ee, "content");--*/ | ||
| 1201 | 1203 | ||
| 1202 | - getApp().deal_iframe(a,e,'content',t.data.data.goods_content,ee); | 1204 | + getApp().deal_iframe(a,e,'content',t.data.data.goods_content,ee); |
| 1203 | 1205 | ||
| 1204 | - //if (ee.data.prom_type) { | ||
| 1205 | - t.data.data.prom_type = ee.data.prom_type; | ||
| 1206 | - t.data.data.prom_id = ee.data.prom_id; | 1206 | + //if (ee.data.prom_type) { |
| 1207 | + t.data.data.prom_type = ee.data.prom_type; | ||
| 1208 | + t.data.data.prom_id = ee.data.prom_id; | ||
| 1207 | 1209 | ||
| 1208 | - //只有是普通商品的时候，才要给商品赋值指定门店 | ||
| 1209 | - 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) { | ||
| 1210 | - t.data.data.pickup_ids = t.data.data.pick_up_lists; | ||
| 1211 | - } | ||
| 1212 | - //} | ||
| 1213 | - ee.setData({ | ||
| 1214 | - data: t.data.data, | ||
| 1215 | - sele_g: t.data.data, | ||
| 1216 | - userInfo: getApp().globalData.userInfo, | ||
| 1217 | - front_g: ut.deep_cp(t.data.data), | ||
| 1218 | - }); | 1210 | + //只有是普通商品的时候，才要给商品赋值指定门店 |
| 1211 | + 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) { | ||
| 1212 | + t.data.data.pickup_ids = t.data.data.pick_up_lists; | ||
| 1213 | + } | ||
| 1214 | + //} | ||
| 1215 | + ee.setData({ | ||
| 1216 | + data: t.data.data, | ||
| 1217 | + sele_g: t.data.data, | ||
| 1218 | + userInfo: getApp().globalData.userInfo, | ||
| 1219 | + front_g: ut.deep_cp(t.data.data), | ||
| 1220 | + }); | ||
| 1219 | 1221 | ||
| 1220 | - //一件代发商品不去计算优惠 | ||
| 1221 | - //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) { | ||
| 1222 | - 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) { | 1222 | + //一件代发商品不去计算优惠 |
| 1223 | + //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) { | ||
| 1224 | + 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) { | ||
| 1223 | ee.check_is_youhui(ee.data.gid); | 1225 | ee.check_is_youhui(ee.data.gid); |
| 1224 | - } | ||
| 1225 | - | ||
| 1226 | - //获取统一条形码,普通商品和优惠促销的商品 | ||
| 1227 | - 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) { | ||
| 1228 | - ee.get_sto(); | ||
| 1229 | - ee.get_sku(o.stoid, t.data.data, gid); | ||
| 1230 | - ee.check_has_flash(); | ||
| 1231 | - | ||
| 1232 | - } else { | ||
| 1233 | - var gg = "", | ||
| 1234 | - item = t.data.data; | 1226 | + } |
| 1235 | 1227 | ||
| 1236 | - if (item.goods_spec == "null" || item.goods_spec == null) item.goods_spec = ""; | ||
| 1237 | - if (item.goods_color == "null" || item.goods_color == null) item.goods_color = ""; | 1228 | + //获取统一条形码,普通商品和优惠促销的商品 |
| 1229 | + 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) { | ||
| 1230 | + ee.get_sto(); | ||
| 1231 | + ee.get_sku(o.stoid, t.data.data, gid); | ||
| 1232 | + ee.check_has_flash(); | ||
| 1238 | 1233 | ||
| 1239 | - if (item.goods_spec != "" && item.goods_color != "") { | ||
| 1240 | - gg = item.goods_spec + "/" + item.goods_color; | ||
| 1241 | - } else if (item.goods_spec != "" || item.goods_color != "") { | ||
| 1242 | - gg = item.goods_spec + item.goods_color; | ||
| 1243 | } else { | 1234 | } else { |
| 1244 | - gg = "规格1"; | 1235 | + var gg = "", |
| 1236 | + item = t.data.data; | ||
| 1237 | + | ||
| 1238 | + if (item.goods_spec == "null" || item.goods_spec == null) item.goods_spec = ""; | ||
| 1239 | + if (item.goods_color == "null" || item.goods_color == null) item.goods_color = ""; | ||
| 1240 | + | ||
| 1241 | + if (item.goods_spec != "" && item.goods_color != "") { | ||
| 1242 | + gg = item.goods_spec + "/" + item.goods_color; | ||
| 1243 | + } else if (item.goods_spec != "" || item.goods_color != "") { | ||
| 1244 | + gg = item.goods_spec + item.goods_color; | ||
| 1245 | + } else { | ||
| 1246 | + gg = "规格1"; | ||
| 1247 | + } | ||
| 1248 | + t.data.data.gg = gg; | ||
| 1249 | + var uu = []; | ||
| 1250 | + uu.push(t.data.data); | ||
| 1251 | + ee.setData({ | ||
| 1252 | + sku_g: uu, | ||
| 1253 | + }); | ||
| 1245 | } | 1254 | } |
| 1246 | - t.data.data.gg = gg; | ||
| 1247 | - var uu = []; | ||
| 1248 | - uu.push(t.data.data); | ||
| 1249 | - ee.setData({ | ||
| 1250 | - sku_g: uu, | ||
| 1251 | - }); | ||
| 1252 | - } | ||
| 1253 | - ee.data.g_buy_num = new Map(); | 1255 | + ee.data.g_buy_num = new Map(); |
| 1254 | 1256 | ||
| 1255 | 1257 | ||
| 1256 | - //再返回的时候，prom_id要以f_prom_act为准 | ||
| 1257 | - var c_prom_id=ee.data.data.prom_id; | ||
| 1258 | - if(ee.data.f_prom_act) c_prom_id=ee.data.f_prom_act.id; | 1258 | + //再返回的时候，prom_id要以f_prom_act为准 |
| 1259 | + var c_prom_id=ee.data.data.prom_id; | ||
| 1260 | + if(ee.data.f_prom_act) c_prom_id=ee.data.f_prom_act.id; | ||
| 1259 | 1261 | ||
| 1260 | - //-- 增加相同的活动 -- | ||
| 1261 | - ee.check_prom(gid, ee.data.data.prom_type, c_prom_id); | 1262 | + //-- 增加相同的活动 -- |
| 1263 | + ee.check_prom(gid, ee.data.data.prom_type, c_prom_id); | ||
| 1262 | 1264 | ||
| 1263 | - var th = ee; | ||
| 1264 | - if (ee.data.cat_name == '') { | ||
| 1265 | - //过去国别，分类，品牌的名称 | ||
| 1266 | - i.get("/api/weshop/goodscategory/get/" + o.stoid + "/" + th.data.data.cat_id, { | ||
| 1267 | - success: function (t) { | ||
| 1268 | - var dd = t.data.data; | ||
| 1269 | - if (t.data.code == 0) { | ||
| 1270 | - th.setData({ | ||
| 1271 | - cat_name: dd.name | ||
| 1272 | - }); | 1265 | + var th = ee; |
| 1266 | + if (ee.data.cat_name == '') { | ||
| 1267 | + //过去国别，分类，品牌的名称 | ||
| 1268 | + i.get("/api/weshop/goodscategory/get/" + o.stoid + "/" + th.data.data.cat_id, { | ||
| 1269 | + success: function (t) { | ||
| 1270 | + var dd = t.data.data; | ||
| 1271 | + if (t.data.code == 0) { | ||
| 1272 | + th.setData({ | ||
| 1273 | + cat_name: dd.name | ||
| 1274 | + }); | ||
| 1275 | + } | ||
| 1273 | } | 1276 | } |
| 1274 | - } | ||
| 1275 | - }); | ||
| 1276 | - //过去国别，分类，品牌的名称 | ||
| 1277 | - i.get("/api/weshop/brand/get/" + o.stoid + "/" + th.data.data.brand_id, { | ||
| 1278 | - success: function (t) { | ||
| 1279 | - var dd = t.data.data; | ||
| 1280 | - if (t.data.code == 0) { | ||
| 1281 | - th.setData({ | ||
| 1282 | - brand_name: dd.name | ||
| 1283 | - }); | 1277 | + }); |
| 1278 | + //过去国别，分类，品牌的名称 | ||
| 1279 | + i.get("/api/weshop/brand/get/" + o.stoid + "/" + th.data.data.brand_id, { | ||
| 1280 | + success: function (t) { | ||
| 1281 | + var dd = t.data.data; | ||
| 1282 | + if (t.data.code == 0) { | ||
| 1283 | + th.setData({ | ||
| 1284 | + brand_name: dd.name | ||
| 1285 | + }); | ||
| 1286 | + } | ||
| 1284 | } | 1287 | } |
| 1285 | - } | ||
| 1286 | - }); | ||
| 1287 | - //过去国别，分类，品牌的名称 | ||
| 1288 | - i.get("/api/weshop/nation/get/" + o.stoid + "/" + th.data.data.nation_id, { | ||
| 1289 | - success: function (t) { | ||
| 1290 | - var dd = t.data.data; | ||
| 1291 | - if (t.data.code == 0) { | ||
| 1292 | - th.setData({ | ||
| 1293 | - nation_name: dd.name | ||
| 1294 | - }); | 1288 | + }); |
| 1289 | + //过去国别，分类，品牌的名称 | ||
| 1290 | + i.get("/api/weshop/nation/get/" + o.stoid + "/" + th.data.data.nation_id, { | ||
| 1291 | + success: function (t) { | ||
| 1292 | + var dd = t.data.data; | ||
| 1293 | + if (t.data.code == 0) { | ||
| 1294 | + th.setData({ | ||
| 1295 | + nation_name: dd.name | ||
| 1296 | + }); | ||
| 1297 | + } | ||
| 1295 | } | 1298 | } |
| 1299 | + }); | ||
| 1300 | + } | ||
| 1301 | + | ||
| 1302 | + } else { | ||
| 1303 | + wx.showModal({ | ||
| 1304 | + title: t.data.msg, | ||
| 1305 | + showCancel: !1, | ||
| 1306 | + complete: function () { | ||
| 1307 | + wx.navigateBack(); | ||
| 1296 | } | 1308 | } |
| 1297 | }); | 1309 | }); |
| 1298 | } | 1310 | } |
| 1299 | 1311 | ||
| 1300 | - } else { | ||
| 1301 | - wx.showModal({ | ||
| 1302 | - title: t.data.msg, | ||
| 1303 | - showCancel: !1, | ||
| 1304 | - complete: function () { | ||
| 1305 | - wx.navigateBack(); | ||
| 1306 | - } | ||
| 1307 | - }); | ||
| 1308 | - } | ||
| 1309 | - | ||
| 1310 | - console.log('bbbbbbbbbbbbbb'); | ||
| 1311 | - console.log(th.data.prom_type); | 1312 | + console.log('bbbbbbbbbbbbbb'); |
| 1313 | + console.log(th.data.prom_type); | ||
| 1312 | 1314 | ||
| 1313 | 1315 | ||
| 1314 | - setTimeout(() => { | ||
| 1315 | - console.log('cccc'); | ||
| 1316 | - console.log(th.data.prom_type); | ||
| 1317 | - console.log(th.data.sele_g); | 1316 | + setTimeout(() => { |
| 1317 | + console.log('cccc'); | ||
| 1318 | + console.log(th.data.prom_type); | ||
| 1319 | + console.log(th.data.sele_g); | ||
| 1318 | 1320 | ||
| 1319 | - }, 1500) | 1321 | + }, 1500) |
| 1320 | 1322 | ||
| 1321 | 1323 | ||
| 1322 | 1324 | ||
| 1323 | - } | ||
| 1324 | - }); | ||
| 1325 | - }) | 1325 | + } |
| 1326 | + }); | ||
| 1327 | + }) | ||
| 1328 | + },1500) | ||
| 1326 | 1329 | ||
| 1327 | console.log('aaaaaaaaaa'); | 1330 | console.log('aaaaaaaaaa'); |
| 1328 | console.log(this.data.prom_type); | 1331 | console.log(this.data.prom_type); |
| @@ -5433,7 +5436,8 @@ Page({ | @@ -5433,7 +5436,8 @@ Page({ | ||
| 5433 | data: { | 5436 | data: { |
| 5434 | store_id: os.stoid, | 5437 | store_id: os.stoid, |
| 5435 | user_id: user_id, | 5438 | user_id: user_id, |
| 5436 | - goods_id: gd.goods_id, isnew:1 | 5439 | + goods_id: gd.goods_id, isnew:1, |
| 5440 | + timetype:gd.viplimited_timetype | ||
| 5437 | }, | 5441 | }, |
| 5438 | success: function (t) { | 5442 | success: function (t) { |
| 5439 | if (t.data.code == 0) { | 5443 | if (t.data.code == 0) { |
| @@ -5461,7 +5465,8 @@ Page({ | @@ -5461,7 +5465,8 @@ Page({ | ||
| 5461 | user_id: user_id, | 5465 | user_id: user_id, |
| 5462 | goods_id: gd.goods_id, | 5466 | goods_id: gd.goods_id, |
| 5463 | prom_type: gd.prom_type, | 5467 | prom_type: gd.prom_type, |
| 5464 | - prom_id: gd.prom_id, isnew:1 | 5468 | + prom_id: gd.prom_id, isnew:1, |
| 5469 | + timetype:gd.viplimited_timetype | ||
| 5465 | }, | 5470 | }, |
| 5466 | //-----获取----- | 5471 | //-----获取----- |
| 5467 | success: function (tt) { | 5472 | success: function (tt) { |
| @@ -8334,8 +8339,9 @@ Page({ | @@ -8334,8 +8339,9 @@ Page({ | ||
| 8334 | user_id: user_id, | 8339 | user_id: user_id, |
| 8335 | goods_id: gid, | 8340 | goods_id: gid, |
| 8336 | prom_type: 3, | 8341 | prom_type: 3, |
| 8337 | - prom_id: fir_act.prom_id, isnew:1 | 8342 | + prom_id: fir_act.prom_id, isnew:1, |
| 8338 | }; | 8343 | }; |
| 8344 | + | ||
| 8339 | var gd_limit_rs=await getApp().promiseGet('/api/weshop/ordergoods/getUserBuyGoodsNum',{data:lrs}); | 8345 | var gd_limit_rs=await getApp().promiseGet('/api/weshop/ordergoods/getUserBuyGoodsNum',{data:lrs}); |
| 8340 | var pro_by_num=0; | 8346 | var pro_by_num=0; |
| 8341 | if(gd_limit_rs && gd_limit_rs.data.code==0){ | 8347 | if(gd_limit_rs && gd_limit_rs.data.code==0){ |
| @@ -9025,6 +9031,10 @@ Page({ | @@ -9025,6 +9031,10 @@ Page({ | ||
| 9025 | con_weixin: function () { | 9031 | con_weixin: function () { |
| 9026 | getApp().con_wx(this); | 9032 | getApp().con_wx(this); |
| 9027 | }, | 9033 | }, |
| 9034 | + customer_chat: function () { | ||
| 9035 | + var goods_id=this.data.front_g.goods_id; | ||
| 9036 | + getApp().customer_chat(goods_id); | ||
| 9037 | + }, | ||
| 9028 | 9038 | ||
| 9029 | get_normal(gid) { | 9039 | get_normal(gid) { |
| 9030 | 9040 | ||
| @@ -9093,6 +9103,9 @@ Page({ | @@ -9093,6 +9103,9 @@ Page({ | ||
| 9093 | }) | 9103 | }) |
| 9094 | }, | 9104 | }, |
| 9095 | 9105 | ||
| 9106 | + | ||
| 9107 | + | ||
| 9108 | + | ||
| 9096 | //-- 检验商品的活动情况 -- | 9109 | //-- 检验商品的活动情况 -- |
| 9097 | check_gd_prom_new: async function (func) { | 9110 | check_gd_prom_new: async function (func) { |
| 9098 | 9111 | ||
| @@ -9286,6 +9299,7 @@ Page({ | @@ -9286,6 +9299,7 @@ Page({ | ||
| 9286 | // 0关闭（如果有设置热线电话，则显示拨打热线电话）、 | 9299 | // 0关闭（如果有设置热线电话，则显示拨打热线电话）、 |
| 9287 | // 1小程序客服、 | 9300 | // 1小程序客服、 |
| 9288 | // 2企业微信客服 | 9301 | // 2企业微信客服 |
| 9302 | + // 3商城聊天系统 | ||
| 9289 | if (this.data.sys_switch) { | 9303 | if (this.data.sys_switch) { |
| 9290 | let csType = this.data.sys_switch.weapp_customertype; | 9304 | let csType = this.data.sys_switch.weapp_customertype; |
| 9291 | if (csType == 0) { | 9305 | if (csType == 0) { |