qiubinghui
/
zhywpt-sp
關注 1
收藏 0
複製 0
程式碼 問題 0 合併請求 0 版本發佈 0 Wiki 活動
瀏覽代碼

Merge branch 'master' of http://82.156.35.112:3000/qiubinghui/zhywpt-sp 

# Conflicts:
#	utils/utils.ts
master
cetc 5 天之前
父節點
1f64ba3009 587f09a9f6
當前提交
72dabf25ee
共有 3 個檔案被更改，包括 246 行新增 和 106 行删除
分割檢視 顯示文件統計
  1. 119
    94
      subpackage/orders/order_payment.vue
  2. 124
    12
      subpackage/orders/release-products.vue
  3. 3
    0
      utils/utils.ts

+ 119
- 94
subpackage/orders/order_payment.vue 查看文件

@@ -222,7 +222,7 @@
const data = res;
console.log(data);
if (data.paymentStatus == 1) {
gotoEditUserOrUnitInfo()
// gotoEditUserOrUnitInfo()
}
state.dataArray = data.datas;
for (let i = 0; i < state.dataArray.length; i++) {
@@ -269,6 +269,7 @@
onShow(() => {
// 支付完跳转到广告页，回来再次查询跳转 (签约完回来也要查询)
if (state.payOK) {
console.log("刷新页面",state)
refreshFirst()
}
})
@@ -357,71 +358,74 @@
console.log("输出内容", options);
requestNew(payQuery, options).then((res) => {
const data = res;
console.log(data);
console.log("1111",data);
if (data.paymentStatus == 1) {
gotoEditUserOrUnitInfo();
// isValueCard 1 储值卡 2 记账卡
if (state.orderQuery == '1') {
console.log("state.qtSign", state.qtSign, state.qtSign == '0')
// 记账卡
if (state.cardType == '1') {
// 去诺德签约
if (state.qtSign == '0') {
// 去签约，已经签约完，回来查订单详情，如果是激活就去激活
orderDetail().then((res) => {
if (res['orderStep'] == OrderStatus['待激活']) {
// 已签约
gotoActiveOrder(getItem('orderQueryActivate'))
} else {
// 未签约
if (state.qdSignAppId) {
uni.navigateToMiniProgram({
appId: state.qdSignAppId,
path: state.qdSignUrl,
extraData: {},
envVersion: 'trial',
success(res) {
state.payOK = true
console.log(res);
},
complete(res) {
console.log(res);
},
fail(res) {
console.log(res);
// 未成功跳转到车主小程序
},
});
} else {
const params = encodeURIComponent(JSON.stringify(state.qdSignUrl))
tools.toUrl(`/subpackage/personal-center/webview?url=` + params)
}
}
})


} else {
// 签约
uni.redirectTo({
url: `/subpackage/orders/release-products?orderId=${state.orderId}&orderQuery=${state.orderQuery}`
});
}
} else {
gotoActiveOrder(getItem('orderQueryActivate'))
}

} else {
if (state.isValueCard == 1) {
// 不签约
uni.switchTab({
url: "/pages/order/order"
})
} else {
// 签约
uni.redirectTo({
url: `/subpackage/orders/release-products?orderId=${state.orderId}&orderQuery=${state.orderQuery}`
});
}
}
// if (state.orderQuery == '1') {
// console.log("state.qtSign", state.qtSign, state.qtSign == '0')
// // 记账卡
// if (state.cardType == '1') {
// // 去诺德签约
// if (state.qtSign == '0') {
// // 去签约，已经签约完，回来查订单详情，如果是激活就去激活
// orderDetail().then((res) => {
// if (res['orderStep'] == OrderStatus['待激活']) {
// // 已签约
// gotoActiveOrder(getItem('orderQueryActivate'))
// } else {
// // 未签约
// if (state.qdSignAppId) {
// uni.navigateToMiniProgram({
// appId: state.qdSignAppId,
// path: state.qdSignUrl,
// extraData: {},
// envVersion: 'trial',
// success(res) {
// state.payOK = true
// console.log(res);
// },
// complete(res) {
// console.log(res);
// },
// fail(res) {
// console.log(res);
// // 未成功跳转到车主小程序
// },
// });
// } else {
// const params = encodeURIComponent(JSON.stringify(state.qdSignUrl))
// tools.toUrl(`/subpackage/personal-center/webview?url=` + params)
// }
// }
// })


// } else {
// console.log("前往签约3")
// // 签约
// uni.redirectTo({
// url: `/subpackage/orders/release-products?orderId=${state.orderId}&orderQuery=${state.orderQuery}`
// });
// }
// } else {
// gotoActiveOrder(getItem('orderQueryActivate'))
// }

// } else {
// if (state.isValueCard == 1) {
// // 不签约
// uni.switchTab({
// url: "/pages/order/order"
// })
// } else {
// console.log("前往签约2")
// // 签约
// uni.redirectTo({
// url: `/subpackage/orders/release-products?orderId=${state.orderId}&orderQuery=${state.orderQuery}`
// });
// }
// }
}
state.dataArray = data.datas;
for (let i = 0; i < state.dataArray.length; i++) {
@@ -500,40 +504,60 @@
showLoading: true,
}
requestNew(payAfterOrder, options).then((res) => {
console.log("res",res)
if (res.orderStep === 'WAITING_ACTIVE') {
// 前往激活
gotoActiveOrder(getItem('orderQueryActivate'));
} else if (res.orderStep === 'ORDER_PAID') {
// 前往签约
if (res.qtSign) {
// 黔通智联签约
uni.redirectTo({
url: `/subpackage/orders/release-products?orderId=${state.orderId}&orderQuery=${state.orderQuery}`
});
} else if (res.qdAppId){
// 其他渠道签约
uni.navigateToMiniProgram({
appId: res.qdAppId,
path: res.qdSignUrl,
extraData: {},
envVersion: 'trial',
success(res) {
state.payOK = true
console.log(res);
},
complete(res) {
console.log(res);
},
fail(res) {
console.log(res);
// 未成功跳转到车主小程序
},
console.log("前往激活")
if(state.jhOk){
uni.showModal({
title: "*激活检测*",
content: "您还没有激活成功，将要去激活",
showCancel: false,
confirmText: "我知道了",
success() {
state.jhOk = true
gotoActiveOrder(getItem('orderQueryActivate'));
}
});
} else {
// 其他渠道签约
const params = encodeURIComponent(JSON.stringify(res.qdSignUrl))
tools.toUrl(`/subpackage/personal-center/webview?url=` + params);
}else{
state.jhOk = true
gotoActiveOrder(getItem('orderQueryActivate'));
}
} else if (res.orderStep === 'ORDER_PAID') {
// 前往签约
console.log("前往签约1")
uni.redirectTo({
url: `/subpackage/orders/release-products?orderId=${state.orderId}&orderQuery=${state.orderQuery}`
});
// if (res.qtSign) {
// // 黔通智联签约
// uni.redirectTo({
// url: `/subpackage/orders/release-products?orderId=${state.orderId}&orderQuery=${state.orderQuery}`
// });
// } else if (res.qdAppId){
// // 其他渠道签约
// uni.navigateToMiniProgram({
// appId: res.qdAppId,
// path: res.qdSignUrl,
// extraData: {},
// envVersion: 'trial',
// success(res) {
// state.payOK = true
// console.log(res);
// },
// complete(res) {
// console.log(res);
// },
// fail(res) {
// console.log(res);
// // 未成功跳转到车主小程序
// },
// });
// } else {
// // 其他渠道签约
// const params = encodeURIComponent(JSON.stringify(res.qdSignUrl))
// tools.toUrl(`/subpackage/personal-center/webview?url=` + params);
// }
}
});
@@ -619,6 +643,7 @@
qdSignAppId: "",
qtSign: "",
payOK: false,
jhOk: false,
cardType: "",
});
</script>

+ 124
- 12
subpackage/orders/release-products.vue 查看文件

@@ -26,27 +26,34 @@
</template>

<script setup lang="ts">
import { onLoad } from "@dcloudio/uni-app";
import { onLoad,onShow } from "@dcloudio/uni-app";
import { reactive } from "vue";
import { etcQyList } from "@/utils/network/api.js";
import { etcQyList ,payAfterOrder} from "@/utils/network/api.js";
import { request, requestNew } from "@/utils/network/request.js";
import { fileURL } from "@/datas/fileURL.js";
import navBar from "@/components/nav-bar/nav-bar2.vue";
import navBgCar from "./components/nav-bg-car1";
const imgURL = `${fileURL}image/`;
import { navTo } from "@/utils/utils";
import useOrderSkip from "@/composables/order/useOrderSkip";
import {
setItem, getItem
} from "@/utils/storage";
const tools = require("../../static/etcUtil/tools.js");
const { gotoActiveOrder } = useOrderSkip();
const qianyueAction = (val) => {
gotoEditUserOrUnitInfo()
console.log(val);
// #ifdef MP-ALIPAY
navTo(
`/subpackage/orders/sign-up-ali?orderId=${state.orderId}&orderQuery=${state.orderQuery}`,
);
// #endif
// #ifdef MP-WEIXIN
navTo(
`/subpackage/orders/sign-up?orderId=${state.orderId}&&clientFee=${state.clientFee}&&id=${state.id}&orderQuery=${state.orderQuery}`,
);
// #endif
// // #ifdef MP-ALIPAY
// navTo(
// `/subpackage/orders/sign-up-ali?orderId=${state.orderId}&orderQuery=${state.orderQuery}`,
// );
// // #endif
// // #ifdef MP-WEIXIN
// navTo(
// `/subpackage/orders/sign-up?orderId=${state.orderId}&&clientFee=${state.clientFee}&&id=${state.id}&orderQuery=${state.orderQuery}`,
// );
// // #endif

};
//解析URL获取参数
@@ -67,6 +74,48 @@
}
return theRequest;
};
onShow(() => {
// 支付完跳转到广告页，回来再次查询跳转 (签约完回来也要查询)
console.log("刷新页面之前===========",state)
if (state.payOK) {
console.log("刷新页面",state)
const options = {
type: 2,
data: {
orderNo: state.orderId
},
method: "POST",
showLoading: true,
}
requestNew(payAfterOrder, options).then((res) => {
if (res.orderStep === 'WAITING_ACTIVE') {
if(state.jhOk){
uni.showModal({
title: "*激活检测*",
content: "您还没有激活成功，点击签约可直达激活",
showCancel: false,
confirmText: "我知道了",
});
}else{
// 前往激活
console.log("前往激活")
state.jhOk = false
gotoActiveOrder(getItem('orderQueryActivate'));
}
} else if (res.orderStep === 'ORDER_PAID') {
uni.showModal({
title: "*签约检测*",
content: "您还没有签约成功，请重新签约",
showCancel: false,
confirmText: "我知道了",
});
}
})
// gotoEditUserOrUnitInfo()
}
})
onLoad((option : any) => {
if (option.q) {
const q = decodeURIComponent(option.q); // 获取到二维码原始链接内容
@@ -118,6 +167,67 @@
// });
});

const gotoEditUserOrUnitInfo = () => {
// if (state.orderQuery == '1') {
const options = {
type: 2,
data: {
orderNo: state.orderId
},
method: "POST",
showLoading: true,
}
requestNew(payAfterOrder, options).then((res) => {
console.log("res",res)
if (res.orderStep === 'WAITING_ACTIVE') {
state.jhOk = true
// 前往激活
console.log("前往激活")
gotoActiveOrder(getItem('orderQueryActivate'));
} else if (res.orderStep === 'ORDER_PAID') {
// 前往签约
console.log("前往签约1")
if (res.qtSign) {
// 黔通智联签约
// #ifdef MP-ALIPAY
navTo(
`/subpackage/orders/sign-up-ali?orderId=${state.orderId}&orderQuery=${state.orderQuery}`,
);
// #endif
// #ifdef MP-WEIXIN
navTo(
`/subpackage/orders/sign-up?orderId=${state.orderId}&&clientFee=${state.clientFee}&&id=${state.id}&orderQuery=${state.orderQuery}`,
);
// #endif
} else if (res.qdAppId){
state.payOK = true
// 其他渠道签约
uni.navigateToMiniProgram({
appId: res.qdAppId,
path: res.qdSignUrl,
extraData: {},
envVersion: 'trial',
success(res) {
state.payOK = true
console.log(res);
},
complete(res) {
console.log(res);
},
fail(res) {
console.log(res);
// 未成功跳转到车主小程序
},
});
} else {
// 其他渠道签约
const params = encodeURIComponent(JSON.stringify(res.qdSignUrl))
tools.toUrl(`/subpackage/personal-center/webview?url=` + params);
}
}
});
}
const state = reactive({
data: {
show: false,
@@ -126,6 +236,8 @@
list: [],
id: "",
clientFee: "",
payOK: false,
jhOk: false,
orderId: "",
orderQuery: "0"
});

+ 3
- 0
utils/utils.ts 查看文件

@@ -523,7 +523,10 @@ export const uploadFile = (tempImagePath, imageType) => {
console.log("tempImagePath", tempImagePath, tempImagePath.size,imageType)
return new Promise((resolve, reject) => {
uni.uploadFile({
<<<<<<< HEAD
// url: 'https://qtzl.etcjz.cn/newDev/minIo/upload', //测试
=======
>>>>>>> 587f09a9f6387e5dadbd0e4541576a45b55e9f37
url: 'https://qtzl.etcjz.cn/newProd/minIo/upload', //仅为示例，非真实的接口地址
filePath: tempImagePath,
name: 'file',

Write Preview
Loading…
取消
儲存