From c43e9ca8e4baa3e31c1da3c086ec8f1a7d12e438 Mon Sep 17 00:00:00 2001
From: Mr.Shi <1878285526@qq.com>
Date: 星期三, 23 八月 2023 18:27:20 +0800
Subject: [PATCH] 大屏

---
 h5_standard/src/views/workOrder/reportingForWork.vue   |    1 
 minipro_standard/manifest.json                         |   11 
 minipro_standard/main.js                               |   13 -
 h5_standard/src/components/newCom/user.vue             |    2 
 h5_standard/src/views/plannedProgress/details.vue      |  104 ++++++++++
 minipro_standard/pages/workbench/workbench.vue         |  133 ++++++++++++++
 minipro_standard/pages/index/index.vue                 |    8 
 minipro_standard/App.vue                               |    6 
 minipro_standard/pages.json                            |   12 
 minipro_standard/pages/mine/mine.vue                   |  168 +++++++++++++----
 h5_standard/.env.production                            |    4 
 minipro_standard/util/request/responseInterceptors.js  |   24 +-
 h5_standard/src/views/workOrder/workOrderReporting.vue |    3 
 minipro_standard/components/myTabber.vue               |    2 
 14 files changed, 386 insertions(+), 105 deletions(-)

diff --git a/h5_standard/.env.production b/h5_standard/.env.production
index c874a31..af03e19 100644
--- a/h5_standard/.env.production
+++ b/h5_standard/.env.production
@@ -18,7 +18,7 @@
 # VUE_APP_API = 'https://hsky.doumee.com/doumeeplant_api/'
 
 # 娴嬭瘯
-# VUE_APP_API = 'https://dmtest.ahapp.net/doumeeplant_api/'
+VUE_APP_API = 'https://dmtest.ahapp.net/doumeeplant_api/'
 
 # 婕旂ず
-VUE_APP_API = 'https://www.mes.red/doumeeplant/'
+# VUE_APP_API = 'https://www.mes.red/doumeeplant/'
diff --git a/h5_standard/src/components/newCom/user.vue b/h5_standard/src/components/newCom/user.vue
index 55d4505..7ae8a6a 100644
--- a/h5_standard/src/components/newCom/user.vue
+++ b/h5_standard/src/components/newCom/user.vue
@@ -17,7 +17,7 @@
             <div class="content_total">鍏眥{form.total}}鏉℃暟鎹�</div>
             <div class="content_list">
                 <div class="content_list_item" v-for="(item, i) in list" :key="i" @click="jump(item)">
-                    <div class="content_list_item_name">{{item.name}}&nbsp;|&nbsp;{{item.dmodel.name}}</div>
+                    <div class="content_list_item_name" v-if="item.dmodel">{{item.name}}&nbsp;|&nbsp;{{item.dmodel.name}}</div>
                 </div>
             </div>
         </div>
diff --git a/h5_standard/src/views/plannedProgress/details.vue b/h5_standard/src/views/plannedProgress/details.vue
index d1e61af..29d7c25 100644
--- a/h5_standard/src/views/plannedProgress/details.vue
+++ b/h5_standard/src/views/plannedProgress/details.vue
@@ -51,12 +51,33 @@
                         <div class="content_list_item_content_item_label">璁″垝浜哄憳锛�</div>
                         <div class="content_list_item_content_item_nr">{{info.usermodel.realname}}</div>
                     </div>
+                    <div class="content_list_item_content_item">
+                        <div class="content_list_item_content_item_label">鍒嗛厤鏁伴噺锛�</div>
+                        <div class="content_list_item_content_item_nr">{{info.createTime}}</div>
+                    </div>
+                    <div class="content_list_item_content_item">
+                        <div class="content_list_item_content_item_label">瀹屽伐鏁伴噺锛�</div>
+                        <div class="content_list_item_content_item_nr" v-if="info.umodel">{{info.doneNum}}{{info.umodel.name}}</div>
+                    </div>
                 </div>
             </div>
         </div>
         <NotFound info="鏆傛湭鍒嗛厤宸ュ崟" v-if="info.workorderList && info.workorderList.length === 0" />
         <template v-else>
