xt / xcx-book · Commits

Go to a project

Commit 7f5a42d90b44d20db649cf6b51619cebebe29289

Authored by pengye
1 parent 315f7f31
build: skipped

付费券、免费券详情、券列表页面修改3

Inline Side-by-side
Showing 3 changed files with 41 additions and 20 deletions
@@ -58,7 +58,7 @@ Page({ @@ -58,7 +58,7 @@ Page({
58 }).then(res => { 58 }).then(res => {
59 let detail = res.data; 59 let detail = res.data;
60 let exp_date = detail.exp_date ? JSON.parse(detail.exp_date) : ''; 60 let exp_date = detail.exp_date ? JSON.parse(detail.exp_date) : '';
61 - let use = detail.activity.use ? JSON.parse(detail.activity.use) : ''; 61 + let use = detail.activity.use ? JSON.parse(detail.activity.use) : {};
62 use.images = use && use.images ? JSON.parse(use.images) : ''; 62 use.images = use && use.images ? JSON.parse(use.images) : '';
63 let date = Date.now() * 1; 63 let date = Date.now() * 1;
64 if (date > detail.etime) { 64 if (date > detail.etime) {
@@ -35,7 +35,7 @@ @@ -35,7 +35,7 @@
35 </block> 35 </block>
36 </view> 36 </view>
37 <view class="btnBox"> 37 <view class="btnBox">
38 - <view class="font24r orderingFood" wx:if="{{item.is_examine=='0' && item.is_expire=='0' && item.is_examine=='0' && item.status!='4' && item.status!='5'}}">去核销</view> 38 + <view class="font24r orderingFood" wx:if="{{item.is_type!='3'&&item.is_examine=='0' && item.is_expire=='0' && item.is_examine=='0' && item.status!='4' && item.status!='5'}}">去核销</view>
39 <view class="font24r orderingFood" wx:if="{{item.is_examine=='1' && item.is_expire=='0' && item.status!='4' && item.status!='5' && item.is_comment!='1'}}">去评价</view> 39 <view class="font24r orderingFood" wx:if="{{item.is_examine=='1' && item.is_expire=='0' && item.status!='4' && item.status!='5' && item.is_comment!='1'}}">去评价</view>
40 <view class="font24r orderingFood" wx:if="{{!(item.is_examine=='1' && item.is_expire=='0' && item.status!='4' && item.status!='5' && item.is_comment!='1') && item.noShowTetxt}}">{{item.noShowTetxt}}</view> 40 <view class="font24r orderingFood" wx:if="{{!(item.is_examine=='1' && item.is_expire=='0' && item.status!='4' && item.status!='5' && item.is_comment!='1') && item.noShowTetxt}}">{{item.noShowTetxt}}</view>
41 </view> 41 </view>
@@ -6,23 +6,51 @@ @@ -6,23 +6,51 @@
6 "miniprogram": { 6 "miniprogram": {
7 "list": [ 7 "list": [
8 { 8 {
9 - "name": "pack-activity/pack/buyFreeCoupon", 9 + "name": "新邀请函入口页",
  10 + "pathName": "pages/customer/detail_owner_invitation_new",
  11 + "query": "id=1288253&uid=311&hasSellerShare=1&paymentId=",
  12 + "launchMode": "default",
  13 + "scene": null
  14 + },
  15 + {
  16 + "name": "免费券付费券付款页",
10 "pathName": "pack-activity/pack/buyFreeCoupon", 17 "pathName": "pack-activity/pack/buyFreeCoupon",
11 - "query": "sid=4352", 18 + "query": "sid=8",
12 "launchMode": "default", 19 "launchMode": "default",
13 "scene": null 20 "scene": null
14 }, 21 },
15 { 22 {
16 - "name": "新邀请函入口页",  
17 - "pathName": "pages/customer/detail_owner_invitation_new",  
18 - "query": "id=1245853&uid=7035&hasSellerShare=1&paymentId=", 23 + "name": "收藏页",
  24 + "pathName": "pages/me/follow",
  25 + "query": "",
  26 + "launchMode": "default",
  27 + "scene": null
  28 + },
  29 + {
  30 + "name": "商家详情",
  31 + "pathName": "pages/reserve/shopHome",
  32 + "query": "sid=8",
19 "launchMode": "default", 33 "launchMode": "default",
20 "scene": null 34 "scene": null
21 }, 35 },
22 { 36 {
23 - "name": "pack-activity/pack/receiveCoupon", 37 + "name": "付费券详情",
  38 + "pathName": "pack-activity/pack/examineCertificate",
  39 + "query": "id=2743",
  40 + "launchMode": "default",
  41 + "scene": null
  42 + },
  43 + {
  44 + "name": "免费券详情页",
24 "pathName": "pack-activity/pack/receiveCoupon", 45 "pathName": "pack-activity/pack/receiveCoupon",
25 - "query": "id=930&name=%E9%95%BF%E5%AE%89%E5%A4%A7%E6%8E%92%E6%A1%A3%E6%80%BB%E5%BA%97&use=%22%7B%5C%22is_cash%5C%22%3A%5C%221%5C%22%2C%5C%22is_discount%5C%22%3A%5C%220%5C%22%2C%5C%22is_dish%5C%22%3A%5C%220%5C%22%2C%5C%22cash%5C%22%3A%5C%2230%5C%22%2C%5C%22discount%5C%22%3A%5C%22%5C%22%2C%5C%22dish%5C%22%3A%5C%22%5C%22%2C%5C%22images%5C%22%3A%5C%22%5B%5D%5C%22%7D%22&sid=4352&oid=1230951&types=1&StyleType=9", 46 + "query": "id=989&activity_id=810&types=4&name=%E9%95%BF%E5%AE%89%E5%A4%A7%E6%8E%92%E6%A1%A3%E6%80%BB%E5%BA%97&use=%22%7B%5C%22is_cash%5C%22%3A%5C%221%5C%22%2C%5C%22is_discount%5C%22%3A%5C%220%5C%22%2C%5C%22is_dish%5C%22%3A%5C%220%5C%22%2C%5C%22cash%5C%22%3A%5C%2230%5C%22%2C%5C%22discount%5C%22%3A%5C%22%5C%22%2C%5C%22dish%5C%22%3A%5C%22%5C%22%2C%5C%22images%5C%22%3A%5C%22%5B%5D%5C%22%7D%22&sid=8&oid=1267899&StyleType=9",
  47 + "launchMode": "default",
  48 + "scene": null
  49 + },
  50 + {
  51 + "name": "卡券列表页",
  52 + "pathName": "pages/me/coupon_news",
  53 + "query": "",
26 "launchMode": "default", 54 "launchMode": "default",
27 "scene": null 55 "scene": null
28 }, 56 },
@@ -83,15 +111,15 @@ @@ -83,15 +111,15 @@
83 "scene": null 111 "scene": null
84 }, 112 },
85 { 113 {
86 - "name": "邀请函-----10",  
87 - "pathName": "pack-invitation/pages/detail_owner_invitation10", 114 + "name": "邀请函-----20",
  115 + "pathName": "pack-invitation/pages/detail_owner_invitation20",
88 "query": "id=1127561&uid=7035&hasSellerShare=1&paymentId=324", 116 "query": "id=1127561&uid=7035&hasSellerShare=1&paymentId=324",
89 "launchMode": "default", 117 "launchMode": "default",
90 "scene": null 118 "scene": null
91 }, 119 },
92 { 120 {
93 - "name": "邀请函-----11",  
94 - "pathName": "pack-invitation/pages/detail_owner_invitation11", 121 + "name": "邀请函-----18",
  122 + "pathName": "pack-invitation/pages/detail_owner_invitation18",
95 "query": "id=1127561&uid=7035&hasSellerShare=1&paymentId=324", 123 "query": "id=1127561&uid=7035&hasSellerShare=1&paymentId=324",
96 "launchMode": "default", 124 "launchMode": "default",
97 "scene": null 125 "scene": null
@@ -705,13 +733,6 @@ @@ -705,13 +733,6 @@
705 "scene": null 733 "scene": null
706 }, 734 },
707 { 735 {
708 - "name": "商家详情",  
709 - "pathName": "pages/reserve/shopHome",  
710 - "query": "sid=4352",  
711 - "launchMode": "default",  
712 - "scene": null  
713 - },  
714 - {  
715 "name": "", 736 "name": "",
716 "pathName": "pages/customer/joinSeller", 737 "pathName": "pages/customer/joinSeller",
717 "query": "", 738 "query": "",