Skip to content

严立 / mini-shimao

Go to a project
Commit 323a7ed7 by wjw
Options

Merge branch 'master' of http://120.77.182.185/yanl/mini-shimao.git into master

parents 131a5ce2 d20b2e7f
Inline Side-by-side
Showing with 141 additions and 67 deletions
pages/commodity/room-appointment/room-appointment.js
...@@ -22,12 +22,17 @@ Page({ ...@@ -22,12 +22,17 @@ Page({
// 预约入园剩余名额 // 预约入园剩余名额
total: 0, total: 0,
optionsTab:'',
frompage:''
}, },
onLoad: function (options) { onLoad: function (options) {
this.setData({
frompage: options.frompage,
optionsTab:options.tab
})
this.setReset() this.setReset()
}, },
setReset: function () { setReset: function () {
let funcDate = App.modular.miment(new Date().getTime()).format('YYYY-MM-DD') let funcDate = App.modular.miment(new Date().getTime()).format('YYYY-MM-DD')
let endDate = this.getNextDay(funcDate, 3) let endDate = this.getNextDay(funcDate, 3)
...@@ -222,19 +227,27 @@ Page({ ...@@ -222,19 +227,27 @@ Page({
this.setData({ this.setData({
appointmentComplete: false, appointmentComplete: false,
}) })
if (this.data.frompage=='appointment') {
wx.redirectTo({
url: '/pages/mine/appointment/appointment?tab='+this.data.optionsTab,
})
} else {
wx.navigateBack({ wx.navigateBack({
delta: 1 delta: 1,
}) })
}
}, },
getNextDay(d, t) { getNextDay(d, t) {
console.log(d, t)//格式为---2019-02-13 3 console.log(d, t) //格式为---2019-02-13 3
d = new Date(d); d = new Date(d);
console.log(d)//格式为---Wed Feb 13 2019 08:00:00 GMT+0800 (中国标准时间) console.log(d) //格式为---Wed Feb 13 2019 08:00:00 GMT+0800 (中国标准时间)
d = +d + (1000 * 60 * 60 * 24) * t; d = +d + (1000 * 60 * 60 * 24) * t;
console.log(d)//格式为--时间戳1550275200000 console.log(d) //格式为--时间戳1550275200000
d = new Date(d); d = new Date(d);
console.log(d)//格式为---Sat Feb 16 2019 08:00:00 GMT+0800 (中国标准时间) console.log(d) //格式为---Sat Feb 16 2019 08:00:00 GMT+0800 (中国标准时间)
return App.modular.miment(new Date(d)).format("YYYY-MM-DD") //格式为"2019-02-16 00:00:00" return App.modular.miment(new Date(d)).format("YYYY-MM-DD") //格式为"2019-02-16 00:00:00"
}, },
......
pages/home/night-appointment/night-appointment.js
...@@ -23,17 +23,20 @@ Page({ ...@@ -23,17 +23,20 @@ Page({
// 预约入园剩余名额 // 预约入园剩余名额
total: 0, total: 0,
frompage: '',
optionsTab: ''
}, },
onLoad: function (options) { onLoad: function (options) {
this.setData({
frompage: options.frompage,
optionsTab: options.tab
})
this.setReset() this.setReset()
}, },
setReset: function () { setReset: function () {
let funcDate = App.modular.miment().format('YYYY-MM-DD') let funcDate = App.modular.miment().format('YYYY-MM-DD')
console.log(funcDate)
let endDate = this.getNextDay(funcDate, 3) let endDate = this.getNextDay(funcDate, 3)
this.setData({ this.setData({
formName: '', formName: '',
...@@ -43,11 +46,6 @@ Page({ ...@@ -43,11 +46,6 @@ Page({
appointmentDate: funcDate, appointmentDate: funcDate,
appointmentEndDate: endDate, appointmentEndDate: endDate,
}) })
console.log(this.data.formDate)
console.log(this.data.appointmentDate)
console.log(this.data.appointmentEndDate)
this.queryQuota() this.queryQuota()
}, },
...@@ -239,10 +237,20 @@ Page({ ...@@ -239,10 +237,20 @@ Page({
type: 0, type: 0,
}, },
success: (res) => { success: (res) => {
if (res.data && res.data.code == 500) {
wx.lin.showToast({
image: '/image/error.png',
title: res.data.msg,
})
} else {
this.setData({ this.setData({
appointmentComplete: true, appointmentComplete: true,
}) })
wx.lin.hideToast() wx.lin.hideToast()
}
}, },
fail: (err) => { fail: (err) => {
wx.lin.showToast({ wx.lin.showToast({
...@@ -257,9 +265,16 @@ Page({ ...@@ -257,9 +265,16 @@ Page({
this.setData({ this.setData({
appointmentComplete: false, appointmentComplete: false,
}) })
if (this.data.frompage == 'appointment') {
wx.redirectTo({
url: '/pages/mine/appointment/appointment?tab=' + this.data.optionsTab,
})
} else {
wx.navigateBack({ wx.navigateBack({
delta: 1 delta: 1,
}) })
}
}, },
// 预约入园查询返回剩余名额 // 预约入园查询返回剩余名额
...@@ -282,13 +297,13 @@ Page({ ...@@ -282,13 +297,13 @@ Page({
}, },
getNextDay(d, t) { getNextDay(d, t) {
console.log(d, t)//格式为---2019-02-13 3 console.log(d, t) //格式为---2019-02-13 3
d = new Date(d); d = new Date(d);
console.log(d)//格式为---Wed Feb 13 2019 08:00:00 GMT+0800 (中国标准时间) console.log(d) //格式为---Wed Feb 13 2019 08:00:00 GMT+0800 (中国标准时间)
d = +d + (1000 * 60 * 60 * 24) * t; d = +d + (1000 * 60 * 60 * 24) * t;
console.log(d)//格式为--时间戳1550275200000 console.log(d) //格式为--时间戳1550275200000
d = new Date(d); d = new Date(d);
console.log(d)//格式为---Sat Feb 16 2019 08:00:00 GMT+0800 (中国标准时间) console.log(d) //格式为---Sat Feb 16 2019 08:00:00 GMT+0800 (中国标准时间)
return App.modular.miment(new Date(d)).format("YYYY-MM-DD") //格式为"2019-02-16 00:00:00" return App.modular.miment(new Date(d)).format("YYYY-MM-DD") //格式为"2019-02-16 00:00:00"
}, },
......
pages/mine/appointment-ticket/appointment-ticket.js
...@@ -51,6 +51,16 @@ Page({ ...@@ -51,6 +51,16 @@ Page({
that.setData({ that.setData({
isDoing: false isDoing: false
}) })
if (response.data&&response.data.code == 500) {
wx.lin.showToast({
image: '/image/error.png',
title: response.data.msg,
})
} else {
wx.lin.showToast({ wx.lin.showToast({
image: '/image/success.png', image: '/image/success.png',
title: '取消成功', title: '取消成功',
...@@ -70,6 +80,10 @@ Page({ ...@@ -70,6 +80,10 @@ Page({
}) })
}, 2000); }, 2000);
}
} }
}) })
} else if (res.cancel) { } else if (res.cancel) {
...@@ -97,15 +111,13 @@ Page({ ...@@ -97,15 +111,13 @@ Page({
* 生命周期函数--监听页面加载 * 生命周期函数--监听页面加载
*/ */
onLoad: function (options) { onLoad: function (options) {
console.log('.............', options.detail)
let detail = JSON.parse(options.detail); let detail = JSON.parse(options.detail);
console.log(detail);
let yyDate = detail.subscribeDate ? Date.parse(detail.subscribeDate.replace(/-/, '/')) : 0 let yyDate = detail.subscribeDate ? Date.parse(detail.subscribeDate.replace(/-/, '/')) : 0
let nowStr=new Date().toLocaleString().substr(0,10)+" 00:00:00" let nowStr = new Date().toLocaleString().substr(0, 10) + " 00:00:00"
let now = Date.parse(nowStr) let now = Date.parse(nowStr)
console.log(yyDate, 'yyDateyyDateyyDateyyDateyyDate');
console.log(nowStr, 'nowStr');
console.log(now, 'now');
let isShowCancel = now <= yyDate let isShowCancel = now <= yyDate
this.setData({ this.setData({
......
pages/mine/appointment/appointment.js
...@@ -12,6 +12,7 @@ Page({ ...@@ -12,6 +12,7 @@ Page({
* 页面的初始数据 * 页面的初始数据
*/ */
data: { data: {
isLoading: false,
isFinished: false, isFinished: false,
option: {}, option: {},
isDoing: false, isDoing: false,
...@@ -84,6 +85,7 @@ Page({ ...@@ -84,6 +85,7 @@ Page({
} else { } else {
this.getList(type) this.getList(type)
} }
}, },
// 去使用 // 去使用
onOrderUse: function (event) { onOrderUse: function (event) {
...@@ -137,10 +139,10 @@ Page({ ...@@ -137,10 +139,10 @@ Page({
// 数据校验不通过 // 数据校验不通过
let that = this let that = this
console.log( ); console.log();
let funcItem = event.currentTarget.dataset.item let funcItem = event.currentTarget.dataset.item
console.log( funcItem,'jjjj' ); console.log(funcItem, 'jjjj');
let wxRequest = funcItem.wxRequest let wxRequest = funcItem.wxRequest
...@@ -182,9 +184,10 @@ Page({ ...@@ -182,9 +184,10 @@ Page({
url = '/pages/play/activity/activity' url = '/pages/play/activity/activity'
} else if (type == 1) { } else if (type == 1) {
// 夜间入园预约 // 夜间入园预约
url = '/pages/home/night-appointment/night-appointment' url = '/pages/home/night-appointment/night-appointment?frompage=appointment&tab=1'
} else if (type == 2) { } else if (type == 2) {
url = "/pages/commodity/room-appointment/room-appointment" // 房产预约
url = "/pages/commodity/room-appointment/room-appointment?frompage=appointment&tab=2"
} }
wx.navigateTo({ wx.navigateTo({
url: url url: url
...@@ -261,7 +264,10 @@ Page({ ...@@ -261,7 +264,10 @@ Page({
let that = this let that = this
wx.showLoading({ wx.showLoading({
title: '加载中', title: '加载中',
mask:true mask: true
})
this.setData({
isLoading: true
}) })
App.wxRequest({ App.wxRequest({
url: '/api/v1/activity/getMyActivityList', url: '/api/v1/activity/getMyActivityList',
...@@ -272,6 +278,9 @@ Page({ ...@@ -272,6 +278,9 @@ Page({
type: '1' type: '1'
}, },
success: function (res) { success: function (res) {
that.setData({
isLoading: false
})
wx.hideLoading({ wx.hideLoading({
success: (res) => {}, success: (res) => {},
}) })
...@@ -294,12 +303,13 @@ Page({ ...@@ -294,12 +303,13 @@ Page({
address: item.address, address: item.address,
num: item.number, num: item.number,
amount: item.totalMoney.toFixed(2), amount: item.totalMoney.toFixed(2),
wxRequest:item.wxRequest wxRequest: item.wxRequest
} }
tmpArr.push(obj) tmpArr.push(obj)
}) })
that.setData({ that.setData({
activityList: that.data.activityList.concat(tmpArr) activityList: that.data.activityList.concat(tmpArr),
isLoading: false
}) })
} }
}) })
...@@ -319,15 +329,19 @@ Page({ ...@@ -319,15 +329,19 @@ Page({
let that = this let that = this
wx.showLoading({ wx.showLoading({
title: '加载中', title: '加载中',
mask:true mask: true
})
this.setData({
isLoading: true
}) })
App.wxRequest({ App.wxRequest({
url: '/api/v1/subscribe/getList', url: '/api/v1/subscribe/getList',
data: { data: {
state: '', state: 1, //未过期 1,其他 空字符""
type: type //0 入园预约 1 看房预约 全部 空字符 type: type //0 入园预约 1 看房预约 全部 空字符
}, },
success: function (res) { success: function (res) {
wx.hideLoading({ wx.hideLoading({
success: (res) => {}, success: (res) => {},
}) })
...@@ -360,7 +374,8 @@ Page({ ...@@ -360,7 +374,8 @@ Page({
tmpArr.push(obj) tmpArr.push(obj)
}) })
that.setData({ that.setData({
data: tmpArr data: tmpArr,
isLoading: false
}) })
} }
}) })
......
pages/mine/appointment/appointment.wxml
...@@ -215,28 +215,29 @@ ...@@ -215,28 +215,29 @@
</view> </view>
<!-- 夜间入园预约、看房预约 --> <!-- 夜间入园预约、看房预约 -->
<view class="myAppointment-body" wx:if="{{data.length > 0 && active !== 0}}"> <view class="myAppointment-body" wx:if="{{data.length > 0 && active !== 0}}">
<view class="myAppointment-item" wx:for="{{data}}" wx:key="index" data-item="{{item}}" bindtap="gohotelAccommodation"> <view class="myAppointment-item" wx:for="{{data}}" wx:key="index" data-item="{{item}}"
bindtap="gohotelAccommodation">
<image src="{{item.url}}" class="item-img"></image> <image src="{{item.url}}" class="item-img"></image>
<view class="item-content"> <view class="item-content">
<view class="item-title {{item.type == 0 ?'item-num-1' : ''}}">{{item.title}}</view> <view class="item-title {{item.type == 0 ?'item-num-1' : ''}}">{{item.title}}</view>
<view class="item-time {{item.type == 1 ?'item-time-1' : ''}}">预约时间 {{item.time}}</view> <view class="item-time {{item.type == 1 ?'item-time-1' : ''}}">预约时间 {{item.time}}</view>
<view wx:if="{{item.type == 0}}" class="item-num">预约人数 {{item.num}}人</view> <view wx:if="{{item.type == 0}}" class="item-num">预约人数 {{item.num}}人</view>
</view> </view>
<view class="button" >预约凭证</view> <view class="button">预约凭证</view>
</view> </view>
</view> </view>
</view> </view>
<view class="noActive" wx:if="{{data.length === 0 && active === 1}}"> <view class="noActive" wx:if="{{data.length === 0 && active === 1&&!isLoading}}">
<view class="noActive-title">暂无夜间入园预约</view> <view class="noActive-title">暂无夜间入园预约</view>
<view class="noActive-rule">20:00后入园需要提前预约，每日限流200人</view> <view class="noActive-rule">20:00后入园需要提前预约，每日限流200人</view>
<view class="noActive-botton" data-index="1" bindtap="goAppoint">去预约</view> <view class="noActive-botton" data-index="1" bindtap="goAppoint">去预约</view>
</view> </view>
<view class="noActive" wx:if="{{data.length === 0 && active === 2}}"> <view class="noActive" wx:if="{{data.length === 0 && active === 2&&!isLoading}}">
<view class="noActive-title">暂无看房预约</view> <view class="noActive-title">暂无看房预约</view>
<view class="noActive-botton" data-index="2" bindtap="goAppoint">去预约</view> <view class="noActive-botton" data-index="2" bindtap="goAppoint">去预约</view>
</view> </view>
<!-- 主题活动数据为空 --> <!-- 主题活动数据为空 -->
<view class="noActive" wx:if="{{activityList.length === 0 && active === 0}}"> <view class="noActive" wx:if="{{activityList.length === 0 && active === 0&&!isLoading}}">
<view class="noActive-title">暂无活动预约</view> <view class="noActive-title">暂无活动预约</view>
<view class="noActive-botton" data-index="0" bindtap="goAppoint">去预约</view> <view class="noActive-botton" data-index="0" bindtap="goAppoint">去预约</view>
</view> </view>
......
pages/mine/home/home.js
...@@ -185,7 +185,7 @@ Page({ ...@@ -185,7 +185,7 @@ Page({
let list = res.data.map(item => { let list = res.data.map(item => {
let shopFilter = that.data.shopConfig.filter(k => { let shopFilter = that.data.shopConfig.filter(k => {
return k.name.toLowerCase() == item.officeName.toLowerCase() return k.name.toLowerCase() == item.officeName.toLowerCase() || item.officeName.toLowerCase().indexOf(k.name.toLowerCase()) != -1
}) })
item.logo = shopFilter.length > 0 ? shopFilter[0].logo : '' item.logo = shopFilter.length > 0 ? shopFilter[0].logo : ''
if (item.smOrderDetails.length > 3) { if (item.smOrderDetails.length > 3) {
...@@ -412,10 +412,11 @@ Page({ ...@@ -412,10 +412,11 @@ Page({
App.wxRequest({ App.wxRequest({
url: '/api/v1/activity/getMyActivityList', url: '/api/v1/activity/getMyActivityList',
data: { data: {
activeState: '1', enrollState:2,//待使用
activeState: '1',//""全部 0 未开始 1进行中 2已结束
pageSize: -1, pageSize: -1,
pageNo: 1, pageNo: 1,
type: 1 type: 1 ,//0 影片 1 活动
}, },
success: function (res) { success: function (res) {
let list = res.data.list let list = res.data.list
......
pages/mine/order/order.js
...@@ -67,7 +67,7 @@ Page({ ...@@ -67,7 +67,7 @@ Page({
}) })
wx.showLoading({ wx.showLoading({
title: '加载中', title: '加载中',
mask:true mask: true
}) })
App.wxRequest({ App.wxRequest({
url: '/api/v1/order/getOrderList', url: '/api/v1/order/getOrderList',
...@@ -134,6 +134,12 @@ Page({ ...@@ -134,6 +134,12 @@ Page({
funcItem.shopAppId = App.globalData.shopId[i].appId funcItem.shopAppId = App.globalData.shopId[i].appId
funcItem.shopLogo = App.globalData.shopId[i].logo funcItem.shopLogo = App.globalData.shopId[i].logo
break break
} else if (funcItem.shopName.toLowerCase().indexOf(App.globalData.shopId[i].name.toLowerCase()) != -1) {
// 5D星空影院
funcItem.shopId = App.globalData.shopId[i].id
funcItem.shopAppId = App.globalData.shopId[i].appId
funcItem.shopLogo = App.globalData.shopId[i].logo
break
} }
} }
funcList.push(funcItem) funcList.push(funcItem)
......
pages/pay/order-comment/order-comment.js
...@@ -205,30 +205,43 @@ Page({ ...@@ -205,30 +205,43 @@ Page({
* @returns * @returns
*/ */
eventImageAdd: function (event) { eventImageAdd: function (event) {
console.log(event.detail, '新增------')
let that = this let that = this
let imgUrl = event.detail.all[0].url
let imgUrls = []
imgUrls.push(imgUrl)
this.setData({
imgUrls
})
// let imgUrl = event.detail.all[0].url
console.log(event, '8989');
let imgUrls = event.detail.all
let urlArr = []
imgUrls.forEach(item => {
urlArr.push(item.url)
})
// imgUrls.push(imgUrl)
// this.setData({
// imgUrls
// })
for (let i = 0; i < urlArr.length; i++) {
wx.showLoading({
title: '上传中',
mask: true
})
wx.uploadFile({ wx.uploadFile({
url: App.globalData.baseUrl + '/api/v1/common/upload', url: App.globalData.baseUrl + '/api/v1/common/upload',
filePath: imgUrl, filePath: urlArr[i],
name: 'file', name: 'file',
header: { header: {
'Content-Type': 'multipart/form-data', 'Content-Type': 'multipart/form-data',
'token': App.globalData.token 'token': App.globalData.token
}, },
success: function (res) { success: function (res) {
wx.hideLoading({
success: (res) => {},
})
console.log(res, '9999');
let data = typeof (res.data) == 'string' ? JSON.parse(res.data) : res.data let data = typeof (res.data) == 'string' ? JSON.parse(res.data) : res.data
that.data.fileResults.push(data.data.fileUrl) that.data.fileResults.push(data.data.fileUrl[0])
} }
}) })
}
}, },
/** /**
* 移除评价图片 * 移除评价图片
......
pages/pay/order-comment/order-comment.wxml
...@@ -80,9 +80,8 @@ ...@@ -80,9 +80,8 @@
<view class="order-comment"> <view class="order-comment">
<l-textarea cursor-spacing="100" placeholder="您的评价与建议，会让园区做的更好" placeholder-style="color: #C2C7CF" maxlength="200" <l-textarea cursor-spacing="100" placeholder="您的评价与建议，会让园区做的更好" placeholder-style="color: #C2C7CF" maxlength="200"
l-class="l-textarea" border="{{false}}" bind:linconfirm="eventInputDone" /> l-class="l-textarea" border="{{false}}" bind:linconfirm="eventInputDone" />
<view class="order-picker"> <view class="order-picker">
<l-image-picker l-item-class="l-image-item" l-class="l-picker" count="9" size="3" size-type="compressed" <l-image-picker size-type="compressed" preview="{{true}}" l-item-class="l-image-item" l-class="l-picker" count="9" size="3" size-type="compressed"
custom="{{true}}" bind:linchange="eventImageAdd" bind:linremove="eventImageRemove" custom="{{true}}" bind:linchange="eventImageAdd" bind:linremove="eventImageRemove"
bind:linpreview="eventImagePreview"> bind:linpreview="eventImagePreview">
<view class="col con-c align-c"> <view class="col con-c align-c">
......
pages/pay/order-detail/order-detail.js
...@@ -211,7 +211,7 @@ Page({ ...@@ -211,7 +211,7 @@ Page({
'commodity': [], 'commodity': [],
'tipOrderNo': funcResponse.orderSerialNumber, // 订单编号 'tipOrderNo': funcResponse.orderSerialNumber, // 订单编号
'tipTimeSubmit': funcResponse.createDate, 'tipTimeSubmit': funcResponse.createDate,
'tipTimePay': App.modular.miment(funcResponse.paymentTime).format('YYYY-MM-DD hh:mm:ss'), 'tipTimePay': funcResponse.paymentTime ? App.modular.miment(funcResponse.paymentTime).format('YYYY-MM-DD hh:mm:ss') : '',
'tipIntegral': funcResponse.integral, 'tipIntegral': funcResponse.integral,
'officeName': funcResponse.officeName, 'officeName': funcResponse.officeName,
'wxRequest': funcResponse.wxRequest, 'wxRequest': funcResponse.wxRequest,
...@@ -223,11 +223,11 @@ Page({ ...@@ -223,11 +223,11 @@ Page({
let shopName = funcResponse.officeName; let shopName = funcResponse.officeName;
let shopFilter = this.data.shopConfig.filter( let shopFilter = this.data.shopConfig.filter(
item => { item => {
return item.name.toLowerCase() == shopName.toLowerCase() return item.name.toLowerCase() == shopName.toLowerCase() || shopName.toLowerCase().indexOf(item.name.toLowerCase()) != -1
} }
) )
funcOrderInfo.shopInfo = shopFilter[0] funcOrderInfo.shopInfo = shopFilter[0]
console.log(shopFilter[0], '-----------shopFilter[0]------');
// 添加订单商品列表 // 添加订单商品列表
let funcCommodity = funcResponse.smOrderDetails let funcCommodity = funcResponse.smOrderDetails
for (let i = 0, l = funcCommodity.length; i < l; i++) { for (let i = 0, l = funcCommodity.length; i < l; i++) {
......
pages/pay/order-detail/order-detail.wxml
...@@ -24,10 +24,9 @@ ...@@ -24,10 +24,9 @@
<text>订单已过期</text> <text>订单已过期</text>
</view> </view>
<view class="state-content-tip row"> <view class="state-content-tip row">
<text>有效期xxx-xxx</text> <text>有效期 {{orderInfo.expireTime}}</text>
</view> </view>
</view> </view>
<view class="state-content state-content-invalid col con-c" wx:if="{{orderInfo.state === -1}}"> <view class="state-content state-content-invalid col con-c" wx:if="{{orderInfo.state === -1}}">
<view class="state-content-title row"> <view class="state-content-title row">
<text>订单已取消</text> <text>订单已取消</text>
...@@ -36,7 +35,6 @@ ...@@ -36,7 +35,6 @@
<text>下单后15分钟内未付款，自动取消订单</text> <text>下单后15分钟内未付款，自动取消订单</text>
</view> --> </view> -->
</view> </view>
<view class="state-content state-content-invalid col con-c" wx:if="{{orderInfo.state === 6}}"> <view class="state-content state-content-invalid col con-c" wx:if="{{orderInfo.state === 6}}">
<view class="state-content-title row"> <view class="state-content-title row">
<text>订单已评价</text> <text>订单已评价</text>
...@@ -185,7 +183,7 @@ ...@@ -185,7 +183,7 @@
<view class="info-content col con-c"> <view class="info-content col con-c">
<view class="info-content-item row"> <view class="info-content-item row">
<text class="info-content-item-label">电影</text> <text class="info-content-item-label">电影</text>
<text class="info-content-item-title">儿童营地</text> <text class="info-content-item-title">{{}}</text>
</view> </view>
<view class="info-content-item row"> <view class="info-content-item row">
<text class="info-content-item-label">场次</text> <text class="info-content-item-label">场次</text>
...@@ -193,11 +191,11 @@ ...@@ -193,11 +191,11 @@
</view> </view>
<view class="info-content-item row"> <view class="info-content-item row">
<text class="info-content-item-label">订单信息</text> <text class="info-content-item-label">订单信息</text>
<text class="info-content-item-tip">姓名</text> <text class="info-content-item-tip">{{rderInfo.contactName}}</text>
</view> </view>
<view class="info-content-item row"> <view class="info-content-item row">
<text class="info-content-item-label"></text> <text class="info-content-item-label"></text>
<text class="info-content-item-tip">18030303030</text> <text class="info-content-item-tip">{{rderInfo.contactPhone}}</text>
</view> </view>
<image wx:if="{{orderInfo.state!==2}}" class="seal-shot" src="{{resourcesBase+orderInfo.shopInfo.print}}"> <image wx:if="{{orderInfo.state!==2}}" class="seal-shot" src="{{resourcesBase+orderInfo.shopInfo.print}}">
</image> </image>
...@@ -236,7 +234,6 @@ ...@@ -236,7 +234,6 @@
<view class="logo-box"> <view class="logo-box">
<image src="{{resourcesBase + orderInfo.shopInfo.logo}}" mode="aspectFit"></image> <image src="{{resourcesBase + orderInfo.shopInfo.logo}}" mode="aspectFit"></image>
</view> </view>
<text>{{orderInfo.officeName}}</text> <text>{{orderInfo.officeName}}</text>
</view> </view>
<block wx:for="{{orderInfo.commodity}}" wx:for-index="index" wx:for-item="item" wx:key="index"> <block wx:for="{{orderInfo.commodity}}" wx:for-index="index" wx:for-item="item" wx:key="index">
...@@ -284,6 +281,7 @@ ...@@ -284,6 +281,7 @@
wx:if="{{orderInfo.state !== 0 && orderInfo.state !== -1&&orderInfo.tipIntegral}}">{{'获得积分：' + (orderInfo.tipIntegral?orderInfo.tipIntegral:'')}}</text> wx:if="{{orderInfo.state !== 0 && orderInfo.state !== -1&&orderInfo.tipIntegral}}">{{'获得积分：' + (orderInfo.tipIntegral?orderInfo.tipIntegral:'')}}</text>
</view> </view>
</view> </view>
</view> </view>
<!-- 多张 扫码弹窗 --> <!-- 多张 扫码弹窗 -->
...@@ -347,6 +345,7 @@ ...@@ -347,6 +345,7 @@
</view> </view>
</view> </view>
</view> </view>
<!-- 底部按钮 --> <!-- 底部按钮 -->
<view class="footer-btn row con-e" wx:if="{{orderInfo.state !== 2}}"> <view class="footer-btn row con-e" wx:if="{{orderInfo.state !== 2}}">
<!-- 状态(-1已取消，0未付款，1未发货，2待使用，3已使用，4已过期，5已发货，6已关闭/已评价) --> <!-- 状态(-1已取消，0未付款，1未发货，2待使用，3已使用，4已过期，5已发货，6已关闭/已评价) -->
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment