wxd / MShopWeApp

Commit 738803157570391e9bce6a7f5d22983bca691222

Authored by season
2 parents 7aac5acd 1df16535

Merge branch 'qa' of http://git.vipzhuang.cn/wxd/MShopWeApp

Inline Side-by-side
Showing 5 changed files with 450 additions and 235 deletions
components/privacy_pop/privacy_pop.js
  View file @7388031
... ... @@ -17,22 +17,24 @@ Component({
17 17 methods: {
18 18 //判断用户有没有同意安全隐私
19 19 check_pri_show(){
20   - wx.getPrivacySetting({
21   - success: res => {
22   - console.log(res) // 返回结果为: res = { needAuthorization: true/false, privacyContractName: '《xxx隐私保护指引》' }
23   - if (res.needAuthorization) {
24   - // 需要弹出隐私协议
25   - this.setData({
26   - show_pri: 1
27   - })
28   - }else{
29   - this.setData({
30   - show_pri: 0
31   - })
32   - this.triggerEvent('agree_pri');// 调用同意的函数
33   - }
34   - }
35   - })
  20 + if(wx.getPrivacySetting){
  21 + wx.getPrivacySetting({
  22 + success: res => {
  23 + console.log(res) // 返回结果为: res = { needAuthorization: true/false, privacyContractName: '《xxx隐私保护指引》' }
  24 + if (res.needAuthorization) {
  25 + // 需要弹出隐私协议
  26 + this.setData({
  27 + show_pri: 1
  28 + })
  29 + }else{
  30 + this.setData({
  31 + show_pri: 0
  32 + })
  33 + this.triggerEvent('agree_pri');// 调用同意的函数
  34 + }
  35 + }
  36 + })
  37 + }
36 38 },
37 39 //--- 分享 ---
38 40 goto:function (e) {
... ...
components/store_popup/store_popup.js
  View file @7388031
... ... @@ -129,6 +129,7 @@ Component({
129 129 getApp().get_user_store(function (e) {
130 130 if (!e) {
131 131 th.data.fir_def_store = {}; //赋值空对象
  132 + if (func) func();
132 133 return false;
133 134 }
134 135  
... ...
packageE/pages/cart/cart2/cart2.js
  View file @7388031
... ... @@ -1026,6 +1026,7 @@ Page({
1026 1026 //-----------循环查找门店-------------
1027 1027 if (arr.length > 0) {
1028 1028 for (var j = 0; j < arr.length; j++) {
  1029 +
1029 1030 if (arr[j].pickup_id == pcid) {
1030 1031 if (item.is_gift != 1) {
1031 1032 //确定配送方式
... ... @@ -1044,15 +1045,22 @@ Page({
1044 1045 }
1045 1046 switch (dis_t) {
1046 1047 case 0:
1047   - e_t = 1;
1048   - //-- 系统后台有设置要默认的 --
1049   - if (th.data.json_d.pickupway && th.data.json_d.pickupway == 1) e_t = 0;
  1048 + if(!arr[j].exp_sure){
  1049 + e_t = 1;
  1050 + //-- 系统后台有设置要默认的 --
  1051 + if (th.data.json_d.pickupway && th.data.json_d.pickupway == 1) e_t = 0;
  1052 + arr[j].exp_type=e_t
  1053 + }
1050 1054 break;
1051 1055 case 1:
1052 1056 e_t = 1;
  1057 + arr[j].exp_sure=1
  1058 + arr[j].exp_type=1
1053 1059 break;
1054 1060 case 2:
1055 1061 e_t = 0;
  1062 + arr[j].exp_sure=1
  1063 + arr[j].exp_type=0
1056 1064 break;
1057 1065 }
1058 1066 //如果是物流的话，全部自提的控制要弄成0
... ... @@ -1115,6 +1123,9 @@ Page({
1115 1123 } else {
1116 1124 dis_t = item.distr_type;
1117 1125 }
  1126 +
  1127 + let exp_sure=0;
  1128 +
1118 1129 switch (dis_t) {
1119 1130 case 0:
1120 1131 e_t = 1;
... ... @@ -1123,9 +1134,11 @@ Page({
1123 1134 break;
1124 1135 case 1:
1125 1136 e_t = 1;
  1137 + exp_sure=1;
1126 1138 break;
1127 1139 case 2:
1128 1140 e_t = 0;
  1141 + exp_sure=1;
1129 1142 break;
1130 1143 }
1131 1144 //如果是物流的话，全部自提的控制要弄成0
... ... @@ -1147,7 +1160,7 @@ Page({
1147 1160 }
1148 1161  
1149 1162  
1150   - if (back_data && parseFloat(back_data)) {
  1163 + if (back_data && parseFloat(back_data)) {
1151 1164 c_item.can_usecommise = parseFloat(parseFloat(back_data).toFixed(2));
1152 1165 cart_commission += c_item.can_usecommise;
1153 1166 }
... ... @@ -1166,7 +1179,8 @@ Page({
1166 1179 total_amount: 0,
1167 1180 order_amount: 0,
1168 1181 user_note: "",
1169   - sto: sto
  1182 + sto: sto,
  1183 + exp_sure:1
1170 1184 };
1171 1185  
1172 1186 //-- 把等级卡会优惠多少钱装进去 --
... ... @@ -1209,199 +1223,197 @@ Page({
1209 1223 //-- 循环计算一下线下取价 --
1210 1224 for (var k = 0; k < arr.length; k++) {
1211 1225 var c_item = arr[k];
1212   - if(!is_change){
  1226 + if (!is_change) {
1213 1227 //-- 要进行归类一下活动 --
1214   - await m_cx.cart_cx_group(th,arr[k].goods,c_item,0,0,(show_can_cx)=>{
  1228 + await m_cx.cart_cx_group(th, arr[k].goods, c_item, 0, 0, (show_can_cx) => {
1215 1229  
1216   - arr[k].show_can_cx=show_can_cx;
  1230 + arr[k].show_can_cx = show_can_cx;
1217 1231 })
1218   - }else{
1219   - var show_can_cx=this.data.cartlist[k].show_can_cx;
1220   - //-- 多促销活动的优化 --
1221   - if(show_can_cx){
1222   - arr[k].show_can_cx=show_can_cx;
1223   - }
  1232 + } else {
  1233 + var show_can_cx = this.data.cartlist[k].show_can_cx;
  1234 + //-- 多促销活动的优化 --
  1235 + if (show_can_cx) {
  1236 + arr[k].show_can_cx = show_can_cx;
  1237 + }
1224 1238 }
1225 1239  
1226 1240 //要在多活动确定之后，在来计算
1227   - for(var jh=0;jh<arr[k].goods.length;jh++){
1228   - var item1=arr[k].goods[jh]
1229   - //要把优惠活动加入,prom_goods_map中,赠品不要运算，代发商品不算优惠
1230   - if (item1.prom_type == 3 && item1.is_gift != 1 && !item1.whsle_id) {
1231   - // th.check_is_youhui(item1.goods_id, item1.pick_id);
1232   - //增加优惠活动次数限制
1233   - let limit_num= await th.getprom(item1) //活动限制次数
1234   -
1235   - if(!limit_num){
  1241 + for (var jh = 0; jh < arr[k].goods.length; jh++) {
  1242 + var item1 = arr[k].goods[jh]
  1243 + //要把优惠活动加入,prom_goods_map中,赠品不要运算，代发商品不算优惠
  1244 + if (item1.prom_type == 3 && item1.is_gift != 1 && !item1.whsle_id) {
  1245 + // th.check_is_youhui(item1.goods_id, item1.pick_id);
  1246 + //增加优惠活动次数限制
  1247 + let limit_num = await th.getprom(item1) //活动限制次数
  1248 +
  1249 + if (!limit_num) {
  1250 + await th.add_prom_goods_map(item1);
  1251 + // item1.prom_id=''
  1252 + // item1.prom_type=''
  1253 + } else {
  1254 + let user_pre_buynum = await th.getUserBuyPromNum_pre(item1.prom_id) //用户已经参与次数
  1255 + if (user_pre_buynum < limit_num) {
1236 1256 await th.add_prom_goods_map(item1);
1237   - // item1.prom_id=''
1238   - // item1.prom_type=''
1239   - }else{
1240   - let user_pre_buynum = await th.getUserBuyPromNum_pre(item1.prom_id) //用户已经参与次数
1241   - if(user_pre_buynum<limit_num){
1242   - await th.add_prom_goods_map(item1);
1243   - }else{
1244   - // await th.add_prom_goods_map(item1);
1245   - item1.prom_id=''
1246   - item1.prom_type=''
1247   - }
  1257 + } else {
  1258 + // await th.add_prom_goods_map(item1);
  1259 + item1.prom_id = ''
  1260 + item1.prom_type = ''
1248 1261 }
1249 1262 }
1250   - //-- 如果组合购的总数量不足的处理 --
1251   - // if(no_zh_num[item1.prom_id] && item1.prom_type == 7){
1252   - // item1.prom_type = 0;
1253   - // item1.prom_type1 = 0;
1254   - // item1.prom_id = 0;
1255   - // item1.prom_id1 = 0
1256   - // }
1257   -
1258   - //要把组合购的东西拿出来算一下,同时组合购的总数量要有存在
1259   - if (item1.prom_type == 7) {
1260   - if (!th.data.zuhe_map_good[item1.prom_id]) {
1261   - var isok = 1;
1262   - var is_flag = 1;
1263   - var store_count_ok=1;
1264   - //如果有组合购
1265   - var url = "/api/weshop/prom/zhbuy/get/" + os.stoid + "/" + item1.prom_id + '/' + getApp().globalData.userInfo.user_id;
1266   - await getApp().request.promiseGet(url, {}).then(res => {
1267   - if (res.data.code == 0 && res.data.data) {
1268   - //如果活动已经结束
1269   - if (res.data.data.is_end == 1) {
1270   - isok = 0;
1271   - }
1272   - if (ut.gettimestamp() > res.data.data.end_time) {
1273   - isok = 0;
1274   - }
1275   - item1.act = res.data.data;
1276   -
1277   - //-- 在这里要判断一下活动的组合购总数量 --
1278   - if(item1.act.zh_num>0 && item1.act.zh_buy_num>=item1.act.zh_num){
1279   - store_count_ok = 0;
1280   - no_zh_num[item1.prom_id]=1;
1281   - //-- 清理一下活动的状态 --
1282   - // item1.prom_type = 0;
1283   - // item1.prom_type1 = 0;
1284   - // item1.prom_id = 0;
1285   - // item1.prom_id1 = 0
1286   -
1287   - }else{
1288   - th.data.zhhe_act_map[item1.prom_id] = res.data.data;
1289   - }
  1263 + }
  1264 + //-- 如果组合购的总数量不足的处理 --
  1265 + // if(no_zh_num[item1.prom_id] && item1.prom_type == 7){
  1266 + // item1.prom_type = 0;
  1267 + // item1.prom_type1 = 0;
  1268 + // item1.prom_id = 0;
  1269 + // item1.prom_id1 = 0
  1270 + // }
1290 1271  
1291   - } else {
1292   - //未找到商品的活动
1293   - is_flag = 0;
  1272 + //要把组合购的东西拿出来算一下,同时组合购的总数量要有存在
  1273 + if (item1.prom_type == 7) {
  1274 + if (!th.data.zuhe_map_good[item1.prom_id]) {
  1275 + var isok = 1;
  1276 + var is_flag = 1;
  1277 + var store_count_ok = 1;
  1278 + //如果有组合购
  1279 + var url = "/api/weshop/prom/zhbuy/get/" + os.stoid + "/" + item1.prom_id + '/' + getApp().globalData.userInfo.user_id;
  1280 + await getApp().request.promiseGet(url, {}).then(res => {
  1281 + if (res.data.code == 0 && res.data.data) {
  1282 + //如果活动已经结束
  1283 + if (res.data.data.is_end == 1) {
  1284 + isok = 0;
1294 1285 }
1295   - })
1296   -
1297   - if (!isok) {
1298   - getApp().my_warnning("组合购的活动已经过期", 0, th);
1299   - return false;
1300   - }
1301   -
1302   - //------ 先增组合活动的总数量的时候 -------
1303   - if(store_count_ok) {
1304   - var url1 = "/api/weshop/prom/zhbuyGoods/page";
1305   - var req_data = {
1306   - page: 1,
1307   - pageSize: 2000,
1308   - store_id: os.stoid,
1309   - zh_id: item1.prom_id,
  1286 + if (ut.gettimestamp() > res.data.data.end_time) {
  1287 + isok = 0;
1310 1288 }
1311   - await getApp().request.promiseGet(url1, {
1312   - data: req_data
1313   - }).then(res => {
1314   - if (ut.ajax_ok(res)) {
1315   - var gdlist = res.data.data.pageData;
1316   - gdlist.forEach(i => {
1317   - if (item1.goods_id == i.goods_id && !is_flag) {
1318   - item1.prom_type = 0;
1319   - item1.prom_type1 = 0;
1320   - item1.prom_id = 0;
1321   - item1.prom_id1 = 0
1322   - }
1323   - })
1324   - th.data.zuhe_map_good[item1.prom_id] = gdlist;
1325   - }
1326   - })
1327   - }
1328   -
1329   -
1330   -
1331   - }
1332   - else {
1333   - item1.act = th.data.zhhe_act_map[item1.prom_id];
1334   - }
1335   - }
1336   - if (item1.prom_type == 10) {
1337   - if (!th.data.ladder_map[item1.prom_id]) {
1338   - //如果有预售
1339   - var isok = 1;
1340   - var is_flag = 1;
1341   - var act = null;
1342   - var url = "/api/weshop/prom/ladderForm/get/" + os.stoid + "/" + item1.prom_id;
1343   - await getApp().request.promiseGet(url, {}).then(res => {
1344   - console.log(res, 1000);
1345   - if (res.data.code == 0 && res.data.data) {
1346   - if (res.data.data.isuse != 1) {
1347   - isok = 0;
1348   - }
1349   - //如果活动已经结束
1350   - if (res.data.data.is_end == 1) {
1351   - isok = 0;
1352   - }
1353   - //已经结束
1354   - if (ut.gettimestamp() > res.data.data.end_time) {
1355   - isok = 0;
1356   - }
1357   - //还未开始
1358   - if (ut.gettimestamp() < res.data.data.start_time) {
1359   - isok = 0;
1360   - }
1361   - act = res.data.data;
  1289 + item1.act = res.data.data;
  1290 +
  1291 + //-- 在这里要判断一下活动的组合购总数量 --
  1292 + if (item1.act.zh_num > 0 && item1.act.zh_buy_num >= item1.act.zh_num) {
  1293 + store_count_ok = 0;
  1294 + no_zh_num[item1.prom_id] = 1;
  1295 + //-- 清理一下活动的状态 --
  1296 + // item1.prom_type = 0;
  1297 + // item1.prom_type1 = 0;
  1298 + // item1.prom_id = 0;
  1299 + // item1.prom_id1 = 0
1362 1300  
1363 1301 } else {
1364   - //未找到商品的活动
1365   - is_flag = 0;
  1302 + th.data.zhhe_act_map[item1.prom_id] = res.data.data;
1366 1303 }
1367   - })
1368   - if (!isok) {
1369   - var url = '/api/weshop/cart/del/' + oo.stoid + '/' + item1.id;
1370   - getApp().request.delete(url, {});
1371   - th.data.ladder_map[item1.prom_id] = -1;
1372   - continue;
  1304 +
  1305 + } else {
  1306 + //未找到商品的活动
  1307 + is_flag = 0;
1373 1308 }
1374   - th.data.ladder_map[item1.prom_id] = act;
  1309 + })
  1310 +
  1311 + if (!isok) {
  1312 + getApp().my_warnning("组合购的活动已经过期", 0, th);
  1313 + return false;
  1314 + }
1375 1315  
1376   - //-- 获取阶梯规则 --
1377   - var url1 = "/api/weshop/prom/ladderList/list";
  1316 + //------ 先增组合活动的总数量的时候 -------
  1317 + if (store_count_ok) {
  1318 + var url1 = "/api/weshop/prom/zhbuyGoods/page";
1378 1319 var req_data = {
  1320 + page: 1,
  1321 + pageSize: 2000,
1379 1322 store_id: os.stoid,
1380   - form_id: item1.prom_id,
  1323 + zh_id: item1.prom_id,
1381 1324 }
1382 1325 await getApp().request.promiseGet(url1, {
1383 1326 data: req_data
1384   - }).then(rs1 => {
1385   - if (rs1.data.code == 0 && rs1.data.data) {
1386   - var gdlist = rs1.data.data;
1387   - th.data.ladder_map[item1.prom_id].ladder_list = gdlist;
  1327 + }).then(res => {
  1328 + if (ut.ajax_ok(res)) {
  1329 + var gdlist = res.data.data.pageData;
  1330 + gdlist.forEach(i => {
  1331 + if (item1.goods_id == i.goods_id && !is_flag) {
  1332 + item1.prom_type = 0;
  1333 + item1.prom_type1 = 0;
  1334 + item1.prom_id = 0;
  1335 + item1.prom_id1 = 0
  1336 + }
  1337 + })
  1338 + th.data.zuhe_map_good[item1.prom_id] = gdlist;
1388 1339 }
1389 1340 })
1390 1341 }
1391   - }
1392 1342  
1393   - //-- 判断一下，获取搭配购的消息,只有prom_type==5才会判断优惠活动 --
1394   - if ( item1.prom_type == 5 && (!item1.collocationList || !item1.collocationList.length)) {
1395   - await th.set_collection(item1, arr[k].goods, jh);
  1343 +
  1344 + } else {
  1345 + item1.act = th.data.zhhe_act_map[item1.prom_id];
1396 1346 }
  1347 + }
  1348 + if (item1.prom_type == 10) {
  1349 + if (!th.data.ladder_map[item1.prom_id]) {
  1350 + //如果有预售
  1351 + var isok = 1;
  1352 + var is_flag = 1;
  1353 + var act = null;
  1354 + var url = "/api/weshop/prom/ladderForm/get/" + os.stoid + "/" + item1.prom_id;
  1355 + await getApp().request.promiseGet(url, {}).then(res => {
  1356 + console.log(res, 1000);
  1357 + if (res.data.code == 0 && res.data.data) {
  1358 + if (res.data.data.isuse != 1) {
  1359 + isok = 0;
  1360 + }
  1361 + //如果活动已经结束
  1362 + if (res.data.data.is_end == 1) {
  1363 + isok = 0;
  1364 + }
  1365 + //已经结束
  1366 + if (ut.gettimestamp() > res.data.data.end_time) {
  1367 + isok = 0;
  1368 + }
  1369 + //还未开始
  1370 + if (ut.gettimestamp() < res.data.data.start_time) {
  1371 + isok = 0;
  1372 + }
  1373 + act = res.data.data;
1397 1374  
1398   - if (item1.collocationList) {
1399   - if (!arr[k].collocationList) arr[k].collocationList = item1.collocationList;
1400   - else {
1401   - var arr_new = [...arr[k].collocationList, ...item1.collocationList];
1402   - arr[k].collocationList = arr_new;
  1375 + } else {
  1376 + //未找到商品的活动
  1377 + is_flag = 0;
  1378 + }
  1379 + })
  1380 + if (!isok) {
  1381 + var url = '/api/weshop/cart/del/' + oo.stoid + '/' + item1.id;
  1382 + getApp().request.delete(url, {});
  1383 + th.data.ladder_map[item1.prom_id] = -1;
  1384 + continue;
  1385 + }
  1386 + th.data.ladder_map[item1.prom_id] = act;
  1387 +
  1388 + //-- 获取阶梯规则 --
  1389 + var url1 = "/api/weshop/prom/ladderList/list";
  1390 + var req_data = {
  1391 + store_id: os.stoid,
  1392 + form_id: item1.prom_id,
1403 1393 }
  1394 + await getApp().request.promiseGet(url1, {
  1395 + data: req_data
  1396 + }).then(rs1 => {
  1397 + if (rs1.data.code == 0 && rs1.data.data) {
  1398 + var gdlist = rs1.data.data;
  1399 + th.data.ladder_map[item1.prom_id].ladder_list = gdlist;
  1400 + }
  1401 + })
  1402 + }
  1403 + }
  1404 +
  1405 + //-- 判断一下，获取搭配购的消息,只有prom_type==5才会判断优惠活动 --
  1406 + if (item1.prom_type == 5 && (!item1.collocationList || !item1.collocationList.length)) {
  1407 + await th.set_collection(item1, arr[k].goods, jh);
  1408 + }
  1409 +
  1410 + if (item1.collocationList) {
  1411 + if (!arr[k].collocationList) arr[k].collocationList = item1.collocationList;
  1412 + else {
  1413 + var arr_new = [...arr[k].collocationList, ...item1.collocationList];
  1414 + arr[k].collocationList = arr_new;
1404 1415 }
  1416 + }
1405 1417  
1406 1418 }
1407 1419  
... ... @@ -1412,25 +1424,32 @@ Page({
1412 1424 //计算佣金的商品
1413 1425 var commission_gds = [];
1414 1426 for (var c = 0; c < item.length; c++) {
1415   - if (!item[c].is_gift) {
1416   - var hr = {
1417   - goods_id: item[c].goods_id,
1418   - goods_num: item[c].goods_num,
1419   - prom_type: item[c].prom_type,
1420   - prom_id: item[c].prom_id,
1421 1427  
1422   - }
1423   - let req_d1 = {
1424   - user_id: getApp().globalData.user_id, goods_ids: [hr], store_id: os.stoid
1425   - }
  1428 + //-- 有开启佣金抵扣的时候 --
  1429 + if (getApp().globalData.userInfo.is_distribut
  1430 + && th.data.dis_config && th.data.dis_config.is_yongjin_dk) {
1426 1431  
1427   - await getApp().request.promisePost("/api/weshop/order/getrebateSum", {
1428   - is_json: 1, data: req_d1
1429   - }).then(grs => {
1430   - if (grs.data.code == 0) item[c].use_commission = grs.data.data;
1431   - });
1432   - commission_gds.push(hr);
  1432 + if (!item[c].is_gift) {
  1433 + var hr = {
  1434 + goods_id: item[c].goods_id,
  1435 + goods_num: item[c].goods_num,
  1436 + prom_type: item[c].prom_type,
  1437 + prom_id: item[c].prom_id,
  1438 +
  1439 + }
  1440 + let req_d1 = {
  1441 + user_id: getApp().globalData.user_id, goods_ids: [hr], store_id: os.stoid
  1442 + }
  1443 +
  1444 + await getApp().request.promisePost("/api/weshop/order/getrebateSum", {
  1445 + is_json: 1, data: req_d1
  1446 + }).then(grs => {
  1447 + if (grs.data.code == 0) item[c].use_commission = grs.data.data;
  1448 + });
  1449 + commission_gds.push(hr);
  1450 + }
1433 1451 }
  1452 +
1434 1453 if (th.data.sales_rules != 2) {
1435 1454 item[c].offline_price = 0;
1436 1455 }
... ... @@ -1446,22 +1465,24 @@ Page({
1446 1465 c_item.is_offline = 1;
1447 1466 }
1448 1467  
1449   - //获取购物车的佣金,此处要优化调用接口，获取佣金
1450   - var req_d = {
1451   - user_id: getApp().globalData.user_id, goods_ids: commission_gds, store_id: os.stoid
1452   - }
1453   - var back_data = null;
1454   - await getApp().request.promisePost("/api/weshop/order/getrebateSum", {
1455   - is_json: 1, data: req_d
1456   - }).then(rs => {
1457   - if (rs.data.code == 0) back_data = rs.data.data;
1458   - });
  1468 + //-- 如果有佣金抵扣的时候 --
  1469 + if (commission_gds.length) {
  1470 + //获取购物车的佣金,此处要优化调用接口，获取佣金
  1471 + var req_d = {
  1472 + user_id: getApp().globalData.user_id, goods_ids: commission_gds, store_id: os.stoid
  1473 + }
  1474 + var back_data = null;
  1475 + await getApp().request.promisePost("/api/weshop/order/getrebateSum", {
  1476 + is_json: 1, data: req_d
  1477 + }).then(rs => {
  1478 + if (rs.data.code == 0) back_data = rs.data.data;
  1479 + });
1459 1480  
1460   - if (back_data && parseFloat(back_data)) {
1461   - c_item.can_usecommise = parseFloat(back_data);
1462   - cart_commission += c_item.can_usecommise;
  1481 + if (back_data && parseFloat(back_data)) {
  1482 + c_item.can_usecommise = parseFloat(back_data);
  1483 + cart_commission += c_item.can_usecommise;
  1484 + }
1463 1485 }
1464   -
1465 1486 }
1466 1487  
1467 1488 if (cart_commission) {
... ...
pages/cart/cart/cart.js
  View file @7388031
... ... @@ -552,23 +552,41 @@ Page({
552 552  
553 553 var by_map = null;
554 554  
555   - //--要获得商品，该用户买了多少件,同步应用--
556   - await getApp().request.promiseGet("/api/weshop/ordergoods/listUserBuyGoodsNum", {
557   - data: {
558   - store_id: oo.stoid,
559   - user_id: user_id,
560   - goods_ids: g_arr.join(','),
  555 + // //--要获得商品，该用户买了多少件,同步应用--
  556 + // await getApp().request.promiseGet("/api/weshop/ordergoods/listUserBuyGoodsNum", {
  557 + // data: {
  558 + // store_id: oo.stoid,
  559 + // user_id: user_id,
  560 + // goods_ids: g_arr.join(','),
  561 + //
  562 + // },
  563 + // }).then(res => {
  564 + // if (ut.ajax_ok2(res)) {
  565 + // by_map = {};
  566 + // for (let i in res.data.data) {
  567 + // let item = res.data.data[i];
  568 + // by_map[item.goods_id] = item;
  569 + // }
  570 + // }
  571 + // })
  572 +
  573 + for (let ir = 0; ir < g_arr.length; ir++) {
  574 + let gg_it=g_arr[ir];
  575 + await getApp().request.promiseGet("/api/weshop/ordergoods/getUserBuyGoodsNum", {
  576 + data: {
  577 + store_id: oo.stoid,
  578 + user_id: user_id,
  579 + goods_id: gg_it,
  580 + isnew:1
  581 + },
  582 + }).then(tt => {
  583 + if (tt.data.code == 0) {
  584 + if(!by_map) by_map={};
  585 + by_map[gg_it] = tt.data.data;
  586 + }
  587 + })
  588 + }
561 589  
562   - },
563   - }).then(res => {
564   - if (ut.ajax_ok2(res)) {
565   - by_map = {};
566   - for (let i in res.data.data) {
567   - let item = res.data.data[i];
568   - by_map[item.goods_id] = item;
569   - }
570   - }
571   - })
572 590  
573 591 for (var i = 0; i < carr.length; i++) {
574 592 var item = carr[i];
... ... @@ -1464,6 +1482,50 @@ Page({
1464 1482 t_num = 0,
1465 1483 text_arr = "";
1466 1484  
  1485 +
  1486 + if(this.data.is_edit){
  1487 + let val=!e.data.checkAllToggle;
  1488 + if (dda && dda.length > 0) {
  1489 + for (var i = 0; i < dda.length; i++) {
  1490 + var item = dda[i].goods;
  1491 +
  1492 + var txt0 = "requestData[" + i + "].selected";
  1493 + this.setData({
  1494 + [txt0]: val,
  1495 + });
  1496 +
  1497 + for (var j = 0; j < item.length; j++) {
  1498 + let txt = "requestData[" + i + "].goods[" + j + "].selected";
  1499 + e.setData({
  1500 + [txt]: val,
  1501 + });
  1502 + }
  1503 + }
  1504 + }
  1505 + if (sdda && sdda.length > 0) {
  1506 + for (i = 0; i < sdda.length; i++) {
  1507 + var item1 = sdda[i].goods;
  1508 +
  1509 + var txt00 = "service_data[" + i + "].selected";
  1510 + this.setData({
  1511 + [txt00]: val,
  1512 + });
  1513 +
  1514 + for (j = 0; j < item1.length; j++) {
  1515 + let txt1 = "service_data[" + i + "].goods[" + j + "].selected";
  1516 + e.setData({
  1517 + [txt1]: val,
  1518 + });
  1519 + }
  1520 + }
  1521 + }
  1522 +
  1523 + e.setData({
  1524 + checkAllToggle: val,
  1525 + })
  1526 + return false;
  1527 + }
  1528 +
1467 1529 if (e.data.requestData && e.data.requestData.length > 0 &&
1468 1530 e.data.service_data && e.data.service_data.length > 0) {
1469 1531 wx.showModal({
... ... @@ -1498,6 +1560,46 @@ Page({
1498 1560 for (var j = 0; j < item.length; j++) {
1499 1561 if (item[j].is_gift) continue;
1500 1562 var obj = JSON.parse(JSON.stringify(item[j]));
  1563 + var gd_info=obj;
  1564 +
  1565 + if (!gd_info.whsle_id && [1, 2, 4, 6, 8, 9].indexOf(gd_info.prom_type) == -1 && !gd_info.selected && th.data.sales_rules >= 2) {
  1566 + var ob = {};
  1567 + await th.check_down_line_next(gd_info, i, j, gd_info.erpwareid, function (res) {
  1568 + ob = res;
  1569 + });
  1570 +
  1571 + if (ob.code == -1) {
  1572 +
  1573 + wx.showToast({
  1574 + title: gd_info.goods_name+'购买数量超出商品库存',
  1575 + icon: 'none',
  1576 + });
  1577 +
  1578 + return false;
  1579 + } else {
  1580 + if (th.data.sales_rules == 3) {
  1581 + var goods_id = gd_info.goods_id;
  1582 + var num = 0;
  1583 +
  1584 + for (let ii = 0; ii< th.data.requestData.length; ii++) {
  1585 + if (i == ii) continue;
  1586 + var it = th.data.requestData[ii].goods.find((e) => {
  1587 + return e.goods_id == goods_id;
  1588 + })
  1589 + if (it && it.selected) num += it.goods_num
  1590 + }
  1591 +
  1592 + if (num > ob.CanOutQty) {
  1593 + wx.showToast({
  1594 + title: gd_info.goods_name+'购买数量超出商品库存',
  1595 + icon: 'none',
  1596 + });
  1597 + return false;
  1598 + }
  1599 + }
  1600 + }
  1601 + }
  1602 +
1501 1603  
1502 1604  
1503 1605 //-- 判断起购数量 --
... ... @@ -1734,6 +1836,20 @@ Page({
1734 1836 });
1735 1837  
1736 1838 if (!sele) {
  1839 +
  1840 + //编辑不管判断了
  1841 + if(this.data.is_edit){
  1842 + for (var im = 0; im < item.length; im++) {
  1843 + let pro_off1 = false
  1844 + var txt = "requestData[" + pitems + "].goods[" + im + "].selected";
  1845 + this.setData({[txt]:1})
  1846 + }
  1847 +
  1848 + var txt0 = "requestData[" + pitems + "].selected";
  1849 + this.setData({[txt0]:1})
  1850 + return false;
  1851 + }
  1852 +
1737 1853 var check_is_service_selected = 0;
1738 1854 for (var ii in garr) {
1739 1855 for (var ij in garr[ii].goods) {
... ... @@ -1797,7 +1913,7 @@ Page({
1797 1913 if (ob.code == -1) {
1798 1914  
1799 1915 wx.showToast({
1800   - title: '购买数量超出商品库存',
  1916 + title: gd_info.goods_name+'购买数量超出商品库存',
1801 1917 icon: 'none',
1802 1918 });
1803 1919  
... ... @@ -1817,7 +1933,7 @@ Page({
1817 1933  
1818 1934 if (num > ob.CanOutQty) {
1819 1935 wx.showToast({
1820   - title: '购买数量超出商品库存',
  1936 + title: gd_info.goods_name+'购买数量超出商品库存',
1821 1937 icon: 'none',
1822 1938 });
1823 1939 return false;
... ... @@ -1963,6 +2079,15 @@ Page({
1963 2079 var garr = e.data.service_data;
1964 2080  
1965 2081 if (!a.selected) {
  2082 +
  2083 + //如果是标记的时候
  2084 + if(this.data.is_edit){
  2085 + var txt = "requestData[" + pitems + "].goods[" + item + "].selected";
  2086 + this.setData({[txt]:1})
  2087 + return false;
  2088 + }
  2089 +
  2090 +
1966 2091 var check_is_service_selected = 0;
1967 2092 for (var ii in garr) {
1968 2093 for (var ij in garr[ii].goods) {
... ... @@ -2127,6 +2252,17 @@ Page({
2127 2252 iarr = item;
2128 2253  
2129 2254 if (!sele) {
  2255 +
  2256 + //编辑不管判断了
  2257 + if(this.data.is_edit){
  2258 + for (var im = 0; im < item.length; im++) {
  2259 + let pro_off1 = false
  2260 + var txt = "service_data[" + pitems + "].goods[" + im + "].selected";
  2261 + this.setData({[txt]:1})
  2262 + }
  2263 + return false;
  2264 + }
  2265 +
2130 2266 var check_is_goods_selected = 0;
2131 2267 for (var ii in garr) {
2132 2268 for (var ij in garr[ii].goods) {
... ... @@ -2172,6 +2308,16 @@ Page({
2172 2308 var garr = e.data.requestData;
2173 2309  
2174 2310 if (!a.selected) {
  2311 +
  2312 + if(this.data.is_edit){
  2313 + var txt = "service_data[" + pitems + "].goods[" + item + "].selected";
  2314 + e.setData({
  2315 + [txt]: 1,
  2316 + });
  2317 + return false;
  2318 + }
  2319 +
  2320 +
2175 2321 var check_is_goods_selected = 0;
2176 2322 for (var ii in garr) {
2177 2323 for (var ij in garr[ii].goods) {
... ... @@ -3938,6 +4084,51 @@ Page({
3938 4084 this.setData({
3939 4085 is_edit: type
3940 4086 });
  4087 +
  4088 + let dda = this.data.requestData;
  4089 + let sdda = this.data.service_data;
  4090 +
  4091 + //清空选中的状态
  4092 + if (dda && dda.length > 0) {
  4093 + for (var i = 0; i < dda.length; i++) {
  4094 + var item = dda[i].goods;
  4095 + var txt0 = "requestData[" + i + "].selected";
  4096 + this.setData({
  4097 + [txt0]: 0,
  4098 + });
  4099 +
  4100 + for (var j = 0; j < item.length; j++) {
  4101 + let txt = "requestData[" + i + "].goods[" + j + "].selected";
  4102 + this.setData({
  4103 + [txt]: 0,
  4104 + });
  4105 + }
  4106 + }
  4107 + }
  4108 +
  4109 + //清空选中的状态
  4110 + if (sdda && sdda.length > 0) {
  4111 + for (i = 0; i < sdda.length; i++) {
  4112 + var item1 = sdda[i].goods;
  4113 + var txt00 = "service_data[" + i + "].selected";
  4114 + this.setData({
  4115 + [txt00]: 0,
  4116 + });
  4117 +
  4118 + for (j = 0; j < item1.length; j++) {
  4119 + let txt1 = "service_data[" + i + "].goods[" + j + "].selected";
  4120 + this.setData({
  4121 + [txt1]: 0,
  4122 + });
  4123 + }
  4124 + }
  4125 + }
  4126 +
  4127 + this.setData({
  4128 + checkAllToggle: 0,
  4129 + })
  4130 +
  4131 +
3941 4132 },
3942 4133  
3943 4134 //--多个删除购物车商品---
... ...
pages/goods/goodsInfo/goodsInfo.js
  View file @7388031
... ... @@ -3661,12 +3661,12 @@ Page({
3661 3661  
3662 3662 var pickup_ids=th.data.sele_g.pickup_ids;
3663 3663 //不是单独购买的时候，要清空商品pickup_ids
3664   - if(!is_normal && th.data.prom_type>0){
  3664 +
  3665 + var py=parseFloat(th.data.prom_type+'');
  3666 + if(!is_normal && py>0 && [3,5,7,10].indexOf(py)<0 ){
3665 3667 pickup_ids=null;
3666 3668 }
3667 3669  
3668   -
3669   - var py=parseFloat(th.data.prom_type+'');
3670 3670 //指定门店判断， 不是普通购买的时候，秒杀的时候，秒杀有指定门店
3671 3671 if(!is_normal && [1,2,6].indexOf(py)>-1 && th.data.prom_act.pick_up_lists){
3672 3672 pickup_ids=th.data.prom_act.pick_up_lists
... ...