From 79b808404a9264b2c8f3ed97669bb7babe05831b Mon Sep 17 00:00:00 2001
From: yujialong <479214531@qq.com>
Date: Fri, 4 Aug 2023 14:19:05 +0800
Subject: [PATCH] fix
---
config/request.js | 4 +-
order/addCourse/addCourse.vue | 2 -
order/clientDetail/clientDetail.vue | 37 +++++----
order/editCourse/editCourse.vue | 22 +++++-
order/orderDetail/orderDetail.vue | 71 +++++++++--------
order/productDetail/productDetail.vue | 2 +-
order/products/products.vue | 4 +-
pages.json | 12 ++-
pages/index/index.vue | 107 +++++++++++++++++++++++---
pages/login/login.vue | 5 +-
pages/person/person.vue | 7 +-
pages/reg/reg.vue | 3 +-
pages/workbench/workbench.vue | 29 +++++--
static/image/index/banner.png | Bin 66550 -> 25860 bytes
static/image/index/banner1.png | Bin 0 -> 21349 bytes
static/image/logo.png | Bin 4483 -> 9939 bytes
static/image/logo1.png | Bin 0 -> 3028 bytes
static/image/product/shop-blue.png | Bin 473 -> 1007 bytes
static/image/product/shop-blue1.png | Bin 1070 -> 0 bytes
static/image/product/shop.png | Bin 578 -> 510 bytes
styles/common.scss | 6 +-
team/article/article.vue | 3 +
team/info/info.vue | 8 +-
team/plans/plans.vue | 16 ++--
team/scheme/scheme.vue | 4 +-
team/study/study.vue | 6 +-
26 files changed, 244 insertions(+), 104 deletions(-)
create mode 100644 static/image/index/banner1.png
create mode 100644 static/image/logo1.png
delete mode 100644 static/image/product/shop-blue1.png
diff --git a/config/request.js b/config/request.js
index 6f3a944..d6c6600 100644
--- a/config/request.js
+++ b/config/request.js
@@ -5,9 +5,9 @@
*/
export default {
- baseURL: 'https://huorantech.cn/',
+ // baseURL: 'https://huorantech.cn/',
// baseURL: 'http://192.168.31.152:9000/',
- // baseURL: 'http://121.37.12.51/',
+ baseURL: 'http://121.37.12.51/',
headers: {
'Content-Type': 'application/json;charset=UTF-8'
},
diff --git a/order/addCourse/addCourse.vue b/order/addCourse/addCourse.vue
index 518b9c5..3f85280 100644
--- a/order/addCourse/addCourse.vue
+++ b/order/addCourse/addCourse.vue
@@ -260,7 +260,6 @@
const list = this.checked // 已选产品
if (list.length) {
const result = this.courses
- console.log(123, result)
const list1 = [] // 实训、理论
const list0 = [] // 数据前瞻
const list2 = [] // 职站增值
@@ -278,7 +277,6 @@
const res = await queryCitySettlementPrice(e.mallId, this.provinceId, this.cityId)
if (res.mallPrice) e.settlementPrice = res.mallPrice.discountRate
}
- console.log(44, e)
const classId = e.classificationId
const pid = +e.associatedProduct
const { mallId } = e
diff --git a/order/clientDetail/clientDetail.vue b/order/clientDetail/clientDetail.vue
index 9dedc19..8098b8e 100644
--- a/order/clientDetail/clientDetail.vue
+++ b/order/clientDetail/clientDetail.vue
@@ -108,6 +108,7 @@
isDetail: false,
customerId: '',
shopCart: false,
+ fromOrder: false,
// 客户类型
customerTypeList: [{
name: '正式',
@@ -166,6 +167,7 @@
this.customerId = options.customerId
this.isDetail = !!options.show
this.shopCart = options.shopCart // 从购物车进去订单的标识
+ this.fromOrder = options.order // 从创建订单页面跳转进来
options.customerId && this.getInfo()
// 非详情才需要查询学校和行业
@@ -317,21 +319,28 @@
} else {
addCustomer(form).then(({ customerId }) => {
uni.hideLoading()
- const that = this
- uni.showModal({
- title: '提示',
- content: '创建客户成功，是否马上为该客户创建订单？',
- success: function (res) {
- if (res.confirm) {
- // 选择是则直接跳转到新建订单页面，并且选中当前新加的客户
- uni.redirectTo({
- url: `/order/orderDetail/orderDetail?customerId=${customerId}${that.shopCart ? '&shopCart=1' : ''}`
- })
- } else if (res.cancel) {
- uni.navigateBack()
+ // 从创建订单页面跳转进来的则直接返回，不用提示
+ if (this.fromOrder) {
+ uni.redirectTo({
+ url: `/order/orderDetail/orderDetail?customerId=${customerId}${this.shopCart ? '&shopCart=1' : ''}`
+ })
+ } else {
+ const that = this
+ uni.showModal({
+ title: '提示',
+ content: '创建客户成功，是否马上为该客户创建订单？',
+ success: function (res) {
+ if (res.confirm) {
+ // 选择是则直接跳转到新建订单页面，并且选中当前新加的客户
+ uni.redirectTo({
+ url: `/order/orderDetail/orderDetail?customerId=${customerId}${that.shopCart ? '&shopCart=1' : ''}`
+ })
+ } else if (res.cancel) {
+ uni.navigateBack()
+ }
}
- }
- })
+ })
+ }
}).catch(res => {})
}
},
diff --git a/order/editCourse/editCourse.vue b/order/editCourse/editCourse.vue
index 720d3f8..ffcac03 100644
--- a/order/editCourse/editCourse.vue
+++ b/order/editCourse/editCourse.vue
@@ -76,7 +76,7 @@