diff --git a/order/addCourse/addCourse.vue b/order/addCourse/addCourse.vue
index d551fa1..a11e06f 100644
--- a/order/addCourse/addCourse.vue
+++ b/order/addCourse/addCourse.vue
@@ -234,7 +234,8 @@
settlementPrice: trial ? 0 : '', // 结算价
settlementPriceUnit: e.settlementPrice || 0, // 结算单价
serviceFee: 0, // 平台服务费（前端计算后展示，不入库）
- mallNonAssociatedLinks: e.mallNonAssociatedLinks // 产品链接
+ mallNonAssociatedLinks: e.mallNonAssociatedLinks, // 产品链接
+ typeName: e.typeName
}
},
// 判断是否为客户已有的课程
diff --git a/order/curClient/curClient.vue b/order/curClient/curClient.vue
index 79a81ab..e551c43 100644
--- a/order/curClient/curClient.vue
+++ b/order/curClient/curClient.vue
@@ -134,6 +134,11 @@
this.customerId = options.customerId
this.customerName = options.name
this.initList()
+ // 清除订单缓存
+ try {
+ uni.removeStorageSync('courses')
+ uni.removeStorageSync('orderEdited')
+ } catch (e) {}
},
methods: {
getList() {
diff --git a/order/editCourse/editCourse.vue b/order/editCourse/editCourse.vue
index 0729853..a288054 100644
--- a/order/editCourse/editCourse.vue
+++ b/order/editCourse/editCourse.vue
@@ -1,79 +1,81 @@
-
+
{{ c.name }}
-
-
-
-
- {{ item.productName }}
-
-
-
-
-
- 产品类型
- {{ item.typeName }}
+
+
+
+
+
+ {{ item.productName }}
+
+
-
- 使用期限
-
-
+
+
+ 产品类型
+ {{ item.typeName }}
- {{ units.find(e => e.id === item.options).text }}
-
- {{ units.find(e => e.id === item.options).text }}
-
+
+ 使用期限
+
+
+
+ {{ units.find(e => e.id === item.options).text }}
+
+ {{ units.find(e => e.id === item.options).text }}
+
+
-
-
- 起止日期
- {{ item.endTime ? item.startTime + ' - ' + item.endTime : item.startTime}}
-
-
-
- {{ item.endTime ? item.startTime + ' - ' + item.endTime : item.startTime}}
-
-
-
+
+ 起止日期
+ {{ item.endTime ? item.startTime + ' - ' + item.endTime : item.startTime}}
+
+
+
+ {{ item.endTime ? item.startTime + ' - ' + item.endTime : item.startTime}}
+
+
+
+
-
-
- 数量
- 1
-
-
-
- {{ item.authority ? '市场价' : '市场单价' }}
- {{ item.marketValue }}元
-
-
- 结算价
-
-
- 元
+
+ 数量
+ 1
+
-
-
- 折扣率
- {{ item.discountRate }}
-
-
- 平台服务费
- {{ item.serviceFee }}元
-
-
- 成交价
-
-
- 元
+
+ {{ item.authority ? '市场价' : '市场单价' }}
+ {{ item.marketValue }}元
+
+
+ 结算价
+
+
+ 元
+
+
+
+ 折扣率
+ {{ item.discountRate }}
+
+
+ 平台服务费
+ {{ item.serviceFee }}元
+
+
+ 成交价
+
+
+ 元
+
-
+
@@ -364,10 +366,12 @@
msg = '请输入成交价！'
break
}
+ e.edited = 1 // 未编辑过的标识，编辑过了的产品在编辑产品页不再显示
}
if (msg) return this.$util.errMsg(msg)
if (this.orderRepeat.length) return this.$util.errMsg(this.repeatMsg) // 有重复订单不能提交
uni.setStorageSync('courses', this.courses)
+ uni.setStorageSync('orderEdited', 1)
uni.navigateBack()
},
}
diff --git a/order/orderDetail/orderDetail.vue b/order/orderDetail/orderDetail.vue
index 4e3bc13..285de49 100644
--- a/order/orderDetail/orderDetail.vue
+++ b/order/orderDetail/orderDetail.vue
@@ -45,18 +45,20 @@
{{ form.businessManagerName }}
-
- 订单编号
- {{ form.orderNumber }}
-
-
- 订单时间
- {{ form.createTime }}
-
-
- 订单金额（元）
- {{ form.orderAmount }}
-
+
+
+ 订单编号
+ {{ form.orderNumber }}
+
+
+ 订单时间
+ {{ form.createTime }}
+
+
+ 订单金额（元）
+ {{ form.orderAmount }}
+
+
@@ -80,7 +82,7 @@
-
+
@@ -136,7 +138,7 @@
成交价
- {{ item.finalPrice }}
+ {{ item.finalPrice }}
元
@@ -149,33 +151,40 @@
-
-
-
- 添加产品
+
+
+ 下一步
-
-
-
-
-
- 共选{{ courses.length }}个产品
- 总成交价合计{{ form.orderAmount }}元
+
+
+
+
+
+ 添加产品
-
-
- 总采购成本:{{ form.purchaseCost }}元
+
+
+
+
+
+ 共选{{ courses.length }}个产品
+ 总成交价合计{{ form.orderAmount }}元
-
- 总产品利润: {{ form.profit }} 元
+
+
+ 总采购成本:{{ form.purchaseCost }}元
+
+
+ 总产品利润: {{ form.profit }} 元
+
+
+ 提交({{ courses.length }})
+ {{ courses.find(e => !e.ship) ? '一键发货' : '取消全部发货' }}
+
-
- 提交({{ courses.length }})
- {{ courses.find(e => !e.ship) ? '一键发货' : '取消全部发货' }}
-
-
+
@@ -242,6 +251,7 @@
isEdit: 0, // 编辑
isHandle: 0, // 处理
isRenew: 0, // 续费
+ edited: false,
orderId: '',
orderTypes: [{
text: '正式',
@@ -328,6 +338,7 @@
this.isEdit = action === 'edit'
this.isHandle = action === 'handle'
this.isRenew = action === 'renew'
+ this.edited = uni.getStorageSync('orderEdited')
const store = uni.getStorageSync('courses')
this.getTeam(!store)
if (store) {
@@ -1060,13 +1071,16 @@
.line {
display: flex;
justify-content: space-between;
- padding: 12rpx 0;
- margin: 5px 0;
+ padding: 28rpx 0;
font-size: 12px;
+ border-bottom: 1px solid #E6E8ED;
+ &:last-child {
+ border-bottom: 0;
+ }
}
.label {
font-size: 28rpx;
- color: #999;
+ color: #333;
}
.ph {
font-size: 28rpx;
@@ -1097,26 +1111,33 @@
background-color: #fff;
box-shadow: 0 -2px 2px #f5f5f5;
box-sizing: border-box;
-}
-.add-wrap {
- padding: 16rpx 24rpx 40rpx;
- background-color: #f5f5f5;
-}
-/deep/.add-btn {
- display: flex;
- justify-content: center;
- align-items: center;
- font-size: 28rpx;
- line-height: 88rpx;
- color: #007EFF;
- background-color: #fff;
- border: 1px solid #007EFF;
- border-radius: 16rpx;
- .icon {
- margin-right: 10rpx;
+ .add-wrap {
+ padding: 16rpx 24rpx 40rpx;
+ background-color: #f5f5f5;
}
- .uni-icons {
- font-size: 38rpx !important;
+ .next-wrap {
+ padding: 24rpx 24rpx 0;
+ }
+ /deep/.lg-btn {
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ font-size: 28rpx;
+ line-height: 88rpx;
+ color: #007EFF;
+ background-color: #fff;
+ border: 1px solid #007EFF;
+ border-radius: 16rpx;
+ .icon {
+ margin-right: 10rpx;
+ }
+ .uni-icons {
+ font-size: 38rpx !important;
+ }
+ &.next {
+ color: #fff;
+ background-color: #007EFF;
+ }
}
}
.product {
@@ -1221,12 +1242,6 @@
margin-left: 10rpx;
}
}
-.period {
- flex: none;
- width: 100rpx;
- font-size: 28rpx;
- text-align: center;
-}
.ship-info {
height: 400rpx;
padding: 30rpx;
diff --git a/order/orders/orders.vue b/order/orders/orders.vue
index 76cbd9c..dac4b6c 100644
--- a/order/orders/orders.vue
+++ b/order/orders/orders.vue
@@ -145,9 +145,10 @@
}
},
onShow() {
- // 清除产品缓存
+ // 清除订单缓存
try {
uni.removeStorageSync('courses')
+ uni.removeStorageSync('orderEdited')
} catch (e) {}
this.initList()
},
diff --git a/team/qrcode/qrcode.vue b/team/qrcode/qrcode.vue
index bc1bcae..0877d10 100644
--- a/team/qrcode/qrcode.vue
+++ b/team/qrcode/qrcode.vue
@@ -59,8 +59,8 @@
generateInvitationCode(accountId).then(({ expireTime }) => {
const date = new Date(Date.now() + expireTime * 1000) // 返回的秒，要*1000
this.expireTime = `${date.getFullYear()}-${this.$util.preZero(date.getMonth() + 1)}-${this.$util.preZero(date.getDate())} ${this.$util.preZero(date.getHours())}:${this.$util.preZero(date.getMinutes())}:${this.$util.preZero(date.getMinutes())}`
- this.link = `https://huorantech.cn/#/join?accountId=${accountId}&id=${this.id}&isTeam=1`
- // this.link = `http://121.37.12.51/backstage/#/join?accountId=${accountId}&id=${this.id}&isTeam=1`
+ // this.link = `https://huorantech.cn/#/join?accountId=${accountId}&id=${this.id}&isTeam=1`
+ this.link = `http://121.37.12.51/backstage/#/join?accountId=${accountId}&id=${this.id}&isTeam=1`
}).catch(e => {})
},
// 二维码组件生成完成钩子。生成后把图片导出给image组件，image组件才可以长按二维码转发