charles/frontend-app
1
0
Fork 0
Code Issues Pull Requests Actions Projects Releases Wiki Activity

Merge branch 'develop' into dongjian

Browse Source
This commit is contained in:
money
2025-09-06 11:35:25 +08:00
parent f1791ace40 2bcf3ce800
commit 21ae9b8c11
10 changed files with 268 additions and 283 deletions
Download Patch File Download Diff File Expand all files Collapse all files
api/order.js
+18
View File
@@ -139,3 +139,21 @@ export function returnGoodsFeedback(data) {
data,
});
}
// 查询快递公司
export function getExpressCompany() {
return request({
url: "/common/getExpress",
method: "get",
});
}
// 取消订单
export function cancelOrder(data) {
return request({
url: "/order/cancelOrder",
method: "post",
data,
});
}
manifest.json
+6 -1
View File
@@ -64,7 +64,12 @@
"sdkConfigs" : {
"payment" : {
"alipay" : {
"__platform__" : [ "ios", "android" ]
"__platform__" : [ "ios" ]
},
"weixin" : {
"__platform__" : [ "ios", "android" ],
"appid" : "wxb1deb175472de036",
"UniversalLinks" : ""
}
}
},
pages/home/home.vue
+1
View File
@@ -447,6 +447,7 @@ export default {
const params = {
type,
page: 1,
isRecomm:true,
pageSize: type === SEARCH_TYPE.SOMETHING ? 4 : 3,
}
const resp = await searchList(params);
pages/mine_package/mine_order/after-sales/refund-popu.vue
+65 -30
View File
@@ -42,6 +42,10 @@
<view class="list_left">邮寄地址</view>
<view>{{ address || "--" }}</view>
</view>
<view class="card_list" @click="onSelectExpress">
<view class="list_left">选择快递名称</view>
<view>{{ product.expressName || "--" }}</view>
</view>
<view class="card_list">
<view class="list_left">填快递单号</view>
<input
@@ -49,17 +53,7 @@
type="text"
:disabled="status != 2"
placeholder="请填写快递单号"
v-model="cancelForm.expressNo"
/>
</view>
<view class="card_list">
<view class="list_left">填快递名称</view>
<input
class="input-express"
type="text"
:disabled="status != 2"
placeholder="请填写快递名称"
v-model="cancelForm.expressName"
v-model="product.expressNo"
/>
</view>
</view>
@@ -69,18 +63,29 @@
'bottom_box',
{
bottom_box_disabled:
status == 2 && (!cancelForm.expressNo || !cancelForm.expressName),
status == 2 && (!product.expressNo || !product.expressName),
},
{ bottom_box_quash: status == 1 },
{ bottom_box_quash: status == 1 || status == 3 },
]"
>
<view class="button operate_but_2" @click="submit"
> {{ buttonLabel }}</view
<view class="button operate_but_2" @click="submit">
{{ buttonLabel }}</view
>
</view>
</view>
</view>
<up-toast ref="uToastRef"></up-toast>
<up-picker
:show="expressShow"
:columns="[expressList]"
keyName="name"
valueName="id"
itemHeight="34"
@confirm="onExpressConfirm"
@cancel="expressShow = false"
@close="expressShow = false"
></up-picker>
</view>
</template>
<script>
import salesStatus from "../components/salesStatus.vue";
@@ -88,6 +93,7 @@ import {
afterSaleApply,
cancelAfterSale,
returnGoodsFeedback,
getExpressCompany,
} from "@/api/order.js";
import { RETURN_REASON } from "@/pages/mine_package/mine_order/emun/index.js";
export default {
@@ -104,7 +110,14 @@ export default {
},
data() {
return {};
return {
expressList: [],
expressShow: false,
};
},
created() {
this.onGetExpressCompany();
},
methods: {
submit() {
@@ -113,11 +126,11 @@ export default {
this.onAfterSaleApply();
}
//已售后-- 撤销申请
if (this.status == 1) {
if (this.status == 1 || this.status == 3) {
this.onCancelApply();
}
if (this.status == 2) {
if (!this.cancelForm.expressNo || !this.cancelForm.expressName) {
if (!this.product.expressNo || !this.product.expressName) {
this.$refs.uToastRef.show({
type: "error",
message: "请填写快递信息",
@@ -179,9 +192,9 @@ export default {
// 寄回商品
async onReturnGoods() {
const params = {
afterId: this.product.afterId,
expressNo: this.cancelForm.expressNo,
expressName: this.cancelForm.expressName,
id: this.product.afterId,
expressNo: this.product.expressNo,
expressId: this.product.expressId,
};
console.log("寄回商品", params);
const { bizcode } = await returnGoodsFeedback(params);
@@ -197,15 +210,38 @@ export default {
onClose(item = false) {
this.$emit("close", item);
},
// 快递公司
async onGetExpressCompany() {
const res = await getExpressCompany();
console.log("快递公司", res.data);
this.expressList = res.data;
},
// 方法
onExpressConfirm(item) {
console.log(item);
const val = item.value[0];
this.product.expressName = val.name;
this.product.expressId = val.id;
this.expressShow = false;
},
onSelectExpress() {
if (this.status == 2) {
this.expressShow = true;
}
},
},
computed: {
status() {
// 未售后 -- 提交申请
if (this.product.afterType == 0) {
console.log(
"未售后-开始售后---",
this.product.status,
this.product.afterType
);
// 未售后-开始售后
if (this.product.status == 9) {
return 0;
}
// 已售后
if (this.product.afterType > 0) {
// 已售后 --提交申请
if (this.product.status == 0) {
return 1;
}
@@ -225,7 +261,6 @@ export default {
if (this.product.status == 7) {
return 5;
}
}
},
/* 根据订单状态按钮显示不同文案 */
buttonLabel() {
@@ -236,7 +271,7 @@ export default {
} else if (this.status == 2) {
return "确定退货/退款";
} else if (this.status == 3) {
return "确定退货/退款";
return "撤销申请";
} else if (this.status == 4) {
return "重新发起";
} else if (this.status == 5) {
@@ -250,7 +285,7 @@ export default {
} else if (this.status == 2) {
return "请按照以下地址寄回商品";
} else if (this.status == 3) {
return "请按照以下地址寄回商品";
return "退款/退货处理中";
} else if (this.status == 4) {
return "您发起的退货/退款申请，未通过";
} else if (this.status == 5) {
@@ -264,7 +299,7 @@ export default {
} else if (this.status == 2) {
return "退款申请通过";
} else if (this.status == 3) {
return "退款申请通过";
return "您已成功发起退货/退款申请，请耐心等待处";
} else if (this.status == 4) {
return "退款申请失败";
} else if (this.status == 5) {
pages/mine_package/mine_order/mine_order.vue
+139 -212
View File
@@ -1,86 +1,50 @@
<template>
<view class="order_warp">
<view class="order_header">
<up-image
src="/static/common/left.png"
width="20"
height="20"
bgColor="#f1f6ff00"
@click="jumpLeft"
></up-image>
<up-search
shape="round"
bgColor="#FFFFFFFF"
:showAction="false"
@blur="onBlur"
@search="searchFun"
v-model="search"
></up-search>
<up-image src="/static/common/left.png" width="20" height="20" bgColor="#f1f6ff00" @click="jumpLeft"></up-image>
<up-search shape="round" bgColor="#FFFFFFFF" :showAction="false" @blur="onBlur" @search="searchFun"
v-model="search"></up-search>
</view>
<view class="order_type_title">
<view
:class="
form.type === item.id
<view :class="form.type === item.id
? 'order_type_title_item order_type_title_item_sel'
: 'order_type_title_item'
"
v-for="(item, index) in orderTypeList"
@click="checkType(item)"
:key="index"
>
" v-for="(item, index) in orderTypeList" @click="checkType(item)" :key="index">
{{ item.title }}
</view>
</view>
<scroll-view
scroll-y="true"
@scrolltolower="loadMore"
style="height: calc(100vh - 300rpx)"
>
<scroll-view scroll-y="true" @scrolltolower="loadMore" style="height: calc(100vh - 300rpx)">
<view v-if="orderList && orderList.length !== 0" class="order_list_warp">
<view
class="order_item"
v-for="(item, index) in orderList"
:key="item.id"
>
<view class="order_item" v-for="(item, index) in orderList" :key="item.id">
<!-- 头部 -->
<view class="order_item_header">
<view class="order_item_header_left">
<up-image
:src="item.shopLogo"
width="22"
height="22"
bgColor="#f1f6ff00"
shape="circle"
></up-image>
<up-image :src="item.shopLogo" width="22" height="22" bgColor="#f1f6ff00" shape="circle"></up-image>
<view class="order_product_title">{{ item.shopName }}</view>
</view>
<!-- 除开待付款 -->
<view
v-if="item.status !== ORDER_TYPE.UNPAID"
class="order_item_header_right"
:style="{ color: ORDER_STATUS_CSS[item.status] }"
>
<view v-if="
item.status !== ORDER_TYPE.UNPAID &&
form.type !== MINE_ORDER_TYPE.AFTER_SALE
" class="order_item_header_right" :style="{ color: ORDER_STATUS_CSS[item.status] }">
{{ getValue(ORDER_STATUS, item.status) }}
</view>
<!-- 待付款 -->
<view v-else class="order_item_header_right order_right_due">
<view v-if="
form.type !== MINE_ORDER_TYPE.AFTER_SALE &&
item.status === ORDER_TYPE.UNPAID
" class="order_item_header_right order_right_due">
<view class="order_right_due_msg">等待付款</view>
<view class="order_right_due_time"
>{{ formatDate1(item.expireTime) }}前</view
>
<view class="order_right_due_time">{{ formatDate1(item.expireTime) }}前</view>
</view>
</view>
<!-- 产品详情 -->
<view class="order_item_content">
<view v-for="pItem in item.items" :key="pItem.id">
<view class="content_item" @click="jumpOrderInfo(item)">
<up-image
:src="pItem.mainGraph"
width="80"
height="80"
bgColor="#f1f6ff00"
></up-image>
<up-image :src="pItem.mainGraph" width="80" height="80" bgColor="#f1f6ff00"></up-image>
<view class="content_info">
<view class="content_info_title">{{ pItem.title }}</view>
<view class="content_info_tag">{{ pItem.goodsSpece }}</view>
@@ -91,85 +55,64 @@
</view> -->
</view>
<view class="content_right">
<view class="content_right_total"
>￥{{ pItem.goodsAmount }}</view
>
<view class="content_right_quantity"
>x{{ pItem.buyNum }}</view
>
<view class="content_right_total">￥{{ pItem.goodsAmount }}</view>
<view class="content_right_quantity">x{{ pItem.buyNum }}</view>
</view>
</view>
<view class="content_item_yd" v-if="pItem.expressNo">
<view>
运单号：
<text v-if="pItem.expressName"
>（{{ pItem.expressName }}）</text
>
<text v-if="pItem.expressName">（{{ pItem.expressName }}）</text>
{{ pItem.expressNo }}
</view>
<view style="margin-left: 10rpx">
<up-image
src="/static/common/copy.png"
width="14"
height="14"
bgColor="#f1f6ff00"
@click="copyData(pItem.expressNo)"
></up-image>
<up-image src="/static/common/copy.png" width="14" height="14" bgColor="#f1f6ff00"
@click="copyData(pItem.expressNo)"></up-image>
</view>
</view>
</view>
</view>
<!-- 汇总 -->
<view class="order_item_collect">
<view
class="collect_msg collect_msg_s"
v-if="this.form.type === MINE_ORDER_TYPE.NOT_RECEIVE"
>
<view class="content_item_yd_msg"
>(快递动态跟进请复制单号至[快递100官网] 查询)</view
>
<view class="collect_msg collect_msg_s" v-if="this.form.type === MINE_ORDER_TYPE.NOT_RECEIVE">
<view class="content_item_yd_msg">(快递动态跟进请复制单号至[快递100官网] 查询)</view>
<view>共{{ item.buyNum }}件,合计￥{{ item.sumAmount }}</view>
</view>
<view class="collect_msg" v-else
>共{{ item.buyNum }}件,合计￥{{ item.sumAmount }}</view
>
<view class="collect_msg" v-else>共{{ item.buyNum }}件,合计￥{{ item.sumAmount }}</view>
<view class="collect_operate">
<!-- <view class="operate_comm operate_but_1" v-if="item.status === ORDER_TYPE.UNSHIPPED" @click="checkCancel(true)">取消订单</view> -->
<view
class="operate_comm operate_but_2"
v-if="item.status === ORDER_TYPE.UNPAID"
@click="jumpOrderInfo(item)"
>去付款</view
>
<view class="operate_comm operate_but_2" v-if="
item.status === ORDER_TYPE.UNPAID &&
form.type !== MINE_ORDER_TYPE.AFTER_SALE
" @click="jumpOrderInfo(item)">去付款</view>
<!-- <view class="operate_comm operate_but_1" v-if="item.status === ORDER_TYPE.COMPLETED">申请退款</view> -->
<view
class="operate_comm operate_but_2"
v-if="item.status === ORDER_TYPE.NOT_RECEIVE"
@click="confirmReceiptOk(item)"
>确认收货</view
>
<view
class="operate_comm operate_but_2"
v-if="
<view class="operate_comm operate_but_2" v-if="item.status === ORDER_TYPE.NOT_RECEIVE"
@click="confirmReceiptOk(item)">确认收货</view>
<view class="operate_comm operate_but_2" v-if="
!isCheckSigne &&
index == 0 &&
item.status === ORDER_TYPE.SUCCEED
"
@click="downShow = true"
>去签署</view
>
" @click="downShow = true">去签署</view>
<!-- <view class="operate_comm operate_but_3" v-if="item.status === ORDER_TYPE.UNSHIPPED">提醒发货</view> -->
<view
class="operate_comm operate_but_1"
v-if="
[ORDER_TYPE.NOT_RECEIVE, ORDER_TYPE.UNSHIPPED].includes(
item.status
)
"
@click="onSaleAfter(item)"
>
售后
<view class="operate_comm operate_but_1" v-if="item.isAfter && form.type !== MINE_ORDER_TYPE.AFTER_SALE"
@click="onSaleAfterTab">
查看售后
</view>
<view :class="[
'operate_comm',
form.type === MINE_ORDER_TYPE.UNPAID
? 'operate_but_3'
: 'operate_but_1',
]" v-if="!item.isAfter && form.type !== MINE_ORDER_TYPE.AFTER_SALE" @click="onSaleAfter(item)">
{{ form.type === MINE_ORDER_TYPE.UNPAID ? "取消支付" : "售后" }}
</view>
<view class="operate_comm operate_but_1" v-if="form.type === MINE_ORDER_TYPE.AFTER_SALE"
@click="onAfterSaleDetail(item)">
售后详情
</view>
<!-- <view class="operate_comm operate_but_1" v-if="item.status === ORDER_TYPE.AFTER_SALE">查看售后</view> -->
<!-- <view class="operate_comm operate_but_1" v-if="[ORDER_TYPE.COMPLETED].includes(item.status)">删除记录</view> -->
@@ -179,12 +122,8 @@
</view>
</view>
<view v-else class="not_order_warp">
<up-image
src="https://cex-pub.s3.ap-southeast-1.amazonaws.com/static/not_order.png"
width="80"
height="80"
bgColor="#f1f6ff00"
></up-image>
<up-image src="https://cex-pub.s3.ap-southeast-1.amazonaws.com/static/not_order.png" width="80" height="80"
bgColor="#f1f6ff00"></up-image>
<view class="not_order_msg_warp">暂无相关订单</view>
</view>
<view v-if="loading" style="text-align: center">加载中...</view>
@@ -195,12 +134,7 @@
<up-modal :show="openShow" :showConfirmButton="false">
<view class="slot-content">
<view class="close_warp" @click="openShow = false">
<up-image
src="/static/common/close.png"
width="20"
height="20"
bgColor="#f1f6ff00"
></up-image>
<up-image src="/static/common/close.png" width="20" height="20" bgColor="#f1f6ff00"></up-image>
</view>
<view class="content_">
<view class="content_1">温馨提示</view>
@@ -213,21 +147,13 @@
</up-modal>
<!-- 申请售后 -->
<up-popup
v-model:show="afterShow"
class="after-sales-popup"
:customStyle="{
height: '1000rpx',
<up-popup v-model:show="afterShow" class="after-sales-popup" :customStyle="{
height: '1200rpx',
overflow: 'scroll',
position: 'relative',
paddingBottom: '80rpx',
}"
:round="10"
:closeOnClickOverlay="false"
:closeable="true"
:safeAreaInsetBottom="false"
@close="afterShow = false"
>
}" :round="10" :closeOnClickOverlay="false" :closeable="true" :safeAreaInsetBottom="false"
@close="afterShow = false">
<view class="after-sales-title">
{{
salesServer === 1
@@ -240,18 +166,11 @@
<!-- 申请售后 -->
<view class="slot-content" v-if="salesServer == 1">
<view class="after-sales-tabs">
<view
:class="['after-sales-tabs-item', { active: activeIndex === 0 }]"
@click="activeIndex = 0"
>
<view :class="['after-sales-tabs-item', { active: activeIndex === 0 }]" @click="activeIndex = 0">
联系售后
<text class="after-sales-tabs-text">荐</text>
</view>
<view
:class="['after-sales-tabs-item', { active: activeIndex === 1 }]"
@click="activeIndex = 1"
>退货退款</view
>
<view :class="['after-sales-tabs-item', { active: activeIndex === 1 }]" @click="activeIndex = 1">退货退款</view>
</view>
<view class="content_" v-if="activeIndex === 0">
@@ -259,50 +178,30 @@
<view class="content_2">如遇退/换货等问题，请联系客服处理</view>
<view class="content_3">
<view style="margin-left: 20rpx">
<up-image
src="/static/common/kf_dh.png"
width="40"
height="40"
bgColor="#f1f6ff00"
></up-image>
<up-image src="/static/common/kf_dh.png" width="40" height="40" bgColor="#f1f6ff00"></up-image>
</view>
<view class="content_info">
<view class="content_info_title">客服电话</view>
<view class="content_info_mobile">
{{ PHONE_NUMBER }}
<view style="margin-left: 20rpx">
<up-image
src="/static/common/copy_c.png"
width="14"
height="14"
bgColor="#f1f6ff00"
@click="copyMobile(PHONE_NUMBER)"
></up-image>
<up-image src="/static/common/copy_c.png" width="14" height="14" bgColor="#f1f6ff00"
@click="copyMobile(PHONE_NUMBER)"></up-image>
</view>
</view>
</view>
</view>
<view class="content_3">
<view style="margin-left: 20rpx">
<up-image
src="/static/common/kf_wx.png"
width="40"
height="40"
bgColor="#f1f6ff00"
></up-image>
<up-image src="/static/common/kf_wx.png" width="40" height="40" bgColor="#f1f6ff00"></up-image>
</view>
<view class="content_info">
<view class="content_info_title">客服微信</view>
<view class="content_info_mobile">
{{ WECHAT }}
<view style="margin-left: 20rpx">
<up-image
src="/static/common/copy_c.png"
width="14"
height="14"
bgColor="#f1f6ff00"
@click="copyMobile(WECHAT)"
></up-image>
<up-image src="/static/common/copy_c.png" width="14" height="14" bgColor="#f1f6ff00"
@click="copyMobile(WECHAT)"></up-image>
</view>
</view>
</view>
@@ -315,18 +214,9 @@
<view class="cancel_show_warp">
<view class="cancel_show_reason_warp">
<view class="reason_title">选择退货原因 </view>
<up-radio-group
v-model="cancelForm.afterReason"
placement="column"
>
<up-radio
:customStyle="{ marginBottom: '8px' }"
v-for="(item, index) in RETURN_REASON"
:key="index"
:label="item.name"
:name="item.id"
activeColor="#7934F6"
></up-radio>
<up-radio-group v-model="cancelForm.afterReason" placement="column">
<up-radio :customStyle="{ marginBottom: '8px' }" v-for="(item, index) in RETURN_REASON" :key="index"
:label="item.name" :name="item.id" activeColor="#7934F6"></up-radio>
</up-radio-group>
</view>
</view>
@@ -337,27 +227,20 @@
</view>
<!-- 确认退货退款 -->
<view v-if="salesServer == 2">
<refund-popup
:product="aftterSalesProduct"
:cancelForm="cancelForm"
@close="onCloseAfterShow"
/>
<refund-popup :product="aftterSalesProduct" :cancelForm="cancelForm" @close="onCloseAfterShow" />
</view>
</up-popup>
<!-- 腾讯电子签H5 → 集成到UniApp -->
<web-view v-if="signUrl" :src="signUrl" @message="handleMessage"></web-view>
<u-modal
:show="tipsShow"
:showCancelButton="true"
confirmText="去认证"
@cancel="onTipsCancel"
@confirm="onConfirm"
confirmColor="#7934F6"
title="提示"
content="签署合同需要进行实名认证，请先完成实名认证"
></u-modal>
<u-modal :show="tipsShow" :showCancelButton="true" confirmText="去认证" @cancel="onTipsCancel" @confirm="onConfirm"
confirmColor="#7934F6" title="提示" content="签署合同需要进行实名认证，请先完成实名认证"></u-modal>
<DownPopup :show="downShow" @ok="onSignContract" @cancel="onCancel" />
<u-modal class="sure_pay" :show="surePayShow" title="提示" showCancelButton @cancel="surePayShow = false" @confirm="cancelPay" confirmColor="#7934F6"
content="确定取消支付吗？"></u-modal>
</view>
</template>
@@ -378,6 +261,7 @@ import {
isSignContract,
getMiniProgramSignUrl,
afterSaleDetail,
cancelOrder
} from "@/api/order.js";
import dayjs from "dayjs";
import { formatDate1, copyData } from "@/utils/index.js";
@@ -432,11 +316,13 @@ export default {
id: MINE_ORDER_TYPE.SUCCEED,
title: "已完成",
},
// {
// id:MINE_ORDER_TYPE.AFTER_SALE,
// title:"售后",
// },
{
id: MINE_ORDER_TYPE.AFTER_SALE,
title: "售后",
},
],
surePayShow: false,
cancelPayParams: {},
form: {
page: 1,
pageSize: 10,
@@ -482,33 +368,48 @@ export default {
getValue,
formatDate1,
copyData,
onNextRefund() {
this.salesServer = 2;
if (this.aftterSalesProduct.afterType == 0) {
this.aftterSalesProduct = {
...this.aftterSalesProduct,
...{ afterReason: this.cancelForm.afterReason },
};
}
},
onSaleAfterTab() {
this.checkType({ id: MINE_ORDER_TYPE.AFTER_SALE, title: "售后" });
},
// 售后
onSaleAfter(item) {
console.log("售后---1", item);
console.log("售后---1", item, this.form.type);
if (this.form.type === MINE_ORDER_TYPE.UNPAID) {
// 取消支付
this.cancelPayParams = { orderId: item.id };
this.surePayShow = true;
} else {
// 未售后
if (item.afterType == 0) {
this.cancelForm.afterReason = "";
this.salesServer = 1;
this.activeIndex = 0;
this.aftterSalesProduct = item;
this.afterShow = true;
}
// 已开始售后
if (item.afterType > 0) {
this.onAfterSaleDetail(item);
this.aftterSalesProduct.status = 9;
this.aftterSalesProduct.afterType = this.form.type - 1;
}
},
// 售后订单详情
async onAfterSaleDetail(item) {
if (item.status === 8) {
this.$refs.uToastRef.show({
type: "success",
message: "订单已作废",
});
return;
}
const { bizcode, data } = await afterSaleDetail({ id: item.afterId });
if (bizcode == 100) {
this.aftterSalesProduct = { ...data, ...{ afterId: item.afterId } };
@@ -516,6 +417,7 @@ export default {
this.afterShow = true;
}
},
// 关闭售后申请
onCloseAfterShow(item) {
// 重新发起
@@ -531,6 +433,22 @@ export default {
this.afterShow = false;
},
// 取消支付
cancelPay() {
cancelOrder(this.cancelPayParams).then((res) => {
if (res.bizcode == 100) {
this.$refs.uToastRef.show({
type: "success",
message: "取消成功",
});
this.surePayShow = false;
this.form.page = 1;
this.orderList = [];
this.loadData();
}
});
},
onTipsCancel() {
this.tipsShow = false;
},
@@ -579,11 +497,12 @@ export default {
) {
this.checkSigned();
}
if (item.id !== MINE_ORDER_TYPE.AFTER_SALE) {
// if (item.id !== MINE_ORDER_TYPE.AFTER_SALE) {
// this.loadData();
// } else {
// this.openShow = true; // 未开发的弹框
// }
this.loadData();
} else {
this.openShow = true; // 未开发的弹框
}
},
jumpOrderInfo(item) {
uni.navigateTo({
@@ -800,6 +719,7 @@ export default {
<style lang="scss" scoped>
.after-sales-popup {
height: 400px !important;
.after-sales-title {
font-size: 28rpx;
color: #71737c;
@@ -1034,6 +954,7 @@ export default {
background: transparent;
z-index: 100;
box-shadow: 0rpx -4rpx 12rpx 0rpx rgba(0, 0, 0, 0.06);
.cancel_show_button {
position: initial;
width: 94%;
@@ -1112,4 +1033,10 @@ export default {
font-size: 30rpx;
color: #ffffff;
}
.sure_pay{
::v-deep(.u-modal__content__text){
text-align: center;
}
}
</style>
pages/mine_package/mine_purse_recharge/mine_purse_recharge.vue
+1 -1
View File
@@ -113,7 +113,7 @@ export default {
});
return;
}
console.log("params", params);
console.log("params---", params);
const result = await recharge(params);
console.log("result", result);
if (result && result.bizcode === 100) {
pages/supply_chain/supply_chain.vue
+1 -2
View File
@@ -123,8 +123,7 @@ export default {
}
.head-view{
width:100%;
// height:
min-hieght:88rpx;
min-height:88rpx;
height:88rpx;
display: flex;
align-items: center;
utils/config.js
+2 -3
View File
@@ -1,10 +1,9 @@
// export const BASE_URL="https://frontend.jdns360.com/api"; // 正式环境
// export const BASE_URL="http://cl55un59859.vicp.fun:24346"; // 测试环境
// export const BASE_URL = "https://api.tbmall.xin"; //生产
export const BASE_URL = "https://api.tbmall.xin"; //生产
// export const BASE_URL ='http://api.hm.a-d.work:6880/api' // 测试
export const BASE_URL ='http://api.outer.tbmall.xin:6880' // 测试
// export const BASE_URL ='http://api.outer.tbmall.xin:6880' // 测试
utils/enumUtils.js
+1 -1
View File
@@ -266,7 +266,7 @@ export const BALANCE_TYPE = [
export const CERT_OPTION = [
{
key: 1,
value: "居民身份证"
name: "居民身份证"
}
// , {
// key: 2,
utils/payUtils.js
+1
View File
@@ -10,6 +10,7 @@ import { feedback } from '@/api/payment.js';
export function appWxpayFun(alipay, orderId, orderNum) {
const type = alipay.type;
const orderStr = alipay.orderStr;
console.log("微信支付---",alipay)
if (type === "app") {// app
const orderInfo = {
"appid": alipay.appId, // 微信开放平台 - 应用 - AppId，注意和微信小程序、公众号 AppId 可能不一致