updaye
This commit is contained in:
parent
b093e653f4
commit
bef63b04f8
@ -100,6 +100,11 @@
|
||||
"style": {
|
||||
"navigationBarTitleText": "订单详情"
|
||||
}
|
||||
}, {
|
||||
"path": "orderdetail/reasonforRefund",
|
||||
"style": {
|
||||
"navigationBarTitleText": "退款原因"
|
||||
}
|
||||
}, {
|
||||
"path": "orderFoodDetail/index",
|
||||
"style": {
|
||||
|
||||
@ -241,8 +241,8 @@
|
||||
class="roadIcon"
|
||||
src="/static/images/home/broadcastIcon.svg"
|
||||
/>
|
||||
<!-- <text class="roadTitle">高速路况播报</text> -->
|
||||
<text class="roadTitle">女神节团购活动</text>
|
||||
<text class="roadTitle">高速路况播报</text>
|
||||
<!-- <text class="roadTitle">女神节团购活动</text> -->
|
||||
</view>
|
||||
<view class="roadTopRight">
|
||||
<image class="roadIcon" src="/static/images/home/rightArrow.svg" />
|
||||
@ -579,7 +579,7 @@ export default {
|
||||
let stronge = uni.getStorageSync("showIndexPoster");
|
||||
console.log("stronge", stronge);
|
||||
|
||||
this.$refs.noticeRef.open("center");
|
||||
// this.$refs.noticeRef.open("center");
|
||||
// if (
|
||||
// stronge === 1 ||
|
||||
// stronge === "1" ||
|
||||
@ -958,6 +958,8 @@ export default {
|
||||
uni.navigateTo({ url: "/pages/newMap/index/index?comeForm=home" });
|
||||
},
|
||||
getLocalServer() {
|
||||
console.log("getLocation");
|
||||
|
||||
// 根据定位获取周边服务区
|
||||
let _this = this;
|
||||
uni.getLocation({
|
||||
@ -979,6 +981,9 @@ export default {
|
||||
console.log("2");
|
||||
_this.handleGetNearService(latitude, longitude);
|
||||
},
|
||||
fail: (err) => {
|
||||
console.log("err", err);
|
||||
},
|
||||
});
|
||||
},
|
||||
// 合并服务区数据
|
||||
|
||||
@ -72,7 +72,11 @@
|
||||
</div>
|
||||
</div>
|
||||
<!-- <text @click="handleChangeOrderStatus">收货</text> -->
|
||||
|
||||
<div class="hx-block"></div>
|
||||
|
||||
<div class="pageDesc">*自提商品的提货地址：凌云大厦一楼彩云驿购</div>
|
||||
|
||||
<div class="order-info">
|
||||
<p class="order-info-type order-info-h">
|
||||
<!-- :class="{ appoint: orderInfo.TAKE_TYPE === 2000 }" -->
|
||||
@ -281,6 +285,7 @@ export default {
|
||||
type: 0,
|
||||
},
|
||||
sellchildid: "", // 子ID
|
||||
showNotice: false,
|
||||
};
|
||||
},
|
||||
computed: {
|
||||
@ -297,6 +302,21 @@ export default {
|
||||
// 发起退款
|
||||
handleRefund() {
|
||||
let _this = this;
|
||||
uni.showModal({
|
||||
title: "提示",
|
||||
content: "仅支持整单退款，确认发起退款申请？",
|
||||
success: async function (res) {
|
||||
if (res.confirm) {
|
||||
uni.navigateTo({
|
||||
url: `/pages/order/orderdetail/reasonforRefund?salebillId=${_this.orderInfo.SALEBILL_ID}&&saleBillChildId=${_this.orderInfo.SALEBILL_CHILD_ID}`,
|
||||
});
|
||||
}
|
||||
},
|
||||
});
|
||||
|
||||
// 现在跳个页面 发起退款 所以下面的操作 就在其他页面完成
|
||||
return;
|
||||
// let _this = this;
|
||||
|
||||
let openId = uni.getStorageSync("openId");
|
||||
console.log("openId", openId);
|
||||
@ -846,9 +866,9 @@ export default {
|
||||
clearInterval(this.timer);
|
||||
this.pageMsg.type = 0;
|
||||
},
|
||||
// onShow () {
|
||||
// this.getOrderType()
|
||||
// },
|
||||
onShow () {
|
||||
this.getOrderType()
|
||||
},
|
||||
onLoad(option) {
|
||||
console.log("option", option);
|
||||
|
||||
@ -872,7 +892,7 @@ export default {
|
||||
|
||||
this.orderNumber = option.orderNumber;
|
||||
this.orderInternal = option.orderInternal;
|
||||
this.getOrderType();
|
||||
// this.getOrderType();
|
||||
},
|
||||
};
|
||||
</script>
|
||||
@ -974,6 +994,15 @@ page {
|
||||
box-sizing: border-box;
|
||||
// box-shadow 0 2rpx 16rpx 0.4rpx #e2e2e2
|
||||
}
|
||||
.pageDesc {
|
||||
width: 100%;
|
||||
text-align: left;
|
||||
font-size: 28rpx;
|
||||
color: red;
|
||||
box-sizing: border-box;
|
||||
padding-left: 32rpx;
|
||||
margin-bottom: 16rpx;
|
||||
}
|
||||
|
||||
.order-top {
|
||||
display: flex;
|
||||
|
||||
318
pages/order/orderdetail/reasonforRefund.vue
Normal file
318
pages/order/orderdetail/reasonforRefund.vue
Normal file
@ -0,0 +1,318 @@
|
||||
<template>
|
||||
<view class="container">
|
||||
<view class="title">请选择退款原因</view>
|
||||
<scroll-view class="scrollView" scroll-y>
|
||||
<radio-group class="radio-group" @change="onReasonChange">
|
||||
<label
|
||||
class="radio-item"
|
||||
v-for="(item, index) in reasons"
|
||||
:key="index"
|
||||
:style="{
|
||||
alignItems: index + 1 === reasons.length ? 'flex-start' : '',
|
||||
}"
|
||||
>
|
||||
<radio :value="item.value" :checked="item.checked" />
|
||||
<text>{{ item.label }}</text>
|
||||
<!-- <textarea
|
||||
v-if="item.value === 'other'"
|
||||
v-model="otherReason"
|
||||
class="other-input"
|
||||
placeholder="请输入具体原因"
|
||||
:disabled="selectedReason !== 'other'"
|
||||
/> -->
|
||||
</label>
|
||||
</radio-group>
|
||||
|
||||
<radio-group
|
||||
v-if="childrenReasons && childrenReasons.length > 0"
|
||||
class="radio-group"
|
||||
style="margin-top: 40rpx"
|
||||
@change="onChildrenReasonChange"
|
||||
>
|
||||
<label
|
||||
class="radio-item"
|
||||
v-for="(item, index) in childrenReasons"
|
||||
:key="index"
|
||||
:style="{
|
||||
alignItems:
|
||||
item.value === 2099 || item.value === 1099 ? 'flex-start' : '',
|
||||
}"
|
||||
>
|
||||
<radio :value="item.value" :checked="item.checked" />
|
||||
<text>{{ item.label }}</text>
|
||||
<textarea
|
||||
v-if="item.value === 2099 || item.value === 1099"
|
||||
v-model="otherReason"
|
||||
class="other-input"
|
||||
placeholder="请输入具体原因"
|
||||
:disabled="selectedChildrenReason !== selectedChildrenReason"
|
||||
/>
|
||||
</label>
|
||||
</radio-group>
|
||||
</scroll-view>
|
||||
<view class="submit-btn" @click="onSubmit"> 确认退款 </view>
|
||||
</view>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import { mapGetters } from "vuex";
|
||||
export default {
|
||||
data() {
|
||||
return {
|
||||
selectedReason: "",
|
||||
selectedReasonText: "", // 选择的父集名称
|
||||
otherReason: "",
|
||||
reasons: [],
|
||||
orderInfo: {}, // 订单详情先拿到
|
||||
orderInternal: "", // 退款的id
|
||||
sellchildid: "", // 退款的id
|
||||
childrenReasons: [], // 子集原因列表
|
||||
selectedChildrenReason: "", // 选择的子集
|
||||
selectedChildrenText: "", // 选择的子集名称
|
||||
};
|
||||
},
|
||||
computed: {
|
||||
...mapGetters(["user"]),
|
||||
},
|
||||
onLoad(query) {
|
||||
// 拿到要退款的订单id
|
||||
if (query.salebillId) {
|
||||
this.orderInternal = query.salebillId;
|
||||
}
|
||||
if (query.saleBillChildId) {
|
||||
this.sellchildid = query.saleBillChildId;
|
||||
}
|
||||
// 退货的枚举类型
|
||||
this.handleServiceType();
|
||||
// 订单的详情
|
||||
this.getOrderType();
|
||||
},
|
||||
methods: {
|
||||
// 退货的枚举类型
|
||||
async handleServiceType() {
|
||||
uni.showLoading({
|
||||
title: "加载中...",
|
||||
});
|
||||
const data = await this.$api.$get(
|
||||
"/EShangApiMain/FrameWork/GetFieldEnumTree",
|
||||
{ FieldExplainField: "AFTERSALE_TYPE" }
|
||||
);
|
||||
let list = this.$utils.wrapTreeNode(data.Result_Data.List);
|
||||
this.reasons = list;
|
||||
uni.hideLoading();
|
||||
},
|
||||
// 获取订单状态
|
||||
getOrderType() {
|
||||
let _this = this;
|
||||
_this.$api
|
||||
.getCoop({
|
||||
action_type: "GetOrderDetail",
|
||||
salebillId: _this.orderInternal,
|
||||
saleBillChildId: _this.sellchildid ? _this.sellchildid : "",
|
||||
})
|
||||
.then((res) => {
|
||||
if (res.ResultCode === "100") {
|
||||
let _data = res.Data;
|
||||
_this.orderInfo = _data;
|
||||
}
|
||||
});
|
||||
},
|
||||
|
||||
onChildrenReasonChange(e) {
|
||||
this.selectedChildrenReason = Number(e.detail.value);
|
||||
|
||||
let list = this.childrenReasons.filter(
|
||||
(item) => item.value === Number(e.detail.value)
|
||||
);
|
||||
|
||||
this.selectedChildrenText = list[0].label;
|
||||
|
||||
if (
|
||||
this.selectedChildrenReason !== "2099" &&
|
||||
this.selectedChildrenReason !== "1099"
|
||||
) {
|
||||
this.otherReason = "";
|
||||
}
|
||||
},
|
||||
onReasonChange(e) {
|
||||
this.selectedReason = e.detail.value;
|
||||
let list = this.reasons.filter(
|
||||
(item) => item.value === Number(e.detail.value)
|
||||
);
|
||||
|
||||
let childrenList = [];
|
||||
if (list && list.length > 0) {
|
||||
childrenList = list[0].children;
|
||||
this.selectedReasonText = list[0].label;
|
||||
}
|
||||
|
||||
this.childrenReasons = childrenList;
|
||||
this.$forceUpdate();
|
||||
|
||||
// if (this.selectedReason !== "other") {
|
||||
// this.otherReason = "";
|
||||
// }
|
||||
},
|
||||
async onSubmit() {
|
||||
if (!this.selectedReason) {
|
||||
uni.showToast({
|
||||
title: "请选择退款原因",
|
||||
icon: "none",
|
||||
});
|
||||
return;
|
||||
}
|
||||
if (!this.selectedChildrenReason) {
|
||||
uni.showToast({
|
||||
title: "请选择具体原因",
|
||||
icon: "none",
|
||||
});
|
||||
return;
|
||||
}
|
||||
|
||||
if (
|
||||
(this.selectedChildrenReason === 2099 ||
|
||||
this.selectedChildrenReason === 1099) &&
|
||||
!this.otherReason
|
||||
) {
|
||||
uni.showToast({
|
||||
title: "请输入具体原因",
|
||||
icon: "none",
|
||||
});
|
||||
return;
|
||||
}
|
||||
|
||||
let _this = this;
|
||||
let openId = uni.getStorageSync("openId");
|
||||
let reqOrder = {
|
||||
action_type: "ScanOrder",
|
||||
salebillType: 3999,
|
||||
provinceCode: _this.user.PROVINCE_CODE || "530000",
|
||||
serverpartShopId: "5634",
|
||||
salebillDesc: `${this.selectedReasonText}:${
|
||||
this.selectedChildrenText === "其他原因"
|
||||
? this.otherReason
|
||||
: this.selectedChildrenText
|
||||
}`,
|
||||
wechatOpenId: openId || "",
|
||||
oriSalebillCode: _this.orderInfo.SALEBILL_CODE,
|
||||
wechatUnionId: _this.user.USER_UNIONID || "",
|
||||
takeType: _this.orderInfo.TAKE_TYPE,
|
||||
t_saleorderdetail: JSON.stringify(_this.orderInfo.List),
|
||||
requestType: "application/x-www-form-urlencoded",
|
||||
};
|
||||
const orderData = await _this.$api.postCoop(reqOrder);
|
||||
if (orderData.ResultCode === "100") {
|
||||
const req = {
|
||||
action_type: "UpdateOrderState",
|
||||
action_data: _this.orderInfo.SALEBILL_ID,
|
||||
SALEBILL_STATE: 8000,
|
||||
};
|
||||
const data = await _this.$api.getCoop(req);
|
||||
// 提交退款申请逻辑
|
||||
uni.showToast({
|
||||
title: "退款申请已提交",
|
||||
icon: "success",
|
||||
});
|
||||
setTimeout(() => {
|
||||
uni.navigateBack({
|
||||
delta: 1,
|
||||
});
|
||||
}, 1000);
|
||||
// if (data.error === 1) {
|
||||
// _this.getOrderType();
|
||||
// }
|
||||
} else {
|
||||
uni.showToast({
|
||||
title: orderData.ResultDesc,
|
||||
icon: "none",
|
||||
});
|
||||
}
|
||||
},
|
||||
},
|
||||
};
|
||||
</script>
|
||||
|
||||
<style lang="less" scoped>
|
||||
.container {
|
||||
padding: 32rpx;
|
||||
background: #fff;
|
||||
}
|
||||
|
||||
.title {
|
||||
font-size: 16px;
|
||||
font-weight: bold;
|
||||
margin-bottom: 20px;
|
||||
}
|
||||
|
||||
.scrollView {
|
||||
width: 100%;
|
||||
height: calc(100vh - 84px - 37px - 46px);
|
||||
padding: 16px 0;
|
||||
}
|
||||
|
||||
.scrollView ::-webkit-scrollbar {
|
||||
display: none;
|
||||
width: 0;
|
||||
}
|
||||
|
||||
.radio-group {
|
||||
// margin-bottom: 30px;
|
||||
// height: 100%;
|
||||
padding: 12rpx;
|
||||
border-radius: 8rpx;
|
||||
background: #f6f6f6;
|
||||
box-sizing: border-box;
|
||||
padding-left: 24rpx;
|
||||
}
|
||||
|
||||
.radio-item {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
padding: 15px 0;
|
||||
border-bottom: 1px solid #eee;
|
||||
|
||||
&:last-child {
|
||||
border-bottom: none;
|
||||
}
|
||||
|
||||
text {
|
||||
margin-left: 10px;
|
||||
font-size: 14px;
|
||||
}
|
||||
|
||||
.other-input {
|
||||
flex: 1;
|
||||
margin-left: 10px;
|
||||
padding: 5px;
|
||||
border: 1px solid #ddd;
|
||||
border-radius: 4px;
|
||||
font-size: 14px;
|
||||
|
||||
&:disabled {
|
||||
background-color: #f5f5f5;
|
||||
border-color: #eee;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.submit-btn {
|
||||
width: 90vw;
|
||||
padding: 22rpx 0;
|
||||
box-sizing: border-box;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
font-family: "PingFangSC";
|
||||
font-weight: 400;
|
||||
font-size: 32rpx;
|
||||
color: #ffffff;
|
||||
line-height: 44rpx;
|
||||
text-align: right;
|
||||
font-style: normal;
|
||||
background: #1e9b4a;
|
||||
border-radius: 8rpx;
|
||||
position: fixed;
|
||||
bottom: 40px;
|
||||
left: 5vw;
|
||||
}
|
||||
</style>
|
||||
@ -2,11 +2,24 @@
|
||||
<div class="flex-row space-x-12">
|
||||
<img
|
||||
class="shrink-0 self-start image_9"
|
||||
:src="obj.IMAGE_PATH || obj.DEFAULT_IMG || '/static/images/home/defultImg.png'"
|
||||
:src="
|
||||
obj.IMAGE_PATH || obj.DEFAULT_IMG || '/static/images/home/defultImg.png'
|
||||
"
|
||||
/>
|
||||
<div class="flex-col info">
|
||||
<div class="flex-row justify-between">
|
||||
<div class="font_3 titleName">{{ obj.COMMODITY_NAME }}</div>
|
||||
<div class="font_3 titleName" v-if="obj.bracketContent">
|
||||
<span style="font-weight: 600; color: red">{{
|
||||
obj.bracketContent
|
||||
}}</span
|
||||
><span>{{ obj.restContent || "" }}</span>
|
||||
</div>
|
||||
<div class="font_3 titleName" v-else>{{ obj.COMMODITY_NAME || "" }}</div>
|
||||
|
||||
<!-- <div class="font_3 titleName">
|
||||
{{ obj.bracketContent
|
||||
obj.restContent obj.COMMODITY_NAME }}
|
||||
</div> -->
|
||||
<div class="font_3" style="width: 100px; text-align: right">
|
||||
x{{ obj.count }}{{ obj.COMMODITY_UNIT }}
|
||||
</div>
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
<div class="settlement" :style="{ overflow: isShow ? 'hidden' : 'auto' }">
|
||||
<OrderStatus :status="1" v-if="isSubmit" :reservationDate="currentDate" />
|
||||
<div class="topBox">
|
||||
<div class="tabBox">
|
||||
<!-- <div class="tabBox">
|
||||
<div
|
||||
@click="handleChangeTab(1)"
|
||||
:class="selectTab === 1 ? 'tabItem seleTabItem' : 'tabItem'"
|
||||
@ -15,7 +15,7 @@
|
||||
>
|
||||
自提
|
||||
</div>
|
||||
</div>
|
||||
</div> -->
|
||||
<div
|
||||
class="address"
|
||||
v-if="selectTab === 1"
|
||||
@ -289,12 +289,21 @@ export default {
|
||||
let shopList = JSON.parse(option.shopCarList);
|
||||
console.log("shopList", shopList);
|
||||
let sum = 0;
|
||||
let newList = [];
|
||||
if (shopList && shopList.length > 0) {
|
||||
shopList.forEach((item) => {
|
||||
let obj = this.parseBracketString(item.COMMODITY_NAME);
|
||||
console.log("obj", obj);
|
||||
sum += item.count;
|
||||
newList.push({
|
||||
...obj,
|
||||
...item,
|
||||
});
|
||||
});
|
||||
|
||||
}
|
||||
this.shopOrder = shopList;
|
||||
this.shopOrder = newList;
|
||||
console.log("this.shopOrder", this.shopOrder);
|
||||
this.shopCount = sum;
|
||||
}
|
||||
if (option.addressId) {
|
||||
@ -327,6 +336,26 @@ export default {
|
||||
handleOpenAddress() {
|
||||
this.$refs.addressPopup.open("bottom");
|
||||
},
|
||||
parseBracketString(input) {
|
||||
const pattern = /【([^】]+)】/;
|
||||
const match = pattern.exec(input);
|
||||
if (!match) {
|
||||
// 如果没有找到【】，直接返回原始字符串
|
||||
return {
|
||||
bracketContent: "",
|
||||
restContent: input,
|
||||
};
|
||||
}
|
||||
// match[0] 是带【】的完整字符串，例如 "【凌云一楼自提】"
|
||||
// match[1] 是不带【】的字符串，例如 "凌云一楼自提"
|
||||
const bracketContent = match[0];
|
||||
// 剩余内容：将匹配到的带【】的部分删掉
|
||||
const restContent = input.replace(bracketContent, "");
|
||||
return {
|
||||
bracketContent,
|
||||
restContent,
|
||||
};
|
||||
},
|
||||
// 请求该用户的地址列表
|
||||
async handleGetAddressList() {
|
||||
const data = await this.$api.getCoop({ action_type: "GetAddressList" });
|
||||
@ -528,6 +557,7 @@ export default {
|
||||
},
|
||||
// 余额支付
|
||||
async handleBalancePayment(obj) {
|
||||
let _this = this;
|
||||
console.log("this.user", this.user);
|
||||
console.log("obj", obj);
|
||||
|
||||
@ -567,22 +597,20 @@ export default {
|
||||
console.log("data", data);
|
||||
if (data.ResultCode === "100") {
|
||||
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({
|
||||
title: "进行组合支付...",
|
||||
uni.showModal({
|
||||
title: "提示",
|
||||
content: `当前积分${this.userInfo.ACCOUNT_BALANCE}，还需额外支付${data.ResultData}元`,
|
||||
success: function (res) {
|
||||
if (res.confirm) {
|
||||
uni.showLoading({
|
||||
title: "进行组合支付...",
|
||||
});
|
||||
_this.getOrderInfo(obj, data.ResultData);
|
||||
uni.hideLoading();
|
||||
} else if (res.cancel) {
|
||||
}
|
||||
},
|
||||
});
|
||||
this.getOrderInfo(obj, data.ResultData);
|
||||
uni.hideLoading();
|
||||
} else {
|
||||
this.isMakeOrdering = false;
|
||||
uni.showToast({
|
||||
|
||||
@ -197,7 +197,7 @@
|
||||
good.SEND_MODE > 0 ||
|
||||
good.DELIVER_AREA ||
|
||||
good.LIMIT_TOTALCOUNT > 0 ||
|
||||
good.LIMIT_TOTALCOUNT > 0
|
||||
good.AFTERSALE_NATRUE > 0
|
||||
"
|
||||
>
|
||||
<view
|
||||
@ -227,7 +227,9 @@
|
||||
}}</view>
|
||||
|
||||
<view>{{
|
||||
good.DELIVER_AREA ? "配送区域：仅限云南省即江浙沪包邮区购买" : ""
|
||||
good.DELIVER_AREA
|
||||
? `配送区域：${good.DELIVER_AREA || "仅限云南省即江浙沪包邮区购买"}`
|
||||
: ""
|
||||
}}</view>
|
||||
<view>{{
|
||||
good.LIMIT_TOTALCOUNT
|
||||
@ -239,6 +241,20 @@
|
||||
? `每日限购：每人每日限购${good.LIMIT_TOTALCOUNT}件`
|
||||
: ""
|
||||
}}</view>
|
||||
|
||||
<view>{{
|
||||
good.AFTERSALE_NATRUE
|
||||
? `售后性质：${
|
||||
good.AFTERSALE_NATRUE === 1000
|
||||
? "退货"
|
||||
: good.AFTERSALE_NATRUE === 2000
|
||||
? "换货"
|
||||
: good.AFTERSALE_NATRUE === 3000
|
||||
? "退换货"
|
||||
: ""
|
||||
}`
|
||||
: ""
|
||||
}}</view>
|
||||
</view>
|
||||
</div>
|
||||
|
||||
|
||||
@ -464,10 +464,20 @@ export default {
|
||||
},
|
||||
// 最底下的两个点击事件
|
||||
handleLastFun(value) {
|
||||
console.log("value", value);
|
||||
if (value === 1) {
|
||||
// 客服帮助
|
||||
uni.navigateTo({
|
||||
url: `/pages/noDataPage/index`,
|
||||
// uni.navigateTo({
|
||||
// url: `/pages/noDataPage/index`,
|
||||
// });
|
||||
wx.openCustomerServiceChat({
|
||||
extInfo: {
|
||||
url: "", // 客服链接
|
||||
}, // 客服信息
|
||||
corpId: "", //企业ID
|
||||
success(res) {
|
||||
console.log("res", res);
|
||||
},
|
||||
});
|
||||
} else if (value === 2) {
|
||||
// 服务热线
|
||||
|
||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
1
unpackage/dist/dev/mp-weixin/app.json
vendored
1
unpackage/dist/dev/mp-weixin/app.json
vendored
@ -52,6 +52,7 @@
|
||||
"buyOrder/index",
|
||||
"foodOrder/index",
|
||||
"orderdetail/index",
|
||||
"orderdetail/reasonforRefund",
|
||||
"orderFoodDetail/index"
|
||||
]
|
||||
},
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{
|
||||
"component": true,
|
||||
"usingComponents": {}
|
||||
"usingComponents": {},
|
||||
"component": true
|
||||
}
|
||||
@ -1,4 +1,4 @@
|
||||
{
|
||||
"component": true,
|
||||
"usingComponents": {}
|
||||
"usingComponents": {},
|
||||
"component": true
|
||||
}
|
||||
@ -351,7 +351,8 @@ var _default = {
|
||||
case 0:
|
||||
stronge = uni.getStorageSync("showIndexPoster");
|
||||
console.log("stronge", stronge);
|
||||
_this2.$refs.noticeRef.open("center");
|
||||
|
||||
// this.$refs.noticeRef.open("center");
|
||||
// if (
|
||||
// stronge === 1 ||
|
||||
// stronge === "1" ||
|
||||
@ -407,7 +408,7 @@ var _default = {
|
||||
_this2.handleGetProductsList();
|
||||
// 商城的内容
|
||||
_this2.handleGetShoppingMall();
|
||||
case 18:
|
||||
case 17:
|
||||
case "end":
|
||||
return _context.stop();
|
||||
}
|
||||
@ -775,6 +776,8 @@ var _default = {
|
||||
});
|
||||
},
|
||||
getLocalServer: function getLocalServer() {
|
||||
console.log("getLocation");
|
||||
|
||||
// 根据定位获取周边服务区
|
||||
var _this = this;
|
||||
uni.getLocation({
|
||||
@ -794,6 +797,9 @@ var _default = {
|
||||
var longitude = res.longitude;
|
||||
console.log("2");
|
||||
_this.handleGetNearService(latitude, longitude);
|
||||
},
|
||||
fail: function fail(err) {
|
||||
console.log("err", err);
|
||||
}
|
||||
});
|
||||
},
|
||||
|
||||
File diff suppressed because one or more lines are too long
@ -1,4 +1,4 @@
|
||||
{
|
||||
"component": true,
|
||||
"usingComponents": {}
|
||||
"usingComponents": {},
|
||||
"component": true
|
||||
}
|
||||
@ -206,10 +206,11 @@ var _default = {
|
||||
pageMsg: {
|
||||
type: 0
|
||||
},
|
||||
sellchildid: "" // 子ID
|
||||
sellchildid: "",
|
||||
// 子ID
|
||||
showNotice: false
|
||||
};
|
||||
},
|
||||
|
||||
computed: _objectSpread(_objectSpread({}, (0, _vuex.mapGetters)(["user"])), {}, {
|
||||
tatalMoney: function tatalMoney() {
|
||||
var total = this.orderAmount;
|
||||
@ -221,6 +222,38 @@ var _default = {
|
||||
// 发起退款
|
||||
handleRefund: function handleRefund() {
|
||||
var _this = this;
|
||||
uni.showModal({
|
||||
title: "提示",
|
||||
content: "仅支持整单退款，确认发起退款申请？",
|
||||
success: function () {
|
||||
var _success = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(res) {
|
||||
return _regenerator.default.wrap(function _callee$(_context) {
|
||||
while (1) {
|
||||
switch (_context.prev = _context.next) {
|
||||
case 0:
|
||||
if (res.confirm) {
|
||||
uni.navigateTo({
|
||||
url: "/pages/order/orderdetail/reasonforRefund?salebillId=".concat(_this.orderInfo.SALEBILL_ID, "&&saleBillChildId=").concat(_this.orderInfo.SALEBILL_CHILD_ID)
|
||||
});
|
||||
}
|
||||
case 1:
|
||||
case "end":
|
||||
return _context.stop();
|
||||
}
|
||||
}
|
||||
}, _callee);
|
||||
}));
|
||||
function success(_x) {
|
||||
return _success.apply(this, arguments);
|
||||
}
|
||||
return success;
|
||||
}()
|
||||
});
|
||||
|
||||
// 现在跳个页面 发起退款 所以下面的操作 就在其他页面完成
|
||||
return;
|
||||
// let _this = this;
|
||||
|
||||
var openId = uni.getStorageSync("openId");
|
||||
console.log("openId", openId);
|
||||
console.log("_this.orderInfo", _this.orderInfo);
|
||||
@ -228,14 +261,14 @@ var _default = {
|
||||
title: "提示",
|
||||
content: "仅支持整单退款，确认发起退款申请？",
|
||||
success: function () {
|
||||
var _success = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(res) {
|
||||
var _success2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(res) {
|
||||
var reqOrder, orderData, req, data;
|
||||
return _regenerator.default.wrap(function _callee$(_context) {
|
||||
return _regenerator.default.wrap(function _callee2$(_context2) {
|
||||
while (1) {
|
||||
switch (_context.prev = _context.next) {
|
||||
switch (_context2.prev = _context2.next) {
|
||||
case 0:
|
||||
if (!res.confirm) {
|
||||
_context.next = 15;
|
||||
_context2.next = 15;
|
||||
break;
|
||||
}
|
||||
reqOrder = {
|
||||
@ -254,12 +287,12 @@ var _default = {
|
||||
t_saleorderdetail: JSON.stringify(_this.orderInfo.List),
|
||||
requestType: "application/x-www-form-urlencoded"
|
||||
};
|
||||
_context.next = 4;
|
||||
_context2.next = 4;
|
||||
return _this.$api.postCoop(reqOrder);
|
||||
case 4:
|
||||
orderData = _context.sent;
|
||||
orderData = _context2.sent;
|
||||
if (!(orderData.ResultCode === "100")) {
|
||||
_context.next = 14;
|
||||
_context2.next = 14;
|
||||
break;
|
||||
}
|
||||
req = {
|
||||
@ -269,10 +302,10 @@ var _default = {
|
||||
SALEBILL_STATE: 8000
|
||||
// deliverDate: new Date()
|
||||
};
|
||||
_context.next = 9;
|
||||
_context2.next = 9;
|
||||
return _this.$api.getCoop(req);
|
||||
case 9:
|
||||
data = _context.sent;
|
||||
data = _context2.sent;
|
||||
uni.showToast({
|
||||
title: data.msg,
|
||||
icon: "none"
|
||||
@ -280,7 +313,7 @@ var _default = {
|
||||
if (data.error === 1) {
|
||||
_this.getOrderType();
|
||||
}
|
||||
_context.next = 15;
|
||||
_context2.next = 15;
|
||||
break;
|
||||
case 14:
|
||||
uni.showToast({
|
||||
@ -289,13 +322,13 @@ var _default = {
|
||||
});
|
||||
case 15:
|
||||
case "end":
|
||||
return _context.stop();
|
||||
return _context2.stop();
|
||||
}
|
||||
}
|
||||
}, _callee);
|
||||
}, _callee2);
|
||||
}));
|
||||
function success(_x) {
|
||||
return _success.apply(this, arguments);
|
||||
function success(_x2) {
|
||||
return _success2.apply(this, arguments);
|
||||
}
|
||||
return success;
|
||||
}()
|
||||
@ -338,11 +371,11 @@ var _default = {
|
||||
},
|
||||
goPayment: function goPayment(obj, payMoney) {
|
||||
var _this2 = this;
|
||||
return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3() {
|
||||
return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee4() {
|
||||
var _this, mchid, timeStamp, nonceStr, serial_no, out_trade_no, req, reqSign, data, Authorization, AuthorizationStr;
|
||||
return _regenerator.default.wrap(function _callee3$(_context3) {
|
||||
return _regenerator.default.wrap(function _callee4$(_context4) {
|
||||
while (1) {
|
||||
switch (_context3.prev = _context3.next) {
|
||||
switch (_context4.prev = _context4.next) {
|
||||
case 0:
|
||||
console.log("tatalMoney", _this2.tatalMoney);
|
||||
// this.$refs.payPopup.open("bottom");
|
||||
@ -389,10 +422,10 @@ var _default = {
|
||||
parameters: "POST\n/v3/pay/transactions/jsapi\n" + timeStamp + "\n" + nonceStr + "\n" + JSON.stringify(req) + "\n"
|
||||
};
|
||||
console.log("POST\n/v3/pay/transactions/jsapi\n" + timeStamp + "\n" + nonceStr + "\n" + JSON.stringify(req) + "\n");
|
||||
_context3.next = 14;
|
||||
_context4.next = 14;
|
||||
return _this2.$api.$get("/WeChat/GenerateSign", reqSign);
|
||||
case 14:
|
||||
data = _context3.sent;
|
||||
data = _context4.sent;
|
||||
console.log("data3213123", data.Result_Data);
|
||||
Authorization = "mchid=\"".concat(mchid, "\",nonce_str=\"").concat(nonceStr, "\",signature=\"").concat(data.Result_Data, "\",timestamp=\"").concat(timeStamp, "\",serial_no=\"").concat(serial_no, "\"");
|
||||
AuthorizationStr = "WECHATPAY2-SHA256-RSA2048 ".concat(Authorization);
|
||||
@ -409,11 +442,11 @@ var _default = {
|
||||
"Content-Type": "application/json"
|
||||
},
|
||||
success: function () {
|
||||
var _success2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(res) {
|
||||
var _success3 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3(res) {
|
||||
var paySign, reqSign, data;
|
||||
return _regenerator.default.wrap(function _callee2$(_context2) {
|
||||
return _regenerator.default.wrap(function _callee3$(_context3) {
|
||||
while (1) {
|
||||
switch (_context2.prev = _context2.next) {
|
||||
switch (_context3.prev = _context3.next) {
|
||||
case 0:
|
||||
console.log(res.data.prepay_id);
|
||||
_this2.text = "request success";
|
||||
@ -421,10 +454,10 @@ var _default = {
|
||||
reqSign = {
|
||||
parameters: "wxee018fb96955552a\n" + timeStamp + "\n" + nonceStr + "\nprepay_id=" + res.data.prepay_id + "\n"
|
||||
};
|
||||
_context2.next = 6;
|
||||
_context3.next = 6;
|
||||
return _this2.$api.$get("/WeChat/GenerateSign", reqSign);
|
||||
case 6:
|
||||
data = _context2.sent;
|
||||
data = _context3.sent;
|
||||
paySign = data.Result_Data;
|
||||
wx.requestPayment({
|
||||
timeStamp: timeStamp.toString(),
|
||||
@ -447,23 +480,23 @@ var _default = {
|
||||
});
|
||||
case 9:
|
||||
case "end":
|
||||
return _context2.stop();
|
||||
return _context3.stop();
|
||||
}
|
||||
}
|
||||
}, _callee2);
|
||||
}, _callee3);
|
||||
}));
|
||||
function success(_x2) {
|
||||
return _success2.apply(this, arguments);
|
||||
function success(_x3) {
|
||||
return _success3.apply(this, arguments);
|
||||
}
|
||||
return success;
|
||||
}()
|
||||
});
|
||||
case 20:
|
||||
case "end":
|
||||
return _context3.stop();
|
||||
return _context4.stop();
|
||||
}
|
||||
}
|
||||
}, _callee3);
|
||||
}, _callee4);
|
||||
}))();
|
||||
},
|
||||
// 获取订单状态
|
||||
@ -561,14 +594,14 @@ var _default = {
|
||||
title: "温馨提示",
|
||||
content: "您是否确认取消订单。",
|
||||
success: function success(res) {
|
||||
return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee4() {
|
||||
return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee5() {
|
||||
var req, data;
|
||||
return _regenerator.default.wrap(function _callee4$(_context4) {
|
||||
return _regenerator.default.wrap(function _callee5$(_context5) {
|
||||
while (1) {
|
||||
switch (_context4.prev = _context4.next) {
|
||||
switch (_context5.prev = _context5.next) {
|
||||
case 0:
|
||||
if (!res.confirm) {
|
||||
_context4.next = 12;
|
||||
_context5.next = 12;
|
||||
break;
|
||||
}
|
||||
uni.showLoading({
|
||||
@ -583,10 +616,10 @@ var _default = {
|
||||
mixPay: 1
|
||||
// deliverDate: new Date()
|
||||
};
|
||||
_context4.next = 5;
|
||||
_context5.next = 5;
|
||||
return _this.$api.getCoop(req);
|
||||
case 5:
|
||||
data = _context4.sent;
|
||||
data = _context5.sent;
|
||||
console.log("data", data);
|
||||
uni.hideLoading();
|
||||
uni.showToast({
|
||||
@ -625,16 +658,16 @@ var _default = {
|
||||
// });
|
||||
// }
|
||||
// });
|
||||
_context4.next = 13;
|
||||
_context5.next = 13;
|
||||
break;
|
||||
case 12:
|
||||
if (res.cancel) {}
|
||||
case 13:
|
||||
case "end":
|
||||
return _context4.stop();
|
||||
return _context5.stop();
|
||||
}
|
||||
}
|
||||
}, _callee4);
|
||||
}, _callee5);
|
||||
}))();
|
||||
}
|
||||
});
|
||||
@ -778,11 +811,11 @@ var _default = {
|
||||
// 修改订单状态
|
||||
handleChangeOrderStatus: function handleChangeOrderStatus() {
|
||||
var _this3 = this;
|
||||
return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee5() {
|
||||
return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee6() {
|
||||
var _this, req, data;
|
||||
return _regenerator.default.wrap(function _callee5$(_context5) {
|
||||
return _regenerator.default.wrap(function _callee6$(_context6) {
|
||||
while (1) {
|
||||
switch (_context5.prev = _context5.next) {
|
||||
switch (_context6.prev = _context6.next) {
|
||||
case 0:
|
||||
_this = _this3;
|
||||
req = {
|
||||
@ -794,16 +827,16 @@ var _default = {
|
||||
};
|
||||
|
||||
console.log("req", req);
|
||||
_context5.next = 5;
|
||||
_context6.next = 5;
|
||||
return _this.$api.getCoop(req);
|
||||
case 5:
|
||||
data = _context5.sent;
|
||||
data = _context6.sent;
|
||||
case 6:
|
||||
case "end":
|
||||
return _context5.stop();
|
||||
return _context6.stop();
|
||||
}
|
||||
}
|
||||
}, _callee5);
|
||||
}, _callee6);
|
||||
}))();
|
||||
}
|
||||
},
|
||||
@ -814,9 +847,9 @@ var _default = {
|
||||
clearInterval(this.timer);
|
||||
this.pageMsg.type = 0;
|
||||
},
|
||||
// onShow () {
|
||||
// this.getOrderType()
|
||||
// },
|
||||
onShow: function onShow() {
|
||||
this.getOrderType();
|
||||
},
|
||||
onLoad: function onLoad(option) {
|
||||
console.log("option", option);
|
||||
uni.setNavigationBarColor({
|
||||
@ -836,7 +869,7 @@ var _default = {
|
||||
this.couponAmount = this.$store.getters.couponPrice ? "-￥" + this.$store.getters.couponPrice : "";
|
||||
this.orderNumber = option.orderNumber;
|
||||
this.orderInternal = option.orderInternal;
|
||||
this.getOrderType();
|
||||
// this.getOrderType();
|
||||
}
|
||||
};
|
||||
exports.default = _default;
|
||||
|
||||
File diff suppressed because one or more lines are too long
@ -78,6 +78,15 @@ page.data-v-8f520710 {
|
||||
border-radius: 12rpx;
|
||||
box-sizing: border-box;
|
||||
}
|
||||
.pageDesc.data-v-8f520710 {
|
||||
width: 100%;
|
||||
text-align: left;
|
||||
font-size: 28rpx;
|
||||
color: red;
|
||||
box-sizing: border-box;
|
||||
padding-left: 32rpx;
|
||||
margin-bottom: 16rpx;
|
||||
}
|
||||
.order-top.data-v-8f520710 {
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
|
||||
@ -163,6 +163,19 @@ exports.default = void 0;
|
||||
//
|
||||
//
|
||||
//
|
||||
//
|
||||
//
|
||||
//
|
||||
//
|
||||
//
|
||||
//
|
||||
//
|
||||
//
|
||||
//
|
||||
//
|
||||
//
|
||||
//
|
||||
//
|
||||
var _default = {
|
||||
props: {
|
||||
obj: {},
|
||||
|
||||
@ -1 +1 @@
|
||||
<view class="flex-row space-x-12 _div data-v-5a6f0e03"><image class="shrink-0 self-start image_9 _img data-v-5a6f0e03" src="{{obj.IMAGE_PATH||obj.DEFAULT_IMG||'/static/images/home/defultImg.png'}}"></image><view class="flex-col info _div data-v-5a6f0e03"><view class="flex-row justify-between _div data-v-5a6f0e03"><view class="font_3 titleName _div data-v-5a6f0e03">{{obj.COMMODITY_NAME}}</view><view class="font_3 _div data-v-5a6f0e03" style="width:100px;text-align:right;">{{'x'+obj.count+obj.COMMODITY_UNIT+''}}</view></view><view class="flex-row justify-between _div data-v-5a6f0e03"><label class="font_2 _span data-v-5a6f0e03">{{"单价: "+obj.COMMODITY_MEMBERPRICE+"元/"+obj.COMMODITY_UNIT}}</label><label class="font_2 _span data-v-5a6f0e03">{{"¥"+obj.cartItemAoumt}}</label></view><block wx:if="{{isSubmit&&obj.SALEDETAIL_DESC}}"><view class="remark _div data-v-5a6f0e03"><input class="input data-v-5a6f0e03" disabled="{{isSubmit}}" data-event-opts="{{[['input',[['__set_model',['$0','SALEDETAIL_DESC','$event',[]],['obj']]]]]}}" value="{{obj.SALEDETAIL_DESC}}" bindinput="__e"/></view></block><block wx:if="{{!isSubmit}}"><view class="remark _div data-v-5a6f0e03"><input class="input data-v-5a6f0e03" placeholder="这里是备注的内容" data-event-opts="{{[['blur',[['handleChangeValue',['$event','$0'],['obj']]]]]}}" value="{{obj.SALEDETAIL_DESC}}" bindblur="__e"/></view></block></view></view>
|
||||
<view class="flex-row space-x-12 _div data-v-5a6f0e03"><image class="shrink-0 self-start image_9 _img data-v-5a6f0e03" src="{{obj.IMAGE_PATH||obj.DEFAULT_IMG||'/static/images/home/defultImg.png'}}"></image><view class="flex-col info _div data-v-5a6f0e03"><view class="flex-row justify-between _div data-v-5a6f0e03"><block wx:if="{{obj.bracketContent}}"><view class="font_3 titleName _div data-v-5a6f0e03"><label style="font-weight:600;color:red;" class="_span data-v-5a6f0e03">{{obj.bracketContent}}</label><label class="_span data-v-5a6f0e03">{{obj.restContent||""}}</label></view></block><block wx:else><view class="font_3 titleName _div data-v-5a6f0e03">{{obj.COMMODITY_NAME||""}}</view></block><view class="font_3 _div data-v-5a6f0e03" style="width:100px;text-align:right;">{{'x'+obj.count+obj.COMMODITY_UNIT+''}}</view></view><view class="flex-row justify-between _div data-v-5a6f0e03"><label class="font_2 _span data-v-5a6f0e03">{{"单价: "+obj.COMMODITY_MEMBERPRICE+"元/"+obj.COMMODITY_UNIT}}</label><label class="font_2 _span data-v-5a6f0e03">{{"¥"+obj.cartItemAoumt}}</label></view><block wx:if="{{isSubmit&&obj.SALEDETAIL_DESC}}"><view class="remark _div data-v-5a6f0e03"><input class="input data-v-5a6f0e03" disabled="{{isSubmit}}" data-event-opts="{{[['input',[['__set_model',['$0','SALEDETAIL_DESC','$event',[]],['obj']]]]]}}" value="{{obj.SALEDETAIL_DESC}}" bindinput="__e"/></view></block><block wx:if="{{!isSubmit}}"><view class="remark _div data-v-5a6f0e03"><input class="input data-v-5a6f0e03" placeholder="这里是备注的内容" data-event-opts="{{[['blur',[['handleChangeValue',['$event','$0'],['obj']]]]]}}" value="{{obj.SALEDETAIL_DESC}}" bindblur="__e"/></view></block></view></view>
|
||||
@ -303,7 +303,7 @@ var _default = {
|
||||
onLoad: function onLoad(option) {
|
||||
var _this2 = this;
|
||||
return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
|
||||
var shopList, sum;
|
||||
var shopList, sum, newList;
|
||||
return _regenerator.default.wrap(function _callee$(_context) {
|
||||
while (1) {
|
||||
switch (_context.prev = _context.next) {
|
||||
@ -313,12 +313,17 @@ var _default = {
|
||||
shopList = JSON.parse(option.shopCarList);
|
||||
console.log("shopList", shopList);
|
||||
sum = 0;
|
||||
newList = [];
|
||||
if (shopList && shopList.length > 0) {
|
||||
shopList.forEach(function (item) {
|
||||
var obj = _this2.parseBracketString(item.COMMODITY_NAME);
|
||||
console.log("obj", obj);
|
||||
sum += item.count;
|
||||
newList.push(_objectSpread(_objectSpread({}, obj), item));
|
||||
});
|
||||
}
|
||||
_this2.shopOrder = shopList;
|
||||
_this2.shopOrder = newList;
|
||||
console.log("this.shopOrder", _this2.shopOrder);
|
||||
_this2.shopCount = sum;
|
||||
}
|
||||
if (option.addressId) {
|
||||
@ -359,6 +364,26 @@ var _default = {
|
||||
handleOpenAddress: function handleOpenAddress() {
|
||||
this.$refs.addressPopup.open("bottom");
|
||||
},
|
||||
parseBracketString: function parseBracketString(input) {
|
||||
var pattern = /【([^】]+)】/;
|
||||
var match = pattern.exec(input);
|
||||
if (!match) {
|
||||
// 如果没有找到【】，直接返回原始字符串
|
||||
return {
|
||||
bracketContent: "",
|
||||
restContent: input
|
||||
};
|
||||
}
|
||||
// match[0] 是带【】的完整字符串，例如 "【凌云一楼自提】"
|
||||
// match[1] 是不带【】的字符串，例如 "凌云一楼自提"
|
||||
var bracketContent = match[0];
|
||||
// 剩余内容：将匹配到的带【】的部分删掉
|
||||
var restContent = input.replace(bracketContent, "");
|
||||
return {
|
||||
bracketContent: bracketContent,
|
||||
restContent: restContent
|
||||
};
|
||||
},
|
||||
// 请求该用户的地址列表
|
||||
handleGetAddressList: function handleGetAddressList() {
|
||||
var _this3 = this;
|
||||
@ -608,11 +633,12 @@ var _default = {
|
||||
handleBalancePayment: function handleBalancePayment(obj) {
|
||||
var _this6 = this;
|
||||
return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee4() {
|
||||
var userData, insufficientBalance, req, data;
|
||||
var _this, userData, insufficientBalance, req, data;
|
||||
return _regenerator.default.wrap(function _callee4$(_context4) {
|
||||
while (1) {
|
||||
switch (_context4.prev = _context4.next) {
|
||||
case 0:
|
||||
_this = _this6;
|
||||
console.log("this.user", _this6.user);
|
||||
console.log("obj", obj);
|
||||
|
||||
@ -620,12 +646,12 @@ var _default = {
|
||||
uni.showLoading({
|
||||
title: "获取用户余额..."
|
||||
});
|
||||
_context4.next = 5;
|
||||
_context4.next = 6;
|
||||
return _this6.$api.getCoop({
|
||||
action_type: "GetMembershipInfo",
|
||||
WechatUserId: _this6.user.WechatUserId
|
||||
});
|
||||
case 5:
|
||||
case 6:
|
||||
userData = _context4.sent;
|
||||
_this6.userInfo = userData.Data;
|
||||
console.log("this.userInfo", _this6.userInfo);
|
||||
@ -649,29 +675,26 @@ var _default = {
|
||||
requestType: "application/x-www-form-urlencoded",
|
||||
mixPay: insufficientBalance ? 1 : "" // 组合支付的时候传1
|
||||
};
|
||||
_context4.next = 14;
|
||||
_context4.next = 15;
|
||||
return _this6.$api.postCoop(req);
|
||||
case 14:
|
||||
case 15:
|
||||
data = _context4.sent;
|
||||
console.log("data", data);
|
||||
if (data.ResultCode === "100") {
|
||||
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({
|
||||
title: "进行组合支付..."
|
||||
uni.showModal({
|
||||
title: "提示",
|
||||
content: "\u5F53\u524D\u79EF\u5206".concat(_this6.userInfo.ACCOUNT_BALANCE, "\uFF0C\u8FD8\u9700\u989D\u5916\u652F\u4ED8").concat(data.ResultData, "\u5143"),
|
||||
success: function success(res) {
|
||||
if (res.confirm) {
|
||||
uni.showLoading({
|
||||
title: "进行组合支付..."
|
||||
});
|
||||
_this.getOrderInfo(obj, data.ResultData);
|
||||
uni.hideLoading();
|
||||
} else if (res.cancel) {}
|
||||
}
|
||||
});
|
||||
_this6.getOrderInfo(obj, data.ResultData);
|
||||
uni.hideLoading();
|
||||
} else {
|
||||
_this6.isMakeOrdering = false;
|
||||
uni.showToast({
|
||||
@ -685,7 +708,7 @@ var _default = {
|
||||
}, 1500);
|
||||
}
|
||||
}
|
||||
case 17:
|
||||
case 18:
|
||||
case "end":
|
||||
return _context4.stop();
|
||||
}
|
||||
|
||||
File diff suppressed because one or more lines are too long
@ -140,7 +140,7 @@ var render = function () {
|
||||
_vm.good.SEND_MODE > 0 ||
|
||||
_vm.good.DELIVER_AREA ||
|
||||
_vm.good.LIMIT_TOTALCOUNT > 0 ||
|
||||
_vm.good.LIMIT_TOTALCOUNT > 0
|
||||
_vm.good.AFTERSALE_NATRUE > 0
|
||||
var g2 = g1 ? new Date(_vm.good.UPPER_DATE).getTime() : null
|
||||
var g3 = g1 ? new Date().getTime() : null
|
||||
var g4 = _vm.good.ContentImgList && _vm.good.ContentImgList.length > 0
|
||||
|
||||
File diff suppressed because one or more lines are too long
17
unpackage/dist/dev/mp-weixin/pages/user/index.js
vendored
17
unpackage/dist/dev/mp-weixin/pages/user/index.js
vendored
@ -397,10 +397,23 @@ var _default = {
|
||||
},
|
||||
// 最底下的两个点击事件
|
||||
handleLastFun: function handleLastFun(value) {
|
||||
console.log("value", value);
|
||||
if (value === 1) {
|
||||
// 客服帮助
|
||||
uni.navigateTo({
|
||||
url: "/pages/noDataPage/index"
|
||||
// uni.navigateTo({
|
||||
// url: `/pages/noDataPage/index`,
|
||||
// });
|
||||
wx.openCustomerServiceChat({
|
||||
extInfo: {
|
||||
url: "" // 客服链接
|
||||
},
|
||||
|
||||
// 客服信息
|
||||
corpId: "",
|
||||
//企业ID
|
||||
success: function success(res) {
|
||||
console.log("res", res);
|
||||
}
|
||||
});
|
||||
} else if (value === 2) {
|
||||
// 服务热线
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user