wk450097098
/
mrr.sj.front
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/mrr_sj_develop_丁杰_20260413_pricer'

This commit is contained in:
cjl520cy 2026-04-16 10:34:54 +08:00
parent f7e8388e67 9ecaf1a1de
commit a4df9a6269
12 changed files with 15572 additions and 16462 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28442
pages/address/data/ChinaCitys.json
View File

File diff suppressed because it is too large Load Diff

2
pages/address/search.vue
View File

@ -573,7 +573,7 @@
const currentCityCode = (cityItem.code || '').slice(0, 6) const currentCityCode = (cityItem.code || '').slice(0, 6)
if (currentCityCode === targetCityCode) { if (currentCityCode === targetCityCode) {
result.cityIndex = cIdx result.cityIndex = cIdx
const areas = cityItem.areas || [] const areas = cityItem?.areas || []
for (let aIdx = 0; aIdx < areas.length; aIdx++) { for (let aIdx = 0; aIdx < areas.length; aIdx++) {
const areaItem = areas[aIdx] const areaItem = areas[aIdx]
const currentAreaCode = (areaItem.code || '').slice(0, 6) const currentAreaCode = (areaItem.code || '').slice(0, 6)

2
pages/home/components/orderCard2.vue
View File

@ -39,7 +39,7 @@
<view class="service-price"> <view class="service-price">
<text v-if="dataItem.team_buy_id">{{`团购价: `}}</text>¥<text <text v-if="dataItem.team_buy_id">{{`团购价: `}}</text>¥<text
style="font-size: 34rpx;">{{ dataItem.order_money }}</text> style="font-size: 34rpx;">{{ dataItem.order_money }}</text>
<text class="service-price-line">{{ dataItem.line_money }}</text> <!-- <text class="service-price-line">{{ dataItem.line_money }}</text> -->
</view> </view>
</view> </view>

4
pages/shop/components/orderCard.vue
View File

@ -30,7 +30,7 @@
</text> </text>
</view> </view>
<view class="service-time" v-if="dataItem.add_time">下单时间: {{ dataItem.add_time }}</view> <view class="service-time" v-if="dataItem.add_time && dataItem.state!=7">下单时间: {{ dataItem.add_time }}</view>
</view> </view>
<view class="service-price" > <view class="service-price" >
<text v-if="dataItem.team_buy_id">{{`团购价: `}}</text>¥<text <text v-if="dataItem.team_buy_id">{{`团购价: `}}</text>¥<text
@ -145,7 +145,7 @@
"待支付", "待支付",
"待接单", "待接单",
"待开始", "待开始",
"进行中", "待完成",
"已完成", "已完成",
"已评价", "已评价",
"已取消", "已取消",

4
pages/shop/manHour/components/orderCard.vue
View File

@ -51,10 +51,10 @@
<view class="btn accept-btn" v-if="dataItem.state == 2 || dataItem.state == 3" @click.stop="emitRefund">申请退款</view> <view class="btn accept-btn" v-if="dataItem.state == 2 || dataItem.state == 3" @click.stop="emitRefund">申请退款</view>
<!-- 已完成状态：再来一单 --> <!-- 已完成状态：再来一单 -->
<view class="btn accept-btn" v-if="dataItem.state == 5" @click.stop="emitReOrder">再来一单</view> <view class="btn accept-btn" v-if="dataItem.state == 5 || dataItem.state == 7" @click.stop="emitReOrder">再来一单</view>
<!-- 已取消状态：重新预订 --> <!-- 已取消状态：重新预订 -->
<view class="btn accept-btn" v-if="dataItem.state == 7" @click.stop="emitReOrder">重新预订</view> <!-- <view class="btn accept-btn" v-if="dataItem.state == 7" @click.stop="emitReOrder">重新预订</view> -->
</view> </view>
</view> </view>
</template> </template>

2
pages/shop/manHour/saleList.vue
View File

@ -180,7 +180,7 @@ export default {
.post(url, data) .post(url, data)
.then((res) => { .then((res) => {
if (res.code == 1 || res.code == 200) { if (res.code == 1 || res.code == 200) {
uni.showToast({ title: "申请退款！", icon: "none" }); uni.showToast({ title: "申请退款成功！", icon: "none" });
this.getServicesList(); this.getServicesList();
} else { } else {
uni.showToast({ title: res.msg, icon: "none" }); uni.showToast({ title: res.msg, icon: "none" });

2
pages/shop/manHourDetail.vue
View File

@ -92,7 +92,7 @@
<text class="label">订单编号</text> <text class="label">订单编号</text>
<text class="value">{{ orderInfo.number }}</text> <text class="value">{{ orderInfo.number }}</text>
</view> </view>
<view class="info-item" v-if="orderInfo.server_code"> <view class="info-item" v-if="orderInfo.server_code && orderInfo.state !=7">
<text class="label">服务码</text> <text class="label">服务码</text>
<text class="value">{{ orderInfo.server_code }}</text> <text class="value">{{ orderInfo.server_code }}</text>
</view> </view>

3363
pages/shop/sj-info-change.vue
View File

File diff suppressed because it is too large Load Diff

207
pages/shop/userorder-detail.vue
View File

@ -22,7 +22,8 @@
<view class="kh-card-footer-left flex-row-center"> <view class="kh-card-footer-left flex-row-center">
<image class="kh-card-footer-left-img" :src="orderInfo.order_headphoto"></image> <image class="kh-card-footer-left-img" :src="orderInfo.order_headphoto"></image>
<view class="kh-card-footer-left-text"> <view class="kh-card-footer-left-text">
{{ `${orderInfo.order_username} ${orderInfo.phone_user}` }}</view> {{ `${orderInfo.order_username} ${orderInfo.phone_user}` }}
</view>
</view> </view>
<image class="kh-card-footer-right" @click="contactService(orderInfo.phone_user)" <image class="kh-card-footer-right" @click="contactService(orderInfo.phone_user)"
src="/static/images/icons/phone.png"></image> src="/static/images/icons/phone.png"></image>
@ -58,7 +59,7 @@
</view> </view>
<!-- 店铺信息 --> <!-- 店铺信息 -->
<view class="shop_card" <!-- <view class="shop_card"
v-if=" serviceType !== '2' && orderInfo.order_kind !== 3 && user_sj && user_sj.name"> v-if=" serviceType !== '2' && orderInfo.order_kind !== 3 && user_sj && user_sj.name">
<view class="shop_info_box"> <view class="shop_info_box">
<view class="shop_info_row"> <view class="shop_info_row">
@ -89,9 +90,24 @@
<text class="shop_address" v-if="user_sj.address">地址：{{ user_sj.address }}</text> <text class="shop_address" v-if="user_sj.address">地址：{{ user_sj.address }}</text>
</view> </view>
</view> </view>
</view> </view> -->
<!-- 用户信息 -->
<!-- <view class="shop_card" v-if="orderInfo.order_kind==2">
<view class="userinfo">
<view class="" v-if="orderInfo.user_yh.head_photo">
<image :src="orderInfo.user_yh.head_photo" mode="widthFix"
style="width: 70rpx;border-radius: 50%;"></image>
</view>
<view class="" style="margin-left: 20rpx;margin-top: 15rpx;">{{orderInfo.user_yh.username}}</view>
<view class="" style="margin-left: 12rpx;margin-top: 15rpx;">{{orderInfo.user_yh.account}}</view>
<view class="" style="margin-left: auto;" @click="contactService(orderInfo.user_yh.account)">
<image
src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/1cd9338d-f5b3-421b-8757-92578387e05d.png"
mode="widthFix" style="width: 40rpx;margin-top: 15rpx;"></image>
</view>
</view>
</view> -->
<!-- 服务时段 --> <!-- 服务时段 -->
<view class="time_card" v-if="orderInfo.order_kind == 3"> <view class="time_card" v-if="orderInfo.order_kind == 3">
<view class="card_title">服务时段</view> <view class="card_title">服务时段</view>
@ -107,7 +123,7 @@
<!-- 预约信息 --> <!-- 预约信息 -->
<view class="booking-card"> <view class="booking-card">
<view class="card_title">预约服务信息</view> <view class="card_title">预约信息</view>
<view class="service-item"> <view class="service-item">
<image :src="orderInfo.server_photo[0]" <image :src="orderInfo.server_photo[0]"
v-if="orderInfo.server_photo && orderInfo.server_photo.length != 0" mode="aspectFill" v-if="orderInfo.server_photo && orderInfo.server_photo.length != 0" mode="aspectFill"
@ -117,7 +133,7 @@
<view class="service-name-num">×1</view> <view class="service-name-num">×1</view>
</view> </view>
<view v-if="orderInfo.team_buy_id" class="group-price"> <view v-if="orderInfo.team_buy_id" class="group-price">
<view class="service-price">原价¥{{ orderInfo.cost_money }}</view> <!-- <view class="service-price">原价¥{{ orderInfo.cost_money }}</view> -->
<view class="service-price2">团购价:¥<text style="font-size: 36rpx">{{ <view class="service-price2">团购价:¥<text style="font-size: 36rpx">{{
orderInfo.order_money orderInfo.order_money
}}</text></view> }}</text></view>
@ -127,11 +143,33 @@
</text> </text>
</view> </view>
</view> </view>
<view class="service-item1">
<view class="serverinfo">
<view class="serverinfo-l">服务售价</view>
<view class="serverinfo-r">
<view class="serverinfo-r-o" v-if="orderInfo.cost_money!=orderInfo.line_money">
￥{{orderInfo.line_money}}</view>
<view class="serverinfo-r-t">￥{{orderInfo.cost_money}}</view>
</view>
</view>
</view>
<view class="service-item1">
<view class="payinfo">
<view class="payinfo-l">用户实付</view>
<view class="payinfo-r">￥{{orderInfo.pay_money}}</view>
</view>
</view>
<view class="service-item1" v-if="orderInfo.butie_zonge && orderInfo.butie_zonge!=0">
<view class="btinfo">
<view class="btinfo-l">平台补贴</view>
<view class="btinfo-r">￥{{orderInfo.butie_zonge}}</view>
</view>
</view>
<view class="service-real"> <view class="service-real">
<text class="real-lable">实付金额：</text> <text class="real-lable">商家结算基数</text>
<view class="real-price"> <view class="real-price">
<text class="icon">￥</text> <text class="icon">￥</text>
<text>{{ orderInfo.pay_money?orderInfo.pay_money:0 }}</text> <text>{{ orderInfo.jiesuan_jine_yiju?orderInfo.jiesuan_jine_yiju:0 }}</text>
</view> </view>
</view> </view>
</view> </view>
@ -213,10 +251,29 @@
<text class="value">{{orderInfo.team_buy_order_number}}</text> <text class="value">{{orderInfo.team_buy_order_number}}</text>
</view> </view>
</view> </view>
<view class="order-card" v-if="Object.keys(orderInfo.coupon_info).length>0">
<text class="card-title">优惠券信息</text>
<view class="coupon-item">
<view class="info-item">
<text class="label">优惠券</text>
<text class="value">{{orderInfo.coupon_info.title}}</text>
</view>
<view class="info-item">
<text class="label">券码</text>
<text class="value">{{orderInfo.coupon_info.code_num}}</text>
</view>
<view class="info-item">
<text class="label">优惠金额</text>
<text class="value">{{orderInfo.coupon_info.reduce_money}}元</text>
</view>
</view>
</view>
</view> </view>
<!-- 底部按钮 --> <!-- 底部按钮 -->
<view class="bottom-buttons" v-if="haveButton && (orderInfo.state == 2) || orderInfo.state == 3 || orderInfo.state == 4"> <view class="bottom-buttons"
v-if="haveButton && (orderInfo.state == 2) || orderInfo.state == 3 || orderInfo.state == 4">
<!-- <view class="contact-button" @click="contactService(orderInfo.phone_user)"> <!-- <view class="contact-button" @click="contactService(orderInfo.phone_user)">
<image src="/static/images/tell_icon.png" class="tell-icon"></image> <image src="/static/images/tell_icon.png" class="tell-icon"></image>
<text class="contact-text">联系TA</text> <text class="contact-text">联系TA</text>
@ -355,12 +412,12 @@
state: "2", state: "2",
}, },
{ {
text: "待服务", text: "待开始",
icon: "/static/images/icons/pendingService.png", icon: "/static/images/icons/daikaishi.png",
state: "3", state: "3",
}, },
{ {
text: "服务中", text: "待完成",
icon: "/static/images/icons/pendingService.png", icon: "/static/images/icons/pendingService.png",
state: "4", state: "4",
}, },
@ -386,9 +443,11 @@
}, },
methods: { methods: {
//消息列表跳转阅读 //消息列表跳转阅读
messageRead(id){ messageRead(id) {
request.post("/sj/push/messageRead",{id:id}).then(res=>{ request.post("/sj/push/messageRead", {
console.log("messageRead:",res) id: id
}).then(res => {
console.log("messageRead:", res)
this.messageUpudateNum() this.messageUpudateNum()
}) })
}, },
@ -1536,4 +1595,120 @@
} }
} }
} }
.userinfo {
display: flex;
}
.serverinfo {
display: flex;
justify-content: space-between;
}
.serverinfo-l {
width: 120rpx;
height: 42rpx;
font-family: PingFangSC, PingFang SC;
font-weight: 400;
font-size: 30rpx;
color: #333333;
line-height: 42rpx;
text-align: left;
font-style: normal;
}
.serverinfo-r {
display: flex;
}
.serverinfo-r-o {
height: 40rpx;
font-family: PingFangSC, PingFang SC;
font-weight: 400;
font-size: 26rpx;
color: #999999;
line-height: 40rpx;
text-align: left;
font-style: normal;
// margin-left: 350rpx;
text-decoration: line-through;
}
.serverinfo-r-t {
height: 40rpx;
font-family: DINPro, DINPro;
font-weight: 500;
font-size: 32rpx;
color: #333333;
line-height: 40rpx;
text-align: left;
font-style: normal;
margin-left: 17rpx;
}
.service-item1 {
margin-bottom: 32rpx;
}
.payinfo {
display: flex;
justify-content: space-between;
}
.payinfo-l {
font-family: PingFangSC, PingFang SC;
font-weight: 400;
font-size: 26rpx;
color: #666666;
line-height: 37rpx;
text-align: left;
font-style: normal;
}
.payinfo-r {
font-family: DINPro, DINPro;
font-weight: 500;
font-size: 32rpx;
color: #333333;
line-height: 41rpx;
text-align: left;
font-style: normal;
}
.btinfo {
display: flex;
justify-content: space-between;
}
.btinfo-l {
font-family: PingFangSC, PingFang SC;
font-weight: 400;
font-size: 26rpx;
color: #666666;
line-height: 37rpx;
text-align: left;
font-style: normal;
}
.btinfo-r {
font-family: DINPro, DINPro;
font-weight: 500;
font-size: 30rpx;
color: #333333;
line-height: 38rpx;
text-align: left;
font-style: normal;
}
.coupon-title{
width: 160rpx;
height: 40rpx;
font-family: PingFangSC, PingFang SC;
font-weight: 500;
font-size: 32rpx;
color: #3D3D3D;
line-height: 39rpx;
text-align: left;
font-style: normal;
}
.coupon-item {}
</style> </style>

4
pages/shop/userorders.vue
View File

@ -1,7 +1,7 @@
<template> <template>
<view class="orders-page"> <view class="orders-page">
<!-- 顶部导航栏 --> <!-- 顶部导航栏 -->
<custom-navbar title="全部订单" :show-back="true" backgroundColor="#fff"></custom-navbar> <custom-navbar title="订单列表" :show-back="true" backgroundColor="#fff"></custom-navbar>
<!-- <serviecFirstTab :tabs="tabs" :activeId="activeId" @tab-click="tabClick" bgColor="#FAFAFA"> <!-- <serviecFirstTab :tabs="tabs" :activeId="activeId" @tab-click="tabClick" bgColor="#FAFAFA">
</serviecFirstTab> --> </serviecFirstTab> -->
<view class="status"> <view class="status">
@ -125,7 +125,7 @@
}, },
{ {
id: 4, id: 4,
title: "进行中", title: "待完成",
}, },
{ {
id: 5, id: 5,

2
pages/shop/workSpace/saleList.vue
View File

@ -60,7 +60,7 @@
}, },
{ {
id: 4, id: 4,
text: "进行中", text: "待完成",
}, },
{ {
id: 5, id: 5,

BIN
static/images/icons/daikaishi.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 8.1 KiB