Merge branch 'main' of https://gitea.lihaink.cn/mkm/shop-applet

manifest.json

@@ -2,8 +2,8 @@
     "name" : "惠农商户平台",
     "appid" : "__UNI__1EE148C",
     "description" : "",
-    "versionName" : "1.3.4",
+    "versionName" : "1.3.7",
-    "versionCode" : 134,
+    "versionCode" : 137,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {

pages/index/index.vue

@@ -875,20 +875,21 @@
 			}
 		},
 
-		beforeDestroy() {
+    beforeDestroy() {
-			// 销毁监听事件
+      // 销毁监听事件
-			this.$bus.$off('value-updated')
+      this.$bus.$off('value-updated')
-		},
+    },
-		methods: {
+    methods: {
-			// 提现页面
+      // 提现页面
-			handleToWithDraw(item, index) {
+      handleToWithDraw(item, index) {
-				let url;
+        if(index==3||index==4) return;
-				if (index < 2) url = "/pages/users/embody/embody?mer_id=" + this.userInfoData.service.mer_id;
+        let url;
-				else url = `/pages/admin/orderList/index?merId=${this.userInfoData.service.mer_id}&types=2`
+        if(index<2) url = "/pages/users/embody/embody?mer_id=" + this.userInfoData.service.mer_id;
-				uni.navigateTo({
+        else url = `/pages/admin/orderList/index?merId=${this.userInfoData.service.mer_id}&types=2`;
-					url: url
+        uni.navigateTo({
-				})
+          url: url
-			},
+        })
+      },
 
 			// 初始化菜单
 			initTypeLiseMenu() {