qiubinghui
/
zhywpt-sp
보기 1
좋아요 0
포크 0
코드 이슈 0 풀 리퀘스트 0 릴리즈 0 위키 Activity
소스 검색

提交

yxb
DESKTOP-2IO5MST\huting 1 년 전
부모
7e3e65cfd8
커밋
8e260ae9cd
14개의 변경된 파일과 343개의 추가작업 그리고 364개의 파일을 삭제
분할 보기 변경상태 보기
  1. 2
    23
      App.vue
  2. 4
    1
      composables/order/useOrderListItem.ts
  3. 0
    1
      composables/order/useOrderSkip.ts
  4. 5
    5
      pages/index/index.vue
  5. 1
    4
      pages/order/components/order-list-item.vue
  6. 304
    305
      static/etcUtil/tools.js
  7. 2
    1
      subpackage/after-sale/ETC-product-status-list-query/ETC-product-status-list-query.vue
  8. 2
    2
      subpackage/after-sale/activation-once-again/activation-once-again.vue
  9. 4
    2
      subpackage/after-sale/activation/activate.vue
  10. 2
    1
      subpackage/after-sale/to-bookkeeping-card/choice-product-new.vue
  11. 2
    1
      subpackage/orders/choice-product.vue
  12. 8
    1
      utils/network/difference.js
  13. 4
    15
      utils/network/request.js
  14. 3
    2
      utils/utils.ts

+ 2
- 23
App.vue 파일 보기

