diff --git a/yack-app/common/mqttTool.js b/yack-app/common/mqttTool.js
index 1b80c2e1..27443e67 100644
--- a/yack-app/common/mqttTool.js
+++ b/yack-app/common/mqttTool.js
@@ -1,6 +1,5 @@
 import projectConfig from '@/env.config.js';
 
-var mqtt = require('mqtt')
 var url = projectConfig.mqttServer;
 
 let mqttTool = {
@@ -8,6 +7,7 @@ let mqttTool = {
 }
 
 mqttTool.connect = function (token) {
+	var mqtt = require('mqtt');
 	let options = {
 		clientId: 'phone-' + Math.random().toString(16).substr(2),
 		username: 'fastbee',
diff --git a/yack-app/env.config.js b/yack-app/env.config.js
index c6f8a021..1ce3ce1f 100644
--- a/yack-app/env.config.js
+++ b/yack-app/env.config.js
@@ -17,10 +17,10 @@ let xinzhiKey = 'SBh45_yy21FU5ErV_';
 const CONFIG = {
 	// 开发环境配置
 	development: {
-		officialWebUrl: 'http://localhost:8080/',
-		baseUrl: 'http://localhost:8080/',
-		mqttServer: protocalDev + 'localhost/mqtt',
-		decoderUrl: 'http://localhost:8080/',
+		officialWebUrl: 'https://ycdat.cn/',
+		baseUrl: 'https://ycdat.cn/prod-api/',
+		mqttServer: protocalProd + 'ycdat.cn/mqtt',
+		decoderUrl: 'https://ycdat.cn/',
 		qqmapKey,
 		xinzhiKey,
 	},
diff --git a/yack-app/manifest.json b/yack-app/manifest.json
index 768f4050..7b3cd94e 100644
--- a/yack-app/manifest.json
+++ b/yack-app/manifest.json
@@ -124,7 +124,7 @@
     },
     "quickapp" : {},
     "mp-weixin" : {
-        "appid" : "wx5bfbadf52adc17f3",
+        "appid" : "wx8bcff4708d1f6d2b",
         "setting" : {
             "urlCheck" : false,
             "minified" : true
diff --git a/yack-app/package.json b/yack-app/package.json
index a898373c..664cccdd 100644
--- a/yack-app/package.json
+++ b/yack-app/package.json
@@ -5,8 +5,8 @@
 	"homepage": "https://fastbee.cn",
 	"main": "main.js",
 	"dependencies": {
-		"jsencrypt": "^3.3.2",
-		"moment": "^2.30.1",
+		"dayjs": "^1.11.19",
+		"jsencrypt": "^3.5.4",
 		"mqtt": "^3.0.0",
 		"vue-i18n": "^9.13.1"
 	},
diff --git a/yack-app/pages.json b/yack-app/pages.json
index 9cdedb1f..aa21e1e3 100644
--- a/yack-app/pages.json
+++ b/yack-app/pages.json
@@ -59,16 +59,6 @@
 				"enablePullDownRefresh": true
 			}
 		},
-		{
-			"path": "pages/tabBar/alert/edit",
-			"meta": {
-				"title": "%navBar.alarmHandling%"
-			},
-			"style": {
-				"navigationBarTitleText": "%navBar.alarmHandling%",
-				"enablePullDownRefresh": false
-			}
-		},
 		{
 			"path": "pages/tabBar/trend/trend",
 			"style": {
@@ -78,20 +68,30 @@
 					"bounce": "none" // 将回弹属性关掉
 				}
 			}
-		},
-		{
-			"path": "pages/common/webview/index",
-			"style": {
-				"navigationBarTitleText": "%navBar.browse%"
-			},
-			"meta": {
-				"requireAuth": true
-			}
 		}
 	],
 	"subPackages": [{
 		"root": "pagesA",
 		"pages": [{
+				"path": "alert/edit",
+				"meta": {
+					"title": "%navBar.alarmHandling%"
+				},
+				"style": {
+					"navigationBarTitleText": "%navBar.alarmHandling%",
+					"enablePullDownRefresh": false
+				}
+			},
+			{
+				"path": "common/webview/index",
+				"style": {
+					"navigationBarTitleText": "%navBar.browse%"
+				},
+				"meta": {
+					"requireAuth": true
+				}
+			},
+			{
 				"path": "scene/detail",
 				"meta": {
 					"title": "%navBar.sceneDetail%",
@@ -624,6 +624,16 @@
 			}
 		]
 	}],
+	"preloadRule": {
+		"pages/tabBar/home/index": {
+			"network": "all",
+			"packages": ["pagesA"]
+		},
+		"pages/tabBar/user/user": {
+			"network": "all",
+			"packages": ["pagesB"]
+		}
+	},
 	"globalStyle": {
 		"pageOrientation": "portrait",
 		"navigationBarTitleText": "%common.fastbee%",
diff --git a/yack-app/pages/login/index.vue b/yack-app/pages/login/index.vue
index 0b5065b6..c567117f 100644
--- a/yack-app/pages/login/index.vue
+++ b/yack-app/pages/login/index.vue
@@ -453,7 +453,7 @@
 				let title = this.$tt('login.serviceAgreement');
 				let url = projectConfig.officialWebUrl + 'service-agreement.html';
 				uni.navigateTo({
-					url: `/pages/common/webview/index?title=${title}&url=${url}`
+					url: `/pagesA/common/webview/index?title=${title}&url=${url}`
 				});
 			},
 			// 隐私政策
@@ -461,7 +461,7 @@
 				let title = this.$tt('login.privacyPolicy');
 				let url = projectConfig.officialWebUrl + 'privacy-policy.html';
 				uni.navigateTo({
-					url: `/pages/common/webview/index?title=${title}&url=${url}`
+					url: `/pagesA/common/webview/index?title=${title}&url=${url}`
 				});
 			},
 			//记住密码
@@ -474,7 +474,7 @@
 			},
 			openhpLink() {
 				uni.navigateTo({
-					url: '/pages/common/webview/index?url=https://ycdat.cn/'
+					url: '/pagesA/common/webview/index?url=https://ycdat.cn/'
 				});
 			}
 		}
diff --git a/yack-app/pages/tabBar/alert/index.vue b/yack-app/pages/tabBar/alert/index.vue
index 10b431af..9090a88b 100644
--- a/yack-app/pages/tabBar/alert/index.vue
+++ b/yack-app/pages/tabBar/alert/index.vue
@@ -251,7 +251,7 @@
 				});
 				// #endif
 				uni.navigateTo({
-					url: `/pages/tabBar/alert/edit?alertLogId=${item.alertLogId}&source=2`
+					url: `/pagesA/alert/edit?alertLogId=${item.alertLogId}&source=2`
 				});
 			},
 			// 获取模板id
diff --git a/yack-app/pages/tabBar/user/user.vue b/yack-app/pages/tabBar/user/user.vue
index e7c98f2a..4c8c6d7a 100644
--- a/yack-app/pages/tabBar/user/user.vue
+++ b/yack-app/pages/tabBar/user/user.vue
@@ -367,7 +367,7 @@
 			},
 			openYanAnLink() {
 				uni.navigateTo({
-					url: '/pages/common/webview/index?url=https://ycdat.cn/'
+					url: '/pagesA/common/webview/index?url=https://ycdat.cn/'
 				});
 			},
 			gotoAbout() {
@@ -450,7 +450,7 @@
 			},
 			openappLink() {
 				uni.navigateTo({
-					url: '/pages/common/webview/index?url=https://gitee.com/beecue/fastbee-app/tree/master/app'
+					url: '/pagesA/common/webview/index?url=https://gitee.com/beecue/fastbee-app/tree/master/app'
 				});
 			},
 			// 解绑微信
