16 Commits

Author SHA1 Message Date
d2a56965fc 修改本地php请求 2025-08-19 09:44:48 +08:00
gyq
c20cb8cfbc Merge branch 'master-php' of e.coding.net:g-cphe0354/duanju/video_admin into master-php 2025-08-01 16:24:25 +08:00
gyq
ebf40e35f6 优化 2025-08-01 16:24:05 +08:00
9fcadc1248 Merge branch 'master-php' of https://e.coding.net/g-cphe0354/duanju/video_admin into master-php 2025-08-01 16:23:36 +08:00
d34c5a84b8 修改部分接口 2025-08-01 16:23:34 +08:00
gyq
9e95072685 优化 2025-07-29 15:49:50 +08:00
943ef313cf 更新部分接口传参 2025-07-29 15:49:11 +08:00
b82eb59b1d Merge branch 'master-php' of https://e.coding.net/g-cphe0354/duanju/video_admin into master-php 2025-07-28 16:07:54 +08:00
842270186a 修改部分接口传参,修复登录验证码错误弹窗不显示问题 2025-07-28 16:07:52 +08:00
gyq
329299a3b5 任务兑换字段不统一问题修改 2025-07-28 10:02:55 +08:00
7744a8112d 修改849接口 2025-07-23 18:27:26 +08:00
8054985445 修改请求地址,修改查询用户详情接口和common/type接口,增加params传承 2025-07-23 15:10:44 +08:00
bf3dc320c0 修改用户详情接口传参,增加userId参数,暂时剔除请求401重新登录 2025-07-23 11:09:56 +08:00
eb2b6c15f2 修复请求问题 2025-07-23 10:10:39 +08:00
b711e87f50 修改验证码接口 2025-07-23 09:25:51 +08:00
3e4ec97803 修改测试链接 2025-07-23 09:19:12 +08:00
27 changed files with 227 additions and 254 deletions

View File

