From bb1ed11a1da68d68cd68c1da2eb11b9e3df42ce6 Mon Sep 17 00:00:00 2001
From: yujialong <479214531@qq.com>
Date: Fri, 7 Jul 2023 16:19:47 +0800
Subject: [PATCH] fix

---
 config/request.js                 |  4 ++--
 order/addCourse/addCourse.vue     |  6 +++++-
 order/editCourse/editCourse.vue   | 19 +++++++++----------
 order/orderDetail/orderDetail.vue | 27 ++++++++++++++-------------
 order/products/products.vue       |  8 +++++---
 pages/login/login.vue             |  6 +++---
 6 files changed, 38 insertions(+), 32 deletions(-)

diff --git a/config/request.js b/config/request.js
index 6748186..042bc89 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.151: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 3a6a5d5..d551fa1 100644
--- a/order/addCourse/addCourse.vue
+++ b/order/addCourse/addCourse.vue
@@ -18,7 +18,7 @@
 			<li v-for="(item, i) in list">
 				<uni-data-checkbox v-if="item.check" class="check" multiple :value="[1]" :localdata="item.checkData" @change="e => checkChange(e, i)"></uni-data-checkbox>
 				<uni-data-checkbox v-else class="check" multiple v-model="item.check" :localdata="item.checkData" @change="e => checkChange(e, i)"></uni-data-checkbox>
-				<image class="icon" :src="$util.getIcon(item)" mode="widthFix"></image>
+				<image class="icon" :src="$util.getIcon(item)"></image>
 				{{ item.productName }}
 			</li>
 		</ul>
@@ -214,6 +214,7 @@
 					dataOrCourseId: e.associatedProduct, // id
 					mallId: e.mallId,
 					productName: e.productName, // 名称
+					typeName: e.typeName, // 产品类型
 					periodOfUse: '', // 使用期限
 					startTime: this.$util.formatDate(new Date(), 'yyyy-MM-dd'), // 开始
 					endTime: '', // 终止
