|
|
@@ -33,8 +33,7 @@
|
|
|
<button v-else class="follow_btn focused">已关注</button>
|
|
|
</view>
|
|
|
<view v-if="userInfo.id==uid">
|
|
|
- <navigator hover-class="none" :url="`/pages/discover/discover_release/index?fair=${true}`"
|
|
|
- class="follow_btn focus bg-color">
|
|
|
+ <navigator hover-class="none" :url="`/pages/discover/discover_release/index?fair=${true}`" class="follow_btn focus bg-color">
|
|
|
去发布
|
|
|
</navigator>
|
|
|
</view>
|
|
|
@@ -56,12 +55,10 @@
|
|
|
|
|
|
<view class="plant_info" style="padding-bottom: 30rpx;">
|
|
|
<view class="count_wrapper acea-row">
|
|
|
- <navigator :url="!id ? '/pages/discover/discover_follow/index?type=follow' : ''" class="item"
|
|
|
- hover-class="none">
|
|
|
+ <navigator :url="!id ? '/pages/discover/discover_follow/index?type=follow' : ''" class="item" hover-class="none">
|
|
|
<text class="mr10">{{userInfo.concernedNum}}</text> 关注
|
|
|
</navigator>
|
|
|
- <navigator :url="!id ? '/pages/discover/discover_follow/index?type=fans' : ''" class="item"
|
|
|
- hover-class="none">
|
|
|
+ <navigator :url="!id ? '/pages/discover/discover_follow/index?type=fans' : ''" class="item" hover-class="none">
|
|
|
<text class="mr10">{{userInfo.fansNum}}</text> 粉丝
|
|
|
</navigator>
|
|
|
<view class="item">
|
|
|
@@ -107,9 +104,7 @@
|
|
|
</view>
|
|
|
<view v-if="item.refundStatus == 3" class='font_color'>已退款</view>
|
|
|
<template v-else>
|
|
|
- <view v-if="item.groupBuyRecordStatus==99||item.status==9||item.groupBuyRecordStatus==10"
|
|
|
- class='font_color'>{{item.status | orderStatusFilter}}</view>
|
|
|
- <view v-else class='font_color'>{{item.groupBuyRecordStatus===0?'拼团中':'拼团失败'}}</view>
|
|
|
+ <view class='font_color'>{{item.status | orderStatusFilter}}</view>
|
|
|
</template>
|
|
|
</view>
|
|
|
<view v-for="(items,indexs) in item.orderInfoList" :key="indexs">
|
|
|
@@ -120,8 +115,7 @@
|
|
|
<view class='text acea-row row-between'>
|
|
|
<view class="nameBox">
|
|
|
<view class='name line2'>
|
|
|
- <span v-if="Number(item.type) > 0 && Number(item.type) < 3"
|
|
|
- class="activity bg_color">{{item.type | orderTypeFilter}}</span>
|
|
|
+ <span v-if="Number(item.type) > 0 && Number(item.type) < 3" class="activity bg_color">{{item.type | orderTypeFilter}}</span>
|
|
|
<span v-if="Number(item.secondType) === 1" class="activity bg_color">积分</span>
|
|
|
<span>{{items.productName}}</span>
|
|
|
</view>
|
|
|
@@ -133,8 +127,7 @@
|
|
|
</view>
|
|
|
</view>
|
|
|
</view>
|
|
|
- <view v-if="items.applyRefundNum && item.refundStatus > -1"
|
|
|
- class="text-24rpx font-color oppoSans-R mr-20px px-30 mt-14">
|
|
|
+ <view v-if="items.applyRefundNum && item.refundStatus > -1" class="text-24rpx font-color oppoSans-R mr-20px px-30 mt-14">
|
|
|
售后申请数量：{{ items.applyRefundNum }}
|
|
|
</view>
|
|
|
</view>
|
|
|
@@ -142,11 +135,11 @@
|
|
|
件商品，总金额
|
|
|
<text class='money semiBold'> ￥{{item.payPrice}}</text>
|
|
|
</view>
|
|
|
- <view v-if="item.status===0" class="mx-20 flex">
|
|
|
+ <!-- <view v-if="item.status===0" class="mx-20 flex">
|
|
|
<view class="tips w-full px-20 f-s-26">
|
|
|
付款提醒<text class="ml-20 text-999">请在{{item.expirationTime}}前完成支付！</text>
|
|
|
</view>
|
|
|
- </view>
|
|
|
+ </view> -->
|
|
|
<!-- 订单状态（0：待支付，1：待发货,2：部分发货， 3：待核销，4：待收货,5：已收货,6：已完成，9：已取消） -->
|
|
|
<view class='bottom acea-row row-right row-middle'>
|
|
|
<view class='bnt cancelBnt' v-if="item.status === 0" @click='cancelOrder(index,item.orderNo)'>
|
|
|
@@ -155,36 +148,14 @@
|
|
|
<view class='bnt bg_color' v-if="item.status === 0" @click='goPay(item)'>
|
|
|
立即付款
|
|
|
</view>
|
|
|
- <view class='bnt cancelBnt' v-if="item.type==2&&item.status !== 0&&item.status !== 9"
|
|
|
- @click="toCheckGroup(item)">
|
|
|
- 查看拼团
|
|
|
- </view>
|
|
|
- <view class='bnt bg_color'
|
|
|
- v-if="item.type==2&&item.status !== 0&&item.groupBuyRecordStatus===0&&item.status!=9"
|
|
|
- @click="listenerActionSheet(item)">
|
|
|
- 邀请好友
|
|
|
- </view>
|
|
|
- <view class='bnt bg_color'
|
|
|
- v-if="((item.paid || item.status == 9)&&item.type!=2)||(item.type==2&&item.groupBuyRecordStatus!==0)"
|
|
|
- @click='goOrderDetails(item)'>
|
|
|
+ <view class='bnt bg_color' v-if="((item.paid || item.status == 9)&&item.type!=2)||(item.type==2&&item.groupBuyRecordStatus!==0)"
|
|
|
+ @click='goOrderDetails(item)'>
|
|
|
查看详情</view>
|
|
|
- <view class='bnt cancelBnt' v-if="item.status==6 || item.status==9"
|
|
|
- @click='delOrder(item.orderNo,index)'>
|
|
|
+ <view class='bnt cancelBnt' v-if="item.status==6 || item.status==9" @click='delOrder(item.orderNo,index)'>
|
|
|
删除订单
|
|
|
</view>
|
|
|
</view>
|
|
|
-
|
|
|
- </view>
|
|
|
- </view>
|
|
|
-
|
|
|
- <view class='loadingicon acea-row row-center-wrapper'>
|
|
|
- <text class='loading iconfont icon-jiazai'
|
|
|
- :hidden='loading==false'></text>{{orderList.length>0?loadTitle:''}}
|
|
|
- </view>
|
|
|
- <view class='noCart' v-if="orderList.length == 0 && isShow && !loading">
|
|
|
- <view class='pictrue'>
|
|
|
- <image :src="urlDomain+'crmebimage/presets/nodingdan.png'"></image>
|
|
|
- <view class="default_txt">暂无订单信息~</view>
|
|
|
+
|
|
|
</view>
|
|
|
</view>
|
|
|
</view>
|
|
|
@@ -194,8 +165,7 @@
|
|
|
</view>
|
|
|
<view class='loadingicon acea-row row-center-wrapper'>
|
|
|
<text class='loading iconfont icon-jiazai' :hidden='loading==false'></text>
|
|
|
- <view class="end" :hidden="loading || list.length == 0"><text
|
|
|
- :class="loaded ? 'loaded' : ''">{{loadTitle}}</text>
|
|
|
+ <view class="end" :hidden="loading || list.length == 0"><text :class="loaded ? 'loaded' : ''">{{loadTitle}}</text>
|
|
|
</view>
|
|
|
</view>
|
|
|
</view>
|
|
|
@@ -206,8 +176,7 @@
|
|
|
<view class="fs-32 fw-500 lh-44rpx text-center">{{fieldStr == 'signature' ? '编辑简介' : '编辑学校'}}</view>
|
|
|
<view class="mt-24 bg--w111-f5f5f5 rd-16rpx p-24">
|
|
|
<textarea v-if="fieldStr == 'signature'" class="w-full fs-26 h-342" ref="myTextarea" v-model="signature" :focus="focus"
|
|
|
- :always-embed="true" :adjust-position="true" cursor-spacing="85rpx"
|
|
|
- placeholder="请输入内容" :maxlength="100" name="desc" />
|
|
|
+ :always-embed="true" :adjust-position="true" cursor-spacing="85rpx" placeholder="请输入内容" :maxlength="100" name="desc" />
|
|
|
<input v-if="fieldStr == 'school'" class="placeholder" type='text' v-model='school' :focus="focus"
|
|
|
placeholder='请输入学校' placeholder-class='placeholder'></input>
|
|
|
</view>
|
|
|
@@ -248,6 +217,9 @@
|
|
|
editSignatureApi,
|
|
|
editSchoolApi
|
|
|
} from '@/api/discover.js';
|
|
|
+ import {
|
|
|
+ ProductTypeEnum,
|
|
|
+ } from "@/enums/productEnums";
|
|
|
import {secondHandOrderList} from '@/api/secondHand.js';
|
|
|
import {
|
|
|
toLogin
|
|
|
@@ -258,6 +230,7 @@
|
|
|
import {
|
|
|
discoverFollowAuthor
|
|
|
} from '@/libs/follow.js';
|
|
|
+ import easyLoadimage from '@/components/base/easy-loadimage.vue';
|
|
|
const app = getApp();
|
|
|
let sysHeight = uni.getSystemInfoSync().statusBarHeight;
|
|
|
export default {
|
|
|
@@ -265,13 +238,15 @@
|
|
|
WaterfallsFlow,
|
|
|
WaterfallsFlowItem,
|
|
|
emptyPage,
|
|
|
- NavBar
|
|
|
+ NavBar,
|
|
|
+ easyLoadimage
|
|
|
},
|
|
|
data() {
|
|
|
return {
|
|
|
sysHeight: sysHeight,
|
|
|
urlDomain: this.$Cache.get("imgHost"),
|
|
|
theme: app.globalData.theme,
|
|
|
+ ProductTypeEnum: ProductTypeEnum,
|
|
|
list: [], // 内容列表
|
|
|
loadTitle: '加载更多',
|
|
|
loading: false,
|
|
|
@@ -385,6 +360,44 @@
|
|
|
})
|
|
|
});
|
|
|
},
|
|
|
+ /**
|
|
|
+ * 去订单详情
|
|
|
+ */
|
|
|
+ goOrderDetails: function(item, status) {
|
|
|
+ if (!item.orderNo) return this.$util.Tips({
|
|
|
+ title: '缺少订单号无法查看订单详情'
|
|
|
+ });
|
|
|
+ //虚拟商品
|
|
|
+ if (item.secondType === this.ProductTypeEnum.CloudDrive || item.secondType === this.ProductTypeEnum
|
|
|
+ .CardPassword) {
|
|
|
+ // #ifdef MP
|
|
|
+ uni.navigateTo({
|
|
|
+ url: '/pages/goods/virtual_order_details/index?orderNo=' + item.orderNo
|
|
|
+ })
|
|
|
+ // #endif
|
|
|
+ // #ifndef MP
|
|
|
+ uni.navigateTo({
|
|
|
+ animationType: animationType.type,
|
|
|
+ animationDuration: animationType.duration,
|
|
|
+ url: '/pages/goods/virtual_order_details/index?orderNo=' + item.orderNo
|
|
|
+ })
|
|
|
+ // #endif
|
|
|
+ } else {
|
|
|
+ // #ifdef MP
|
|
|
+ uni.navigateTo({
|
|
|
+ url: '/pages/goods/order_details/index?orderNo=' + item.orderNo + '&orderType=secondHand'
|
|
|
+ })
|
|
|
+ // #endif
|
|
|
+ // #ifndef MP
|
|
|
+ uni.navigateTo({
|
|
|
+ animationType: animationType.type,
|
|
|
+ animationDuration: animationType.duration,
|
|
|
+ url: '/pages/goods/order_details/index?orderNo=' + item.orderNo + "'&orderType=secondHand'
|
|
|
+ })
|
|
|
+ // #endif
|
|
|
+ }
|
|
|
+
|
|
|
+ },
|
|
|
//逛逛用户主页
|
|
|
getUserHome(id) {
|
|
|
userHomeApi(id).then(res => {
|
|
|
@@ -965,7 +978,6 @@
|
|
|
|
|
|
|
|
|
.my-order {
|
|
|
- /* #endif */
|
|
|
.header {
|
|
|
height: 250rpx;
|
|
|
padding: 0 30rpx;
|
|
|
@@ -1002,4 +1014,4 @@
|
|
|
width: 100%;
|
|
|
height: 100%;
|
|
|
}
|
|
|
-</style>
|
|
|
+</style>
|
ZZ