wangxiaowei/xiuhuwangqiu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

完善功能

Browse Source
This commit is contained in:
wangxiaowei
2025-12-13 00:32:46 +08:00
parent 8c2803eebc
commit f29756ac58
13 changed files with 118 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pages/index/index.vue
View File

@ -582,7 +582,7 @@ export default {
});
uni.setTabBarItem({
index: 1,
text: '分类',
text: '商城',
iconPath: 'static/tabbar/category_7.png',
selectedIconPath: 'static/tabbar/category_8.png'
});

6
pages/order/cashier.vue
View File

@ -13,13 +13,13 @@
</view>
<view class="icon-box d-c-c"><span class="icon iconfont icon-xuanze"></span></view>
</view>
<view v-if="item==30" :class="pay_type == 30 ? 'item active' : 'item'" @tap="payTypeFunc(30)">
<!-- <view v-if="item==30" :class="pay_type == 30 ? 'item active' : 'item'" @tap="payTypeFunc(30)">
<view class="d-s-c">
<view class="icon-box d-c-c mr10"><span class="icon iconfont icon-zhifubao"></span></view>
<text class="key">支付宝支付：</text>
</view>
<view class="icon-box d-c-c"><span class="icon iconfont icon-xuanze"></span></view>
</view>
</view> -->
</view>
<!-- <view v-if="hasBanlance && balance > 0" class="item">
<view class="d-s-c">
@ -268,7 +268,7 @@
@include background_color("background_color");
@include font_color('text_color2');
width: 100%;
padding-bottom: env(safe-area-inset-bottom);
// padding-bottom: env(safe-area-inset-bottom);
}
.bottom-btn>button {

10
pages/order/cg-order-detail.vue
View File

@ -50,7 +50,7 @@
<!-- 退款 -->
<view class="status-text" style="width: 100%;" v-if="detail.order_status == 5">
<view class="d-c-c" style="margin-bottom: 18rpx;" @tap="billPopup = true">
<view class="refund-txt">实际退款￥{{ detail.order_amount }}</view>
<view class="refund-txt">实际退款￥{{ detail.refund_price }}</view>
<!-- <image style="width: 48rpx;height: 48rpx;margin-left: 6rpx;margin-top: 10rpx;" src="@/static/icon/right.png" mode=""></image> -->
</view>
<view class="">您的订单已取消。期待下次有机会再为您服务！</view>
@ -242,10 +242,10 @@
<price-format color="#303133" :subscript-size="30" :first-size="30" :second-size="30" price="100"></price-format>
</view>
</view>
<view class="title2 d-b-c">
<!-- <view class="title2 d-b-c">
<view>灯光费（￥50元/小时）</view>
<view>x3</view>
</view>
</view> -->
</view>
<view class="line"></view>
@ -407,7 +407,7 @@
function(res) {
self.cancelOrderPopup = false;
uni.showToast({
window.uni.showToast({
title: '操作成功',
duration: 2000,
icon: 'success'
@ -448,7 +448,7 @@
setTimeout(() => {
uni.hideLoading();
self.getData();
}, 500);
}, 800);
} else {
uni.hideLoading();
}

8
pages/order/confirm-order.vue
View File

@ -1,14 +1,14 @@
<template>
<view class="wrap" :data-theme='theme()' :class="theme() || ''" v-if="!loading">
<!--tab-->
<view class="top-tabbar" v-if="OrderData.delivery != 30">
<!-- <view class="top-tabbar" v-if="OrderData.delivery != 30">
<block v-if="hasType(10)">
<view :class="tab_type == 0 ? 'tab-item active' : 'tab-item'" @click="tabFunc(0)">快递配送</view>
</block>
<block v-if="hasType(20)">
<view :class="tab_type == 1 ? 'tab-item active' : 'tab-item'" @click="tabFunc(1)">上门自提</view>
</block>
</view>
</view> -->
<view class="p-0-23">
<Myinfo :dis="options.order_type == 'retainage'" v-if="tab_type == 0 && OrderData.delivery != 30"
:Address="Address" :exist_address="exist_address">
@ -96,7 +96,7 @@
<text class="f24">￥{{ OrderData.express_price }}</text>
</view>
</view>
<view class="item" v-if="OrderData.is_coupon">
<!-- <view class="item" v-if="OrderData.is_coupon">
<text class="key">优惠券：</text>
<block v-if="coupon_num > 0">
<view class="f24 theme-price" v-if="OrderData.coupon_id > 0"
@ -106,7 +106,7 @@
</view>
</block>
<text v-else class="f24 gray9">无优惠券可用</text>
</view>
</view> -->
<view class="item" v-if="OrderData.product_reduce_money > 0">
<text class="key">商品立减：</text>
<view>

4
pages/order/myorder.vue
View File

@ -204,6 +204,8 @@
},
data() {
return {
id: '',// 接入微信小程序所需参数
/*手机高度*/
phoneHeight: 0,
/*可滚动视图区域高度*/
@ -252,6 +254,8 @@
}
},
onLoad(e) {
this.id = e.id || '';
if (typeof e.dataType != 'undefined') {
this.dataType = e.dataType;
}

8
pages/order/pay-success/pay-success.vue
View File

@ -15,7 +15,7 @@
</view>
<view class="success-btns d-b-c">
<button type="default" class="flex-1 mr10" @click="goHome()">返回首页</button>
<button type="primary" class="flex-1 ml10" @click="goMyorder">我的订单</button>
<button type="primary" class="flex-1 ml10" @click="goMyorder" style="background-color: #365A9A !important;">我的订单</button>
</view>
<!--推荐-->
<view><recommendProduct :location="30"></recommendProduct></view>
@ -103,7 +103,7 @@
.pay-success .success-icon .iconfont {
padding: 30rpx;
background: #04BE01;
background: #365A9A;
border-radius: 50%;
font-size: 80rpx;
color: #FFFFFF;
@ -137,7 +137,7 @@
}
.pay-success .success-btns button[type="default"] {
border: 1px solid #04BE01;
color: #04BE01;
border: 1px solid #365A9A;
color: #365A9A;
}
</style>

12
pages/user/index/index.vue
View File

@ -21,9 +21,9 @@
<view class="info">
<view class="d-c-c mb23">
<view class="name">{{ detail.nickName }}</view>
<text class="ml20 grade" v-if="detail.grade_id > 0">
<!-- <text class="ml20 grade" v-if="detail.grade_id > 0">
{{ detail.grade.name }}
</text>
</text> -->
</view>
<view class="tel d-s-c">
<text class="f26 id-number">{{ detail.mobile || 'ID:' + detail.user_id }}</text>
@ -53,7 +53,7 @@
<!-- 我的场馆订单 -->
<view class="my-cg-order my-assets">
<view class="my-assets-all">
<view class="f30 fb">我的场馆订单</view>
<view class="f30 fb">场馆订单</view>
<view class="gray9 f26" @click="jumpPage('/pages/order/cg-my-order?dataType=all')">全部订单<text
class="icon iconfont icon-jiantou"></text></view>
</view>
@ -107,7 +107,7 @@
<!--我的资产-->
<view class="my-assets">
<view class="my-assets-all">
<view class="f30 fb">我的订单</view>
<view class="f30 fb">商城订单</view>
<view class="gray9 f26" @click="jumpPage('/pages/order/myorder?dataType=all')">全部订单<text
class="icon iconfont icon-jiantou"></text></view>
</view>
@ -329,7 +329,7 @@
<style lang="scss">
page {
background-color: #EBEBEB;
background-color: #F6F7F9;
}
.w100 {
@ -594,7 +594,7 @@
}
.menu-wrap .item .name {
margin-top: 19rpx;
margin-top: 13rpx;
}
.bind_phone {