商户入驻

2024-04-29 18:25:43 +08:00 · 2024-04-29 18:25:43 +08:00 · 03b6683aac
commit 03b6683aac
parent 916fa3fdd0
9 changed files with 982 additions and 400 deletions
--- a/api/store.js
+++ b/api/store.js
@ -554,6 +554,17 @@ export function getParmasValue(id) {
 		noAuth: true
 	});
 }
+
+/**
+ * 获取参数值列表
+ * @param int id
+ * 
+ */
+export function getIntention(uid) {
+	return request.get(`intention/info/${uid}`);
+}
+
+
 /**
 * 到货通知
 * 
--- a/manifest.json
+++ b/manifest.json
@ -1,353 +1,353 @@
 {
-	"name": "惠农生活",
-	"appid": "__UNI__3A527D1",
-	"description": "",
-	"versionName": "2.0.60",
-	"versionCode": 2037,
-	"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": false,
-			"waiting": false,
-			"autoclose": true,
-			"delay": 0
-		},
-		/* 模块配置 */
-		"modules": {
-			"VideoPlayer": {},
-			"OAuth": {},
-			"Payment": {},
-			"Share": {},
-			"iBeacon": {},
-			"Maps": {},
-			"Geolocation": {},
-			"UniMP": {
-				"description": "uni小程序"
-			},
-			"Push": {},
-			"Barcode": {},
-			"Camera": {}
-		},
-		"safearea": {
-			"bottom": {
-				"offset": "none"
-			}
-		},
-		/* 应用发布信息 */
-		"distribute": {
-			/* android打包配置 */
-			"android": {
-				"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.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.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_SETTINGS\"/>",
-					"<uses-permission android:name=\"android.permission.BLUETOOTH_ADMIN\"/>"
-				],
-				"abiFilters": ["armeabi-v7a", "arm64-v8a", "x86"],
-				"permissionExternalStorage": {
-					"request": "none",
-					"prompt": "应用保存运行状态等信息，需要获取读写手机存储（系统提示为访问设备上的照片、媒体内容和文件）权限，请允许。"
-				},
-				"permissionPhoneState": {
-					"request": "none" //拨打电话权限关闭
-				},
-				"minSdkVersion": 23,
-				"targetSdkVersion": 30
-			},
-			/* ios打包配置 */
-			"ios": {
-				"privacyDescription": {
-					"NSPhotoLibraryUsageDescription": "上传用户头像保存分享海报",
-					"NSPhotoLibraryAddUsageDescription": "上传用户头像保存分享海报",
-					"NSCameraUsageDescription": "上传用户头像保存分享海报",
-					"NSLocationWhenInUseUsageDescription": "根据客户地理位置推荐最近门店",
-					"NSLocationAlwaysUsageDescription": "根据客户地理位置推荐最近门店"
-				},
-				"idfa": false,
-				"dSYMs": false
-			},
-			/* SDK配置 */
-			"sdkConfigs": {
-				"maps": {
-					"amap": {
-						"appkey_ios": "0a3202688624938fd5d2f37b52c30d5d",
-						"appkey_android": "0354f5ddc11e2ea76c5aac647f44d945",
-						"name": "amapIvoVHpJR"
-					}
-				},
-				"payment": {
-					"weixin": {
-						"__platform__": ["ios", "android"],
-						"appid": "wx2e8f79ff281284f5",
-						"UniversalLinks": "https://shop.lihaink.cn/"
-					}
-				},
-				"share": {
-					"weixin": {
-						"appid": "wx2e8f79ff281284f5",
-						"UniversalLinks": "https://shop.lihaink.cn/"
-					}
-				},
-				"geolocation": {
-					"amap": {
-						"name": "amapIvoVHpJR",
-						"__platform__": ["ios", "android"],
-						"appkey_ios": "0a3202688624938fd5d2f37b52c30d5d",
-						"appkey_android": "0354f5ddc11e2ea76c5aac647f44d945"
-					}
-				},
-				"push": {},
-				"oauth": {
-					"weixin": {
-						"appid": "wx2e8f79ff281284f5",
-						"UniversalLinks": "https://shop.lihaink.cn/"
-					},
-					"univerify": {}
-				},
-				"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,
-				"androidStyle": "common"
-			}
-		},
-		"nativePlugins": {
-			"JG-JCore": {
-				"JPUSH_APPKEY_IOS": "8a5efd65cda14fafa6e64ad3",
-				"JPUSH_CHANNEL_IOS": "8a5efd65cda14fafa6e64ad3",
-				"JPUSH_APPKEY_ANDROID": "b5f679f4357018605ea6fd2e",
-				"JPUSH_CHANNEL_ANDROID": "",
-				"__plugin_info__": {
-					"name": "JG-JCore",
-					"description": "极光推送JCore插件",
-					"platforms": "Android,iOS",
-					"url": "",
-					"android_package_name": "uni.UNI3A527D1",
-					"ios_bundle_id": "",
-					"isCloud": false,
-					"bought": -1,
-					"pid": "",
-					"parameters": {
-						"JPUSH_APPKEY_IOS": {
-							"des": "[iOS]极光portal配置应用信息时分配的AppKey",
-							"key": "JCore:APP_KEY",
-							"value": "daebe19b547c43128796a078"
-						},
-						"JPUSH_CHANNEL_IOS": {
-							"des": "[iOS]用于统计分发渠道，不需要可填默认值developer-default",
-							"key": "JCore:CHANNEL",
-							"value": ""
-						},
-						"JPUSH_APPKEY_ANDROID": {
-							"des": "[Android]极光portal配置应用信息时分配的AppKey",
-							"key": "JPUSH_APPKEY",
-							"value": ""
-						},
-						"JPUSH_CHANNEL_ANDROID": {
-							"des": "[Android]用于统计分发渠道，不需要可填默认值developer-default",
-							"key": "JPUSH_CHANNEL",
-							"value": ""
-						}
-					}
-				}
-			},
-			"JG-JPush": {
-				"JPUSH_ISPRODUCTION_IOS": "true",
-				"JPUSH_ADVERTISINGID_IOS": "",
-				"JPUSH_DEFAULTINITJPUSH_IOS": "true",
-				"JPUSH_OPPO_APPKEY": "",
-				"JPUSH_OPPO_APPID": "",
-				"JPUSH_OPPO_APPSECRET": "",
-				"JPUSH_VIVO_APPKEY": "",
-				"JPUSH_VIVO_APPID": "",
-				"JPUSH_MEIZU_APPKEY": "",
-				"JPUSH_MEIZU_APPID": "",
-				"JPUSH_XIAOMI_APPKEY": "",
-				"JPUSH_XIAOMI_APPID": "",
-				"__plugin_info__": {
-					"name": "JG-JPush",
-					"description": "极光推送Hbuilder插件",
-					"platforms": "Android,iOS",
-					"url": "",
-					"android_package_name": "uni.UNI3A527D1",
-					"ios_bundle_id": "",
-					"isCloud": false,
-					"bought": -1,
-					"pid": "",
-					"parameters": {
-						"JPUSH_ISPRODUCTION_IOS": {
-							"des": "[iOS]是否是生产环境，是填true，不是填false或者不填",
-							"key": "JPush:ISPRODUCTION",
-							"value": ""
-						},
-						"JPUSH_ADVERTISINGID_IOS": {
-							"des": "[iOS]广告标识符（IDFA）如果不需要使用IDFA，可不填",
-							"key": "JPush:ADVERTISINGID",
-							"value": ""
-						},
-						"JPUSH_DEFAULTINITJPUSH_IOS": {
-							"des": "[iOS]是否默认初始化，是填true，不是填false或者不填",
-							"key": "JPush:DEFAULTINITJPUSH",
-							"value": ""
-						},
-						"JPUSH_OPPO_APPKEY": {
-							"des": "厂商OPPO-appkey,示例：OP-12345678",
-							"key": "OPPO_APPKEY",
-							"value": ""
-						},
-						"JPUSH_OPPO_APPID": {
-							"des": "厂商OPPO-appId,示例：OP-12345678",
-							"key": "OPPO_APPID",
-							"value": ""
-						},
-						"JPUSH_OPPO_APPSECRET": {
-							"des": "厂商OPPO-appSecret,示例：OP-12345678",
-							"key": "OPPO_APPSECRET",
-							"value": ""
-						},
-						"JPUSH_VIVO_APPKEY": {
-							"des": "厂商VIVO-appkey,示例：12345678",
-							"key": "com.vivo.push.api_key",
-							"value": ""
-						},
-						"JPUSH_VIVO_APPID": {
-							"des": "厂商VIVO-appId,示例：12345678",
-							"key": "com.vivo.push.app_id",
-							"value": ""
-						},
-						"JPUSH_MEIZU_APPKEY": {
-							"des": "厂商MEIZU-appKey,示例：MZ-12345678",
-							"key": "MEIZU_APPKEY",
-							"value": ""
-						},
-						"JPUSH_MEIZU_APPID": {
-							"des": "厂商MEIZU-appId,示例：MZ-12345678",
-							"key": "MEIZU_APPID",
-							"value": ""
-						},
-						"JPUSH_XIAOMI_APPKEY": {
-							"des": "厂商XIAOMI-appKey,示例：MI-12345678",
-							"key": "XIAOMI_APPKEY",
-							"value": ""
-						},
-						"JPUSH_XIAOMI_APPID": {
-							"des": "厂商XIAOMI-appId,示例：MI-12345678",
-							"key": "XIAOMI_APPID",
-							"value": ""
-						}
-					}
-				}
-			}
-		}
-	},
-	/* 快应用特有相关 */
-	"quickapp": {},
-	/* 小程序特有相关 */
-	"mp-weixin": {
-		"appid": "wx5fb1cc8edb3f8baa",
-		"setting": {
-			"urlCheck": false,
-			"minified": true,
-			"postcss": true,
-			"es6": true
-		},
-		"permission": {
-			"scope.userLocation": {
-				"desc": "获取您的位置"
-			}
-		},
-		"requiredPrivateInfos": ["getLocation", "chooseAddress"],
-		"usingComponents": true,
-		"__usePrivacyCheck__": 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",
-		"optimization": {
-			"treeShaking": {
-				"enable": true
-			}
-		}
-	}
+    "name" : "惠农生活",
+    "appid" : "__UNI__3A527D1",
+    "description" : "",
+    "versionName" : "2.0.60",
+    "versionCode" : 2037,
+    "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" : false,
+            "waiting" : false,
+            "autoclose" : true,
+            "delay" : 0
+        },
+        /* 模块配置 */
+        "modules" : {
+            "VideoPlayer" : {},
+            "OAuth" : {},
+            "Payment" : {},
+            "Share" : {},
+            "iBeacon" : {},
+            "Maps" : {},
+            "Geolocation" : {},
+            "UniMP" : {
+                "description" : "uni小程序"
+            },
+            "Push" : {},
+            "Barcode" : {},
+            "Camera" : {}
+        },
+        "safearea" : {
+            "bottom" : {
+                "offset" : "none"
+            }
+        },
+        /* 应用发布信息 */
+        "distribute" : {
+            /* android打包配置 */
+            "android" : {
+                "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.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.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_SETTINGS\"/>",
+                    "<uses-permission android:name=\"android.permission.BLUETOOTH_ADMIN\"/>"
+                ],
+                "abiFilters" : [ "armeabi-v7a", "arm64-v8a", "x86" ],
+                "permissionExternalStorage" : {
+                    "request" : "none",
+                    "prompt" : "应用保存运行状态等信息，需要获取读写手机存储（系统提示为访问设备上的照片、媒体内容和文件）权限，请允许。"
+                },
+                "permissionPhoneState" : {
+                    "request" : "none" //拨打电话权限关闭
+                },
+                "minSdkVersion" : 23,
+                "targetSdkVersion" : 30
+            },
+            /* ios打包配置 */
+            "ios" : {
+                "privacyDescription" : {
+                    "NSPhotoLibraryUsageDescription" : "上传用户头像保存分享海报",
+                    "NSPhotoLibraryAddUsageDescription" : "上传用户头像保存分享海报",
+                    "NSCameraUsageDescription" : "上传用户头像保存分享海报",
+                    "NSLocationWhenInUseUsageDescription" : "根据客户地理位置推荐最近门店",
+                    "NSLocationAlwaysUsageDescription" : "根据客户地理位置推荐最近门店"
+                },
+                "idfa" : false,
+                "dSYMs" : false
+            },
+            /* SDK配置 */
+            "sdkConfigs" : {
+                "maps" : {
+                    "amap" : {
+                        "appkey_ios" : "0a3202688624938fd5d2f37b52c30d5d",
+                        "appkey_android" : "0354f5ddc11e2ea76c5aac647f44d945",
+                        "name" : "amapIvoVHpJR"
+                    }
+                },
+                "payment" : {
+                    "weixin" : {
+                        "__platform__" : [ "ios", "android" ],
+                        "appid" : "wx2e8f79ff281284f5",
+                        "UniversalLinks" : "https://shop.lihaink.cn/"
+                    }
+                },
+                "share" : {
+                    "weixin" : {
+                        "appid" : "wx2e8f79ff281284f5",
+                        "UniversalLinks" : "https://shop.lihaink.cn/"
+                    }
+                },
+                "geolocation" : {
+                    "amap" : {
+                        "name" : "amapIvoVHpJR",
+                        "__platform__" : [ "ios", "android" ],
+                        "appkey_ios" : "0a3202688624938fd5d2f37b52c30d5d",
+                        "appkey_android" : "0354f5ddc11e2ea76c5aac647f44d945"
+                    }
+                },
+                "push" : {},
+                "oauth" : {
+                    "weixin" : {
+                        "appid" : "wx2e8f79ff281284f5",
+                        "UniversalLinks" : "https://shop.lihaink.cn/"
+                    },
+                    "univerify" : {}
+                },
+                "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,
+                "androidStyle" : "common"
+            }
+        },
+        "nativePlugins" : {
+            "JG-JCore" : {
+                "JPUSH_APPKEY_IOS" : "8a5efd65cda14fafa6e64ad3",
+                "JPUSH_CHANNEL_IOS" : "8a5efd65cda14fafa6e64ad3",
+                "JPUSH_APPKEY_ANDROID" : "b5f679f4357018605ea6fd2e",
+                "JPUSH_CHANNEL_ANDROID" : "",
+                "__plugin_info__" : {
+                    "name" : "JG-JCore",
+                    "description" : "极光推送JCore插件",
+                    "platforms" : "Android,iOS",
+                    "url" : "",
+                    "android_package_name" : "uni.UNI3A527D1",
+                    "ios_bundle_id" : "",
+                    "isCloud" : false,
+                    "bought" : -1,
+                    "pid" : "",
+                    "parameters" : {
+                        "JPUSH_APPKEY_IOS" : {
+                            "des" : "[iOS]极光portal配置应用信息时分配的AppKey",
+                            "key" : "JCore:APP_KEY",
+                            "value" : "daebe19b547c43128796a078"
+                        },
+                        "JPUSH_CHANNEL_IOS" : {
+                            "des" : "[iOS]用于统计分发渠道，不需要可填默认值developer-default",
+                            "key" : "JCore:CHANNEL",
+                            "value" : ""
+                        },
+                        "JPUSH_APPKEY_ANDROID" : {
+                            "des" : "[Android]极光portal配置应用信息时分配的AppKey",
+                            "key" : "JPUSH_APPKEY",
+                            "value" : ""
+                        },
+                        "JPUSH_CHANNEL_ANDROID" : {
+                            "des" : "[Android]用于统计分发渠道，不需要可填默认值developer-default",
+                            "key" : "JPUSH_CHANNEL",
+                            "value" : ""
+                        }
+                    }
+                }
+            },
+            "JG-JPush" : {
+                "JPUSH_ISPRODUCTION_IOS" : "true",
+                "JPUSH_ADVERTISINGID_IOS" : "",
+                "JPUSH_DEFAULTINITJPUSH_IOS" : "true",
+                "JPUSH_OPPO_APPKEY" : "",
+                "JPUSH_OPPO_APPID" : "",
+                "JPUSH_OPPO_APPSECRET" : "",
+                "JPUSH_VIVO_APPKEY" : "",
+                "JPUSH_VIVO_APPID" : "",
+                "JPUSH_MEIZU_APPKEY" : "",
+                "JPUSH_MEIZU_APPID" : "",
+                "JPUSH_XIAOMI_APPKEY" : "",
+                "JPUSH_XIAOMI_APPID" : "",
+                "__plugin_info__" : {
+                    "name" : "JG-JPush",
+                    "description" : "极光推送Hbuilder插件",
+                    "platforms" : "Android,iOS",
+                    "url" : "",
+                    "android_package_name" : "uni.UNI3A527D1",
+                    "ios_bundle_id" : "",
+                    "isCloud" : false,
+                    "bought" : -1,
+                    "pid" : "",
+                    "parameters" : {
+                        "JPUSH_ISPRODUCTION_IOS" : {
+                            "des" : "[iOS]是否是生产环境，是填true，不是填false或者不填",
+                            "key" : "JPush:ISPRODUCTION",
+                            "value" : ""
+                        },
+                        "JPUSH_ADVERTISINGID_IOS" : {
+                            "des" : "[iOS]广告标识符（IDFA）如果不需要使用IDFA，可不填",
+                            "key" : "JPush:ADVERTISINGID",
+                            "value" : ""
+                        },
+                        "JPUSH_DEFAULTINITJPUSH_IOS" : {
+                            "des" : "[iOS]是否默认初始化，是填true，不是填false或者不填",
+                            "key" : "JPush:DEFAULTINITJPUSH",
+                            "value" : ""
+                        },
+                        "JPUSH_OPPO_APPKEY" : {
+                            "des" : "厂商OPPO-appkey,示例：OP-12345678",
+                            "key" : "OPPO_APPKEY",
+                            "value" : ""
+                        },
+                        "JPUSH_OPPO_APPID" : {
+                            "des" : "厂商OPPO-appId,示例：OP-12345678",
+                            "key" : "OPPO_APPID",
+                            "value" : ""
+                        },
+                        "JPUSH_OPPO_APPSECRET" : {
+                            "des" : "厂商OPPO-appSecret,示例：OP-12345678",
+                            "key" : "OPPO_APPSECRET",
+                            "value" : ""
+                        },
+                        "JPUSH_VIVO_APPKEY" : {
+                            "des" : "厂商VIVO-appkey,示例：12345678",
+                            "key" : "com.vivo.push.api_key",
+                            "value" : ""
+                        },
+                        "JPUSH_VIVO_APPID" : {
+                            "des" : "厂商VIVO-appId,示例：12345678",
+                            "key" : "com.vivo.push.app_id",
+                            "value" : ""
+                        },
+                        "JPUSH_MEIZU_APPKEY" : {
+                            "des" : "厂商MEIZU-appKey,示例：MZ-12345678",
+                            "key" : "MEIZU_APPKEY",
+                            "value" : ""
+                        },
+                        "JPUSH_MEIZU_APPID" : {
+                            "des" : "厂商MEIZU-appId,示例：MZ-12345678",
+                            "key" : "MEIZU_APPID",
+                            "value" : ""
+                        },
+                        "JPUSH_XIAOMI_APPKEY" : {
+                            "des" : "厂商XIAOMI-appKey,示例：MI-12345678",
+                            "key" : "XIAOMI_APPKEY",
+                            "value" : ""
+                        },
+                        "JPUSH_XIAOMI_APPID" : {
+                            "des" : "厂商XIAOMI-appId,示例：MI-12345678",
+                            "key" : "XIAOMI_APPID",
+                            "value" : ""
+                        }
+                    }
+                }
+            }
+        }
+    },
+    /* 快应用特有相关 */
+    "quickapp" : {},
+    /* 小程序特有相关 */
+    "mp-weixin" : {
+        "appid" : "wx5fb1cc8edb3f8baa",
+        "setting" : {
+            "urlCheck" : false,
+            "minified" : true,
+            "postcss" : true,
+            "es6" : true
+        },
+        "permission" : {
+            "scope.userLocation" : {
+                "desc" : "获取您的位置"
+            }
+        },
+        "requiredPrivateInfos" : [ "getLocation", "chooseAddress" ],
+        "usingComponents" : true,
+        "__usePrivacyCheck__" : 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",
+        "optimization" : {
+            "treeShaking" : {
+                "enable" : true
+            }
+        }
+    }
 }
