Skip to content

M
mallapp
Commit 0140521f authored by 黄奎's avatar 黄奎
Browse files
Options

页面调整

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