diff --git a/yack-app/pagesA/alert/edit.vue b/yack-app/pagesA/alert/edit.vue
new file mode 100644
index 00000000..dabe6ebc
--- /dev/null
+++ b/yack-app/pagesA/alert/edit.vue
@@ -0,0 +1,214 @@
+<template>
+	<page-meta>
+		<navigation-bar :title="$tt('navBar.alarmHandling')" title-align="center" background-color="#007AFF" />
+	</page-meta>
+
+	<view class="alert-edit">
+		<view class="alert-info">
+			<view class="title">{{$tt('alert.alertInformation')}}</view>
+			<u--form labelPosition="left" :model="model" labelWidth="90"
+				:labelStyle="{ fontSize: '28rpx', color: '#8f9ca2' }">
+				<u-form-item :label="$tt('alert.alertName')">
+					{{ model.alertName }}
+				</u-form-item>
+				<u-form-item :label="$tt('alert.serialNumber')">
+					{{ model.serialNumber }}
+				</u-form-item>
+				<u-form-item :label="$tt('alert.deviceName')">
+					{{ model.deviceName }}
+				</u-form-item>
+				<u-form-item :label="$tt('alert.alertType')">
+					<text
+						:class="{'success': model.alertLevel === 1, 'warning': model.alertLevel === 2, 'error': model.alertLevel === 3}">
+						{{ getaLertLevelDisplay(model) }}
+					</text>
+				</u-form-item>
+				<u-form-item :label="$tt('alert.alertTime')">
+					{{ model.createTime }}
+				</u-form-item>
+				<u-form-item :label="$tt('alert.data')">
+					<div v-html="formatDetail(model.detail)"></div>
+				</u-form-item>
+			</u--form>
+		</view>
+		<view class="alert-dispose" v-if="model.status !== 1">
+			<view class="title">{{$tt('alert.alertProcess')}}</view>
+			<u--form labelPosition="left" :model="model" labelWidth="90"
+				:labelStyle="{ fontSize: '28rpx', color: '#8f9ca2' }">
+				<u-form-item :label="$tt('alert.processAlert')">
+					<u-radio-group v-if="model.status === 2" v-model="alertLevel" size="16" labelSize="14">
+						<u-radio shape="circle" :name="1" :label="$tt('alert.untreated')"></u-radio>
+						<text style="margin-left: 30rpx;"></text>
+						<u-radio shape="circle" :name="3" :label="$tt('alert.processed')"></u-radio>
+					</u-radio-group>
+					<text v-if="model.status === 3">{{ getaStatusDisplay(model) }}</text>
+				</u-form-item>
+				<u-form-item v-if="model.status === 2" :label="$tt('alert.processResult')" labelPosition="top">
+					<u-textarea v-model="model.remark" fontSize="14" :placeholder="$tt('alert.inputProcessMsg')"
+						confirmType="done" border="none"></u-textarea>
+				</u-form-item>
+				<u-form-item v-if="model.status === 3" :label="$tt('alert.processResult')">
+					{{ model.remark }}
+				</u-form-item>
+				<u-form-item v-if="model.status === 3" :label="$tt('alert.processTime')">
+					{{ model.updateTime }}
+				</u-form-item>
+			</u--form>
+		</view>
+
+		<view class="btn-wrap" v-if="model.status === 2">
+			<u-button :customStyle="{ height: '96rpx' }" type="primary" size="normal" :text="$tt('common.save')"
+				@click="handleSaveForm"></u-button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import { getAlertLog, editAlertLog } from '@/apis/modules/alertLog.js';
+
+	export default {
+		data () {
+			return {
+				alertLogId: null, // 告警id
+				source: null, // 数据来源-设备/告警列表
+				// 详情数据
+				model: {
+					remark: '',
+				},
+				alertLevel: 1, // 处理级别
+			};
+		},
+		onLoad: function (option) {
+			this.alertLogId = Number(option.alertLogId) || null;
+			this.source = Number(option.source) || null;
+			this.getAlertDetail();
+		},
+		methods: {
+			// 获取遥控器详情
+			getAlertDetail () {
+				getAlertLog(this.alertLogId).then(res => {
+					const { code, data } = res;
+					if (code === 200) {
+						this.model = { ...data };
+					}
+				});
+			},
+			// 格式化detail字段
+			formatDetail (json) {
+				if (json == null || json == "") {
+					return;
+				}
+				let item = JSON.parse(json);
+				let result = 'id：<span style="color:#F56C6C">' + item.id + '</span><br />';
+				result = result + 'value：<span style="color:#F56C6C">' + item.value + '</span><br />';
+				result = result + 'remark：<span style="color:#F56C6C">' + item.remark + '</span>';
+				return result;
+			},
+			// 保存
+			handleSaveForm () {
+				const params = { ...this.model, status: this.alertLevel };
+				editAlertLog(params).then(res => {
+					if (res.code === 200) {
+						let pages = getCurrentPages();
+						let prevPage = pages[pages.length - 2];
+						// 更新列表
+						if (this.source === 1) {
+							// #ifdef H5 || APP-PLUS
+							prevPage.$refs.deviceAlertLog.handleSearch();
+							// #endif
+							// #ifdef MP-WEIXIN
+							prevPage.$vm.$refs.deviceAlertLog.handleSearch();
+							// #endif
+						}
+						if (this.source === 2) {
+							// #ifdef H5 || APP-PLUS
+							prevPage.handleSearch();
+							// #endif
+							// #ifdef MP-WEIXIN
+							prevPage.$vm.handleSearch();
+							// #endif
+						}
+						uni.navigateBack();
+					} else {
+						uni.showToast({
+							icon: 'error',
+							title: this.$tt('common.saveError')
+						});
+					}
+				});
+			},
+			// 获取告警级别显示
+			getaLertLevelDisplay (item) {
+				const { alertLevel } = item;
+				if (alertLevel === 1) {
+					return this.$tt('alert.notice');
+				} else if (alertLevel === 2) {
+					return this.$tt('alert.minor');
+				} else if (alertLevel === 3) {
+					return this.$tt('alert.warning');
+				}
+			},
+			// 获取告警状态显示
+			getaStatusDisplay (item) {
+				const { status } = item;
+				if (status === 1) {
+					return this.$tt('alert.noNeed');
+				} else if (status === 2) {
+					return this.$tt('alert.Unprocessed');
+				} else if (status === 3) {
+					return this.$tt('alert.processed');
+				}
+			},
+		},
+	};
+</script>
+
+<style lang="scss">
+	page {
+		height: 100%;
+		background: #eef3f7;
+	}
+
+	.alert-edit {
+		width: 100%;
+
+		.alert-info,
+		.alert-dispose {
+			background: #fff;
+			margin: 20rpx;
+			padding: 20rpx 30rpx;
+			border-radius: 10rpx;
+
+			.title {
+				color: #303133;
+				font-size: 32rpx;
+				padding: 12rpx 0;
+			}
+		}
+
+		.btn-wrap {
+			margin: 30rpx 20rpx;
+		}
+
+		.success {
+			color: #5ac725;
+		}
+
+		.warning {
+			color: #f9ae3d;
+		}
+
+		.error {
+			color: #f56c6c;
+		}
+	}
+</style>
+<style lang="scss" scoped>
+	::v-deep .u-form-item__body {
+		padding: 5px 0 !important;
+	}
+
+	::v-deep .u-textarea__field {
+		font-size: 28rpx !important;
+	}
+</style>
\ No newline at end of file
diff --git a/yack-app/pagesA/common/webview/index.vue b/yack-app/pagesA/common/webview/index.vue
new file mode 100644
index 00000000..c139ef15
--- /dev/null
+++ b/yack-app/pagesA/common/webview/index.vue
@@ -0,0 +1,38 @@
+<template>
+	<view v-if="params.url">
+		<web-view :src="`${params.url}`"></web-view>
+		<u-loading-page :loading="loading"></u-loading-page>
+	</view>
+</template>
+
+<script>
+	export default {
+		data () {
+			return {
+				loading: true,
+				params: {}
+			}
+		},
+		props: {
+			src: {
+				type: [String],
+				default: null
+			}
+		},
+		onLoad (event) {
+			const { url, ...res } = event;
+			this.params = {
+				url: decodeURIComponent(url),
+				res
+			};
+			if (event.title) {
+				uni.setNavigationBarTitle({
+					title: event.title
+				})
+			};
+			setTimeout(() => {
+				this.loading = false;
+			}, 1000);
+		},
+	}
+</script>
\ No newline at end of file
diff --git a/yack-app/pagesA/home/device/log/alertLog.vue b/yack-app/pagesA/home/device/log/alertLog.vue
index dc961519..1fc49606 100644
--- a/yack-app/pagesA/home/device/log/alertLog.vue
+++ b/yack-app/pagesA/home/device/log/alertLog.vue
@@ -153,7 +153,7 @@
 				});
 				// #endif
 				uni.navigateTo({
-					url: `/pages/tabBar/alert/edit?alertLogId=${item.alertLogId}&source=1`
+					url: `/pagesA/alert/edit?alertLogId=${item.alertLogId}&source=1`
 				});
 			},
 			// 获取模板id
