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 d615d11..3d21088 100644 --- a/order/addCourse/addCourse.vue +++ b/order/addCourse/addCourse.vue @@ -18,7 +18,7 @@
  • - + {{ item.productName }}
    • @@ -358,7 +358,10 @@ } .icon { width: 80rpx; + min-width: 80rpx; + height: 80rpx; margin: 0 20rpx; + border-radius: 4px; } } /deep/.check { diff --git a/order/orderDetail/orderDetail.vue b/order/orderDetail/orderDetail.vue index e2100e4..390083b 100644 --- a/order/orderDetail/orderDetail.vue +++ b/order/orderDetail/orderDetail.vue @@ -12,7 +12,7 @@ {{ form.customerName }} {{ form.customerName || '请选择客户' }} - 找不到客户？马上创建 + @@ -68,7 +68,7 @@ - + @@ -134,6 +134,7 @@ 请选择客户 + 找不到客户？马上创建 {{ item.customerName }} @@ -225,6 +226,7 @@ if (this.orderId) { this.getInfo() } else if (store) { + console.log(11, store) // 新增取缓存，取了删除 const list = [] for (const i in store) { @@ -232,11 +234,11 @@ } this.courseList = store this.courses = list - this.$nextTick(() => { - uni.pageScrollTo({ - selector: '#products', - }) - }) + // this.$nextTick(() => { + // uni.pageScrollTo({ + // selector: '#products', + // }) + // }) try { uni.removeStorageSync('courses') @@ -301,7 +303,6 @@ e.serviceFee = (e.finalPrice * (this.rate / 100)).toFixed(2) // 服务费 != 0 && 才需要算 courses['list' + e.authority].list.push(e) }) - console.log(123,courses) this.courseList = courses }).catch(e => {}) }, @@ -525,7 +526,6 @@ }, // 显示发货信息 showShip(row) { - console.log(33) let val = '' row.mallNonAssociatedLinks && row.mallNonAssociatedLinks.forEach(e => { val += e.urlName + '：' + e.url + '\n' @@ -632,11 +632,12 @@ .customer-wrap { text-align: right; } - .create { - margin-top: 10rpx; - font-size: 20rpx; - color: #f00; - } +} +.create { + padding: 0 20rpx; + font-size: 20rpx; + text-align: right; + color: #f00; } .pro-wrap { position: relative; @@ -668,10 +669,13 @@ padding: 0 16rpx; margin-left: 10rpx; font-size: 28rpx; + white-space: nowrap; } .left { display: inline-flex; align-items: center; + max-width: 480rpx; + margin-right: 10rpx; } .del { width: 40rpx; diff --git a/order/productDetail/productDetail.vue b/order/productDetail/productDetail.vue index 25bee27..92d82f1 100644 --- a/order/productDetail/productDetail.vue +++ b/order/productDetail/productDetail.vue @@ -49,7 +49,8 @@ 详情介绍： - + + {{ form.mall.detailedIntroduction }} @@ -94,7 +95,7 @@ - + 购物车 @@ -163,6 +164,7 @@ detailsOfGoods(this.id).then(res => { const e = res.orderDetails e.mall.productIntroduction = this.$util.removeTag(e.mall.productIntroduction) + e.mall.detailedIntroduction = this.$util.removeTag(e.mall.detailedIntroduction) this.form = e const pics = this.form.mall.interfaceDiagram if (pics) { diff --git a/order/products/products.vue b/order/products/products.vue index 360c0ac..52bc295 100644 --- a/order/products/products.vue +++ b/order/products/products.vue @@ -32,7 +32,7 @@