Merge branch 'master' of https://git.citupro.com/zhengnaiwen_citu/menduner-uniapp

components/FilterList/index.vue

@@ -99,9 +99,4 @@ watch(() => props.list,
     font-size: 14px;
   }
 }
-.popup {
-  height: 50vh;
-  background-color: #fff;
-  text-align: center;
-}
 </style>

layout/components/authModal/login/index.vue

@@ -42,7 +42,7 @@
 
         <!-- 账号密码登录 -->
         <uni-forms
-          v-else
+          v-if="current === 1"
           ref="accountLoginRef"
           v-model="state.account"
           :rules="state.rules"
@@ -58,15 +58,21 @@
             <uni-easyinput type="password" placeholder="请输入密码" v-model="state.account.password" :inputBorder="false"></uni-easyinput>
           </uni-forms-item>
         </uni-forms>
+
+        <view v-if="current === 2">
+          <button v-if="!protocol" class="send-button" @click="showProtocolToast">微信一键登录</button>
+          <button v-else class="send-button" open-type="getPhoneNumber" @getphonenumber="getPhoneNumber">微信一键登录</button>
+        </view>
+
         <view class="quickLogon">
           <view>
-            <button v-if="!protocol" class="wxLogon" type="text" :plain="true" @click="showProtocolToast">微信一键登录</button>
-            <button v-else class="wxLogon" type="text" :plain="true" open-type="getPhoneNumber" @getphonenumber="getPhoneNumber">微信一键登录</button>
+            <!-- <button v-if="!protocol" class="wxLogon" type="text" :plain="true" @click="showProtocolToast">微信一键登录</button>
+            <button v-else class="wxLogon" type="text" :plain="true" open-type="getPhoneNumber" @getphonenumber="getPhoneNumber">微信一键登录</button> -->
           </view>
           <view class="register" @tap="handleChangeRegister">还没有登录账户？去注册</view>
         </view>
-        <button class="send-button" @tap="handleLogin"> 登 录  </button>
-        <view class="agreement-box ss-flex ss-row-center">
+        <button v-if="current !== 2" class="send-button" @tap="handleLogin"> 登 录  </button>
+        <view class="agreement-box ss-flex ss-row-center" style="margin-bottom: 30px;">
           <uni-icons size="20" :type="protocol ? 'checkbox-filled' : 'circle'" :color="protocol ? '#00897B' : '#ccc'" @tap="protocol = !protocol"></uni-icons>
           <view class="color-999 ss-flex ss-col-center ss-m-l-8 font-size-13">
             我已阅读并遵守
@@ -119,11 +125,11 @@
           </uni-easyinput>
         </uni-forms-item>
       </uni-forms>
-      <view class="register login" @tap="handleChangeLogin">已有账户？去登陆</view>
+      <view class="register login" style="text-align: end;" @tap="handleChangeLogin">已有账户？去登陆</view>
       <view>
         <button class="send-button" @tap="handleRegister"> 注 册 </button>
       </view>
-      <view class="color-999 ss-flex ss-col-center ss-row-center ss-m-l-8 font-size-13">
+      <view class="color-999 ss-flex ss-col-center ss-row-center ss-m-l-8 font-size-13" style="margin-bottom: 30px;">
         点击注册即代表您同意
         <view class="color-primary" @tap.stop="handleToDetail('user')">
           《用户协议》
@@ -144,7 +150,7 @@ import { getSmsCode, getSmsTimer } from '@/utils/code'
 import { userStore } from '@/store/user'
 
 const useUserStore = userStore()
-const items = ['短信登录', '账号登录']
+const items = ['短信登录', '账号登录', '微信一键登录']
 const current = ref(0)
 const accountLoginRef = ref()
 const smsLoginRef = ref()

layout/index.vue

@@ -34,12 +34,13 @@ watch(() => useUserStore?.accountInfo?.userId, (newVal, oldVal) => {
 })
 
 </script>
