更新按钮类型

manifest.json

@@ -1,141 +1,152 @@
 {
-    "name" : "工效通APP",
-    "appid" : "__UNI__1050C07",
-    "description" : "工效通任务管理平台",
-    "versionName" : "1.2.3",
-    "versionCode" : "123",
-    "uni-app-x" : {},
-    "quickapp" : {},
-    "mp-weixin" : {
-        "appid" : "",
-        "setting" : {
-            "urlCheck" : false
-        },
-        "usingComponents" : true
-    },
-    "mp-alipay" : {
-        "usingComponents" : true
-    },
-    "mp-baidu" : {
-        "usingComponents" : true
-    },
-    "mp-toutiao" : {
-        "usingComponents" : true
-    },
-    "uniStatistics" : {
-        "enable" : false
-    },
-    "vueVersion" : "3",
-    "app" : {
-        "distribute" : {
-            "icons" : {
-                "android" : {
-                    "hdpi" : "",
-                    "xhdpi" : "",
-                    "xxhdpi" : "",
-                    "xxxhdpi" : ""
-                }
-            }
-        }
-    },
-    "app-android" : {
-        "permissions" : [
-            "<uses-permission android:name=\"android.permission.INTERNET\"/>",
-            "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
-            "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
-            "<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>",
-            "<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>"
-        ],
-        "usesCleartextTraffic" : true,
-        "abiFilters" : [ "armeabi-v7a", "arm64-v8a" ],
-        "networkSecurityConfig" : "@xml/network_security_config",
-        "distribute" : {
-            "modules" : {
-                "uni-map" : {},
-                "uni-location" : {},
-                "uni-push" : {}
-            },
-            "icons" : {
-                "hdpi" : "E:/宇光同行/工效APP/app/logo72.png",
-                "xhdpi" : "E:/宇光同行/工效APP/app/logo96.png",
-                "xxhdpi" : "E:/宇光同行/工效APP/app/logo144.png",
-                "xxxhdpi" : "E:/宇光同行/工效APP/app/logo192.png"
-            },
-            "splashScreens" : {
-                "default" : {
-                    "xhdpi" : "E:/宇光同行/工效APP/app/1.png",
-                    "xxhdpi" : "E:/宇光同行/工效APP/app/1.png",
-                    "xxxhdpi" : "E:/宇光同行/工效APP/app/1.png"
-                },
-                "icon" : {
-                    "xhdpi" : "E:/宇光同行/工效APP/app/logo.png",
-                    "xxhdpi" : "E:/宇光同行/工效APP/app/logo.png",
-                    "xxxhdpi" : "E:/宇光同行/工效APP/app/logo.png"
-                },
-                "brand" : {
-                    "xhdpi" : "E:/宇光同行/工效APP/app/logo72.png",
-                    "xxhdpi" : "E:/宇光同行/工效APP/app/logo96.png",
-                    "xxxhdpi" : "E:/宇光同行/工效APP/app/logo144.png"
-                }
-            },
-            "abiFilters" : [ "armeabi-v7a", "arm64-v8a", "x86", "x86_64" ],
-            "targetSdkVersion" : "33",
-            "minSdkVersion" : "21"
-        }
-    },
-    "app-ios" : {
-        "distribute" : {
-            "modules" : {},
-            "icons" : {
-                "appstore" : "E:/宇光同行/工效APP/app/logo1024.png"
-            },
-            "splashScreens" : {
-                "storyboard" : "E:/宇光同行/工效APP/app/CustomStoryboard/CustomStoryboard.zip"
-            }
-        }
-    },
-    "web" : {
-        "router" : {
-            "mode" : ""
-        }
-    },
-    "app-harmony" : {
-        "permissions" : [ "ohos.permission.APPROXIMATELY_LOCATION", "ohos.permission.LOCATION" ],
-        "distribute" : {
-            "modules" : {
-                "uni-location" : {
-                    "system" : {}
-                },
-                "uni-map" : {}
-            },
-            "bundleName" : "uni.app.UNI1050C07",
-            "signingConfigs" : {
-                "default" : {
-                    "certpath" : "E:\\宇光同行\\工效APP\\app\\工效通调试.cer",
-                    "keyAlias" : "key0",
-                    "keyPassword" : "00000019B6D17227C664B7E20BE328E2D91B702B87717A77247B8756CBA32D4D35D643F7740B4C1B9C",
-                    "profile" : "E:\\宇光同行\\工效APP\\app\\工效通Profile调试Debug.p7b",
-                    "signAlg" : "SHA256withECDSA",
-                    "storeFile" : "E:\\宇光同行\\工效APP\\app\\gxt-harmony.p12",
-                    "storePassword" : "0000001980ACB8587E712237AB63BDE1F726BC1DB79638CAA45AAAAC2C43A9F08424C189676126EDE2"
-                },
-                "release" : {
-                    "certpath" : "E:\\宇光同行\\工效APP\\app\\工效通.cer",
-                    "keyAlias" : "key0",
-                    "keyPassword" : "00000019129F760DCD21E365E2F07BEB288E40E4BB4060E8A34DA0AE104531B09D10A307B66141BEFC",
-                    "profile" : "E:\\宇光同行\\工效APP\\app\\工效通ProfileRelease.p7b",
-                    "signAlg" : "SHA256withECDSA",
-                    "storeFile" : "E:\\宇光同行\\工效APP\\app\\gxt-harmony.p12",
-                    "storePassword" : "0000001955A098E2704861459D885787FB0AB77F5C304B76B28996D9587A70481B6EB3563D2632DB94"
-                }
-            },
-            "splashScreens" : {
-                "startWindowIcon" : "E:/宇光同行/工效APP/app/logo.png"
-            },
-            "icons" : {
-                "foreground" : "E:/宇光同行/工效APP/app/logo1024.png",
-                "background" : "E:/宇光同行/工效APP/app/logo1024.png"
-            }
-        }
-    }
-}
+	"name": "工效通APP",
+	"appid": "__UNI__1050C07",
+	"description": "工效通任务管理平台",
+	"versionName": "1.2.4",
+	"versionCode": "124",
+	"uni-app-x": {},
+	"quickapp": {},
+	"mp-weixin": {
+		"appid": "",
+		"setting": {
+			"urlCheck": false
+		},
+		"usingComponents": true
+	},
+	"mp-alipay": {
+		"usingComponents": true
+	},
+	"mp-baidu": {
+		"usingComponents": true
+	},
+	"mp-toutiao": {
+		"usingComponents": true
+	},
+	"uniStatistics": {
+		"enable": false
+	},
+	"vueVersion": "3",
+	"app": {
+		"distribute": {
+			"icons": {
+				"android": {
+					"hdpi": "",
+					"xhdpi": "",
+					"xxhdpi": "",
+					"xxxhdpi": ""
+				}
+			}
+		}
+	},
+	"app-android": {
+		"permissions": [
+			"<uses-permission android:name=\"android.permission.INTERNET\"/>",
+			"<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
+			"<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
+			"<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>",
+			"<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>"
+		],
+		"usesCleartextTraffic": true,
+		"abiFilters": [
+			"armeabi-v7a",
+			"arm64-v8a"
+		],
+		"networkSecurityConfig": "@xml/network_security_config",
+		"distribute": {
+			"modules": {
+				"uni-map": {},
+				"uni-location": {},
+				"uni-push": {}
+			},
+			"icons": {
+				"hdpi": "E:/宇光同行/工效APP/app/logo72.png",
+				"xhdpi": "E:/宇光同行/工效APP/app/logo96.png",
+				"xxhdpi": "E:/宇光同行/工效APP/app/logo144.png",
+				"xxxhdpi": "E:/宇光同行/工效APP/app/logo192.png"
+			},
+			"splashScreens": {
+				"default": {
+					"xhdpi": "E:/宇光同行/工效APP/app/1.png",
+					"xxhdpi": "E:/宇光同行/工效APP/app/1.png",
+					"xxxhdpi": "E:/宇光同行/工效APP/app/1.png"
+				},
+				"icon": {
+					"xhdpi": "E:/宇光同行/工效APP/app/logo.png",
+					"xxhdpi": "E:/宇光同行/工效APP/app/logo.png",
+					"xxxhdpi": "E:/宇光同行/工效APP/app/logo.png"
+				},
+				"brand": {
+					"xhdpi": "E:/宇光同行/工效APP/app/logo72.png",
+					"xxhdpi": "E:/宇光同行/工效APP/app/logo96.png",
+					"xxxhdpi": "E:/宇光同行/工效APP/app/logo144.png"
+				}
+			},
+			"abiFilters": [
+				"armeabi-v7a",
+				"arm64-v8a",
+				"x86",
+				"x86_64"
+			],
+			"targetSdkVersion": "33",
+			"minSdkVersion": "21"
+		}
+	},
+	"app-ios": {
+		"distribute": {
+			"modules": {},
+			"icons": {
+				"appstore": "E:/宇光同行/工效APP/app/logo1024-1.png"
+			},
+			"splashScreens": {
+				"storyboard": "E:/宇光同行/工效APP/app/CustomStoryboard/CustomStoryboard.zip"
+			}
+		}
+	},
+	"web": {
+		"router": {
+			"mode": ""
+		}
+	},
+	"app-harmony": {
+		"permissions": [
+			"ohos.permission.APPROXIMATELY_LOCATION",
+			"ohos.permission.LOCATION"
+		],
+		"distribute": {
+			"modules": {
+				"uni-location": {
+					"system": {}
+				},
+				"uni-map": {}
+			},
+			"bundleName": "uni.app.UNI1050C07",
+			"signingConfigs": {
+				"default": {
+					"certpath": "E:\\宇光同行\\工效APP\\app\\工效通调试.cer",
+					"keyAlias": "key0",
+					"keyPassword": "00000019B6D17227C664B7E20BE328E2D91B702B87717A77247B8756CBA32D4D35D643F7740B4C1B9C",
+					"profile": "E:\\宇光同行\\工效APP\\app\\工效通Profile调试Debug.p7b",
+					"signAlg": "SHA256withECDSA",
+					"storeFile": "E:\\宇光同行\\工效APP\\app\\gxt-harmony.p12",
+					"storePassword": "0000001980ACB8587E712237AB63BDE1F726BC1DB79638CAA45AAAAC2C43A9F08424C189676126EDE2"
+				},
+				"release": {
+					"certpath": "E:\\宇光同行\\工效APP\\app\\工效通.cer",
+					"keyAlias": "key0",
+					"keyPassword": "00000019129F760DCD21E365E2F07BEB288E40E4BB4060E8A34DA0AE104531B09D10A307B66141BEFC",
+					"profile": "E:\\宇光同行\\工效APP\\app\\工效通ProfileRelease.p7b",
+					"signAlg": "SHA256withECDSA",
+					"storeFile": "E:\\宇光同行\\工效APP\\app\\gxt-harmony.p12",
+					"storePassword": "0000001955A098E2704861459D885787FB0AB77F5C304B76B28996D9587A70481B6EB3563D2632DB94"
+				}
+			},
+			"splashScreens": {
+				"startWindowIcon": "E:/宇光同行/工效APP/app/logo.png"
+			},
+			"icons": {
+				"foreground": "E:/宇光同行/工效APP/app/logo1024.png",
+				"background": "E:/宇光同行/工效APP/app/logo1024.png"
+			}
+		}
+	}
+}

