Преглед изворни кода

1.0版本---拨打电话、首页流转步骤排版

qianduan пре 11 месеци
родитељ
комит
ef6ab377ef
43 измењених фајлова са 917 додато и 286 уклоњено
  1. 7 4
      .env.js
  2. 29 4
      App.vue
  3. 92 0
      common/downApp.js
  4. 3 3
      components/TreeItem.vue
  5. 13 1
      components/orderManagement.vue
  6. 22 8
      manifest.json
  7. 7 1
      pages.json
  8. 115 99
      pages/home/index.vue
  9. 23 6
      pages/home/selectStore.vue
  10. 75 90
      pages/index/codeTracing.vue
  11. 127 4
      pages/indexRouter.vue
  12. 12 10
      pages/mine/index.vue
  13. 8 2
      pages/order/completionTasks.vue
  14. 93 19
      pages/order/delivery.vue
  15. 22 3
      pages/order/orderDetails.vue
  16. 177 0
      pages/order/quickMark.vue
  17. BIN
      unpackage/cache/apk/__UNI__10C0A5F_cm.apk
  18. 1 1
      unpackage/cache/apk/apkurl
  19. 0 0
      unpackage/cache/apk/cmManifestCache.json
  20. 1 1
      unpackage/cache/certdata
  21. 0 0
      unpackage/cache/wgt/__UNI__10C0A5F/__uniappquill.js
  22. 0 0
      unpackage/cache/wgt/__UNI__10C0A5F/__uniappquillimageresize.js
  23. 2 2
      unpackage/cache/wgt/__UNI__10C0A5F/app-config-service.js
  24. 0 0
      unpackage/cache/wgt/__UNI__10C0A5F/app-service.js
  25. 0 0
      unpackage/cache/wgt/__UNI__10C0A5F/app-view.js
  26. 0 0
      unpackage/cache/wgt/__UNI__10C0A5F/manifest.json
  27. 0 0
      unpackage/cache/wgt/__UNI__10C0A5F/view.umd.min.js
  28. 0 0
      unpackage/dist/build/app-plus/__uniappquill.js
  29. 0 0
      unpackage/dist/build/app-plus/__uniappquillimageresize.js
  30. 2 2
      unpackage/dist/build/app-plus/app-config-service.js
  31. 0 0
      unpackage/dist/build/app-plus/app-service.js
  32. 0 0
      unpackage/dist/build/app-plus/app-view.js
  33. 0 0
      unpackage/dist/build/app-plus/manifest.json
  34. 0 0
      unpackage/dist/build/app-plus/view.umd.min.js
  35. 0 0
      unpackage/dist/dev/app-plus/__uniappquill.js
  36. 0 0
      unpackage/dist/dev/app-plus/__uniappquillimageresize.js
  37. 2 2
      unpackage/dist/dev/app-plus/app-config-service.js
  38. 0 0
      unpackage/dist/dev/app-plus/app-service.js
  39. 84 24
      unpackage/dist/dev/app-plus/app-view.js
  40. 0 0
      unpackage/dist/dev/app-plus/manifest.json
  41. 0 0
      unpackage/dist/dev/app-plus/view.umd.min.js
  42. BIN
      unpackage/release/apk/__UNI__10C0A5F__20240513130801.apk
  43. BIN
      unpackage/release/apk/__UNI__10C0A5F__20240513132654.apk

+ 7 - 4
.env.js

@@ -1,9 +1,12 @@
 const UNI_APP = {
-	APP_DEV_URL: 'http://192.168.11.77:6500',
-	APP_PROD_URL: 'http://192.168.11.77:6500',
-	
+	// APP_DEV_URL: 'http://192.168.11.77:6500',
+	// APP_PROD_URL: 'http://192.168.11.77:6500',
+
+	APP_DEV_URL: 'https://gascylinder.baozhida.cn/gas_cylinder', //线上
+	APP_PROD_URL: 'https://gascylinder.baozhida.cn/gas_cylinder', //线上
+
 	AES_KEY: "675I3123J3Toq10L",
 	AES_IV: "AdC01PoIU3LnSh10",
 }
 
-module.exports = UNI_APP;
+module.exports = UNI_APP;

+ 29 - 4
App.vue

@@ -1,20 +1,45 @@
 <script>
+	import {
+		checkUpdateApp
+	} from './common/downApp.js';
 	// 燃气瓶app
 	export default {
 		onLaunch: function() {
 			var token = this.$cache.getToken()
 			if (token) {
 				uni.redirectTo({
-					url: '/pages/indexRouter'
+					url: '/pages/indexRouter',
+					success: () => {
+						//跳转完页面后再关闭启动页
+						// #ifdef APP-PLUS 
+						plus.navigator.closeSplashscreen();
+						// #endif
+					}
 				})
 			}
-			console.log('App Launch')
+			// console.log('App Launch')
 		},
 		onShow: function() {
-			console.log('App Show')
+			// #ifdef APP-PLUS 
+			uni.getSystemInfo({
+				success: (res) => {
+					var that = this;
+					//检测当前平台,如果是安卓则启动安卓更新  
+					if (res.platform == "android") {
+						checkUpdateApp();
+					}
+				}
+			})
+			// #endif
+			setTimeout(() => {
+				// #ifdef APP-PLUS 
+				plus.navigator.closeSplashscreen()
+				// #endif
+			}, 2000)
+			// console.log('App Show')
 		},
 		onHide: function() {
-			console.log('App Hide')
+			// console.log('App Hide')
 		}
 	}
 </script>

+ 92 - 0
common/downApp.js

@@ -0,0 +1,92 @@
+export function checkUpdateApp() {
+	plus.runtime.getProperty(plus.runtime.appid, function(widgetinfo) {
+		if (widgetinfo.name == '气瓶安全追溯') {
+			uni.request({
+				url: 'https://www.pgyer.com/apiv2/app/check',
+				data: {
+					_api_key: '202eadee73f2051186b26106cc8bfed1',
+					appKey: '7516f44eee8b3b0af4d0d783c8a99ca7'
+				},
+				success: check => {
+					if (check.statusCode == 200 && check.data.code == 0 && check.data.data) {
+						let data = check.data.data;
+						let version = widgetinfo.version,
+							appVersion = data.buildVersion,
+							appName = widgetinfo.name,
+							appurl = data.downloadURL,
+							intro = '发现新的《气瓶安全追溯》APP,需要更新APP';
+
+						if (data && version < appVersion) {
+							uni.showModal({
+								title: '更新提示',
+								confirmText: '立即升级',
+								content: intro,
+								success: res => {
+									if (res.confirm) {
+										uni.showLoading({
+											title: '正在更新',
+											mask: true
+										});
+										uni.downloadFile({
+											url: appurl,
+											success: download => {
+												if (download.statusCode ==
+													200) {
+													plus.runtime.install(
+														download
+														.tempFilePath, {
+															force: false
+														},
+														() => {
+															uni
+														.hideLoading();
+															plus.runtime
+																.restart(); //更新成功启动
+														},
+														err => {
+															uni
+														.hideLoading();
+															uni.showToast({
+																title: '更新失败,将跳转下载页面',
+																icon: 'none',
+																duration: 2000
+															});
+														}
+													);
+													setTimeout(function() {
+														plus.runtime
+															.openURL(
+																appurl
+																);
+													}, 2000);
+												}
+											}
+										});
+									} else if (res.cancel) {
+										console.log('用户点击取消');
+										uni.showToast({
+											title: '低版本无法继续使用,请先升级',
+											icon: 'none',
+											duration: 2000
+										});
+										//退出app
+										setTimeout(function() {
+											plus.runtime.quit();
+										}, 2000);
+									}
+								},
+								fail: () => {
+									uni.hideLoading();
+								}
+							});
+						} else {
+							console.log('暂无新版本=====')
+						}
+					}
+				}
+			});
+		} else {
+			//非安卓
+		}
+	});
+}

+ 3 - 3
components/TreeItem.vue

@@ -10,7 +10,7 @@
 				<view class="name_tree_item">{{ item.name }}</view>
 			</view>
 			<view>
-				<u-button type="primary" text="确定" @click="choice(item)"></u-button>
+				<u-button type="primary" size="small" text="确定" @click="choice(item)"></u-button>
 			</view>
 		</view>
 		<view v-if="item.children && item.children.length && expanded">
@@ -35,7 +35,7 @@
 			choice(value) {
 				this.$emit('confirm', value.cmpCode)
 			},
-			confirm(cmpCode){
+			confirm(cmpCode) {
 				this.$emit('confirm', cmpCode)
 			}
 		}
@@ -47,7 +47,7 @@
 		display: flex;
 		align-items: center;
 		justify-content: space-between;
-		padding: 20rpx;
+		padding: 20rpx 20rpx;
 		border-bottom: 1rpx solid #dfdfdf;
 	}
 

+ 13 - 1
components/orderManagement.vue

@@ -17,6 +17,9 @@
 						<view class="details_title" style="color: #5ac725;" v-if="item.state == 3">已送达</view>
 						<view class="details_title" style="color: #f56c6c;" v-else-if="item.state == 4">已取消</view>
 					</view>
+					<view v-if="item.state == 1 || item.state == 2">
+						<view class="details_title" style="color: #3c9cff;">待配送</view>
+					</view>
 				</view>
 				<view class="item_num">×{{item.quantity}}</view>
 				<view class="item_address">配送地址:{{item.address}}</view>
@@ -86,7 +89,15 @@
 				this.$emit('toDeliver', row)
 			},
 			phone(phone) {
-				console.log(phone, 66)
+				uni.makePhoneCall({
+					phoneNumber: phone,
+					success: () => {
+						console.log('拨打电话成功!');
+					},
+					fail: () => {
+						console.error('拨打电话失败!');
+					}
+				});
 			}
 		}
 	}