diff --git a/yack-app/pagesA/home/device/statistic/history.vue b/yack-app/pagesA/home/device/statistic/history.vue
index 4ae8924b..fa3f4657 100644
--- a/yack-app/pagesA/home/device/statistic/history.vue
+++ b/yack-app/pagesA/home/device/statistic/history.vue
@@ -76,7 +76,7 @@
 </template>
 
 <script>
-	import moment from 'moment';
+	import dayjs from 'dayjs';
 	import uniDataCheckbox from '@/pagesA/components/uni-data-checkbox/index.vue';
 	import uniPagination from '@/pagesA/components/uni-pagination/index.vue';
 	import { getSubGatewayList } from '@/apis/modules/gateway.js';
@@ -366,8 +366,8 @@
 					});
 					const params = {
 						identifierList: idenList,
-						beginTime: moment(beginTime).format('YYYY-MM-DD HH:mm:ss'),
-						endTime: moment(endTime).format('YYYY-MM-DD HH:mm:ss'),
+						beginTime: dayjs(beginTime).format('YYYY-MM-DD HH:mm:ss'),
+						endTime: dayjs(endTime).format('YYYY-MM-DD HH:mm:ss'),
 						deviceId: deviceId,
 						// slaveId: slaveId,
 						serialNumber: serialNumber,
diff --git a/yack-app/pagesB/components/cropping/index.vue b/yack-app/pagesB/components/cropping/index.vue
new file mode 100644
index 00000000..0800c7f9
--- /dev/null
+++ b/yack-app/pagesB/components/cropping/index.vue
@@ -0,0 +1,1053 @@
+<template>
+	<view class="cropping-wrap" :class="{open: value}" disable-scroll :style="'z-index: ' + zIndex + ';' + customStyle">
+		<view class="cropping-mask" @touchstart.stop.prevent="clipTouchStart" @touchmove.stop.prevent="clipTouchMove"
+			@touchend.stop.prevent="clipTouchEnd">
+			<view class="cropping-content" :style="clipStyle">
+				<view class="cropping-edge" v-for="(item, index) in [0, 0, 0, 0]" :key="index"></view>
+			</view>
+		</view>
+		<image class="cropping-image" @error="imageLoad" @load="imageLoad" @touchstart="imageTouchStart"
+			@touchmove="imageTouchMove" @touchend="imageTouchEnd" :src="image"
+			:mode="imageWidth == 'auto' ? 'widthFix' : 'scaleToFill'" v-if="image" :style="imageStyle" />
+		<canvas canvas-id="cropping" id="cropping" disable-scroll
+			:style="'width: ' + canvasWidth * scaleRatio + 'px; height:' + canvasHeight * scaleRatio + 'px;'"
+			class="cropping-canvas"></canvas>
+		<view class="cropping-tools">
+			<view class="cropping-tools-btns">
+				<view v-if="isShowCancelBtn" @tap="handleCancel">
+					<slot name="cancel" v-if="$slots.cancel" />
+					<view v-else class="cancel">取消</view>
+				</view>
+				<view v-if="isShowPhotoBtn" @tap="handleUploadImage">
+					<slot name="photo" v-if="$slots.photo" />
+					<image v-else src="/static/cropping/photo.png" />
+				</view>
+				<view v-if="isShowRotateBtn" @tap="handleRotate" data-type="inverse">
+					<slot name="rotate" v-if="$slots.rotate" />
+					<image v-else src="/static/cropping/rotate.png" />
+				</view>
+				<view v-if="isShowConfirmBtn" @tap="handleConfirm">
+					<slot name="confirm" v-if="$slots.confirm" />
+					<view v-else class="confirm">完成</view>
+				</view>
+			</view>
+			<slot></slot>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		determineDirection,
+		calcImageOffset,
+		calcImageScale,
+		calcImageSize,
+		calcPythagoreanTheorem,
+		clipTouchMoveOfCalculate,
+		imageTouchMoveOfCalcOffset
+	} from '@/utils/cropping.js';
+	const cache = {};
+
+	export default {
+		name: 'cropping',
+		props: {
+			value: {
+				type: Boolean,
+				default: true
+			},
+			// #ifdef MP-WEIXIN
+			type: {
+				type: String,
+				default: '2d'
+			},
+			// #endif
+			customStyle: {
+				type: String,
+			},
+			zIndex: {
+				type: Number,
+				default: 99
+			},
+			imageUrl: {
+				type: String
+			},
+			fileType: {
+				type: String,
+				default: 'png'
+			},
+			quality: {
+				type: Number,
+				default: 1
+			},
+			width: {
+				type: Number,
+				default: 400
+			},
+			height: {
+				type: Number,
+				default: 400
+			},
+			minWidth: {
+				type: Number,
+				default: 200
+			},
+			maxWidth: {
+				type: Number,
+				default: 600
+			},
+			destWidth: Number,
+			destHeight: Number,
+			minHeight: {
+				type: Number,
+				default: 200
+			},
+			maxHeight: {
+				type: Number,
+				default: 600
+			},
+			isLockWidth: {
+				type: Boolean,
+				default: false
+			},
+			isLockHeight: {
+				type: Boolean,
+				default: false
+			},
+			isLockRatio: {
+				type: Boolean,
+				default: true
+			},
+			scaleRatio: {
+				type: Number,
+				default: 1
+			},
+			minRatio: {
+				type: Number,
+				default: 0.5
+			},
+			maxRatio: {
+				type: Number,
+				default: 2
+			},
+			isDisableScale: {
+				type: Boolean,
+				default: false
+			},
+			isDisableRotate: {
+				type: Boolean,
+				default: false
+			},
+			isLimitMove: {
+				type: Boolean,
+				default: false
+			},
+			isShowPhotoBtn: {
+				type: Boolean,
+				default: true
+			},
+			isShowRotateBtn: {
+				type: Boolean,
+				default: true
+			},
+			isShowConfirmBtn: {
+				type: Boolean,
+				default: true
+			},
+			isShowCancelBtn: {
+				type: Boolean,
+				default: true
+			},
+			rotateAngle: {
+				type: Number,
+				default: 90
+			},
+			source: {
+				type: Object,
+				default: () => ({
+					album: '从相册中选择',
+					camera: '拍照',
+					// #ifdef MP-WEIXIN
+					message: '从微信中选择'
+					// #endif
+				})
+			}
+		},
+		data () {
+			return {
+				canvasWidth: 0,
+				canvasHeight: 0,
+				clipX: 0,
+				clipY: 0,
+				clipWidth: 0,
+				clipHeight: 0,
+				animation: false,
+				imageWidth: 0,
+				imageHeight: 0,
+				imageTop: 0,
+				imageLeft: 0,
+				scale: 1,
+				angle: 0,
+				image: '',
+				imageInit: false,
+				sysinfo: {},
+				throttleTimer: null,
+				throttleFlag: true,
+				timeClipCenter: null,
+				flagClipTouch: false,
+				flagEndTouch: false,
+				clipStart: {},
+				animationTimer: null,
+				touchRelative: [{ x: 0, y: 0 }],
+				hypotenuseLength: 0,
+				ctx: null,
+				canvasId: 'cropping'
+			};
+		},
+		computed: {
+			clipStyle () {
+				const { clipWidth, clipHeight, clipY, clipX, animation } = this;
+				return `
+				width: ${clipWidth}px;
+				height:${clipHeight}px;
+				transition-property: ${animation ? '' : 'background'};
+				left: ${clipX}px;
+				top: ${clipY}px
+				`
+			},
+			imageStyle () {
+				const { imageWidth, imageHeight, imageLeft, imageTop, animation, scale, angle } = this;
+				return `
+				width: ${imageWidth ? imageWidth + 'px' : 'auto'};
+				height: ${imageHeight ? imageHeight + 'px' : 'auto'};
+				transform: translate3d(${imageLeft - imageWidth / 2}px, ${imageTop - imageHeight / 2}px, 0) scale(${scale}) rotate(${angle}deg);
+				transition-duration: ${animation ? 0.35 : 0}s
+				`
+			},
+			clipSize () {
+				const { clipWidth, clipHeight } = this;
+				return { clipWidth, clipHeight };
+			},
+			clipPoint () {
+				const { clipY, clipX } = this;
+				return { clipY, clipX };
+			}
+		},
+		watch: {
+			value (val) {
+				if (!val) {
+					this.animation = 0;
+					this.angle = 0;
+				} else {
+					if (this.imageUrl) {
+						const {
+							imageWidth,
+							imageHeight,
+							imageLeft,
+							imageTop,
+							scale,
+							clipX,
+							clipY,
+							clipWidth,
+							clipHeight,
+							path
+						} = cache?.[this.imageUrl] || {}
+						if (path != this.image) {
+							this.image = this.imageUrl;
+						} else {
+							this.setDiffData({
+								imageWidth,
+								imageHeight,
+								imageLeft,
+								imageTop,
+								scale,
+								clipX,
+								clipY,
+								clipWidth,
+								clipHeight
+							})
+						}
+					}
+				}
+			},
+			imageUrl (url) {
+				this.image = url;
+			},
+			image: {
+				handler: async function (url) {
+					this.getImageInfo(url)
+				},
+			},
+			clipSize ({ widthVal, heightVal }) {
+				let { minWidth, minHeight } = this;
+				minWidth = minWidth / 2;
+				minHeight = minHeight / 2;
+				if (widthVal < minWidth) {
+					this.setDiffData({ clipWidth: minWidth })
+				}
+				if (heightVal < minHeight) {
+					this.setDiffData({ clipHeight: minHeight })
+				}
+				this.calcClipSize();
+			},
+			angle (val) {
+				this.animation = this.imageInit;
+				this.moveStop();
+				const { isLimitMove } = this;
+				if (isLimitMove && val % 90) {
+					this.setDiffData({
+						angle: Math.round(val / 90) * 90
+					})
+				}
+				this.imgMarginDetectionScale();
+			},
+			animation (val) {
+				clearTimeout(this.animationTimer);
+				if (val) {
+					let animationTimer = setTimeout(() => {
+						this.setDiffData({
+							animation: false
+						})
+					}, 260);
+					this.setDiffData({ animationTimer })
+					this.animationTimer = animationTimer;
+				}
+			},
+			isLimitMove (val) {
+				if (val) {
+					if (this.angle % 90) {
+						this.setDiffData({
+							angle: Math.round(this.angle / 90) * 90
+						})
+					}
+					this.imgMarginDetectionScale();
+				}
+			},
+			clipPoint () {
+				this.cutDetectionPosition();
+			},
+			width (width, oWidth) {
+				if (width !== oWidth) {
+					this.setDiffData({
+						clipWidth: uni.upx2px(width) //width / 2
+					})
+				}
+			},
+			height (height, oHeight) {
+				if (height !== oHeight) {
+					this.setDiffData({
+						clipHeight: uni.upx2px(height) //height / 2
+					})
+				}
+			}
+		},
+		mounted () {
+			const sysinfo = uni.getSystemInfoSync();
+			this.sysinfo = sysinfo;
+			this.setClipInfo();
+			this.image = this.imageUrl || this.image;
+			this.setClipCenter();
+			this.calcClipSize();
+			this.cutDetectionPosition();
+		},
+		methods: {
+			setDiffData (data) {
+				Object.keys(data).forEach(key => {
+					if (this[key] !== data[key]) {
+						this[key] = data[key];
+					}
+				});
+			},
+			getImageInfo (url) {
+				if (!url) return;
+				if (this.value) {
+					uni.showLoading({
+						title: '请稍候...',
+						mask: true
+					});
+				}
+				this.imageInit = false
+				uni.getImageInfo({
+					src: url,
+					success: res => {
+						if (['right', 'left'].includes(res.orientation)) {
+							this.imgComputeSize(res.height, res.width);
+						} else {
+							this.imgComputeSize(res.width, res.height);
+						}
+						this.image = res.path;
+						if (this.isLimitMove) {
+							this.imgMarginDetectionScale();
+							this.$emit('ready', res);
+						}
+						const {
+							imageWidth,
+							imageHeight,
+							imageLeft,
+							imageTop,
+							scale,
+							clipX,
+							clipY,
+							clipWidth,
+							clipHeight
+						} = this
+						cache[url] = Object.assign(res, {
+							imageWidth,
+							imageHeight,
+							imageLeft,
+							imageTop,
+							scale,
+							clipX,
+							clipY,
+							clipWidth,
+							clipHeight
+						});
+					},
+					fail: (err) => {
+						this.imgComputeSize();
+						if (this.isLimitMove) {
+							this.imgMarginDetectionScale();
+						}
+					}
+				});
+
+			},
+			setClipInfo () {
+				const { width, height, sysinfo, canvasId } = this;
+				const clipWidth = width / 2;
+				const clipHeight = height / 2;
+				const clipY = (sysinfo.windowHeight - clipHeight) / 2;
+				const clipX = (sysinfo.windowWidth - clipWidth) / 2;
+				const imageLeft = sysinfo.windowWidth / 2;
+				const imageTop = sysinfo.windowHeight / 2;
+				this.ctx = uni.createCanvasContext(canvasId, this);
+				this.clipWidth = clipWidth;
+				this.clipHeight = clipHeight;
+				this.clipX = clipX;
+				this.clipY = clipY;
+				this.canvasHeight = clipHeight;
+				this.canvasWidth = clipWidth;
+				this.imageLeft = imageLeft;
+				this.imageTop = imageTop;
+			},
+			setClipCenter () {
+				const { sysInfo, clipHeight, clipWidth, imageTop, imageLeft } = this;
+				let sys = sysInfo || uni.getSystemInfoSync();
+				let clipY = (sys.windowHeight - clipHeight) * 0.5;
+				let clipX = (sys.windowWidth - clipWidth) * 0.5;
+				this.imageTop = imageTop - this.clipY + clipY;
+				this.imageLeft = imageLeft - this.clipX + clipX;
+				this.clipY = clipY;
+				this.clipX = clipX;
+			},
+			calcClipSize () {
+				const { clipHeight, clipWidth, sysinfo, clipX, clipY } = this;
+				if (clipWidth > sysinfo.windowWidth) {
+					this.setDiffData({
+						clipWidth: sysinfo.windowWidth
+					})
+				} else if (clipWidth + clipX > sysinfo.windowWidth) {
+					this.setDiffData({
+						clipX: sysinfo.windowWidth - clipX
+					})
+				}
+				if (clipHeight > sysinfo.windowHeight) {
+					this.setDiffData({
+						clipHeight: sysinfo.windowHeight
+					})
+				} else if (clipHeight + clipY > sysinfo.windowHeight) {
+					this.clipY = sysinfo.windowHeight - clipY;
+					this.setDiffData({
+						clipY: sysinfo.windowHeight - clipY
+					})
+				}
+			},
+			cutDetectionPosition () {
+				const { clipX, clipY, sysinfo, clipHeight, clipWidth } = this;
+				let cutDetectionPositionTop = () => {
+						if (clipY < 0) {
+							this.setDiffData({ clipY: 0 })
+						}
+						if (clipY > sysinfo.windowHeight - clipHeight) {
+							this.setDiffData({ clipY: sysinfo.windowHeight - clipHeight })
+						}
+					},
+					cutDetectionPositionLeft = () => {
+						if (clipX < 0) {
+							this.setDiffData({ clipX: 0 })
+						}
+						if (clipX > sysinfo.windowWidth - clipWidth) {
+							this.setDiffData({ clipX: sysinfo.windowWidth - clipWidth })
+						}
+					};
+				if (clipY === null && clipX === null) {
+					let newClipY = (sysinfo.windowHeight - clipHeight) * 0.5;
+					let newClipX = (sysinfo.windowWidth - clipWidth) * 0.5;
+					this.setDiffData({
+						clipX: newClipX,
+						clipY: newClipY
+					})
+				} else if (clipY !== null && clipX !== null) {
+					cutDetectionPositionTop();
+					cutDetectionPositionLeft();
+				} else if (clipY !== null && clipX === null) {
+					cutDetectionPositionTop();
+					this.setDiffData({
+						clipX: (sysinfo.windowWidth - clipWidth) / 2
+					})
+				} else if (clipY === null && clipX !== null) {
+					cutDetectionPositionLeft();
+					this.setDiffData({
+						clipY: (sysinfo.windowHeight - clipHeight) / 2
+					})
+				}
+			},
+			imgComputeSize (width, height) {
+				const { imageWidth, imageHeight } = calcImageSize(width, height, this);
+				this.imageWidth = imageWidth;
+				this.imageHeight = imageHeight;
+			},
+			imgMarginDetectionScale (scale) {
+				if (!this.isLimitMove) return;
+				const currentScale = calcImageScale(this, scale);
+				this.imgMarginDetectionPosition(currentScale);
+			},
+			imgMarginDetectionPosition (scale) {
+				if (!this.isLimitMove) return;
+				const { scale: currentScale, left, top } = calcImageOffset(this, scale);
+				this.setDiffData({
+					imageLeft: left,
+					imageTop: top,
+					scale: currentScale
+				})
+			},
+			throttle () {
+				this.setDiffData({
+					throttleFlag: true
+				})
+			},
+			moveDuring () {
+				clearTimeout(this.timeClipCenter);
+			},
+			moveStop () {
+				clearTimeout(this.timeClipCenter);
+				const timeClipCenter = setTimeout(() => {
+					if (!this.animation) {
+						this.setDiffData({
+							imageInit: true,
+							animation: true,
+						})
+					}
+					this.setClipCenter();
+				}, 800);
+				this.setDiffData({ timeClipCenter })
+			},
+			clipTouchStart (event) {
+				// #ifdef H5
+				event.preventDefault()
+				// #endif
+				if (!this.image) {
+					uni.showToast({
+						title: '请选择图片',
+						icon: 'none'
+					});
+					return;
+				}
+				const currentX = event.touches[0].clientX;
+				const currentY = event.touches[0].clientY;
+				const { clipX, clipY, clipWidth, clipHeight } = this;
+				const corner = determineDirection(clipX, clipY, clipWidth, clipHeight, currentX, currentY);
+				this.moveDuring();
+				if (!corner) { return }
+				this.clipStart = {
+					width: clipWidth,
+					height: clipHeight,
+					x: currentX,
+					y: currentY,
+					clipY,
+					clipX,
+					corner
+				};
+				this.flagClipTouch = true;
+				this.flagEndTouch = true;
+			},
+			clipTouchMove (event) {
+				// #ifdef H5
+				event.stopPropagation()
+				event.preventDefault()
+				// #endif
+				if (!this.image) {
+					uni.showToast({
+						title: '请选择图片',
+						icon: 'none'
+					});
+					return;
+				}
+				// 只针对单指点击做处理
+				if (event.touches.length !== 1) {
+					return;
+				}
+				const { flagClipTouch, throttleFlag } = this;
+				if (flagClipTouch && throttleFlag) {
+					const { isLockRatio, isLockHeight, isLockWidth } = this;
+					if (isLockRatio && (isLockWidth || isLockHeight)) return;
+					this.setDiffData({
+						throttleFlag: false
+					})
+					this.throttle();
+					const clipData = clipTouchMoveOfCalculate(this, event);
+					if (clipData) {
+						const { width, height, clipX, clipY } = clipData;
+						if (!isLockWidth && !isLockHeight) {
+							this.setDiffData({
+								clipWidth: width,
+								clipHeight: height,
+								clipX,
+								clipY
+							})
+						} else if (!isLockWidth) {
+							this.setDiffData({
+								clipWidth: width,
+								clipX
+							})
+						} else if (!isLockHeight) {
+							this.setDiffData({
+								clipHeight: height,
+								clipY
+							})
+						}
+						this.imgMarginDetectionScale();
+					}
+
+				}
+			},
+			clipTouchEnd () {
+				this.moveStop();
+				this.flagClipTouch = false;
+			},
+			imageTouchStart (e) {
+				// #ifdef H5
+				event.preventDefault()
+				// #endif
+				this.flagEndTouch = false;
+				const { imageLeft, imageTop } = this;
+				const clientXForLeft = e.touches[0].clientX;
+				const clientYForLeft = e.touches[0].clientY;
+
+				let touchRelative = [];
+				if (e.touches.length === 1) {
+					touchRelative[0] = {
+						x: clientXForLeft - imageLeft,
+						y: clientYForLeft - imageTop
+					};
+					this.touchRelative = touchRelative;
+				} else {
+					const clientXForRight = e.touches[1].clientX;
+					const clientYForRight = e.touches[1].clientY;
+					let width = Math.abs(clientXForLeft - clientXForRight);
+					let height = Math.abs(clientYForLeft - clientYForRight);
+					const hypotenuseLength = calcPythagoreanTheorem(width, height);
+
+					touchRelative = [{
+							x: clientXForLeft - imageLeft,
+							y: clientYForLeft - imageTop
+						},
+						{
+							x: clientXForRight - imageLeft,
+							y: clientYForRight - imageTop
+						}
+					];
+					this.touchRelative = touchRelative;
+					this.hypotenuseLength = hypotenuseLength;
+				}
+			},
+			imageTouchMove (e) {
+				// #ifdef H5
+				event.preventDefault()
+				// #endif
+				const { flagEndTouch, throttleFlag } = this;
+				if (flagEndTouch || !throttleFlag) return;
+				const clientXForLeft = e.touches[0].clientX;
+				const clientYForLeft = e.touches[0].clientY;
+				this.setDiffData({ throttleFlag: false })
+				this.throttle();
+				this.moveDuring();
+				if (e.touches.length === 1) {
+					const { left: imageLeft, top: imageTop } = imageTouchMoveOfCalcOffset(this, clientXForLeft,
+						clientYForLeft);
+					this.setDiffData({
+						imageLeft,
+						imageTop
+					})
+					this.imgMarginDetectionPosition();
+				} else {
+					const clientXForRight = e.touches[1].clientX;
+					const clientYForRight = e.touches[1].clientY;
+					let width = Math.abs(clientXForLeft - clientXForRight),
+						height = Math.abs(clientYForLeft - clientYForRight),
+						hypotenuse = calcPythagoreanTheorem(width, height),
+						scale = this.scale * (hypotenuse / this.hypotenuseLength);
+					if (this.isDisableScale) {
+						scale = 1;
+					} else {
+						scale = scale <= this.minRatio ? this.minRatio : scale;
+						scale = scale >= this.maxRatio ? this.maxRatio : scale;
+						this.$emit('change', {
+							width: this.imageWidth * scale,
+							height: this.imageHeight * scale
+						});
+					}
+
+					this.imgMarginDetectionScale(scale);
+					this.hypotenuseLength = Math.sqrt(Math.pow(width, 2) + Math.pow(height, 2));
+					this.scale = scale;
+				}
+			},
+			imageTouchEnd () {
+				this.setDiffData({
+					flagEndTouch: true
+				})
+				this.moveStop();
+			},
+			imageReset () {
+				const sys = this.sysinfo || uni.getSystemInfoSync();
+				this.moveStop();
+				this.scale = 1;
+				this.angle = 0;
+
+				this.imageTop = sys.windowHeight / 2;
+				this.imageLeft = sys.windowWidth / 2;
+			},
+			imageLoad (e) {
+				this.imageReset();
+				uni.hideLoading();
+				this.$emit('ready', e.detail);
+			},
+			// 选择图片
+			handleUploadImage () {
+				const itemList = Object.entries(this.source);
+				const sizeType = ['original', 'compressed'];
+				const success = ({ tempFilePaths: a, tempFiles: b }) => {
+					this.image = a ? a[0] : b[0].path
+				};
+				const _uploadImage = (type) => {
+					if (type !== 'message') {
+						uni.chooseImage({
+							count: 1,
+							sizeType,
+							sourceType: [type],
+							success
+						});
+					}
+					// #ifdef MP-WEIXIN
+					if (type == 'message') {
+						wx.chooseMessageFile({
+							count: 1,
+							type: 'image',
+							success
+						})
+					}
+					// #endif
+				}
+				if (itemList.length > 1) {
+					uni.showActionSheet({
+						itemList: itemList.map(v => v[1]),
+						success: ({ tapIndex: i }) => {
+							_uploadImage(itemList[i][0])
+						}
+					})
+				} else {
+					_uploadImage(itemList[0][0])
+				}
+			},
+			// 旋转
+			handleRotate (event) {
+				if (this.isDisableRotate) return;
+				if (!this.image) {
+					uni.showToast({
+						title: '请选择图片',
+						icon: 'none'
+					});
+					return;
+				}
+				const { rotateAngle } = this;
+				const originAngle = this.angle;
+				const type = event.currentTarget.dataset.type;
+				if (type === 'along') {
+					this.angle = originAngle + rotateAngle
+				} else {
+					this.angle = originAngle - rotateAngle
+				}
+				this.$emit('rotate', this.angle);
+			},
+			// 完成
+			handleConfirm () {
+				if (!this.image) {
+					uni.showToast({
+						title: '请选择图片',
+						icon: 'none'
+					});
+					return;
+				}
+				uni.showLoading({
+					title: '加载中...'
+				});
+				const {
+					canvasHeight,
+					canvasWidth,
+					clipHeight,
+					clipWidth,
+					scale,
+					ctx,
+					imageLeft,
+					imageTop,
+					clipX,
+					clipY,
+					angle,
+					scaleRatio: dpr,
+					image,
+					quality,
+					fileType,
+					type: imageType,
+					canvasId
+				} = this;
+				const draw = () => {
+					const imageWidth = this.imageWidth * scale * dpr;
+					const imageHeight = this.imageHeight * scale * dpr;
+					const xpos = imageLeft - clipX;
+					const ypos = imageTop - clipY;
+					// const ctx = uni.createCanvasContext(canvasId, this);
+					ctx.translate(xpos * dpr, ypos * dpr);
+					ctx.rotate((angle * Math.PI) / 180);
+					ctx.drawImage(image, -imageWidth / 2, -imageHeight / 2, imageWidth, imageHeight);
+					ctx.draw(false, () => {
+						const width = clipWidth * dpr
+						const height = clipHeight * dpr
+						let params = {
+							x: 0,
+							y: 0,
+							width,
+							height,
+							destWidth: this.destWidth || width,
+							destHeight: this.destHeight || height,
+							canvasId,
+							fileType,
+							quality,
+							success: (res) => {
+								// 钉钉小程序
+								data.url = res.tempFilePath || res.filePath;
+								uni.hideLoading();
+								this.$emit('success', data);
+							},
+							fail: (error) => {
+								console.error('error', error)
+								this.$emit('fail', error);
+							}
+						};
+
+						let data = {
+							url: '',
+							width,
+							height
+						};
+						uni.canvasToTempFilePath(params, this)
+					});
+				};
+
+				if (canvasWidth !== clipWidth || canvasHeight !== clipHeight) {
+					this.canvasWidth = clipWidth;
+					this.canvasHeight = clipHeight;
+					ctx.draw();
+					this.$nextTick(() => {
+						setTimeout(() => {
+							draw();
+						}, 100);
+					})
+				} else {
+					draw();
+				}
+			},
+			// 取消
+			handleCancel () {
+				this.$emit('cancel', false)
+			},
+		}
+	};
+</script>
+
+<style lang="scss" scoped>
+	.cropping-wrap {
+		width: 100%;
+		height: calc(100% - var(--window-top));
+		background-color: rgba(0, 0, 0, 0.8);
+		position: fixed;
+		top: var(--window-top);
+
+		&.open {
+			left: 0;
+		}
+
+		.cropping-mask {
+			position: relative;
+			z-index: 2;
+			pointer-events: none;
+		}
+
+		.cropping-content {
+			pointer-events: none;
+			position: absolute;
+			border: 1rpx solid rgba(255, 255, 255, 0.6);
+			box-sizing: border-box;
+			box-shadow: rgba(0, 0, 0, 0.5) 0 0 0 80vh;
+			background: transparent;
+
+			&::before,
+			&::after {
+				content: '';
+				position: absolute;
+				border: 1rpx dashed rgba(255, 255, 255, .3);
+			}
+
+			&::before {
+				width: 100%;
+				top: 33.33%;
+				height: 33.33%;
+				border-left: none;
+				border-right: none;
+			}
+
+			&::after {
+				width: 33.33%;
+				left: 33.33%;
+				height: 100%;
+				border-top: none;
+				border-bottom: none;
+			}
+
+		}
+
+		.cropping-edge {
+			position: absolute;
+			width: 34rpx;
+			height: 34rpx;
+			border: 6rpx solid #ffffff;
+			pointer-events: auto;
+
+			&::before {
+				content: '';
+				position: absolute;
+				width: 40rpx;
+				height: 40rpx;
+				background-color: transparent;
+			}
+
+			&:nth-child(1) {
+				left: - 6rpx;
+				top: - 6rpx;
+				border-bottom-width: 0 !important;
+				border-right-width: 0 !important;
+
+				&:before {
+					top: -50%;
+					left: -50%;
+				}
+			}
+
+			&:nth-child(2) {
+				right: - 6rpx;
+				top: - 6rpx;
+				border-bottom-width: 0 !important;
+				border-left-width: 0 !important;
+
+				&:before {
+					top: -50%;
+					left: 50%;
+				}
+
+			}
+
+			&:nth-child(3) {
+				left: - 6rpx;
+				bottom: - 6rpx;
+				border-top-width: 0 !important;
+				border-right-width: 0 !important;
+
+				&:before {
+					bottom: -50%;
+					left: -50%;
+				}
+			}
+
+			&:nth-child(4) {
+				right: - 6rpx;
+				bottom: - 6rpx;
+				border-top-width: 0 !important;
+				border-left-width: 0 !important;
+
+				&:before {
+					bottom: -50%;
+					left: 50%;
+				}
+			}
+		}
+
+		.cropping-image {
+			width: 100%;
+			max-width: inherit;
+			border-style: none;
+			position: absolute;
+			top: 0;
+			left: 0;
+			z-index: 1;
+			-webkit-backface-visibility: hidden;
+			backface-visibility: hidden;
+			transform-origin: center;
+		}
+
+		.cropping-canvas {
+			position: fixed;
+			z-index: 10;
+			left: -200vw;
+			top: -200vw;
+			pointer-events: none;
+		}
+
+		.cropping-tools {
+			position: absolute;
+			left: 0;
+			bottom: 10px;
+			width: 100%;
+			z-index: 99;
+			color: #fff;
+
+			&-btns {
+				display: flex;
+				align-items: center;
+				justify-content: space-between;
+				width: 100%;
+				padding: 20rpx 40rpx;
+				box-sizing: border-box;
+				font-size: 36rpx;
+
+				.cancel {
+					width: 112rpx;
+					height: 60rpx;
+					text-align: center;
+					line-height: 60rpx;
+				}
+
+				.confirm {
+					width: 112rpx;
+					height: 60rpx;
+					line-height: 60rpx;
+					text-align: center;
+				}
+
+				image {
+					display: block;
+					width: 60rpx;
+					height: 60rpx;
+				}
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/yack-app/pagesB/login/bindLogin.vue b/yack-app/pagesB/login/bindLogin.vue
index 7790419c..02807bc1 100644
--- a/yack-app/pagesB/login/bindLogin.vue
+++ b/yack-app/pagesB/login/bindLogin.vue
@@ -207,7 +207,7 @@
 				let title = this.$tt('login.privacyPolicy');
 				let url = projectConfig.officialWebUrl + 'privacy-policy.html';
 				uni.navigateTo({
-					url: `/pages/common/webview/index?title=${title}&url=${url}`
+					url: `/pagesA/common/webview/index?title=${title}&url=${url}`
 				});
 			},
 			// 服务协议
@@ -215,7 +215,7 @@
 				let title = this.$tt('login.serviceAgreement');
 				let url = projectConfig.officialWebUrl + 'service-agreement.html';
 				uni.navigateTo({
-					url: `/pages/common/webview/index?title=${title}&url=${url}`
+					url: `/pagesA/common/webview/index?title=${title}&url=${url}`
 				});
 			},
 			// 儿童隐私保护声明
@@ -223,7 +223,7 @@
 				let title = this.$tt('login.childProtectionStatement');
 				let url = projectConfig.officialWebUrl + 'child-protection-statement.html';
 				uni.navigateTo({
-					url: `/pages/common/webview/index?title=${title}&url=${url}`
+					url: `/pagesA/common/webview/index?title=${title}&url=${url}`
 				});
 			},
 			// 第三方信息共享清单