@@ -1,102 +0,0 @@
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,23 +3,21 @@ 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).toString().padStart(2, '0'); var MM = d.getMonth() + 1 >= 10 ? (d.getMonth() + 1) : '0' + (d.getMonth() + 1);
var DD = d.getDate().toString().padStart(2, '0'); var DD = d.getDate() >= 10 ? d.getDate() : '0' + d.getDate();
var h = d.getHours().toString().padStart(2, '0'); var h = d.getHours() >= 10 ? d.getHours() : '0' + d.getHours();
var mm = d.getMinutes().toString().padStart(2, '0'); var mm = d.getMinutes() >= 10 ? d.getMinutes() : '0' + d.getMinutes();
version = yy + MM + DD + h + mm; version = yy + MM + DD + h + mm;
versionPath = path.join(distPath, version); // 使用path.join更安全 versionPath = distPath + '/' + version;
})(); })();
// 编译 // 编译
@@ -27,60 +25,78 @@ 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(path.join(distPath, 'static', '**', '*')) return gulp.src(`${distPath}/static/**/*`)
.pipe(gulp.dest(path.join(versionPath, 'static'))); .pipe(gulp.dest(`${versionPath}/static/`))
})); }))
// 替换cdnUrl占位变量 // 替换${versionPath}/static/js/manifest.js window.SITE_CONFIG.cdnUrl占位变量
gulp.task('replace:cdnUrl', gulp.series('create:versionCatalog', function () { gulp.task('replace:cdnUrl', gulp.series('create:versionCatalog', function () {
const assetsPublicPath = require('./config').build.assetsPublicPath; return gulp.src(`${versionPath}/static/js/manifest.js`)
return gulp.src(path.join(versionPath, 'static', 'js', 'manifest.js')) .pipe($.replace(new RegExp(`"${require('./config').build.assetsPublicPath}"`, 'g'), 'window.SITE_CONFIG.cdnUrl + "/"'))
.pipe($.replace(new RegExp(`"${assetsPublicPath}"`, 'g'), 'window.SITE_CONFIG.cdnUrl + "/"')) .pipe(gulp.dest(`${versionPath}/static/js/`))
.pipe(gulp.dest(path.join(versionPath, 'static', 'js'))); }))
}));
// 替换version配置变量 // 替换${versionPath}/static/config/index-${env}.js window.SITE_CONFIG['version']配置变量
gulp.task('replace:version', gulp.series('create:versionCatalog', function () { gulp.task('replace:version', gulp.series('create:versionCatalog', function () {
return gulp.src(path.join(versionPath, 'static', 'config', `index-${env}.js`)) return gulp.src(`${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(path.join(versionPath, 'static', 'config'))); .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 () { gulp.task('concat:config', gulp.series('replace:version', function () {
return gulp.src([ return gulp.src([`${versionPath}/static/config/index-${env}.js`, `${versionPath}/static/config/init.js`])
path.join(versionPath, 'static', 'config', `index-${env}.js`), .pipe($.concat('index.js'))
path.join(versionPath, 'static', 'config', 'init.js') .pipe(gulp.dest(`${distPath}/config/`))
]) }))
.pipe($.concat('index.js'))
.pipe(gulp.dest(path.join(distPath, 'config')));
}));
// 清空文件历史 // 清空文件历史
gulp.task('clean', function () { gulp.task('clean', function () {
console.log('--clean--'); console.log('--clean--')
return del([distPath]); // del([`${distPath}/static`, `${versionPath}/static/config`]);
}); // return del([versionPath])
return del([`${distPath}`])
})
// 构建结束清理
gulp.task('build-end', function () { gulp.task('build-end', function () {
console.log('--builed-end--'); console.log('--builed-end--')
return del([ // del([`${distPath}/static`, `${versionPath}/static/config`]);
path.join(distPath, 'static'), return del([`${distPath}/static`, `${versionPath}/static/config`]);
path.join(versionPath, 'static', 'config') })
]);
});
// 主任务 - 按正确顺序执行 env = process.env.npm_config_qa ? 'qa' : process.env.npm_config_uat ? 'uat' : 'prod';
gulp.task('default', gulp.series(
'clean', gulp.task('default',
'build', gulp.series('clean',
'create:versionCatalog', gulp.parallel('create:versionCatalog', 'replace:cdnUrl', 'replace:version', 'concat:config'),
gulp.parallel('replace:cdnUrl', 'replace:version'), 'build', 'build-end')
'concat:config', )
'build-end',
function (done) {
console.log(`构建完成,环境: ${env},版本号: ${version}`);
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();
}))
})); */
/*
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: "/czg/userInfo/list", url: "/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: "/czg/userInfo", url: "/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: "/czg/userInfo", url: "/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-chengdu.aliyuncs.com/", "https://sy-duanju.oss-cn-nanjing.aliyuncs.com/",
"https://short-video.hnsiyao.cn/" "https://short-video.hnsiyao.cn/"
); );
}, },

View File

@@ -5,8 +5,10 @@ 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 = "https://ph.hnsiyao.cn/czg/" // 线上 // const baseUrl = "http://192.168.1.31:8080/admin/" // php本地
// 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,9 +49,6 @@ 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

@@ -43,7 +43,7 @@
<!-- <el-form-item <!-- <el-form-item
label="统一地址:" label="统一地址:"
:label-width="formLabelWidth" :label-width="formLabelWidth"
> >
<el-input v-model="formupgrad.wgtUrl" style="width: 65%"></el-input> <el-input v-model="formupgrad.wgtUrl" style="width: 65%"></el-input>
</el-form-item> --> </el-form-item> -->
@@ -345,7 +345,7 @@ export default {
return; return;
} }
return fileRes.replace( return fileRes.replace(
"https://sy-duanju.oss-cn-chengdu.aliyuncs.com/", "https://sy-duanju.oss-cn-nanjing.aliyuncs.com/",
"https://short-video.hnsiyao.cn/" "https://short-video.hnsiyao.cn/"
); );
}, },

View File

@@ -37,7 +37,7 @@
</el-button> </el-button>
<el-button :disabled="!isAuth('coupon:update')" size="mini" <el-button :disabled="!isAuth('coupon:update')" size="mini"
type="primary" icon="document" @click="shengCoupon(scope.row)" style="margin: 3px;">生成卡密</el-button> type="primary" icon="document" @click="shengCoupon(scope.row)" style="margin: 3px;">生成卡密</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@@ -104,7 +104,7 @@
</el-button> </el-button>
</div> </div>
</div> </div>
<el-table v-loading="tableDataLoadingKm" :data="tableDataKm.records" @selection-change="changeFunP" > <el-table v-loading="tableDataLoadingKm" :data="tableDataKm.records" @selection-change="changeFunP" >
<el-table-column type="selection"> <el-table-column type="selection">
</el-table-column> </el-table-column>
@@ -115,7 +115,7 @@
<el-table-column prop="sdkContent" label="卡密"> <el-table-column prop="sdkContent" label="卡密">
</el-table-column> </el-table-column>
<el-table-column prop="sysUserName" label="渠道商名称"> <el-table-column prop="sysUserName" label="渠道商名称">
</el-table-column> </el-table-column>
<el-table-column prop="giveNum" label="赠送会员天数"> <el-table-column prop="giveNum" label="赠送会员天数">
</el-table-column> </el-table-column>
@@ -169,7 +169,7 @@
<el-button type="primary" @click="amendNoticeTo()"> </el-button> <el-button type="primary" @click="amendNoticeTo()"> </el-button>
</div> </div>
</el-dialog> </el-dialog>
<!-- 生成卡密 --> <!-- 生成卡密 -->
<el-dialog title="生成卡密" :visible.sync="dialogFormVisible3" center width="70%"> <el-dialog title="生成卡密" :visible.sync="dialogFormVisible3" center width="70%">
<div style="margin-bottom: 10px;"> <div style="margin-bottom: 10px;">
@@ -235,7 +235,7 @@
<el-table-column prop="sdkContent" label="卡密"> <el-table-column prop="sdkContent" label="卡密">
</el-table-column> </el-table-column>
<el-table-column prop="sysUserName" label="渠道商名称"> <el-table-column prop="sysUserName" label="渠道商名称">
</el-table-column> </el-table-column>
<el-table-column prop="giveNum" label="赠送会员天数" width="80"> <el-table-column prop="giveNum" label="赠送会员天数" width="80">
</el-table-column> </el-table-column>
@@ -284,7 +284,7 @@
</el-table-column> </el-table-column>
<el-table-column prop="qdRate" header-align="center" align="center" label="渠道佣金"> <el-table-column prop="qdRate" header-align="center" align="center" label="渠道佣金">
<!-- <template slot-scope="scope"> <!-- <template slot-scope="scope">
<span v-for="(item,index) in scope.row.roleEntityList" :key="index">{{item.roleName}} </span> <span v-for="(item,index) in scope.row.roleEntityList" :key="index">{{item.roleName}} </span>
</template> --> </template> -->
</el-table-column> </el-table-column>
<el-table-column prop="qdCode" header-align="center" align="center" label="渠道码"> <el-table-column prop="qdCode" header-align="center" align="center" label="渠道码">
@@ -443,7 +443,7 @@
this.page = val; this.page = val;
this.dataSelectKm() this.dataSelectKm()
}, },
handleSizeChangeY(val) { handleSizeChangeY(val) {
this.size1 = val; this.size1 = val;
this.dataSelectYhq() this.dataSelectYhq()
@@ -525,9 +525,9 @@
}); });
return return
} }
if (this.titles == '添加') { if (this.titles == '添加') {
var url = 'couponCard/insertCouponCardType' var url = 'couponCard/insertCouponCardType'
} else { } else {
@@ -566,7 +566,7 @@
} }
}) })
} }
}) })
}, },
//删除 //删除
@@ -628,7 +628,7 @@
dataSelect() { dataSelect() {
this.tableDataLoading = true this.tableDataLoading = true
this.$http({ this.$http({
url: this.$http.adornUrl('admin/sdkType/getSdkTypeList'), url: this.$http.adornUrl('sdkType/getSdkTypeList'),
method: 'get', method: 'get',
params: this.$http.adornParams({ params: this.$http.adornParams({
'page': this.page, 'page': this.page,
@@ -746,7 +746,7 @@
'typeId': this.couponCardTypeId, 'typeId': this.couponCardTypeId,
'num':this.num, 'num':this.num,
'sysUserId':this.sysUserId, 'sysUserId':this.sysUserId,
}) })
}).then(({ }).then(({
data data
@@ -771,7 +771,7 @@
} }
}) })
} }
}) })
}, },
// 卡密列表 // 卡密列表
@@ -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,
@@ -804,7 +804,7 @@
this.tableDataLoadingKm = false this.tableDataLoadingKm = false
let returnData = data.data; let returnData = data.data;
this.tableDataKm = returnData this.tableDataKm = returnData
}) })
}, },
// 详情跳转 // 详情跳转
@@ -827,7 +827,7 @@
this.dataSelectKm() this.dataSelectKm()
this.dialogFormVisibleKm = true this.dialogFormVisibleKm = true
}, },
// 导出 // 导出
excelStair(){ excelStair(){
// var endTime = this.endTime // var endTime = this.endTime
@@ -847,7 +847,7 @@
'endTime': this.endTime, 'endTime': this.endTime,
'startTime': this.startTime, 'startTime': this.startTime,
'sysUserName':this.sysUserNameT 'sysUserName':this.sysUserNameT
}) })
}).then(({ }).then(({
data data
@@ -906,7 +906,7 @@
} }
}) })
} }
}) })
}).catch(() => {}) }).catch(() => {})
}, },
@@ -949,7 +949,7 @@
qudaoBtn(){ qudaoBtn(){
this.getDataList() this.getDataList()
this.dialogFormVisibleQd = true this.dialogFormVisibleQd = true
}, },
getDataList() { getDataList() {
this.dataListLoading = true this.dataListLoading = true
@@ -979,7 +979,7 @@
this.sysUserName = row.username this.sysUserName = row.username
this.dialogFormVisibleQd = false this.dialogFormVisibleQd = false
}, },
}, },
mounted() { mounted() {
this.dataSelect() this.dataSelect()

View File

@@ -18,7 +18,7 @@
</el-input> </el-input>
</el-col> </el-col>
<el-col :span="10" class="login-captcha"> <el-col :span="10" class="login-captcha">
<img :src="captchaPath" @click="getCaptcha()" alt=""> <img :src="captchaPath" @click="getCaptcha()" alt="">
</el-col> </el-col>
</el-row> </el-row>
</el-form-item> </el-form-item>
@@ -35,6 +35,7 @@
<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 {
@@ -84,16 +85,24 @@
this.$router.replace({ name: 'home' }) this.$router.replace({ name: 'home' })
} else { } else {
this.getCaptcha() this.getCaptcha()
this.$message.error(data.msg) this.$message.error(data.message)
} }
}) })
} }
}) })
}, },
// 获取验证码 // 获取验证码
getCaptcha () { async getCaptcha () {
this.dataForm.uuid = getUUID() this.dataForm.uuid = getUUID()
this.captchaPath = this.$http.adornUrl(`/captcha.jpg?uuid=${this.dataForm.uuid}`) const res =await this.$http({
url:'indetcode/getCode',
method:'get',
params:{
uuid:this.dataForm.uuid
}
})
console.log(res);
this.captchaPath=res.data.data.img
} }
} }
} }

View File

@@ -1850,7 +1850,10 @@
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: this.$http.adornParams({}) params: {
...this.$http.adornParams({}),
userId: userId
}
}).then(({ }).then(({
data data
}) => { }) => {
@@ -1978,11 +1981,8 @@
}).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,7 +3081,10 @@
this.$http({ this.$http({
url: this.$http.adornUrl('common/type/152'), url: this.$http.adornUrl('common/type/152'),
method: 'get', method: 'get',
params: this.$http.adornParams({}) params: {
...this.$http.adornParams({}),
type:152
}
}).then(({ }).then(({
data data
}) => { }) => {
@@ -3093,7 +3096,10 @@
this.$http({ this.$http({
url: this.$http.adornUrl('common/type/153'), url: this.$http.adornUrl('common/type/153'),
method: 'get', method: 'get',
params: this.$http.adornParams({}) params: {
...this.$http.adornParams({}),
type:153
}
}).then(({ }).then(({
data data
}) => { }) => {

View File

@@ -493,7 +493,7 @@
'createTime': this.info.stockDate, 'createTime': this.info.stockDate,
'sort': this.sort, 'sort': this.sort,
'helpWordTitle': this.helpWordTitle, 'helpWordTitle': this.helpWordTitle,
}) })
}).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-chengdu.aliyuncs.com/", "https://sy-duanju.oss-cn-nanjing.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,6 +2550,7 @@ 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) {
@@ -2591,6 +2592,7 @@ 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) {
@@ -2651,6 +2653,9 @@ 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) {
@@ -2663,6 +2668,9 @@ 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) {
@@ -2673,6 +2681,9 @@ 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) {
@@ -2683,7 +2694,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({}), params: this.$http.adornParams({type:849}),
}).then(({ data }) => { }).then(({ data }) => {
if (data.code == 0) { if (data.code == 0) {
if (data.data.value == "是") { if (data.data.value == "是") {

View File

@@ -1576,6 +1576,9 @@
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

@@ -34,7 +34,7 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="wxCourseId" label="微信短剧ID"></el-table-column> <el-table-column prop="wxCourseId" label="微信短剧ID"></el-table-column>
<el-table-column prop="qualificationType" label="剧目资质" width="160"> <el-table-column prop="qualificationType" label="剧目资质" width="160">
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="scope.row.qualificationType == 1 ">取得网络剧片发行许可证或重点节目备案号</span> <span v-if="scope.row.qualificationType == 1 ">取得网络剧片发行许可证或重点节目备案号</span>
@@ -181,7 +181,7 @@
:show-file-list="false" :on-success="handleUploadSuccess4" :on-progress="onprogress4" > :show-file-list="false" :on-success="handleUploadSuccess4" :on-progress="onprogress4" >
<el-button type="primary">上传文件</el-button> <el-button type="primary">上传文件</el-button>
</el-upload> </el-upload>
<!-- <div class="imgs" v-for="(item,index) in cost_commitment_letter_material_id" :key="index"> <!-- <div class="imgs" v-for="(item,index) in cost_commitment_letter_material_id" :key="index">
<img width="100%" class="images" height="100%" :src="item" alt=""> <img width="100%" class="images" height="100%" :src="item" alt="">
<span class="dels"> <span class="dels">
@@ -197,7 +197,7 @@
</el-upload> </el-upload>
</div> --> </div> -->
</div> </div>
</div> </div>
<div style="display: block;margin-left: 200px;margin-bottom: 20px;" v-if="qualification_type==2"> <div style="display: block;margin-left: 200px;margin-bottom: 20px;" v-if="qualification_type==2">
<div> <div>
@@ -355,7 +355,7 @@
<el-dialog title="同步短剧" :visible.sync="dialogFormVisibleTbdj" center v-loading="loading" <el-dialog title="同步短剧" :visible.sync="dialogFormVisibleTbdj" center v-loading="loading"
element-loading-text="正在读取中" element-loading-spinner="el-icon-loading" element-loading-text="正在读取中" element-loading-spinner="el-icon-loading"
element-loading-background="rgba(0, 0, 0, 0.8)"> element-loading-background="rgba(0, 0, 0, 0.8)">
<!-- <div style="margin-bottom: 10px;"> <!-- <div style="margin-bottom: 10px;">
<span style="width: 200px;display: inline-block;text-align: right;">读取oss路径</span> <span style="width: 200px;display: inline-block;text-align: right;">读取oss路径</span>
<el-input v-model="filePath" type="text" style="width:50%;" placeholder="请输入读取oss路径"></el-input> <el-input v-model="filePath" type="text" style="width:50%;" placeholder="请输入读取oss路径"></el-input>
@@ -376,12 +376,12 @@
<span style="width: 200px;display: inline-block;text-align: right;">最小点赞数量</span> <span style="width: 200px;display: inline-block;text-align: right;">最小点赞数量</span>
<el-input v-model="minGood" type="number" style="width:50%;" placeholder="请输入最小点赞数量"></el-input> <el-input v-model="minGood" type="number" style="width:50%;" placeholder="请输入最小点赞数量"></el-input>
</div> </div>
<div slot="footer" class="dialog-footer" style="text-align: center;"> <div slot="footer" class="dialog-footer" style="text-align: center;">
<el-button @click="dialogFormVisibleTbdj = false"> </el-button> <el-button @click="dialogFormVisibleTbdj = false"> </el-button>
<el-button type="primary" @click="querentongbu()"> </el-button> <el-button type="primary" @click="querentongbu()"> </el-button>
</div> </div>
</el-dialog> </el-dialog>
</el-tab-pane> </el-tab-pane>
</el-tabs> </el-tabs>
@@ -576,8 +576,8 @@
percentage2: 0, percentage2: 0,
media:'', media:'',
access_token:'', access_token:'',
dialogFormVisibleTbdj: false, dialogFormVisibleTbdj: false,
filePath: '', filePath: '',
freeNum: '', freeNum: '',
@@ -717,8 +717,8 @@
}else{ }else{
this.cost_commitment_letter_material_id = '' this.cost_commitment_letter_material_id = ''
} }
this.tokenSelect() this.tokenSelect()
this.dialogFormVisible1 = true this.dialogFormVisible1 = true
}, },
@@ -774,7 +774,7 @@
}) })
return return
} }
if (this.qualification_certificate_material_id == '') { if (this.qualification_certificate_material_id == '') {
this.$notify({ this.$notify({
title: '提示', title: '提示',
@@ -806,7 +806,7 @@
} }
} }
this.$http({ this.$http({
url: this.$http.adornUrl('course/uploadWxCourse'), url: this.$http.adornUrl('course/uploadWxCourse'),
@@ -1453,6 +1453,9 @@
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
@@ -1997,10 +2000,10 @@
this.maxGood = '' this.maxGood = ''
this.minGood = '' this.minGood = ''
this.dialogFormVisibleTbdj = true this.dialogFormVisibleTbdj = true
}, },
// querentongbu() { // querentongbu() {
// // if (this.filePath === '') { // // if (this.filePath === '') {
// // this.$notify({ // // this.$notify({
// // title: '提示', // // title: '提示',
@@ -2070,7 +2073,7 @@
// }).then(({ // }).then(({
// data // data
// }) => { // }) => {
// if (data.code == 0) { // if (data.code == 0) {
// this.$message({ // this.$message({
// message: '操作成功', // message: '操作成功',
@@ -2089,18 +2092,18 @@
// type: 'warning', // type: 'warning',
// duration: 3000, // duration: 3000,
// onClose: () => { // onClose: () => {
// } // }
// }) // })
// } // }
// }) // })
// }, // },
// 同步短剧 // 同步短剧
querentongbu() { querentongbu() {
// this.$confirm(`确定同步短剧?`, '提示', { // this.$confirm(`确定同步短剧?`, '提示', {
@@ -2244,10 +2247,10 @@
handleUploadSuccess4(file) { handleUploadSuccess4(file) {
this.cost_commitment_letter_material_id = file.media_id this.cost_commitment_letter_material_id = file.media_id
console.log('------',file) console.log('------',file)
// this.media = fileList // this.media = fileList
// this.cost_commitment_letter_material_id = file.data // this.cost_commitment_letter_material_id = file.data
}, },
onprogress4(event, file, fileList) { onprogress4(event, file, fileList) {
// console.log('event, file, fileList', parseInt(event.percent),event, file, fileList) // console.log('event, file, fileList', parseInt(event.percent),event, file, fileList)
@@ -2271,7 +2274,7 @@
if (data.code == 0) { if (data.code == 0) {
// media:'', // media:'',
this.access_token = data.data this.access_token = data.data
// this.cost_commitment_letter_material_id = // this.cost_commitment_letter_material_id =
} else { } else {
this.$message({ this.$message({
message: data.msg, message: data.msg,
@@ -2281,7 +2284,7 @@
} }
}) })
} }
}) })
}, },
mediaSelect(){ mediaSelect(){
@@ -2301,7 +2304,7 @@
if (data.code == 0) { if (data.code == 0) {
// media:'', // media:'',
// access_token:'', // access_token:'',
// this.cost_commitment_letter_material_id = // this.cost_commitment_letter_material_id =
} else { } else {
this.$message({ this.$message({
message: data.msg, message: data.msg,
@@ -2311,7 +2314,7 @@
} }
}) })
} }
}) })
}, },
}, },
@@ -2320,7 +2323,7 @@
this.classifySelect1() this.classifySelect1()
this.dataSelect() this.dataSelect()
this.xianshi() this.xianshi()
} }
} }

View File

@@ -1158,7 +1158,8 @@
'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,7 +148,9 @@
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,7 +130,9 @@
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,12 +72,15 @@
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,7 +126,10 @@
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: this.$http.adornParams() params: {
...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
@@ -141,7 +144,7 @@
}) })
}, },
// 表单提交 // 表单提交
dataFormSubmit () { dataFormSubmit () {
this.$refs['dataForm'].validate((valid) => { this.$refs['dataForm'].validate((valid) => {
if (valid) { if (valid) {
if(this.dataForm.roleIdList.length<1){ if(this.dataForm.roleIdList.length<1){

View File

@@ -190,7 +190,10 @@
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: this.$http.adornParams() params: {
...this.$http.adornParams(),
'userId': this.dataForm.id
}
}).then(({ }).then(({
data data
}) => { }) => {

View File

@@ -193,7 +193,10 @@
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: this.$http.adornParams() params: {
...this.$http.adornParams(),
'userId': this.dataForm.id
}
}).then(({ }).then(({
data data
}) => { }) => {
@@ -233,7 +236,7 @@
this.dataForm.qdRate = qdRate this.dataForm.qdRate = qdRate
this.dataForm.sysUserId = sysUserId this.dataForm.sysUserId = sysUserId
this.dataForm.qdCode = qdCode this.dataForm.qdCode = qdCode
this.dataForm.money = 0 this.dataForm.money = 0
} }

View File

@@ -208,9 +208,12 @@ 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.page.list; this.tableData.list = data.data.list;
this.tableData.total = data.page.totalCount; this.tableData.total = data.data.totalCount;
} catch (error) { } catch (error) {
this.tableData.loading = false; this.tableData.loading = false;
console.log(error); console.log(error);

View File

@@ -1380,7 +1380,10 @@ export default {
this.$http({ this.$http({
url: this.$http.adornUrl(`user/${userId}`), url: this.$http.adornUrl(`user/${userId}`),
method: "get", method: "get",
params: this.$http.adornParams({}), params: {
...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);
@@ -1868,7 +1871,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("admin/sdkInfo/getSdkList"), url: this.$http.adornUrl("sdkInfo/getSdkList"),
method: "get", method: "get",
params: this.$http.adornParams({ params: this.$http.adornParams({
page: this.page, page: this.page,

View File

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

View File

@@ -998,7 +998,10 @@ 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.total }} <span>失败合计</span> {{ orderInfo.withdrawTotal.fail.count }}
</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.total }} <span>失败合计</span> {{ orderInfo.payTotal.fail.count }}
</div> </div>
<div class="row"> <div class="row">
<span>失败笔数</span> {{ orderInfo.payTotal.fail.count }} <span>失败笔数</span> {{ orderInfo.payTotal.fail.count }}
@@ -148,12 +148,11 @@ 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.msg) this.$message.error(res.data.message)
} }
} 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://web.hnsiyao.cn/czg'; window.SITE_CONFIG['baseUrl'] = 'https://ditanxiong.gomyorder.cn/czg';
// cdn地址 = 域名 + 版本号 // cdn地址 = 域名 + 版本号
window.SITE_CONFIG['domain'] = './'; // 域名 window.SITE_CONFIG['domain'] = './'; // 域名