dev_202303
yujialong 2 years ago
parent cc885752ad
commit aecbbe71bb
  1. 2
      src/router/index.js
  2. 4
      src/setting.js
  3. 16
      src/views/course/contentSettings.vue
  4. 10
      src/views/order/AddOrder.vue
  5. 4
      src/views/serve/projectAdd.vue

@ -245,7 +245,7 @@ router.beforeEach(function(to, from, next) {
// 根据路由元信息设置文档标题
window.document.title = to.meta.title || '中台';
//使用钩子函数对路由进行权限跳转
const login = location.href.includes('192.168.31.126:') ? '/devLogin' : '/login'
const login = location.href.includes('dev.huorantech.cn') ? '/devLogin' : '/login'
if (!sessionStorage.getItem('token') && to.path !== login && to.path !== '/join' && to.path !== '/success') {
next(login);
} else {

@ -11,7 +11,7 @@ if (isDev) {
jumpPath = 'http://192.168.31.125:8087/' // 本地调试-需要启动本地判分点系统
host = 'http://121.37.12.51/'
// host = 'https://huorantech.cn/'
// host = 'http://192.168.31.51:9000/'// 榕
host = 'http://192.168.31.51:9000/'// 榕
// host = 'http://192.168.31.116:9000/'// 赓
} else if (isPro) {
jumpPath = 'https://www.huorantech.cn/judgmentPoint/'
@ -49,7 +49,7 @@ const Setting = {
/**
* @description 默认密码
*/
initialPassword: '111aaa',
initialPassword: '1122aa',
};
export default Setting;

@ -367,14 +367,14 @@ export default {
//
beforeUpload(file) {
let type = this.transferType(file.name.substring(file.name.lastIndexOf(".") + 1));
if (type != "视频" && type != "图片" && type != "pdf" && (file.size / 1024 / 1024) > 10) {
this.$message.error("请上传10M以内的文件");
return false;
}
if (type == "视频" && (file.size / 1024 / 1024) > 30) {
util.errorMsg("请上传30M以内的视频");
return false;
}
// if (type != "" && type != "" && type != "pdf" && (file.size / 1024 / 1024) > 10) {
// this.$message.error("10M");
// return false;
// }
// if (type == "" && (file.size / 1024 / 1024) > 30) {
// this.$message.warning('30M')
// return false;
// }
this.uploading = true;
this.originalFileName = file.name;
if (this.isAddSection) this.sectionName = file.name.substring(0, file.name.lastIndexOf("."));

@ -116,8 +116,8 @@
</div>
<div>
<template v-if="!viewDisabled && !renewDisabled && coursePermissions.length">
<el-button v-if="coursePermissions.find(e => !e.ship)" type="primary" round @click="batchDeliver(1, 0)">一键发货</el-button>
<el-button v-else type="primary" round @click="batchDeliver(0, 0)">取消全部发货</el-button>
<el-button v-if="coursePermissions.find(e => !e.ship)" v-auth="'/order:发货'" type="primary" round @click="batchDeliver(1, 0)">一键发货</el-button>
<el-button v-else v-auth="'/order:发货'" type="primary" round @click="batchDeliver(0, 0)">取消全部发货</el-button>
</template>
<el-button v-if="!viewDisabled&&!editDisabled&&!renewDisabled" type="primary" round @click="addCourseJurisdiction()">添加</el-button>
</div>
@ -237,6 +237,7 @@
-->
<el-switch
v-if="scope.row.status === 1 || dispose || isAdd"
v-auth="'/order:发货'"
style="margin-right:10px;"
v-model="scope.row.ship"
:active-value="1"
@ -271,8 +272,8 @@
</div>
<div>
<template v-if="!viewDisabled && !renewDisabled && dataPlatformPermissions.length">
<el-button v-if="dataPlatformPermissions.find(e => !e.ship)" type="primary" round @click="batchDeliver(1, 1)">一键发货</el-button>
<el-button v-else type="primary" round @click="batchDeliver(0, 1)">取消全部发货</el-button>
<el-button v-if="dataPlatformPermissions.find(e => !e.ship)" v-auth="'/order:发货'" type="primary" round @click="batchDeliver(1, 1)">一键发货</el-button>
<el-button v-else v-auth="'/order:发货'" type="primary" round @click="batchDeliver(0, 1)">取消全部发货</el-button>
</template>
<el-button v-if="!viewDisabled&&!editDisabled&&!renewDisabled" type="primary" round class="mag" @click="addDataJurisdiction()">添加</el-button>
</div>
@ -414,6 +415,7 @@
>删除</el-button>
<el-switch
v-if="scope.row.status === 1 || dispose || isAdd"
v-auth="'/order:发货'"
style="margin-right:10px;"
v-model="scope.row.ship"
:active-value="1"

@ -716,7 +716,7 @@ export default {
console.log(systemId);
} else if (systemId == 3) {
console.log(systemId);
} else if (systemId == 11) {
} else if (systemId == 11 || systemId == 12) {
//
href = `${jumpPath}/#/Transaction?isView=true&systemId=${systemId}&lcId=${row.judgmentId}&token=${this.token}&referrer=${btoa(location.href)}`;
} else {
@ -729,7 +729,7 @@ export default {
console.log(systemId);
} else if (systemId == 3) {
console.log(systemId);
} else if (systemId == 11) {
} else if (systemId == 11 || systemId == 12) {
//
href = `${jumpPath}/#/Transaction?isEdit=true&systemId=${systemId}&lcId=${row.judgmentId}&token=${this.token}&referrer=${btoa(location.href)}`;
} else {

Loading…
Cancel
Save