@@ -231,7 +231,7 @@
 				let title = this.$tt('login.commonBill');
 				let url = projectConfig.officialWebUrl + 'common-bill.html';
 				uni.navigateTo({
-					url: `/pages/common/webview/index?title=${title}&url=${url}`
+					url: `/pagesA/common/webview/index?title=${title}&url=${url}`
 				});
 			},
 			// 勾选协议
@@ -247,7 +247,7 @@
 			},
 			openhpLink () {
 				uni.navigateTo({
-					url: '/pages/common/webview/index?url=https://ycdat.cn/'
+					url: '/pagesA/common/webview/index?url=https://ycdat.cn/'
 				});
 			}
 		}
diff --git a/yack-app/pagesB/login/bindRegister.vue b/yack-app/pagesB/login/bindRegister.vue
index 11d9ba69..cea65892 100644
--- a/yack-app/pagesB/login/bindRegister.vue
+++ b/yack-app/pagesB/login/bindRegister.vue
@@ -215,7 +215,7 @@
 				let title = this.$tt('login.privacyPolicy');
 				let url = projectConfig.officialWebUrl + 'privacy-policy.html';
 				uni.navigateTo({
-					url: `/pages/common/webview/index?title=${title}&url=${url}`
+					url: `/pagesA/common/webview/index?title=${title}&url=${url}`
 				});
 			},
 			// 服务协议
