theluyuan/deming
2
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Compare commits

base: theluyuan:2c6cdbead9577c09b766de0da6187455aadbf385
Branches Tags
theluyuan:master
theluyuan:qxf
theluyuan:zhy
theluyuan:xbx
theluyuan:gyh
theluyuan:xbx-new
theluyuan:zmr
theluyuan:cmx
theluyuan:lxb
..
compare: theluyuan:2a8ee65a945403a0accbed7107f2b6527fe78f20
Branches Tags
theluyuan:master
theluyuan:qxf
theluyuan:zhy
theluyuan:xbx
theluyuan:gyh
theluyuan:xbx-new
theluyuan:zmr
theluyuan:cmx
theluyuan:lxb

No commits in common. "2c6cdbead9577c09b766de0da6187455aadbf385" and "2a8ee65a945403a0accbed7107f2b6527fe78f20" have entirely different histories.
2c6cdbead9 ... 2a8ee65a94

9 changed files with 48 additions and 150 deletions
Show Stats Expand all files Collapse all files

3
components/mine/order-item/index.vue
View File

@ -25,7 +25,8 @@
</view> </view>
</view> </view>
<view class="order-btn" v-if="[1, 2, 3, 4, 8].indexOf(order.view_type) >= 0"> <view class="order-btn" v-if="[1, 2, 3, 4, 8].indexOf(order.view_type) >= 0">
<view class="cancel" v-if="order.view_type == 3 || order.view_type == 2" @click="toOtherPage('RefundOrder')">申请退款</view> <!-- @click="toOtherPage('RefundOrder')" -->
<view class="cancel" v-if="order.view_type == 3 || order.view_type == 2">申请退款</view>
<view class="cancel" v-if="order.view_type == 3" @click="toOtherPage('Logistics')">查看物流</view> <view class="cancel" v-if="order.view_type == 3" @click="toOtherPage('Logistics')">查看物流</view>
<view class="logistics" v-if="order.view_type == 3" @click="confirmReceive">确认收货</view> <view class="logistics" v-if="order.view_type == 3" @click="confirmReceive">确认收货</view>
<view class="comment" v-if="order.view_type == 4" @click="toOtherPage('Comment')">立即评价</view> <view class="comment" v-if="order.view_type == 4" @click="toOtherPage('Comment')">立即评价</view>

15
components/shop/group/index.vue
View File