--- a/pages.json
+++ b/pages.json
@ -835,6 +835,12 @@
 						"navigationBarTitleText": "商家入驻"
 					}
 				},
+				{
+					"path": "settled/index1",
+					"style": {
+						"navigationBarTitleText": "商家入驻"
+					}
+				},
 				{
 					"path": "settled/unit",
 					"style": {
--- a/pages/store/settled/index.vue
+++ b/pages/store/settled/index.vue
@ -4,30 +4,30 @@
 			简单3步 享开店好礼
 		</view>
 		<view class="steps">
-			<view class="steps-li">
-				<view class="num">
+			<view class="steps-li" @click="step=1">
+				<view class="num act">
 					1
 				</view>
-				<view class="" style="font-size: 28rpx;">
+				<view class="" style="font-size: 28rpx;color: #35BD3E;">
 					添加店铺
 				</view>
 			</view>
 			<u-line color="#99999B" length="148rpx" style="transform: translateY(-80rpx);"></u-line>
-			<view class="steps-li">
-				<view class="num">
-					1
+			<view class="steps-li" @click="step=2">
+				<view class="num" :class="{act:step>1}">
+					2
 				</view>
-				<view class="" style="font-size: 28rpx;">
-					添加店铺
+				<view class="" style="font-size: 28rpx;" :style="{color:step>1?'#35BD3E':''}">
+					资质认证
 				</view>
 			</view>
 			<u-line color="#99999B" length="148rpx" style="transform: translateY(-80rpx);"></u-line>
-			<view class="steps-li">
-				<view class="num">
-					1
+			<view class="steps-li" @click="step=3">
+				<view class="num" :class="{act:step>2}">
+					3
 				</view>
-				<view class="" style="font-size: 28rpx;">
-					添加店铺
+				<view class="" style="font-size: 28rpx;" :style="{color:step>2?'#35BD3E':''}">
+					入驻审核
 				</view>
 			</view>

@ -36,22 +36,431 @@
 			<u--image :showLoading="true" src="/static/images/YDT.png" style="margin: 0 auto;" width="670rpx"
 				height="202rpx"></u--image>
 		</view>
-		<view class="form">
+		<u-transition :show="step==1" mode="slide-left">
+			<view class="step1" v-if='step==1'>
+				<view class="card">
+					<view class="card-tit">
+						店铺名称
+					</view>
+					<u--input placeholder="店铺名称" :maxlength='20' style="height: 100rpx;" border="surround"
+						v-model="formData.mer_name">
+						<template slot="suffix">
+							{{formData.mer_name.length}}/20
+						</template>
+					</u--input>
+				</view>
+				<view class="card">
+					<view class="card-tit">
+						店铺分类
+					</view>
+					<view class="card-cont">
+						<view class="card-cont-li" @click="showMerchantCategoryPicker=true">
+							{{formData.merchant_category_name|| '请选择店铺分类'}}
+							<u-icon name="arrow-right" color="#444444" size="15"></u-icon>
+						</view>
+						<u-line style="margin: 28rpx 0;"></u-line>
+						<view class="card-cont-li" @click="showStoreType=true">
+							{{formData.mer_storeType||'请选择店铺类型'}}
+							<u-icon name="arrow-right" color="#444444" size="15"></u-icon>
+						</view>
+					</view>
+				</view>
+			</view>
+		</u-transition>

+		<u-transition :show="step==2" :mode="step==1?'slide-right':'slide-right'">
+			<view class="step2" v-if='step==2'>
+				<view class="card">
+					<view class="card-tit">
+						公司性质
+					</view>
+					<view class="card-cont">
+						<view class="card-cont-li" @click="showCompanyType=true">
+							{{formData.is_company?'对公户':'个体户'}}
+							<u-icon name="arrow-right" color="#444444" size="15"></u-icon>
+						</view>
+					</view>
+				</view>
+				<view class="card">
+					<view class="card-tit">
+						请上传营业执照
+					</view>
+					<view class="upload">
+						<view class='uploadimg' @click="handleChooseImage(1)">
+							<u--image v-if="formData.images[0]" :showLoading="true" :src="formData.images[0]"
+								width="140rpx" height="140rpx"></u--image>
+							<u-icon v-if='!formData.images[0]' name="plus" color="#777777"></u-icon>
+							<view v-if='!formData.images[0]' style="color: #777777;font-size: 20rpx;">
+								上传图片
+							</view>
+						</view>
+					</view>
+				</view>
+				<view class="card">
+					<view class="card-tit">
+						店铺资质
+					</view>
+					<view class="card-cont">
+						<view class="card-cont-li">
+							<view class="ellipsis">
+								详细地址 {{formData.address}}
+							</view>
+						</view>
+						<u-line style="margin: 28rpx 0;"></u-line>
+						<view class="card-cont-li">
+							<view class="ellipsis">
+								公司名称 {{formData.company_name}}
+							</view>
+						</view>
+						<u-line style="margin: 28rpx 0;"></u-line>
+						<view class="card-cont-li">
+							法人名称 {{formData.name}}
+						</view>
+						<u-line style="margin: 28rpx 0;"></u-line>
+						<view class="card-cont-li">
+							<view class="ellipsis">
+								社会信用代码 {{formData.social_credit_code}}
+							</view>
+						</view>
+					</view>
+				</view>
+				<view class="card">
+					<view class="card-tit">
+						其他相关资质证明
+					</view>
+					<view class="upload" style="display: flex;flex-wrap: wrap;">
+						<u--image v-for="(item,index) in (formData.images.filter((i,k)=>k>0 ))"
+							style="margin-right: 20rpx;margin-bottom: 20rpx;" :showLoading="true" :src="item"
+							width="140rpx" height="140rpx"></u--image>
+						<view class='uploadimg' @click="handleChooseImage(0)">
+							<u-icon name="plus" color="#777777"></u-icon>
+							<view class="" style="color: #777777;font-size: 20rpx;">
+								上传图片
+							</view>
+						</view>
+					</view>
+				</view>
+				<view class="card">
+					<view class="card-tit">
+						电话认证
+					</view>
+					<view class="card-cont">
+						<view class="card-cont-li">
+							联系电话 {{formData.phone}}
+						</view>
+						<u-line style="margin: 28rpx 0;"></u-line>
+						<view class="card-cont-li">
+							<view class="" style="flex: 4;display: flex;align-items: center;">
+								验证码 <u--input style="padding-left: 40rpx;" border="none" v-model="formData.code">
+								</u--input>
+							</view>
+							<view class="" style="flex: 1;">
+								<u-button @click="handleVerify" type="success" shape="circle" :plain="true"
+									:text="text"></u-button>
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+		</u-transition>
+
+		<u-transition :show="step==3" mode="slide-right">
+			<view class="step3" v-if='step==3'>
+				<view style="font-size: 36rpx;margin: 50rpx 0 34rpx 0;text-align:center">
+					店铺等待审核
+				</view>
+				<view style="font-size: 32rpx;font-family: PFR;margin-bottom: 40rpx;text-align:center">
+					店铺已提交入驻申请
+				</view>
+				<view class="step3-card">
+					<view class="" style="display: flex;justify-content: space-between;font-size: 32rpx;">
+						<text>{{formData.mer_name}}</text>
+						<text style="font-family: PFR;">等待审核</text>
+					</view>
+					<view class="" style="color: #777;font-size: 24rpx;margin-top: 28rpx;">
+						提交时间：{{formData.create_time}}
+					</view>
+				</view>
+			</view>
+		</u-transition>
+		<view class="agreen" v-if='step==1'>
+			<u-checkbox-group activeColor="#20B128" v-model="checkboxValue1" placement="column">
+				<u-checkbox :customStyle="{marginBottom: '8px'}" label="已阅读并同意" name="1">
+				</u-checkbox>
+			</u-checkbox-group>
+			<text style="color: #35BD3E;" @click="getConfig">《入驻协议》</text>
+		</view>
+		<view class="submit-btn">
+			<u-button text="添加店铺" @click="submit" shape='circle'
+				color=" linear-gradient( 132deg, #38BE41 0%, #20B128 100%)"></u-button>
 		</view>

+		<u-picker cancelColor='#3ABE40' confirmColor='#3ABE40' @cancel='showMerchantCategoryPicker=false'
+			@confirm='confirmCate' :show="showMerchantCategoryPicker" keyName="category_name"
+			:columns="MerchantCategoryColumn"></u-picker>
+		<u-picker cancelColor='#3ABE40' confirmColor='#3ABE40' @cancel='showStoreType=false' @confirm='confirmType'
+			:show="showStoreType" keyName="type_name" :columns="StoreTypeColumn">
+		</u-picker>
+		<u-picker cancelColor='#3ABE40' confirmColor='#3ABE40' @cancel='showCompanyType=false' @confirm='confirmCompany'
+			:show="showCompanyType" :columns="companyColumn" keyName='label'>
+		</u-picker>
+
+		<view class="settlementAgreement" v-if="showProtocol">
+			<view class="setAgCount" style="width: 656rpx;height: 458px;">
+				<view class="close" @click="showProtocol = false">
+					<u-icon name="close-circle-fill" color="#B4B1B4" size="24"></u-icon>
+				</view>
+				<div class="title">'商户入驻协议'</div>
+				<view class="content">
+					<jyf-parser :html="protocol" ref="article" :tag-style="tagStyle"></jyf-parser>
+				</view>
+			</view>
+		</view>
+		<Verify @success="success" :captchaType="'blockPuzzle'" :imgSize="{ width: '330px', height: '155px' }"
+			ref="verify">
+		</Verify>
 	</view>
 </template>

 <script>
+	import {
+		configMap
+	} from "@/utils";
+	import {
+		mapGetters
+	} from "vuex";
+	import {
+		Toast
+	} from "../../../libs/uniApi";
+	import {
+		create,
+		verify,
+		merchantLicenseIdentify,
+		merClassifly,
+		getStoreTypeApi,
+		getIntention,
+		getGoodsDetails
+	} from '@/api/store.js';
+	import Verify from '@/components/verify/verify.vue';
+	export default {
+		components: {
+			Verify
+		},
+		data() {
+			return {
+				tagStyle: {
+					img: 'width:100%;display:block;'
+				},
+				disabled: false,
+				checkboxValue1: [],
+				protocol: this.sys_intention_agree,
+				step: 1,
+				showProtocol: false,
+				showMerchantCategoryPicker: false,
+				showCompanyType: false,
+				showStoreType: false,
+				MerchantCategoryColumn: [],
+				StoreTypeColumn: [
+
+				],
+				companyColumn: [
+					[{
+						label: '对公户',
+						is_company: 1
+					}, {
+						label: '个体户',
+						is_company: 0
+					}]
+				],
+				text: '获取验证码',
+				formData: {
+					"phone": "",
+					"mer_name": "",
+					"name": "",
+					"code": "1212",
+					"company_name": "",
+					"address": "123号",
+					"invitation_code": "",
+					"social_credit_code": "",
+					"merchant_category_id": 0,
+					"merchant_category_name": "",
+					"is_company": 1,
+					"mer_type_id": 0,
+					"mer_storeType": "",
+					province_name: "",
+					"city_name": "",
+					"area_name": "",
+					"street_name": "",
+					"village_name": '',
+					"is_nmsc": 0,
+					"images": [],
+					step: 1
+
+				}
+			}
+		},
+		computed: configMap({
+			sys_intention_agree: ''
+		}, mapGetters(['isLogin', 'viewColor', 'keyColor'])),
+		methods: {
+			splitAddress(str) {
+				var reg = /.+?(省|市|自治区|自治州|县|区|镇|社区|街道|街|村)/g; // 省市区的正则
+				let list = str.match(reg)
+				console.log(list)
+				this.formData.province_name = list[0]
+				this.formData.city_name = list[1]
+				this.formData.area_name = list[2]
+				this.formData.street_name = list[3]
+				this.formData.village_name = list[4]
+			},
+			confirmCate(e) {
+				console.log(e)
+				this.formData.merchant_category_name = e.value[0].category_name
+				this.formData.merchant_category_id = e.value[0].merchant_category_id
+				this.showMerchantCategoryPicker = false
+			},
+			confirmType(e) {
+				this.formData.mer_storeType = e.value[0].type_name
+				this.formData.mer_type_id = e.value[0].mer_type_id
+				this.showStoreType = false
+			},
+			confirmCompany(e) {
+				this.formData.is_company = e.value[0].is_company
+				this.showCompanyType = false
+			},
+			getConfig() {
+				this.showProtocol = true;
+				// 获取配置
+				this.protocol = this.sys_intention_agree;
+			},
+
+			// 选择图片
+			handleChooseImage(type = 0) {
+				let that = this;
+				that.$util.uploadImageOne({
+					count: 1,
+					url: 'upload/image'
+				}, function(res) {
+					type ? that.getInfoByImg(res.data.path) :
+						that.formData.images.push(res.data.path)
+				});
+			},
+			// 识别图片
+			getInfoByImg(img) {
+				let that = this
+				this.formData.images = [img]
+				uni.showLoading({
+					title: '识别中'
+				})
+				merchantLicenseIdentify({
+					image: img
+				}).then(res => {
+					uni.hideLoading();
+					if (res.status == 200) {
+						that.formData.address = res.data.address;
+						that.formData.name = res.data.legal_person;
+						// that.formData.social_credit_code = res.data.register_number;
+						that.formData.social_credit_code = '454as4545455457sdfdf';
+						that.formData.company_name = res.data.name;
+						console.log(that.splitAddress(res.data.address))
+					} else {
+						that.$util.Tips({
+							title: "识别失败!"
+						})
+					}
+				}).catch((e) => {
+					uni.hideLoading();
+					that.$util.Tips({
+						title: "识别失败"
+					})
+				})
+			},
+			handleVerify() {
+				this.$refs.verify.show();
+			},
+			success(data) {
+				this.$refs.verify.hide();
+				this.code(data);
+			},
+			async code(data) {
+				let that = this;
+				await verify({
+					phone: that.formData.phone,
+					type: 'intention',
+					captchaType: 'blockPuzzle',
+					captchaVerification: data.captchaVerification
+				}).then(res => {
+					that.$util.Tips({
+						title: res.msg
+					});
+					that.sendCode();
+				}).catch(res => {
+					that.$util.Tips({
+						title: res
+					});
+				});
+			},
+			sendCode() {
+				if (this.disabled) return;
+				this.disabled = true;
+				let n = 60;
+				this.text = "剩余 " + n + "s";
+				const run = setInterval(() => {
+					n = n - 1;
+					if (n < 0) {
+						clearInterval(run);
+					}
+					this.text = "剩余 " + n + "s";
+					if (this.text < "剩余 " + 0 + "s") {
+						this.disabled = false;
+						this.text = "重新获取";
+					}
+				}, 1000);
+			},
+			submit() {
+				if (!this.checkboxValue1[0]) {
+					return Toast("请勾选用户协议")
+				}
+				this.formData.step = this.step
+				create(this.formData).then(res => {
+					this.step += 1
+				}).catch(err => {
+					console.log(err, 'err')
+					Toast(err)
+				})
+			}
+		},
+		onLoad() {
+			this.formData.phone = this.$store.state.app.userInfo.account
+			console.log(this.$store.state.app.userInfo)
+			merClassifly().then(res => {
+				this.MerchantCategoryColumn = [res.data]
+			})
+			getStoreTypeApi().then(res => {
+				this.StoreTypeColumn = [res.data]
+			})
+			getIntention(this.$store.state.app.userInfo.uid).then(res => {
+				this.formData = res.data
+				this.step = this.formData.step
+				this.formData.phone = this.$store.state.app.userInfo.account
+
+				if (this.formData.step == 3) {
+					getGoodsDetails(this.$store.state.app.userInfo.uid)
+				}
+
+			})
+		}
+	}
 </script>

 <style lang="scss" scoped>
 	.content {
 		min-height: 100vh;
 		background-color: #fff;
-		padding: 20rpx;
+		padding: 40rpx;
 		box-sizing: border-box;
+		font-family: PF;
+		padding-bottom: 200rpx;

 		.heder-tips {
 			font-weight: 400;
@ -65,20 +474,190 @@
 		.steps {
 			display: flex;
 			justify-content: center;
-			// justify-content: space-around;
-			// align-items: center;

 			.num {
 				width: 52rpx;
 				height: 52rpx;
 				border-radius: 52rpx;
-				background-color: #20B128;
-				color: white;
+				background-color: #F3F3F3;
 				text-align: center;
 				line-height: 52rpx;
 				margin: 0 auto;
 				margin-bottom: 16rpx;
 			}
+
+			.act {
+				background-color: #20B128;
+				color: white;
+			}
+		}
+
+		.card {
+			.card-tit {
+				font-size: 32rpx;
+				margin: 40rpx 0 30rpx 0;
+			}
+
+			.card-cont {
+				padding: 30rpx;
+				border: 1px solid #F3F3F3;
+				border-radius: 16rpx;
+				font-family: PFR;
+				color: #777777;
+
+				.card-cont-li {
+					display: flex;
+					justify-content: space-between;
+					align-items: center;
+				}
+
+				.ellipsis {
+					// background-color: red;
+					width: 600rpx;
+					white-space: nowrap;
+					/* 防止文本换行 */
+					overflow: hidden;
+					/* 隐藏超出容器的文本 */
+					text-overflow: ellipsis;
+					/* 使用省略号来表示被截断的文本 */
+				}
+			}
+		}
+
+
+		.agreen {
+			display: flex;
+			margin-top: 60rpx;
 		}
 	}
+
+
+	.uploadimg {
+		width: 140rpx;
+		height: 140rpx;
+		border-radius: 16rpx;
+		border: 2rpx solid #F1F1F1;
+		display: flex;
+		flex-direction: column;
+		justify-content: space-around;
+		align-items: center;
+		box-sizing: border-box;
+		padding: 20rpx 0;
+		overflow: hidden;
+
+	}
+
+	.step3-card {
+		width: 670rpx;
+		height: 194rpx;
+		background: #FBFBFB;
+		box-shadow: 0rpx 6rpx 12rpx 2rpx rgba(0, 0, 0, 0.16);
+		border-radius: 16rpx 16rpx 16rpx 16rpx;
+		padding: 50rpx;
+	}
+
+	.submit-btn {
+		position: fixed;
+		bottom: 50rpx;
+		width: 670rpx;
+	}
+
+	.settlementAgreement {
+		width: 100%;
+		height: 100%;
+		position: fixed;
+		top: 0;
+		left: 0;
+		z-index: 12;
+		background: rgba(0, 0, 0, .5);
+	}
+
+	.settlementAgreement .setAgCount {
+		background: #fff;
+		width: 694rpx;
+		// height: 458px;
+		position: absolute;
+		top: 50%;
+		left: 50%;
+
+		padding: 28rpx;
+		-webkit-transform: translate(-50%, -50%);
+		-moz-transform: translate(-50%, -50%);
+		transform: translate(-50%, -50%);
+		overflow: hidden;
+
+		.content {
+			height: 900rpx;
+			overflow-y: scroll;
+
+			/deep/ p {
+				font-size: 13px;
+				line-height: 22px;
+			}
+
+			/deep/ img {
+				max-width: 100%;
+			}
+		}
+	}
+
+	.settlementAgreement .setAgCount .close {
+		position: absolute;
+		top: 15rpx;
+		right: 15rpx;
+	}
+
+	.settlementAgreement .setAgCount .icon {
+		font-size: 42rpx;
+		color: #b4b1b4;
+		position: absolute;
+		top: 15rpx;
+		right: 15rpx;
+	}
+
+	.settlementAgreement .setAgCount .title {
+		color: #333;
+		font-size: 32rpx;
+		text-align: center;
+		font-weight: bold;
+	}
+
+	.settlementAgreement .setAgCount .content {
+		color: #333;
+		font-size: 26rpx;
+		line-height: 22px;
+		text-align: justify;
+		text-justify: distribute-all-lines;
+		overflow-y: scroll;
+		padding-bottom: 20rpx;
+	}
+
+	.settlementAgreement .setAgCount .contenta {
+		color: #333;
+		font-size: 26rpx;
+		line-height: 22px;
+		text-align: justify;
+		text-justify: distribute-all-lines;
+		height: 85%;
+		overflow-y: scroll;
+	}
+
+	.code {
+		position: absolute;
+		width: 93px;
+		line-height: 27px;
+		border: 1px solid var(--view-theme);
+		border-radius: 15px;
+		color: var(--view-theme);
+		text-align: center;
+		bottom: 8px;
+		right: 0;
+		font-size: 12px;
+	}
+
+	.code.on {
+		background-color: #bbb;
+		color: #fff;
+		border-color: #bbb;
+	}
 </style>
--- a/pages/store/settled/index1.vue
+++ b/pages/store/settled/index1.vue
@ -283,8 +283,6 @@
 			</Verify>
 		</view>

-
-
 		<view class="settledSuccessMain " v-else :style="viewColor">
 			<view class="settledSuccessful">
 				<image class="image" src="../static/images/settledSuccessful.svg" alt="">
@ -312,9 +310,9 @@
 		verify,
 		merClassifly,
 		getCategoryList,
+		getStoreTypeApi,
 		getGoodsDetails,
 		updateGoodsRecord,
-		getStoreTypeApi,
 		agreeiness,
 		merchantLicenseIdentify
 	} from '@/api/store.js';
@ -368,7 +366,7 @@
 				disabled: false,
 				isAgree: false,
 				showProtocol: false,
-				isShowCode: false,
+				isShow: false,
 				loading: false,
 				isshow: false,
 				merchantData: {
@ -817,30 +815,7 @@
 				let that = this;
 				that.$util.uploadImageOne('upload/image', function(res) {
 					that.business_license = res.data.path;
-					uni.showLoading({
-						title: '识别中'
-					})
-					merchantLicenseIdentify({
-						image: res.data.path
-					}).then(res => {
-						uni.hideLoading();
-						if (res.status == 200) {
-							that.merchantData.address = res.data.address;
-							that.merchantData.user_name = res.data.legal_person;
-							that.merchantData.social_credit_code = res.data.register_number;
-							that.merchantData.company_name = res.data.name;
-							// that.$set('merchantData', that.merchantData);
-						} else {
-							that.$util.Tips({
-								title: "识别失败!"
-							})
-						}
-					}).catch((e) => {
-						uni.hideLoading();
-						that.$util.Tips({
-							title: "识别失败"
-						})
-					})
+
 				});
 			},

--- a/static/css/base.css
+++ b/static/css/base.css
@ -413,3 +413,14 @@ checkbox .uni-checkbox-input.uni-checkbox-input-checked::before {
 	height: 80rpx;
 	overflow: hidden
 }
+
+
+@font-face {
+	font-family: PF;
+	src: url('/static/font/PingFangMedium.ttf');
+}
+
+@font-face {
+	font-family: PFR;
+	src: url('/static/font/PingFangRegular.ttf');
+}
--- a/static/font/PingFangMedium.ttf
+++ b/static/font/PingFangMedium.ttf
--- a/static/font/PingFangRegular.ttf
+++ b/static/font/PingFangRegular.ttf
--- a/uni.scss
+++ b/uni.scss
@ -15,7 +15,7 @@
 /* 颜色变量 */

 /* 行为相关颜色 */
-$uni-color-primary: #007aff;
+$uni-color-primary: #20B128;
 $uni-color-success: #4cd964;
 $uni-color-warning: #f0ad4e;
 $uni-color-error: #dd524d;