@@ -223,7 +223,7 @@
 				let title = this.$tt('login.serviceAgreement');
 				let url = projectConfig.officialWebUrl + 'service-agreement.html';
 				uni.navigateTo({
-					url: `/pages/common/webview/index?title=${title}&url=${url}`
+					url: `/pagesA/common/webview/index?title=${title}&url=${url}`
 				});
 			},
 			// 儿童隐私保护声明
@@ -231,7 +231,7 @@
 				let title = this.$tt('login.childProtectionStatement');
 				let url = projectConfig.officialWebUrl + 'child-protection-statement.html';
 				uni.navigateTo({
-					url: `/pages/common/webview/index?title=${title}&url=${url}`
+					url: `/pagesA/common/webview/index?title=${title}&url=${url}`
 				});
 			},
 			// 第三方信息共享清单
@@ -239,7 +239,7 @@
 				let title = this.$tt('login.commonBill');
 				let url = projectConfig.officialWebUrl + 'common-bill.html';
 				uni.navigateTo({
-					url: `/pages/common/webview/index?title=${title}&url=${url}`
+					url: `/pagesA/common/webview/index?title=${title}&url=${url}`
 				});
 			},
 			// 勾选协议
diff --git a/yack-app/pagesB/login/firstOpen.vue b/yack-app/pagesB/login/firstOpen.vue
index e983080a..7f5354fb 100644
--- a/yack-app/pagesB/login/firstOpen.vue
+++ b/yack-app/pagesB/login/firstOpen.vue
@@ -33,7 +33,7 @@
 				let title = this.$tt('login.privacyPolicy');
 				let url = projectConfig.officialWebUrl + 'privacy-policy.html';
 				uni.navigateTo({
-					url: `/pages/common/webview/index?title=${title}&url=${url}`
+					url: `/pagesA/common/webview/index?title=${title}&url=${url}`
 				});
 			},
 			// 服务协议
