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

Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into xbx

Browse Source
This commit is contained in:
luyuan
2020-08-03 10:35:41 +08:00
parent 1da6974fe3 7ae10c200d
commit 8727ae913d
40 changed files with 1875 additions and 878 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
components/comment/index.vue
View File

@@ -3,7 +3,7 @@
<view class="user">
<u-avatar :src="content.member_avatar" class="avatar" size="60"></u-avatar>
<text class="name">{{ content.geval_frommembername }}</text>
<u-rate v-if="reply" :disabled='true' count="count" v-model="rate" size="23" active-color="#FF780F" inactive-color="#F0EDF1" gutter="10"></u-rate>
<u-rate v-if="reply" :disabled='true' :count="count" v-model="rate" size="23" active-color="#FF780F" inactive-color="#F0EDF1" gutter="10"></u-rate>
</view>
<view class="content">
<view class="text">{{ content.geval_content }}</view>
@@ -30,7 +30,7 @@ export default {
data() {
return {
count: 5,
rate: 2,
rate: 0,
}
},
props: {

2
components/informations/notice/notice.vue
View File

@@ -1,6 +1,6 @@
<template>
<view class="notice">
<view v-for="(item,index) in notice">
<view v-for="(item,index) in notice" :key="index">
<view class="time_notice">2020-05-14 20:11</view>
<view class="notice_view">
<image :src="item.url" mode="aspectFill" ></image>

18
components/mine/address-active/index.vue
View File

@@ -7,12 +7,12 @@
<view>
<input type="text" placeholder="手机号" maxlength="11" v-model="phone" />
</view>
<view class="area" @click="show=true">
<input type="text" placeholder="省市区" v-model="address" disabled />
<view>
<view class="area">
<input type="text" placeholder="省市区" v-model="address" disabled @click="show=true" />
<!-- <view @click="chooseArea">
<image src="/static/image/mine/24.png"></image>
<text>定位</text>
</view>
</view> -->
</view>
<view>
<input type="text" placeholder="详细地址" v-model="area" />
@@ -80,6 +80,16 @@ export default {
confirmBtn() {
this.info ? this.editAddress() : this.addAddress();
},
chooseArea() {
uni.chooseLocation({
success: function (res) {
console.log('位置名称：' + res.name);
console.log('详细地址：' + res.address);
console.log('纬度：' + res.latitude);
console.log('经度：' + res.longitude);
}
});
},
// 验证
validateValue() {
if(this.$u.test.isEmpty(this.name)) {

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

@@ -15,7 +15,7 @@
<view class="goods-sku u-line-1" v-if="order.order_state !== 20 && order.order_state !== 40 && goods.goods_spec">
<text v-for="(spec, index) in goods.goods_spec" :key="index">{{ spec + ';' }}</text>
</view>
<view class="goods-time u-line-1" v-if="order.order_state == 10 || order.order_state == 10">结束时间：{{ order.add_time * 1000 | date('yyyy-mm-dd hh:MM') }}</view>
<!-- <view class="goods-time u-line-1" v-if="order.order_state == 10 || order.order_state == 10">结束时间：{{ order.add_time * 1000 | date('yyyy-mm-dd hh:MM') }}</view> -->
<view class="goods-price u-line-1" v-if="order.order_state == 20 || order.order_state == 40">总价：￥{{ goods.goods_price }}，实付款￥{{ goods.goods_pay_price }}</view>
<view class="goods-date" v-if="order.order_state == 20 || order.order_state == 40">
<image src="@/pageE/static/mine/26.png"></image>
@@ -24,14 +24,15 @@
</view>
</view>
</view>
<view class="order-btn" v-if="[10, 30, 20, 40].indexOf(order.order_state) >= 0">
<view class="logistics" v-if="order.order_state == 30">确认收货</view>
<view class="logistics" v-if="order.order_state == 30" @click="toOtherPage('Logistics')">查看物流</view>
<view class="comment" v-if="order.order_state == 40 && order.evaluation_state == 0" @click="toOtherPage('Comment')">立即评价</view>
<view class="calcel" v-if="order.order_state == 10" @click="cancelOrder">取消支付</view>
<view class="payment" v-if="order.order_state == 10" @click="payNow(order.pay_sn, order.order_amount)">立即支付</view>
<view class="service" v-if="order.order_state == 20">联系官方客服</view>
<view class="submit" v-if="order.order_state == 20">提交官方审核</view>
<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="applyRefund">申请退款</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="comment" v-if="order.view_type == 4" @click="toOtherPage('Comment')">立即评价</view>
<view class="cancel" v-if="order.view_type == 1" @click="cancelOrder">取消支付</view>
<view class="payment" v-if="order.view_type == 1" @click="payNow(order.pay_sn, order.order_amount)">立即支付</view>
<view class="service" v-if="order.view_type == 8">联系官方客服</view>
<view class="submit" v-if="order.view_type == 8">提交官方审核</view>
</view>
</view>
</template>
@@ -40,7 +41,7 @@ import common from '@/static/js/common.js';
export default {
data() {
return {
state: '', // 1: 待收货 2: 待评价 3: 交易成功 4: 已取消 5: 已退款 6: 待支付, 7: 售后
state: '',
}
},
props: {
@@ -49,44 +50,25 @@ export default {
created() {
this.viewState();
},
filters: {
// timeLine(timestamp) {
// const timestamp = 0.5*60*60*1000;
// const now = new Date().getTime();
// let line = now - timestamp * 1000;
// return common.getLineTime({ timestamp: line });
// }
},
methods: {
viewState() {
let state;
switch (this.order.order_state) {
case 0: // 已取消
state = '已取消';
break;
case 10: // 未付款
switch (this.order.view_type) {
case 1:
state = '待支付';
break;
case 20: // 已付款
state = '交易成功';
case 2:
state = '待发货';
break;
case 30: // 已发货
case 3:
state = '待收货';
break;
case 40: // 已收货
if(this.order.evaluation_state == 0) state = '待评价';
else state = '交易成功'
case 4:
state = '待评价';
break;
default:
break;
}
if(this.order.refund_state) state = '已退款';
// 申请退款
if(this.order.refund_data) {
if([1, 2].indexOf(this.order.refund_data.refund_state) >= 0) state = '待退款';
if(this.order.refund_data.refund_state == 3) state = '已退款';
}
this.state = state;
},
cancelOrder() {
@@ -94,7 +76,20 @@ export default {
order_id: this.order.order_id,
}).then(res => {
if(res.errCode == 0) {
this.$emit("refreshOrderList", { reload: 'again' });
this.$emit("refreshOrderList");
}
this.$u.toast(res.message);
})
},
applyRefund() {
},
confirmReceive() {
this.$u.api.confirmReceive({
order_id: this.order.order_id,
}).then(res => {
if(res.errCode == 0) {
this.$emit("refreshOrderList");
}
this.$u.toast(res.message);
})
@@ -165,6 +160,7 @@ export default {
line-height: 38rpx;
}
.goods-sku {
display: inline-block;
max-width: 230rpx;
background: rgba(236,236,236,1);
border-radius: 6rpx;
@@ -212,7 +208,7 @@ export default {
.logistics, .comment, .payment {
@include btn-class($width: 160rpx, $color: rgba(255,119,15,1));
}
.calcel {
.cancel {
@include btn-class($width: 160rpx, $color: rgba(155,153,153,1));
}
.service {

37
components/remaining/remaining.vue
View File

@@ -18,7 +18,7 @@
<view class="page-section swiper">
<view class="page-section-spacing">
<swiper class="swiper" :indicator-dots="true" :style="{height:heightOut+'px'}" :autoplay="false" :interval="3000" :duration="1000">
<swiper-item v-for="item in list" >
<swiper-item v-for="(item,index) in list" :key="index">
<view class="swiper-item uni-bg-red">
<image :src=" 'https://' + item.launch_path"></image>
</view>
@@ -48,7 +48,7 @@
export default {
data() {
return {
remaining: 4,
remaining: 11,
type: true,
banner: false,
protocol: false,
@@ -142,12 +142,19 @@
uni.getSystemInfo({
success: function(res) {
that.heightOut = res.windowHeight;
console.log('666666666666666' + that.heightOut)
console.log(that.heightOut)
}
});
},
// 我同意
to_agree() {
uni.setStorage({
key: 'launchFlag',
data: true,
success: function() {
console.log('error时存储launchFlag');
}
});
uni.navigateTo({
url: '/pageA/login/login'
});
@@ -174,8 +181,7 @@
})
},
videoErrorCallback: function(e) {
console.log('视频错误信息:')
console.log(e.target.errMsg)
console.log('视频错误信息:',e);
},
getRandomColor: function() {
const rgb = []
@@ -222,19 +228,18 @@
// height: 400rpx;
}
.welcome_jumpes {
width: 94rpx;
height: 36rpx;
opacity: 0.5;
border-radius: 18rpx;
z-index: 10;
position: absolute;
right: 37rpx;
top: 66rpx;
top: 80rpx;
right: 60rpx;
width: 100rpx;
height: 40rpx;
border-radius: 20rpx;
font-size: 22rpx;
text-align: center;
line-height: 35rpx;
line-height: 40rpx;
color: #fff;
background: #C4CAC6;
z-index: 10;
background-color: rgba(0,0,0,0.5);
}
#myVideo {
@@ -257,8 +262,8 @@
.welcome_images {
width: 100%;
height: 100vh;
position: fixed;
height: 100%
}
uni-swiper,
@@ -266,7 +271,7 @@
uni-image {
width: 100%;
// position: fixed;
height: 100%
height: 100vh;
}
uni-image {