+
 <style lang="scss" scoped>
 .page-app {
   position: relative;
   // color: var(--ui-TC);
   // background-color: var(--ui-BG-1) !important;
-  z-index: 2;
+  // z-index: 2;
   display: flex;
   width: 100%;
   height: 100vh;

pages/index/my.vue

@@ -38,12 +38,13 @@
 				</uni-list>
 			</view>
 	
-			<button v-if="useUserStore.isLogin" class="send-button ss-m-b-30" @tap="handleLogout">退出登录</button>
+			<button v-if="useUserStore.isLogin" class="send-button" style="margin-bottom: 50px;" @tap="handleLogout">退出登录</button>
 	
 			<uni-popup ref="popup" type="dialog">
 				<uni-popup-dialog type="warn" cancelText="取消" confirmText="确定" title="系统提示" content="确认退出账号？" @confirm="handleLogoutConfirm"
 					@close="handleLogoutClose"></uni-popup-dialog>
 			</uni-popup>
+			<!-- 我的分享码 -->
 			<uni-popup ref="shareQrCodePopup" type="dialog">
 				<view class="shareQrCodePopupContent">
 					<view class="color-primary text">邀请用户注册领50积分</view>
@@ -58,6 +59,13 @@
 					<view v-if="shareUrl" class="saveImg">长按二维码保存图片</view>
 				</view>
 			</uni-popup>
+
+			<uni-popup ref="inputDialog" type="dialog">
+				<view class="shareQrCodePopupContent">
+					<view>请前往网页版{{ dialogType ? '门墩儿招聘' : '门墩儿商城' }}</view>
+					<uni-link class="ss-m-t-10" :href="dialogType ? 'http://menduner.citupro.com:7878' : 'http://menduner.citupro.com:7878/mall'" text="点击复制网页地址" color="#00897B" fontSize="16" copyTips="已复制，请在电脑端打开"></uni-link>
+				</view>
+			</uni-popup>
 		</view>
 	</layout-page>
 </template>
@@ -81,6 +89,7 @@ onShow(() => {
     currentTabBar?.setData({ selected: 4 });
 })
 
+const inputDialog = ref()
 const useUserStore = userStore()
 const baseInfo = computed(() => useUserStore?.baseInfo)
 const userInfo = computed(() => useUserStore?.userInfo)
@@ -112,22 +121,27 @@ watch(
 )
 
 // 列表跳转
+const dialogType = ref('')
 const handleToLink = (item) => {
 	if (item.appId) {
 		// uni.navigateToMiniProgram({
 		// 	appId: item.appId,
 		// })
 		// return
-		uni.showToast({
-			title: '请前往网页版门墩儿商城',
-			icon: 'none'
-		})
+		// uni.showToast({
+		// 	title: '请前往网页版门墩儿商城',
+		// 	icon: 'none'
+		// })
+		dialogType.value = 0
+		inputDialog.value.open()
 	}
 	if (item.key === 'recruit') {
-		uni.showToast({
-			title: '请前往网页版门墩儿招聘',
-			icon: 'none'
-		})
+		// uni.showToast({
+		// 	title: '请前往网页版门墩儿招聘',
+		// 	icon: 'none'
+		// })
+		dialogType.value = 1
+		inputDialog.value.open()
 	}
 	if (!item.path) return
   if (!getAccessToken()) {
@@ -279,8 +293,8 @@ const handleLogoutConfirm = () => {
 	margin: 0 0 20rpx 30rpx;
 }
 .shareQrCodePopupContent {
-	width: 80vw;
-	padding: 30rpx;
+	width: 75vw;
+	padding: 40rpx;
 	margin-bottom: 20rpx;
 	text-align: center;
 	background-color: #fff;

pages/index/position.vue

@@ -41,6 +41,13 @@
           </view>
         </scroll-view>
         <AdvertisePop @login="showAuthModal()"></AdvertisePop>
+
+        <uni-popup ref="inputDialog" type="dialog">
+          <view class="shareQrCodePopupContent">
+            <view class="ss-m-b-10">请前往网页版门墩儿查看</view>
+            <uni-link href="http://menduner.citupro.com:7878" text="点击复制网页地址" color="#00897B" fontSize="16" copyTips="已复制，请在电脑端打开"></uni-link>
+          </view>
+        </uni-popup>
       </view>
     </layout-page>
   </view>
@@ -72,6 +79,7 @@ onLoad(() => {
   if (!uni.getStorageSync('token')) getRewardEventList()
 })
 
+const inputDialog = ref()
 const more = ref('more')
 const swiperAdList = [
   'https://minio.citupro.com/dev/menduner/miniProgram/banner1.gif',
@@ -97,10 +105,11 @@ const gridList = [
 ]
 
 const handleGrid = (e) => {
-  uni.showToast({
-    icon: 'none',
-    title: '请前往网页版门墩儿查看'
-  })
+  // uni.showToast({
+  //   icon: 'none',
+  //   title: '请前往网页版门墩儿查看'
+  // })
+  inputDialog.value.open()
 }
 
 // 
@@ -219,4 +228,14 @@ const loadingMore = () => { // 加载更多
   border-radius: 0 5px 5px 0;
   z-index: 9;
 }
+:deep(.picker-view) {
+  padding-bottom: 80px !important;
+}
+.shareQrCodePopupContent {
+	width: 75vw;
+	padding: 40rpx;
+	margin-bottom: 20rpx;
+	text-align: center;
+	background-color: #fff;
+}
 </style>

pagesA/chart/index.vue

@@ -148,7 +148,7 @@
     <view class="box-bottom">
       <view class="box-bottom-tool" style="display: flex; justify-content: space-between;">
         <uni-tag :text="isSendResume ? '简历已投递' : '发送简历'" :disabled="isSendResume" type="success" @tap="handleFindResume"/>
-        <uni-tag text="发 送" type="success" @tap="handleSend"/>
+        <uni-tag text="发 送" type="success" @click="handleSend"/>
       </view>
       
       <view class="d-flex align-end">

pagesA/resumeOnline/educationExp.vue

@@ -20,7 +20,7 @@
 				</picker>
 			</uni-forms-item>
       <uni-forms-item label="结束时间" name="endTime" required>
-				<picker mode="date" :value="formData.endTime" fields="month" :end="endDate" @change="e => formData.endTime = e.detail.value">
+				<picker mode="date" :value="formData.endTime" fields="month" @change="e => formData.endTime = e.detail.value">
 					<view class="uni-input ss-m-t-20">{{ formData.endTime }}</view>
 				</picker>
 			</uni-forms-item>