@@ -2,7 +2,7 @@ | |||
新办订单状态:待支付、审核中、审核不通过、待发货、待收货、待激活、已完成、已取消、已结束、退货、换货--> | |||
<template> | |||
<!-- <view :class="item.orderStatus == OrderStatus.已取消 ? 'item finished' : 'item'" @click.stop="gotoOrderDetails(item)"> --> | |||
<view :class="item.orderStatus == OrderStatus.已取消 ? 'item finished' : 'item'" > | |||
<view :class="item.orderStatus == OrderStatus.已取消 ? 'item finished' : 'item'"> | |||
<view class="head"> | |||
<view class="name"> | |||
<image :src="`${$imgUrl}order/icon-star-green.png`" class="icon" mode="aspectFill"></image> | |||
@@ -110,8 +110,8 @@ | |||
<view class="btn btn-primary" v-if="item.isProduct==0 || item.isEquity==0" | |||
@click.stop="gotoEvaluateProduct(item)">去评价产品</view> | |||
<!-- promotionModes字段判断的,1-线上模式 ,2-线下模式 ,线上模式就是自主办理不展示业务员评价 --> | |||
<view class="btn btn-primary" v-if="(item.isService==0) " @click.stop="gotoEvaluateSalesman(item)"> | |||
去评价业务员</view> | |||
<!-- <view class="btn btn-primary" v-if="(item.isService==0) " @click.stop="gotoEvaluateSalesman(item)"> | |||
去评价业务员</view> --> | |||
</view> | |||
</view> | |||
@@ -1,8 +1,9 @@ | |||
/* 接口中常量 */ | |||
// export const URL = "192.168.100.63"; | |||
export const URL = "trial.etcjz.cn"; | |||
// export const URL = "trial.etcjz.cn"; | |||
// export const URL = "qtzl.etcjz.cn"; | |||
// export const URL = "192.168.100.158"; | |||
export const URL = "192.168.100.63"; | |||
// http://192.168.100.63:50001 | |||
/** | |||
* 配置信息,针对不同的平台进行配置 | |||
*/ | |||
@@ -10,16 +11,18 @@ export const envs = { | |||
//开发环境配置 | |||
development: { | |||
// baseUrl: "https://qtzl.etcjz.cn", | |||
baseUrl: "https://trial.etcjz.cn", | |||
// baseUrl: "https://trial.etcjz.cn", | |||
// baseUrl: "http://192.168.100.158:8085", | |||
baseUrl: "http://192.168.100.63:50001", | |||
}, | |||
//生产环境配置 | |||
production: { | |||
// baseUrl: "http://192.168.124.6:8087", | |||
// baseUrl: "http://222.85.144.89:19002", | |||
// baseUrl: "https://qtzl.etcjz.cn", | |||
baseUrl: "https://trial.etcjz.cn", | |||
// baseUrl: "https://trial.etcjz.cn", | |||
// baseUrl: "http://192.168.100.158:8085", | |||
baseUrl: "http://192.168.100.63:50001", | |||
}, | |||
} | |||
@@ -30,7 +33,8 @@ export const aliPayConfigId = "6a9a54bc01f6443123452b1234"; //支付配置编号 | |||
export const aliPayConfigIdTwo = "6a9a54bc01f644312543761234"; | |||
export const wechatAppID = "wx8fba957179c1329a"; //九州小程序APPid:wx008c60533388527a | |||
export const wechatSecret = "699c10826113ddb350fbe58a96e2b015"; //九州小程序AppSecret:95197718b43b497f02732bd9f8011080 | |||
export const sm4Key = "5dc11f854ceca1473e1a5075ed16eb226b4543a9a05fe50f7fba40f898099ce34abba69a07a20509f315f94d808a4d0e988935588858f65a"; | |||
export const sm4Key = | |||
"5dc11f854ceca1473e1a5075ed16eb226b4543a9a05fe50f7fba40f898099ce34abba69a07a20509f315f94d808a4d0e988935588858f65a"; | |||
// export const sm4Key = "5dc11f854ceca147"; | |||
@@ -19,7 +19,6 @@ import { | |||
StorageKeys | |||
} from "@/utils/storage"; | |||
const s4 = new SM4Util() | |||
console.log('SM4===',s4) | |||
const _signCode = "etc123456"; //签名码 | |||
@@ -194,13 +193,14 @@ function textToBase64(text, key, iv) { | |||
//调用中台参数 | |||
export function encryption(ifCode, subdata, type) { | |||
var requestData = new Array(); | |||
const key = 'WVdSdGFXNHdNREZmTWpBeU16QTRNRE09' | |||
// const key = 'WVdSdGFXNHdNREZmTWpBeU16QTRNRE09' | |||
const key = 'TlRJd016QXhNekZmTWpBeU16QTRNekU9' | |||
requestData["ifCode"] = ifCode; | |||
requestData["appId"] = "52030131"; // || "admin001" | |||
// requestData["appId"] = "admin001"; // || "admin001" | |||
// requestData["signType"] = "SM3"; // || "NONE" | |||
requestData["signType"] = "SM3"; // || "NONE" | |||
requestData["encryptType"] = "SM4"; | |||
requestData["encryptType"] = "NONE"; | |||
// requestData["encryptType"] = "NONE"; | |||
requestData["reqId"] = requestData["appId"] + "_" + getDate() + "_" + generateMixed(5); | |||
requestData["timestamp"] = formatTime(new Date()); | |||
requestData["bizContent"] = s4.encryptData_CBC(subdata, sm4Key) | |||
@@ -216,7 +216,6 @@ export function encryption(ifCode, subdata, type) { | |||
"&reqId=" + requestData["reqId"] + | |||
"&accessToken=" + requestData["accessToken"], key | |||
); | |||
console.log('requestData:',requestData) | |||
let endData = arrayToJson(requestData); | |||
return endData; | |||
} |
@@ -13,11 +13,11 @@ import { | |||
import { | |||
sm4Key | |||
} from "../network/api.js"; | |||
import s4 from '../util/sm4.js' | |||
import SM4Util from '../util/sm4.js' | |||
import { | |||
updateToken | |||
} from "@/utils/network/api"; | |||
// const s4 = new SM4Util() | |||
const s4 = new SM4Util() | |||
/* 刷新token */ | |||
function updateGetToken() { | |||
@@ -159,8 +159,8 @@ export function request(code, options = {}, start = false) { | |||
reject(res.data.errorMsg) | |||
return | |||
} else { | |||
let content = res | |||
// let content = s4.decryptData_CBC(res, sm4Key) | |||
// let content = res | |||
let content = s4.decryptData_CBC(res, sm4Key) | |||
// console.log(content); | |||
// content.data.bizContent = JSON.stringify(content.data.bizContent) | |||
// console.log(content.data); |