ylj/caiyunyi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
cclu 2025-02-28 18:54:14 +08:00
parent 1ca32e6e0c
commit b093e653f4
71 changed files with 99 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pages/index/index.vue
View File

@ -241,7 +241,8 @@
class="roadIcon" class="roadIcon"
src="/static/images/home/broadcastIcon.svg" src="/static/images/home/broadcastIcon.svg"
/> />
<text class="roadTitle">高速路况播报</text> <!-- <text class="roadTitle">高速路况播报</text> -->
<text class="roadTitle">女神节团购活动</text>
</view> </view>
<view class="roadTopRight"> <view class="roadTopRight">
<image class="roadIcon" src="/static/images/home/rightArrow.svg" /> <image class="roadIcon" src="/static/images/home/rightArrow.svg" />

3
pages/order/orderdetail/index.vue
View File

@ -124,7 +124,7 @@
><span>{{ orderInfo.ORDER_PERSONTEL }}</span> ><span>{{ orderInfo.ORDER_PERSONTEL }}</span>
</p> </p>
<p class="order-info-type" v-if="orderInfo.BALANCE_PAYMENT"> <p class="order-info-type" v-if="orderInfo.BALANCE_PAYMENT">
<span class="order-info-t">余额支付</span <span class="order-info-t">工会积分支付</span
><span>￥{{ orderInfo.BALANCE_PAYMENT }}</span> ><span>￥{{ orderInfo.BALANCE_PAYMENT }}</span>
</p> </p>
@ -315,6 +315,7 @@ export default {
wechatOpenId: openId || "", wechatOpenId: openId || "",
oriSalebillCode: _this.orderInfo.SALEBILL_CODE, oriSalebillCode: _this.orderInfo.SALEBILL_CODE,
wechatUnionId: _this.user.USER_UNIONID || "", wechatUnionId: _this.user.USER_UNIONID || "",
takeType: _this.orderInfo.TAKE_TYPE,
// addressId: this.addressInfo.MEMBERADDRESS_ID, // addressId: this.addressInfo.MEMBERADDRESS_ID,
// orderPersonTel: this.addressInfo.MOBILEPHONE, // orderPersonTel: this.addressInfo.MOBILEPHONE,
// couponCode: '',//优惠券 // couponCode: '',//优惠券

2
pages/shopMallPage/index/index.vue
View File

@ -220,7 +220,7 @@
class="shopItem" class="shopItem"
v-for="(item, index) in activityShopList" v-for="(item, index) in activityShopList"
:key="index" :key="index"
@click.stop="handleGoActivityType" @click.stop="handleGoShopDetail(item)"
> >
<div class="shopItemImg"> <div class="shopItemImg">
<div class="imgBox"> <div class="imgBox">

11
pages/shopPages/settlement/index.vue
View File

@ -567,6 +567,17 @@ export default {
console.log("data", data); console.log("data", data);
if (data.ResultCode === "100") { if (data.ResultCode === "100") {
if (insufficientBalance) { if (insufficientBalance) {
// uni.showModal({
// title: "提示",
// content: `当前积分${this.userInfo.ACCOUNT_BALANCE}，还需额外支付${data.ResultData}元`,
// success: function (res) {
// if (res.confirm) {
// console.log("用户点击确定");
// } else if (res.cancel) {
// console.log("用户点击取消");
// }
// },
// });
uni.showLoading({ uni.showLoading({
title: "进行组合支付...", title: "进行组合支付...",
}); });

2
unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/components/card.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/components/currentService.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/components/keyboard.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/components/noData.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/components/shopTabbar.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/components/tabbar.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/allFunPage/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/bindCar/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/evaluateList/addEvaluate.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/evaluateList/components/orderItem.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/evaluateList/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/highwayHeadlines/detail.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/highwayHeadlines/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/myAddress/address/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/myAddress/newAdd/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/newEvaluate/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/newMap/index/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/noDataPage/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/order/buyOrder/components/orderItem.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/order/buyOrder/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/order/foodOrder/components/orderItem.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/order/foodOrder/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/order/orderFoodDetail/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/order/orderdetail/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/otherFunPage/finance/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/otherFunPage/goPublicPage/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/otherFunPage/insurance/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/payfor/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/register/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/reservationOrder/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/serviceDetail/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/serviceList/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/shopMallPage/index/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/shopMallPage/shopCar/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/shopMallPage/shopType/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/shopMallPage/user/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/shopPages/settlement/components/commodityItem.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/shopPages/settlement/components/loading/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/shopPages/settlement/components/orderInfo.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/shopPages/settlement/components/orderStatus.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/shopPages/settlement/components/receiveGoods.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/shopPages/settlement/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/shopPages/settlementFood/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/shopPages/shop/components/merchantEvaluation.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/shopPages/shop/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/shopPages/shopDetail/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/shopPages/shopList/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/storeDetail/components/merchantEvaluation.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/storeDetail/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/user/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/l-dragSort/components/l-dragSort/l-dragSort.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-icons/components/uni-icons/uni-icons.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-popup/components/uni-popup/uni-popup.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-rate/components/uni-rate/uni-rate.js.map vendored
View File

File diff suppressed because one or more lines are too long

4
unpackage/dist/dev/mp-weixin/components/currentService.json vendored
View File

@ -1,4 +1,4 @@
{ {
"usingComponents": {}, "component": true,
"component": true "usingComponents": {}
} }

4
unpackage/dist/dev/mp-weixin/components/keyboard.json vendored
View File

@ -1,4 +1,4 @@
{ {
"usingComponents": {}, "component": true,
"component": true "usingComponents": {}
} }

4
unpackage/dist/dev/mp-weixin/components/noData.json vendored
View File

@ -1,4 +1,4 @@
{ {
"usingComponents": {}, "component": true,
"component": true "usingComponents": {}
} }

4
unpackage/dist/dev/mp-weixin/components/shopTabbar.json vendored
View File

@ -1,4 +1,4 @@
{ {
"usingComponents": {}, "component": true,
"component": true "usingComponents": {}
} }

4
unpackage/dist/dev/mp-weixin/components/tabbar.json vendored
View File

@ -1,4 +1,4 @@
{ {
"usingComponents": {}, "component": true,
"component": true "usingComponents": {}
} }

2
unpackage/dist/dev/mp-weixin/pages/index/index.wxml vendored
View File

File diff suppressed because one or more lines are too long

4
unpackage/dist/dev/mp-weixin/pages/order/buyOrder/components/orderItem.json vendored
View File

@ -1,4 +1,4 @@
{ {
"usingComponents": {}, "component": true,
"component": true "usingComponents": {}
} }

1
unpackage/dist/dev/mp-weixin/pages/order/orderdetail/index.js vendored
View File

@ -247,6 +247,7 @@ var _default = {
wechatOpenId: openId || "", wechatOpenId: openId || "",
oriSalebillCode: _this.orderInfo.SALEBILL_CODE, oriSalebillCode: _this.orderInfo.SALEBILL_CODE,
wechatUnionId: _this.user.USER_UNIONID || "", wechatUnionId: _this.user.USER_UNIONID || "",
takeType: _this.orderInfo.TAKE_TYPE,
// addressId: this.addressInfo.MEMBERADDRESS_ID, // addressId: this.addressInfo.MEMBERADDRESS_ID,
// orderPersonTel: this.addressInfo.MOBILEPHONE, // orderPersonTel: this.addressInfo.MOBILEPHONE,
// couponCode: '',//优惠券 // couponCode: '',//优惠券

2
unpackage/dist/dev/mp-weixin/pages/order/orderdetail/index.wxml vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/mp-weixin/pages/shopMallPage/index/index.wxml vendored
View File

File diff suppressed because one or more lines are too long

11
unpackage/dist/dev/mp-weixin/pages/shopPages/settlement/index.js vendored
View File

@ -656,6 +656,17 @@ var _default = {
console.log("data", data); console.log("data", data);
if (data.ResultCode === "100") { if (data.ResultCode === "100") {
if (insufficientBalance) { if (insufficientBalance) {
// uni.showModal({
// title: "提示",
// content: `当前积分${this.userInfo.ACCOUNT_BALANCE}，还需额外支付${data.ResultData}元`,
// success: function (res) {
// if (res.confirm) {
// console.log("用户点击确定");
// } else if (res.cancel) {
// console.log("用户点击取消");
// }
// },
// });
uni.showLoading({ uni.showLoading({
title: "进行组合支付..." title: "进行组合支付..."
}); });