huoran
/
FE_middlePlatform_server
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 14 Wiki Activity

订单、用户等修改

Browse Source
dev_2022-04-07
yujialong 3 years ago
parent a635295041
commit 51defe0d06
7 changed files with 18 additions and 16 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      src/setting.js
  2. 2
      src/utils/http.js
  3. 8
      src/views/course/AddCurriculum.vue
  4. 4
      src/views/customer/AddCustomer.vue
  5. 8
      src/views/order/AddOrder.vue
  6. 4
      src/views/system/staff.vue
  7. 2
      src/views/user/AddUser.vue

6
src/setting.js
Unescape View File

@ -9,8 +9,8 @@ let jumpPath = `${location.origin}/judgmentPoint`
let host = `${location.origin}:9000/` let host = `${location.origin}:9000/`
if (isDev) { if (isDev) {
jumpPath = "http://192.168.31.125:8087/"; // 本地调试-需要启动本地判分点系统 jumpPath = "http://192.168.31.125:8087/"; // 本地调试-需要启动本地判分点系统
// host = 'http://39.108.250.202:9000/' host = 'http://39.108.250.202:9000/'
host = 'http://192.168.31.151:9000/'// 榕 // host = 'http://192.168.31.151:9000/'// 榕
// host = 'http://192.168.31.137:9000/'// 赓 // host = 'http://192.168.31.137:9000/'// 赓
} else if (isPro) { } else if (isPro) {
jumpPath = "http://www.huorantech.cn/judgmentPoint/"; jumpPath = "http://www.huorantech.cn/judgmentPoint/";
@ -23,7 +23,7 @@ const Setting = {
* */ * */
platformId: 3, // 平台标识，1职站，2数据平台，3中台 platformId: 3, // 平台标识，1职站，2数据平台，3中台
jumpPath, // 判分点系统跳转路径前缀 jumpPath, // 判分点系统跳转路径前缀
host, // 请求路径前缀 apiBaseURL: host, // 请求路径前缀
uploadURL: 'http://39.108.250.202:9000/', // 阿里云oss域名 uploadURL: 'http://39.108.250.202:9000/', // 阿里云oss域名
// 平台列表 // 平台列表
platformList: [ platformList: [

2
src/utils/http.js
Unescape View File

@ -4,7 +4,7 @@ import { Message } from 'element-ui'
import router from '../router/index' import router from '../router/index'
import Setting from '@/setting' import Setting from '@/setting'
axios.defaults.baseURL = Setting.host axios.defaults.baseURL = Setting.apiBaseURL
// 请求超时时间 // 请求超时时间
axios.defaults.timeout = 30000; axios.defaults.timeout = 30000;

8
src/views/course/AddCurriculum.vue
Unescape View File

@ -556,11 +556,11 @@ export default {
return e; return e;
}); });
if (this.permissions) { if (this.permissions) {
this.assessmentData = data; this.assessmentData.push(...data)
this.assessmentTotal = data.length; this.assessmentTotal = this.assessmentData.length;
} else { } else {
this.practiceData = data; this.practiceData.push(...data)
this.practiceTotal = data.length; this.practiceTotal = this.practiceData.length;
} }
}).catch(err => { }).catch(err => {
}); });

4
src/views/customer/AddCustomer.vue
Unescape View File

@ -73,10 +73,10 @@
<el-input placeholder="请输入联系人姓名" v-model="form.name"></el-input> <el-input placeholder="请输入联系人姓名" v-model="form.name"></el-input>
</el-form-item> </el-form-item>
<el-form-item prop="phone" label="手机号"> <el-form-item prop="phone" label="手机号">
<el-input placeholder="请输入联系人手机号" v-model="form.phone" maxlength="11" @blur="phoneChange"></el-input> <el-input placeholder="请输入联系人手机号" v-model="form.phone" maxlength="11"></el-input>
</el-form-item> </el-form-item>
<el-form-item prop="email" label="邮箱"> <el-form-item prop="email" label="邮箱">
<el-input placeholder="请输入邮箱" v-model="form.email" @blur="emailChange"></el-input> <el-input placeholder="请输入邮箱" v-model="form.email"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-form> </el-form>

8
src/views/order/AddOrder.vue
Unescape View File

