From e5b880933c2e6de0ae49f070e6140fafa938693f Mon Sep 17 00:00:00 2001
From: 1154079537 <1154079537@qq.com>
Date: Sat, 11 May 2024 14:23:35 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/content-top/index.vue        |  50 +--
 manifest.json                           | 429 +++++++++----------
 pages/chat/customer_list/chat.vue       |   2 +-
 pages/chat/customer_list/index.vue      |   4 +-
 pages/index/unregist.vue                |  38 +-
 pages/wholesale/wholesale/wholesale.vue | 530 ++++++++++++------------
 pages/withdrawal/index.vue              |   2 +-
 7 files changed, 516 insertions(+), 539 deletions(-)

diff --git a/components/content-top/index.vue b/components/content-top/index.vue
index ab884dd..0f3023c 100644
--- a/components/content-top/index.vue
+++ b/components/content-top/index.vue
@@ -2,23 +2,20 @@
 	<view class="contentgb">
 		<view class="return_top">
 			<view class="z-bootm-img1" @click="returnbom()">
-				<image src="@/static/images/fb1.png" mode="aspectFit"></image>
+				<u-image width="40rpx" height="14rpx" src="@/static/images/fb1.png" mode="widthFit"></u-image>
 			</view>
 			<view class="z-bootm-l"></view>
 			<view class="z-bootm-img2" @click="returnbom()">
-				<image src="@/static/images/fb2.png" mode="aspectFit"></image>
+				<u-image width="38rpx" height="38rpx" src="@/static/images/fb2.png" mode="widthFit"></u-image>
 			</view>
 		</view>
 	</view>
