Procházet zdrojové kódy

fix:交易记录优化

zhanghui před 2 roky
rodič
revize
85f714058d
2 změnil soubory, kde provedl 107 přidání a 91 odebrání
  1. 92 82
      manifest.json
  2. 15 9
      myPages/transactionRecord/index.vue

+ 92 - 82
manifest.json

@@ -1,83 +1,93 @@
 {
-    "name" : "shoppingTemplate",
-    "appid" : "__UNI__EEB3904",
-    "description" : "",
-    "versionName" : "1.0.0",
-    "versionCode" : "100",
-    "transformPx" : false,
-    /* 5+App特有相关 */
-    "app-plus" : {
-        "usingComponents" : true,
-        "nvueStyleCompiler" : "uni-app",
-        "compilerVersion" : 3,
-        "splashscreen" : {
-            "alwaysShowBeforeRender" : true,
-            "waiting" : true,
-            "autoclose" : true,
-            "delay" : 0
-        },
-        /* 模块配置 */
-        "modules" : {},
-        /* 应用发布信息 */
-        "distribute" : {
-            /* android打包配置 */
-            "android" : {
-                "permissions" : [
-                    "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
-                    "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
-                    "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
-                    "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
-                    "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
-                    "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.CAMERA\"/>",
-                    "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
-                    "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
-                    "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
-                    "<uses-feature android:name=\"android.hardware.camera\"/>",
-                    "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
-                ]
-            },
-            /* ios打包配置 */
-            "ios" : {},
-            /* SDK配置 */
-            "sdkConfigs" : {}
-        }
-    },
-    /* 快应用特有相关 */
-    "quickapp" : {},
-    /* 小程序特有相关 */
-    "mp-weixin" : {
-        "appid" : "wx3f3b07566561dc70",
-        "setting" : {
-            "urlCheck" : false,
-            "minified" : true,
-            "postcss" : false
-        },
-        "usingComponents" : true,
-        "optimization" : {
-            "subPackages" : true
-        },
-        "requiredPrivateInfos" : [ "getLocation" ],
-        "permission" : {
-            "scope.userLocation" : {
-                "desc" : "你的位置信息将用于和门店的距离长度"
-            }
-        }
-    },
-    "mp-alipay" : {
-        "usingComponents" : true
-    },
-    "mp-baidu" : {
-        "usingComponents" : true
-    },
-    "mp-toutiao" : {
-        "usingComponents" : true
-    },
-    "uniStatistics" : {
-        "enable" : false
-    },
-    "vueVersion" : "2"
-}
+	"name": "shoppingTemplate",
+	"appid": "__UNI__EEB3904",
+	"description": "",
+	"versionName": "1.0.0",
+	"versionCode": "100",
+	"transformPx": false,
+	/* 5+App特有相关 */
+	"app-plus": {
+		"usingComponents": true,
+		"nvueStyleCompiler": "uni-app",
+		"compilerVersion": 3,
+		"splashscreen": {
+			"alwaysShowBeforeRender": true,
+			"waiting": true,
+			"autoclose": true,
+			"delay": 0
+		},
+		/* 模块配置 */
+		"modules": {
+			"Payment": {}
+		},
+		/* 应用发布信息 */
+		"distribute": {
+			/* android打包配置 */
+			"android": {
+				"permissions": [
+					"<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
+					"<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
+					"<uses-permission android:name=\"android.permission.VIBRATE\"/>",
+					"<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
+					"<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
+					"<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
+					"<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
+					"<uses-permission android:name=\"android.permission.CAMERA\"/>",
+					"<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
+					"<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
+					"<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
+					"<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
+					"<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
+					"<uses-feature android:name=\"android.hardware.camera\"/>",
+					"<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
+				]
+			},
+			/* ios打包配置 */
+			"ios": {},
+			/* SDK配置 */
+			"sdkConfigs": {
+				"payment": {
+					"weixin": {
+						"__platform__": ["android"],
+						"appid": "wx9e86b549db43d624",
+						"UniversalLinks": ""
+					}
+				}
+			}
+		}
+	},
+	/* 快应用特有相关 */
+	"quickapp": {},
+	/* 小程序特有相关 */
+	"mp-weixin": {
+		"appid": "wx3f3b07566561dc70",
+		"setting": {
+			"urlCheck": false,
+			"minified": true,
+			"postcss": false
+		},
+		"usingComponents": true,
+		"optimization": {
+			"subPackages": true
+		},
+		"requiredPrivateInfos": ["getLocation"],
+		"permission": {
+			"scope.userLocation": {
+				"desc": "你的位置信息将用于和门店的距离长度"
+			}
+		}
+	},
+	"mp-alipay": {
+		"usingComponents": true
+	},
+	"mp-baidu": {
+		"usingComponents": true
+	},
+	"mp-toutiao": {
+		"usingComponents": true
+	},
+	"uniStatistics": {
+		"enable": false
+	},
+	"vueVersion": "2"
+}

+ 15 - 9
myPages/transactionRecord/index.vue

@@ -27,9 +27,9 @@
                 </view>
 
                 <view class="right flex-row justify-around">
-                    <text>新增:{{tranFlowstatistic.rechargeAmount || 0}}</text>
-                    <text>消费:{{tranFlowstatistic.consumeAmount || 0 }}</text>
-                    <text>退款:{{tranFlowstatistic.refundAmount || 0 }}</text>
+                    <text>新增:{{tranFlowstatistic.rechargeAmount || '0.00'}}</text>
+                    <text>消费:{{tranFlowstatistic.consumeAmount || '0.00' }}</text>
+                    <text>退款:{{tranFlowstatistic.refundAmount || '0.00' }}</text>
                 </view>
             </view>
 
@@ -115,6 +115,7 @@
             },
             swiperChange(e){
                 this.tabIndex = e.detail.current
+                this.transactionFlowstatistic()
                 // if (this.$refs.MescrollItem[e.detail.current].orderList.length>0){
                 // 	this.$refs.MescrollItem[e.detail.current].downCallback()
                 // }
@@ -135,13 +136,18 @@
             // 查询交易流水统计
             transactionFlowstatistic(){
                 let that = this;
-                this.$api.transactionFlowstatistic({dataTime:this.dataTime}).then((res)=>{
+                let param = {
+                    dataTime:this.dataTime,
+                    tradeNoType:this.tabIndex
+                }
+                if (this.tabIndex === 0){
+                    param={
+                        dataTime:this.dataTime
+                    }
+                }
+                this.$api.transactionFlowstatistic(param).then((res)=>{
                     that.tranFlowstatistic = res.data.data;
-                }).catch(() =>{
-                    uni.showToast({
-                        title: "操作失败"
-                    })
-                });
+                })
             },
 
             // 详情