wxd / MShopWeApp

Commit 98d02260f8d45bff250770a0e7f5a4065b72e825

Authored by WXD-SEASON\season
2 parents c9a60728 c40e4c9b

Merge branch 'dev_oa_fu17' into dev

Inline Side-by-side
Showing 40 changed files with 619 additions and 75 deletions
app.wxss
  View file @98d0226
... ... @@ -367,6 +367,7 @@ button {
367 367 .ai_end{
368 368 align-items: flex-end;
369 369 }
  370 +
370 371 .cover-layer {
371 372 position: fixed;
372 373 left: 0;
... ... @@ -1332,4 +1333,10 @@ background: #ffe3e2;
1332 1333 100% {
1333 1334 transform: translateY(550rpx);
1334 1335 }
1335   -}
1336 1336 \ No newline at end of file
  1337 +}
  1338 +
  1339 +checkbox .wx-checkbox-input {
  1340 + width: 32rpx !important;
  1341 + height: 32rpx !important;
  1342 + margin-right: 16rpx;
  1343 +}
... ...
components/privacy_pop/privacy_pop.js 0 → 100644
  View file @98d0226
  1 +var t = getApp(),os =t.globalData.setting;
  2 +Component({
  3 + properties: {
  4 + },
  5 + data: {
  6 + show_pri:0,
  7 + is_all_ok:0,
  8 + store:null
  9 + },
  10 + //获取一下商家的信息
  11 + ready: function () {
  12 + getApp().getConfig(e=>{
  13 + this.setData({store:e})
  14 + })
  15 + },
  16 +
  17 + methods: {
  18 + //判断用户有没有同意安全隐私
  19 + check_pri_show(){
  20 + wx.getPrivacySetting({
  21 + success: res => {
  22 + console.log(res) // 返回结果为: res = { needAuthorization: true/false, privacyContractName: '《xxx隐私保护指引》' }
  23 + if (res.needAuthorization) {
  24 + // 需要弹出隐私协议
  25 + this.setData({
  26 + show_pri: 1
  27 + })
  28 + }else{
  29 + this.setData({
  30 + show_pri: 0
  31 + })
  32 + this.triggerEvent('agree_pri');// 调用同意的函数
  33 + }
  34 + }
  35 + })
  36 + },
  37 + //--- 分享 ---
  38 + goto:function (e) {
  39 + var url= e.currentTarget.dataset.url;
  40 + getApp().goto(url);
  41 + },
  42 + need_ok:function (){
  43 + wx.showToast({
  44 + title: '请您先阅读和勾选指定的内容',
  45 + icon: 'none',
  46 + });
  47 + },
  48 + //同意隐私的内容
  49 + AgreePrivacy:function (){
  50 + this.setData({show_pri:0,});
  51 + this.triggerEvent('agree_pri');// 调用同意的函数
  52 + },
  53 +
  54 + // 是否同意协议
  55 + isAgree(e) {
  56 + let isAgree = null;
  57 + if (e.detail.value[0]) {
  58 + isAgree = true;
  59 + } else { isAgree = false;}
  60 +
  61 + this.setData({
  62 + is_all_ok:isAgree,
  63 + });
  64 + },
  65 +
  66 + }
  67 +
  68 +})
  69 +
... ...
components/privacy_pop/privacy_pop.json 0 → 100644
  View file @98d0226
  1 +{
  2 + "component": true,
  3 + "usingComponents": {}
  4 +}
0 5 \ No newline at end of file
... ...
components/privacy_pop/privacy_pop.wxml 0 → 100644
  View file @98d0226
  1 +<view wx:if="{{show_pri}}">
  2 + <!-- 遮罩层 -->
  3 + <view class="cover-layer" style="z-index:11111"></view>
  4 + <!-- 内容层 -->
  5 + <view class="privacy_view">
  6 + <view class="pri_title">
  7 + 隐私政策更新提示
  8 + </view>
  9 + <view class="pri_content">
  10 + <view class="pri_content_p" >
  11 + 为了更好地保障您的权益，我们更新了《{{store.store_name}}小程序隐私政策》，本次更新主要包括：
  12 +
  13 + <view style="margin:40rpx 0">1. 调整注销账户功能的描述</view>
  14 +
  15 + 请您务必在勾选同意前仔细阅读、充分理解《{{store.store_name}}小程序隐私政策》的内容。若您不同意《{{store.store_name}}小程序隐私政策》的内容，请您选择不同意或立即停止使用我们的产品
  16 +
  17 + <view style="margin-top:40rpx">如您对上述内容有任何疑问，可与我们电话联系[{{store.store_tel}}]</view>
  18 + </view>
  19 + </view>
  20 +
  21 + <!-- 用户使用协议和隐私政策 -->
  22 + <view class="pri_btn">
  23 + <view class="flex-vertical fs24">
  24 + <checkbox-group bindchange="isAgree">
  25 + <checkbox class="m_ck_box" value="true">
  26 + <label for="true">
  27 + <view class="user-name-txt">我已阅读同意 <text class="gray" catchtap="goto" data-url="/packageA/pages/parseHtml/parseHtml?t=0">《用户使用协议》</text>与<text class="gray" catchtap="goto" data-url="/packageA/pages/parseHtml/parseHtml?t=1">《隐私政策》</text></view>
  28 + </label>
  29 + </checkbox>
  30 + </checkbox-group>
  31 + </view>
  32 + </view>
  33 +
  34 + <view class="pri_btn">
  35 + <block wx:if="{{!is_all_ok}}">
  36 + <button class="continue_btn" bindtap="need_ok">
  37 + <view class="flex flex-center ali-c">
  38 + <view>同意，继续使用</view>
  39 + </view>
  40 + </button>
  41 + </block>
  42 + <block wx:else>
  43 + <button class="continue_btn" open-type="agreePrivacyAuthorization" bindagreeprivacyauthorization="AgreePrivacy">
  44 + <view class="flex flex-center ali-c">
  45 + <view>同意，继续使用</view>
  46 + </view>
  47 + </button>
  48 + </block>
  49 + </view>
  50 +
  51 + </view>
  52 +</view>
