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

Merge branch 'develop' of https://gitee.com/qinxingxing/alpha-shopping into develop

Browse Source
This commit is contained in:
money
2025-08-16 01:03:44 +08:00
parent 764fbf7560 bd8555480b
commit f74d02bfa1
3 changed files with 20 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
api/contract.js
+1 -1
View File
@@ -2,7 +2,7 @@ import request from '@/utils/request.js'; // 引入封装的方法
// 是否已签 // 是否已签
export function signContract() { export function isSignContract() {
// return request.post('/common/getSmsCode',qs.stringify(params)); // return request.post('/common/getSmsCode',qs.stringify(params));
return request({ return request({
url: "/signature/isSignContract", url: "/signature/isSignContract",
pages/contract/index.vue
+3 -3
View File
@@ -21,8 +21,8 @@ import Header from '@/components/common/header.vue';
import TopSafe from '@/components/common/top-safe.nvue' import TopSafe from '@/components/common/top-safe.nvue'
import ContractItem from './components/contract-item.vue' import ContractItem from './components/contract-item.vue'
import DownPopup from '@/components/common/down-popup.vue'; import DownPopup from '@/components/common/down-popup.vue';
import { getContractList, signContract } from '@/api/contract.js' import { getContractList, isSignContract, } from '@/api/contract.js'
import { getSignUrl, getMiniProgramSignUrl } from '@/api/order.js'; import { getSignUrl, getMiniProgramSignUrl, signContract } from '@/api/order.js';
import func from '@/utils/func.js'; import func from '@/utils/func.js';
export default { export default {
@@ -70,7 +70,7 @@ export default {
this.downShow = false; this.downShow = false;
}, },
isSignContract() { isSignContract() {
signContract().then(res => { isSignContract().then(res => {
if (res.bizcode == 100) { if (res.bizcode == 100) {
this.type = res.data; this.type = res.data;
if (this.type) { if (this.type) {
pages/mine_package/mine_order/mine_order.vue
+4 -7
View File
@@ -155,7 +155,7 @@
<view class="content_info"> <view class="content_info">
<view class="content_info_title">客服电话</view> <view class="content_info_title">客服电话</view>
<view class="content_info_mobile"> <view class="content_info_mobile">
{{CUSTOMER_SERVICE_PHONE_NUMBER}} {{ CUSTOMER_SERVICE_PHONE_NUMBER }}
<view style="margin-left: 20rpx;"> <view style="margin-left: 20rpx;">
<up-image src="/static/common/copy_c.png" width="14" height="14" bgColor="#f1f6ff00" <up-image src="/static/common/copy_c.png" width="14" height="14" bgColor="#f1f6ff00"
@click="copyMobile(CUSTOMER_SERVICE_PHONE_NUMBER)"></up-image> @click="copyMobile(CUSTOMER_SERVICE_PHONE_NUMBER)"></up-image>
@@ -171,7 +171,7 @@
<view class="content_info"> <view class="content_info">
<view class="content_info_title">客服微信</view> <view class="content_info_title">客服微信</view>
<view class="content_info_mobile"> <view class="content_info_mobile">
{{CUSTOMER_SERVICE_PHONE_NUMBER}} {{ CUSTOMER_SERVICE_PHONE_NUMBER }}
<view style="margin-left: 20rpx;"> <view style="margin-left: 20rpx;">
<up-image src="/static/common/copy_c.png" width="14" height="14" bgColor="#f1f6ff00" <up-image src="/static/common/copy_c.png" width="14" height="14" bgColor="#f1f6ff00"
@click="copyMobile(CUSTOMER_SERVICE_PHONE_NUMBER)"></up-image> @click="copyMobile(CUSTOMER_SERVICE_PHONE_NUMBER)"></up-image>
@@ -490,11 +490,8 @@ export default {
return; return;
} }
const params = {
// 需要的参数 const { bizcode, data } = await signContract();
orderId: this.selectItem.id,
}
const { bizcode, data } = await signContract(params);
if (bizcode === 100) { if (bizcode === 100) {
this.flowId = data.flowId; this.flowId = data.flowId;