wxd / MShopWeApp

Commit 548799a1032a3343095f3363f82edf2a08dcf0dc

Authored by season
2 parents a069cd42 d087ff41

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

Inline Side-by-side
Showing 29 changed files with 629 additions and 306 deletions
... ... @@ -145,7 +145,7 @@ App({
145 145 // }
146 146 // })
147 147 // }
148   - // else if(app.globalData.user_id){ //-- 启用默认的user_id --
  148 + // if(app.globalData.user_id){ //-- 启用默认的user_id --
149 149 //
150 150 // app.promiseGet("/api/weshop/users/get/" + app.globalData.setting.stoid + "/" + app.globalData.user_id,{}).then(res=>{
151 151 // app.globalData.is_get_login=1;
... ... @@ -216,6 +216,10 @@ App({
216 216 this.globalData.isIpx = true
217 217 }
218 218  
  219 + if (res["platform"].toLowerCase()=== 'ios') {
  220 + this.globalData.is_iPhone=1;
  221 + }
  222 +
219 223 /*-- 判断是不是PC端打开的 */
220 224 if (res && ["windows", "mac"].some((v) => v === res["platform"])) {
221 225 app.globalData.is_pc=1;
... ...
components/diy_goodsGroup/diy_goodsGroup.js
  View file @548799a
... ... @@ -237,6 +237,7 @@ Component({
237 237 isonsale: 1,
238 238 orderField: "sort",
239 239 orderType: 'asc',
  240 + isnewwhere:1
240 241 };
241 242 if (th.data.is_recommend) r_data.is_recommend = th.data.is_recommend;
242 243 if (th.data.is_hot) r_data.is_hot = th.data.is_hot;
... ...
packageA/pages/goodsInfo/goodsInfo.js
  View file @548799a
... ... @@ -281,7 +281,9 @@ Page({
281 281  
282 282 };
283 283  
284   - //-- 设置顶部高度 --
  284 +
  285 +
  286 + //-- 设置顶部高度 --
285 287 let height= getApp().globalData.navBarHeight;
286 288 ee.setData({ gid: gid,top_nav:height});
287 289  
... ... @@ -645,14 +647,7 @@ Page({
645 647 var ee = this,gid = this.data.gid, i = getApp().request;
646 648  
647 649 //判断是不是要跳转到拼团服务卡
648   - getApp().check_go_fw(gid,function (act,url){
649   -
650   - if(act){
651   - wx.redirectTo({
652   - url:url
653   - })
654   - return false;
655   - }
  650 + this.check_go_act_fw(gid,function (){
656 651  
657 652 th.data.is_timer = 1;
658 653 //获取用户的默认门店
... ... @@ -881,10 +876,6 @@ Page({
881 876 if(!th.data.prom_type) th.get_sto();
882 877 })
883 878  
884   -
885   -
886   -
887   -
888 879  
889 880 },
890 881  
... ... @@ -4460,6 +4451,64 @@ Page({
4460 4451 },
4461 4452  
4462 4453  
  4454 + async check_go_act_fw(gid,func){
  4455 +
  4456 + if(this.data.options.prom_type==1){
  4457 + func();
  4458 + return false;
  4459 + }
  4460 +
  4461 + var th=this;
  4462 + var rurl = '/api/weshop/activitylist/listGoodActInfo2New';
  4463 + var req_d = {
  4464 + "store_id": getApp().globalData.setting.stoid,
  4465 + "goods_id": gid,
  4466 + "user_id": getApp().globalData.user_id || 0,
  4467 + "goods_type":1
  4468 + }
  4469 + var res= await getApp().request.promiseGet(rurl, {data: req_d});
  4470 +
  4471 + var url = "/packageA/pages/goodsInfo/goodsInfo?goods_id=" + gid;
  4472 + if (res.data.code == 0 && res.data.data && res.data.data.length > 0) {
  4473 + var arr = res.data.data;
  4474 + let times = new Date().getTime();
  4475 + //-- 预热也要计算 --
  4476 + var arr2 = arr.filter(function (e) {
  4477 + return e.s_time < ut.gettimestamp() || (e.warm_uptime && e.warm_uptime < ut.gettimestamp())
  4478 + })
  4479 + if(arr2.length==1) {
  4480 + switch(arr2[0].prom_type){
  4481 + case 1:
  4482 + //url+="&prom_type=1&prom_id="+arr2[0].act_id;
  4483 + th.data.options.prom_id=arr2[0].act_id;
  4484 + th.data.options.prom_type=1;
  4485 + url='';
  4486 + break;
  4487 + case 2:
  4488 + url="/packageG/pages/group_buy/goodsInfo/goodsInfo?goods_id="+gid+"&prom_id="+arr2[0].act_id;
  4489 + break;
  4490 + case 6:
  4491 + url = `/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo?goods_id=${gid}&prom_type=${arr2[0].prom_type}&prom_id=${arr2[0].act_id}`;
  4492 + break;
  4493 + case 8:
  4494 + url = `/packageC/pages/presell/cardInfo/goodsInfo?goods_id=${gid}&prom_id=${arr2[0].act_id}`;
  4495 + break;
  4496 + }
  4497 + if(url){
  4498 + wx.redirectTo({
  4499 + url: url,
  4500 + });
  4501 + return false;
  4502 +
  4503 + }
  4504 + }
  4505 +
  4506 + }
  4507 +
  4508 + func();
  4509 + }
  4510 +
  4511 +
4463 4512 });
4464 4513  
4465 4514  
... ...
packageA/pages/goodsInfo/goodsInfo.wxml
  View file @548799a
... ... @@ -128,7 +128,7 @@
128 128  
129 129  
130 130 <view class="goods-title">
131   - <view class="goods-name elli">{{data.goods_name}}</view>
  131 + <view class="goods-name elli"><text selectable='true' user-select="true">{{data.goods_name}}</text></view>
132 132 </view>
133 133 </view>
134 134  
... ...
packageA/pages/prom_list/prom_list.js
  View file @548799a
... ... @@ -2093,7 +2093,7 @@ Page({
2093 2093 return 1;
2094 2094 },
2095 2095  
2096   - set_sele:function (e) {
  2096 + set_sele:async function (e) {
2097 2097 var th=this;
2098 2098 var index=e.currentTarget.dataset.ind;
2099 2099 var set=e.currentTarget.dataset.set;
... ... @@ -2125,8 +2125,44 @@ Page({
2125 2125 }
2126 2126 }
2127 2127 }
2128   -
  2128 +
  2129 + //判断搭配商品的限购
  2130 + var gd= await getApp().request.promiseGet("/api/weshop/goods/get/" + os.stoid + "/" + click_item.goods_id, {});
  2131 + if(gd && gd.data.code==0 && gd.data.data && gd.data.data.viplimited>0){
  2132 +
  2133 + gd=gd.data.data;
  2134 + var g_buy_num=0;
  2135 +
  2136 + //----获取商品购买数----
  2137 + var buyed=await getApp().request.promiseGet("/api/weshop/ordergoods/getUserBuyGoodsNum", {
  2138 + data: {
  2139 + store_id: os.stoid,
  2140 + user_id: getApp().globalData.user_id,
  2141 + goods_id: gd.goods_id, isnew: 1,
  2142 + timetype: gd.viplimited_timetype
  2143 + }
  2144 + })
  2145 +
  2146 + if(buyed && buyed.data.code==0){
  2147 + g_buy_num = buyed.data.data.goodsbuynum;
  2148 + }
  2149 +
  2150 + if(g_buy_num>=gd.viplimited){
  2151 + wx.showToast({
  2152 + title: "搭配商品超出限购",
  2153 + icon: 'none',
  2154 + duration: 2000
  2155 + })
  2156 + return false;
  2157 + }
  2158 +
  2159 + }
  2160 +
  2161 +
2129 2162 }
  2163 +
  2164 +
  2165 +
2130 2166  
2131 2167 var ob={};
2132 2168 ob[text]= parseInt(set);
... ...
packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.wxml
  View file @548799a
... ... @@ -138,7 +138,7 @@
138 138 <!-- 许程 商家团主页 -->
139 139 <view class="xc-goods-explain flex-vertical-between">
140 140 <view class="xc-explain fs32 ellipsis-2" wx:if="{{prom_type!=0 }}">
141   - {{data.goods_name}}
  141 + <text selectable='true' user-select="true">{{data.goods_name}}</text>
142 142 </view>
143 143 <!-- 这个是分享按钮 -->
144 144 <view wx:if="{{isLogin}}" class="xc-share-frame t-c shrink0" bindtap="clickShare">
... ...
packageC/pages/group_list/group_list.js
  View file @548799a
... ... @@ -19,7 +19,8 @@ Page({
19 19 noMore: false, // 检测是否有更多数据,true为没有更多数据,false为还有数据
20 20 pageNum: 1, // 当前页数
21 21  
22   - time_arr:[]
  22 + time_arr:[],
  23 + timer: null,
23 24 },
24 25  
25 26 /**
... ... @@ -296,8 +297,6 @@ Page({
296 297 var th = this;
297 298 // 获取当前时间，同时得到活动结束时间数组
298 299 let newTime = ut.gettimestamp();
299   -
300   -
301 300 var time_arr=[];
302 301  
303 302 for (let j = 0; j < this.data.list.length; j++) {
... ... @@ -309,43 +308,66 @@ Page({
309 308 // 对结束时间进行处理渲染到页面
310 309 for (var i = 0; i < endTimeList.length; i++) {
311 310  
312   - var o = endTimeList[i];
313   - var endTime = this.data.type == 1 ? o.end_time : o.start_time;
  311 +
314 312 // if(th.data.type==0) endTime = o.start_time;
315   - let obj = null;
316   - // 如果活动未结束，对时间进行处理
317   - if (endTime - newTime > 0) {
318   - let time = (endTime - newTime);
319   - // 获取天、时、分、秒
320   - let day = parseInt(time / (60 * 60 * 24));
321   - let hou = parseInt(time % (60 * 60 * 24) / 3600);
322   - let min = parseInt(time % (60 * 60 * 24) % 3600 / 60);
323   - let sec = parseInt(time % (60 * 60 * 24) % 3600 % 60);
324   - obj = {
325   - day: this.timeFormat(day),
326   - hou: this.timeFormat(hou),
327   - min: this.timeFormat(min),
328   - sec: this.timeFormat(sec),
329   - hide: 1
330   - }
331   - } else {
332   - //活动已结束，全部设置为'00'
333   - obj = {day: '00', hou: '00', min: '00', sec: '00'}
334   - }
335   - //var txt = "goodlist[" + i + "].djs";
336   - //th.setData({[txt]: obj});
337 313  
338   - var e={djs:obj};
339   - arr_new.push(e);
340 314  
  315 + // 创建查询对象
  316 + let query = wx.createSelectorQuery();
  317 + // 获取目标元素，并获取目标元素的信息
  318 + query.select("#l_item_"+j+"_"+i).boundingClientRect();
  319 + // 获取视口，并获取视口信息
  320 + query.selectViewport().boundingClientRect();
  321 + //-- 执行查询,元素要在显示中的才显示定时器 --
  322 + query.exec(([target, view]) => {
  323 +
  324 + if (!th.data.is_timer) return;
  325 + if (!target) return;
  326 + if (!target.id) return;
  327 +
  328 + let idx_str= target.id.replace('l_item_','');
  329 + idx_str=idx_str.split('_');
  330 +
  331 + var o = this.data.list[idx_str[0]][idx_str[1]];
  332 + var endTime = this.data.type == 1 ? o.end_time : o.start_time;
  333 +
  334 + // 条件1：当目标顶部距离视口顶部距离小于视口的高度时
  335 + // 条件2：当目标底部距离视口顶部距离大于0时
  336 + // 当以上两个条件同时成立时，目标元素在视口中
  337 + if (target.top < view.height && target.bottom > 0) {
  338 +
  339 + let obj = null;
  340 + // 如果活动未结束，对时间进行处理
  341 + if (endTime - newTime > 0) {
  342 + let time = (endTime - newTime);
  343 + // 获取天、时、分、秒
  344 + let day = parseInt(time / (60 * 60 * 24));
  345 + let hou = parseInt(time % (60 * 60 * 24) / 3600);
  346 + let min = parseInt(time % (60 * 60 * 24) % 3600 / 60);
  347 + let sec = parseInt(time % (60 * 60 * 24) % 3600 % 60);
  348 + obj = {
  349 + day: this.timeFormat(day),
  350 + hou: this.timeFormat(hou),
  351 + min: this.timeFormat(min),
  352 + sec: this.timeFormat(sec),
  353 + hide: 1
  354 + }
  355 + } else {
  356 + //活动已结束，全部设置为'00'
  357 + obj = {day: '00', hou: '00', min: '00', sec: '00'}
  358 + }
  359 +
  360 + var txt = "time_arr[" + idx_str[0] + "][" + idx_str[1] + "].djs";
  361 + th.setData({[txt]: obj});
  362 + }
  363 + });
  364 + //var e={djs:obj};
  365 + //arr_new.push(e);
341 366 }
342 367  
343   - time_arr.push(arr_new);
344   -
345   -
  368 + //time_arr.push(arr_new);
346 369 }
347   -
348   - this.setData({time_arr:time_arr});
  370 + //this.setData({time_arr:time_arr});
349 371  
350 372 },
351 373  
... ...
packageC/pages/group_list/group_list.wxml
  View file @548799a
... ... @@ -4,7 +4,7 @@
4 4 <block wx:for="{{list}}" wx:for-item="p_item" wx:for-index="p_idx">
5 5  
6 6 <block wx:for="{{p_item}}">
7   - <view class="list-item" bindtap="goto" data-pidx="{{p_idx}}" data-index="{{index}}" >
  7 + <view id="l_item_{{p_idx}}_{{index}}" class="list-item" bindtap="goto" data-pidx="{{p_idx}}" data-index="{{index}}" >
8 8 <view class="img-container">
9 9 <image class="img-block" src="{{imghost + item.original_img}}" data-val="{{item.original_img}}"
10 10 data-errorimg="list[{{p_idx}}][{{index}}].original_img" binderror="bind_bnerr2" lazy-load="true"></image>
... ...
packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js
  View file @548799a
... ... @@ -303,6 +303,17 @@ Page({
303 303 fir_set_sto:1, //最初始的一下，获取门店
304 304 front_pick:null, //在详情页面上显示的门店
305 305  
  306 + //苹果机都为真
  307 + gn_sele_fir:true,
  308 + gn_sele_sec:getApp().globalData.is_iPhone?true:false,
  309 + sn_sele_sec:getApp().globalData.is_iPhone?true:false,
  310 + sku_sele_sec:getApp().globalData.is_iPhone?true:false,
  311 + cate_sele_sec:getApp().globalData.is_iPhone?true:false,
  312 + brand_sele_sec:getApp().globalData.is_iPhone?true:false,
  313 + nation_sele_sec:getApp().globalData.is_iPhone?true:false,
  314 + guige_sele_sec:getApp().globalData.is_iPhone?true:false,
  315 + ontime_sele_sec:getApp().globalData.is_iPhone?true:false,
  316 +
306 317 },
307 318  
308 319 //------初始化加载----------
... ... @@ -1427,8 +1438,13 @@ Page({
1427 1438 var e = t.currentTarget.id;
1428 1439 this.setData({
1429 1440 activeCategoryId: e
1430   - }),
1431   - 1 == e ? this.tabGoodsContent() : 2 == e && this.tabComment();
  1441 + }), 1 == e ? this.tabGoodsContent() : 2 == e && this.tabComment();
  1442 +
  1443 + if(e>0){
  1444 + wx.pageScrollTo({
  1445 + scrollTop:0
  1446 + })
  1447 + }
1432 1448 },
1433 1449  
1434 1450  
... ... @@ -7429,5 +7445,42 @@ Page({
7429 7445 },
7430 7446  
7431 7447  
  7448 + handtouch(e){
  7449 + //苹果机都为真
  7450 + if(getApp().globalData.is_iPhone){
  7451 + return false;
  7452 + }
  7453 + var name=e.currentTarget.dataset.name;
  7454 + var set_data={
  7455 + gn_sele_fir:false,
  7456 + gn_sele_sec:false,
  7457 + sn_sele_sec:false,
  7458 + sku_sele_sec:false,
  7459 + cate_sele_sec:false,
  7460 + brand_sele_sec:false,
  7461 + nation_sele_sec:false,
  7462 + guige_sele_sec:false,
  7463 + ontime_sele_sec:false
  7464 + }
  7465 +
  7466 + switch (name){
  7467 + case 'gn_sele_fir': delete set_data.gn_sele_fir;break;
  7468 + case 'gn_sele_sec': delete set_data.gn_sele_sec;break;
  7469 + case 'sn_sele_sec': delete set_data.sn_sele_sec;break;
  7470 + case 'sku_sele_sec': delete set_data.sku_sele_sec;break;
  7471 + case 'cate_sele_sec': delete set_data.cate_sele_sec;break;
  7472 + case 'brand_sele_sec': delete set_data.brand_sele_sec;break;
  7473 + case 'nation_sele_sec': delete set_data.nation_sele_sec;break;
  7474 + case 'guige_sele_sec': delete set_data.guige_sele_sec;break;
  7475 + case 'ontime_sele_sec': delete set_data.ontime_sele_sec;break;
  7476 + }
  7477 +
  7478 + this.setData(set_data)
  7479 + this.setData({
  7480 + [name]:true
  7481 + })
  7482 +
  7483 + }
  7484 +
7432 7485  
7433 7486 });
... ...
packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxml
  View file @548799a
... ... @@ -211,7 +211,7 @@
211 211  
212 212  
213 213 <view class="goods-title">
214   - <view class="goods-name elli">{{data.goods_name}}</view>
  214 + <view class="goods-name elli" bindtouchstart="handtouch" data-name="gn_sele_fir" ><text selectable='{{gn_sele_fir}}' user-select="{{gn_sele_fir}}" >{{data.goods_name}} </text> </view>
215 215 </view>
216 216  
217 217  
... ... @@ -619,64 +619,64 @@
619 619 <view class="item_left">
620 620 <text>商品名称</text>
621 621 </view>
622   - <view class="item_right">
623   - <text>{{data.goods_name}}</text>
  622 + <view class="item_right" bindtouchstart="handtouch" data-name="gn_sele_sec">
  623 + <text selectable='{{gn_sele_sec}}' user-select="{{gn_sele_sec}}">{{data.goods_name}}</text>
624 624 </view>
625 625 </view>
626 626 <view class="tb_item tb-l">
627 627 <view class="item_left">
628 628 <text>商品编号</text>
629 629 </view>
630   - <view class="item_right">
631   - <text>{{data.goods_sn}}</text>
  630 + <view class="item_right" bindtouchstart="handtouch" data-name="sn_sele_sec">
  631 + <text selectable='{{sn_sele_sec}}' user-select="{{sn_sele_sec}}">{{data.goods_sn}}</text>
632 632 </view>
633 633 </view>
634 634 <view class="tb_item tb-l">
635 635 <view class="item_left">
636 636 <text>商品条码</text>
637 637 </view>
638   - <view class="item_right">
639   - <text>{{data.sku}}</text>
  638 + <view class="item_right" bindtouchstart="handtouch" data-name="sku_sele_sec">
  639 + <text selectable='{{sku_sele_sec}}' user-select="{{sku_sele_sec}}" >{{data.sku}}</text>
640 640 </view>
641 641 </view>
642 642 <view class="tb_item tb-l" wx:if="{{cat_name && is_show_pl}}">
643 643 <view class="item_left">
644 644 <text>品类</text>
645 645 </view>
646   - <view class="item_right">
647   - <text>{{cat_name}}</text>
  646 + <view class="item_right" bindtouchstart="handtouch" data-name="cate_sele_sec">
  647 + <text selectable='{{cate_sele_sec}}' user-select="{{cate_sele_sec}}" >{{cat_name}}</text>
648 648 </view>
649 649 </view>
650 650 <view class="tb_item tb-l" wx:if="{{brand_name && is_show_pp}}">
651 651 <view class="item_left">
652 652 <text>品牌</text>
653 653 </view>
654   - <view class="item_right">
655   - <text>{{brand_name}}</text>
  654 + <view class="item_right" bindtouchstart="handtouch" data-name="brand_sele_sec">
  655 + <text selectable='{{brand_sele_sec}}' user-select="{{brand_sele_sec}}" >{{brand_name}}</text>
656 656 </view>
657 657 </view>
658 658 <view class="tb_item tb-l" wx:if="{{nation_name && is_show_gb}}">
659 659 <view class="item_left">
660 660 <text>国别</text>
661 661 </view>
662   - <view class="item_right">
663   - <text>{{nation_name}}</text>
  662 + <view class="item_right" bindtouchstart="handtouch" data-name="nation_sele_sec">
  663 + <text selectable='{{nation_sele_sec}}' user-select="{{nation_sele_sec}}">{{nation_name}}</text>
664 664 </view>
665 665 </view>
666 666 <view class="tb_item tb-l">
667 667 <view class="item_left">
668 668 <text>规格</text>
669 669 </view>
670   - <view class="item_right">
671   - <text>{{filters.show_gui_ge(data.goods_spec,data.goods_color)}}</text>
  670 + <view class="item_right" bindtouchstart="handtouch" data-name="guige_sele_sec">
  671 + <text selectable='{{guige_sele_sec}}' user-select="{{guige_sele_sec}}" >{{filters.show_gui_ge(data.goods_spec,data.goods_color)}}</text>
672 672 </view>
673 673 </view>
674 674 <view class="tb_item tb-l">
675 675 <view class="item_left">
676 676 <text>上架时间</text>
677 677 </view>
678   - <view class="item_right">
679   - <text>{{data.on_time}}</text>
  678 + <view class="item_right" bindtouchstart="handtouch" data-name="ontime_sele_sec">
  679 + <text selectable='{{ontime_sele_sec}}' user-select="{{ontime_sele_sec}}">{{data.on_time}}</text>
680 680 </view>
681 681 </view>
682 682 </view>
... ... @@ -712,64 +712,64 @@
712 712 <view class="item_left">
713 713 <text>商品名称</text>
714 714 </view>
715   - <view class="item_right">
716   - <text>{{data.goods_name}}</text>
  715 + <view class="item_right" bindtouchstart="handtouch" data-name="gn_sele_sec">
  716 + <text selectable='{{gn_sele_sec}}' user-select="{{gn_sele_sec}}">{{data.goods_name}}</text>
717 717 </view>
718 718 </view>
719 719 <view class="tb_item tb-l">
720 720 <view class="item_left">
721 721 <text>商品编号</text>
722 722 </view>
723   - <view class="item_right">
724   - <text>{{data.goods_sn}}</text>
  723 + <view class="item_right" bindtouchstart="handtouch" data-name="sn_sele_sec">
  724 + <text selectable='{{sn_sele_sec}}' user-select="{{sn_sele_sec}}">{{data.goods_sn}}</text>
725 725 </view>
726 726 </view>
727 727 <view class="tb_item tb-l">
728 728 <view class="item_left">
729 729 <text>商品条码</text>
730 730 </view>
731   - <view class="item_right">
732   - <text>{{data.sku}}</text>
  731 + <view class="item_right" bindtouchstart="handtouch" data-name="sku_sele_sec">
  732 + <text selectable='{{sku_sele_sec}}' user-select="{{sku_sele_sec}}" >{{data.sku}}</text>
733 733 </view>
734 734 </view>
735 735 <view class="tb_item tb-l" wx:if="{{cat_name && is_show_pl}}">
736 736 <view class="item_left">
737 737 <text>品类</text>
738 738 </view>
739   - <view class="item_right">
740   - <text>{{cat_name}}</text>
  739 + <view class="item_right" bindtouchstart="handtouch" data-name="cate_sele_sec">
  740 + <text selectable='{{cate_sele_sec}}' user-select="{{cate_sele_sec}}" >{{cat_name}}</text>
741 741 </view>
742 742 </view>
743 743 <view class="tb_item tb-l" wx:if="{{brand_name && is_show_pp}}">
744 744 <view class="item_left">
745 745 <text>品牌</text>
746 746 </view>
747   - <view class="item_right">
748   - <text>{{brand_name}}</text>
  747 + <view class="item_right" bindtouchstart="handtouch" data-name="brand_sele_sec">
  748 + <text selectable='{{brand_sele_sec}}' user-select="{{brand_sele_sec}}" >{{brand_name}}</text>
749 749 </view>
750 750 </view>
751 751 <view class="tb_item tb-l" wx:if="{{nation_name && is_show_gb}}">
752 752 <view class="item_left">
753 753 <text>国别</text>
754 754 </view>
755   - <view class="item_right">
756   - <text>{{nation_name}}</text>
  755 + <view class="item_right" bindtouchstart="handtouch" data-name="nation_sele_sec">
  756 + <text selectable='{{nation_sele_sec}}' user-select="{{nation_sele_sec}}">{{nation_name}}</text>
757 757 </view>
758 758 </view>
759 759 <view class="tb_item tb-l">
760 760 <view class="item_left">
761 761 <text>规格</text>
762 762 </view>
763   - <view class="item_right">
764   - <text>{{data.goods_spec==""?"规格1":data.goods_spec}}</text>
  763 + <view class="item_right" bindtouchstart="handtouch" data-name="guige_sele_sec">
  764 + <text selectable='{{guige_sele_sec}}' user-select="{{guige_sele_sec}}" >{{filters.show_gui_ge(data.goods_spec,data.goods_color)}}</text>
765 765 </view>
766 766 </view>
767 767 <view class="tb_item tb-l">
768 768 <view class="item_left">
769 769 <text>上架时间</text>
770 770 </view>
771   - <view class="item_right">
772   - <text>{{data.on_time}}</text>
  771 + <view class="item_right" bindtouchstart="handtouch" data-name="ontime_sele_sec">
  772 + <text selectable='{{ontime_sele_sec}}' user-select="{{ontime_sele_sec}}">{{data.on_time}}</text>
773 773 </view>
774 774 </view>
775 775 </view>
... ...
packageC/pages/presell/cardInfo/goodsInfo.wxml
  View file @548799a
... ... @@ -127,8 +127,8 @@
127 127 <!-- --显示团类型和团价格-- -->
128 128 <view class="pt_fir_title ">
129 129 <view class="xc-goods-explain flex-vertical-between">
130   - <view class="xc-explain fs32 ellipsis-2">
131   - {{data.goods_name}}
  130 + <view class="xc-explain fs32 ellipsis-2">
  131 + <text selectable='true' user-select="true">{{data.goods_name}}</text>
132 132 </view>
133 133 <!-- 这个是分享按钮 -->
134 134 <view wx:if="{{isLogin}}" class="xc-share-frame t-c" bindtap="clickShare">
... ...
packageC/pages/presell/cart/cart.js
  View file @548799a
... ... @@ -3334,7 +3334,7 @@ Page({
3334 3334 prom_type: good.prom_type,
3335 3335 prom_id: good.prom_id,
3336 3336 isnew: 1,
3337   - timetype:good.viplimited_timetype
  3337 + timetype:gg.viplimited_timetype
3338 3338 },
3339 3339 }).then(res => {
3340 3340 var buy_num_data = res.data.data;
... ...
packageC/pages/presell/goodsInfo/goodsInfo.js
  View file @548799a
... ... @@ -269,7 +269,18 @@ Page({
269 269 nav_backgroundColor: "#ffffff",
270 270 nav_type: 2, //导航类型
271 271 istop: 0, //是否置顶风格为1
272   - searchbox_transparent: 1
  272 + searchbox_transparent: 1,
  273 +
  274 + //苹果机都为真
  275 + gn_sele_fir: true,
  276 + gn_sele_sec:getApp().globalData.is_iPhone?true:false,
  277 + sn_sele_sec:getApp().globalData.is_iPhone?true:false,
  278 + sku_sele_sec:getApp().globalData.is_iPhone?true:false,
  279 + cate_sele_sec:getApp().globalData.is_iPhone?true:false,
  280 + brand_sele_sec:getApp().globalData.is_iPhone?true:false,
  281 + nation_sele_sec:getApp().globalData.is_iPhone?true:false,
  282 + guige_sele_sec:getApp().globalData.is_iPhone?true:false,
  283 + ontime_sele_sec:getApp().globalData.is_iPhone?true:false,
273 284  
274 285 },
275 286  
... ... @@ -1051,6 +1062,12 @@ Page({
1051 1062 this.setData({
1052 1063 activeCategoryId: e
1053 1064 }), 1 == e ? this.tabGoodsContent() : 2 == e && this.tabComment();
  1065 +
  1066 + if(e>0){
  1067 + wx.pageScrollTo({
  1068 + scrollTop:0
  1069 + })
  1070 + }
1054 1071 },
1055 1072 tabClick2: function (t) {
1056 1073 this.setData({
... ... @@ -5003,4 +5020,42 @@ Page({
5003 5020 },
5004 5021  
5005 5022  
  5023 + handtouch(e){
  5024 + //苹果机都为真
  5025 + if(getApp().globalData.is_iPhone){
  5026 + return false;
  5027 + }
  5028 + var name=e.currentTarget.dataset.name;
  5029 + var set_data={
  5030 + gn_sele_fir:false,
  5031 + gn_sele_sec:false,
  5032 + sn_sele_sec:false,
  5033 + sku_sele_sec:false,
  5034 + cate_sele_sec:false,
  5035 + brand_sele_sec:false,
  5036 + nation_sele_sec:false,
  5037 + guige_sele_sec:false,
  5038 + ontime_sele_sec:false
  5039 + }
  5040 +
  5041 + switch (name){
  5042 + case 'gn_sele_fir': delete set_data.gn_sele_fir;break;
  5043 + case 'gn_sele_sec': delete set_data.gn_sele_sec;break;
  5044 + case 'sn_sele_sec': delete set_data.sn_sele_sec;break;
  5045 + case 'sku_sele_sec': delete set_data.sku_sele_sec;break;
  5046 + case 'cate_sele_sec': delete set_data.cate_sele_sec;break;
  5047 + case 'brand_sele_sec': delete set_data.brand_sele_sec;break;
  5048 + case 'nation_sele_sec': delete set_data.nation_sele_sec;break;
  5049 + case 'guige_sele_sec': delete set_data.guige_sele_sec;break;
  5050 + case 'ontime_sele_sec': delete set_data.ontime_sele_sec;break;
  5051 + }
  5052 +
  5053 + this.setData(set_data)
  5054 + this.setData({
  5055 + [name]:true
  5056 + })
  5057 +
  5058 + }
  5059 +
  5060 +
5006 5061 });
... ...
packageC/pages/presell/goodsInfo/goodsInfo.wxml
  View file @548799a
... ... @@ -131,8 +131,8 @@
131 131 <view class="pt_fir_title ">
132 132 <view class="xc-goods-explain flex-vertical-between">
133 133 <view class="xc-explain fs32 ellipsis-2">
134   - {{data.goods_name}}
135   - </view>
  134 + <text bindtouchstart="handtouch" data-name="gn_sele_fir" selectable='{{gn_sele_fir}}' user-select="{{gn_sele_fir}}" >{{data.goods_name}}</text>
  135 + </view>
136 136 <!-- 这个是分享按钮 -->
137 137 <view wx:if="{{isLogin}}" class="xc-share-frame t-c" bindtap="clickShare">
138 138 <view class="iconfont icon-share"></view>
... ... @@ -284,64 +284,64 @@
284 284 <view class="item_left">
285 285 <text>商品名称</text>
286 286 </view>
287   - <view class="item_right">
288   - <text>{{data.goods_name}}</text>
  287 + <view class="item_right" bindtouchstart="handtouch" data-name="gn_sele_sec">
  288 + <text selectable='{{gn_sele_sec}}' user-select="{{gn_sele_sec}}">{{data.goods_name}}</text>
289 289 </view>
290 290 </view>
291 291 <view class="tb_item tb-l">
292 292 <view class="item_left">
293 293 <text>商品编号</text>
294 294 </view>
295   - <view class="item_right">
296   - <text>{{data.goods_sn}}</text>
  295 + <view class="item_right" bindtouchstart="handtouch" data-name="sn_sele_sec">
  296 + <text selectable='{{sn_sele_sec}}' user-select="{{sn_sele_sec}}">{{data.goods_sn}}</text>
297 297 </view>
298 298 </view>
299 299 <view class="tb_item tb-l">
300 300 <view class="item_left">
301 301 <text>商品条码</text>
302 302 </view>
303   - <view class="item_right">
304   - <text>{{data.sku}}</text>
  303 + <view class="item_right" bindtouchstart="handtouch" data-name="sku_sele_sec">
  304 + <text selectable='{{sku_sele_sec}}' user-select="{{sku_sele_sec}}" >{{data.sku}}</text>
305 305 </view>
306 306 </view>
307 307 <view class="tb_item tb-l" wx:if="{{cat_name && is_show_pl}}">
308 308 <view class="item_left">
309 309 <text>品类</text>
310 310 </view>
311   - <view class="item_right">
312   - <text>{{cat_name}}</text>
  311 + <view class="item_right" bindtouchstart="handtouch" data-name="cate_sele_sec">
  312 + <text selectable='{{cate_sele_sec}}' user-select="{{cate_sele_sec}}" >{{cat_name}}</text>
313 313 </view>
314 314 </view>
315 315 <view class="tb_item tb-l" wx:if="{{brand_name && is_show_pp}}">
316 316 <view class="item_left">
317 317 <text>品牌</text>
318 318 </view>
319   - <view class="item_right">
320   - <text>{{brand_name}}</text>
  319 + <view class="item_right" bindtouchstart="handtouch" data-name="brand_sele_sec">
  320 + <text selectable='{{brand_sele_sec}}' user-select="{{brand_sele_sec}}" >{{brand_name}}</text>
321 321 </view>
322 322 </view>
323 323 <view class="tb_item tb-l" wx:if="{{nation_name && is_show_gb}}">
324 324 <view class="item_left">
325 325 <text>国别</text>
326 326 </view>
327   - <view class="item_right">
328   - <text>{{nation_name}}</text>
  327 + <view class="item_right" bindtouchstart="handtouch" data-name="nation_sele_sec">
  328 + <text selectable='{{nation_sele_sec}}' user-select="{{nation_sele_sec}}">{{nation_name}}</text>
329 329 </view>
330 330 </view>
331 331 <view class="tb_item tb-l">
332 332 <view class="item_left">
333 333 <text>规格</text>
334 334 </view>
335   - <view class="item_right">
336   - <text>{{filters.show_gui_ge(data.goods_spec,data.goods_color)}}</text>
  335 + <view class="item_right" bindtouchstart="handtouch" data-name="guige_sele_sec">
  336 + <text selectable='{{guige_sele_sec}}' user-select="{{guige_sele_sec}}" >{{filters.show_gui_ge(data.goods_spec,data.goods_color)}}</text>
337 337 </view>
338 338 </view>
339 339 <view class="tb_item tb-l">
340 340 <view class="item_left">
341 341 <text>上架时间</text>
342 342 </view>
343   - <view class="item_right">
344   - <text>{{data.on_time}}</text>
  343 + <view class="item_right" bindtouchstart="handtouch" data-name="ontime_sele_sec">
  344 + <text selectable='{{ontime_sele_sec}}' user-select="{{ontime_sele_sec}}">{{data.on_time}}</text>
345 345 </view>
346 346 </view>
347 347 </view>
... ... @@ -381,74 +381,74 @@
381 381 </view>
382 382 <!-- ----------商品详情图片页面-------------- -->
383 383 <view class="goods-norms" hidden="{{activeCategoryId==1?false:true}}">
  384 +
384 385 <view class="table_s">
385 386 <view class="tb_item tb-l">
386 387 <view class="item_left">
387 388 <text>商品名称</text>
388 389 </view>
389   - <view class="item_right">
390   - <text>{{data.goods_name}}</text>
  390 + <view class="item_right" bindtouchstart="handtouch" data-name="gn_sele_sec">
  391 + <text selectable='{{gn_sele_sec}}' user-select="{{gn_sele_sec}}">{{data.goods_name}}</text>
391 392 </view>
392 393 </view>
393 394 <view class="tb_item tb-l">
394 395 <view class="item_left">
395 396 <text>商品编号</text>
396 397 </view>
397   - <view class="item_right">
398   - <text>{{data.goods_sn}}</text>
  398 + <view class="item_right" bindtouchstart="handtouch" data-name="sn_sele_sec">
  399 + <text selectable='{{sn_sele_sec}}' user-select="{{sn_sele_sec}}">{{data.goods_sn}}</text>
399 400 </view>
400 401 </view>
401 402 <view class="tb_item tb-l">
402 403 <view class="item_left">
403 404 <text>商品条码</text>
404 405 </view>
405   - <view class="item_right">
406   - <text>{{data.sku}}</text>
  406 + <view class="item_right" bindtouchstart="handtouch" data-name="sku_sele_sec">
  407 + <text selectable='{{sku_sele_sec}}' user-select="{{sku_sele_sec}}" >{{data.sku}}</text>
407 408 </view>
408 409 </view>
409 410 <view class="tb_item tb-l" wx:if="{{cat_name && is_show_pl}}">
410 411 <view class="item_left">
411 412 <text>品类</text>
412 413 </view>
413   - <view class="item_right">
414   - <text>{{cat_name}}</text>
  414 + <view class="item_right" bindtouchstart="handtouch" data-name="cate_sele_sec">
  415 + <text selectable='{{cate_sele_sec}}' user-select="{{cate_sele_sec}}" >{{cat_name}}</text>
415 416 </view>
416 417 </view>
417 418 <view class="tb_item tb-l" wx:if="{{brand_name && is_show_pp}}">
418 419 <view class="item_left">
419 420 <text>品牌</text>
420 421 </view>
421   - <view class="item_right">
422   - <text>{{brand_name}}</text>
  422 + <view class="item_right" bindtouchstart="handtouch" data-name="brand_sele_sec">
  423 + <text selectable='{{brand_sele_sec}}' user-select="{{brand_sele_sec}}" >{{brand_name}}</text>
423 424 </view>
424 425 </view>
425 426 <view class="tb_item tb-l" wx:if="{{nation_name && is_show_gb}}">
426 427 <view class="item_left">
427 428 <text>国别</text>
428 429 </view>
429   - <view class="item_right">
430   - <text>{{nation_name}}</text>
  430 + <view class="item_right" bindtouchstart="handtouch" data-name="nation_sele_sec">
  431 + <text selectable='{{nation_sele_sec}}' user-select="{{nation_sele_sec}}">{{nation_name}}</text>
431 432 </view>
432 433 </view>
433 434 <view class="tb_item tb-l">
434 435 <view class="item_left">
435 436 <text>规格</text>
436 437 </view>
437   - <view class="item_right">
438   - <text>{{data.goods_spec==""?"规格1":data.goods_spec}}</text>
  438 + <view class="item_right" bindtouchstart="handtouch" data-name="guige_sele_sec">
  439 + <text selectable='{{guige_sele_sec}}' user-select="{{guige_sele_sec}}" >{{filters.show_gui_ge(data.goods_spec,data.goods_color)}}</text>
439 440 </view>
440 441 </view>
441 442 <view class="tb_item tb-l">
442 443 <view class="item_left">
443 444 <text>上架时间</text>
444 445 </view>
445   - <view class="item_right">
446   - <text>{{data.on_time}}</text>
  446 + <view class="item_right" bindtouchstart="handtouch" data-name="ontime_sele_sec">
  447 + <text selectable='{{ontime_sele_sec}}' user-select="{{ontime_sele_sec}}">{{data.on_time}}</text>
447 448 </view>
448 449 </view>
449 450 </view>
450 451  
451   -
452 452 <!-- 详情广告顶部-->
453 453 <view class="wxParse">
454 454 <template is="wxParse" data="{{wxParseData:goodInfo_ad2.nodes}}"></template>
... ...
packageE/pages/cart/cart2/cart2.js
  View file @548799a
... ... @@ -1394,7 +1394,9 @@ Page({
1394 1394 if (arr[k].show_can_cx) {
1395 1395 for (let key_o in arr[k].show_can_cx) {
1396 1396 let k_arr = key_o.split(',');
1397   - if (k_arr.indexOf(item1.goods_id + '') > -1) {
  1397 +
  1398 + //秒杀，团购等活动不参与计算
  1399 + if (k_arr.indexOf(item1.goods_id + '') > -1 && ![1,2,4,6,8,9].includes(parseInt(item1.prom_type+''))){
1398 1400 //-- 如果初始活动在计算的时候，是不满足的时候，就要把活动清理掉 --
1399 1401 var is_no_ok = arr[k].show_can_cx[key_o].cur_act.is_no_ok;
1400 1402 if (is_no_ok == 1) {
... ...
packageG/pages/customer_chat/customer_chat.js
  View file @548799a
... ... @@ -25,9 +25,9 @@ Page({
25 25 return false;
26 26 }
27 27  
28   - let url= os.h5_host+"/mchat/mbchat/index?goods_id="+goods_id+"&stoid="+os.stoid+"&user_id="+user_id;
  28 + let url= os.h5_host+"/mchat/mbchat/index?is_webview=1&goods_id="+goods_id+"&stoid="+os.stoid+"&user_id="+user_id;
29 29 if(type)
30   - url= os.h5_host+"/mchat/mbchat/index?card_id="+goods_id+"&stoid="+os.stoid+"&user_id="+user_id;
  30 + url= os.h5_host+"/mchat/mbchat/index?is_webview=1&card_id="+goods_id+"&stoid="+os.stoid+"&user_id="+user_id;
31 31  
32 32 console.log("chat"+url);
33 33 this.setData({
... ...
packageG/pages/group_buy/goodsInfo/goodsInfo.wxml
  View file @548799a
... ... @@ -114,7 +114,7 @@
114 114 <!-- 手店价 -->
115 115 <view class="co-red" wx:if="{{prom_type == 0}}"><text class="rel yuan fs28">￥</text>{{filters.toFix(data.shop_price,2)}}</view>
116 116 <view class="goods-title">
117   - <view class="goods-name elli">{{data.goods_name}}</view>
  117 + <view class="goods-name elli"><text selectable='true' user-select="true">{{data.goods_name}}</text></view>
118 118 </view>
119 119 </view>
120 120  
... ...
packageG/pages/team/team_show/team_show.js
  View file @548799a
... ... @@ -91,7 +91,9 @@ Page({
91 91  
92 92 sort_store: 0, //门店分类
93 93 choice_sort_store: 0, //选择分类门店
94   - template_id:[],//订阅消息id
  94 + template_id:[],//订阅消息id
  95 +
  96 + paying:0, //避免多次点击
95 97 },
96 98 onLoad: async function(options) {
97 99 wx.setNavigationBarTitle({ title: "拼团订单",})
... ... @@ -158,6 +160,8 @@ Page({
158 160  
159 161 //显示加载
160 162 onShow:function(){
  163 + this.data.paying=0;
  164 +
161 165 //-- 看一下隐私政策要不要显示 --
162 166 var privacy_pop = this.selectComponent("#privacy_pop"); //组件的id
163 167 if (privacy_pop) {
... ... @@ -820,18 +824,29 @@ Page({
820 824  
821 825 //------去支付，购买-------
822 826 go_pay:function () {
  827 +
  828 + if(this.data.paying) return false;
  829 + this.data.paying=1;
  830 +
823 831 var th=this;
824 832 var def_pick_store=this.data.def_pick_store;
825 833 if(def_pick_store && def_pick_store.pickup_id) {
826 834 th.data.pick_id=def_pick_store.pickup_id; //选择门店
827 835 th.data.end_name=def_pick_store.pickup_name;
828 836 }
829   - if (!th.data.pick_id) return s.my_warnning("请选择门店", 0, th);
830   - if (th.data.pick_id==0) return s.my_warnning("请选择门店", 0, th);
  837 + if (!th.data.pick_id) {
  838 + this.data.paying=0;
  839 + return s.my_warnning("请选择门店", 0, th);
  840 + }
  841 + if (th.data.pick_id==0){
  842 + this.data.paying=0;
  843 + return s.my_warnning("请选择门店", 0, th);
  844 + }
831 845  
832 846 //----判断起购数----
833 847 var qnum=parseFloat(th.data.teamlist.minbuynum);
834 848 if(qnum>0 && qnum>th.data.num ){
  849 + this.data.paying=0;
835 850 getApp().confirmBox("拼团商品至少要买"+qnum+"件!");
836 851 return false;
837 852 }
... ... @@ -844,9 +859,11 @@ Page({
844 859 }else{
845 860 getApp().showWarning("拼单已经抢光");
846 861 }
847   - return false;
  862 + th.data.paying=0;
  863 + return false;
848 864 }
849 865 if(th.data.teamlist.kttype==2 && 1>arr[1]){
  866 + th.data.paying=0;
850 867 getApp().showWarning("拼团已满");
851 868 return false;
852 869 }
... ... @@ -917,7 +934,10 @@ Page({
917 934 async buy_check_redis(func){
918 935  
919 936 var ck= await this.check_num(this.data.num,1);
920   - if(!ck) return false;
  937 + if(!ck) {
  938 + this.data.paying=0;
  939 + return false;
  940 + }
921 941  
922 942 //获取redis中的数量
923 943 var r_num=0,prom_type=6,prom_id=this.data.teamlist.id;
... ...
packageG/pages/user/order_detail/order_detail.js
  View file @548799a
... ... @@ -505,7 +505,7 @@ Page({
505 505 })
506 506  
507 507 var buyed_mum2 = goodsbuynum + good.goods_num;
508   - if (buyed_mum2 > limit && limit > 0) {
  508 + if (buyed_mum2 > limit && limit > 0 && !good.is_gift) {
509 509 var content = gg.goods_name + '购买数量超出商品限购,请取消订单';
510 510 th.toast(content);
511 511 th.setData({ paying: 0 });
... ... @@ -1151,6 +1151,8 @@ Page({
1151 1151  
1152 1152 //---如果是活动的时候---
1153 1153 var prom = null, goodsinfo = good, th = this;
  1154 +
  1155 + goodsinfo.prom_type=parseInt(goodsinfo.prom_type+'');
1154 1156 if (goodsinfo.prom_type == 1) {
1155 1157 await getApp().request.promiseGet("/api/ms/flash_sale/getNew/" + os.stoid + "/" + user_id + "/" + goodsinfo.prom_id, {}).then(res => {
1156 1158 if (res.data.code == 0) {
... ... @@ -1185,8 +1187,16 @@ Page({
1185 1187 }
1186 1188 })
1187 1189 }
  1190 +
  1191 + if(!prom && [1,2,4,6].includes(goodsinfo.prom_type)){
  1192 + wx.showToast({ title: "未找到活动", icon: 'none', duration: 3000 });
  1193 + th.setData({ paying: 0 });
  1194 + return false;
  1195 + }
  1196 +
1188 1197 //----------如果有活动，并且在进行中，就不计算线下库存---------------
1189 1198 if (prom) {
  1199 +
1190 1200 let c_type=parseInt(goodsinfo.prom_type+'');
1191 1201 var act_type='';
1192 1202 switch (c_type){
... ... @@ -1207,13 +1217,20 @@ Page({
1207 1217 }
1208 1218  
1209 1219 var now = ut.gettimestamp();
1210   - if (prom.is_end == 1 && prom.end_time < now) {
  1220 + if (prom.is_end == 1 || prom.end_time < now) {
1211 1221 var content = goodsinfo.goods_name + '商品的活动已经结束,请取消订单'
1212 1222 th.toast(content);
1213 1223 th.setData({ paying: 0 });
1214 1224 return false;
1215 1225 }
1216 1226  
  1227 + if(prom.is_show==0){
  1228 + wx.showToast({ title: "活动未启用", icon: 'none', duration: 3000 });
  1229 + th.setData({ paying: 0 });
  1230 + return false;
  1231 + }
  1232 +
  1233 +
1217 1234 buyed_mum2 = promgoodsbuynum + good.goods_num;
1218 1235 if (buyed_mum2 > prom.buy_limit && prom.buy_limit > 0) {
1219 1236  
... ... @@ -1904,23 +1921,23 @@ Page({
1904 1921  
1905 1922 //-- 看一下购物车上有多少商品 --
1906 1923 var cart_num=0;
1907   - await getApp().request.promiseGet("/api/weshop/cart/page", {
1908   - data: {
1909   - store_id: os.stoid,
1910   - user_id: getApp().globalData.user_id,
1911   - state:0, is_gift:0,
1912   - goods_id:good.goods_id,
1913   - pick_id: b_item.pickup_id
1914   - }
1915   - }).then(res=>{
1916   - var num = 0;
1917   - if(res.data.code==0 && res.data.data && res.data.data.pageData) {
1918   - for (var i = 0; i < res.data.data.pageData.length; i++) {
1919   - num += res.data.data.pageData[i].goods_num;
1920   - }
1921   - }
1922   - cart_num=num;
1923   - })
  1924 + // await getApp().request.promiseGet("/api/weshop/cart/page", {
  1925 + // data: {
  1926 + // store_id: os.stoid,
  1927 + // user_id: getApp().globalData.user_id,
  1928 + // state:0, is_gift:0,
  1929 + // goods_id:good.goods_id,
  1930 + // pick_id: b_item.pickup_id
  1931 + // }
  1932 + // }).then(res=>{
  1933 + // var num = 0;
  1934 + // if(res.data.code==0 && res.data.data && res.data.data.pageData) {
  1935 + // for (var i = 0; i < res.data.data.pageData.length; i++) {
  1936 + // num += res.data.data.pageData[i].goods_num;
  1937 + // }
  1938 + // }
  1939 + // cart_num=num;
  1940 + // })
1924 1941  
1925 1942 var lock=0,plist=null;
1926 1943  
... ... @@ -1976,7 +1993,8 @@ Page({
1976 1993 store_id: os.stoid,
1977 1994 user_id: getApp().globalData.user_id,
1978 1995 goods_id: good.goods_id,
1979   - timetype:good.viplimited_timetype
  1996 + timetype:good.viplimited_timetype,
  1997 + isnew:1,
1980 1998 };
1981 1999 if(b_item.prom_type==7){
1982 2000 req_data.prom_type=7;
... ... @@ -2016,22 +2034,22 @@ Page({
2016 2034 }else{
2017 2035 //-- 看一下购物车上有多少商品 --
2018 2036 var cart_num=0;
2019   - await getApp().request.promiseGet("/api/weshop/cart/page", {
2020   - data: {
2021   - store_id: os.stoid,
2022   - user_id: getApp().globalData.user_id,
2023   - state:0, is_gift:0,
2024   - goods_id:good.goods_id
2025   - }
2026   - }).then(res=>{
2027   - var num = 0;
2028   - if(res.data.code==0 && res.data.data && res.data.data.pageData) {
2029   - for (var i = 0; i < res.data.data.pageData.length; i++) {
2030   - num += res.data.data.pageData[i].goods_num;
2031   - }
2032   - }
2033   - cart_num=num;
2034   - })
  2037 + // await getApp().request.promiseGet("/api/weshop/cart/page", {
  2038 + // data: {
  2039 + // store_id: os.stoid,
  2040 + // user_id: getApp().globalData.user_id,
  2041 + // state:0, is_gift:0,
  2042 + // goods_id:good.goods_id
  2043 + // }
  2044 + // }).then(res=>{
  2045 + // var num = 0;
  2046 + // if(res.data.code==0 && res.data.data && res.data.data.pageData) {
  2047 + // for (var i = 0; i < res.data.data.pageData.length; i++) {
  2048 + // num += res.data.data.pageData[i].goods_num;
  2049 + // }
  2050 + // }
  2051 + // cart_num=num;
  2052 + // })
2035 2053  
2036 2054 if(good.store_count<=0){
2037 2055 err_text+= good['goods_name']+"库存不足\n";
... ... @@ -2048,7 +2066,8 @@ Page({
2048 2066 store_id: os.stoid,
2049 2067 user_id: getApp().globalData.user_id,
2050 2068 goods_id: good.goods_id,
2051   - timetype:good.viplimited_timetype
  2069 + timetype:good.viplimited_timetype,
  2070 + isnew:1,
2052 2071 };
2053 2072  
2054 2073 if(prom){
... ... @@ -2087,7 +2106,7 @@ Page({
2087 2106  
2088 2107 //---- 要计算商品的限购 -----
2089 2108 if(good['viplimited']>0){
2090   - if(cart_num+buynum>good['viplimited']){
  2109 + if(cart_num+buynum>=good['viplimited']){
2091 2110 err_text+= good['goods_name']+"超出限购\n";
2092 2111 continue;
2093 2112 }
... ...
packageG/pages/user/userinfo/userinfo.js
  View file @548799a
... ... @@ -920,6 +920,7 @@ Page({
920 920 },
921 921  
922 922  
  923 +
923 924 //------卡片的显示和关闭--------
924 925 show_tc: function() {
925 926 var that=this;
... ... @@ -938,7 +939,8 @@ Page({
938 939 return;
939 940 }
940 941 //base64_encode($user.mobile.'|'.date('Y-m-d H:i:s')
941   - var val = that.data.userInfo.mobile + "|" +getnowtime+"|"+that.data.getusercode_vailtime;
  942 + var val = getApp().globalData.userInfo.mobile + "|" +getnowtime+"|"+that.data.getusercode_vailtime;
  943 +
942 944 val = "^" + ut.base64_encode(val);
943 945 let userInfo = getApp().globalData.userInfo;
944 946 qrcode('qrcode', val, 350, 350, that);
... ...
pages/activity/pind_list/pind_list.js
  View file @548799a
... ... @@ -97,7 +97,7 @@ Page({
97 97  
98 98 onHide: function () {
99 99 //--清理定时器--
100   - clearInterval(this.timer);
  100 + clearInterval(this.data.timer);
101 101 this.setData({
102 102 isshow: 0
103 103 });
... ... @@ -111,15 +111,15 @@ Page({
111 111 //----倒计时函数-----
112 112 countDown() {
113 113 if (!this.data.goodlist) return false;
  114 + if (!this.data.is_timer) return false;
  115 +
114 116 var th = this;
115 117 // 获取当前时间，同时得到活动结束时间数组
116 118 var newTime = ut.gettimestamp();
117 119 var endTimeList = this.data.goodlist;
118 120 // 对结束时间进行处理渲染到页面
119 121 for (var i = 0; i < endTimeList.length;i++){
120   - var o = endTimeList[i];
121   - var endTime = o.end_time;
122   - if(th.data.type==0) endTime = o.start_time;
  122 +
123 123  
124 124 // 创建查询对象
125 125 let query = wx.createSelectorQuery();
... ... @@ -134,6 +134,11 @@ Page({
134 134 if (!target) return;
135 135 if (!target.id) return;
136 136 let idx= target.id.replace('kill-item','');
  137 +
  138 + var o = endTimeList[idx];
  139 + var endTime = o.end_time;
  140 + if(th.data.type==0) endTime = o.start_time;
  141 +
137 142 // 条件1：当目标顶部距离视口顶部距离小于视口的高度时
138 143 // 条件2：当目标底部距离视口顶部距离大于0时
139 144 // 当以上两个条件同时成立时，目标元素在视口中
... ...
pages/activity/seckill_list/seckill_list.js
  View file @548799a
... ... @@ -115,6 +115,7 @@ Page({
115 115  
116 116 //----倒计时函数,优化定时器只显示在可视范围内的-----
117 117 countDown() {
  118 + if (!this.data.goodlist) return false;
118 119 if (!this.data.is_timer) return false;
119 120  
120 121 var th = this;
... ... @@ -124,14 +125,11 @@ Page({
124 125 if (endTimeList == null) return null
125 126 // 对结束时间进行处理渲染到页面
126 127 for (var i = 0; i < endTimeList.length; i++) {
  128 + var oo = endTimeList[i];
  129 + if(!oo) continue;
127 130  
128 131 if (!this.data.is_timer) break;
129 132  
130   - var o = endTimeList[i];
131   - if(!o) continue;
132   - var endTime = o.end_time;
133   - if (th.data.type == 0) endTime = o.start_time;
134   -
135 133 // 创建查询对象
136 134 let query = wx.createSelectorQuery();
137 135 // 获取目标元素，并获取目标元素的信息
... ... @@ -146,6 +144,11 @@ Page({
146 144 if (!target.id) return;
147 145  
148 146 let idx= target.id.replace('kill-item','');
  147 + var o=endTimeList[idx];
  148 + var endTime = o.end_time;
  149 + if (th.data.type == 0) endTime = o.start_time;
  150 +
  151 +
149 152 // 条件1：当目标顶部距离视口顶部距离小于视口的高度时
150 153 // 条件2：当目标底部距离视口顶部距离大于0时
151 154 // 当以上两个条件同时成立时，目标元素在视口中
... ... @@ -187,8 +190,6 @@ Page({
187 190 }
188 191 });
189 192  
190   -
191   -
192 193 }
193 194 },
194 195  
... ...
pages/cart/cart/cart.js
  View file @548799a
... ... @@ -5841,5 +5841,17 @@ Page({
5841 5841 },
5842 5842  
5843 5843  
  5844 + //-- 图片失败，默认图片,赠品图片的处理 --
  5845 + bind_bnerr_gift: function (e) {
  5846 + var pid = e.target.dataset.pid;
  5847 + var idxx = e.target.dataset.idxx;
  5848 + var cart_zp=this.data.cart_zp;
  5849 + cart_zp[pid].goods[idxx].original_img= oo.imghost + "/miniapp/images/default_g_img.png";
  5850 + this.setData({
  5851 + cart_zp
  5852 + })
  5853 + },
  5854 +
  5855 +
5844 5856  
5845 5857 });
5846 5858 \ No newline at end of file
... ...
pages/cart/cart/cart.wxml
  View file @548799a
... ... @@ -161,23 +161,23 @@
161 161  
162 162 <!-- 判断有没有赠品2024-2-1 -->
163 163 <block wx:if="{{cart_zp[item.pid] && cart_zp[item.pid].goods.length>0 }}">
164   - <block wx:for="{{cart_zp[item.pid].goods}}" wx:for-item="items" wx:for-index="idx" wx:key="{{idx}}">
165   - <view class="order-item" data-item="{{idx}}">
  164 + <block wx:for="{{cart_zp[item.pid].goods}}" wx:for-item="itemss" wx:for-index="idxx" wx:key="{{idxx}}">
  165 + <view class="order-item" data-item="{{idxx}}">
166 166 <view class="order-raido flex-vertical " style="width: 45rpx"></view>
167   - <navigator class="goods-img rel" bindtap="go_gd" data-item="{{items}}" data-gd="{{items.goods_id}}">
168   - <image class="wh100" src="{{items.original_img}}" binderror="bind_bnerr2" data-errorimg="requestData[{{pidx}}].goods[{{idx}}].original_img" data-url="{{items.original_img}}"></image>
169   - <view style="background-color:red" class="abs flex-center fs26" wx:if="{{items.is_gift==1}}">赠品</view>
  167 + <navigator class="goods-img rel" bindtap="go_gd" data-item="{{itemss}}" data-gd="{{itemss.goods_id}}">
  168 + <image class="wh100" src="{{itemss.original_img}}" binderror="bind_bnerr_gift" data-pid="{{item.pid}}" data-idxx="{{idxx}}" data-url="{{itemss.original_img}}"></image>
  169 + <view style="background-color:red" class="abs flex-center fs26">赠品</view>
170 170 </navigator>
171 171 <view class="goods-cont">
172 172 <view class="goods-name">
173   - <navigator bindtap="go_gd" class="ellipsis-2 fs30" data-item="{{items}}" data-gd="{{items.goods_id}}">{{items.goods_name}}</navigator>
  173 + <navigator bindtap="go_gd" class="ellipsis-2 fs30" data-item="{{itemss}}" data-gd="{{itemss.goods_id}}">{{itemss.goods_name}}</navigator>
174 174  
175 175 <view class="specifications ellipsis-1">
176   - <view wx:if="{{items.goods_color || items.goods_spec}}">
177   - {{items.goods_color}}{{items.goods_color?"/":''}}{{items.goods_spec}}</view>
  176 + <view wx:if="{{itemss.goods_color || itemss.goods_spec}}">
  177 + {{itemss.goods_color}}{{itemss.goods_color?"/":''}}{{itemss.goods_spec}}</view>
178 178 <view wx:else>规格1</view>
179 179 </view>
180   - <view>{{items.goods_num}}件</view>
  180 + <view>{{itemss.goods_num}}件</view>
181 181 </view>
182 182 </view>
183 183 </view>
... ...
pages/goods/goodsInfo/goodsInfo.js
  View file @548799a
... ... @@ -295,6 +295,17 @@ Page({
295 295 front_pick:null, //在详情页面上显示的门店
296 296  
297 297 get_sto_ing:1, //默认是不让弹出框的
  298 +
  299 + //苹果机都为真
  300 + gn_sele_fir:true,
  301 + gn_sele_sec:getApp().globalData.is_iPhone?true:false,
  302 + sn_sele_sec:getApp().globalData.is_iPhone?true:false,
  303 + sku_sele_sec:getApp().globalData.is_iPhone?true:false,
  304 + cate_sele_sec:getApp().globalData.is_iPhone?true:false,
  305 + brand_sele_sec:getApp().globalData.is_iPhone?true:false,
  306 + nation_sele_sec:getApp().globalData.is_iPhone?true:false,
  307 + guige_sele_sec:getApp().globalData.is_iPhone?true:false,
  308 + ontime_sele_sec:getApp().globalData.is_iPhone?true:false,
298 309 },
299 310  
300 311 //------初始化加载----------
... ... @@ -5097,7 +5108,7 @@ Page({
5097 5108 });
5098 5109 //拿取价格并且判断时间,并判断会员的身分--
5099 5110 getApp().request.get("/api/weshop/teamlist/getUser/" +
5100   - os.stoid + "/" + prom_id+"/"+getApp().globalData.user_id, {
  5111 + os.stoid + "/" + prom_id+"/"+user_id, {
5101 5112 success: async function (t) {
5102 5113 if (t.data.code != 0) {
5103 5114 ee.get_normal(gid);
... ... @@ -9452,5 +9463,43 @@ Page({
9452 9463 },
9453 9464  
9454 9465  
  9466 + handtouch(e){
  9467 + //苹果机都为真
  9468 + if(getApp().globalData.is_iPhone){
  9469 + return false;
  9470 + }
  9471 + var name=e.currentTarget.dataset.name;
  9472 + var set_data={
  9473 + gn_sele_fir:false,
  9474 + gn_sele_sec:false,
  9475 + sn_sele_sec:false,
  9476 + sku_sele_sec:false,
  9477 + cate_sele_sec:false,
  9478 + brand_sele_sec:false,
  9479 + nation_sele_sec:false,
  9480 + guige_sele_sec:false,
  9481 + ontime_sele_sec:false
  9482 + }
  9483 +
  9484 + switch (name){
  9485 + case 'gn_sele_fir': delete set_data.gn_sele_fir;break;
  9486 + case 'gn_sele_sec': delete set_data.gn_sele_sec;break;
  9487 + case 'sn_sele_sec': delete set_data.sn_sele_sec;break;
  9488 + case 'sku_sele_sec': delete set_data.sku_sele_sec;break;
  9489 + case 'cate_sele_sec': delete set_data.cate_sele_sec;break;
  9490 + case 'brand_sele_sec': delete set_data.brand_sele_sec;break;
  9491 + case 'nation_sele_sec': delete set_data.nation_sele_sec;break;
  9492 + case 'guige_sele_sec': delete set_data.guige_sele_sec;break;
  9493 + case 'ontime_sele_sec': delete set_data.ontime_sele_sec;break;
  9494 + }
  9495 +
  9496 + this.setData(set_data)
  9497 + this.setData({
  9498 + [name]:true
  9499 + })
  9500 +
  9501 + }
  9502 +
  9503 +
9455 9504  
9456 9505 })
9457 9506 \ No newline at end of file
... ...
pages/goods/goodsInfo/goodsInfo.wxml
  View file @548799a
... ... @@ -200,7 +200,7 @@
200 200 <!-- 许程 商家团主页 -->
201 201 <view class="xc-goods-explain flex-vertical-between">
202 202 <view class="xc-explain fs32 ellipsis-2" wx:if="{{prom_type!=0 }}">
203   - {{front_g.goods_name}}
  203 + <text bindtouchstart="handtouch" data-name="gn_sele_fir" selectable='{{gn_sele_fir}}' user-select="{{gn_sele_fir}}" >{{front_g.goods_name}}</text>
204 204 </view>
205 205 <!-- 这个是分享按钮 -->
206 206 <view wx:if="{{isLogin}}" class="xc-share-frame t-c shrink0" bindtap="clickShare">
... ... @@ -306,7 +306,7 @@
306 306 </view>
307 307 <view class="goods-title">
308 308 <image wx:if="{{front_g.commission > 0}}" style="width: 25rpx;height: 25rpx;margin-right: 6rpx;" src="https://mshop-lib.yolipai.net/template/mobile/new/static/images/addmoney.png"></image>
309   - <view class="goods-name elli">{{front_g.goods_name}}</view>
  309 + <view class="goods-name elli"><text bindtouchstart="handtouch" data-name="gn_sele_fir" selectable='{{gn_sele_fir}}' user-select="{{gn_sele_fir}}">{{front_g.goods_name}}</text></view>
310 310 </view>
311 311 <view class="goods-num">
312 312 <view class="sales">销量：{{prom_act.buy_num+prom_act.virtual}}件</view>
... ... @@ -427,7 +427,7 @@
427 427 <view wx:if="{{prom_type!=1 && prom_type!=2 }}">
428 428 <view class="goods-title">
429 429 <image wx:if="{{front_g.commission > 0}}" style="width: 25rpx;height: 25rpx;margin-right: 6rpx;" src="https://mshop-lib.yolipai.net/template/mobile/new/static/images/addmoney.png"></image>
430   - <view class="goods-name elli">{{front_g.goods_name}}</view>
  430 + <view class="goods-name elli"><text bindtouchstart="handtouch" data-name="gn_sele_fir" selectable='{{gn_sele_fir}}' user-select="{{gn_sele_fir}}" >{{front_g.goods_name}}</text></view>
431 431 </view>
432 432 </view>
433 433 <view class="goods-num" wx:if="{{prom_type!=1 && prom_type!=2}}">
... ... @@ -457,11 +457,11 @@
457 457  
458 458 <!-- 秒杀的活动名称 -->
459 459 <view class="xc-explain fs32 ellipsis-2" wx:if="{{prom_type!=0 && prom_type!=4 && prom_type!=2}}">
460   - {{front_g.goods_name}}
  460 + <text bindtouchstart="handtouch" data-name="gn_sele_fir" selectable='{{gn_sele_fir}}' user-select="{{gn_sele_fir}}">{{front_g.goods_name}}</text>
461 461 </view>
462 462  
463 463 <view class="xc-explain flex jc_sb" wx:if="{{prom_type==2}}">
464   - <view class="fs32 ellipsis-2" style="max-width:80%; max-height: 90rpx;">{{front_g.goods_name}}</view>
  464 + <view class="fs32 ellipsis-2" style="max-width:80%; max-height: 90rpx;"><text bindtouchstart="handtouch" data-name="gn_sele_fir" selectable='{{gn_sele_fir}}' user-select="{{gn_sele_fir}}">{{front_g.goods_name}}</text></view>
465 465 <!-- 这个是分享按钮 -->
466 466 <view wx:if="{{isLogin}}" class="xc-share-frame t-c shrink0" bindtap="clickShare" style="flex-shrink:0;position: relative;top: -22rpx;">
467 467 <view class="iconfont icon-share"></view>
... ... @@ -819,64 +819,64 @@
819 819 <view class="item_left">
820 820 <text>商品名称</text>
821 821 </view>
822   - <view class="item_right">
823   - <text>{{front_g.goods_name}}</text>
  822 + <view class="item_right" bindtouchstart="handtouch" data-name="gn_sele_sec">
  823 + <text selectable='{{gn_sele_sec}}' user-select="{{gn_sele_sec}}">{{front_g.goods_name}}</text>
824 824 </view>
825 825 </view>
826 826 <view class="tb_item tb-l">
827 827 <view class="item_left">
828 828 <text>商品编号</text>
829 829 </view>
830   - <view class="item_right">
831   - <text>{{front_g.goods_sn}}</text>
  830 + <view class="item_right" bindtouchstart="handtouch" data-name="sn_sele_sec" >
  831 + <text selectable='{{sn_sele_sec}}' user-select="{{sn_sele_sec}}" >{{front_g.goods_sn}}</text>
832 832 </view>
833 833 </view>
834 834 <view class="tb_item tb-l">
835 835 <view class="item_left">
836 836 <text>商品条码</text>
837 837 </view>
838   - <view class="item_right">
839   - <text>{{front_g.sku}}</text>
  838 + <view class="item_right" bindtouchstart="handtouch" data-name="sku_sele_sec" >
  839 + <text selectable='{{sku_sele_sec}}' user-select="{{sku_sele_sec}}" >{{front_g.sku}}</text>
840 840 </view>
841 841 </view>
842 842 <view class="tb_item tb-l" wx:if="{{cat_name && is_show_pl}}">
843 843 <view class="item_left">
844 844 <text>品类</text>
845 845 </view>
846   - <view class="item_right">
847   - <text>{{cat_name}}</text>
  846 + <view class="item_right" bindtouchstart="handtouch" data-name="cate_sele_sec" >
  847 + <text selectable='{{cate_sele_sec}}' user-select="{{cate_sele_sec}}" >{{cat_name}}</text>
848 848 </view>
849 849 </view>
850 850 <view class="tb_item tb-l" wx:if="{{brand_name && is_show_pp}}">
851 851 <view class="item_left">
852 852 <text>品牌</text>
853 853 </view>
854   - <view class="item_right">
855   - <text>{{brand_name}}</text>
  854 + <view class="item_right" bindtouchstart="handtouch" data-name="brand_sele_sec" >
  855 + <text selectable='{{brand_sele_sec}}' user-select="{{brand_sele_sec}}" >{{brand_name}}</text>
856 856 </view>
857 857 </view>
858 858 <view class="tb_item tb-l" wx:if="{{nation_name && is_show_gb}}">
859 859 <view class="item_left">
860 860 <text>国别</text>
861 861 </view>
862   - <view class="item_right">
863   - <text>{{nation_name}}</text>
  862 + <view class="item_right" bindtouchstart="handtouch" data-name="nation_sele_sec" >
  863 + <text selectable='{{nation_sele_sec}}' user-select="{{nation_sele_sec}}" >{{nation_name}}</text>
864 864 </view>
865 865 </view>
866 866 <view class="tb_item tb-l">
867 867 <view class="item_left">
868 868 <text>规格</text>
869 869 </view>
870   - <view class="item_right">
871   - <text>{{filters.show_gui_ge(front_g.goods_spec,front_g.goods_color)}}</text>
  870 + <view class="item_right" bindtouchstart="handtouch" data-name="guige_sele_sec" >
  871 + <text selectable='{{guige_sele_sec}}' user-select="{{guige_sele_sec}}" >{{filters.show_gui_ge(front_g.goods_spec,front_g.goods_color)}}</text>
872 872 </view>
873 873 </view>
874 874 <view class="tb_item tb-l">
875 875 <view class="item_left">
876 876 <text>上架时间</text>
877 877 </view>
878   - <view class="item_right">
879   - <text>{{front_g.on_time}}</text>
  878 + <view class="item_right" bindtouchstart="handtouch" data-name="ontime_sele_sec">
  879 + <text selectable='{{ontime_sele_sec}}' user-select="{{ontime_sele_sec}}" >{{front_g.on_time}}</text>
880 880 </view>
881 881 </view>
882 882 </view>
... ... @@ -913,64 +913,64 @@
913 913 <view class="item_left">
914 914 <text>商品名称</text>
915 915 </view>
916   - <view class="item_right">
917   - <text>{{front_g.goods_name}}</text>
  916 + <view class="item_right" bindtouchstart="handtouch" data-name="gn_sele_sec">
  917 + <text selectable='{{gn_sele_sec}}' user-select="{{gn_sele_sec}}" >{{front_g.goods_name}}</text>
918 918 </view>
919 919 </view>
920 920 <view class="tb_item tb-l">
921 921 <view class="item_left">
922 922 <text>商品编号</text>
923 923 </view>
924   - <view class="item_right">
925   - <text>{{front_g.goods_sn}}</text>
  924 + <view class="item_right" bindtouchstart="handtouch" data-name="sn_sele_sec" >
  925 + <text selectable='{{sn_sele_sec}}' user-select="{{sn_sele_sec}}" >{{front_g.goods_sn}}</text>
926 926 </view>
927 927 </view>
928 928 <view class="tb_item tb-l">
929 929 <view class="item_left">
930 930 <text>商品条码</text>
931 931 </view>
932   - <view class="item_right">
933   - <text>{{front_g.sku}}</text>
  932 + <view class="item_right" bindtouchstart="handtouch" data-name="sku_sele_sec">
  933 + <text selectable='{{sku_sele_sec}}' user-select="{{sku_sele_sec}}" >{{front_g.sku}}</text>
934 934 </view>
935 935 </view>
936 936 <view class="tb_item tb-l" wx:if="{{cat_name && is_show_pl}}">
937 937 <view class="item_left">
938 938 <text>品类</text>
939 939 </view>
940   - <view class="item_right">
941   - <text>{{cat_name}}</text>
  940 + <view class="item_right" bindtouchstart="handtouch" data-name="cate_sele_sec" >
  941 + <text selectable='{{cate_sele_sec}}' user-select="{{cate_sele_sec}}" >{{cat_name}}</text>
942 942 </view>
943 943 </view>
944 944 <view class="tb_item tb-l" wx:if="{{brand_name && is_show_pp}}">
945 945 <view class="item_left">
946 946 <text>品牌</text>
947 947 </view>
948   - <view class="item_right">
949   - <text>{{brand_name}}</text>
  948 + <view class="item_right" bindtouchstart="handtouch" data-name="brand_sele_sec" >
  949 + <text selectable='{{brand_sele_sec}}' user-select="{{brand_sele_sec}}" >{{brand_name}}</text>
950 950 </view>
951 951 </view>
952 952 <view class="tb_item tb-l" wx:if="{{nation_name && is_show_gb}}">
953 953 <view class="item_left">
954 954 <text>国别</text>
955 955 </view>
956   - <view class="item_right">
957   - <text>{{nation_name}}</text>
  956 + <view class="item_right" bindtouchstart="handtouch" data-name="nation_sele_sec" >
  957 + <text selectable='{{nation_sele_sec}}' user-select="{{nation_sele_sec}}" >{{nation_name}}</text>
958 958 </view>
959 959 </view>
960 960 <view class="tb_item tb-l">
961 961 <view class="item_left">
962 962 <text>规格</text>
963 963 </view>
964   - <view class="item_right">
965   - <text>{{front_g.goods_spec==""?"规格1":front_g.goods_spec}}</text>
  964 + <view class="item_right" bindtouchstart="handtouch" data-name="guige_sele_sec" >
  965 + <text selectable='{{guige_sele_sec}}' user-select="{{guige_sele_sec}}" >{{front_g.goods_spec==""?"规格1":front_g.goods_spec}}</text>
966 966 </view>
967 967 </view>
968 968 <view class="tb_item tb-l">
969 969 <view class="item_left">
970 970 <text>上架时间</text>
971 971 </view>
972   - <view class="item_right">
973   - <text>{{front_g.on_time}}</text>
  972 + <view class="item_right" bindtouchstart="handtouch" data-name="ontime_sele_sec">
  973 + <text selectable='{{ontime_sele_sec}}' user-select="{{ontime_sele_sec}}" >{{front_g.on_time}}</text>
974 974 </view>
975 975 </view>
976 976 </view>
... ... @@ -1429,39 +1429,9 @@
1429 1429 </view>
1430 1430 </block>
1431 1431 </view>
1432   - <!-- 选择门店模块 -->
1433   - <view class="flex-space-between address ai_end xc-width ">
1434   - <view class="flex" wx:if="{{def_pick_store && def_pick_store.pickup_name}}">
1435   - <text class="fs30 xc-black3 shop_name bold {{def_pick_store.distance!=null?'max':''}} ">{{def_pick_store.pickup_name}}</text>
1436   - <view class="distance fs24 xc-ash" wx:if="{{def_pick_store.distance!=null}}">
1437   - 距离:{{def_pick_store.distance>1000?filters.toFix(def_pick_store.distance/1000,2)+"km":filters.toFix(def_pick_store.distance,0)+"m"}}
1438   - </view>
1439   - </view>
1440   - <!-- 没有门店的时候 -->
1441   - <view class="flex" bindtap="choice_store" wx:else>
1442   - <image class="stores-img" src="{{iurl}}/miniapp/images/stores.png"></image>
1443   - <view class="fs30" style="color:black;">选择门店</view>
1444   - </view>
1445   - <view hidden="{{has_def && sys_switch.is_pricing_open_store}}" class="red-co fs28" bindtap="choice_store">更多门店<text class="right-arrow"></text></view>
1446   - </view>
1447   - <view wx:if="{{only_pk && !only_pk.length}}">(库存不足)</view>
1448   - <block wx:else>
1449   - <view wx:if="{{def_pickpu_list && !def_pickpu_list.length}}">(库存不足)</view>
1450   - <block wx:else>
1451   - <view class="no_store" wx:if="{{def_pick_store.is_no_dis}}">(配送不匹配)</view>
1452 1432  
1453   - <view class="no_store" wx:elif="{{def_pick_store.is_no_dis_nor}}">(该店不可售)</view>
1454   - <view class="no_store" wx:elif="{{def_pick_store.is_no_dis_nor && is_normal}}">(该店不可售)</view>
1455   - <view class="no_store" wx:elif="{{def_pick_store.is_no_dis_act && !is_normal}}">(该店不可售)</view>
1456   - <view wx:elif="{{def_pick_store && !def_pick_store.CanOutQty && !filters.is_virtual_gd(sele_g.is_virtual) && sales_rules>=2 && prom_type==0 &&!sele_g.whsle_id }}">
1457   - (库存不足)
1458   - </view>
1459   - </block>
1460   - </block>
1461   - <view class="fs24 xc-ash-9f xc-distance-top " wx:if="{{def_pick_store && def_pick_store.fulladdress}}">
1462   - 地址:{{def_pick_store.fulladdress}}
1463   - </view>
1464 1433 </view>
  1434 +
1465 1435 <!-- 商品的属性项目 -->
1466 1436 <view class="xc-goods-attribute">
1467 1437 <view hidden="{{ismend==1}}" class="spec-name">商品规格</view>
... ... @@ -1591,6 +1561,8 @@
1591 1561 </block>
1592 1562 </view>
1593 1563 <view class="clear"></view>
  1564 +
  1565 +
1594 1566 <!-- 选择门店的列表 -->
1595 1567 <view hidden="{{ismend==0}}" class="sto_v">
1596 1568 <view class="title" hidden="{{is_sec_mend==1}}" bindtap="hidemend">
... ...
pages/index/index/index.wxml
  View file @548799a
... ... @@ -455,9 +455,9 @@
455 455 <block wx:if="{{item.ename=='searchbox'}}">
456 456 <searchbox object="{{item.content}}" transparent="{{searchbox_transparent}}" nav_backgroundColor="{{nav_backgroundColor ? '#fff' :'#fff'}}"></searchbox>
457 457 </block>
458   - <!-- <block wx:if="{{item.ename=='store_select'}}">
  458 + <block wx:if="{{item.ename=='store_select'}}">
459 459 <store_select object="{{item.content}}"></store_select>
460   - </block> -->
  460 + </block>
461 461 </block>
462 462 </block>
463 463 </view>
... ... @@ -486,9 +486,9 @@
486 486 <block wx:if="{{item.ename=='searchbox'}}">
487 487 <searchbox object="{{item.content}}"></searchbox>
488 488 </block>
489   - <!-- <block wx:if="{{item.ename=='store_select'}}">-->
490   - <!-- <store_select object="{{item.content}}"></store_select>-->
491   - <!-- </block>-->
  489 + <block wx:if="{{item.ename=='store_select'}}">
  490 + <store_select object="{{item.content}}"></store_select>
  491 + </block>
492 492  
493 493 </block>
494 494 </block>
... ...
pages/user/order_list/order_list.js
  View file @548799a
... ... @@ -820,7 +820,7 @@ Page({
820 820 })
821 821  
822 822 var buyed_mum2 = goodsbuynum + good.goods_num;
823   - if (buyed_mum2 > limit && limit > 0) {
  823 + if (buyed_mum2 > limit && limit > 0 && !good.is_gift) {
824 824 var content = gg.goods_name + '购买数量超出商品限购,请取消订单';
825 825 th.toast(content);
826 826 th.setData({ paying: 0 });
... ... @@ -1480,6 +1480,8 @@ Page({
1480 1480  
1481 1481 //---如果是活动的时候---
1482 1482 var prom = null, goodsinfo = good, th = this;
  1483 +
  1484 + goodsinfo.prom_type=parseInt(goodsinfo.prom_type+'');
1483 1485 if (goodsinfo.prom_type == 1) {
1484 1486 await getApp().request.promiseGet("/api/ms/flash_sale/getNew/" + os.stoid + "/" + user_id + "/" + goodsinfo.prom_id, {}).then(res => {
1485 1487 if (res.data.code == 0) {
... ... @@ -1514,8 +1516,16 @@ Page({
1514 1516 }
1515 1517 })
1516 1518 }
  1519 +
  1520 + if(!prom && [1,2,4,6].includes(goodsinfo.prom_type)){
  1521 + wx.showToast({ title: "未找到活动", icon: 'none', duration: 3000 });
  1522 + th.setData({ paying: 0 });
  1523 + return false;
  1524 + }
  1525 +
1517 1526 //----------如果有活动，并且在进行中，就不计算线下库存---------------
1518 1527 if (prom) {
  1528 +
1519 1529 let c_type=parseInt(goodsinfo.prom_type+'');
1520 1530 var act_type='';
1521 1531 switch (c_type){
... ... @@ -1537,13 +1547,20 @@ Page({
1537 1547 }
1538 1548  
1539 1549 var now = ut.gettimestamp();
1540   - if (prom.is_end == 1 && prom.end_time < now) {
  1550 + if (prom.is_end == 1 || prom.end_time < now) {
1541 1551 var content = goodsinfo.goods_name + '商品的活动已经结束,请取消订单'
1542 1552 th.toast(content);
1543 1553 th.setData({ paying: 0 });
1544 1554 return false;
1545 1555 }
1546 1556  
  1557 + if(prom.is_show==0){
  1558 + wx.showToast({ title: "活动未启用", icon: 'none', duration: 3000 });
  1559 + th.setData({ paying: 0 });
  1560 + return false
  1561 + }
  1562 +
  1563 +
1547 1564 buyed_mum2 = promgoodsbuynum + good.goods_num;
1548 1565 if (buyed_mum2 > prom.buy_limit && prom.buy_limit > 0) {
1549 1566  
... ... @@ -2231,23 +2248,23 @@ Page({
2231 2248  
2232 2249 //-- 看一下购物车上有多少商品 --
2233 2250 var cart_num = 0;
2234   - await getApp().request.promiseGet("/api/weshop/cart/page", {
2235   - data: {
2236   - store_id: os.stoid,
2237   - user_id: getApp().globalData.user_id,
2238   - state: 0, is_gift: 0,
2239   - goods_id: good.goods_id,
2240   - pick_id: b_item.pickup_id
2241   - }
2242   - }).then(res => {
2243   - var num = 0;
2244   - if (res.data.code == 0 && res.data.data && res.data.data.pageData) {
2245   - for (var i = 0; i < res.data.data.pageData.length; i++) {
2246   - num += res.data.data.pageData[i].goods_num;
2247   - }
2248   - }
2249   - cart_num = num;
2250   - })
  2251 + // await getApp().request.promiseGet("/api/weshop/cart/page", {
  2252 + // data: {
  2253 + // store_id: os.stoid,
  2254 + // user_id: getApp().globalData.user_id,
  2255 + // state: 0, is_gift: 0,
  2256 + // goods_id: good.goods_id,
  2257 + // pick_id: b_item.pickup_id
  2258 + // }
  2259 + // }).then(res => {
  2260 + // var num = 0;
  2261 + // if (res.data.code == 0 && res.data.data && res.data.data.pageData) {
  2262 + // for (var i = 0; i < res.data.data.pageData.length; i++) {
  2263 + // num += res.data.data.pageData[i].goods_num;
  2264 + // }
  2265 + // }
  2266 + // cart_num = num;
  2267 + // })
2251 2268  
2252 2269 var lock = 0, plist = null;
2253 2270  
... ... @@ -2298,7 +2315,8 @@ Page({
2298 2315 store_id: os.stoid,
2299 2316 user_id: getApp().globalData.user_id,
2300 2317 goods_id: good.goods_id,
2301   - timetype:good.viplimited_timetype
  2318 + timetype:good.viplimited_timetype,
  2319 + isnew:1,
2302 2320  
2303 2321 };
2304 2322 if (b_item.prom_type == 7) {
... ... @@ -2340,22 +2358,22 @@ Page({
2340 2358  
2341 2359 //-- 看一下购物车上有多少商品 --
2342 2360 var cart_num = 0;
2343   - await getApp().request.promiseGet("/api/weshop/cart/page", {
2344   - data: {
2345   - store_id: os.stoid,
2346   - user_id: getApp().globalData.user_id,
2347   - state: 0, is_gift: 0,
2348   - goods_id: good.goods_id
2349   - }
2350   - }).then(res => {
2351   - var num = 0;
2352   - if (res.data.code == 0 && res.data.data && res.data.data.pageData) {
2353   - for (var i = 0; i < res.data.data.pageData.length; i++) {
2354   - num += res.data.data.pageData[i].goods_num;
2355   - }
2356   - }
2357   - cart_num = num;
2358   - })
  2361 + // await getApp().request.promiseGet("/api/weshop/cart/page", {
  2362 + // data: {
  2363 + // store_id: os.stoid,
  2364 + // user_id: getApp().globalData.user_id,
  2365 + // state: 0, is_gift: 0,
  2366 + // goods_id: good.goods_id
  2367 + // }
  2368 + // }).then(res => {
  2369 + // var num = 0;
  2370 + // if (res.data.code == 0 && res.data.data && res.data.data.pageData) {
  2371 + // for (var i = 0; i < res.data.data.pageData.length; i++) {
  2372 + // num += res.data.data.pageData[i].goods_num;
  2373 + // }
  2374 + // }
  2375 + // cart_num = num;
  2376 + // })
2359 2377  
2360 2378  
2361 2379 if (good.store_count <= 0) {
... ... @@ -2373,7 +2391,8 @@ Page({
2373 2391 store_id: os.stoid,
2374 2392 user_id: getApp().globalData.user_id,
2375 2393 goods_id: good.goods_id,
2376   - timetype:good.viplimited_timetype
  2394 + timetype:good.viplimited_timetype,
  2395 + isnew:1,
2377 2396 };
2378 2397  
2379 2398 if (prom) {
... ...
utils/more_cx.js
  View file @548799a
... ... @@ -434,6 +434,8 @@ module.exports = {
434 434 if(!c_item.selected) continue;
435 435 //如果是秒杀之类是商品
436 436 if([1,2,4,6,8,9].indexOf(c_item.prom_type)>-1) continue;
  437 + //如果是搭配的时候商品
  438 + if(c_item.is_collocation) continue;
437 439  
438 440 //-- 把活动进行规整 --
439 441 var more_cx=c_item.more_cx;
... ...