xt / xcx-book · Commits

Go to a project

Commit 588b3b173e1112d310212b490f5bab387d61aac8

Authored by pengye
1 parent 3e48468d
build: skipped

邀请函、商家有礼、商家详情充值无数据报错问题处理

Inline Side-by-side
Showing 24 changed files with 290 additions and 224 deletions
@@ -867,23 +867,29 @@ Page({ @@ -867,23 +867,29 @@ Page({
867 App.Activity.GetNewRecharge({ 867 App.Activity.GetNewRecharge({
868 id 868 id
869 }).then(res => { 869 }).then(res => {
870 - let detail = res.data  
871 - let exp_date = res.data.exp_date ? JSON.parse(res.data.exp_date) : ''  
872 - let recharge_list = res.data.recharge_list ? JSON.parse(res.data.recharge_list) : ''  
873 - let priceInfo, scoreInfo, certificate;  
874 - detail.recharge_list = recharge_list;  
875 - detail.exp_date = exp_date;  
876 - if (recharge_list.is_price == '1') priceInfo = '会员充值满' + detail.recharge_money + '元赠送' + recharge_list.price + '元余额';  
877 - if (recharge_list.is_score == '1') scoreInfo = '会员充值满' + detail.recharge_money + '元赠送' + recharge_list.score + '积分';  
878 - if (recharge_list.is_coupons == '1' && recharge_list.coupons_names.length > 0) certificate = recharge_list.coupons_names.join('、');  
879 - let recharge_data = (this.data.dataStr < detail.etime * 1 && detail.is_open == '1') ? detail : ''  
880 - console.log('邀请函--------------充值', recharge_data);  
881 - this.setData({  
882 - recharge_data,  
883 - scoreInfo,  
884 - priceInfo,  
885 - certificate  
886 - }) 870 + if (res.data) {
  871 + let detail = res.data
  872 + let exp_date = res.data.exp_date ? JSON.parse(res.data.exp_date) : ''
  873 + let recharge_list = res.data.recharge_list ? JSON.parse(res.data.recharge_list) : ''
  874 + let priceInfo, scoreInfo, certificate;
  875 + detail.recharge_list = recharge_list;
  876 + detail.exp_date = exp_date;
  877 + if (recharge_list.is_price == '1') priceInfo = '会员充值满' + detail.recharge_money + '元赠送' + recharge_list.price + '元余额';
  878 + if (recharge_list.is_score == '1') scoreInfo = '会员充值满' + detail.recharge_money + '元赠送' + recharge_list.score + '积分';
  879 + if (recharge_list.is_coupons == '1' && recharge_list.coupons_names.length > 0) certificate = recharge_list.coupons_names.join('、');
  880 + let recharge_data = (this.data.dataStr < detail.etime * 1 && detail.is_open == '1') ? detail : ''
  881 + console.log('邀请函--------------充值', recharge_data);
  882 + this.setData({
  883 + recharge_data,
  884 + scoreInfo,
  885 + priceInfo,
  886 + certificate
  887 + })
  888 + } else {
  889 + this.setData({
  890 + recharge_data: {},
  891 + })
  892 + }
887 }) 893 })
888 }, 894 },
889 // 获取评价赠送的券最新详情 895 // 获取评价赠送的券最新详情
@@ -132,7 +132,7 @@ @@ -132,7 +132,7 @@
132 <!-- 充值 --> 132 <!-- 充值 -->
133 <view class="publicModule preferentialCoupon" wx:if="{{(hasValueRecharge && marketing.is_recharge=='1' && recharge_data) || (hasValueRecharge && marketing.is_link=='1')}}"> 133 <view class="publicModule preferentialCoupon" wx:if="{{(hasValueRecharge && marketing.is_recharge=='1' && recharge_data) || (hasValueRecharge && marketing.is_link=='1')}}">
134 <image class="titleImg6" src="https://qn.colorcun.com/invitation10Title2.png" mode="" /> 134 <image class="titleImg6" src="https://qn.colorcun.com/invitation10Title2.png" mode="" />
135 - <navigator wx:if="{{hasValueRecharge && marketing.is_recharge=='1' && recharge_data}}" url="/pack-activity/pack/vipRecharge?id={{recharge_data.id}}&name={{seller.name}}&sid={{seller.sid}}&oid={{detail.id}}&types=1&StyleType={{StyleType}}" hover-class="navigator-hover"> 135 + <navigator wx:if="{{hasValueRecharge && marketing.is_recharge=='1' && recharge_data && recharge_data.id}}" url="/pack-activity/pack/vipRecharge?id={{recharge_data.id}}&name={{seller.name}}&sid={{seller.sid}}&oid={{detail.id}}&types=1&StyleType={{StyleType}}" hover-class="navigator-hover">
136 <view class="rechargeItems"> 136 <view class="rechargeItems">
137 <image class="checkImg" src="https://qn.colorcun.com/invitation10vector1.png" mode="" /> 137 <image class="checkImg" src="https://qn.colorcun.com/invitation10vector1.png" mode="" />
138 <view class="rechargeTitle font36r">{{recharge_data.rname}}</view> 138 <view class="rechargeTitle font36r">{{recharge_data.rname}}</view>
@@ -887,36 +887,42 @@ Page({ @@ -887,36 +887,42 @@ Page({
887 App.Activity.GetNewRecharge({ 887 App.Activity.GetNewRecharge({
888 id 888 id
889 }).then(res => { 889 }).then(res => {
890 - let detail = res.data  
891 - let exp_date = res.data.exp_date ? JSON.parse(res.data.exp_date) : ''  
892 - let recharge_list = res.data.recharge_list ? JSON.parse(res.data.recharge_list) : ''  
893 - let priceInfo, scoreInfo, certificate;  
894 - detail.recharge_list = recharge_list;  
895 - detail.exp_date = exp_date;  
896 - if (recharge_list.is_price == '1') priceInfo = '赠送' + recharge_list.price + '元余额';  
897 - if (recharge_list.is_score == '1') scoreInfo = '赠送' + recharge_list.score + '积分';  
898 - if (recharge_list.is_coupons == '1' && recharge_list.coupons_names.length > 0) certificate = recharge_list.coupons_names.join('、');  
899 - let recharge_data = (this.data.dataStr < detail.etime * 1 && detail.is_open == '1') ? detail : ''  
900 - console.log('邀请函--------------充值', recharge_data);  
901 - let entry = this.data.titleList  
902 - if (this.data.hasValueRecharge && this.data.marketing.is_recharge == '1' && recharge_data) {  
903 - entry.push({  
904 - id: 2,  
905 - title: '会员充值优惠'  
906 - })  
907 - if (entry.length > 0) {  
908 - entry.sort((a, b) => a.id - b.id); 890 + if (res.data) {
  891 + let detail = res.data
  892 + let exp_date = res.data.exp_date ? JSON.parse(res.data.exp_date) : ''
  893 + let recharge_list = res.data.recharge_list ? JSON.parse(res.data.recharge_list) : ''
  894 + let priceInfo, scoreInfo, certificate;
  895 + detail.recharge_list = recharge_list;
  896 + detail.exp_date = exp_date;
  897 + if (recharge_list.is_price == '1') priceInfo = '赠送' + recharge_list.price + '元余额';
  898 + if (recharge_list.is_score == '1') scoreInfo = '赠送' + recharge_list.score + '积分';
  899 + if (recharge_list.is_coupons == '1' && recharge_list.coupons_names.length > 0) certificate = recharge_list.coupons_names.join('、');
  900 + let recharge_data = (this.data.dataStr < detail.etime * 1 && detail.is_open == '1') ? detail : ''
  901 + console.log('邀请函--------------充值', recharge_data);
  902 + let entry = this.data.titleList
  903 + if (this.data.hasValueRecharge && this.data.marketing.is_recharge == '1' && recharge_data) {
  904 + entry.push({
  905 + id: 2,
  906 + title: '会员充值优惠'
  907 + })
  908 + if (entry.length > 0) {
  909 + entry.sort((a, b) => a.id - b.id);
  910 + }
  911 + recharge_data.timeStr = util.unixtoTime(recharge_data.stime, 'YYYY-MM-DD') + ' - ' + util.unixtoTime(recharge_data.etime, 'YYYY-MM-DD')
909 } 912 }
910 - recharge_data.timeStr = util.unixtoTime(recharge_data.stime, 'YYYY-MM-DD') + ' - ' + util.unixtoTime(recharge_data.etime, 'YYYY-MM-DD') 913 + this.setData({
  914 + titleList: entry,
  915 + activeTitle: entry.length > 0 ? entry[0].id : '',
  916 + recharge_data,
  917 + scoreInfo,
  918 + priceInfo,
  919 + certificate
  920 + })
  921 + } else {
  922 + this.setData({
  923 + recharge_data: {},
  924 + })
911 } 925 }
912 - this.setData({  
913 - titleList: entry,  
914 - activeTitle: entry.length > 0 ? entry[0].id : '',  
915 - recharge_data,  
916 - scoreInfo,  
917 - priceInfo,  
918 - certificate  
919 - })  
920 }) 926 })
921 }, 927 },
922 // 选择标题 928 // 选择标题
@@ -168,7 +168,7 @@ @@ -168,7 +168,7 @@
168 </view> 168 </view>
169 <!-- 充值 --> 169 <!-- 充值 -->
170 <view class="regionItem" wx:if="{{activeTitle == '2'}}"> 170 <view class="regionItem" wx:if="{{activeTitle == '2'}}">
171 - <navigator url="/pack-activity/pack/vipRecharge?id={{recharge_data.id}}&name={{seller.name}}&sid={{seller.sid}}&oid={{detail.id}}&types=1&StyleType={{StyleType}}" hover-class="navigator-hover"> 171 + <navigator wx:if="{{recharge_data.id}}" url="/pack-activity/pack/vipRecharge?id={{recharge_data.id}}&name={{seller.name}}&sid={{seller.sid}}&oid={{detail.id}}&types=1&StyleType={{StyleType}}" hover-class="navigator-hover">
172 <view class="rechargeItems"> 172 <view class="rechargeItems">
173 <image class="checkImg" src="https://qn.colorcun.com/invitation10vector.png" mode="" /> 173 <image class="checkImg" src="https://qn.colorcun.com/invitation10vector.png" mode="" />
174 <view class="rechargeTitle">{{recharge_data.recharge_money}}<text class="font24r">元</text></view> 174 <view class="rechargeTitle">{{recharge_data.recharge_money}}<text class="font24r">元</text></view>
@@ -193,7 +193,7 @@ @@ -193,7 +193,7 @@
193 </view> 193 </view>
194 <view class="rechargeBtn"> 194 <view class="rechargeBtn">
195 <view wx:if="{{hasValueRecharge && marketing.is_link=='1'}}" class="favouredPolicy">更多优惠</view> 195 <view wx:if="{{hasValueRecharge && marketing.is_link=='1'}}" class="favouredPolicy">更多优惠</view>
196 - <navigator url="/pack-activity/pack/vipRecharge?id={{recharge_data.id}}&name={{seller.name}}&sid={{seller.sid}}&oid={{detail.id}}&types=1&StyleType={{StyleType}}" hover-class="navigator-hover"> 196 + <navigator wx:if="{{recharge_data.id}}" url="/pack-activity/pack/vipRecharge?id={{recharge_data.id}}&name={{seller.name}}&sid={{seller.sid}}&oid={{detail.id}}&types=1&StyleType={{StyleType}}" hover-class="navigator-hover">
197 立即充值 197 立即充值
198 </navigator> 198 </navigator>
199 </view> 199 </view>
@@ -902,36 +902,42 @@ Page({ @@ -902,36 +902,42 @@ Page({
902 App.Activity.GetNewRecharge({ 902 App.Activity.GetNewRecharge({
903 id 903 id
904 }).then(res => { 904 }).then(res => {
905 - let detail = res.data  
906 - let exp_date = res.data.exp_date ? JSON.parse(res.data.exp_date) : ''  
907 - let recharge_list = res.data.recharge_list ? JSON.parse(res.data.recharge_list) : ''  
908 - let priceInfo, scoreInfo, certificate;  
909 - detail.recharge_list = recharge_list;  
910 - detail.exp_date = exp_date;  
911 - if (recharge_list.is_price == '1') priceInfo = '赠送' + recharge_list.price + '元余额';  
912 - if (recharge_list.is_score == '1') scoreInfo = '赠送' + recharge_list.score + '积分';  
913 - if (recharge_list.is_coupons == '1' && recharge_list.coupons_names.length > 0) certificate = recharge_list.coupons_names.join('、');  
914 - let recharge_data = (this.data.dataStr < detail.etime * 1 && detail.is_open == '1') ? detail : ''  
915 - console.log('邀请函--------------充值', recharge_data);  
916 - let entry = this.data.titleList  
917 - if (this.data.hasValueRecharge && this.data.marketing.is_recharge == '1' && recharge_data) {  
918 - entry.push({  
919 - id: 2,  
920 - title: '会员充值优惠'  
921 - })  
922 - if (entry.length > 0) {  
923 - entry.sort((a, b) => a.id - b.id); 905 + if (res.data) {
  906 + let detail = res.data
  907 + let exp_date = res.data.exp_date ? JSON.parse(res.data.exp_date) : ''
  908 + let recharge_list = res.data.recharge_list ? JSON.parse(res.data.recharge_list) : ''
  909 + let priceInfo, scoreInfo, certificate;
  910 + detail.recharge_list = recharge_list;
  911 + detail.exp_date = exp_date;
  912 + if (recharge_list.is_price == '1') priceInfo = '赠送' + recharge_list.price + '元余额';
  913 + if (recharge_list.is_score == '1') scoreInfo = '赠送' + recharge_list.score + '积分';
  914 + if (recharge_list.is_coupons == '1' && recharge_list.coupons_names.length > 0) certificate = recharge_list.coupons_names.join('、');
  915 + let recharge_data = (this.data.dataStr < detail.etime * 1 && detail.is_open == '1') ? detail : ''
  916 + console.log('邀请函--------------充值', recharge_data);
  917 + let entry = this.data.titleList
  918 + if (this.data.hasValueRecharge && this.data.marketing.is_recharge == '1' && recharge_data) {
  919 + entry.push({
  920 + id: 2,
  921 + title: '会员充值优惠'
  922 + })
  923 + if (entry.length > 0) {
  924 + entry.sort((a, b) => a.id - b.id);
  925 + }
  926 + recharge_data.timeStr = util.unixtoTime(recharge_data.stime, 'YYYY-MM-DD') + ' - ' + util.unixtoTime(recharge_data.etime, 'YYYY-MM-DD')
924 } 927 }
925 - recharge_data.timeStr = util.unixtoTime(recharge_data.stime, 'YYYY-MM-DD') + ' - ' + util.unixtoTime(recharge_data.etime, 'YYYY-MM-DD') 928 + this.setData({
  929 + titleList: entry,
  930 + activeTitle: entry.length > 0 ? entry[0].id : '',
  931 + recharge_data,
  932 + scoreInfo,
  933 + priceInfo,
  934 + certificate
  935 + })
  936 + } else {
  937 + this.setData({
  938 + recharge_data: {},
  939 + })
926 } 940 }
927 - this.setData({  
928 - titleList: entry,  
929 - activeTitle: entry.length > 0 ? entry[0].id : '',  
930 - recharge_data,  
931 - scoreInfo,  
932 - priceInfo,  
933 - certificate  
934 - })  
935 }) 941 })
936 }, 942 },
937 // 选择标题 943 // 选择标题
@@ -97,7 +97,7 @@ @@ -97,7 +97,7 @@
97 <image src="https://qn.colorcun.com/invitation1{{bookType == '1'?'3':'4'}}Icon1.png" mode="" /> 97 <image src="https://qn.colorcun.com/invitation1{{bookType == '1'?'3':'4'}}Icon1.png" mode="" />
98 <view class="font24r">专属优惠券</view> 98 <view class="font24r">专属优惠券</view>
99 </view> 99 </view>
100 - <view bindtap="publicShowModal" data-type="2" data-title="会员充值优惠" wx:if="{{(hasValueRecharge && marketing.is_recharge=='1' && recharge_data) || (hasValueRecharge && marketing.is_link=='1')}}" class="entranceItem"> 100 + <view bindtap="publicShowModal" data-type="2" data-title="会员充值优惠" wx:if="{{(hasValueRecharge && marketing.is_recharge=='1' && recharge_data && recharge_data.id) || (hasValueRecharge && marketing.is_link=='1')}}" class="entranceItem">
101 <image src="https://qn.colorcun.com/invitation1{{bookType == '1'?'3':'4'}}Icon2.png" mode="" /> 101 <image src="https://qn.colorcun.com/invitation1{{bookType == '1'?'3':'4'}}Icon2.png" mode="" />
102 <view class="font24r">会员充值优惠</view> 102 <view class="font24r">会员充值优惠</view>
103 </view> 103 </view>
@@ -213,7 +213,7 @@ @@ -213,7 +213,7 @@
213 </block> 213 </block>
214 <block wx:if="{{modalType == '2'}}"> 214 <block wx:if="{{modalType == '2'}}">
215 <view class="publicModule preferentialCoupon" slot="modalContent"> 215 <view class="publicModule preferentialCoupon" slot="modalContent">
216 - <navigator wx:if="{{hasValueRecharge && marketing.is_recharge=='1' && recharge_data}}" url="/pack-activity/pack/vipRecharge?id={{recharge_data.id}}&name={{seller.name}}&sid={{seller.sid}}&oid={{detail.id}}&types=1&StyleType={{StyleType}}" hover-class="navigator-hover"> 216 + <navigator wx:if="{{hasValueRecharge && marketing.is_recharge=='1' && recharge_data && recharge_data.id}}" url="/pack-activity/pack/vipRecharge?id={{recharge_data.id}}&name={{seller.name}}&sid={{seller.sid}}&oid={{detail.id}}&types=1&StyleType={{StyleType}}" hover-class="navigator-hover">
217 <view class="rechargeItems"> 217 <view class="rechargeItems">
218 <image class="checkImg" src="https://qn.colorcun.com/{{bookType == '1' ?'invitation10vector1':'invitation10vector'}}.png" mode="" /> 218 <image class="checkImg" src="https://qn.colorcun.com/{{bookType == '1' ?'invitation10vector1':'invitation10vector'}}.png" mode="" />
219 <view class="rechargeTitle font36r">{{recharge_data.rname}}</view> 219 <view class="rechargeTitle font36r">{{recharge_data.rname}}</view>
@@ -897,23 +897,29 @@ Page({ @@ -897,23 +897,29 @@ Page({
897 App.Activity.GetNewRecharge({ 897 App.Activity.GetNewRecharge({
898 id 898 id
899 }).then(res => { 899 }).then(res => {
900 - let detail = res.data  
901 - let exp_date = res.data.exp_date ? JSON.parse(res.data.exp_date) : ''  
902 - let recharge_list = res.data.recharge_list ? JSON.parse(res.data.recharge_list) : ''  
903 - let priceInfo, scoreInfo, certificate;  
904 - detail.recharge_list = recharge_list;  
905 - detail.exp_date = exp_date;  
906 - if (recharge_list.is_price == '1') priceInfo = '会员充值满' + detail.recharge_money + '元赠送' + recharge_list.price + '元余额';  
907 - if (recharge_list.is_score == '1') scoreInfo = '会员充值满' + detail.recharge_money + '元赠送' + recharge_list.score + '积分';  
908 - if (recharge_list.is_coupons == '1' && recharge_list.coupons_names.length > 0) certificate = recharge_list.coupons_names.join('、');  
909 - let recharge_data = (this.data.dataStr<detail.etime*1 && detail.is_open == '1') ? detail : ''  
910 - console.log('邀请函--------------充值',recharge_data);  
911 - this.setData({  
912 - recharge_data,  
913 - scoreInfo,  
914 - priceInfo,  
915 - certificate  
916 - }) 900 + if (res.data) {
  901 + let detail = res.data
  902 + let exp_date = res.data.exp_date ? JSON.parse(res.data.exp_date) : ''
  903 + let recharge_list = res.data.recharge_list ? JSON.parse(res.data.recharge_list) : ''
  904 + let priceInfo, scoreInfo, certificate;
  905 + detail.recharge_list = recharge_list;
  906 + detail.exp_date = exp_date;
  907 + if (recharge_list.is_price == '1') priceInfo = '会员充值满' + detail.recharge_money + '元赠送' + recharge_list.price + '元余额';
  908 + if (recharge_list.is_score == '1') scoreInfo = '会员充值满' + detail.recharge_money + '元赠送' + recharge_list.score + '积分';
  909 + if (recharge_list.is_coupons == '1' && recharge_list.coupons_names.length > 0) certificate = recharge_list.coupons_names.join('、');
  910 + let recharge_data = (this.data.dataStr<detail.etime*1 && detail.is_open == '1') ? detail : ''
  911 + console.log('邀请函--------------充值',recharge_data);
  912 + this.setData({
  913 + recharge_data,
  914 + scoreInfo,
  915 + priceInfo,
  916 + certificate
  917 + })
  918 + } else {
  919 + this.setData({
  920 + recharge_data: {},
  921 + })
  922 + }
917 }) 923 })
918 }, 924 },
919 // 获取评价赠送的券最新详情 925 // 获取评价赠送的券最新详情
@@ -287,7 +287,7 @@ @@ -287,7 +287,7 @@
287 <view wx:if="{{titleType}}" class="chefText font36r"> 287 <view wx:if="{{titleType}}" class="chefText font36r">
288 <titleStyle isWhite="{{themeColor}}" titleStyleType="{{titleType}}" titleText="会员招募"></titleStyle> 288 <titleStyle isWhite="{{themeColor}}" titleStyleType="{{titleType}}" titleText="会员招募"></titleStyle>
289 </view> 289 </view>
290 - <navigator url="/pack-activity/pack/vipRecharge?id={{recharge_data.id}}&name={{seller.name}}&sid={{seller.sid}}&oid={{detail.id}}&types=1&StyleType={{StyleType}}" hover-class="navigator-hover"> 290 + <navigator wx:if="{{recharge_data.id}}" url="/pack-activity/pack/vipRecharge?id={{recharge_data.id}}&name={{seller.name}}&sid={{seller.sid}}&oid={{detail.id}}&types=1&StyleType={{StyleType}}" hover-class="navigator-hover">
291 <view class="preferentialItems rechargeItems"> 291 <view class="preferentialItems rechargeItems">
292 <view class="itemLeft"> 292 <view class="itemLeft">
293 <view class="itemTop font36r"> 293 <view class="itemTop font36r">
@@ -852,23 +852,29 @@ Page({ @@ -852,23 +852,29 @@ Page({
852 App.Activity.GetNewRecharge({ 852 App.Activity.GetNewRecharge({
853 id 853 id
854 }).then(res => { 854 }).then(res => {
855 - let detail = res.data  
856 - let exp_date = res.data.exp_date ? JSON.parse(res.data.exp_date) : ''  
857 - let recharge_list = res.data.recharge_list ? JSON.parse(res.data.recharge_list) : ''  
858 - let priceInfo, scoreInfo, certificate;  
859 - detail.recharge_list = recharge_list;  
860 - detail.exp_date = exp_date;  
861 - if (recharge_list.is_price == '1') priceInfo = '会员充值满' + detail.recharge_money + '元赠送' + recharge_list.price + '元余额';  
862 - if (recharge_list.is_score == '1') scoreInfo = '会员充值满' + detail.recharge_money + '元赠送' + recharge_list.score + '积分';  
863 - if (recharge_list.is_coupons == '1' && recharge_list.coupons_names.length > 0) certificate = recharge_list.coupons_names.join('、');  
864 - let recharge_data = (this.data.dataStr<detail.etime*1 && detail.is_open == '1') ? detail : ''  
865 - console.log('邀请函--------------充值',recharge_data);  
866 - this.setData({  
867 - recharge_data,  
868 - scoreInfo,  
869 - priceInfo,  
870 - certificate  
871 - }) 855 + if (res.data) {
  856 + let detail = res.data
  857 + let exp_date = res.data.exp_date ? JSON.parse(res.data.exp_date) : ''
  858 + let recharge_list = res.data.recharge_list ? JSON.parse(res.data.recharge_list) : ''
  859 + let priceInfo, scoreInfo, certificate;
  860 + detail.recharge_list = recharge_list;
  861 + detail.exp_date = exp_date;
  862 + if (recharge_list.is_price == '1') priceInfo = '会员充值满' + detail.recharge_money + '元赠送' + recharge_list.price + '元余额';
  863 + if (recharge_list.is_score == '1') scoreInfo = '会员充值满' + detail.recharge_money + '元赠送' + recharge_list.score + '积分';
  864 + if (recharge_list.is_coupons == '1' && recharge_list.coupons_names.length > 0) certificate = recharge_list.coupons_names.join('、');
  865 + let recharge_data = (this.data.dataStr<detail.etime*1 && detail.is_open == '1') ? detail : ''
  866 + console.log('邀请函--------------充值',recharge_data);
  867 + this.setData({
  868 + recharge_data,
  869 + scoreInfo,
  870 + priceInfo,
  871 + certificate
  872 + })
  873 + } else {
  874 + this.setData({
  875 + recharge_data: {},
  876 + })
  877 + }
872 }) 878 })
873 }, 879 },
874 // 获取评价赠送的券最新详情 880 // 获取评价赠送的券最新详情
@@ -292,7 +292,7 @@ @@ -292,7 +292,7 @@
292 <view wx:if="{{titleType}}" class="chefText font36r"> 292 <view wx:if="{{titleType}}" class="chefText font36r">
293 <titleStyle isWhite="{{themeColor}}" titleStyleType="{{titleType}}" titleText="会员招募"></titleStyle> 293 <titleStyle isWhite="{{themeColor}}" titleStyleType="{{titleType}}" titleText="会员招募"></titleStyle>
294 </view> 294 </view>
295 - <navigator url="/pack-activity/pack/vipRecharge?id={{recharge_data.id}}&name={{seller.name}}&sid={{seller.sid}}&oid={{detail.id}}&types=1&StyleType={{StyleType}}" hover-class="navigator-hover"> 295 + <navigator wx:if="{{recharge_data.id}}" url="/pack-activity/pack/vipRecharge?id={{recharge_data.id}}&name={{seller.name}}&sid={{seller.sid}}&oid={{detail.id}}&types=1&StyleType={{StyleType}}" hover-class="navigator-hover">
296 <view class="preferentialItems rechargeItems"> 296 <view class="preferentialItems rechargeItems">
297 <view class="itemLeft"> 297 <view class="itemLeft">
298 <view class="itemTop font36r"> 298 <view class="itemTop font36r">
@@ -853,23 +853,29 @@ Page({ @@ -853,23 +853,29 @@ Page({
853 App.Activity.GetNewRecharge({ 853 App.Activity.GetNewRecharge({
854 id 854 id
855 }).then(res => { 855 }).then(res => {
856 - let detail = res.data  
857 - let exp_date = res.data.exp_date ? JSON.parse(res.data.exp_date) : ''  
858 - let recharge_list = res.data.recharge_list ? JSON.parse(res.data.recharge_list) : ''  
859 - let priceInfo, scoreInfo, certificate;  
860 - detail.recharge_list = recharge_list;  
861 - detail.exp_date = exp_date;  
862 - if (recharge_list.is_price == '1') priceInfo = '会员充值满' + detail.recharge_money + '元赠送' + recharge_list.price + '元余额';  
863 - if (recharge_list.is_score == '1') scoreInfo = '会员充值满' + detail.recharge_money + '元赠送' + recharge_list.score + '积分';  
864 - if (recharge_list.is_coupons == '1' && recharge_list.coupons_names.length > 0) certificate = recharge_list.coupons_names.join('、');  
865 - let recharge_data = (this.data.dataStr<detail.etime*1 && detail.is_open == '1') ? detail : ''  
866 - console.log('邀请函--------------充值',recharge_data);  
867 - this.setData({  
868 - recharge_data,  
869 - scoreInfo,  
870 - priceInfo,  
871 - certificate  
872 - }) 856 + if (res.data) {
  857 + let detail = res.data
  858 + let exp_date = res.data.exp_date ? JSON.parse(res.data.exp_date) : ''
  859 + let recharge_list = res.data.recharge_list ? JSON.parse(res.data.recharge_list) : ''
  860 + let priceInfo, scoreInfo, certificate;
  861 + detail.recharge_list = recharge_list;
  862 + detail.exp_date = exp_date;
  863 + if (recharge_list.is_price == '1') priceInfo = '会员充值满' + detail.recharge_money + '元赠送' + recharge_list.price + '元余额';
  864 + if (recharge_list.is_score == '1') scoreInfo = '会员充值满' + detail.recharge_money + '元赠送' + recharge_list.score + '积分';
  865 + if (recharge_list.is_coupons == '1' && recharge_list.coupons_names.length > 0) certificate = recharge_list.coupons_names.join('、');
  866 + let recharge_data = (this.data.dataStr<detail.etime*1 && detail.is_open == '1') ? detail : ''
  867 + console.log('邀请函--------------充值',recharge_data);
  868 + this.setData({
  869 + recharge_data,
  870 + scoreInfo,
  871 + priceInfo,
  872 + certificate
  873 + })
  874 + } else {
  875 + this.setData({
  876 + recharge_data: {},
  877 + })
  878 + }
873 }) 879 })
874 }, 880 },
875 // 获取评价赠送的券最新详情 881 // 获取评价赠送的券最新详情
@@ -275,7 +275,7 @@ @@ -275,7 +275,7 @@
275 <view wx:if="{{titleType}}" class="chefText font36r"> 275 <view wx:if="{{titleType}}" class="chefText font36r">
276 <titleStyle isWhite="{{themeColor}}" titleStyleType="{{titleType}}" titleText="会员招募"></titleStyle> 276 <titleStyle isWhite="{{themeColor}}" titleStyleType="{{titleType}}" titleText="会员招募"></titleStyle>
277 </view> 277 </view>
278 - <navigator url="/pack-activity/pack/vipRecharge?id={{recharge_data.id}}&name={{seller.name}}&sid={{seller.sid}}&oid={{detail.id}}&types=1&StyleType={{StyleType}}" hover-class="navigator-hover"> 278 + <navigator wx:if="{{recharge_data.id}}" url="/pack-activity/pack/vipRecharge?id={{recharge_data.id}}&name={{seller.name}}&sid={{seller.sid}}&oid={{detail.id}}&types=1&StyleType={{StyleType}}" hover-class="navigator-hover">
279 <view class="preferentialItems rechargeItems"> 279 <view class="preferentialItems rechargeItems">
280 <view class="itemLeft"> 280 <view class="itemLeft">
281 <view class="itemTop font36r"> 281 <view class="itemTop font36r">
@@ -851,23 +851,29 @@ Page({ @@ -851,23 +851,29 @@ Page({
851 App.Activity.GetNewRecharge({ 851 App.Activity.GetNewRecharge({
852 id 852 id
853 }).then(res => { 853 }).then(res => {
854 - let detail = res.data  
855 - let exp_date = res.data.exp_date ? JSON.parse(res.data.exp_date) : ''  
856 - let recharge_list = res.data.recharge_list ? JSON.parse(res.data.recharge_list) : ''  
857 - let priceInfo, scoreInfo, certificate;  
858 - detail.recharge_list = recharge_list;  
859 - detail.exp_date = exp_date;  
860 - if (recharge_list.is_price == '1') priceInfo = '会员充值满' + detail.recharge_money + '元赠送' + recharge_list.price + '元余额';  
861 - if (recharge_list.is_score == '1') scoreInfo = '会员充值满' + detail.recharge_money + '元赠送' + recharge_list.score + '积分';  
862 - if (recharge_list.is_coupons == '1' && recharge_list.coupons_names.length > 0) certificate = recharge_list.coupons_names.join('、');  
863 - let recharge_data = (this.data.dataStr<detail.etime*1 && detail.is_open == '1') ? detail : ''  
864 - console.log('邀请函--------------充值',recharge_data);  
865 - this.setData({  
866 - recharge_data,  
867 - scoreInfo,  
868 - priceInfo,  
869 - certificate  
870 - }) 854 + if (res.data) {
  855 + let detail = res.data
  856 + let exp_date = res.data.exp_date ? JSON.parse(res.data.exp_date) : ''
  857 + let recharge_list = res.data.recharge_list ? JSON.parse(res.data.recharge_list) : ''
  858 + let priceInfo, scoreInfo, certificate;
  859 + detail.recharge_list = recharge_list;
  860 + detail.exp_date = exp_date;
  861 + if (recharge_list.is_price == '1') priceInfo = '会员充值满' + detail.recharge_money + '元赠送' + recharge_list.price + '元余额';
  862 + if (recharge_list.is_score == '1') scoreInfo = '会员充值满' + detail.recharge_money + '元赠送' + recharge_list.score + '积分';
  863 + if (recharge_list.is_coupons == '1' && recharge_list.coupons_names.length > 0) certificate = recharge_list.coupons_names.join('、');
  864 + let recharge_data = (this.data.dataStr<detail.etime*1 && detail.is_open == '1') ? detail : ''
  865 + console.log('邀请函--------------充值',recharge_data);
  866 + this.setData({
  867 + recharge_data,
  868 + scoreInfo,
  869 + priceInfo,
  870 + certificate
  871 + })
  872 + } else {
  873 + this.setData({
  874 + recharge_data: {},
  875 + })
  876 + }
871 }) 877 })
872 }, 878 },
873 // 获取评价赠送的券最新详情 879 // 获取评价赠送的券最新详情
@@ -274,7 +274,7 @@ @@ -274,7 +274,7 @@
274 <view wx:if="{{titleType}}" class="chefText font36r"> 274 <view wx:if="{{titleType}}" class="chefText font36r">
275 <titleStyle isWhite="{{themeColor}}" titleStyleType="{{titleType}}" titleText="会员招募"></titleStyle> 275 <titleStyle isWhite="{{themeColor}}" titleStyleType="{{titleType}}" titleText="会员招募"></titleStyle>
276 </view> 276 </view>
277 - <navigator url="/pack-activity/pack/vipRecharge?id={{recharge_data.id}}&name={{seller.name}}&sid={{seller.sid}}&oid={{detail.id}}&types=1&StyleType={{StyleType}}" hover-class="navigator-hover"> 277 + <navigator wx:if="{{recharge_data.id}}" url="/pack-activity/pack/vipRecharge?id={{recharge_data.id}}&name={{seller.name}}&sid={{seller.sid}}&oid={{detail.id}}&types=1&StyleType={{StyleType}}" hover-class="navigator-hover">
278 <view class="preferentialItems rechargeItems"> 278 <view class="preferentialItems rechargeItems">
279 <view class="itemLeft"> 279 <view class="itemLeft">
280 <view class="itemTop font36r"> 280 <view class="itemTop font36r">
@@ -808,23 +808,29 @@ Page({ @@ -808,23 +808,29 @@ Page({
808 App.Activity.GetNewRecharge({ 808 App.Activity.GetNewRecharge({
809 id 809 id
810 }).then(res => { 810 }).then(res => {
811 - let detail = res.data  
812 - let exp_date = res.data.exp_date ? JSON.parse(res.data.exp_date) : ''  
813 - let recharge_list = res.data.recharge_list ? JSON.parse(res.data.recharge_list) : ''  
814 - let priceInfo, scoreInfo, certificate;  
815 - detail.recharge_list = recharge_list;  
816 - detail.exp_date = exp_date;  
817 - if (recharge_list.is_price == '1') priceInfo = '会员充值满' + detail.recharge_money + '元赠送' + recharge_list.price + '元余额';  
818 - if (recharge_list.is_score == '1') scoreInfo = '会员充值满' + detail.recharge_money + '元赠送' + recharge_list.score + '积分';  
819 - if (recharge_list.is_coupons == '1' && recharge_list.coupons_names.length > 0) certificate = recharge_list.coupons_names.join('、');  
820 - let recharge_data = (this.data.dataStr<detail.etime*1 && detail.is_open == '1') ? detail : ''  
821 - console.log('邀请函--------------充值',recharge_data);  
822 - this.setData({  
823 - recharge_data,  
824 - scoreInfo,  
825 - priceInfo,  
826 - certificate  
827 - }) 811 + if (res.data) {
  812 + let detail = res.data
  813 + let exp_date = res.data.exp_date ? JSON.parse(res.data.exp_date) : ''
  814 + let recharge_list = res.data.recharge_list ? JSON.parse(res.data.recharge_list) : ''
  815 + let priceInfo, scoreInfo, certificate;
  816 + detail.recharge_list = recharge_list;
  817 + detail.exp_date = exp_date;
  818 + if (recharge_list.is_price == '1') priceInfo = '会员充值满' + detail.recharge_money + '元赠送' + recharge_list.price + '元余额';
  819 + if (recharge_list.is_score == '1') scoreInfo = '会员充值满' + detail.recharge_money + '元赠送' + recharge_list.score + '积分';
  820 + if (recharge_list.is_coupons == '1' && recharge_list.coupons_names.length > 0) certificate = recharge_list.coupons_names.join('、');
  821 + let recharge_data = (this.data.dataStr<detail.etime*1 && detail.is_open == '1') ? detail : ''
  822 + console.log('邀请函--------------充值',recharge_data);
  823 + this.setData({
  824 + recharge_data,
  825 + scoreInfo,
  826 + priceInfo,
  827 + certificate
  828 + })
  829 + } else {
  830 + this.setData({
  831 + recharge_data: {},
  832 + })
  833 + }
828 }) 834 })
829 }, 835 },
830 // 获取评价赠送的券最新详情 836 // 获取评价赠送的券最新详情
@@ -262,7 +262,7 @@ @@ -262,7 +262,7 @@
262 <view class="rubric rubric1"> 262 <view class="rubric rubric1">
263 特别优惠 263 特别优惠
264 </view> 264 </view>
265 - <navigator url="/pack-activity/pack/vipRecharge?id={{recharge_data.id}}&name={{seller.name}}&sid={{seller.sid}}&oid={{detail.id}}&types=1&StyleType={{StyleType}}" hover-class="navigator-hover"> 265 + <navigator wx:if="{{recharge_data.id}}" url="/pack-activity/pack/vipRecharge?id={{recharge_data.id}}&name={{seller.name}}&sid={{seller.sid}}&oid={{detail.id}}&types=1&StyleType={{StyleType}}" hover-class="navigator-hover">
266 <view class="rechargeItems"> 266 <view class="rechargeItems">
267 <view class="left"> 267 <view class="left">
268 <view class="top"> 268 <view class="top">
@@ -852,23 +852,29 @@ Page({ @@ -852,23 +852,29 @@ Page({
852 App.Activity.GetNewRecharge({ 852 App.Activity.GetNewRecharge({
853 id 853 id
854 }).then(res => { 854 }).then(res => {
855 - let detail = res.data  
856 - let exp_date = res.data.exp_date ? JSON.parse(res.data.exp_date) : ''  
857 - let recharge_list = res.data.recharge_list ? JSON.parse(res.data.recharge_list) : ''  
858 - let priceInfo, scoreInfo, certificate;  
859 - detail.recharge_list = recharge_list;  
860 - detail.exp_date = exp_date;  
861 - if (recharge_list.is_price == '1') priceInfo = '会员充值满' + detail.recharge_money + '元赠送' + recharge_list.price + '元余额';  
862 - if (recharge_list.is_score == '1') scoreInfo = '会员充值满' + detail.recharge_money + '元赠送' + recharge_list.score + '积分';  
863 - if (recharge_list.is_coupons == '1' && recharge_list.coupons_names.length > 0) certificate = recharge_list.coupons_names.join('、');  
864 - let recharge_data = (this.data.dataStr<detail.etime*1 && detail.is_open == '1') ? detail : ''  
865 - console.log('邀请函--------------充值',recharge_data);  
866 - this.setData({  
867 - recharge_data,  
868 - scoreInfo,  
869 - priceInfo,  
870 - certificate  
871 - }) 855 + if (res.data) {
  856 + let detail = res.data
  857 + let exp_date = res.data.exp_date ? JSON.parse(res.data.exp_date) : ''
  858 + let recharge_list = res.data.recharge_list ? JSON.parse(res.data.recharge_list) : ''
  859 + let priceInfo, scoreInfo, certificate;
  860 + detail.recharge_list = recharge_list;
  861 + detail.exp_date = exp_date;
  862 + if (recharge_list.is_price == '1') priceInfo = '会员充值满' + detail.recharge_money + '元赠送' + recharge_list.price + '元余额';
  863 + if (recharge_list.is_score == '1') scoreInfo = '会员充值满' + detail.recharge_money + '元赠送' + recharge_list.score + '积分';
  864 + if (recharge_list.is_coupons == '1' && recharge_list.coupons_names.length > 0) certificate = recharge_list.coupons_names.join('、');
  865 + let recharge_data = (this.data.dataStr<detail.etime*1 && detail.is_open == '1') ? detail : ''
  866 + console.log('邀请函--------------充值',recharge_data);
  867 + this.setData({
  868 + recharge_data,
  869 + scoreInfo,
  870 + priceInfo,
  871 + certificate
  872 + })
  873 + } else {
  874 + this.setData({
  875 + recharge_data: {},
  876 + })
  877 + }
872 }) 878 })
873 }, 879 },
874 // 获取评价赠送的券最新详情 880 // 获取评价赠送的券最新详情
@@ -287,7 +287,7 @@ @@ -287,7 +287,7 @@
287 <view wx:if="{{titleType}}" class="chefText font36r"> 287 <view wx:if="{{titleType}}" class="chefText font36r">
288 <titleStyle isWhite="{{themeColor}}" titleStyleType="{{titleType}}" titleText="会员招募"></titleStyle> 288 <titleStyle isWhite="{{themeColor}}" titleStyleType="{{titleType}}" titleText="会员招募"></titleStyle>
289 </view> 289 </view>
290 - <navigator url="/pack-activity/pack/vipRecharge?id={{recharge_data.id}}&name={{seller.name}}&sid={{seller.sid}}&oid={{detail.id}}&types=1&StyleType={{StyleType}}" hover-class="navigator-hover"> 290 + <navigator wx:if="{{recharge_data.id}}" url="/pack-activity/pack/vipRecharge?id={{recharge_data.id}}&name={{seller.name}}&sid={{seller.sid}}&oid={{detail.id}}&types=1&StyleType={{StyleType}}" hover-class="navigator-hover">
291 <view class="preferentialItems rechargeItems"> 291 <view class="preferentialItems rechargeItems">
292 <view class="itemLeft"> 292 <view class="itemLeft">
293 <view class="itemTop font36r"> 293 <view class="itemTop font36r">
@@ -851,23 +851,29 @@ Page({ @@ -851,23 +851,29 @@ Page({
851 App.Activity.GetNewRecharge({ 851 App.Activity.GetNewRecharge({
852 id 852 id
853 }).then(res => { 853 }).then(res => {
854 - let detail = res.data  
855 - let exp_date = res.data.exp_date ? JSON.parse(res.data.exp_date) : ''  
856 - let recharge_list = res.data.recharge_list ? JSON.parse(res.data.recharge_list) : ''  
857 - let priceInfo, scoreInfo, certificate;  
858 - detail.recharge_list = recharge_list;  
859 - detail.exp_date = exp_date;  
860 - if (recharge_list.is_price == '1') priceInfo = '会员充值满' + detail.recharge_money + '元赠送' + recharge_list.price + '元余额';  
861 - if (recharge_list.is_score == '1') scoreInfo = '会员充值满' + detail.recharge_money + '元赠送' + recharge_list.score + '积分';  
862 - if (recharge_list.is_coupons == '1' && recharge_list.coupons_names.length > 0) certificate = recharge_list.coupons_names.join('、');  
863 - let recharge_data = (this.data.dataStr<detail.etime*1 && detail.is_open == '1') ? detail : ''  
864 - console.log('邀请函--------------充值',recharge_data);  
865 - this.setData({  
866 - recharge_data,  
867 - scoreInfo,  
868 - priceInfo,  
869 - certificate  
870 - }) 854 + if (res.data) {
  855 + let detail = res.data
  856 + let exp_date = res.data.exp_date ? JSON.parse(res.data.exp_date) : ''
  857 + let recharge_list = res.data.recharge_list ? JSON.parse(res.data.recharge_list) : ''
  858 + let priceInfo, scoreInfo, certificate;
  859 + detail.recharge_list = recharge_list;
  860 + detail.exp_date = exp_date;
  861 + if (recharge_list.is_price == '1') priceInfo = '会员充值满' + detail.recharge_money + '元赠送' + recharge_list.price + '元余额';
  862 + if (recharge_list.is_score == '1') scoreInfo = '会员充值满' + detail.recharge_money + '元赠送' + recharge_list.score + '积分';
  863 + if (recharge_list.is_coupons == '1' && recharge_list.coupons_names.length > 0) certificate = recharge_list.coupons_names.join('、');
  864 + let recharge_data = (this.data.dataStr<detail.etime*1 && detail.is_open == '1') ? detail : ''
  865 + console.log('邀请函--------------充值',recharge_data);
  866 + this.setData({
  867 + recharge_data,
  868 + scoreInfo,
  869 + priceInfo,
  870 + certificate
  871 + })
  872 + } else {
  873 + this.setData({
  874 + recharge_data: {},
  875 + })
  876 + }
871 }) 877 })
872 }, 878 },
873 // 获取评价赠送的券最新详情 879 // 获取评价赠送的券最新详情
@@ -285,7 +285,7 @@ @@ -285,7 +285,7 @@
285 <view wx:if="{{titleType}}" class="chefText font36r"> 285 <view wx:if="{{titleType}}" class="chefText font36r">
286 <titleStyle isWhite="{{themeColor}}" titleStyleType="{{titleType}}" titleText="会员招募"></titleStyle> 286 <titleStyle isWhite="{{themeColor}}" titleStyleType="{{titleType}}" titleText="会员招募"></titleStyle>
287 </view> 287 </view>
288 - <navigator url="/pack-activity/pack/vipRecharge?id={{recharge_data.id}}&name={{seller.name}}&sid={{seller.sid}}&oid={{detail.id}}&types=1&StyleType={{StyleType}}" hover-class="navigator-hover"> 288 + <navigator wx:if="{{recharge_data.id}}" url="/pack-activity/pack/vipRecharge?id={{recharge_data.id}}&name={{seller.name}}&sid={{seller.sid}}&oid={{detail.id}}&types=1&StyleType={{StyleType}}" hover-class="navigator-hover">
289 <view class="preferentialItems rechargeItems"> 289 <view class="preferentialItems rechargeItems">
290 <view class="itemLeft"> 290 <view class="itemLeft">
291 <view class="itemTop font36r"> 291 <view class="itemTop font36r">
@@ -885,23 +885,29 @@ Page({ @@ -885,23 +885,29 @@ Page({
885 App.Activity.GetNewRecharge({ 885 App.Activity.GetNewRecharge({
886 id 886 id
887 }).then(res => { 887 }).then(res => {
888 - let detail = res.data  
889 - let exp_date = res.data.exp_date ? JSON.parse(res.data.exp_date) : ''  
890 - let recharge_list = res.data.recharge_list ? JSON.parse(res.data.recharge_list) : ''  
891 - let priceInfo, scoreInfo, certificate;  
892 - detail.recharge_list = recharge_list;  
893 - detail.exp_date = exp_date;  
894 - if (recharge_list.is_price == '1') priceInfo = '会员充值满' + detail.recharge_money + '元赠送' + recharge_list.price + '元余额';  
895 - if (recharge_list.is_score == '1') scoreInfo = '会员充值满' + detail.recharge_money + '元赠送' + recharge_list.score + '积分';  
896 - if (recharge_list.is_coupons == '1' && recharge_list.coupons_names.length > 0) certificate = recharge_list.coupons_names.join('、');  
897 - let recharge_data = (this.data.dataStr<detail.etime*1 && detail.is_open == '1') ? detail : ''  
898 - console.log('邀请函--------------充值',recharge_data);  
899 - this.setData({  
900 - recharge_data,  
901 - scoreInfo,  
902 - priceInfo,  
903 - certificate  
904 - }) 888 + if (res.data) {
  889 + let detail = res.data
  890 + let exp_date = res.data.exp_date ? JSON.parse(res.data.exp_date) : ''
  891 + let recharge_list = res.data.recharge_list ? JSON.parse(res.data.recharge_list) : ''
  892 + let priceInfo, scoreInfo, certificate;
  893 + detail.recharge_list = recharge_list;
  894 + detail.exp_date = exp_date;
  895 + if (recharge_list.is_price == '1') priceInfo = '会员充值满' + detail.recharge_money + '元赠送' + recharge_list.price + '元余额';
  896 + if (recharge_list.is_score == '1') scoreInfo = '会员充值满' + detail.recharge_money + '元赠送' + recharge_list.score + '积分';
  897 + if (recharge_list.is_coupons == '1' && recharge_list.coupons_names.length > 0) certificate = recharge_list.coupons_names.join('、');
  898 + let recharge_data = (this.data.dataStr<detail.etime*1 && detail.is_open == '1') ? detail : ''
  899 + console.log('邀请函--------------充值',recharge_data);
  900 + this.setData({
  901 + recharge_data,
  902 + scoreInfo,
  903 + priceInfo,
  904 + certificate
  905 + })
  906 + } else {
  907 + this.setData({
  908 + recharge_data: {},
  909 + })
  910 + }
905 }) 911 })
906 }, 912 },
907 // 获取评价赠送的券最新详情 913 // 获取评价赠送的券最新详情
@@ -284,7 +284,7 @@ @@ -284,7 +284,7 @@
284 <block wx:if="{{titleType}}"> 284 <block wx:if="{{titleType}}">
285 <titleStyle titleStyleType="{{titleType}}" titleText="会员招募"></titleStyle> 285 <titleStyle titleStyleType="{{titleType}}" titleText="会员招募"></titleStyle>
286 </block> 286 </block>
287 - <navigator url="/pack-activity/pack/vipRecharge?id={{recharge_data.id}}&name={{seller.name}}&sid={{seller.sid}}&oid={{detail.id}}&types=1&StyleType={{StyleType}}" hover-class="navigator-hover"> 287 + <navigator wx:if="{{recharge_data.id}}" url="/pack-activity/pack/vipRecharge?id={{recharge_data.id}}&name={{seller.name}}&sid={{seller.sid}}&oid={{detail.id}}&types=1&StyleType={{StyleType}}" hover-class="navigator-hover">
288 <view class="preferentialItems rechargeItems"> 288 <view class="preferentialItems rechargeItems">
289 <view class="itemLeft"> 289 <view class="itemLeft">
290 <view class="itemTop font36r"> 290 <view class="itemTop font36r">
@@ -53,7 +53,7 @@ @@ -53,7 +53,7 @@
53 </navigator> 53 </navigator>
54 </block> 54 </block>
55 </view> 55 </view>
56 -<view class="box" wx:if="{{options.form == '1' && hasValueRecharge && recharge_data}}"> 56 +<view class="box" wx:if="{{options.form == '1' && hasValueRecharge && recharge_data && recharge_data.id}}">
57 <view class="title"> 57 <view class="title">
58 <view class="sign"></view><text class="font32r">会员充值优惠</text> 58 <view class="sign"></view><text class="font32r">会员充值优惠</text>
59 </view> 59 </view>
@@ -189,7 +189,7 @@ @@ -189,7 +189,7 @@
189 </block> 189 </block>
190 </view> 190 </view>
191 </view> 191 </view>
192 - <view class="preferential" wx:if="{{hasValueRecharge && marketing && marketing.is_recharge=='1' && recharge_data}}"> 192 + <view class="preferential" wx:if="{{hasValueRecharge && marketing && marketing.is_recharge=='1' && recharge_data && recharge_data.id}}">
193 <view wx:if="{{titleType}}" class="chefText font36r"> 193 <view wx:if="{{titleType}}" class="chefText font36r">
194 <titleStyle isWhite="pearlWhite" titleStyleType="{{titleType}}" titleText="会员招募"></titleStyle> 194 <titleStyle isWhite="pearlWhite" titleStyleType="{{titleType}}" titleText="会员招募"></titleStyle>
195 </view> 195 </view>