miniprogram / teamshop · 提交

转到一个项目

作者 Lijianheng
提交 2928e309969939ea41f8b3987e533a4a68b6b109 1 个父辈 6e06e5d8

更新个人中心

内嵌 并排对比
正在显示 11 个修改的文件 包含 387 行增加 和 140 行删除
... ... @@ -30,7 +30,7 @@ Page({
}
let header = {
"XX-Token": '123123',
"XX-Token": wx.getStorageSync('token'),
"XX-Device-Type": 'wxapp'
}
app.post(url, params, header).then((res) => {
... ... @@ -60,26 +60,25 @@ Page({
address_id: id
}
let header = {
"XX-Token": '123123',
"XX-Token": wx.getStorageSync('token'),
"XX-Device-Type": 'wxapp'
}
app.post(url, params, header).then((res) => {
console.log(res)
if (res == '') {
// if (res == '') {
// wx.showToast({
// title: '删除成功',
// icon: 'none'
// })
wx.showToast({
title: '删除成功',
icon: 'none'
})
setTimeout(function () {
that.getaddresslist()
}, 1000)
}
// console.log('删除功能'+res);
// that.setData({
// address_id: res.list
// })
}).catch((err) => {
... ...
... ... @@ -76,23 +76,23 @@ Page({
address_id: that.data.address_id
}
let header = {
"XX-Token": '123123',
"XX-Token": wx.getStorageSync('token'),
"XX-Device-Type": 'wxapp'
}
app.post(url, params, header).then((res) => {
console.log(res);
// 列表值
that.setData({
addressEdit: res,
region: [res.province, res.city, res.county],
province: res.province,
name: res.name,
mobile: res.mobile,
status: res.status,
province: res.province,
city: res.city,
county: res.city,
address: res.address,
addressEdit: res.data,
region: [res.data.province, res.data.city, res.data.county],
province: res.data.province,
name: res.data.name,
mobile: res.data.mobile,
status: res.data.status,
province: res.data.province,
city: res.data.city,
county: res.data.city,
address: res.data.address,
})
... ... @@ -123,7 +123,7 @@ Page({
address: that.data.address
}
let header = {
"XX-Token": '123123',
"XX-Token": wx.getStorageSync('token'),
"XX-Device-Type": 'wxapp'
}
app.post(url, params, header).then((res) => {
... ...
... ... @@ -48,14 +48,14 @@ Page({
}
let header = {
"XX-Token": '123123',
"XX-Token": wx.getStorageSync('token'),
"XX-Device-Type": 'wxapp'
}
app.post(url, params, header).then((res) => {
console.log(res);
// 列表值
that.setData({
collectList: res.list
collectList: res.data.list
})
console.log(that.data.collectList)
... ...
... ... @@ -58,7 +58,7 @@
{{item.text_content}}
</view>
</view>
<!-- 右下右 -->
<!-- 右下 -->
<view class='right_bottom_rig'>
立即参团
</view>
... ... @@ -80,7 +80,7 @@
</view>
</view>
<view class='mid_item'>
<!-- <view class='mid_item'>
<!-- 顶部 -->
<view class='mid_item_top'>
<!-- 左边 -->
... ... @@ -156,6 +156,6 @@
智利进口，绿色健康，硕大饱满
</view>
</view>
</view>
<!-- </view> -->
</view>
</view>
\ No newline at end of file
... ...
... ... @@ -36,7 +36,7 @@
flex-flow: column;
}
.top_left_pic{
width: 208rpx;
width: 202rpx;
height: 160rpx;
display: flex;
}
... ...
const app = getApp();
var that;
Page({
/**
* 页面的初始数据
*/
data: {
images: [],
uploadedImages: [],
goods_id: '',
text: '',
img: [],
eOrder: '',
},
/**
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
that = this
// this.evaluateOrder()
},
submitComment() {
let that = this;
let url = 'user/index/message';
let params = {
goods_id : that.data.goods_id,
text : that.data.text,
img : that.data.img.join(",")
}
let header = {
"XX-Token": wx.getStorageSync('token'),
"XX-Device-Type": 'wxapp'
}
app.post(url, params, header).then((res) => {
console.log(res);
// 获取值
that.setData({
eOrder: res.data
})
}).catch((err) => {
})
},
//----- 上传图片 -----
//选择图片
chooseImage: function () {
// 选择图片
wx.chooseImage({
count: 3, // 默认9
sizeType: ['compressed'],
sourceType: ['album', 'camera'],
// 可以指定来源是相册还是相机，默认二者都有
success: function (res) {
// 返回选定照片的本地文件路径列表，tempFilePath可以作为img标签的src属性显示图片
var tempFilePaths = res.tempFilePaths;
that.setData({
images: that.data.images.concat(tempFilePaths)
});
}
})
},
// 图片预览
previewImage: function (e) {
console.log(this.data.images);
var current = e.target.dataset.src
wx.previewImage({
current: current,
urls: this.data.images
})
},
submit: function () {
// // 提交图片，事先遍历图集数组
// that.data.images.forEach(function (tempFilePath) {
// new AV.File('file-name', {
// blob: {
// uri: tempFilePath,
// },
// }).save().then(
// // file => console.log(file.url())
// function (file) {
// // 先读取
// var uploadedImages = that.data.uploadedImages;
// uploadedImages.push(file.url());
// // 再写入
// that.setData({
// uploadedImages: uploadedImages
// }); console.log(uploadedImages);
// }
// ).catch(console.error);
// });
// wx.showToast({
// title: '评价成功', success: function () {
// wx.navigateBack();
// }
// });
},
delete: function (e) {
var index = e.currentTarget.dataset.index;
var images = that.data.images;
images.splice(index, 1);
that.setData({
images: images
});
},
/**
... ...
... ... @@ -11,8 +11,17 @@
</view>
<!-- 图片 -->
<view class='top_item'>
<view class='top_item_pic'>
<!-- <view class='top_item_pic' bindtap='chooseImage'>
<image src='../../../img/tianjiatupian@2x.png'></image>
</view> -->
<view class="top_item_pic" wx:for="{{images}}" wx:key="">
<image src="{{item}}" data-src="{{item}}" bindtap="previewImage" mode="aspectFill" />
<!-- 删除按钮 -->
<view class="delete" bindtap="delete" data-index="{{index}}">X</view>
</view>
<view class="top_item_pic" bindtap="chooseImage">
<image src='../../../img/tianjiatupian@3x.png'></image>
</view>
</view>
... ... @@ -20,7 +29,7 @@
</view>
<view class='bottom'>
<view class='bottom_btn'>
<view class='bottom_btn' bindtap='submitComment'>
发表评价
</view>
</view>
... ...
... ... @@ -40,6 +40,7 @@ page{
display: flex;
margin-top: 30rpx;
margin-right: 40rpx;
position: relative;
}
.top_item_pic image{
width: 100%;
... ... @@ -73,3 +74,9 @@ page{
font-weight:600;
color:rgba(255,255,255,1);
}
.delete{
position: absolute;
right: 10rpx;
top: -3rpx;
font-size: 30rpx;
}
\ No newline at end of file
... ...
... ... @@ -33,13 +33,29 @@ Page({
orderList: '',
page: 1,
status: 0,
toCancel: false
toCancel: false,
delect_order: false,
//倒计时
countDownList: [],
actEndTimeList: []
},
/**
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
// let endTimeList = [];
// // 将活动的结束时间参数提成一个单独的数组，方便操作
// goodsList.forEach(o => { endTimeList.push(o.actEndTime) })
// this.setData({ actEndTimeList: endTimeList });
// // 执行倒计时函数
// this.countDown();
this.myOrder()
console.log(options)
if (options.id == 1) {
... ... @@ -64,6 +80,13 @@ Page({
})
}
},
timeFormat(param) {//小于10的格式化函数
return param < 10 ? '0' + param : param;
},
// 我的订单
myOrder() {
let that = this;
... ... @@ -79,6 +102,7 @@ Page({
}
app.post(url, params, header).then((res) => {
console.log(res);
// 列表值
that.setData({
orderList: res.data.list
... ... @@ -93,6 +117,95 @@ Page({
})
},
countDown() {//倒计时函数
// 获取当前时间，同时得到活动结束时间数组
let newTime = new Date().getTime();
let endTimeList = this.data.actEndTimeList;
let countDownArr = [];
// 对结束时间进行处理渲染到页面
endTimeList.forEach(o => {
let endTime = new Date(o).getTime();
let obj = null;
// 如果活动未结束，对时间进行处理
if (endTime - newTime > 0) {
let time = (endTime - newTime) / 1000;
// 获取天、时、分、秒
let day = parseInt(time / (60 * 60 * 24));
let hou = parseInt(time % (60 * 60 * 24) / 3600);
let min = parseInt(time % (60 * 60 * 24) % 3600 / 60);
let sec = parseInt(time % (60 * 60 * 24) % 3600 % 60);
obj = {
day: this.timeFormat(day),
hou: this.timeFormat(hou),
min: this.timeFormat(min),
sec: this.timeFormat(sec)
}
} else {//活动已结束，全部设置为'00'
obj = {
day: '00',
hou: '00',
min: '00',
sec: '00'
}
}
countDownArr.push(obj);
})
// // 渲染，然后每隔一秒执行一次倒计时函数
// this.setData({ countDownList: countDownArr })
// setTimeout(this.countDown, 1000);
},
// 倒计时功能
// timeFunc(num) {
// //let number = res.compare.surplus_time;
// // 时间戳处理
// var totalSecond = num;
// var interval = setInterval(function () {
// // 秒数
// var second = totalSecond;
// // 天数位
// var day = Math.floor(second / 3600 / 24);
// var dayStr = day.toString();
// if (dayStr.length == 1) dayStr = '0' + dayStr;
// // 小时位
// var hr = Math.floor((second - day * 3600 * 24) / 3600);
// var hrStr = hr.toString();
// if (hrStr.length == 1) hrStr = '0' + hrStr;
// // 分钟位
// var min = Math.floor((second - day * 3600 * 24 - hr * 3600) / 60);
// var minStr = min.toString();
// if (minStr.length == 1) minStr = '0' + minStr;
// // 秒位
// var sec = second - day * 3600 * 24 - hr * 3600 - min * 60;
// var secStr = sec.toString();
// if (secStr.length == 1) secStr = '0' + secStr;
// that.setData({
// days: dayStr,
// hours: hrStr,
// minutes: minStr,
// seconds: secStr,
// });
// totalSecond--;
// if (totalSecond <= 0) {
// clearInterval(interval);
// wx.showToast({
// title: '活动已结束',
// });
// // 倒计时结束
// that.countDown();
// that.setData({
// days: '00',
// hours: '00',
// minutes: '00',
// seconds: '00',
// });
// }
// }.bind(this), 1000);
// },
navbarTap: function (e) {
... ... @@ -187,63 +300,36 @@ Page({
}
},
//评价按钮
btn_eOrder() {
btn_eOrder(e) {
console.log(e);
let id=e.currentTab.dataset.id
wx.navigateTo({
url: '/pages/mine/eOrder/eOrder',
url: '/pages/mine/eOrder/eOrder?id='+id,
})
},
// 倒计时功能
timeFunc(num) {
//let number = res.compare.surplus_time;
// 时间戳处理
var totalSecond = num;
var interval = setInterval(function () {
// 秒数
var second = totalSecond;
// 天数位
var day = Math.floor(second / 3600 / 24);
var dayStr = day.toString();
if (dayStr.length == 1) dayStr = '0' + dayStr;
// 小时位
var hr = Math.floor((second - day * 3600 * 24) / 3600);
var hrStr = hr.toString();
if (hrStr.length == 1) hrStr = '0' + hrStr;
// 分钟位
var min = Math.floor((second - day * 3600 * 24 - hr * 3600) / 60);
var minStr = min.toString();
if (minStr.length == 1) minStr = '0' + minStr;
// 秒位
var sec = second - day * 3600 * 24 - hr * 3600 - min * 60;
var secStr = sec.toString();
if (secStr.length == 1) secStr = '0' + secStr;
that.setData({
days: dayStr,
hours: hrStr,
minutes: minStr,
seconds: secStr,
});
totalSecond--;
if (totalSecond <= 0) {
clearInterval(interval);
wx.showToast({
title: '活动已结束',
});
// 倒计时结束
that.countDown();
that.setData({
days: '00',
hours: '00',
minutes: '00',
seconds: '00',
});
}
}.bind(this), 1000);
// 删除订单
// delectOrder(){
// this.setData({
// delect_order:true
// })
// },
// toDelect(){
// this.setData({
// delect_order:false
// })
// },
toDelect(){
this.setData({
delect_order:true
})
},
toDelect_close(){
this.setData({
delect_order:false
})
},
// 取消订单
cancelOrder() {
... ...
... ... @@ -10,7 +10,9 @@
<!-- 中部 -->
<view class='mid'>
<view class="nodata" wx:if='{{orderList.length==0}}'>暂无数据</view>
<!-- 全部 -->
<block wx:else>
<view class='mid_item' wx:if='{{currentTab == 0}}' wx:for='{{orderList}}' wx:key=''>
<!-- 上 -->
<view class='mid_item_top'>
... ... @@ -36,7 +38,7 @@
<!-- 图片 -->
<view class='mid_left_pic'>
<!-- <image src='../../../img/goods_1.png'></image>-->
<image src='../../../img/goods_1.png'></image>
<image src='{{item.thumb}}'></image>
</view>
<!-- 文字 -->
<view class='mid_left_text'>
... ... @@ -55,13 +57,15 @@
</view>
<!-- 百分比 -->
<view class='mid_right_m'>
<view class='right_m_left'>
<view class='right_m_left_content' ></view>
</view>
<!-- <view class='right_m_left'> -->
<!-- <view class='right_m_left_content' style="width:{{item.percent}}"></view> -->
<view class='right_m_right'>
42%
</view>
<progress percent="{{item.percent}}" show-info color="#B5DE96" border-radius="8" font-size="24rpx" stroke-width="16rpx" />
<!-- </view> -->
<!-- <view class='right_m_right'>
{{item.percent}}%
</view> -->
</view>
<!-- 拼团份数 -->
<view class='mid_right_bottom'>
... ... @@ -69,7 +73,7 @@
已拼{{item.numb}}份，目标{{item.group}}份
</view>
<view class='mid_right_bottom_rig'>
x4
{{item.goods_numb}}
</view>
</view>
... ... @@ -81,12 +85,26 @@
共2件商品,实付
<span class='color_red'>￥52</span>
</view>
<view class='mid_item_bottom_rig'>
<view class='mid_item_bottom_rig' wx:if="{{item.goods_status==2}}">
<view class='bottom_btn_left' bindtap='cancelOrder'>取消订单</view>
<view class='bottom_btn_right'>立即付款</view>
</view>
<view wx:if="{{item.goods_status==1}}">
<view class='mid_item_bottom_rig' wx:if="{{item.message_id==0}}">
<view class='bottom_btn_left' bindtap='cancelOrder'>去评价</view>
<view class='bottom_btn_right'>确认订单</view>
</view>
<view class='mid_item_bottom_rig' wx:else>
<view class='bottom_btn_left' bindtap='cancelOrder'>删除</view>
</view>
</view>
</view>
</view>
</block>
<!-- 待付款 -->
<view class='mid_item' wx:if='{{currentTab == 1}}' wx:for='{{orderList}}' wx:key=''>
<!-- 上 -->
... ... @@ -113,7 +131,7 @@
<!-- 图片 -->
<view class='mid_left_pic'>
<!-- <image src='../../../img/goods_1.png'></image>-->
<image src='../../../img/goods_1.png'></image>
<image src='{{item.thumb}}'></image>
</view>
<!-- 文字 -->
<view class='mid_left_text'>
... ... @@ -126,8 +144,8 @@
<view class='right_top_lef'>{{item.shop_name}}</view>
<view class='right_top_rig'>
<span class='price_small'>￥</span>
<span class='font_big'>50</span>
<span class='font_small'>.00</span>
<span class='font_big'>{{item.money_sale}}</span>
<!-- <span class='font_small'>.00</span> -->
</view>
</view>
<!-- 百分比 -->
... ... @@ -146,7 +164,7 @@
已拼{{item.numb}}份，目标{{item.group}}份
</view>
<view class='mid_right_bottom_rig'>
x4
{{item.goods_numb}}
</view>
</view>
... ... @@ -159,7 +177,7 @@
<span class='color_red'>￥52</span>
</view>
<view class='mid_item_bottom_rig'>
<view class='bottom_btn_left' bindtap='cancelOrder'>取消订单</view>
<view class='bottom_btn_left' bindtap='cancelOrder' >取消订单</view>
<view class='bottom_btn_right'>立即付款</view>
</view>
</view>
... ... @@ -189,7 +207,7 @@
<view class='mid_item_mid_left'>
<!-- 图片 -->
<view class='mid_left_pic'>
<image src='../../../img/goods_1.png'></image>
<image src='{{item.thumb}}'></image>
</view>
<!-- 文字 -->
<view class='mid_left_text'>
... ... @@ -222,7 +240,7 @@
已拼300份，目标500份
</view>
<view class='mid_right_bottom_rig'>
x4
{{item.goods_numb}}
</view>
</view>
... ... @@ -231,7 +249,7 @@
</view>
<!-- 待发货 -->
<view class='mid_item' wx:if='{{currentTab == 3}}'>
<view class='mid_item' wx:if='{{currentTab == 3}}' wx:for='{{orderList}}' wx:key=''>
<!-- 上 -->
<view class='mid_item_top'>
<!-- 订单号 -->
... ... @@ -242,12 +260,12 @@
</view>
<!-- 订单号 -->
<view class='top_left_text'>
订单号：1003828041
订单号：{{item.goods}}
</view>
</view>
<!-- 待发货 -->
<view class='mid_item_top_right'>
待发货
{{item.goods_status}}
</view>
</view>
<!-- 中 -->
... ... @@ -255,7 +273,7 @@
<view class='mid_item_mid_left'>
<!-- 图片 -->
<view class='mid_left_pic'>
<image src='../../../img/goods_1.png'></image>
<image src='{{item.thumb}}'></image>
</view>
<!-- 文字 -->
<view class='mid_left_text text_b'>
... ... @@ -265,11 +283,11 @@
<!-- 中——右边 -->
<view class='mid_item_mid_right'>
<view class='mid_right_top'>
<view class='right_top_lef'>纯进口有机菜花</view>
<view class='right_top_lef'>{{item.shop_name}}</view>
<view class='right_top_rig'>
<span class='price_small'>￥</span>
<span class='font_big'>52</span>
<span class='font_small'>.00</span>
<span class='font_big'>{{item.money_pay}}</span>
<!-- <span class='font_small'>.00</span> -->
</view>
</view>
... ... @@ -279,7 +297,7 @@
拼团成功
</view>
<view class='mid_right_bottom_rig'>
x4
{{item.goods_numb}}
</view>
</view>
... ... @@ -288,7 +306,10 @@
</view>
<!-- 待完成 -->
<view class='mid_item' wx:if='{{currentTab == 4}}'>
<view class='mid_item' wx:if='{{currentTab == 4}}' wx:for='{{orderList}}' wx:key=''>
<view class="nodata" wx:if="{{orderList.length==0}}">暂无数据</view>
<block wx:else >
<view wx:for='{{orderList}}'>
<!-- 上 -->
<view class='mid_item_top'>
<!-- 订单号 -->
... ... @@ -299,12 +320,12 @@
</view>
<!-- 订单号 -->
<view class='top_left_text'>
订单号：1003828041
订单号：{{item.goods}}
</view>
</view>
<!-- 待完成 -->
<view class='mid_item_top_right'>
待完成
{{item.goods_status}}
</view>
</view>
<!-- 中 -->
... ... @@ -312,7 +333,7 @@
<view class='mid_item_mid_left'>
<!-- 图片 -->
<view class='mid_left_pic'>
<image src='../../../img/goods_1.png'></image>
<image src='{{item.thumb}}'></image>
</view>
<!-- 文字 -->
<view class='mid_left_text text_b'>
... ... @@ -322,11 +343,11 @@
<!-- 中——右边 -->
<view class='mid_item_mid_right'>
<view class='mid_right_top'>
<view class='right_top_lef'>纯进口有机菜花</view>
<view class='right_top_lef'>{{item.shop_name}}</view>
<view class='right_top_rig'>
<span class='price_small'>￥</span>
<span class='font_big'>52</span>
<span class='font_small'>.00</span>
<span class='font_big'>{{item.money_pay}}</span>
<!-- <span class='font_small'>.00</span> -->
</view>
</view>
... ... @@ -336,7 +357,7 @@
拼团成功
</view>
<view class='mid_right_bottom_rig'>
x4
{{item.goods_numb}}
</view>
</view>
... ... @@ -353,8 +374,12 @@
</view>
</view>
</view>
</block>
</view>
<!-- 待评价 -->
<view class='mid_item' wx:if='{{currentTab == 5}}'>
<view class='mid_item' wx:if='{{currentTab == 5}}' wx:for='{{orderList}}' wx:key=''>
<!-- 上 -->
<view class='mid_item_top' >
<!-- 订单号 -->
... ... @@ -365,12 +390,12 @@
</view>
<!-- 订单号 -->
<view class='top_left_text'>
订单号：1003828041
订单号：{{item.goods}}
</view>
</view>
<!-- 待评价 -->
<view class='mid_item_top_right'>
待评价
{{item.goods_status}}
</view>
</view>
<!-- 中 -->
... ... @@ -378,7 +403,7 @@
<view class='mid_item_mid_left'>
<!-- 图片 -->
<view class='mid_left_pic'>
<image src='../../../img/goods_1.png'></image>
<image src='{{item.thumb}}'></image>
</view>
<!-- 文字 -->
<view class='mid_left_text text_b'>
... ... @@ -388,11 +413,11 @@
<!-- 中——右边 -->
<view class='mid_item_mid_right'>
<view class='mid_right_top'>
<view class='right_top_lef'>纯进口有机菜花</view>
<view class='right_top_lef'>{{item.shop_name}}</view>
<view class='right_top_rig'>
<span class='price_small'>￥</span>
<span class='font_big'>52</span>
<span class='font_small'>.00</span>
<span class='font_big'>{{item.money_pay}}</span>
<!-- <span class='font_small'>.00</span> -->
</view>
</view>
... ... @@ -402,7 +427,7 @@
拼团成功
</view>
<view class='mid_right_bottom_rig'>
x4
{{item.goods_numb}}
</view>
</view>
... ... @@ -414,13 +439,13 @@
</view>
<view class='mid_item_bottom_rig'>
<view class='bottom_btn_left' bindtap='btn_eOrder'>去评价</view>
<view class='bottom_btn_left' bindtap='btn_eOrder' data-id="{{item.goods_id}}">去评价</view>
<view class='bottom_btn_right'>确认订单</view>
</view>
</view>
</view>
<!-- 已完成 -->
<view class='mid_item' wx:if='{{currentTab == 6}}'>
<view class='mid_item' wx:if='{{currentTab == 6}}' wx:for='{{orderList}}' wx:key=''>
<!-- 上 -->
<view class='mid_item_top'>
<!-- 订单号 -->
... ... @@ -431,12 +456,12 @@
</view>
<!-- 订单号 -->
<view class='top_left_text'>
订单号：1003828041
订单号：{{item.goods}}
</view>
</view>
<!-- 已完成 -->
<view class='mid_item_top_right color_text'>
已完成
{{item.goods_status}}
</view>
</view>
<!-- 中 -->
... ... @@ -444,7 +469,7 @@
<view class='mid_item_mid_left'>
<!-- 图片 -->
<view class='mid_left_pic'>
<image src='../../../img/goods_1.png'></image>
<image src='{{item.thumb}}'></image>
</view>
<!-- 文字 -->
<view class='mid_left_text text_b'>
... ... @@ -454,11 +479,11 @@
<!-- 中——右边 -->
<view class='mid_item_mid_right'>
<view class='mid_right_top'>
<view class='right_top_lef'>纯进口有机菜花</view>
<view class='right_top_lef'>{{item.shop_name}}</view>
<view class='right_top_rig'>
<span class='price_small'>￥</span>
<span class='font_big'>52</span>
<span class='font_small'>.00</span>
<span class='font_big'>{{item.money_pay}}</span>
<!-- <span class='font_small'>.00</span> -->
</view>
</view>
... ... @@ -468,7 +493,7 @@
拼团成功
</view>
<view class='mid_right_bottom_rig'>
x4
{{item.goods_numb}}
</view>
</view>
... ... @@ -486,7 +511,7 @@
</view>
</view>
<!-- 已取消 -->
<view class='mid_item' wx:if='{{currentTab == 7}}'>
<view class='mid_item' wx:if='{{currentTab == 7}}' wx:for='{{orderList}}' wx:key=''>
<!-- 上 -->
<view class='mid_item_top'>
<!-- 订单号 -->
... ... @@ -497,12 +522,12 @@
</view>
<!-- 订单号 -->
<view class='top_left_text'>
订单号：1003828041
订单号：{{item.goods}}
</view>
</view>
<!-- 已取消 -->
<view class='mid_item_top_right color_red'>
已取消
{{item.goods_status}}
</view>
</view>
<!-- 中 -->
... ... @@ -510,7 +535,7 @@
<view class='mid_item_mid_left'>
<!-- 图片 -->
<view class='mid_left_pic'>
<image src='../../../img/goods_1.png'></image>
<image src='{{item.thumb}}'></image>
</view>
<!-- 文字 -->
<view class='mid_left_text text_b'>
... ... @@ -520,11 +545,11 @@
<!-- 中——右边 -->
<view class='mid_item_mid_right'>
<view class='mid_right_top'>
<view class='right_top_lef'>纯进口有机菜花</view>
<view class='right_top_lef'>{{item.shop_name}}</view>
<view class='right_top_rig'>
<span class='price_small'>￥</span>
<span class='font_big'>52</span>
<span class='font_small'>.00</span>
<span class='font_big'>{{item.money_pay}}</span>
<!-- <span class='font_small'>.00</span> -->
</view>
</view>
... ... @@ -534,7 +559,7 @@
拼团成功
</view>
<view class='mid_right_bottom_rig'>
x4
{{item.goods_numb}}
</view>
</view>
... ... @@ -547,7 +572,7 @@
</view>
<view class='mid_item_bottom_rig'>
<view></view>
<view class='bottom_btn_delete'>删除</view>
<view class='bottom_btn_delete' bindtap='toDelect'>删除</view>
</view>
</view>
</view>
... ... @@ -566,3 +591,14 @@
</view>
</view>
</view>
<!-- 删除订单弹层 -->
<view class='mask' wx:if='{{delect_order}}'>
<view class='mask_mid'>
<view class='mask_mid_top'>您确定要删除吗?</view>
<view class='mask_mid_bottom'>
<view class='mask_mid_bottom_left'>确定</view>
<view class='mask_mid_bottom_right' bindtap='toDelect_close'>取消</view>
</view>
</view>
</view>
\ No newline at end of file
... ...
... ... @@ -307,6 +307,12 @@ page{
opacity:1;
}
progress {
width:370rpx;
color:#b5de96;
margin-top:24rpx;
}
.mask{
position: fixed;
... ... @@ -354,3 +360,7 @@ page{
text-align: center;
background: #EBEBEB;
}
.nodata{
margin-top: 20rpx;
font-size: 30rpx;
}
... ...