... ...
components/privacy_pop/privacy_pop.wxss 0 → 100644
  View file @98d0226
  1 +@import '../../app.wxss';
  2 +.privacy_view{
  3 + position: fixed; z-index: 110000; background-color: #fff;
  4 + left:50%;top: 50%;border-radius: 10rpx;
  5 + width: 640rpx;margin-left: -320rpx;
  6 + height:940rpx;margin-top: -470rpx;
  7 +}
  8 +.pri_title{
  9 + color:#333;text-align: center;font-size: 30rpx; margin: 20rpx 0;
  10 +}
  11 +.pri_content{
  12 + border: 1rpx solid #eee; color:#666; height: 560rpx;width: 600rpx; margin: 0 auto; font-size: 26rpx;
  13 +}
  14 +.pri_content_p{ width: 560rpx;display: block; margin-top: 20rpx;margin-left: 20rpx;}
  15 +.pri_btn{width: 600rpx; margin: 0 auto;margin-top: 20rpx}
  16 +.gray {color: #767f8e;}
  17 +.continue_btn{
  18 + width: 600rpx;
  19 + height: 94rpx;
  20 + line-height: 94rpx;
  21 + background-color: #f23030;
  22 + border-radius: 48rpx;
  23 + color: rgb(255,255,255);
  24 + font-size: 32rpx;
  25 + margin-top: 40rpx;
  26 +}
  27 +
... ...
packageA/pages/goodsInfo/goodsInfo.js
  View file @98d0226
... ... @@ -560,6 +560,12 @@ Page({
560 560 // gid 在onload阶段已经保存在this.data中
561 561 onShow: function() {
562 562  
  563 + //-- 看一下隐私政策要不要显示 --
  564 + var privacy_pop = this.selectComponent("#privacy_pop"); //组件的id
  565 + if (privacy_pop) {
  566 + privacy_pop.check_pri_show();
  567 + }
  568 +
563 569 getApp().check_can_share();
564 570  
565 571 var that=this;var th=this;
... ... @@ -4047,22 +4053,43 @@ Page({
4047 4053 hiddenCS: true,
4048 4054 });
4049 4055 },
4050   -
4051   -
4052   -
4053   -
4054   -
4055   -
4056 4056  
4057   -
4058   -
4059   -
4060 4057  
  4058 + //-- 弹出框的同意的优化,重新获取定位 ---
  4059 + agree_pri:function (){
  4060 + var th=this;
  4061 + var bconfig = th.data.bconfig;
  4062 + if (bconfig && bconfig.is_sort_storage) {
  4063 + wx.getLocation({
  4064 + type: 'gcj02',
  4065 + success: function (res) {
  4066 +
  4067 + th.data.lat = res.latitude;
  4068 + th.data.lon = res.longitude;
  4069 + th.data.is_get_local_ok = 1;
  4070 + th.setData({is_gps: 1});
  4071 + th.get_sto();
  4072 + },
  4073 + fail: function (res) {
  4074 + th.data.is_get_local_ok = 1;
  4075 + th.get_sto();
  4076 + if (res.errCode == 2) {
  4077 + th.setData({is_gps: 0});
  4078 + if (th.data.is_gps == 0) {
  4079 + getApp().confirmBox("请开启GPS定位", null, 25000, !1);
  4080 + }
  4081 + } else {
  4082 + th.setData({is_gps: "3"});
  4083 + }
  4084 +
  4085 + }
  4086 + })
  4087 + }
  4088 + },
  4089 +
4061 4090  
4062   -
4063 4091  
4064 4092  
4065   -
4066 4093 });
4067 4094  
4068 4095  
... ...
packageA/pages/goodsInfo/goodsInfo.json
  View file @98d0226
... ... @@ -4,6 +4,7 @@
4 4 "usingComponents": {
5 5 "nav_box": "/components/nav_box/nav_box",
6 6 "warn": "/components/long_warn/long_warn",
7   - "serviceCard_recommend": "/components/serviceCard_list/serviceCard_list"
  7 + "serviceCard_recommend": "/components/serviceCard_list/serviceCard_list",
  8 + "privacy_pop": "/components/privacy_pop/privacy_pop"
8 9 }
9 10 }
10 11 \ No newline at end of file
... ...
packageA/pages/goodsInfo/goodsInfo.wxml
  View file @98d0226
... ... @@ -3,6 +3,9 @@
3 3 <wxs module="g_filters" src="g_filter.wxs"></wxs>
4 4 <wxs module="tool" src="filter.wxs"></wxs>
5 5  
  6 +<!-- 判断隐私是不是显示 -->
  7 +<privacy_pop id="privacy_pop" bind:agree_pri="agree_pri"></privacy_pop>
  8 +
6 9 <!-- 商品内容区域,普通商品,秒杀,拼团 -->
7 10 <block wx:if="{{isshow}}">
8 11 <view class="container">
... ...
packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.js
  View file @98d0226
... ... @@ -554,6 +554,12 @@ Page({
554 554 // gid 在onload阶段已经保存在this.data中
555 555 onShow: function () {
556 556  
  557 + //-- 看一下隐私政策要不要显示 --
  558 + var privacy_pop = this.selectComponent("#privacy_pop"); //组件的id
  559 + if (privacy_pop) {
  560 + privacy_pop.check_pri_show();
  561 + }
  562 +
557 563 getApp().check_can_share(this);
558 564 var that = this;
559 565 var ee = this, gid = this.data.gid, i = getApp().request;
... ... @@ -3885,6 +3891,38 @@ Page({
3885 3891 getApp().goto(url);
3886 3892 },
3887 3893  
  3894 + //-- 弹出框的同意的优化,重新获取定位 ---
  3895 + agree_pri:function (){
  3896 + var th=this;
  3897 + var bconfig = th.data.bconfig;
  3898 + if (bconfig && bconfig.is_sort_storage) {
  3899 + wx.getLocation({
  3900 + type: 'gcj02',
  3901 + success: function(res) {
  3902 +
  3903 + th.data.lat = res.latitude;
  3904 + th.data.lon = res.longitude;
  3905 + th.data.is_get_local_ok = 1;
  3906 + th.setData({ is_gps: 1 });
  3907 + th.get_sto();
  3908 + },
  3909 + fail: function(res) {
  3910 +
  3911 + th.data.is_get_local_ok = 1;
  3912 + th.get_sto();
  3913 + if (res.errCode == 2) {
  3914 + th.setData({is_gps: 0});
  3915 + if (th.data.is_gps == 0) {
  3916 + getApp().confirmBox("请开启GPS定位", null, 25000, !1);
  3917 + }
  3918 + } else {
  3919 + th.setData({ is_gps: "3" });
  3920 + }
  3921 +
  3922 + }
  3923 + })
  3924 + }
  3925 + },
3888 3926  
3889 3927 });
3890 3928  
... ...
packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.json
  View file @98d0226
... ... @@ -5,6 +5,7 @@
5 5 "nav_box": "/components/nav_box/nav_box",
6 6 "warn": "/components/long_warn/long_warn",
7 7 "serviceCard_recommend": "/components/serviceCard_list/serviceCard_list",
8   - "share": "/components/share/share"
  8 + "share": "/components/share/share",
  9 + "privacy_pop": "/components/privacy_pop/privacy_pop"
9 10 }
10 11 }
11 12 \ No newline at end of file
... ...
packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.wxml
  View file @98d0226
