首页页面样式修改

config/app.js

@@ -2,16 +2,16 @@ let httpApiThree;
 let httpApi; // 总域名
 let httpApiTwo; // 物流系统域名
 
-const env = 'dev'; // 开发
+// const env = 'dev'; // 开发
-// const env = 'prod'; // 生产
+const env = 'prod'; // 生产
 // const env = 'prew';    // 预上线
 // const env = 'local'; // 本地
 
 switch (env) {
 	case 'prod':
-		httpApi = 'https://worker-task.lihaink.cn' //正式
+		httpApi = 'https://new-worker.lihaink.cn/' //正式
-		httpApiTwo = 'https://logistics.lihaink.cn' //正式环境
+		httpApiTwo = 'https://new-worker.lihaink.cn/' //正式环境
-		httpApiThree = 'https://worker-task.lihaink.cn' //正式
+		httpApiThree = 'https://new-worker.lihaink.cn/' //正式
 		break;
 	case 'prew':
 		httpApi = 'https://preview-worker-task.lihaink.cn' //预上线
@@ -24,9 +24,9 @@ switch (env) {
 		httpApiTwo = 'http://192.168.1.21:8083' //预上线
 		break;
 	default:
-		httpApi = 'https://ceshi-worker-task.lihaink.cn' //测试
+		httpApi = 'https://ceshi-new-wokr.lihaink.cn/' //测试
-		httpApiThree = 'https://ceshi-worker-task.lihaink.cn' //测试
+		httpApiThree = 'https://ceshi-new-wokr.lihaink.cn/' //测试
-		httpApiTwo = 'https://ceshi-logistics.lihaink.cn' //测试环境
+		httpApiTwo = 'https://ceshi-new-wokr.lihaink.cn/' //测试环境
 		//测试环境
 }
 

manifest.json

@@ -1,10 +1,10 @@
 {
 	"name": "里海社区",
 	// "appid" : "__UNI__3A527D1",
-	"appid": "__UNI__B5B1EDD",
+	"appid": "__UNI__A495155",
 	"description": "",
-	"versionName": "1.3.0",
+	"versionName": "1.3.1",
-	"versionCode": 130,
+	"versionCode": 131,
 	"transformPx": false,
 	/* 5+App特有相关 */
 	"app-plus": {

pages.json

@@ -962,30 +962,8 @@
 				"iconPath": "static/tabs-icon/home.png",
 				"selectedIconPath": "static/tabs-icon/home-a.png"
 			},
-			{
+
-				"pagePath": "pages/oaExamine/oaExamine",
+
-				"text": "审批",
-				"iconPath": "static/tabs-icon/Task.png",
-				"selectedIconPath": "static/tabs-icon/Task-a.png"
-			},
-			{
-				"pagePath": "pages/oaTask/oaTask",
-				"text": "任务",
-				"iconPath": "static/tabs-icon/approval.png",
-				"selectedIconPath": "static/tabs-icon/approval-a.png"
-			},
-			// {
-			//   "pagePath": "pages/oaManager/oaManager",
-			//   "text": "片区经理",
-			//   "iconPath": "static/tabs-icon/manager.png",
-			//   "selectedIconPath": "static/tabs-icon/manager-a.png"
-			// },
-			{
-				"pagePath": "pages/business/business",
-				"text": "商机",
-				"iconPath": "static/tabs-icon/manager.png",
-				"selectedIconPath": "static/tabs-icon/manager-a.png"
-			},
 			{
 				"pagePath": "pages/oaMy/oaMy",
 				"text": "我的",

pages/oaLogin/oaLogin.vue

@@ -9,7 +9,7 @@
 		<!-- <view style="height: var(--status-bar-height)"></view> -->
 		<!-- #endif -->
 		<view class="body">
-			<view class="title">欢迎进入里海供销平台！</view>
+			<view class="title">欢迎进入里海工作平台！</view>
 			<view class="login-card">
 				<view class="top">
 					<view class="text item">
@@ -22,17 +22,7 @@
 						type="tel" placeholder="输入账号" />
 					<input @click="getId" class="mobile item" v-model="formData.password" maxlength="26"
 						placeholder="输入密码" password type="safe-password" />
-					<!-- <input v-if="current == 1" class="mobile item" v-model="formData.account" placeholder="输入手机号" />
+
-					<view v-if="current == 1" class="code item">
-						<input placeholder="输入验证码" v-model="formData.code" maxlength="6" />
-						<u-code :seconds="seconds" @end="end" @start="start" ref="uCode" @change="codeChange"></u-code>
-						<view class="get-code" @click="getCode">{{ tips }}</view>
-					</view>
-					<view class="btn">
-					</view> -->
-					<view class="">
-						还没有账号? <text class="enroll-text" @click="navgo('/pages/oaLogin/oaEnroll')">点击注册</text>
-					</view>
 				</view>
 
 				<button class="submit_btn" @click="login">登录</button>

pages/oaMy/oaMy.vue

@@ -3,7 +3,8 @@
 		<view class="head_box" style="position: relative;">
 			<!-- <image class="head_img" src="../../static/img/home/head-bg.png"></image> -->
 			<view style="position: absolute;bottom: 0;left: 0;overflow: hidden;border-radius: 0;">
-        <hx-lottie :options="options" ref="lottie" style="width: 100vw;height: 460rpx;transform: scale(1.2);background-color: #0122c7;"/>
+				<hx-lottie :options="options" ref="lottie"
+					style="width: 100vw;height: 460rpx;transform: scale(1.2);background-color: #0122c7;" />
 			</view>
 			<!-- <u-navbar v-if="uniMP" @leftClick="leftClick" bgColor="rgba(0,0,0,0)"
           leftIconColor=" #fff" :autoBack="false">
@@ -34,7 +35,7 @@
 						<view v-else class="name_work">
 							<view class="name">
 								<text class="nickname">姓名:{{ oaUserInfo.nickname }}</text>
-								（{{ oaUserInfo.admin_id?'超级管理员':'普通用户'}}）
+
 								<!-- <text class="omit" v-if="oaUserInfo.admin.company">所属公司:{{ oaUserInfo.admin.company.company_name }}</text> -->
 							</view>
 							<view class="work">
@@ -42,13 +43,12 @@
 									<view class="wr_t_left">电话:</view>
 									<view class="wr_t_right">{{oaUserInfo.account}}</view>
 								</view>
+
 								<view class="wr_item">
-                    <view class="wr_t_left">公司:</view>
+									<view class="wr_t_left">类型:</view>
-                    <view class="wr_t_right" v-if="oaUserInfo.company">{{oaUserInfo.company.company_name}}</view>
+									<view class="wr_t_right">
+										{{oaUserInfo.user_role_name}}
 									</view>
-                  <view class="wr_item">
-                    <view class="wr_t_left">公司类型:</view>
-                    <view class="wr_t_right" v-if="oaUserInfo.company">{{oaUserInfo.company.company_type_name}}</view>
 								</view>
 								<!-- {{ oaUserInfo.did_name }}({{ oaUserInfo.label_name }}) -->
 							</view>
@@ -121,7 +121,7 @@
 			this.options.data = bj;
 		},
 		onShow() {
-      if(uni.getStorageSync('uniMP'))this.uniMP = true;
+			if (uni.getStorageSync('uniMP')) this.uniMP = true;
 			this.getOaUserInfo();
 		},
 		onHide() {
@@ -141,19 +141,19 @@
 					}
 				};
 			},
