更新二期需求

.env.development

@@ -10,7 +10,7 @@ VITE_APP_BASE_API = ''
 # 路由懒加载
 VITE_CLI_BABEL_TRANSPILE_MODULES = true
 
-VITE_API_URL=http://192.168.168.104:8090
-# VITE_API_URL=https://test-coupon.qiuyutech.com.cn/stage-api
+# VITE_API_URL=http://192.168.168.104:8090
+VITE_API_URL=https://test-coupon.qiuyutech.com.cn/stage-api
 # VITE_API_URL=https://coupon.qiuyutech.com.cn/prod-api
 

.env.production

@@ -6,5 +6,5 @@ VITE_NODE_ENV = production
 # 若依管理系统/生产环境
 VITE_APP_BASE_API = '/prod-api'
 
+VITE_API_URL=https://test-coupon.qiuyutech.com.cn/stage-api
 # VITE_API_URL=https://coupon.qiuyutech.com.cn/prod-api
-VITE_API_URL=https://coupon.qiuyutech.com.cn/prod-api

src/hooks/useDraw.ts

@@ -11,7 +11,7 @@ export function useDraw(props?: any, emit?: any) {
   };
 
   const isWithDraw = (status: string) => {
-    return status === "3" || status === "5" || status === "6" || status === "8";
+    return status === "3" || status === "5" || status === "8";
   };
 
   const onPayment = (data: any, type: string, pageType?: string) => {
@@ -21,7 +21,7 @@ export function useDraw(props?: any, emit?: any) {
     const status =
       data.processStatus === "3" ||
       data.processStatus === "5" ||
-      data.processStatus === "6" || 
+      // data.processStatus === "6" || 
 			data.processStatus === "8";
     if (!status) return;
     const currentApi = pageType === "claim" ? claimPayment : payment;

src/manifest.json

@@ -1,78 +1,78 @@
 {
-  "name": "奇思广议味道馆",
-  "appid": "__UNI__AFCF561",
-  "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
+    "name" : "奇思广议味道馆",
+    "appid" : "__UNI__AFCF561",
+    "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" : {}
+        }
     },
-    /* 模块配置 */
-    "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": "wxe7e6e6a6508aa518",
-    "setting": {
-      "urlCheck": false
+    /* 快应用特有相关 */
+    "quickapp" : {},
+    /* 小程序特有相关 */
+    "mp-weixin" : {
+        "appid" : "wxe7e6e6a6508aa518",
+        "setting" : {
+            "urlCheck" : false
+        },
+        "usingComponents" : true,
+        "requiredPrivateInfos" : [ "getLocation" ],
+        "permission" : {
+            "scope.userLocation" : {
+                "desc" : "是否允许授权地理位置信息。"
+            }
+        }
     },
-    "usingComponents": true,
-    "requiredPrivateInfos": ["getLocation"],
-    "permission": {
-      "scope.userLocation": {
-        "desc": "是否允许授权地理位置信息。"
-      }
-    }
-  },
-  "mp-alipay": {
-    "usingComponents": true
-  },
-  "mp-baidu": {
-    "usingComponents": true
-  },
-  "mp-toutiao": {
-    "usingComponents": true
-  },
-  "uniStatistics": {
-    "enable": false
-  },
-  "vueVersion": "3"
+    "mp-alipay" : {
+        "usingComponents" : true
+    },
+    "mp-baidu" : {
+        "usingComponents" : true
+    },
+    "mp-toutiao" : {
+        "usingComponents" : true
+    },
+    "uniStatistics" : {
+        "enable" : false
+    },
+    "vueVersion" : "3"
 }

src/pagesOne/record/components/claimItem.vue

@@ -55,17 +55,22 @@
 			<image src="https://qiuyu-daodian.oss-cn-beijing.aliyuncs.com/images/expox-icon.png" mode=""></image>
 			过期原因：您于{{ detail.firstConfirmTime }}发起提现，因未在24 小时内确认收款，款项已被微信平台自动退回。重新提交参与活动即可。
 		</view>
