Skip to content

M
mallapp
Commit a339b61b authored by 罗超's avatar 罗超
Browse files
Options

2

parent 3a2fbdb8
Show whitespace changes
Inline Side-by-side
Showing with 75 additions and 40 deletions
pages/order/index/index.vue
View file @ a339b61b
......@@ -55,8 +55,12 @@
</view>
<!-- TODO 样式结构修改-->
<view class="handle">
<u-button shape="circle" size="medium" :custom-style="customStyle" v-on:click.stop="cancel(item, index)" v-if="
item.OrderStatus == '1'&&item.OrderEduType>0">取消订单</u-button>
<view class="" v-if="item.OrderEduType===0">
<u-button shape="circle" size="medium" :custom-style="customStyle" v-on:click.stop="cancel(item, index)" v-if="
item.OrderStatus == '1' || (item.OrderStatus == '2' && item.PresentFXGrade!=1)">取消订单</u-button>
</view>
<u-button shape="circle" size="medium" :custom-style="themCustomStyle" v-on:click.stop="payment(item)" v-if="item.OrderStatus == '1'">立即支付</u-button>
<u-button shape="circle" size="medium" :custom-style="item.OrderStatus == '3' ? customStyle : themCustomStyle"
v-if="item.OrderStatus != '1'" @click.stop="buy(item)">再次购买</u-button>
......
pages/order/order-detail.vue
View file @ a339b61b
......@@ -15,8 +15,10 @@
</view>
<view class="status" :style="[headStyle]">
<view class="status-title">{{ orders.OrderStatusName }}</view>
<view class="sub-title" v-if='orders.OrderStatus==1 || orders.OrderStatus==2 ||orders.OrderStatus==3||orders.OrderStatus==4 '>
<u-icon style="display: inline-block; vertical-align: middle;" name="warning-o" color="#FFF" size="28"></u-icon>
<view class="sub-title"
v-if='orders.OrderStatus==1 || orders.OrderStatus==2 ||orders.OrderStatus==3||orders.OrderStatus==4 '>
<u-icon style="display: inline-block; vertical-align: middle;" name="warning-o" color="#FFF"
size="28"></u-icon>
<!-- TODO返回字段 不能写死 -->
<text style="margin-left: 5px;">交易成功{{delivery_time}}天，系统自动确认完成</text>
<!-- TODO 交易情况说明 -->
......@@ -37,7 +39,8 @@
<view class="block goods">
<view class="item" v-for="(x, i) in orders.DetailList" :key="i">
<view style="display: flex;">
<image :src="x.CoverImagePath" class="img" @click="redirectGoods(x.GoodsId)" mode="aspectFill" />
<image :src="x.CoverImagePath" class="img" @click="redirectGoods(x.GoodsId)"
mode="aspectFill" />
<view class="good-info">
<view class="good-name" @click="redirectGoods(x.GoodsId)">{{x.GoodsName}}</view>
<view class="good-attr">
......@@ -46,7 +49,8 @@
{{y}}
</text>
</view>
<view style="overflow: hidden;white-space: nowrap;text-overflow: ellipsis;margin-top: 2px;" @click.native.stop="goUrl(x.FreeShippingUrl)"
<view style="overflow: hidden;white-space: nowrap;text-overflow: ellipsis;margin-top: 2px;"
@click.native.stop="goUrl(x.FreeShippingUrl)"
v-if="x.FreeShippingRemarks !=null && x.FreeShippingRemarks!='' ">
<view style="color: #FF4048;background: #fdf6ec;padding: 0 5px;display: inline-block;">
<Text style="font-size: 20rpx;margin-right: 5rpx;">
......@@ -58,13 +62,16 @@
</view>
</view>
<template v-for="(e, ei) in expressInfo">
<view :key="ei" class="order-info-item peisong" v-for="(ec, eci) in e.GoodsList" v-if=" ec.Id == x.DetailId">
<view :key="ei" class="order-info-item peisong" v-for="(ec, eci) in e.GoodsList"
v-if=" ec.Id == x.DetailId">
<template>
<view class="field" :key="eci" v-if="e.Type == '2' && ec.Id == x.DetailId">
<view class="label">配送方式</view>
<view class="content">{{ e.Remark }}</view>
</view>
<view class="field" :key="eci" @click="goExpressHandler(e.ExpressName, e.ExpressNumber,e.ExpressId)" v-if="e.Type == '1' && ec.Id == x.DetailId">
<view class="field" :key="eci"
@click="goExpressHandler(e.ExpressName, e.ExpressNumber,e.ExpressId)"
v-if="e.Type == '1' && ec.Id == x.DetailId">
<view class="label">配送方式</view>
<view class="content">{{ e.ExpressName }} {{ e.ExpressNumber }}</view>
<view style="margin-left: 10px;">
......@@ -75,15 +82,18 @@
</view>
</template>
<view style="margin-top: 20px;display: flex;flex-direction: row-reverse;align-items: center;">
<u-button shape="circle" size="medium" :custom-style="customStyle" @click="joinCart(x)">加购物车</u-button>
<u-button shape="circle" size="medium" :custom-style="customStyle" @click="joinCart(x)">加购物车
</u-button>
<view v-if="x.refund_status == 1" style="margin-right: 40rpx; font-size: 28rpx; color: gray;">
已申请售后（{{ x.refund.status_text }}）
</view>
</view>
<view class="customer">
<button open-type="contact" :send-message-title="x.GoodsName" :send-message-path="'/pages/index/index?id=' + x.GoodsId + '&user_id=' + uid+'&JumpType=1'"
<button open-type="contact" :send-message-title="x.GoodsName"
:send-message-path="'/pages/index/index?id=' + x.GoodsId + '&user_id=' + uid+'&JumpType=1'"
:send-message-img=" x.CoverImagePath " :show-message-card="true">
<u-icon style="display: inline-block; vertical-align: middle;" size="36" color="#111" name="chat-o"></u-icon>
<u-icon style="display: inline-block; vertical-align: middle;" size="36" color="#111"
name="chat-o"></u-icon>
<text style="margin-left: 10rpx;">联系客服</text>
</button>
</view>
......@@ -142,8 +152,10 @@
<view class="content right">
<text style="margin-right: 10px;">实付款：</text>
<text style="font-size: 11px; font-weight: 700;" :style="{ color: mc }">￥</text>
<text style="font-size: 17px;" :style="{ color: mc }">{{String(orders.Income).split(".")[0]}}</text>
<text style="font-size: 12px;" :style="{ color: mc }">.{{String(orders.Income).split(".")[1] || "00" }}</text>
<text style="font-size: 17px;"
:style="{ color: mc }">{{String(orders.Income).split(".")[0]}}</text>
<text style="font-size: 12px;"
:style="{ color: mc }">.{{String(orders.Income).split(".")[1] || "00" }}</text>
</view>
</view>
</view>
......@@ -159,24 +171,38 @@
</view>
<view class="btn-box" v-if="orders.OrderStatus != '5'&&isShowBtn">
<view class="item" v-if="orders.OrderStatus == '3'">
<u-button shape="circle" size="medium" @click="shouhuoHandler" :custom-style="themCustomStyle">确认收货</u-button>
<u-button shape="circle" size="medium" @click="shouhuoHandler" :custom-style="themCustomStyle">确认收货
</u-button>
</view>
<view class="item" v-if="orders.OrderStatus == '1'">
<u-button shape="circle" size="medium" :custom-style="themCustomStyle" v-on:click.stop="payment(orders)">立即支付</u-button>
<u-button shape="circle" size="medium" :custom-style="themCustomStyle"
v-on:click.stop="payment(orders)">立即支付</u-button>
</view>
<view class="item" v-if="orders.OrderStatus == '1' && orders.Income >0">
<u-button shape="circle" size="medium" :custom-style="themCustomStyle" open-type="share">找人代付</u-button>
<u-button shape="circle" size="medium" :custom-style="themCustomStyle" open-type="share">找人代付
</u-button>
</view>
<view class="item" v-if="orders.OrderStatus == '3'&& orders.PresentFXGrade!=1">
<u-button shape="circle" size="medium" :custom-style="customStyle" @click="openAfterHandler">申请售后</u-button>
<view class="item"
v-if="orders.OrderStatus == '3'&& orders.PresentFXGrade!=1&&orders.OrderEduType === 0 ">
<u-button shape="circle" size="medium" :custom-style="customStyle" @click="openAfterHandler">申请售后
</u-button>
</view>
<view class="">
<view class="item" v-if="orders.OrderStatus == '1'&&orders.OrderEduType> 0 ">
<u-button shape="circle" size="medium" :custom-style="customStyle" @click="cancel">取消订单
</u-button>
</view>
<view class="item"
v-if="(orders.OrderStatus == '1' || (orders.OrderStatus == '2' && orders.PresentFXGrade!=1))&&orders.OrderEduType === 0 ">
<u-button shape="circle" size="medium" :custom-style="customStyle" @click="cancel">取消订单
</u-button>
</view>
<view class="item" v-if="orders.OrderStatus == '1' || (orders.OrderStatus == '2' && orders.PresentFXGrade!=1)">
<u-button shape="circle" size="medium" :custom-style="customStyle" @click="cancel">取消订单</u-button>
</view>
<view class="item" style="line-height: 34px;" v-if="orders.OrderStatus == 6">
待处理
</view>
<view class="item" style="line-height: 34px;font-size: 16px;color: gray;font-weight: 600;" v-if="orders.OrderStatus == 7">
<view class="item" style="line-height: 34px;font-size: 16px;color: gray;font-weight: 600;"
v-if="orders.OrderStatus == 7">
已取消
</view>
</view>
......@@ -187,22 +213,27 @@
<view style="display: flex;align-items: center;justify-content: center;height:70px ;">
<Text>是否取消订单？</Text>
</view>
<view style="display: flex;flex-direction: column;height:80px ;margin-left: 15px;width: 100%;" v-if='orders.OrderStatus==2'>
<view style="display: flex;flex-direction: column;height:80px ;margin-left: 15px;width: 100%;"
v-if='orders.OrderStatus==2'>
<Text style='margin-left: 10px;margin-top: 5px;'>备注</Text>
<input class="uni-input inputM" style='margin-left: 10px;margin-top: 5px;' v-model="Cancelmsg.Remark" placeholder="输入备注" />
<input class="uni-input inputM" style='margin-left: 10px;margin-top: 5px;'
v-model="Cancelmsg.Remark" placeholder="输入备注" />
</view>
<view style="display: flex;flex-direction: row;align-items: center;height: 50px;border-top: 1px solid #F5F5F5;width: 100%;">
<view style="width: 50%;display: flex;align-items: center;justify-content: center" @click="showModal=false">
<view
style="display: flex;flex-direction: row;align-items: center;height: 50px;border-top: 1px solid #F5F5F5;width: 100%;">
<view style="width: 50%;display: flex;align-items: center;justify-content: center"
@click="showModal=false">
<Text>取消</Text>
</view>
<view style="width: 50%;color: #a0cfff;display: flex;align-items: center;justify-content: center" @click="confirm">
<view style="width: 50%;color: #a0cfff;display: flex;align-items: center;justify-content: center"
@click="confirm">
<Text>确定</Text>
</view>
</view>
</view>
</u-popup>
<u-modal v-model="showReviceModal" content="是否确认收货？" :show-cancel-button="true" :show-title="false" @confirm="submitReviceGoodHandler"
:border-radius="20"></u-modal>
<u-modal v-model="showReviceModal" content="是否确认收货？" :show-cancel-button="true" :show-title="false"
@confirm="submitReviceGoodHandler" :border-radius="20"></u-modal>
<u-toast ref="uToast" />
<payCom v-if="payBtn" :payInfo="payInfo" @closePay="closePay"></payCom>
<u-popup v-model="payExit" mode="center" :mask-close-able="false">
......@@ -210,7 +241,8 @@
<view style="padding:10px 0 0 10px">提交失败</view>
<view style="text-align:center;padding-bottom:40rpx">
<view style="margin:80rpx 0">支付取消</view>
<span @click="exitPay" style="padding:10rpx 50rpx;color:#fff;background:#19be6b;border-radius: 12px;">确定</span>
<span @click="exitPay"
style="padding:10rpx 50rpx;color:#fff;background:#19be6b;border-radius: 12px;">确定</span>
</view>
</view>
</u-popup>
......@@ -288,7 +320,8 @@
let nav = uni.getMenuButtonBoundingClientRect();
this.headStyle.paddingTop = nav.top + "px";
this.contentStyle.paddingTop = nav.top + 44 + "px";
this.delivery_time = uni.getStorageSync('basedata') ? uni.getStorageSync('basedata').mall.setting.delivery_time : 14;
this.delivery_time = uni.getStorageSync('basedata') ? uni.getStorageSync('basedata').mall.setting
.delivery_time : 14;
let p = getCurrentPages();
let u = uni.getStorageSync("mall_UserInfo");
this.uid = u.UserId ? u.UserId : 0;
......@@ -408,7 +441,8 @@
//如果微店id为0 去找所属微店id
SmallShopId = u.UserSmallShopId ? u.UserSmallShopId : 0;
}
this.path = '/pages/index/index?OrderId=' + res.data.OrderId + "&user_id=" + uid + "&Up=" + Up + "&SmallShopId=" +
this.path = '/pages/index/index?OrderId=' + res.data.OrderId + "&user_id=" + uid + "&Up=" +
Up + "&SmallShopId=" +
SmallShopId + '&JumpType=4';
this.initRecommend();
this.getexpressInfo(res.data.OrderId)
......@@ -425,7 +459,8 @@
this.scrollTop = 0;
},
initRecommend() {
var UserPageType = uni.getStorageSync("mall_UserInfo") ? uni.getStorageSync("mall_UserInfo").UserPageType : 0;
var UserPageType = uni.getStorageSync("mall_UserInfo") ? uni.getStorageSync("mall_UserInfo").UserPageType :
0;
this.request2({
url: "/api/AppletGoods/GetAppletGoodsRecommendListForZY",
data: {
......@@ -598,9 +633,7 @@
color: gray;
}
.orderdetail .goods {
}
.orderdetail .goods {}
.orderdetail .goods .item {
margin-bottom: 20px;
......@@ -706,9 +739,7 @@
background: #fff;
}
.orderdetail .btn-box .item {
}
.orderdetail .btn-box .item {}
.orderdetail .customer {
padding-top: 20rpx;
......
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 to comment