From 64b7a52d22f9a23c97d4f8f633d1da11e2adef76 Mon Sep 17 00:00:00 2001
From: "DESKTOP-GMUNQ1B\\k" <1154079537@qq.com>
Date: Tue, 9 Apr 2024 18:04:54 +0800
Subject: [PATCH] 1

---
 config/app.js                            |   4 +-
 manifest.json                            | 429 +++++++++++------------
 pages/product/basicSet.vue               | 100 +++---
 pages/product/shop_type_change/index.vue |   1 +
 pages/withdrawal/add.vue                 |   2 +-
 pages/withdrawal/index.vue               |  26 +-
 static/images/fb2.png                    | Bin 1037 -> 905 bytes
 static/images/fb21.png                   | Bin 1119 -> 0 bytes
 8 files changed, 287 insertions(+), 275 deletions(-)
 delete mode 100644 static/images/fb21.png

diff --git a/config/app.js b/config/app.js
index 479ac47..d94b1a2 100644
--- a/config/app.js
+++ b/config/app.js
@@ -9,8 +9,8 @@ let httpApiThree
 let wsApi
 
 // 在打包之前请检查当前环境是否正确
-const env = 'dev'; // 开发
-// const env = 'prod'; // 生产
+// const env = 'dev'; // 开发
+const env = 'prod'; // 生产
 // const env = 'prew'; // 预上线
 
 switch (env) {
diff --git a/manifest.json b/manifest.json
index 18bbe3e..63113ed 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,218 +1,217 @@
 {
-    "name" : "惠农商户平台",
-    "appid" : "__UNI__1EE148C",
-    "description" : "",
-    "versionName" : "1.4.6",
-    "versionCode" : 1460,
-    "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__1EE148C",
+	"description": "",
+	"versionName": "1.4.9",
+	"versionCode": 1490,
+	"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打包配置 */
-
+/* ios打包配置 */
\ No newline at end of file
diff --git a/pages/product/basicSet.vue b/pages/product/basicSet.vue
index 9372353..efd6d0f 100644
--- a/pages/product/basicSet.vue
+++ b/pages/product/basicSet.vue
@@ -1,14 +1,13 @@
 <template>
 	<view class="basic_set">
+		<!-- 老板说这里不要 -->
 		<view class="basice_item">
 			<view class="headline">
 				<view class="text flex_a_c">店铺基本配置</view>
 			</view>
-			<view class="store_bg">
+			<view class="store_bg" v-if="false">
 				<view class="text flex_a_c"><i class="iconfont icon-xinghao"></i>店铺背景图</view>
 				<block v-if="images[0].img">
-					<!-- 				<u--image :showLoading="true" :src="images[0].img" width="388px" height="210.53rpx" radius="4px"
-											@click="delImg(0)" mode="aspectFit"></u--image> -->
 					<u--image :showLoading="true" :src="images[0].img" width="680rpx" height="210.53rpx" radius="4px"
 						@click="delImg(0)"></u--image>
 				</block>
@@ -17,6 +16,7 @@
 					建议尺寸：710*220px
 				</view>
 			</view>
+
 			<view class="store_avatar flex_a_c_j_sb">
 				<view class="avatar_box">
 					<view class="text flex_a_c"><i class="iconfont icon-xinghao"></i>店铺头像</view>
@@ -49,10 +49,6 @@
 							<u--image :showLoading="true" @click="priviewImg(imagesArr, index)" :src="imgArr"
 								width="210.53rpx" height="210.53rpx" radius="4px"></u--image>
 						</view>
-						<!-- <view class="avatar_img other-item" @click="seleckImageArr()" :style="{marginRight: (imagesArr.length+1)%3==0?'0rpx':'20rpx'}">
-            	<view class="iconfont icon-tupian1"></view>
-            	建议尺寸：120*120px
-            </view> -->
 					</view>
 				</view>
 			</view>
@@ -69,7 +65,8 @@
 					</view>
 				</block>
 			</view>
-			<view class="street_bg" style="margin-bottom:20rpx;">
+
+			<view class="street_bg" style="margin-bottom:20rpx;" v-if="false">
 				<view class="text flex_a_c"> <i class="iconfont icon-xinghao"></i> 店铺街背景图</view>
 				<block v-if="images[2].img">
 					<u--image :showLoading="true" :src="images[2].img" width="680rpx" height="210.53rpx" radius="4px"
@@ -91,8 +88,7 @@
 					<text class="sub_title">配送方式：</text>
 					<view class="flex">
 						<checkbox-group name="" @change="checkboxChange">
-							<checkbox :checked="isZiti" :value="check.ziti" /><text
-								class="text ziti">到店自提</text>
+							<checkbox :checked="isZiti" :value="check.ziti" /><text class="text ziti">到店自提</text>
 							<checkbox :checked="isKuaidi" :value="check.kuaidi" /><text class="text">商家配送</text>
 						</checkbox-group>
 					</view>
@@ -183,8 +179,6 @@
         </view>
         <text style="color: #CCCCCC;">开启后，店铺即可展示在移动端</text>
       </view> -->
-
-
 		</view>
 
 		<button class="submit_btn l_center" @click="postMerchantUpdata">提交</button>
@@ -250,7 +244,7 @@
 				},
 				isZiti: false,
 				isKuaidi: false,
-				delivery_way: [1],
+				delivery_way: [1, 2],
 				takeName: '',
 				takePhone: '',
 				servicePhone: '',
@@ -264,34 +258,34 @@
 				dateWeek: [{
 					name: '星期一',
 					id: 1,
-					isCheck: false
+					isCheck: true
 				}, {
 					name: '星期二',
 					id: 2,
-					isCheck: false
+					isCheck: true
 				}, {
 					name: '星期三',
 					id: 3,
-					isCheck: false
+					isCheck: true
 				}, {
 					name: '星期四',
 					id: 4,
-					isCheck: false
+					isCheck: true
 				}, {
 					name: '星期五',
 					id: 5,
-					isCheck: false
+					isCheck: true
 				}, {
 					name: '星期六',
 					id: 6,
-					isCheck: false
+					isCheck: true
 				}, {
 					name: '星期日',
 					id: 7,
-					isCheck: false
+					isCheck: true
 				}],
-				selarr: [],
-				mer_take_time: [],
+				selarr: [1, 2, 3, 4, 5, 6, 7],
+				mer_take_time: ['08:00', '18:00'],
 				beginTimeShow: false,
 				overTimeShow: false,
 				mer_address: '',
@@ -307,49 +301,59 @@
 		},
 		onLoad(e) {
 			this.id = e.mer_id
-			this.getMerchantInfo(e.mer_id)
-
-			this.isZiti = true
+			this.getMerchantInfo(e.mer_id);
 		},
