Merge branch 'test' of 47.94.45.65:angelo/web-africa-h5 into base-online

App.vue

@@ -221,12 +221,7 @@ export default {
           this.$i18n.mergeLocaleMessage(name, enUS);
         }
       }
-      if (name == "ru-RU") {
+      
-        if (ruRU) {
-          const localruRU = this.getJS(ruRU, "ruRU");
-          this.$i18n.mergeLocaleMessage(name, ruRU);
-        }
-      }
       if (name == "fr-FR") {
         if (frFR) {
           const localruRU = this.getJS(frFR, "frFR");
@@ -238,9 +233,7 @@ export default {
       let self = this;
       self.setLocale("en-US", "enUS", "en");
       self.setLocale("zh-CN", "zhCN", "zh-CN");
-      self.setLocale("ru-RU", "ruRU", "ru-RU");
       self.setLocale("fr-FR", "frFR", "fr-FR");
-      // self.setLocale('pt-PT', 'ptPT', 'pt-PT');
     },
     isFirstEnter() {
       var firstEnter = uni.getStorageSync("firstEnter"); //同步获取缓存中是否有首次进入字段

components/annuity/index.vue

@@ -130,7 +130,7 @@
 			},
 			getData() {
 				let self = this;
-				self._get("/member/api/member/get-member-annuity-time", {}, (res) => {
+				self._get("member/api/member/get-member-annuity-time", {}, (res) => {
 					self.annuityParams = res.data;
 					if (
 						self.annuityParams.expireDateNumber <= 60 &&
@@ -146,7 +146,7 @@
 			},
 			getMemberRenewAmount() {
 				let self = this;
-				self._get("/member/api/member/get-member-renew-amount", {}, (res) => {
+				self._get("member/api/member/get-member-renew-amount", {}, (res) => {
 					this.qnnuityPrice = res.data;
 					this.isPopup = true;
 				});

components/architectures/resettleSO1.vue

@@ -42,14 +42,6 @@
                     ></image>
                   </view>
                   <view>
-                    <!-- <image
-											crossorigin="anonymous"
-											data-etype="image"
-											:data-enode="treeData.countryUrl2"
-											:src="'data:image/png;base64,' + treeData.countryUrl2Base64"
-											mode="aspectFit"
-											class="poster2"
-										></image> -->
                     <image
                       crossorigin="anonymous"
                       data-etype="image"
@@ -139,7 +131,6 @@
               </view>
             </view>
             <view class="flex_btn">
-              <!-- <view @click.stop="downImage('Poster1')" class="goTop_btn" style="backgroundColor:#ee1e26">{{ $t('S_C_45') }}</view> -->
               <view
                 @click.stop="copyText(treeData)"
                 class="goTop_btn"
@@ -164,8 +155,7 @@
       v-if="
         Array.isArray(treeData.children) &&
         treeData.children.length &&
-        treeData.extend &&
+        treeData.extend
-        !loading
       "
     >
       <view
@@ -175,7 +165,7 @@
         class="childLevel v-td"
       >
         <TreeChart
-          :json="children"
+          :treeData="children"
           :left="0"
           :top="0"
           @click-node="clickNode"
@@ -183,7 +173,6 @@
         />
       </view>
     </view>
-    <!-- <Eposter width="750" height="1334" :list="list" backgroundColor="rgb(255, 255, 255)" @on-success="onSuccess" ref="Eposter"></Eposter> -->
   </view>
 </template>
 
@@ -195,59 +184,14 @@ export default {
     // Eposter
   },
   name: "TreeChart",
-  props: ["json", "size"],
+  props: ["treeData", "size"],
   data() {
     return {
-      treeData: {},
       list: [],
       languages: "",
-      loading: true,
     };
   },
-  watch: {
+
-    json: {
-      handler: function (Props) {
-        let extendKey = function (jsonData) {
-          if (Object.prototype.toString.call(jsonData) !== "[object Object]") {
-            jsonData = {};
-          }
-          jsonData.extend =
-            jsonData.extend === void 0 ? true : !!jsonData.extend;
-          if (Array.isArray(jsonData.children)) {
-            jsonData.children.forEach((c) => {
-              extendKey(c);
-            });
-          }
-          return jsonData;
-        };
-        if (Props) {
-          let self = this;
-          // self._post(
-          // 	'member/manage/member-structure/get-url-base64',
-          // 	{
-          // 		countryUrl2: extendKey(Props).countryUrl2,
-          // 		settleCountryUrl2: extendKey(Props).settleCountryUrl2,
-          // 		avatarUrl: extendKey(Props).avatarUrl
-          // 	},
-          // 	res => {
-          // 		extendKey(Props).countryUrl2Base64 = res.countryUrl2Base64;
-          // 		extendKey(Props).settleCountryUrl2Base64 = res.settleCountryUrl2Base64;
-          // 		extendKey(Props).avatarUrlBase64 = res.avatarUrlBase64;
-          // 		this.treeData = extendKey(Props);
-          // 		self.loading = false;
-          // 	}
-          // );
-          extendKey(Props).countryUrl2Base64 = extendKey(Props).countryUrl2;
-          extendKey(Props).settleCountryUrl2Base64 =
-            extendKey(Props).settleCountryUrl2;
-          extendKey(Props).avatarUrlBase64 = extendKey(Props).avatarUrl;
-          this.treeData = extendKey(Props);
-          self.loading = false;
-        }
-      },
-      immediate: true,
-    },
-  },
   onload() {
     this.languages = uni.getLocale();
   },
@@ -291,44 +235,6 @@ export default {
         },
       });
     },
-    //下载图片
-    downImage(elClass) {
-      this.$refs.Eposter.createForElRect(elClass, false);
-    },
-    downloadImg() {
-      let self = this;
-      let element = document.querySelector(".Poster1");
-      uni.showLoading({
-        title: self.$t("w_0413"),
-      });
-      html2canvas(element)
-        .then(function (canvas) {
-          let dataURL = canvas.toDataURL("image/jpeg");
-          let link = document.createElement("a");
-          link.style.display = "none";
-          link.href = dataURL;
-          link.download = "image.jpg";
-          document.body.appendChild(link);
-          link.click();
-          document.body.removeChild(link);
-          uni.showToast({
-            icon: "none",
-            title: self.$t("fn_056"),
-            duration: 2000,
-          });
-          uni.hideLoading();
-        })
-        .catch(function (error) {
-          uni.hideLoading();
-          uni.showModal({
-            title: self.$t("w_0406"),
-          });
-        });
-    },
-    onSuccess(val) {
-      this.posterImg = val;
-      this.downloadImg(this.posterImg);
-    },
     toggleExtend: function (treeData) {
       treeData.extend = !treeData.extend;
       this.$forceUpdate();

config.js

@@ -1,14 +1,12 @@
-var app_url = 'http://f.hzs413.com';
+var app_url = '/prod-api/';
 var yxyapi = 'https://yxy.hzs413.com';
-var ossapi = 'https://dny-test.s3.ap-southeast-1.amazonaws.com';
+var ossapi = 'https://agl413-test.s3.af-south-1.amazonaws.com';
-var ossurl = '/online/language/';
+var ossurl = '/test/';
 // 如果是本地测试环境
 if (process.env.NODE_ENV === 'development') {
 	//#ifdef H5
-	app_url = '/api';
+	app_url = 'http://192.168.0.86:8080/';
 	yxyapi = '/dev-api';
-	ossapi = '/oss-api';
-	ossurl = '/online/language/';
 	//#endif
 }
 // 如果是生产环境，h5环境下直接读取url

locale/index.js

@@ -2,14 +2,12 @@ import enUS from './en-US.json'
 import zhCN from './zh-CN';
 // import zhHant from './zh-Hant.json'
 import frFR from './fr-FR.json'
-import ruRU from './ru-RU.json'
 import ptPT from './pt-PT.json'
 export default {
 	'en-US': enUS,
 	'zh-CN': zhCN,
 	// 'zh-Hant': zhHant,
 	'fr-FR': frFR,
-	'ru-RU': ruRU,
 	'pt-PT':ptPT
 }
  

locale/uni-app.ru-RU.json

@@ -1,34 +0,0 @@
-{
-	"common": {
-		"uni.app.quit": "Нажмите еще раз, чтобы выйти из приложения",
-		"uni.async.error": "Время ожидания подключения к серверу, нажмите на экран, чтобы повторить попытку",
-		"uni.showActionSheet.cancel": "Отменить",
-		"uni.showToast.unpaired": "Обратите внимание, что ShowToast и HideToast должны работать вместе.",
-		"uni.showLoading.unpaired": "Обратите внимание, что showLoading и hideLoading должны быть совместимы.",
-		"uni.showModal.cancel": "Отменить",
-		"uni.showModal.confirm": "Определение",
-		"uni.chooseImage.cancel": "Отменить",
-		"uni.chooseImage.sourceType.album": "Выбрать из альбома",
-		"uni.chooseImage.sourceType.camera": "Съемки",
-		"uni.chooseVideo.cancel": "Отменить",
-		"uni.chooseVideo.sourceType.album": "Выбрать из альбома",
-		"uni.chooseVideo.sourceType.camera": "Съемки",
-		"uni.previewImage.cancel": "Отменить",
-		"uni.previewImage.button.save": "Сохранить изображение",
-		"uni.previewImage.save.success": "Сохранить изображение в альбом",
-		"uni.previewImage.save.fail": "Ошибка сохранения изображения в альбоме",
-		"uni.setClipboardData.success": "Содержание скопировано",
-		"uni.scanCode.title": "Код сканирования",
-		"uni.scanCode.album": "Фотоальбом",
-		"uni.scanCode.fail": "Ошибка идентификации",
-		"uni.scanCode.flash.on": "Подсветка",
-		"uni.scanCode.flash.off": "Приключения закрываются",
-		"uni.startSoterAuthentication.authContent": "Отпечатки пальцев....",
-		"uni.picker.done": "Завершено",
-		"uni.picker.cancel": "Отменить",
-		"uni.video.danmu": "Снаряд",
-		"uni.video.volume": "Громкость",
-		"uni.button.feedback.title": "Обратная связь ",
-		"uni.button.feedback.send": "Отправить"
-	}
-}

main.js

@@ -17,14 +17,9 @@ let i18nConfig = {
 		'en-US': messages['en-US'],
 		'zh-CN': messages['zh-CN'],
 		// 'zh-Hant': messages['zh-Hant'],
-		'ru-RU': messages['ru-RU'],
 		'fr-FR': messages['fr-FR'],
 		'pt-PT': messages['pt-PT'],
-		// 'en': '',
+		
-		// 'zh-CN': '',
-		// 'zh-Hant': '',
-		// 'ru-RU': '',
-		// 'fr-FR': '',
 	}
 }
 import VueI18n from 'vue-i18n'
@@ -85,9 +80,9 @@ app.$router.afterEach((to, from) => {
 	}
 	const u = navigator.userAgent.toLowerCase()
 	if (u.indexOf("like mac os x") < 0 || u.match(/MicroMessenger/i) != 'micromessenger') return
-	if (to.path !== global.location.pathname) {
+	// if (to.path !== global.location.pathname) {
-		location.assign(config.h5_addr + to.fullPath);
+	// 	location.assign(config.h5_addr + to.fullPath);
-	}
+	// }
 })
 //#endif
 
@@ -114,10 +109,12 @@ Vue.prototype._get = function(path, data, success, fail, complete) {
 	let host = self.websiteUrl();
 	// #ifndef APP-PLUS
 	host = config.app_url
+	console.log(host, '...host')
 	// #endif
 	let callback = function() {
+	
 		uni.request({
-			url: host + '/inter-api/' + path,
+			url: host + path,
 			data: data,
 			dataType: 'json',
 			header: {
@@ -195,7 +192,7 @@ Vue.prototype._post = function(path, data, success, fail, complete) {
 	Source = '3'
 	// #endif
 	uni.request({
-		url: host + '/inter-api/' + path,
+		url: host + path,
 		data: data,
 		dataType: 'json',
 		method: 'POST',
@@ -241,7 +238,7 @@ Vue.prototype._put = function(path, data, success, fail, complete) {
 	host = config.app_url
 	// #endif
 	uni.request({
-		url: host + '/inter-api/' + path + '/' + data,
+		url: host + path + '/' + data,
 		dataType: 'json',
 		method: 'PUT',
 		header: {
@@ -281,7 +278,7 @@ Vue.prototype._putjson = function(path, data, success, fail, complete) {
 	host = config.app_url
 	// #endif
 	uni.request({
-		url: host + '/inter-api/' + path,
+		url: host + path,
 		data: data,
 		dataType: 'json',
 		method: 'PUT',
@@ -321,7 +318,7 @@ Vue.prototype._delete = function(path, data, success, fail, complete) {
 	host = config.app_url
 	// #endif
 	uni.request({
-		url: host + '/inter-api/' + path,
+		url: host + path,
 		dataType: 'json',
 		method: 'DELETE',
 		header: {
@@ -603,18 +600,11 @@ Vue.prototype.topBarTop = function() {
 	// #ifdef MP-WEIXIN
 	return uni.getMenuButtonBoundingClientRect().top;
 	// #endif
-	// #ifndef MP-WEIXIN
-	const SystemInfo = uni.getSystemInfoSync();
-	return SystemInfo.statusBarHeight;
-	// #endif
 };
 Vue.prototype.topBarHeight = function() {
 	// #ifdef MP-WEIXIN
 	return uni.getMenuButtonBoundingClientRect().height;
 	// #endif
-	// #ifndef MP-WEIXIN
-	return 0
-	// #endif
 };
 Vue.prototype.callPhone = function(n) {
 	if (n == '') {
@@ -705,8 +695,6 @@ Vue.prototype.getLocale = function() {
 		return 'zh-TC'
 	} else if (l == 'fr-FR') {
 		return 'fr-FR'
-	} else if (l == 'ru-RU') {
-		return 'ru-RU'
 	} else if (l == 'pt-PT') {
 		return 'pt-PT'
 	} else {
@@ -721,8 +709,6 @@ Vue.prototype.getLanguage = function() {
 		return 'zh-TC'
 	} else if (l == 'fr-FR') {
 		return 'fr-FR'
-	} else if (l == 'ru-RU') {
-		return 'ru-RU'
 	} else if (l == 'pt-PT') {
 		return 'pt-PT'
 	} else {

manifest.json

@@ -1,7 +1,7 @@
 {
-    "name" : "海之圣",
+    "name": "af-app",
-    "appid" : "__UNI__A4B56F3",
+    "appid": "__UNI__31B4587",
-    "description" : "海之圣",
+    "description": "af-app",
     "versionName": "1.6.4",
     "versionCode": 164,
     "transformPx": false,
@@ -49,7 +49,11 @@
                     "<uses-permission android:name=\"android.permission.WRITE_CONTACTS\"/>",
                     "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
                 ],
-                "abiFilters" : [ "armeabi-v7a", "arm64-v8a", "x86" ]
+                "abiFilters": [
+                    "armeabi-v7a",
+                    "arm64-v8a",
+                    "x86"
+                ]
             },
             "ios": {
                 "idfa": false,
@@ -72,14 +76,20 @@
                 },
                 "payment": {
                     "weixin": {
-                        "__platform__" : [ "ios", "android" ],
+                        "__platform__": [
+                            "ios",
+                            "android"
+                        ],
                         "appid": "wx6996eec3fdcc8482",
                         "UniversalLinks": "https://hzs.hzs413.com/"
                     }
                 },
                 "geolocation": {
                     "amap": {
-                        "__platform__" : [ "ios", "android" ],
+                        "__platform__": [
+                            "ios",
+                            "android"
+                        ],
                         "appkey_ios": "6f95a1f244b11c5948c4f76bdef74044",
                         "appkey_android": "87dd4017ae554f18176812ddc4ae4c13"
                     }
@@ -158,14 +168,11 @@
         "devServer": {
             "https": false,
             "proxy": {
-                "/api" : {
+                "/prod-api": {
                     "ws": false,
-                    "target" : "http://f.hzs413.com",
+                    "target": "http://af-app.beida413.com/",
                     "changeOrigin": true,
-                    "secure" : false,
+                    "secure": false
-                    "pathRewrite" : {
-                        "^/api" : "/"
-                    }
                 },
                 "/dev-api": {
                     "ws": false,

pages/architecture/recommendArchite/recommend1.vue

@@ -162,7 +162,7 @@ export default {
     getDataList() {
       let self = this;
       let params = this.queryParams;
-      self._get("/member/api/member-structure/tj-framework", params, (res) => {
+      self._get("member/api/member-structure/tj-framework", params, (res) => {
         self.treeData = res.data;
       });
     },

pages/architecture/resettleArchite/mixin/archDataMixin.js

@@ -0,0 +1,30 @@
+export default {
+  data() {
+    return {
+      archTreeData: {},
+    };
+  },
+  methods: {
+    archDataFormat(archTreeData) {
+      const forkData = JSON.parse(JSON.stringify(archTreeData))
+      const addExtendKey = (forkData) => {
+        if (!forkData) {
+          forkData = {}
+        }
+        forkData.extend = forkData.extend === void 0 ? true : !!forkData.extend
+        if (Array.isArray(forkData.children)) {
+          forkData.children.forEach((c) => {
+            addExtendKey(c)
+          })
+        } else {
+          forkData.countryUrl2Base64 = forkData.countryUrl2
+          forkData.settleCountryUrl2Base64 = forkData.settleCountryUrl2
+          forkData.avatarUrlBase64 = forkData.avatarUrl
+        }
+        return forkData
+      }
+      addExtendKey(forkData)
+      return forkData
+    },
+  },
+};

pages/architecture/resettleArchite/mixin/touchScaleMixin.js

@@ -0,0 +1,425 @@
+// 兼容性处理：requestAnimationFrame polyfill
+const getRequestAnimationFrame = () => {
+  // 检查全局对象是否存在（uni-app 中可能是 uni 而不是 window）
+  const global = typeof window !== 'undefined' ? window : 
+                 typeof uni !== 'undefined' ? uni : 
+                 typeof global !== 'undefined' ? global : {};
+
+  return global.requestAnimationFrame ||
+    global.webkitRequestAnimationFrame ||
+    global.mozRequestAnimationFrame ||
+    global.oRequestAnimationFrame ||
+    global.msRequestAnimationFrame ||
+    function(callback) {
+      return setTimeout(callback, 1000 / 60); // 60 FPS fallback
+    };
+};
+
+const getCancelAnimationFrame = () => {
+  const global = typeof window !== 'undefined' ? window : 
+                 typeof uni !== 'undefined' ? uni : 
+                 typeof global !== 'undefined' ? global : {};
+
+  return global.cancelAnimationFrame ||
+    global.webkitCancelAnimationFrame ||
+    global.mozCancelAnimationFrame ||
+    global.oCancelAnimationFrame ||
+    global.msCancelAnimationFrame ||
+    function(id) {
+      return clearTimeout(id);
+    };
+};
+
+const requestAnimationFrame = getRequestAnimationFrame();
+const cancelAnimationFrame = getCancelAnimationFrame();
+
+export default {
+  data() {
+    return {
+      // 触摸缩放相关状态
+      touchStartPosition1: {
+        x: 0,
+        y: 0,
+      },
+      touchStartPosition2: {
+        x: 0,
+        y: 0,
+      },
+      initialDistance: 0,
+      x: 0, // 元素的x坐标
+      y: 0, // 元素的y坐标
+      scale: 1, // 元素的缩放比例
+      initialX: 0, // 元素的初始x坐标
+      initialY: 0, // 元素的初始y坐标
+      minScale: 0.5, // 最小缩放比例
+      maxScale: 3, // 最大缩放比例
+      isScaling: false, // 是否正在缩放
+      lastTouchTime: 0, // 上次触摸时间
+      
+      // 拖拽优化相关
+      isDragging: false, // 是否正在拖拽
+      dragStartTime: 0, // 拖拽开始时间
+      lastMoveTime: 0, // 上次移动时间
+      velocity: { x: 0, y: 0 }, // 移动速度
+      animationId: null, // 动画帧ID
+      pendingUpdate: false, // 是否有待处理的更新
+      
+      // 边界控制
+      enableBoundary: false, // 是否启用边界控制
+      boundary: {
+        minX: -500,
+        maxX: 500,
+        minY: -500,
+        maxY: 500,
+      }, // 移动边界
+      
+      // 兼容性相关
+      useTimer: false, // 是否使用定时器代替 RAF（兼容性降级）
+    };
+  },
+  methods: {
+    /**
+     * 触摸开始事件处理
+     * @param {TouchEvent} event 触摸事件
+     */
+    handleTouchStart(event) {
+      event.preventDefault();
+      
+      // 取消之前的动画
+      if (this.animationId) {
+        this.safeCancelAnimationFrame(this.animationId);
+        this.animationId = null;
+      }
+      
+      const currentTime = Date.now();
+      this.lastTouchTime = currentTime;
+      
+      if (event.touches.length === 1) {
+        // 单指拖拽初始化
+        this.isScaling = false;
+        this.isDragging = true;
+        this.dragStartTime = currentTime;
+        this.lastMoveTime = currentTime;
+        this.initialX = event.touches[0].clientX;
+        this.initialY = event.touches[0].clientY;
+        this.velocity = { x: 0, y: 0 };
+        this.pendingUpdate = false;
+      } else if (event.touches.length === 2) {
+        // 双指缩放初始化
+        this.isScaling = true;
+        this.isDragging = false;
+        this.touchStartPosition1.x = event.touches[0].clientX;
+        this.touchStartPosition1.y = event.touches[0].clientY;
+        this.touchStartPosition2.x = event.touches[1].clientX;
+        this.touchStartPosition2.y = event.touches[1].clientY;
+        
+        // 计算初始两指间距离
+        this.initialDistance = this.getDistance(
+          this.touchStartPosition1,
+          this.touchStartPosition2
+        );
+      }
+    },
+    
+    /**
+     * 触摸移动事件处理
+     * @param {TouchEvent} event 触摸事件
+     */
+    handleTouchMove(event) {
+      event.preventDefault();
+      
+      if (event.touches.length === 2 && this.isScaling) {
+        // 双指缩放逻辑
+        const currentDistance = this.getDistance(
+          { x: event.touches[0].clientX, y: event.touches[0].clientY },
+          { x: event.touches[1].clientX, y: event.touches[1].clientY }
+        );
+        
+        if (this.initialDistance > 0) {
+          // 计算缩放比例变化
+          const scaleChange = currentDistance / this.initialDistance;
+          let newScale = this.scale * scaleChange;
+          
+          // 限制缩放范围
+          newScale = Math.max(this.minScale, Math.min(this.maxScale, newScale));
+          this.scale = newScale;
+          
+          // 更新初始距离为当前距离，用于下次计算
+          this.initialDistance = currentDistance;
+        }
+      } else if (event.touches.length === 1 && this.isDragging) {
+        // 单指拖拽逻辑优化
+        const currentTime = Date.now();
+        const currentX = event.touches[0].clientX;
+        const currentY = event.touches[0].clientY;
+        
+        // 计算移动距离
+        const deltaX = currentX - this.initialX;
+        const deltaY = currentY - this.initialY;
+        
+        // 计算移动速度（用于惯性效果）
+        const timeDelta = currentTime - this.lastMoveTime;
+        if (timeDelta > 0) {
+          this.velocity.x = deltaX / timeDelta * 16; // 标准化到16ms（60fps）
+          this.velocity.y = deltaY / timeDelta * 16;
+        }
+        
+        // 使用节流机制更新位置
+        this.schedulePositionUpdate(deltaX, deltaY);
+        
+        // 更新初始位置和时间
+        this.initialX = currentX;
+        this.initialY = currentY;
+        this.lastMoveTime = currentTime;
+      }
+    },
+    
+    /**
+     * 触摸结束事件处理
+     * @param {TouchEvent} event 触摸事件
+     */
+    handleTouchEnd(event) {
+      if (event.touches.length === 0) {
+        // 所有手指都离开屏幕，重置状态
+        this.isScaling = false;
+        this.initialDistance = 0;
+        
+        // 如果是拖拽结束，启动惯性效果
+        if (this.isDragging) {
+          this.isDragging = false;
+          this.startInertiaAnimation();
+        }
+      } else if (event.touches.length === 1 && this.isScaling) {
+        // 从双指变为单指，切换到拖拽模式
+        this.isScaling = false;
+        this.isDragging = true;
+        this.initialX = event.touches[0].clientX;
+        this.initialY = event.touches[0].clientY;
+        this.lastMoveTime = Date.now();
+      }
+    },
+    
+    /**
+     * 计算两点间距离的辅助方法
+     * @param {Object} point1 第一个点 {x, y}
+     * @param {Object} point2 第二个点 {x, y}
+     * @return {Number} 两点间距离
+     */
+    getDistance(point1, point2) {
+      const dx = point1.x - point2.x;
+      const dy = point1.y - point2.y;
+      return Math.sqrt(dx * dx + dy * dy);
+    },
+    
+    /**
+     * 重置缩放和位置
+     */
+    resetTransform() {
+      this.x = 0;
+      this.y = 0;
+      this.scale = 1;
+      this.isScaling = false;
+      this.initialDistance = 0;
+    },
+    
+    /**
+     * 安全的 requestAnimationFrame 调用
+     * @param {Function} callback 回调函数
+     * @return {Number} 动画ID
+     */
+    safeRequestAnimationFrame(callback) {
+      try {
+        if (this.useTimer) {
+          return setTimeout(callback, 16); // 约 60 FPS
+        }
+        return requestAnimationFrame(callback);
+      } catch (error) {
+        console.warn('requestAnimationFrame failed, fallback to setTimeout:', error);
+        this.useTimer = true;
+        return setTimeout(callback, 16);
+      }
+    },
+    
+    /**
+     * 安全的 cancelAnimationFrame 调用
+     * @param {Number} id 动画ID
+     */
+    safeCancelAnimationFrame(id) {
+      try {
+        if (this.useTimer || typeof id === 'number') {
+          clearTimeout(id);
+        } else {
+          cancelAnimationFrame(id);
+        }
+      } catch (error) {
+        console.warn('cancelAnimationFrame failed, fallback to clearTimeout:', error);
+        clearTimeout(id);
+      }
+    },
+
+    /**
+     * 节流位置更新机制
+     * @param {Number} deltaX x轴位移
+     * @param {Number} deltaY y轴位移
+     */
+    schedulePositionUpdate(deltaX, deltaY) {
+      // 计算新位置
+      let newX = this.x + deltaX;
+      let newY = this.y + deltaY;
+      
+      // 应用边界限制
+      if (this.enableBoundary) {
+        const pos = this.applyBoundaryConstraints(newX, newY);
+        newX = pos.x;
+        newY = pos.y;
+      }
+      
+      // 更新位置
+      this.x = newX;
+      this.y = newY;
+      
+      if (!this.pendingUpdate) {
+        this.pendingUpdate = true;
+        this.safeRequestAnimationFrame(() => {
+          this.pendingUpdate = false;
+        });
+      }
+    },
+    
+    /**
+     * 启动惯性动画
+     */
+    startInertiaAnimation() {
+      const minVelocity = 0.1; // 最小速度阈值
+      const friction = 0.95; // 摩擦系数
+      
+      // 如果速度太小，直接停止
+      if (Math.abs(this.velocity.x) < minVelocity && Math.abs(this.velocity.y) < minVelocity) {
+        return;
+      }
+      
+      const animate = () => {
+        // 应用摩擦力
+        this.velocity.x *= friction;
+        this.velocity.y *= friction;
+        
+        // 更新位置
+        let newX = this.x + this.velocity.x;
+        let newY = this.y + this.velocity.y;
+        
+        // 应用边界限制
+        if (this.enableBoundary) {
+          const pos = this.applyBoundaryConstraints(newX, newY);
+          newX = pos.x;
+          newY = pos.y;
+          
+          // 如果到达边界，减慢对应方向的速度
+          if (newX !== this.x + this.velocity.x) {
+            this.velocity.x *= 0.3;
+          }
+          if (newY !== this.y + this.velocity.y) {
+            this.velocity.y *= 0.3;
+          }
+        }
+        
+        this.x = newX;
+        this.y = newY;
+        
+        // 检查是否继续动画
+        if (Math.abs(this.velocity.x) > minVelocity || Math.abs(this.velocity.y) > minVelocity) {
+          this.animationId = this.safeRequestAnimationFrame(animate);
+        } else {
+          this.animationId = null;
+          this.velocity = { x: 0, y: 0 };
+        }
+      };
+      
+      this.animationId = this.safeRequestAnimationFrame(animate);
+    },
+    
+    /**
+     * 应用边界约束
+     * @param {Number} x x坐标
+     * @param {Number} y y坐标
+     * @return {Object} 约束后的坐标 {x, y}
+     */
+    applyBoundaryConstraints(x, y) {
+      return {
+        x: Math.max(this.boundary.minX, Math.min(this.boundary.maxX, x)),
+        y: Math.max(this.boundary.minY, Math.min(this.boundary.maxY, y)),
+      };
+    },
+    
+    /**
+     * 设置缩放范围
+     * @param {Number} minScale 最小缩放比例
+     * @param {Number} maxScale 最大缩放比例
+     */
+    setScaleRange(minScale, maxScale) {
+      this.minScale = minScale || 0.5;
+      this.maxScale = maxScale || 3;
+    },
+    
+    /**
+     * 设置移动边界
+     * @param {Object} boundary 边界配置 {minX, maxX, minY, maxY}
+     * @param {Boolean} enable 是否启用边界控制
+     */
+    setBoundary(boundary, enable = true) {
+      this.boundary = { ...this.boundary, ...boundary };
+      this.enableBoundary = enable;
+    },
+    
+    /**
+     * 检测并设置兼容性模式
+     */
+    detectCompatibility() {
+      try {
+        // 尝试调用 requestAnimationFrame
+        const testId = requestAnimationFrame(() => {});
+        cancelAnimationFrame(testId);
+        this.useTimer = false;
+      } catch (error) {
+        console.warn('requestAnimationFrame not supported, using timer fallback');
+        this.useTimer = true;
+      }
+    },
+    
+    /**
+     * 强制使用定时器模式（用于调试或特殊需求）
+     * @param {Boolean} useTimer 是否使用定时器
+     */
+    setTimerMode(useTimer = true) {
+      this.useTimer = useTimer;
+      if (useTimer) {
+        console.info('TouchScale: 已切换到定时器模式');
+      } else {
+        console.info('TouchScale: 已切换到 requestAnimationFrame 模式');
+      }
+    },
+
+    /**
+     * 清理动画和状态
+     */
+    cleanupTouchScale() {
+      if (this.animationId) {
+        this.safeCancelAnimationFrame(this.animationId);
+        this.animationId = null;
+      }
+      this.isDragging = false;
+      this.isScaling = false;
+      this.velocity = { x: 0, y: 0 };
+      this.pendingUpdate = false;
+    },
+  },
+  
+  // 组件创建时检测兼容性
+  mounted() {
+    this.detectCompatibility();
+  },
+  
+  // 组件销毁时清理
+  beforeDestroy() {
+    this.cleanupTouchScale();
+  },
+};

pages/architecture/resettleArchite/resettle11.vue

@@ -45,7 +45,7 @@
               transform: `scale(${scale})`,
             }"
             :size="size"
-            :json="data"
+            :treeData="archTreeData"
             :class="{ landscape: landscape.length }"
             @click-node="clickNode"
             @click-top="clickTop"
@@ -146,11 +146,14 @@
 import html2canvas from "html2canvas";
 import TreeChart3 from "@/components/architectures/resettleSO1.vue";
 import Eposter from "@/components/architectures/Poster.vue";
+import archDataMixin from "./mixin/archDataMixin";
+import touchScaleMixin from "./mixin/touchScaleMixin";
 export default {
   components: {
     TreeChart3,
     Eposter,
   },
+  mixins: [archDataMixin, touchScaleMixin],
   data() {
     return {
       avaerInfoList: [],
@@ -158,35 +161,21 @@ export default {
       queryParams: {
         memberSettlePeriodId: "", //期数
         memberCode: "", //会员编号
-        level: 3, //代数
+        level: 7, //代数
         type: 1,
       },
       memberSettlePeriodList: [], //期数
       popShow: false,
       listShow: false,
       settleName: "",
-      data: {},
+      archTreeData: {},
       size: 0.8,
       landscape: [],
       popMould: {},
       isPop: false,
-      touchStartPosition1: {
-        x: 0,
-        y: 0,
-      },
-      touchStartPosition2: {
-        x: 0,
-        y: 0,
-      },
-      initialDistance: 0,
       list: [],
       startX: 0,
-      startY: 0,
+      startY: 0
-      x: 0, // 元素的x坐标
-      y: 0, // 元素的y坐标
-      scale: 1, // 元素的缩放比例
-      initialX: 0, // 元素的初始x坐标
-      initialY: 0, // 元素的初始y坐标
     };
   },
   onLoad() {
@@ -198,41 +187,8 @@ export default {
   methods: {
     onpenPop() {
       this.popShow = true;
-      console.log(this.popShow);
     },
-    handleTouchStart(event) {
-      // 记录元素的初始位置
-      this.initialX = event.changedTouches[0].clientX;
-      this.initialY = event.changedTouches[0].clientY;
-    },
-    handleTouchMove(event) {
-      if (event.touches.length === 2) {
-        // 计算拖动的距离
-        const deltaX = event.touches[0].clientX - event.touches[1].clientX;
-        const deltaY = event.touches[0].clientY - event.touches[1].clientY;
-        // 更新元素的位置和缩放比例
-        this.x += deltaX;
-        this.y += deltaY;
-        // 根据滑动距离控制缩放比例
-        this.scale += deltaY / 100;
-      } else {
-        // 计算拖动的距离
-        const deltaX = event.changedTouches[0].clientX - this.initialX;
-        const deltaY = event.changedTouches[0].clientY - this.initialY;
-        // 更新元素的位置和缩放比例
-        this.x += deltaX;
-        this.y += deltaY;
-      }
 
-      // 更新元素的初始位置为最后一次拖动的结束位置
-      this.initialX = event.touches[0].clientX;
-      this.initialY = event.touches[0].clientY;
-    },
-    handleTouchEnd(event) {
-      // 在这里记录第一次拖动的结束位置，以便第二次拖动时使用
-      this.initialX = event.changedTouches[0].clientX;
-      this.initialY = event.changedTouches[0].clientY;
-    },
     clickNode(e) {},
     clickTop(e) {
       let that = this;
@@ -260,10 +216,9 @@ export default {
       );
     },
     getDataList() {
-      let self = this;
       let params = this.queryParams;
-      self._get("/member/api/member-structure/az-framework-first", params, (res) => {
+      this._get("/member/api/member-structure/az-framework-first", params, (res) => {
-        self.data = res.data[0];
+        this.archTreeData = this.archDataFormat(res.data[0] || {});
       });
     },
     clearAll() {

pages/cart/cart.vue

@@ -318,7 +318,7 @@ export default {
       console.log(self.typeIndex);
       let specialArea = self.typeList[self.typeIndex].specialArea;
       self._get(
-        "/sale/api/shopping/getShopping",
+        "sale/api/shopping/getShopping",
         {
           specialArea: specialArea,
         },
@@ -339,7 +339,7 @@ export default {
     getType() {
       let self = this;
       self.isInit = false;
-      self._get("/sale/api/shopping/getShopping", {}, (res) => {
+      self._get("sale/api/shopping/getShopping", {}, (res) => {
         self.typeList = res.data;
         if (self.typeList && self.typeList.length > 0) {
           self.listData = self.typeList[0].shoppingCartList;

pages/index/part/home.vue

@@ -49,7 +49,7 @@
 					v-for="(item, index) in advertBannerList" :key="index"></view>
 			</view>
 		</view>
-		<view class="time-box f26">{{$t('fn_313')+': '}}<text class="domation">{{nowDate}}</text></view>
+		<!-- <view class="time-box f26">{{$t('fn_313')+': '}}<text class="domation">{{nowDate}}</text></view> -->
 		<annuity :userInfo="userInfo"></annuity>
 		<view class="nav-list">
 			<view class="nav-item" v-for="(item, index) in recommendSpecialAreaList" :key="index" v-if="

pages/order/cashier.vue

@@ -222,20 +222,7 @@
 		<view class="p-40-0">
 			<button class="normal-sub-btn" @click="payFunc">{{ $t('w_0248') }}</button>
 		</view>
-		<template v-if="showUp">
+
-			<view class="pop-bg"></view>
-			<view class="upgrade-pop">
-				<view class="d-e-c" @click="showUp = false"><u-icon name="close" size="32rpx" color="#fff"></u-icon></view>
-				<view class="fb white tc f48">升级成功</view>
-				<image style="width:100%;margin: 0 auto;" src="/static/cashier-up.png" mode="widthFix"></image>
-				<view class="progress-box"><view class="progress-box-item"></view></view>
-				<view class="d-c d-c-c white f28">
-					<view class="mb20">32100/49800</view>
-					<view class="mb20">您的最新等级为:VIP</view>
-					<view class="mb20">您的最新奖衔为:资深经理</view>
-				</view>
-			</view>
-		</template>
 		<Popup :show="isPopup" :width="665" :padding="0" @hidePopup="hidePopupFunc">
 			<view class="d-e-c ww100">
 				<view class="p20" @click="hidePopupFunc(true)"><text class="icon iconfont icon-guanbi" style="color: #999;font-size: 28rpx;"></text></view>

pages/order/myorder.vue

@@ -342,7 +342,7 @@ export default {
   methods: {
     getOrderStatus() {
       let self = this;
-      self._get("/system/pub/enums/order-status-api", {}, (res) => {
+      self._get("system/pub/enums/order-status-api", {}, (res) => {
         self.orderStatus = res.data;
       });
     },

pages/prefecture/part/register.vue

@@ -24,7 +24,7 @@
           <text class="domation mr10">*</text>
           {{ $t("PER_DA_3") }}
         </view>
-        <view class="flex-1 d-s-c">
+        <view class="flex-1 d-s-c" style="width: 100%; justify-content: flex-end;">
           <image
             class="queryimg mr10"
             mode="heightFix"
@@ -34,7 +34,7 @@
                 : ''
             "
           ></image>
-          <view class="flex-1">{{
+          <view >{{
             pkCountry >= 0 && countryList[pkCountry]
               ? countryList[pkCountry].shortName
               : ""
@@ -48,7 +48,7 @@
           <text class="domation mr10">*</text>
           {{ $t("PER_DA_4") }}
         </view>
-        <view class="flex-1 d-s-c">
+        <view class="flex-1 d-s-c" style="width: 100%; justify-content: flex-end;">
           <image
             class="queryimg mr10"
             mode="heightFix"
@@ -58,7 +58,7 @@
                 : ''
             "
           ></image>
-          <view class="flex-1">{{
+          <view style="padding-right: 30rpx;">{{
             pkSettleCountry >= 0 && countryList[pkSettleCountry]
               ? countryList[pkSettleCountry].shortName
               : ""
@@ -600,7 +600,8 @@ export default {
 
 .queryimg {
   height: 60rpx;
-  flex-shrink: 0;
+  width: 60rpx;
+  // flex-shrink: 0;
 }
 
 .form-top-nav {

pages/prefecture/part/upgrade.vue

@@ -305,7 +305,8 @@
 	}
 	.queryimg {
 		height: 60rpx;
-		flex-shrink: 0;
+		width: 60rpx;
+		// flex-shrink: 0;
 	}
 	
 	.form-title {

pages/product/list.vue

@@ -674,13 +674,13 @@
 		methods: {
 			getMemberAnnuity() {
 				let self = this;
-				self._get("/member/api/member/get-member-annuity-time", {}, (res) => {
+				self._get("member/api/member/get-member-annuity-time", {}, (res) => {
 					self.resaleIncomeBonus = res.data.resaleIncomeBonus;
 				});
 			},
 			getNextLevelPv() {
 				let self = this;
-				self._get("/member/api/member/next-level-pv", {}, (res) => {
+				self._get("member/api/member/next-level-pv", {}, (res) => {
 					self.nextText = res.data.gradeValue;
 					self.isMaxGrade = res.data.isMaxGrade;
 				});
@@ -2029,7 +2029,8 @@
 
 	.queryimg {
 		height: 40rpx;
-		flex-shrink: 0;
+		width: 40rpx;
+		// flex-shrink: 0;
 		margin: 0 10rpx;
 	}
 

pages/user/index/index.vue

@@ -317,7 +317,7 @@
 			},
 			getOrderStatus() {
 				let self = this;
-				self._get('/system/pub/enums/order-status-api', {}, res => {
+				self._get('system/pub/enums/order-status-api', {}, res => {
 					self.orderStatus = res.data;
 				})
 			},

pages/user/set/security.vue

@@ -14,7 +14,7 @@
 				</view>
 			</view>
 		</view>
-		<view class="set-group" style="padding-top: 18rpx;">
+		<!-- <view  class="set-group" style="padding-top: 18rpx;">
 			<view class="d-b-c set-group-item "
 				@click="gotoPage('pages/user/set/bind/email?email='+encodeURIComponent(userInfo.email || ''))">
 				<view>{{$t('PER_DA_33')}}</view>
@@ -23,20 +23,9 @@
 					<text class="icon iconfont icon-jiantou"></text>
 				</view>
 			</view>
-			<!-- <view class="d-b-c set-group-item" @click="gotoPage('pages/user/set/bind/mobiless')">
+			
-				<view>{{$t('w_0417')}}</view>
+			
-				<view class="d-e-c gray9">
-					<text class="">{{ mobileHidden(userInfo.phone) || $t('w_0418') }}</text>
-				</view>
 		</view> -->
-			<view class="d-b-c set-group-item">
-				<view>{{$t('w_0417')}}</view>
-				<view class="d-e-c gray9">
-					<text class="">{{ mobileHidden(userInfo.phone) || $t('w_0418') }}</text>
-					<!-- <text class="icon iconfont icon-jiantou"></text> -->
-				</view>
-			</view>
-		</view>
 	</view>
 </template>