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 @@
bottom: 34rpx;
left: calc(50% - 232rpx);
width: 464rpx;
height: calc(100rpx + env(safe-area-inset-bottom));
/* height: calc(100rpx + env(safe-area-inset-bottom)); */
height: 100rpx;
background: #FFFFFF;
box-shadow: 0rpx 0rpx 10rpx 0rpx #E5E5E5;
border-radius: 50rpx;
... ...
view{
. order-info view{
line-height:1.2;
}
... ...
... ... @@ -19,6 +19,7 @@ Page({
this.setData({
options:options
})
console.log('success',options)
this.initOrder()
this.getDetail()
},
... ...
... ... @@ -18,6 +18,12 @@ Page({
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
let systemInfo = wx.getSystemInfoSync();
console.log('hahha',systemInfo,systemInfo.statusBarHeight)
this.setData({
headertop:systemInfo.statusBarHeight,
ratio:750/systemInfo.windowWidth,
})
App.Invitation.UserIdentity({openid:getApp().openid}).then(res=>{
if(res.data.seller.flag){//商户
this.setData({
... ...
<!--pages/me/index.wxml-->
<view class="meHeader flex-ll" >
<view class="meHeader flex-ll" style="padding-top: {{headertop+44}}px;height: {{48*ratio}}rpx;padding-bottom: {{headertop-20>0 ? 150 : 130}}rpx;">
<view class="avatar">
<open-data type="userAvatarUrl"></open-data>
</view>
... ... @@ -11,6 +11,7 @@
<nav backgroundColor="rgba(0,0,0,0)" color="#ffffff">周到安排</nav>
<layout>
<view class="pages">
<view style="margin-top:-{{224+(headertop-20)*ratio+(headertop-20>0 ? 16 : 0)}}rpx;"></view>
<view class="block-rev money flex-lr">
<navigator url="/pages/me/follow" class="money-item">
<view class="flex-vc">
... ... @@ -98,7 +99,7 @@
</navigator>
</view>
<view class="view flex justify-center">
<navigator url="/pages/pinglun/mylist" class="flex flex-direction justify-center align-center">
<navigator url="/pages/pinglun/mylist?hasStatus={{true}}" class="flex flex-direction justify-center align-center">
<view class="icon picon p5"></view>
<view class="text">我的评价</view>
</navigator>
... ...
... ... @@ -5,7 +5,7 @@ page{
}
.pages{
width: calc(100% - 40rpx);
margin: -220rpx 20rpx 40rpx;
margin: 0 20rpx 40rpx;
color:#353535;
padding-bottom: 40rpx;
}
... ... @@ -15,12 +15,9 @@ image{
display: inherit;
}
.meHeader{
padding-top: 60rpx;
padding-bottom: 64rpx;
padding-left: 40rpx;
color:#fff;
box-sizing: border-box;
margin-top: -10rpx;
/* box-sizing: border-box; */
/* margin-top: -10rpx; */
background-image: url("http://nosqn.colorcun.com/taocan/1%20%2814%29.png");
background-size: 100% 100%;
height: 344rpx;
... ... @@ -31,6 +28,8 @@ image{
border-radius: 50%;
overflow: hidden;
margin-right: 20rpx;
margin-left: 40rpx;
/* border:2rpx solid #ffffff; */
}
.name{
height: 52rpx;
... ...
... ... @@ -24,6 +24,7 @@ Page({
this.setData({
title:titles[options.act]||'我的评价',
optionsAct:options.act,
hasStatus:options.hasStatus || options.act=='yunying' ? true : false
})
if(options.act=='seller'){
App.Customer.GetCountCommentLabel({sid:options.sid}).then(res=>{
... ...
... ... @@ -10,7 +10,7 @@
</view>
<view class="view" wx:for="{{posts}}" wx:key="posts">
<view class="view margin-lg solid-bottom padding-bottom-lg">
<plcard post="{{item}}" hasSeller hasStatus cla="{{optionsAct}}"></plcard>
<plcard post="{{item}}" hasSeller hasStatus="{{hasStatus}}" cla="{{optionsAct}}"></plcard>
<view class="view flex justify-end margin-top-sm" wx:if="{{optionsAct=='yunying'}}">
<view bindtap="CheckComment" data-status="3" data-cid="{{item.id}}"
class="view yunying padding-lr-sm margin-bottom-sm margin-right">不通过</view>
... ...
... ... @@ -18,19 +18,22 @@
"checkSiteMap": true,
"uploadWithSourceMap": true,
"compileHotReLoad": false,
"useMultiFrameRuntime": false,
"useMultiFrameRuntime": true,
"useApiHook": true,
"babelSetting": {
"ignore": [],
"disablePlugins": [],
"outputPath": ""
},
"bundle": false,
"useIsolateContext": true,
"useCompilerModule": true,
"userConfirmedUseCompilerModuleSwitch": false,
"userConfirmedBundleSwitch": false,
"packNpmManually": false,
"packNpmRelationList": [],
"minifyWXSS": true
"minifyWXSS": true,
"useApiHostProcess": true
},
"compileType": "miniprogram",
"libVersion": "2.11.2",
... ... @@ -73,6 +76,12 @@
}
},
"condition": {
"search": {
"list": []
},
"conversation": {
"list": []
},
"plugin": {
"list": []
},
... ... @@ -88,7 +97,7 @@
"id": 0,
"name": "预订本-商家1",
"pathName": "pack-book/pages/book/b_index",
"query": "seller_id=555&seller_openid= oZc-q05hV2N-knHfpxKg5dDUp5vU&manager_id=20612",
"query": "seller_id=1297&seller_openid= oZc-q05hV2N-knHfpxKg5dDUp5vU&manager_id=20612",
"scene": 1001
},
{
... ... @@ -178,17 +187,6 @@
}
},
{
"name": "我的 常用信息 pages/me/setting",
"pathName": "pages/me/setting",
"query": "id=330&openid=oB-xJ5BjnTvdgQGLHsjioNHH0eE8&name=杜&sex=1&phone=15339180360&remark=&is_default=0&status=1&cdate=1587349236",
"scene": 1044,
"shareInfo": {
"groupName": "测试模拟群1",
"shareName": "8DEbIRpK4pa9mH_QY2vU4ZUKYPuI97WoQ4BQoFej-Q8@cr4dev",
"shareKey": "PZhnqMlY2TnRuHhATyGeSamVmBQUDXXr_WtjRSddeeFK17UAiOP-HNOdhxiEN7PFub5S1DjAeUl0IXOdW-VDqg~~"
}
},
{
"id": -1,
"name": "预订本-添加预订",
"pathName": "pack-book/pages/book/b_addnew",
... ... @@ -465,12 +463,6 @@
"scene": null
},
{
"name": "pages/reserve/indexList",
"pathName": "pages/reserve/indexList",
"query": "lat=39.65157&lng=118.15044&keyword=西安&multiIndex=0",
"scene": null
},
{
"id": 53,
"name": "选择更多桌位",
"pathName": "pack-book/pages/book/b_desk",
... ... @@ -485,12 +477,6 @@
"scene": null
},
{
"name": "pages/reserve/submit",
"pathName": "pages/reserve/submit",
"query": "section=noon&time=14:30&date=2020-12-24&sid=1&ddate=1608791400&room_demand=[{\"id\":\"30\",\"name\":\"6人间\"},{\"id\":\"31\",\"name\":\"10人间\"}]",
"scene": null
},
{
"id": 56,
"name": "测试组件",
"pathName": "pages/reserve/detail",
... ... @@ -505,12 +491,6 @@
"scene": null
},
{
"name": "pages/me/list 我的订单",
"pathName": "pages/me/list",
"query": "type=2",
"scene": null
},
{
"id": 59,
"name": "pack-book/pages/roomtype/roomtype",
"pathName": "pack-book/pages/book/roomtype/roomtype",
... ... @@ -602,12 +582,6 @@
"scene": null
},
{
"name": "pages/reserve/detail",
"pathName": "pages/reserve/detail",
"query": "id=1001&_activeTab=reserve&_date=2020-02-16&_pnum=6",
"scene": null
},
{
"id": 73,
"name": "pages/customer/cancel",
"pathName": "pages/customer/cancel",
... ... @@ -629,12 +603,6 @@
"scene": null
},
{
"name": "pages/customer/detail_owner",
"pathName": "pages/customer/detail_owner",
"query": "id=149290&firstShowMsg=预计10分钟左右餐厅将告知您结果（请留意短息或微信通知）&hasSubscribeFail=true",
"scene": null
},
{
"id": -1,
"name": "pack-activity/pages/kefu",
"pathName": "pack-activity/pages/kefu",
... ... @@ -717,66 +685,6 @@
"pathName": "pack-book/pages/book/b_index",
"query": "seller_id=80&seller_openid=oGefL4qKBWIh5xwyg3LVfkMbDumA&manager_id=763&goPath=roomtype/roomtype",
"scene": null
},
{
"name": "pages/taocan/index",
"pathName": "pages/taocan/index",
"query": "sid=1001&pid=3",
"scene": null
},
{
"name": "pages/taocan/order",
"pathName": "pages/taocan/order",
"query": "id=0000002024",
"scene": null
},
{
"name": "pages/taocan/orderHis",
"pathName": "pages/taocan/orderHis",
"query": "id=0000000011",
"scene": null
},
{
"name": "pages/pinglun/create",
"pathName": "pages/pinglun/create",
"query": "sid=80&oid=118853&sellername=秦风面庄001",
"scene": null
},
{
"name": "pages/pinglun/success",
"pathName": "pages/pinglun/success",
"query": "",
"scene": null
},
{
"name": "pages/pinglun/mylist",
"pathName": "pages/pinglun/mylist",
"query": "act=yunying&_act=seller&sid=80",
"scene": null
},
{
"name": "pages/reserve/reserve",
"pathName": "pages/reserve/reserve",
"query": "id=80&activeTab=reserve&_date=2020-02-16&_pnum=6",
"scene": null
},
{
"name": "pages/reserve/remark",
"pathName": "pages/reserve/remark",
"query": "remark=远离卫生间,尽量安静,尽量靠窗",
"scene": null
},
{
"name": "pages/me/concat",
"pathName": "pages/me/concat",
"query": "remark=远离卫生间,尽量安静,尽量靠窗",
"scene": null
},
{
"name": "pages/tcads/cmyy",
"pathName": "pages/tcads/cmyy",
"query": "",
"scene": null
}
]
}
... ...