5 Commits

Author SHA1 Message Date
68ea7e40de 修改oss地址 2025-11-04 11:14:16 +08:00
296a8032de 修改为php接口请求 2025-10-15 13:28:19 +08:00
2f464cdc2d 代码更新 2025-10-09 11:29:16 +08:00
a4abdf9cc0 增加登录跳转刷新 2025-08-19 13:34:05 +08:00
d10a6cb178 代码打包修改 2025-08-18 17:22:08 +08:00
27 changed files with 254 additions and 227 deletions

102
gulpfile copy.js Normal file
View File

@@ -0,0 +1,102 @@
var gulp = require('gulp');
var $ = require('gulp-load-plugins')();
var path = require('path');
var del = require('del');
var distPath = path.resolve('./dist');
var version = ''; // 版本号
var versionPath = ''; // 版本号路径
var env = ''; // 运行环境
// 创建版本号(年月日时分)
(function () {
var d = new Date();
var yy = d.getFullYear().toString().slice(2);
var MM = d.getMonth() + 1 >= 10 ? (d.getMonth() + 1) : '0' + (d.getMonth() + 1);
var DD = d.getDate() >= 10 ? d.getDate() : '0' + d.getDate();
var h = d.getHours() >= 10 ? d.getHours() : '0' + d.getHours();
var mm = d.getMinutes() >= 10 ? d.getMinutes() : '0' + d.getMinutes();
version = yy + MM + DD + h + mm;
versionPath = distPath + '/' + version;
})();
// 编译
gulp.task('build', $.shell.task(['node build/build.js']));
// 创建版本号目录
gulp.task('create:versionCatalog', gulp.series('build', function () {
return gulp.src(`${distPath}/static/**/*`)
.pipe(gulp.dest(`${versionPath}/static/`))
}))
// 替换${versionPath}/static/js/manifest.js window.SITE_CONFIG.cdnUrl占位变量
gulp.task('replace:cdnUrl', gulp.series('create:versionCatalog', function () {
return gulp.src(`${versionPath}/static/js/manifest.js`)
.pipe($.replace(new RegExp(`"${require('./config').build.assetsPublicPath}"`, 'g'), 'window.SITE_CONFIG.cdnUrl + "/"'))
.pipe(gulp.dest(`${versionPath}/static/js/`))
}))
// 替换${versionPath}/static/config/index-${env}.js window.SITE_CONFIG['version']配置变量
gulp.task('replace:version', gulp.series('create:versionCatalog', function () {
return gulp.src(`${versionPath}/static/config/index-${env}.js`)
.pipe($.replace(/window.SITE_CONFIG\['version'\] = '.*'/g, `window.SITE_CONFIG['version'] = '${version}'`))
.pipe(gulp.dest(`${versionPath}/static/config/`))
}))
// 合并${versionPath}/static/config/[index-${env}, init].js 至 ${distPath}/config/index.js
gulp.task('concat:config', gulp.series('replace:version', function () {
return gulp.src([`${versionPath}/static/config/index-${env}.js`, `${versionPath}/static/config/init.js`])
.pipe($.concat('index.js'))
.pipe(gulp.dest(`${distPath}/config/`))
}))
// 清空文件历史
gulp.task('clean', function () {
console.log('--clean--')
// del([`${distPath}/static`, `${versionPath}/static/config`]);
// return del([versionPath])
return del([`${distPath}`])
})
gulp.task('build-end', function () {
console.log('--builed-end--')
// del([`${distPath}/static`, `${versionPath}/static/config`]);
return del([`${distPath}/static`, `${versionPath}/static/config`]);
})
env = process.env.npm_config_qa ? 'qa' : process.env.npm_config_uat ? 'uat' : 'prod';
gulp.task('default',
gulp.series('clean',
gulp.parallel('create:versionCatalog', 'replace:cdnUrl', 'replace:version', 'concat:config'),
'build', 'build-end')
)
/* gulp.task('default', gulp.series('clean', function (done) {
// 获取环境配置
env = process.env.npm_config_qa ? 'qa' : process.env.npm_config_uat ? 'uat' : 'prod'
// 开始打包编译
// 开始打包编译
gulp.task('default', gulp.series('build','create:versionCatalog', 'replace:cdnUrl', 'replace:version', 'concat:config', function (done) {
// 清除, 编译 / 处理项目中产生的文件
del([`${distPath}/static`, `${versionPath}/static/config`])
done();
}))
})); */
/*
gulp.task('default', gulp.series('clean', function (done) {
// 获取环境配置
env = process.env.npm_config_qa ? 'qa' : process.env.npm_config_uat ? 'uat' : 'prod'
// 开始打包编译
// 开始打包编译
gulp.task('default', gulp.series('build','create:versionCatalog', 'replace:cdnUrl', 'replace:version', 'concat:config', function (done) {
// 清除, 编译 / 处理项目中产生的文件
del([`${distPath}/static`, `${versionPath}/static/config`])
done();
}))
}));
*/