@@ -361,7 +362,10 @@
 	}
 	.icon {
 		width: 80rpx;
+		min-width: 80rpx;
+		height: 80rpx;
 		margin: 0 20rpx;
+		border-radius: 4px;
 	}
 }
 /deep/.check {
diff --git a/order/editCourse/editCourse.vue b/order/editCourse/editCourse.vue
index 6d2d80c..0729853 100644
--- a/order/editCourse/editCourse.vue
+++ b/order/editCourse/editCourse.vue
@@ -16,7 +16,7 @@
 						<view class="form-list">
 							<view class="line">
 								<view class="name">产品类型</view>
-								<view class="val">{{ productTypes.find(e => e.id === item.productType).name }}</view>
+								<view class="val">{{ item.typeName }}</view>
 							</view>
 							<view :class="['line', {err: err === 'periodOfUse' + item.dataOrCourseId + item.authority}]">
 								<view class="name">使用期限</view>
@@ -86,7 +86,7 @@
 <script>
 	import { getOrderOtherTime } from '@/apis/modules/order.js'
 	import { getPartnerTeamRates } from '@/apis/modules/parner.js'
-	import { productCategoryList } from '@/apis/modules/product.js'
+	import { productCategoryList, productTypeList } from '@/apis/modules/product.js'
 	export default {
 		data() {
 			return {
@@ -133,23 +133,22 @@
 		methods: {
 			// 转换产品列表
 			handleProduct() {
+				// 产品类型
+				productTypeList().then(res => {
+					this.productTypes = res.typeList
+				}).catch(e => {})
+				
 				const list = uni.getStorageSync('courses')
 				let courses = {}
 				// 产品分类
 				productCategoryList().then(res => {
-					const typeList = []
 					res.classificationList.forEach(e => {
-						typeList.push({
-							id: e.classificationId,
-							name: e.classificationName
-						})
 						courses['list' + this.$util.getOrderType(e.classificationId)] = {
 							shrink: false,
 							name: e.classificationName,
 							list: []
 						}
 					})
-					this.productTypes = typeList
 					list.map(e => {
 						courses['list' + e.authority].list.push(e)
 					})
@@ -249,9 +248,9 @@
 			},
 			// 计算结算价及平台服务费
 			dealSettlePrice(row) {
-				// 如果是试用，结算价和平台服务费都是0
+				// 如果是试用或者没选择，结算价和平台服务费都是0
 				console.log('dealSettlePrice=>', row, this.orderType)
-				if (this.orderType == 2) {
+				if (this.orderType != 1) {
 					row.settlementPrice = 0
 					row.serviceFee = 0
 				} else {
diff --git a/order/orderDetail/orderDetail.vue b/order/orderDetail/orderDetail.vue
index 4b38644..4e3bc13 100644
--- a/order/orderDetail/orderDetail.vue
+++ b/order/orderDetail/orderDetail.vue
@@ -8,7 +8,6 @@
 					<view v-if="orderId" class="val">{{ form.customerName }}</view>
 					<view v-else class="customer-wrap">
 						<view :class="['ph', {val: form.customerName}]" @click="customerVisible = true">{{ form.customerName || '请选择客户' }}</view>
-						<view class="create" @click="toClient">找不到客户？马上创建</view>
 					</view>
 				</view>
 				<view class="line" v-if="form.customerName">
@@ -207,6 +206,7 @@
 			<view class="top">请选择客户</view>
 			<uni-icons class="close" type="closeempty" size="20" @click="closeCustomer"></uni-icons>
 			<uni-search-bar class="search" radius="5" placeholder="请输入客户名称" v-model="keyword" clearButton="auto" cancelButton="none" />
+			<view class="create" @click="toClient">找不到客户？马上创建</view>
 			<view class="list">
 				<view class="item" v-for="item in customerList" @click="customerChange(item)">{{ item.customerName }}</view>
 			</view>
@@ -338,11 +338,11 @@
 				}
 				this.courseList = store
 				this.courses = list
-				this.$nextTick(() => {
-					uni.pageScrollTo({
-						selector: '#products',
-					})
-				})
+				// this.$nextTick(() => {
+				// 	uni.pageScrollTo({
+				// 		selector: '#products',
+				// 	})
+				// })
 				try {
 					uni.removeStorageSync('courses')
 				} catch (e) {}
@@ -837,8 +837,8 @@
 				}, 500)
 			},
 			dealSettlePrice(row) {
-				// 如果是试用，结算价和平台服务费都是0
-				if (this.form.orderType == 2) {
+				// 如果是试用或者没选择，结算价和平台服务费都是0
+				if (this.form.orderType != 1) {
 					row.settlementPrice = 0
 					row.serviceFee = 0
 				} else {
@@ -997,11 +997,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;
diff --git a/order/products/products.vue b/order/products/products.vue
index e43a98a..2d95337 100644
--- a/order/products/products.vue
+++ b/order/products/products.vue
@@ -18,7 +18,7 @@
 		<ul class="list">
 			<li v-for="item in list">
 				<view class="pro-name">
-				<image class="icon" :src="$util.getIcon(item)" mode="widthFix"></image>
+				<image class="icon" :src="$util.getIcon(item)"></image>
 					{{ item.productName }}
 				</view>
 				<view class="info">
@@ -188,11 +188,13 @@
 		align-items: center;
 		padding: 18rpx 0;
 		font-size: 30rpx;
+		font-weight: 600;
 		color: #333;
 		border-bottom: 1px solid #E6E8ED;
 		.icon {
-			width: 52rpx;
-			height: 52rpx;
+			width: 58rpx;
+			min-width: 58rpx;
+			height: 58rpx;
 			margin-right: 20rpx;
 		}
 	}
diff --git a/pages/login/login.vue b/pages/login/login.vue
index 16d1312..d3c6bd1 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -9,8 +9,8 @@
 			</button>
 			<template v-else>
 				<view class="btn wechat" @click="login">
-					<image src="@/static/image/wechat.png" mode="widthFix"></image>
-					微信授权登录
+					<!-- <image src="@/static/image/wechat.png" mode="widthFix"></image> -->
+					快捷登录
 				</view>
 			</template>
 			
@@ -75,7 +75,7 @@
 										this.submiting = true
 										login({
 											code,
-											avatarUrl: userInfo.avatarUrl
+											// avatarUrl: userInfo.avatarUrl
 										}).then(({ data }) => {
 											const e = data.sessionKey
 											this.sessionKey = e.session_key