@@ -23,13 +23,8 @@
import {
getCodeName
} from "@/datas/queryKey.js";
// import { log } from "console";
export default {
// data(){
// return{
// isEnableSetGray:true,
// }
// },

onLaunch: function(option) {
var that = this;
uni.getSystemInfo({
@@ -53,25 +48,9 @@
uni.login({
provider: "weixin",
success: function(e) {
// auth.code2Session
console.log("ee", e);
that.getOpenid(e.code);
// uni.request({
// url: `https://api.weixin.qq.com/sns/jscode2session?appid=${wechatAppID}&secret=${wechatSecret}&js_code=${e.code}&grant_type=authorization_code`,
// success: (res) => {
// // state.openid = res.data.openid;
// setItem("QYorder", res.data);
// console.log("获取微信小程序openid", res);
// },
// fail: (err) => {
// uni.showToast({
// title: "网络异常，请重试！" + err.errcode,
// icon: "error",
// duration: 500,
// });
// return;
// },
// });

},
});


+ 4
- 1
composables/order/useOrderListItem.ts 파일 보기

@@ -41,10 +41,12 @@ export default function useOrderListItem(props) {

//搜索
const doSearch = () => {
// #ifdef MP-WEIXIN
if (!searchKeyWords.value) {
msg('请输入需要搜索的车牌号！');
return;
}
// #endif
refreshList(true);
}

@@ -101,7 +103,8 @@ export default function useOrderListItem(props) {
"tabIndex": props.index + '',
"pageNo": params.pageNum,
"pageSize": params.pageSize,
"promotionModes": 1
"promotionModes": 1,
"isAfter": true
},
method: 'POST',
// showLoading: isLoading ? (params.pageNum === 1 ? true : false) : false ,

+ 0
- 1
composables/order/useOrderSkip.ts 파일 보기

@@ -187,7 +187,6 @@ export default function useOrderSkip() {

//车辆信息变更-信息重写
const gotoEditCarWriteInfo = (orderInfo : any) => {
// navTo(`/pages/bluetooth/bluetooth?id=${orderInfo.id}&orderId=${orderInfo.orderId}`);
navTo(`/pages/bluetooth/bluetooth?routeType=3`);
}


+ 5
- 5
pages/index/index.vue 파일 보기

@@ -299,23 +299,23 @@
//办理流程数据
{
title: "第一步：产品选择",
desc: "提交车牌号、车牌颜色、收货地址相关信息",
desc: "选择购买的发行产品",
},
{
title: "第二步：信息校验",
desc: "上传身份证、行驶证等相关信息",
desc: "提交车牌号、车牌颜色、收货地址相关信息",
},
{
title: "第三步：证件上传",
desc: "选择签约账户并关联",
desc: "上传身份证、行驶证等相关信息",
},
{
title: "第四步：订单支付",
desc: "选择购买的发行产品",
desc: "支付完成订单",
},
{
title: "第五步：签约代扣",
desc: "支付完成订单",
desc: "选择签约账户并关联",
},
],
highMsgData: '',//高速快讯内容

+ 1
- 4
pages/order/components/order-list-item.vue 파일 보기

@@ -2,7 +2,7 @@
<template>
<scroll-view class="setHight" scroll-y="true" refresher-enabled="true" :refresher-enabled='state.freshing'
:refresher-triggered='state.triggered' @refresherrefresh="onRefresh" @refresherpulling="onPulling"
refresher-default-style="black" @scroll="upper">
refresher-default-style="black">
<!-- 搜索框 -->
<view class="as-layout-horizontal as-gravity-center-start search-layout">
<view class="search-box">
@@ -93,9 +93,6 @@
}
state.triggered = true
}
const upper = (e) => {
console.log("333333")
}
</script>

<style lang="scss" scoped>

+ 304
- 305
static/etcUtil/tools.js 파일 보기

@@ -9,272 +9,271 @@ import theme from './theme.js';
const common_vendor = require("../../common/vendor.js");
var uni = common_vendor.index

const identityData = [
{
id: 101,
name: '身份证(含临时身份证)'
},
{
id: 102,
name: '护照(限外籍人士)'
},
{
id: 103,
name: '港澳居民来往内地通行证'
},
{
id: 104,
name: '台湾居民来往大陆通行证'
},
{
id: 105,
name: '军官证'
},
{
id: 106,
name: '武警警察身份证'
},
{
id: 201,
name: '统一社会信用代码证书'
},
{
id: 202,
name: '组织机构代码证'
},
{
id: 203,
name: '营业执照'
},
{
id: 204,
name: '事业单位法人证书'
},
{
id: 205,
name: '社会团体法人登记证书'
},
{
id: 206,
name: '律师事务所执业许可证'
},
{
id: 217,
name: '公司商业登记副本（3个月内）'
},
{
id: 218,
name: '公司营业税单M8副本'
},
{
id: 219,
name: '公司营业税开业/更改M1副本'
}
const identityData = [{
id: 101,
name: '身份证(含临时身份证)'
},
{
id: 102,
name: '护照(限外籍人士)'
},
{
id: 103,
name: '港澳居民来往内地通行证'
},
{
id: 104,
name: '台湾居民来往大陆通行证'
},
{
id: 105,
name: '军官证'
},
{
id: 106,
name: '武警警察身份证'
},
{
id: 201,
name: '统一社会信用代码证书'
},
{
id: 202,
name: '组织机构代码证'
},
{
id: 203,
name: '营业执照'
},
{
id: 204,
name: '事业单位法人证书'
},
{
id: 205,
name: '社会团体法人登记证书'
},
{
id: 206,
name: '律师事务所执业许可证'
},
{
id: 217,
name: '公司商业登记副本（3个月内）'
},
{
id: 218,
name: '公司营业税单M8副本'
},
{
id: 219,
name: '公司营业税开业/更改M1副本'
}
];
const deviceModel = [
{
name: '万集',
value: 'WJ'
},
{
name: '聚利',
value: 'JL'
},
{
name: '金溢',
value: 'JY'
},
{
name: '埃特斯',
value: 'AT'
},
{
name: '建投',
value: 'JT'
},
{
name: '握奇',
value: 'WQ'
},
{
name: '成谷',
value: 'CG'
},
{
name: '天地融',
value: 'TD'
},
{
name: '智载',
value: 'ZZ'
}
const deviceModel = [{
name: '万集',
value: 'WJ'
},
{
name: '聚利',
value: 'JL'
},
{
name: '金溢',
value: 'JY'
},
{
name: '埃特斯',
value: 'AT'
},
{
name: '建投',
value: 'JT'
},
{
name: '握奇',
value: 'WQ'
},
{
name: '成谷',
value: 'CG'
},
{
name: '天地融',
value: 'TD'
},
{
name: '智载',
value: 'ZZ'
}
];
/********************** 路由跳转 **********************/
//保留当前页面，跳转到应用内的某个页面

function toUrl(url) {
uni.showToast({
//显示消息提示框 此处是提升用户体验的作用
title: '加载中',
icon: 'loading'
}); // if (url.indexOf("?")==-1){
// url += '?rand=' + datas.randomNum(1000,9999)
// }else{
// url += '&rand=' + datas.randomNum(1000,9999)
// }
uni.showToast({
//显示消息提示框 此处是提升用户体验的作用
title: '加载中',
icon: 'loading'
}); // if (url.indexOf("?")==-1){
// url += '?rand=' + datas.randomNum(1000,9999)
// }else{
// url += '&rand=' + datas.randomNum(1000,9999)
// }

console.log('url:*****' + url);
uni.navigateTo({
url: url,
complete: function (response) {
uni.hideToast();
}
});
console.log('url:*****' + url);
uni.navigateTo({
url: url,
complete: function(response) {
uni.hideToast();
}
});
} //关闭当前页面，返回上一页面或多级页面。

function navigateBack(delta, successFunc = null, failFunc = null) {
uni.navigateBack({
delta: delta,
success: function (res) {
//接口调用成功的回调函数
if (successFunc != null) {
successFunc(res);
}
},
fail: function (res) {
//接口调用失败的回调函数
if (failFunc != null) {
failFunc(res);
}
},
complete: function (res) {} //接口调用结束的回调函数（调用成功、失败都会执行）
});
uni.navigateBack({
delta: delta,
success: function(res) {
//接口调用成功的回调函数
if (successFunc != null) {
successFunc(res);
}
},
fail: function(res) {
//接口调用失败的回调函数
if (failFunc != null) {
failFunc(res);
}
},
complete: function(res) {} //接口调用结束的回调函数（调用成功、失败都会执行）
});
}
/********************** showModalAlert ************************/

function showModalAlert(content, successFunc = null, failFunc = null, title = '温馨提示', showCancel = false) {
uni.showModal({
title: title,
content: content,
showCancel: showCancel,
//是否显示取消按钮
cancelText: '取消',
//默认是“取消”
cancelColor: theme.cancelModalColor,
//取消文字的颜色
confirmText: '确定',
//默认是“确定”
confirmColor: theme.modalColor,
//确定文字的颜色
success: function (res) {
//接口调用成功的回调函数
if (successFunc != null) {
successFunc(res);
}
},
fail: function (res) {
//接口调用失败的回调函数
if (failFunc != null) {
failFunc(res);
}
},
complete: function (res) {} //接口调用结束的回调函数（调用成功、失败都会执行）
});
uni.showModal({
title: title,
content: content,
showCancel: showCancel,
//是否显示取消按钮
cancelText: '取消',
//默认是“取消”
cancelColor: theme.cancelModalColor,
//取消文字的颜色
confirmText: '确定',
//默认是“确定”
confirmColor: theme.modalColor,
//确定文字的颜色
success: function(res) {
//接口调用成功的回调函数
if (successFunc != null) {
successFunc(res);
}
},
fail: function(res) {
//接口调用失败的回调函数
if (failFunc != null) {
failFunc(res);
}
},
complete: function(res) {} //接口调用结束的回调函数（调用成功、失败都会执行）
});
}
/*******************showToastAlert********************/

function showToastAlert(title = '成功', icon = 'none', image = '', duration = 2000, mask = true, successFunc = null, failFunc = null, completeFun = null) {
uni.showToast({
title: title,
icon: icon,
//success显示成功图标,loading显示加载图标,none不显示图标
image: image,
duration: duration,
mask: mask,
////是否显示透明蒙层，防止触摸穿透
success: function (res) {
//接口调用成功的回调函数
if (successFunc != null) {
successFunc(res);
}
},
fail: function (res) {
//接口调用失败的回调函数
if (failFunc != null) {
failFunc(res);
}
},
complete: function (res) {
//接口调用结束的回调函数（调用成功、失败都会执行）
if (completeFun != null) {
completeFun(res);
}
}
});
function showToastAlert(title = '成功', icon = 'none', image = '', duration = 2000, mask = true, successFunc = null,
failFunc = null, completeFun = null) {
uni.showToast({
title: title,
icon: icon,
//success显示成功图标,loading显示加载图标,none不显示图标
image: image,
duration: duration,
mask: mask,
////是否显示透明蒙层，防止触摸穿透
success: function(res) {
//接口调用成功的回调函数
if (successFunc != null) {
successFunc(res);
}
},
fail: function(res) {
//接口调用失败的回调函数
if (failFunc != null) {
failFunc(res);
}
},
complete: function(res) {
//接口调用结束的回调函数（调用成功、失败都会执行）
if (completeFun != null) {
completeFun(res);
}
}
});
}
/******************showLoadingAlert************************/

function showLoadingAlert(title = '加载中...', mask = true, successFunc = null, failFunc = null, completeFun = null) {
uni.showLoading({
title: title,
mask: mask,
//是否显示透明蒙层，防止触摸穿透
success: function (res) {
//接口调用成功的回调函数
if (successFunc != null) {
successFunc(res);
}
},
fail: function (res) {
//接口调用失败的回调函数
if (failFunc != null) {
failFunc(res);
}
},
complete: function (res) {
//接口调用结束的回调函数（调用成功、失败都会执行）
if (completeFun != null) {
completeFun(res);
}
}
});
uni.showLoading({
title: title,
mask: mask,
//是否显示透明蒙层，防止触摸穿透
success: function(res) {
//接口调用成功的回调函数
if (successFunc != null) {
successFunc(res);
}
},
fail: function(res) {
//接口调用失败的回调函数
if (failFunc != null) {
failFunc(res);
}
},
complete: function(res) {
//接口调用结束的回调函数（调用成功、失败都会执行）
if (completeFun != null) {
completeFun(res);
}
}
});
}

function hideLoadingAlert(successFunc = null, failFunc = null, completeFun = null) {
uni.hideLoading({
success: function (res) {
//接口调用成功的回调函数
if (successFunc != null) {
successFunc(res);
}
},
fail: function (res) {
//接口调用失败的回调函数
if (failFunc != null) {
failFunc(res);
}
},
complete: function (res) {
//接口调用结束的回调函数（调用成功、失败都会执行）
if (completeFun != null) {
completeFun(res);
}
}
});
uni.hideLoading({
success: function(res) {
//接口调用成功的回调函数
if (successFunc != null) {
successFunc(res);
}
},
fail: function(res) {
//接口调用失败的回调函数
if (failFunc != null) {
failFunc(res);
}
},
complete: function(res) {
//接口调用结束的回调函数（调用成功、失败都会执行）
if (completeFun != null) {
completeFun(res);
}
}
});
} //签名

function alertF(msg) {
//隐藏加载框
hideLoadingAlert(); //提示对话框
//隐藏加载框
hideLoadingAlert(); //提示对话框

showModalAlert(msg);
showModalAlert(msg);
}

function alertFback(msg, backcall) {
//隐藏加载框
hideLoadingAlert(); //提示对话框
//隐藏加载框
hideLoadingAlert(); //提示对话框

showModalAlert(msg, backcall);
showModalAlert(msg, backcall);
}

/**
@@ -282,93 +281,93 @@ function alertFback(msg, backcall) {
*/

function vehiclePlateStr(num, successFun) {
var vehicleColorStr;
var vehicleColorStr;

switch (num) {
case 0:
vehicleColorStr = '蓝色';
successFun(vehicleColorStr);
break;
switch (num) {
case 0:
vehicleColorStr = '蓝色';
successFun(vehicleColorStr);
break;

case 1:
vehicleColorStr = '黄色';
successFun(vehicleColorStr);
break;
case 1:
vehicleColorStr = '黄色';
successFun(vehicleColorStr);
break;

case 2:
vehicleColorStr = '黑色';
successFun(vehicleColorStr);
break;
case 2:
vehicleColorStr = '黑色';
successFun(vehicleColorStr);
break;

case 3:
vehicleColorStr = '白色';
successFun(vehicleColorStr);
break;
case 3:
vehicleColorStr = '白色';
successFun(vehicleColorStr);
break;

case 4:
vehicleColorStr = '渐变绿色';
successFun(vehicleColorStr);
break;
case 4:
vehicleColorStr = '渐变绿色';
successFun(vehicleColorStr);
break;

case 5:
vehicleColorStr = '黄绿双拼色';
successFun(vehicleColorStr);
break;
case 5:
vehicleColorStr = '黄绿双拼色';
successFun(vehicleColorStr);
break;

case 6:
vehicleColorStr = '蓝白渐变色';
successFun(vehicleColorStr);
break;
case 6:
vehicleColorStr = '蓝白渐变色';
successFun(vehicleColorStr);
break;

case 7:
vehicleColorStr = '临时牌照';
successFun(vehicleColorStr);
break;
case 7:
vehicleColorStr = '临时牌照';
successFun(vehicleColorStr);
break;

case 9:
vehicleColorStr = '未确定';
successFun(vehicleColorStr);
break;
case 9:
vehicleColorStr = '未确定';
successFun(vehicleColorStr);
break;

case 11:
vehicleColorStr = '绿色';
successFun(vehicleColorStr);
break;
case 11:
vehicleColorStr = '绿色';
successFun(vehicleColorStr);
break;

case 12:
vehicleColorStr = '红色';
successFun(vehicleColorStr);
break;
case 12:
vehicleColorStr = '红色';
successFun(vehicleColorStr);
break;

default:
vehicleColorStr = '未知';
successFun(vehicleColorStr);
break;
}
default:
vehicleColorStr = '未知';
successFun(vehicleColorStr);
break;
}
}

//字符串加密
function md5Str(str) {
var _str = md5.i(str);
return _str;
var _str = md5.i(str);
return _str;
}

module.exports = {
toUrl,
navigateBack,
showModalAlert,
showToastAlert,
showLoadingAlert,
hideLoadingAlert,
// getEtcBankList,
// showAlertv2,
// loading,
md5Str,
// sha1Str,
alertF,
alertFback,
identityData,
deviceModel,
// isFollow,
vehiclePlateStr
};
toUrl,
navigateBack,
showModalAlert,
showToastAlert,
showLoadingAlert,
hideLoadingAlert,
// getEtcBankList,
// showAlertv2,
// loading,
md5Str,
// sha1Str,
alertF,
alertFback,
identityData,
deviceModel,
// isFollow,
vehiclePlateStr
};

+ 2
- 1
subpackage/after-sale/ETC-product-status-list-query/ETC-product-status-list-query.vue 파일 보기

@@ -40,6 +40,7 @@
import { ETCProductStatusListQueryApi } from "@/utils/network/api.js";
import { request } from "@/utils/network/request.js";
import { stringToJson } from "@/utils/network/encryption.js";
import { agentId } from "@/utils/network/difference";
const state = reactive({
promoteName: "", //产品名称
promoteId: "",//产品编号
@@ -66,7 +67,7 @@
const options = {
type: 2,
data: {
"agencyId": "52010106998",
"agencyId": agentId,
"pageNo": state.pageNo,
"pageSize": state.pageSize,
"status": state.index == 1 ? 'DISABLE' : "ENABLE",

+ 2
- 2
subpackage/after-sale/activation-once-again/activation-once-again.vue 파일 보기

@@ -107,7 +107,7 @@
import {
getCodeName
} from "@/datas/queryKey.js";
import { agentId } from "@/utils/network/difference";


const state = reactive({
@@ -263,7 +263,7 @@
obuId: obu.obuId,
vehicleId: orderInfos.vehiclePlate + "_" + orderInfos.vehiclePlateColor,
orderId: orderInfos.orderId,
agentId: "52010106998",
agentId: agentId,
channelId: "5201010200601130001",
channelType: "1",
staffId: "opId",

+ 4
- 2
subpackage/after-sale/activation/activate.vue 파일 보기

@@ -63,7 +63,9 @@
stringToJson
} from "@/utils/network/encryption.js";
import * as IFCODE from "@/utils/network/api.js";

import {
agentId
} from "@/utils/network/difference";
const cmd = require("../../../static/etcUtil/cmdConfig.js");
const tools = require("../../../static/etcUtil/tools.js");
const bluetoothUtil = require("../../../static/etcUtil/index.js");
@@ -612,7 +614,7 @@
obuId: obu.obuId,
vehicleId: fileDataStrings.vehiclePlate + "_" + fileDataStrings.vehiclePlateColor,
orderId: fileDataStrings.orderId,
agentId: "52010106998",
agentId: agentId,
channelId: "5201010200601130001",
channelType: "1",
staffId: "opId",

+ 2
- 1
subpackage/after-sale/to-bookkeeping-card/choice-product-new.vue 파일 보기

@@ -61,6 +61,7 @@
// import navBar from "@/components/nav-bar/nav-bar2.vue";
import { getItem, StorageKeys, setItem } from "@/utils/storage.ts";
import { msg } from "@/utils/utils";
import { agentId } from "@/utils/network/difference";
import {
navTo
} from "@/utils/utils"
@@ -119,7 +120,7 @@
var data = {
type: state.type,
source: state.sysType, //请求方来源
agencyId: "52010106998",//渠道编号
agencyId: agentId,//渠道编号
userType: state.userType, //用户类型
vanType: state.type, //车类型
promotionMode: 1

+ 2
- 1
subpackage/orders/choice-product.vue 파일 보기

@@ -60,6 +60,7 @@
import navBar from "@/components/nav-bar/nav-bar2.vue";
import { getItem, StorageKeys, setItem } from "@/utils/storage.ts";
import { msg } from "@/utils/utils";
import { agentId } from "@/utils/network/difference";
const imgURL = `${fileURL}image/`;
// import { setItem } from "@/utils/storage";

@@ -144,7 +145,7 @@
var data = {
userType: state.userType,
// source: state.sysType, //请求方来源
agencyId: '52010106998',
agencyId: agentId,
vanType: state.type,
promotionMode: 1
};

+ 8
- 1
utils/network/difference.js 파일 보기

@@ -6,4 +6,11 @@ export const source = "ALI"
export const source = "WECHAT"
// #endif

// 微信：52010106004 支付宝52010106998
// 微信小程序渠道编号：52010106004 支付宝小程序52010106998
// 渠道编号
// #ifdef MP-ALIPAY
export const agentId = "52010106998"
// #endif
// #ifdef MP-WEIXIN
export const agentId = "52010106004"
// #endif

+ 4
- 15
utils/network/request.js 파일 보기

@@ -15,6 +15,9 @@ import {
sm4Key
} from "../network/api.js";
import SM4Util from '../util/sm4.js'
import {
agentId
} from "@/utils/network/difference";
import {
updateToken
} from "@/utils/network/api";
@@ -48,21 +51,8 @@ function updateGetToken() {
//请求
export function request(code, options = {}, start = false) {
//公参
// #ifdef MP-ALIPAY
const Common = {
agentId: "52010106998",
channelId: "5201010200601130001",
channelType: "1",
staffId: "54623263cb4d4a289dccbc983b22a4af",
terminalId: "999999999999",
loginSource: getItem("loginSource"),
rbacSource: 'MINI_PROGRAM',
accessToken: getItem(StorageKeys.Token)
}
// #endif
// #ifdef MP-WEIXIN
const Common = {
agentId: "52010106004",
agentId: agentId,
channelId: "5201010200601130001",
channelType: "1",
staffId: "54623263cb4d4a289dccbc983b22a4af",
@@ -71,7 +61,6 @@ export function request(code, options = {}, start = false) {
rbacSource: 'MINI_PROGRAM',
accessToken: getItem(StorageKeys.Token)
}
// #endif

options.url = envs[process.env.NODE_ENV].baseUrl + '/api/interfaceMidGroundIn'
// options.url = envs[process.env.NODE_ENV].baseUrl + '/ifzt/api/interfaceMidGroundIn'

+ 3
- 2
utils/utils.ts 파일 보기

@@ -4,6 +4,7 @@ import { envs } from "@/utils/network/api.js";
import {
stringToJson
} from "@/utils/network/encryption";
import { agentId } from "@/utils/network/difference";
import {
request
} from "@/utils/network/request.js";
@@ -448,7 +449,7 @@ export const uploadFile = (tempImagePath, imageType, code) => {
if (code == 15) { //身份证
var data = {
source: "1",
agencyId: "52010106998",
agencyId: agentId,
imageType: imageType,
fileName: tempImagePath,
url: uploadFileImage
@@ -456,7 +457,7 @@ export const uploadFile = (tempImagePath, imageType, code) => {
} else if (code == 16) { //行驶证
var data = {
source: "1",
agencyId: "52010106998",
agencyId: agentId,
imageType: imageType,
fileName: tempImagePath,
imageUrl: uploadFileImage

Write Preview
Loading…
취소
저장