@ -1073,6 +1073,7 @@ export default {
async addCourse() { async addCourse() {
if (this.courseSelection.length > 0) { if (this.courseSelection.length > 0) {
let that = this; let that = this;
const { orderType } = this.form
let fn = function(e) { let fn = function(e) {
let obj = { let obj = {
dataOrCourseId: e.cid,// id dataOrCourseId: e.cid,// id
@ -1082,7 +1083,7 @@ export default {
endTime: "", // 终止 endTime: "", // 终止
remainingPeriod: "",// 剩余期限 remainingPeriod: "",// 剩余期限
marketValue: e.marketPrice,// 市场价 marketValue: e.marketPrice,// 市场价
finalPrice: "",// 成交价 finalPrice: orderType === 2 ? 0 : '',// 成交价
discountRate: "",// 折扣率 discountRate: "",// 折扣率
accountNum: "",// 账号数 accountNum: "",// 账号数
totalAmount: "",// 总价 totalAmount: "",// 总价
@ -1185,6 +1186,7 @@ export default {
async addPlatform() { async addPlatform() {
if (this.platformSelect.length > 0) { if (this.platformSelect.length > 0) {
let that = this; let that = this;
const { orderType } = this.form
let fn = function(e) { let fn = function(e) {
let obj = { let obj = {
dataOrCourseId: e.id,// id dataOrCourseId: e.id,// id
@ -1194,10 +1196,10 @@ export default {
endTime: "", // 终止 endTime: "", // 终止
remainingPeriod: "",// 剩余期限 remainingPeriod: "",// 剩余期限
marketValue: e.market,// 市场价 marketValue: e.market,// 市场价
finalPrice: "",// 成交价 finalPrice: '',// 成交价
discountRate: "",// 折扣率 discountRate: "",// 折扣率
accountNum: "",// 账号数 accountNum: "",// 账号数
totalAmount: "",// 总价 totalAmount: orderType === 2 ? 0 : '',// 总价
isEnable: 1, // 启用否：1启用，0禁用 isEnable: 1, // 启用否：1启用，0禁用
ship: 0,// 发货否（0未发货，1已发货，默认不发货） ship: 0,// 发货否（0未发货，1已发货，默认不发货）
authority: 0,// 数据平台权限 authority: 0,// 数据平台权限

4
src/views/system/staff.vue
Unescape View File

@ -237,7 +237,7 @@ export default {
if (value) { if (value) {
const pattern = /^1[3456789]\d{9}$/ const pattern = /^1[3456789]\d{9}$/
if(pattern.test(value)){ if(pattern.test(value)){
this.phoneChange() // this.phoneChange()
callback() callback()
}else{ }else{
callback(new Error('请输入正确手机号格式')) callback(new Error('请输入正确手机号格式'))
@ -250,7 +250,7 @@ export default {
if (value) { if (value) {
const pattern = /^([a-zA-Z]|[0-9])(\w|\-)+@[a-zA-Z0-9]+\.([a-zA-Z]{2,4})$/ const pattern = /^([a-zA-Z]|[0-9])(\w|\-)+@[a-zA-Z0-9]+\.([a-zA-Z]{2,4})$/
if(pattern.test(value)){ if(pattern.test(value)){
this.emailChange() // this.emailChange()
callback() callback()
}else{ }else{
callback(new Error('请输入正确邮箱格式')) callback(new Error('请输入正确邮箱格式'))

2
src/views/user/AddUser.vue
Unescape View File

@ -140,7 +140,7 @@
<el-table-column prop="userName" label="姓名" align="center"></el-table-column> <el-table-column prop="userName" label="姓名" align="center"></el-table-column>
<el-table-column prop="workNumber" label="工号/学号" align="center"></el-table-column> <el-table-column prop="workNumber" label="工号/学号" align="center"></el-table-column>
<el-table-column prop="roleName" label="角色" align="center"></el-table-column> <el-table-column prop="roleName" label="角色" align="center"></el-table-column>
<el-table-column prop="logInNumber" label="绑定时间" align="center"></el-table-column> <el-table-column prop="phoneBindingTime" label="绑定时间" align="center"></el-table-column>
<el-table-column prop="logInNumber" label="登录次数" align="center"></el-table-column> <el-table-column prop="logInNumber" label="登录次数" align="center"></el-table-column>
<el-table-column prop="lastLoginTime" label="上一次的登录时间" align="center"></el-table-column> <el-table-column prop="lastLoginTime" label="上一次的登录时间" align="center"></el-table-column>
<el-table-column label="操作" align="center"> <el-table-column label="操作" align="center">

Write Preview
Loading…
Cancel
Save