@ -2,10 +2,7 @@
<view class="group"> <view class="group">
<view class="top"> <view class="top">
<text>全部拼团</text> <text>全部拼团</text>
<view class="more" @click="viewMore"> <text @click="viewMore">查看更多></text>
<text>查看更多</text>
<u-icon name="arrow-right" color="#999" size="22"></u-icon>
</view>
</view> </view>
<view class="label"> <view class="label">
<u-tabs-swiper ref="group" :list="classifyList" name="gc_name" :is-scroll="true" active-color="#FF780F" :current="current" font-size="24" :show-bar="false" @change="tabsChange" height="60"></u-tabs-swiper> <u-tabs-swiper ref="group" :list="classifyList" name="gc_name" :is-scroll="true" active-color="#FF780F" :current="current" font-size="24" :show-bar="false" @change="tabsChange" height="60"></u-tabs-swiper>
@ -91,12 +88,10 @@ export default {
font-size: 30rpx; font-size: 30rpx;
color: #333; color: #333;
} }
.more { >text:last-child{
font-size: 18rpx; font-size: 18rpx;
display: flex; color: #999;
align-items: center; }
color: #999;
}
} }
.list { .list {
box-sizing: border-box; box-sizing: border-box;

8
components/shop/list/index.vue
View File

@ -6,10 +6,10 @@
</view> </view>
<swiper class="swiper-box" :current="swiperCurrent" @transition="transition" @animationfinish="animationfinish" :style="{height: swiperHeight}"> <swiper class="swiper-box" :current="swiperCurrent" @transition="transition" @animationfinish="animationfinish" :style="{height: swiperHeight}">
<swiper-item class="swiper-item" v-for="(_, index) in classifyList" :key="index"> <swiper-item class="swiper-item" v-for="(_, index) in classifyList" :key="index">
<view class="goods-item" v-if="goodsList.length"> <view class="goods-item">
<item v-for="item in goodsList" :key="item.goods_id" :info="item"></item> <item v-for="item in goodsList" :key="item.goods_id" :info="item"></item>
</view> </view>
<u-empty text="暂无商品" mode="list" color="#000" margin-top="20" v-else></u-empty> <u-empty text="暂无商品" mode="list" color="#000" v-if="!goodsList.length"></u-empty>
</swiper-item> </swiper-item>
</swiper> </swiper>
<!-- 加载更多 --> <!-- 加载更多 -->
@ -138,13 +138,13 @@ export default {
height: 100%; height: 100%;
margin-bottom: 10rpx; margin-bottom: 10rpx;
.swiper-item { .swiper-item {
// height: 100%; height: 100%;
.goods-item { .goods-item {
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
justify-content: space-between; justify-content: space-between;
width: 100%; width: 100%;
// height: 100%; height: 100%;
overflow-y: scroll; overflow-y: scroll;
} }
} }

33
components/shop/recommend/index.vue
View File

@ -1,11 +1,8 @@
<template> <template>
<view class="recommend"> <view class="recommend">
<view class="top"> <view class="top">
<text>今日秒杀推荐</text> <text>{{ type == 'spike' ? '今日秒杀推荐' : '今日拼团推荐' }}</text>
<view class="more" @click="toOthersPage"> <text>点击查看更多></text>
<text>点击查看更多</text>
<u-icon name="arrow-right" color="#999" size="22"></u-icon>
</view>
</view> </view>
<view class="connect"> <view class="connect">
<view class="time" v-if="type == 'spike'"> <view class="time" v-if="type == 'spike'">
@ -35,26 +32,12 @@ export default {
props: ['recommendData', 'type'], props: ['recommendData', 'type'],
created() { created() {
this.info = this.recommendData; this.info = this.recommendData;
console.log(this.recommendData); // console.log(this.recommendData);
},
methods: {
toOthersPage() {
this.$u.route({
url: 'pageB/sdetails/index',
params: {
id: this.recommendData.groupbuy_id,
type: 3,
}
})
}
} }
} }
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.recommend{ .recommend{
margin-bottom: 20rpx;
padding: 0 30rpx;
background-color: #ffffff;
.top{ .top{
height: 90rpx; height: 90rpx;
display: flex; display: flex;
@ -64,14 +47,12 @@ export default {
font-size: 30rpx; font-size: 30rpx;
color: #333; color: #333;
} }
.more { >text:last-child{
display: flex; font-size: 18rpx;
align-items: center; color: #999;
color: #999; }
}
} }
.connect{ .connect{
padding: 15rpx;
display: flex; display: flex;
.time{ .time{
display: flex; display: flex;

16
components/shop/recommend/pintuan.vue
View File

@ -2,10 +2,7 @@
<view class="recommend"> <view class="recommend">
<view class="top"> <view class="top">
<text>今日拼团推荐</text> <text>今日拼团推荐</text>
<view class="more" @click="toDetailsPage"> <text @click="toDetailsPage">点击查看更多></text>
<text>点击查看更多</text>
<u-icon name="arrow-right" color="#999" size="22"></u-icon>
</view>
</view> </view>
<view class="connect"> <view class="connect">
<view class="user"> <view class="user">
@ -69,7 +66,7 @@ export default {
} }
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.recommend { .recommend{
margin-bottom: 20rpx; margin-bottom: 20rpx;
padding: 0 30rpx; padding: 0 30rpx;
background-color: #ffffff; background-color: #ffffff;
@ -82,11 +79,10 @@ export default {
font-size: 30rpx; font-size: 30rpx;
color: #333; color: #333;
} }
.more { >text:last-child{
display: flex; font-size: 18rpx;
align-items: center; color: #999;
color: #999; }
}
} }
.connect{ .connect{
padding:10rpx 30rpx 30rpx; padding:10rpx 30rpx 30rpx;

13
components/shop/seckill/index.vue
View File

@ -17,10 +17,9 @@
<text class="num">00</text> <text class="num">00</text>
</view> </view>
</view> </view>
<view class="next" @click="viewMore"> <view class="next" @click="viewMore">
<text>查看更多</text> 查看更多>
<u-icon name="arrow-right" color="#999" size="18"></u-icon> </view>
</view>
</view> </view>
<view class="list"> <view class="list">
<sitem v-for="(item, index) in list.slice(0, 3)" :key="index" :item="item"></sitem> <sitem v-for="(item, index) in list.slice(0, 3)" :key="index" :item="item"></sitem>
@ -77,10 +76,8 @@ export default {
} }
} }
.next{ .next{
font-size: 18rpx; font-size: 18rpx;
display: flex; color: #999;
align-items: center;
color: #999;
} }
} }
.list{ .list{

5
pageB/sdetails/index.vue
View File

@ -443,6 +443,9 @@ export default {
break; break;
case 3: case 3:
title = '秒杀商品详情'; title = '秒杀商品详情';
break;
case 1:
break; break;
default: default:
break; break;
@ -862,7 +865,6 @@ export default {
font-size: 32rpx; font-size: 32rpx;
color: rgba(255,255,255,1); color: rgba(255,255,255,1);
z-index: 10076; z-index: 10076;
background-color: #FFFFFF;
.launch { .launch {
flex: 1; flex: 1;
background: rgba(253,211,96,1); background: rgba(253,211,96,1);
@ -884,7 +886,6 @@ export default {
height: 98rpx; height: 98rpx;
display: flex; display: flex;
z-index: 10076; z-index: 10076;
background-color: #FFFFFF;
.left { .left {
width: 190rpx; width: 190rpx;
display: flex; display: flex;

6
pageE/order/Details.vue
View File

@ -68,7 +68,8 @@
</view> </view>
</view> </view>
<view class="btn" v-if="['1', '2', '4', '6'].indexOf(orderstate) >= 0"> <view class="btn" v-if="['1', '2', '4', '6'].indexOf(orderstate) >= 0">
<view class="cancel" v-if="orderstate == '4' || orderstate == '1'" @click="toOtherPage('RefundOrder')">申请退款</view> <!-- @click="toOtherPage('RefundOrder')" -->
<view class="cancel" v-if="orderstate == '4' || orderstate == '1'">申请退款</view>
<view class="cancel" v-if="orderstate == '1'" @click="toOtherPage('Logistics')">查看物流</view> <view class="cancel" v-if="orderstate == '1'" @click="toOtherPage('Logistics')">查看物流</view>
<view class="logistics" v-if="orderstate == '1'" @click="confirmReceive">确认收货</view> <view class="logistics" v-if="orderstate == '1'" @click="confirmReceive">确认收货</view>
<view class="comment" v-if="orderstate == '2'" @click="toOtherPage('Comment')">立即评价</view> <view class="comment" v-if="orderstate == '2'" @click="toOtherPage('Comment')">立即评价</view>
@ -210,6 +211,9 @@ export default {
} }
uni.stopPullDownRefresh(); // 结束刷新 uni.stopPullDownRefresh(); // 结束刷新
}) })
},
applyRefund() {
}, },
cancelOrder() { cancelOrder() {
this.$u.api.cancelOrder({ this.$u.api.cancelOrder({

99
pageE/order/RefundOrder.vue
View File

@ -4,7 +4,7 @@
<u-radio-group v-model="value" @change="radioChange"> <u-radio-group v-model="value" @change="radioChange">
<label class="radio-view" v-for="(item, index) in goodsList" :key="index"> <label class="radio-view" v-for="(item, index) in goodsList" :key="index">
<view class="radio"> <view class="radio">
<u-radio color="#F0AD4E" :name="item.goods_id" active-color="#FF780F" icon-size="24" shape="circle"></u-radio> <u-radio color="#F0AD4E" :name="item.goods_id" active-color="#FF780F" icon-size="34" shape="circle"></u-radio>
</view> </view>
<view class="store_info"> <view class="store_info">
<view class="info_img"> <view class="info_img">
@ -26,18 +26,18 @@
<view class="refund-details"> <view class="refund-details">
<view class="goods-number"> <view class="goods-number">
<view>选择数量</view> <view>选择数量</view>
<u-number-box :input-width="40" :input-height="38" :size="22" bg-color="#FFFFFF" :disabled-input=true color="#FF780F" :max="goods.goods_num" v-model="num"></u-number-box> <view></view>
</view> </view>
<view class="refund-price"> <view class="refund-price">
<view class="price"> <view>
<view class="title">退款金额</view> <view>退款金额</view>
<view class="value">￥{{ (goods.goods_pay_price * num).toFixed(2) }}</view> <view>￥99.00</view>
</view> </view>
<view class="tips">若退款成功，将退还给您 ￥{{ (goods.goods_pay_price * num).toFixed(2) }}</view> <view>若退款成功，将退还给您￥99.00</view>
</view> </view>
<view class="refund-text"> <view class="refund-text">
<view class="title">申请说明</view> <view>申请说明</view>
<u-input v-model="refundText" type="textarea" placeholder="必填，请详细说明退款理由" /> <u-input v-model="refundText" type="textarea" />
</view> </view>
</view> </view>
<view class="submit-btn">提交申请</view> <view class="submit-btn">提交申请</view>
@ -48,13 +48,7 @@ export default {
data() { data() {
return { return {
goodsList: [], goodsList: [],
goods: {
goods_num: 0,
goods_pay_price: 0,
},
value: '', value: '',
refundText: '',
num: 0,
} }
}, },
onLoad(option) { onLoad(option) {
@ -62,12 +56,7 @@ export default {
}, },
methods: { methods: {
radioChange(e){ radioChange(e){
const goodsList = this.goodsList.filter(goods => { console.log(e)
return e == goods.goods_id;
})
// console.log(goodsList);
this.goods = goodsList[0];
console.log(this.goods);
}, },
getOrderInfo(id) { getOrderInfo(id) {
this.$u.api.getOrderInfo({ this.$u.api.getOrderInfo({
@ -76,7 +65,7 @@ export default {
if(res.errCode == 0) { if(res.errCode == 0) {
// this.orderInfo = res.data; // this.orderInfo = res.data;
this.goodsList = res.data.extend_order_goods; this.goodsList = res.data.extend_order_goods;
// console.log(this.goodsList); console.log(this.goodsList);
} }
// uni.stopPullDownRefresh(); // 结束刷新 // uni.stopPullDownRefresh(); // 结束刷新
}) })
@ -147,73 +136,7 @@ export default {
} }
.refund-details { .refund-details {
background-color: #FFFFFF; background-color: #FFFFFF;
.goods-number { .goods-number {}
padding: 0 30rpx;
height: 100rpx;
background: rgba(255,255,255,1);
display: flex;
align-items: center;
justify-content: space-between;
margin-bottom: 2rpx;
/deep/ .u-numberbox {
border: 1rpx solid rgba(217,215,215,1);
border-radius:4px;
.u-icon-minus, .u-icon-plus {
width: 38rpx;
}
.u-number-input {
margin: 0;
color: #333 !important;
border: 1rpx #D9D7D7 solid {
top: 0px;
bottom: 0px;
}
}
}
}
.refund-price {
background: rgba(255,255,255,1);
padding: 36rpx 30rpx;
margin-bottom: 2rpx;
.price {
display: flex;
align-items: center;
margin-bottom: 36rpx;
.title {
font-size: 30rpx;
color: rgba(51,51,51,1);
margin-right: 56rpx;
}
.value {
font-size: 28rpx;
color: rgba(244,14,14,1);
}
}
.tips {
font-size: 24rpx;
color: rgba(153,153,153,1);
}
}
.refund-text {
background: rgba(255,255,255,1);
padding: 36rpx 30rpx;
.title {
font-size: 30rpx;
color: rgba(51,51,51,1);
margin-bottom: 40rpx;
}
}
}
.submit-btn {
width: 690rpx;
height: 98rpx;
background: rgba(255,120,15,1);
border-radius: 49rpx;
font-size: 36rpx;
color: rgba(255,255,255,1);
line-height: 98rpx;
text-align: center;
margin: 120rpx auto 0;
} }
} }
</style> </style>