订单修改

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
 				}
 			},
 			// 判断是否为客户已有的课程

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() {

order/editCourse/editCourse.vue

@@ -1,11 +1,12 @@
 <template>
 	<view class="page">
 		<template v-for="c in courses">
-			<view v-if="c.list.length" class="block">
+			<view v-if="c.list.length && c.list.filter(e => !e.edited).length" class="block">
 				<view class="l-title">{{ c.name }}</view>
 				<uni-icons class="arrow" type="top" size="20" color="#007EFF" @click="toggle(c)"></uni-icons>
 				<view v-show="!c.shrink">
-					<view v-for="(item, i) in c.list">
+					<template v-for="(item, i) in c.list">
+						<view v-if="!item.edited" :key="i">
 							<view class="pro-name">
 								<view class="left">
 									<image class="icon" :src="$util.getIcon(item)" mode="widthFix"></image>
@@ -74,6 +75,7 @@
 								</view>
 							</view>
 						</view>
+					</template>
 				</view>
 			</view>
 		</template>
@@ -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()
 			},
 		}

order/orderDetail/orderDetail.vue

@@ -45,6 +45,7 @@
 					<view v-if="isDetail" class="val">{{ form.businessManagerName }}</view>
 					<uni-data-picker v-else class="picker-input" placeholder="请选择商务经理" popup-title="请选择商务经理" preload :localdata="bms" :map="{text: 'userName', value: 'partnerId'}" v-model="form.businessManagerId" :readonly="form.teamId ? false : true"></uni-data-picker>
 				</view>
+				<template v-if="edited">
 					<view class="line">
 						<view class="name">订单编号</view>
 						<view class="val">{{ form.orderNumber }}</view>
@@ -57,6 +58,7 @@
 						<view class="name">订单金额（元）</view>
 						<view class="val">{{ form.orderAmount }}</view>
 					</view>
+				</template>
 			</view>
 		</view>
 		
@@ -80,7 +82,7 @@
 									<button v-if="auth('订单管理:发货')" class="course-btn" type="primary" @click.stop="handleDeliver(n, i)">{{ item.ship ? '取消' : ''}}发货</button>
 								</template>
 								<button v-else-if="!isDetail && auth('订单管理:启用')" class="course-btn" type="primary" @click.stop="handleEnable(n, i)">{{ item.isEnable ? '禁用' : '启用'}}</button>
-								<button v-if="auth('订单管理:发货') && (item.authority == 3 || item.authority == 4) && (!isDetail || (isDetail && item.shipContent))" class="course-btn mg" type="primary" @click.stop="showShip(item)">发货信息</button>
+								<button v-if="auth('订单管理:发货') && (item.authority == 0 || item.authority == 3 || item.authority == 4) && (!isDetail || (isDetail && item.shipContent))" class="course-btn mg" type="primary" @click.stop="showShip(item)">发货信息</button>
 								<image v-if="!orderId || isRenew || isHandle" class="del" src="@/static/image/trash.png" mode="widthFix" @click.stop="delCourse(c, i)"></image>
 							</view>
 						</view>
@@ -136,7 +138,7 @@
 							</view>
 							<view :class="['line req', {err: err === 'finalPrice' + item.dataOrCourseId + item.authority}]">
 								<view class="label">成交价</view>
-								<view v-if="isDetail || (isEdit && !item.authority)" class="ph">{{ item.finalPrice }}</view>
+								<view v-if="isDetail" class="ph">{{ item.finalPrice }}</view>
 								<view class="inline" v-else>
 									<input type="number" v-model="item.finalPrice" placeholder="请输入" @input="calcFinalValue(item)" @change="handleErr(item, 'finalPrice')">
 									元
@@ -149,8 +151,14 @@
 		</template>
 		
 		<view class="bottom">
+			<template v-if="!edited && !orderId">
+				<view class="next-wrap">
+					<view class="lg-btn next" @click="toAdd(0)">下一步</view>
+				</view>
+			</template>
+			<template v-else>
 				<view v-if="!orderId || isHandle" class="add-wrap">
-				<view class="add-btn" @click="toAdd">
+					<view class="lg-btn" @click="toAdd">
 						<uni-icons class="icon" type="plus" color="#007FFF"></uni-icons>
 						添加产品
 					</view>
@@ -176,6 +184,7 @@
 						<view v-if="auth('订单管理:发货') && (isHandle || (!orderId && courses.length))" class="btn" @click="batchDeliver">{{ courses.find(e => !e.ship) ? '一键发货' : '取消全部发货' }}</view>
 					</view>
 				</view>
+			</template>
 		</view>
 		
 		<view v-if="isDetail" class="action">
@@ -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;
+		padding: 28rpx 0;
-		margin: 5px 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,12 +1111,14 @@
 	background-color: #fff;
 	box-shadow: 0 -2px 2px #f5f5f5;
 	box-sizing: border-box;
-}
+	.add-wrap {
-.add-wrap {
 		padding: 16rpx 24rpx 40rpx;
 		background-color: #f5f5f5;
-}
+	}
-/deep/.add-btn {
+	.next-wrap {
+		padding: 24rpx 24rpx 0;
+	}
+	/deep/.lg-btn {
 		display: flex;
 		justify-content: center;
 		align-items: center;
@@ -1118,6 +1134,11 @@
 		.uni-icons {
 			font-size: 38rpx !important;
 		}
+		&.next {
+			color: #fff;
+			background-color: #007EFF;
+		}
+	}
 }
 .product {
 	display: flex;
@@ -1221,12 +1242,6 @@
 		margin-left: 10rpx;
 	}
 }
-.period {
-	flex: none;
-	width: 100rpx;
-	font-size: 28rpx;
-	text-align: center;
-}
 .ship-info {
 	height: 400rpx;
 	padding: 30rpx;

order/orders/orders.vue

@@ -145,9 +145,10 @@
 			}
 		},
 		onShow() {
-			// 清除产品缓存
+			// 清除订单缓存
 			try {
 				uni.removeStorageSync('courses')
+				uni.removeStorageSync('orderEdited')
 			} catch (e) {}
 			this.initList()
 		},

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 = `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 = `http://121.37.12.51/backstage/#/join?accountId=${accountId}&id=${this.id}&isTeam=1`
 				}).catch(e => {})
 			},
 			// 二维码组件生成完成钩子。生成后把图片导出给image组件，image组件才可以长按二维码转发