Skip to content

严立 / mini-shimao

Go to a project
Commit 5ffe5416 by wjw
Options

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

parents 2640c2fe c8efd7d4
Inline Side-by-side
Showing with 15 additions and 15 deletions
pages/mine/home/home.js
...@@ -78,7 +78,8 @@ Page({ ...@@ -78,7 +78,8 @@ Page({
isMonthCard: false, isMonthCard: false,
authInfo: null, authInfo: null,
goodTypeCountData: {}, goodTypeCountData: {},
enrollSubscribeData: {} enrollSubscribeData: {},
isLoadingOrder:true
}, },
// 去活动预约列表 // 去活动预约列表
...@@ -187,6 +188,9 @@ Page({ ...@@ -187,6 +188,9 @@ Page({
//获取待使用订单 //获取待使用订单
getWillUseOrders() { getWillUseOrders() {
let that = this let that = this
this.setData({
isLoadingOrder:true
})
App.wxRequest({ App.wxRequest({
url: '/api/v1/order/getOrderList', url: '/api/v1/order/getOrderList',
data: { data: {
...@@ -216,7 +220,8 @@ Page({ ...@@ -216,7 +220,8 @@ Page({
list.length = 1 list.length = 1
that.setData({ that.setData({
[orderList]: list, [orderList]: list,
orderListBackup: listBackUp orderListBackup: listBackUp,
isLoadingOrder:false
}) })
......
pages/mine/home/home.wxml
...@@ -207,7 +207,7 @@ ...@@ -207,7 +207,7 @@
</view> </view>
</view> </view>
<!-- more --> <!-- more -->
<view class="more row align-c con-c" bindtap="onShowMoreOrder"> <view class="more row align-c con-c" bindtap="onShowMoreOrder" wx:if="{{!isLoadingOrder}}">
<text wx:if="{{!showMoreOrder}}">展开更多</text> <text wx:if="{{!showMoreOrder}}">展开更多</text>
<text wx:else>收起</text> <text wx:else>收起</text>
<image wx:if="{{!showMoreOrder}}" src="{{imageBase + 'icon/arrow-b-2.png'}}"></image> <image wx:if="{{!showMoreOrder}}" src="{{imageBase + 'icon/arrow-b-2.png'}}"></image>
......
pages/pay/order-comment/order-comment.js
...@@ -207,18 +207,13 @@ Page({ ...@@ -207,18 +207,13 @@ Page({
eventImageAdd: function (event) { eventImageAdd: function (event) {
let that = this let that = this
// let imgUrl = event.detail.all[0].url let imgUrls = event.detail.current
console.log(event, '8989');
let imgUrls = event.detail.all
let urlArr = [] let urlArr = []
imgUrls.forEach(item => { imgUrls.forEach(item => {
urlArr.push(item.url) urlArr.push(item.url)
}) })
// imgUrls.push(imgUrl)
// this.setData({
// imgUrls
// })
for (let i = 0; i < urlArr.length; i++) { for (let i = 0; i < urlArr.length; i++) {
wx.showLoading({ wx.showLoading({
title: '上传中', title: '上传中',
...@@ -236,9 +231,9 @@ Page({ ...@@ -236,9 +231,9 @@ Page({
wx.hideLoading({ wx.hideLoading({
success: (res) => {}, 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[0]) that.data.fileResults.push(data.data.fileUrl[0])
} }
}) })
} }
......
pages/pay/order-detail/order-detail.wxml
...@@ -183,7 +183,7 @@ ...@@ -183,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">{{orderInfo.commodity[0].name}}</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>
...@@ -191,11 +191,11 @@ ...@@ -191,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">{{rderInfo.contactName}}</text> <text class="info-content-item-tip">{{orderInfo.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">{{rderInfo.contactPhone}}</text> <text class="info-content-item-tip">{{orderInfo.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>
......
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