Commit 83bc71098f6dc1441065b32698bdc095f94b268d

Authored by antploy
1 parent 47261ef5

拼团活动,后台设置了拼单活动不启用,但是小程序端还是可以正常参团购买

Showing 1 changed file with 2217 additions and 2195 deletions
pages/goods/goodsInfo/goodsInfo.js
Changes suppressed. Click to show
1 1 var t = require("../../../utils/util.js"),
2   - ut = t,
3   - e = require("../../../utils/common.js"),
4   - a = require("../../../utils/wxParse/wxParse.js"),
5   - s = getApp(),
6   - i = s.request,
7   - rq = i,
8   - oo = s.globalData,
9   - o = s.globalData.setting,
10   - os = o;
  2 + ut = t,
  3 + e = require("../../../utils/common.js"),
  4 + a = require("../../../utils/wxParse/wxParse.js"),
  5 + s = getApp(),
  6 + i = s.request,
  7 + rq = i,
  8 + oo = s.globalData,
  9 + o = s.globalData.setting,
  10 + os = o;
11 11 //评价加载更多
12   -var more = function(e) {
13   - return e && e.__esModule ? e : {
14   - default: e
15   - };
16   - }(require("../../../utils/LoadMore.js")),
17   - n = new more.default();
  12 +var more = function (e) {
  13 + return e && e.__esModule ? e : {
  14 + default: e
  15 + };
  16 +}(require("../../../utils/LoadMore.js")),
  17 + n = new more.default();
18 18 var utils = require('../../../utils/util.js');
19 19 var regeneratorRuntime = require('../../../utils/runtime.js');
  20 +const { app } = require("../../../utils/common.js");