-            <div class="details_timeline" v-for="(item, i) in info.workorderList" :key="i">
+            <div class="details_list">
+                <div class="details_list_item" v-for="(item, i) in info.workorderList" :key="i" @click="jump(item.id)">
+                    <div class="details_list_item_top">
+                        <span>{{ item.createUserName }}</span><span>{{ item.code }}</span>
+                    </div>
+                    <div class="details_list_item_center">
+                        <span>鑹搧鏁帮細{{ item.qualifiedNum }}</span><span>涓嶈壇鏁帮細<span class="red">{{ item.unqualifiedNum }}</span></span>
+                    </div>
+                    <div class="details_list_item_bottom">
+                        <span>{{ item.createTime }}</span>
+                    </div>
+                </div>
+            </div>
+            <!-- <div class="details_timeline" v-for="(item, i) in info.workorderList" :key="i">
                 <div class="details_timeline_header">
                     <div class="details_timeline_header_code">
                         <span>宸ュ崟缂栧彿锛歿{item.code}}</span>
@@ -68,10 +89,10 @@
                     <span v-if="item.status === 3" class="purple">宸叉楠�</span>
                     <span v-if="item.status === 4">宸叉姤宸�</span>
                     <span v-if="item.status === 5">宸插叆搴�</span>
-                    <span v-if="item.status === 6">宸插彇娑�</span>
+                    <span v-if="item.status === 6">宸插彇娑�</span> -->
                     <!--                <span v-if="item.status === 7">宸插彇娑�</span>-->
                     <!--                <span v-if="item.status === 8">宸插叧闂�</span>-->
-                </div>
+                <!-- </div>
                 <div class="details_timeline_item" v-if="item.produceDate">
                     <div class="activedian"></div>
                     <div class="dian active"></div>
@@ -132,21 +153,22 @@
                         </div>
                     </div>
                 </div>
-            </div>
+            </div> -->
         </template>
     </div>
 </template>
 
 <script setup lang="ts">
     import { ref, onMounted, watch } from 'vue'
-    import { useRoute } from "vue-router"
+    import { useRoute, useRouter } from "vue-router"
     import { queryByID } from '@/apis/PlanningAPI'
     import NotFound from '@/components/common/NotFound.vue'
 
     const route = useRoute()
+    const router = useRouter()
 
     // 璇︽儏鏁版嵁
-    let info = ref({})
+    let info:any = ref({})
 
     let loading = ref<boolean>(true)
 
@@ -158,6 +180,10 @@
                     info.value = res.data
                 }
             })
+    }
+
+    const jump = (id: any) => {
+        router.push({ name: 'workOrderReporting', query: { id } })
     }
 
     const proUserStr = (item: any) => {
@@ -296,6 +322,72 @@
             }
         }
     }
