Merge branch 'recruit-enterprise' of https://git.citupro.com/zhengnaiwen_citu/menduner-uniapp into recruit-enterprise

layout/components/authModal/login/index.vue

@@ -23,7 +23,7 @@
         </uni-forms>
 
         <view class="quickLogon">
-          <view class="color-666" style="font-size: .85em;" @tap.stop="handleForgotPassword">忘记密码</view>
+          <view class="color-666" style="font-size: .85em; text-decoration: underline;" @tap.stop="handleForgotPassword">忘记密码</view>
           <view class="register" @tap="handleChangeRegister">还没有登录账户？去注册</view>
         </view>
         <button class="send-button" @tap="handleLogin"> 登 录  </button>
@@ -260,8 +260,6 @@ const handleLogin = async () => {
   text-align: center; 
   font-size: 12px; 
   cursor: pointer;
-  // border: 1px dashed #00B760;
-  // border-radius: 26px;
   padding: 0;
 }
 .head-title {
@@ -276,18 +274,11 @@ const handleLogin = async () => {
   padding: 0 20rpx;
   align-items: center;
 }
-.wxLogon {
-  font-size: .85em;
-  color: #00B760;
-  border: none;
-  margin: 0;
-  padding: 0;
-}
 .register {
   widows: 100%;
   font-size: .85em;
-  color: red;
-  // text-align: right;
+  color: #00B760;
+  text-decoration: underline;
   &.login {
     color: #00B760;
   }

pagesA/chart/index.vue

@@ -440,6 +440,16 @@ onLoad(async (options) => {
 .text-right {
   text-align: right !important;
 }
+:deep {
+	.uni-select__selector-item {
+		display: block !important;
+		text-align: left !important;
+		max-width: 100% !important;
+		white-space: nowrap !important;
+		text-overflow: ellipsis !important;
+		overflow: hidden !important;
+	}
+}
 .box {
   width: 100%;
   display: flex;

utils/request.js

@@ -74,6 +74,7 @@ const http = new Request({
 		Accept: 'text/json',
 		'Content-Type': 'application/json;charset=UTF-8',
 		platform: 'WechatMiniProgram',
+		'Login-User-Type': 1
 	},
 	// #ifdef APP-PLUS
 	sslVerify: false,