... ... @@ -3,6 +3,9 @@
3 3 <wxs module="g_filters" src="g_filter.wxs"></wxs>
4 4 <wxs module="tool" src="filter.wxs"></wxs>
5 5  
  6 +<!-- 判断隐私是不是显示 -->
  7 +<privacy_pop id="privacy_pop" bind:agree_pri="agree_pri"></privacy_pop>
  8 +
6 9 <!-- 商品内容区域,普通商品,秒杀,拼团 -->
7 10 <block wx:if="{{isshow}}">
8 11 <view class="container">
... ...
packageA/pages/serviceCard_pd/team_show/team_show.js
  View file @98d0226
... ... @@ -140,7 +140,13 @@ Page({
140 140  
141 141 //显示加载
142 142 onShow:function(){
143   - getApp().check_can_share();
  143 + //-- 看一下隐私政策要不要显示 --
  144 + var privacy_pop = this.selectComponent("#privacy_pop"); //组件的id
  145 + if (privacy_pop) {
  146 + privacy_pop.check_pri_show();
  147 + }
  148 +
  149 + getApp().check_can_share();
144 150 var tg_id = this.data.tg_id,th=this;
145 151 this.init(tg_id);
146 152 },
... ... @@ -1615,7 +1621,46 @@ Page({
1615 1621 go_to:function (e) {
1616 1622 var url=e.currentTarget.dataset.url;
1617 1623 getApp().goto(url);
1618   - }
  1624 + },
  1625 +
  1626 + //-- 弹出框的同意的优化,重新获取定位 ---
  1627 + agree_pri:function (){
  1628 + var th=this;
  1629 + var bconfig = th.data.bconfig;
  1630 + if (bconfig && bconfig.is_sort_storage) {
  1631 + wx.getLocation({
  1632 + type: 'gcj02',
  1633 + success: function (res) {
  1634 + th.data.lat = res.latitude;
  1635 + th.data.lon = res.longitude;
  1636 + th.data.is_get_local_ok = 1;
  1637 + th.setData({
  1638 + is_gps: 1
  1639 + });
  1640 + //th.onShow();
  1641 + th.get_sto();
  1642 + },
  1643 + fail: function (res) {
  1644 + //th.onShow();
  1645 + th.data.is_get_local_ok = 1;
  1646 + th.get_sto();
  1647 + if (res.errCode == 2) {
  1648 + th.setData({
  1649 + is_gps: 0
  1650 + });
  1651 + if (th.data.is_gps == 0) {
  1652 + getApp().confirmBox("请开启GPS定位", null, 25000, !1);
  1653 + }
  1654 + } else {
  1655 + th.setData({
  1656 + is_gps: "3"
  1657 + });
  1658 + }
  1659 +
  1660 + }
  1661 + })
  1662 + }
  1663 + },
1619 1664  
1620 1665  
1621 1666  
... ...
packageA/pages/serviceCard_pd/team_show/team_show.json
  View file @98d0226
... ... @@ -7,6 +7,7 @@
7 7 "backgroundColor": "#eeeeee"
8 8 },
9 9 "usingComponents": {
10   - "warn": "/components/long_warn/long_warn"
  10 + "warn": "/components/long_warn/long_warn",
  11 + "privacy_pop": "/components/privacy_pop/privacy_pop"
11 12 }
12 13 }
13 14 \ No newline at end of file
... ...
packageA/pages/serviceCard_pd/team_show/team_show.wxml
  View file @98d0226
  1 +<!-- 判断隐私是不是显示 -->
  2 +<privacy_pop id="privacy_pop" bind:agree_pri="agree_pri"></privacy_pop>
  3 +
1 4 <wxs module="filters" src="../../../../utils/filter.wxs"></wxs>
2 5 <!---- //文字"-->
3 6 <view wx:if="{{is_show}}">
... ... @@ -11,13 +14,13 @@
11 14 <view class='cenrt'>
12 15  
13 16 <view class='xc-goods-details ellipsis-2 fs28'>
14   - <span>{{goods.serviceName}}</span>
  17 + <text>{{goods.serviceName}}</text>
15 18 </view>
16 19 </view>
17 20 <view class='cenrcen flex-vertical-between'>
18 21 <view>
19 22 <view class="fs40 xc-wc" style='font-size:40rpx'>
20   - <span class="fs28" style="font-weight:500;">￥</span>{{teamlist.price}}</view>
  23 + <text class="fs28" style="font-weight:500;">￥</text>{{teamlist.price}}</view>
21 24 <view class="fs22 word-line xc-wc">
22 25 零售价￥{{goods.show_price}}
23 26 </view>
... ... @@ -62,7 +65,7 @@
62 65 <view class='bodyimg flex-level' wx:for="{{ordertx2}}" wx:key>
63 66 <view class='d'>
64 67 <image src='{{item.head_pic}}'></image>
65   - <span wx:if="{{item.is_pt_tz==1}}">团长</span>
  68 + <text wx:if="{{item.is_pt_tz==1}}">团长</text>
66 69 </view>
67 70 </view>
68 71 <view class='d' wx:for="{{sf_arr}}">
... ... @@ -84,10 +87,10 @@
84 87 <!--许程 <view class='bodytimecen' wx:if='{{obj}}'> -->
85 88 <view class='bodytimecen'>
86 89 剩余
87   - <span wx:if="{{obj.day!=0}}"> {{obj.day}} </span>:
88   - <span> {{obj.hou}} </span>:
89   - <span> {{obj.min}} </span>:
90   - <span> {{obj.sec}} </span>结束
  90 + <text wx:if="{{obj.day!=0}}"> {{obj.day}} </text>:
  91 + <text> {{obj.hou}} </text>:
  92 + <text> {{obj.min}} </text>:
  93 + <text> {{obj.sec}} </text>结束
91 94 </view>
92 95  
93 96  
... ... @@ -131,21 +134,21 @@
131 134 <view class='mck'>
132 135 <view class='bodyfoot'>
133 136 <view class='bodyselect' wx:if="{{zk}}" bindtap='czk'>
134   - <span>展开拼团列表
  137 + <text>展开拼团列表
135 138 <view class='down-arrow'></view>
136   - </span>
  139 + </text>
137 140 </view>
138 141 <!----收起拼团列表---->
139 142 <view class='zhangxi' wx:if="{{hiddenName}}">
140 143  
141   - <view class='zspan' bindtap='click'>收起拼团列表
  144 + <view class='ztext' bindtap='click'>收起拼团列表
142 145 <view class='down-arrow1'></view>
143 146 </view>
144 147  
145 148 <view class="ia" wx:for="{{ordertx}}" wx:for-index="ky">
146 149 <view class='img'>
147 150 <image src='{{item.head_pic}}'></image>
148   - <span>{{item.nickname}}</span>
  151 + <text>{{item.nickname}}</text>
149 152 </view>
150 153 <view class='zssj' wx:if="{{ky==0}}">{{item.add_time_date}} 开团</view>
151 154 <view class='zssj' wx:else>{{item.add_time_date}} 参团</view>
... ... @@ -157,7 +160,7 @@
157 160 <!--大家都在团-->
158 161 <view class='goodslist'>
159 162 <view class='goodslisttop'>
160   - <span class='goodslistspan'>大家都在团</span>
  163 + <text class='goodslisttext'>大家都在团</text>
161 164 <view class='goodslisttopright'></view>
162 165 </view>
163 166 <view class="changxin">
... ... @@ -171,7 +174,7 @@
171 174 <view class='price'>
172 175 <view class='jgleft'>¥{{item.price}}</view>
173 176 <view class='jgright'>{{item.ct_num}}人
174   - <span>参团</span>
  177 + <text>参团</text>
175 178 </view>
176 179 </view>
177 180 </view>
... ... @@ -194,7 +197,7 @@
194 197 <view class="spec-goods-name ellipsis-1">{{goods.serviceName}}</view>
195 198 <view class="flex ai_end xc-val-money">
196 199 <view class="spec-goods-price">
197   - <span class='t1'>¥</span><text class='t2'>{{teamlist.kttype==3?teamlist.yf_price:teamlist.price}}</text>
  200 + <text class='t1'>¥</text><text class='t2'>{{teamlist.kttype==3?teamlist.yf_price:teamlist.price}}</text>
198 201 </view>
199 202 </view>
200 203 <view class="flex">
... ... @@ -300,7 +303,7 @@
300 303 </view>
301 304 </view>
302 305 <view>
303   - <view class="distance fs24 address-val"wx:if="{{item.distance!=null}}">
  306 + <view class="distance fs24 address-val" wx:if="{{item.distance!=null}}">
304 307 距离：{{item.distance>1000?filters.toFix(item.distance/1000,2)+'km':filters.toFix(item.distance,0)+"m"}}</view>
305 308 </view>
306 309 </view>
... ... @@ -360,7 +363,7 @@
360 363 </view>
361 364 </view>
362 365 <view>
363   - <view class="distance fs24 address-val"wx:if="{{item.distance!=null}}">
  366 + <view class="distance fs24 address-val" wx:if="{{item.distance!=null}}">
364 367 距离：{{item.distance>1000?filters.toFix(item.distance/1000,2)+"km":filters.toFix(item.distance,0)+"m"}}</view>
365 368 </view>
366 369 </view>
... ... @@ -377,7 +380,7 @@
377 380 <view class="store-bottom flex-vertical-between">
378 381 <view class="determine red-b fs28 white t-c" bindtap="sure_pick"
379 382 data-openindstore="{{open_ind_store}}">确定</view>
380   - <view class="default t-c fs28" bindtap="set_def_pick"data-openindstore="{{open_ind_store}}">设为默认</view>
  383 + <view class="default t-c fs28" bindtap="set_def_pick" data-openindstore="{{open_ind_store}}">设为默认</view>
381 384 </view>
382 385 </view>
383 386  
... ...
packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js
  View file @98d0226
... ... @@ -898,6 +898,12 @@ Page({
898 898 //---展示---
899 899 onShow: async function () {
900 900  
  901 + //-- 看一下隐私政策要不要显示 --
  902 + var privacy_pop = this.selectComponent("#privacy_pop"); //组件的id
  903 + if (privacy_pop) {
  904 + privacy_pop.check_pri_show();
  905 + }
  906 +
901 907 //添加购物车的控制要清理0
902 908 this.data.adding=0;
903 909  
... ... @@ -7346,7 +7352,40 @@ Page({
7346 7352 break;
7347 7353 }
7348 7354 }
7349   - }
  7355 + },
  7356 +
  7357 + //-- 弹出框的同意的优化,重新获取定位 ---
  7358 + agree_pri:function (){
  7359 + var th=this;
  7360 + var bconfig = th.data.bconfig;
  7361 + if (bconfig && bconfig.is_sort_storage) {
  7362 + wx.getLocation({
  7363 + type: 'gcj02',
  7364 + success: function(res) {
  7365 +
  7366 + th.data.lat = res.latitude;
  7367 + th.data.lon = res.longitude;
  7368 + th.data.is_get_local_ok = 1;
  7369 + th.setData({ is_gps: 1 });
  7370 + th.get_sto();
  7371 + },
  7372 + fail: function(res) {
  7373 +
  7374 + th.data.is_get_local_ok = 1;
  7375 + th.get_sto();
  7376 + if (res.errCode == 2) {
  7377 + th.setData({is_gps: 0});
  7378 + if (th.data.is_gps == 0) {
  7379 + getApp().confirmBox("请开启GPS定位", null, 25000, !1);
  7380 + }
  7381 + } else {
  7382 + th.setData({ is_gps: "3" });
  7383 + }
  7384 +
  7385 + }
  7386 + })
  7387 + }
  7388 + },
7350 7389  
7351 7390  
7352 7391  
... ...
packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.json
  View file @98d0226
... ... @@ -5,6 +5,7 @@
5 5 "nav_box": "/components/nav_box/nav_box",
6 6 "warn": "/components/long_warn/long_warn",
7 7 "goods_recommend": "/components/goods_list/goods_list",
8   - "share": "/components/share/share"
  8 + "share": "/components/share/share",
  9 + "privacy_pop": "/components/privacy_pop/privacy_pop"
9 10 }
10 11 }
11 12 \ No newline at end of file
... ...
packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxml
  View file @98d0226