20 21  
21 22 Page({
22 23 data: {
... ... @@ -31,7 +32,7 @@ Page({
31 32 resourceUrl: o.h5_url, //公众号那边的图片文件域名
32 33 iurl: o.imghost,
33 34 defaultAvatar: o.resourceUrl + "/static/images/user68.jpg",
34   -
  35 +
35 36 data: null,
36 37 content: "", //商品详情
37 38 comments: null, //商品评论
... ... @@ -80,25 +81,25 @@ Page({
80 81 id: 1,
81 82 num: 0
82 83 },
83   - {
84   - name: "有图",
85   - id: 5,
86   - num: 0
87   - },
  84 + {
  85 + name: "有图",
  86 + id: 5,
  87 + num: 0
  88 + },
88 89  
89   - {
90   - name: "好评",
91   - id: 2,
92   - num: 0
93   - }, {
94   - name: "中评",
95   - id: 3,
96   - num: 0
97   - }, {
98   - name: "差评",
99   - id: 4,
100   - num: 0
101   - },
  90 + {
  91 + name: "好评",
  92 + id: 2,
  93 + num: 0
  94 + }, {
  95 + name: "中评",
  96 + id: 3,
  97 + num: 0
  98 + }, {
  99 + name: "差评",
  100 + id: 4,
  101 + num: 0
  102 + },
102 103 ],
103 104  
104 105 select: {
... ... @@ -126,7 +127,7 @@ Page({
126 127 def_pickpu_list: null, //一开始5个门店list
127 128 sec_pick_index: 0, //第二级门店选择ID
128 129 fir_pick_index: 0, //第一级门店选择ID
129   - all_pick_list:null,//所有的门店先记录起来
  130 + all_pick_list: null,//所有的门店先记录起来
130 131 //同一条形码的所有商品
131 132 sku_g: null,
132 133 sku_g_pt: null, //---拼单的普通购买---
... ... @@ -219,7 +220,7 @@ Page({
219 220 new_user: 0, //新用户
220 221  
221 222 def_pick_store: null, // 默认的门店
222   - fir_def_store:null, //客户默认的门店的
  223 + fir_def_store: null, //客户默认的门店的
223 224 lat: null, //维度
224 225 lon: null, //经度
225 226  
... ... @@ -229,122 +230,122 @@ Page({
229 230 open_ind_store: 0, //哪里打开的门店列表的控制属性
230 231 default_store: {}, //创建添加默认门店地址的对象
231 232  
232   - comments_no_more:0,
233   - get_c:0, //获取评价是不是成
234   - is_collect_load:0, //是不是处理
235   - is_newsales_rules:0, //是否开启最新的门店规则,此时会新读门店,当点击选择门店时会触发读取线下库存
236   - sales_rules:1, //默认是线上销售
  233 + comments_no_more: 0,
  234 + get_c: 0, //获取评价是不是成
  235 + is_collect_load: 0, //是不是处理
  236 + is_newsales_rules: 0, //是否开启最新的门店规则,此时会新读门店,当点击选择门店时会触发读取线下库存
  237 + sales_rules: 1, //默认是线上销售
237 238  
238   - wait_for_user_store:null,
239   - prom_goods:null, //商品优惠列表
240   - order_prom:null, //订单优惠
241   - collocationGoods:null, //搭配购
242   -
243   - poster:null, //自定义海报
244   - share_b_img:'', //自定义分享的背景
245   -
246   - showPoster: false,
247   - hui_condition:null,
248   - sto_sele_name_1:'',//分享的门店名称
249   - fir_goods:null,
  239 + wait_for_user_store: null,
  240 + prom_goods: null, //商品优惠列表
  241 + order_prom: null, //订单优惠
  242 + collocationGoods: null, //搭配购
250 243  
251   - share_hidden: false,
  244 + poster: null, //自定义海报
  245 + share_b_img: '', //自定义分享的背景
  246 +
  247 + showPoster: false,
  248 + hui_condition: null,
  249 + sto_sele_name_1: '',//分享的门店名称
  250 + fir_goods: null,
  251 +
  252 + share_hidden: false,
252 253 },
253 254  
254 255 //------初始化加载----------
255   - onLoad: function(t) {
  256 + onLoad: function (t) {
256 257  
257 258  
258 259  
259 260 var ee = this,
260   - that = ee,
261   - th = ee,
262   - gid = t.goods_id,
263   - first_leader=t.first_leader,
264   - room_id=t.room_id,
265   - room_user_share=t.room_user_share; //如果是会员分享带有room_id的话,那么接下来会员分享就不传room_id
266   -
267   - //-- 自定义海报 --
268   - getApp().request.promiseGet("/api/weshop/goods/poster/page", {
269   - data:{store_id:os.stoid, type:1, is_use:1}
270   - }).then(res=>{
271   - if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData[0]){
272   -
273   - var poster_data=res.data.data.pageData[0];
274   - var json_str=poster_data.jsonStr;
275   -
276   - if(json_str){
277   - var json_data=JSON.parse(json_str);
278   - if(json_data.bg_img){
279   -
280   - //-- 把图片那到本地 --
281   - wx.getImageInfo({
282   - src:json_data.bg_img,
283   - success: function(res) {
284   - var path= res.path;
285   - th.setData({share_b_img:path})
286   - },
287   - fail: function(res) {}
288   - });
289   - }
290   - th.setData({poster:json_data})
291   -
292   - }
293   - }
294   - })
295   -
  261 + that = ee,
  262 + th = ee,
  263 + gid = t.goods_id,
  264 + first_leader = t.first_leader,
  265 + room_id = t.room_id,
  266 + room_user_share = t.room_user_share; //如果是会员分享带有room_id的话,那么接下来会员分享就不传room_id
  267 +
  268 + //-- 自定义海报 --
  269 + getApp().request.promiseGet("/api/weshop/goods/poster/page", {
  270 + data: { store_id: os.stoid, type: 1, is_use: 1 }
  271 + }).then(res => {
  272 + if (res.data.code == 0 && res.data.data && res.data.data.pageData && res.data.data.pageData[0]) {
  273 +
  274 + var poster_data = res.data.data.pageData[0];
  275 + var json_str = poster_data.jsonStr;
  276 +
  277 + if (json_str) {
  278 + var json_data = JSON.parse(json_str);
  279 + if (json_data.bg_img) {
  280 +
  281 + //-- 把图片那到本地 --
  282 + wx.getImageInfo({
  283 + src: json_data.bg_img,
  284 + success: function (res) {
  285 + var path = res.path;
  286 + th.setData({ share_b_img: path })
  287 + },
  288 + fail: function (res) { }
  289 + });
  290 + }
  291 + th.setData({ poster: json_data })
  292 +
  293 + }
  294 + }
  295 + })
  296 +
296 297 //---获取手机地址坐标--
297 298 //--如果tg_id是空的话,分享回来--
298 299 if (gid == undefined || gid == null || gid == "") {
299   - var gid_str = decodeURIComponent(t.scene);
300   - gid_str=gid_str.split("_");
301   - gid=gid_str[0];
302   - if(gid_str.length>1){
303   - first_leader=gid_str[1];
304   - }
305   - //-- 如果有room_id的获取 --
306   - if(gid_str.length>2 && gid_str[2]){
307   - room_id=gid_str[2];
308   - room_user_share=1;
309   - }
310   -
  300 + var gid_str = decodeURIComponent(t.scene);
  301 + gid_str = gid_str.split("_");
  302 + gid = gid_str[0];
  303 + if (gid_str.length > 1) {
  304 + first_leader = gid_str[1];
  305 + }
  306 + //-- 如果有room_id的获取 --
  307 + if (gid_str.length > 2 && gid_str[2]) {
  308 + room_id = gid_str[2];
  309 + room_user_share = 1;
  310 + }
  311 +
311 312 }
312 313  
313   - ee.setData({ gid: gid});
314   - if(first_leader){
315   - console.log("log---".first_leader);
316   - getApp().globalData.first_leader=first_leader;
  314 + ee.setData({ gid: gid });
  315 + if (first_leader) {
  316 + console.log("log---".first_leader);
  317 + getApp().globalData.first_leader = first_leader;
317 318 //调用接口判断是不是会员
318   - getApp().request.promiseGet("/api/weshop/shoppingGuide/get/"+os.stoid+"/"+first_leader,{}).then(res=>{
319   - if(res.data.code==0){
320   - getApp().globalData.guide_id=res.data.data.id;
  319 + getApp().request.promiseGet("/api/weshop/shoppingGuide/get/" + os.stoid + "/" + first_leader, {}).then(res => {
  320 + if (res.data.code == 0) {
  321 + getApp().globalData.guide_id = res.data.data.id;
321 322 }
322 323 })
323 324 }
324 325  
325 326 //-- 如果有房间号 --
326   - if(room_id){
327   - getApp().globalData.room_id=room_id;
328   - getApp().globalData.room_goods_id=gid;
329   - //如果是会员分享过来的要记录
330   - if(room_user_share)
331   - getApp().globalData.room_user_share=room_user_share;
  327 + if (room_id) {
  328 + getApp().globalData.room_id = room_id;
  329 + getApp().globalData.room_goods_id = gid;
  330 + //如果是会员分享过来的要记录
  331 + if (room_user_share)
  332 + getApp().globalData.room_user_share = room_user_share;
332 333 }
333 334  
334   - var c_guide_id=t.c_guide_id;
335   - if(c_guide_id){
336   - th.data.c_guide_id=c_guide_id;
  335 + var c_guide_id = t.c_guide_id;
  336 + if (c_guide_id) {
  337 + th.data.c_guide_id = c_guide_id;
337 338 }
338   -
339   - getApp().getConfig(function(e) {
340   - ee.setData({sto_sele_name_1:e.store_name})
341   - })
  339 +
  340 + getApp().getConfig(function (e) {
  341 + ee.setData({ sto_sele_name_1: e.store_name })
  342 + })
342 343  
343 344 //----获取系统参数-----
344   - getApp().getConfig2(function(e) {
  345 + getApp().getConfig2(function (e) {
345 346 ee.setData({
346 347 bconfig: e,
347   - sales_rules:e.sales_rules,
  348 + sales_rules: e.sales_rules,
348 349 });
349 350  
350 351 if (e.categoryset.indexOf("," + 1 + ",") != -1) {
... ... @@ -362,13 +363,13 @@ Page({
362 363 is_show_gb: 1
363 364 });
364 365 }
365   -
  366 + console.log(e);
366 367 var json_d = JSON.parse(e.switch_list);
367 368 ee.setData({
368 369 store_config: e,
369   - sys_switch:json_d,
  370 + sys_switch: json_d,
370 371 is_closecoupon: json_d.is_closecoupon,
371   - is_newsales_rules:json_d.is_newsales_rules
  372 + is_newsales_rules: json_d.is_newsales_rules
372 373 });
373 374 ee.init(gid);
374 375 //------几人评价-------
... ... @@ -379,39 +380,39 @@ Page({
379 380 });
380 381  
381 382 //计算等级价相关
382   - var swithc_list=e.switch_list;
383   - var sw_arr=JSON.parse(swithc_list);
  383 + var swithc_list = e.switch_list;
  384 + var sw_arr = JSON.parse(swithc_list);
384 385 //---如果后台又开等级卡的开关---
385   - if(sw_arr.rank_switch && sw_arr.rank_switch=="2"){
386   - th.setData({rank_switch:true});
  386 + if (sw_arr.rank_switch && sw_arr.rank_switch == "2") {
  387 + th.setData({ rank_switch: true });
387 388 //---回调卡的列表---
388   - th.getPlusCardType(function(ob){
389   - th.setData({card_list:ob.card_list});
  389 + th.getPlusCardType(function (ob) {
  390 + th.setData({ card_list: ob.card_list });
390 391 var ti = setInterval(function () {
391 392 var user = getApp().globalData.userInfo;
392 393 if (!user) return false;
393 394 clearInterval(ti);
394 395  
395   - if(user.card_field && user['card_expiredate']){
  396 + if (user.card_field && user['card_expiredate']) {
396 397 var str = user['card_expiredate'].replace(/-/g, '/');
397 398 var end = new Date(str);
398 399 end = Date.parse(end) / 1000;
399 400 var now = ut.gettimestamp();
400 401 //--- 判断是等级会员,且在有效期范围内 ---
401   - if(user.card_field && now<end){
402   - var card_name=ob.name_map.get(user.card_field);
  402 + if (user.card_field && now < end) {
  403 + var card_name = ob.name_map.get(user.card_field);
403 404 //if(card_name.length>6) card_name=card_name.substring(0,6);
404 405  
405   - var is_near_date=0;
406   - if(end-now<60*60*30*24) is_near_date=1; //如果小于30天
407   - th.setData({card_field:user.card_field,card_name:card_name,card_list:ob.card_list,is_near_date:is_near_date});
  406 + var is_near_date = 0;
  407 + if (end - now < 60 * 60 * 30 * 24) is_near_date = 1; //如果小于30天
  408 + th.setData({ card_field: user.card_field, card_name: card_name, card_list: ob.card_list, is_near_date: is_near_date });
408 409 }
409 410 }
410 411 }, 500)
411 412 })
412 413 }
413 414  
414   - },1);
  415 + }, 1);
415 416  
416 417 //获取用户设备信息,屏幕宽度
417 418 wx.getSystemInfo({
... ... @@ -421,36 +422,36 @@ Page({
421 422 })
422 423 }
423 424 });
424   -
  425 +
425 426 //获取用户的默认门店
426   - getApp().get_user_store(function(e) {
427   - if(!e) {
428   - th.data.fir_def_store={}; //赋值空对象
  427 + getApp().get_user_store(function (e) {
  428 + if (!e) {
  429 + th.data.fir_def_store = {}; //赋值空对象
429 430 return false;
430 431 }
431   - var ee=JSON.parse(JSON.stringify(e));
  432 + var ee = JSON.parse(JSON.stringify(e));
432 433 //--定时器推迟一下--
433 434 setTimeout(function () {
434   - if(th.data.fir_goods) var g_distr_type=th.data.fir_goods.distr_type;
  435 + if (th.data.fir_goods) var g_distr_type = th.data.fir_goods.distr_type;
435 436 //--如果默认门店的配送方式不对,就不能被选择,这里不控制,如果不一样,就说明配送方式不对--
436   - if(ee.distr_type!=0 && g_distr_type!=0 && ee.distr_type!=g_distr_type ){
  437 + if (ee.distr_type != 0 && g_distr_type != 0 && ee.distr_type != g_distr_type) {
437 438 //th.data.fir_def_store={}; //赋值空对象
438 439 //return false;
439   - //th.data.fir_def_store.is_no_dis=1;
440   - ee.is_no_dis=1;
  440 + //th.data.fir_def_store.is_no_dis=1;
  441 + ee.is_no_dis = 1;
441 442 }
442 443  
443   - var appd=getApp().globalData;
444   - var w_time = setInterval(function() {
  444 + var appd = getApp().globalData;
  445 + var w_time = setInterval(function () {
445 446 if (that.data.is_get_local_ok == 0) return false;
446 447 clearInterval(w_time);
447 448 var distance = null;
448   - var e=JSON.parse(JSON.stringify(ee));
  449 + var e = JSON.parse(JSON.stringify(ee));
449 450  
450 451 //如果有开启近距离的话,同时距离优不一样了
451 452 if (that.data.lat != null) {
452 453 //如果经纬度有变化的话
453   - if(e && appd.lat==that.data.lat && appd.lon==that.data.lon && e.distance>0 ){
  454 + if (e && appd.lat == that.data.lat && appd.lon == that.data.lon && e.distance > 0) {
454 455 //that.data.fir_def_store=e;
455 456 // that.setData({
456 457 // def_pick_store: e,
... ... @@ -458,18 +459,18 @@ Page({
458 459 // sto_sele_id: e.pickup_id,
459 460 // sto_sele_distr: e.distr_type
460 461 // })
461   - that.set_def_storage(e);
462   -
463   - }else{
  462 + that.set_def_storage(e);
  463 +
  464 + } else {
464 465 //要用接口是获取距离,js的计算不准
465   - getApp().request.promiseGet("/api/weshop/pickup/list",{
466   - data:{store_id:os.stoid,pickup_id:e.pickup_id,lat:th.data.lat,lon: th.data.lon},
467   - }).then(res=>{
468   - if(res.data.code==0){
469   - e=res.data.data.pageData[0];
470   - if (e){
471   - e.is_no_dis=ee.is_no_dis;
472   - appd.pk_store=e;
  466 + getApp().request.promiseGet("/api/weshop/pickup/list", {
  467 + data: { store_id: os.stoid, pickup_id: e.pickup_id, lat: th.data.lat, lon: th.data.lon },
  468 + }).then(res => {
  469 + if (res.data.code == 0) {
  470 + e = res.data.data.pageData[0];
  471 + if (e) {
  472 + e.is_no_dis = ee.is_no_dis;
  473 + appd.pk_store = e;
473 474 // that.data.fir_def_store=e;
474 475 // that.setData({
475 476 // def_pick_store: e,
... ... @@ -477,17 +478,17 @@ Page({
477 478 // sto_sele_id: e.pickup_id,
478 479 // sto_sele_distr: e.distr_type
479 480 // })
480   - that.set_def_storage(e);
  481 + that.set_def_storage(e);
481 482 }
482 483  
483 484 }
484 485 })
485 486 }
486 487 //e.distance = distance;
487   - appd.lat=that.data.lat;
488   - appd.lon=that.data.lon;
  488 + appd.lat = that.data.lat;
  489 + appd.lon = that.data.lon;
489 490  
490   - }else{
  491 + } else {
491 492 if (e) {
492 493 e.distance = null;
493 494 // that.data.fir_def_store=e;
... ... @@ -497,86 +498,86 @@ Page({
497 498 // sto_sele_id: e.pickup_id,
498 499 // sto_sele_distr: e.distr_type
499 500 // })
500   - that.set_def_storage(e);
  501 + that.set_def_storage(e);
501 502 }
502 503 }
503 504 }, 500)
504   - },700)
505   - });
506   -
  505 + }, 700)
  506 + });
  507 +
507 508 //更新点击量
508   - getApp().request.put("/api/weshop/goods/updateClick",{
509   - data:{store_id:os.stoid,goods_id:gid}
510   - })
  509 + getApp().request.put("/api/weshop/goods/updateClick", {
  510 + data: { store_id: os.stoid, goods_id: gid }
  511 + })
511 512 },
512   -
513   -
  513 +
  514 +
514 515 //--- 设置一下默认库存的数量 ----
515   - set_def_storage(ee){
516   - var that=this,th=this;
517   - getApp().getConfig2(function(e){
518   - var sales_rules=e.sales_rules;
519   - if(sales_rules==2){
520   - getApp().waitfor2(that,"wait_for_user_store","fir_goods",function(){
521   - var lock=0,plist=null;
522   - var gd=that.data.fir_goods;
523   - //先读取门店的lock,采用链式写法,少用await
524   - getApp().request.promiseGet("/api/weshop/order/ware/lock/page",{
525   - data:{store_id:os.stoid,wareId:that.data.fir_goods.goods_id,storageId:ee.pickup_id,pageSize:1000}
526   - }).then(res=>{
527   - if(res.data.code==0 && res.data.data.total>0){
528   - for(var i in res.data.data.pageData)
529   - lock+=res.data.data.pageData[i].outQty
530   - }
531   - //---通过接口获取门店的线下库存信息--
532   - return getApp().request.promiseGet("/api/weshop/goods/getWareStorages",{
533   - data:{storageNos:ee.pickup_no,wareIds:encodeURIComponent(th.data.data.erpwareid),storeId:os.stoid}
534   - })
535   - }).then(res=>{
536   - if(res.data.code==0 && res.data.data.total>0){
537   - plist=res.data.data.pageData[0];
538   - }
539   - if(plist && plist.CanOutQty-lock>0){
540   - ee.CanOutQty=plist.CanOutQty-lock;
541   - }else{
542   - ee.CanOutQty=0;
543   - }
544   - //--给门店赋值线下库存--
545   - that.data.fir_def_store=ee;
546   - that.setData({
547   - def_pick_store: ee,
548   - sto_sele_name: ee.pickup_name,
549   - sto_sele_id: ee.pickup_id,
550   - sto_sele_distr: ee.distr_type
551   - })
552   - })
553   - })
554   - }else{
555   - that.data.fir_def_store=ee;
556   - that.setData({
557   - def_pick_store: ee,
558   - sto_sele_name: ee.pickup_name,
559   - sto_sele_id: ee.pickup_id,
560   - sto_sele_distr: ee.distr_type
561   - })
562   - }
563   - })
564   -
565   - },
566   -
  516 + set_def_storage(ee) {
  517 + var that = this, th = this;
  518 + getApp().getConfig2(function (e) {
  519 + var sales_rules = e.sales_rules;
  520 + if (sales_rules == 2) {
  521 + getApp().waitfor2(that, "wait_for_user_store", "fir_goods", function () {
  522 + var lock = 0, plist = null;
  523 + var gd = that.data.fir_goods;
  524 + //先读取门店的lock,采用链式写法,少用await
  525 + getApp().request.promiseGet("/api/weshop/order/ware/lock/page", {
  526 + data: { store_id: os.stoid, wareId: that.data.fir_goods.goods_id, storageId: ee.pickup_id, pageSize: 1000 }
  527 + }).then(res => {
  528 + if (res.data.code == 0 && res.data.data.total > 0) {
  529 + for (var i in res.data.data.pageData)
  530 + lock += res.data.data.pageData[i].outQty
  531 + }
  532 + //---通过接口获取门店的线下库存信息--
  533 + return getApp().request.promiseGet("/api/weshop/goods/getWareStorages", {
  534 + data: { storageNos: ee.pickup_no, wareIds: encodeURIComponent(th.data.data.erpwareid), storeId: os.stoid }
  535 + })
  536 + }).then(res => {
  537 + if (res.data.code == 0 && res.data.data.total > 0) {
  538 + plist = res.data.data.pageData[0];
  539 + }
  540 + if (plist && plist.CanOutQty - lock > 0) {
  541 + ee.CanOutQty = plist.CanOutQty - lock;
  542 + } else {
  543 + ee.CanOutQty = 0;
  544 + }
  545 + //--给门店赋值线下库存--
  546 + that.data.fir_def_store = ee;
  547 + that.setData({
  548 + def_pick_store: ee,
  549 + sto_sele_name: ee.pickup_name,
  550 + sto_sele_id: ee.pickup_id,
  551 + sto_sele_distr: ee.distr_type
  552 + })
  553 + })
  554 + })
  555 + } else {
  556 + that.data.fir_def_store = ee;
  557 + that.setData({
  558 + def_pick_store: ee,
  559 + sto_sele_name: ee.pickup_name,
  560 + sto_sele_id: ee.pickup_id,
  561 + sto_sele_distr: ee.distr_type
  562 + })
  563 + }
  564 + })
  565 +
  566 + },
  567 +
567 568  
568 569 //------------程序初始化入口-------------
569 570 async init(gid) {
570 571 var ee = this,
571   - th = ee,
572   - gallery = null,
573   - is_collect = 0,
574   - collect_id = 0,
575   - categories3 = ee.data.categories3,
576   - fir_com = null,
577   - fir_quan = null,
578   - mapurl = null,
579   - mapurl_f_img = null;
  572 + th = ee,
  573 + gallery = null,
  574 + is_collect = 0,
  575 + collect_id = 0,
  576 + categories3 = ee.data.categories3,
  577 + fir_com = null,
  578 + fir_quan = null,
  579 + mapurl = null,
  580 + mapurl_f_img = null;
580 581  
581 582  
582 583 //------图片滚动----------
... ... @@ -655,8 +656,8 @@ Page({
655 656 goods_id: gid,
656 657 pageSize: 3,
657 658 parent_id: 0,
658   - page:1,
659   - is_show:1,
  659 + page: 1,
  660 + is_show: 1,
660 661 },
661 662 }).then(res => {
662 663 fir_com = res.data.data.pageData;
... ... @@ -678,7 +679,7 @@ Page({
678 679 type: 1,
679 680 pageSize: 3,
680 681 page: 1,
681   - is_share:0,
  682 + is_share: 0,
682 683 },
683 684 }).then(res1 => {
684 685 fir_quan = res1.data.data.pageData;
... ... @@ -709,21 +710,21 @@ Page({
709 710 },
710 711  
711 712 //---展示---
712   - onShow: function() {
713   - console.log('djfijsaoifjoisadjfoij');
714   - var goods_list = null,th = this,that=this;
715   - var show_prew_img= this.data.show_prew_img
716   - if(show_prew_img){
717   - show_prew_img=0;
  713 + onShow: function () {
  714 + console.log('djfijsaoifjoisadjfoij');
  715 + var goods_list = null, th = this, that = this;
  716 + var show_prew_img = this.data.show_prew_img
  717 + if (show_prew_img) {
  718 + show_prew_img = 0;
718 719 return false;
719 720 }
720 721  
721 722 //优惠券要实时更新
722   - getApp().getConfig2(function(e) {
  723 + getApp().getConfig2(function (e) {
723 724 var json_d = JSON.parse(e.switch_list);
724   - th.setData({is_closecoupon: json_d.is_closecoupon})
725   - th.setData({is_open_offline: json_d.is_pricing_open})
726   - },1)
  725 + th.setData({ is_closecoupon: json_d.is_closecoupon })
  726 + th.setData({ is_open_offline: json_d.is_pricing_open })
  727 + }, 1)
727 728  
728 729  
729 730 var ui = setInterval(function () {
... ... @@ -737,20 +738,21 @@ Page({
737 738  
738 739 this.data.is_timer = 1;
739 740 var ee = this,
740   - gid = this.data.gid,
741   - i = getApp().request;
  741 + gid = this.data.gid,
  742 + i = getApp().request;
742 743  
743 744 this.wait_for_store_config();
744 745  
745 746 i.get("/api/weshop/goods/get/" + o.stoid + "/" + ee.data.gid, {
746 747 failRollback: !0,
747   - success: function(t) {
  748 + success: function (t) {
  749 + console.log(t);
748 750 if (t.data.code == 0) {
749 751 if (t.data.data.is_on_sale != 1) {
750 752 wx.showModal({
751 753 title: '商品已经下架',
752 754 showCancel: !1,
753   - complete: function() {
  755 + complete: function () {
754 756 wx.navigateBack();
755 757 }
756 758 });
... ... @@ -762,7 +764,7 @@ Page({
762 764 wx.showModal({
763 765 title: '商品还未上架',
764 766 showCancel: !1,
765   - complete: function() {
  767 + complete: function () {
766 768 wx.navigateBack();
767 769 }
768 770 });
... ... @@ -773,7 +775,7 @@ Page({
773 775 wx.showModal({
774 776 title: '商品已经到期下架',
775 777 showCancel: !1,
776   - complete: function() {
  778 + complete: function () {
777 779 wx.navigateBack();
778 780 }
779 781 });
... ... @@ -781,46 +783,46 @@ Page({
781 783 }
782 784 //动态获取商品名称
783 785 wx.setNavigationBarTitle({
784   - title: t.data.data.goods_name,
  786 + title: t.data.data.goods_name,
785 787 });
786 788  
787 789 //-- 判断是不是组合购活动,必须要登录后才能判断 --
788   - if(getApp().globalData.userInfo && t.data.data.prom_type==7 ){
789   - //获取活动信息
790   - var url = "/api/weshop/prom/zhbuy/get/" + os.stoid + "/" +
791   - t.data.data.prom_id+"/"+getApp().globalData.userInfo.user_id;
792   - getApp().request.get(url, {
793   - success:function (e) {
794   - if (e.data.code == 0 && e.data.data) {
795   - if(ut.gettimestamp()<e.data.data.start_time){
796   - return false;
797   - }
798   - if (e.data.data.is_end == 0 && ut.gettimestamp()<e.data.data.end_time ) {
799   - //-- 获取商品列表 --
800   - th.setData({zh_act:e.data.data });
801   - }
802   -
803   - }
  790 + if (getApp().globalData.userInfo && t.data.data.prom_type == 7) {
  791 + //获取活动信息
  792 + var url = "/api/weshop/prom/zhbuy/get/" + os.stoid + "/" +
  793 + t.data.data.prom_id + "/" + getApp().globalData.userInfo.user_id;
  794 + getApp().request.get(url, {
  795 + success: function (e) {
  796 + if (e.data.code == 0 && e.data.data) {
  797 + if (ut.gettimestamp() < e.data.data.start_time) {
  798 + return false;
804 799 }
805   - });
  800 + if (e.data.data.is_end == 0 && ut.gettimestamp() < e.data.data.end_time) {
  801 + //-- 获取商品列表 --
  802 + th.setData({ zh_act: e.data.data });
  803 + }
  804 +
  805 + }
  806 + }
  807 + });
806 808 }
807 809  
808   - //-- 把商品的赋值 --
809   - ee.data.fir_goods=JSON.parse(JSON.stringify(t.data.data));
  810 + //-- 把商品的赋值 --
  811 + ee.data.fir_goods = JSON.parse(JSON.stringify(t.data.data));
810 812 ee.check_is_youhui(ee.data.gid);
811 813  
812 814 t.data.data.on_time = ut.formatTime(t.data.data.on_time, 'yyyy-MM-dd hh:mm:ss');
813   -
814   - var cur_price=t.data.data.shop_price;
815   - if(getApp().globalData.userInfo && getApp().globalData.userInfo.card_field){
816   - var cfile=getApp().globalData.userInfo.card_field;
817   - if(t.data.data[cfile]){
818   - cur_price=t.data.data[cfile];
819   - }
820   - }
821   - var txt =(cur_price / t.data.data.market_price * 10).toFixed(2).toString();
822   - txt=parseFloat(txt);
823   -
  815 +
  816 + var cur_price = t.data.data.shop_price;
  817 + if (getApp().globalData.userInfo && getApp().globalData.userInfo.card_field) {
  818 + var cfile = getApp().globalData.userInfo.card_field;
  819 + if (t.data.data[cfile]) {
  820 + cur_price = t.data.data[cfile];
  821 + }
  822 + }
  823 + var txt = (cur_price / t.data.data.market_price * 10).toFixed(2).toString();
  824 + txt = parseFloat(txt);
  825 +
824 826 t.data.data['disc'] = txt;
825 827  
826 828 if (t.data.data.original_img.indexOf(o.imghost) == -1)
... ... @@ -829,55 +831,55 @@ Page({
829 831 if (t.data.data.goods_content == null) t.data.data.goods_content = "";
830 832  
831 833 //-----商品详情---
832   - if(!t.data.data.goods_content) t.data.data.goods_content=" ";
  834 + if (!t.data.data.goods_content) t.data.data.goods_content = " ";
833 835 a.wxParse("content", "html", t.data.data.goods_content, ee, 6);
834 836 e.wxParseAddFullImageUrl(ee, "content");
835 837  
836 838 ee.setData({
837 839 data: t.data.data,
838 840 sele_g: t.data.data,
839   - userInfo:getApp().globalData.userInfo
  841 + userInfo: getApp().globalData.userInfo
840 842 });
841 843  
842 844  
843 845 //获取统一条形码,普通商品和优惠促销的商品
844   - if (ee.data.data.prom_type == 0 || ee.data.data.prom_type == 2 || ee.data.data.prom_type == 3 || ee.data.data.prom_type == 5 || ee.data.data.prom_type == 7){
  846 + if (ee.data.data.prom_type == 0 || ee.data.data.prom_type == 2 || ee.data.data.prom_type == 3 || ee.data.data.prom_type == 5 || ee.data.data.prom_type == 7) {
845 847 //默认门店要拿下门店库存
846   - if(that.data.sales_rules==2 && that.data.is_newsales_rules){
  848 + if (that.data.sales_rules == 2 && that.data.is_newsales_rules) {
847 849 //获取门店
848 850 ee.get_sto();
849 851 //--等待某个值只运行---,这里有可能因为导航的时间太久,而不能计算门店库存
850   - /*---
851   - getApp().waitfor2(that,"wait_for_user_store","fir_def_store",function(){
852   - if(th.data.fir_def_store && th.data.fir_def_store.pickup_id ){
853   - var lock=0,plist=null;
854   - //先读取门店的lock,采用链式写法,少用await
855   - getApp().request.promiseGet("/api/weshop/order/ware/lock/page",{
856   - data:{store_id:os.stoid,wareId:ee.data.data.goods_id,storageId:that.data.fir_def_store.pickup_id,pageSize:1000}
857   - }).then(res=>{
858   - if(res.data.code==0 && res.data.data.total>0){
859   - for(var i in res.data.data.pageData)
860   - lock+=res.data.data.pageData[i].outQty
861   - }
862   - //---通过接口获取门店的线下库存信息--
863   - return getApp().request.promiseGet("/api/weshop/goods/getWareStorages",{
864   - data:{storageNos:that.data.fir_def_store.pickup_no,wareIds:encodeURIComponent(th.data.data.erpwareid),storeId:os.stoid}
865   - })
866   - }).then(res=>{
867   - if(res.data.code==0 && res.data.data.total>0){
868   - plist=res.data.data.pageData[0];
869   - }
870   - if(plist && plist.CanOutQty-lock>0){
871   - that.data.fir_def_store.CanOutQty=plist.CanOutQty-lock;
872   - }else{
873   - that.data.fir_def_store.CanOutQty=0;
874   - }
875   - //--给门店赋值线下库存--
876   - th.setData({def_pick_store:that.data.fir_def_store});
877   - })
878   - }
879   - })--*/
880   - }else{
  852 + /*---
  853 + getApp().waitfor2(that,"wait_for_user_store","fir_def_store",function(){
  854 + if(th.data.fir_def_store && th.data.fir_def_store.pickup_id ){
  855 + var lock=0,plist=null;
  856 + //先读取门店的lock,采用链式写法,少用await
  857 + getApp().request.promiseGet("/api/weshop/order/ware/lock/page",{
  858 + data:{store_id:os.stoid,wareId:ee.data.data.goods_id,storageId:that.data.fir_def_store.pickup_id,pageSize:1000}
  859 + }).then(res=>{
  860 + if(res.data.code==0 && res.data.data.total>0){
  861 + for(var i in res.data.data.pageData)
  862 + lock+=res.data.data.pageData[i].outQty
  863 + }
  864 + //---通过接口获取门店的线下库存信息--
  865 + return getApp().request.promiseGet("/api/weshop/goods/getWareStorages",{
  866 + data:{storageNos:that.data.fir_def_store.pickup_no,wareIds:encodeURIComponent(th.data.data.erpwareid),storeId:os.stoid}
  867 + })
  868 + }).then(res=>{
  869 + if(res.data.code==0 && res.data.data.total>0){
  870 + plist=res.data.data.pageData[0];
  871 + }
  872 + if(plist && plist.CanOutQty-lock>0){
  873 + that.data.fir_def_store.CanOutQty=plist.CanOutQty-lock;
  874 + }else{
  875 + that.data.fir_def_store.CanOutQty=0;
  876 + }
  877 + //--给门店赋值线下库存--
  878 + th.setData({def_pick_store:that.data.fir_def_store});
  879 + })
  880 + }
  881 + })--*/
  882 + } else {
881 883 //获取门店
882 884 ee.get_sto();
883 885 }
... ... @@ -887,8 +889,8 @@ Page({
887 889 else {
888 890 var gg = "", item = t.data.data;
889 891  
890   - if(item.goods_spec=="null" || item.goods_spec==null ) item.goods_spec="";
891   - if(item.goods_color=="null" || item.goods_color==null) item.goods_color="";
  892 + if (item.goods_spec == "null" || item.goods_spec == null) item.goods_spec = "";
  893 + if (item.goods_color == "null" || item.goods_color == null) item.goods_color = "";
892 894  
893 895 if (item.goods_spec != "" && item.goods_color != "") {
894 896 gg = item.goods_spec + "/" + item.goods_color;
... ... @@ -911,7 +913,7 @@ Page({
911 913 if (ee.data.cat_name == '') {
912 914 //过去国别,分类,品牌的名称
913 915 i.get("/api/weshop/goodscategory/get/" + o.stoid + "/" + th.data.data.cat_id, {
914   - success: function(t) {
  916 + success: function (t) {
915 917 var dd = t.data.data;
916 918 if (t.data.code == 0) {
917 919 th.setData({
... ... @@ -922,7 +924,7 @@ Page({
922 924 });
923 925 //过去国别,分类,品牌的名称
924 926 i.get("/api/weshop/brand/get/" + o.stoid + "/" + th.data.data.brand_id, {
925   - success: function(t) {
  927 + success: function (t) {
926 928 var dd = t.data.data;
927 929 if (t.data.code == 0) {
928 930 th.setData({
... ... @@ -933,7 +935,7 @@ Page({
933 935 });
934 936 //过去国别,分类,品牌的名称
935 937 i.get("/api/weshop/nation/get/" + o.stoid + "/" + th.data.data.nation_id, {
936   - success: function(t) {
  938 + success: function (t) {
937 939 var dd = t.data.data;
938 940 if (t.data.code == 0) {
939 941 th.setData({
... ... @@ -945,77 +947,77 @@ Page({
945 947 }
946 948  
947 949 }
948   - else{
949   - wx.showModal({
950   - title: t.data.msg,
951   - showCancel: !1,
952   - complete: function() {
953   - wx.navigateBack();
954   - }
955   - });
956   - }
957   - }
  950 + else {
  951 + wx.showModal({
  952 + title: t.data.msg,
  953 + showCancel: !1,
  954 + complete: function () {
  955 + wx.navigateBack();
  956 + }
  957 + });
  958 + }
  959 + }
958 960 });
959 961 this.data.enterAddressPage && (this.data.enterAddressPage = !1);
960 962  
961 963 },
962   - enterAddress: function() {
  964 + enterAddress: function () {
963 965 this.data.enterAddressPage = !0, wx.navigateTo({
964 966 url: "/pages/user/address_list/address_list?operate=selectAddress"
965 967 });
966 968 },
967   - onUnload: function() {
968   - for(var i = 1; i < 100; i++) {
969   - clearInterval(i);
970   - }
  969 + onUnload: function () {
  970 + for (var i = 1; i < 100; i++) {
  971 + clearInterval(i);
  972 + }
971 973 },
972   - onHide: function() {
  974 + onHide: function () {
973 975 this.data.is_timer = 0;
974   - for(var i = 1; i < 100; i++) {
  976 + for (var i = 1; i < 100; i++) {
975 977 clearInterval(i);
976 978 }
977 979 },
978 980 //----------三个选项按钮-----------
979   - tabClick: function(t) {
  981 + tabClick: function (t) {
980 982 var e = t.currentTarget.id;
981 983 this.setData({
982 984 activeCategoryId: e
983 985 }), 1 == e ? this.tabGoodsContent() : 2 == e && this.tabComment();
984 986 },
985   - tabClick2: function(t) {
  987 + tabClick2: function (t) {
986 988 this.setData({
987 989 activeCategoryId2: t.currentTarget.id
988 990 });
989 991 },
990 992  
991   - tabClick3: function(t) {
  993 + tabClick3: function (t) {
992 994 var e = this;
993 995 if (t.currentTarget.id != this.data.activeCategoryId3) {
994 996 e.data.c_curr_p = 1;
995 997 this.setData({
996 998 activeCategoryId3: t.currentTarget.id,
997   - comments: null,comments_no_more:0,get_c:0,
  999 + comments: null, comments_no_more: 0, get_c: 0,
998 1000 });
999 1001 this.requestComments_new();
1000 1002 }
1001 1003 },
1002 1004  
1003   - doScrollTop: function() {
  1005 + doScrollTop: function () {
1004 1006 wx.pageScrollTo({
1005 1007 scrollTop: 0
1006 1008 });
1007 1009 },
1008 1010  
1009   - tabComment: function() {
  1011 + tabComment: function () {
1010 1012 this.setData({
1011   - activeCategoryId: 2,comments_no_more:0,get_c:0
  1013 + activeCategoryId: 2, comments_no_more: 0, get_c: 0
1012 1014 }), this.data.comments || this.requestComments_new();
1013 1015 },
1014 1016  
1015 1017 //商品详情的时候调用
1016   - tabGoodsContent: function() {
  1018 + tabGoodsContent: function () {
1017 1019 var th = this,
1018   - i = getApp().request;
  1020 + i = getApp().request;
1019 1021 this.setData({
1020 1022 activeCategoryId: 1
1021 1023 });
... ... @@ -1023,7 +1025,7 @@ Page({
1023 1025 if (th.data.cat_name == '') {
1024 1026 //过去国别,分类,品牌的名称
1025 1027 i.get("/api/weshop/goodscategory/get/" + o.stoid + "/" + th.data.data.cat_id, {
1026   - success: function(t) {
  1028 + success: function (t) {
1027 1029 var dd = t.data.data;
1028 1030 if (t.data.code == 0) {
1029 1031 th.setData({
... ... @@ -1034,7 +1036,7 @@ Page({
1034 1036 });
1035 1037 //过去国别,分类,品牌的名称
1036 1038 i.get("/api/weshop/brand/get/" + o.stoid + "/" + th.data.data.brand_id, {
1037   - success: function(t) {
  1039 + success: function (t) {
1038 1040 var dd = t.data.data;
1039 1041 if (t.data.code == 0) {
1040 1042 th.setData({
... ... @@ -1045,7 +1047,7 @@ Page({
1045 1047 });
1046 1048 //过去国别,分类,品牌的名称
1047 1049 i.get("/api/weshop/nation/get/" + o.stoid + "/" + th.data.data.nation_id, {
1048   - success: function(t) {
  1050 + success: function (t) {
1049 1051 var dd = t.data.data;
1050 1052 if (t.data.code == 0) {
1051 1053 th.setData({
... ... @@ -1060,8 +1062,8 @@ Page({
1060 1062 //获取redis中的数量
1061 1063 async getactLen(func) {
1062 1064 var r_num = 0,
1063   - prom_type = this.data.prom_type,
1064   - prom_id = this.data.prom_id;
  1065 + prom_type = this.data.prom_type,
  1066 + prom_id = this.data.prom_id;
1065 1067 await getApp().request.promiseGet("/api/weshop/activitylist/getActLen/" + os.stoid + "/" + prom_type + "/" + prom_id, {
1066 1068 1: 1
1067 1069 }).then(res => {
... ... @@ -1074,16 +1076,16 @@ Page({
1074 1076 },
1075 1077  
1076 1078 //------------加入购物车--------------
1077   - addCart: function(t) {
  1079 + addCart: function (t) {
1078 1080 var th = this;
1079 1081 var ind = t.currentTarget.dataset.openSpecModal_ind;
1080   - if(!ind) ind = t.currentTarget.dataset.openspecmodal_ind;
  1082 + if (!ind) ind = t.currentTarget.dataset.openspecmodal_ind;
1081 1083 th.setData({
1082 1084 open_ind_store: ind
1083 1085 });
1084 1086 //如果是秒杀的话,要看redis够不够
1085 1087 if (this.data.prom_type == 1) {
1086   - this.getactLen(function(num) {
  1088 + this.getactLen(function (num) {
1087 1089 if (num < th.data.goodsInputNum) {
1088 1090 getApp().my_warnning("秒杀库存不足!", 0, th);
1089 1091 return false;
... ... @@ -1095,27 +1097,27 @@ Page({
1095 1097 th.add_cart_func(t);
1096 1098 }
1097 1099 },
1098   -
1099   -
1100   -
  1100 +
  1101 +
  1102 +
1101 1103 //-- 加入购物的函数 --
1102   - add_cart_func_inte: function(t) {
  1104 + add_cart_func_inte: function (t) {
1103 1105 var i = getApp().request;
1104 1106 if (oo.user_id == null) {
1105 1107 return s.my_warnning("还未登录!", 0, this);
1106 1108 }
1107   - if(!getApp().globalData.userInfo){
1108   - return s.my_warnning("还未登录!", 0, this);
1109   - }
1110   -
  1109 + if (!getApp().globalData.userInfo) {
  1110 + return s.my_warnning("还未登录!", 0, this);
  1111 + }
  1112 +
1111 1113 var e = this,
1112   - th = e,
1113   - a = 0,
1114   - o = this.data.data;
  1114 + th = e,
  1115 + a = 0,
  1116 + o = this.data.data;
1115 1117 a = o.goods_id;
1116   -
  1118 +
1117 1119 //----------添加到购物车时,要判断限购数量,--------
1118   - e.get_buy_num(o, function(ee) {
  1120 + e.get_buy_num(o, function (ee) {
1119 1121 //---判断商品是否超出限购---
1120 1122 if (th.data.g_buy_num != null && th.data.sele_g.viplimited > 0) {
1121 1123 if (th.data.goodsInputNum + th.data.g_buy_num.get(th.data.sele_g.goods_id) > th.data.sele_g.viplimited) {
... ... @@ -1136,14 +1138,14 @@ Page({
1136 1138 return false;
1137 1139 }
1138 1140 }
1139   -
  1141 +
1140 1142 if (th.data.goodsInputNum <= 0) return s.my_warnning("商品数量不能为0", 0, th);
1141 1143 if (th.data.sto_sele_name == null || th.data.sto_sele_name == undefined)
1142 1144 this.setData({
1143 1145 sto_sele_name: ""
1144 1146 });
1145 1147 if (th.data.sto_sele_name == "") return s.my_warnning("请选择门店", 0, th);
1146   -
  1148 +
1147 1149 //--------------此时操作的数据------------
1148 1150 var newd = {
1149 1151 goods_id: o.goods_id,
... ... @@ -1152,72 +1154,72 @@ Page({
1152 1154 user_id: oo.user_id,
1153 1155 store_id: th.data.stoid,
1154 1156 goods_price: th.data.prom_price,
1155   - integral:th.data.prom_integral,
  1157 + integral: th.data.prom_integral,
1156 1158 member_goods_price: o.shop_price,
1157 1159 goods_name: o.goods_name,
1158 1160 goods_sn: o.goods_sn,
1159 1161 sku: o.sku,
1160   - };
1161   -
  1162 + };
  1163 +
1162 1164 //---是不是从收藏夹出来的---
1163   - if(th.data.c_guide_id){
  1165 + if (th.data.c_guide_id) {
1164 1166 newd['guide_id'] = th.data.c_guide_id;
1165   - newd['guide_type']=2;
1166   - if ("add" == t.currentTarget.dataset.action) newd['guide_type']=3;
1167   - }else{
1168   - if(getApp().globalData.guide_id){
  1167 + newd['guide_type'] = 2;
  1168 + if ("add" == t.currentTarget.dataset.action) newd['guide_type'] = 3;
  1169 + } else {
  1170 + if (getApp().globalData.guide_id) {
1169 1171 newd['guide_id'] = getApp().globalData.guide_id;
1170   - newd['guide_type']=0;
1171   - if ("add" == t.currentTarget.dataset.action) newd['guide_type']=1;
  1172 + newd['guide_type'] = 0;
  1173 + if ("add" == t.currentTarget.dataset.action) newd['guide_type'] = 1;
1172 1174 }
1173 1175 }
1174   -
  1176 +
1175 1177 //让商品带上房间号
1176 1178 //让商品带上房间号
1177   - if(th.data.sys_switch.is_skuroom_id==1){
1178   - if(th.data.data.goods_id==getApp().globalData.room_goods_id){
1179   - newd.room_id=getApp().globalData.room_id;
  1179 + if (th.data.sys_switch.is_skuroom_id == 1) {
  1180 + if (th.data.data.goods_id == getApp().globalData.room_goods_id) {
  1181 + newd.room_id = getApp().globalData.room_id;
1180 1182 }
1181   - }else{
1182   - if(newd.goods_id==getApp().globalData.room_goods_id) newd.room_id=getApp().globalData.room_id;
  1183 + } else {
  1184 + if (newd.goods_id == getApp().globalData.room_goods_id) newd.room_id = getApp().globalData.room_id;
1183 1185 }
1184   -
  1186 +
1185 1187 //如果是积分够,is_integral_normal就要有积分购普通购买字段
1186 1188 //if(o.prom_type==4){
1187   - //newd.is_integral_normal=1;
  1189 + //newd.is_integral_normal=1;
1188 1190 //}
1189   -
1190   - //-----如果是秒杀,团购,积分购,拼团-----
1191   - newd.prom_type = th.data.prom_type;
1192   - newd.prom_id = th.data.prom_id;
1193   - if (o.store_count <= 0) return s.my_warnning("库存已为空!", 0, th);
1194   - if (o.store_count <e.data.goodsInputNum) return s.my_warnning("库存不足!", 0, th);
1195   -
1196   -
1197   - th.add_cart_next(e,t,a,o,newd); //立即购买下一步
1198   -
1199   - })
1200   - },
1201   -
  1191 +
  1192 + //-----如果是秒杀,团购,积分购,拼团-----
  1193 + newd.prom_type = th.data.prom_type;
  1194 + newd.prom_id = th.data.prom_id;
  1195 + if (o.store_count <= 0) return s.my_warnning("库存已为空!", 0, th);
  1196 + if (o.store_count < e.data.goodsInputNum) return s.my_warnning("库存不足!", 0, th);
  1197 +
  1198 +
  1199 + th.add_cart_next(e, t, a, o, newd); //立即购买下一步
  1200 +
  1201 + })
  1202 + },
  1203 +
1202 1204 //-- 加入购物的函数 --
1203   - add_cart_func: function(t) {
  1205 + add_cart_func: function (t) {
1204 1206 var i = getApp().request;
1205 1207 if (oo.user_id == null) {
1206 1208 return s.my_warnning("还未登录!", 0, this);
1207 1209 }
1208   -
1209   - if(!getApp().globalData.userInfo){
1210   - return s.my_warnning("还未登录!", 0, this);
1211   - }
1212   -
  1210 +
  1211 + if (!getApp().globalData.userInfo) {
  1212 + return s.my_warnning("还未登录!", 0, this);
  1213 + }
  1214 +
1213 1215 var e = this,
1214   - th = e,
1215   - a = 0,
1216   - o = this.data.sele_g;
  1216 + th = e,
  1217 + a = 0,
  1218 + o = this.data.sele_g;
1217 1219 a = o.goods_id;
1218 1220  
1219 1221 //----------添加到购物车时,要判断限购数量,--------
1220   - e.get_buy_num(o, function(ee) {
  1222 + e.get_buy_num(o, function (ee) {
1221 1223 //---判断商品是否超出限购---
1222 1224 if (th.data.g_buy_num != null && th.data.sele_g.viplimited > 0) {
1223 1225 if (th.data.goodsInputNum + th.data.g_buy_num.get(th.data.sele_g.goods_id) > th.data.sele_g.viplimited) {
... ... @@ -1258,193 +1260,193 @@ Page({
1258 1260 goods_name: o.goods_name,
1259 1261 goods_sn: o.goods_sn,
1260 1262 sku: o.sku,
1261   - };
1262   -
  1263 + };
  1264 +
1263 1265 //---是不是从收藏夹出来的---
1264   - if(th.data.c_guide_id){
  1266 + if (th.data.c_guide_id) {
1265 1267 newd['guide_id'] = th.data.c_guide_id;
1266   - newd['guide_type']=2;
1267   - if ("add" == t.currentTarget.dataset.action) newd['guide_type']=3;
1268   - }else{
1269   - if(getApp().globalData.guide_id){
  1268 + newd['guide_type'] = 2;
  1269 + if ("add" == t.currentTarget.dataset.action) newd['guide_type'] = 3;
  1270 + } else {
  1271 + if (getApp().globalData.guide_id) {
1270 1272 newd['guide_id'] = getApp().globalData.guide_id;
1271   - newd['guide_type']=0;
1272   - if ("add" == t.currentTarget.dataset.action) newd['guide_type']=1;
  1273 + newd['guide_type'] = 0;
  1274 + if ("add" == t.currentTarget.dataset.action) newd['guide_type'] = 1;
1273 1275 }
1274 1276 }
1275 1277  
1276 1278 //让商品带上房间号
1277 1279 //让商品带上房间号
1278   - if(th.data.sys_switch.is_skuroom_id==1){
1279   - if(th.data.data.goods_id==getApp().globalData.room_goods_id){
1280   - newd.room_id=getApp().globalData.room_id;
  1280 + if (th.data.sys_switch.is_skuroom_id == 1) {
  1281 + if (th.data.data.goods_id == getApp().globalData.room_goods_id) {
  1282 + newd.room_id = getApp().globalData.room_id;
1281 1283 }
1282   - }else{
1283   - if(newd.goods_id==getApp().globalData.room_goods_id) newd.room_id=getApp().globalData.room_id;
  1284 + } else {
  1285 + if (newd.goods_id == getApp().globalData.room_goods_id) newd.room_id = getApp().globalData.room_id;
1284 1286 }
1285 1287  
1286 1288 //如果是积分够,is_integral_normal就要有积分购普通购买字段
1287   - if(o.prom_type==4){
1288   - newd.is_integral_normal=1;
  1289 + if (o.prom_type == 4) {
  1290 + newd.is_integral_normal = 1;
1289 1291 }
1290   -
1291   - //如果有线下取价
1292   - if(o.offline_price){
1293   - newd.offline_price=o.offline_price;
1294   - newd.pricing_type=o.pricing_type;
1295   - }
1296   -
  1292 +
  1293 + //如果有线下取价
  1294 + if (o.offline_price) {
  1295 + newd.offline_price = o.offline_price;
  1296 + newd.pricing_type = o.pricing_type;
  1297 + }
  1298 +
1297 1299 //-----如果是秒杀,团购,积分购,拼团-----
1298 1300 if (th.data.prom_type == 1) {
1299 1301 newd.goods_price = th.data.prom_price;
1300 1302 newd.member_goods_price = th.data.prom_price,
1301   - newd.prom_type = th.data.prom_type;
  1303 + newd.prom_type = th.data.prom_type;
1302 1304 newd.prom_id = th.data.prom_id;
1303 1305  
1304 1306 if (o.store_count <= 0) return s.my_warnning("库存已为空!", 0, th);
1305   - if (o.store_count <e.data.goodsInputNum) return s.my_warnning("库存不足!", 0, th);
1306   -
1307   - th.add_cart_next(e,t,a,o,newd); //加入购物车下一步
1308   -
1309   - }else if(o.prom_type==7){
1310   -
1311   - //判断进行中的活动,是不是要判断线下库存
1312   - th.check_zh_acting(function (ee){
1313   - newd.prom_id = 0;
1314   - newd.prom_type = 0;
1315   - if(ee && th.data.sele_g.act){
1316   - newd.prom_id = th.data.sele_g.act.id;
1317   - newd.prom_type = 7;
1318   - if (o.store_count <= 0) return s.my_warnning("库存已为空!", 0, th);
1319   - if (o.store_count <e.data.goodsInputNum) return s.my_warnning("库存不足!", 0, th);
1320   - th.add_cart_next(e,t,a,o,newd); //加入购物车下一步
1321   - return false;
1322   - }else{
1323   - //---如果是线下门店销售的时候---
1324   - if(th.data.sales_rules==2){
1325   - var pick=th.get_pick_from_list(th.data.sto_sele_id)
1326   - //---通过接口获取门店的线下库存信息--
1327   - getApp().request.get("/api/weshop/goods/getWareStorages",{
1328   - data:{storageNos:pick.pickup_no,wareIds:encodeURIComponent(th.data.sele_g.erpwareid),storeId:os.stoid},
1329   - success:function(res){
1330   - if(res.data.code==0){
1331   - if(res.data.data.pageData.length>0){
1332   - var CanOutQty=res.data.data.pageData[0].CanOutQty;
1333   - if(CanOutQty<e.data.goodsInputNum){
1334   - return s.my_warnning("库存不足!", 0, th);
1335   - }
1336   - //在调一次接口,读取商品的预出库的数量,lock
1337   - getApp().request.get("/api/weshop/order/ware/lock/page",{
1338   - data:{store_id:os.stoid,wareId:th.data.sele_g.goods_id,storageId:pick.pickup_id,pageSize:1000},
1339   - success:function(res_data){
1340   - if(res_data.data.code==0 && res_data.data.data.total>0){
1341   -
1342   - var lock=0;
1343   - for(var i in res_data.data.data.pageData){
1344   - lock+=res_data.data.data.pageData[i].outQty;
1345   - }
1346   -
1347   - if(CanOutQty<=lock){
1348   - return s.my_warnning("库存不足!", 0, th);
1349   - }
1350   - th.add_cart_next(e,t,a,o,newd,CanOutQty-lock);
1351   - }else{
1352   - th.add_cart_next(e,t,a,o,newd,CanOutQty);
1353   - }
1354   - }
1355   - })
1356   - }else{
1357   - return s.my_warnning("库存不足!", 0, th);
1358   - }
1359   -
1360   - }
1361   - }
1362   - })
1363   - }else{
1364   - if (o.store_count <= 0) return s.my_warnning("库存已为空!", 0, th);
1365   - if (o.store_count <e.data.goodsInputNum) return s.my_warnning("库存不足!", 0, th);
1366   - th.add_cart_next(e,t,a,o,newd); //加入购物车下一步
1367   - }
1368   - }
1369   - })
  1307 + if (o.store_count < e.data.goodsInputNum) return s.my_warnning("库存不足!", 0, th);
  1308 +
  1309 + th.add_cart_next(e, t, a, o, newd); //加入购物车下一步
  1310 +
  1311 + } else if (o.prom_type == 7) {
  1312 +
  1313 + //判断进行中的活动,是不是要判断线下库存
  1314 + th.check_zh_acting(function (ee) {
  1315 + newd.prom_id = 0;
  1316 + newd.prom_type = 0;
  1317 + if (ee && th.data.sele_g.act) {
  1318 + newd.prom_id = th.data.sele_g.act.id;
  1319 + newd.prom_type = 7;
  1320 + if (o.store_count <= 0) return s.my_warnning("库存已为空!", 0, th);
  1321 + if (o.store_count < e.data.goodsInputNum) return s.my_warnning("库存不足!", 0, th);
  1322 + th.add_cart_next(e, t, a, o, newd); //加入购物车下一步
  1323 + return false;
  1324 + } else {
  1325 + //---如果是线下门店销售的时候---
  1326 + if (th.data.sales_rules == 2) {
  1327 + var pick = th.get_pick_from_list(th.data.sto_sele_id)
  1328 + //---通过接口获取门店的线下库存信息--
  1329 + getApp().request.get("/api/weshop/goods/getWareStorages", {
  1330 + data: { storageNos: pick.pickup_no, wareIds: encodeURIComponent(th.data.sele_g.erpwareid), storeId: os.stoid },
  1331 + success: function (res) {
  1332 + if (res.data.code == 0) {
  1333 + if (res.data.data.pageData.length > 0) {
  1334 + var CanOutQty = res.data.data.pageData[0].CanOutQty;
  1335 + if (CanOutQty < e.data.goodsInputNum) {
  1336 + return s.my_warnning("库存不足!", 0, th);
  1337 + }
  1338 + //在调一次接口,读取商品的预出库的数量,lock
  1339 + getApp().request.get("/api/weshop/order/ware/lock/page", {
  1340 + data: { store_id: os.stoid, wareId: th.data.sele_g.goods_id, storageId: pick.pickup_id, pageSize: 1000 },
  1341 + success: function (res_data) {
  1342 + if (res_data.data.code == 0 && res_data.data.data.total > 0) {
  1343 +
  1344 + var lock = 0;
  1345 + for (var i in res_data.data.data.pageData) {
  1346 + lock += res_data.data.data.pageData[i].outQty;
  1347 + }
  1348 +
  1349 + if (CanOutQty <= lock) {
  1350 + return s.my_warnning("库存不足!", 0, th);
  1351 + }
  1352 + th.add_cart_next(e, t, a, o, newd, CanOutQty - lock);
  1353 + } else {
  1354 + th.add_cart_next(e, t, a, o, newd, CanOutQty);
  1355 + }
  1356 + }
  1357 + })
  1358 + } else {
  1359 + return s.my_warnning("库存不足!", 0, th);
  1360 + }
  1361 +
  1362 + }
  1363 + }
  1364 + })
  1365 + } else {
  1366 + if (o.store_count <= 0) return s.my_warnning("库存已为空!", 0, th);
  1367 + if (o.store_count < e.data.goodsInputNum) return s.my_warnning("库存不足!", 0, th);
  1368 + th.add_cart_next(e, t, a, o, newd); //加入购物车下一步
  1369 + }
  1370 + }
  1371 + })
1370 1372  
1371 1373 }
1372   - else if ( th.data.prom_type == 0 || th.data.prom_type == 3 || th.data.prom_type == 2 || th.data.prom_type == 4 || th.data.prom_type == 5) {
  1374 + else if (th.data.prom_type == 0 || th.data.prom_type == 3 || th.data.prom_type == 2 || th.data.prom_type == 4 || th.data.prom_type == 5) {
1373 1375 newd.prom_type = 0;
1374 1376 newd.prom_id = 0;
1375 1377  
1376 1378 //---如果是线下门店销售的时候---
1377   - if(th.data.sales_rules==2){
1378   - var pick=th.get_pick_from_list(th.data.sto_sele_id)
  1379 + if (th.data.sales_rules == 2) {
  1380 + var pick = th.get_pick_from_list(th.data.sto_sele_id)
1379 1381 //---通过接口获取门店的线下库存信息--
1380   - getApp().request.get("/api/weshop/goods/getWareStorages",{
1381   - data:{storageNos:pick.pickup_no,wareIds:encodeURIComponent(th.data.sele_g.erpwareid),storeId:os.stoid},
1382   - success:function(res){
1383   - if(res.data.code==0){
1384   - if(res.data.data.pageData.length>0){
1385   - var CanOutQty=res.data.data.pageData[0].CanOutQty;
1386   - if(CanOutQty<e.data.goodsInputNum){
  1382 + getApp().request.get("/api/weshop/goods/getWareStorages", {
  1383 + data: { storageNos: pick.pickup_no, wareIds: encodeURIComponent(th.data.sele_g.erpwareid), storeId: os.stoid },
  1384 + success: function (res) {
  1385 + if (res.data.code == 0) {
  1386 + if (res.data.data.pageData.length > 0) {
  1387 + var CanOutQty = res.data.data.pageData[0].CanOutQty;
  1388 + if (CanOutQty < e.data.goodsInputNum) {
1387 1389 return s.my_warnning("库存不足!", 0, th);
1388 1390 }
1389 1391 //在调一次接口,读取商品的预出库的数量,lock
1390   - getApp().request.get("/api/weshop/order/ware/lock/page",{
1391   - data:{store_id:os.stoid,wareId:th.data.sele_g.goods_id,storageId:pick.pickup_id,pageSize:1000},
1392   - success:function(res_data){
1393   - if(res_data.data.code==0 && res_data.data.data.total>0){
1394   -
1395   - var lock=0;
1396   - for(var i in res_data.data.data.pageData){
1397   - lock+=res_data.data.data.pageData[i].outQty;
  1392 + getApp().request.get("/api/weshop/order/ware/lock/page", {
  1393 + data: { store_id: os.stoid, wareId: th.data.sele_g.goods_id, storageId: pick.pickup_id, pageSize: 1000 },
  1394 + success: function (res_data) {
  1395 + if (res_data.data.code == 0 && res_data.data.data.total > 0) {
  1396 +
  1397 + var lock = 0;
  1398 + for (var i in res_data.data.data.pageData) {
  1399 + lock += res_data.data.data.pageData[i].outQty;
1398 1400 }
1399 1401  
1400   - if(CanOutQty<=lock){
  1402 + if (CanOutQty <= lock) {
1401 1403 return s.my_warnning("库存不足!", 0, th);
1402 1404 }
1403   - th.add_cart_next(e,t,a,o,newd,CanOutQty-lock);
1404   - }else{
1405   - th.add_cart_next(e,t,a,o,newd,CanOutQty);
  1405 + th.add_cart_next(e, t, a, o, newd, CanOutQty - lock);
  1406 + } else {
  1407 + th.add_cart_next(e, t, a, o, newd, CanOutQty);
1406 1408 }
1407 1409 }
1408 1410 })
1409   - }else{
  1411 + } else {
1410 1412 return s.my_warnning("库存不足!", 0, th);
1411 1413 }
1412 1414  
1413 1415 }
1414 1416 }
1415 1417 })
1416   - }else{
  1418 + } else {
1417 1419 if (o.store_count <= 0) return s.my_warnning("库存已为空!", 0, th);
1418   - if (o.store_count <e.data.goodsInputNum) return s.my_warnning("库存不足!", 0, th);
1419   - th.add_cart_next(e,t,a,o,newd); //加入购物车下一步
  1420 + if (o.store_count < e.data.goodsInputNum) return s.my_warnning("库存不足!", 0, th);
  1421 + th.add_cart_next(e, t, a, o, newd); //加入购物车下一步
1420 1422 }
1421 1423 }
1422 1424 })
1423 1425 },
1424 1426  
1425 1427 //---加入购物车的最后一步---
1426   - add_cart_next(e,t,a,o,newd,CanOutQty){
1427   - var th=this,i=getApp().request;
  1428 + add_cart_next(e, t, a, o, newd, CanOutQty) {
  1429 + var th = this, i = getApp().request;
1428 1430 //---如果商品不是积分购和拼团,要判断一个是否要进行等级价的判断------
1429   - if(o.prom_type!=1 && ((o.prom_type!=6 && o.prom_type!=4) || th.data.is_normal)){
1430   - var conf=th.data.bconfig;
1431   - if (conf.switch_list && getApp().globalData.userInfo['card_field'] && getApp().globalData.userInfo['card_expiredate']){
1432   - var s_list=JSON.parse(conf.switch_list);
1433   - var now=ut.gettimestamp();
1434   -
  1431 + if (o.prom_type != 1 && ((o.prom_type != 6 && o.prom_type != 4) || th.data.is_normal)) {
  1432 + var conf = th.data.bconfig;
  1433 + if (conf.switch_list && getApp().globalData.userInfo['card_field'] && getApp().globalData.userInfo['card_expiredate']) {
  1434 + var s_list = JSON.parse(conf.switch_list);
  1435 + var now = ut.gettimestamp();
  1436 +
1435 1437  
1436 1438 var str = getApp().globalData.userInfo['card_expiredate'].replace(/-/g, '/');
1437 1439 var end = new Date(str);
1438 1440 end = Date.parse(end) / 1000;
1439 1441  
1440 1442 //--如果后台有开启等级价的功能,而且会员的等级没有过期的情况下--
1441   - if(parseInt(s_list.rank_switch)==2 && end>now){
1442   - var card_price=o[getApp().globalData.userInfo['card_field']];
  1443 + if (parseInt(s_list.rank_switch) == 2 && end > now) {
  1444 + var card_price = o[getApp().globalData.userInfo['card_field']];
1443 1445 //如果会员有等级价
1444   - if(getApp().globalData.userInfo['card_field']!=undefined && getApp().globalData.userInfo['card_field']!=null
1445   - && getApp().globalData.userInfo['card_field']!="" && card_price>0){
1446   - newd.goods_price=card_price;
1447   - newd.member_goods_price=card_price;
  1446 + if (getApp().globalData.userInfo['card_field'] != undefined && getApp().globalData.userInfo['card_field'] != null
  1447 + && getApp().globalData.userInfo['card_field'] != "" && card_price > 0) {
  1448 + newd.goods_price = card_price;
  1449 + newd.member_goods_price = card_price;
1448 1450 }
1449 1451 }
1450 1452 }
... ... @@ -1453,7 +1455,7 @@ Page({
1453 1455 //if (this.data.data.goods.is_virtual) return this.buyVirtualGoods(d);
1454 1456 if ("add" == t.currentTarget.dataset.action) {
1455 1457  
1456   - if(th.data.prom_goods){
  1458 + if (th.data.prom_goods) {
1457 1459 newd.prom_type = 3;
1458 1460 newd.prom_id = th.data.prom_goods[0].prom_id;
1459 1461 }
... ... @@ -1466,7 +1468,7 @@ Page({
1466 1468 goods_id: a,
1467 1469 pick_id: e.data.sto_sele_id,
1468 1470 },
1469   - success: function(re) {
  1471 + success: function (re) {
1470 1472  
1471 1473 //-------如果购物车中有相关的数据---------
1472 1474 if (re.data.data.total > 0) {
... ... @@ -1474,12 +1476,12 @@ Page({
1474 1476 var item = re.data.data.pageData[0];
1475 1477  
1476 1478 //判断数量,要看下购物车中有没有该商品
1477   - if(CanOutQty){
1478   - if(item.goods_num+ th.data.goodsInputNum>CanOutQty){
  1479 + if (CanOutQty) {
  1480 + if (item.goods_num + th.data.goodsInputNum > CanOutQty) {
1479 1481 return s.my_warnning("库存不足!", 0, th);
1480 1482 }
1481   - }else{
1482   - if(item.goods_num+ th.data.goodsInputNum>o.store_count){
  1483 + } else {
  1484 + if (item.goods_num + th.data.goodsInputNum > o.store_count) {
1483 1485 return s.my_warnning("库存不足!", 0, th);
1484 1486 }
1485 1487 }
... ... @@ -1488,15 +1490,15 @@ Page({
1488 1490 id: item.id,
1489 1491 goods_num: e.data.goodsInputNum + item.goods_num,
1490 1492 goods_price: newd.goods_price,
1491   - member_goods_price:newd.goods_price,
  1493 + member_goods_price: newd.goods_price,
1492 1494 store_id: th.data.stoid,
1493 1495 };
1494 1496  
1495 1497 //---是不是从收藏夹出来的---
1496   - if(th.data.c_guide_id){
  1498 + if (th.data.c_guide_id) {
1497 1499 updata['guide_id'] = th.data.c_guide_id;
1498   - updata['guide_type']=3; //加入购物车之后就变成了3
1499   - }else {
  1500 + updata['guide_type'] = 3; //加入购物车之后就变成了3
  1501 + } else {
1500 1502 if (getApp().globalData.guide_id) {
1501 1503 updata['guide_id'] = getApp().globalData.guide_id;
1502 1504 updata['guide_type'] = 0;
... ... @@ -1505,7 +1507,7 @@ Page({
1505 1507  
1506 1508 i.put("/api/weshop/cart/update", {
1507 1509 data: updata,
1508   - success: function(t) {
  1510 + success: function (t) {
1509 1511 getApp().my_warnning('加入购物车成功', 1, th, 450);
1510 1512 var c_num = th.data.cartGoodsNum + th.data.goodsInputNum;
1511 1513 th.setData({
... ... @@ -1519,7 +1521,7 @@ Page({
1519 1521  
1520 1522 i.post("/api/weshop/cart/save", {
1521 1523 data: newd,
1522   - success: function(t) {
  1524 + success: function (t) {
1523 1525 getApp().my_warnning('加入购物车成功', 1, th, 450);
1524 1526 var c_num = th.data.cartGoodsNum + e.data.goodsInputNum;
1525 1527 th.setData({
... ... @@ -1536,20 +1538,20 @@ Page({
1536 1538 //else "exchange" == t.currentTarget.dataset.action ? this.exchange(d) : this.buyNow(d);
1537 1539 else {
1538 1540  
1539   - if(th.data.prom_goods){
1540   - var prom_d=th.data.prom_goods;
1541   - for(var i in prom_d){
  1541 + if (th.data.prom_goods) {
  1542 + var prom_d = th.data.prom_goods;
  1543 + for (var i in prom_d) {
1542 1544 //判断活动有俩种条件,0元 1件
1543   - var condition_t=prom_d[i].prom_type;
1544   - switch(condition_t) {
  1545 + var condition_t = prom_d[i].prom_type;
  1546 + switch (condition_t) {
1545 1547 case 0: //按钱
1546   - if(newd.goods_price>=condition_t){
  1548 + if (newd.goods_price >= condition_t) {
1547 1549 newd.prom_type = 3;
1548 1550 newd.prom_id = prom_d[i].prom_id;
1549 1551 }
1550 1552 break
1551 1553 case 1://按购买数量
1552   - if(newd.goods_num>=condition_t){
  1554 + if (newd.goods_num >= condition_t) {
1553 1555 newd.prom_type = 3;
1554 1556 newd.prom_id = prom_d[i].prom_id;
1555 1557 }
... ... @@ -1567,7 +1569,7 @@ Page({
1567 1569  
1568 1570  
1569 1571 //----------购买虚拟商品------
1570   - buyVirtualGoods: function(e) {
  1572 + buyVirtualGoods: function (e) {
1571 1573 Object.assign(e, {
1572 1574 goods_name: this.data.data.goods.goods_name,
1573 1575 spec_name: this.data.select.specName,
... ... @@ -1577,102 +1579,102 @@ Page({
1577 1579 });
1578 1580 },
1579 1581 //----------积分兑换---------
1580   - exchange: function(e) {
  1582 + exchange: function (e) {
1581 1583 this.data.shippingCost < 0 || this.data.select.stock <= 0 || wx.navigateTo({
1582 1584 url: "/pages/cart/integral/integral?" + t.Obj2Str(e)
1583 1585 });
1584 1586 },
1585   -
1586   -
  1587 +
  1588 +
1587 1589 //----------立即购买-----------
1588   - buyNow: function(e) {
  1590 + buyNow: function (e) {
1589 1591 // this.data.shippingCost < 0 || this.data.select.stock <= 0 || (Object.assign(e, {
1590 1592 // action: "buy_now"
1591 1593 // }),
1592 1594 this.setData({
1593   - openSpecModal:0,
1594   - openSpecModal_inte:0,
1595   - openSpecModal_inte_normal:0,
1596   - openSpecModal_pt:0,
  1595 + openSpecModal: 0,
  1596 + openSpecModal_inte: 0,
  1597 + openSpecModal_inte_normal: 0,
  1598 + openSpecModal_pt: 0,
1597 1599 })
1598   -
1599   - if(e.prom_type==4){
1600   - s.set_b_now(e);
1601   - var url="/pages/cart/cart2_inte/cart2_inte?is_bnow=1&goods_id=" + e.goods_id;
1602   - getApp().goto(url);
1603   - }else{
1604   - //要判断积分购的普通购买有没有参加优惠活动
1605   - if(e.is_integral_normal==1){
1606   - this.check_nor_promgood(e.goods_id,function(res){
1607   - if(res && res.cat_id){
1608   - e.prom_type=3;
1609   - e.prom_id=res.cat_id
1610   - }
1611   - s.set_b_now(e);
1612   - /*--
1613   - wx.redirectTo({
1614   - url: "/pages/cart/cart2/cart2?is_bnow=1&goods_id=" + e.goods_id,
1615   - });--*/
1616   - getApp().goto("/pages/cart/cart2/cart2?is_bnow=1&goods_id=" + e.goods_id)
1617   -
1618   - })
1619   - }else{
1620   - s.set_b_now(e);
1621   - /*--
1622   - wx.redirectTo({
1623   - url: "/pages/cart/cart2/cart2?is_bnow=1&goods_id=" + e.goods_id,
1624   - });--*/
1625   - getApp().goto("/pages/cart/cart2/cart2?is_bnow=1&goods_id=" + e.goods_id)
1626   - }
1627   -
1628   - }
  1600 +
  1601 + if (e.prom_type == 4) {
  1602 + s.set_b_now(e);
  1603 + var url = "/pages/cart/cart2_inte/cart2_inte?is_bnow=1&goods_id=" + e.goods_id;
  1604 + getApp().goto(url);
  1605 + } else {
  1606 + //要判断积分购的普通购买有没有参加优惠活动
  1607 + if (e.is_integral_normal == 1) {
  1608 + this.check_nor_promgood(e.goods_id, function (res) {
  1609 + if (res && res.cat_id) {
  1610 + e.prom_type = 3;
  1611 + e.prom_id = res.cat_id
  1612 + }
  1613 + s.set_b_now(e);
  1614 + /*--
  1615 + wx.redirectTo({
  1616 + url: "/pages/cart/cart2/cart2?is_bnow=1&goods_id=" + e.goods_id,
  1617 + });--*/
  1618 + getApp().goto("/pages/cart/cart2/cart2?is_bnow=1&goods_id=" + e.goods_id)
  1619 +
  1620 + })
  1621 + } else {
  1622 + s.set_b_now(e);
  1623 + /*--
  1624 + wx.redirectTo({
  1625 + url: "/pages/cart/cart2/cart2?is_bnow=1&goods_id=" + e.goods_id,
  1626 + });--*/
  1627 + getApp().goto("/pages/cart/cart2/cart2?is_bnow=1&goods_id=" + e.goods_id)
  1628 + }
  1629 +
  1630 + }
1629 1631 },
1630 1632  
1631 1633 //----------增加购买数量-----------
1632   - addCartNum: function(t) {
  1634 + addCartNum: function (t) {
1633 1635 this.checkCartNum(this.data.goodsInputNum + 1);
1634 1636 },
1635 1637 //----------减少购买数量-----------
1636   - subCartNum: function(t) {
  1638 + subCartNum: function (t) {
1637 1639 this.checkCartNum(this.data.goodsInputNum - 1);
1638 1640 },
1639 1641 //----------输入框输入购买数量-----------
1640   - inputCartNum: function(t) {
  1642 + inputCartNum: function (t) {
1641 1643 this.checkCartNum(Number(t.detail.value));
1642 1644 },
1643   -
  1645 +
1644 1646 //----------增加购买数量-----------
1645   - addCartNum_inte: function(t) {
  1647 + addCartNum_inte: function (t) {
1646 1648 this.checkCartNum_inte(this.data.goodsInputNum + 1);
1647 1649 },
1648 1650 //----------减少购买数量-----------
1649   - subCartNum_inte: function(t) {
  1651 + subCartNum_inte: function (t) {
1650 1652 this.checkCartNum_inte(this.data.goodsInputNum - 1);
1651 1653 },
1652 1654 //----------输入框输入购买数量-----------
1653   - inputCartNum_inte: function(t) {
  1655 + inputCartNum_inte: function (t) {
1654 1656 this.checkCartNum_inte(Number(t.detail.value));
1655 1657 },
1656   -
  1658 +
1657 1659  
1658 1660 //------检查数量是不是超出限购------
1659   - checkCartNum: function(t) {
  1661 + checkCartNum: function (t) {
1660 1662 var th = this;
1661   - this.get_buy_num(this.data.sele_g, async function() {
  1663 + this.get_buy_num(this.data.sele_g, async function () {
1662 1664  
1663 1665 //--判断商品是否超出限购--
1664 1666 if (th.data.g_buy_num != null && th.data.sele_g.viplimited > 0) {
1665 1667  
1666   - var gd_buy_num=th.data.g_buy_num.get(th.data.sele_g.goods_id);
  1668 + var gd_buy_num = th.data.g_buy_num.get(th.data.sele_g.goods_id);
1667 1669  
1668 1670 if (t + gd_buy_num > th.data.sele_g.viplimited) {
1669 1671 wx.showModal({
1670 1672 title: '超出商品限购',
1671 1673 });
1672 1674  
1673   - var num= th.data.sele_g.viplimited-gd_buy_num;
1674   - if(num<0) num=0;
1675   - th.setData({goodsInputNum:num})
  1675 + var num = th.data.sele_g.viplimited - gd_buy_num;
  1676 + if (num < 0) num = 0;
  1677 + th.setData({ goodsInputNum: num })
1676 1678 return false;
1677 1679 }
1678 1680 }
... ... @@ -1684,9 +1686,9 @@ Page({
1684 1686 title: '超出商品活动限购',
1685 1687 });
1686 1688  
1687   - var num=th.data.prom_buy_limit- th.data.prom_buy_num ;
1688   - if(num<0) num=0;
1689   - th.setData({goodsInputNum:num})
  1689 + var num = th.data.prom_buy_limit - th.data.prom_buy_num;
  1690 + if (num < 0) num = 0;
  1691 + th.setData({ goodsInputNum: num })
1690 1692 return false;
1691 1693 }
1692 1694 }
... ... @@ -1695,7 +1697,7 @@ Page({
1695 1697 var redis_num = 0;
1696 1698 //------判断活动是否抢光-----
1697 1699 await getApp().request.promiseGet("/api/weshop/activitylist/getActLen/" +
1698   - os.stoid + "/" + th.data.sele_g.prom_type + "/" + th.data.sele_g.prom_id, {
  1700 + os.stoid + "/" + th.data.sele_g.prom_type + "/" + th.data.sele_g.prom_id, {
1699 1701 1: 1
1700 1702 }).then(res => {
1701 1703 redis_num = res.data.data;
... ... @@ -1705,131 +1707,133 @@ Page({
1705 1707 wx.showModal({
1706 1708 title: '超出商品活动库存',
1707 1709 });
1708   - th.setData({goodsInputNum:redis_num})
  1710 + th.setData({ goodsInputNum: redis_num })
1709 1711 return false;
1710 1712 }
1711 1713 }
1712 1714 var e = th.data.sele_g.store_count;
1713   - var p_type=th.data.prom_type; //&& p_type!=1 && p_type!=4
1714   - if(th.data.sales_rules==2 && (p_type!=1 && p_type!=4 && p_type!=6 || th.data.openSpecModal_inte_normal==1 || th.data.is_normal== 1) ){
1715   - if(!th.data.def_pick_store){
  1715 + var p_type = th.data.prom_type; //&& p_type!=1 && p_type!=4
  1716 + if (th.data.sales_rules == 2 && (p_type != 1 && p_type != 4 && p_type != 6 || th.data.openSpecModal_inte_normal == 1 || th.data.is_normal == 1)) {
  1717 + if (!th.data.def_pick_store) {
1716 1718 wx.showModal({ title: '请选择门店', });
1717 1719 return false;
1718   - }else{
1719   - e=th.data.def_pick_store.CanOutQty;
  1720 + } else {
  1721 + e = th.data.def_pick_store.CanOutQty;
1720 1722 }
1721 1723 }
1722   - if(!e) e=0;
  1724 + if (!e) e = 0;
1723 1725 //库存不足,不增加
1724   - if(e<t){ wx.showModal({ title: '库存不足', });
1725   - if(e<0) e=0;
1726   - th.setData({ goodsInputNum: e }); return false;
  1726 + if (e < t) {
  1727 + wx.showModal({ title: '库存不足', });
  1728 + if (e < 0) e = 0;
  1729 + th.setData({ goodsInputNum: e }); return false;
1727 1730 }
1728 1731 t > e || 0 == e ? t = e : t < 1 && (t = 1);
1729 1732 th.setData({ goodsInputNum: t });
1730   - th.is_show_more_buy();
  1733 + th.is_show_more_buy();
1731 1734  
1732 1735 })
1733 1736 },
1734 1737  
1735 1738 //----- 检查一下积分购的限购之类的问题 -----
1736   - checkCartNum_inte: function(t) {
  1739 + checkCartNum_inte: function (t) {
1737 1740 var th = this;
1738   - this.get_buy_num(this.data.data, async function() {
1739   -
  1741 + this.get_buy_num(this.data.data, async function () {
  1742 +
1740 1743 //--判断商品是否超出限购--
1741 1744 if (th.data.g_buy_num != null && th.data.data.viplimited > 0) {
1742   -
1743   - var gd_buy_num=th.data.g_buy_num.get(th.data.sele_g.goods_id);
1744   -
  1745 +
  1746 + var gd_buy_num = th.data.g_buy_num.get(th.data.sele_g.goods_id);
  1747 +
1745 1748 if (t + gd_buy_num > th.data.sele_g.viplimited) {
1746 1749 wx.showModal({
1747 1750 title: '超出商品限购',
1748 1751 });
1749   -
1750   - var num= th.data.sele_g.viplimited-gd_buy_num;
1751   - if(num<0) num=0;
1752   - th.setData({goodsInputNum:num})
  1752 +
  1753 + var num = th.data.sele_g.viplimited - gd_buy_num;
  1754 + if (num < 0) num = 0;
  1755 + th.setData({ goodsInputNum: num })
1753 1756 return false;
1754 1757 }
1755 1758 }
1756   -
  1759 +
1757 1760 //--判断商品是否超出活动限购--
1758 1761 if (th.data.prom_buy_num != -1 && th.data.prom_buy_limit > 0) {
1759 1762 if (t + th.data.prom_buy_num > th.data.prom_buy_limit) {
1760 1763 wx.showModal({
1761 1764 title: '超出商品活动限购',
1762 1765 });
1763   -
1764   - var num=th.data.prom_buy_limit- th.data.prom_buy_num ;
1765   - if(num<0) num=0;
1766   - th.setData({goodsInputNum:num})
  1766 +
  1767 + var num = th.data.prom_buy_limit - th.data.prom_buy_num;
  1768 + if (num < 0) num = 0;
  1769 + th.setData({ goodsInputNum: num })
1767 1770 return false;
1768 1771 }
1769 1772 }
1770   -
  1773 +
1771 1774 if (th.data.sele_g.prom_type == 1 || th.data.sele_g.prom_type == 6) {
1772 1775 var redis_num = 0;
1773 1776 //------判断活动是否抢光-----
1774 1777 await getApp().request.promiseGet("/api/weshop/activitylist/getActLen/" +
1775   - os.stoid + "/" + th.data.sele_g.prom_type + "/" + th.data.sele_g.prom_id, {
  1778 + os.stoid + "/" + th.data.sele_g.prom_type + "/" + th.data.sele_g.prom_id, {
1776 1779 1: 1
1777 1780 }).then(res => {
1778 1781 redis_num = res.data.data;
1779 1782 });
1780   -
  1783 +
1781 1784 if (t > redis_num) {
1782 1785 wx.showModal({
1783 1786 title: '超出商品活动库存',
1784 1787 });
1785   - th.setData({goodsInputNum:redis_num})
  1788 + th.setData({ goodsInputNum: redis_num })
1786 1789 return false;
1787 1790 }
1788   -
  1791 +
1789 1792 }
1790   -
  1793 +
1791 1794 var e = th.data.sele_g.store_count;
1792   - var p_type=th.data.prom_type; //&& p_type!=1 && p_type!=4
1793   - if(th.data.sales_rules==2 && (p_type!=1 && p_type!=4 && p_type!=6 || th.data.openSpecModal_inte_normal==1 || th.data.is_normal== 1) ){
1794   - if(!th.data.def_pick_store){
  1795 + var p_type = th.data.prom_type; //&& p_type!=1 && p_type!=4
  1796 + if (th.data.sales_rules == 2 && (p_type != 1 && p_type != 4 && p_type != 6 || th.data.openSpecModal_inte_normal == 1 || th.data.is_normal == 1)) {
  1797 + if (!th.data.def_pick_store) {
1795 1798 wx.showModal({ title: '请选择门店', });
1796 1799 return false;
1797   - }else{
1798   - e=th.data.def_pick_store.CanOutQty;
  1800 + } else {
  1801 + e = th.data.def_pick_store.CanOutQty;
1799 1802 }
1800 1803 }
1801   - if(!e) e=0;
  1804 + if (!e) e = 0;
1802 1805 //库存不足,不增加
1803   - if(e<t){ wx.showModal({ title: '库存不足', });
1804   - if(e<0) e=0;
1805   - th.setData({ goodsInputNum: e }); return false;
  1806 + if (e < t) {
  1807 + wx.showModal({ title: '库存不足', });
  1808 + if (e < 0) e = 0;
  1809 + th.setData({ goodsInputNum: e }); return false;
1806 1810 }
1807 1811 t > e || 0 == e ? t = e : t < 1 && (t = 1);
1808   - th.setData({ goodsInputNum: t });
  1812 + th.setData({ goodsInputNum: t });
1809 1813 })
1810 1814 },
1811 1815  
1812 1816  
1813   - closeSpecModal: function() {
1814   - if(this.data.openSpecModal_pt && this.data.is_normal){
1815   - this.get_sto();
1816   - this.setData({
1817   - sele_g:this.data.data,
1818   - gid:this.data.data.goods_id
1819   - })
1820   -
1821   - this.sele_spec_chech_activity();
1822   -
1823   - }
1824   -
  1817 + closeSpecModal: function () {
  1818 + if (this.data.openSpecModal_pt && this.data.is_normal) {
  1819 + this.get_sto();
  1820 + this.setData({
  1821 + sele_g: this.data.data,
  1822 + gid: this.data.data.goods_id
  1823 + })
  1824 +
  1825 + this.sele_spec_chech_activity();
  1826 +
  1827 + }
  1828 +
1825 1829 this.setData({
1826 1830 openSpecModal: !1,
1827 1831 openSpecModal_pt: !1
1828 1832 });
1829 1833 },
1830   -
1831   - openSpecModel: function(t) {
1832   - var th=this;
  1834 +
  1835 + openSpecModel: function (t) {
  1836 + var th = this;
1833 1837 var open_store = t.currentTarget.dataset.ind;
1834 1838 this.setData({
1835 1839 store: 0,
... ... @@ -1849,7 +1853,7 @@ Page({
1849 1853 var ind = t.currentTarget.dataset.ind;
1850 1854  
1851 1855 //回调。判断是不是优惠促销
1852   - th.check_is_prom_goods(function (){
  1856 + th.check_is_prom_goods(function () {
1853 1857 th.setData({
1854 1858 openSpecModal: !0,
1855 1859 openSpecModal_ind: ind,
... ... @@ -1858,127 +1862,129 @@ Page({
1858 1862 th.get_off_price();
1859 1863 })
1860 1864 },
1861   -
  1865 +
1862 1866 //判断是不是优惠促销
1863   - check_is_prom_goods:function(callback){
1864   - var th=this;
1865   - var usr=getApp().globalData.userInfo;
1866   - if(this.data.sele_g.prom_type!=0 && this.data.sele_g.prom_type!=3){
1867   - callback();
1868   - }else{
1869   - //-- 判断有没有优惠活动 --
1870   - getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid+"/"+th.data.sele_g.goods_id+"/0", {}).then(res => {
1871   - if(res.data.code==0){
1872   - var r_data=res.data.data;
1873   - th.data.prom_goods=r_data.promGoodsLists;
1874   - if(!th.data.prom_goods){
1875   - callback();
1876   - return false;
1877   - }
1878   -
1879   - ///api/weshop/order/getWPayOrder?store_id=1&user_id=5682366&prom_id=1&goods_id=1
1880   - getApp().promiseGet("/api/weshop/order/getWPayOrder",{
1881   - data:{store_id:os.stoid,user_id:usr.user_id,goods_id:th.data.sele_g.goods_id,prom_id:th.data.prom_goods[0].prom_id}
1882   - }).then(res=>{
1883   - if(res.data.code==0){
1884   - wx.showToast({
1885   - title: "您已经购买了该商品待支付中",
1886   - icon: 'none',
1887   - duration: 2000
1888   - })
1889   - setTimeout(function (){
1890   - getApp().goto("/pages/user/order_detail/order_detail?order_id=" + res.data.data.order_id,)
1891   - },1000)
1892   - }
1893   - //未找到相关记录
1894   - else{
1895   - callback();
1896   - }
1897   - })
1898   - }
1899   -
1900   - })
1901   -
1902   - }
1903   - },
1904   -
1905   -
1906   -
  1867 + check_is_prom_goods: function (callback) {
  1868 + var th = this;
  1869 + var usr = getApp().globalData.userInfo;
  1870 + if (this.data.sele_g.prom_type != 0 && this.data.sele_g.prom_type != 3) {
  1871 + callback();
  1872 + } else {
  1873 + //-- 判断有没有优惠活动 --
  1874 + getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid + "/" + th.data.sele_g.goods_id + "/0", {}).then(res => {
  1875 + if (res.data.code == 0) {
  1876 + var r_data = res.data.data;
  1877 + th.data.prom_goods = r_data.promGoodsLists;
  1878 + if (!th.data.prom_goods) {
  1879 + callback();
  1880 + return false;
  1881 + }
  1882 +
  1883 + ///api/weshop/order/getWPayOrder?store_id=1&user_id=5682366&prom_id=1&goods_id=1
  1884 + getApp().promiseGet("/api/weshop/order/getWPayOrder", {
  1885 + data: { store_id: os.stoid, user_id: usr.user_id, goods_id: th.data.sele_g.goods_id, prom_id: th.data.prom_goods[0].prom_id }
  1886 + }).then(res => {
  1887 + if (res.data.code == 0) {
  1888 + wx.showToast({
  1889 + title: "您已经购买了该商品待支付中",
  1890 + icon: 'none',
  1891 + duration: 2000
  1892 + })
  1893 + setTimeout(function () {
  1894 + getApp().goto("/pages/user/order_detail/order_detail?order_id=" + res.data.data.order_id,)
  1895 + }, 1000)
  1896 + }
  1897 + //未找到相关记录
  1898 + else {
  1899 + callback();
  1900 + }
  1901 + })
  1902 + }
  1903 +
  1904 + })
  1905 +
  1906 + }
  1907 + },
  1908 +
  1909 +
  1910 +
1907 1911 //----获取线下价格-------
1908   - get_off_price(){
1909   - var th=this;
1910   - //没有开启就返回
1911   - if(!th.data.is_open_offline) return false;
1912   - //先看下购买的功能有没有到期
1913   - getApp().request.promiseGet("/store/storemoduleendtime/page?store_id=" +os.stoid + "&type=6",{}).then(res=>{
1914   - //未购买
1915   - if(res.data.code!=0 || !res.data.data || !res.data.data.pageData || !res.data.data.pageData.length){
1916   - return false;
1917   - }else{
1918   - //已经过期
1919   - var item=res.data.data.pageData[0];
1920   - if(item.end_time<ut.gettimestamp()){
1921   - return false;
1922   - }
1923   - }
1924   -
1925   -
1926   - var cur_goods=this.data.sele_g;
1927   - var cur_price=cur_goods.shop_price;
1928   - if(th.data.card_field && cur_goods[th.data.card_field]>0){
1929   - cur_price=cur_goods[th.data.card_field];
1930   - }
1931   -
1932   - var user_info = getApp().globalData.userInfo;
1933   - //获取一下接口,判断是不是有线下接口,必须是普通商品,全局优惠活动也是不行
1934   - if(cur_goods.prom_type==0 && !this.data.prom_goods){
1935   - cur_goods.offline_price=null;
1936   - //如果没有门店,不用计算线下价格
1937   - var def_pick_store=this.data.def_pick_store;
1938   - if(!def_pick_store) return false;
1939   - getApp().request.get("/api/weshop/goods/listWarePrice", {
1940   - data:{VIPId:encodeURIComponent(user_info.erpvipid),
1941   - store_id:os.stoid,
1942   - PickupId:def_pick_store.pickup_id,
1943   - WareIds:encodeURIComponent(cur_goods.erpwareid)},
1944   - success:function(res){
1945   - if(res.data.code==0 && res.data.data && res.data.data.length>0){
1946   - var datalist=res.data.data;
1947   - if(datalist[0].WarePrice<cur_price){
1948   - cur_goods.offline_price=datalist[0].WarePrice; //存储线下活动的价格
1949   - cur_goods.pricing_type=datalist[0].PriceType; //存储线下活动的类型
1950   - }
1951   - }
1952   - th.setData({sele_g:cur_goods});
1953   - }
1954   -
1955   - })
1956   - }
1957   -
1958   - })
1959   -
1960   -
1961   - },
1962   -
1963   -
  1912 + get_off_price() {
  1913 + var th = this;
  1914 + //没有开启就返回
  1915 + if (!th.data.is_open_offline) return false;
  1916 + //先看下购买的功能有没有到期
  1917 + getApp().request.promiseGet("/store/storemoduleendtime/page?store_id=" + os.stoid + "&type=6", {}).then(res => {
  1918 + //未购买
  1919 + if (res.data.code != 0 || !res.data.data || !res.data.data.pageData || !res.data.data.pageData.length) {
  1920 + return false;
  1921 + } else {
  1922 + //已经过期
  1923 + var item = res.data.data.pageData[0];
  1924 + if (item.end_time < ut.gettimestamp()) {
  1925 + return false;
  1926 + }
  1927 + }
  1928 +
  1929 +
  1930 + var cur_goods = this.data.sele_g;
  1931 + var cur_price = cur_goods.shop_price;
  1932 + if (th.data.card_field && cur_goods[th.data.card_field] > 0) {
  1933 + cur_price = cur_goods[th.data.card_field];
  1934 + }
  1935 +
  1936 + var user_info = getApp().globalData.userInfo;
  1937 + //获取一下接口,判断是不是有线下接口,必须是普通商品,全局优惠活动也是不行
  1938 + if (cur_goods.prom_type == 0 && !this.data.prom_goods) {
  1939 + cur_goods.offline_price = null;
  1940 + //如果没有门店,不用计算线下价格
  1941 + var def_pick_store = this.data.def_pick_store;
  1942 + if (!def_pick_store) return false;
  1943 + getApp().request.get("/api/weshop/goods/listWarePrice", {
  1944 + data: {
  1945 + VIPId: encodeURIComponent(user_info.erpvipid),
  1946 + store_id: os.stoid,
  1947 + PickupId: def_pick_store.pickup_id,
  1948 + WareIds: encodeURIComponent(cur_goods.erpwareid)
  1949 + },
  1950 + success: function (res) {
  1951 + if (res.data.code == 0 && res.data.data && res.data.data.length > 0) {
  1952 + var datalist = res.data.data;
  1953 + if (datalist[0].WarePrice < cur_price) {
  1954 + cur_goods.offline_price = datalist[0].WarePrice; //存储线下活动的价格
  1955 + cur_goods.pricing_type = datalist[0].PriceType; //存储线下活动的类型
  1956 + }
  1957 + }
  1958 + th.setData({ sele_g: cur_goods });
  1959 + }
  1960 +
  1961 + })
  1962 + }
  1963 +
  1964 + })
  1965 +
  1966 +
  1967 + },
  1968 +
  1969 +
1964 1970 //---------点击收藏和不收藏------------
1965   - collectGoods: function() {
  1971 + collectGoods: function () {
1966 1972 var t = this,
1967   - i = getApp().request;
  1973 + i = getApp().request;
1968 1974 var user_id = s.globalData.user_id;
1969 1975 if (user_id == '') {
1970   - getApp().getUserFir(function() {});
  1976 + getApp().getUserFir(function () { });
1971 1977 getApp().showWarning("未登录");
1972 1978 return false;
1973 1979 } else {
1974 1980  
1975   - if(t.data.is_collect_load) return false;
1976   - t.data.is_collect_load=1;
  1981 + if (t.data.is_collect_load) return false;
  1982 + t.data.is_collect_load = 1;
1977 1983  
1978 1984 if (t.data.is_collect == 1) { //删除收藏
1979 1985 i.delete("/api/weshop/goodscollect/del/" + o.stoid + "/" + t.data.collect_id, {
1980   - success: function(e) {
1981   - t.data.is_collect_load=0;
  1986 + success: function (e) {
  1987 + t.data.is_collect_load = 0;
1982 1988 if (e.data.code == 0) {
1983 1989 t.setData({
1984 1990 is_collect: 0,
... ... @@ -1997,15 +2003,15 @@ Page({
1997 2003 add_time: timestamp,
1998 2004 };
1999 2005 //加入收藏夹就是导购的ID
2000   - if(getApp().globalData.guide_id){
2001   - d.guide_id=getApp().globalData.guide_id;
2002   - d.guide_type=2;
  2006 + if (getApp().globalData.guide_id) {
  2007 + d.guide_id = getApp().globalData.guide_id;
  2008 + d.guide_type = 2;
2003 2009 }
2004 2010  
2005 2011 i.post("/api/weshop/goodscollect/save", { //添加收藏
2006 2012 data: d,
2007   - success: function(e) {
2008   - t.data.is_collect_load=0;
  2013 + success: function (e) {
  2014 + t.data.is_collect_load = 0;
2009 2015 if (e.data.code == 0) {
2010 2016 t.setData({
2011 2017 is_collect: 1,
... ... @@ -2019,13 +2025,13 @@ Page({
2019 2025 },
2020 2026  
2021 2027 //---------联系客服------------
2022   - contactService: function() {
2023   - s.getConfig(function(t) {
  2028 + contactService: function () {
  2029 + s.getConfig(function (t) {
2024 2030 if (t.store_tel == undefined) {
2025 2031 getApp().request.get("/api/weshop/store/get/" + os.stoid, {
2026 2032 isShowLoading: 1,
2027 2033 data: {},
2028   - success: function(rs) {
  2034 + success: function (rs) {
2029 2035 getApp().globalData.config = rs.data.data;
2030 2036 if (rs.data.data.store_tel == null && rs.data.data.store_tel == undefined) {
2031 2037 getApp().my_warnning("商家未设置电话", 0, th);
... ... @@ -2040,44 +2046,44 @@ Page({
2040 2046 });
2041 2047 },
2042 2048 //-------获取购物车数量----------
2043   - requestCardNum: function() {
  2049 + requestCardNum: function () {
2044 2050 var t = this;
2045 2051 getApp().request.get("/api/weshop/cart/page", {
2046 2052 data: {
2047 2053 store_id: o.stoid,
2048 2054 user_id: s.globalData.user_id,
2049   - state:0,
2050   - is_gift:0
  2055 + state: 0,
  2056 + is_gift: 0
2051 2057 },
2052   - success: function(e) {
  2058 + success: function (e) {
2053 2059 var num = 0;
2054 2060 for (var i = 0; i < e.data.data.pageData.length; i++) {
2055 2061 num += e.data.data.pageData[i].goods_num;
2056 2062 }
2057 2063  
2058 2064 //-- 读取服务卡的数量 --
2059   - getApp().promiseGet("/api/weshop/cartService/page",{
2060   - data:{
  2065 + getApp().promiseGet("/api/weshop/cartService/page", {
  2066 + data: {
2061 2067 store_id: s.globalData.setting.stoid,
2062 2068 user_id: s.globalData.user_id,
2063 2069 }
2064   - }).then(res=>{
  2070 + }).then(res => {
2065 2071 for (var i = 0; i < res.data.data.pageData.length; i++) {
2066 2072 num += res.data.data.pageData[i].goods_num;
2067 2073 }
2068   - t.setData({cartGoodsNum:num});
  2074 + t.setData({ cartGoodsNum: num });
2069 2075 })
2070 2076 }
2071 2077 });
2072 2078 },
2073 2079  
2074   - previewCommentImgs: function(t) {
  2080 + previewCommentImgs: function (t) {
2075 2081 var e = this.data.comments[t.currentTarget.dataset.cidx].img;
2076 2082 var b = e.slice()
2077   - for(var i in b){
  2083 + for (var i in b) {
2078 2084 b[i] = this.data.iurl + e[i];
2079 2085 }
2080   - this.data.show_prew_img=1;
  2086 + this.data.show_prew_img = 1;
2081 2087  
2082 2088 wx.previewImage({
2083 2089 current: b[t.currentTarget.dataset.id],
... ... @@ -2085,106 +2091,106 @@ Page({
2085 2091 });
2086 2092 },
2087 2093  
2088   - previewCommentImgs_w: function(t) {
  2094 + previewCommentImgs_w: function (t) {
2089 2095 var e = this.data.comments[t.currentTarget.dataset.cidx].weapp_img;
2090 2096 var b = e.slice()
2091 2097 for (var i in b) {
2092 2098 b[i] = this.data.iurl + e[i];
2093 2099 }
2094   - this.data.show_prew_img=1;
  2100 + this.data.show_prew_img = 1;
2095 2101 wx.previewImage({
2096 2102 current: b[t.currentTarget.dataset.id],
2097 2103 urls: b
2098 2104 });
2099 2105 },
2100 2106  
2101   - previewGoodsCommentImgs: function(t) {
  2107 + previewGoodsCommentImgs: function (t) {
2102 2108 var e = this,
2103   - a = this.data.data.comment[t.currentTarget.dataset.cidx].img;
2104   - a = a.map(function(t) {
  2109 + a = this.data.data.comment[t.currentTarget.dataset.cidx].img;
  2110 + a = a.map(function (t) {
2105 2111 return e.data.url + t;
2106 2112 }), wx.previewImage({
2107 2113 current: a[t.currentTarget.dataset.id],
2108 2114 urls: a
2109 2115 });
2110   - this.data.show_prew_img=1;
  2116 + this.data.show_prew_img = 1;
2111 2117 },
2112   - closePromModal: function() {
  2118 + closePromModal: function () {
2113 2119 this.setData({
2114 2120 openPromModal: !1
2115 2121 });
2116 2122 },
2117   - openPromModal: function() {
  2123 + openPromModal: function () {
2118 2124 this.setData({
2119 2125 openPromModal: !0
2120 2126 });
2121 2127 },
2122 2128  
2123 2129 //--点击分享事件---
2124   - onShareAppMessage: function(t) {
2125   -
  2130 + onShareAppMessage: function (t) {
  2131 +
2126 2132 var th = this;
2127 2133 var price = th.data.data.shop_price;
2128 2134 if (th.data.prom_act) {
2129 2135 price = th.data.prom_act.price;
2130 2136  
2131 2137 }
2132   - var title= th.data.data.goods_name;
2133   - var img=th.data.data.original_img;
2134   - if(th.data.prom_type==6 || th.data.prom_type==1 || th.data.prom_type==4){
2135   - title=th.data.prom_act.share_title;
2136   - if(!title) title=th.data.prom_act.title;
2137   - if(th.data.prom_type==4) title=th.data.prom_act.name;
2138   -
2139   - if(th.data.prom_act.share_imgurl)
2140   - img=th.data.iurl+th.data.prom_act.share_imgurl;
  2138 + var title = th.data.data.goods_name;
  2139 + var img = th.data.data.original_img;
  2140 + if (th.data.prom_type == 6 || th.data.prom_type == 1 || th.data.prom_type == 4) {
  2141 + title = th.data.prom_act.share_title;
  2142 + if (!title) title = th.data.prom_act.title;
  2143 + if (th.data.prom_type == 4) title = th.data.prom_act.name;
  2144 +
  2145 + if (th.data.prom_act.share_imgurl)
  2146 + img = th.data.iurl + th.data.prom_act.share_imgurl;
  2147 + }
  2148 +
  2149 +
  2150 + var url = "/pages/goods/goodsInfo/goodsInfo?goods_id=" + th.data.gid;
  2151 + if (getApp().globalData.user_id) {
  2152 + url += "&first_leader=" + getApp().globalData.user_id;
2141 2153 }
2142 2154  
2143   -
2144   - var url="/pages/goods/goodsInfo/goodsInfo?goods_id=" + th.data.gid;
2145   - if(getApp().globalData.user_id){
2146   - url+="&first_leader="+getApp().globalData.user_id;
  2155 + //-- 如果房间分享,且不是会员分享的 --
  2156 + if (getApp().globalData.room_id &&
  2157 + th.data.data.goods_id == getApp().globalData.room_goods_id &&
  2158 + !getApp().globalData.room_user_share
  2159 + ) {
  2160 + url += "&room_id=" + getApp().globalData.room_id + "&room_user_share=1";
2147 2161 }
2148   -
2149   - //-- 如果房间分享,且不是会员分享的 --
2150   - if(getApp().globalData.room_id &&
2151   - th.data.data.goods_id==getApp().globalData.room_goods_id &&
2152   - !getApp().globalData.room_user_share
2153   - ){
2154   - url+="&room_id="+getApp().globalData.room_id+"&room_user_share=1";
2155   - }
2156   -
2157   - var ob={
2158   - title: price + "元 " +title,
2159   - path:url,
  2162 +
  2163 + var ob = {
  2164 + title: price + "元 " + title,
  2165 + path: url,
2160 2166 imageUrl: img,
2161   - };
2162   - if(th.data.prom_type==6){
2163   - title+='\n'+th.data.prom_act.share_remark;
2164   - ob.title=title;
2165   - ob.desc=th.data.prom_act.share_remark;
2166   - }
2167   -
2168   - //如果是积分购的时候
2169   - if(th.data.prom_type==4){
2170   - var name = th.data.prom_act.name;
2171   - //-- 积分购的 --
2172   - var pri0 = th.data.prom_act.addmoney;
2173   - var integral=th.data.prom_act.integral;
2174   - var text="";
2175   - if(integral){text=integral+"积分"; }
2176   - if(pri0 && integral){ text+="+";}
2177   - if(pri0){ text+="¥"+pri0;}
2178   -
2179   - ob.title= text+" "+name;
2180   - }
2181   -
  2167 + };
  2168 + if (th.data.prom_type == 6) {
  2169 + title += '\n' + th.data.prom_act.share_remark;
  2170 + ob.title = title;
  2171 + ob.desc = th.data.prom_act.share_remark;
  2172 + }
  2173 +
  2174 + //如果是积分购的时候
  2175 + if (th.data.prom_type == 4) {
  2176 + var name = th.data.prom_act.name;
  2177 + //-- 积分购的 --
  2178 + var pri0 = th.data.prom_act.addmoney;
  2179 + var integral = th.data.prom_act.integral;
  2180 + var text = "";
  2181 + if (integral) { text = integral + "积分"; }
  2182 + if (pri0 && integral) { text += "+"; }
  2183 + if (pri0) { text += "¥" + pri0; }
  2184 +
  2185 + ob.title = text + " " + name;
  2186 + }
  2187 +
2182 2188 return ob;
2183   -
  2189 +
2184 2190 },
2185 2191  
2186 2192 //-----图片失败,默认图片-----
2187   - bind_bnerr: function(e) {
  2193 + bind_bnerr: function (e) {
2188 2194 var _errImg = e.target.dataset.errorimg;
2189 2195 var _errObj = {};
2190 2196 _errObj[_errImg] = this.data.iurl + "/miniapp/images/default_g_img.gif";
... ... @@ -2192,7 +2198,7 @@ Page({
2192 2198 },
2193 2199  
2194 2200 //-----图片失败,默认图片-----
2195   - bind_bnerr2: function(e) {
  2201 + bind_bnerr2: function (e) {
2196 2202  
2197 2203 var _errImg = e.target.dataset.errorimg;
2198 2204 var _errObj = {};
... ... @@ -2202,76 +2208,79 @@ Page({
2202 2208  
2203 2209 //----------装载同一条形码的商品----------
2204 2210 async get_sku(stoid, gd, g_id, is_normal, func) {
2205   - var tt = this,arrdata=null;
2206   - var now=ut.gettimestamp();
  2211 + console.log('get_sku');
  2212 + var tt = this, arrdata = null;
  2213 + var now = ut.gettimestamp();
2207 2214 await getApp().request.promiseGet("/api/weshop/goods/page", {
2208 2215 data: {
2209 2216 store_id: o.stoid,
2210 2217 sku: gd.sku,
2211   - more_spec:gd.more_spec,
  2218 + more_spec: gd.more_spec,
2212 2219 isonsale: 1,
2213 2220 is_on_sale: 1,
2214   - pageSize:500,
2215   - orderField: 'sort'
  2221 + pageSize: 500,
  2222 + orderField: 'sort'
2216 2223 }
2217 2224 }).then(res => {
2218 2225 var e = res;
2219 2226 if (e.data.code == 0) arrdata = e.data.data.pageData;
2220 2227 })
2221   - if(!arrdata) return false;
  2228 + if (!arrdata) return false;
2222 2229  
2223 2230 var arrsku = new Array();
2224 2231 var gitem = null;
2225   - var gb = 1,gg = "";
  2232 + var gb = 1, gg = "";
2226 2233 for (var i = 0; i < arrdata.length; i++) {
2227   - var goodsinfo=arrdata[i],prom=null;
  2234 + var goodsinfo = arrdata[i], prom = null;
2228 2235 if (goodsinfo.goods_id != g_id) {
2229   -
2230   - switch(goodsinfo.prom_type){
2231   - case 1:
2232   - await getApp().request.promiseGet("/api/ms/flash_sale/get/"+os.stoid+"/"+goodsinfo.prom_id,{
2233   - }).then(res=>{
2234   - if(res.data.code==0) prom=res.data.data;
2235   - })
2236   -
2237   - break;
2238   - case 6:
2239   - await getApp().request.promiseGet("/api/weshop/teamlist/get/"+os.stoid+"/"+goodsinfo.prom_id,{
2240   - }).then(res=>{
2241   - if(res.data.code==0) prom=res.data.data;
2242   - })
2243   -
2244   - break;
2245   - case 2:
2246   - await getApp().request.promiseGet("/api/weshop/goods/groupBuy/getActInfo/"+os.stoid+"/"+goodsinfo.goods_id+"/"+goodsinfo.prom_id,{
2247   - }).then(res=>{
2248   - if(res.data.code==0) prom=res.data.data;
2249   - })
2250   - break;
2251   - case 4:
2252   - await getApp().request.promiseGet("/api/weshop/integralbuy/getActInfo/"+os.stoid+"/"+goodsinfo.goods_id+"/"+goodsinfo.prom_id,{
2253   - }).then(res=>{
2254   - if(res.data.code==0) prom=res.data.data;
2255   - })
2256   - break
2257   -
2258   - }
2259   -
2260   -
  2236 +
  2237 + switch (goodsinfo.prom_type) {
  2238 + case 1:
  2239 + await getApp().request.promiseGet("/api/ms/flash_sale/get/" + os.stoid + "/" + goodsinfo.prom_id, {
  2240 + }).then(res => {
  2241 + if (res.data.code == 0) prom = res.data.data;
  2242 + })
  2243 +
  2244 + break;
  2245 + case 6:
  2246 + await getApp().request.promiseGet("/api/weshop/teamlist/get/" + os.stoid + "/" + goodsinfo.prom_id, {
  2247 + }).then(res => {
  2248 + console.log(res);
  2249 + if (res.data.code == 0) prom = res.data.data;
  2250 + })
  2251 +
  2252 + break;
  2253 + case 2:
  2254 + await getApp().request.promiseGet("/api/weshop/goods/groupBuy/getActInfo/" + os.stoid + "/" + goodsinfo.goods_id + "/" + goodsinfo.prom_id, {
  2255 + }).then(res => {
  2256 + if (res.data.code == 0) prom = res.data.data;
  2257 + })
  2258 + break;
  2259 + case 4:
  2260 + await getApp().request.promiseGet("/api/weshop/integralbuy/getActInfo/" + os.stoid + "/" + goodsinfo.goods_id + "/" + goodsinfo.prom_id, {
  2261 + }).then(res => {
  2262 + if (res.data.code == 0) prom = res.data.data;
  2263 + })
  2264 + break
  2265 +
  2266 + }
  2267 +
  2268 +
2261 2269 }
2262 2270 //---如果有活动,不算在一起---
2263   - if(prom){
2264   - if(goodsinfo.prom_type==1 || goodsinfo.prom_type==6){
2265   - if(prom.is_end==0 && prom.end_time>now && prom.start_time<now) continue;
2266   - }else{
2267   - continue;
2268   - }
  2271 + if (prom) {
  2272 + if (goodsinfo.prom_type == 1 || goodsinfo.prom_type == 6) {
  2273 + console.log(prom);
  2274 + if (prom.is_end == 0 && prom.end_time > now && prom.start_time < now) continue;
  2275 + } else {
  2276 + continue;
  2277 + }
2269 2278 }
2270   -
2271 2279  
2272   - var item = arrdata[i],gg = "";
2273   - if(item.goods_spec=="null" || item.goods_spec==null) item.goods_spec="";
2274   - if(item.goods_color=="null" || item.goods_color==null) item.goods_color="";
  2280 +
  2281 + var item = arrdata[i], gg = "";
  2282 + if (item.goods_spec == "null" || item.goods_spec == null) item.goods_spec = "";
  2283 + if (item.goods_color == "null" || item.goods_color == null) item.goods_color = "";
2275 2284  
2276 2285 if (item.goods_spec != "" && item.goods_color != "") {
2277 2286 gg = item.goods_spec + "/" + item.goods_color;
... ... @@ -2283,10 +2292,10 @@ Page({
2283 2292 }
2284 2293 item.gg = gg;
2285 2294  
2286   - if(item.spec_img)
2287   - item.original_img=os.imghost+item.spec_img;
  2295 + if (item.spec_img)
  2296 + item.original_img = os.imghost + item.spec_img;
2288 2297 else
2289   - item.original_img=os.imghost+item.original_img;
  2298 + item.original_img = os.imghost + item.original_img;
2290 2299  
2291 2300  
2292 2301 if (item.goods_id == g_id) {
... ... @@ -2312,16 +2321,16 @@ Page({
2312 2321 },
2313 2322  
2314 2323 //-----------选择属性的按钮事件----------
2315   - sele_spec: function(e) {
2316   - var that=this,ee=this,th=this;
  2324 + sele_spec: function (e) {
  2325 + var that = this, ee = this, th = this;
2317 2326 var gid = e.currentTarget.dataset.gid;
2318   - var nor=e.currentTarget.dataset.nor;
2319   -
  2327 + var nor = e.currentTarget.dataset.nor;
  2328 +
2320 2329 var sku_g = this.data.sku_g;
2321   - if(nor){
2322   - sku_g = this.data.sku_g_pt;
2323   - }
2324   -
  2330 + if (nor) {
  2331 + sku_g = this.data.sku_g_pt;
  2332 + }
  2333 +
2325 2334 var item = null;
2326 2335 for (var i in sku_g) {
2327 2336 if (sku_g[i].goods_id == gid) {
... ... @@ -2333,41 +2342,41 @@ Page({
2333 2342 sele_g: item,
2334 2343 gid: gid
2335 2344 });
2336   -
2337   -
2338 2345  
2339   - that.check_is_youhui(gid,that.data.is_normal);
2340   -
2341   - var ty=0;
  2346 +
  2347 +
  2348 + that.check_is_youhui(gid, that.data.is_normal);
  2349 +
  2350 + var ty = 0;
2342 2351 this.get_sto(that.data.is_normal);
2343   -
2344   -
  2352 +
  2353 +
2345 2354 //默认门店要拿下门店库存
2346   - if(that.data.sales_rules==2 && that.data.def_pick_store){
2347   - var lock=0,plist=null;
  2355 + if (that.data.sales_rules == 2 && that.data.def_pick_store) {
  2356 + var lock = 0, plist = null;
2348 2357 //先读取门店的lock,采用链式写法,少用await
2349   - getApp().request.promiseGet("/api/weshop/order/ware/lock/page",{
2350   - data:{store_id:os.stoid,wareId:ee.data.sele_g.goods_id,storageId:that.data.def_pick_store.pickup_id,pageSize:1000}
2351   - }).then(res=>{
2352   - if(res.data.code==0 && res.data.data.total>0){
2353   - for(var i in res.data.data.pageData)
2354   - lock+=res.data.data.pageData[i].outQty
  2358 + getApp().request.promiseGet("/api/weshop/order/ware/lock/page", {
  2359 + data: { store_id: os.stoid, wareId: ee.data.sele_g.goods_id, storageId: that.data.def_pick_store.pickup_id, pageSize: 1000 }
  2360 + }).then(res => {
  2361 + if (res.data.code == 0 && res.data.data.total > 0) {
  2362 + for (var i in res.data.data.pageData)
  2363 + lock += res.data.data.pageData[i].outQty
2355 2364 }
2356 2365 //---通过接口获取门店的线下库存信息--
2357   - return getApp().request.promiseGet("/api/weshop/goods/getWareStorages",{
2358   - data:{storageNos:that.data.def_pick_store.pickup_no,wareIds:encodeURIComponent(th.data.sele_g.erpwareid),storeId:os.stoid}
  2366 + return getApp().request.promiseGet("/api/weshop/goods/getWareStorages", {
  2367 + data: { storageNos: that.data.def_pick_store.pickup_no, wareIds: encodeURIComponent(th.data.sele_g.erpwareid), storeId: os.stoid }
2359 2368 })
2360   - }).then(res=>{
2361   - if(res.data.code==0 && res.data.data.total>0){
2362   - plist=res.data.data.pageData[0];
  2369 + }).then(res => {
  2370 + if (res.data.code == 0 && res.data.data.total > 0) {
  2371 + plist = res.data.data.pageData[0];
2363 2372 }
2364   - if(plist && plist.CanOutQty-lock>0){
2365   - that.data.def_pick_store.CanOutQty=plist.CanOutQty-lock;
2366   - }else{
2367   - that.data.def_pick_store.CanOutQty=0;
  2373 + if (plist && plist.CanOutQty - lock > 0) {
  2374 + that.data.def_pick_store.CanOutQty = plist.CanOutQty - lock;
  2375 + } else {
  2376 + that.data.def_pick_store.CanOutQty = 0;
2368 2377 }
2369 2378 //--给门店赋值线下库存--
2370   - th.setData({def_pick_store:that.data.def_pick_store});
  2379 + th.setData({ def_pick_store: that.data.def_pick_store });
2371 2380 })
2372 2381 }
2373 2382  
... ... @@ -2376,58 +2385,58 @@ Page({
2376 2385 },
2377 2386  
2378 2387 //选择了不同的规格的时候要判断是不是有活动正在进行中
2379   - async sele_spec_chech_activity(){
  2388 + async sele_spec_chech_activity() {
2380 2389 //---如果是活动的时候---
2381   - var prom=null,goodsinfo=this.data.sele_g,th=this;
2382   - if(goodsinfo.prom_type==1){
2383   - await getApp().request.promiseGet("/api/ms/flash_sale/get/"+os.stoid+"/"+goodsinfo.prom_id,{
2384   - }).then(res=>{
2385   - if(res.data.code==0){
2386   - prom=res.data.data;
  2390 + var prom = null, goodsinfo = this.data.sele_g, th = this;
  2391 + if (goodsinfo.prom_type == 1) {
  2392 + await getApp().request.promiseGet("/api/ms/flash_sale/get/" + os.stoid + "/" + goodsinfo.prom_id, {
  2393 + }).then(res => {
  2394 + if (res.data.code == 0) {
  2395 + prom = res.data.data;
  2396 + }
  2397 + })
  2398 + }
  2399 + if (goodsinfo.prom_type == 6) {
  2400 + await getApp().request.promiseGet("/api/weshop/teamlist/get/" + os.stoid + "/" + goodsinfo.prom_id, {
  2401 + }).then(res => {
  2402 + if (res.data.code == 0) {
  2403 + prom = res.data.data;
2387 2404 }
2388 2405 })
2389 2406 }
2390   - if(goodsinfo.prom_type==6){
2391   - await getApp().request.promiseGet("/api/weshop/teamlist/get/"+os.stoid+"/"+goodsinfo.prom_id,{
2392   - }).then(res=>{
2393   - if(res.data.code==0){
2394   - prom=res.data.data;
  2407 +
  2408 + if (goodsinfo.prom_type == 4) {
  2409 + await getApp().request.promiseGet("/api/weshop/integralbuy/getActInfo/" + os.stoid + "/" + goodsinfo.goods_id + "/" + goodsinfo.prom_id, {
  2410 + }).then(res => {
  2411 + if (res.data.code == 0) {
  2412 + prom = res.data.data;
2395 2413 }
2396 2414 })
2397 2415 }
2398   -
2399   - if(goodsinfo.prom_type==4){
2400   - await getApp().request.promiseGet("/api/weshop/integralbuy/getActInfo/"+os.stoid+"/"+goodsinfo.goods_id+"/"+goodsinfo.prom_id,{
2401   - }).then(res=>{
2402   - if(res.data.code==0){
2403   - prom=res.data.data;
2404   - }
2405   - })
2406   - }
2407   -
  2416 +
2408 2417 //----------如果有活动,并且在进行中,就不计算线下库存---------------
2409   - var now=ut.gettimestamp();
2410   - if(prom){
2411   - if(prom.is_end==0 && prom.end_time>now && prom.start_time<now){
  2418 + var now = ut.gettimestamp();
  2419 + if (prom) {
  2420 + if (prom.is_end == 0 && prom.end_time > now && prom.start_time < now) {
2412 2421 th.setData({
2413   - prom_type:goodsinfo.prom_type,
2414   - prom_price:prom.price,
2415   - prom_buy_limit:prom.buy_limit,
2416   - prom_end_time:prom.end_time,
2417   - prom_start_time:prom.start_time,
2418   - prom_st:1,
  2422 + prom_type: goodsinfo.prom_type,
  2423 + prom_price: prom.price,
  2424 + prom_buy_limit: prom.buy_limit,
  2425 + prom_end_time: prom.end_time,
  2426 + prom_start_time: prom.start_time,
  2427 + prom_st: 1,
2419 2428 })
2420 2429 return false;
2421 2430 }
2422 2431 }
2423 2432 //---设置普通商品---
2424 2433 th.setData({
2425   - prom_type:0,
2426   - prom_price:null,
2427   - prom_buy_limit:null,
2428   - prom_end_time:null,
2429   - prom_start_time:null,
2430   - prom_st:null,
  2434 + prom_type: 0,
  2435 + prom_price: null,
  2436 + prom_buy_limit: null,
  2437 + prom_end_time: null,
  2438 + prom_start_time: null,
  2439 + prom_st: null,
2431 2440 })
2432 2441  
2433 2442 },
... ... @@ -2435,20 +2444,20 @@ Page({
2435 2444  
2436 2445 //---------拿出门店分类和门店------------
2437 2446 get_sto(e) {
2438   - var th = this,that=this;
2439   - var is_normal=e;
2440   -
2441   - if(e==1){
2442   - th.setData({is_normal:1})
2443   - }else{
2444   - th.setData({is_normal:0})
2445   - }
2446   -
2447   - var timer_get = setInterval(function() {
  2447 + var th = this, that = this;
  2448 + var is_normal = e;
  2449 +
  2450 + if (e == 1) {
  2451 + th.setData({ is_normal: 1 })
  2452 + } else {
  2453 + th.setData({ is_normal: 0 })
  2454 + }
  2455 +
  2456 + var timer_get = setInterval(function () {
2448 2457 if (th.data.is_get_local_ok == 0) return false;
2449   - var dd = null,i = getApp().request;
2450   - if (!th.data.sele_g) return false;
2451   -
  2458 + var dd = null, i = getApp().request;
  2459 + if (!th.data.sele_g) return false;
  2460 +
2452 2461 var g_distr_type = th.data.sele_g.distr_type;
2453 2462 if (g_distr_type != 0) {
2454 2463 dd = {
... ... @@ -2470,52 +2479,52 @@ Page({
2470 2479 dd.lon = th.data.lon;
2471 2480 }
2472 2481 clearInterval(timer_get);
2473   -
2474   - //如果会员是有默认的门店话
2475   - if(!th.data.def_pick_store && th.data.fir_def_store){
2476   - th.setData({def_pick_store:th.data.fir_def_store});
2477   - }
2478   -
2479   - /*--最新的,不用这里筛选配送方式
2480   - if(th.data.def_pick_store && g_distr_type!=0 && th.data.def_pick_store.distr_type!=0 && th.data.def_pick_store.distr_type!=g_distr_type ){
2481   - th.setData({def_pick_store:null});
2482   - }--*/
2483   -
2484   -
2485   - wx.showLoading({
2486   - title:'加载中.'
2487   - });
  2482 +
  2483 + //如果会员是有默认的门店话
  2484 + if (!th.data.def_pick_store && th.data.fir_def_store) {
  2485 + th.setData({ def_pick_store: th.data.fir_def_store });
  2486 + }
  2487 +
  2488 + /*--最新的,不用这里筛选配送方式
  2489 + if(th.data.def_pick_store && g_distr_type!=0 && th.data.def_pick_store.distr_type!=0 && th.data.def_pick_store.distr_type!=g_distr_type ){
  2490 + th.setData({def_pick_store:null});
  2491 + }--*/
  2492 +
  2493 +
  2494 + wx.showLoading({
  2495 + title: '加载中.'
  2496 + });
2488 2497 //----------获取门店----------------
2489 2498 getApp().request.promiseGet("/api/weshop/pickup/list", {
2490 2499 data: dd,
2491 2500 }).then(res => {
2492 2501 var e = res;
2493   -
2494   - if (e.data.code == 0 && e.data.data && e.data.data.pageData && e.data.data.pageData.length>0) {
2495   -
2496   - var his_cate_num=0;
2497   - for(let i in e.data.data.pageData){
2498   - let item=e.data.data.pageData[i];
2499   - if(item.category_id>0){
2500   - his_cate_num=1;break;
  2502 +
  2503 + if (e.data.code == 0 && e.data.data && e.data.data.pageData && e.data.data.pageData.length > 0) {
  2504 +
  2505 + var his_cate_num = 0;
  2506 + for (let i in e.data.data.pageData) {
  2507 + let item = e.data.data.pageData[i];
  2508 + if (item.category_id > 0) {
  2509 + his_cate_num = 1; break;
2501 2510 }
2502 2511 }
2503   - e.his_cate_num=his_cate_num;
  2512 + e.his_cate_num = his_cate_num;
2504 2513  
2505 2514  
2506 2515 //如果有开启距离的功能,没有设置默认门店,要用最近的门店作为默认门店
2507   - if(dd.lat && (!th.data.def_pick_store || JSON.stringify(th.data.def_pick_store)=='{}') && th.data.bconfig && th.data.bconfig.is_sort_storage){
  2516 + if (dd.lat && (!th.data.def_pick_store || JSON.stringify(th.data.def_pick_store) == '{}') && th.data.bconfig && th.data.bconfig.is_sort_storage) {
2508 2517 th.setData({
2509   - def_pick_store:e.data.data.pageData[0],
  2518 + def_pick_store: e.data.data.pageData[0],
2510 2519 sto_sele_name: e.data.data.pageData[0].pickup_name,
2511 2520 sto_sele_id: e.data.data.pageData[0].pickup_id,
2512 2521 sto_sele_distr: e.data.data.pageData[0].distr_type
2513 2522 });
2514   - th.data.fir_def_store=e.data.data.pageData[0];
  2523 + th.data.fir_def_store = e.data.data.pageData[0];
2515 2524 }
2516 2525  
2517 2526 //-- 如果有默认选择门店的时候,要把默认门店放在第一位,修改不要配送方式的判断 --
2518   - if (th.data.def_pick_store && JSON.stringify(th.data.def_pick_store)!='{}'){
  2527 + if (th.data.def_pick_store && JSON.stringify(th.data.def_pick_store) != '{}') {
2519 2528 for (var k = 0; k < e.data.data.pageData.length; k++) {
2520 2529 if (e.data.data.pageData[k].pickup_id == th.data.def_pick_store.pickup_id) {
2521 2530 e.data.data.pageData.splice(k, 1); //删除
... ... @@ -2526,17 +2535,17 @@ Page({
2526 2535 }
2527 2536  
2528 2537  
2529   - th.setData({all_pick_list:e.data.data.pageData});
  2538 + th.setData({ all_pick_list: e.data.data.pageData });
2530 2539  
2531 2540 //--获取线下库存,而且不是新的门店规则, 同时是普通购买的时候,或者同时不能是活动,秒杀,拼团,积分购--
2532   - if(th.data.sales_rules==2 && !th.data.is_newsales_rules && ((th.data.prom_type!=1 && th.data.prom_type!=6 && th.data.prom_type!=4) || is_normal==1)){
2533   - setTimeout(function(){
  2541 + if (th.data.sales_rules == 2 && !th.data.is_newsales_rules && ((th.data.prom_type != 1 && th.data.prom_type != 6 && th.data.prom_type != 4) || is_normal == 1)) {
  2542 + setTimeout(function () {
2534 2543 th.deal_pickup_dline(e);
2535   - },800)
2536   - }else{
2537   - setTimeout(function(){
  2544 + }, 800)
  2545 + } else {
  2546 + setTimeout(function () {
2538 2547 th.deal_pickup(e); //--普通门店排版--
2539   - },800)
  2548 + }, 800)
2540 2549 }
2541 2550 }
2542 2551 })
... ... @@ -2544,29 +2553,29 @@ Page({
2544 2553  
2545 2554 },
2546 2555  
2547   -
  2556 +
2548 2557 //------------处理门店---------------
2549   - deal_pickup(e){
2550   - var th=this;
2551   - if(!th.data.sele_g) return false
2552   -
2553   - var g_distr_type=th.data.sele_g.distr_type;
2554   - wx.hideLoading();
  2558 + deal_pickup(e) {
  2559 + var th = this;
  2560 + if (!th.data.sele_g) return false
  2561 +
  2562 + var g_distr_type = th.data.sele_g.distr_type;
  2563 + wx.hideLoading();
2555 2564  
2556 2565 //单总量超出10个的时候,同时门店有分类
2557   - if (e.data.data.total > 10 && e.his_cate_num ) {
  2566 + if (e.data.data.total > 10 && e.his_cate_num) {
2558 2567 getApp().request.get("/api/weshop/storagecategory/page", {
2559 2568 data: {
2560 2569 store_id: o.stoid,
2561 2570 is_show: 1,
2562 2571 pageSize: 1000,
2563   - orderField:"sort",
2564   - orderType:'asc',
  2572 + orderField: "sort",
  2573 + orderType: 'asc',
2565 2574 },
2566   - success: function(ee) {
  2575 + success: function (ee) {
2567 2576 if (ee.data.code == 0) {
2568   -
2569   - if (ee.data.data && ee.data.data.pageData && ee.data.data.pageData.length > 0) {
  2577 +
  2578 + if (ee.data.data && ee.data.data.pageData && ee.data.data.pageData.length > 0) {
2570 2579 var def_arr = new Array();
2571 2580 var ishas = 0;
2572 2581 //-- 开始就看5个门店 --
... ... @@ -2587,7 +2596,7 @@ Page({
2587 2596 //----要进行门店分组--------
2588 2597 for (var i = 0; i < sto_arr.length; i++) {
2589 2598 //找一下这个门店有没有在分类数组内
2590   - var find2 = 0, find2name = "",sort=0;
  2599 + var find2 = 0, find2name = "", sort = 0;
2591 2600 for (var m = 0; m < sto_cate.length; m++) {
2592 2601 if (sto_arr[i].category_id == sto_cate[m].cat_id) {
2593 2602 find2 = sto_cate[m].cat_id;
... ... @@ -2614,7 +2623,7 @@ Page({
2614 2623 var item = {
2615 2624 cat_id: find2,
2616 2625 name: find2name,
2617   - sort:sort,
  2626 + sort: sort,
2618 2627 s_arr: arr0
2619 2628 };
2620 2629 newarr.push(item);
... ... @@ -2630,7 +2639,7 @@ Page({
2630 2639 var item = {
2631 2640 cat_id: find2,
2632 2641 name: find2name,
2633   - sort:sort,
  2642 + sort: sort,
2634 2643 s_arr: arr0
2635 2644 };
2636 2645 newarr.push(item);
... ... @@ -2639,18 +2648,18 @@ Page({
2639 2648 }
2640 2649 }
2641 2650 }
2642   -
2643   - //门店分类要排序下
2644   - function compare(property){
2645   - return function(a,b){
2646   - var value1 = a[property];
2647   - var value2 = b[property];
2648   - return value1 - value2;
2649   - }
2650   - }
2651   - if(newarr.length>0)
2652   - newarr.sort(compare("sort"));
2653   -
  2651 +
  2652 + //门店分类要排序下
  2653 + function compare(property) {
  2654 + return function (a, b) {
  2655 + var value1 = a[property];
  2656 + var value2 = b[property];
  2657 + return value1 - value2;
  2658 + }
  2659 + }
  2660 + if (newarr.length > 0)
  2661 + newarr.sort(compare("sort"));
  2662 +
2654 2663  
2655 2664 //----安排其他的分类-----
2656 2665 if (qita.length > 0) {
... ... @@ -2661,7 +2670,7 @@ Page({
2661 2670 };
2662 2671 newarr.push(item);
2663 2672 }
2664   -
  2673 +
2665 2674 th.setData({
2666 2675 is_show_sto_cat: 1,
2667 2676 all_sto: newarr
... ... @@ -2674,7 +2683,7 @@ Page({
2674 2683 });
2675 2684 //-----如果没有默认门店,要取第一个门店作为默认店.此时没有门店分类的情况------
2676 2685 if (!th.data.def_pick_store) {
2677   - th.setData({def_pick_store:e.data.data.pageData[0]})
  2686 + th.setData({ def_pick_store: e.data.data.pageData[0] })
2678 2687 }
2679 2688 }
2680 2689 } else {
... ... @@ -2684,13 +2693,13 @@ Page({
2684 2693 });
2685 2694 //-----如果没有默认门店,要取第一个门店作为默认店.此时没有门店分类的情况------
2686 2695 if (!th.data.def_pick_store) {
2687   - th.setData({def_pick_store:e.data.data.pageData[0]})
  2696 + th.setData({ def_pick_store: e.data.data.pageData[0] })
2688 2697 }
2689 2698  
2690 2699 }
2691 2700 }
2692 2701 });
2693   - } else {
  2702 + } else {
2694 2703 th.setData({
2695 2704 is_show_sto_cat: 0,
2696 2705 only_pk: e.data.data.pageData
... ... @@ -2698,7 +2707,7 @@ Page({
2698 2707 //-----如果没有默认门店,要取第一个门店作为默认店------
2699 2708 if (!th.data.def_pick_store && th.data.bconfig && th.data.bconfig.is_sort_storage) {
2700 2709 th.setData({
2701   - def_pick_store:e.data.data.pageData[0],
  2710 + def_pick_store: e.data.data.pageData[0],
2702 2711 sto_sele_name: e.data.data.pageData[0].pickup_name,
2703 2712 sto_sele_id: e.data.data.pageData[0].pickup_id,
2704 2713 sto_sele_distr: e.data.data.pageData[0].distr_type
... ... @@ -2706,66 +2715,66 @@ Page({
2706 2715 }
2707 2716 }
2708 2717 },
2709   -
  2718 +
2710 2719 //------------处理线下门店库存--------
2711   - deal_pickup_dline(e){
2712   - var pkno=[],th=this;
2713   - if(!th.data.sele_g) return false;
2714   -
2715   - if(this.data.def_pick_store){
  2720 + deal_pickup_dline(e) {
  2721 + var pkno = [], th = this;
  2722 + if (!th.data.sele_g) return false;
  2723 +
  2724 + if (this.data.def_pick_store) {
2716 2725 pkno.push(this.data.def_pick_store.pickup_no);
2717 2726 }
2718   - for(var i in e.data.data.pageData){
2719   - var item=e.data.data.pageData[i];
2720   - if(pkno.indexOf(item.pickup_no)<0)
  2727 + for (var i in e.data.data.pageData) {
  2728 + var item = e.data.data.pageData[i];
  2729 + if (pkno.indexOf(item.pickup_no) < 0)
2721 2730 pkno.push(item.pickup_no);
2722 2731 }
2723   - pkno.sort();
2724   - var pkno_str=pkno.join(",");
2725   - var o_plist=e.data.data.pageData;
2726   - var new_list=[];
2727   - var is_find_def_store=0;
  2732 + pkno.sort();
  2733 + var pkno_str = pkno.join(",");
  2734 + var o_plist = e.data.data.pageData;
  2735 + var new_list = [];
  2736 + var is_find_def_store = 0;
2728 2737  
2729 2738  
2730   - var g_distr_type=th.data.sele_g.distr_type;
2731   - var lock=[];
  2739 + var g_distr_type = th.data.sele_g.distr_type;
  2740 + var lock = [];
2732 2741 //先读取门店的lock,采用链式写法,少用await
2733   - getApp().request.promiseGet("/api/weshop/order/ware/lock/page",{
2734   - data:{store_id:os.stoid,wareId:th.data.sele_g.goods_id,pageSize:1000}
2735   - }).then(res=>{
2736   - if(res.data.code==0 && res.data.data.total>0){
2737   - lock=res.data.data.pageData
  2742 + getApp().request.promiseGet("/api/weshop/order/ware/lock/page", {
  2743 + data: { store_id: os.stoid, wareId: th.data.sele_g.goods_id, pageSize: 1000 }
  2744 + }).then(res => {
  2745 + if (res.data.code == 0 && res.data.data.total > 0) {
  2746 + lock = res.data.data.pageData
2738 2747 }
2739 2748 //---通过接口获取门店的线下库存信息--
2740   - return getApp().request.promiseGet("/api/weshop/goods/getWareStorages",{
2741   - data:{storageNos:pkno_str,wareIds:encodeURIComponent(th.data.sele_g.erpwareid),storeId:os.stoid,pageSize:2000}
  2749 + return getApp().request.promiseGet("/api/weshop/goods/getWareStorages", {
  2750 + data: { storageNos: pkno_str, wareIds: encodeURIComponent(th.data.sele_g.erpwareid), storeId: os.stoid, pageSize: 2000 }
2742 2751 })
2743   - }).then(res=>{
  2752 + }).then(res => {
2744 2753  
2745   - wx.hideLoading();
2746   - if(res.data.code==0){
2747   - if(res.data.data.pageData && res.data.data.pageData.length>0){
2748   - var plist=res.data.data.pageData;
2749   - var def_pick_store=th.data.def_pick_store;
  2754 + wx.hideLoading();
  2755 + if (res.data.code == 0) {
  2756 + if (res.data.data.pageData && res.data.data.pageData.length > 0) {
  2757 + var plist = res.data.data.pageData;
  2758 + var def_pick_store = th.data.def_pick_store;
2750 2759 //以原来的数组为外循环,保证距离的顺序
2751   - for(var kk in o_plist){
2752   - for(var ii in plist){
  2760 + for (var kk in o_plist) {
  2761 + for (var ii in plist) {
2753 2762 //线下的门店小心
2754   - var n_item=plist[ii];
2755   - if(n_item.StorageNo==o_plist[kk].pickup_no){
  2763 + var n_item = plist[ii];
  2764 + if (n_item.StorageNo == o_plist[kk].pickup_no) {
2756 2765  
2757 2766 //拿到锁库的数量
2758   - var lock_num=th.find_lock_num(o_plist[kk].pickup_id,lock);
  2767 + var lock_num = th.find_lock_num(o_plist[kk].pickup_id, lock);
2759 2768 //可出库数大于预出库库存的数量,可以判断为有库存
2760   - if(n_item.CanOutQty>lock_num){
2761   - o_plist[kk].CanOutQty=n_item.CanOutQty-lock_num;
  2769 + if (n_item.CanOutQty > lock_num) {
  2770 + o_plist[kk].CanOutQty = n_item.CanOutQty - lock_num;
2762 2771 new_list.push(o_plist[kk]);
2763 2772 //--如果找到默认门店,同时也应该判断配送方式对不对--
2764   - if(th.data.fir_def_store && n_item.StorageNo==th.data.fir_def_store.pickup_no && (g_distr_type==0 || th.data.fir_def_store.distr_type==0 || th.data.def_pick_store.distr_type==g_distr_type ) ){
2765   - th.data.fir_def_store.CanOutQty=n_item.CanOutQty-lock_num;
2766   - if(def_pick_store.pickup_id==th.data.fir_def_store.pickup_id)
2767   - th.setData({def_pick_store:th.data.fir_def_store})
2768   - is_find_def_store=1;
  2773 + if (th.data.fir_def_store && n_item.StorageNo == th.data.fir_def_store.pickup_no && (g_distr_type == 0 || th.data.fir_def_store.distr_type == 0 || th.data.def_pick_store.distr_type == g_distr_type)) {
  2774 + th.data.fir_def_store.CanOutQty = n_item.CanOutQty - lock_num;
  2775 + if (def_pick_store.pickup_id == th.data.fir_def_store.pickup_id)
  2776 + th.setData({ def_pick_store: th.data.fir_def_store })
  2777 + is_find_def_store = 1;
2769 2778 }
2770 2779 }
2771 2780 break;
... ... @@ -2774,55 +2783,55 @@ Page({
2774 2783 }
2775 2784  
2776 2785 //数据组装下
2777   - var em={};em.data={};em.data.data={};
2778   - em.data.data.total=new_list.length;
2779   - em.data.data.pageData=new_list;
2780   - em.data.data.pageData=new_list;
  2786 + var em = {}; em.data = {}; em.data.data = {};
  2787 + em.data.data.total = new_list.length;
  2788 + em.data.data.pageData = new_list;
  2789 + em.data.data.pageData = new_list;
2781 2790  
2782 2791 //--如果找到默认门店,同时也应该判断配送方式对不对--
2783   - if(th.data.fir_def_store && !is_find_def_store && th.data.fir_def_store.pickup_id && (g_distr_type==0 || th.data.fir_def_store.distr_type==0 || th.data.def_pick_store.distr_type==g_distr_type ) ){
2784   - th.data.fir_def_store.CanOutQty=0;
  2792 + if (th.data.fir_def_store && !is_find_def_store && th.data.fir_def_store.pickup_id && (g_distr_type == 0 || th.data.fir_def_store.distr_type == 0 || th.data.def_pick_store.distr_type == g_distr_type)) {
  2793 + th.data.fir_def_store.CanOutQty = 0;
2785 2794 //--当选择的门店是客户默认的门店的时候--
2786   - if(th.data.def_pick_store && th.data.fir_def_store.pickup_id==th.data.def_pick_store.pickup_id) {
2787   - th.setData({def_pick_store:th.data.fir_def_store});
  2795 + if (th.data.def_pick_store && th.data.fir_def_store.pickup_id == th.data.def_pick_store.pickup_id) {
  2796 + th.setData({ def_pick_store: th.data.fir_def_store });
2788 2797 em.data.data.pageData.unshift(th.data.def_pick_store);
2789   - }else{
2790   - em.data.data.pageData.splice(1,0,th.data.fir_def_store);
  2798 + } else {
  2799 + em.data.data.pageData.splice(1, 0, th.data.fir_def_store);
2791 2800 }
2792 2801 }
2793 2802  
2794 2803 //---把数组组装进去---
2795 2804 th.deal_pickup(em);
2796   - }else{
2797   - th.setData({def_pick_store:null,all_sto:null,only_pk:null,def_pickpu_list:null})
  2805 + } else {
  2806 + th.setData({ def_pick_store: null, all_sto: null, only_pk: null, def_pickpu_list: null })
2798 2807 }
2799   - }else{
2800   - th.setData({def_pick_store:null,all_sto:null,only_pk:null,def_pickpu_list:null})
  2808 + } else {
  2809 + th.setData({ def_pick_store: null, all_sto: null, only_pk: null, def_pickpu_list: null })
2801 2810 }
2802 2811 })
2803 2812 },
2804 2813  
2805   - find_lock_num(pick_id,lock){
2806   - var lock_num=0;
2807   - if(!lock) return 0;
2808   - if(lock.length<0) return 0;
2809   - for(var i in lock){
2810   - if(pick_id==lock[i].pickupId){
2811   - lock_num+=lock[i].outQty;
  2814 + find_lock_num(pick_id, lock) {
  2815 + var lock_num = 0;
  2816 + if (!lock) return 0;
  2817 + if (lock.length < 0) return 0;
  2818 + for (var i in lock) {
  2819 + if (pick_id == lock[i].pickupId) {
  2820 + lock_num += lock[i].outQty;
2812 2821 }
2813 2822 }
2814 2823 return lock_num;
2815 2824 },
2816 2825  
2817 2826 //----------取货门店被点击的效果------
2818   - getmendian: function(t) {
  2827 + getmendian: function (t) {
2819 2828 this.setData({
2820 2829 ismend: 1,
2821 2830 });
2822 2831 },
2823 2832  
2824 2833 //----------隐藏取货门店,选取门店----------
2825   - hidemend: function(e) {
  2834 + hidemend: function (e) {
2826 2835 var pid = e.target.dataset.p_id;
2827 2836 var pname = e.target.dataset.p_name;
2828 2837 var p_distr_t = e.target.dataset.p_dis;
... ... @@ -2836,7 +2845,7 @@ Page({
2836 2845 },
2837 2846  
2838 2847 //------显示取货2级----------
2839   - show_sec: function(t) {
  2848 + show_sec: function (t) {
2840 2849 var index = t.target.dataset.index;
2841 2850 var item = this.data.all_sto[index];
2842 2851 this.setData({
... ... @@ -2846,43 +2855,43 @@ Page({
2846 2855 },
2847 2856  
2848 2857 //------隐藏取货门店2级----
2849   - hide_sec_mend: function() {
  2858 + hide_sec_mend: function () {
2850 2859 this.setData({
2851 2860 is_sec_mend: 0,
2852 2861 });
2853 2862 },
2854 2863  
2855 2864 //评论的调用
2856   - requestComments_new: async function(){
2857   - var e = this, th = e,ee=e; var tp = e.data.activeCategoryId3;
  2865 + requestComments_new: async function () {
  2866 + var e = this, th = e, ee = e; var tp = e.data.activeCategoryId3;
2858 2867 var t = '/api/weshop/comment/pageComment?page=' + e.data.c_curr_p;
2859 2868  
2860 2869 wx.showLoading();
2861 2870 var req_where = {
2862   - store_id: o.stoid, pageSize: 5,is_show:1,
  2871 + store_id: o.stoid, pageSize: 5, is_show: 1,
2863 2872 parent_id: 0, goods_id: th.data.gid, commenttype: tp,
2864 2873 }
2865 2874 if (getApp().globalData.userInfo) {
2866 2875 req_where.userId = getApp().globalData.userInfo.user_id;
2867 2876 }
2868 2877  
2869   - var rs_data=null;
2870   - await getApp().request.promiseGet(t, { data: req_where}).then(res=>{
  2878 + var rs_data = null;
  2879 + await getApp().request.promiseGet(t, { data: req_where }).then(res => {
2871 2880 var tot = res.data.data.total;
2872 2881 e.data.c_curr_p++;
2873 2882 e.setData({
2874 2883 com_num: tot, //已经有加载
2875 2884 });
2876   - if (res.data.data && res.data.data.pageData && res.data.data.pageData.length>0){
2877   - rs_data=res.data.data.pageData;
2878   - }else{
2879   - th.setData({comments_no_more:1,auto:1});
  2885 + if (res.data.data && res.data.data.pageData && res.data.data.pageData.length > 0) {
  2886 + rs_data = res.data.data.pageData;
  2887 + } else {
  2888 + th.setData({ comments_no_more: 1, auto: 1 });
2880 2889 }
2881 2890 })
2882 2891  
2883   - if (rs_data){
  2892 + if (rs_data) {
2884 2893 //var cda = th.data.comments;
2885   - var cda = rs_data,com_data=th.data.comments;
  2894 + var cda = rs_data, com_data = th.data.comments;
2886 2895 for (var ind in cda) {
2887 2896 var ep = cda[ind];
2888 2897 if (cda[ind].head_pic == '') {
... ... @@ -2896,13 +2905,13 @@ Page({
2896 2905 }
2897 2906  
2898 2907 //--测量多有字的宽带,计算有多少行--
2899   - var widh=ut.measureText(ep.content,30);
2900   - var lines=widh/712;
2901   - cda[ind].seeMore=false;
2902   - if(lines>3) cda[ind].seeMore=true;
  2908 + var widh = ut.measureText(ep.content, 30);
  2909 + var lines = widh / 712;
  2910 + cda[ind].seeMore = false;
  2911 + if (lines > 3) cda[ind].seeMore = true;
2903 2912  
2904 2913 await getApp().request.promiseGet("/api/weshop/comment/pageComment", {
2905   - data: {store_id: o.stoid, parent_id: ep.comment_id }
  2914 + data: { store_id: o.stoid, parent_id: ep.comment_id }
2906 2915 }).then(res => {
2907 2916 if (res.data.data.pageData && res.data.data.pageData.length > 0) {
2908 2917 cda[ind].replay_list = res.data.data.pageData;
... ... @@ -2913,16 +2922,16 @@ Page({
2913 2922 if (!com_data) com_data = cda;
2914 2923 else com_data = com_data.concat(cda);
2915 2924  
2916   - th.setData({ comments: com_data});
  2925 + th.setData({ comments: com_data });
2917 2926 }
2918   - th.setData({get_c: 1});
  2927 + th.setData({ get_c: 1 });
2919 2928 wx.hideLoading();
2920 2929 },
2921 2930  
2922 2931 //加载更多是靠这个函数
2923   - onReachBottom: function() {
2924   - if (this.data.activeCategoryId == 2){
2925   - if(!this.data.comments_no_more) this.requestComments_new();
  2932 + onReachBottom: function () {
  2933 + if (this.data.activeCategoryId == 2) {
  2934 + if (!this.data.comments_no_more) this.requestComments_new();
2926 2935 }
2927 2936  
2928 2937 var goods_list = this.selectComponent("#goods_list"); //组件的id
... ... @@ -2932,20 +2941,18 @@ Page({
2932 2941 //--------检查是否活动,活动是否开始,或者是否结束-------
2933 2942 async check_prom(gid, prom_type, prom_id) {
2934 2943 var ee = this,
2935   - th = ee;
2936   - if (prom_type == 3 || prom_type == 0 || prom_type == 2 || prom_type == 5 || prom_type == 7) {
  2944 + th = ee;
  2945 + if (prom_type == 3 || prom_type == 0 || prom_type == 2 || prom_type == 5 || prom_type == 7) {
2937 2946 this.setData({
2938 2947 prom_type: 0,
2939 2948 isshow: 1,
2940 2949 });
2941 2950 return false;
2942 2951 }
2943   -
2944   -
2945   -
2946   - //if (prom_type != 3 && prom_type!=0){
2947   - //---判断秒杀----
2948   - if (prom_type == 1) {
  2952 +
  2953 + //if (prom_type != 3 && prom_type!=0){
  2954 + //---判断秒杀----
  2955 + if (prom_type == 1) {
2949 2956 //-------判断活动是否抢光---------
2950 2957 await getApp().request.promiseGet("/api/weshop/activitylist/getActLen/" + os.stoid + "/" + prom_type + "/" + prom_id, {
2951 2958 1: 1
... ... @@ -2958,8 +2965,8 @@ Page({
2958 2965 });
2959 2966 //拿取价格并且判断时间--
2960 2967 getApp().request.get("/api/ms/flash_sale/get/" +
2961   - os.stoid + "/" + prom_id, {
2962   - success: function(t) {
  2968 + os.stoid + "/" + prom_id, {
  2969 + success: function (t) {
2963 2970 if (t.data.code != 0) {
2964 2971 ee.setData({
2965 2972 prom_type: 0,
... ... @@ -3047,73 +3054,73 @@ Page({
3047 3054 })
3048 3055 }
3049 3056  
3050   - if(prom_type==4){
3051   - //th.setData({is_integral_normal:1});
3052   - var rdata={
3053   - store_id:o.stoid,stype:1,stypeup:1,goods_id:gid
3054   - }
3055   -
3056   - var integrals=0;
3057   - var get_datas= {
3058   - user_id:getApp().globalData.user_id, store_id:o.stoid,
3059   - };
3060   - await getApp().request.promiseGet("/api/weshop/users/getAllPoints", {
3061   - data: get_datas
3062   - }).then(res => {
3063   - if(res.data.code==0){
3064   - integrals=res.data.data.Integral;
3065   - }
3066   - })
3067   -
3068   - //获取一下积分活动
3069   - await getApp().request.promiseGet("/api/weshop/integralbuy/pageIntegralBuyGoodsList", {
3070   - data: rdata
3071   - }).then(res => {
3072   - //调用接口有数据的时候
3073   - if (res.data.code == 0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length>0) {
3074   - var inte_data=res.data.data.pageData[0];
3075   - var can_integral=(parseFloat(integrals)>=parseFloat(inte_data.integral));
3076   - ee.setData({
3077   - prom_price:parseFloat(inte_data.addmoney),
3078   - prom_integral:parseFloat(inte_data.integral),
3079   - prom_type: 4,
3080   - prom_id: inte_data.id,
3081   - prom_buy_limit: inte_data.limitvipqty,
3082   - prom_act: inte_data,
3083   - isshow: 1,
3084   - can_integral:can_integral,
3085   - is_shopbuy: parseInt(inte_data.is_shopbuy?inte_data.is_shopbuy:0)
3086   - });
3087   - ee.get_sto();
3088   -
3089   - }else{
3090   - ee.setData({prom_type: 0, isshow: 1,});
3091   - ee.get_sku(os.stoid, ee.data.data, gid);
3092   - ee.get_sto();
3093   - return false;
3094   - }
3095   - })
3096   -
3097   - }
3098   -
3099   -
  3057 + if (prom_type == 4) {
  3058 + //th.setData({is_integral_normal:1});
  3059 + var rdata = {
  3060 + store_id: o.stoid, stype: 1, stypeup: 1, goods_id: gid
  3061 + }
  3062 +
  3063 + var integrals = 0;
  3064 + var get_datas = {
  3065 + user_id: getApp().globalData.user_id, store_id: o.stoid,
  3066 + };
  3067 + await getApp().request.promiseGet("/api/weshop/users/getAllPoints", {
  3068 + data: get_datas
  3069 + }).then(res => {
  3070 + if (res.data.code == 0) {
  3071 + integrals = res.data.data.Integral;
  3072 + }
  3073 + })
  3074 +
  3075 + //获取一下积分活动
  3076 + await getApp().request.promiseGet("/api/weshop/integralbuy/pageIntegralBuyGoodsList", {
  3077 + data: rdata
  3078 + }).then(res => {
  3079 + //调用接口有数据的时候
  3080 + if (res.data.code == 0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length > 0) {
  3081 + var inte_data = res.data.data.pageData[0];
  3082 + var can_integral = (parseFloat(integrals) >= parseFloat(inte_data.integral));
  3083 + ee.setData({
  3084 + prom_price: parseFloat(inte_data.addmoney),
  3085 + prom_integral: parseFloat(inte_data.integral),
  3086 + prom_type: 4,
  3087 + prom_id: inte_data.id,
  3088 + prom_buy_limit: inte_data.limitvipqty,
  3089 + prom_act: inte_data,
  3090 + isshow: 1,
  3091 + can_integral: can_integral,
  3092 + is_shopbuy: parseInt(inte_data.is_shopbuy ? inte_data.is_shopbuy : 0)
  3093 + });
  3094 + ee.get_sto();
  3095 +
  3096 + } else {
  3097 + ee.setData({ prom_type: 0, isshow: 1, });
  3098 + ee.get_sku(os.stoid, ee.data.data, gid);
  3099 + ee.get_sto();
  3100 + return false;
  3101 + }
  3102 + })
  3103 +
  3104 + }
  3105 +
  3106 +
3100 3107 //---判断拼单----
3101 3108 if (prom_type == 6) {
3102 3109 //-------判断活动是否抢光---------
3103 3110 await getApp().request.promiseGet("/api/weshop/activitylist/getActLen/" + os.stoid + "/" + prom_type + "/" + prom_id, {
3104 3111 1: 1
3105 3112 }).then(res => {
  3113 + console.log(res,3114);
3106 3114 var em = res;
3107 3115 if (em.data.code == 0) {
3108   -
3109   -
3110 3116 if (em.data.data <= 0) ee.setData({
3111 3117 prom_r_null: 1
3112 3118 });
3113 3119 //拿取价格并且判断时间--
3114 3120 getApp().request.get("/api/weshop/teamlist/get/" +
3115   - os.stoid + "/" + prom_id, {
3116   - success: function(t) {
  3121 + os.stoid + "/" + prom_id, {
  3122 + success: function (t) {
  3123 + console.log(t,3124);
3117 3124 if (t.data.code != 0) {
3118 3125 ee.setData({
3119 3126 prom_type: 0,
... ... @@ -3155,6 +3162,30 @@ Page({
3155 3162 return false;
3156 3163 }
3157 3164  
  3165 + /*-- 判断拼单是否启用 --*/
  3166 + if (!t.data.data.is_show) {
  3167 + console.log('没启用');
  3168 + wx.setNavigationBarTitle({
  3169 + title: '系统提示',
  3170 + });
  3171 + wx.showToast({
  3172 + title:'没有拼单活动',
  3173 + success(){
  3174 + setTimeout(()=>{
  3175 + wx.navigateBack()
  3176 + },2000)
  3177 + }
  3178 + })
  3179 + return false
  3180 + ee.setData({
  3181 + prom_type: 0,
  3182 + isshow: 1,
  3183 + });
  3184 + ee.get_sku(os.stoid, ee.data.data, gid);
  3185 + ee.get_sto();
  3186 + return false;
  3187 + }
  3188 +
3158 3189 //-------查看自己是不是有买过该团的商品,并还为支付,或者在进行中-------
3159 3190 getApp().request.get("/api/weshop/order/page", {
3160 3191 data: {
... ... @@ -3164,7 +3195,7 @@ Page({
3164 3195 pageSize: 1,
3165 3196 page: 1
3166 3197 },
3167   - success: function(e) {
  3198 + success: function (e) {
3168 3199 if (e.data.code == 0 && e.data.data.pageData.length > 0) {
3169 3200 var odr = e.data.data.pageData[0];
3170 3201 th.data.buy_order = odr;
... ... @@ -3183,17 +3214,17 @@ Page({
3183 3214 }
3184 3215 }).then(res => {
3185 3216 var now = ut.gettimestamp();
3186   - if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length>0){
3187   - var tgr = res.data.data.pageData[0];
3188   - //如果团的时间已经到了
3189   - if (now >= tgr.kt_end_time) {
3190   - th.update_jiti(tgr.id);
3191   - } else {
3192   - th.setData({
3193   - user_order_pt_state: 2
3194   - });
3195   - }
3196   - }
  3217 + if (res.data.code == 0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length > 0) {
  3218 + var tgr = res.data.data.pageData[0];
  3219 + //如果团的时间已经到了
  3220 + if (now >= tgr.kt_end_time) {
  3221 + th.update_jiti(tgr.id);
  3222 + } else {
  3223 + th.setData({
  3224 + user_order_pt_state: 2
  3225 + });
  3226 + }
  3227 + }
3197 3228 })
3198 3229  
3199 3230 } else {
... ... @@ -3214,10 +3245,10 @@ Page({
3214 3245 });
3215 3246  
3216 3247 //----------查看阶梯团------------
3217   - if (t.data.data.ct_rylist != "null" && t.data.data.ct_rylist != "" && t.data.data.ct_rylist != null && t.data.data.ct_rylist != undefined) {
  3248 + if (t.data.data.ct_rylist != "null" && t.data.data.ct_rylist != "" && t.data.data.ct_rylist != null && t.data.data.ct_rylist != undefined) {
3218 3249 t.data.data.ct_rylist = JSON.parse(t.data.data.ct_rylist);
3219 3250 var max_num = 0;
3220   - t.data.data.ct_rylist.forEach(function(val, ind) {
  3251 + t.data.data.ct_rylist.forEach(function (val, ind) {
3221 3252 if (parseInt(val.rynum) > max_num) max_num = parseInt(val.rynum);
3222 3253 })
3223 3254 t.data.data.max_ct_num = max_num;
... ... @@ -3269,24 +3300,24 @@ Page({
3269 3300 //--获取有多少人在开团--
3270 3301 async get_team_group(prom_id) {
3271 3302 var teamgroup = [],
3272   - th = this,
3273   - grounp_tatal = 0;
  3303 + th = this,
  3304 + grounp_tatal = 0;
3274 3305 //如果活动是开团不是商家团
3275 3306 if (this.data.prom_act.kttype > 1) {
3276   -
3277   - var req_data={
3278   - store_id: os.stoid,
3279   - pageSize: 3,
3280   - page: 1,
3281   - state: 2,
3282   - team_id: prom_id,
3283   - ordernum:1
3284   - };
3285   -
3286   - if(this.data.prom_act.kttype==3 && this.data.prom_act.max_ct_num ){
3287   - req_data.max_num=this.data.prom_act.max_ct_num;
3288   - }
3289   -
  3307 +
  3308 + var req_data = {
  3309 + store_id: os.stoid,
  3310 + pageSize: 3,
  3311 + page: 1,
  3312 + state: 2,
  3313 + team_id: prom_id,
  3314 + ordernum: 1
  3315 + };
  3316 +
  3317 + if (this.data.prom_act.kttype == 3 && this.data.prom_act.max_ct_num) {
  3318 + req_data.max_num = this.data.prom_act.max_ct_num;
  3319 + }
  3320 +
3290 3321 //获取活动从表信息team_id
3291 3322 await getApp().request.promiseGet("/api/weshop/teamgroup/page", {
3292 3323 data: req_data
... ... @@ -3358,7 +3389,7 @@ Page({
3358 3389 prom_time_text: '距结束还剩:',
3359 3390 prom_st: 1
3360 3391 })
3361   - setTimeout(function() {
  3392 + setTimeout(function () {
3362 3393 th.countDown(endTime2)
3363 3394 }, 1000);
3364 3395 return false;
... ... @@ -3385,17 +3416,17 @@ Page({
3385 3416 th.setData({
3386 3417 djs: obj
3387 3418 });
3388   - setTimeout(function() {
  3419 + setTimeout(function () {
3389 3420 th.countDown(endTime)
3390 3421 }, 1000);
3391 3422 },
3392 3423  
3393 3424  
3394 3425 //-------------获取购买数量的总函数----------------
3395   - get_buy_num: function(gd, func) {
  3426 + get_buy_num: function (gd, func) {
3396 3427 var map = this.data.g_buy_num,
3397   - th = this,
3398   - user_id = getApp().globalData.user_id;
  3428 + th = this,
  3429 + user_id = getApp().globalData.user_id;
3399 3430 if (user_id == null) {
3400 3431 map.set(gd.goods_id, 0);
3401 3432 th.setData({
... ... @@ -3416,7 +3447,7 @@ Page({
3416 3447 user_id: user_id,
3417 3448 goods_id: gd.goods_id
3418 3449 },
3419   - success: function(t) {
  3450 + success: function (t) {
3420 3451 if (t.data.code == 0) {
3421 3452 var g_buy_num = t.data.data.goodsbuynum;
3422 3453 if (gd.prom_type == 1 || gd.prom_type == 2 || gd.prom_type == 4 || gd.prom_type == 6) {
... ... @@ -3430,7 +3461,7 @@ Page({
3430 3461 prom_id: gd.prom_id
3431 3462 },
3432 3463 //-----获取-----
3433   - success: function(tt) {
  3464 + success: function (tt) {
3434 3465 if (tt.data.code == 0) {
3435 3466 map.set(gd.goods_id, g_buy_num);
3436 3467 th.setData({
... ... @@ -3455,7 +3486,7 @@ Page({
3455 3486 },
3456 3487  
3457 3488 //--拼单推荐的显示---
3458   - tj_Click: function(e) {
  3489 + tj_Click: function (e) {
3459 3490 var ind = parseInt(e.target.dataset.ind);
3460 3491 this.setData({
3461 3492 is_show_gz: ind
... ... @@ -3463,22 +3494,22 @@ Page({
3463 3494 },
3464 3495  
3465 3496 //--------拼团玩法显示详情--------
3466   - show_pt_xx: function(e) {
  3497 + show_pt_xx: function (e) {
3467 3498 this.setData({
3468 3499 pd_xx: 1,
3469 3500 })
3470 3501 },
3471   - close_pt_xx: function() {
  3502 + close_pt_xx: function () {
3472 3503 this.setData({
3473 3504 pd_xx: 0,
3474 3505 })
3475 3506 },
3476 3507  
3477 3508 //--点击弹起拼单--
3478   - openSpecModel_pt: function(e) {
  3509 + openSpecModel_pt: function (e) {
3479 3510  
3480 3511  
3481   - this.setData({ open_ind_store: 4,goodsInputNum:1});//拼团直接给4
  3512 + this.setData({ open_ind_store: 4, goodsInputNum: 1 });//拼团直接给4
3482 3513  
3483 3514  
3484 3515 //--先判断会员状态--
... ... @@ -3496,23 +3527,23 @@ Page({
3496 3527 if (ind == 1) {
3497 3528 //如果拼单的sku data是空的,就要先获取一下
3498 3529 if (th.data.sku_g_pt) {
3499   - th.get_sto(1);
  3530 + th.get_sto(1);
3500 3531 th.setData({
3501 3532 is_normal: ind,
3502 3533 openSpecModal_pt: 1
3503 3534 });
3504 3535 } else {
3505   - th.get_sto(1);
3506   - th.get_sku(o.stoid, th.data.data, th.data.gid, 1, function() {
  3536 + th.get_sto(1);
  3537 + th.get_sku(o.stoid, th.data.data, th.data.gid, 1, function () {
3507 3538 th.setData({
3508 3539 is_normal: ind,
3509 3540 openSpecModal_pt: 1
3510 3541 });
3511 3542 });
3512   - }
3513   - th.check_is_youhui(th.data.gid,1);
  3543 + }
  3544 + th.check_is_youhui(th.data.gid, 1);
3514 3545 } else {
3515   -
  3546 +
3516 3547 //拼单商品从这里进,先判断有没有买过商品,
3517 3548 getApp().request.get("/api/weshop/order/page", {
3518 3549 data: {
... ... @@ -3522,7 +3553,7 @@ Page({
3522 3553 pageSize: 1,
3523 3554 page: 1
3524 3555 },
3525   - success: function(e) {
  3556 + success: function (e) {
3526 3557 //--跳转到已经购买的情况--
3527 3558 if (e.data.data.pageData.length > 0) {
3528 3559 var odr = e.data.data.pageData[0];
... ... @@ -3530,7 +3561,7 @@ Page({
3530 3561 if (odr.pt_status == 0 && (odr.order_status == 1 || odr.order_status == 0)) {
3531 3562 wx.showModal({
3532 3563 title: "您已经购买了该商品待支付中",
3533   - success: function(a) {
  3564 + success: function (a) {
3534 3565 if (a.confirm) {
3535 3566 wx.navigateTo({
3536 3567 url: "/pages/user/order_detail/order_detail?order_id=" + odr.order_id,
... ... @@ -3539,15 +3570,15 @@ Page({
3539 3570 }
3540 3571 });
3541 3572 } else if (odr.pt_status == 1 && odr.order_status == 1) {
3542   -
3543   - if(this.data.is_go_to_team_show) return false;
3544   - this.data.is_go_to_team_show=1;
3545   - wx.showLoading();
3546   -
3547   - /*---
3548   - wx.redirectTo({
3549   - url: "/pages/team/team_success/team_success?ordersn=" + odr.order_sn,
3550   - });--*/
  3573 +
  3574 + if (this.data.is_go_to_team_show) return false;
  3575 + this.data.is_go_to_team_show = 1;
  3576 + wx.showLoading();
  3577 +
  3578 + /*---
  3579 + wx.redirectTo({
  3580 + url: "/pages/team/team_success/team_success?ordersn=" + odr.order_sn,
  3581 + });--*/
3551 3582 getApp().goto("/pages/team/team_success/team_success?ordersn=" + odr.order_sn);
3552 3583  
3553 3584 } else {
... ... @@ -3569,7 +3600,7 @@ Page({
3569 3600 },
3570 3601  
3571 3602 //-----------------拼单生成方法---------------------
3572   - addCart_pt: function() {
  3603 + addCart_pt: function () {
3573 3604 var th = this;
3574 3605 if (this.data.is_normal == 0) {
3575 3606 //看一下有没有起购数,如果有起购数,要计算起购数
... ... @@ -3585,18 +3616,18 @@ Page({
3585 3616 }
3586 3617 },
3587 3618  
3588   - addcart_pt_func: function() {
  3619 + addcart_pt_func: function () {
3589 3620 if (oo.user_id == null) {
3590 3621 s.my_warnning("还未登录!", 0, this);
3591 3622 return;
3592 3623 }
3593 3624 var e = this,
3594   - th = e,
3595   - o = this.data.sele_g;
  3625 + th = e,
  3626 + o = this.data.sele_g;
3596 3627 if (o.store_count <= 0) return s.my_warnning("库存已为空!", 0, th);
3597 3628  
3598 3629 //----------添加到购物车时,要判断限购数量,--------
3599   - e.get_buy_num(o, async function(ee) {
  3630 + e.get_buy_num(o, async function (ee) {
3600 3631  
3601 3632 //---判断商品是否超出限购---
3602 3633 if (th.data.g_buy_num != null && th.data.sele_g.viplimited > 0) {
... ... @@ -3606,30 +3637,30 @@ Page({
3606 3637 content: '超出商品限购'
3607 3638 });
3608 3639  
3609   - var num=th.data.prom_buy_limit-th.data.prom_buy_num;
3610   - if(num<0) num=0;
3611   - th.setData({goodsInputNum:num})
  3640 + var num = th.data.prom_buy_limit - th.data.prom_buy_num;
  3641 + if (num < 0) num = 0;
  3642 + th.setData({ goodsInputNum: num })
3612 3643 return false;
3613 3644 }
3614 3645 }
3615 3646 //---判断商品是否超出活动限购,拼团的普通购买不计算活动的限购---
3616   - if (th.data.prom_buy_num != -1 && th.data.prom_buy_limit > 0 && th.data.is_normal!=1) {
  3647 + if (th.data.prom_buy_num != -1 && th.data.prom_buy_limit > 0 && th.data.is_normal != 1) {
3617 3648 if (th.data.goodsInputNum + th.data.prom_buy_num > th.data.prom_buy_limit) {
3618 3649 wx.showModal({
3619 3650 title: '提示',
3620 3651 content: '超出商品活动限购'
3621 3652 });
3622 3653  
3623   - var num=th.data.prom_buy_limit-th.data.prom_buy_num;
3624   - if(num<0) num=0;
3625   - th.setData({goodsInputNum:num})
  3654 + var num = th.data.prom_buy_limit - th.data.prom_buy_num;
  3655 + if (num < 0) num = 0;
  3656 + th.setData({ goodsInputNum: num })
3626 3657 return false;
3627 3658 }
3628 3659 }
3629 3660  
3630 3661 var redis_num = 0
3631 3662 //不是普通购买的时候
3632   - if(th.data.is_normal!=1){
  3663 + if (th.data.is_normal != 1) {
3633 3664 //-------判断活动是否抢光---------
3634 3665 await getApp().request.promiseGet("/api/weshop/activitylist/getActLen/" + os.stoid + "/6/" + th.data.sele_g.prom_id, {
3635 3666 1: 1
... ... @@ -3643,7 +3674,7 @@ Page({
3643 3674 content: '超出商品活动库存'
3644 3675 });
3645 3676  
3646   - th.setData({goodsInputNum:redis_num})
  3677 + th.setData({ goodsInputNum: redis_num })
3647 3678  
3648 3679 return false;
3649 3680 }
... ... @@ -3651,7 +3682,7 @@ Page({
3651 3682  
3652 3683 if (th.data.goodsInputNum <= 0) return s.my_warnning("商品数量不能为0", 0, th);
3653 3684 if (th.data.goodsInputNum > o.store_count) {
3654   - th.setData({goodsInputNum:o.store_count})
  3685 + th.setData({ goodsInputNum: o.store_count })
3655 3686 return s.my_warnning("超出商品库存", 0, th);
3656 3687 }
3657 3688  
... ... @@ -3674,42 +3705,42 @@ Page({
3674 3705 };
3675 3706  
3676 3707 //---是不是从收藏夹出来的---
3677   - if(th.data.c_guide_id){
  3708 + if (th.data.c_guide_id) {
3678 3709 newd['guide_id'] = th.data.c_guide_id;
3679   - newd['guide_type']=2;
  3710 + newd['guide_type'] = 2;
3680 3711  
3681   - }else{
3682   - if(getApp().globalData.guide_id){
  3712 + } else {
  3713 + if (getApp().globalData.guide_id) {
3683 3714 newd['guide_id'] = getApp().globalData.guide_id;
3684   - newd['guide_type']=0;
  3715 + newd['guide_type'] = 0;
3685 3716  
3686 3717 }
3687 3718 }
3688 3719  
3689 3720 //让商品带上房间号
3690   - if(th.data.sys_switch.is_skuroom_id==1){
3691   - if(th.data.data.goods_id==getApp().globalData.room_goods_id){
3692   - newd.room_id=getApp().globalData.room_id;
  3721 + if (th.data.sys_switch.is_skuroom_id == 1) {
  3722 + if (th.data.data.goods_id == getApp().globalData.room_goods_id) {
  3723 + newd.room_id = getApp().globalData.room_id;
3693 3724 }
3694   - }else{
3695   - if(newd.goods_id==getApp().globalData.room_goods_id){
3696   - newd.room_id=getApp().globalData.room_id;
  3725 + } else {
  3726 + if (newd.goods_id == getApp().globalData.room_goods_id) {
  3727 + newd.room_id = getApp().globalData.room_id;
3697 3728 }
3698 3729 }
3699 3730  
3700 3731 //---如果商品不是积分购和拼团,要判断一个是否要进行等级价的判断------
3701 3732  
3702   - if(th.data.is_normal == 1){
3703   - var conf=th.data.bconfig;
3704   - if(conf.switch_list){
3705   - var s_list=JSON.parse(conf.switch_list);
  3733 + if (th.data.is_normal == 1) {
  3734 + var conf = th.data.bconfig;
  3735 + if (conf.switch_list) {
  3736 + var s_list = JSON.parse(conf.switch_list);
3706 3737 //如果后台有开启等级价的功能
3707   - if(parseInt(s_list.rank_switch)==2){
3708   - var card_price=o[getApp().globalData.userInfo['card_field']];
  3738 + if (parseInt(s_list.rank_switch) == 2) {
  3739 + var card_price = o[getApp().globalData.userInfo['card_field']];
3709 3740 //如果会员有等级价
3710   - if(getApp().globalData.userInfo['card_field']!=undefined && getApp().globalData.userInfo['card_field']!=null
3711   - && getApp().globalData.userInfo['card_field']!="" && card_price>0){
3712   - newd.goods_price=card_price;
  3741 + if (getApp().globalData.userInfo['card_field'] != undefined && getApp().globalData.userInfo['card_field'] != null
  3742 + && getApp().globalData.userInfo['card_field'] != "" && card_price > 0) {
  3743 + newd.goods_price = card_price;
3713 3744 }
3714 3745 }
3715 3746 }
... ... @@ -3717,7 +3748,7 @@ Page({
3717 3748  
3718 3749  
3719 3750 //-----如果是秒杀,团购,积分购,拼团,且不是普通购买-----
3720   - if (th.data.prom_type == 6 && th.data.is_normal!= 1) {
  3751 + if (th.data.prom_type == 6 && th.data.is_normal != 1) {
3721 3752 newd.goods_price = th.data.prom_price;
3722 3753 newd.prom_type = th.data.prom_type;
3723 3754 newd.prom_id = th.data.prom_id;
... ... @@ -3739,23 +3770,23 @@ Page({
3739 3770 newd['pick_name'] = th.data.sto_sele_name;
3740 3771 newd['pick_dis'] = th.data.sto_sele_distr;
3741 3772 newd['is_normal'] = th.data.is_normal;
3742   -
3743   - if(newd['is_normal']){
3744   - newd['is_pd_normal']=1;
3745   - //判断一下有没有全局优惠活动
3746   - th.check_nor_promgood(newd.goods_id,function(e){
3747   - if(e && e.act_id){
3748   - newd['prom_type']=3;
3749   - newd['prom_id']=e.act_id;
3750   - }
3751   - th.buyNow(newd)
3752   - })
3753   - }
  3773 +
  3774 + if (newd['is_normal']) {
  3775 + newd['is_pd_normal'] = 1;
  3776 + //判断一下有没有全局优惠活动
  3777 + th.check_nor_promgood(newd.goods_id, function (e) {
  3778 + if (e && e.act_id) {
  3779 + newd['prom_type'] = 3;
  3780 + newd['prom_id'] = e.act_id;
  3781 + }
  3782 + th.buyNow(newd)
  3783 + })
  3784 + }
3754 3785 else th.buyNow_pt(newd);
3755 3786 })
3756 3787 },
3757 3788 //----------立即购买_pt-----------
3758   - buyNow_pt: function(e) {
  3789 + buyNow_pt: function (e) {
3759 3790 s.set_b_now(e);
3760 3791 wx.navigateTo({
3761 3792 url: "/pages/cart/cart2_pt/cart2_pt?is_bnow=1&goods_id=" + e.goods_id,
... ... @@ -3763,27 +3794,27 @@ Page({
3763 3794 },
3764 3795  
3765 3796 //-------跳转pt商品-------
3766   - go_to_nopay: function() {
3767   - var th = this;
3768   - url="/pages/user/order_detail/order_detail?order_id=" + th.data.buy_order.order_id;
3769   - getApp().goto(url);
3770   -
  3797 + go_to_nopay: function () {
  3798 + var th = this;
  3799 + url = "/pages/user/order_detail/order_detail?order_id=" + th.data.buy_order.order_id;
  3800 + getApp().goto(url);
  3801 +
3771 3802 },
3772 3803 //-------跳转pt teamshow-------
3773   - go_to_team_show: function() {
3774   -
3775   - if(this.data.is_go_to_team_show) return false;
3776   - this.data.is_go_to_team_show=1;
3777   - wx.showLoading();
3778   -
3779   - var th = this;
3780   - var url="/pages/team/team_success/team_success?ordersn=" + th.data.buy_order.order_sn;
3781   - /*--
3782   - wx.redirectTo({
3783   - url:url,
3784   - })--*/
3785   - getApp().goto(url);
3786   -
  3804 + go_to_team_show: function () {
  3805 +
  3806 + if (this.data.is_go_to_team_show) return false;
  3807 + this.data.is_go_to_team_show = 1;
  3808 + wx.showLoading();
  3809 +
  3810 + var th = this;
  3811 + var url = "/pages/team/team_success/team_success?ordersn=" + th.data.buy_order.order_sn;
  3812 + /*--
  3813 + wx.redirectTo({
  3814 + url:url,
  3815 + })--*/
  3816 + getApp().goto(url);
  3817 +
3787 3818 },
3788 3819  
3789 3820 //---拼团倒计时---
... ... @@ -3828,7 +3859,7 @@ Page({
3828 3859 setTimeout(th.countDown2, 1000);
3829 3860 },
3830 3861 //跳转参加团
3831   - go_cj_team: function(e) {
  3862 + go_cj_team: function (e) {
3832 3863 var ind = e.currentTarget.dataset.ind;
3833 3864 var item = this.data.teamgroup[ind];
3834 3865 var id = item.id;
... ... @@ -3842,7 +3873,7 @@ Page({
3842 3873 pageSize: 1,
3843 3874 page: 1
3844 3875 },
3845   - success: function(e) {
  3876 + success: function (e) {
3846 3877 if (e.data.code != 0) {
3847 3878 getApp().my_warnning("读取订单失败", 0, th);
3848 3879 return fasle;
... ... @@ -3854,7 +3885,7 @@ Page({
3854 3885 if (odr.pt_status == 0 && (odr.order_status == 1 || odr.order_status == 0)) {
3855 3886 wx.showModal({
3856 3887 title: "您已经购买了该商品待支付中",
3857   - success: function(a) {
  3888 + success: function (a) {
3858 3889 if (a.confirm) {
3859 3890 wx.navigateTo({
3860 3891 url: "/pages/user/order_detail/order_detail?order_id=" + odr.order_id,
... ... @@ -3863,16 +3894,16 @@ Page({
3863 3894 }
3864 3895 });
3865 3896 } else if (odr.pt_status == 1 && odr.order_status == 1) {
3866   -
3867   - if(this.data.is_go_to_team_show) return false;
3868   - this.data.is_go_to_team_show=1;
3869   - wx.showLoading();
3870   - /*--
3871   - wx.redirectTo({
3872   - url: "/pages/team/team_success/team_success?ordersn=" + odr.order_sn,
3873   - });--*/
3874 3897  
3875   - getApp().goto("/pages/team/team_success/team_success?ordersn=" + odr.order_sn);
  3898 + if (this.data.is_go_to_team_show) return false;
  3899 + this.data.is_go_to_team_show = 1;
  3900 + wx.showLoading();
  3901 + /*--
  3902 + wx.redirectTo({
  3903 + url: "/pages/team/team_success/team_success?ordersn=" + odr.order_sn,
  3904 + });--*/
  3905 +
  3906 + getApp().goto("/pages/team/team_success/team_success?ordersn=" + odr.order_sn);
3876 3907  
3877 3908 } else {
3878 3909 wx.navigateTo({
... ... @@ -3892,7 +3923,7 @@ Page({
3892 3923 },
3893 3924  
3894 3925 //跳到团更多
3895   - go_t_more: function() {
  3926 + go_t_more: function () {
3896 3927 var team_id = this.data.prom_id;
3897 3928 wx.navigateTo({
3898 3929 url: "/pages/team/team_more/team_more?team_id=" + team_id,
... ... @@ -3900,11 +3931,11 @@ Page({
3900 3931 },
3901 3932  
3902 3933 //--点赞功能--
3903   - click_zan: function(e) {
  3934 + click_zan: function (e) {
3904 3935 var com_id = e.currentTarget.dataset.com_id;
3905 3936 var item_id = e.currentTarget.dataset.item_id;
3906 3937 var app = getApp(),
3907   - th = this;
  3938 + th = this;
3908 3939  
3909 3940 if (app.globalData.userInfo == null || app.globalData.userInfo == undefined) {
3910 3941 app.confirmBox("您还未登录");
... ... @@ -3923,7 +3954,7 @@ Page({
3923 3954 goods_id: th.data.gid,
3924 3955 comment_id: com_id
3925 3956 },
3926   - success: function(ee) {
  3957 + success: function (ee) {
3927 3958  
3928 3959 if (ee.data.code == "-1") {
3929 3960 app.my_warnning("不能给自己点赞", 0, th);
... ... @@ -3952,7 +3983,7 @@ Page({
3952 3983 th.setData(_errObj);
3953 3984 }
3954 3985  
3955   - setTimeout(function() {
  3986 + setTimeout(function () {
3956 3987 th.data.iszaning = 0;
3957 3988 }, 500)
3958 3989  
... ... @@ -3961,7 +3992,7 @@ Page({
3961 3992 },
3962 3993  
3963 3994 /*----券的开关---*/
3964   - switchCoupon: async function(event) {
  3995 + switchCoupon: async function (event) {
3965 3996 var coupon = event.currentTarget.dataset.coupon;
3966 3997 var app = getApp();
3967 3998 var url = "/api/weshop/prom/coupon/pageCouponList";
... ... @@ -3978,7 +4009,7 @@ Page({
3978 4009 pageSize: 100,
3979 4010 page: 1,
3980 4011 user_id: app.globalData.user_id,
3981   - is_share:0
  4012 + is_share: 0
3982 4013 }
3983 4014 }).then(res => {
3984 4015 wx.hideLoading();
... ... @@ -4009,13 +4040,13 @@ Page({
4009 4040 },
4010 4041  
4011 4042 //--查看评价--
4012   - look_pj: function() {
  4043 + look_pj: function () {
4013 4044 this.tabComment();
4014 4045 this.doScrollTop();
4015 4046 },
4016 4047  
4017 4048 //-----领取券-----
4018   - get_quan: function(e) {
  4049 + get_quan: function (e) {
4019 4050 var cid = e.currentTarget.dataset.cid;
4020 4051 var index = e.currentTarget.dataset.ind;
4021 4052 var item = this.data.quan_list[index];
... ... @@ -4051,17 +4082,17 @@ Page({
4051 4082 'store_id': os.stoid,
4052 4083 'type': 5
4053 4084 };
4054   -
4055   - //-- 导购ID --
4056   - if(getApp().globalData.guide_id){
4057   - pdata.guide_id=getApp().globalData.guide_id;
4058   - }
4059   -
  4085 +
  4086 + //-- 导购ID --
  4087 + if (getApp().globalData.guide_id) {
  4088 + pdata.guide_id = getApp().globalData.guide_id;
  4089 + }
  4090 +
4060 4091 var app = getApp(),
4061   - th = this;
  4092 + th = this;
4062 4093 app.request.post("/api/weshop/couponList/saveCouponList", {
4063 4094 data: pdata,
4064   - success: function(res) {
  4095 + success: function (res) {
4065 4096 if (res.data.code == 0) {
4066 4097 app.my_warnning("领取成功", 1, th);
4067 4098 lq_num++;
... ... @@ -4081,9 +4112,9 @@ Page({
4081 4112 }
4082 4113 })
4083 4114 },
4084   -
  4115 +
4085 4116 //--定义的保存图片方法,分享团---
4086   - saveImageToPhotosAlbum: function() {
  4117 + saveImageToPhotosAlbum: function () {
4087 4118 //--先判断会员状态--
4088 4119 var user_info = getApp().globalData.userInfo;
4089 4120 if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
... ... @@ -4091,12 +4122,12 @@ Page({
4091 4122 wx.navigateTo({ url: '/pages/togoin/togoin', })
4092 4123 return false;
4093 4124 }
4094   -
4095   - if(this.data.share_hidden) {
4096   - this.setData({
4097   - share_hidden: false,
4098   - });
4099   - };
  4125 +
  4126 + if (this.data.share_hidden) {
  4127 + this.setData({
  4128 + share_hidden: false,
  4129 + });
  4130 + };
4100 4131  
4101 4132 //类型 0普通商品 1秒杀商品 2商家和会员团 3阶梯团 4阶梯团
4102 4133 var type = this.data.prom_type;
... ... @@ -4107,7 +4138,7 @@ Page({
4107 4138 title: '生成中...',
4108 4139 })
4109 4140 var that = this,
4110   - th = that;
  4141 + th = that;
4111 4142 //设置画板显示,才能开始绘图
4112 4143 that.setData({
4113 4144 canvasHidden: false
... ... @@ -4116,230 +4147,230 @@ Page({
4116 4147 var app = getApp();
4117 4148 var unit = that.data.screenWidth / 750 * 1.35; //基础单位,
4118 4149 var path2 = that.data.data.original_img;
4119   - var scene = th.data.gid+"";
4120   - var user_id = getApp().globalData.user_id?getApp().globalData.user_id:0;
4121   - if(user_id>0) {
4122   - scene+="_"+user_id;
  4150 + var scene = th.data.gid + "";
  4151 + var user_id = getApp().globalData.user_id ? getApp().globalData.user_id : 0;
  4152 + if (user_id > 0) {
  4153 + scene += "_" + user_id;
  4154 + }
  4155 + //-- 如果不是会员分享过来的要分享给别人 --
  4156 + if (getApp().globalData.room_id && th.data.data.goods_id == getApp().globalData.room_goods_id && !getApp().globalData.room_user_share) {
  4157 + //固定房间是第3个字符
  4158 + if (!user_id) scene += "_0";
  4159 + scene += "_" + getApp().globalData.room_id;
4123 4160 }
4124   - //-- 如果不是会员分享过来的要分享给别人 --
4125   - if(getApp().globalData.room_id && th.data.data.goods_id==getApp().globalData.room_goods_id && !getApp().globalData.room_user_share) {
4126   - //固定房间是第3个字符
4127   - if(!user_id) scene+="_0";
4128   - scene+="_"+getApp().globalData.room_id ;
4129   - }
4130 4161 ///二微码
4131 4162 var path3 = os.url + "/api/wx/open/app/user/getWeAppEwm/" +
4132   - os.stoid + "?sceneValue=" + scene + "&pageValue=pages/goods/goodsInfo/goodsInfo";
  4163 + os.stoid + "?sceneValue=" + scene + "&pageValue=pages/goods/goodsInfo/goodsInfo";
4133 4164  
4134 4165 console.log(path3);
4135 4166  
4136 4167 //读取文件成功则OK--
4137 4168 wx.getImageInfo({
4138 4169 src: path3,
4139   - success: function(res) {
  4170 + success: function (res) {
4140 4171 //回调写法
4141   - th.get_head_temp(th.get_goods_temp, function() {
  4172 + th.get_head_temp(th.get_goods_temp, function () {
4142 4173 var vpath = res.path;
4143 4174 var context = wx.createCanvasContext('share');
4144 4175 //先画背景
4145 4176 var pg_path = "../../../images/share/share_bg.png";
4146   -
4147   - // context.fillStyle="#FFFFFF";
4148   - // context.fillRect(0,0,554 * unit, 899 * unit);
4149   -
4150   - //-- 如果有自定义海报的时候,判断背景的图片 --
4151   - if(th.data.share_b_img){
4152   - pg_path=th.data.share_b_img;
4153   - }
  4177 +
  4178 + // context.fillStyle="#FFFFFF";
  4179 + // context.fillRect(0,0,554 * unit, 899 * unit);
  4180 +
  4181 + //-- 如果有自定义海报的时候,判断背景的图片 --
  4182 + if (th.data.share_b_img) {
  4183 + pg_path = th.data.share_b_img;
  4184 + }
4154 4185 context.drawImage(pg_path, 0, 0, 554 * unit, 899 * unit);
4155   -
4156   - //-- 是自定义海报的情况下 --
4157   - if(th.data.poster && parseInt(th.data.poster.style)==2) {
4158   - //在线上分享人的情况下
4159   - if(parseInt(th.data.poster.show_headpic)){
4160   - //获取坐标
4161   - var x=parseFloat(th.data.poster.head_x)*2;
4162   - var y=parseFloat(th.data.poster.head_y)*2;
4163   - var x1=(x+90) *unit;
4164   - var y1=(y+50) *unit;
4165   - //--昵称---
4166   - context.setFontSize(24 * unit)
4167   - context.setFillStyle("black")
4168   - context.fillText(app.globalData.userInfo.nickname, x1, y1);
4169   - var width = 24 * app.globalData.userInfo.nickname.length * unit + 4 * unit;
4170   - //强烈推荐 改许程
4171   - var tj_path = "../../../images/share/q_tj.png";
4172   - context.drawImage(tj_path, x1 + width, y1-22*unit, 85 * unit, 30 * unit);
4173   - context.setFontSize(16 * unit)
4174   - context.setLineJoin('round'); //交点设置成圆角
4175   - context.setFillStyle("white")
4176   - context.fillText('强烈推荐', x1 + width+8*unit, y1-1*unit);
4177   -
4178   - //context.setFillStyle("black")
4179   - //context.setFontSize(24 * unit)
4180   - //context.fillText(getApp().globalData.config.store_name, 40 * unit, 130 * unit);
4181   - }
4182   - } else {
4183   - //--昵称---
4184   - context.setFontSize(24 * unit)
4185   - context.setFillStyle("black")
4186   - context.fillText(app.globalData.userInfo.nickname, 152 * unit, 76 * unit);
4187   - var width = 24 * app.globalData.userInfo.nickname.length * unit + 2 * unit;
4188   - //强烈推荐 改许程
4189   - var tj_path = "../../../images/share/q_tj.png";
4190   - context.drawImage(tj_path, 152 * unit + width, 54 * unit, 85 * unit, 30 * unit);
4191   - context.setFontSize(16 * unit);
4192   - context.setLineJoin('round'); //交点设置成圆角
4193   - context.setFillStyle("white");
4194   - context.fillText('强烈推荐', 149 * unit + width + 15 * unit, 75 * unit);
4195   - }
4196   -
4197   - var share_title=th.data.data.goods_name;
4198   - if(th.data.prom_type==1 || th.data.prom_type==6 || th.data.prom_type==4){
4199   - share_title=th.data.prom_act.share_title;
4200   - if(!share_title) share_title=th.data.prom_act.title;
4201   - if(th.data.prom_type==4) share_title=th.data.prom_act.name;
  4186 +
  4187 + //-- 是自定义海报的情况下 --
  4188 + if (th.data.poster && parseInt(th.data.poster.style) == 2) {
  4189 + //在线上分享人的情况下
  4190 + if (parseInt(th.data.poster.show_headpic)) {
  4191 + //获取坐标
  4192 + var x = parseFloat(th.data.poster.head_x) * 2;
  4193 + var y = parseFloat(th.data.poster.head_y) * 2;
  4194 + var x1 = (x + 90) * unit;
  4195 + var y1 = (y + 50) * unit;
  4196 + //--昵称---
  4197 + context.setFontSize(24 * unit)
  4198 + context.setFillStyle("black")
  4199 + context.fillText(app.globalData.userInfo.nickname, x1, y1);
  4200 + var width = 24 * app.globalData.userInfo.nickname.length * unit + 4 * unit;
  4201 + //强烈推荐 改许程
  4202 + var tj_path = "../../../images/share/q_tj.png";
  4203 + context.drawImage(tj_path, x1 + width, y1 - 22 * unit, 85 * unit, 30 * unit);
  4204 + context.setFontSize(16 * unit)
  4205 + context.setLineJoin('round'); //交点设置成圆角
  4206 + context.setFillStyle("white")
  4207 + context.fillText('强烈推荐', x1 + width + 8 * unit, y1 - 1 * unit);
  4208 +
  4209 + //context.setFillStyle("black")
  4210 + //context.setFontSize(24 * unit)
  4211 + //context.fillText(getApp().globalData.config.store_name, 40 * unit, 130 * unit);
  4212 + }
  4213 + } else {
  4214 + //--昵称---
  4215 + context.setFontSize(24 * unit)
  4216 + context.setFillStyle("black")
  4217 + context.fillText(app.globalData.userInfo.nickname, 152 * unit, 76 * unit);
  4218 + var width = 24 * app.globalData.userInfo.nickname.length * unit + 2 * unit;
  4219 + //强烈推荐 改许程
  4220 + var tj_path = "../../../images/share/q_tj.png";
  4221 + context.drawImage(tj_path, 152 * unit + width, 54 * unit, 85 * unit, 30 * unit);
  4222 + context.setFontSize(16 * unit);
  4223 + context.setLineJoin('round'); //交点设置成圆角
  4224 + context.setFillStyle("white");
  4225 + context.fillText('强烈推荐', 149 * unit + width + 15 * unit, 75 * unit);
  4226 + }
  4227 +
  4228 + var share_title = th.data.data.goods_name;
  4229 + if (th.data.prom_type == 1 || th.data.prom_type == 6 || th.data.prom_type == 4) {
  4230 + share_title = th.data.prom_act.share_title;
  4231 + if (!share_title) share_title = th.data.prom_act.title;
  4232 + if (th.data.prom_type == 4) share_title = th.data.prom_act.name;
4202 4233 }
4203 4234  
4204 4235 //---产品名称---
4205 4236 //文本换行 参数:1、canvas对象,2、文本 3、距离左侧的距离 4、距离顶部的距离 5、6、文本的宽度
4206   - if(type!=4){
4207   - context.setFillStyle("black");
4208   - context.setFontSize(21.3 * unit)
4209   - th.draw_Text(context, share_title,
4210   - 38 * unit, 180 * unit, 200 * unit, 279 * unit, unit);
4211   -
4212   - //------产品的价格-------
4213   - context.setFontSize(23 * unit)
4214   - context.setFillStyle("red")
4215   -
4216   -
4217   - var pri0 = th.data.data.shop_price;
4218   - if (th.data.prom_act)
4219   - pri0 = th.data.prom_act.price;
4220   - pri0 = parseFloat(pri0).toFixed(2);
4221   - var wd1=th.data.screenWidth-ut.measureText(pri0, 31 * unit)-25;
4222   - context.fillText("¥", wd1-15, 185 * unit);
4223   - context.setFontSize(31 * unit)
4224   - context.fillText(pri0, wd1, 185 * unit);
4225   -
4226   - //---市场价划掉---
4227   - context.setFillStyle("gray")
4228   - context.setFontSize(22 * unit)
4229   - pri0="¥" + th.data.data.market_price.toFixed(2);
4230   - var wd2=th.data.screenWidth-ut.measureText(pri0, 22 * unit)-25;
4231   - context.fillText(pri0, wd2, 213 * unit);
4232   -
4233   - context.setStrokeStyle('gray');
4234   - context.setLineWidth(1 * unit);
4235   - context.moveTo(wd2-5, 206 * unit);
4236   - context.lineTo(wd2+ut.measureText(pri0, 22 * unit)+5, 206 * unit);
4237   - context.stroke();
4238   -
4239   - }else{
4240   - context.setFillStyle("black");
4241   - context.setFontSize(21.3 * unit)
4242   - th.draw_Text(context, share_title,
4243   - 38 * unit, 170 * unit, 20 * unit, 300*unit, unit);
4244   - //------ 产品的价格 -----
4245   - var pri0 = th.data.prom_act.addmoney;
4246   - var integral=th.data.prom_act.integral;
4247   - var text= "";
4248   - if(integral){text=integral+"积分"; }
4249   - if(pri0 && integral){ text+="+";}
4250   - if(pri0){ text+="¥"+pri0;}
4251   -
4252   - if(!pri0 && !integral){ text="0积分";}
4253   - context.setFillStyle("red");
4254   - context.fillText(text, 38 * unit, 235 * unit);
4255   -
4256   - }
4257   -
  4237 + if (type != 4) {
  4238 + context.setFillStyle("black");
  4239 + context.setFontSize(21.3 * unit)
  4240 + th.draw_Text(context, share_title,
  4241 + 38 * unit, 180 * unit, 200 * unit, 279 * unit, unit);
  4242 +
  4243 + //------产品的价格-------
  4244 + context.setFontSize(23 * unit)
  4245 + context.setFillStyle("red")
  4246 +
  4247 +
  4248 + var pri0 = th.data.data.shop_price;
  4249 + if (th.data.prom_act)
  4250 + pri0 = th.data.prom_act.price;
  4251 + pri0 = parseFloat(pri0).toFixed(2);
  4252 + var wd1 = th.data.screenWidth - ut.measureText(pri0, 31 * unit) - 25;
  4253 + context.fillText("¥", wd1 - 15, 185 * unit);
  4254 + context.setFontSize(31 * unit)
  4255 + context.fillText(pri0, wd1, 185 * unit);
  4256 +
  4257 + //---市场价划掉---
  4258 + context.setFillStyle("gray")
  4259 + context.setFontSize(22 * unit)
  4260 + pri0 = "¥" + th.data.data.market_price.toFixed(2);
  4261 + var wd2 = th.data.screenWidth - ut.measureText(pri0, 22 * unit) - 25;
  4262 + context.fillText(pri0, wd2, 213 * unit);
  4263 +
  4264 + context.setStrokeStyle('gray');
  4265 + context.setLineWidth(1 * unit);
  4266 + context.moveTo(wd2 - 5, 206 * unit);
  4267 + context.lineTo(wd2 + ut.measureText(pri0, 22 * unit) + 5, 206 * unit);
  4268 + context.stroke();
  4269 +
  4270 + } else {
  4271 + context.setFillStyle("black");
  4272 + context.setFontSize(21.3 * unit)
  4273 + th.draw_Text(context, share_title,
  4274 + 38 * unit, 170 * unit, 20 * unit, 300 * unit, unit);
  4275 + //------ 产品的价格 -----
  4276 + var pri0 = th.data.prom_act.addmoney;
  4277 + var integral = th.data.prom_act.integral;
  4278 + var text = "";
  4279 + if (integral) { text = integral + "积分"; }
  4280 + if (pri0 && integral) { text += "+"; }
  4281 + if (pri0) { text += "¥" + pri0; }
  4282 +
  4283 + if (!pri0 && !integral) { text = "0积分"; }
  4284 + context.setFillStyle("red");
  4285 + context.fillText(text, 38 * unit, 235 * unit);
  4286 +
  4287 + }
  4288 +
4258 4289 //---中间大图---
4259 4290 context.drawImage(th.data.share_goods_img, 70 * unit, 250 * unit, 408 * unit, 408 * unit);
4260 4291 //-------大图后面就不一样了-----------
4261 4292 switch (type) {
4262 4293 case 0: //普通商品的展示
4263   - case 4:
  4294 + case 4:
4264 4295 //中间的几个字
4265   - if(th.data.poster && parseInt(th.data.poster.style)==2 ){
4266   - if(parseInt(th.data.poster.show_quality)){
4267   - var g_path = "../../../images/share/s_gou.png";
4268   - context.drawImage(g_path, 56 * unit, 670 * unit, 22 * unit, 22 * unit);
4269   - context.setFillStyle("red")
4270   - context.setFontSize(18 * unit)
4271   - context.fillText("正品保证", 84 * unit, 690 * unit);
4272   -
4273   - context.drawImage(g_path, 218 * unit, 670 * unit, 22 * unit, 22 * unit);
4274   - context.setFillStyle("red")
4275   - context.setFontSize(18 * unit)
4276   - context.fillText("纯实体店", 246 * unit, 690 * unit);
4277   -
4278   - context.drawImage(g_path, 388 * unit, 670 * unit, 22 * unit, 22 * unit);
4279   - context.setFillStyle("red")
4280   - context.setFontSize(18 * unit)
4281   - context.fillText("官方验证", 420 * unit, 690 * unit);
4282   - }
4283   -
4284   - }else{
4285   - var g_path = "../../../images/share/s_gou.png";
4286   - context.drawImage(g_path, 56 * unit, 670 * unit, 22 * unit, 22 * unit);
4287   - context.setFillStyle("red")
4288   - context.setFontSize(18 * unit)
4289   - context.fillText("正品保证", 84 * unit, 690 * unit);
4290   -
4291   - context.drawImage(g_path, 218 * unit, 670 * unit, 22 * unit, 22 * unit);
4292   - context.setFillStyle("red")
4293   - context.setFontSize(18 * unit)
4294   - context.fillText("纯实体店", 246 * unit, 690 * unit);
4295   -
4296   - context.drawImage(g_path, 388 * unit, 670 * unit, 22 * unit, 22 * unit);
4297   - context.setFillStyle("red")
4298   - context.setFontSize(18 * unit)
4299   - context.fillText("官方验证", 420 * unit, 690 * unit);
4300   - }
4301   -
4302   -
4303   - //---画线---
4304   - context.setLineWidth(1 * unit)
4305   - context.moveTo(32 * unit, 710 * unit)
4306   - context.lineTo(520 * unit, 710 * unit)
4307   - context.stroke();
4308   -
4309   - //---文字---
4310   - context.setFillStyle("black")
4311   - context.setFontSize(22 * unit)
4312   -
4313   - if(type==0){
4314   - // 原来start --->
4315   - context.setFontSize(24 * unit)
4316   - context.fillText(th.data.sto_sele_name_1, 40 * unit, 766 * unit);
4317   -
4318   - context.setFontSize(22 * unit)
4319   - context.fillText("优惠乐翻天,精彩就在你身边", 40 * unit, 806 * unit);
4320   - context.fillText("长按识别二维码,立即开始抢购", 40 * unit, 846 * unit);
4321   -
4322   - }else{
4323   - context.setFontSize(24 * unit)
4324   - context.fillText(th.data.sto_sele_name_1, 40 * unit, 766 * unit);
4325   - context.setFontSize(22 * unit)
4326   - context.fillText("长按识别二维码", 40 * unit, 806 * unit);
4327   - context.fillText("立即开始兑换", 40 * unit, 846 * unit);
4328   -
4329   -
4330   - }
4331   -
  4296 + if (th.data.poster && parseInt(th.data.poster.style) == 2) {
  4297 + if (parseInt(th.data.poster.show_quality)) {
  4298 + var g_path = "../../../images/share/s_gou.png";
  4299 + context.drawImage(g_path, 56 * unit, 670 * unit, 22 * unit, 22 * unit);
  4300 + context.setFillStyle("red")
  4301 + context.setFontSize(18 * unit)
  4302 + context.fillText("正品保证", 84 * unit, 690 * unit);
  4303 +
  4304 + context.drawImage(g_path, 218 * unit, 670 * unit, 22 * unit, 22 * unit);
  4305 + context.setFillStyle("red")
  4306 + context.setFontSize(18 * unit)
  4307 + context.fillText("纯实体店", 246 * unit, 690 * unit);
  4308 +
  4309 + context.drawImage(g_path, 388 * unit, 670 * unit, 22 * unit, 22 * unit);
  4310 + context.setFillStyle("red")
  4311 + context.setFontSize(18 * unit)
  4312 + context.fillText("官方验证", 420 * unit, 690 * unit);
  4313 + }
  4314 +
  4315 + } else {
  4316 + var g_path = "../../../images/share/s_gou.png";
  4317 + context.drawImage(g_path, 56 * unit, 670 * unit, 22 * unit, 22 * unit);
  4318 + context.setFillStyle("red")
  4319 + context.setFontSize(18 * unit)
  4320 + context.fillText("正品保证", 84 * unit, 690 * unit);
  4321 +
  4322 + context.drawImage(g_path, 218 * unit, 670 * unit, 22 * unit, 22 * unit);
  4323 + context.setFillStyle("red")
  4324 + context.setFontSize(18 * unit)
  4325 + context.fillText("纯实体店", 246 * unit, 690 * unit);
  4326 +
  4327 + context.drawImage(g_path, 388 * unit, 670 * unit, 22 * unit, 22 * unit);
  4328 + context.setFillStyle("red")
  4329 + context.setFontSize(18 * unit)
  4330 + context.fillText("官方验证", 420 * unit, 690 * unit);
  4331 + }
  4332 +
  4333 +
  4334 + //---画线---
  4335 + context.setLineWidth(1 * unit)
  4336 + context.moveTo(32 * unit, 710 * unit)
  4337 + context.lineTo(520 * unit, 710 * unit)
  4338 + context.stroke();
  4339 +
  4340 + //---文字---
  4341 + context.setFillStyle("black")
  4342 + context.setFontSize(22 * unit)
  4343 +
  4344 + if (type == 0) {
  4345 + // 原来start --->
  4346 + context.setFontSize(24 * unit)
  4347 + context.fillText(th.data.sto_sele_name_1, 40 * unit, 766 * unit);
  4348 +
  4349 + context.setFontSize(22 * unit)
  4350 + context.fillText("优惠乐翻天,精彩就在你身边", 40 * unit, 806 * unit);
  4351 + context.fillText("长按识别二维码,立即开始抢购", 40 * unit, 846 * unit);
  4352 +
  4353 + } else {
  4354 + context.setFontSize(24 * unit)
  4355 + context.fillText(th.data.sto_sele_name_1, 40 * unit, 766 * unit);
  4356 + context.setFontSize(22 * unit)
  4357 + context.fillText("长按识别二维码", 40 * unit, 806 * unit);
  4358 + context.fillText("立即开始兑换", 40 * unit, 846 * unit);
  4359 +
  4360 +
  4361 + }
  4362 +
4332 4363 //---二维吗图---
4333   - //-- 自定义海报 --
4334   - if(th.data.poster){
4335   - var erm_x= parseFloat(th.data.poster.ewm_x)*2;
4336   - var erm_y= parseFloat(th.data.poster.ewm_y)*2;
4337   - context.drawImage(vpath, erm_x * unit, erm_y * unit, 136 * unit, 136 * unit);
4338   - }else{
4339   - //---二维吗图---
4340   - context.drawImage(vpath, 390 * unit, 726 * unit, 136 * unit, 136 * unit);
4341   - }
4342   -
  4364 + //-- 自定义海报 --
  4365 + if (th.data.poster) {
  4366 + var erm_x = parseFloat(th.data.poster.ewm_x) * 2;
  4367 + var erm_y = parseFloat(th.data.poster.ewm_y) * 2;
  4368 + context.drawImage(vpath, erm_x * unit, erm_y * unit, 136 * unit, 136 * unit);
  4369 + } else {
  4370 + //---二维吗图---
  4371 + context.drawImage(vpath, 390 * unit, 726 * unit, 136 * unit, 136 * unit);
  4372 + }
  4373 +
4343 4374 break;
4344 4375 case 1: //秒杀商品的展示
4345 4376 //---画线---
... ... @@ -4351,27 +4382,27 @@ Page({
4351 4382 //画秒杀的图片
4352 4383 var miaos_path = '../../../images/share/miao_share.png';
4353 4384 context.drawImage(miaos_path, 43 * unit, 700 * unit, 222 * unit, 40 * unit);
4354   -
4355   - context.setFillStyle("black")
4356   - context.setFontSize(24 * unit)
4357   - context.fillText(th.data.sto_sele_name_1, 40 * unit, 786 * unit);
  4385 +
  4386 + context.setFillStyle("black")
  4387 + context.setFontSize(24 * unit)
  4388 + context.fillText(th.data.sto_sele_name_1, 40 * unit, 786 * unit);
4358 4389 //---文字---
4359 4390 context.setFontSize(22 * unit)
4360 4391 context.setFillStyle("black")
4361 4392 context.fillText("特惠好物,限时秒杀", 40 * unit, 826 * unit);
4362 4393 context.fillText("长按识别二维码,立即开始抢购", 40 * unit, 866 * unit);
4363   -
4364   -
  4394 +
  4395 +
4365 4396 //---二维吗图---
4366 4397 //-- 自定义海报 --
4367   - if(th.data.poster){
4368   - var erm_x= parseFloat(th.data.poster.ewm_x)*2;
4369   - var erm_y= parseFloat(th.data.poster.ewm_y)*2;
4370   - context.drawImage(vpath, erm_x * unit, erm_y * unit, 135 * unit, 135 * unit);
4371   - }else{
4372   - //---二维吗图---
4373   - context.drawImage(vpath, 390 * unit, 726 * unit, 135 * unit, 135 * unit);
4374   - }
  4398 + if (th.data.poster) {
  4399 + var erm_x = parseFloat(th.data.poster.ewm_x) * 2;
  4400 + var erm_y = parseFloat(th.data.poster.ewm_y) * 2;
  4401 + context.drawImage(vpath, erm_x * unit, erm_y * unit, 135 * unit, 135 * unit);
  4402 + } else {
  4403 + //---二维吗图---
  4404 + context.drawImage(vpath, 390 * unit, 726 * unit, 135 * unit, 135 * unit);
  4405 + }
4375 4406 break;
4376 4407  
4377 4408 case 2: //会员团和商家团的展示
... ... @@ -4381,10 +4412,10 @@ Page({
4381 4412 context.lineTo(520 * unit, 670 * unit)
4382 4413 context.stroke();
4383 4414 //---文字---
4384   -
4385   - context.setFillStyle("black")
4386   - context.setFontSize(24 * unit)
4387   - context.fillText(th.data.sto_sele_name_1, 40 * unit, 720 * unit);
  4415 +
  4416 + context.setFillStyle("black")
  4417 + context.setFontSize(24 * unit)
  4418 + context.fillText(th.data.sto_sele_name_1, 40 * unit, 720 * unit);
4388 4419  
4389 4420 //绘制成团图片
4390 4421 var ct_img = "../../../images/share/ct_num.png";
... ... @@ -4400,25 +4431,25 @@ Page({
4400 4431 }
4401 4432 context.setFontSize(22 * unit)
4402 4433 context.fillText("已拼" + th.data.prom_act.buy_num + "份", 166 * unit, 763 * unit);
4403   -
4404   - context.setFillStyle("gray")
  4434 +
  4435 + context.setFillStyle("gray")
4405 4436 context.fillText("快来和我一起拼团吧!", 40 * unit, 806 * unit);
4406 4437 context.setFillStyle("black")
4407 4438 context.font = 'normal bold 18px sans-serif';
4408 4439 context.setFontSize(21.3 * unit)
4409 4440 context.fillText("长按识别二维码,立即参团", 40 * unit, 836 * unit);
4410   -
4411   -
  4441 +
  4442 +
4412 4443 //---二维吗图---
4413 4444 //-- 自定义海报 --
4414   - if(th.data.poster){
4415   - var erm_x= parseFloat(th.data.poster.ewm_x)*2;
4416   - var erm_y= parseFloat(th.data.poster.ewm_y)*2;
4417   - context.drawImage(vpath, erm_x * unit, erm_y * unit, 136 * unit, 136 * unit);
4418   - }else{
4419   - //---二维吗图---
4420   - context.drawImage(vpath, 390 * unit, 726 * unit, 136 * unit, 136 * unit);
4421   - }
  4445 + if (th.data.poster) {
  4446 + var erm_x = parseFloat(th.data.poster.ewm_x) * 2;
  4447 + var erm_y = parseFloat(th.data.poster.ewm_y) * 2;
  4448 + context.drawImage(vpath, erm_x * unit, erm_y * unit, 136 * unit, 136 * unit);
  4449 + } else {
  4450 + //---二维吗图---
  4451 + context.drawImage(vpath, 390 * unit, 726 * unit, 136 * unit, 136 * unit);
  4452 + }
4422 4453 break
4423 4454 case 3: //阶梯团的展示
4424 4455 //---画线---
... ... @@ -4427,11 +4458,11 @@ Page({
4427 4458 context.lineTo(520 * unit, 670 * unit)
4428 4459 context.stroke();
4429 4460 //---文字---
4430   -
4431   - context.setFillStyle("black")
4432   - context.setFontSize(24 * unit)
4433   - context.fillText(th.data.sto_sele_name_1, 40 * unit, 720 * unit);
4434   -
  4461 +
  4462 + context.setFillStyle("black")
  4463 + context.setFontSize(24 * unit)
  4464 + context.fillText(th.data.sto_sele_name_1, 40 * unit, 720 * unit);
  4465 +
4435 4466 //---绘制中间阶梯的价格---
4436 4467 var list = th.data.prom_act.ct_rylist;
4437 4468 for (var i = 0; i < list.length; i++) {
... ... @@ -4448,80 +4479,80 @@ Page({
4448 4479 context.fillText("满" + item.rynum + "人", 40 * unit + wi, 786 * unit);
4449 4480 }
4450 4481 //----------------下面部分----------------
4451   - // context.setFillStyle("gray")
4452   - // context.fillText("快来和我一起拼团吧!", 40 * unit, 830 * unit);
4453   - // context.setFillStyle("black")
4454   - // context.font = 'normal bold 18px sans-serif';
4455   - // context.setFontSize(22 * unit)
4456   - // context.fillText("长按识别二维码,立即参团", 40 * unit, 860 * unit);
  4482 + // context.setFillStyle("gray")
  4483 + // context.fillText("快来和我一起拼团吧!", 40 * unit, 830 * unit);
  4484 + // context.setFillStyle("black")
  4485 + // context.font = 'normal bold 18px sans-serif';
  4486 + // context.setFontSize(22 * unit)
  4487 + // context.fillText("长按识别二维码,立即参团", 40 * unit, 860 * unit);
4457 4488 //context.setFillStyle("gray")
4458   - context.setFillStyle("black")
4459   - context.fillText("快来和我一起拼团吧!", 40 * unit, 820 * unit);
  4489 + context.setFillStyle("black")
  4490 + context.fillText("快来和我一起拼团吧!", 40 * unit, 820 * unit);
4460 4491 //context.font = 'normal bold 18px sans-serif';
4461 4492 context.setFontSize(21 * unit)
4462 4493 context.fillText("长按识别二维码,立即参团", 40 * unit, 850 * unit);
4463   -
4464   -
4465   - //-- 自定义海报 --
4466   - if(th.data.poster){
4467   - var erm_x= parseFloat(th.data.poster.ewm_x)*2;
4468   - var erm_y= parseFloat(th.data.poster.ewm_y)*2;
4469   - context.drawImage(vpath, erm_x * unit, erm_y * unit, 136 * unit, 136 * unit);
4470   - }else{
4471   - //---二维吗图---
4472   - context.drawImage(vpath, 390 * unit, 726 * unit, 136 * unit, 136 * unit);
4473   - }
  4494 +
  4495 +
  4496 + //-- 自定义海报 --
  4497 + if (th.data.poster) {
  4498 + var erm_x = parseFloat(th.data.poster.ewm_x) * 2;
  4499 + var erm_y = parseFloat(th.data.poster.ewm_y) * 2;
  4500 + context.drawImage(vpath, erm_x * unit, erm_y * unit, 136 * unit, 136 * unit);
  4501 + } else {
  4502 + //---二维吗图---
  4503 + context.drawImage(vpath, 390 * unit, 726 * unit, 136 * unit, 136 * unit);
  4504 + }
4474 4505 break
4475   -
4476   -
  4506 +
  4507 +
  4508 + }
  4509 +
  4510 +
  4511 + //--- 如果是自定义海报的时候 ---
  4512 + if (th.data.poster && parseInt(th.data.poster.style) == 2) {
  4513 +
  4514 + //如果显示会员信息的话
  4515 + if (parseInt(th.data.poster.show_headpic)) {
  4516 + //获取坐标
  4517 + var x = parseFloat(th.data.poster.head_x) * 2;
  4518 + var y = parseFloat(th.data.poster.head_y) * 2;
  4519 + //---绘制圆形要放在最后----
  4520 + context.save();
  4521 + context.beginPath();
  4522 + var h_x = x * unit;
  4523 + var h_y = y * unit;
  4524 + var h_r = 40 * unit;
  4525 + var cx = h_x + h_r;
  4526 + var cy = h_y + h_r;
  4527 + context.arc(cx, cy, h_r, 0, Math.PI * 2, false);
  4528 + context.closePath();
  4529 + context.fill();
  4530 + context.clip();
  4531 + context.drawImage(th.data.share_head, h_x, h_y, h_r * 2, h_r * 2);
  4532 + context.restore();
  4533 + }
  4534 +
  4535 + } else {
  4536 + //---绘制圆形要放在最后----
  4537 + context.save();
  4538 + context.beginPath();
  4539 + var h_x = 60 * unit;
  4540 + var h_y = 24 * unit;
  4541 + var h_r = 40 * unit;
  4542 + var cx = h_x + h_r;
  4543 + var cy = h_y + h_r;
  4544 + context.arc(cx, cy, h_r, 0, Math.PI * 2, false);
  4545 + context.closePath();
  4546 + context.fill();
  4547 + context.clip();
  4548 + context.drawImage(th.data.share_head, h_x, h_y, h_r * 2, h_r * 2);
  4549 + context.restore();
4477 4550 }
4478   -
4479   -
4480   - //--- 如果是自定义海报的时候 ---
4481   - if(th.data.poster && parseInt(th.data.poster.style)==2){
4482   -
4483   - //如果显示会员信息的话
4484   - if(parseInt(th.data.poster.show_headpic)){
4485   - //获取坐标
4486   - var x= parseFloat(th.data.poster.head_x)*2;
4487   - var y=parseFloat(th.data.poster.head_y)*2;
4488   - //---绘制圆形要放在最后----
4489   - context.save();
4490   - context.beginPath();
4491   - var h_x = x* unit;
4492   - var h_y = y * unit;
4493   - var h_r = 40 * unit;
4494   - var cx = h_x + h_r;
4495   - var cy = h_y + h_r;
4496   - context.arc(cx, cy, h_r, 0, Math.PI * 2, false);
4497   - context.closePath();
4498   - context.fill();
4499   - context.clip();
4500   - context.drawImage(th.data.share_head, h_x, h_y, h_r * 2, h_r * 2);
4501   - context.restore();
4502   - }
4503   -
4504   - }else{
4505   - //---绘制圆形要放在最后----
4506   - context.save();
4507   - context.beginPath();
4508   - var h_x = 60 * unit;
4509   - var h_y = 24 * unit;
4510   - var h_r = 40 * unit;
4511   - var cx = h_x + h_r;
4512   - var cy = h_y + h_r;
4513   - context.arc(cx, cy, h_r, 0, Math.PI * 2, false);
4514   - context.closePath();
4515   - context.fill();
4516   - context.clip();
4517   - context.drawImage(th.data.share_head, h_x, h_y, h_r * 2, h_r * 2);
4518   - context.restore();
4519   - }
4520   -
4521   -
  4551 +
  4552 +
4522 4553 //把画板内容绘制成图片,并回调 画板图片路径
4523   - context.draw(false, function() {
4524   - setTimeout(function() {
  4554 + context.draw(false, function () {
  4555 + setTimeout(function () {
4525 4556 wx.canvasToTempFilePath({
4526 4557 x: 0,
4527 4558 y: 0,
... ... @@ -4530,40 +4561,40 @@ Page({
4530 4561 destWidth: 1.2 * 750 * 750 / that.data.screenWidth,
4531 4562 destHeight: 1.2 * 1217 * 750 / that.data.screenWidth,
4532 4563 canvasId: 'share',
4533   - success: function (res) {
4534   -
4535   - that.setData({
4536   - shareImgPath: res.tempFilePath,
4537   - canvasHidden: true
4538   - })
  4564 + success: function (res) {
4539 4565  
4540   - if (!res.tempFilePath) {
4541   - wx.showModal({
4542   - title: '提示',
4543   - content: '图片绘制中,请稍后重试',
4544   - showCancel: false
4545   - })
4546   - return false;
4547   - }
  4566 + that.setData({
  4567 + shareImgPath: res.tempFilePath,
  4568 + canvasHidden: true
  4569 + })
4548 4570  
4549   - // wx.previewImage({
4550   - // //将图片预览出来
4551   - // urls: [that.data.shareImgPath]
4552   - // });
4553   - that.setData({
4554   - showPoster: true,
4555   - });
4556   - wx.hideLoading();
  4571 + if (!res.tempFilePath) {
  4572 + wx.showModal({
  4573 + title: '提示',
  4574 + content: '图片绘制中,请稍后重试',
  4575 + showCancel: false
  4576 + })
  4577 + return false;
4557 4578 }
  4579 +
  4580 + // wx.previewImage({
  4581 + // //将图片预览出来
  4582 + // urls: [that.data.shareImgPath]
  4583 + // });
  4584 + that.setData({
  4585 + showPoster: true,
  4586 + });
  4587 + wx.hideLoading();
  4588 + }
4558 4589 })
4559 4590 }, 500)
4560 4591  
4561 4592 });
4562 4593 });
4563 4594 },
4564   - fail: function(res) {
4565   - console.log(res);
4566   - wx.hideLoading();
  4595 + fail: function (res) {
  4596 + console.log(res);
  4597 + wx.hideLoading();
4567 4598  
4568 4599 }
4569 4600 });
... ... @@ -4571,7 +4602,7 @@ Page({
4571 4602  
4572 4603  
4573 4604 //文本换行 参数:1、canvas对象,2、文本 3、距离左侧的距离 4、距离顶部的距离 5、6、文本的宽度
4574   - draw_Text: function(ctx, str, leftWidth, initHeight, titleHeight, canvasWidth, unit) {
  4605 + draw_Text: function (ctx, str, leftWidth, initHeight, titleHeight, canvasWidth, unit) {
4575 4606 var lineWidth = 0;
4576 4607 var lastSubStrIndex = 0; //每次开始截取的字符串的索引
4577 4608 var han = 0;
... ... @@ -4600,7 +4631,7 @@ Page({
4600 4631  
4601 4632 // ----视频图片----
4602 4633 // 图片计数器
4603   - swiperChange: function(e) {
  4634 + swiperChange: function (e) {
4604 4635 var that = this;
4605 4636 if (e.detail.current > 0) {
4606 4637 that.setData({
... ... @@ -4621,7 +4652,7 @@ Page({
4621 4652 },
4622 4653  
4623 4654 /*---视频相关--*/
4624   - videopicture: function(e) {
  4655 + videopicture: function (e) {
4625 4656 var vipi = e.currentTarget.dataset.vipi;
4626 4657 this.setData({
4627 4658 videopicture: vipi,
... ... @@ -4631,14 +4662,14 @@ Page({
4631 4662 });
4632 4663 },
4633 4664  
4634   - videoPlay: function(e) {
  4665 + videoPlay: function (e) {
4635 4666 var _index = e.currentTarget.id
4636 4667 this.setData({
4637 4668 _index: _index,
4638 4669 noon: 1
4639 4670 })
4640 4671  
4641   - setTimeout(function() {
  4672 + setTimeout(function () {
4642 4673 //将点击视频进行播放
4643 4674 var videoContext = wx.createVideoContext(_index)
4644 4675 videoContext.play();
... ... @@ -4648,7 +4679,7 @@ Page({
4648 4679  
4649 4680  
4650 4681 //--获取头像的本地缓存,回调写法--
4651   - get_head_temp: function(tt, func) {
  4682 + get_head_temp: function (tt, func) {
4652 4683 var ee = this;
4653 4684 if (ee.data.share_head) {
4654 4685 tt(func);
... ... @@ -4664,12 +4695,12 @@ Page({
4664 4695 path2 = path2.replace("https://thirdwx.qlogo.cn", "https://wx.qlogo.cn");
4665 4696 wx.getImageInfo({
4666 4697 src: path2,
4667   - success: function(res) {
  4698 + success: function (res) {
4668 4699 //res.path是网络图片的本地地址
4669 4700 ee.data.share_head = res.path;
4670 4701 tt(func);
4671 4702 },
4672   - fail: function(res) {
  4703 + fail: function (res) {
4673 4704 ee.data.share_head = "../../../images/share/hui_hear_pic.png"; //分享的图片不能用网络的
4674 4705 tt(func);
4675 4706 }
... ... @@ -4677,35 +4708,35 @@ Page({
4677 4708 }
4678 4709 },
4679 4710 //--获取商品图片的本地缓存,回调写法--
4680   - get_goods_temp: function(tt) {
  4711 + get_goods_temp: function (tt) {
4681 4712 var ee = this;
4682 4713 if (ee.data.share_goods_img) {
4683 4714 tt();
4684 4715 return false;
4685 4716 }
4686 4717  
4687   - var img_url=ee.data.data.original_img;
4688   - if((this.data.prom_type==1 || this.data.prom_type==6) && this.data.prom_act.share_imgurl){
4689   - img_url=this.data.iurl+this.data.prom_act.share_imgurl;
  4718 + var img_url = ee.data.data.original_img;
  4719 + if ((this.data.prom_type == 1 || this.data.prom_type == 6) && this.data.prom_act.share_imgurl) {
  4720 + img_url = this.data.iurl + this.data.prom_act.share_imgurl;
4690 4721 }
4691 4722  
4692 4723 //获取商品是分享图信息
4693 4724 wx.getImageInfo({
4694 4725 src: img_url,
4695   - success: function(res) {
4696   - //res.path是网络图片的本地地址
4697   - ee.data.share_goods_img = res.path;
4698   - tt();
  4726 + success: function (res) {
  4727 + //res.path是网络图片的本地地址
  4728 + ee.data.share_goods_img = res.path;
  4729 + tt();
4699 4730 },
4700   - fail: function(res) {
4701   - ee.data.share_goods_img = "../../../images/share/default_g_img.gif"; //分享的图片不能用网络的
4702   - tt();
  4731 + fail: function (res) {
  4732 + ee.data.share_goods_img = "../../../images/share/default_g_img.gif"; //分享的图片不能用网络的
  4733 + tt();
4703 4734 }
4704 4735 });
4705 4736 },
4706 4737  
4707 4738 //--外侧评价的点击效果---
4708   - clik_evaluate: function(e) {
  4739 + clik_evaluate: function (e) {
4709 4740 var val = e.currentTarget.dataset.val;
4710 4741 this.setData({
4711 4742 activeCategoryId: 2,
... ... @@ -4716,19 +4747,19 @@ Page({
4716 4747 },
4717 4748  
4718 4749 //--跳转到商品详情页面--
4719   - go_goods: function(e) {
  4750 + go_goods: function (e) {
4720 4751 var gid = e.currentTarget.dataset.gid;
4721 4752 var url = "/pages/goods/goodsInfo/goodsInfo?goods_id=" + gid;
4722 4753 getApp().goto(url);
4723 4754 },
4724 4755  
4725 4756 //--跳转到支付尾款界面--
4726   - go_pay_wk: function() {
  4757 + go_pay_wk: function () {
4727 4758 var url = "/pages/cart/cart_wk/cart_wk?order_id=" + this.data.wk_order_id;
4728 4759 getApp().goto(url);
4729 4760 },
4730 4761  
4731   - pop_err_img: function(e) {
  4762 + pop_err_img: function (e) {
4732 4763 var txt = e.currentTarget.dataset.errorimg;
4733 4764 var ob = {};
4734 4765 ob[txt] = this.data.iurl + "/miniapp/images/default_g_img.gif";
... ... @@ -4736,11 +4767,11 @@ Page({
4736 4767 },
4737 4768  
4738 4769 //--调用更新阶梯团的接口--
4739   - update_jiti: function(id) {
  4770 + update_jiti: function (id) {
4740 4771 var th = this;
4741 4772 //--更新阶梯团--
4742 4773 getApp().request.put("/api/weshop/teamgroup/updateTeamOrder/" + os.stoid + "/" + id, {
4743   - success: function(ee) {
  4774 + success: function (ee) {
4744 4775 //--等于0是要去支付尾款,接口调用失败,就要去查看参团详情--
4745 4776 if (ee.data.code == 0) {
4746 4777 th.setData({
... ... @@ -4755,21 +4786,21 @@ Page({
4755 4786 })
4756 4787 },
4757 4788 // 选择门店
4758   - choice_store: function(ee) {
  4789 + choice_store: function (ee) {
4759 4790 var th = this;
4760   - var ind=ee.currentTarget.dataset.ind;
  4791 + var ind = ee.currentTarget.dataset.ind;
4761 4792 var bconfig = th.data.bconfig;
4762 4793  
4763   - if(!th.data.only_pk && !th.data.def_pickpu_list){
  4794 + if (!th.data.only_pk && !th.data.def_pickpu_list) {
4764 4795 getApp().confirmBox("门店库存不足", null, 25000, !1);
4765 4796 return false;
4766 4797 }
4767 4798  
4768   - if(th.data.only_pk && !th.data.only_pk.length){
  4799 + if (th.data.only_pk && !th.data.only_pk.length) {
4769 4800 getApp().confirmBox("门店库存不足", null, 25000, !1);
4770 4801 return false;
4771 4802 }
4772   - if(th.data.def_pickpu_list && !th.data.def_pickpu_list.length){
  4803 + if (th.data.def_pickpu_list && !th.data.def_pickpu_list.length) {
4773 4804 getApp().confirmBox("门店库存不足", null, 25000, !1);
4774 4805 return false;
4775 4806 }
... ... @@ -4778,7 +4809,7 @@ Page({
4778 4809 if (bconfig && bconfig.is_sort_storage) {
4779 4810 wx.getLocation({
4780 4811 type: 'gcj02',
4781   - success: function(res) {
  4812 + success: function (res) {
4782 4813  
4783 4814 th.data.lat = res.latitude;
4784 4815 th.data.lon = res.longitude;
... ... @@ -4789,7 +4820,7 @@ Page({
4789 4820 //th.onShow();
4790 4821 th.get_sto(th.data.is_normal);
4791 4822 },
4792   - fail: function(res) {
  4823 + fail: function (res) {
4793 4824 //th.onShow();
4794 4825 th.data.is_get_local_ok = 1;
4795 4826 th.get_sto(th.data.is_normal);
... ... @@ -4808,19 +4839,19 @@ Page({
4808 4839  
4809 4840 }
4810 4841 })
4811   - }else{
  4842 + } else {
4812 4843 th.data.is_get_local_ok = 1;
4813 4844 th.get_sto(th.data.is_normal);
4814 4845 }
4815 4846  
4816   - if(ind!=undefined && ind!=null ){
  4847 + if (ind != undefined && ind != null) {
4817 4848 this.setData({
4818 4849 open_ind_store: ind,
4819 4850 store: 1,
4820 4851 openSpecModal: !1,
4821 4852 openSpecModal_pt: !1
4822 4853 })
4823   - }else{
  4854 + } else {
4824 4855 this.setData({
4825 4856 store: 1,
4826 4857 openSpecModal: !1,
... ... @@ -4829,17 +4860,17 @@ Page({
4829 4860 }
4830 4861 },
4831 4862 //关闭选择门店
4832   - close_popup: function(e) {
4833   - var th=this;
  4863 + close_popup: function (e) {
  4864 + var th = this;
4834 4865 this.setData({
4835 4866 store: 0,
4836 4867 choice_sort_store: 0,
4837 4868 sort_store: 0,
4838   - fir_pick_index:0,
4839   - sec_pick_index:0
  4869 + fir_pick_index: 0,
  4870 + sec_pick_index: 0
4840 4871 })
4841 4872  
4842   - var openindstore=this.data.open_ind_store;
  4873 + var openindstore = this.data.open_ind_store;
4843 4874 if (openindstore == 1) {
4844 4875 th.setData({
4845 4876 openSpecModal: !0,
... ... @@ -4871,23 +4902,23 @@ Page({
4871 4902 },
4872 4903  
4873 4904 //选择更多门店
4874   - more_store: function() {
  4905 + more_store: function () {
4875 4906 this.setData({
4876 4907 sort_store: 1
4877 4908 });
4878 4909 },
4879   - sort_store: function() {
  4910 + sort_store: function () {
4880 4911  
4881 4912 },
4882 4913 // 返回按钮
4883   - returns: function() {
  4914 + returns: function () {
4884 4915 this.setData({
4885 4916 sort_store: 0,
4886 4917 choice_sort_store: 0
4887 4918 });
4888 4919 },
4889 4920 //---选择分类门店---
4890   - choice_sort_store: function(e) {
  4921 + choice_sort_store: function (e) {
4891 4922 var index = e.currentTarget.dataset.index;
4892 4923 var region_name = e.currentTarget.dataset.region;
4893 4924 var item = this.data.all_sto[index];
... ... @@ -4900,9 +4931,9 @@ Page({
4900 4931 });
4901 4932 },
4902 4933  
4903   - choose_for_store_fir: function(e) {
  4934 + choose_for_store_fir: function (e) {
4904 4935 var index_c = e.currentTarget.dataset.ind;
4905   - var th=this;
  4936 + var th = this;
4906 4937 th.setData({
4907 4938 fir_pick_index: index_c
4908 4939 })
... ... @@ -4910,53 +4941,53 @@ Page({
4910 4941 },
4911 4942  
4912 4943 //如果开启线下库存,已经急速库存才会使用
4913   - async check_the_pick(item,func){
4914   - var th=this;
4915   - var goodsinfo=th.data.sele_g;
4916   - var erpwareid=goodsinfo.erpwareid;
4917   - var plist=null;
4918   - var lock=0;
  4944 + async check_the_pick(item, func) {
  4945 + var th = this;
  4946 + var goodsinfo = th.data.sele_g;
  4947 + var erpwareid = goodsinfo.erpwareid;
  4948 + var plist = null;
  4949 + var lock = 0;
4919 4950  
4920 4951 //---如果是活动的时候,同时不是普通购买---
4921   - if((th.data.prom_type==1 || th.data.prom_type==6 || th.data.prom_type==4) && !th.data.is_normal ) {
  4952 + if ((th.data.prom_type == 1 || th.data.prom_type == 6 || th.data.prom_type == 4) && !th.data.is_normal) {
4922 4953 func(); return false;
4923 4954 }
4924 4955  
4925   - if(this.data.sales_rules!=2){
  4956 + if (this.data.sales_rules != 2) {
4926 4957 func();
4927   - }else{
  4958 + } else {
4928 4959  
4929 4960 //先读取门店的lock
4930   - await getApp().request.promiseGet("/api/weshop/order/ware/lock/page",{
4931   - data:{store_id:os.stoid,wareId:goodsinfo.goods_id,storageId:item.pickup_id,pageSize:1000}
4932   - }).then(res=>{
4933   - if(res.data.code==0 && res.data.data.total>0){
4934   - for(var i in res.data.data.pageData )
4935   - lock+=res.data.data.pageData[i].outQty;
  4961 + await getApp().request.promiseGet("/api/weshop/order/ware/lock/page", {
  4962 + data: { store_id: os.stoid, wareId: goodsinfo.goods_id, storageId: item.pickup_id, pageSize: 1000 }
  4963 + }).then(res => {
  4964 + if (res.data.code == 0 && res.data.data.total > 0) {
  4965 + for (var i in res.data.data.pageData)
  4966 + lock += res.data.data.pageData[i].outQty;
4936 4967 }
4937 4968 })
4938 4969 //读取线下的门店库存
4939   - await getApp().request.promiseGet("/api/weshop/goods/getWareStorages",{
4940   - data:{storageNos:item.pickup_no,wareIds:encodeURIComponent(erpwareid),storeId:os.stoid}
4941   - }).then(res=>{
4942   - if(res.data.code==0 && res.data.data.total>0){
4943   - plist=res.data.data.pageData[0];
  4970 + await getApp().request.promiseGet("/api/weshop/goods/getWareStorages", {
  4971 + data: { storageNos: item.pickup_no, wareIds: encodeURIComponent(erpwareid), storeId: os.stoid }
  4972 + }).then(res => {
  4973 + if (res.data.code == 0 && res.data.data.total > 0) {
  4974 + plist = res.data.data.pageData[0];
4944 4975 }
4945 4976 })
4946 4977  
4947   - if(plist && plist.CanOutQty-lock>0){
4948   - item.CanOutQty=plist.CanOutQty-lock;
  4978 + if (plist && plist.CanOutQty - lock > 0) {
  4979 + item.CanOutQty = plist.CanOutQty - lock;
4949 4980 func();
4950 4981 return false;
4951 4982 }
4952   - getApp().my_warnning(item.pickup_name+"库存不足!", 0, th);
  4983 + getApp().my_warnning(item.pickup_name + "库存不足!", 0, th);
4953 4984  
4954 4985 }
4955 4986 },
4956 4987  
4957 4988  
4958 4989 //确定def_pick为选择的门店
4959   - sure_pick: function(e) {
  4990 + sure_pick: function (e) {
4960 4991 var th = this;
4961 4992 var item = null;
4962 4993 var openindstore = th.data.open_ind_store;
... ... @@ -4974,20 +5005,20 @@ Page({
4974 5005 item = th.data.sec_sto.s_arr[index];
4975 5006 }
4976 5007  
4977   - if(!th.data.sele_g) return false;
4978   - //判断门店的配送方式是不是匹配
4979   - var g_distr_type = th.data.sele_g.distr_type;
4980   - if(item.distr_type!=0 && g_distr_type!=0 && item.distr_type!=g_distr_type){
4981   - wx.showToast({
4982   - title: "门店配送方式不匹配",
4983   - icon: 'none',
4984   - duration: 2000
4985   - });
4986   - return false;
4987   - }
4988   -
  5008 + if (!th.data.sele_g) return false;
  5009 + //判断门店的配送方式是不是匹配
  5010 + var g_distr_type = th.data.sele_g.distr_type;
  5011 + if (item.distr_type != 0 && g_distr_type != 0 && item.distr_type != g_distr_type) {
  5012 + wx.showToast({
  5013 + title: "门店配送方式不匹配",
  5014 + icon: 'none',
  5015 + duration: 2000
  5016 + });
  5017 + return false;
  5018 + }
  5019 +
4989 5020 //--回调函数的用法--
4990   - th.check_the_pick(item,function(){
  5021 + th.check_the_pick(item, function () {
4991 5022 th.setData({
4992 5023 def_pick_store: item,
4993 5024 sto_sele_name: item.pickup_name,
... ... @@ -5023,15 +5054,15 @@ Page({
5023 5054 choice_sort_store: 0,
5024 5055 sort_store: 0
5025 5056 })
5026   - }
5027   - //如果商品没有其他活动,要取一下线下价格
5028   - th.get_off_price();
  5057 + }
  5058 + //如果商品没有其他活动,要取一下线下价格
  5059 + th.get_off_price();
5029 5060 })
5030 5061 },
5031 5062 //---点击二级之后的选择---
5032   - choose_for_store: function(e) {
  5063 + choose_for_store: function (e) {
5033 5064 var index_c = e.currentTarget.dataset.ind;
5034   - var th=this;
  5065 + var th = this;
5035 5066 th.setData({
5036 5067 sec_pick_index: index_c,
5037 5068 fir_pick_index: index_c
... ... @@ -5039,7 +5070,7 @@ Page({
5039 5070  
5040 5071 },
5041 5072 //把选择的门店设置成默认的门店def_pick
5042   - set_def_pick: function(e) {
  5073 + set_def_pick: function (e) {
5043 5074 var th = this;
5044 5075 var item = null;
5045 5076 if (th.data.choice_sort_store == 0) {
... ... @@ -5053,30 +5084,30 @@ Page({
5053 5084 var index = th.data.sec_pick_index;
5054 5085 item = th.data.sec_sto.s_arr[index];
5055 5086 }
5056   -
5057   - //判断门店的配送方式是不是匹配
5058   - var g_distr_type = th.data.sele_g.distr_type;
5059   - if(item.distr_type!=0 && g_distr_type!=0 && item.distr_type!=g_distr_type){
5060   - wx.showToast({
5061   - title: "门店配送方式不匹配",
5062   - icon: 'none',
5063   - duration: 2000
5064   - });
5065   - return false;
5066   - }
  5087 +
  5088 + //判断门店的配送方式是不是匹配
  5089 + var g_distr_type = th.data.sele_g.distr_type;
  5090 + if (item.distr_type != 0 && g_distr_type != 0 && item.distr_type != g_distr_type) {
  5091 + wx.showToast({
  5092 + title: "门店配送方式不匹配",
  5093 + icon: 'none',
  5094 + duration: 2000
  5095 + });
  5096 + return false;
  5097 + }
5067 5098  
5068 5099 //先设置之前,要判断是不是有库存
5069   - th.check_the_pick(item,function(){
  5100 + th.check_the_pick(item, function () {
5070 5101 var store_id = o.stoid;
5071 5102 var user_id = getApp().globalData.user_id;
5072 5103 var def_pickup_id = item.pickup_id;
5073 5104  
5074 5105 getApp().request.put('/api/weshop/users/update', {
5075 5106 data: {
5076   - user_id:user_id,
5077   - def_pickup_id:def_pickup_id
  5107 + user_id: user_id,
  5108 + def_pickup_id: def_pickup_id
5078 5109 },
5079   - success: function(res) {
  5110 + success: function (res) {
5080 5111 if (res.data.code == 0) {
5081 5112 if (th.data.choice_sort_store == 0) th.setData({
5082 5113 fir_pick_index: 0
... ... @@ -5084,7 +5115,7 @@ Page({
5084 5115 getApp().globalData.pk_store = item;
5085 5116 } else {
5086 5117 //s.showWarning("设置默认门店地址失败", null, 500, !1);
5087   - getApp().my_warnning("设置默认门店地址失败",0,th)
  5118 + getApp().my_warnning("设置默认门店地址失败", 0, th)
5088 5119 }
5089 5120  
5090 5121 }
... ... @@ -5133,27 +5164,27 @@ Page({
5133 5164 sort_store: 0,
5134 5165 })
5135 5166 }
5136   -
5137   - //如果商品没有其他活动,要取一下线下价格
5138   - th.get_off_price();
5139   -
  5167 +
  5168 + //如果商品没有其他活动,要取一下线下价格
  5169 + th.get_off_price();
  5170 +
5140 5171 })
5141 5172 },
5142 5173  
5143   - wait_for_store_config: function() {
  5174 + wait_for_store_config: function () {
5144 5175 var th = this;
5145   - var t_time = setInterval(function() {
  5176 + var t_time = setInterval(function () {
5146 5177 if (th.data.bconfig == null) false;
5147 5178 var e = th.data.bconfig;
5148 5179 if (e && e.is_sort_storage) {
5149 5180 wx.getLocation({
5150 5181 type: 'gcj02',
5151   - success: function(res) {
  5182 + success: function (res) {
5152 5183 th.data.lat = res.latitude;
5153 5184 th.data.lon = res.longitude;
5154 5185 th.data.is_get_local_ok = 1;
5155 5186 },
5156   - fail: function(res) {
  5187 + fail: function (res) {
5157 5188 if (res.errCode == 2) {
5158 5189 th.setData({
5159 5190 is_gps: 0
... ... @@ -5178,9 +5209,9 @@ Page({
5178 5209 }, 500)
5179 5210 },
5180 5211 //显示全部
5181   - toggleHandler: function(e) {
  5212 + toggleHandler: function (e) {
5182 5213 var that = this,
5183   - index = e.currentTarget.dataset.index;
  5214 + index = e.currentTarget.dataset.index;
5184 5215 for (var i = 0; i < that.data.comments.length; i++) {
5185 5216 if (index == i) {
5186 5217 for (var i = 0; i < that.data.comments.length; i++) {
... ... @@ -5195,9 +5226,9 @@ Page({
5195 5226 },
5196 5227  
5197 5228 //收起更多
5198   - toggleContent: function(e) {
  5229 + toggleContent: function (e) {
5199 5230 var that = this,
5200   - index = e.currentTarget.dataset.index;
  5231 + index = e.currentTarget.dataset.index;
5201 5232 for (var i = 0; i < that.data.comments.length; i++) {
5202 5233 if (index == i) {
5203 5234 that.data.comments[index].auto = true;
... ... @@ -5213,394 +5244,385 @@ Page({
5213 5244 getPlusCardType: function (func) {
5214 5245 var storid = os.stoid;
5215 5246 var th = this;
5216   - var user=getApp().globalData.userInfo;
5217   - if(!user) return false;
  5247 + var user = getApp().globalData.userInfo;
  5248 + if (!user) return false;
5218 5249 getApp().request.promiseGet("/api/weshop/plus/vip/mem/bership/list?" + "storeId=" + storid, {}).then(res => {
5219 5250 var plusCard = res.data.data;
5220 5251 var arr = [1219, 2089, 3031];
5221 5252 var new_arr = new Array();
5222   - var card_name_map=new Map();
5223   -
5224   - var list=[];
5225   - for (var i = 0; i < plusCard.length; i++) {
5226   - if((!user || user.card_field==null || user.card_field=="") && plusCard[i].IsStopBuy==true) continue;
5227   - var name="card"+plusCard[i].CorrPrice.toLowerCase();
5228   - card_name_map.set(name,plusCard[i].CardName);
5229   - list.push(plusCard[i]);
  5253 + var card_name_map = new Map();
  5254 +
  5255 + var list = [];
  5256 + for (var i = 0; i < plusCard.length; i++) {
  5257 + if ((!user || user.card_field == null || user.card_field == "") && plusCard[i].IsStopBuy == true) continue;
  5258 + var name = "card" + plusCard[i].CorrPrice.toLowerCase();
  5259 + card_name_map.set(name, plusCard[i].CardName);
  5260 + list.push(plusCard[i]);
5230 5261 }
5231   -
5232   - var ob={"card_list":list,"name_map":card_name_map};
  5262 +
  5263 + var ob = { "card_list": list, "name_map": card_name_map };
5233 5264 func(ob);
5234 5265 })
5235 5266 },
5236 5267  
5237   - go_plus:function(){
  5268 + go_plus: function () {
5238 5269 getApp().goto("/pages/user/plus/plus");
5239 5270 },
5240   - go_card_info:function(){
  5271 + go_card_info: function () {
5241 5272 getApp().goto("/pages/user/cardinfo/cardinfo");
5242 5273 },
5243 5274 //-- 根据ID拿出门店 --
5244   - get_pick_from_list(pid){
5245   - var all_pick_list=this.data.all_pick_list;
5246   - for(var i in all_pick_list){
5247   - var item=all_pick_list[i];
5248   - if(item.pickup_id==pid){
  5275 + get_pick_from_list(pid) {
  5276 + var all_pick_list = this.data.all_pick_list;
  5277 + for (var i in all_pick_list) {
  5278 + var item = all_pick_list[i];
  5279 + if (item.pickup_id == pid) {
5249 5280 return item;
5250 5281 }
5251 5282 }
5252 5283 },
5253 5284 //-----显示优惠券的时候情况-----
5254   - show_more_cx:function () {
5255   - if(this.data.is_more_cx){
5256   - this.setData({is_more_cx:0});
5257   - }else{
5258   - this.setData({is_more_cx:1});
  5285 + show_more_cx: function () {
  5286 + if (this.data.is_more_cx) {
  5287 + this.setData({ is_more_cx: 0 });
  5288 + } else {
  5289 + this.setData({ is_more_cx: 1 });
5259 5290 }
5260 5291 },
5261 5292  
5262 5293 //----跳转到搭配购买----
5263   - go_prom_list:function () {
5264   -
5265   - var url= "../../../packageA/pages/prom_list/prom_list?goods_id="+this.data.gid;
5266   - var room_id= getApp().globalData.room_id;
5267   - if(room_id && this.data.gid==getApp().globalData.room_goods_id){
5268   - url+="&room_id="+room_id;
5269   - }
5270   - wx.navigateTo({ url: url,})
  5294 + go_prom_list: function () {
  5295 +
  5296 + var url = "../../../packageA/pages/prom_list/prom_list?goods_id=" + this.data.gid;
  5297 + var room_id = getApp().globalData.room_id;
  5298 + if (room_id && this.data.gid == getApp().globalData.room_goods_id) {
  5299 + url += "&room_id=" + room_id;
  5300 + }
  5301 + wx.navigateTo({ url: url, })
5271 5302 },
5272 5303  
5273 5304 //---检查有没有优惠活动---
5274   - check_is_youhui:function(gid,is_nor){
5275   - var th=this;
5276   - //如果是普通购买的时候,要进行调用
5277   - if(is_nor){
5278   - getApp().request.get("/api/weshop/goods/getGoodsPromNormal/" + os.stoid+"/"+gid, {
5279   - success:function(res){
5280   - if(res.data.code==0){
5281   - var r_data=res.data.data;
5282   - th.setData({
5283   - prom_goods:r_data.promGoodsLists,
5284   - })
5285   - th.is_show_more_buy();
5286   - }
5287   - },
5288   - })
5289   -
5290   - }else{
5291   - //调用接口判断订单优惠,
5292   - getApp().request.get("/api/weshop/goods/getGoodsPromList/" + os.stoid+"/"+gid+"/0", {
5293   - success:function(res){
5294   - if(res.data.code==0){
5295   - var r_data=res.data.data;
5296   - var max=0,min=0;
5297   - if(r_data.collocationList){
5298   - for(var i in r_data.collocationList){
5299   - if(max==0) max=r_data.collocationList[i].price;
5300   - if(min==0) min=r_data.collocationList[i].price;
5301   -
5302   - if(max<parseFloat(r_data.collocationList[i].price)) max=r_data.collocationList[i].price;
5303   - if(min>parseFloat(r_data.collocationList[i].price)) min=r_data.collocationList[i].price;
5304   - }
5305   - r_data.collocationPromList.max=(max+th.data.data.shop_price).toFixed(2);
5306   - r_data.collocationPromList.min=(min+th.data.data.shop_price).toFixed(2);
5307   - }
5308   - th.setData({
5309   - order_prom:r_data.promOrder,
5310   - collocationGoods:r_data.collocationPromList,
5311   - prom_goods:r_data.promGoodsLists,
5312   - })
5313   - th.is_show_more_buy();
5314   - }
5315   - }
5316   -
5317   - })
5318   - }
5319   -
5320   -
5321   - },
5322   -
5323   - closePoster() {
5324   - this.setData({
5325   - showPoster: false,
5326   - });
5327   - },
5328   -
5329   - // 保存图片到手机
5330   - savePic() {
5331   - console.log('保存图片');
5332   - var self = this;
5333   - // 获取用户的当前设置,返回值中有小程序已经向用户请求过的权限
5334   - this.getSetting().then((res) => {
5335   - // 判断用户是否授权了保存到相册的权限,如果没有发起授权
5336   - if (!res.authSetting['scope.writePhotosAlbum']) {
5337   - this.authorize().then(() => {
5338   - // 同意授权后保存下载文件
5339   - this.saveImage(self.data.shareImgPath)
5340   - .then(() => {
5341   - self.setData({
5342   - showPoster: false
5343   - });
5344   - });
5345   - })
5346   - } else {
5347   - // 如果已经授权,保存下载文件
5348   - this.saveImage(self.data.shareImgPath)
5349   - .then(() => {
5350   - self.setData({
5351   - showPoster: false
5352   - });
5353   - });
5354   - }
5355   -
5356   - })
5357   - },
5358   -
5359   - // 获取用户已经授予了哪些权限
5360   - getSetting() {
5361   - return new Promise((resolve, reject) => {
5362   - wx.getSetting({
5363   - success: res => {
5364   - resolve(res)
5365   - }
5366   - })
5367   - })
5368   - },
5369   -
5370   - // 发起首次授权请求
5371   - authorize() {
5372   - // isFirst 用来记录是否为首次发起授权,
5373   - // 如果首次授权拒绝后,isFirst赋值为1
5374   - let isFirst = wx.getStorageSync('isFirst') || 0;
5375   - return new Promise((resolve, reject) => {
5376   - wx.authorize({
5377   - scope: 'scope.writePhotosAlbum',
5378   - // 同意授权
5379   - success: () => {
5380   - resolve();
5381   - },
5382   - // 拒绝授权,这里是用户拒绝授权后的回调
5383   - fail: res => {
5384   - if(isFirst === 0) {
5385   - wx.setStorageSync('isFirst', 1);
5386   - wx.showToast({
5387   - title: '保存失败',
5388   - icon: 'none',
5389   - duration: 1000
5390   - })
5391   - } else {
5392   - this.showModal();
5393   - }
5394   - console.log('拒绝授权');
5395   - reject();
5396   - }
5397   - })
5398   - })
5399   - },
5400   -
5401   -
5402   - // 保存图片到系统相册
5403   - saveImage(saveUrl) {
5404   - var self = this;
5405   - return new Promise((resolve, reject) => {
5406   - wx.saveImageToPhotosAlbum({
5407   - filePath: saveUrl,
5408   - success: (res) => {
5409   - wx.showToast({
5410   - title: '保存成功',
5411   - duration: 1000,
5412   - });
5413   - self.setData({
5414   - showPlaybill: 'true'
5415   - });
5416   - resolve();
5417   - },
5418   - fail: () => {
5419   - wx.showToast({
5420   - title: '保存失败',
5421   - duration: 1000,
5422   - });
5423   - }
5424   - })
5425   - })
5426   - },
5427   -
5428   - previewImage() {
5429   - this.data.show_prew_img=1;
5430   - wx.previewImage({
5431   - //将图片预览出来
5432   - urls: [this.data.shareImgPath]
5433   - });
5434   - },
5435   -
5436   - is_show_more_buy:function(){
5437   - var prom_goods=this.data.prom_goods;
5438   - var per_price=this.data.sele_g.shop_price
5439   - if(this.data.card_field && this.data.sele_g[this.data.card_field]>0){
5440   - per_price=this.data.sele_g[this.data.card_field];
5441   - }
5442   - var all_price=per_price*this.data.goodsInputNum;
5443   - var con=null;
5444   - for(var i in prom_goods){
5445   - var item=prom_goods[i];
5446   - if(item.prom_type==1){
5447   - if(item.condition>this.data.goodsInputNum) {
5448   - con=item;
5449   - con.need=(item.condition-this.data.goodsInputNum).toFixed(2)+"件";
5450   - break;
5451   - }
5452   - }else{
5453   - if(item.condition>all_price){
5454   - con=item;
5455   - con.need=(item.condition-all_price).toFixed(2)+"元";
5456   - break;
5457   - }
5458   - }
5459   - }
5460   -
5461   - this.setData({hui_condition:con});
5462   -
5463   - },
5464   -
5465   - //-- 积分购 --
5466   - go_pay_integral:function(){
5467   - this.get_sto(0)
5468   - this.setData({openSpecModal_inte:1,goodsInputNum:1});
5469   - },
5470   - //-- 积分购普通购买 --
5471   - go_pay_integral_normal:function(){
5472   - var th=this;
5473   - if (th.data.sku_g_pt) {
5474   - this.get_sto(1)
5475   - this.setData({openSpecModal_inte_normal:1});
5476   - }else{
5477   - th.get_sto(1);
5478   - th.get_sku(o.stoid, th.data.data, th.data.gid, 1, function() {
5479   - th.setData({
5480   - is_normal: 1,
5481   - openSpecModal_inte_normal:1
5482   - });
5483   - });
5484   - }
5485   - this.check_is_youhui(th.data.gid,1);
5486   - },
5487   -
5488   - closeSpecModal_inte:function(){
5489   - this.setData({openSpecModal_inte:0});
5490   - } ,
5491   - closeSpecModal_inte_normal:function(){
5492   - this.setData({openSpecModal_inte_normal:0});
5493   - //要进行还原
5494   - this.get_sto();
5495   - this.setData({
5496   - sele_g:this.data.data,
5497   - gid:this.data.data.goods_id
5498   - })
5499   -
5500   - this.sele_spec_chech_activity();
5501   - },
5502   -
5503   - addCart_inte:function(t){
5504   - this.add_cart_func_inte(t);
5505   - },
5506   -
5507   -
5508   -
5509   -
5510   - onShareTimeline() {
5511   - var store_name=getApp().globalData.config?getApp().globalData.config.store_name:'';
5512   - if(!store_name)
5513   - store_name=getApp().globalData.setting.appName;
5514   - return {
5515   - title:this.data.data.goods_name + '-' + store_name,
5516   - imageUrl:this.data.gallery[0].image_url,
5517   - }
5518   - },
5519   -
5520   -
5521   - clickCollapse() {
5522   - this.setData({
5523   - flag: !this.data.flag,
5524   - })
5525   - },
5526   -
5527   - clickShare() {
5528   - this.setData({
5529   - share_hidden: true,
5530   - });
5531   - },
5532   -
5533   - send() {
5534   - this.setData({
5535   - share_hidden:false,
5536   - });
5537   - },
5538   -
5539   - cancel() {
5540   - this.setData({
5541   - share_hidden:false,
5542   - });
5543   - },
5544   -
5545   - //积分购和拼团的普通购买的的时候,要判断有没有全场优惠活动
5546   - check_nor_promgood(goods_id,back){
5547   - getApp().request.get("/api/weshop/goods/getGoodsPromNormal/"+os.stoid+"/"+goods_id,{
5548   - success:function(res){
5549   - if(res.data.code==0 && res.data.data && res.data.data.promGoodsLists && res.data.data.promGoodsLists.length>0){
5550   - var obj={
5551   - act_id:res.data.data.promGoodsLists[0].prom_id,
5552   - }
5553   - back(obj);
5554   - }else{
5555   - back(0)
5556   - }
5557   - }
5558   - })
5559   - },
5560   -
5561   - go_zh:function (e) {
5562   - var id=e.currentTarget.dataset.id;
5563   - getApp().goto("/packageB/pages/zuhegou/index/index?id="+id);
5564   - },
5565   -
5566   - check_zh_acting:function (func) {
5567   - var isok = 1,item=this.data.sele_g;
5568   - //如果有组合购
5569   - var url="/api/weshop/prom/zhbuy/get/"+os.stoid+"/"+item.prom_id+"/"+getApp().globalData.userInfo.user_id;
5570   - getApp().request.promiseGet(url, {}).then(res => {
5571   - if(res.data.code==0 && res.data.data){
5572   - if(res.data.data.is_show!=1){
5573   - isok=0;
5574   - }
5575   - //如果活动已经结束
5576   - if(res.data.data.is_end==1){
5577   - isok=0;
5578   - }
5579   - //已经结束
5580   - if(ut.gettimestamp()>res.data.data.end_time){
5581   - isok=0;
5582   - }
5583   - //还未开始
5584   - if(ut.gettimestamp()<res.data.data.start_time){
5585   - isok=0;
5586   - }
5587   -
5588   - }else{
5589   - //未找到商品的活动
5590   - isok = 0;
5591   - }
5592   - item.act=res.data.data;
5593   - func(isok);
5594   - })
5595   - }
5596   -
5597   -
5598   -
5599   -
5600   -
5601   -
5602   -
5603   -
5604   -
5605   -
  5305 + check_is_youhui: function (gid, is_nor) {
  5306 + var th = this;
  5307 + //如果是普通购买的时候,要进行调用
  5308 + if (is_nor) {
  5309 + getApp().request.get("/api/weshop/goods/getGoodsPromNormal/" + os.stoid + "/" + gid, {
  5310 + success: function (res) {
  5311 + if (res.data.code == 0) {
  5312 + var r_data = res.data.data;
  5313 + th.setData({
  5314 + prom_goods: r_data.promGoodsLists,
  5315 + })
  5316 + th.is_show_more_buy();
  5317 + }
  5318 + },
  5319 + })
  5320 +
  5321 + } else {
  5322 + //调用接口判断订单优惠,
  5323 + getApp().request.get("/api/weshop/goods/getGoodsPromList/" + os.stoid + "/" + gid + "/0", {
  5324 + success: function (res) {
  5325 + console.log(res);
  5326 + if (res.data.code == 0) {
  5327 + var r_data = res.data.data;
  5328 + var max = 0, min = 0;
  5329 + if (r_data.collocationList) {
  5330 + for (var i in r_data.collocationList) {
  5331 + if (max == 0) max = r_data.collocationList[i].price;
  5332 + if (min == 0) min = r_data.collocationList[i].price;
  5333 +
  5334 + if (max < parseFloat(r_data.collocationList[i].price)) max = r_data.collocationList[i].price;
  5335 + if (min > parseFloat(r_data.collocationList[i].price)) min = r_data.collocationList[i].price;
  5336 + }
  5337 + r_data.collocationPromList.max = (max + th.data.data.shop_price).toFixed(2);
  5338 + r_data.collocationPromList.min = (min + th.data.data.shop_price).toFixed(2);
  5339 + }
  5340 + th.setData({
  5341 + order_prom: r_data.promOrder,
  5342 + collocationGoods: r_data.collocationPromList,
  5343 + prom_goods: r_data.promGoodsLists,
  5344 + })
  5345 + th.is_show_more_buy();
  5346 + }
  5347 + }
  5348 +
  5349 + })
  5350 + }
  5351 +
  5352 +
  5353 + },
  5354 +
  5355 + closePoster() {
  5356 + this.setData({
  5357 + showPoster: false,
  5358 + });
  5359 + },
  5360 +
  5361 + // 保存图片到手机
  5362 + savePic() {
  5363 + console.log('保存图片');
  5364 + var self = this;
  5365 + // 获取用户的当前设置,返回值中有小程序已经向用户请求过的权限
  5366 + this.getSetting().then((res) => {
  5367 + // 判断用户是否授权了保存到相册的权限,如果没有发起授权
  5368 + if (!res.authSetting['scope.writePhotosAlbum']) {
  5369 + this.authorize().then(() => {
  5370 + // 同意授权后保存下载文件
  5371 + this.saveImage(self.data.shareImgPath)
  5372 + .then(() => {
  5373 + self.setData({
  5374 + showPoster: false
  5375 + });
  5376 + });
  5377 + })
  5378 + } else {
  5379 + // 如果已经授权,保存下载文件
  5380 + this.saveImage(self.data.shareImgPath)
  5381 + .then(() => {
  5382 + self.setData({
  5383 + showPoster: false
  5384 + });
  5385 + });
  5386 + }
  5387 +
  5388 + })
  5389 + },
  5390 +
  5391 + // 获取用户已经授予了哪些权限
  5392 + getSetting() {
  5393 + return new Promise((resolve, reject) => {
  5394 + wx.getSetting({
  5395 + success: res => {
  5396 + resolve(res)
  5397 + }
  5398 + })
  5399 + })
  5400 + },
  5401 +
  5402 + // 发起首次授权请求
  5403 + authorize() {
  5404 + // isFirst 用来记录是否为首次发起授权,
  5405 + // 如果首次授权拒绝后,isFirst赋值为1
  5406 + let isFirst = wx.getStorageSync('isFirst') || 0;
  5407 + return new Promise((resolve, reject) => {
  5408 + wx.authorize({
  5409 + scope: 'scope.writePhotosAlbum',
  5410 + // 同意授权
  5411 + success: () => {
  5412 + resolve();
  5413 + },
  5414 + // 拒绝授权,这里是用户拒绝授权后的回调
  5415 + fail: res => {
  5416 + if (isFirst === 0) {
  5417 + wx.setStorageSync('isFirst', 1);
  5418 + wx.showToast({
  5419 + title: '保存失败',
  5420 + icon: 'none',
  5421 + duration: 1000
  5422 + })
  5423 + } else {
  5424 + this.showModal();
  5425 + }
  5426 + console.log('拒绝授权');
  5427 + reject();
  5428 + }
  5429 + })
  5430 + })
  5431 + },
  5432 +
  5433 +
  5434 + // 保存图片到系统相册
  5435 + saveImage(saveUrl) {
  5436 + var self = this;
  5437 + return new Promise((resolve, reject) => {
  5438 + wx.saveImageToPhotosAlbum({
  5439 + filePath: saveUrl,
  5440 + success: (res) => {
  5441 + wx.showToast({
  5442 + title: '保存成功',
  5443 + duration: 1000,
  5444 + });
  5445 + self.setData({
  5446 + showPlaybill: 'true'
  5447 + });
  5448 + resolve();
  5449 + },
  5450 + fail: () => {
  5451 + wx.showToast({
  5452 + title: '保存失败',
  5453 + duration: 1000,
  5454 + });
  5455 + }
  5456 + })
  5457 + })
  5458 + },
  5459 +
  5460 + previewImage() {
  5461 + this.data.show_prew_img = 1;
  5462 + wx.previewImage({
  5463 + //将图片预览出来
  5464 + urls: [this.data.shareImgPath]
  5465 + });
  5466 + },
  5467 +
  5468 + is_show_more_buy: function () {
  5469 + var prom_goods = this.data.prom_goods;
  5470 + var per_price = this.data.sele_g.shop_price
  5471 + if (this.data.card_field && this.data.sele_g[this.data.card_field] > 0) {
  5472 + per_price = this.data.sele_g[this.data.card_field];
  5473 + }
  5474 + var all_price = per_price * this.data.goodsInputNum;
  5475 + var con = null;
  5476 + for (var i in prom_goods) {
  5477 + var item = prom_goods[i];
  5478 + if (item.prom_type == 1) {
  5479 + if (item.condition > this.data.goodsInputNum) {
  5480 + con = item;
  5481 + con.need = (item.condition - this.data.goodsInputNum).toFixed(2) + "件";
  5482 + break;
  5483 + }
  5484 + } else {
  5485 + if (item.condition > all_price) {
  5486 + con = item;
  5487 + con.need = (item.condition - all_price).toFixed(2) + "元";
  5488 + break;
  5489 + }
  5490 + }
  5491 + }
  5492 +
  5493 + this.setData({ hui_condition: con });
  5494 +
  5495 + },
  5496 +
  5497 + //-- 积分购 --
  5498 + go_pay_integral: function () {
  5499 + this.get_sto(0)
  5500 + this.setData({ openSpecModal_inte: 1, goodsInputNum: 1 });
  5501 + },
  5502 + //-- 积分购普通购买 --
  5503 + go_pay_integral_normal: function () {
  5504 + var th = this;
  5505 + if (th.data.sku_g_pt) {
  5506 + this.get_sto(1)
  5507 + this.setData({ openSpecModal_inte_normal: 1 });
  5508 + } else {
  5509 + th.get_sto(1);
  5510 + th.get_sku(o.stoid, th.data.data, th.data.gid, 1, function () {
  5511 + th.setData({
  5512 + is_normal: 1,
  5513 + openSpecModal_inte_normal: 1
  5514 + });
  5515 + });
  5516 + }
  5517 + this.check_is_youhui(th.data.gid, 1);
  5518 + },
  5519 +
  5520 + closeSpecModal_inte: function () {
  5521 + this.setData({ openSpecModal_inte: 0 });
  5522 + },
  5523 + closeSpecModal_inte_normal: function () {
  5524 + this.setData({ openSpecModal_inte_normal: 0 });
  5525 + //要进行还原
  5526 + this.get_sto();
  5527 + this.setData({
  5528 + sele_g: this.data.data,
  5529 + gid: this.data.data.goods_id
  5530 + })
  5531 +
  5532 + this.sele_spec_chech_activity();
  5533 + },
  5534 +
  5535 + addCart_inte: function (t) {
  5536 + this.add_cart_func_inte(t);
  5537 + },
  5538 +
  5539 +
  5540 +
  5541 +
  5542 + onShareTimeline() {
  5543 + var store_name = getApp().globalData.config ? getApp().globalData.config.store_name : '';
  5544 + if (!store_name)
  5545 + store_name = getApp().globalData.setting.appName;
  5546 + return {
  5547 + title: this.data.data.goods_name + '-' + store_name,
  5548 + imageUrl: this.data.gallery[0].image_url,
  5549 + }
  5550 + },
  5551 +
  5552 +
  5553 + clickCollapse() {
  5554 + this.setData({
  5555 + flag: !this.data.flag,
  5556 + })
  5557 + },
  5558 +
  5559 + clickShare() {
  5560 + this.setData({
  5561 + share_hidden: true,
  5562 + });
  5563 + },
  5564 +
  5565 + send() {
  5566 + this.setData({
  5567 + share_hidden: false,
  5568 + });
  5569 + },
  5570 +
  5571 + cancel() {
  5572 + this.setData({
  5573 + share_hidden: false,
  5574 + });
  5575 + },
  5576 +
  5577 + //积分购和拼团的普通购买的的时候,要判断有没有全场优惠活动
  5578 + check_nor_promgood(goods_id, back) {
  5579 + getApp().request.get("/api/weshop/goods/getGoodsPromNormal/" + os.stoid + "/" + goods_id, {
  5580 + success: function (res) {
  5581 + if (res.data.code == 0 && res.data.data && res.data.data.promGoodsLists && res.data.data.promGoodsLists.length > 0) {
  5582 + var obj = {
  5583 + act_id: res.data.data.promGoodsLists[0].prom_id,
  5584 + }
  5585 + back(obj);
  5586 + } else {
  5587 + back(0)
  5588 + }
  5589 + }
  5590 + })
  5591 + },
  5592 +
  5593 + go_zh: function (e) {
  5594 + var id = e.currentTarget.dataset.id;
  5595 + getApp().goto("/packageB/pages/zuhegou/index/index?id=" + id);
  5596 + },
  5597 +
  5598 + check_zh_acting: function (func) {
  5599 + var isok = 1, item = this.data.sele_g;
  5600 + //如果有组合购
  5601 + var url = "/api/weshop/prom/zhbuy/get/" + os.stoid + "/" + item.prom_id + "/" + getApp().globalData.userInfo.user_id;
  5602 + getApp().request.promiseGet(url, {}).then(res => {
  5603 + if (res.data.code == 0 && res.data.data) {
  5604 + if (res.data.data.is_show != 1) {
  5605 + isok = 0;
  5606 + }
  5607 + //如果活动已经结束
  5608 + if (res.data.data.is_end == 1) {
  5609 + isok = 0;
  5610 + }
  5611 + //已经结束
  5612 + if (ut.gettimestamp() > res.data.data.end_time) {
  5613 + isok = 0;
  5614 + }
  5615 + //还未开始
  5616 + if (ut.gettimestamp() < res.data.data.start_time) {
  5617 + isok = 0;
  5618 + }
  5619 +
  5620 + } else {
  5621 + //未找到商品的活动
  5622 + isok = 0;
  5623 + }
  5624 + item.act = res.data.data;
  5625 + func(isok);
  5626 + })
  5627 + }
5606 5628 });
... ...