@@ -41,7 +41,7 @@
 				let title = this.$tt('login.serviceAgreement');
 				let url = projectConfig.officialWebUrl + 'service-agreement.html';
 				uni.navigateTo({
-					url: `/pages/common/webview/index?title=${title}&url=${url}`
+					url: `/pagesA/common/webview/index?title=${title}&url=${url}`
 				});
 			},
 			// 儿童隐私保护声明
@@ -49,7 +49,7 @@
 				let title = this.$tt('login.childProtectionStatement');
 				let url = projectConfig.officialWebUrl + 'child-protection-statement.html';
 				uni.navigateTo({
-					url: `/pages/common/webview/index?title=${title}&url=${url}`
+					url: `/pagesA/common/webview/index?title=${title}&url=${url}`
 				});
 			},
 			// 第三方信息共享清单
@@ -57,7 +57,7 @@
 				let title = this.$tt('login.commonBill');
 				let url = projectConfig.officialWebUrl + 'common-bill.html';
 				uni.navigateTo({
-					url: `/pages/common/webview/index?title=${title}&url=${url}`
+					url: `/pagesA/common/webview/index?title=${title}&url=${url}`
 				});
 			},
 			//点击同意
diff --git a/yack-app/pagesB/login/register.vue b/yack-app/pagesB/login/register.vue
index 8705ad48..7760230e 100644
--- a/yack-app/pagesB/login/register.vue
+++ b/yack-app/pagesB/login/register.vue
@@ -204,7 +204,7 @@
 				let title = this.$tt('login.privacyPolicy');
 				let url = projectConfig.officialWebUrl + 'privacy-policy.html';
 				uni.navigateTo({
-					url: `/pages/common/webview/index?title=${title}&url=${url}`
+					url: `/pagesA/common/webview/index?title=${title}&url=${url}`
 				});
 			},
 			// 服务协议