... ... @@ -3,6 +3,8 @@
3 3 <wxs module="g_filters" src="g_filter.wxs"></wxs>
4 4 <wxs module="tool" src="filter.wxs"></wxs>
5 5  
  6 +<!-- 判断隐私是不是显示 -->
  7 +<privacy_pop id="privacy_pop" bind:agree_pri="agree_pri"></privacy_pop>
6 8  
7 9 <!-- 商品内容区域,普通商品,秒杀,拼团 -->
8 10 <block wx:if="{{isshow}}">
... ...
packageC/pages/presell/goodsInfo/goodsInfo.js
  View file @98d0226
... ... @@ -703,6 +703,13 @@ Page({
703 703  
704 704 //---展示---
705 705 onShow: function () {
  706 +
  707 + //-- 看一下隐私政策要不要显示 --
  708 + var privacy_pop = this.selectComponent("#privacy_pop"); //组件的id
  709 + if (privacy_pop) {
  710 + privacy_pop.check_pri_show();
  711 + }
  712 +
706 713 getApp().check_can_share(this);
707 714 var goods_list = null, th = this, that = this;
708 715  
... ... @@ -4821,4 +4828,48 @@ Page({
4821 4828 });
4822 4829 },
4823 4830  
  4831 + //-- 弹出框的同意的优化,重新获取定位 ---
  4832 + agree_pri:function (){
  4833 + var th=this;
  4834 + var bconfig = th.data.bconfig;
  4835 +
  4836 + if (bconfig && bconfig.is_sort_storage) {
  4837 + wx.getLocation({
  4838 + type: 'gcj02',
  4839 + success: function (res) {
  4840 +
  4841 + th.data.lat = res.latitude;
  4842 + th.data.lon = res.longitude;
  4843 + th.data.is_get_local_ok = 1;
  4844 + th.setData({
  4845 + is_gps: 1
  4846 + });
  4847 + //th.onShow();
  4848 + th.get_sto();
  4849 + },
  4850 + fail: function (res) {
  4851 + //th.onShow();
  4852 + th.data.is_get_local_ok = 1;
  4853 + th.get_sto();
  4854 + if (res.errCode == 2) {
  4855 + th.setData({
  4856 + is_gps: 0
  4857 + });
  4858 + if (th.data.is_gps == 0) {
  4859 + getApp().confirmBox("请开启GPS定位", null, 25000, !1);
  4860 + }
  4861 + } else {
  4862 + th.setData({
  4863 + is_gps: "3"
  4864 + });
  4865 + }
  4866 +
  4867 + }
  4868 + })
  4869 + }
  4870 +
  4871 +
  4872 + },
  4873 +
  4874 +
4824 4875 });
... ...
packageC/pages/presell/goodsInfo/goodsInfo.json
  View file @98d0226