-      myOaData(){
+			myOaData() {
 				const route = 'pages/oaMy/oaMy';
 				let arr = [];
-        this.$store.state.config?.config?.menu?.forEach((item)=>{
+				this.$store.state.config?.config?.menu?.forEach((item) => {
-          if(item.paths.includes(route)){
+					if (item.paths.includes(route)) {
-            arr=item.children;
+						arr = item.children;
 					}
 				})
 				return arr;
 			}
 		},
-    watch:{
+		watch: {
-      modelShow: function(n,o){
+			modelShow: function(n, o) {
 
 			}
 		},
@@ -162,7 +162,7 @@
 			leftClick(e) {
 				uni.sendHostEvent('closeApp', e, (ret) => {
 					//发送消息成功回调
-          console.log('关闭应用'+JSON.stringify(ret));
+					console.log('关闭应用' + JSON.stringify(ret));
 				});
 			},
 			login() {
@@ -191,8 +191,8 @@
 				this.$store.commit('setUserInfo', res.data);
 				uni.stopPullDownRefresh()
 			},
-			navTo (url) {
+			navTo(url) {
-			  if(url){
+				if (url) {
 					uni.showLoading({
 						title: '加载中',
 						mask: true
@@ -202,12 +202,12 @@
 						success() {
 							uni.hideLoading()
 						},
-			      fail (e) {
+						fail(e) {
 							uni.hideLoading()
 							console.log(e);
 						},
 					})
-			  }else Toast('暂未开放')
+				} else Toast('暂未开放')
 			},
 			alterMyInfo() {
 				uni.navigateTo({
@@ -224,6 +224,7 @@
 <style lang="scss">
 	.my {
 		padding-bottom: 160rpx;
+
 		.head_box {
 			position: relative;
 			padding: 28rpx;
@@ -290,9 +291,11 @@
 
 			.work {
 				margin-top: 14.04rpx;
-        .wr_item{
+
+				.wr_item {
 					display: flex;
-          .wr_t_left{
+
+					.wr_t_left {
 						flex-shrink: 0;
 						margin-right: 12rpx;
 					}

pages/otherSetting/otherSetting.vue

@@ -9,7 +9,7 @@
 						<view class="text">{{ item.name }}</view>
 					</view>
 					<view style="display: flex;align-items: center;">
-            <view v-if="i==0">{{version}}</view>
+						<view v-if="i==0">1.0.1</view>
 						<uni-icons type="forward"></uni-icons>
 					</view>
 				</view>
@@ -23,8 +23,12 @@
 </template>
 
 <script>
-  import { Toast } from '../../libs/uniApi';
+	import {
-  import { destroyAccount } from '@/api/oaUser.js';
+		Toast
+	} from '../../libs/uniApi';
+	import {
+		destroyAccount
+	} from '@/api/oaUser.js';
 	export default {
 		data() {
 			return {