@@ -212,7 +212,7 @@
 				let title = this.$tt('login.serviceAgreement');
 				let url = projectConfig.officialWebUrl + 'service-agreement.html';
 				uni.navigateTo({
-					url: `/pages/common/webview/index?title=${title}&url=${url}`
+					url: `/pagesA/common/webview/index?title=${title}&url=${url}`
 				});
 			},
 			// 儿童隐私保护声明
@@ -220,7 +220,7 @@
 				let title = this.$tt('login.childProtectionStatement');
 				let url = projectConfig.officialWebUrl + 'child-protection-statement.html';
 				uni.navigateTo({
-					url: `/pages/common/webview/index?title=${title}&url=${url}`
+					url: `/pagesA/common/webview/index?title=${title}&url=${url}`
 				});
 			},
 			// 第三方信息共享清单
@@ -228,7 +228,7 @@
 				let title = this.$tt('login.commonBill');
 				let url = projectConfig.officialWebUrl + 'common-bill.html';
 				uni.navigateTo({
-					url: `/pages/common/webview/index?title=${title}&url=${url}`
+					url: `/pagesA/common/webview/index?title=${title}&url=${url}`
 				});
 			},
 			// 勾选协议
diff --git a/yack-app/pagesB/login/smsLogin.vue b/yack-app/pagesB/login/smsLogin.vue
index 8bb14c67..22976914 100644
--- a/yack-app/pagesB/login/smsLogin.vue
+++ b/yack-app/pagesB/login/smsLogin.vue
@@ -182,7 +182,7 @@
 				let title = this.$tt('login.serviceAgreement');
 				let url = projectConfig.officialWebUrl + 'service-agreement.html';
 				uni.navigateTo({
-					url: `/pages/common/webview/index?title=${title}&url=${url}`
+					url: `/pagesA/common/webview/index?title=${title}&url=${url}`
 				});
 			},
 			// 隐私政策
@@ -190,12 +190,12 @@
 				let title = this.$tt('login.privacyPolicy');
 				let url = projectConfig.officialWebUrl + 'privacy-policy.html';
 				uni.navigateTo({
-					url: `/pages/common/webview/index?title=${title}&url=${url}`
+					url: `/pagesA/common/webview/index?title=${title}&url=${url}`
 				});
 			},
 			openhpLink () {
 				uni.navigateTo({
-					url: '/pages/common/webview/index?url=https://ycdat.cn/'
+					url: '/pagesA/common/webview/index?url=https://ycdat.cn/'
 				});
 			}
 		}
diff --git a/yack-app/pagesB/login/waitLogin.vue b/yack-app/pagesB/login/waitLogin.vue
index 7955789c..0ded6c5f 100644
--- a/yack-app/pagesB/login/waitLogin.vue
+++ b/yack-app/pagesB/login/waitLogin.vue
@@ -75,7 +75,7 @@
 				let title = this.$tt('login.privacyPolicy');
 				let url = projectConfig.officialWebUrl + 'privacy-policy.html';
 				uni.navigateTo({
-					url: `/pages/common/webview/index?title=${title}&url=${url}`
+					url: `/pagesA/common/webview/index?title=${title}&url=${url}`
 				});
 			},
 			// 服务协议