pages/order/detail/resetIndex.uvue

@@ -214,7 +214,7 @@
 				returnTypeOptions.value = options
 	        }
 	    } catch (e: any) {
-	        console.error('获取挂起原因失败:', e.message)
+	        console.error('获取复启原因失败:', e.message)
 	    }
 	}
 
@@ -259,7 +259,7 @@
 			const code = resultObj['code'] as number
 			if (code == 200) {
 				uni.showToast({
-					title: '挂起成功',
+					title: '复启成功',
 					icon: 'success'
 				})
 				hasDealed.value = true
@@ -282,7 +282,7 @@
 		} catch (error: any) {
 		    console.error('请求失败:', error);
 			uni.showToast({
-			    title: error.message ?? '挂起失败',
+			    title: error.message ?? '复启失败',
 			    icon: 'none'
 			})
 		} finally {

pages/order/index.uvue

@@ -101,62 +101,62 @@
 							</view>
 						</view>
 						<view class="btn-group">
-							<button
+							<view
 								v-if="getOrderStatus(item) == 'assigned' && canHandleOrder(item,'accept')"
 								class="btn-primary info-value"
 								@click.stop="handleItemClick(item,'')"
 								>
-								接单
-							</button>
-							<button
+								<text class="btn-text">接单</text>
+							</view>
+							<view
 								v-if="getOrderStatus(item) == 'to_approve' && canHandleOrder(item,'')"
 								class="btn-primary info-value"
 								@click.stop="handleItemClick(item,'')"
 								>
-								审批
-							</button>
-							<button
+								<text class="btn-text">审批</text>
+							</view>
+							<view
 								v-if="getOrderStatus(item) == 'suspended' && canHandleOrder(item,'')"
 								class="btn-primary info-value"
 								@click.stop="handleItemClick(item,'')"
 								>
-								恢复
-							</button>
-							<button
+								<text class="btn-text">恢复</text>
+							</view>
+							<view
 								v-if="getOrderStatus(item) == 'return' && canHandleOrder(item,'acceptReturn')"
 								class="btn-primary info-value"
 								@click.stop="handleItemClick(item,'acceptReturn')"
 								>
-								退回
-							</button>
-							<button
+								<text class="btn-text">退回</text>
+							</view>
+							<view
 								v-if="getOrderStatus(item) == 'assigned' && canHandleOrder(item,'acceptReturn')"
 								class="btn-primary info-value"
 								@click.stop="handleItemClick(item,'acceptReturn')"
 								>
-								退回
-							</button>
-							<button
+								<text class="btn-text">退回</text>
+							</view>
+							<view
 								v-if="getOrderStatus(item) == 'to_finish' && canHandleOrder(item, 'return')"
 								class="btn-primary info-value"
 								@click.stop="handleItemClick(item, 'return')"
 								>
-								退回
-							</button>
-							<button
+								<text class="btn-text">退回</text>
+							</view>
+							<view
 								v-if="getOrderStatus(item) == 'to_finish' && canHandleOrder(item, 'suspend')"
 								class="btn-primary info-value"
 								@click.stop="handleItemClick(item, 'suspend')"
 								>
-								挂起
-							</button>
-							<button
+								<text class="btn-text">挂起</text>
+							</view>
+							<view
 								v-if="getOrderStatus(item) == 'to_finish' && canHandleOrder(item, 'finalize')"
 								class="btn-primary info-value"
 								@click.stop="handleItemClick(item, 'finalize')"
 								>
-								复启
-							</button>
+								<text class="btn-text">复启</text>
+							</view>
 						</view>
                     </view>
                 </view>
@@ -802,7 +802,12 @@ const statusConfig: StatusItem[] = [
 		margin-left: 20rpx;
 		background-color: #165DFF;
 		line-height: 45rpx;
-	    color: #ffffff;
+		color: #ffffff;
+		.btn-text{
+			color: #ffffff;
+			font-size: 24rpx;
+			padding: 5px 15px;
+		}
 	}
 .item-header {
   flex-direction: row;

pages/order/overdue.uvue

@@ -32,13 +32,13 @@
 								<text class="text-gray">{{ getCreateTime(item) }}</text>
 							</view>
 							<view class="info-value">
-								<button
+								<view
 									v-if="canHandleOrder(item)"
 									class="btn-primary info-value"
 									@click.stop="handleItemClick(item)"
 									>
-									接单
-								</button>
+									<text class="btn-text">接单</text>
+								</view>
 								</view>
 						</view>
                     </view>
@@ -507,11 +507,16 @@ import {checkPermi} from '../../utils/storage'
 	z-index: 999;
 	border-radius: 10rpx;
 	font-size: 24rpx;
-	white-space: nowrap;
+	// white-space: nowrap;
 	margin-left: 20rpx;
 	background-color: #165DFF;
 	line-height: 45rpx;
 	color: #ffffff;
+	.btn-text{
+		color: #ffffff;
+		font-size: 24rpx;
+		padding: 5px 15px;
+	}
 }
 
 // /* 超时 */

pages/order/pendingOrder.uvue

@@ -32,20 +32,20 @@
 								<text class="text-gray">{{ getDisplayTime(item) }}</text>
 							</view>
 							<view class="info-value">
-								<button
+								<view
 									v-if="getOrderStatus(item) == 'assigned' && canHandleOrder(item)"
 									class="btn-primary info-value"
 									@click.stop="handleItemClick(item)"
 									>
-									接单
-								</button>
-								<button
+									<text class="btn-text">接单</text>
+								</view>
+								<view
 									v-else-if="getOrderStatus(item) == 'to_approve' && canHandleOrder(item)"
 									class="btn-primary info-value"
 									@click.stop="handleItemClick(item)"
 									>
-									审批
-								</button>
+									<text class="btn-text">审批</text>
+								</view>
 								<!-- <button
 									v-else-if="getOrderStatus(item) == 'to_finish' && canHandleOrder(item)"
 									class="btn-primary info-value"
@@ -53,13 +53,13 @@
 									>
 									挂起
 								</button> -->
-								<button
+								<view
 									v-else-if="getOrderStatus(item) == 'suspended' && canHandleOrder(item)"
 									class="btn-primary info-value"
 									@click.stop="handleItemClick(item)"
 									>
-									恢复
-								</button>
+									<text class="btn-text">恢复</text>
+								</view>
 							</view>
 						</view>
                     </view>
@@ -599,11 +599,16 @@ import {checkPermi} from '../../utils/storage'
 	z-index: 999;
 	border-radius: 10rpx;
 	font-size: 24rpx;
-	white-space: nowrap;
+	// white-space: nowrap;
 	margin-left: 20rpx;
 	background-color: #165DFF;
 	line-height: 45rpx;
 	color: #ffffff;
+	.btn-text{
+		color: #ffffff;
+		font-size: 24rpx;
+		padding: 5px 15px;
+	}
 }
 
 // /* 超时 */