... ... @@ -5,6 +5,7 @@
5 5 "nav_box": "/components/nav_box/nav_box",
6 6 "warn": "/components/long_warn/long_warn",
7 7 "goods_recommend": "/components/goods_list/goods_list",
8   - "share": "/components/share/share"
  8 + "share": "/components/share/share",
  9 + "privacy_pop": "/components/privacy_pop/privacy_pop"
9 10 }
10 11 }
11 12 \ No newline at end of file
... ...
packageC/pages/presell/goodsInfo/goodsInfo.wxml
  View file @98d0226
... ... @@ -3,6 +3,8 @@
3 3 <wxs module="g_filters" src="g_filter.wxs"></wxs>
4 4 <wxs module="tool" src="filter.wxs"></wxs>
5 5  
  6 +<!-- 判断隐私是不是显示 -->
  7 +<privacy_pop id="privacy_pop" bind:agree_pri="agree_pri"></privacy_pop>
6 8  
7 9 <block wx:if="{{show}}">
8 10 <!-- 商品内容区域,普通商品,秒杀,拼团 -->
... ...
packageE/pages/togoin/togoin.js
  View file @98d0226
... ... @@ -26,6 +26,12 @@ Page({
26 26 this.data.is_reg=1;
27 27 }
28 28  
  29 + //-- 看一下隐私政策要不要显示 --
  30 + var privacy_pop = this.selectComponent("#privacy_pop"); //组件的id
  31 + if (privacy_pop) {
  32 + privacy_pop.check_pri_show();
  33 + }
  34 +
29 35 //--判断是否有接受到邀请人的ID--
30 36 if (options.first_leader) {
31 37 this.setData({ first_leader: options.first_leader });
... ... @@ -38,6 +44,7 @@ Page({
38 44 th.setData({ store: e, store_logo: logo });
39 45 })
40 46  
  47 +
41 48 //判断注册的条件
42 49 app.getConfig2(function (e) {
43 50 if (e.reg_type == 1) {
... ... @@ -490,7 +497,12 @@ Page({
490 497 });
491 498 },
492 499  
493   -
  500 + //弹出框的同意的优化
  501 + agree_pri:function (){
  502 + this.setData({
  503 + isAgree:1,
  504 + });
  505 + },
494 506 //通过路径跳转到其他页面
495 507 goto: function (e) {
496 508 console.log('xxxx', e);
... ...
packageE/pages/togoin/togoin.json
  View file @98d0226
1 1 {
2 2 "navigationBarTitleText": "授权登录",
3 3 "usingComponents": {
4   - "warn": "/components/long_warn/long_warn"
  4 + "warn": "/components/long_warn/long_warn",
  5 + "privacy_pop": "/components/privacy_pop/privacy_pop"
5 6 }
6 7 }
7 8 \ No newline at end of file
... ...
packageE/pages/togoin/togoin.wxml
  View file @98d0226
1   -<view>
  1 +<!-- 判断隐私是不是显示 -->
  2 +<privacy_pop id="privacy_pop" bind:agree_pri="agree_pri"></privacy_pop>
2 3  
  4 +<view>
3 5 <!-- 登录图 -->
4 6 <view >
5 7 <view class="logins flex-center2 ali-c flex" style="padding-top: 120rpx;">
... ... @@ -17,7 +19,7 @@
17 19  
18 20 <view bindtap="" class="user-name flex-vertical fs24 jc-center">
19 21 <checkbox-group bindchange="isAgree">
20   - <checkbox value="true">
  22 + <checkbox checked="{{isAgree}}" value="true">
21 23 <label for="true">
22 24 <view class="user-name-txt">我已阅读同意 <text class="gray" catchtap="goto" data-url="/packageA/pages/parseHtml/parseHtml?t=0">《用户使用协议》</text>与<text class="gray" catchtap="goto" data-url="/packageA/pages/parseHtml/parseHtml?t=1">《隐私政策》</text></view>
23 25 </label>
... ... @@ -64,7 +66,6 @@
64 66  
65 67 </view>
66 68  
67   -
68 69 <view wx:if="{{show_bind}}">
69 70 <view class="cover-layer" bindtap="close_pop"></view>
70 71 <view class="p_content">
... ...
pages/cart/cart/cart.js
  View file @98d0226
... ... @@ -125,6 +125,13 @@ Page({
125 125  
126 126 },
127 127 onShow: function () {
  128 +
  129 + //-- 看一下隐私政策要不要显示 --
  130 + var privacy_pop = this.selectComponent("#privacy_pop"); //组件的id
  131 + if (privacy_pop) {
  132 + privacy_pop.check_pri_show();
  133 + }
  134 +
128 135 //每次显示都清空
129 136 this.data.in_zhact_gdmap = {};
130 137 this.setData({
... ... @@ -797,6 +804,30 @@ Page({
797 804 continue;
798 805 }
799 806  
  807 + //把活动写入
  808 + item.prom=prom;
  809 +
  810 + //判断团购的限购
  811 + if (item.goods_num + promgoodsbuynum > prom.buy_limit && prom.buy_limit > 0) {
  812 + var cbuy = prom.buy_limit - promgoodsbuynum;
  813 + if (cbuy <= 0) {
  814 + // var url = '/api/weshop/cart/del/' + oo.stoid + '/' + item.id;
  815 + // a.delete(url, {});
  816 + th.disInvalid(item, 2);
  817 + continue;
  818 + }
  819 + //-- 购物车更新 --
  820 + var updata1 = {
  821 + id: item.id,
  822 + goods_num: cbuy,
  823 + store_id: os.stoid,
  824 + user_id: getApp().globalData.userInfo.user_id
  825 + };
  826 + getApp().request.put("/api/weshop/cart/update", {
  827 + data: updata1,
  828 + })
  829 + item.goods_num = cbuy;
  830 + }
800 831  
801 832 }
802 833  
... ... @@ -3382,13 +3413,18 @@ Page({
3382 3413 if (res.data.code == 0) gd = res.data.data;
3383 3414 })
3384 3415  
3385   - //判断秒杀的指定门店
3386   - if(py_type==1 && i_arr[j].prom && i_arr[j].prom.pick_up_lists){
  3416 + //判断秒杀的指定门店和团购的指定门店
  3417 + if([1,2].indexOf(py_type)>-1 && i_arr[j].prom && i_arr[j].prom.pick_up_lists){
3387 3418 var idx0=i_arr[j].prom.pick_up_lists.findIndex(function (e){
3388 3419 return e.pickup_id==i_arr[j].pick_id;
3389 3420 })
3390 3421 if(idx0<0){
3391   - getApp().confirmBox(i_arr[j].goods_name + "秒杀活动的门店不可售");
  3422 +
  3423 + var act_type=0;
  3424 + if(py_type==1) act_type='秒杀';
  3425 + if(py_type==2) act_type='团购';
  3426 +
  3427 + getApp().confirmBox(i_arr[j].goods_name + act_type+"活动的门店不可售");
3392 3428 wx.hideLoading();
3393 3429 return false;
3394 3430 }
... ...
pages/cart/cart/cart.json
  View file @98d0226
... ... @@ -3,6 +3,7 @@
3 3 "usingComponents": {
4 4 "warn": "/components/long_warn/long_warn",
5 5 "goods_recommend":"/components/goods_list/goods_list",
6   - "pro_pop": "/components/promate_pop/promate_pop"
  6 + "pro_pop": "/components/promate_pop/promate_pop",
  7 + "privacy_pop": "/components/privacy_pop/privacy_pop"
7 8 }
8 9 }
9 10 \ No newline at end of file
... ...
pages/cart/cart/cart.wxml
  View file @98d0226
  1 +<!-- 判断隐私是不是显示 -->
  2 +<privacy_pop id="privacy_pop" bind:agree_pri="agree_pri"></privacy_pop>
1 3 <!-- 促销弹出框 -->
2 4 <pro_pop id="pro_pop" bind:sure_cx_group="sure_cx_group"></pro_pop>
3 5  
... ...
pages/goods/goodsInfo/goodsInfo.js
  View file @98d0226
... ... @@ -921,6 +921,13 @@ Page({
921 921  
922 922 //---展示---
923 923 onShow: function () {
  924 +
  925 + //-- 看一下隐私政策要不要显示 --
  926 + var privacy_pop = this.selectComponent("#privacy_pop"); //组件的id
  927 + if (privacy_pop) {
  928 + privacy_pop.check_pri_show();
  929 + }
  930 +
924 931 //添加购物车的控制要清理0
925 932 this.data.adding=0;
926 933  
... ... @@ -3645,9 +3652,9 @@ Page({
3645 3652 }
3646 3653  
3647 3654  
3648   -
  3655 + var py=parseFloat(th.data.prom_type+'');
3649 3656 //指定门店判断， 不是普通购买的时候，秒杀的时候，秒杀有指定门店
3650   - if(!is_normal && (th.data.prom_type==1 || th.data.prom_type==6) && th.data.prom_act.pick_up_lists){
  3657 + if(!is_normal && [1,2,6].indexOf(py)>-1 && th.data.prom_act.pick_up_lists){
3651 3658 pickup_ids=th.data.prom_act.pick_up_lists
3652 3659 }
3653 3660  
... ... @@ -3675,7 +3682,7 @@ Page({
3675 3682  
3676 3683 if(idx1<0){
3677 3684 //如果是秒杀的指定门店，就要设置秒杀的
3678   - if(!is_normal && (th.data.prom_type==1 || th.data.prom_type==6) ){
  3685 + if(!is_normal && [1,2,6].indexOf(py)>-1 ){
3679 3686 th.data.def_pick_store.is_no_dis_act=1;
3680 3687 }else{
3681 3688 th.data.def_pick_store.is_no_dis_nor=1;
... ... @@ -8748,7 +8755,46 @@ Page({
8748 8755 break;
8749 8756 }
8750 8757 }
8751   - }
  8758 + },
  8759 +
  8760 + //-- 弹出框的同意的优化,重新获取定位 ---
  8761 + agree_pri:function (){
  8762 + var th=this;
  8763 + var bconfig = th.data.bconfig;
  8764 + if (bconfig && bconfig.is_sort_storage) {
  8765 + wx.getLocation({
  8766 + type: 'gcj02',
  8767 + success: function (res) {
  8768 + th.data.lat = res.latitude;
  8769 + th.data.lon = res.longitude;
  8770 + th.data.is_get_local_ok = 1;
  8771 + th.setData({
  8772 + is_gps: 1
  8773 + });
  8774 + //th.onShow();
  8775 + th.get_sto();
  8776 + },
  8777 + fail: function (res) {
  8778 + //th.onShow();
  8779 + th.data.is_get_local_ok = 1;
  8780 + th.get_sto();
  8781 + if (res.errCode == 2) {
  8782 + th.setData({
  8783 + is_gps: 0
  8784 + });
  8785 + if (th.data.is_gps == 0) {
  8786 + getApp().confirmBox("请开启GPS定位", null, 25000, !1);
  8787 + }
  8788 + } else {
  8789 + th.setData({
  8790 + is_gps: "3"
  8791 + });
  8792 + }
  8793 +
  8794 + }
  8795 + })
  8796 + }
  8797 + },
8752 8798  
8753 8799  
8754 8800 })
8755 8801 \ No newline at end of file
... ...
pages/goods/goodsInfo/goodsInfo.json
  View file @98d0226
... ... @@ -6,6 +6,7 @@
6 6 "warn": "/components/long_warn/long_warn",
7 7 "goods_recommend": "/components/goods_list/goods_list",
8 8 "share": "/components/share/share",
9   - "pro_pop": "/components/promate_pop/promate_pop"
  9 + "pro_pop": "/components/promate_pop/promate_pop",
  10 + "privacy_pop": "/components/privacy_pop/privacy_pop"
10 11 }
11 12 }
12 13 \ No newline at end of file
... ...
pages/goods/goodsInfo/goodsInfo.wxml
  View file @98d0226
  1 +<!-- 判断隐私是不是显示 -->
  2 +<privacy_pop id="privacy_pop" bind:agree_pri="agree_pri"></privacy_pop>
1 3 <!-- 促销弹出框 -->
2 4 <pro_pop id="pro_pop"></pro_pop>
3 5  
... ... @@ -1180,7 +1182,8 @@
1180 1182 <text style="font-size: 23rpx">￥</text>
1181 1183 {{filters.toFix(prom_act.tz_yyhjg,2)}}
1182 1184 </view>
1183   - <view wx:if="{{prom_act.tz_yhjgtype==2}}">团长免单</view>
  1185 + <view style="margin-top:2rpx" wx:if="{{prom_act.tz_yhjgtype==2}}">团长免单</view>
  1186 + <view style="margin-top:2rpx" wx:if="{{prom_act.tz_yhjgtype==4}}">送赠品</view>
1184 1187 </view>
1185 1188 <view wx:else>
1186 1189 <view class="fir-v">￥{{ filters.toFix(prom_act.price,2)}}</view>
... ...
pages/index/index/index.js
  View file @98d0226
... ... @@ -391,13 +391,18 @@ Page({
391 391  
392 392 async onShow() {
393 393  
394   - getApp().check_can_share();
  394 + //-- 看一下隐私政策要不要显示 --
  395 + var privacy_pop = this.selectComponent("#privacy_pop"); //组件的id
  396 + if (privacy_pop) {
  397 + privacy_pop.check_pri_show();
  398 + }
395 399  
396   - if (typeof this.getTabBar === 'function' && this.getTabBar()) {
397   - this.getTabBar().setData({
398   - cartGoodsNum: getApp().globalData.cartGoodsNum
399   - })
400   - }
  400 + getApp().check_can_share();
  401 + if (typeof this.getTabBar === 'function' && this.getTabBar()) {
  402 + this.getTabBar().setData({
  403 + cartGoodsNum: getApp().globalData.cartGoodsNum
  404 + })
  405 + }
401 406 var th = this;
402 407 //-- 登录回来判断弹框 --
403 408 var user_id = getApp().globalData.user_id;
... ... @@ -418,7 +423,7 @@ Page({
418 423 console.log(this.data.isTemplate, '首页');
419 424  
420 425 if (!this.data.isTemplate) {
421   - // timetype: 1 仅查询已预售 置空查询全部,
  426 + //timetype: 1 仅查询已预售 置空查询全部,
422 427 var pre_data = { store_id: os.stoid, is_end: 0, isuse: 1,timetype:3 };
423 428 if (user_id) {
424 429 pre_data.user_id = user_id;
... ...
pages/index/index/index.json
  View file @98d0226
... ... @@ -18,14 +18,15 @@
18 18 "picMax": "/components/diy_picMax/diy_picMax",
19 19 "mvideo": "/components/diy_video/diy_video",
20 20 "service": "/components/diy_service/diy_service",
21   - "scan": "/components/diy_scan/diy_scan",
22   - "store_select": "/components/diy_store_select/diy_store_select",
  21 + "scan": "/components/diy_scan/diy_scan",
  22 + "store_select": "/components/diy_store_select/diy_store_select",
23 23 "presell": "/components/diy_pregoods/diy_pregoods",
24   - "luckyGo": "/components/diy_luckyGo/diy_luckyGo",
25   - "serviceCard": "/components/diy_serviceCard/diy_serviceCard",
26   - "live": "/components/diy_live/diy_live",
27   - "mp-dialog": "weui-miniprogram/dialog/dialog",
28   - "mp-sticky": "/components/mp-sticky/mp-sticky"
  24 + "luckyGo": "/components/diy_luckyGo/diy_luckyGo",
  25 + "serviceCard": "/components/diy_serviceCard/diy_serviceCard",
  26 + "live": "/components/diy_live/diy_live",
  27 + "mp-dialog": "weui-miniprogram/dialog/dialog",
  28 + "mp-sticky": "/components/mp-sticky/mp-sticky",
  29 + "privacy_pop": "/components/privacy_pop/privacy_pop"
29 30 },
30 31 "enablePullDownRefresh": false,
31 32 "onReachBottomDistance":300
... ...
pages/index/index/index.wxml
  View file @98d0226
  1 +<!-- 判断隐私是不是显示 -->
  2 +<privacy_pop id="privacy_pop"></privacy_pop>
1 3 <!-- 全屏控制 -->
2 4 <view wx:if="{{is_full_screen_show && full_ad && !full_ad.show_type}}" class="full_screen" bindtap="go_full_ad" style="background-image: url('{{url+full_ad.ad_code}}');">
3 5 <view catchtap="close_full_screen" class="skip_box">跳过 <text>{{sec_show}}</text></view>
... ... @@ -406,8 +408,6 @@
406 408 </view>
407 409 </view>
408 410  
409   -
410   -
411 411 <block wx:if="{{f_hidden}}">
412 412 <!--是否是自定义-->
413 413 <view class="container" wx:if="{{isTemplate}}" style="background-color:{{bgcolor_t}}; padding-bottom: 10rpx">
... ...
pages/team/team_show/team_show.js
  View file @98d0226
... ... @@ -144,7 +144,13 @@ Page({
144 144  
145 145 //显示加载
146 146 onShow:function(){
147   - getApp().check_can_share();
  147 + //-- 看一下隐私政策要不要显示 --
  148 + var privacy_pop = this.selectComponent("#privacy_pop"); //组件的id
  149 + if (privacy_pop) {
  150 + privacy_pop.check_pri_show();
  151 + }
  152 +
  153 + getApp().check_can_share();
148 154 var tg_id = this.data.tg_id,th=this;
149 155 this.init(tg_id);
150 156 },
... ... @@ -1633,7 +1639,45 @@ Page({
1633 1639 })
1634 1640  
1635 1641 },
1636   -
  1642 +
  1643 + //-- 弹出框的同意的优化,重新获取定位 ---
  1644 + agree_pri:function (){
  1645 + var th=this;
  1646 + var bconfig = th.data.bconfig;
  1647 + if (bconfig && bconfig.is_sort_storage) {
  1648 + wx.getLocation({
  1649 + type: 'gcj02',
  1650 + success: function (res) {
  1651 + th.data.lat = res.latitude;
  1652 + th.data.lon = res.longitude;
  1653 + th.data.is_get_local_ok = 1;
  1654 + th.setData({
  1655 + is_gps: 1
  1656 + });
  1657 + //th.onShow();
  1658 + th.get_sto();
  1659 + },
  1660 + fail: function (res) {
  1661 + //th.onShow();
  1662 + th.data.is_get_local_ok = 1;
  1663 + th.get_sto();
  1664 + if (res.errCode == 2) {
  1665 + th.setData({
  1666 + is_gps: 0
  1667 + });
  1668 + if (th.data.is_gps == 0) {
  1669 + getApp().confirmBox("请开启GPS定位", null, 25000, !1);
  1670 + }
  1671 + } else {
  1672 + th.setData({
  1673 + is_gps: "3"
  1674 + });
  1675 + }
  1676 +
  1677 + }
  1678 + })
  1679 + }
  1680 + },
1637 1681  
1638 1682  
1639 1683  
... ...
pages/team/team_show/team_show.json
  View file @98d0226
... ... @@ -7,6 +7,7 @@
7 7 "backgroundColor": "#eeeeee"
8 8 },
9 9 "usingComponents": {
10   - "warn": "/components/long_warn/long_warn"
  10 + "warn": "/components/long_warn/long_warn",
  11 + "privacy_pop": "/components/privacy_pop/privacy_pop"
11 12 }
12 13 }
13 14 \ No newline at end of file
... ...
pages/team/team_show/team_show.wxml
  View file @98d0226
  1 +<!-- 判断隐私是不是显示 -->
  2 +<privacy_pop id="privacy_pop" bind:agree_pri="agree_pri"></privacy_pop>
  3 +
1 4 <wxs module="filters" src="../../../utils/filter.wxs"></wxs>
2 5 <!---- //文字"-->
3 6 <view wx:if="{{is_show}}">
... ...
pages/user/index/index.js
  View file @98d0226
... ... @@ -119,6 +119,12 @@ Page({
119 119  
120 120 var _that=this;
121 121  
  122 + //-- 看一下隐私政策要不要显示 --
  123 + var privacy_pop = this.selectComponent("#privacy_pop"); //组件的id
  124 + if (privacy_pop) {
  125 + privacy_pop.check_pri_show();
  126 + }
  127 +
122 128 getApp().check_can_share();
123 129 //看一下小程序是不是过期了
124 130 getApp().getConfig2(function (config2) {
... ...
pages/user/index/index.json
  View file @98d0226
1 1 {
2 2 "usingComponents": {
3 3 "pop_txt": "/components/userqy_pop_up/userqy_pop_up",
4   - "goods_recommend": "/components/goods_list/goods_list"
  4 + "goods_recommend": "/components/goods_list/goods_list",
  5 + "privacy_pop": "/components/privacy_pop/privacy_pop"
5 6 },
6 7 "navigationBarTitleText": "会员中心"
7 8 }
8 9 \ No newline at end of file
... ...
pages/user/index/index.wxml
  View file @98d0226
  1 +<!-- 判断隐私是不是显示 -->
  2 +<privacy_pop id="privacy_pop" bind:agree_pri="agree_pri"></privacy_pop>
1 3 <!-- <import src="../../tabbar/tabbar.wxml" />
2 4 <template is="tabBar" data="{{tabBar}}" /> -->
3 5 <wxs src="filter.wxs" module="util"></wxs>
... ...
pages/user/order_detail/order_detail.js
  View file @98d0226
... ... @@ -1038,10 +1038,11 @@ Page({
1038 1038 var act_type='';
1039 1039 switch (c_type){
1040 1040 case 1:act_type='秒杀';break;
  1041 + case 2:act_type='团购';break;
1041 1042 case 6:act_type='拼团';break;
1042 1043 }
1043 1044 //指定门店的控制
1044   - if ([1,6].indexOf(c_type)>-1 && prom.pick_up_lists) {
  1045 + if ([1,2,6].indexOf(c_type)>-1 && prom.pick_up_lists) {
1045 1046 var idx0=prom.pick_up_lists.findIndex(function (e){
1046 1047 return e.pickup_id==order.pickup_id;
1047 1048 })
... ...
pages/user/order_list/order_list.js
  View file @98d0226
... ... @@ -778,7 +778,6 @@ Page({
778 778 return false;
779 779 }
780 780  
781   -
782 781 //-- 要进行判断指定门店的判断优化,先做普通商品 --
783 782 if([0,3,5,7,10].indexOf(parseInt(good.prom_type))>-1 && gg.pick_group_ids && !good.is_gift){
784 783 var idx0=gg.pick_up_lists.findIndex(function (e){
... ... @@ -1354,11 +1353,12 @@ Page({
1354 1353 var act_type='';
1355 1354 switch (c_type){
1356 1355 case 1:act_type='秒杀';break;
  1356 + case 2:act_type='团购';break;
1357 1357 case 6:act_type='拼团';break;
1358 1358 }
1359 1359  
1360 1360 //指定门店的控制
1361   - if ([1,6].indexOf(c_type)>-1 && prom.pick_up_lists) {
  1361 + if ([1,2,6].indexOf(c_type)>-1 && prom.pick_up_lists) {
1362 1362 var idx0=prom.pick_up_lists.findIndex(function (e){
1363 1363 return e.pickup_id==order.pickup_id;
1364 1364 })
... ...