Commit 5a67d999519d5c39ca8fd00b6b37705b5a1e4498

Authored by pengye
1 parent 64b132b3

领券页面,店铺名称改为接口获取

@@ -8,7 +8,6 @@ Page({ @@ -8,7 +8,6 @@ Page({
8 */ 8 */
9 data: { 9 data: {
10 opt: { 10 opt: {
11 - name: '',  
12 id:'', 11 id:'',
13 oid:'', 12 oid:'',
14 sid:'', 13 sid:'',
@@ -20,6 +19,7 @@ Page({ @@ -20,6 +19,7 @@ Page({
20 exp_date:{}, 19 exp_date:{},
21 num: 1, 20 num: 1,
22 totalize: '', 21 totalize: '',
  22 + sellername:'',
23 }, 23 },
24 24
25 /** 25 /**
@@ -29,7 +29,6 @@ Page({ @@ -29,7 +29,6 @@ Page({
29 this.setData({ 29 this.setData({
30 opt:{ 30 opt:{
31 id:options.id, 31 id:options.id,
32 - name:options.name,  
33 sid:options.sid, 32 sid:options.sid,
34 oid:options.oid, 33 oid:options.oid,
35 types:options.types,//1是邀请函过来的(邀请函的券或者点击意见反馈买券) 2是邀请函 3是商家APP分享的或者短信的链接 34 types:options.types,//1是邀请函过来的(邀请函的券或者点击意见反馈买券) 2是邀请函 3是商家APP分享的或者短信的链接
@@ -44,6 +43,7 @@ Page({ @@ -44,6 +43,7 @@ Page({
44 */ 43 */
45 onReady() { 44 onReady() {
46 this.getDetail(); 45 this.getDetail();
  46 + this.getSellerDetail();
47 }, 47 },
48 48
49 /** 49 /**
@@ -52,6 +52,17 @@ Page({ @@ -52,6 +52,17 @@ Page({
52 onShow() { 52 onShow() {
53 53
54 }, 54 },
  55 + // 获取店铺名称
  56 + getSellerDetail(){
  57 + App.Customer.GetSellerDetail({
  58 + sid: this.data.opt.sid
  59 + }).then(res=>{
  60 + this.setData({
  61 + sellername:res.data.sellername
  62 + })
  63 + })
  64 + },
  65 + // 获取券信息
55 getDetail(){ 66 getDetail(){
56 App.Activity.GetActivityById({ 67 App.Activity.GetActivityById({
57 id: this.data.opt.id 68 id: this.data.opt.id
@@ -158,7 +169,7 @@ Page({ @@ -158,7 +169,7 @@ Page({
158 } 169 }
159 console.log('oidoid',this.data.opt.oid); 170 console.log('oidoid',this.data.opt.oid);
160 let detail=this.data.detail 171 let detail=this.data.detail
161 - detail.name=this.data.opt.name; 172 + detail.name=this.data.sellername;
162 detail.oid=this.data.opt.oid; 173 detail.oid=this.data.opt.oid;
163 App.Activity.CreateNewRechargeOrder({ 174 App.Activity.CreateNewRechargeOrder({
164 recharge_id:this.data.opt.id, 175 recharge_id:this.data.opt.id,
@@ -179,7 +190,7 @@ Page({ @@ -179,7 +190,7 @@ Page({
179 } 190 }
180 // 跳转到支付页,types传参 1邀请函 2提前点餐 3商家端app分享 191 // 跳转到支付页,types传参 1邀请函 2提前点餐 3商家端app分享
181 wx.navigateTo({ 192 wx.navigateTo({
182 - url: `./confirmPayment?sid=${this.data.opt.sid}&sellerName=${this.data.opt.name}&oid=${this.data.opt.oid}&rid=${this.data.opt.rid?this.data.opt.rid:''}&type=1&detail=${JSON.stringify(detail)}&combine_out_trade_no=${res.data.combine_out_trade_no}&totalize=${this.data.totalize}&types=1`, 193 + url: `./confirmPayment?sid=${this.data.opt.sid}&sellerName=${this.data.sellername}&oid=${this.data.opt.oid}&rid=${this.data.opt.rid?this.data.opt.rid:''}&type=1&detail=${JSON.stringify(detail)}&combine_out_trade_no=${res.data.combine_out_trade_no}&totalize=${this.data.totalize}&types=1`,
183 }) 194 })
184 }else{ 195 }else{
185 wx.showToast({ 196 wx.showToast({
@@ -228,19 +239,19 @@ Page({ @@ -228,19 +239,19 @@ Page({
228 let imageUrl,title; 239 let imageUrl,title;
229 if(use.is_cash=='1' || use.is_cash){ 240 if(use.is_cash=='1' || use.is_cash){
230 imageUrl='https://nosqn.colorcun.com/share_money.png'; 241 imageUrl='https://nosqn.colorcun.com/share_money.png';
231 - title=detail.price == '0'?`免费获取${data.name}${use.cash}元代金券,点击查看详情。`:`仅需${detail.price}元,获取${data.name}${use.cash}元代金券,点击查看详情。` 242 + title=detail.price == '0'?`免费获取${this.data.sellername}${use.cash}元代金券,点击查看详情。`:`仅需${detail.price}元,获取${this.data.sellername}${use.cash}元代金券,点击查看详情。`
232 } 243 }
233 if(use.is_discount=='1' || use.is_discount){ 244 if(use.is_discount=='1' || use.is_discount){
234 imageUrl='https://nosqn.colorcun.com/share_discount.png'; 245 imageUrl='https://nosqn.colorcun.com/share_discount.png';
235 - title=detail.price == '0'?`免费获取${data.name}${use.discount}折折扣券,点击查看详情。`:`仅需${detail.price}元,获取${data.name}${use.discount}折折扣券,点击查看详情。` 246 + title=detail.price == '0'?`免费获取${this.data.sellername}${use.discount}折折扣券,点击查看详情。`:`仅需${detail.price}元,获取${this.data.sellername}${use.discount}折折扣券,点击查看详情。`
236 } 247 }
237 if(use.is_dish=='1' || use.is_dish){ 248 if(use.is_dish=='1' || use.is_dish){
238 imageUrl='https://nosqn.colorcun.com/share_dish.png'; 249 imageUrl='https://nosqn.colorcun.com/share_dish.png';
239 - title=detail.price == '0'?`免费获取${data.name}${detail.aname},点击查看详情。`:`仅需${detail.price}元,获取${data.name}${detail.aname},点击查看详情。` 250 + title=detail.price == '0'?`免费获取${this.data.sellername}${detail.aname},点击查看详情。`:`仅需${detail.price}元,获取${this.data.sellername}${detail.aname},点击查看详情。`
240 } 251 }
241 return { 252 return {
242 title, 253 title,
243 - path:`/pack-activity/pack/buyCoupon?use=${JSON.stringify(use)}&id=${data.id}&name=${data.name}&oid=${data.oid}&rid=${data.rid}&sid=${data.sid}&types=${data.types}`, 254 + path:`/pack-activity/pack/buyCoupon?use=${JSON.stringify(use)}&id=${data.id}&oid=${data.oid}&rid=${data.rid}&sid=${data.sid}&types=${data.types}`,
244 imageUrl, 255 imageUrl,
245 } 256 }
246 } 257 }
1 <!--pack-activity/pack/buyCoupon.wxml 代金券抢购页面--> 1 <!--pack-activity/pack/buyCoupon.wxml 代金券抢购页面-->
2 <wxs src="../../utils/util.wxs" module="util" /> 2 <wxs src="../../utils/util.wxs" module="util" />
3 -<nav>{{opt.name}}</nav> 3 +<nav>{{sellername}}</nav>
4 <scroll-view class="view scroll-view" scroll-y="true"> 4 <scroll-view class="view scroll-view" scroll-y="true">
5 <image wx:if="{{use.is_dish=='1' && use.images.length>0}}" class="imgs1" mode="widthFix" src="{{use.images[0]}}" mode="" /> 5 <image wx:if="{{use.is_dish=='1' && use.images.length>0}}" class="imgs1" mode="widthFix" src="{{use.images[0]}}" mode="" />
6 <view class="info info1"> 6 <view class="info info1">