View File

@@ -3,21 +3,23 @@ var $ = require('gulp-load-plugins')();
var path = require('path'); var path = require('path');
var del = require('del'); var del = require('del');
// 先设置环境变量,确保任务定义时可以正确访问
var env = process.env.npm_config_qa ? 'qa' : process.env.npm_config_uat ? 'uat' : 'prod';
var distPath = path.resolve('./dist'); var distPath = path.resolve('./dist');
var version = ''; // 版本号 var version = ''; // 版本号
var versionPath = ''; // 版本号路径 var versionPath = ''; // 版本号路径
var env = ''; // 运行环境
// 创建版本号(年月日时分) // 创建版本号(年月日时分)
(function () { (function () {
var d = new Date(); var d = new Date();
var yy = d.getFullYear().toString().slice(2); var yy = d.getFullYear().toString().slice(2);
var MM = d.getMonth() + 1 >= 10 ? (d.getMonth() + 1) : '0' + (d.getMonth() + 1); var MM = (d.getMonth() + 1).toString().padStart(2, '0');
var DD = d.getDate() >= 10 ? d.getDate() : '0' + d.getDate(); var DD = d.getDate().toString().padStart(2, '0');
var h = d.getHours() >= 10 ? d.getHours() : '0' + d.getHours(); var h = d.getHours().toString().padStart(2, '0');
var mm = d.getMinutes() >= 10 ? d.getMinutes() : '0' + d.getMinutes(); var mm = d.getMinutes().toString().padStart(2, '0');
version = yy + MM + DD + h + mm; version = yy + MM + DD + h + mm;
versionPath = distPath + '/' + version; versionPath = path.join(distPath, version); // 使用path.join更安全
})(); })();
// 编译 // 编译
@@ -25,78 +27,60 @@ gulp.task('build', $.shell.task(['node build/build.js']));
// 创建版本号目录 // 创建版本号目录
gulp.task('create:versionCatalog', gulp.series('build', function () { gulp.task('create:versionCatalog', gulp.series('build', function () {
return gulp.src(`${distPath}/static/**/*`) return gulp.src(path.join(distPath, 'static', '**', '*'))
.pipe(gulp.dest(`${versionPath}/static/`)) .pipe(gulp.dest(path.join(versionPath, 'static')));
})) }));
// 替换${versionPath}/static/js/manifest.js window.SITE_CONFIG.cdnUrl占位变量 // 替换cdnUrl占位变量
gulp.task('replace:cdnUrl', gulp.series('create:versionCatalog', function () { gulp.task('replace:cdnUrl', gulp.series('create:versionCatalog', function () {
return gulp.src(`${versionPath}/static/js/manifest.js`) const assetsPublicPath = require('./config').build.assetsPublicPath;
.pipe($.replace(new RegExp(`"${require('./config').build.assetsPublicPath}"`, 'g'), 'window.SITE_CONFIG.cdnUrl + "/"')) return gulp.src(path.join(versionPath, 'static', 'js', 'manifest.js'))
.pipe(gulp.dest(`${versionPath}/static/js/`)) .pipe($.replace(new RegExp(`"${assetsPublicPath}"`, 'g'), 'window.SITE_CONFIG.cdnUrl + "/"'))
})) .pipe(gulp.dest(path.join(versionPath, 'static', 'js')));
}));
// 替换${versionPath}/static/config/index-${env}.js window.SITE_CONFIG['version']配置变量 // 替换version配置变量
gulp.task('replace:version', gulp.series('create:versionCatalog', function () { gulp.task('replace:version', gulp.series('create:versionCatalog', function () {
return gulp.src(`${versionPath}/static/config/index-${env}.js`) return gulp.src(path.join(versionPath, 'static', 'config', `index-${env}.js`))
.pipe($.replace(/window.SITE_CONFIG\['version'\] = '.*'/g, `window.SITE_CONFIG['version'] = '${version}'`)) .pipe($.replace(/window.SITE_CONFIG\['version'\] = '.*'/g, `window.SITE_CONFIG['version'] = '${version}'`))
.pipe(gulp.dest(`${versionPath}/static/config/`)) .pipe(gulp.dest(path.join(versionPath, 'static', 'config')));
})) }));
// 合并${versionPath}/static/config/[index-${env}, init].js 至 ${distPath}/config/index.js // 合并配置文件
gulp.task('concat:config', gulp.series('replace:version', function () { gulp.task('concat:config', gulp.series('replace:version', function () {
return gulp.src([`${versionPath}/static/config/index-${env}.js`, `${versionPath}/static/config/init.js`]) return gulp.src([
path.join(versionPath, 'static', 'config', `index-${env}.js`),
path.join(versionPath, 'static', 'config', 'init.js')
])
.pipe($.concat('index.js')) .pipe($.concat('index.js'))
.pipe(gulp.dest(`${distPath}/config/`)) .pipe(gulp.dest(path.join(distPath, 'config')));
})) }));
// 清空文件历史 // 清空文件历史
gulp.task('clean', function () { gulp.task('clean', function () {
console.log('--clean--') console.log('--clean--');
// del([`${distPath}/static`, `${versionPath}/static/config`]); return del([distPath]);
// return del([versionPath]) });
return del([`${distPath}`])
})
// 构建结束清理
gulp.task('build-end', function () { gulp.task('build-end', function () {
console.log('--builed-end--') console.log('--builed-end--');
// del([`${distPath}/static`, `${versionPath}/static/config`]); return del([
return del([`${distPath}/static`, `${versionPath}/static/config`]); path.join(distPath, 'static'),
}) path.join(versionPath, 'static', 'config')
]);
});
env = process.env.npm_config_qa ? 'qa' : process.env.npm_config_uat ? 'uat' : 'prod'; // 主任务 - 按正确顺序执行
gulp.task('default', gulp.series(
gulp.task('default', 'clean',
gulp.series('clean', 'build',
gulp.parallel('create:versionCatalog', 'replace:cdnUrl', 'replace:version', 'concat:config'), 'create:versionCatalog',
'build', 'build-end') gulp.parallel('replace:cdnUrl', 'replace:version'),
) 'concat:config',
'build-end',
function (done) {
console.log(`构建完成,环境: ${env},版本号: ${version}`);
/* gulp.task('default', gulp.series('clean', function (done) {
// 获取环境配置
env = process.env.npm_config_qa ? 'qa' : process.env.npm_config_uat ? 'uat' : 'prod'
// 开始打包编译
// 开始打包编译
gulp.task('default', gulp.series('build','create:versionCatalog', 'replace:cdnUrl', 'replace:version', 'concat:config', function (done) {
// 清除, 编译 / 处理项目中产生的文件
del([`${distPath}/static`, `${versionPath}/static/config`])
done(); done();
})) }
})); */ ));
/*
gulp.task('default', gulp.series('clean', function (done) {
// 获取环境配置
env = process.env.npm_config_qa ? 'qa' : process.env.npm_config_uat ? 'uat' : 'prod'
// 开始打包编译
// 开始打包编译
gulp.task('default', gulp.series('build','create:versionCatalog', 'replace:cdnUrl', 'replace:version', 'concat:config', function (done) {
// 清除, 编译 / 处理项目中产生的文件
del([`${distPath}/static`, `${versionPath}/static/config`])
done();
}))
}));
*/

View File

@@ -46,7 +46,7 @@ export function summary_query(params) {
*/ */
export function userInfo_list(params) { export function userInfo_list(params) {
return $http({ return $http({
url: "/userInfo/list", url: "/czg/userInfo/list",
method: "get", method: "get",
params params
}); });
@@ -59,7 +59,7 @@ export function userInfo_list(params) {
*/ */
export function userInfo(data) { export function userInfo(data) {
return $http({ return $http({
url: "/userInfo", url: "/czg/userInfo",
method: "put", method: "put",
data data
}); });
@@ -71,7 +71,7 @@ export function userInfo(data) {
*/ */
export function userInfoDel(data) { export function userInfoDel(data) {
return $http({ return $http({
url: "/userInfo", url: "/czg/userInfo",
method: "DELETE", method: "DELETE",
data data
}); });

View File

@@ -70,7 +70,7 @@ export default {
return; return;
} }
this.url = fileRes.replace( this.url = fileRes.replace(
"https://sy-duanju.oss-cn-nanjing.aliyuncs.com/", "https://sy-duanju.oss-cn-chengdu.aliyuncs.com/",
"https://short-video.hnsiyao.cn/" "https://short-video.hnsiyao.cn/"
); );
}, },

View File

@@ -5,10 +5,8 @@ export const productUrl='dj-admin';
// const baseUrl = "https://api.tianjinzhitongdaohe.com/czg/" // const baseUrl = "https://api.tianjinzhitongdaohe.com/czg/"
// const baseUrl = "https://web-api.hnsiyao.cn/czg/" //测试 // const baseUrl = "https://web-api.hnsiyao.cn/czg/" //测试
// const baseUrl = "https://web.hnsiyao.cn/czg/" // 线上 const baseUrl = "https://web.hnsiyao.cn/czg/" // 线上
// const baseUrl = "http://192.168.1.31:8080/admin/" // php本地 // const baseUrl = "https://ph.hnsiyao.cn/czg/" // 线上
// const baseUrl = "https://playlet.test.sxczgkj.com/admin/" // php测试服
const baseUrl = "http://192.168.1.10:8787/czg/" // php测试服
export default{ export default{
baseUrl baseUrl

View File

@@ -49,6 +49,9 @@ http.interceptors.response.use(response => {
if (response.data && response.data.code === 401) { // 401, token失效 if (response.data && response.data.code === 401) { // 401, token失效
clearLoginInfo() clearLoginInfo()
router.push({name: 'login'}) router.push({name: 'login'})
setTimeout(() => {
window.location.reload()
}, 300);
} }
return response return response
}, error => { }, error => {

View File

@@ -345,7 +345,7 @@ export default {
return; return;
} }
return fileRes.replace( return fileRes.replace(
"https://sy-duanju.oss-cn-nanjing.aliyuncs.com/", "https://sy-duanju.oss-cn-chengdu.aliyuncs.com/",
"https://short-video.hnsiyao.cn/" "https://short-video.hnsiyao.cn/"
); );
}, },

View File

@@ -628,7 +628,7 @@
dataSelect() { dataSelect() {
this.tableDataLoading = true this.tableDataLoading = true
this.$http({ this.$http({
url: this.$http.adornUrl('sdkType/getSdkTypeList'), url: this.$http.adornUrl('admin/sdkType/getSdkTypeList'),
method: 'get', method: 'get',
params: this.$http.adornParams({ params: this.$http.adornParams({
'page': this.page, 'page': this.page,
@@ -784,7 +784,7 @@
// this.startTime = this.info2.stockDate2 // this.startTime = this.info2.stockDate2
// } // }
this.$http({ this.$http({
url: this.$http.adornUrl('/admin/sdkInfo/getSdkList'), url: this.$http.adornUrl('admin/sdkInfo/getSdkList'),
method: 'get', method: 'get',
params: this.$http.adornParams({ params: this.$http.adornParams({
'page': this.page, 'page': this.page,

View File

@@ -35,7 +35,6 @@
<script> <script>
import { getUUID } from '@/utils' import { getUUID } from '@/utils'
import { entryName } from '@/utils/httpRequest' import { entryName } from '@/utils/httpRequest'
import { method } from 'lodash'
export default { export default {
data () { data () {
return { return {
@@ -85,24 +84,16 @@ import { method } from 'lodash'
this.$router.replace({ name: 'home' }) this.$router.replace({ name: 'home' })
} else { } else {
this.getCaptcha() this.getCaptcha()
this.$message.error(data.message) this.$message.error(data.msg)
} }
}) })
} }
}) })
}, },
// 获取验证码 // 获取验证码
async getCaptcha () { getCaptcha () {
this.dataForm.uuid = getUUID() this.dataForm.uuid = getUUID()
const res =await this.$http({ this.captchaPath = this.$http.adornUrl(`/captcha.jpg?uuid=${this.dataForm.uuid}`)
url:'indetcode/getCode',
method:'get',
params:{
uuid:this.dataForm.uuid
}
})
console.log(res);
this.captchaPath=res.data.data.img
} }
} }
} }

View File

@@ -1850,10 +1850,7 @@
this.$http({ this.$http({
url: this.$http.adornUrl('sys/user/info/' + userId), url: this.$http.adornUrl('sys/user/info/' + userId),
method: 'get', method: 'get',
params: { params: this.$http.adornParams({})
...this.$http.adornParams({}),
userId: userId
}
}).then(({ }).then(({
data data
}) => { }) => {
@@ -1981,8 +1978,11 @@
}).then(({ }).then(({
data data
}) => { }) => {
console.log('-------')
this.tableDataLoading = false this.tableDataLoading = false
let returnData = data.data; let returnData = data.data;
console.log(returnData)
this.tableDataYe = returnData this.tableDataYe = returnData
}) })
@@ -3081,10 +3081,7 @@
this.$http({ this.$http({
url: this.$http.adornUrl('common/type/152'), url: this.$http.adornUrl('common/type/152'),
method: 'get', method: 'get',
params: { params: this.$http.adornParams({})
...this.$http.adornParams({}),
type:152
}
}).then(({ }).then(({
data data
}) => { }) => {
@@ -3096,10 +3093,7 @@
this.$http({ this.$http({
url: this.$http.adornUrl('common/type/153'), url: this.$http.adornUrl('common/type/153'),
method: 'get', method: 'get',
params: { params: this.$http.adornParams({})
...this.$http.adornParams({}),
type:153
}
}).then(({ }).then(({
data data
}) => { }) => {

View File

@@ -1410,7 +1410,7 @@ export default {
return; return;
} }
this.url = fileRes.replace( this.url = fileRes.replace(
"https://sy-duanju.oss-cn-nanjing.aliyuncs.com/", "https://sy-duanju.oss-cn-chengdu.aliyuncs.com/",
"https://short-video.hnsiyao.cn/" "https://short-video.hnsiyao.cn/"
); );
}, },
@@ -1787,7 +1787,7 @@ export default {
courseType: this.courseType, courseType: this.courseType,
isRecommend: this.isRecommend, isRecommend: this.isRecommend,
status: this.statusType, status: this.statusType,
// remark: this.remark, remark: this.remark,
bannerId: this.fenleiId2, bannerId: this.fenleiId2,
isPrice: this.isPrice, isPrice: this.isPrice,
isOver: this.isOver, isOver: this.isOver,
@@ -2550,7 +2550,6 @@ export default {
data: this.$http.adornData({ data: this.$http.adornData({
courseDetailsId: row.courseDetailsId, courseDetailsId: row.courseDetailsId,
advertising: row.advertising, advertising: row.advertising,
courseId: row.courseId,
}), }),
}).then(({ data }) => { }).then(({ data }) => {
if (data.code == 0) { if (data.code == 0) {
@@ -2592,7 +2591,6 @@ export default {
data: this.$http.adornData({ data: this.$http.adornData({
courseDetailsId: row.courseDetailsId, courseDetailsId: row.courseDetailsId,
good: row.good, good: row.good,
courseId: row.courseId,
}), }),
}).then(({ data }) => { }).then(({ data }) => {
if (data.code == 0) { if (data.code == 0) {
@@ -2653,9 +2651,6 @@ export default {
this.$http({ this.$http({
url: this.$http.adornUrl("common/type/247"), url: this.$http.adornUrl("common/type/247"),
method: "get", method: "get",
params: {
type:247
},
data: this.$http.adornData({}), data: this.$http.adornData({}),
}).then(({ data }) => { }).then(({ data }) => {
if (data.code == 0) { if (data.code == 0) {
@@ -2668,9 +2663,6 @@ export default {
this.$http({ this.$http({
url: this.$http.adornUrl("common/type/450"), url: this.$http.adornUrl("common/type/450"),
method: "get", method: "get",
params: {
type:450
},
data: this.$http.adornData({}), data: this.$http.adornData({}),
}).then(({ data }) => { }).then(({ data }) => {
if (data.code == 0) { if (data.code == 0) {
@@ -2681,9 +2673,6 @@ export default {
this.$http({ this.$http({
url: this.$http.adornUrl("common/type/451"), url: this.$http.adornUrl("common/type/451"),
method: "get", method: "get",
params: {
type:451
},
data: this.$http.adornData({}), data: this.$http.adornData({}),
}).then(({ data }) => { }).then(({ data }) => {
if (data.code == 0) { if (data.code == 0) {
@@ -2694,7 +2683,7 @@ export default {
this.$http({ this.$http({
url: this.$http.adornUrl("common/type/849"), url: this.$http.adornUrl("common/type/849"),
method: "get", method: "get",
params: this.$http.adornParams({type:849}), params: this.$http.adornParams({}),
}).then(({ data }) => { }).then(({ data }) => {
if (data.code == 0) { if (data.code == 0) {
if (data.data.value == "是") { if (data.data.value == "是") {

View File

@@ -1576,9 +1576,6 @@
this.$http({ this.$http({
url: this.$http.adornUrl('common/type/247'), url: this.$http.adornUrl('common/type/247'),
method: 'get', method: 'get',
params: {
type:247
},
data: this.$http.adornData({}) data: this.$http.adornData({})
}).then(({ }).then(({
data data

View File

@@ -1453,9 +1453,6 @@
this.$http({ this.$http({
url: this.$http.adornUrl('common/type/247'), url: this.$http.adornUrl('common/type/247'),
method: 'get', method: 'get',
params: {
type:247
},
data: this.$http.adornData({}) data: this.$http.adornData({})
}).then(({ }).then(({
data data

View File

@@ -1158,8 +1158,7 @@
'page': this.page, 'page': this.page,
'limit': this.limit, 'limit': this.limit,
'member': this.member, 'member': this.member,
'phone': this.phone, 'phone': this.phone
type:88
}) })
}).then(({ }).then(({
data data

View File

@@ -148,9 +148,7 @@
this.$http({ this.$http({
url: this.$http.adornUrl(`/sys/menu/info/${this.dataForm.id}`), url: this.$http.adornUrl(`/sys/menu/info/${this.dataForm.id}`),
method: 'get', method: 'get',
params: this.$http.adornParams({ params: this.$http.adornParams()
menuId: this.dataForm.id
})
}).then(({data}) => { }).then(({data}) => {
this.dataForm.id = data.menu.menuId this.dataForm.id = data.menu.menuId
this.dataForm.type = data.menu.type this.dataForm.type = data.menu.type

View File

@@ -130,9 +130,7 @@
this.$http({ this.$http({
url: this.$http.adornUrl(`/sys/menu/delete/${id}`), url: this.$http.adornUrl(`/sys/menu/delete/${id}`),
method: 'post', method: 'post',
data: this.$http.adornData({ data: this.$http.adornData()
menuId: id
})
}).then(({data}) => { }).then(({data}) => {
if (data && data.code === 0) { if (data && data.code === 0) {
this.$message({ this.$message({

View File

@@ -72,15 +72,12 @@
this.$http({ this.$http({
url: this.$http.adornUrl(`/sys/role/info/${this.dataForm.id}`), url: this.$http.adornUrl(`/sys/role/info/${this.dataForm.id}`),
method: 'get', method: 'get',
params: this.$http.adornParams({ params: this.$http.adornParams()
roleId:this.dataForm.id
})
}).then(({data}) => { }).then(({data}) => {
if (data && data.code === 0) { if (data && data.code === 0) {
this.dataForm.roleName = data.role.roleName this.dataForm.roleName = data.role.roleName
this.dataForm.remark = data.role.remark this.dataForm.remark = data.role.remark
var idx = data.role.menuIdList.indexOf(this.tempKey) var idx = data.role.menuIdList.indexOf(this.tempKey)
console.log(idx);
if (idx !== -1) { if (idx !== -1) {
data.role.menuIdList.splice(idx, data.role.menuIdList.length - idx) data.role.menuIdList.splice(idx, data.role.menuIdList.length - idx)
} }

View File

@@ -126,10 +126,7 @@
this.$http({ this.$http({
url: this.$http.adornUrl(`/sys/user/info/${this.dataForm.id}`), url: this.$http.adornUrl(`/sys/user/info/${this.dataForm.id}`),
method: 'get', method: 'get',
params: { params: this.$http.adornParams()
...this.$http.adornParams(),
'userId': this.dataForm.id
}
}).then(({data}) => { }).then(({data}) => {
if (data && data.code === 0) { if (data && data.code === 0) {
this.dataForm.userName = data.user.username this.dataForm.userName = data.user.username

View File

@@ -190,10 +190,7 @@
this.$http({ this.$http({
url: this.$http.adornUrl(`sys/user/info/${this.dataForm.id}`), url: this.$http.adornUrl(`sys/user/info/${this.dataForm.id}`),
method: 'get', method: 'get',
params: { params: this.$http.adornParams()
...this.$http.adornParams(),
'userId': this.dataForm.id
}
}).then(({ }).then(({
data data
}) => { }) => {

View File

@@ -193,10 +193,7 @@
this.$http({ this.$http({
url: this.$http.adornUrl(`sys/user/info/${this.dataForm.id}`), url: this.$http.adornUrl(`sys/user/info/${this.dataForm.id}`),
method: 'get', method: 'get',
params: { params: this.$http.adornParams()
...this.$http.adornParams(),
'userId': this.dataForm.id
}
}).then(({ }).then(({
data data
}) => { }) => {

View File

@@ -208,12 +208,9 @@ export default {
page: this.tableData.page, page: this.tableData.page,
limit: this.tableData.limit limit: this.tableData.limit
}); });
console.log("获取抽奖记录列表", data);
this.tableData.loading = false; this.tableData.loading = false;
this.tableData.list = data.data.list; this.tableData.list = data.page.list;
this.tableData.total = data.data.totalCount; this.tableData.total = data.page.totalCount;
} catch (error) { } catch (error) {
this.tableData.loading = false; this.tableData.loading = false;
console.log(error); console.log(error);

View File

@@ -1380,10 +1380,7 @@ export default {
this.$http({ this.$http({
url: this.$http.adornUrl(`user/${userId}`), url: this.$http.adornUrl(`user/${userId}`),
method: "get", method: "get",
params: { params: this.$http.adornParams({}),
...this.$http.adornParams({}),
userId: userId,
},
}).then(({ data }) => { }).then(({ data }) => {
if (data.code === 0) { if (data.code === 0) {
console.log("data", data); console.log("data", data);
@@ -1871,7 +1868,7 @@ export default {
this.tableDataLoading = true; this.tableDataLoading = true;
let userId = this.$route.query.userId; let userId = this.$route.query.userId;
this.$http({ this.$http({
url: this.$http.adornUrl("sdkInfo/getSdkList"), url: this.$http.adornUrl("admin/sdkInfo/getSdkList"),
method: "get", method: "get",
params: this.$http.adornParams({ params: this.$http.adornParams({
page: this.page, page: this.page,

View File

@@ -1311,10 +1311,7 @@
this.$http({ this.$http({
url: this.$http.adornUrl(`user/${userId}`), url: this.$http.adornUrl(`user/${userId}`),
method: 'get', method: 'get',
params: { params: this.$http.adornParams({})
...this.$http.adornParams({}),
userId: userId,
},
}).then(({ }).then(({
data data
}) => { }) => {

View File

@@ -998,10 +998,7 @@ export default {
this.$http({ this.$http({
url: this.$http.adornUrl(`user/deleteUserByUserId/${delid}`), url: this.$http.adornUrl(`user/deleteUserByUserId/${delid}`),
method: 'post', method: 'post',
params: this.$http.adornData({}), params: this.$http.adornData({})
data: {
'userId': delid
}
}).then(({ }).then(({
data data
}) => { }) => {

View File

@@ -73,7 +73,7 @@
<span>成功笔数</span> {{ orderInfo.withdrawTotal.success.count }} <span>成功笔数</span> {{ orderInfo.withdrawTotal.success.count }}
</div> </div>
<div class="row"> <div class="row">
<span>失败合计</span> {{ orderInfo.withdrawTotal.fail.count }} <span>失败合计</span> {{ orderInfo.withdrawTotal.fail.total }}
</div> </div>
<div class="row"> <div class="row">
<span>失败笔数</span> {{ orderInfo.withdrawTotal.fail.count }} <span>失败笔数</span> {{ orderInfo.withdrawTotal.fail.count }}
@@ -105,7 +105,7 @@
<span>成功笔数</span> {{ orderInfo.payTotal.success.count }} <span>成功笔数</span> {{ orderInfo.payTotal.success.count }}
</div> </div>
<div class="row"> <div class="row">
<span>失败合计</span> {{ orderInfo.payTotal.fail.count }} <span>失败合计</span> {{ orderInfo.payTotal.fail.total }}
</div> </div>
<div class="row"> <div class="row">
<span>失败笔数</span> {{ orderInfo.payTotal.fail.count }} <span>失败笔数</span> {{ orderInfo.payTotal.fail.count }}
@@ -148,11 +148,12 @@ export default {
if (!this.queryForm.outTradeNo) return if (!this.queryForm.outTradeNo) return
this.loading = true this.loading = true
const res = await queryByTradeNo({ outTradeNo: this.queryForm.outTradeNo }) const res = await queryByTradeNo({ outTradeNo: this.queryForm.outTradeNo })
console.log(res);
if (res.data.code == 0) { if (res.data.code == 0) {
this.orderInfo = res.data.data this.orderInfo = res.data.data
} else { } else {
this.orderInfo = '' this.orderInfo = ''
this.$message.error(res.data.message) this.$message.error(res.data.msg)
} }
} catch (error) { } catch (error) {
this.orderInfo = '' this.orderInfo = ''

View File

@@ -5,7 +5,7 @@
window.SITE_CONFIG = {}; window.SITE_CONFIG = {};
// api接口请求地址 // api接口请求地址
window.SITE_CONFIG['baseUrl'] = 'https://ditanxiong.gomyorder.cn/czg'; window.SITE_CONFIG['baseUrl'] = 'https://web.hnsiyao.cn/czg';
// cdn地址 = 域名 + 版本号 // cdn地址 = 域名 + 版本号
window.SITE_CONFIG['domain'] = './'; // 域名 window.SITE_CONFIG['domain'] = './'; // 域名