diff --git a/manifest.json b/manifest.json index 8a86db5..9bf4449 100644 --- a/manifest.json +++ b/manifest.json @@ -1,6 +1,6 @@ { - "name" : "若依移动端", - "appid" : "__UNI__25A9D80", + "name" : "贵州安全工机具", + "appid" : "__UNI__81194DA", "description" : "", "versionName" : "1.1.0", "versionCode" : "100", @@ -14,7 +14,9 @@ "autoclose" : true, "delay" : 0 }, - "modules" : {}, + "modules" : { + "Camera" : {} + }, "distribute" : { "android" : { "permissions" : [ @@ -33,10 +35,22 @@ "", "", "" - ] + ], + "abiFilters" : [ "armeabi-v7a", "arm64-v8a", "x86" ] }, - "ios" : {}, - "sdkConfigs" : {} + "ios" : { + "privacyDescription" : { + "NSPhotoLibraryUsageDescription" : "该应用需要读取你的相册,以便为你编辑信息", + "NSPhotoLibraryAddUsageDescription" : "该应用需要读取你的相册,以便为你编辑信息", + "NSCameraUsageDescription" : "该应用需要你的相机,以便为你编辑信息", + "NSLocalNetworkUsageDescription" : "该应用需要你的网络,以便为你编辑信息" + }, + "idfa" : false, + "dSYMs" : false + }, + "sdkConfigs" : { + "ad" : {} + } } }, "quickapp" : {}, @@ -60,7 +74,7 @@ "port" : 9090, "https" : false }, - "title" : "RuoYi-App", + "title" : "贵州安全工机具", "router" : { "mode" : "hash", "base" : "./" diff --git a/pages/arrivalConfirmation/index.vue b/pages/arrivalConfirmation/index.vue index 98e220f..02f78be 100644 --- a/pages/arrivalConfirmation/index.vue +++ b/pages/arrivalConfirmation/index.vue @@ -12,7 +12,7 @@ > -
+
{{ item.name }}
@@ -193,6 +193,18 @@ export default { console.log('🚀 ~ selectImg ~ err:', err) } }) + }, + handleDetail(item) { + console.log('🚀 ~ handleDetail ~ item', item) + const params = { + isDetail: true, + // 到货 + isArrival: true, + active: 1, + } + uni.navigateTo({ + url: `/pages/sendACarSystem/details?params=${JSON.stringify(params)}` + }) } } } diff --git a/pages/sendACarSystem/components/AuditRecord.vue b/pages/sendACarSystem/components/AuditRecord.vue index b1e4ea8..5c0c618 100644 --- a/pages/sendACarSystem/components/AuditRecord.vue +++ b/pages/sendACarSystem/components/AuditRecord.vue @@ -1,25 +1,128 @@ \ No newline at end of file + .left-item { + display: flex; + align-items: center; + } + .circle { + width: 8px; + height: 8px; + border: 3px solid #409eff; + border-radius: 50%; + margin-right: 15px; + } + + .time { + margin-right: 15px; + display: flex; + align-items: center; + } + } + .item-cont { + margin: 20px 0 20px 50px; + padding: 10px; + background-color: #fff; + color: #666; + border-radius: 8px; + box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.1); + display: flex; + align-items: flex-start; + } +} + diff --git a/pages/sendACarSystem/components/PlanAuditDetails.vue b/pages/sendACarSystem/components/PlanAuditDetails.vue new file mode 100644 index 0000000..5154024 --- /dev/null +++ b/pages/sendACarSystem/components/PlanAuditDetails.vue @@ -0,0 +1,338 @@ + + + + + diff --git a/pages/sendACarSystem/components/PlanDetails.vue b/pages/sendACarSystem/components/PlanDetails.vue index 93040bd..b2281e5 100644 --- a/pages/sendACarSystem/components/PlanDetails.vue +++ b/pages/sendACarSystem/components/PlanDetails.vue @@ -1,25 +1,237 @@ \ No newline at end of file + .list-item { + padding: 5px 15px; + + .title { + color: #999; + } + + div { + line-height: 1.9; + } + span { + line-height: 1.5; + } + } +} +.btn-wrap { + width: 100%; + position: fixed; + bottom: 0; + left: 0; + background-color: #fff; + padding: 15px 0 20px; +} +.slot-content { + width: 100%; + height: 100%; + .item-wrap { + margin-bottom: 15px; + width: 100%; + height: 100%; + display: flex; + justify-content: space-between; + align-items: center; + + .item { + width: 45%; + height: 30px; + display: flex; + justify-content: center; + align-items: center; + border: 1px solid #e8e8e8; + border-radius: 30px; + background-color: #f8f8f8; + color: #666; + font-size: 16px; + font-weight: 500; + transition: color 0.3s ease, background-color 0.3s ease, border 0.3s ease; + + &.active { + color: $u-primary; + background-color: #f8f8f8; + border: 1px solid $u-primary; + } + } + } +} + diff --git a/pages/sendACarSystem/components/SendCarDetails.vue b/pages/sendACarSystem/components/SendCarDetails.vue deleted file mode 100644 index 5f11906..0000000 --- a/pages/sendACarSystem/components/SendCarDetails.vue +++ /dev/null @@ -1,25 +0,0 @@ - - - - - \ No newline at end of file diff --git a/pages/sendACarSystem/details.vue b/pages/sendACarSystem/details.vue index 401e6c6..df78dda 100644 --- a/pages/sendACarSystem/details.vue +++ b/pages/sendACarSystem/details.vue @@ -1,290 +1,50 @@