xt / xcx-book · Commits

Go to a project

Commit 235320191c9978da1e987efa433920747ea13bff

Authored by liuxuqing
1 parent 2bcf8bc6
build: skipped

no message

Inline Side-by-side
Showing 9 changed files with 32 additions and 115 deletions
@@ -5,7 +5,8 @@ @@ -5,7 +5,8 @@
5 bottom: 34rpx; 5 bottom: 34rpx;
6 left: calc(50% - 232rpx); 6 left: calc(50% - 232rpx);
7 width: 464rpx; 7 width: 464rpx;
8 - height: calc(100rpx + env(safe-area-inset-bottom)); 8 + /* height: calc(100rpx + env(safe-area-inset-bottom)); */
  9 + height: 100rpx;
9 background: #FFFFFF; 10 background: #FFFFFF;
10 box-shadow: 0rpx 0rpx 10rpx 0rpx #E5E5E5; 11 box-shadow: 0rpx 0rpx 10rpx 0rpx #E5E5E5;
11 border-radius: 50rpx; 12 border-radius: 50rpx;
1 -view{ 1 +. order-info view{
2 line-height:1.2; 2 line-height:1.2;
3 } 3 }
4 4
@@ -19,6 +19,7 @@ Page({ @@ -19,6 +19,7 @@ Page({
19 this.setData({ 19 this.setData({
20 options:options 20 options:options
21 }) 21 })
  22 + console.log('success',options)
22 this.initOrder() 23 this.initOrder()
23 this.getDetail() 24 this.getDetail()
24 }, 25 },
@@ -18,6 +18,12 @@ Page({ @@ -18,6 +18,12 @@ Page({
18 * 生命周期函数--监听页面加载 18 * 生命周期函数--监听页面加载
19 */ 19 */
20 onLoad: function (options) { 20 onLoad: function (options) {
  21 + let systemInfo = wx.getSystemInfoSync();
  22 + console.log('hahha',systemInfo,systemInfo.statusBarHeight)
  23 + this.setData({
  24 + headertop:systemInfo.statusBarHeight,
  25 + ratio:750/systemInfo.windowWidth,
  26 + })
21 App.Invitation.UserIdentity({openid:getApp().openid}).then(res=>{ 27 App.Invitation.UserIdentity({openid:getApp().openid}).then(res=>{
22 if(res.data.seller.flag){//商户 28 if(res.data.seller.flag){//商户
23 this.setData({ 29 this.setData({
1 <!--pages/me/index.wxml--> 1 <!--pages/me/index.wxml-->
2 -<view class="meHeader flex-ll" > 2 +<view class="meHeader flex-ll" style="padding-top: {{headertop+44}}px;height: {{48*ratio}}rpx;padding-bottom: {{headertop-20>0 ? 150 : 130}}rpx;">
3 <view class="avatar"> 3 <view class="avatar">
4 <open-data type="userAvatarUrl"></open-data> 4 <open-data type="userAvatarUrl"></open-data>
5 </view> 5 </view>
@@ -11,6 +11,7 @@ @@ -11,6 +11,7 @@
11 <nav backgroundColor="rgba(0,0,0,0)" color="#ffffff">周到安排</nav> 11 <nav backgroundColor="rgba(0,0,0,0)" color="#ffffff">周到安排</nav>
12 <layout> 12 <layout>
13 <view class="pages"> 13 <view class="pages">
  14 + <view style="margin-top:-{{224+(headertop-20)*ratio+(headertop-20>0 ? 16 : 0)}}rpx;"></view>
14 <view class="block-rev money flex-lr"> 15 <view class="block-rev money flex-lr">
15 <navigator url="/pages/me/follow" class="money-item"> 16 <navigator url="/pages/me/follow" class="money-item">
16 <view class="flex-vc"> 17 <view class="flex-vc">
@@ -98,7 +99,7 @@ @@ -98,7 +99,7 @@
98 </navigator> 99 </navigator>
99 </view> 100 </view>
100 <view class="view flex justify-center"> 101 <view class="view flex justify-center">
101 - <navigator url="/pages/pinglun/mylist" class="flex flex-direction justify-center align-center"> 102 + <navigator url="/pages/pinglun/mylist?hasStatus={{true}}" class="flex flex-direction justify-center align-center">
102 <view class="icon picon p5"></view> 103 <view class="icon picon p5"></view>
103 <view class="text">我的评价</view> 104 <view class="text">我的评价</view>
104 </navigator> 105 </navigator>
@@ -5,7 +5,7 @@ page{ @@ -5,7 +5,7 @@ page{
5 } 5 }
6 .pages{ 6 .pages{
7 width: calc(100% - 40rpx); 7 width: calc(100% - 40rpx);
8 - margin: -220rpx 20rpx 40rpx; 8 + margin: 0 20rpx 40rpx;
9 color:#353535; 9 color:#353535;
10 padding-bottom: 40rpx; 10 padding-bottom: 40rpx;
11 } 11 }
@@ -15,12 +15,9 @@ image{ @@ -15,12 +15,9 @@ image{
15 display: inherit; 15 display: inherit;
16 } 16 }
17 .meHeader{ 17 .meHeader{
18 - padding-top: 60rpx;  
19 - padding-bottom: 64rpx;  
20 - padding-left: 40rpx;  
21 color:#fff; 18 color:#fff;
22 - box-sizing: border-box;  
23 - margin-top: -10rpx; 19 + /* box-sizing: border-box; */
  20 + /* margin-top: -10rpx; */
24 background-image: url("http://nosqn.colorcun.com/taocan/1%20%2814%29.png"); 21 background-image: url("http://nosqn.colorcun.com/taocan/1%20%2814%29.png");
25 background-size: 100% 100%; 22 background-size: 100% 100%;
26 height: 344rpx; 23 height: 344rpx;
@@ -31,6 +28,8 @@ image{ @@ -31,6 +28,8 @@ image{
31 border-radius: 50%; 28 border-radius: 50%;
32 overflow: hidden; 29 overflow: hidden;
33 margin-right: 20rpx; 30 margin-right: 20rpx;
  31 + margin-left: 40rpx;
  32 + /* border:2rpx solid #ffffff; */
34 } 33 }
35 .name{ 34 .name{
36 height: 52rpx; 35 height: 52rpx;
@@ -24,6 +24,7 @@ Page({ @@ -24,6 +24,7 @@ Page({
24 this.setData({ 24 this.setData({
25 title:titles[options.act]||'我的评价', 25 title:titles[options.act]||'我的评价',
26 optionsAct:options.act, 26 optionsAct:options.act,
  27 + hasStatus:options.hasStatus || options.act=='yunying' ? true : false
27 }) 28 })
28 if(options.act=='seller'){ 29 if(options.act=='seller'){
29 App.Customer.GetCountCommentLabel({sid:options.sid}).then(res=>{ 30 App.Customer.GetCountCommentLabel({sid:options.sid}).then(res=>{
@@ -10,7 +10,7 @@ @@ -10,7 +10,7 @@
10 </view> 10 </view>
11 <view class="view" wx:for="{{posts}}" wx:key="posts"> 11 <view class="view" wx:for="{{posts}}" wx:key="posts">
12 <view class="view margin-lg solid-bottom padding-bottom-lg"> 12 <view class="view margin-lg solid-bottom padding-bottom-lg">
13 - <plcard post="{{item}}" hasSeller hasStatus cla="{{optionsAct}}"></plcard> 13 + <plcard post="{{item}}" hasSeller hasStatus="{{hasStatus}}" cla="{{optionsAct}}"></plcard>
14 <view class="view flex justify-end margin-top-sm" wx:if="{{optionsAct=='yunying'}}"> 14 <view class="view flex justify-end margin-top-sm" wx:if="{{optionsAct=='yunying'}}">
15 <view bindtap="CheckComment" data-status="3" data-cid="{{item.id}}" 15 <view bindtap="CheckComment" data-status="3" data-cid="{{item.id}}"
16 class="view yunying padding-lr-sm margin-bottom-sm margin-right">不通过</view> 16 class="view yunying padding-lr-sm margin-bottom-sm margin-right">不通过</view>
@@ -18,19 +18,22 @@ @@ -18,19 +18,22 @@
18 "checkSiteMap": true, 18 "checkSiteMap": true,
19 "uploadWithSourceMap": true, 19 "uploadWithSourceMap": true,
20 "compileHotReLoad": false, 20 "compileHotReLoad": false,
21 - "useMultiFrameRuntime": false, 21 + "useMultiFrameRuntime": true,
22 "useApiHook": true, 22 "useApiHook": true,
23 "babelSetting": { 23 "babelSetting": {
24 "ignore": [], 24 "ignore": [],
25 "disablePlugins": [], 25 "disablePlugins": [],
26 "outputPath": "" 26 "outputPath": ""
27 }, 27 },
  28 + "bundle": false,
28 "useIsolateContext": true, 29 "useIsolateContext": true,
29 "useCompilerModule": true, 30 "useCompilerModule": true,
30 "userConfirmedUseCompilerModuleSwitch": false, 31 "userConfirmedUseCompilerModuleSwitch": false,
  32 + "userConfirmedBundleSwitch": false,
31 "packNpmManually": false, 33 "packNpmManually": false,
32 "packNpmRelationList": [], 34 "packNpmRelationList": [],
33 - "minifyWXSS": true 35 + "minifyWXSS": true,
  36 + "useApiHostProcess": true
34 }, 37 },
35 "compileType": "miniprogram", 38 "compileType": "miniprogram",
36 "libVersion": "2.11.2", 39 "libVersion": "2.11.2",
@@ -73,6 +76,12 @@ @@ -73,6 +76,12 @@
73 } 76 }
74 }, 77 },
75 "condition": { 78 "condition": {
  79 + "search": {
  80 + "list": []
  81 + },
  82 + "conversation": {
  83 + "list": []
  84 + },
76 "plugin": { 85 "plugin": {
77 "list": [] 86 "list": []
78 }, 87 },
@@ -88,7 +97,7 @@ @@ -88,7 +97,7 @@
88 "id": 0, 97 "id": 0,
89 "name": "预订本-商家1", 98 "name": "预订本-商家1",
90 "pathName": "pack-book/pages/book/b_index", 99 "pathName": "pack-book/pages/book/b_index",
91 - "query": "seller_id=555&seller_openid= oZc-q05hV2N-knHfpxKg5dDUp5vU&manager_id=20612", 100 + "query": "seller_id=1297&seller_openid= oZc-q05hV2N-knHfpxKg5dDUp5vU&manager_id=20612",
92 "scene": 1001 101 "scene": 1001
93 }, 102 },
94 { 103 {
@@ -178,17 +187,6 @@ @@ -178,17 +187,6 @@
178 } 187 }
179 }, 188 },
180 { 189 {
181 - "name": "我的 常用信息 pages/me/setting",  
182 - "pathName": "pages/me/setting",  
183 - "query": "id=330&openid=oB-xJ5BjnTvdgQGLHsjioNHH0eE8&name=杜&sex=1&phone=15339180360&remark=&is_default=0&status=1&cdate=1587349236",  
184 - "scene": 1044,  
185 - "shareInfo": {  
186 - "groupName": "测试模拟群1",  
187 - "shareName": "8DEbIRpK4pa9mH_QY2vU4ZUKYPuI97WoQ4BQoFej-Q8@cr4dev",  
188 - "shareKey": "PZhnqMlY2TnRuHhATyGeSamVmBQUDXXr_WtjRSddeeFK17UAiOP-HNOdhxiEN7PFub5S1DjAeUl0IXOdW-VDqg~~"  
189 - }  
190 - },  
191 - {  
192 "id": -1, 190 "id": -1,
193 "name": "预订本-添加预订", 191 "name": "预订本-添加预订",
194 "pathName": "pack-book/pages/book/b_addnew", 192 "pathName": "pack-book/pages/book/b_addnew",
@@ -465,12 +463,6 @@ @@ -465,12 +463,6 @@
465 "scene": null 463 "scene": null
466 }, 464 },
467 { 465 {
468 - "name": "pages/reserve/indexList",  
469 - "pathName": "pages/reserve/indexList",  
470 - "query": "lat=39.65157&lng=118.15044&keyword=西安&multiIndex=0",  
471 - "scene": null  
472 - },  
473 - {  
474 "id": 53, 466 "id": 53,
475 "name": "选择更多桌位", 467 "name": "选择更多桌位",
476 "pathName": "pack-book/pages/book/b_desk", 468 "pathName": "pack-book/pages/book/b_desk",
@@ -485,12 +477,6 @@ @@ -485,12 +477,6 @@
485 "scene": null 477 "scene": null
486 }, 478 },
487 { 479 {
488 - "name": "pages/reserve/submit",  
489 - "pathName": "pages/reserve/submit",  
490 - "query": "section=noon&time=14:30&date=2020-12-24&sid=1&ddate=1608791400&room_demand=[{\"id\":\"30\",\"name\":\"6人间\"},{\"id\":\"31\",\"name\":\"10人间\"}]",  
491 - "scene": null  
492 - },  
493 - {  
494 "id": 56, 480 "id": 56,
495 "name": "测试组件", 481 "name": "测试组件",
496 "pathName": "pages/reserve/detail", 482 "pathName": "pages/reserve/detail",
@@ -505,12 +491,6 @@ @@ -505,12 +491,6 @@
505 "scene": null 491 "scene": null
506 }, 492 },
507 { 493 {
508 - "name": "pages/me/list 我的订单",  
509 - "pathName": "pages/me/list",  
510 - "query": "type=2",  
511 - "scene": null  
512 - },  
513 - {  
514 "id": 59, 494 "id": 59,
515 "name": "pack-book/pages/roomtype/roomtype", 495 "name": "pack-book/pages/roomtype/roomtype",
516 "pathName": "pack-book/pages/book/roomtype/roomtype", 496 "pathName": "pack-book/pages/book/roomtype/roomtype",
@@ -602,12 +582,6 @@ @@ -602,12 +582,6 @@
602 "scene": null 582 "scene": null
603 }, 583 },
604 { 584 {
605 - "name": "pages/reserve/detail",  
606 - "pathName": "pages/reserve/detail",  
607 - "query": "id=1001&_activeTab=reserve&_date=2020-02-16&_pnum=6",  
608 - "scene": null  
609 - },  
610 - {  
611 "id": 73, 585 "id": 73,
612 "name": "pages/customer/cancel", 586 "name": "pages/customer/cancel",
613 "pathName": "pages/customer/cancel", 587 "pathName": "pages/customer/cancel",
@@ -629,12 +603,6 @@ @@ -629,12 +603,6 @@
629 "scene": null 603 "scene": null
630 }, 604 },
631 { 605 {
632 - "name": "pages/customer/detail_owner",  
633 - "pathName": "pages/customer/detail_owner",  
634 - "query": "id=149290&firstShowMsg=预计10分钟左右餐厅将告知您结果（请留意短息或微信通知）&hasSubscribeFail=true",  
635 - "scene": null  
636 - },  
637 - {  
638 "id": -1, 606 "id": -1,
639 "name": "pack-activity/pages/kefu", 607 "name": "pack-activity/pages/kefu",
640 "pathName": "pack-activity/pages/kefu", 608 "pathName": "pack-activity/pages/kefu",
@@ -717,66 +685,6 @@ @@ -717,66 +685,6 @@
717 "pathName": "pack-book/pages/book/b_index", 685 "pathName": "pack-book/pages/book/b_index",
718 "query": "seller_id=80&seller_openid=oGefL4qKBWIh5xwyg3LVfkMbDumA&manager_id=763&goPath=roomtype/roomtype", 686 "query": "seller_id=80&seller_openid=oGefL4qKBWIh5xwyg3LVfkMbDumA&manager_id=763&goPath=roomtype/roomtype",
719 "scene": null 687 "scene": null
720 - },  
721 - {  
722 - "name": "pages/taocan/index",  
723 - "pathName": "pages/taocan/index",  
724 - "query": "sid=1001&pid=3",  
725 - "scene": null  
726 - },  
727 - {  
728 - "name": "pages/taocan/order",  
729 - "pathName": "pages/taocan/order",  
730 - "query": "id=0000002024",  
731 - "scene": null  
732 - },  
733 - {  
734 - "name": "pages/taocan/orderHis",  
735 - "pathName": "pages/taocan/orderHis",  
736 - "query": "id=0000000011",  
737 - "scene": null  
738 - },  
739 - {  
740 - "name": "pages/pinglun/create",  
741 - "pathName": "pages/pinglun/create",  
742 - "query": "sid=80&oid=118853&sellername=秦风面庄001",  
743 - "scene": null  
744 - },  
745 - {  
746 - "name": "pages/pinglun/success",  
747 - "pathName": "pages/pinglun/success",  
748 - "query": "",  
749 - "scene": null  
750 - },  
751 - {  
752 - "name": "pages/pinglun/mylist",  
753 - "pathName": "pages/pinglun/mylist",  
754 - "query": "act=yunying&_act=seller&sid=80",  
755 - "scene": null  
756 - },  
757 - {  
758 - "name": "pages/reserve/reserve",  
759 - "pathName": "pages/reserve/reserve",  
760 - "query": "id=80&activeTab=reserve&_date=2020-02-16&_pnum=6",  
761 - "scene": null  
762 - },  
763 - {  
764 - "name": "pages/reserve/remark",  
765 - "pathName": "pages/reserve/remark",  
766 - "query": "remark=远离卫生间,尽量安静,尽量靠窗",  
767 - "scene": null  
768 - },  
769 - {  
770 - "name": "pages/me/concat",  
771 - "pathName": "pages/me/concat",  
772 - "query": "remark=远离卫生间,尽量安静,尽量靠窗",  
773 - "scene": null  
774 - },  
775 - {  
776 - "name": "pages/tcads/cmyy",  
777 - "pathName": "pages/tcads/cmyy",  
778 - "query": "",  
779 - "scene": null  
780 } 688 }
781 ] 689 ]
782 } 690 }