+		<!-- 提现失败 -->
+		<view class="expired-box" v-if="claimType === 'list' && detail.processStatus == '6'">
+			<image src="https://qiuyu-daodian.oss-cn-beijing.aliyuncs.com/images/expox-icon.png" mode=""></image>
+			失败原因：因微信打款通道失败，请重新提交申请参与活动。
+		</view>
 		<!-- 再次提现 -->
 		<view class="expired-box" v-if="claimType === 'list' && detail.processStatus == '8'">
 			<image src="https://qiuyu-daodian.oss-cn-beijing.aliyuncs.com/images/expox-icon.png" mode=""></image>
-			失败原因：因微信打款通道失败，请重新提交申请参与活动。
+			原因：提现通道有点点拥挤，再提现一次吧！
 		</view>
     <view
       v-if="claimType === 'list'"
       class="btn"
       :class="isWithDraw(detail.processStatus) ? 'active' : 'static'"
       @click="onPayment(detail, '4', 'claim')"
-      >{{ isWithDraw(detail.processStatus) ? detail.processStatus == '8' ? "再次提现" : "提现" : detail.processStatus == "7" ? "提现过期" : "提现成功" }}</view
+      >{{ isWithDraw(detail.processStatus) ? detail.processStatus == '8' ? "再次提现" : "提现" : detail.processStatus == "7" ? "提现过期" : detail.processStatus == '6' ? '提现' : "提现成功" }}</view
     >
   </view>
 </template>
@@ -150,6 +155,7 @@ const props = defineProps({
 			width: 32rpx;
 			height: 32rpx;
 			vertical-align: sub;
+			margin-right: 8rpx;
 		}
 	}
 }

src/pagesOne/record/winnerList.vue

@@ -40,17 +40,22 @@
 					<image src="https://qiuyu-daodian.oss-cn-beijing.aliyuncs.com/images/expox-icon.png" mode=""></image>
 					过期原因：您于{{ item.firstConfirmTime }}发起提现，因未在24 小时内确认收款，款项已被微信平台自动退回。重新提交参与活动即可。
 				</view>
+				<!-- 提现失败 -->
+				<view class="expired-box" v-if="item.processStatus == '6'">
+					<image src="https://qiuyu-daodian.oss-cn-beijing.aliyuncs.com/images/expox-icon.png" mode=""></image>
+					失败原因：因微信打款通道失败，请重新提交申请参与活动。
+				</view>
 				<!-- 再次提现 -->
 				<view class="expired-box" v-if="item.processStatus == '8'">
 					<image src="https://qiuyu-daodian.oss-cn-beijing.aliyuncs.com/images/expox-icon.png" mode=""></image>
-					失败原因：因微信打款通道失败，请重新提交申请参与活动。
+					原因：提现通道有点点拥挤，再提现一次吧！
 				</view>
         <view class="flex-end">
           <view
             class="widthBtn"
             :class="isWithDraw(item.processStatus) ? 'active' : 'static'"
             @click="onPayment(item, '1')"
-            >{{ isWithDraw(item.processStatus) ? item.processStatus == '8' ? "再次提现" : "提现" : item.processStatus == '7' ? '提现过期' : "提现成功" }}</view
+            >{{ isWithDraw(item.processStatus) ? item.processStatus == '8' ? "再次提现" : "提现" : item.processStatus == '7' ? '提现过期' : item.processStatus == '6' ? '提现' : "提现成功" }}</view
           >
         </view>
       </view>
@@ -302,6 +307,7 @@ onReachBottom(() => {
 			width: 32rpx;
 			height: 32rpx;
 			vertical-align: sub;
+			margin-right: 8rpx;
 		}
 	}
 }

src/pagesOne/winner/components/winRecordPopup.vue

@@ -74,6 +74,7 @@ const scrolltolower = () => {
 				width: 32rpx;
 				height: 32rpx;
 				vertical-align: sub;
+				margin-right: 8rpx;
 			}
 		}
 .winRecordPopup {