From 38d8bb7c81bbadbd7cbd2687e573ec56c1596838 Mon Sep 17 00:00:00 2001
From: weipengfei <2187978347@qq.com>
Date: Tue, 26 Mar 2024 17:21:22 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.vue                     | 37 +++++++++++++++++--------------------
 api/appLet.js               |  2 +-
 config/app.js               |  4 ++--
 manifest.json               |  4 ++--
 pages/admin/order/index.vue |  2 +-
 pages/index/index.vue       | 30 +++++++++++++++---------------
 6 files changed, 38 insertions(+), 41 deletions(-)

diff --git a/App.vue b/App.vue
index 7793ebf..caa6c0d 100644
--- a/App.vue
+++ b/App.vue
@@ -120,26 +120,23 @@
 
 			if (option?.referrerInfo?.extraData?.uniMP) {
 				uni.setStorageSync('uniMP', option.referrerInfo?.extraData?.uniMP);
-				// this.$store.commit("LOGIN", {
-				// 	'token': option.referrerInfo?.extraData?.token,
-				// 	'time': 604800
-				// });
-        parseToken({
-          token: option.referrerInfo?.extraData?.token
-        }).then((res)=>{
-          this.$store.commit("LOGIN", {
-          	'token': res.data.token,
-          	'time': 604800
-          });
-          this.$isResolve()
-        }).catch((err)=>{
-          this.$store.commit("LOGIN", {
-          	'token': option.referrerInfo?.extraData?.token,
-          	'time': 604800
-          });
-          console.log('TOKEN解析错误:', err);
-          this.$isResolve()
-        })
+        this.$isResolve()
+        // parseToken({
+        //   token: option.referrerInfo?.extraData?.token
+        // }).then((res)=>{
+        //   this.$store.commit("LOGIN", {
+        //   	'token': res.data.token,
+        //   	'time': 604800
+        //   });
+        //   this.$isResolve()
+        // }).catch((err)=>{
+        //   this.$store.commit("LOGIN", {
+        //   	'token': option.referrerInfo?.extraData?.token,
+        //   	'time': 604800
+        //   });
+        //   console.log('TOKEN解析错误:', err);
+        //   this.$isResolve()
+        // })
 			}else {
         this.$isResolve()
       }
diff --git a/api/appLet.js b/api/appLet.js
index 8aa6650..e3f5bfe 100644
--- a/api/appLet.js
+++ b/api/appLet.js
@@ -1,7 +1,7 @@
 import request from "@/utils/request.js";
 
 /**
- * 文章详情
+ * 
  * 
  */
 export function parseToken(data) {
diff --git a/config/app.js b/config/app.js
index 4f7918e..479ac47 100644
--- a/config/app.js
+++ b/config/app.js
@@ -9,9 +9,9 @@ let httpApiThree
 let wsApi
 
 // 在打包之前请检查当前环境是否正确
-// const env = 'dev'; // 开发
+const env = 'dev'; // 开发
 // const env = 'prod'; // 生产
-const env = 'prew'; // 预上线
+// const env = 'prew'; // 预上线
 
 switch (env) {
 	case 'prod':
diff --git a/manifest.json b/manifest.json
index 4d2ff1d..7e3bd20 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
     "name" : "惠农商户平台",
     "appid" : "__UNI__1EE148C",
     "description" : "",
-    "versionName" : "1.3.9",
-    "versionCode" : 139,
+    "versionName" : "1.4.0",
+    "versionCode" : 1400,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
diff --git a/pages/admin/order/index.vue b/pages/admin/order/index.vue
index c5cc5df..e424f9a 100644
--- a/pages/admin/order/index.vue
+++ b/pages/admin/order/index.vue
@@ -201,7 +201,7 @@
 			options.product_type ? uni.setStorageSync("PRODUCT_TYPE", 98) : uni.removeStorageSync("PRODUCT_TYPE");
 			this.getOrderStatistics(this.mer_id);
 			this.getList(this.mer_id)
-			this.purchaseOrderList(this.mer_id)
+			// this.purchaseOrderList(this.mer_id)
 		},
 		methods: {
 			getIndex: function() {
diff --git a/pages/index/index.vue b/pages/index/index.vue
index eb4f0e2..1f810f7 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -551,11 +551,11 @@
 					// 	type: 3,
 					// 	image: require('@/static/images/index4.png')
 					// },
-					{
-						name: '扫码付款',
-						type: 18,
-						image: require('@/static/images/index25.png')
-					},
+					// {
+					// 	name: '扫码付款',
+					// 	type: 18,
+					// 	image: require('@/static/images/index25.png')
+					// },
 					// {
 					// 	name: '进货管理',
 					// 	type: 4,
@@ -652,11 +652,11 @@
 						type: 2,
 						image: require('@/static/images/index1.png')
 					},
-					{
-						name: '扫码付款',
-						type: 18,
-						image: require('@/static/images/index25.png')
-					},
+					// {
+					// 	name: '扫码付款',
+					// 	type: 18,
+					// 	image: require('@/static/images/index25.png')
+					// },
 					{
 						name: '提现管理',
 						type: 5,
@@ -761,11 +761,11 @@
 						type: 23,
 						image: require('@/static/images/index26.png')
 					},
-					{
-						name: '扫码付款',
-						type: 18,
-						image: require('@/static/images/index25.png')
-					},
+					// {
+					// 	name: '扫码付款',
+					// 	type: 18,
+					// 	image: require('@/static/images/index25.png')
+					// },
 					// {
 					// 	name: '进货管理',
 					// 	type: 4,