+    .details_list {
+        width: 100%;
+        height: auto;
+        background-color: #FFFFFF;
+        margin-top: 20px;
+        .details_list_item {
+            width: 100%;
+            padding: 24px 30px;
+            box-sizing: border-box;
+            background-color: #FFFFFF;
+            border-bottom: 2px solid #F7F7F7;
+            &:last-child {
+                border: none !important;
+            }
+            .details_list_item_top {
+                width: 100%;
+                display: flex;
+                align-items: center;
+                span {
+                    &:first-child {
+                        font-size: 30px;
+                        font-family: PingFangSC-Medium, PingFang SC;
+                        font-weight: 500;
+                        color: #222222;
+                        margin-right: 16px;
+                    }
+                    &:last-child {
+                        font-size: 24px;
+                        font-family: PingFangSC-Regular, PingFang SC;
+                        font-weight: 400;
+                        color: #666666;
+                    }
+                }
+            }
+            .details_list_item_center {
+                width: 100%;
+                margin: 16px 0 20px 0;
+                .red {
+                    color: #DE5243;
+                }
+                span {
+                    &:first-child {
+                        font-size: 26px;
+                        font-family: PingFangSC-Regular, PingFang SC;
+                        font-weight: 400;
+                        color: #333333;
+                        margin-right: 100px;
+                    }
+                    &:last-child {
+                        font-size: 26px;
+                        font-family: PingFangSC-Regular, PingFang SC;
+                        font-weight: 400;
+                        color: #333333;
+                    }
+                }
+            }
+            .details_list_item_bottom {
+                span {
+                    font-size: 24px;
+                    font-family: PingFangSC-Regular, PingFang SC;
+                    font-weight: 400;
+                    color: #999999;
+                }
+            }
+        }
+    }
     .details_timeline {
         padding: 30px;
         background: #ffffff;
diff --git a/h5_standard/src/views/workOrder/reportingForWork.vue b/h5_standard/src/views/workOrder/reportingForWork.vue
index 256d10c..241b071 100644
--- a/h5_standard/src/views/workOrder/reportingForWork.vue
+++ b/h5_standard/src/views/workOrder/reportingForWork.vue
@@ -697,6 +697,7 @@
             getDeviceByCondition({ procedureId: res.procedureId })
                 .then(res1 => {
                     if (res1.code === 200) {
+                        if (res1.data && res1.data.length > 0)
                         deviceId.value = res1.data[0].id
                         from.deviceId = res1.data[0].id
                         from.deviceName = res1.data[0].name
diff --git a/h5_standard/src/views/workOrder/workOrderReporting.vue b/h5_standard/src/views/workOrder/workOrderReporting.vue
index 531d7fd..b24be91 100644
--- a/h5_standard/src/views/workOrder/workOrderReporting.vue
+++ b/h5_standard/src/views/workOrder/workOrderReporting.vue
@@ -311,7 +311,8 @@
             <div class="bh_zw"></div>
             <div class="bg_footer">
                 <div class="bg_footer_submit" v-if="typeView == 0" @click="submit">纭鎶ュ伐</div>
-                <div class="bg_footer_submit1" @click="jumpdj" v-if="proxy.$auth('h5:workorder:processRecord') && typeView == 1">
+                <!-- proxy.$auth('h5:workorder:processRecord') &&  -->
+                <div class="bg_footer_submit1" @click="jumpdj" v-if="typeView == 1">
                     <img src="@/assets/icon/gongdan_ic_shoudong@2x.png" alt="" />
                     <span>鏂板鐐规</span>
                 </div>
diff --git a/minipro_standard/App.vue b/minipro_standard/App.vue
index 000f628..d1aed6d 100644
--- a/minipro_standard/App.vue
+++ b/minipro_standard/App.vue
@@ -16,7 +16,7 @@
 	/*姣忎釜椤甸潰鍏叡css */
 	@import "@/uni_modules/uview-ui/index.scss";
 	@import "common/css/lib.css";
-	page {
-		background-color: #F3F6F9 !important;
-	}
+	// page {
+	// 	background-color: #F3F6F9 !important;
+	// }
 </style>
diff --git a/minipro_standard/components/myTabber.vue b/minipro_standard/components/myTabber.vue
index 5fdc680..b8b5250 100644
--- a/minipro_standard/components/myTabber.vue
+++ b/minipro_standard/components/myTabber.vue
@@ -6,7 +6,7 @@
 			fixed
 			activeColor="#222"
 			inactiveColor="#666"
-		>
+			:safeAreaInsetBottom="true">
 			<u-tabbar-item text="寰呭姙">
 				<view class="" slot="active-icon"> 
 					<image src="@/static/nav_daiban_sel@2x.png" class="icon-style" mode=""></image>
diff --git a/minipro_standard/main.js b/minipro_standard/main.js
index 06bb2a0..a8ee7ad 100644
--- a/minipro_standard/main.js
+++ b/minipro_standard/main.js
@@ -1,32 +1,23 @@
 import Vue from 'vue'
 import App from './App'
-
-
 import mixin from './common/mixin'
-
 // 寮曞叆鍏ㄥ眬uView
 import uView from '@/uni_modules/uview-ui'
 Vue.use(uView)
-
 // vuex
 import store from './store'
 Vue.prototype.$store = store
 store.dispatch('getHeight')
-
 Vue.config.productionTip = false
-
-App.mpType = 'app'
-
+App.mpType = 'app'
 console.log(uni.$u);
 // #ifdef MP
 // 寮曞叆uView瀵瑰皬绋嬪簭鍒嗕韩鐨刴ixin灏佽
 const mpShare = require('@/uni_modules/uview-ui/libs/mixin/mpShare.js')
 Vue.mixin(mpShare)
 // #endif
-
 Vue.mixin(mixin)
-// 寮曞叆璇锋眰灏佽
-
+// 寮曞叆璇锋眰灏佽
 const app = new Vue({
 	store,
   ...App
diff --git a/minipro_standard/manifest.json b/minipro_standard/manifest.json
index 2188567..a25c0b8 100644
--- a/minipro_standard/manifest.json
+++ b/minipro_standard/manifest.json
@@ -50,14 +50,15 @@
     "quickapp" : {},
     /* 灏忕▼搴忕壒鏈夌浉鍏� */
     "mp-weixin" : {
-        "appid" : "wxf8f2d1ee4b273688",
+        "appid" : "wxcd2b89fd2ff065f8",
         "setting" : {
-            "urlCheck" : false
+            "urlCheck" : false,
+            "es6" : true,
+            "postcss" : true,
+            "minified" : true
         },
         "usingComponents" : true,
-				"requiredPrivateInfos": [
-					"getLocation"
-				],
+        "requiredPrivateInfos" : [ "getLocation" ],
         "permission" : {
             "scope.userLocation" : {
                 "desc" : "瀹炴椂涓婁紶鍥剧墖"
diff --git a/minipro_standard/pages.json b/minipro_standard/pages.json
index 5641535..cb37cc6 100644
--- a/minipro_standard/pages.json
+++ b/minipro_standard/pages.json
@@ -1,12 +1,11 @@
 {
-	"pages": [ //pages鏁扮粍涓涓�椤硅〃绀哄簲鐢ㄥ惎鍔ㄩ〉锛屽弬鑰冿細https://uniapp.dcloud.io/collocation/pages
+	"pages": [
 		{
 			"path": "pages/workbench/workbench",
 			"style": {
 				"navigationBarTitleText": "宸ヤ綔鍙�",
 				"enablePullDownRefresh": false
 			}
-		
 		},
 		{
 			"path": "pages/index/index",
@@ -26,16 +25,15 @@
             {
                 "navigationBarTitleText": "鐧诲綍",
                 "enablePullDownRefresh": false,
-								"navigationStyle": "custom"
-            }
-            
+				"navigationStyle": "custom"
+            }
         }
     ],
 	"globalStyle": {
 		"navigationBarTextStyle": "black",
 		"navigationBarTitleText": "uni-app",
-		"navigationBarBackgroundColor": "#F3F6F9",
-		"backgroundColor": "#F3F6F9"
+		"navigationBarBackgroundColor": "#ffffff",
+		"backgroundColor": "#ffffff"
 	},
 	"tabBar": {
 		"color": "#666666",
diff --git a/minipro_standard/pages/index/index.vue b/minipro_standard/pages/index/index.vue
index 7308129..c6d7304 100644
--- a/minipro_standard/pages/index/index.vue
+++ b/minipro_standard/pages/index/index.vue
@@ -1,14 +1,10 @@
 <template>
-	<view>
-		
+	<view>
 		<myTabbar :index="0" />
 	</view>
 </template>
 
 <script>
-	// import { coustomLogin, wxEmpower } from '@/util/api/index'
-
-
 	import myTabbar from "@/components/myTabber.vue"
 	export default {
 		components: {
@@ -73,5 +69,5 @@
 </script>
 
 <style lang="scss" scoped>
-
+	
 </style>
diff --git a/minipro_standard/pages/mine/mine.vue b/minipro_standard/pages/mine/mine.vue
index 417e0d4..081c8eb 100644
--- a/minipro_standard/pages/mine/mine.vue
+++ b/minipro_standard/pages/mine/mine.vue
@@ -1,8 +1,31 @@
 <template>
-	<view>
-
-		<myTabbar :index="2" />
-	</view>
+<view>
+	<div class="box">
+		<div class="box_info" :style="{background: 'url(' + img + ')'}">
+			<image src="@/static/2@2x.png" mode="widthFix" />
+			<div class="box_info_box">
+				<text>寮犱笁</text>
+				<div class="box_info_box_x">
+					<text>璞嗙背绉戞妧</text>
+					<image src="@/static/mine_ic_change@2x.png" alt="" />
+				</div>
+			</div>
+		</div>
+		<div class="box_function">
+			<div class="box_function_item" v-for="(item, index) in MENU" :key="index">
+				<div class="box_function_item_left">
+					<image :src="item.icon" alt="" />
+					<text>{{item.name}}</text>
+				</div>
+				<div class="box_function_item_right">
+					<van-icon name="arrow" size="20" color="#CCCCCC" />
+				</div>
+			</div>
+		</div>
+		<div class="box_out"><text>閫�鍑虹櫥褰�</text></div>
+	</div>
+	<myTabbar :index="2" />
+</view>
 </template>
 
 <script>
@@ -13,15 +36,19 @@
 		},
 		data() {
 			return {
-				form: {
-					account: '',
-					password: '',
-				},
-				logining: false,
-				openId: ''
+				MENU: [
+					{ name: '涓汉淇℃伅', url: '/personal/personalInformation', icon: require('@/static/mine_ic_gerenxinxi@2x.png') },
+					// { name: '绯荤粺閫氱煡', url: '', icon: require('@/assets/icon/mine_ic_xitonggonggao@2x.png') },
+					{ name: '鏇存柊鎵嬫満鍙�', url: '/personal/updatePhone', icon: require('@/static/mine_ic_shoujihao@2x.png') },
+					{ name: '鏇存柊閭鍙�', url: '/personal/updateMailbox', icon: require('@/static/mine_ic_youxianghao@2x.png') },
+					{ name: '鎵爜缁戝畾璐﹀彿', url: '', icon: require('@/static/mine_ic_bangding@2x.png') },
+					{ name: '淇敼瀵嗙爜', url: '/personal/changePassword', icon: require('@/static/mine_ic_xiugaimima@2x.png') },
+				],
+				img: require('@/static/mine_bg@2x.png')
 			}
 		},
 		onLoad() {
+			uni.hideTabBar()
 			// uni.login({
 			// 	success: data => {
 			// 		this.wxLogin(data.code)
@@ -32,43 +59,96 @@
 			// })
 		},
 		methods: {
-			// loginAction() {
-			// 	if (!this.form.account || !this.form.password) {
-			// 		uni.$u.toast('璐﹀彿鎴栬�呭瘑鐮佷笉鑳戒负绌�')
-			// 	}
-			// 	this.logining = true
-			// 	coustomLogin({...this.form, openid: this.openId})
-			// 		.then(res => {
-			// 			this.$store.commit('SETTOKEN', res.token)
-			// 			this.$store.commit('SETUSERINFO', res)
-			// 			uni.navigateTo({
-			// 				url:'/pages/projectList/projectList'
-			// 			})
-			// 		})
-			// 		.finally(() => {
-			// 			this.logining = false
-			// 		})
-			// },
-			// wxLogin(code) {
-			// 	wxEmpower({code})
-			// 		.then(res => {
-			// 			this.openId = res.openid
-			// 			if (res.userInfo) {
-			// 				this.$store.commit('SETTOKEN', res.userInfo.token)
-			// 				this.$store.commit('SETUSERINFO', res.userInfo)
-			// 				uni.navigateTo({
-			// 					url:'/pages/projectList/projectList'
-			// 				})
-			// 			} 
-			// 		})
-			// 		.catch(err => {
-			// 			uni.$u.toast(err)
-			// 		})
-			// }
 		}
 	}
 </script>
 
 <style lang="scss" scoped>
-
+	.box {
+		width: 100%;
+		padding: 30rpx;
+		box-sizing: border-box;
+		.box_info {
+			padding: 0 30rpx;
+			height: 168rpx;
+			border-radius: 16rpx;
+			display: flex;
+			align-items: center;
+			background-repeat: no-repeat;
+			background-size: cover;
+			image {
+				width: 88rpx;
+				height: 88rpx;
+			}
+			.box_info_box {
+				height: 88rpx;
+				display: flex;
+				margin-left: 30rpx;
+				flex-direction: column;
+				justify-content: space-between;
+				.box_info_box_x {
+					display: flex;
+					align-items: center;
+					text {
+						font-size: 26rpx;
+						font-weight: 400;
+						color: rgba(255, 255, 255, 0.8);
+					}
+					image {
+						width: 26rpx;
+						height: 26rpx;
+						margin-left: 10rpx;
+					}
+				}
+				text {
+					font-size: 34rpx;
+					font-weight: 500;
+					color: #FFFFFF;
+				}
+			}
+		}
+		.box_function {
+			margin-top: 30rpx;
+			.box_function_item {
+				display: flex;
+				align-items: center;
+				justify-content: space-between;
+				height: 98rpx;
+				border-bottom: 1rpx solid #E5E5E5;
+				/*&:last-child {*/
+				/*    border: none;*/
+				/*}*/
+				.box_function_item_left {
+					display: flex;
+					align-items: center;
+					image {
+						width: 36rpx;
+						height: 36rpx;
+						margin-right: 24rpx;
+					}
+					text {
+						font-size: 30rpx;
+						font-weight: 400;
+						color: #222222;
+					}
+				}
+			}
+		}
+		.box_out {
+			position: fixed;
+			bottom: 200rpx;
+			left: 50%;
+			transform: translate(-50%, 0);
+			width: 350rpx;
+			height: 88rpx;
+			background: #F7F7F7;
+			border-radius: 8rpx;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			font-size: 30rpx;
+			font-weight: 400;
+			color: #333333;
+		}
+	}
 </style>
diff --git a/minipro_standard/pages/workbench/workbench.vue b/minipro_standard/pages/workbench/workbench.vue
index 8d77569..01a623e 100644
--- a/minipro_standard/pages/workbench/workbench.vue
+++ b/minipro_standard/pages/workbench/workbench.vue
@@ -1,6 +1,21 @@
 <template>
-	<view>
-
+	<view class="index">
+		<view class="menu">
+			<view class="menu_list" v-for="(row, i) in 3" :key="i">
+				<view class="menu_list_head">
+					<span>甯哥敤鍔熻兘</span>
+				</view>
+				<div class="menu_list_list">
+					<view class="menu_list_item" v-for="item in list" :key="item.id" @click="jump(item)">
+						<image :src="item.icon" mode="widthFix" />
+						<span>{{item.label}}</span>
+					</view>
+					<view class="menu_list_zw"></view>
+					<view class="menu_list_zw"></view>
+					<view class="menu_list_zw"></view>
+				</div>
+			</view>
+		</view>
 		<myTabbar :index="1" />
 	</view>
 </template>
@@ -14,7 +29,32 @@
 		},
 		data() {
 			return {
-
+				list: [
+					{
+						icon: require('@/static/logo@2x.png'),
+						label: '娴嬭瘯'
+					},
+					{
+						icon: require('@/static/logo@2x.png'),
+						label: '娴嬭瘯'
+					},
+					{
+						icon: require('@/static/logo@2x.png'),
+						label: '娴嬭瘯'
+					},
+					{
+						icon: require('@/static/logo@2x.png'),
+						label: '娴嬭瘯'
+					},
+					{
+						icon: require('@/static/logo@2x.png'),
+						label: '娴嬭瘯'
+					},
+					{
+						icon: require('@/static/logo@2x.png'),
+						label: '娴嬭瘯'
+					}
+				]
 			};
 		},
 		onLoad() {
@@ -49,7 +89,88 @@
 		}
 	}
 </script>
-
-<style lang="scss">
-
+<style>
+	page {
+		background-color: #F7F7F7 !important;
+	}
+</style>
+<style scoped lang="scss">
+.index {
+	width: 100%;
+	.menu {
+		width: 100%;
+		display: flex;
+		flex-direction: column;
+		.menu_list {
+			display: flex;
+			flex-direction: column;
+			padding: 30rpx;
+			box-sizing: border-box;
+			margin-bottom: 20rpx;
+			background: white;
+			&:last-child {
+				margin-bottom: 0;
+			}
+			.menu_list_head {
+				width: 100%;
+				display: flex;
+				align-items: center;
+				justify-content: space-between;
+				margin-bottom: 40rpx;
+				span {
+					font-size: 32rpx;
+					font-family: PingFangSC-Medium, PingFang SC;
+					font-weight: 500;
+					color: #222222;
+				}
+			}
+			.menu_list_list {
+				width: 100%;
+				display: flex;
+				align-items: center;
+				flex-wrap: wrap;
+				justify-content: space-between;
+				.menu_list_zw {
+					width: 20%;
+					height: 0;
+				}
+				.menu_list_item {
+					width: 20%;
+					display: flex;
+					flex-direction: column;
+					align-items: center;
+					justify-content: center;
+					margin-top: 40rpx;
+					&:nth-child(1) {
+						margin: 0;
+					}
+					&:nth-child(2) {
+						margin: 0;
+					}
+					&:nth-child(3) {
+						margin: 0;
+					}
+					&:nth-child(4) {
+						margin: 0;
+					}
+					&:nth-child(5) {
+						margin: 0;
+					}
+					image {
+						width: 88rpx;
+						height: 88rpx;
+						border-radius: 24rpx;
+						overflow: hidden;
+					}
+					span {
+						font-size: 24rpx;
+						font-weight: 400;
+						color: #333333;
+						margin-top: 16rpx;
+					}
+				}
+			}
+		}
+	}
+}
 </style>
diff --git a/minipro_standard/util/request/responseInterceptors.js b/minipro_standard/util/request/responseInterceptors.js
index d2fe335..a88ed54 100644
--- a/minipro_standard/util/request/responseInterceptors.js
+++ b/minipro_standard/util/request/responseInterceptors.js
@@ -7,18 +7,18 @@
 		/* 瀵瑰搷搴旀垚鍔熷仛鐐逛粈涔� 鍙娇鐢╝sync await 鍋氬紓姝ユ搷浣�*/
 		const data = response.data
 		// 鑷畾涔夊弬鏁�
-		const custom = response.config?.custom
-		if (data.code !== 200) { // 鏈嶅姟绔繑鍥炵殑鐘舵�佺爜涓嶇瓑浜�200锛屽垯reject()
-			uni.$u.toast(data.message)
-			if (data.code === 401) {
-				// console.log('鏈櫥褰曘�佺櫥褰曞け鏁�');
-				// 鏈櫥褰曘�佺櫥褰曞け鏁�
-				uni.reLaunch({
-					url: '/pages/login/login'
-				})
-			}
-			return Promise.reject(data)
-		}
+		// const custom = response.config?.custom
+		// if (data.code !== 200) { // 鏈嶅姟绔繑鍥炵殑鐘舵�佺爜涓嶇瓑浜�200锛屽垯reject()
+		// 	uni.$u.toast(data.message)
+		// 	if (data.code === 401) {
+		// 		// console.log('鏈櫥褰曘�佺櫥褰曞け鏁�');
+		// 		// 鏈櫥褰曘�佺櫥褰曞け鏁�
+		// 		uni.reLaunch({
+		// 			url: '/pages/login/login'
+		// 		})
+		// 	}
+		// 	return Promise.reject(data)
+		// }
 		// console.log(data.data);
 		return data.data || {}
 	}, (response) => {

--
Gitblit v1.9.3