-
 </template>
 
 <script>
 	export default {
 		data() {
-			return {
-
-			}
+			return {}
 		},
 		methods: {
 			returnbom() {
@@ -34,58 +31,25 @@
 
 <style lang="scss" scoped>
 	.contentgb {
-
 		width: 166rpx;
 		height: 56rpx;
 
 		.return_top {
+			display: flex;
+			justify-content: center;
+			align-items: center;
 			width: 166rpx;
 			height: 56rpx;
 			background: rgba(255, 255, 255, 0.6);
 			border-radius: 44rpx 44rpx;
-
 			position: relative;
 
-			.z-bootm-img1 {
-				width: 41rpx;
-				height: 13rpx;
-
-				position: absolute;
-				top: 5rpx;
-				left: 25rpx;
-
-				image {
-					width: 100%;
-					height: 100%;
-				}
-			}
-
 			.z-bootm-l {
 				width: 1px;
 				height: 32rpx;
 				background: rgba(0, 0, 0, 0.2);
-				margin: auto 0;
-
-				position: absolute;
-				top: 10rpx;
-				left: 85rpx;
+				margin: 0 16rpx;
 			}
-
-			.z-bootm-img2 {
-				width: 38rpx;
-				height: 38rpx;
-				margin-top: -15rpx;
-				margin-left: -15rpx;
-				position: absolute;
-				right: 25rpx;
-				top: 25rpx;
-
-				image {
-					width: 100%;
-					height: 100%;
-				}
-			}
-
 		}
 	}
 </style>
\ No newline at end of file
diff --git a/manifest.json b/manifest.json
index ea54376..5a3be65 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,217 +1,218 @@
 {
-	"name": "惠农商户平台",
-	"appid": "__UNI__7626C0F",
-	"description": "",
-	"versionName": "1.5.0",
-	"versionCode": 1500,
-	"transformPx": false,
-	/* 5+App特有相关 */
-	"app-plus": {
-		"titleNView": true,
-		"usingComponents": true,
-		"nvueCompiler": "uni-app",
-		"nvueStyleCompiler": "uni-app",
-		"compilerVersion": 3,
-		"compatible": {
-			"ignoreVersion": true //true表示忽略版本检查提示框，HBuilderX1.9.0及以上版本支持 
-		},
-		"splashscreen": {
-			"alwaysShowBeforeRender": true,
-			"waiting": true,
-			"autoclose": true,
-			"delay": 0
-		},
-		/* 模块配置 */
-		"modules": {
-			"VideoPlayer": {},
-			"iBeacon": {},
-			"Barcode": {},
-			"Camera": {},
-			"Geolocation": {},
-			"Payment": {},
-			"Share": {},
-			"OAuth": {},
-			"UniMP": {
-				"description": "uni小程序"
-			},
-			"Maps": {}
-		},
-		"safearea": {
-			"bottom": {
-				"offset": "none"
-			}
-		},
-		/* 应用发布信息 */
-		"distribute": {
-			/* android打包配置 */
-			"android": {
-				"resizeableActivity": true,
-				"permissions": [
-					"<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>",
-					"<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>",
-					"<uses-permission android:name=\"android.permission.ACCESS_LOCATION_EXTRA_COMMANDS\"/>",
-					"<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
-					"<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
-					"<uses-permission android:name=\"android.permission.BATTERY_STATS\"/>",
-					"<uses-permission android:name=\"android.permission.BLUETOOTH\"/>",
-					"<uses-permission android:name=\"android.permission.BLUETOOTH_ADMIN\"/>",
-					"<uses-permission android:name=\"android.permission.CALL_PHONE\"/>",
-					"<uses-permission android:name=\"android.permission.CAMERA\"/>",
-					"<uses-permission android:name=\"android.permission.CHANGE_CONFIGURATION\"/>",
-					"<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
-					"<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
-					"<uses-permission android:name=\"android.permission.INTERNET\"/>",
-					"<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>",
-					"<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
-					"<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
-					"<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
-					"<uses-permission android:name=\"android.permission.VIBRATE\"/>",
-					"<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
-					"<uses-permission android:name=\"android.permission.WRITE_EXTERNAL_STORAGE\"/>",
-					"<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
-				],
-				"abiFilters": ["armeabi-v7a", "arm64-v8a", "x86"],
-				"permissionExternalStorage": {
-					"request": "none",
-					"prompt": "应用保存运行状态等信息，需要获取读写手机存储（系统提示为访问设备上的照片、媒体内容和文件）权限，请允许。"
-				},
-				"permissionPhoneState": {
-					"request": "none" //拨打电话权限关闭
-				}
-			},
-			/* ios打包配置 */
-			"ios": {
-				"privacyDescription": {
-					"NSPhotoLibraryUsageDescription": "上传用户头像保存分享海报",
-					"NSPhotoLibraryAddUsageDescription": "上传用户头像保存分享海报",
-					"NSCameraUsageDescription": "上传用户头像保存分享海报",
-					"NSLocationWhenInUseUsageDescription": "根据客户地理位置推荐最近门店",
-					"NSLocationAlwaysUsageDescription": "根据客户地理位置推荐最近门店",
-					"NSLocationAlwaysAndWhenInUseUsageDescription": "根据客户地理位置推荐最近门店"
-				},
-				"idfa": false,
-				"dSYMs": false
-			},
-			/* SDK配置 */
-			"sdkConfigs": {
-				"maps": {
-					"amap": {
-						"appkey_ios": "0a3202688624938fd5d2f37b52c30d5d",
-						"appkey_android": "0354f5ddc11e2ea76c5aac647f44d945",
-						"name": "amapIvoVHpJR"
-					}
-				},
-				"payment": {
-					"weixin": {
-						"__platform__": ["ios", "android"],
-						"appid": "wx9d68c92b550ddd1e",
-						"UniversalLinks": "https://mer.crmeb.net/"
-					}
-				},
-				"share": {
-					"weixin": {
-						"appid": "wx9d68c92b550ddd1e",
-						"UniversalLinks": "https://mer.crmeb.net/"
-					}
-				},
-				"geolocation": {
-					"amap": {
-						"name": "amapIvoVHpJR",
-						"__platform__": ["ios", "android"],
-						"appkey_ios": "0a3202688624938fd5d2f37b52c30d5d",
-						"appkey_android": "0354f5ddc11e2ea76c5aac647f44d945"
-					},
-					"system": {
-						"__platform__": ["ios", "android"]
-					}
-				},
-				"oauth": {},
-				"ad": {}
-			},
-			"icons": {
-				"android": {
-					"hdpi": "unpackage/res/icons/72x72.png",
-					"xhdpi": "unpackage/res/icons/96x96.png",
-					"xxhdpi": "unpackage/res/icons/144x144.png",
-					"xxxhdpi": "unpackage/res/icons/192x192.png"
-				},
-				"ios": {
-					"appstore": "unpackage/res/icons/1024x1024.png",
-					"ipad": {
-						"app": "unpackage/res/icons/76x76.png",
-						"app@2x": "unpackage/res/icons/152x152.png",
-						"notification": "unpackage/res/icons/20x20.png",
-						"notification@2x": "unpackage/res/icons/40x40.png",
-						"proapp@2x": "unpackage/res/icons/167x167.png",
-						"settings": "unpackage/res/icons/29x29.png",
-						"settings@2x": "unpackage/res/icons/58x58.png",
-						"spotlight": "unpackage/res/icons/40x40.png",
-						"spotlight@2x": "unpackage/res/icons/80x80.png"
-					},
-					"iphone": {
-						"app@2x": "unpackage/res/icons/120x120.png",
-						"app@3x": "unpackage/res/icons/180x180.png",
-						"notification@2x": "unpackage/res/icons/40x40.png",
-						"notification@3x": "unpackage/res/icons/60x60.png",
-						"settings@2x": "unpackage/res/icons/58x58.png",
-						"settings@3x": "unpackage/res/icons/87x87.png",
-						"spotlight@2x": "unpackage/res/icons/80x80.png",
-						"spotlight@3x": "unpackage/res/icons/120x120.png"
-					}
-				}
-			},
-			"splashscreen": {
-				"useOriginalMsgbox": true
-			}
-		}
-	},
-	/* 快应用特有相关 */
-	"quickapp": {},
-	/* 小程序特有相关 */
-	"mp-weixin": {
-		"appid": "wxfb4695444ab8d0d0",
-		"setting": {
-			"urlCheck": false,
-			"minified": true,
-			"postcss": true,
-			"es6": true
-		},
-		"permission": {
-			"scope.userLocation": {
-				"desc": "获取您的位置"
-			}
-		},
-		"requiredPrivateInfos": ["getLocation", "chooseAddress"],
-		"usingComponents": true
-	},
-	"mp-alipay": {
-		"usingComponents": true
-	},
-	"mp-baidu": {
-		"usingComponents": true
-	},
-	"mp-toutiao": {
-		"usingComponents": true
-	},
-	"h5": {
-		"devServer": {
-			"https": false
-		},
-		"router": {
-			"mode": "history",
-			"base": ""
-		},
-		"domain": "",
-		"sdkConfigs": {
-			"maps": {
-				"qqmap": {
-					"key": "SMJBZ-WCHK4-ZPZUA-DSIXI-XDDVQ-XWFX7"
-				}
-			}
-		},
-		"title": "加载中...",
-		"template": "template.h5.html"
-	}
+    "name" : "惠农商户平台",
+    "appid" : "__UNI__7626C0F",
+    "description" : "",
+    "versionName" : "1.5.0",
+    "versionCode" : 1500,
+    "transformPx" : false,
+    /* 5+App特有相关 */
+    "app-plus" : {
+        "titleNView" : true,
+        "usingComponents" : true,
+        "nvueCompiler" : "uni-app",
+        "nvueStyleCompiler" : "uni-app",
+        "compilerVersion" : 3,
+        "compatible" : {
+            "ignoreVersion" : true //true表示忽略版本检查提示框，HBuilderX1.9.0及以上版本支持 
+        },
+        "splashscreen" : {
+            "alwaysShowBeforeRender" : true,
+            "waiting" : true,
+            "autoclose" : true,
+            "delay" : 0
+        },
+        /* 模块配置 */
+        "modules" : {
+            "VideoPlayer" : {},
+            "iBeacon" : {},
+            "Barcode" : {},
+            "Camera" : {},
+            "Geolocation" : {},
+            "Payment" : {},
+            "Share" : {},
+            "OAuth" : {},
+            "UniMP" : {
+                "description" : "uni小程序"
+            },
+            "Maps" : {}
+        },
+        "safearea" : {
+            "bottom" : {
+                "offset" : "none"
+            }
+        },
+        /* 应用发布信息 */
+        "distribute" : {
+            /* android打包配置 */
+            "android" : {
+                "resizeableActivity" : true,
+                "permissions" : [
+                    "<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_LOCATION_EXTRA_COMMANDS\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.BATTERY_STATS\"/>",
+                    "<uses-permission android:name=\"android.permission.BLUETOOTH\"/>",
+                    "<uses-permission android:name=\"android.permission.BLUETOOTH_ADMIN\"/>",
+                    "<uses-permission android:name=\"android.permission.CALL_PHONE\"/>",
+                    "<uses-permission android:name=\"android.permission.CAMERA\"/>",
+                    "<uses-permission android:name=\"android.permission.CHANGE_CONFIGURATION\"/>",
+                    "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.INTERNET\"/>",
+                    "<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>",
+                    "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
+                    "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
+                    "<uses-permission android:name=\"android.permission.WRITE_EXTERNAL_STORAGE\"/>",
+                    "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
+                ],
+                "abiFilters" : [ "armeabi-v7a", "arm64-v8a", "x86" ],
+                "permissionExternalStorage" : {
+                    "request" : "none",
+                    "prompt" : "应用保存运行状态等信息，需要获取读写手机存储（系统提示为访问设备上的照片、媒体内容和文件）权限，请允许。"
+                },
+                "permissionPhoneState" : {
+                    "request" : "none" //拨打电话权限关闭
+                }
+            },
+            /* ios打包配置 */
+            "ios" : {
+                "privacyDescription" : {
+                    "NSPhotoLibraryUsageDescription" : "上传用户头像保存分享海报",
+                    "NSPhotoLibraryAddUsageDescription" : "上传用户头像保存分享海报",
+                    "NSCameraUsageDescription" : "上传用户头像保存分享海报",
+                    "NSLocationWhenInUseUsageDescription" : "根据客户地理位置推荐最近门店",
+                    "NSLocationAlwaysUsageDescription" : "根据客户地理位置推荐最近门店",
+                    "NSLocationAlwaysAndWhenInUseUsageDescription" : "根据客户地理位置推荐最近门店"
+                },
+                "idfa" : false,
+                "dSYMs" : false
+            },
+            /* SDK配置 */
+            "sdkConfigs" : {
+                "maps" : {
+                    "amap" : {
+                        "appkey_ios" : "0a3202688624938fd5d2f37b52c30d5d",
+                        "appkey_android" : "0354f5ddc11e2ea76c5aac647f44d945",
+                        "name" : "amapIvoVHpJR"
+                    }
+                },
+                "payment" : {
+                    "weixin" : {
+                        "__platform__" : [ "ios", "android" ],
+                        "appid" : "wx9d68c92b550ddd1e",
+                        "UniversalLinks" : "https://mer.crmeb.net/"
+                    }
+                },
+                "share" : {
+                    "weixin" : {
+                        "appid" : "wx9d68c92b550ddd1e",
+                        "UniversalLinks" : "https://mer.crmeb.net/"
+                    }
+                },
+                "geolocation" : {
+                    "amap" : {
+                        "name" : "amapIvoVHpJR",
+                        "__platform__" : [ "ios", "android" ],
+                        "appkey_ios" : "0a3202688624938fd5d2f37b52c30d5d",
+                        "appkey_android" : "0354f5ddc11e2ea76c5aac647f44d945"
+                    },
+                    "system" : {
+                        "__platform__" : [ "ios", "android" ]
+                    }
+                },
+                "oauth" : {},
+                "ad" : {}
+            },
+            "icons" : {
+                "android" : {
+                    "hdpi" : "unpackage/res/icons/72x72.png",
+                    "xhdpi" : "unpackage/res/icons/96x96.png",
+                    "xxhdpi" : "unpackage/res/icons/144x144.png",
+                    "xxxhdpi" : "unpackage/res/icons/192x192.png"
+                },
+                "ios" : {
+                    "appstore" : "unpackage/res/icons/1024x1024.png",
+                    "ipad" : {
+                        "app" : "unpackage/res/icons/76x76.png",
+                        "app@2x" : "unpackage/res/icons/152x152.png",
+                        "notification" : "unpackage/res/icons/20x20.png",
+                        "notification@2x" : "unpackage/res/icons/40x40.png",
+                        "proapp@2x" : "unpackage/res/icons/167x167.png",
+                        "settings" : "unpackage/res/icons/29x29.png",
+                        "settings@2x" : "unpackage/res/icons/58x58.png",
+                        "spotlight" : "unpackage/res/icons/40x40.png",
+                        "spotlight@2x" : "unpackage/res/icons/80x80.png"
+                    },
+                    "iphone" : {
+                        "app@2x" : "unpackage/res/icons/120x120.png",
+                        "app@3x" : "unpackage/res/icons/180x180.png",
+                        "notification@2x" : "unpackage/res/icons/40x40.png",
+                        "notification@3x" : "unpackage/res/icons/60x60.png",
+                        "settings@2x" : "unpackage/res/icons/58x58.png",
+                        "settings@3x" : "unpackage/res/icons/87x87.png",
+                        "spotlight@2x" : "unpackage/res/icons/80x80.png",
+                        "spotlight@3x" : "unpackage/res/icons/120x120.png"
+                    }
+                }
+            },
+            "splashscreen" : {
+                "useOriginalMsgbox" : true
+            }
+        }
+    },
+    /* 快应用特有相关 */
+    "quickapp" : {},
+    /* 小程序特有相关 */
+    "mp-weixin" : {
+        "appid" : "wxfb4695444ab8d0d0",
+        "setting" : {
+            "urlCheck" : false,
+            "minified" : true,
+            "postcss" : true,
+            "es6" : true
+        },
+        "permission" : {
+            "scope.userLocation" : {
+                "desc" : "获取您的位置"
+            }
+        },
+        "requiredPrivateInfos" : [ "getLocation", "chooseAddress" ],
+        "usingComponents" : true
+    },
+    "mp-alipay" : {
+        "usingComponents" : true
+    },
+    "mp-baidu" : {
+        "usingComponents" : true
+    },
+    "mp-toutiao" : {
+        "usingComponents" : true
+    },
+    "h5" : {
+        "devServer" : {
+            "https" : false
+        },
+        "router" : {
+            "mode" : "history",
+            "base" : ""
+        },
+        "domain" : "",
+        "sdkConfigs" : {
+            "maps" : {
+                "qqmap" : {
+                    "key" : "SMJBZ-WCHK4-ZPZUA-DSIXI-XDDVQ-XWFX7"
+                }
+            }
+        },
+        "title" : "加载中...",
+        "template" : "template.h5.html"
+    }
 }
 //拨打电话权限关闭
-/* ios打包配置 */
\ No newline at end of file
+/* ios打包配置 */
+
diff --git a/pages/chat/customer_list/chat.vue b/pages/chat/customer_list/chat.vue
index e2f4a46..9a0a227 100644
--- a/pages/chat/customer_list/chat.vue
+++ b/pages/chat/customer_list/chat.vue
@@ -36,7 +36,7 @@
 										<navigator
 											v-if="item.msn_type === 6 && item.refundOrder && item.refundOrder.refund_order_id"
 											open-type="navigate"
-											:url="'/pages/order_details/index?order_id='+item.refundOrder.order_id">
+											:url="'/pages/admin/refundDetail/index?id='+item.refundOrder.refund_order_id + '&mer_id=' + item.mer_id">
 											<div class="broadcast-details_num">
 												<span>退款单号：{{ item.refundOrder.refund_order_sn }}</span>
 											</div>
diff --git a/pages/chat/customer_list/index.vue b/pages/chat/customer_list/index.vue
index c0ac102..29694e5 100644
--- a/pages/chat/customer_list/index.vue
+++ b/pages/chat/customer_list/index.vue
@@ -16,7 +16,7 @@
 							v-if="item.last && (item.last.msn_type == 5 || item.last.msn_type == 6)">[订单]</view>
 					</view>
 					<view class="right-box">
-						<view class="time">{{item.last && item.last.create_time.split(' ')[1] || ''}}</view>
+						<view class="time">{{item.display_time}}</view>
 						<view class="num" v-if="item.num>0">{{item.num}}</view>
 					</view>
 				</div>
@@ -38,7 +38,7 @@
 							v-if="item.last &&  (item.last.msn_type == 5 || item.last.msn_type == 6)">[订单]</view>
 					</view>
 					<view class="right-box">
-						<view class="time">{{item.last && item.last.create_time.split(' ')[1]}}</view>
+						<view class="time">{{item.display_time}}</view>
 						<view class="num" v-if="item.num>0">{{item.num}}</view>
 					</view>
 				</div>
diff --git a/pages/index/unregist.vue b/pages/index/unregist.vue
index 95a48f6..8e2153b 100644
--- a/pages/index/unregist.vue
+++ b/pages/index/unregist.vue
@@ -1,14 +1,18 @@
 <!-- 未开通商户 -->
 <template>
 	<view class="unregist">
+		<view class="unregist-wrap">
+			<!-- 适配不同机 -->
+			<view style="height: var(--status-bar-height);"></view>
+			<view style="display: flex;justify-content: space-between;height:100%;">
+				<view class="head">
+					<image src="@/static/images/f.png"></image>
+					<text>暂无信息</text>
+				</view>
 
-		<view class="icon" @click="handleBack">
-			<u-icon name="arrow-left" color="#fff" size="20"></u-icon>
-		</view>
-
-		<view class="head">
-			<image src="@/static/images/f.png"></image>
-			<text>暂无信息</text>
+				<!-- 按钮 -->
+				<retuntop style="margin-right: 50rpx;margin-top: 20rpx;" />
+			</view>
 		</view>
 
 		<view class="con">
@@ -24,7 +28,11 @@
 </template>
 
 <script>
+	import retuntop from '@/components/content-top/index.vue';
 	export default {
+		components: {
+			retuntop
+		},
 		methods: {
 			handleBack() {
 				console.log(1241)
@@ -52,16 +60,7 @@
 	.unregist {
 		position: relative;
 
-		.icon {
-			position: absolute;
-			top: calc(30rpx + var(--status-bar-height));
-			left: 30rpx;
-			z-index: 10;
-		}
-
-		.head {
-			display: flex;
-			align-items: center;
+		.unregist-wrap {
 			width: 100%;
 			height: 360rpx;
 			background-image: url(https://lihai001.oss-cn-chengdu.aliyuncs.com/def/a2e04202404021019436262.webp);
@@ -69,6 +68,11 @@
 			background-repeat: no-repeat;
 			background-position: center;
 			margin-bottom: 200rpx;
+		}
+
+		.head {
+			display: flex;
+			align-items: center;
 
 			image {
 				width: 112rpx;
diff --git a/pages/wholesale/wholesale/wholesale.vue b/pages/wholesale/wholesale/wholesale.vue
index 9a0eb1f..8ef4056 100644
--- a/pages/wholesale/wholesale/wholesale.vue
+++ b/pages/wholesale/wholesale/wholesale.vue
@@ -7,7 +7,7 @@
 					<view class="tab-item" :class="{on:tabIndex==2}" @click="tabIndex = 2">商户</view>
 				</view>
 				<block v-if="tabIndex==1">
-					<view class='nav acea-row row-middle' >
+					<view class='nav acea-row row-middle'>
 						<view class='item' @click="downStatus = !downStatus"
 							:class="{'t-color':downKey>0 && firstKey == 0}">
 							{{downMenu[downKey].title}}
@@ -72,33 +72,33 @@
 							</view> -->
 							<!-- <view class="zhezhao">
 							</view> -->
-							<view class="zhezhao1"  @click="goStore(item.mer_id)">
+							<view class="zhezhao1" @click="goStore(item.mer_id)">
 								<view class="title">
 									<view class="left">
-                    <view>{{item.mer_name}}
-                    </view>
-                    <span>
-                    	{{item.type_name}}
-                    </span>
-                  </view>
-                  <view class="right">
-                    进店
-                  </view>
+										<view>{{item.mer_name}}
+										</view>
+										<span>
+											{{item.type_name}}
+										</span>
+									</view>
+									<view class="right">
+										进店
+									</view>
 								</view>
-                <u-line></u-line>
+								<u-line></u-line>
 								<view class="coent" style="margin-top: 20rpx;">
 									<view class="avater">
 										<image :src="item.mer_avatar" mode=""></image>
 									</view>
 									<view class="text">
-                    <view class="score">
-                    	<view class="star">
-                    		<view
-                    			:style="{width: `${(item.service_score / 5 * 100).toFixed(0)}%`, backgroundImage: `url(${domain}/static/diy/score1${keyColor}.png)`}">
-                    		</view>
-                    	</view>
-                    	<view class="score_text">{{ item.service_score }}</view>
-                    </view>
+										<view class="score">
+											<view class="star">
+												<view
+													:style="{width: `${(item.service_score / 5 * 100).toFixed(0)}%`, backgroundImage: `url(${domain}/static/diy/score1${keyColor}.png)`}">
+												</view>
+											</view>
+											<view class="score_text">{{ item.service_score }}</view>
+										</view>
 										<view class="text_three">
 											<image src="@/static/images/phone_r.png" mode=""></image>
 											{{item.service_phone}}
@@ -150,25 +150,24 @@
 		<!-- #ifndef H5 -->
 		<passwordPopup></passwordPopup>
 		<!-- #endif -->
-    <!-- 购物车 -->
-    <view class="card" :style="`bottom:10px`"
-      @click="navgo('/pages/order_addcart/order_addcart?product_type=98')">
-      <view class="left">
-        <view class="cart" :class="{ act_cart: false }" style="position: relative; z-index: 9999999">
-          <u--image :showLoading="true" src="/static/images/LHYC/GWC.png" width="63.09rpx"
-            height="63.09rpx"></u--image>
-    
-          <view class="badge">
-           {{goodsNum}}
-          </view>
-        </view>
-        <view class="tot_price">
-          <view class=""> ￥{{totalMoney}} </view>
-          <view class=""> 支持配送 售后无忧 </view>
-        </view>
-      </view>
-      <view class="right"> 去结算 </view>
-    </view>
+		<!-- 购物车 -->
+		<view class="card" :style="`bottom:10px`" @click="navgo('/pages/order_addcart/order_addcart?product_type=98')">
+			<view class="left">
+				<view class="cart" :class="{ act_cart: false }" style="position: relative; z-index: 9999999">
+					<u--image :showLoading="true" src="/static/images/LHYC/GWC.png" width="63.09rpx"
+						height="63.09rpx"></u--image>
+
+					<view class="badge">
+						{{goodsNum}}
+					</view>
+				</view>
+				<view class="tot_price">
+					<view class=""> ￥{{totalMoney}} </view>
+					<view class=""> 支持配送 售后无忧 </view>
+				</view>
+			</view>
+			<view class="right"> 去结算 </view>
+		</view>
 	</view>
 </template>
 
@@ -219,11 +218,11 @@
 	import {
 		getconfig,
 	} from '@/api/public.js';
-  import {
-    getCartCounts,
-    getCartList,
-  
-  } from '@/api/requesta.js';
+	import {
+		getCartCounts,
+		getCartList,
+
+	} from '@/api/requesta.js';
 	const app = getApp();
 	export default {
 		components: {
@@ -255,8 +254,8 @@
 				domain: HTTP_REQUEST_URL,
 				productList: [],
 				is_switch: true,
-        goodsNum: 0,
-        totalMoney: 0,
+				goodsNum: 0,
+				totalMoney: 0,
 				where: {
 					cate_id: '',
 					order: '',
@@ -360,11 +359,11 @@
 			this.get_host_product();
 			this.getClassfication();
 			this.getStoreType();
-      // this.tabIndex = 2
+			// this.tabIndex = 2
+		},
+		onShow() {
+			this.cartFn()
 		},
-    onShow() {
-      this.cartFn()
-    },
 		onReady() {},
 		mounted() {
 			uni.getStorage({
@@ -543,7 +542,7 @@
 					this.storeList = this.storeList.concat(res.data.list)
 					this.count = res.data.count
 					this.loading = false
-				
+
 				})
 			},
 			// 店铺排序
@@ -649,7 +648,7 @@
 			},
 			// 组件确定
 			confirm2(data) {
-				
+
 				let arr1 = [],
 					arr2 = []
 				if (data.storeTypeArr.length == 0) {
@@ -741,11 +740,11 @@
 					that.hotScroll = res.data.list.length < that.hotLimit
 					that.hostProduct = that.hostProduct.concat(res.data.list)
 					if (that.hostProduct.length == res.data.count) {
-						
+
 						uni.showToast({
 							title: '推荐商品,加载完毕',
 							duration: 2000, // 显示时长，单位为毫秒
-							icon:'none'
+							icon: 'none'
 						})
 					}
 				});
@@ -787,10 +786,10 @@
 			//查找产品
 			get_product_list: function(isPage) {
 				let that = this;
-				
+
 				if (that.loadend) return;
 				if (that.loading) return;
-				
+
 				if (isPage === true) that.$set(that, 'productList', []);
 				that.loading = true;
 				that.loadTitle = '';
@@ -820,55 +819,55 @@
 					})
 				}
 			},
-      skuaddcart() {
-        this.showcartpop = false
-        // this.skuform = {}
-        let res = postCartAdd({
-          cart_num: this.skuNumber,
-          is_new: 0,
-          product_attr_unique: this.skuform.sku[this.skusize].unique,
-          product_id: this.skuform.product_id,
-          product_type: this.skuform.product_type,
-          spread_id: "",
-        }).then((res, err) => {
-          this.cartFn()
-          uni.showToast({
-            title: "加入成功",
-            duration: 1000,
-      
-          })
-        }).catch(err => {
-          // this.act_cart = false
-          uni.showToast({
-            title: err,
-            icon: "none",
-            duration: 1000,
-          })
-        })
-      
-      },
-      cartFn() {
-        getCartList().then(res => {
-          // console.log(res)
-          this.totalMoney = 0
-          this.cartList = res.data.list
-          this.cartList.forEach(e => {
-            e.list.forEach(item => {
-              this.totalMoney += item.cart_num * item.productAttr.price
-            })
-      
-          })
-          this.totalMoney = this.totalMoney.toFixed(2)
-        })
-        getCartCounts().then(res => {
-          this.goodsNum = res.data[0].count
-        })
-      },
-      navgo(url){
-        uni.navigateTo({
-          url: url
-        })
-      }
+			skuaddcart() {
+				this.showcartpop = false
+				// this.skuform = {}
+				let res = postCartAdd({
+					cart_num: this.skuNumber,
+					is_new: 0,
+					product_attr_unique: this.skuform.sku[this.skusize].unique,
+					product_id: this.skuform.product_id,
+					product_type: this.skuform.product_type,
+					spread_id: "",
+				}).then((res, err) => {
+					this.cartFn()
+					uni.showToast({
+						title: "加入成功",
+						duration: 1000,
+
+					})
+				}).catch(err => {
+					// this.act_cart = false
+					uni.showToast({
+						title: err,
+						icon: "none",
+						duration: 1000,
+					})
+				})
+
+			},
+			cartFn() {
+				getCartList().then(res => {
+					// console.log(res)
+					this.totalMoney = 0
+					this.cartList = res.data.list
+					this.cartList.forEach(e => {
+						e.list.forEach(item => {
+							this.totalMoney += item.cart_num * item.productAttr.price
+						})
+
+					})
+					this.totalMoney = this.totalMoney.toFixed(2)
+				})
+				getCartCounts().then(res => {
+					this.goodsNum = res.data[0].count
+				})
+			},
+			navgo(url) {
+				uni.navigateTo({
+					url: url
+				})
+			}
 		},
 		onPullDownRefresh() {
 
@@ -914,14 +913,14 @@
 
 	.productList .search {
 		width: 100%;
-			height: 170rpx;
-			padding: 0 20rpx;
-			// box-sizing: border-box;
-			position: fixed;
-			left: 0;
-			top: 0rpx;
+		height: 170rpx;
+		padding: 0 20rpx;
+		// box-sizing: border-box;
+		position: fixed;
+		left: 0;
+		top: 0rpx;
 		padding-top: 60rpx;
-			z-index: 9;
+		z-index: 9;
 		background-color: var(--view-theme);
 
 		.icon-dingwei {
@@ -977,13 +976,13 @@
 		width: 62rpx;
 		font-size: 40rpx;
 		height: 86rpx;
-		line-height: 86rpx ;
+		line-height: 86rpx;
 	}
 
 	.productList .nav-wrapper {
 		width: 100%;
 		// background-color: var(--view-theme);
-    background-color: #fff;
+		background-color: #fff;
 
 		.tab-bar {
 			display: flex;
@@ -996,7 +995,7 @@
 				justify-content: center;
 				align-items: center;
 				padding: 8rpx 0 20rpx;
-        color: #333;
+				color: #333;
 				font-size: 28rpx;
 				font-weight: bold;
 
@@ -1014,7 +1013,7 @@
 				&.on {
 					&::after {
 						// background: #fff;
-            background-color: var(--view-theme)
+						background-color: var(--view-theme)
 					}
 				}
 			}
@@ -1055,7 +1054,7 @@
 
 	.productList .list {
 		padding: 0 20rpx;
-	
+
 	}
 
 	.productList .list.on {
@@ -1091,7 +1090,7 @@
 		position: relative;
 		width: 100%;
 		height: 345rpx;
-		
+
 	}
 
 	.productList .list .item .pictrue.on {
@@ -1435,7 +1434,7 @@
 
 	.store-wrapper {
 		// margin-top: 310rpx;
-	
+
 		border-top: 1px solid #F6F6F6;
 
 		.star-box {
@@ -1483,7 +1482,8 @@
 				align-items: center;
 				justify-content: center;
 				color: #fff;
-        margin: 0 20rpx;
+				margin: 0 20rpx;
+				// align-self: ;
 
 				.zhezhao {
 					position: absolute;
@@ -1509,59 +1509,61 @@
 					// height: 150px;
 					border-radius: 20rpx;
 					z-index: 1;
-          background-color: #fff;
-          color: #333 !important;
+					background-color: #fff;
+					color: #333 !important;
 
 					.title {
-            display: flex;
-            align-items: center;
-            justify-content: space-between;
-						.left{
-              flex: 1;
-              display: flex;
-              // height: 50px;
-              padding: 20rpx 0;
-              align-items: center;
-              margin-left: 20px;
-              z-index: 1;
-              
-              span {
-                flex-shrink: 0;
-              	// background-color: #F84221;
-                border: 1px solid #F84221;
-                color: #F84221;
-              	font-size: 12px;
-              	padding: 3px;
-              	border-radius: 5px;
-              	margin-left: 5px;
-                margin-right: 5px;
-              }
-            }
-            .right{
-              flex-shrink: 0;
-              background: linear-gradient(to right, #ff7b36,#F84221);
-              color: #fff;
-              height: 50rpx;
-              line-height: 50rpx;
-              width: 100rpx;
-              text-align: center;
-              margin-right: 30rpx;
-              border-radius: 50rpx;
-            }
+						display: flex;
+						align-items: center;
+						justify-content: space-between;
+
+						.left {
+							flex: 1;
+							display: flex;
+							// height: 50px;
+							padding: 20rpx 0;
+							align-items: center;
+							margin-left: 20px;
+							z-index: 1;
+
+							span {
+								flex-shrink: 0;
+								// background-color: #F84221;
+								border: 1px solid #F84221;
+								color: #F84221;
+								font-size: 12px;
+								padding: 3px;
+								border-radius: 5px;
+								margin-left: 5px;
+								margin-right: 5px;
+							}
+						}
+
+						.right {
+							flex-shrink: 0;
+							background: linear-gradient(to right, #ff7b36, #F84221);
+							color: #fff;
+							height: 50rpx;
+							line-height: 50rpx;
+							width: 100rpx;
+							text-align: center;
+							margin-right: 30rpx;
+							border-radius: 50rpx;
+						}
 					}
 
 					.coent {
 						display: flex;
 						margin: 0 20px;
-            width: 100%;
-            padding-bottom: 20rpx;
+						width: 100%;
+						padding-bottom: 20rpx;
 
 						.avater {
-              flex-shrink: 0;
+							flex-shrink: 0;
 							width: 80px;
 							height: 80px;
-              border-radius: 14rpx;
-              overflow: hidden;
+							border-radius: 14rpx;
+							overflow: hidden;
 
 							image {
 								width: 80px;
@@ -1570,8 +1572,9 @@
 						}
 
 						.text {
-              flex: 1;
-              width: 100%;
+							flex: 1;
+							width: 100%;
+
 							.text_one {
 								display: flex;
 								height: 30px;
@@ -1606,8 +1609,8 @@
 							}
 
 							.text_three {
-                display: flex;
-                align-items: center;
+								display: flex;
+								align-items: center;
 								width: 270px;
 								padding-left: 10rpx;
 								white-space: nowrap;
@@ -1699,99 +1702,104 @@
 	.pop {
 		z-index: 1;
 	}
-  .score {
-  	display: flex;
-  	align-items: center;
-    margin-left: 15rpx;
-    margin-bottom: 16rpx;
-  	font-weight: 500;
-  	font-size: 24rpx;
-  	line-height: 1;
-  	color: #000;
-  
-  	.score-title {
-  		margin-right: 15rpx;
-  
-  	}
-    .score_text{
-      color: #fd5d2e;
-    }
-  
-  	.star {
-  		position: relative;
-  		width: 111rpx;
-  		height: 19rpx;
-  		margin-right: 10rpx;
-  		background: url(../../columnGoods/images/star.png) left top/100% 100% no-repeat;
-  		overflow: hidden;
-  
-  		view {
-  			position: absolute;
-  			top: 0;
-  			left: 0;
-  			width: 100%;
-  			height: 100%;
-  			background: url(../../columnGoods/images/star_active.png) left top/111rpx 19rpx no-repeat;
-  
-  			&.star_purple {
-  				background: url(../../columnGoods/images/star_active_purple.png) left top/111rpx 19rpx no-repeat;
-  			}
-  		}
-  	}
-  }
-  .card {
-    width: 720rpx;
-    z-index: 99;
-    // margin:auto;
-    left: 50%;
-    transform: translateX(-50%);
-    position: fixed;
-    // bottom: 0;
-    background-color: #333333;
-    height: 101.64rpx;
-    border-radius: 50.82rpx;
-    overflow: hidden;
-    color: white;
-    display: flex;
-    justify-content: space-between;
-    box-sizing: border-box;
-  
-    .left {
-      display: flex;
-      align-items: center;
-      padding: 10rpx 35rpx;
-  
-      .tot_price {
-        display: flex;
-        margin-left: 42rpx;
-        flex-direction: column;
-        justify-content: space-between;
-      }
-      .badge {
-        position: absolute;
-        top: 0;
-        right: 0;
-        background-color: #f84221;
-        transform: translate(50%, -50%);
-        // padding: 10rpx 10rpx;
-        border-radius: 35rpx;
-        text-align: center;
-        width: 35rpx;
-        line-height: 35rpx;
-        height: 35rpx;
-      }
-    }
-  
-    .right {
-      font-size: 33.29rpx;
-      line-height: 50px;
-      background: linear-gradient(to right, #f84221, #ff6d20);
-      width: 140.19rpx;
-      text-align: center;
-    }
-  }
-  .act_cart {
-    transition: 0.5s;
-    transform: scale(1.1);
-  }
+
+	.score {
+		display: flex;
+		align-items: center;
+		margin-left: 15rpx;
+		margin-bottom: 16rpx;
+		font-weight: 500;
+		font-size: 24rpx;
+		line-height: 1;
+		color: #000;
+
+		.score-title {
+			margin-right: 15rpx;
+
+		}
+
+		.score_text {
+			color: #fd5d2e;
+		}
+
+		.star {
+			position: relative;
+			width: 111rpx;
+			height: 19rpx;
+			margin-right: 10rpx;
+			background: url(../../columnGoods/images/star.png) left top/100% 100% no-repeat;
+			overflow: hidden;
+
+			view {
+				position: absolute;
+				top: 0;
+				left: 0;
+				width: 100%;
+				height: 100%;
+				background: url(../../columnGoods/images/star_active.png) left top/111rpx 19rpx no-repeat;
+
+				&.star_purple {
+					background: url(../../columnGoods/images/star_active_purple.png) left top/111rpx 19rpx no-repeat;
+				}
+			}
+		}
+	}
+
+	.card {
+		width: 720rpx;
+		z-index: 99;
+		// margin:auto;
+		left: 50%;
+		transform: translateX(-50%);
+		position: fixed;
+		// bottom: 0;
+		background-color: #333333;
+		height: 101.64rpx;
+		border-radius: 50.82rpx;
+		overflow: hidden;
+		color: white;
+		display: flex;
+		justify-content: space-between;
+		box-sizing: border-box;
+
+		.left {
+			display: flex;
+			align-items: center;
+			padding: 10rpx 35rpx;
+
+			.tot_price {
+				display: flex;
+				margin-left: 42rpx;
+				flex-direction: column;
+				justify-content: space-between;
+			}
+
+			.badge {
+				position: absolute;
+				top: 0;
+				right: 0;
+				background-color: #f84221;
+				transform: translate(50%, -50%);
+				// padding: 10rpx 10rpx;
+				border-radius: 35rpx;
+				text-align: center;
+				width: 35rpx;
+				line-height: 35rpx;
+				height: 35rpx;
+			}
+		}
+
+		.right {
+			font-size: 33.29rpx;
+			line-height: 50px;
+			background: linear-gradient(to right, #f84221, #ff6d20);
+			width: 140.19rpx;
+			text-align: center;
+		}
+	}
+
+	.act_cart {
+		transition: 0.5s;
+		transform: scale(1.1);
+	}
 </style>
\ No newline at end of file
diff --git a/pages/withdrawal/index.vue b/pages/withdrawal/index.vue
index 741b3e1..a24c264 100644
--- a/pages/withdrawal/index.vue
+++ b/pages/withdrawal/index.vue
@@ -54,7 +54,7 @@
 						<view class="withdrawal-form-item-label">提现金额</view>
 						<view class="withdrawal-form-item-val">
 							<input @input="onInput" type="number" placeholder="请输入提现金额"
-								placeholder-class="placeholderClass" :value="payForm.extract_money">
+								placeholder-class="placeholderClass" v-model="payForm.extract_money">
 						</view>
 					</view>
 				</view>