Commit 0140521f authored by 黄奎's avatar 黄奎

页面调整

parent 9f0b0bf4
...@@ -3,19 +3,13 @@ ...@@ -3,19 +3,13 @@
<view style="width: 100%;height: 100%;"> <view style="width: 100%;height: 100%;">
<u-empty v-if="g.length==0" text="暂无数据" mode="data"></u-empty> <u-empty v-if="g.length==0" text="暂无数据" mode="data"></u-empty>
<template v-if="g.length > 0"> <template v-if="g.length > 0">
<view <view style="
style="
height: calc(100vh); height: calc(100vh);
width: calc(100vw); width: calc(100vw);
overflow: hidden; overflow: hidden;
padding: 10px 0; padding: 10px 0;
"> ">
<scroll-view <scroll-view :scroll-y="true" :enable-back-to-top="true" :enable-flex="true" @scrolltolower="lower" :style="{ height: '100%' }">
:scroll-y="true"
:enable-back-to-top="true"
:enable-flex="true"
@scrolltolower="lower"
:style="{ height: '100%' }">
<view style="display: flex;flex-direction: column;align-items: center;"> <view style="display: flex;flex-direction: column;align-items: center;">
<view v-for="(item, index) in g" :key="index" class="listbox"> <view v-for="(item, index) in g" :key="index" class="listbox">
<view class="box_t"> <view class="box_t">
...@@ -23,7 +17,7 @@ ...@@ -23,7 +17,7 @@
<text style="margin-left: 15px;">{{item.UserName}}</text> <text style="margin-left: 15px;">{{item.UserName}}</text>
</view> </view>
<view class="box_c" v-for="(x, index2) in item.DetailList" :key="index2"> <view class="box_c" v-for="(x, index2) in item.DetailList" :key="index2">
<image :src="x.CoverImagePath" style="width: 65px;height: 65px;border-radius: 6px;" ></image> <image :src="x.CoverImagePath" style="width: 65px;height: 65px;border-radius: 6px;"></image>
<view style="width: calc(100vw - 30px - 65px - 15px);display: flex;flex-direction: column;margin-left: 15px;"> <view style="width: calc(100vw - 30px - 65px - 15px);display: flex;flex-direction: column;margin-left: 15px;">
<view class="box_c_name">{{x.GoodsName}}</view> <view class="box_c_name">{{x.GoodsName}}</view>
<view class="box_c_name" style="font-size: 12px;color: #555555;margin-top: 3px;"> <view class="box_c_name" style="font-size: 12px;color: #555555;margin-top: 3px;">
...@@ -32,12 +26,10 @@ ...@@ -32,12 +26,10 @@
</view> </view>
<view class="box_r_b"> <view class="box_r_b">
<text style="font-size: 12px;color: #555555;">X{{x.Number}}</text> <text style="font-size: 12px;color: #555555;">X{{x.Number}}</text>
</view> </view>
</view> </view>
</view> </view>
<view class="OrderNoStyle" > <view class="OrderNoStyle">
<text>订单号:{{item.OrderNo}}</text> <text>订单号:{{item.OrderNo}}</text>
<view style="font-size: 12px;color: #111111;"> <view style="font-size: 12px;color: #111111;">
<text>已得佣金:</text> <text>已得佣金:</text>
...@@ -45,24 +37,13 @@ ...@@ -45,24 +37,13 @@
<text></text> <text></text>
</view> </view>
</view> </view>
</view> </view>
</view> </view>
<u-loadmore <u-loadmore :status="status" :load-text="loadText" :font-size="24" :margin-top="20" :margin-bottom="20" bg-color="#f3f4f6" />
:status="status"
:load-text="loadText"
:font-size="24"
:margin-top="20"
:margin-bottom="20"
bg-color="#f3f4f6"
/>
</scroll-view> </scroll-view>
</view> </view>
</template> </template>
</view> </view>
</view> </view>
</template> </template>
...@@ -71,18 +52,17 @@ ...@@ -71,18 +52,17 @@
data() { data() {
return { return {
pageTitle: "账单详情", pageTitle: "账单详情",
contentHeight:0, contentHeight: 0,
mainColor:'', mainColor: '',
secondary:'', secondary: '',
g:[], g: [],
msg: {
msg:{
pageIndex: 1, pageIndex: 1,
pageSize:10, pageSize: 10,
BillId:0 BillId: 0
}, },
SelectBillState:0, SelectBillState: 0,
page_count:1, page_count: 1,
status: "loadmore", status: "loadmore",
loadText: { loadText: {
loadmore: "轻轻上拉,加载更多", loadmore: "轻轻上拉,加载更多",
...@@ -91,17 +71,16 @@ ...@@ -91,17 +71,16 @@
}, },
} }
}, },
created() {
created(){ this.contentHeight = this.$utils.calcContentHeight(-40) + 'px';
this.contentHeight = this.$utils.calcContentHeight(-40)+'px';
this.mainColor = this.$uiConfig.mainColor; this.mainColor = this.$uiConfig.mainColor;
this.secondary = this.$uiConfig.secondary; this.secondary = this.$uiConfig.secondary;
uni.setNavigationBarTitle({ uni.setNavigationBarTitle({
title: this.pageTitle, title: this.pageTitle,
}); });
}, },
onLoad(options){ onLoad(options) {
if(options){ if (options) {
this.msg.BillId = options.ID this.msg.BillId = options.ID
} }
this.init() this.init()
...@@ -110,13 +89,12 @@ ...@@ -110,13 +89,12 @@
}, },
methods: { methods: {
init(){ init() {
uni.showLoading({ uni.showLoading({
title: '加载中' title: '加载中'
}); });
this.request2( this.request2({
{
url: '/api/AppletUser/GetOrderBilldetailPageList', url: '/api/AppletUser/GetOrderBilldetailPageList',
data: this.msg data: this.msg
}, },
...@@ -150,12 +128,12 @@ ...@@ -150,12 +128,12 @@
</script> </script>
<style> <style>
.billDetailsStyle{ .billDetailsStyle {
background: #FAF8F9; background: #FAF8F9;
} }
.billDetailsStyle .listbox{ .billDetailsStyle .listbox {
width: 100%; width: 100%;
margin-bottom: 10px; margin-bottom: 10px;
padding: 15px; padding: 15px;
...@@ -163,9 +141,9 @@ ...@@ -163,9 +141,9 @@
display: flex; display: flex;
flex-direction: column; flex-direction: column;
align-items: center align-items: center
} }
.billDetailsStyle .box_t{
.billDetailsStyle .box_t {
display: flex; display: flex;
flex-direction: row; flex-direction: row;
align-items: center; align-items: center;
...@@ -173,7 +151,8 @@ ...@@ -173,7 +151,8 @@
overflow: hidden; overflow: hidden;
height: 32px; height: 32px;
} }
.billDetailsStyle .box_c{
.billDetailsStyle .box_c {
display: flex; display: flex;
flex-direction: row; flex-direction: row;
align-items: center; align-items: center;
...@@ -181,7 +160,8 @@ ...@@ -181,7 +160,8 @@
overflow: hidden; overflow: hidden;
margin-top: 15px; margin-top: 15px;
} }
.billDetailsStyle .box_c_name{
.billDetailsStyle .box_c_name {
text-overflow: -o-ellipsis-lastline; text-overflow: -o-ellipsis-lastline;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
...@@ -192,7 +172,8 @@ ...@@ -192,7 +172,8 @@
font-size: 13px; font-size: 13px;
color: #111111; color: #111111;
} }
.billDetailsStyle .box_r_b{
.billDetailsStyle .box_r_b {
width: 100%; width: 100%;
display: flex; display: flex;
flex-direction: row; flex-direction: row;
...@@ -200,7 +181,8 @@ ...@@ -200,7 +181,8 @@
justify-content: space-between; justify-content: space-between;
margin-top: 3px; margin-top: 3px;
} }
.billDetailsStyle .OrderNoStyle{
.billDetailsStyle .OrderNoStyle {
width: 100%; width: 100%;
height: 35px; height: 35px;
background: #F8F6F5; background: #F8F6F5;
......
This diff is collapsed.
This diff is collapsed.
...@@ -7,20 +7,9 @@ ...@@ -7,20 +7,9 @@
<view class="title">订单支付成功</view> <view class="title">订单支付成功</view>
<view class="price">实付 ¥{{payInfo.total_price}}</view> <view class="price">实付 ¥{{payInfo.total_price}}</view>
<view class="btn-box"> <view class="btn-box">
<u-button <u-button style="display: inline-block;" shape="circle" :custom-style="customStyle" @click="goHome">返回首页</u-button>
style="display: inline-block;" <u-button shape="circle" style="margin-left: 60rpx; display: inline-block;" :custom-style="themCustomStyle"
shape="circle" @click.stop="redictToOrders">查看订单</u-button>
:custom-style="customStyle"
@click="goHome"
>返回首页</u-button
>
<u-button
shape="circle"
style="margin-left: 60rpx; display: inline-block;"
:custom-style="themCustomStyle"
@click.stop="redictToOrders"
>查看订单</u-button
>
</view> </view>
</view> </view>
<u-divider :margin-top="20" :margin-bottom="20" bg-color="transparent"> <u-divider :margin-top="20" :margin-bottom="20" bg-color="transparent">
...@@ -32,19 +21,14 @@ ...@@ -32,19 +21,14 @@
<view style="padding: 12px;" v-if="recommend.length > 0"> <view style="padding: 12px;" v-if="recommend.length > 0">
<goodlist :list="recommend"></goodlist> <goodlist :list="recommend"></goodlist>
</view> </view>
<coupon <coupon v-if="showCoupons" :coupon-message="couponMessage" @goLook="goLook" @closeBtn="closeBtn"></coupon>
v-if="showCoupons"
:coupon-message="couponMessage"
@goLook="goLook"
@closeBtn="closeBtn"
></coupon>
</view> </view>
</template> </template>
<script> <script>
import goodlist from "@/components/goods/list"; import goodlist from "@/components/goods/list";
import coupon from "@/components/coupons/coupons"; import coupon from "@/components/coupons/coupons";
export default { export default {
components: { components: {
goodlist, goodlist,
coupon coupon
...@@ -61,14 +45,14 @@ export default { ...@@ -61,14 +45,14 @@ export default {
}, },
mainColor: "", mainColor: "",
recommend: [], recommend: [],
payInfo:{}, payInfo: {},
showCoupons:false, showCoupons: false,
couponMessage:'', couponMessage: '',
}; };
}, },
onLoad(option) { onLoad(option) {
if (option.payInfo) { if (option.payInfo) {
this.payInfo=JSON.parse(option.payInfo) this.payInfo = JSON.parse(option.payInfo)
} }
uni.setNavigationBarTitle({ uni.setNavigationBarTitle({
title: "支付成功", title: "支付成功",
...@@ -81,13 +65,12 @@ export default { ...@@ -81,13 +65,12 @@ export default {
}, },
methods: { methods: {
initRecommend() { 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( this.request2({
{
url: "/api/AppletGoods/GetAppletGoodsRecommendListForZY", url: "/api/AppletGoods/GetAppletGoodsRecommendListForZY",
data: { data: {
RecommendType: 1, RecommendType: 1,
GoodsPageType:UserPageType GoodsPageType: UserPageType
}, },
}, },
(res) => { (res) => {
...@@ -96,13 +79,13 @@ export default { ...@@ -96,13 +79,13 @@ export default {
); );
}, },
redictToOrders() { redictToOrders() {
if(this.payInfo.type){ if (this.payInfo.type) {
if(this.payInfo.type==1){//跳到课程订单 if (this.payInfo.type == 1) { //跳到课程订单
uni.reLaunch({ uni.reLaunch({
url:'/pages/school/personal/orderList?status=2' url: '/pages/school/personal/orderList?status=2'
}); });
} }
}else{ } else {
uni.reLaunch({ uni.reLaunch({
url: "/pages/order/index/index?status=2", url: "/pages/order/index/index?status=2",
}); });
...@@ -114,66 +97,69 @@ export default { ...@@ -114,66 +97,69 @@ export default {
url: "/pages/index/index", url: "/pages/index/index",
}); });
}, },
getReceive(){//分享进入调取领券接口 getReceive() { //分享进入调取领券接口
// 1-分享,2-购买并付款 // 1-分享,2-购买并付款
this.request2({
this.request2(
{
url: "/api/AppletUser/ShareCoupon", url: "/api/AppletUser/ShareCoupon",
data: { data: {
TriggerType: 2, TriggerType: 2,
}, },
}, },
(res) => { (res) => {
console.log(res,'res') console.log(res, 'res')
if(res.couponResultCode ==1){ if (res.couponResultCode == 1) {
this.couponMessage = res.couponMessage this.couponMessage = res.couponMessage
this.showCoupons = true; this.showCoupons = true;
} }
} }
); );
}, },
goLook(){ goLook() {
this.showCoupons = true; this.showCoupons = true;
}, },
closeBtn(){ closeBtn() {
this.showCoupons = false this.showCoupons = false
} }
}, },
}; };
</script> </script>
<style> <style>
.paySuccess { .paySuccess {
min-height: 100vh; min-height: 100vh;
padding-bottom: 40rpx; padding-bottom: 40rpx;
background: #f5f5f5; background: #f5f5f5;
} }
.paySuccess .img-box {
.paySuccess .img-box {
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
} }
.paySuccess .img-box .img {
.paySuccess .img-box .img {
width: 256rpx; width: 256rpx;
height: 256rpx; height: 256rpx;
padding: 60rpx 0 0 0; padding: 60rpx 0 0 0;
} }
.paySuccess .title {
.paySuccess .title {
padding: 40rpx 0 20rpx 0; padding: 40rpx 0 20rpx 0;
font-size: 32rpx; font-size: 32rpx;
color: #000; color: #000;
font-weight: 600; font-weight: 600;
text-align: center; text-align: center;
} }
.paySuccess .price {
.paySuccess .price {
font-size: 30rpx; font-size: 30rpx;
color: gray; color: gray;
padding-bottom: 60rpx; padding-bottom: 60rpx;
text-align: center; text-align: center;
} }
.paySuccess .btn-box {
.paySuccess .btn-box {
padding-bottom: 60rpx; padding-bottom: 60rpx;
text-align: center; text-align: center;
} }
</style> </style>
...@@ -9,64 +9,22 @@ ...@@ -9,64 +9,22 @@
<view class="name">运单号:</view> <view class="name">运单号:</view>
<view class="val">{{ express_no }}</view> <view class="val">{{ express_no }}</view>
<view style='margin-left: 20px;'> <view style='margin-left: 20px;'>
<u-button size="mini" shape="circle" @click="paste(express_no)" <u-button size="mini" shape="circle" @click="paste(express_no)">复制</u-button>
>复制</u-button
>
</view> </view>
</view> </view>
<!-- <view class="item">
<view class="name">运送状态:</view>
<view class="val" :style="{ color: mainColor }">{{
d.status_text
}}</view>
</view> -->
</view> </view>
<view style="margin-top: 40rpx;background: #fff;padding: 40rpx;border-radius: 20rpx;">
<view
style="
margin-top: 40rpx;
background: #fff;
padding: 40rpx;
border-radius: 20rpx;
"
>
<u-time-line> <u-time-line>
<u-time-line-item nodeTop="2"> <u-time-line-item nodeTop="2">
<template v-slot:node> <template v-slot:node>
<view <view class="u-node meudim" :style="{ background: mainColor, color: '#FFF' }">收</view>
class="u-node meudim"
:style="{ background: mainColor, color: '#FFF' }"
>收</view
>
</template> </template>
<template v-slot:content> <template v-slot:content>
<view> <view>
<view <view class="u-order-desc" style="padding-bottom: 60rpx;margin-top: 5rpx;font-size: 26rpx;">收货地址:{{address}}</view>
class="u-order-desc"
style="
padding-bottom: 60rpx;
margin-top: 5rpx;
font-size: 26rpx;
"
>收货地址:{{address}}</view
>
</view> </view>
</template> </template>
</u-time-line-item> </u-time-line-item>
<!-- <u-time-line-item nodeTop="2" v-if="d.status == 3">
<template v-slot:node>
<view class="u-node" :style="{ background: mainColor }">
<u-icon name="success" color="#fff" :size="32"></u-icon>
</view>
</template>
<template v-slot:content>
<view style="padding-bottom: 30rpx;color:#000 !important;">
<view class="u-order-title">已签收</view>
<view class="u-order-desc">{{ last.desc }}</view>
<view class="u-order-time">{{ last.datetime }}</view>
</view>
</template>
</u-time-line-item> -->
<u-time-line-item v-for="(x, i) in d" :key="i"> <u-time-line-item v-for="(x, i) in d" :key="i">
<!-- 此处没有自定义左边的内容,会默认显示一个点 --> <!-- 此处没有自定义左边的内容,会默认显示一个点 -->
<template v-slot:content> <template v-slot:content>
...@@ -74,7 +32,6 @@ ...@@ -74,7 +32,6 @@
<view class="u-order-desc">{{ x.AcceptStation!=null? x.AcceptStation:'' }}</view> <view class="u-order-desc">{{ x.AcceptStation!=null? x.AcceptStation:'' }}</view>
<view class="u-order-desc">{{ x.Remark !=null? x.Remark:''}}</view> <view class="u-order-desc">{{ x.Remark !=null? x.Remark:''}}</view>
<view class="u-order-time">{{ x.AcceptTime !=null? x.AcceptTime:''}}</view> <view class="u-order-time">{{ x.AcceptTime !=null? x.AcceptTime:''}}</view>
</view> </view>
</template> </template>
</u-time-line-item> </u-time-line-item>
...@@ -84,16 +41,16 @@ ...@@ -84,16 +41,16 @@
</template> </template>
<script> <script>
export default { export default {
data() { data() {
return { return {
mainColor: "", mainColor: "",
d: [], d: [],
loading: false, loading: false,
last: {}, last: {},
express:'', express: '',
express_no:'', express_no: '',
address:'', address: '',
}; };
}, },
onLoad(option) { onLoad(option) {
...@@ -101,39 +58,15 @@ export default { ...@@ -101,39 +58,15 @@ export default {
title: "物流信息", title: "物流信息",
}); });
this.mainColor = this.$uiConfig.mainColor; this.mainColor = this.$uiConfig.mainColor;
this.express = option.express || "圆通速递"; this.express = option.express || "圆通速递";
this.express_no = option.no || "YT2042624009816"; this.express_no = option.no || "YT2042624009816";
this.address = option.address || "四川成都市高新西区万景峰二期"; this.address = option.address || "四川成都市高新西区万景峰二期";
this.id = option.id || 0; this.id = option.id || 0;
this.init(this.id,this.express_no); this.init(this.id, this.express_no);
}, },
methods: { methods: {
init(id,express_no) { init(id, express_no) {
// let h = this.apiheader(); this.request2({
// this.request(
// {
// url: "",
// header: h,
// data: {
// r: "api/order/express-detail",
// express: this.express,
// express_no: this.express_no,
// customer_name: "",
// },
// },
// (res) => {
// this.loading = false;
// this.d = res.data.express;
// this.d.list = this.d.list.reverse();
// if (this.d.status == 3) {
// this.last = this.d.list[0];
// this.d.list.splice(0, 1);
// }
// }
// );
this.request2(
{
url: "/api/AppletOrder/GetOrderExpressInfo", url: "/api/AppletOrder/GetOrderExpressInfo",
data: { data: {
ExpressId: id, ExpressId: id,
...@@ -141,7 +74,6 @@ export default { ...@@ -141,7 +74,6 @@ export default {
}, },
}, },
(res) => { (res) => {
this.d = res.data; this.d = res.data;
} }
); );
...@@ -152,42 +84,47 @@ export default { ...@@ -152,42 +84,47 @@ export default {
}); });
}, },
}, },
}; };
</script> </script>
<style> <style>
.express { .express {
min-height: 100vh; min-height: 100vh;
background: #f5f5f5; background: #f5f5f5;
font-family: "aaa"; font-family: "aaa";
} }
.express .status-box {
.express .status-box {
background: #fff; background: #fff;
padding: 60rpx 40rpx; padding: 60rpx 40rpx;
padding-bottom: 0; padding-bottom: 0;
border-bottom-left-radius: 20rpx; border-bottom-left-radius: 20rpx;
border-bottom-right-radius: 20rpx; border-bottom-right-radius: 20rpx;
} }
.express .status-box .item {
.express .status-box .item {
display: flex; display: flex;
align-items: center; align-items: center;
padding-bottom: 40rpx; padding-bottom: 40rpx;
} }
.express .status-box .item .name {
.express .status-box .item .name {
font-size: 24rpx; font-size: 24rpx;
color: #888; color: #888;
width: 120rpx; width: 120rpx;
margin-right: 40rpx; margin-right: 40rpx;
} }
.express .status-box .item .val {
.express .status-box .item .val {
font-family: "aaa"; font-family: "aaa";
font-size: 28rpx; font-size: 28rpx;
color: #000; color: #000;
font-weight: 600; font-weight: 600;
width: 1rpx; width: 1rpx;
flex: 1; flex: 1;
} }
.u-node {
.u-node {
width: 44rpx; width: 44rpx;
height: 44rpx; height: 44rpx;
border-radius: 100rpx; border-radius: 100rpx;
...@@ -195,28 +132,27 @@ export default { ...@@ -195,28 +132,27 @@ export default {
justify-content: center; justify-content: center;
align-items: center; align-items: center;
background: #d0d0d0; background: #d0d0d0;
} }
.u-node.meudim {
.u-node.meudim {
width: 40rpx; width: 40rpx;
height: 40rpx; height: 40rpx;
font-size: 24rpx; font-size: 24rpx;
} }
.u-order-title { .u-order-title {
color: #333333; color: #333333;
font-weight: bold; font-weight: bold;
font-size: 32rpx; font-size: 32rpx;
margin-bottom: 20rpx; margin-bottom: 20rpx;
} }
.u-order-desc { .u-order-desc {
/* color: rgb(150, 150, 150); */
font-size: 28rpx; font-size: 28rpx;
margin-bottom: 10rpx; margin-bottom: 10rpx;
} }
.u-order-time { .u-order-time {
/* color: rgb(200, 200, 200); */
font-size: 26rpx; font-size: 26rpx;
} }
</style> </style>
...@@ -3,11 +3,10 @@ ...@@ -3,11 +3,10 @@
订单首页 订单首页
</view> </view>
</template> </template>
<script> <script>
export default { export default {
} }
</script> </script>
<style> <style>
......
This diff is collapsed.
...@@ -6,15 +6,8 @@ ...@@ -6,15 +6,8 @@
<view class="right-box"> <view class="right-box">
<view class="good-info">{{goodsName}}</view> <view class="good-info">{{goodsName}}</view>
<view class="op-box"> <view class="op-box">
<u-rate <u-rate :current="msg.CommentScore" active-color="#FA3534" inactive-color="#b2b2b2" active-icon="star"
:current="msg.CommentScore" inactive-icon="star-o" size="40" @change='change'></u-rate>
active-color="#FA3534"
inactive-color="#b2b2b2"
active-icon="star"
inactive-icon="star-o"
size="40"
@change='change'
></u-rate>
</view> </view>
</view> </view>
</view> </view>
...@@ -26,13 +19,7 @@ ...@@ -26,13 +19,7 @@
</view> </view>
<view class="editor"> <view class="editor">
<textarea placeholder="评价内容" v-model="msg.Content" maxlength="200"></textarea> <textarea placeholder="评价内容" v-model="msg.Content" maxlength="200"></textarea>
<u-upload <u-upload :action="action" :file-list="fileList" max-count="9" :custom-btn="true" @on-success="uploadSuccessHandler">
:action="action"
:file-list="fileList"
max-count="9"
:custom-btn="true"
@on-success="uploadSuccessHandler"
>
<view slot="addBtn" class="slot-btn"> <view slot="addBtn" class="slot-btn">
<u-icon name="photograph" size="40" color="#888"></u-icon> <u-icon name="photograph" size="40" color="#888"></u-icon>
<view class="mian-title">上传图片</view> <view class="mian-title">上传图片</view>
...@@ -42,18 +29,12 @@ ...@@ -42,18 +29,12 @@
</view> </view>
</view> </view>
<view style="padding:10px 40px;background:#FFF"> <view style="padding:10px 40px;background:#FFF">
<u-button <u-button size="80" :ripple="true" @click="submitForm" shape="circle" :custom-style="{
size="80"
:ripple="true"
@click="submitForm"
shape="circle"
:custom-style="{
backgroundColor: mc, backgroundColor: mc,
height: '80rpx', height: '80rpx',
color: '#FFF', color: '#FFF',
fontSize: '14px' fontSize: '14px'
}" }">
>
<u-loading mode="circle" style="margin-right: 5px;" v-if="submitStatus"></u-loading>提交评价 <u-loading mode="circle" style="margin-right: 5px;" v-if="submitStatus"></u-loading>提交评价
</u-button> </u-button>
</view> </view>
...@@ -61,7 +42,7 @@ ...@@ -61,7 +42,7 @@
</template> </template>
<script> <script>
export default { export default {
data() { data() {
return { return {
pageTitle: "发表评价", pageTitle: "发表评价",
...@@ -73,7 +54,7 @@ export default { ...@@ -73,7 +54,7 @@ export default {
Content: "", Content: "",
OrderDetailId: 0, OrderDetailId: 0,
CommentImgList: [], CommentImgList: [],
CommentScore:5 CommentScore: 5
}, },
submitStatus: false, submitStatus: false,
goodsName: "", goodsName: "",
...@@ -97,23 +78,21 @@ export default { ...@@ -97,23 +78,21 @@ export default {
}); });
this.mc = this.$uiConfig.mainColor; this.mc = this.$uiConfig.mainColor;
this.secondary = this.$uiConfig.secondary; this.secondary = this.$uiConfig.secondary;
let MallBaseId = uni.getStorageSync("mall_UserInfo").MallBaseId ? uni.getStorageSync("mall_UserInfo").MallBaseId: 1; let MallBaseId = uni.getStorageSync("mall_UserInfo").MallBaseId ? uni.getStorageSync("mall_UserInfo").MallBaseId : 1;
this.action = this.host2+'/api/File/UploadTencent?MallBaseId='+MallBaseId this.action = this.host2 + '/api/File/UploadTencent?MallBaseId=' + MallBaseId
}, },
methods: { methods: {
uploadSuccessHandler(data, index, lists) { uploadSuccessHandler(data, index, lists) {
console.log(JSON.parse(data));
let r = JSON.parse(data); let r = JSON.parse(data);
this.msg.CommentImgList.push(r.data); this.msg.CommentImgList.push(r.data);
}, },
change(val){ change(val) {
this.msg.CommentScore = val this.msg.CommentScore = val
}, },
submitForm() { submitForm() {
this.submitStatus = true; this.submitStatus = true;
if (this.msg.CommentScore > 0) { if (this.msg.CommentScore > 0) {
this.request2( this.request2({
{
url: "/api/AppletOrder/SetGoodsCommentInfo", url: "/api/AppletOrder/SetGoodsCommentInfo",
data: this.msg, data: this.msg,
}, },
...@@ -123,7 +102,7 @@ export default { ...@@ -123,7 +102,7 @@ export default {
content: "评价成功,感谢您的反馈", content: "评价成功,感谢您的反馈",
showCancel: false, showCancel: false,
confirmText: "确认", confirmText: "确认",
success: function (res) { success: function(res) {
if (res.confirm) { if (res.confirm) {
uni.navigateBack({ uni.navigateBack({
delta: 1, delta: 1,
...@@ -151,36 +130,40 @@ export default { ...@@ -151,36 +130,40 @@ export default {
} }
}, },
}, },
}; };
</script> </script>
<style> <style>
.commit-detail { .commit-detail {
background: #faf8f9; background: #faf8f9;
height: 100vh; height: 100vh;
position: relative; position: relative;
} }
.commit-detail .good-item {
.commit-detail .good-item {
margin: 10px 0; margin: 10px 0;
background: #fff; background: #fff;
padding: 10px; padding: 10px;
border-radius: 10px; border-radius: 10px;
display: flex; display: flex;
} }
.commit-detail .good-item .good-pic {
.commit-detail .good-item .good-pic {
width: 120rpx; width: 120rpx;
height: 120rpx; height: 120rpx;
margin-right: 15px; margin-right: 15px;
border-radius: 5px; border-radius: 5px;
} }
.commit-detail .good-item .right-box {
.commit-detail .good-item .right-box {
width: 1px; width: 1px;
flex: 1; flex: 1;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
height: 120rpx; height: 120rpx;
} }
.commit-detail .good-item .right-box .good-info {
.commit-detail .good-item .right-box .good-info {
flex: 1; flex: 1;
width: 100%; width: 100%;
height: 1px; height: 1px;
...@@ -191,35 +174,42 @@ export default { ...@@ -191,35 +174,42 @@ export default {
overflow: hidden; overflow: hidden;
word-break: break-all; word-break: break-all;
margin-bottom: 5px; margin-bottom: 5px;
} }
.commit-detail .good-item .right-box .op-box {
.commit-detail .good-item .right-box .op-box {
height: 25px; height: 25px;
} }
.commit-detail .content-box {
.commit-detail .content-box {
background: #fff; background: #fff;
padding: 15px; padding: 15px;
border-radius: 5px; border-radius: 5px;
} }
.commit-detail .content-box .title-box {
.commit-detail .content-box .title-box {
padding-bottom: 15px; padding-bottom: 15px;
border-bottom: 1px solid #e3e3e3; border-bottom: 1px solid #e3e3e3;
font-size: 15px; font-size: 15px;
font-weight: 500; font-weight: 500;
margin-bottom: 15px; margin-bottom: 15px;
color: #000; color: #000;
} }
.commit-detail .content-box .editor-box {
.commit-detail .content-box .editor-box {
display: flex; display: flex;
} }
.commit-detail .content-box .editor-box .editor-icon {
.commit-detail .content-box .editor-box .editor-icon {
width: 18px; width: 18px;
margin-right: 5px; margin-right: 5px;
} }
.commit-detail .content-box .editor-box .editor {
.commit-detail .content-box .editor-box .editor {
width: 1px; width: 1px;
flex: 1; flex: 1;
} }
.commit-detail .content-box .editor-box .editor textarea {
.commit-detail .content-box .editor-box .editor textarea {
width: 100%; width: 100%;
height: 150px; height: 150px;
font-size: 14px; font-size: 14px;
...@@ -227,8 +217,9 @@ export default { ...@@ -227,8 +217,9 @@ export default {
border: none; border: none;
outline: none; outline: none;
margin-bottom: 10px; margin-bottom: 10px;
} }
.commit-detail .content-box .editor-box .editor .slot-btn {
.commit-detail .content-box .editor-box .editor .slot-btn {
width: 140rpx; width: 140rpx;
height: 140rpx; height: 140rpx;
display: flex; display: flex;
...@@ -237,20 +228,23 @@ export default { ...@@ -237,20 +228,23 @@ export default {
flex-direction: column; flex-direction: column;
background: rgb(244, 245, 246); background: rgb(244, 245, 246);
border-radius: 10rpx; border-radius: 10rpx;
} }
.commit-detail .content-box .editor-box .editor .slot-btn .mian-title {
.commit-detail .content-box .editor-box .editor .slot-btn .mian-title {
font-size: 28rpx; font-size: 28rpx;
color: #888; color: #888;
font-weight: 600; font-weight: 600;
margin: 10rpx 0; margin: 10rpx 0;
} }
.commit-detail .content-box .editor-box .editor .slot-btn .sub-title {
.commit-detail .content-box .editor-box .editor .slot-btn .sub-title {
color: #999; color: #999;
font-size: 26rpx; font-size: 26rpx;
font-family: "microsoft yahei" !important; font-family: "microsoft yahei" !important;
} }
.commit-detail .u-list-item {
.commit-detail .u-list-item {
width: 90px !important; width: 90px !important;
height: 90px !important; height: 90px !important;
} }
</style> </style>
<template> <template>
<view class="commit-box"> <view class="commit-box">
<u-empty text="没有找到未评价的商品信息" font-size="36" mode="list" v-if="g.length == 0 && !loading"></u-empty> <u-empty text="没有找到未评价的商品信息" font-size="36" mode="list" v-if="g.length == 0 && !loading"></u-empty>
<view <view v-if="g.length > 0" style="height: 100vh;width: 100vw;overflow: hidden;padding:0 0 10px 0;">
v-if="g.length > 0" <scroll-view :scroll-y="true" @scrolltolower="lower" :enable-back-to-top="true" :enable-flex="true" :scroll-top="scrollTop"
style="height: 100vh;width: 100vw;overflow: hidden;padding:0 0 10px 0;" @scroll="scroll" style="height: 100%; padding-bottom: 0px;">
>
<scroll-view
:scroll-y="true"
@scrolltolower="lower"
:enable-back-to-top="true"
:enable-flex="true"
:scroll-top="scrollTop"
@scroll="scroll"
style="height: 100%; padding-bottom: 0px;"
>
<view class="good-list"> <view class="good-list">
<view class="good-item" v-for="(x, i) in g" :key="i"> <view class="good-item" v-for="(x, i) in g" :key="i">
<image class="good-pic" :src="x.CoverImage" mode="aspectFit" /> <image class="good-pic" :src="x.CoverImage" mode="aspectFit" />
...@@ -21,52 +11,24 @@ ...@@ -21,52 +11,24 @@
<view class="good-info"> <view class="good-info">
<view class="good-name">{{x.GoodsName}}</view> <view class="good-name">{{x.GoodsName}}</view>
<view class="good-attr"> <view class="good-attr">
<u-tag <u-tag v-for="(y, yi) in x.SpecificationList" :key="yi" size="mini" :text="y" type="warning" />
v-for="(y, yi) in x.SpecificationList"
:key="yi"
size="mini"
:text="y"
type="warning"
/>
</view> </view>
</view> </view>
<view class="op-box"> <view class="op-box">
<u-button <u-button size="mini" ripple plain shape="circle" :custom-style="{color:mc,borderColor:mc}" @click="goCommit(x)">评价</u-button>
size="mini"
ripple
plain
shape="circle"
:custom-style="{color:mc,borderColor:mc}"
@click="goCommit(x)"
>评价</u-button>
</view> </view>
</view> </view>
</view> </view>
</view> </view>
<u-loadmore <u-loadmore v-if="showLoading" :status="status" :load-text="loadText" :font-size="24" :margin-top="20"
v-if="showLoading" :margin-bottom="20" bg-color="#F5F5F5" />
:status="status"
:load-text="loadText"
:font-size="24"
:margin-top="20"
:margin-bottom="20"
bg-color="#F5F5F5"
/>
</scroll-view> </scroll-view>
</view> </view>
<!-- <view class="quick" v-if="!loading">
<view class="item">
<u-icon name="cart-o" size="48" color="#333" />
</view>
<view class="item" @click="goTop">
<u-icon name="arrow-up" size="48" color="#333" />
</view>
</view>-->
</view> </view>
</template> </template>
<script> <script>
export default { export default {
data() { data() {
return { return {
pageTitle: "评价中心", pageTitle: "评价中心",
...@@ -101,7 +63,6 @@ export default { ...@@ -101,7 +63,6 @@ export default {
this.g = []; this.g = [];
console.log(this.g) console.log(this.g)
this.init(); this.init();
}, },
mounted() { mounted() {
uni.setNavigationBarTitle({ uni.setNavigationBarTitle({
...@@ -122,17 +83,16 @@ export default { ...@@ -122,17 +83,16 @@ export default {
CoverImage: x.CoverImage, CoverImage: x.CoverImage,
}; };
uni.navigateTo({ uni.navigateTo({
url: url: "/pages/order/order-commit-details?param=" +
"/pages/order/order-commit-details?param=" +
encodeURIComponent(JSON.stringify(msg)), encodeURIComponent(JSON.stringify(msg)),
fail: function (e) { fail: function(e) {
console.log(e); console.log(e);
}, },
}); });
}, },
goTop(e) { goTop(e) {
this.scrollTop = this.old.scrollTop; this.scrollTop = this.old.scrollTop;
this.$nextTick(function () { this.$nextTick(function() {
this.scrollTop = 0; this.scrollTop = 0;
}); });
}, },
...@@ -140,8 +100,7 @@ export default { ...@@ -140,8 +100,7 @@ export default {
this.isover = false; this.isover = false;
this.loading = true; this.loading = true;
this.showLoading = this.msg.pageIndex != 1; this.showLoading = this.msg.pageIndex != 1;
this.request2( this.request2({
{
url: "/api/AppletOrder/GetAppletGoodsWaitCommentPageList", url: "/api/AppletOrder/GetAppletGoodsWaitCommentPageList",
data: this.msg, data: this.msg,
}, },
...@@ -172,22 +131,23 @@ export default { ...@@ -172,22 +131,23 @@ export default {
} }
}, },
}, },
}; };
</script> </script>
<style> <style>
.commit-box { .commit-box {
background: #faf8f9; background: #faf8f9;
height: 100vh; height: 100vh;
position: relative; position: relative;
} }
.commit-box .quick {
.commit-box .quick {
right: 50rpx; right: 50rpx;
bottom: 50rpx; bottom: 50rpx;
position: absolute; position: absolute;
} }
.commit-box .quick .item { .commit-box .quick .item {
background: #fff; background: #fff;
border: 1px solid #aaa; border: 1px solid #aaa;
height: 90rpx; height: 90rpx;
...@@ -198,39 +158,45 @@ export default { ...@@ -198,39 +158,45 @@ export default {
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
} }
.commit-box .good-list {
} .commit-box .good-list {}
.commit-box .good-list .good-item {
.commit-box .good-list .good-item {
margin-top: 10px; margin-top: 10px;
background: #fff; background: #fff;
padding: 10px; padding: 10px;
border-radius: 10px; border-radius: 10px;
display: flex; display: flex;
} }
.commit-box .good-list .good-item .good-pic {
.commit-box .good-list .good-item .good-pic {
width: 200rpx; width: 200rpx;
height: 200rpx; height: 200rpx;
margin-right: 15px; margin-right: 15px;
border-radius: 5px; border-radius: 5px;
} }
.commit-box .good-list .good-item .right-box {
.commit-box .good-list .good-item .right-box {
width: 1px; width: 1px;
flex: 1; flex: 1;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
height: 200rpx; height: 200rpx;
} }
.commit-box .good-list .good-item .right-box .good-info {
.commit-box .good-list .good-item .right-box .good-info {
flex: 1; flex: 1;
width: 100%; width: 100%;
height: 1px; height: 1px;
} }
.commit-box .good-list .good-item .right-box .op-box {
.commit-box .good-list .good-item .right-box .op-box {
text-align: right; text-align: right;
height: 25px; height: 25px;
} }
.commit-box .good-list .good-item .right-box .good-info .good-name {
.commit-box .good-list .good-item .right-box .good-info .good-name {
font-size: 28rpx; font-size: 28rpx;
color: #333; color: #333;
text-overflow: -o-ellipsis-lastline; text-overflow: -o-ellipsis-lastline;
...@@ -241,8 +207,9 @@ export default { ...@@ -241,8 +207,9 @@ export default {
line-clamp: 2; line-clamp: 2;
-webkit-box-orient: vertical; -webkit-box-orient: vertical;
margin-bottom: 5px; margin-bottom: 5px;
} }
.commit-box .good-list .good-item .right-box .good-info .good-attr {
.commit-box .good-list .good-item .right-box .good-info .good-attr {
text-align: left; text-align: left;
} }
</style> </style>
This diff is collapsed.
...@@ -31,27 +31,17 @@ ...@@ -31,27 +31,17 @@
<view style="display: flex;"> <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-info">
<view class="good-name" @click="redirectGoods(x.GoodsId)">{{ <view class="good-name" @click="redirectGoods(x.GoodsId)">{{x.GoodsName}}</view>
x.GoodsName
}}</view>
<view class="good-attr"> <view class="good-attr">
<text>数量:{{ x.Number }}</text> <text>数量:{{ x.Number }}</text>
<text v-for="(y, yi) in x.SpecificationList" :key="yi" style="margin-right: 5px;"> <text v-for="(y, yi) in x.SpecificationList" :key="yi" style="margin-right: 5px;">
{{y}} {{y}}
</text> </text>
</view> </view>
<view style=" <view style="overflow: hidden;white-space: nowrap;text-overflow: ellipsis; margin-top: 2px;" @click.native.stop="goUrl(x.FreeShippingUrl)"
overflow: hidden; v-if="x.FreeShippingRemarks !=null && x.FreeShippingRemarks!='' ">
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;"> <view style="color: #FF4048;background: #fdf6ec;padding: 0 5px;display: inline-block;">
<Text style=" <Text style="font-size: 20rpx;margin-right: 5rpx;">
font-size: 20rpx;
margin-right: 5rpx;
">
{{x.FreeShippingRemarks}} {{x.FreeShippingRemarks}}
</Text> </Text>
</view> </view>
...@@ -66,7 +56,6 @@ ...@@ -66,7 +56,6 @@
<view class="label">配送方式</view> <view class="label">配送方式</view>
<view class="content">{{ e.Remark }}</view> <view class="content">{{ e.Remark }}</view>
</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="label">配送方式</view>
<view class="content">{{ e.ExpressName }} {{ e.ExpressNumber }}</view> <view class="content">{{ e.ExpressName }} {{ e.ExpressNumber }}</view>
...@@ -77,12 +66,7 @@ ...@@ -77,12 +66,7 @@
</template> </template>
</view> </view>
</template> </template>
<view style=" <view style="margin-top: 20px;display: flex;flex-direction: row-reverse;align-items: center;">
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;"> <view v-if="x.refund_status == 1" style="margin-right: 40rpx; font-size: 28rpx; color: gray;">
已申请售后({{ x.refund.status_text }}) 已申请售后({{ x.refund.status_text }})
...@@ -142,15 +126,12 @@ ...@@ -142,15 +126,12 @@
<view class="content right"> <view class="content right">
<text style="margin-right: 10px;">实付款:</text> <text style="margin-right: 10px;">实付款:</text>
<text style="font-size: 11px; font-weight: 700;" :style="{ color: mc }"></text> <text style="font-size: 11px; font-weight: 700;" :style="{ color: mc }"></text>
<text style="font-size: 17px;" :style="{ color: mc }">{{ <text style="font-size: 17px;" :style="{ color: mc }">{{String(orders.Income).split(".")[0]}}</text>
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: 12px;" :style="{ color: mc }">.{{String(orders.Income).split(".")[1] || "00" }}</text>
</view> </view>
</view> </view>
</view> </view>
</view> </view>
<view class="btn-box"> <view class="btn-box">
<view class="item" v-if="orders.OrderStatus == 1"> <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>
...@@ -209,10 +190,10 @@ ...@@ -209,10 +190,10 @@
}, },
delivery_time: 14, //时间 delivery_time: 14, //时间
uid: 0, uid: 0,
shopBasics:{}, shopBasics: {},
mall_UserInfo:{}, mall_UserInfo: {},
u:{}, u: {},
OrderId:0 OrderId: 0
}; };
}, },
onLoad(option) { onLoad(option) {
...@@ -228,10 +209,8 @@ ...@@ -228,10 +209,8 @@
let p = getCurrentPages(); let p = getCurrentPages();
let u = uni.getStorageSync("mall_UserInfo"); let u = uni.getStorageSync("mall_UserInfo");
this.uid = u.UserId ? u.UserId : 0; this.uid = u.UserId ? u.UserId : 0;
if (p.length > 1) { if (p.length > 1) {
this.prevPage = p[p.length - 2].route; this.prevPage = p[p.length - 2].route;
} }
this.init(); this.init();
this.themCustomStyle.background = this.mc; this.themCustomStyle.background = this.mc;
...@@ -268,7 +247,6 @@ ...@@ -268,7 +247,6 @@
}, },
scrollHandler(e) { scrollHandler(e) {
this.scrollTop = e.detail.scrollTop; this.scrollTop = e.detail.scrollTop;
//this.$forceUpdate();
}, },
scrollTopHandler() { scrollTopHandler() {
this.scrollTop = 0; this.scrollTop = 0;
...@@ -281,7 +259,6 @@ ...@@ -281,7 +259,6 @@
}, },
}, },
(res) => { (res) => {
this.expressInfo = res.data; this.expressInfo = res.data;
} }
); );
...@@ -292,7 +269,6 @@ ...@@ -292,7 +269,6 @@
}); });
}, },
redirectPrev() { redirectPrev() {
if (this.prevPage != "") { if (this.prevPage != "") {
uni.navigateBack({ uni.navigateBack({
delta: 1, delta: 1,
...@@ -308,7 +284,6 @@ ...@@ -308,7 +284,6 @@
}, },
exitPay() { exitPay() {
this.payExit = false; this.payExit = false;
}, },
closePay() { closePay() {
this.payBtn = false; this.payBtn = false;
......
This diff is collapsed.
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