xt / xcx-book · Commits

Go to a project

Commit e7426ee4234759b86df31613a939c7128c1692c0

Authored by yiren
1 parent d580ec02
build: skipped

充值和买券页面和接口对接

Inline Side-by-side
Showing 17 changed files with 441 additions and 81 deletions
@@ -56,7 +56,8 @@ @@ -56,7 +56,8 @@
56 "pages/tcads/cmyy", 56 "pages/tcads/cmyy",
57 "pages/pinglun/video", 57 "pages/pinglun/video",
58 "pages/customer/detail_owner_invitation_new", 58 "pages/customer/detail_owner_invitation_new",
59 - "pages/me/coupon_news" 59 + "pages/me/coupon_news",
  60 + "pages/me/wananchi"
60 ], 61 ],
61 "requiredPrivateInfos": [ 62 "requiredPrivateInfos": [
62 "getLocation", 63 "getLocation",
@@ -46,39 +46,26 @@ Page({ @@ -46,39 +46,26 @@ Page({
46 }, 46 },
47 getDetail(){ 47 getDetail(){
48 App.Activity.GetOrderRechargeByid({ 48 App.Activity.GetOrderRechargeByid({
49 - orderid:this.data.id 49 + id:this.data.id
50 }).then(res=>{ 50 }).then(res=>{
51 - if(res.data.length>0){  
52 - let detail=res.data[0];  
53 - let exp_date=detail.exp_date?JSON.parse(detail.exp_date):'';  
54 - this.setData({  
55 - detail,  
56 - exp_date  
57 - })  
58 - console.log('detaildetail',{...this.data.detail});  
59 - console.log('exp_date',{...this.data.exp_date});  
60 - this.getSeller(res.data[0].sellerid)  
61 - this.getCertificateDetail(res.data[0].recharge_id)  
62 - }  
63 -  
64 - })  
65 - },  
66 - getCertificateDetail(id){  
67 - App.Activity.GetActivityById({  
68 - id  
69 - }).then(res => {  
70 - if(res.data.length>0){  
71 - let certificateDetail =res.data[0];  
72 - let exp_date=certificateDetail.exp_date?JSON.parse(certificateDetail.exp_date):'';  
73 - this.setData({  
74 - certificateDetail,  
75 - exp_date,  
76 - })  
77 - console.log('certificateDetail',{...certificateDetail});  
78 - console.log('exp_date',{...exp_date}); 51 + let detail=res.data;
  52 + let exp_date=detail.exp_date?JSON.parse(detail.exp_date):'';
  53 + let date=Date.now()*1;
  54 + if(date>detail.etime){
  55 + detail.is_expire='0';
  56 + }else{
  57 + detail.is_expire='1';
79 } 58 }
  59 + this.setData({
  60 + detail,
  61 + exp_date
  62 + })
  63 + console.log('detaildetail',{...this.data.detail});
  64 + console.log('exp_date',{...this.data.exp_date});
  65 + this.getSeller(res.data.sellerid)
80 }) 66 })
81 }, 67 },
  68 + // 获取商家信息
82 getSeller(sid){ 69 getSeller(sid){
83 App.Customer.GetSellerDetail({ 70 App.Customer.GetSellerDetail({
84 sid, 71 sid,
@@ -110,9 +97,15 @@ Page({ @@ -110,9 +97,15 @@ Page({
110 // 申请退款 97 // 申请退款
111 subscribeDrawback() { 98 subscribeDrawback() {
112 wx.navigateTo({ 99 wx.navigateTo({
113 - url: '/pack-activity/pack/subscribeDrawback', 100 + url: '/pack-activity/pack/subscribeDrawback?id='+this.data.detail.orderid,
114 }) 101 })
115 }, 102 },
  103 + // 跳转到商家详情
  104 + getReserve(){
  105 + wx.reLaunch({
  106 + url:'/pages/reserve/detail?id='+this.data.detail.sellerid
  107 + })
  108 + },
116 /** 109 /**
117 * 生命周期函数--监听页面隐藏 110 * 生命周期函数--监听页面隐藏
118 */ 111 */
@@ -4,15 +4,15 @@ @@ -4,15 +4,15 @@
4 <view class="box_wrap"> 4 <view class="box_wrap">
5 <view class="top_box"> 5 <view class="top_box">
6 <view class="discount_name font40r"> 6 <view class="discount_name font40r">
7 - {{detail.aname}} 7 + {{detail.activity.aname}}
8 </view> 8 </view>
9 <view class="shop_name font28r"> 9 <view class="shop_name font28r">
10 {{detail.sellername}} 10 {{detail.sellername}}
11 </view> 11 </view>
12 <view class="lineBox"> 12 <view class="lineBox">
13 <view class="line"></view> 13 <view class="line"></view>
14 - <image wx:if="{{type=='group2'}}" class="group" src="https://qn.colorcun.com/WechatIMG714.png" mode="" />  
15 - <image wx:if="{{type=='group'}}" class="group" src="https://qn.colorcun.com/WechatIMG713.png" mode="" /> 14 + <image wx:if="{{detail.is_examine=='1'}}" class="group" src="https://qn.colorcun.com/WechatIMG713.png" mode="" />
  15 + <image wx:if="{{detail.is_expire=='1'}}" class="group" src="https://qn.colorcun.com/WechatIMG714.png" mode="" />
16 </view> 16 </view>
17 <image class="qcode" src="{{detail.qrcode}}" mode="" /> 17 <image class="qcode" src="{{detail.qrcode}}" mode="" />
18 <view class="orderNumber font28r"> 18 <view class="orderNumber font28r">
@@ -20,15 +20,15 @@ @@ -20,15 +20,15 @@
20 </view> 20 </view>
21 </view> 21 </view>
22 <view class="center_box"> 22 <view class="center_box">
23 - <view class="info"> 23 + <view class="info" wx:if="{{detail.activity.desc}}">
24 <view class="info_left font32r"> 24 <view class="info_left font32r">
25 券要求 25 券要求
26 </view> 26 </view>
27 <view class="info_right font32r"> 27 <view class="info_right font32r">
28 - {{detail.desc}} 28 + {{detail.activity.desc}}
29 </view> 29 </view>
30 </view> 30 </view>
31 - <view class="info"> 31 + <view class="info" wx:if="{{detail.stime}}">
32 <view class="info_left font32r"> 32 <view class="info_left font32r">
33 有效期从 33 有效期从
34 </view> 34 </view>
@@ -37,7 +37,7 @@ @@ -37,7 +37,7 @@
37 </view> 37 </view>
38 </view> 38 </view>
39 <view class="info"> 39 <view class="info">
40 - <view class="info_left font32r"> 40 + <view class="info_left font32r" wx:if="{{detail.etime}}">
41 有效期至 41 有效期至
42 </view> 42 </view>
43 <view class="info_right font32r"> 43 <view class="info_right font32r">
@@ -73,20 +73,20 @@ @@ -73,20 +73,20 @@
73 {{exp_date.week_show?exp_date.week_show+'可用':''}} 73 {{exp_date.week_show?exp_date.week_show+'可用':''}}
74 </text> 74 </text>
75 </view> 75 </view>
76 - <view class="info info1" wx:if="{{detail.explain}}"> 76 + <view class="info info1" wx:if="{{detail.activity.explain}}">
77 <view class="info_left font32r"> 77 <view class="info_left font32r">
78 券说明 78 券说明
79 </view> 79 </view>
80 </view> 80 </view>
81 - <view class="explain_news">{{detail.explain}}</view> 81 + <view class="explain_news">{{detail.activity.explain}}</view>
82 </view> 82 </view>
83 - <view class="btns"> 83 + <view class="btns" wx:if="{{detail.is_examine!='1' && detail.is_expire!='1'}}">
84 <button class="font24r" plain="true" bindtap="subscribeDrawback">申请退费</button> 84 <button class="font24r" plain="true" bindtap="subscribeDrawback">申请退费</button>
85 </view> 85 </view>
86 - <view class="canteen_box"> 86 + <view class="canteen_box" bindtap="getReserve">
87 <image src="{{sellerObj.seller_image}}" mode="heightFix" /> 87 <image src="{{sellerObj.seller_image}}" mode="heightFix" />
88 <view class="info_right"> 88 <view class="info_right">
89 - <view class="font38r">{{sellerObj.sellername}}</view> 89 + <view class="font38r sellerName">{{sellerObj.sellername}}</view>
90 <view class="font24r">{{sellerObj.cateStr}}</view> 90 <view class="font24r">{{sellerObj.cateStr}}</view>
91 <view class="font28r">{{sellerObj.real_address}}</view> 91 <view class="font28r">{{sellerObj.real_address}}</view>
92 </view> 92 </view>
@@ -98,6 +98,10 @@ @@ -98,6 +98,10 @@
98 font-family: PingFang SC; 98 font-family: PingFang SC;
99 } 99 }
100 100
  101 +.sellerName{
  102 + color: #515151;
  103 +}
  104 +
101 .explain_news { 105 .explain_news {
102 width: 100%; 106 width: 100%;
103 box-sizing: border-box; 107 box-sizing: border-box;
1 // pack-activity/pack/subscribeDrawback.js 1 // pack-activity/pack/subscribeDrawback.js
  2 +import App from '../../utils/api'
2 Page({ 3 Page({
3 -  
4 /** 4 /**
5 * 页面的初始数据 5 * 页面的初始数据
6 */ 6 */
7 data: { 7 data: {
8 - checkboxList: [{ 8 + number:'0',
  9 + checkName:'',
  10 + id:'',
  11 + radioboxList: [{
9 value: '1', 12 value: '1',
10 name: '计划有变，没时间消费' 13 name: '计划有变，没时间消费'
11 }, 14 },
@@ -64,6 +67,7 @@ Page({ @@ -64,6 +67,7 @@ Page({
64 * 生命周期函数--监听页面加载 67 * 生命周期函数--监听页面加载
65 */ 68 */
66 onLoad(options) { 69 onLoad(options) {
  70 + this.data.id=options.id;
67 this.modal = this.selectComponent("#drawbackModal"); //通过给组件所起的id调用组件 71 this.modal = this.selectComponent("#drawbackModal"); //通过给组件所起的id调用组件
68 }, 72 },
69 showModal() { 73 showModal() {
@@ -72,9 +76,21 @@ Page({ @@ -72,9 +76,21 @@ Page({
72 closeModal() { 76 closeModal() {
73 this.modal.closeModal() //调用组件中关闭模态框方法 77 this.modal.closeModal() //调用组件中关闭模态框方法
74 }, 78 },
  79 + // 关注公众号
  80 + wananchi() {
  81 + wx.navigateTo({
  82 + url: '/pages/me/wananchi'
  83 + })
  84 + },
75 //申请退款 85 //申请退款
76 subscribeDrawback() { 86 subscribeDrawback() {
77 - this.modal.showModal() 87 + App.PayOnline.RechargeRefundApply({
  88 + reason:this.data.checkName,
  89 + id:this.data.id,
  90 + }).then(res=>{
  91 + console.log(res);
  92 + })
  93 + // this.modal.showModal()
78 // wx.showModal({ 94 // wx.showModal({
79 // title: '申请成功', 95 // title: '申请成功',
80 // cancelText:' ', 96 // cancelText:' ',
@@ -90,21 +106,30 @@ Page({ @@ -90,21 +106,30 @@ Page({
90 // }) 106 // })
91 }, 107 },
92 // 选择退款原因 108 // 选择退款原因
93 - checkboxChange(e) { 109 + radioChange(e) {
94 console.log('checkbox发生change事件，携带value值为：', e.detail.value) 110 console.log('checkbox发生change事件，携带value值为：', e.detail.value)
95 - const checkboxList = this.data.checkboxList 111 + const radioboxList = this.data.radioboxList
96 const values = e.detail.value 112 const values = e.detail.value
97 - for (let i = 0, lenI = checkboxList.length; i < lenI; ++i) {  
98 - checkboxList[i].checked = false 113 + let checkName;
  114 + for (let i = 0, lenI = radioboxList.length; i < lenI; ++i) {
  115 + radioboxList[i].checked = false
99 for (let j = 0, lenJ = values.length; j < lenJ; ++j) { 116 for (let j = 0, lenJ = values.length; j < lenJ; ++j) {
100 - if (checkboxList[i].value === values[j]) {  
101 - checkboxList[i].checked = true 117 + if (radioboxList[i].value === values[j]) {
  118 + radioboxList[i].checked = true;
102 break 119 break
103 } 120 }
104 } 121 }
105 } 122 }
106 this.setData({ 123 this.setData({
107 - checkboxList 124 + radioboxList,
  125 + checkName
  126 + })
  127 + },
  128 + bindTextAreaBlur(e){
  129 + let value = e.detail.value;//获取textarea的内容，
  130 + let len = value.length;//获取textarea的内容长度
  131 + this.setData({
  132 + 'number': len
108 }) 133 })
109 }, 134 },
110 /** 135 /**
1 <!--pack-activity/pack/subscribeDrawback.wxml 申请退款页面--> 1 <!--pack-activity/pack/subscribeDrawback.wxml 申请退款页面-->
2 -<nav> </nav> 2 +<nav></nav>
3 <view class="box"> 3 <view class="box">
4 <view class="content"> 4 <view class="content">
5 <view class="info"> 5 <view class="info">
@@ -23,24 +23,25 @@ @@ -23,24 +23,25 @@
23 退款原因（至少选1项） 23 退款原因（至少选1项）
24 </view> 24 </view>
25 </view> 25 </view>
26 - <checkbox-group bindchange="checkboxChange" class="checklist">  
27 - <label class="weui-cell info weui-check__label" wx:for="{{checkboxList}}" wx:key="{{item.value}}"> 26 + <radio-group bindchange="radioChange" class="checklist radio-label">
  27 + <label class="weui-cell info weui-check__label radio" wx:for="{{radioboxList}}" wx:key="{{item.value}}">
28 <view class="weui-cell__bd info_left">{{item.name}}</view> 28 <view class="weui-cell__bd info_left">{{item.name}}</view>
29 <view class="weui-cell__hd info_right"> 29 <view class="weui-cell__hd info_right">
30 - <checkbox value="{{item.value}}" color="#0143A3" checked="{{item.checked}}" /> 30 + <radio value="{{item.value}}" color="#0143A3" checked="{{item.checked}}" />
31 </view> 31 </view>
32 </label> 32 </label>
33 - </checkbox-group> 33 + </radio-group>
34 <view class="info"> 34 <view class="info">
35 <view class="info_left font32r"> 35 <view class="info_left font32r">
36 更多不爽？必须吐槽！ 36 更多不爽？必须吐槽！
37 </view> 37 </view>
38 </view> 38 </view>
39 <view class="section"> 39 <view class="section">
40 - <textarea class="textareaStyle" bindblur="bindTextAreaBlur" auto-height placeholder="小周将用心倾听您的任何意见~" /> 40 + <textarea class="textareaStyle" bindinput="bindTextAreaBlur" maxlength="500" auto-height placeholder="小周将用心倾听您的任何意见~" />
  41 + <span class="wordwrap">{{number}}/500</span>
41 </view> 42 </view>
42 </view> 43 </view>
43 - <view class="bottom"> 44 + <view class="bottom" bindtap="wananchi">
44 <view class="font26r publicity">关注<text class="bold_box">周到安排</text>公众号，及时获取更多优惠券动态 45 <view class="font26r publicity">关注<text class="bold_box">周到安排</text>公众号，及时获取更多优惠券动态
45 </view> 46 </view>
46 <view class="more" style="margin-left: 20rpx;"></view> 47 <view class="more" style="margin-left: 20rpx;"></view>
@@ -94,6 +94,8 @@ @@ -94,6 +94,8 @@
94 width: 93%; 94 width: 93%;
95 margin-top: 24rpx; 95 margin-top: 24rpx;
96 margin-left: 7%; 96 margin-left: 7%;
  97 + padding-bottom: 20rpx;
  98 + position: relative;
97 } 99 }
98 100
99 .textareaStyle { 101 .textareaStyle {
@@ -155,4 +157,37 @@ @@ -155,4 +157,37 @@
155 157
156 .mymodal-content { 158 .mymodal-content {
157 height: 380px; 159 height: 380px;
158 -}  
  160 +}
  161 +
  162 +.wordwrap {
  163 + position: absolute;
  164 + right: 12rpx;
  165 + bottom: 12rpx;
  166 +}
  167 +radio .wx-radio-input{
  168 + width: 35rpx;
  169 + height: 35rpx;
  170 + line-height: 35rpx;
  171 + border-radius: 3px;/* 圆角:border-radius: 50%; */
  172 + }
  173 + radio .wx-radio-input.wx-radio-input-checked {
  174 + border: 1rpx solid #4788E5;
  175 + background: #4788E5;
  176 + width: 35rpx; /* 背景的宽 */
  177 + height: 35rpx; /* 背景的高 */
  178 + line-height: 35rpx;
  179 + }
  180 + radio .wx-radio-input.wx-radio-input-checked::before {
  181 + width: 35rpx;
  182 + height: 35rpx;
  183 + line-height: 35rpx;
  184 + text-align: center;
  185 + font-size: 30rpx; /* 对勾大小 30rpx */
  186 + color: #fff; /* 对勾颜色 白色 */
  187 + background: transparent;
  188 + transform: translate(-50%, -50%) scale(1);
  189 + -webkit-transform: translate(-50%, -50%) scale(1);
  190 + }
  191 + radio::before, checkbox::before {
  192 + z-index: -10 !important;
  193 + }
@@ -9,12 +9,21 @@ Page({ @@ -9,12 +9,21 @@ Page({
9 this.getlist(); 9 this.getlist();
10 }, 10 },
11 getlist() { 11 getlist() {
12 - App.Activity.GetNewRechargeListByOpenid().then((json) => {  
13 - console.log(json);  
14 - if (json.ret == 200) { 12 + App.Activity.GetNewRechargeListByOpenid().then((res) => {
  13 + if (res.ret == 200) {
  14 + let list=res.data;
  15 + let date=Date.now()*1;
  16 + list.forEach(item=>{
  17 + if(date>item.etime){
  18 + item.is_expire='0';
  19 + }else{
  20 + item.is_expire='1';
  21 + }
  22 + })
15 this.setData({ 23 this.setData({
16 - list: json.data 24 + list: res.data
17 }) 25 })
  26 +
18 } 27 }
19 }) 28 })
20 }, 29 },
@@ -35,12 +44,28 @@ Page({ @@ -35,12 +44,28 @@ Page({
35 contentHeight: systemInfo.windowHeight - pt - h 44 contentHeight: systemInfo.windowHeight - pt - h
36 }) 45 })
37 }, 46 },
38 - getnext() {  
39 - 47 + // 去详情或者去评价
  48 + todetail(e) {
  49 + let id=e.currentTarget.dataset['id'];
  50 + let examine=e.currentTarget.dataset['examine'];
  51 + let expire=e.currentTarget.dataset['expire'];
  52 + let sellername=e.currentTarget.dataset['name'];
  53 + let sid=e.currentTarget.dataset['sid'];
  54 + console.log('todetailid',id);
  55 + if(expire=='0' && examine=='0'){
  56 + wx.reLaunch({
  57 + url: '/pack-activity/pack/examineCertificate?id='+id,
  58 + })
  59 + }else{
  60 + wx.reLaunch({
  61 + url: `/pages/pinglun/create?oid=${id}&sellername=${sellername}&sid=${sid}&types=3`,
  62 + })
  63 + }
40 }, 64 },
41 - toused() { 65 + // 关注公众号
  66 + wananchi() {
42 wx.navigateTo({ 67 wx.navigateTo({
43 - url: './used' 68 + url: './wananchi'
44 }) 69 })
45 } 70 }
46 }) 71 })
1 <!--pages/taocan/coupon_news.wxml 用户端--我的--卡券--> 1 <!--pages/taocan/coupon_news.wxml 用户端--我的--卡券-->
2 <wxs src="../../utils/util.wxs" module="util" /> 2 <wxs src="../../utils/util.wxs" module="util" />
3 <nav>卡券</nav> 3 <nav>卡券</nav>
4 -<scroll-view class="list" style="height:{{contentHeight}}px;padding-bottom: 140rpx;" bindscrolltolower="getnext" scroll-y>  
5 - <block wx:for="{{list}}">  
6 - <view class="card bg-white {{mark}}" bindtap="todetail" data-id="{{item.aid}}">  
7 - <view class="flex-vl {{mark=='canuse' ? 'orange-font' : 'gray-font'}} card-main {{mark}}" style="justify-content:space-between;"> 4 +<scroll-view class="list" style="height:{{contentHeight}}px;padding-bottom: 140rpx;" scroll-y>
  5 + <block wx:if="{{list.length>0}}">
  6 + <view wx:for="{{list}}" class="card bg-white" bindtap="todetail" data-id="{{item.id}}" data-examine="{{item.is_examine}}" data-expire="{{item.is_expire}}" data-name="{{item.recharge_name}}" data-sid="{{item.sellerid}}">
  7 + <view class="flex-vl gray-font card-main" style="justify-content:space-between;">
8 <view class="seller-info flex-ll"> 8 <view class="seller-info flex-ll">
9 <view class="smooth font-siny font32r" wx:if="{{item.recharge_name}}">{{item.recharge_name}}</view> 9 <view class="smooth font-siny font32r" wx:if="{{item.recharge_name}}">{{item.recharge_name}}</view>
10 </view> 10 </view>
11 <view class="font24r font-bold text1" wx:if="{{item.sellername}}">{{item.sellername}}</view> 11 <view class="font24r font-bold text1" wx:if="{{item.sellername}}">{{item.sellername}}</view>
12 <view class="font24r font-bold text1" wx:if="{{item.order_no}}">{{item.order_no}}</view> 12 <view class="font24r font-bold text1" wx:if="{{item.order_no}}">{{item.order_no}}</view>
13 </view> 13 </view>
14 - <button class="flex-cc card-info font30r font-bold smooth" style="color:{{mark=='canuse' ? '#F05522' : '#999999'}};">{{mark=='used' ? (item.status==1 ? '已使用' : '已过期') : '去使用'}}</button>  
15 - <view class="{{mark=='canuse' ? 'orange-font' : 'gray-font'}} font24r texts smooth">有效时间:{{util.unixtoTime(item.stime,'YYYY-MM-DD')}}-{{util.unixtoTime(item.etime,'YYYY-MM-DD')}}</view> 14 + <image wx:if="{{item.is_examine=='1'}}" src="https://qn.colorcun.com/WechatIMG713.png" class="imgs1" mode="" />
  15 + <image wx:if="{{item.is_expire=='1'}}" src="https://qn.colorcun.com/WechatIMG714.png" class="imgs1" mode="" />
  16 + <button wx:if="{{item.is_examine=='1' || (item.is_expire=='0'&& item.is_examine=='0')}}" class="flex-cc card-info font30r font-bold smooth">{{item.is_examine=='1' ? '去评价' : (item.is_expire=='0'&& item.is_examine=='0') ?'去使用': ''}}</button>
  17 + <view class="font24r texts smooth">有效时间:{{util.unixtoTime(item.stime,'YYYY-MM-DD')}}-{{util.unixtoTime(item.etime,'YYYY-MM-DD')}}</view>
  18 + </view>
  19 + </block>
  20 + <block wx:else>
  21 + <view class="flex-vc">
  22 + <view class="empty-img"></view>
  23 + <view class="empty-txt">暂时没有优惠券哦~</view>
16 </view> 24 </view>
17 </block> 25 </block>
18 </scroll-view> 26 </scroll-view>
19 -<view class="card-used flex-cc bg-white gray-font font32r"> 27 +<view class="card-used flex-cc bg-white gray-font font32r" bindtap="wananchi">
20 <view class="wananchi"> 28 <view class="wananchi">
21 关注<text>周到安排</text>公众号，及时获取更多优惠信息 29 关注<text>周到安排</text>公众号，及时获取更多优惠信息
22 </view> 30 </view>
@@ -38,6 +38,7 @@ @@ -38,6 +38,7 @@
38 height: 65%; 38 height: 65%;
39 padding: 14rpx 24rpx; 39 padding: 14rpx 24rpx;
40 box-sizing: border-box; 40 box-sizing: border-box;
  41 + position: relative;
41 } 42 }
42 43
43 .card-main.canuse { 44 .card-main.canuse {
@@ -58,8 +59,8 @@ @@ -58,8 +59,8 @@
58 59
59 .card-info { 60 .card-info {
60 padding: 0 26rpx; 61 padding: 0 26rpx;
61 - height: 54rpx;  
62 - line-height: 54rpx; 62 + height: 48rpx;
  63 + line-height: 48rpx;
63 box-sizing: border-box; 64 box-sizing: border-box;
64 margin: 0; 65 margin: 0;
65 position: absolute; 66 position: absolute;
@@ -68,6 +69,7 @@ @@ -68,6 +69,7 @@
68 border: 2rpx solid #0143A3; 69 border: 2rpx solid #0143A3;
69 border-radius: 44rpx; 70 border-radius: 44rpx;
70 font-weight: normal; 71 font-weight: normal;
  72 + color: #999999;
71 } 73 }
72 74
73 .use-button { 75 .use-button {
@@ -156,4 +158,27 @@ @@ -156,4 +158,27 @@
156 left: 0; 158 left: 0;
157 color: #fff; 159 color: #fff;
158 background: linear-gradient(104.24deg, #4c8dad -57.47%, #0143a3 55.72%, #42a5ff 148.72%); 160 background: linear-gradient(104.24deg, #4c8dad -57.47%, #0143a3 55.72%, #42a5ff 148.72%);
  161 +}
  162 +.imgs1{
  163 + position: absolute !important;
  164 + right: 30%;
  165 + top: 15%;
  166 + width: 92rpx;
  167 + height: 92rpx;
  168 +}
  169 +
  170 +.empty-img{
  171 + background-image: url("http://nosqn.colorcun.com/sellerbaobao/empty2.png");
  172 + background-size: 100% 100%;
  173 + width:302rpx;
  174 + height:408rpx;
  175 +}
  176 +.empty-txt{
  177 + height:44rpx;
  178 + font-size:32rpx;
  179 + font-family:PingFangSC-Regular,PingFang SC;
  180 + font-weight:400;
  181 + color:rgba(53,53,53,1);
  182 + line-height:44rpx;
  183 + margin-top: 40rpx;
159 } 184 }
  1 +// pages/me/wananchi.js
  2 +Page({
  3 +
  4 + /**
  5 + * 页面的初始数据
  6 + */
  7 + data: {
  8 +
  9 + },
  10 + /**
  11 + * 生命周期函数--监听页面加载
  12 + */
  13 + onLoad(options) {
  14 +
  15 + },
  16 +
  17 + /**
  18 + * 生命周期函数--监听页面初次渲染完成
  19 + */
  20 + onReady() {
  21 +
  22 + },
  23 +
  24 + /**
  25 + * 生命周期函数--监听页面显示
  26 + */
  27 + onShow() {
  28 +
  29 + },
  30 +
  31 + /**
  32 + * 生命周期函数--监听页面隐藏
  33 + */
  34 + onHide() {
  35 +
  36 + },
  37 +
  38 + /**
  39 + * 生命周期函数--监听页面卸载
  40 + */
  41 + onUnload() {
  42 +
  43 + },
  44 +
  45 + /**
  46 + * 页面相关事件处理函数--监听用户下拉动作
  47 + */
  48 + onPullDownRefresh() {
  49 +
  50 + },
  51 +
  52 + /**
  53 + * 页面上拉触底事件的处理函数
  54 + */
  55 + onReachBottom() {
  56 +
  57 + },
  58 +
  59 + /**
  60 + * 用户点击右上角分享
  61 + */
  62 + onShareAppMessage() {
  63 +
  64 + }
  65 +})
  1 +{
  2 + "navigationBarBackgroundColor": "#ffffff",
  3 + "navigationBarTextStyle": "black",
  4 + "usingComponents": {
  5 + "nav":"/components/nav/nav"
  6 + }
  7 +}
  1 +<!--pages/me/wananchi.wxml-->
  2 +<nav backgroundColor="transparent"></nav>
  3 +<view class="box">
  4 + <view class="title">
  5 + 关注周到安排公众号
  6 + </view>
  7 + <image show-menu-by-longpress="{{true}}" src="https://img1.maka.im/user/2755422/56504fec5d6a6629f825ed1e17abdb1e.jpeg" class="qrcode" mode="aspectFill" />
  8 + <view class="info">
  9 + 长按扫码关注【周到安排】服务号
  10 + </view>
  11 + <view class="text1">
  12 + 关注<text>周到安排</text>服务号
  13 + </view>
  14 + <view class="text1">
  15 + 即可获得以下权益
  16 + </view>
  17 +</view>
  18 +<view class="bottom flex-lr">
  19 + <view class="content flex-cc">
  20 + <image src="https://xt04.colorcun.com/NewRecharge/order/9.png" mode="" />
  21 + <view class="texts">
  22 + 订单实时提醒
  23 + </view>
  24 + <view class="texts1">
  25 + 及时接收服务信息
  26 + </view>
  27 + <view class="texts1">
  28 + 方便快捷
  29 + </view>
  30 + </view>
  31 + <view class="content flex-cc">
  32 + <image src="https://xt04.colorcun.com/NewRecharge/order/9.png" mode="" />
  33 + <view class="texts">
  34 + 订单实时提醒
  35 + </view>
  36 + <view class="texts1">
  37 + 及时接收服务信息
  38 + </view>
  39 + <view class="texts1">
  40 + 方便快捷
  41 + </view>
  42 + </view>
  43 +</view>
  1 +/* pages/me/wananchi.wxss */
  2 +page {
  3 + background-color: #42A5FF;
  4 + height: 100%;
  5 +}
  6 +
  7 +.box {
  8 + display: flex;
  9 + flex-direction: column;
  10 + align-items: center;
  11 + justify-content: center;
  12 + padding-bottom: 44rpx;
  13 +}
  14 +
  15 +.title {
  16 + color: #f8f9fd;
  17 + font-family: PingFang SC;
  18 + font-size: 66rpx;
  19 + line-height: 52rpx;
  20 + padding: 140rpx 0 116rpx 0;
  21 +}
  22 +
  23 +.qrcode {
  24 + width: 320rpx;
  25 + height: 320rpx;
  26 + border-radius: 18rpx;
  27 +}
  28 +
  29 +.info {
  30 + color: #f8f9fd;
  31 + font-family: PingFang SC;
  32 + font-size: 26rpx;
  33 + line-height: 53rpx;
  34 + padding: 30rpx 0 90rpx 0;
  35 +}
  36 +
  37 +.text1 {
  38 + color: #f8f9fd;
  39 + font-family: PingFang SC;
  40 + font-size: 26rpx;
  41 + line-height: 52rpx;
  42 +}
  43 +
  44 +.bottom {
  45 + padding: 0 100rpx;
  46 +}
  47 +
  48 +.text1 text {
  49 + font-weight: 600;
  50 + font-size: 34rpx
  51 +}
  52 +
  53 +.content {
  54 + flex-direction: column;
  55 +}
  56 +
  57 +.bottom image {
  58 + width: 132rpx;
  59 + height: 132rpx;
  60 + margin-bottom: 60rpx;
  61 +}
  62 +
  63 +.left {
  64 + flex-direction: column;
  65 +}
  66 +
  67 +.texts {
  68 + color: #f8f9fd;
  69 + font-family: PingFang SC;
  70 + font-weight: 600;
  71 + font-size: 30rpx;
  72 + line-height: 52rpx;
  73 +}
  74 +
  75 +.texts1 {
  76 + color: #f8f9fd;
  77 + font-family: PingFang SC;
  78 + font-size: 26rpx;
  79 +}
@@ -8,6 +8,7 @@ Page({ @@ -8,6 +8,7 @@ Page({
8 * 页面的初始数据 8 * 页面的初始数据
9 */ 9 */
10 data: { 10 data: {
  11 + types:'',
11 qnConf:{ 12 qnConf:{
12 accessKey:'uva-aaonM8dukeR6phc9yuPBrOXk9brrNW_PxLD7', 13 accessKey:'uva-aaonM8dukeR6phc9yuPBrOXk9brrNW_PxLD7',
13 secretKey:'oZMMVN6phk49lG0J1xwmi1Ju0ETT15EnAEWcU9Cs', 14 secretKey:'oZMMVN6phk49lG0J1xwmi1Ju0ETT15EnAEWcU9Cs',
@@ -55,7 +56,9 @@ Page({ @@ -55,7 +56,9 @@ Page({
55 * 生命周期函数--监听页面加载 56 * 生命周期函数--监听页面加载
56 */ 57 */
57 onLoad: function (options) { 58 onLoad: function (options) {
  59 + console.log('options',{...options});
58 this.options=options 60 this.options=options
  61 + this.data.types=options.options?options.types:'1';
59 this.initPage() 62 this.initPage()
60 }, 63 },
61 async initPage(){ 64 async initPage(){
@@ -199,7 +202,7 @@ Page({ @@ -199,7 +202,7 @@ Page({
199 enclosure:JSON.stringify(enclosure), 202 enclosure:JSON.stringify(enclosure),
200 identity:1, 203 identity:1,
201 text:this.text||'', 204 text:this.text||'',
202 - types:1, 205 + types:this.data.types,
203 grade:this.statVal, 206 grade:this.statVal,
204 isnoshow:this.data.isnoshow 207 isnoshow:this.data.isnoshow
205 } 208 }
@@ -660,4 +660,14 @@ export default { @@ -660,4 +660,14 @@ export default {
660 'App.Activity.GetNewRechargeListByOpenid':{ 660 'App.Activity.GetNewRechargeListByOpenid':{
661 openid:'openid' 661 openid:'openid'
662 }, 662 },
  663 +
  664 + // 获取订单中券详情
  665 + 'App.Activity.GetOrderRechargeByid':{
  666 + openid:'openid'
  667 + },
  668 +
  669 + // 申请优惠券退款
  670 + 'App.PayOnline.RechargeRefundApply':{
  671 + openid:'openid'
  672 + },
663 } 673 }
@@ -155,9 +155,10 @@ @@ -155,9 +155,10 @@
155 "scene": "1001" 155 "scene": "1001"
156 }, 156 },
157 { 157 {
158 - "name": "pack-cookbook/pages/index", 158 + "name": "提前点餐",
159 "pathName": "pack-cookbook/pages/index", 159 "pathName": "pack-cookbook/pages/index",
160 - "query": "rid=18599&oid=273&identity=1&sid=154", 160 + "query": "rid=322708&oid=1879&identity=1&sid=4352",
  161 + "launchMode": "default",
161 "scene": 1001 162 "scene": 1001
162 }, 163 },
163 { 164 {
@@ -585,6 +586,41 @@ @@ -585,6 +586,41 @@
585 "pathName": "pages/reserve/detail", 586 "pathName": "pages/reserve/detail",
586 "query": "id=1297", 587 "query": "id=1297",
587 "scene": null 588 "scene": null
  589 + },
  590 + {
  591 + "name": "充值",
  592 + "pathName": "pack-activity/pack/vipRecharge",
  593 + "query": "id=254&name=14号酒庄天幕山总部",
  594 + "launchMode": "default",
  595 + "scene": null
  596 + },
  597 + {
  598 + "name": "新邀请函",
  599 + "pathName": "pages/customer/detail_owner_invitation_new",
  600 + "query": "id=329755&hasInvitation=1&hasSellerShare=1&tplid=1",
  601 + "launchMode": "default",
  602 + "scene": null
  603 + },
  604 + {
  605 + "name": "新提前点餐",
  606 + "pathName": "pack-cookbook/pages/index_new",
  607 + "query": "rid=322708&oid=1879&identity=1&sid=4352",
  608 + "launchMode": "default",
  609 + "scene": null
  610 + },
  611 + {
  612 + "name": "",
  613 + "pathName": "pack-activity/pack/examineCertificate",
  614 + "query": "id=9",
  615 + "launchMode": "default",
  616 + "scene": null
  617 + },
  618 + {
  619 + "name": "",
  620 + "pathName": "pages/me/coupon_news",
  621 + "query": "",
  622 + "launchMode": "default",
  623 + "scene": null
588 } 624 }
589 ] 625 ]
590 } 626 }