@@ -122,6 +133,7 @@
 		font-size: 26rpx;
 		font-weight: 500;
 	}
+
 	.item_address {
 		display: flex;
 		align-items: center;

+ 22 - 8
manifest.json

@@ -2,8 +2,8 @@
     "name" : "气瓶安全追溯",
     "appid" : "__UNI__10C0A5F",
     "description" : "",
-    "versionName" : "1.0.0",
-    "versionCode" : "100",
+    "versionName" : "1.0.2",
+    "versionCode" : 102,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
@@ -11,13 +11,18 @@
         "nvueStyleCompiler" : "uni-app",
         "compilerVersion" : 3,
         "splashscreen" : {
-            "alwaysShowBeforeRender" : true,
-            "waiting" : true,
-            "autoclose" : true,
+            "alwaysShowBeforeRender" : false,
+            "waiting" : false,
+            "autoclose" : false,
             "delay" : 0
         },
         /* 模块配置 */
-        "modules" : {},
+        "modules" : {
+            "Barcode" : {},
+            "Camera" : {},
+            "Geolocation" : {},
+            "Contacts" : {}
+        },
         /* 应用发布信息 */
         "distribute" : {
             /* android打包配置 */
@@ -37,7 +42,8 @@
                     "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
                     "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
                     "<uses-feature android:name=\"android.hardware.camera\"/>",
-                    "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
+                    "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>",
+                    "<uses-permission android:name=\"android.permission.CALL_PHONE\"/>"
                 ]
             },
             /* ios打包配置 */
@@ -53,7 +59,15 @@
                         "appkey_android" : ""
                     }
                 },