-		onShow() {},
 		methods: {
 			getMerchantInfo(id) {
 				merchantInfoAPI({
 					id
 				}).then(res => {
+					console.log(res)
+
 					this.mer_name = res.data.mer_name
 					this.category_name = res.data.merchantCategory.category_name
-					this.images[0].img = res.data.mer_banner
+					// this.images[0].img = res.data.mer_banner
 					this.images[1].img = res.data.mer_avatar
-					this.images[2].img = res.data.mini_banner
+					// this.images[2].img = res.data.mini_banner
 					if (typeof res.data.mer_certificate != 'string') {
 						this.images[3].img = res.data.mer_certificate[0];
 						res.data.mer_certificate.shift();
 						this.imagesArr = res.data.mer_certificate;
 					} else this.images[3].img = res.data.mer_certificate;
 					if (this.images[3].img) this.imgUpload = false;
-					if (typeof res.data.delivery_way == 'string') this.delivery_way = res.data.delivery_way.split(
-						',');
-					else this.delivery_way = res.data.delivery_way;
-					this.delivery_way.forEach(item => {
-						if (item === '1') this.isZiti = true
-						if (item === '2') this.isKuaidi = true
-					})
+
+					// 初始化默认
+					if (!res.data.delivery_way || res.data.delivery_way.length == 0) {
+						this.delivery_way = [1, 2];
+						this.isZiti = true;
+						this.isKuaidi = true;
+					} else {
+						if (typeof res.data.delivery_way == 'string') this.delivery_way = res.data.delivery_way
+							.split(
+								',');
+						else this.delivery_way = res.data.delivery_way;
+						this.delivery_way.forEach(item => {
+							if (item === '1') this.isZiti = true
+							if (item === '2') this.isKuaidi = true
+						})
+					}
 					this.takeName = res.data.mer_take_name
 					this.takePhone = res.data.mer_take_phone
 					this.detailSite = res.data.mer_take_address
 					// this.servicePhone = res.data.service_phone
-					this.servicePhone = res.data.mer_phone
+					this.servicePhone = res.data.mer_phone;
+
 					res.data.mer_take_location ? this.longLati = res.data.mer_take_location?.join(',') : null;
-					res.data.mer_take_day.forEach((item, i) => {
+					res.data.mer_take_day && res.data.mer_take_day.forEach((item, i) => {
 						this.dateWeek[Number(item) - 1].isCheck = true
 					})
+
 					this.selarr = res.data.mer_take_day;
 					this.type_code = res.data.type_code
 					this.mer_take_time = res.data.mer_take_time
 					this.intro = res.data.mer_info
 					this.cruxText = res.data.mer_keyword
-					this.mer_address = res.data.mer_address
+					this.mer_address = res.data.mer_address;
 					this.merState = res.data.mer_state === 1 ? true : false
 					this.credit_buy = res.data.credit_buy === 1 ? true : false
 					if (res.data.settle_cycle == 0) {
@@ -362,22 +366,20 @@
 					} else {
 						this.interest_rate = res.data.interest_rate
 					}
-
-					// console.log('res', res.data);
 				}).catch(err => {
 					// console.log('err', err);
 				})
 			},
 			checkboxChange(val) {
-        if(val.detail.value.length==0) {
-          this.isZiti = false;
-          this.isKuaidi = false;
-          this.$nextTick(()=>{
-            if(this.delivery_way[0]==1) this.isZiti = true;
-            else this.isKuaidi = true;
-          })
-          return Toast('请至少选择一种配送方式!');
-        }
+				if (val.detail.value.length == 0) {
+					this.isZiti = false;
+					this.isKuaidi = false;
+					this.$nextTick(() => {
+						if (this.delivery_way[0] == 1) this.isZiti = true;
+						else this.isKuaidi = true;
+					})
+					return Toast('请至少选择一种配送方式!');
+				}
 				this.delivery_way = val.detail.value;
 			},
 			//开启信用购
diff --git a/pages/product/shop_type_change/index.vue b/pages/product/shop_type_change/index.vue
index 6b9a747..abbe501 100644
--- a/pages/product/shop_type_change/index.vue
+++ b/pages/product/shop_type_change/index.vue
@@ -213,6 +213,7 @@
 				}
 
 				.sub-title {
+					width: 440rpx;
 					font-size: 24rpx;
 					color: #555555;
 					line-height: 45rpx;
diff --git a/pages/withdrawal/add.vue b/pages/withdrawal/add.vue
index 5b0d055..718e064 100644
--- a/pages/withdrawal/add.vue
+++ b/pages/withdrawal/add.vue
@@ -203,7 +203,7 @@
 		addBank,
 		searchBank,
 		getById,
-		getUserInfo
+		getUserInfo,
 	} from "@/api/user.js";
 	export default {
 		data() {
diff --git a/pages/withdrawal/index.vue b/pages/withdrawal/index.vue
index 2bc2e5d..8dbbae3 100644
--- a/pages/withdrawal/index.vue
+++ b/pages/withdrawal/index.vue
@@ -123,10 +123,13 @@
 		</view>
 
 		<!-- 提现btn -->
-		<view class="withdrawal-btn tapActive" @click="handleSubmit" v-if="bankList.length !=0">
-			<view class="withdrawal-btn-wrap">
+		<view class="withdrawal-btn tapActive" @click="handleSubmit">
+			<view class="withdrawal-btn-wrap" v-if="bankList.length != 0">
 				<text>点击提现</text>
 			</view>
+			<view class="withdrawal-btn-wrap" v-if="bankList.length == 0 && progressCount > 0">
+				<text>点击查看提现进度</text>
+			</view>
 		</view>
 
 		<!-- 明细按钮 -->
@@ -147,10 +150,10 @@
 </template>
 
 <script>
-	getAdminApplyAPI
 	import {
 		postCreateApplyAPI,
 		getAdminApplyAPI,
+		progressBankList
 	} from '@/api/user.js'
 	import {
 		searchBank
@@ -181,7 +184,8 @@
 				ot_margin: '', //押金
 				extract_money: '', //可提现金额
 				lock_money: '', //暂存金额
-				userInfo: {}
+				userInfo: {},
+				progressCount: 0
 			}
 		},
 
@@ -190,11 +194,10 @@
 			this.getBankInfo();
 			// 用户信息
 			this.userInfo = JSON.parse(this.$Cache.get("USER_INFO"));
+		},
 
-			// uni.showToast({
-			// 	title: `我是123\n\t好的佩奇`,
-			// 	icon: "none"
-			// })
+		onShow() {
+			this.getBankProgress();
 		},
 
 		methods: {
@@ -216,6 +219,13 @@
 				}
 			},
 
+			// 第一次审核拒绝 查询审核过程 
+			getBankProgress() {
+				progressBankList(this.mer_id).then(res => {
+					this.progressCount = res.data.count;
+				})
+			},
+
 			// 添加账户
 			handleToAdd() {
 				//如果绑定银行卡用户为个体户 则不能添加对公账户,只能添加法人账户  is_company =0 个体户
diff --git a/static/images/fb2.png b/static/images/fb2.png
index aca4a5300da83738779881b1ff60454ecf826d14..6b63c279a286dc1e69560aa9aeda3db7d1f2fb29 100644
GIT binary patch
literal 905
zcmV;419tq0P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px&LrFwIR9HvFm(NlYK@i4&JxED%AwGdnrDxHT2dfNEV0Z%I3FPc0;h<jO2}ln9
zxf!1TI9R18p-Rt$Coo(#Xk^;-CL4A)yJQ1cc2z1>$;|XO-+cW|k5D`+Wq1m%rsxu|
zBqH{Ws&;^mARX}S01kj|k)>tYpaocRxH`i6w6Tf*m8QpUoq>VNjmrR3O1QcRn=>U&
z4^|ohekYHSJOGt4vWLjZwUS4ZRSyGnH4DT9fO%M%A11F%Y)172q^<b&IduDQXk%>7
z98?5X1Feb3-3j2T-9EY+&58a`1F)SRr<1GdiK2}&Xcl2)0oDa+OaM{s2Iz8}i8z2v
z+Ew*a4>bW6QgsYqrGzv^<XKXj$>SIUDB-q6c#%?aE5OgD{uD)JTod7WYTc~>->~08
z0AZ<#JHF}U(RwAMoo2$TU$znr0i;pdnfFkufLUqJlZYM1VL}s1$gTmXl*Rpw&-Cgy
z3J9)B=!{{Q*_iv~nvMz6iQA3m3Dn<_GSm?F@uFnI-G>&N6UNNj!RJ134$J|+00+DT
z%ycrNgmjWD_%)fNpPe2)&;1P8ci<LqJ0r{Q!S8PdzlQ=#$Ar+8mXwfv5s9e8t6x2X
z{hUpF0Uiy#=hAq{$fV+<7NF|H?ZwzWFaQZ!B6VggZ@W)cN;ZZ*@H&fy&}GGa8&6X`
zl(INY2_x@*r~w~xs82)r3Ovrjm(DjUfcHb&m>QpfCxrm~gCqDe(8#NTM{xB2MR<iW
z{4uKin<>K#BkJ^qS7u(A5xoQM#f-=d$;50%w4FCG(}=EV#b(DA)|l95b}P2o8JCf<
zU}kcYm(jPViw+^jE~CurSXJ9SbZu(E6&Nt}Iv%mmK&U6yQ<?#Oqd<<_A%z-}(QIqU
z_7QmyUv0#Mftd9;tOwW?5p&RsP(2Dz(@wZvR#VzRWHAMzGipj(Mc5cMrS-&_hv%-R
z!SJddZziuTHzpDwhV$(SHg3yLQ*HTTtSz7HCsa@SXmwg!9&Ir5IEw5(b4-f%_?Szd
zW@X&wgfM4Cp;!lO=9H<SqK{LnkYsB;4T#e6czeuT`Ei;~VbAkw^gI`+j4MX<NTC~h
fo?Ay%sA~QKWXXWNRsr4000000NkvXXu0mjfOe3Rn

literal 1037
zcmV+o1oHcdP)<h;3K|Lk000e1NJLTq001Tc001Tk1^@s6s6FYf00001b5ch_0Itp)
z=>Px&$4Nv%R9HvNSV3zOK@@&(8u2cIQUx0@*+?&z(ne2B4=U(QJPJ(@_Tb4sAZ_sn
zcv25NG{vI_PkPWp<H;ta6c5GCM(7GsDyVl&GEZhV8+K-AW;Z1*T_}{zo0)Il_uiZL
zK7=DYrP7TF;JnHKuORUWK%4*o@#hEI5&4A7XT(3j*jU|lx5D>BJUE0cl!~(}L^KD8
zm0{KizzDG6dd-!r>oNfg00AuYy^?iron2;tR$ziM>h;!BJmg2z2_ylv!9P~7`pDS4
zjbbCPQt3v8IN#KLHUg{)Fm8LhW^!K;hrM2fBb!5@s>V)$TXfy6y5WrEYZE8|XqY&O
zc8-#T0G5^0jMOGPW&maVx~xGLght3hNO$;X_m+V57w$_35!GAm?fI;Sr`Z|2mxwtD
zm{XY9l!A7|pyJeOlFDy+&3t4t09Go@R0(lC?&7$i&J&Z9H_vsu{4Q`l4Gb>_Hk^I{
zV>`JVd%w5$`Hw9*R9cZ}F-oWbFsC>xC>(I#PiJk$6pPd65pt^l^w>@vz9i@_d*043
zot-9h23`w*soo;Mn&&kZb(>u)ly7l_8UT%_#Z&k@9x#IH*LLHh&c0YIugA+t<h1~p
z##?z^@e4uGhirgkE97{`{nkjVO?a&z*AXy^wlR6DPv4j9o=U(!{MW(j`}>Wb>Msee
zF*c7Xjqw1CZ{QTmFVbTwCE@_rT(7aDTB)^DU_cdZ%WEczZjgPQ-tVJOm{^0IORd)K
zLHxarPLyhwp>8=&`5_R!9tAK0TJpT@HFYl)2gU>66kkqZ<~blf83iyPc-3k*6J<sz
z?!Ew)8u*Sg`vwRei~<+}ymh_i{gebawZK545==360#qtV=*z(mAYG)9yH6ze<5wb4
zT`d<{V8>l9`nQi1>&XHe_Tq`l`&bLC(%A$BRxNI)<Vwnicct7Q8Yh_JxWsidiq2-}
zwx@Kpe47|;0KmnJb?p#2F6cT7vEJJDXodvq@R84#FPuFC&j{#|4IBcl{q4Y0T}Ki0
zf#GlxpE2Y{QP(Vr=_ReTcATkkqTD?soI(seNCbz3w2Rn%r(V|9`!N`nHLbNK*2F0z
zosgt9DrNA|jc@YYH)3!G*}*=(8F&}3Q?-UHiD1$~bc2spyU>hsAvk~yV5~N*-er*p
zz%-57L>1jQ9{?o4x)9}TqDtTU72v$0(JUesh7(mHS~AE`l7cAKWtE}QGCrGd7v5z;
zsfmjrS;9)S8I5qK4h%wfJylYt`q`2wXA_5kz8^(T6X*R0&C#|4$>~yi00000NkvXX
Hu0mjf8e!SH

diff --git a/static/images/fb21.png b/static/images/fb21.png
deleted file mode 100644
index a9534065e79c604528fc2cdb79dba242eae84170..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1119
zcmV-l1fctgP)<h;3K|Lk000e1NJLTq001Tc001Hg1^@s6Gpwt)00001b5ch_0Itp)
z=>Px(8A(JzR9Hv7m|Lh-RTPFlGo&IdE7G#aO3fY&GKn(s5@l9|X^7^d<%?ZJp$F5n
zjKmviA_VpzLWx8{C1QeNX{9JZT82eh5N2gw$h?=ycbHRVleO1gOSg@;bN0CWYmI;0
zRy*oTJKzrBUf?d^R-ij@6>tS`0QeR70oV>~0@ea2>x42$RWbMrz*9iiszyQY6tEJQ
z3v8}pTLoBOU<xpzio*&z0-O}yXhZcfV3z?ife96Y)m8Zim=8<`juja<0@e-q2=Hwc
z$=|^Gz#UWbJFpMfAJW_f=m87?9s~4OBwK-Dz~21FB4D=w8-eQ!JRJmP1B)6xX#)VG
z!rRw(E<XYTfuGYKa$pkt^8!$kSK`h9PSnj?qCXXQ1!$l7u!61fKjQyWV3z}1fZH=8
z%YQhq;XDAPrXzu6z@?c#v-AKUO-O;6p64^=Ux538-7NwY-3$&K_GP4EwJu13^#QhJ
zK#v0V0bjKkRCG5ESd#hv3%J>o#y7SCkf5o&4#<fMDXV}-vjDb`83MZj_$ec#Wb6g}
z+XR(5&jAksy@BJvcOgv{%i$*WwiRPvlIZ;=CV@Q*EY2K^2i`1ks-1k8SE6I}J`KFn
z1f2cy@l0oc0X_&#F8+2T4CJz*`x0QPtB6GZq(sqFn$lEW7T7KzZG4vPfD%VG-aS<i
z1s&hqHGsq}l8XTwcUqy#1!nc7J!L5{wj}V2z?>SuRP{l9;6~zlWM_!7L0}Hli;{n~
zRYi#t=Ucy;z+MBUmDsEab2X}L6WE_X#~Q#s3;nGQwr0TI1D;GAZWfqb-KG|0Au#cO
zPG#QDRtju2Ff;-3A@D>Au<HOvRaLRNuP!0Kew;e4>rv(kOinrRqxc5h<IAL#?V?lI
z<vJt*M+xkna4@7mB=?sk$XeN8^D4I(yTn=fJ<u}&VtVr#R)jN-BsbOD!mhS693Hlm
zW+TaN;P^{9?j#r%fqDJBkwiWXJQ&vJs$4o3JzL1DnW21N6M@-vU2*NuQQX5N<k_wA
zTq2j)+#N<$+T1?{25FNnif)$gW{$oA`d3IvUCb8O7r?cNq1?I?_&NvX-){lWWKo=@
zwhuwJLM%3K%QQRsoea#10rF$Sy~uOk%{3MGEZa)m8JRzb>y)cfzVF-lT~y_En-raI
zoq=`XwdRgp>O9}xZqhJQJ7ajoOZ2pfMjelwN5V33)~?aPdnK?u7!;+?bME~>UODkC
za41ofL!M&~hb7RDEk)ue8WZOAe||6fMBtv}=K((xq+PicJTqldLr%4wYq?bUsB%+q
zFuE0p0!@729cBKi0E_l^cDD}Oir>QO%EzI2T(g@UIfdkJ7SJ(bb96FzIs5VC#>~id
l+BV~5FOLM(XtgekcLr(s%Yx}q$(aBE002ovPDHLkV1kui{;B`~