@@ -83,7 +83,7 @@
 				let title = this.$tt('login.serviceAgreement');
 				let url = projectConfig.officialWebUrl + 'service-agreement.html';
 				uni.navigateTo({
-					url: `/pages/common/webview/index?title=${title}&url=${url}`
+					url: `/pagesA/common/webview/index?title=${title}&url=${url}`
 				});
 			},
 			// 儿童隐私保护声明
@@ -91,7 +91,7 @@
 				let title = this.$tt('login.childProtectionStatement');
 				let url = projectConfig.officialWebUrl + 'child-protection-statement.html';
 				uni.navigateTo({
-					url: `/pages/common/webview/index?title=${title}&url=${url}`
+					url: `/pagesA/common/webview/index?title=${title}&url=${url}`
 				});
 			},
 			// 第三方信息共享清单
@@ -99,7 +99,7 @@
 				let title = this.$tt('login.commonBill');
 				let url = projectConfig.officialWebUrl + 'common-bill.html';
 				uni.navigateTo({
-					url: `/pages/common/webview/index?title=${title}&url=${url}`
+					url: `/pagesA/common/webview/index?title=${title}&url=${url}`
 				});
 			},
 			//前往登录页面
diff --git a/yack-app/pagesB/user/avatar.vue b/yack-app/pagesB/user/avatar.vue
index 5a37057e..2498a276 100644
--- a/yack-app/pagesB/user/avatar.vue
+++ b/yack-app/pagesB/user/avatar.vue
@@ -5,7 +5,7 @@
 	<cropping :source="{ album: $tt('avatar.album')}" :imageUrl="avatarUrl" @cancel="handleCancel" @success="handleSuccess" />
 </template>
 <script>
-	import cropping from '@/components/cropping/index.vue';
+	import cropping from '@/pagesB/components/cropping/index.vue';
 	import { uploadAvatar } from "@/apis/modules/account";
 
 	export default {
diff --git a/yack-app/pagesB/user/scada/indeScada.vue b/yack-app/pagesB/user/scada/indeScada.vue
index df4e615b..5054d489 100644
--- a/yack-app/pagesB/user/scada/indeScada.vue
+++ b/yack-app/pagesB/user/scada/indeScada.vue
@@ -116,7 +116,7 @@
 				const token = uni.getStorageSync('token');
 				const url = projectConfig.baseUrl + `${'scada/topo/fullscreen'}?guid=${guid}&type=3&share=${token}`;
 				uni.navigateTo({
-					url: `/pages/common/webview/index?title=${title}&url=${encodeURIComponent(url)}`
+					url: `/pagesA/common/webview/index?title=${title}&url=${encodeURIComponent(url)}`
 				})
 			},
 			// 下拉刷新
diff --git a/yack-app/static/home/fastbee.png b/yack-app/static/home/fastbee.png
deleted file mode 100644
index 67ac75b8..00000000
Binary files a/yack-app/static/home/fastbee.png and /dev/null differ
diff --git a/yack-app/static/logo-1.png b/yack-app/static/logo-1.png
deleted file mode 100644
index de03c7f5..00000000
Binary files a/yack-app/static/logo-1.png and /dev/null differ
diff --git a/yack-app/static/logo.9.png b/yack-app/static/logo.9.png
deleted file mode 100644
index 84cb65c9..00000000
Binary files a/yack-app/static/logo.9.png and /dev/null differ
diff --git a/yack-app/static/logo_title.png b/yack-app/static/logo_title.png
deleted file mode 100644
index 6428ae90..00000000
Binary files a/yack-app/static/logo_title.png and /dev/null differ
diff --git a/yack-app/static/yack.png b/yack-app/static/yack.png
index fb703c31..00b9138d 100644
Binary files a/yack-app/static/yack.png and b/yack-app/static/yack.png differ
diff --git a/yack-app/unpackage/res/icons/1024x1024.png b/yack-app/unpackage/res/icons/1024x1024.png
index 575e7ec8..c834862c 100644
Binary files a/yack-app/unpackage/res/icons/1024x1024.png and b/yack-app/unpackage/res/icons/1024x1024.png differ
diff --git a/yack-app/unpackage/res/icons/120x120.png b/yack-app/unpackage/res/icons/120x120.png
deleted file mode 100644
index ac83699c..00000000
Binary files a/yack-app/unpackage/res/icons/120x120.png and /dev/null differ
diff --git a/yack-app/unpackage/res/icons/144x144.png b/yack-app/unpackage/res/icons/144x144.png
deleted file mode 100644
index e04c3043..00000000
Binary files a/yack-app/unpackage/res/icons/144x144.png and /dev/null differ
diff --git a/yack-app/unpackage/res/icons/152x152.png b/yack-app/unpackage/res/icons/152x152.png
deleted file mode 100644
index fe987bb3..00000000
Binary files a/yack-app/unpackage/res/icons/152x152.png and /dev/null differ
diff --git a/yack-app/unpackage/res/icons/167x167.png b/yack-app/unpackage/res/icons/167x167.png
deleted file mode 100644
index 174789b2..00000000
Binary files a/yack-app/unpackage/res/icons/167x167.png and /dev/null differ
diff --git a/yack-app/unpackage/res/icons/180x180.png b/yack-app/unpackage/res/icons/180x180.png
index 58e3e533..48abb58f 100644
Binary files a/yack-app/unpackage/res/icons/180x180.png and b/yack-app/unpackage/res/icons/180x180.png differ
diff --git a/yack-app/unpackage/res/icons/192x192.png b/yack-app/unpackage/res/icons/192x192.png
index b96a56a8..944b1385 100644
Binary files a/yack-app/unpackage/res/icons/192x192.png and b/yack-app/unpackage/res/icons/192x192.png differ
diff --git a/yack-app/unpackage/res/icons/20x20.png b/yack-app/unpackage/res/icons/20x20.png
deleted file mode 100644
index 39dcf014..00000000
Binary files a/yack-app/unpackage/res/icons/20x20.png and /dev/null differ
diff --git a/yack-app/unpackage/res/icons/29x29.png b/yack-app/unpackage/res/icons/29x29.png
deleted file mode 100644
index 1443d567..00000000
Binary files a/yack-app/unpackage/res/icons/29x29.png and /dev/null differ
diff --git a/yack-app/unpackage/res/icons/40x40.png b/yack-app/unpackage/res/icons/40x40.png
deleted file mode 100644
index 76a0c568..00000000
Binary files a/yack-app/unpackage/res/icons/40x40.png and /dev/null differ
diff --git a/yack-app/unpackage/res/icons/58x58.png b/yack-app/unpackage/res/icons/58x58.png
deleted file mode 100644
index 941facb8..00000000
Binary files a/yack-app/unpackage/res/icons/58x58.png and /dev/null differ
diff --git a/yack-app/unpackage/res/icons/60x60.png b/yack-app/unpackage/res/icons/60x60.png
deleted file mode 100644
index f7dbfb99..00000000
Binary files a/yack-app/unpackage/res/icons/60x60.png and /dev/null differ
diff --git a/yack-app/unpackage/res/icons/72x72.png b/yack-app/unpackage/res/icons/72x72.png
deleted file mode 100644
index 799c932f..00000000
Binary files a/yack-app/unpackage/res/icons/72x72.png and /dev/null differ
diff --git a/yack-app/unpackage/res/icons/76x76.png b/yack-app/unpackage/res/icons/76x76.png
deleted file mode 100644
index 53b06717..00000000
Binary files a/yack-app/unpackage/res/icons/76x76.png and /dev/null differ
diff --git a/yack-app/unpackage/res/icons/80x80.png b/yack-app/unpackage/res/icons/80x80.png
deleted file mode 100644
index e3f92913..00000000
Binary files a/yack-app/unpackage/res/icons/80x80.png and /dev/null differ
diff --git a/yack-app/unpackage/res/icons/87x87.png b/yack-app/unpackage/res/icons/87x87.png
deleted file mode 100644
index a83f210d..00000000
Binary files a/yack-app/unpackage/res/icons/87x87.png and /dev/null differ
diff --git a/yack-app/unpackage/res/icons/96x96.png b/yack-app/unpackage/res/icons/96x96.png
deleted file mode 100644
index 5b352677..00000000
Binary files a/yack-app/unpackage/res/icons/96x96.png and /dev/null differ