-                "ad" : {}
+                "ad" : {},
+                "geolocation" : {
+                    "amap" : {
+                        "name" : "amapzQIiQLSo",
+                        "__platform__" : [ "ios", "android" ],
+                        "appkey_ios" : "1",
+                        "appkey_android" : "7028f3aea610975785759385ccfb0a1f"
+                    }
+                }
             },
             "icons" : {
                 "android" : {

+ 7 - 1
pages.json

@@ -11,7 +11,7 @@
 			"style": {
 				"navigationStyle": "custom"
 			}
-		},{
+		}, {
 			"path": "pages/indexRouter",
 			"style": {
 				"navigationStyle": "custom"
@@ -92,6 +92,12 @@
 			}
 		},
 		{
+			"path": "pages/order/quickMark",
+			"style": {
+				"navigationStyle": "custom"
+			}
+		},
+		{
 			"path": "pages/order/completionTasks",
 			"style": {
 				"navigationStyle": "custom"

+ 115 - 99
pages/home/index.vue

@@ -1,14 +1,14 @@
 <template>
 	<!-- 首页 -->
-	<view>
+	<view class="card_index_bgc">
 		<view class="card_gas_cylinder">气瓶安全追溯管理系统</view>
 		<view class="card_port center_in">{{genreTitle}}</view>
 		<view class="card_cylinder">
 			<view class="card_bottle" v-for="(item,index) in dataList" :key="index" @click="scanCodes(item)">
 				<view class="card_fiche" :style="{backgroundColor:item.color}">
 					<span class="iconfont icon_image" :class="item.icon"></span>
-					<view class="title_hint">{{item.title}}</view>
 				</view>
+				<view class="title_hint">{{item.title}}</view>
 			</view>
 			<!-- <view class="card_bottle" @click="scanning">
 				<view class="card_fiche" :style="{backgroundColor:'#67C23A'}">
@@ -16,110 +16,63 @@
 					<view class="title_hint">扫码查询气瓶流转信息</view>
 				</view>
 			</view> -->
-			<view style="width: 40%;margin: 30rpx 0rpx;"></view>
+			<view style="width: 25%;"></view>
+			<view style="width: 25%;"></view>
+			<view style="width: 25%;"></view>
+		</view>
+		<view class="card_cylinder border_top">
+			<view class="card_bottle" v-for="(item,index) in addList" :key="index" @click="scanCodes(item)">
+				<view class="card_fiche" :style="{backgroundColor:item.color}">
+					<span class="iconfont icon_image" :class="item.icon"></span>
+				</view>
+				<view class="title_hint">{{item.title}}</view>
+			</view>
+			<view style="width: 25%;margin: 30rpx 0rpx;"></view>
+			<view style="width: 25%;margin: 30rpx 0rpx;"></view>
 		</view>
 	</view>
 </template>
 
 <script>
 	export default {
+		props: {
+			dataList: {
+				type: Array,
+				default: []
+			},
+			genreTitle: {
+				type: String,
+				default: ''
+			},
+		},
 		data() {
 			return {
-				dataList: [],
-				aspirated: [{
-					id: '25',
-					title: '领重瓶出库',
-					icon: 'icon-chukudan',
-					color: '#22b9f9',
-				}, {
-					id: '27',
-					title: '扫空瓶入库',
-					icon: 'icon-fankudengji',
-					color: '#6db1ff',
-				}],
-				shopList: [{
-					id: '37',
-					title: '门店重瓶出库',
-					icon: 'icon-peizaizhuangche',
-					color: '#f4b237',
-				}, {
-					id: '10',
-					title: '门店空瓶出库',
-					icon: 'icon-peizaizhuangche-xianxing',
-					color: '#f4b237',
-				}, {
-					id: '21',
-					title: '门店回收空瓶',
-					icon: 'icon-recycling',
-					color: '#8ac247',
-				}, {
-					id: '35',
-					title: '门店确定未配送重瓶返库',
-					icon: 'icon-fankudengji',
-					color: '#22b9f9',
-				}, {
-					id: '33',
-					title: '门店将重瓶退回司机',
-					icon: 'icon-tuihuo',
-					color: '#6db1ff',
-				}],
-				driverList: [{
-					id: '11',
-					title: '司机确定空瓶装车',
-					icon: 'icon-owNote',
-					color: '#22b9f9',
-				}, {
-					id: '12',
-					title: '司机运输空瓶到达气站',
-					icon: 'icon-yidaoda',
-					color: '#8ac247',
-				}, {
-					id: '17',
-					title: '司机确定重瓶从气站出库',
-					icon: 'icon-chukudan',
-					color: '#6db1ff',
+				addList: [{
+					id: 'add',
+					title: '扫码添加钢瓶',
+					icon: 'icon-saoyisao',
+					color: '#1ee94d',
 				}, {
-					id: '19',
-					title: '司机交付门店',
-					icon: 'icon-yunsonghejiaofu',
-					color: '#f4b237',
+					id: 'step',
+					title: '气瓶流转信息',
+					icon: 'icon-saomachaxun',
+					color: '#195eea',
 				}],
-				stationList: [{
-					id: 'inspect',
-					title: '充气前后检查',
-					icon: 'icon-jianchaxiang',
-					color: '#f4b237',
-				}],
-				genreTitle: '',
-			}
-		},
-		mounted() {
-			var userInfo = this.$cache.getCache('userInfo')
-			if (userInfo.provUser) {
-				if (userInfo.provUser.isorders == 0 && userInfo.provUser.userType == 3) {
-					this.dataList = this.aspirated
-					this.genreTitle = '送气员端'
-				} else if (userInfo.provUser.userType == 3) {
-					this.dataList = this.shopList
-					this.genreTitle = '门店端'
-				} else if (userInfo.provUser.userType == 4) {
-					this.dataList = this.driverList
-					this.genreTitle = '司机端'
-				} else if (userInfo.provUser.userType == 5) {
-					this.dataList = this.stationList
-					this.genreTitle = '气站端'
-				}
-			} else {
-				this.dataList = this.aspirated
-				this.genreTitle = '送气员端'
 			}
 		},
+		mounted() {},
 		methods: {
 			scanCodes(value) {
 				if (['25', '27', '11', '12', '17', '19'].includes(value.id)) {
 					uni.navigateTo({
 						url: '/pages/home/selectStore?id=' + value.id + '&title=' + value.title
 					});
+				} else if (value.id == 'add') {
+					uni.navigateTo({
+						url: '/pages/order/quickMark?id=' + value.id + '&title=' + value.title
+					});
+				} else if (value.id == 'step') {
+					this.getInformation()
 				} else {
 					uni.navigateTo({
 						url: '/pages/order/delivery?id=' + value.id + '&title=' + value.title
@@ -131,12 +84,65 @@
 				uni.navigateTo({
 					url: '/pages/index/codeTracing'
 				});
-			}
+			},
+			getInformation() {
+				// 允许从相机和相册扫码
+				uni.scanCode({
+					scanType: ['qrCode'],
+					autoZoom: false,
+					success: (res) => {
+						console.log(res, '--------');
+						if (res.result) {
+							let url = res.result;
+							const arrf = url.split('=')
+							this.unitCoding(arrf[1])
+						} else {
+							console.log('请重新扫描');
+							return false;
+						}
+					},
+					fail: (res) => {
+						console.log('未识别到二维码1');
+					}
+				})
+			},
+			// 单位内编码获取
+			unitCoding(qrid) {
+				uni.showLoading({
+					title: '加载中'
+				});
+				uni.request({
+					url: 'http://qr.uinshine.com:9000/CommonAPI/product/getDetails', //仅为示例,并非真实接口地址。
+					method: 'POST',
+					header: {
+						'content-type': 'application/x-www-form-urlencoded', // 默认值
+					},
+					data: {
+						qr_id: qrid,
+					},
+					success: (res) => {
+						if (res.data.code == 0) {
+							var arr = res.data.data
+							// this.frequencyCoding = arr.inner_code
+							uni.hideLoading();
+							uni.navigateTo({
+								url: '/pages/index/codeTracing?code=' + arr.inner_code
+							});
+						}
+					}
+				});
+			},
 		}
 	}
 </script>
 
 <style lang="scss">
+	.card_index_bgc {
+		padding-top: constant(safe-area-inset-top);
+		padding-top: env(safe-area-inset-top);
+		background-image: linear-gradient(#a9e3f1, #f3f4f6, #ffffff);
+	}
+
 	.card_gas_cylinder {
 		display: flex;
 		justify-content: center;
@@ -158,12 +164,17 @@
 		display: flex;
 		flex-direction: row;
 		flex-wrap: wrap;
-		justify-content: space-evenly;
+		justify-content: space-between;
+		margin: 30rpx;
+		background-color: #fff;
+		border-radius: 20rpx;
+		padding: 20rpx 0rpx;
+		box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
 	}
 
 	.card_bottle {
-		margin: 30rpx 0rpx;
-		width: 40%;
+		width: 25%;
+		margin: 10rpx 0rpx;
 		display: flex;
 		flex-direction: column;
 		align-items: center;
@@ -174,22 +185,27 @@
 		align-items: center;
 		flex-direction: column;
 		justify-content: center;
-		width: 100%;
-		height: 240rpx;
+		width: 120rpx;
+		height: 120rpx;
 		background-color: #027DB4;
 		border-radius: 26rpx;
 	}
 
 	.icon_image {
 		color: #fff;
-		font-size: 80rpx;
+		font-size: 70rpx;
 	}
 
 	.title_hint {
-		margin-top: 20rpx;
-		color: #fff;
-		width: 80%;
+		// height: 78rpx;
+		margin-top: 10rpx;
+		color: #606266;
+		width: 90%;
 		text-align: center;
-		font-size: 32rpx;
+		font-size: 26rpx;
+	}
+
+	.border_top {
+		padding-top: 30rpx;
 	}
 </style>

+ 23 - 6
pages/home/selectStore.vue

@@ -2,7 +2,12 @@
 	<!-- 选择门店 -->
 	<view>
 		<u-navbar border title="选择门店" autoBack placeholder></u-navbar>
-		<tree-item v-for="item in treeData" :key="item.id" :item="item" @confirm="confirm"></tree-item>
+		<view v-if="treeData.length > 0">
+			<tree-item v-for="item in treeData" :key="item.id" :item="item" @confirm="confirm"></tree-item>
+		</view>
+		<view style="margin-top: 30%;" v-else>
+			<u-empty mode="list" text="门店列表为空"></u-empty>
+		</view>
 	</view>
 </template>
 
@@ -26,11 +31,23 @@
 		},
 		methods: {
 			getList() {
-				this.$api.get('/api/store/all').then(res => {
-					if (res.code == 200) {
-						this.treeData = res.data
-					}
-				})
+				if (this.selectiveType == '25' || this.selectiveType == '27') {
+					this.$api.get('/api/store/all2').then(res => {
+						if (res.code == 200) {
+							if (res.data) {
+								this.treeData = res.data
+							}
+						}
+					})
+				} else {
+					this.$api.get('/api/store/all').then(res => {
+						if (res.code == 200) {
+							if (res.data) {
+								this.treeData = res.data
+							}
+						}
+					})
+				}
 			},
 			// 选择门店
 			confirm(cmpCode) {

+ 75 - 90
pages/index/codeTracing.vue

@@ -1,20 +1,13 @@
 <template>
 	<view class="card_code_tracing">
-		<u-navbar border title="二维码溯源" autoBack placeholder></u-navbar>
-		<view class="card_order_details">
-			<view class="details_title">高频编码 <span class="line_title">*</span></view>
-			<view class="card_search">
-				<view class="card_sweep" @click="sweep">
-					<u-icon name="scan" size="36"></u-icon>
-					<view class="scan_title">扫一扫</view>
-				</view>
-				<view class="card_input">
-					<u-input border="surround" v-model="frequencyCoding">
-						<template slot="suffix">
-							<u-icon name="search" size="26" @click="traceSource"></u-icon>
-						</template>
-					</u-input>
-				</view>
+		<u-navbar title="二维码溯源" autoBack placeholder></u-navbar>
+		<!-- <view class="details_title">二维码溯源</view> -->
+		<view class="details_title1">高频编码 <span class="line_title">*</span></view>
+		<view class="card_search">
+			<view class="card_input">
+				<u-search :showAction="true" v-model="frequencyCoding" actionText="搜索" :animation="true"
+					@custom="traceSource(frequencyCoding)"></u-search>
+				<!-- <u-input border="surround" v-model="frequencyCoding"></u-input> -->
 			</view>
 		</view>
 		<view class="card_basic_information" v-if="gasCylinderList.pro_name">
@@ -24,7 +17,8 @@
 					<view class="basics_title basics_left">{{item.title}}:</view>
 					<view class="basics_title1 basics_right"
 						v-if="['fill_media','location','status'].includes(item.field)">
-						{{initDictvalue(gasCylinderList,item.options,item.field)}}
+						<!-- {{initDictvalue(gasCylinderList,item.options,item.field)}} -->
+						{{gasCylinderList[`${item.field}`]}}
 					</view>
 					<view class="basics_title1 basics_right" v-else>{{gasCylinderList[`${item.field}`]}}</view>
 				</view>
@@ -37,9 +31,10 @@
 			</view>
 		</view>
 		<view style="margin-top: 50rpx;" v-if="!gasCylinderList.pro_name && operationLogList.length === 0">
-			<u-empty mode="search" text="没有搜索结果"></u-empty>
+			<u-empty mode="search" text="当前气瓶没有溯源信息"></u-empty>
 		</view>
-		<view style="width: 100%; height: 50rpx;"></view>
+		<view style="width: 100%; height: 200rpx;"></view>
+		<view class="card_Booking center_in" @click="goBooking">订气</view>
 	</view>
 </template>
 
@@ -60,80 +55,55 @@
 				gasCylinderList: {},
 				operationLogList: [],
 				basicsList: [{
+					title: '产权单位',
+					field: 'enterprise_name',
+				}, {
 					title: '设备品种',
 					field: 'pro_variety',
 				}, {
 					title: '产品名称',
 					field: 'pro_name',
 				}, {
+					title: '(出厂)编号',
+					field: 'pro_no',
+				}, {
 					title: '充装介质',
 					field: 'fill_media',
-					options: neurogen()
-				}, {
-					title: '制造单位',
-					field: 'make_unit',
-				}, {
-					title: '下次检验日期',
-					field: 'next_check_time',
-				}, {
-					title: '气瓶使用登记代码',
-					field: 'chip_id',
 				}, {
-					title: '单位内编',
+					title: '单位内编号',
 					field: 'inner_code',
 				}, {
-					title: '归属地',
-					field: 'location',
-					options: attribution()
-				}, {
-					title: '气瓶状态',
-					field: 'status',
-					options: cylinderCondition()
+					title: '制造单位',
+					field: 'make_unit',
 				}, {
-					title: '检测机构',
-					field: 'check_organization',
+					title: '生产日期',
+					field: 'make_time',
 				}, {
-					title: '高频编码',
-					field: 'uid',
+					title: '公称工作压力',
+					field: 'work_pressure',
 				}, {
-					title: '检测结果',
-					field: 'result_code',
+					title: '容积(L)',
+					field: 'volume',
 				}, {
-					title: '使用年限',
-					field: 'deadline_time',
+					title: '最近一次检验日期',
+					field: 'check_time',
 				}, {
-					title: '报废日期',
-					field: 'scrap_time',
+					title: '下次检验日期',
+					field: 'next_check_time',
 				}],
 			}
 		},
+		onLoad(option) {
+			if (option.code) {
+				this.frequencyCoding = option.code
+				this.traceSource(option.code)
+			}
+		},
 		methods: {
-			// 扫一扫
-			sweep() {
-				// 允许从相机和相册扫码
-				uni.scanCode({
-					scanType: ["qrCode"],
-					success: (res) => {
-						// console.log(res);
-						if (res.result) {
-							let url = res.result;
-							this.frequencyCoding = url
-							this.traceSource()
-						} else {
-							console.log('请重新扫描');
-							return false;
-						}
-					},
-					fail: (res) => {
-						console.log('未识别到二维码');
-					}
-				})
-			},
 			// 扫码溯源
-			traceSource() {
-				if (this.frequencyCoding) {
-					this.$api.get('/api/gas-cylinder/uid/' + this.frequencyCoding).then(res => {
-						console.log(res, 24)
+			traceSource(code) {
+				if (code) {
+					this.$api.get('/api/gas-cylinder/uid/' + code).then(res => {
 						if (res.code == 200) {
 							this.gasCylinderList = res.data.gasCylinder
 							this.operationLogList = res.data.operationLog
@@ -155,47 +125,50 @@
 				}
 				return name
 			},
+			// 去订气
+			goBooking() {
+				uni.redirectTo({
+					url: '/pages/indexRouter'
+				})
+			}
 		}
 	}
 </script>
 
 <style lang="scss" scoped>
-	page {
-		background-color: #f4f4f5 !important;
-	}
-
 	.card_order_details {
 		padding: 30rpx 40rpx 10rpx 40rpx;
 		background-color: #fff;
 	}
 
 	.details_title {
+		display: flex;
+		justify-content: center;
+		padding: 20rpx;
 		color: #333;
 		font-size: 34rpx;
 		font-weight: 500;
 		margin-bottom: 10rpx;
 	}
 
-	.card_search {
-		display: flex;
-		align-items: center;
-		margin: 20rpx 0rpx;
-	}
-
-	.scan_title {
-		font-size: 20rpx;
+	.details_title1 {
+		color: #333;
+		font-size: 34rpx;
+		font-weight: 500;
+		margin-bottom: 10rpx;
+		margin-left: 30rpx;
 	}
 
-	.card_sweep {
+	.card_search {
 		display: flex;
-		flex-direction: column;
 		align-items: center;
-		flex: none;
+		margin: 20rpx 0rpx;
 	}
 
 	.card_input {
 		width: 100%;
 		margin-left: 30rpx;
+		margin-right: 30rpx;
 	}
 
 	.line_title {
@@ -203,15 +176,14 @@
 	}
 
 	.card_basic_information {
-		background-color: #fff;
-		margin: 20rpx;
-		border-radius: 10rpx;
+		border-top: 6px solid #f5f5f5;
+		padding: 20rpx;
 	}
 
 	.headline {
 		font-size: 32rpx;
 		color: #000;
-		padding: 20rpx 20rpx 20rpx 30rpx;
+		padding: 0rpx 10rpx 20rpx 10rpx;
 		border-bottom: 1rpx solid #e7e6e4;
 	}
 
@@ -235,6 +207,7 @@
 		width: 38%;
 		text-align: right;
 		font-size: 28rpx;
+		color: #3eacef;
 	}
 
 	.basics_right {
@@ -243,4 +216,16 @@
 		padding-left: 20rpx;
 		font-size: 28rpx;
 	}
+
+	.card_Booking {
+		position: fixed;
+		bottom: 50rpx;
+		right: 20rpx;
+		width: 100rpx;
+		height: 100rpx;
+		border-radius: 50%;
+		color: #fff;
+		background-color: #5ac725;
+		box-shadow: 0 2px 12px 0 rgba(90, 199, 37, 0.5)
+	}
 </style>

+ 127 - 4
pages/indexRouter.vue

@@ -1,13 +1,13 @@
 <template>
 	<!-- 底部tab导航 -->
 	<view>
-		<Home v-if="nowchos === 0"></Home>
+		<Home :dataList="dataList" :genreTitle="genreTitle" ref="home" v-if="nowchos === 0"></Home>
 		<Order v-else-if="nowchos === 1 && isorders == 0 && userType == 3"></Order>
-		<Mine v-else-if="nowchos === 2  && isorders == 0 && userType == 3"></Mine>
+		<Mine :token="token" :userInfo="userInfo" v-else-if="nowchos === 2  && isorders == 0 && userType == 3"></Mine>
 		<!-- <Information v-else-if="nowchos === 2  && isorders == 0 && userType == 3">
 		</Information>
 		<Mine v-else-if="nowchos === 3  && isorders == 0 && userType == 3"></Mine> -->
-		<Mine v-else-if="nowchos === 1 && userType != 3"></Mine>
+		<Mine :token="token" :userInfo="userInfo" v-else-if="getType(isorders,userType)"></Mine>
 		<view class="bottomboxs">
 			<x-navbottom :nowchos='nowchos' @botomchos='botomchos'></x-navbottom>
 		</view>
@@ -32,6 +32,123 @@
 				userInfo: {},
 				isorders: 0,
 				userType: 3,
+				token: '',
+				aspirated: [{
+					id: '25',
+					title: '领重瓶出库',
+					icon: 'icon-chukudan',
+					color: '#f4b237',
+				}, {
+					id: '27',
+					title: '扫空瓶入库',
+					icon: 'icon-fankudengji',
+					color: '#6db1ff',
+				}],
+				shopList: [{
+					id: '37',
+					title: '重瓶出库',
+					icon: 'icon-peizaizhuangche',
+					color: '#f4b237',
+				}, {
+					id: '10',
+					title: '空瓶出库',
+					icon: 'icon-peizaizhuangche-xianxing',
+					color: '#6db1ff',
+				}, {
+					id: '31',
+					title: '重瓶入库',
+					icon: 'icon-fankudengji',
+					color: '#6db1ff',
+				}, {
+					id: '21',
+					title: '回收空瓶',
+					icon: 'icon-recycling',
+					color: '#8ac247',
+				}, {
+					id: '35',
+					// 未配送
+					title: '重瓶返库',
+					icon: 'icon-fankudengji',
+					color: '#22b9f9',
+				}, {
+					id: '33',
+					title: '重瓶退回',
+					icon: 'icon-tuihuo',
+					color: '#f3553e',
+				}, ],
+				driverList: [{
+					id: '11',
+					title: '门店空瓶装车',
+					icon: 'icon-owNote',
+					color: '#22b9f9',
+				}, {
+					id: '12',
+					title: '空瓶到达气站',
+					icon: 'icon-yidaoda',
+					color: '#8ac247',
+				}, {
+					id: '17',
+					title: '气站重瓶出库',
+					icon: 'icon-chukudan',
+					color: '#6db1ff',
+				}, {
+					id: '19',
+					title: '重瓶交付门店',
+					icon: 'icon-yunsonghejiaofu',
+					color: '#f4b237',
+				}],
+				stationList: [{
+					id: '13',
+					title: '空瓶到达气站',
+					icon: 'icon-daichuku',
+					color: '#37c4f4',
+				},{
+					id: '14',
+					title: '气站充装空瓶',
+					icon: 'icon-peizaizhuangche-xianxing',
+					color: '#6db1ff',
+				},{
+					id: '15',
+					title: '气站重瓶出库',
+					icon: 'icon-owNote',
+					color: '#8ac247',
+				},{
+					id: 'inspect',
+					title: '充气前后检查',
+					icon: 'icon-jianchaxiang',
+					color: '#f4b237',
+				},],
+				dataList: [],
+				genreTitle: '',
+			}
+		},
+		onLoad() {
+			var userInfo = this.$cache.getCache('userInfo')
+			if (userInfo.provUser) {
+				if (userInfo.provUser.isorders == 0 && userInfo.provUser.userType == 3) {
+					this.dataList = this.aspirated
+					this.genreTitle = '送气员端'
+				} else if (userInfo.provUser.userType == 3) {
+					this.dataList = this.shopList
+					this.genreTitle = '门店端'
+				} else if (userInfo.provUser.userType == 4) {
+					this.dataList = this.driverList
+					this.genreTitle = '司机端'
+				} else if (userInfo.provUser.userType == 5) {
+					this.dataList = this.stationList
+					this.genreTitle = '气站端'
+				}
+			} else {
+				this.dataList = this.aspirated
+				this.genreTitle = '送气员端'
+			}
+		},
+		onShow() {
+			var token = this.$cache.getToken()
+			this.token = token
+			var userInfo = this.$cache.getCache('userInfo')
+			if (userInfo) {
+				this.userInfo = userInfo
 			}
 		},
 		mounted() {
@@ -40,7 +157,6 @@
 				this.isorders = userInfo.provUser.isorders
 				this.userType = userInfo.provUser.userType
 			}
-			this.userInfo = userInfo
 		},
 		methods: {
 			// tab
@@ -48,6 +164,13 @@
 				uni.setStorageSync('nowchos', e);
 				this.nowchos = e
 			},
+			getType(isorders, userType) {
+				if (isorders == 1 && userType == 3) {
+					return true
+				} else if (isorders == 0 && userType == 4 || userType == 5) {
+					return true
+				}
+			},
 		}
 	}
 </script>

+ 12 - 10
pages/mine/index.vue

@@ -25,18 +25,20 @@
 
 <script>
 	export default {
-		data() {
-			return {
-				token: '',
-				userInfo: {},
-			}
+		props: {
+			token: {
+				type: String,
+				default: () => '',
+			},
+			userInfo: {
+				type: Object,
+				default: () => {},
+			},
 		},
-		mounted() {
-			var token = this.$cache.getToken()
-			this.token = token
-			var userInfo = this.$cache.getCache('userInfo')
-			this.userInfo = userInfo
+		data() {
+			return {}
 		},
+		mounted() {},
 		methods: {
 			//微信授权
 			set_is_login(val) {

+ 8 - 2
pages/order/completionTasks.vue

@@ -166,12 +166,16 @@
 			},
 			// 补全客户信息
 			clientele() {
+				uni.showLoading({
+					mask: true,
+				});
 				const param = {
 					id: this.customerId,
 					...this.model
 				}
 				delete param.hr
 				this.$api.put('/api/customer', param).then(res => {
+					uni.hideLoading();
 					if (res.code == 200) {
 						uni.$u.toast('操作成功')
 						setTimeout(() => {
@@ -181,6 +185,8 @@
 							});
 						}, 1500)
 					}
+				}).catch(() => {
+					uni.hideLoading();
 				})
 			},
 			// 城市筛选
@@ -210,13 +216,13 @@
 				this.model.area = this.regionCode[1].value
 				let arr1 = []
 				let arr2 = []
-				this.regionCode.forEach(item=>{
+				this.regionCode.forEach(item => {
 					arr1.push(item.value)
 					arr2.push(item.label)
 				})
 				this.model.hr = arr1.join('/')
 				this.model.region = arr2.join('/')
-				console.log(this.model,this.regionCode,26626)
+				// console.log(this.model,this.regionCode,26626)
 			},
 			// 获取经纬度
 			longitude() {

+ 93 - 19
pages/order/delivery.vue

@@ -12,6 +12,10 @@
 				<view class="card_input">
 					<u-input border="surround" v-model="frequencyCoding"></u-input>
 				</view>
+				<view class="deleteCurrent" @click="removeWaybill(frequencyCoding)">
+					<u-icon class="icon_current" name="backspace" height="10" size="20"></u-icon>
+					<view class="title_nape">删除</view>
+				</view>
 			</view>
 			<view v-if="selectiveType != '99' && selectiveType != '100'">
 				<view class="card_frequency" v-if="selectiveType != 'inspect'">
@@ -21,7 +25,9 @@
 					</view>
 					<view style="width: 100%;" v-if="list.length > 0">
 						<view class="item_coding" v-for="(item,index) in list" :key="index">
-							{{item}}
+							<view class="title_coding">{{item}}</view>
+							<u-icon name="close-circle-fill" color="#c0c4cc" size="20"
+								@click="removeWaybill(item)"></u-icon>
 						</view>
 					</view>
 					<view class="card_empty" v-else>
@@ -33,14 +39,13 @@
 						<view class="title_entry">{{item.label}}</view>
 						<view style="height: 40rpx;" v-if="item.type == 'radio'">
 							<u-radio-group v-model="ruleForm.state" placement="row">
-								<u-radio shape="circle" :customStyle="{width:'130rpx'}"
+								<u-radio shape="circle" :customStyle="{width:'140rpx'}"
 									v-for="(item, index) in item.options" :key="index" :label="item.label"
 									:name="item.value"></u-radio>
 							</u-radio-group>
 						</view>
 						<view class="center_row" v-if="item.type == 'input'">
-							<u--input class="input_item" border="surround"
-								v-model="ruleForm[`${item.field}`]"></u--input>
+							<u-input class="input_item" border="surround" v-model="ruleForm[`${item.field}`]"></u-input>
 							<view style="margin-left: 15rpx;width: 90rpx;">{{item.unit}}</view>
 						</view>
 					</view>
@@ -122,6 +127,8 @@
 								this.list = []
 								this.frequencyCoding = ''
 								uni.$u.toast('操作成功')
+							} else {
+								uni.$u.toast(res.data.msg)
 							}
 						})
 					} else {
@@ -133,37 +140,74 @@
 			sweep() {
 				// 允许从相机和相册扫码
 				uni.scanCode({
-					scanType: ["qrCode"],
+					scanType: ['qrCode'],
+					autoZoom: false,
 					success: (res) => {
-						// console.log(res);
+						console.log(res, '--------');
 						if (res.result) {
 							let url = res.result;
-							this.frequencyCoding = url
+							const arrf = url.split('=')
+							this.unitCoding(arrf[1])
+						} else {
+							console.log('请重新扫描');
+							return false;
+						}
+					},
+					fail: (res) => {
+						console.log('未识别到二维码1');
+					}
+				})
+			},
+			// 单位内编码获取
+			unitCoding(qrid) {
+				uni.showLoading({
+					title: '加载中'
+				});
+				uni.request({
+					url: 'http://qr.uinshine.com:9000/CommonAPI/product/getDetails', //仅为示例,并非真实接口地址。
+					method: 'POST',
+					header: {
+						'content-type': 'application/x-www-form-urlencoded', // 默认值
+					},
+					data: {
+						qr_id: qrid,
+					},
+					success: (res) => {
+						if (res.data.code == 0) {
+							var arr = res.data.data
+							this.frequencyCoding = arr.inner_code
 							if (this.selectiveType != '99' || this.selectiveType != '100') {
-								this.list.push(url)
+								this.list.push(arr.inner_code)
 
 								function methods1(arr) {
 									return Array.from(new Set(arr));
 								}
 								this.list = methods1(this.list)
 							}
-						} else {
-							console.log('请重新扫描');
-							return false;
+							uni.hideLoading();
 						}
-					},
-					fail: (res) => {
-						console.log('未识别到二维码');
 					}
-				})
-			}
+				});
+			},
+			// 移除错误运单号
+			removeWaybill(value) {
+				if (this.frequencyCoding == value) {
+					this.frequencyCoding = ''
+				}
+				const arr = deleteElementById(this.list, value)
+				this.list = arr
+
+				function deleteElementById(arr, key) {
+					return arr.filter((item) => item !== key);
+				}
+			},
 		}
 	}
 </script>
 
 <style lang="scss" scoped>
 	.card_order_details {
-		margin: 40rpx;
+		margin: 25rpx;
 	}
 
 	.details_title {
@@ -221,12 +265,19 @@
 	}
 
 	.item_coding {
-		margin-top: 26rpx;
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
 		width: 100%;
-		padding-bottom: 15rpx;
+		margin-top: 10px;
+		padding: 25rpx 0rpx;
 		border-bottom: 2rpx solid #dfdfdf;
 	}
 
+	.title_coding {
+		font-size: 30rpx;
+	}
+
 	.card_empty {
 		width: 100%;
 		margin-top: 50rpx;
@@ -270,4 +321,27 @@
 	.input_item {
 		width: 240rpx;
 	}
+
+	.deleteCurrent {
+		display: flex;
+		align-items: center;
+		flex-direction: column;
+		justify-content: center;
+		border: 1px solid #e5e5e5;
+		padding: 5rpx 0rpx 5rpx 5rpx;
+		margin-left: 10rpx;
+		border-radius: 8rpx;
+		height: 66rpx;
+
+		.icon_current {
+			height: 15px;
+		}
+
+		.title_nape {
+			margin: 0rpx 10rpx;
+			display: flex;
+			font-size: 20rpx;
+			width: 40rpx;
+		}
+	}
 </style>

+ 22 - 3
pages/order/orderDetails.vue

@@ -18,11 +18,17 @@
 			</view>
 			<view class="details_title1">订单编号: <span>{{orderData.orderId}}</span></view>
 			<view class="details_title1">配送地址: <span>{{orderData.address}}</span></view>
-			<view class="details_title1" v-if="orderData.state == 5 || orderData.state == 4">联系电话: <span>{{orderData.phone}}</span></view>
+			<view class="details_title1" v-if="orderData.state == 5 || orderData.state == 4">联系电话:
+				<span>{{orderData.phone}}</span> <u-icon color="#70B603" size="26" name="phone-fill"
+					@click.native.stop="phone(orderData.phone)"></u-icon>
+			</view>
 			<view class="details_title1">下单时间: <span>{{orderData.orderTime}}</span></view>
-			<view class="details_title1" v-if="orderData.state == 5 || orderData.state == 4">配送时间: <span>{{orderData.deliveryTime}}</span>
+			<view class="details_title1" v-if="orderData.state == 5 || orderData.state == 4">配送时间:
+				<span>{{orderData.deliveryTime}}</span>
+			</view>
+			<view class="details_title1" v-if="orderData.state == 3 || orderData.state == 4">送达时间:
+				<span>{{orderData.arriveTime}}</span>
 			</view>
-			<view class="details_title1" v-if="orderData.state == 3 || orderData.state == 4">送达时间: <span>{{orderData.arriveTime}}</span></view>
 		</view>
 		<view class="btn_cancel" v-if="orderData.state == 3">
 			<u-button text="取消订单" color="#d7d7d7" @click="cancel"></u-button>
@@ -53,6 +59,17 @@
 				uni.redirectTo({
 					url: '/pages/order/delivery?id=' + '100' + '&title=' + '确定取消' + '&orderId=' + this.orderData.id
 				});
+			},
+			phone(phone) {
+				uni.makePhoneCall({
+					phoneNumber: phone,
+					success: () => {
+						console.log('拨打电话成功!');
+					},
+					fail: () => {
+						console.error('拨打电话失败!');
+					}
+				});
 			}
 		}
 	}
@@ -98,6 +115,8 @@
 	}
 
 	.details_title1 {
+		display: flex;
+		align-items: center;
 		font-size: 26rpx;
 		color: #7f7f7f;
 		margin-top: 20rpx;

+ 177 - 0
pages/order/quickMark.vue

@@ -0,0 +1,177 @@
+<template>
+	<!-- 添加钢瓶扫描二维码 -->
+	<view>
+		<u-navbar :title="navTitle" autoBack placeholder></u-navbar>
+		<view class="card_head_mark">
+			<view class="card_sys" @click="sweep()">
+				<u-icon name="scan" size="60" color="#18b566"></u-icon>
+				<view class="sys_title">扫一扫</view>
+			</view>
+		</view>
+		<view style="margin-top: 30rpx;" v-if="cylinderInformation.inner_code">
+			<view class="card_quickmark" v-for="(item,index) in list" :key="index">
+				<view class="quickmark_title width_quick">{{item.title}}</view>
+				<view class="quickmark_title">{{cylinderInformation[`${item.key}`]}}</view>
+			</view>
+		</view>
+		<view style="margin-top: 30rpx;" v-else>
+			<u-empty mode="data" text="请先扫描钢瓶二维码"></u-empty>
+		</view>
+		<view class="card_btn">
+			<u-button style="margin-bottom: 20rpx;" type="primary" @click="submit">添加钢瓶</u-button>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				navTitle: '',
+				selectiveType: '',
+				list: [{
+					key: 'inner_code',
+					title: '单位内编码:',
+				}, {
+					key: 'status',
+					title: '气瓶状态:',
+				}, {
+					key: 'enterprise_name',
+					title: '上次充装气站:',
+				}, {
+					key: 'fill_time',
+					title: '上次充装时间:',
+				}, {
+					key: 'register_supervise_name',
+					title: '使用登记审批单位:',
+				}, {
+					key: 'register_time',
+					title: '使用登记日期:',
+				}],
+				cylinderInformation: {},
+			}
+		},
+		onLoad(receive) {
+			this.navTitle = receive.title
+			this.selectiveType = receive.id
+		},
+		methods: {
+			getList(qrid) {
+				uni.showLoading({
+					title: '加载中'
+				});
+				uni.request({
+					url: 'http://qr.uinshine.com:9000/CommonAPI/product/getDetails', //仅为示例,并非真实接口地址。
+					method: 'POST',
+					header: {
+						'content-type': 'application/x-www-form-urlencoded', // 默认值
+					},
+					data: {
+						qr_id: qrid,
+					},
+					success: (res) => {
+						if (res.data.code == 0) {
+							this.cylinderInformation = res.data.data
+							uni.hideLoading();
+						}
+					}
+				});
+			},
+			// 扫一扫
+			sweep() {
+				// const arr = 'http://qr.uinshine.com:9000/page/qrProduct.html?qr_id=1892e17a-1cfc-45c6-964e-41d1f1b9e42d'
+				// 允许从相机和相册扫码
+				uni.scanCode({
+					scanType: ['qrCode'],
+					autoZoom: false,
+					success: (res) => {
+						// console.log(res, '--------');
+						if (res.result) {
+							let url = res.result;
+							const arrf = url.split('=')
+							this.getList(arrf[1])
+						} else {
+							console.log('请重新扫描');
+							return false;
+						}
+					},
+					fail: (res) => {
+						console.log('未识别到二维码1');
+					}
+				})
+			},
+			// 添加钢瓶
+			submit() {
+				if (this.cylinderInformation.inner_code) {
+					this.$api.post('/api/gas-cylinder', {
+						...this.cylinderInformation,
+					}).then(res => {
+						if (res.code == 200) {
+							this.cylinderInformation = {}
+							uni.$u.toast('添加成功')
+						}
+					})
+				} else {
+					uni.$u.toast('请先扫描钢瓶二维码')
+				}
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.card_head_mark {
+		display: flex;
+		justify-content: center;
+		padding-bottom: 30rpx;
+		border-bottom: 2rpx solid #e4e7ed;
+	}
+
+	.card_sys {
+		cursor: pointer;
+		margin-top: 30rpx;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		flex-direction: column;
+		width: 180rpx;
+		height: 180rpx;
+		border-radius: 20rpx;
+		background-color: #f4f4f5;
+	}
+
+	.sys_title {
+		font-size: 32rpx;
+		color: #18b566;
+	}
+
+	.card_quickmark {
+		display: inline-flex !important;
+		word-break: break-all;
+		width: calc(100% - 40rpx);
+		margin: 10rpx 20rpx;
+	}
+
+	.width_quick {
+		flex: none;
+	}
+
+	.quickmark_title {
+		color: #249acc;
+		font-size: 30rpx;
+		margin-right: 10rpx;
+	}
+
+	.card_btn {
+		position: fixed;
+		left: 0;
+		right: 0;
+		bottom: 0;
+		padding-left: 30rpx;
+		padding-right: 30rpx;
+		padding-top: 20rpx;
+		background-color: #fff;
+		padding-bottom: constant(safe-area-inset-bottom); //兼容 IOS<11.2
+		padding-bottom: env(safe-area-inset-bottom); //兼容 IOS>11.2
+	}
+</style>

BIN
unpackage/cache/apk/__UNI__10C0A5F_cm.apk


+ 1 - 1
unpackage/cache/apk/apkurl

@@ -1 +1 @@
-https://app.liuyingyong.cn/build/download/c9e60100-e5c7-11ee-9e15-092edb8a8fb2
+https://app.liuyingyong.cn/build/download/689b55b0-10e9-11ef-96b0-c3d764bd9d5a

Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
unpackage/cache/apk/cmManifestCache.json


+ 1 - 1
unpackage/cache/certdata

@@ -1,3 +1,3 @@
-andrCertfile=D:/baozhida/气瓶app证书/0773a04b4468f5be0a9f86af19097652.keystore
+andrCertfile=D:/baozhida/证书/气瓶app证书/0773a04b4468f5be0a9f86af19097652.keystore
 andrCertAlias=__uni__10c0a5f
 andrCertPass=zlA+teBuAf90GRIzqVVHkA==

Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
unpackage/cache/wgt/__UNI__10C0A5F/__uniappquill.js


Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
unpackage/cache/wgt/__UNI__10C0A5F/__uniappquillimageresize.js


+ 2 - 2
unpackage/cache/wgt/__UNI__10C0A5F/app-config-service.js

@@ -1,8 +1,8 @@
 
 var isReady=false;var onReadyCallbacks=[];
 var isServiceReady=false;var onServiceReadyCallbacks=[];
-var __uniConfig = {"pages":["pages/login","pages/indexRouter","pages/home/index","pages/index/codeTracing","pages/home/selectStore","pages/information/index","pages/order/index","pages/mine/index","pages/mine/personal","pages/mine/system","pages/order/orderDetails","pages/order/securityCheck","pages/order/delivery","pages/order/completionTasks","pages/order/signatureBoard"],"window":{"navigationBarTextStyle":"black","navigationBarTitleText":"气瓶安全追溯","navigationBarBackgroundColor":"#F8F8F8","backgroundColor":"#F8F8F8","navigationStyle":"default"},"tabBar":{"color":"#6c6c6c","selectedColor":"#1177FF","borderStyle":"black","backgroundColor":"#ffffff","list":[{"pagePath":"pages/home/index","iconPath":"static/tab/sy.png","selectedIconPath":"static/tab/sy_s.png","text":"首页"},{"pagePath":"pages/order/index","iconPath":"static/tab/dd.png","selectedIconPath":"static/tab/dd_s.png","text":"订单"},{"pagePath":"pages/information/index","iconPath":"static/tab/xx.png","selectedIconPath":"static/tab/xx_s.png","text":"消息"},{"pagePath":"pages/mine/index","iconPath":"static/tab/wd.png","selectedIconPath":"static/tab/wd_s.png","text":"我的"}]},"darkmode":false,"nvueCompiler":"uni-app","nvueStyleCompiler":"uni-app","renderer":"auto","splashscreen":{"alwaysShowBeforeRender":true,"autoclose":false},"appname":"气瓶安全追溯","compilerVersion":"3.99","entryPagePath":"pages/login","networkTimeout":{"request":60000,"connectSocket":60000,"uploadFile":60000,"downloadFile":60000}};
-var __uniRoutes = [{"path":"/pages/login","meta":{"isQuit":true},"window":{"navigationStyle":"custom"}},{"path":"/pages/indexRouter","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/home/index","meta":{"isQuit":true,"isTabBar":true},"window":{"navigationBarTitleText":"","enablePullDownRefresh":false,"navigationBarBackgroundColor":"#FFFFFF","titleNView":false}},{"path":"/pages/index/codeTracing","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/home/selectStore","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/information/index","meta":{"isQuit":true,"isTabBar":true},"window":{"navigationBarTitleText":"消息中心","enablePullDownRefresh":false}},{"path":"/pages/order/index","meta":{"isQuit":true,"isTabBar":true},"window":{"navigationBarTitleText":"订单","enablePullDownRefresh":false}},{"path":"/pages/mine/index","meta":{"isQuit":true,"isTabBar":true},"window":{"navigationBarTitleText":"个人中心","enablePullDownRefresh":false,"navigationBarBackgroundColor":"#FFFFFF"}},{"path":"/pages/mine/personal","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/mine/system","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/order/orderDetails","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/order/securityCheck","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/order/delivery","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/order/completionTasks","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/order/signatureBoard","meta":{},"window":{"navigationStyle":"custom"}}];
+var __uniConfig = {"pages":["pages/login","pages/indexRouter","pages/home/index","pages/index/codeTracing","pages/home/selectStore","pages/information/index","pages/order/index","pages/mine/index","pages/mine/personal","pages/mine/system","pages/order/orderDetails","pages/order/securityCheck","pages/order/delivery","pages/order/quickMark","pages/order/completionTasks","pages/order/signatureBoard"],"window":{"navigationBarTextStyle":"black","navigationBarTitleText":"气瓶安全追溯","navigationBarBackgroundColor":"#F8F8F8","backgroundColor":"#F8F8F8","navigationStyle":"default"},"tabBar":{"color":"#6c6c6c","selectedColor":"#1177FF","borderStyle":"black","backgroundColor":"#ffffff","list":[{"pagePath":"pages/home/index","iconPath":"static/tab/sy.png","selectedIconPath":"static/tab/sy_s.png","text":"首页"},{"pagePath":"pages/order/index","iconPath":"static/tab/dd.png","selectedIconPath":"static/tab/dd_s.png","text":"订单"},{"pagePath":"pages/information/index","iconPath":"static/tab/xx.png","selectedIconPath":"static/tab/xx_s.png","text":"消息"},{"pagePath":"pages/mine/index","iconPath":"static/tab/wd.png","selectedIconPath":"static/tab/wd_s.png","text":"我的"}]},"darkmode":false,"nvueCompiler":"uni-app","nvueStyleCompiler":"uni-app","renderer":"auto","splashscreen":{"alwaysShowBeforeRender":false,"autoclose":false},"appname":"气瓶安全追溯","compilerVersion":"4.08","entryPagePath":"pages/login","networkTimeout":{"request":60000,"connectSocket":60000,"uploadFile":60000,"downloadFile":60000}};
+var __uniRoutes = [{"path":"/pages/login","meta":{"isQuit":true},"window":{"navigationStyle":"custom"}},{"path":"/pages/indexRouter","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/home/index","meta":{"isQuit":true,"isTabBar":true},"window":{"navigationBarTitleText":"","enablePullDownRefresh":false,"navigationBarBackgroundColor":"#FFFFFF","titleNView":false}},{"path":"/pages/index/codeTracing","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/home/selectStore","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/information/index","meta":{"isQuit":true,"isTabBar":true},"window":{"navigationBarTitleText":"消息中心","enablePullDownRefresh":false}},{"path":"/pages/order/index","meta":{"isQuit":true,"isTabBar":true},"window":{"navigationBarTitleText":"订单","enablePullDownRefresh":false}},{"path":"/pages/mine/index","meta":{"isQuit":true,"isTabBar":true},"window":{"navigationBarTitleText":"个人中心","enablePullDownRefresh":false,"navigationBarBackgroundColor":"#FFFFFF"}},{"path":"/pages/mine/personal","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/mine/system","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/order/orderDetails","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/order/securityCheck","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/order/delivery","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/order/quickMark","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/order/completionTasks","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/order/signatureBoard","meta":{},"window":{"navigationStyle":"custom"}}];
 __uniConfig.onReady=function(callback){if(__uniConfig.ready){callback()}else{onReadyCallbacks.push(callback)}};Object.defineProperty(__uniConfig,"ready",{get:function(){return isReady},set:function(val){isReady=val;if(!isReady){return}const callbacks=onReadyCallbacks.slice(0);onReadyCallbacks.length=0;callbacks.forEach(function(callback){callback()})}});
 __uniConfig.onServiceReady=function(callback){if(__uniConfig.serviceReady){callback()}else{onServiceReadyCallbacks.push(callback)}};Object.defineProperty(__uniConfig,"serviceReady",{get:function(){return isServiceReady},set:function(val){isServiceReady=val;if(!isServiceReady){return}const callbacks=onServiceReadyCallbacks.slice(0);onServiceReadyCallbacks.length=0;callbacks.forEach(function(callback){callback()})}});
 service.register("uni-app-config",{create(a,b,c){if(!__uniConfig.viewport){var d=b.weex.config.env.scale,e=b.weex.config.env.deviceWidth,f=Math.ceil(e/d);Object.assign(__uniConfig,{viewport:f,defaultFontSize:Math.round(f/20)})}return{instance:{__uniConfig:__uniConfig,__uniRoutes:__uniRoutes,global:void 0,window:void 0,document:void 0,frames:void 0,self:void 0,location:void 0,navigator:void 0,localStorage:void 0,history:void 0,Caches:void 0,screen:void 0,alert:void 0,confirm:void 0,prompt:void 0,fetch:void 0,XMLHttpRequest:void 0,WebSocket:void 0,webkit:void 0,print:void 0}}}});

Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
unpackage/cache/wgt/__UNI__10C0A5F/app-service.js


Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
unpackage/cache/wgt/__UNI__10C0A5F/app-view.js


Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
unpackage/cache/wgt/__UNI__10C0A5F/manifest.json


Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
unpackage/cache/wgt/__UNI__10C0A5F/view.umd.min.js


Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
unpackage/dist/build/app-plus/__uniappquill.js


Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
unpackage/dist/build/app-plus/__uniappquillimageresize.js


+ 2 - 2
unpackage/dist/build/app-plus/app-config-service.js

@@ -1,8 +1,8 @@
 
 var isReady=false;var onReadyCallbacks=[];
 var isServiceReady=false;var onServiceReadyCallbacks=[];
-var __uniConfig = {"pages":["pages/login","pages/indexRouter","pages/home/index","pages/index/codeTracing","pages/home/selectStore","pages/information/index","pages/order/index","pages/mine/index","pages/mine/personal","pages/mine/system","pages/order/orderDetails","pages/order/securityCheck","pages/order/delivery","pages/order/completionTasks","pages/order/signatureBoard"],"window":{"navigationBarTextStyle":"black","navigationBarTitleText":"气瓶安全追溯","navigationBarBackgroundColor":"#F8F8F8","backgroundColor":"#F8F8F8","navigationStyle":"default"},"tabBar":{"color":"#6c6c6c","selectedColor":"#1177FF","borderStyle":"black","backgroundColor":"#ffffff","list":[{"pagePath":"pages/home/index","iconPath":"static/tab/sy.png","selectedIconPath":"static/tab/sy_s.png","text":"首页"},{"pagePath":"pages/order/index","iconPath":"static/tab/dd.png","selectedIconPath":"static/tab/dd_s.png","text":"订单"},{"pagePath":"pages/information/index","iconPath":"static/tab/xx.png","selectedIconPath":"static/tab/xx_s.png","text":"消息"},{"pagePath":"pages/mine/index","iconPath":"static/tab/wd.png","selectedIconPath":"static/tab/wd_s.png","text":"我的"}]},"darkmode":false,"nvueCompiler":"uni-app","nvueStyleCompiler":"uni-app","renderer":"auto","splashscreen":{"alwaysShowBeforeRender":true,"autoclose":false},"appname":"气瓶安全追溯","compilerVersion":"3.99","entryPagePath":"pages/login","networkTimeout":{"request":60000,"connectSocket":60000,"uploadFile":60000,"downloadFile":60000}};
-var __uniRoutes = [{"path":"/pages/login","meta":{"isQuit":true},"window":{"navigationStyle":"custom"}},{"path":"/pages/indexRouter","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/home/index","meta":{"isQuit":true,"isTabBar":true},"window":{"navigationBarTitleText":"","enablePullDownRefresh":false,"navigationBarBackgroundColor":"#FFFFFF","titleNView":false}},{"path":"/pages/index/codeTracing","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/home/selectStore","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/information/index","meta":{"isQuit":true,"isTabBar":true},"window":{"navigationBarTitleText":"消息中心","enablePullDownRefresh":false}},{"path":"/pages/order/index","meta":{"isQuit":true,"isTabBar":true},"window":{"navigationBarTitleText":"订单","enablePullDownRefresh":false}},{"path":"/pages/mine/index","meta":{"isQuit":true,"isTabBar":true},"window":{"navigationBarTitleText":"个人中心","enablePullDownRefresh":false,"navigationBarBackgroundColor":"#FFFFFF"}},{"path":"/pages/mine/personal","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/mine/system","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/order/orderDetails","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/order/securityCheck","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/order/delivery","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/order/completionTasks","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/order/signatureBoard","meta":{},"window":{"navigationStyle":"custom"}}];
+var __uniConfig = {"pages":["pages/login","pages/indexRouter","pages/home/index","pages/index/codeTracing","pages/home/selectStore","pages/information/index","pages/order/index","pages/mine/index","pages/mine/personal","pages/mine/system","pages/order/orderDetails","pages/order/securityCheck","pages/order/delivery","pages/order/quickMark","pages/order/completionTasks","pages/order/signatureBoard"],"window":{"navigationBarTextStyle":"black","navigationBarTitleText":"气瓶安全追溯","navigationBarBackgroundColor":"#F8F8F8","backgroundColor":"#F8F8F8","navigationStyle":"default"},"tabBar":{"color":"#6c6c6c","selectedColor":"#1177FF","borderStyle":"black","backgroundColor":"#ffffff","list":[{"pagePath":"pages/home/index","iconPath":"static/tab/sy.png","selectedIconPath":"static/tab/sy_s.png","text":"首页"},{"pagePath":"pages/order/index","iconPath":"static/tab/dd.png","selectedIconPath":"static/tab/dd_s.png","text":"订单"},{"pagePath":"pages/information/index","iconPath":"static/tab/xx.png","selectedIconPath":"static/tab/xx_s.png","text":"消息"},{"pagePath":"pages/mine/index","iconPath":"static/tab/wd.png","selectedIconPath":"static/tab/wd_s.png","text":"我的"}]},"darkmode":false,"nvueCompiler":"uni-app","nvueStyleCompiler":"uni-app","renderer":"auto","splashscreen":{"alwaysShowBeforeRender":false,"autoclose":false},"appname":"气瓶安全追溯","compilerVersion":"4.08","entryPagePath":"pages/login","networkTimeout":{"request":60000,"connectSocket":60000,"uploadFile":60000,"downloadFile":60000}};
+var __uniRoutes = [{"path":"/pages/login","meta":{"isQuit":true},"window":{"navigationStyle":"custom"}},{"path":"/pages/indexRouter","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/home/index","meta":{"isQuit":true,"isTabBar":true},"window":{"navigationBarTitleText":"","enablePullDownRefresh":false,"navigationBarBackgroundColor":"#FFFFFF","titleNView":false}},{"path":"/pages/index/codeTracing","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/home/selectStore","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/information/index","meta":{"isQuit":true,"isTabBar":true},"window":{"navigationBarTitleText":"消息中心","enablePullDownRefresh":false}},{"path":"/pages/order/index","meta":{"isQuit":true,"isTabBar":true},"window":{"navigationBarTitleText":"订单","enablePullDownRefresh":false}},{"path":"/pages/mine/index","meta":{"isQuit":true,"isTabBar":true},"window":{"navigationBarTitleText":"个人中心","enablePullDownRefresh":false,"navigationBarBackgroundColor":"#FFFFFF"}},{"path":"/pages/mine/personal","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/mine/system","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/order/orderDetails","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/order/securityCheck","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/order/delivery","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/order/quickMark","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/order/completionTasks","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/order/signatureBoard","meta":{},"window":{"navigationStyle":"custom"}}];
 __uniConfig.onReady=function(callback){if(__uniConfig.ready){callback()}else{onReadyCallbacks.push(callback)}};Object.defineProperty(__uniConfig,"ready",{get:function(){return isReady},set:function(val){isReady=val;if(!isReady){return}const callbacks=onReadyCallbacks.slice(0);onReadyCallbacks.length=0;callbacks.forEach(function(callback){callback()})}});
 __uniConfig.onServiceReady=function(callback){if(__uniConfig.serviceReady){callback()}else{onServiceReadyCallbacks.push(callback)}};Object.defineProperty(__uniConfig,"serviceReady",{get:function(){return isServiceReady},set:function(val){isServiceReady=val;if(!isServiceReady){return}const callbacks=onServiceReadyCallbacks.slice(0);onServiceReadyCallbacks.length=0;callbacks.forEach(function(callback){callback()})}});
 service.register("uni-app-config",{create(a,b,c){if(!__uniConfig.viewport){var d=b.weex.config.env.scale,e=b.weex.config.env.deviceWidth,f=Math.ceil(e/d);Object.assign(__uniConfig,{viewport:f,defaultFontSize:Math.round(f/20)})}return{instance:{__uniConfig:__uniConfig,__uniRoutes:__uniRoutes,global:void 0,window:void 0,document:void 0,frames:void 0,self:void 0,location:void 0,navigator:void 0,localStorage:void 0,history:void 0,Caches:void 0,screen:void 0,alert:void 0,confirm:void 0,prompt:void 0,fetch:void 0,XMLHttpRequest:void 0,WebSocket:void 0,webkit:void 0,print:void 0}}}});

Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
unpackage/dist/build/app-plus/app-service.js


Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
unpackage/dist/build/app-plus/app-view.js


Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
unpackage/dist/build/app-plus/manifest.json


Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
unpackage/dist/build/app-plus/view.umd.min.js


Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
unpackage/dist/dev/app-plus/__uniappquill.js


Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
unpackage/dist/dev/app-plus/__uniappquillimageresize.js


+ 2 - 2
unpackage/dist/dev/app-plus/app-config-service.js

@@ -1,8 +1,8 @@
 
 var isReady=false;var onReadyCallbacks=[];
 var isServiceReady=false;var onServiceReadyCallbacks=[];
-var __uniConfig = {"pages":["pages/login","pages/indexRouter","pages/home/index","pages/index/codeTracing","pages/home/selectStore","pages/information/index","pages/order/index","pages/mine/index","pages/mine/personal","pages/mine/system","pages/order/orderDetails","pages/order/securityCheck","pages/order/delivery","pages/order/completionTasks","pages/order/signatureBoard"],"window":{"navigationBarTextStyle":"black","navigationBarTitleText":"气瓶安全追溯","navigationBarBackgroundColor":"#F8F8F8","backgroundColor":"#F8F8F8","navigationStyle":"default"},"tabBar":{"color":"#6c6c6c","selectedColor":"#1177FF","borderStyle":"black","backgroundColor":"#ffffff","list":[{"pagePath":"pages/home/index","iconPath":"static/tab/sy.png","selectedIconPath":"static/tab/sy_s.png","text":"首页"},{"pagePath":"pages/order/index","iconPath":"static/tab/dd.png","selectedIconPath":"static/tab/dd_s.png","text":"订单"},{"pagePath":"pages/information/index","iconPath":"static/tab/xx.png","selectedIconPath":"static/tab/xx_s.png","text":"消息"},{"pagePath":"pages/mine/index","iconPath":"static/tab/wd.png","selectedIconPath":"static/tab/wd_s.png","text":"我的"}]},"darkmode":false,"nvueCompiler":"uni-app","nvueStyleCompiler":"uni-app","renderer":"auto","splashscreen":{"alwaysShowBeforeRender":true,"autoclose":false},"appname":"气瓶安全追溯","compilerVersion":"3.99","entryPagePath":"pages/login","networkTimeout":{"request":60000,"connectSocket":60000,"uploadFile":60000,"downloadFile":60000}};
-var __uniRoutes = [{"path":"/pages/login","meta":{"isQuit":true},"window":{"navigationStyle":"custom"}},{"path":"/pages/indexRouter","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/home/index","meta":{"isQuit":true,"isTabBar":true},"window":{"navigationBarTitleText":"","enablePullDownRefresh":false,"navigationBarBackgroundColor":"#FFFFFF","titleNView":false}},{"path":"/pages/index/codeTracing","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/home/selectStore","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/information/index","meta":{"isQuit":true,"isTabBar":true},"window":{"navigationBarTitleText":"消息中心","enablePullDownRefresh":false}},{"path":"/pages/order/index","meta":{"isQuit":true,"isTabBar":true},"window":{"navigationBarTitleText":"订单","enablePullDownRefresh":false}},{"path":"/pages/mine/index","meta":{"isQuit":true,"isTabBar":true},"window":{"navigationBarTitleText":"个人中心","enablePullDownRefresh":false,"navigationBarBackgroundColor":"#FFFFFF"}},{"path":"/pages/mine/personal","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/mine/system","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/order/orderDetails","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/order/securityCheck","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/order/delivery","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/order/completionTasks","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/order/signatureBoard","meta":{},"window":{"navigationStyle":"custom"}}];
+var __uniConfig = {"pages":["pages/login","pages/indexRouter","pages/home/index","pages/index/codeTracing","pages/home/selectStore","pages/information/index","pages/order/index","pages/mine/index","pages/mine/personal","pages/mine/system","pages/order/orderDetails","pages/order/securityCheck","pages/order/delivery","pages/order/quickMark","pages/order/completionTasks","pages/order/signatureBoard"],"window":{"navigationBarTextStyle":"black","navigationBarTitleText":"气瓶安全追溯","navigationBarBackgroundColor":"#F8F8F8","backgroundColor":"#F8F8F8","navigationStyle":"default"},"tabBar":{"color":"#6c6c6c","selectedColor":"#1177FF","borderStyle":"black","backgroundColor":"#ffffff","list":[{"pagePath":"pages/home/index","iconPath":"static/tab/sy.png","selectedIconPath":"static/tab/sy_s.png","text":"首页"},{"pagePath":"pages/order/index","iconPath":"static/tab/dd.png","selectedIconPath":"static/tab/dd_s.png","text":"订单"},{"pagePath":"pages/information/index","iconPath":"static/tab/xx.png","selectedIconPath":"static/tab/xx_s.png","text":"消息"},{"pagePath":"pages/mine/index","iconPath":"static/tab/wd.png","selectedIconPath":"static/tab/wd_s.png","text":"我的"}]},"darkmode":false,"nvueCompiler":"uni-app","nvueStyleCompiler":"uni-app","renderer":"auto","splashscreen":{"alwaysShowBeforeRender":false,"autoclose":false},"appname":"气瓶安全追溯","compilerVersion":"4.08","entryPagePath":"pages/login","networkTimeout":{"request":60000,"connectSocket":60000,"uploadFile":60000,"downloadFile":60000}};
+var __uniRoutes = [{"path":"/pages/login","meta":{"isQuit":true},"window":{"navigationStyle":"custom"}},{"path":"/pages/indexRouter","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/home/index","meta":{"isQuit":true,"isTabBar":true},"window":{"navigationBarTitleText":"","enablePullDownRefresh":false,"navigationBarBackgroundColor":"#FFFFFF","titleNView":false}},{"path":"/pages/index/codeTracing","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/home/selectStore","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/information/index","meta":{"isQuit":true,"isTabBar":true},"window":{"navigationBarTitleText":"消息中心","enablePullDownRefresh":false}},{"path":"/pages/order/index","meta":{"isQuit":true,"isTabBar":true},"window":{"navigationBarTitleText":"订单","enablePullDownRefresh":false}},{"path":"/pages/mine/index","meta":{"isQuit":true,"isTabBar":true},"window":{"navigationBarTitleText":"个人中心","enablePullDownRefresh":false,"navigationBarBackgroundColor":"#FFFFFF"}},{"path":"/pages/mine/personal","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/mine/system","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/order/orderDetails","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/order/securityCheck","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/order/delivery","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/order/quickMark","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/order/completionTasks","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/order/signatureBoard","meta":{},"window":{"navigationStyle":"custom"}}];
 __uniConfig.onReady=function(callback){if(__uniConfig.ready){callback()}else{onReadyCallbacks.push(callback)}};Object.defineProperty(__uniConfig,"ready",{get:function(){return isReady},set:function(val){isReady=val;if(!isReady){return}const callbacks=onReadyCallbacks.slice(0);onReadyCallbacks.length=0;callbacks.forEach(function(callback){callback()})}});
 __uniConfig.onServiceReady=function(callback){if(__uniConfig.serviceReady){callback()}else{onServiceReadyCallbacks.push(callback)}};Object.defineProperty(__uniConfig,"serviceReady",{get:function(){return isServiceReady},set:function(val){isServiceReady=val;if(!isServiceReady){return}const callbacks=onServiceReadyCallbacks.slice(0);onServiceReadyCallbacks.length=0;callbacks.forEach(function(callback){callback()})}});
 service.register("uni-app-config",{create(a,b,c){if(!__uniConfig.viewport){var d=b.weex.config.env.scale,e=b.weex.config.env.deviceWidth,f=Math.ceil(e/d);Object.assign(__uniConfig,{viewport:f,defaultFontSize:Math.round(f/20)})}return{instance:{__uniConfig:__uniConfig,__uniRoutes:__uniRoutes,global:void 0,window:void 0,document:void 0,frames:void 0,self:void 0,location:void 0,navigator:void 0,localStorage:void 0,history:void 0,Caches:void 0,screen:void 0,alert:void 0,confirm:void 0,prompt:void 0,fetch:void 0,XMLHttpRequest:void 0,WebSocket:void 0,webkit:void 0,print:void 0}}}});

Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
unpackage/dist/dev/app-plus/app-service.js


Разлика између датотеке није приказан због своје велике величине
+ 84 - 24
unpackage/dist/dev/app-plus/app-view.js


Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
unpackage/dist/dev/app-plus/manifest.json


Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
unpackage/dist/dev/app-plus/view.umd.min.js


BIN
unpackage/release/apk/__UNI__10C0A5F__20240321093149.apk → unpackage/release/apk/__UNI__10C0A5F__20240513130801.apk


BIN
unpackage/release/apk/__UNI__10C0A5F__20240513132654.apk


Неке датотеке нису приказане због велике количине промена