From 436dd56e541504af5a9167c6537f85980b4c4b79 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?lemon=E6=A9=AA?= <17633066053@163.com>
Date: Wed, 28 Jul 2021 09:53:41 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=AF=E5=88=86=E5=95=86=E5=93=81=E5=B1=95?=
 =?UTF-8?q?=E7=A4=BA=E7=9A=84=E9=83=A8=E5=88=86=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/api.js                       | 20 +++++++++++---------
 manifest.json                       |  4 ++--
 pages/cart/payment/payOrder.vue     | 10 ++++++++++
 pages/mine/point/myPoint.vue        |  2 +-
 pages/order/myOrder.vue             |  1 +
 pages/promotion/point/pointList.vue | 15 ++++++++++++++-
 6 files changed, 39 insertions(+), 13 deletions(-)

diff --git a/config/api.js b/config/api.js
index 9d865b9..6e35070 100644
--- a/config/api.js
+++ b/config/api.js
@@ -4,24 +4,26 @@
  */
 // 开发环境
 const dev = {
-	common: "https://common-api.pickmall.cn",
-	buyer: "https://buyer-api.pickmall.cn",
-	
-
+  common: "https://common-api.pickmall.cn",
+  buyer: "https://buyer-api.pickmall.cn",
+//   common: "http://192.168.0.101:8890",
+//   buyer: "http://192.168.0.101:8888",
+//   seller: "http://192.168.0.101:8889",
+//   manager: "http://192.168.0.101:8887",
 };
 // 生产环境
 const prod = {
-	common: "https://common-api.pickmall.cn",
-	buyer: "https://buyer-api.pickmall.cn",
+  common: "https://common-api.pickmall.cn",
+  buyer: "https://buyer-api.pickmall.cn",
 };
 
 //默认生产环境
 let api = dev;
 //如果是开发环境
 if (process.env.NODE_ENV == "development") {
-	api = dev;
+  api = dev;
 } else {
-	api = prod;
+  api = prod;
 }
 //微信小程序，app的打包方式建议为生产环境，所以这块直接条件编译赋值
 // #ifdef MP-WEIXIN || APP-PLUS
@@ -31,5 +33,5 @@ api = prod;
 api.buyer += "/buyer";
 api.common += "/common";
 export default {
-	...api,
+  ...api,
 };
diff --git a/manifest.json b/manifest.json
index 36e7601..2a5e47d 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
     "name" : "lili商城",
     "appid" : "__UNI__C100675",
     "description" : "",
-    "versionName" : "4.0.24",
-    "versionCode" : 4000024,
+    "versionName" : "4.0.25",
+    "versionCode" : 4000025,
     "transformPx" : false,
     "app-plus" : {
         "compatible" : {
diff --git a/pages/cart/payment/payOrder.vue b/pages/cart/payment/payOrder.vue
index aa69401..0a94a1e 100644
--- a/pages/cart/payment/payOrder.vue
+++ b/pages/cart/payment/payOrder.vue
@@ -151,6 +151,7 @@
 				parms.clientType = this.paymentType;
 
 				API_Trade.getCashierData(parms).then((res) => {
+					if(res.data.success){
 					this.cashierParams = res.data.result;
 
 					// #ifdef MP-WEIXIN
@@ -187,6 +188,15 @@
 					this.walletValue = res.data.result.walletValue;
 					this.autoCancel =
 						(res.data.result.autoCancel - new Date().getTime()) / 1000;
+					}
+					else if(res.data.code == 32000){
+						setTimeout(()=>{
+							uni.redirectTo({
+							 url: `/pages/order/myOrder?status=0`
+						});
+						},500)
+						
+					}
 				});
 			},
 
diff --git a/pages/mine/point/myPoint.vue b/pages/mine/point/myPoint.vue
index 8fa9355..4482b8a 100644
--- a/pages/mine/point/myPoint.vue
+++ b/pages/mine/point/myPoint.vue
@@ -25,7 +25,7 @@
           <view>{{ item.content }}</view>
           <view>{{ item.createTime}}</view>
         </view>
-        <view><span>{{item.pointType == "1" ? '+' : '-'}}</span>{{ item.variablePoint }}</view>
+        <view><span>{{item.pointType == "INCREASE" ? '+' : '-'}}</span>{{ item.variablePoint }}</view>
       </view>
       <uni-load-more :status="count.loadStatus"></uni-load-more>
     </div>
diff --git a/pages/order/myOrder.vue b/pages/order/myOrder.vue
index 52a761f..7684cfe 100644
--- a/pages/order/myOrder.vue
+++ b/pages/order/myOrder.vue
@@ -219,6 +219,7 @@ export default {
     if (status == 0) {
       this.loadData(status);
     }
+  
   },
 
   watch: {
diff --git a/pages/promotion/point/pointList.vue b/pages/promotion/point/pointList.vue
index 8210d90..5cf49dd 100644
--- a/pages/promotion/point/pointList.vue
+++ b/pages/promotion/point/pointList.vue
@@ -96,8 +96,21 @@ export default {
       }
     },
   },
-  async mounted() {
+  async onShow() {
     //获取顶级分类
+    this.categoryIndexData = [
+      {
+        categoryId: 0,
+        name: "全部",
+        loadStatus: "more",
+        goods: [],
+        params: {
+          pageNumber: 1,
+          pageSize: 10,
+          pointsGoodsCategoryId: "",
+        },
+      },
+    ];
 
     let response = await getPointsCategory();