From 77554b79ad864dfc903af8db355a34b622876ef8 Mon Sep 17 00:00:00 2001
From: yujialong <479214531@qq.com>
Date: Wed, 6 Dec 2023 17:14:49 +0800
Subject: [PATCH] fix

---
 order/orderDetail/orderDetail.vue     |  6 +++---
 order/productDetail/productDetail.vue | 17 +++++++++++++----
 pages/login/login.vue                 |  7 +++++--
 3 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/order/orderDetail/orderDetail.vue b/order/orderDetail/orderDetail.vue
index bf66b90..c8edc64 100644
--- a/order/orderDetail/orderDetail.vue
+++ b/order/orderDetail/orderDetail.vue
@@ -35,11 +35,11 @@
 					<view class="name">邮箱</view>
 					<view class="val">{{ form.email }}</view>
 				</view>
-				<view :class="['line req', {err: err === 'orderType'}]">
+				<!-- <view :class="['line req', {err: err === 'orderType'}]">
 					<view class="name">订单类型</view>
 					<view v-if="isDetail" class="val">{{ orderTypes.find(e => e.value === form.orderType).text }}</view>
 					<uni-data-picker v-else class="picker-input" placeholder="请选择订单类型" popup-title="请选择订单类型" preload :clear-icon="false" :localdata="orderTypes" v-model="form.orderType" @change="calcTotal(1)"></uni-data-picker>
-				</view>
+				</view> -->
 				<template v-if="edited">
 					<view class="line">
 						<view class="name">订单编号</view>
@@ -209,7 +209,7 @@
 					email: '',
 					customerId: '', // 客户id
 					customerName: '',
-					orderType: '',
+					orderType: 2,
 					cityId: '',
 					cityName: '',
 					phone: '',
diff --git a/order/productDetail/productDetail.vue b/order/productDetail/productDetail.vue
index 4742d36..a36100c 100644
--- a/order/productDetail/productDetail.vue
+++ b/order/productDetail/productDetail.vue
@@ -8,18 +8,20 @@
 			<view class="fields">
 				<view class="field">
 					<image class="icon" src="@/static/image/product/1.png"></image>
-					市场建议价：{{ form.mall.marketUnitPrice }}元/年
+					市场建议价：{{ form.mall.marketUnitPrice || '' }}元/年
 				</view>
 				<view class="field">
 					<image class="icon" src="@/static/image/product/2.png"></image>
-					产品类型：{{ form.goodsRes.typeName }}
+					产品类型：{{ form.goodsRes.typeName || '' }}
 				</view>
 			</view>
 		</view>
 		
 		<view class="detail">
 			<ul class="tabs">
-				<li v-for="(tab, i) in tabs" :class="{active: curTab === tab.id}" @click="tabChange(tab)">{{ tab.name }}</li>
+				<li :class="{active: curTab === 0}" @click="tabChange(0)">详情介绍</li>
+				<li :class="{active: curTab === 1, disabled: !form.interfaceDiagram}" @click="tabChange(1)">界面图</li>
+				<li :class="{active: curTab === 2, disabled: !form.mallAnnex || !form.mallAnnex.length}" @click="tabChange(2)">参数</li>
 			</ul>
 			<view class="title">
 				<image class="icon" src="@/static/image/product/3.png"></image>
@@ -208,7 +210,8 @@
 				}).catch(e => {})
 			},
 			// tab切换
-			tabChange({ id }) {
+			tabChange(id) {
+				if ((id === 1 && !this.form.interfaceDiagram) || (id === 2 && (!form.mallAnnex || !form.mallAnnex.length))) return false
 				this.curTab = id
 				id == 1 && uni.pageScrollTo({
 					selector: '#pics',
@@ -352,6 +355,9 @@
 			background-color: #007EFF;
 		}
 	}
+	.disabled {
+		color: #b3b3b3;
+	}
 }
 .detail {
 	padding: 34rpx 32rpx;
@@ -416,6 +422,9 @@
 			color: #f00;
 		}
 	}
+	.swiper-box {
+		min-height: 250px;
+	}
 	.pic {
 		width: 100%;
 	}
diff --git a/pages/login/login.vue b/pages/login/login.vue
index 554b461..ea27a15 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -11,9 +11,9 @@
 				<view class="tips">未注册或未绑定职站商城的手机号，将帮你注册新账号</view>
 			</template>
 			<template v-else>
-				<!-- <view class="btn wechat" @click="login">
+				<view class="btn wechat" @click="login">
 					快捷登录
-				</view> -->
+				</view>
 			</template>
 			
 			<view class="agree">
@@ -72,6 +72,9 @@
 							console.log(22, userInfo)
 							uni.setStorageSync('userName', userInfo.nickName)
 							uni.setStorageSync('avatar', userInfo.avatarUrl)
+							uni.setStorageSync('token', 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJzdWIiOiJ1c2VyIiwiaWF0IjoxNjk4OTkxMTU1LCJleHAiOjE2OTk4NTUxNTUsImFjY291bnRJZCI6IjEwOCJ9.u1zi29b93oGhY38gkgldBhhvguXFGeVPd_x2OalQBXQ')
+							this.toIndex()
+							return
 							uni.login({
 								success: ({ code }) => {
 									if (code) {