diff --git a/App.vue b/App.vue
index cb17a2b..c64ecb2 100644
--- a/App.vue
+++ b/App.vue
@@ -13,6 +13,7 @@
 		initEvent
 	} from "@/utils/uniMPevent.js";
 	let jpushModule = uni.requireNativePlugin("JG-JPush");
+	import uniMP from '@/utils/uniMP.js';
 	// #endif
 	import {
 		checkLogin
@@ -115,8 +116,7 @@
 				let messageID = result.messageID
 				let title = result.title
 				let content = result.content
-				let extras = result.extras
-
+				let extras = result.extras.type
 				if (result.extras.type == 'ORDER_CREATE' && result.extras.mp3.length > 0) {
 					if (result.extras.mp3[0] == '微信') this.audioTeam.push('/static/audio/wechat.MP3')
 					if (result.extras.mp3[0] == '支付宝') this.audioTeam.push('/static/audio/pay.MP3')
@@ -147,11 +147,21 @@
 					//   this.audioTeam.push(result.extras.type);
 					// }
 				}
+
+				console.log("收到消息")
+				console.log(result)
 				// 点击事件
 				if (notificationEventType == 'notificationOpened') {
-					uni.navigateTo({
-						url: result.extras.route
-					})
+					if (result.extras.type == 2) {
+						let data = result.extras.group_data
+						data.route = result.extras.route
+						data.type = 2
+						uniMP.loadAppletMP(data)
+					} else {
+						uni.navigateTo({
+							url: result.extras.route
+						})
+					}
 				}
 			})
 
diff --git a/api/store.js b/api/store.js
index e4b2f32..0e0c90b 100644
--- a/api/store.js
+++ b/api/store.js
@@ -28,6 +28,11 @@ export function getProductParmas(id, data) {
 		noAuth: true
 	});
 }
+
+export function getUnimpInfo() {
+	return request.get('intention/publish');
+}
+
 /**
  * 获取店铺推荐商品
  * @param int id
@@ -567,6 +572,17 @@ export function getParmasValue(id) {
 		noAuth: true
 	});
 }
+
+/**
+ * 获取参数值列表
+ * @param int id
+ * 
+ */
+export function getIntention(uid) {
+	return request.get(`intention/info/${uid}`);
+}
+
+
 /**
  * 到货通知
  * 
diff --git a/api/user.js b/api/user.js
index 41cb19c..d0119f2 100644
--- a/api/user.js
+++ b/api/user.js
@@ -13,9 +13,9 @@ import Cache from '@/utils/cache';
  * 获取版本信息
  */
 export function Appversion(data) {
-  return request.get(`app/version`, data, {
-    noAuth: true
-  });
+	return request.get(`app/version`, data, {
+		noAuth: true
+	});
 }
 /**
  * 获取用户信息
@@ -117,6 +117,17 @@ export function registerForget(data) {
 		noAuth: true
 	});
 }
+
+
+/**
+ * 一键登录
+ */
+export function phonelogin(data) {
+	return request.post("auth/phonelogin", data, {
+		noAuth: true
+	});
+}
+
 /**
  * 获取用户中心菜单
  *
@@ -257,7 +268,14 @@ export function extractCash(data) {
  * 申请提现
  */
 export function getAdminApplyAPI(merId, data) {
-  return request.get(`admin/${merId}/apply`, data);
+	return request.get(`admin/${merId}/apply`, data);
+}
+
+/**
+ * 新商户
+ */
+export function isNewMer(uid, mer_id, data) {
+	return request.post(`auth/guide/${uid}/${mer_id}`, data);
 }
 /**
  * 提现银行/提现最低金额
diff --git a/components/orderGoods/index.vue b/components/orderGoods/index.vue
index 2beaad7..164d4d3 100644
--- a/components/orderGoods/index.vue
+++ b/components/orderGoods/index.vue
@@ -39,7 +39,7 @@
 								<view class="right-btn-box event_box">
 									<view class="btn-item"
 										v-if="evaluate != 2 && item.is_refund ==0 && pay_type!= 10 && status==0 && (evaluate != 10 && evaluate != 11) && orderData.refund_status || item.refund_num > 0"
-										@click.stop="refund(item)">申请退款</view>
+										@click.stop="showTips=true,refundItem=item">申请退款</view>
 									<view class="btn-item err" v-if="item.is_refund ==1">退款中 x
 										{{item.product_num - item.refund_num}}
 									</view>
@@ -113,7 +113,7 @@
 						</view>
 						<view class="btn-item"
 							v-if="evaluate != 2 && item.refund_switch==1 && pay_type!= 10 && status==0 && (item.is_refund == 0 && evaluate != 9 && orderData.refund_status || item.refund_num > 0)"
-							@click.stop="refund(item)">申请退款</view>
+							@click.stop="showTips=true,refundItem=item">申请退款</view>
 						<view class='btn-item' v-if='item.is_reply==0 && evaluate==2 && item.refund_num > 0'
 							@click.stop="evaluateTap(item.order_product_id,orderId)">去评价</view>
 						<view class='btn-item on' v-else-if="item.is_reply==1 && evaluate==2">已评价</view>
@@ -121,6 +121,22 @@
 				</view>
 			</view>
 		</view>
+
+		<u-overlay :show="showTips">
+			<view class="tips">
+				<view class="" style="font-size: 32rpx;">
+					温馨提示
+				</view>
+				<view class="">
+					下单后1小时内申请退款可极速退款
+				</view>
+				<u-button color="#61D137" text="我知道了" @tap="refund(refundItem)"></u-button>
+			</view>
+		</u-overlay>
+
+
+
+
 	</view>
 </template>
 
@@ -169,14 +185,14 @@
 				type: String,
 				default: '',
 			},
-      pay_type:{
-        type: [Number, String],
-        default: 0,
-      },
-      status:{
-        type: [Number, String],
-        default: 0,
-      },
+			pay_type: {
+				type: [Number, String],
+				default: 0,
+			},
+			status: {
+				type: [Number, String],
+				default: 0,
+			},
 			jump: {
 				type: Boolean,
 				default: false,
@@ -187,14 +203,16 @@
 					return {};
 				}
 			},
-      sale_type: {
-        type: [Number, String],
-        default: 1,
-      },
+			sale_type: {
+				type: [Number, String],
+				default: 1,
+			},
 		},
 		computed: mapGetters(['viewColor']),
 		data() {
 			return {
+				showTips: false, //退款提示弹窗
+				refundItem: null,
 				domain: HTTP_REQUEST_URL,
 				totalNmu: '',
 				isTimePay: false, //是否到支付时间
@@ -245,7 +263,8 @@
 						let id = res.data.product_assist_set_id;
 						uni.hideLoading();
 						uni.navigateTo({
-							url: '/pages/activity/assist_detail/index?id=' + id + '&sale_type=' + this.sale_type
+							url: '/pages/activity/assist_detail/index?id=' + id +
+								'&sale_type=' + this.sale_type
 						});
 					}).catch((err) => {
 						uni.showToast({
@@ -257,6 +276,7 @@
 			},
 			// 退款
 			refund(item) {
+				if (this.showTips) this.showTips = false;
 				// #ifdef MP
 				openOrderRefundSubscribe().then(() => {
 					uni.hideLoading();
@@ -281,12 +301,14 @@
 				if (this.evaluate == 0 || this.evaluate == 9 || this.orderData.is_virtual != 0) {
 					uni.navigateTo({
 						url: '/pages/users/refund/confirm?order_id=' + this.orderId + '&type=1' + '&ids=' + item
-							.order_product_id + '&refund_type=1&order_type=' + this.orderData.order_type + '&sale_type=' + this.sale_type
+							.order_product_id + '&refund_type=1&order_type=' + this.orderData.order_type +
+							'&sale_type=' + this.sale_type
 					})
 				} else {
 					uni.navigateTo({
 						url: '/pages/users/refund/select?order_id=' + this.orderId + '&type=1&order_type=' + this
-							.orderData.order_type + '&ids=' + item.order_product_id + '&sale_type=' + this.sale_type
+							.orderData.order_type + '&ids=' + item.order_product_id + '&sale_type=' + this
+							.sale_type
 					})
 				}
 				// #endif
@@ -459,4 +481,21 @@
 			background: #F0F0F0;
 		}
 	}
+
+	.tips {
+		width: 590rpx;
+		height: 354rpx;
+		background-color: white;
+		border-radius: 16rpx;
+		position: absolute;
+		top: 50%;
+		left: 50%;
+		transform: translate(-50%, -50%);
+		box-sizing: border-box;
+		padding: 50rpx 40rpx;
+		display: flex;
+		flex-direction: column;
+		justify-content: space-between;
+		align-items: center;
+	}
 </style>
\ No newline at end of file
diff --git a/manifest.json b/manifest.json
index 838486c..aec1b5c 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,352 +1,353 @@
 {
-    "name" : "惠农生活",
-    "appid" : "__UNI__3A527D1",
-    "description" : "",
-    "versionName" : "2.0.52",
-    "versionCode" : 2052,
-    "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/"
-                    }
-                },
-                "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.53",
+	"versionCode": 2053,
+	"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
+			}
+		}
+	}
 }
diff --git a/pages.json b/pages.json
index 8f2929b..95dee66 100644
--- a/pages.json
+++ b/pages.json
@@ -19,7 +19,33 @@
 				"enablePullDownRefresh": true,
 				// #endif
 				"app-plus": {
-					"scrollIndicator": false //禁用原生导航栏
+					"scrollIndicator": false, //禁用原生导航栏
+					"subNVues": [{
+							"id": "concatIndex", // 唯一标识  
+							"path": "pages/index/subnvue/concat", // 页面路径  
+							"type": "popup",
+							"style": {
+								"position": "absolute",
+								"dock": "right",
+								"width": "750rpx",
+								"height": "1000px",
+								"background": "rgba(0,0,0,0.2)"
+							}
+						},
+						{
+							"id": "newUser", // 唯一标识  
+							"path": "pages/index/subnvue/newUser", // 页面路径  
+							"type": "popup",
+							"style": {
+								"position": "absolute",
+								"dock": "right",
+								"width": "750rpx",
+								"height": "1000px",
+								"background": "rgba(0,0,0,0.2)"
+							}
+						}
+
+					]
 				}
 			}
 		}, {
@@ -35,8 +61,21 @@
 				"enablePullDownRefresh": true,
 				"navigationBarTitleText": "工作台",
 				"navigationStyle": "custom",
-				"backgroundColorTop": "#40AE36",
-				"backgroundTextStyle": "light"
+				"app-plus": {
+					"scrollIndicator": false, //禁用原生导航栏
+					"subNVues": [{
+						"id": "concat", // 唯一标识  
+						"path": "pages/gather/subnvue/concat", // 页面路径  
+						"type": "popup",
+						"style": {
+							"position": "absolute",
+							"dock": "right",
+							"width": "750rpx",
+							"height": "1500rpx",
+							"background": "rgba(0,0,0,0.2)"
+						}
+					}]
+				}
 			}
 		}, {
 			"path": "pages/order_addcart/order_addcart",
@@ -56,7 +95,22 @@
 			"style": {
 				"enablePullDownRefresh": true,
 				"navigationBarTitleText": "个人中心",
-				"navigationStyle": "custom"
+				"navigationStyle": "custom",
+				"app-plus": {
+					"scrollIndicator": false, //禁用原生导航栏
+					"subNVues": [{
+						"id": "userSubnvu", // 唯一标识  
+						"path": "pages/user/subnvue/index", // 页面路径  
+						"type": "popup",
+						"style": {
+							"position": "absolute",
+							"dock": "right",
+							"width": "750rpx",
+							"height": "1500rpx",
+							"background": "rgba(0,0,0,0.2)"
+						}
+					}]
+				}
 			}
 		},
 		{
@@ -816,7 +870,14 @@
 					"path": "settled/index",
 					"style": {
 						"navigationBarTitleText": "商家入驻",
-						"navigationStyle": "custom"
+						"navigationStyle": "custom",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "settled/index1",
+					"style": {
+						"navigationBarTitleText": "商家入驻"
 					}
 				},
 				{
diff --git a/pages/gather/gather.vue b/pages/gather/gather.vue
index 8dcaf02..2691c56 100644
--- a/pages/gather/gather.vue
+++ b/pages/gather/gather.vue
@@ -175,19 +175,18 @@
 				</view>
 			</view>
 		</view>
-
 		<view class="title-img">
 			<image src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/807b8202403111125379295.webp" mode=""></image>
 		</view>
-
 		<view class="business com special_work" v-if="jurisdiction == false">
 			<view class="content">
 				<block v-if="nowMenuList.length > 0">
 					<u-transition v-for="(item, index) in nowMenuList" :key="item.name" show>
 						<view class="examine" @click.stop="editFlag ? removeMenu(item) : clickMenu(item)"
 							@longpress="editFlag = true">
-							<image class="icon_img" :src="item.pic" mode="aspectFit">
+							<image class="icon_img gatherDiver" :src="item.pic" mode="aspectFit">
 							</image>
+							<!-- <u-icon v-if="editFlag" class="icon" name="minus-circle-fill" color="red"></u-icon> -->
 							<view v-if="editFlag" class="icon" style="background-color: red;">删除</view>
 							<text class="text">{{ item.name }}</text>
 						</view>
@@ -213,6 +212,7 @@
 				<u-transition v-for="(item, index) in AllMenuList" :key="item.name" show>
 					<view class="examine" @click.stop="pushMenu(item)">
 						<image class="icon_img" :src="item.pic" mode="aspectFit"> </image>
+						<!-- <u-icon class="icon" name="plus-circle-fill"></u-icon> -->
 						<view class="icon">添加</view>
 						<text class="text">{{ item.name }}</text>
 					</view>
@@ -248,6 +248,9 @@
 	} from "@/api/public";
 	// #ifdef APP-PLUS
 	import uniMP from '@/utils/uniMP.js';
+	import {
+		isNewMer
+	} from '@/api/user.js';
 	// #endif
 
 	export default {
@@ -256,6 +259,8 @@
 		},
 		data() {
 			return {
+				subNVue: null,
+				elInfo: '',
 				imgUrls: [{
 					img: 'https://lihai001.oss-cn-chengdu.aliyuncs.com/def/e2f0520240203154207556.png'
 				}],
@@ -291,13 +296,23 @@
 		computed: {
 			...mapGetters(['userInfo', 'location', 'isLogin'])
 		},
+		created() {},
+		onLoad() {
+			this.subNVue = uni.getSubNVueById('concat')
+			let that = this
+			uni.$on('diverGatherSubEmit', function(data) {
+				that.clickMenu(that.nowMenuList[0])
+			})
+
+		},
 		onShow() {
+			let that = this
 			this.street = this.$store.state.storage.address.townName;
 			this.getNav();
 			if (this.isLogin) {
 				this.emptyText = '暂无可用应用'
 				this.jurisdiction = false
-				this.initAllAppLet();
+				this.initAllAppLet(true);
 			} else {
 				this.emptyText = '请登录'
 				this.jurisdiction = true
@@ -313,13 +328,38 @@
 				menu = [];
 			}
 			this.nowMenuList = menu;
+
+			// #ifdef APP-PLUS
+			if (Boolean(this.userInfo.service?.mer_id)) {
+				isNewMer(this.userInfo.uid, this.userInfo.service?.mer_id).then(
+					res => {
+						if (res.data == 'true') {
+							setTimeout(() => {
+								const query = uni.createSelectorQuery().in(this);
+								query
+									.select(".gatherDiver")
+									.boundingClientRect((data) => {
+										let info = JSON.stringify(data)
+										that.elInfo = data
+										that.openDiver()
+									})
+									.exec();
+							}, 500)
+						}
+					})
+			}
+			// #endif
+
 		},
 		onPullDownRefresh() {
 			this.getUserInfo()
 			uni.stopPullDownRefresh()
 		},
 		beforeDestroy() {},
-		mounted() {},
+		onReady() {
+			// #ifdef APP-PLUS
+			// #endif
+		},
 		// #ifdef APP-PLUS
 		onPageScroll(e) {
 			const scrollTop = e.scrollTop;
@@ -346,15 +386,9 @@
 			}
 		},
 		methods: {
-			/**
-			 * 获取个人用户信息
-			 */
-			getUserInfo: function() {
-				let that = this;
-				getUserInfo().then(res => {
-					showTab(res.data);
-					this.userInfo = res.data;
-				});
+			openDiver() {
+				this.subNVue.show('zoom-out', 300)
+				uni.$emit('diverGatherEmit', this.elInfo);
 			},
 			changeSwiper(e) {
 				if (e.length > 0 && e[1].value) {
@@ -430,13 +464,13 @@
 					}
 				})
 			},
-			initAllAppLet() {
+			initAllAppLet(flag) {
 				applet().then(res => {
 					this.AllMenuList = res.data;
-					this.initMenu();
+					this.initMenu(flag);
 					this.showControllerAllLet();
 				}).catch(e => {
-					console.log(e);
+					// console.log(e);
 				})
 			},
 			// 根据类型来判断是否显示
@@ -450,7 +484,7 @@
 				}
 			},
 			// 初始化菜单
-			initMenu() {
+			initMenu(flag = false) {
 				let nowMenu = uni.getStorageSync('gatherMenuList');
 				try {
 					let list = JSON.parse(nowMenu || '[]');
@@ -460,8 +494,12 @@
 						if (list.find(t => t.name == item.name)?.name != item.name) all.push(item);
 						else now.push(item)
 					})
+					if (flag && !now.length) {
+						this.$set(now, 0, all[0])
+					}
 					this.AllMenuList = all;
 					this.nowMenuList = now;
+
 				} catch (e) {
 					this.nowMenuList = [];
 				}
@@ -490,7 +528,6 @@
 			},
 			getUniMp(data) {
 				let that = this;
-
 				// #ifdef APP-PLUS
 				if (data.version) return uniMP.loadAppletMP(data);
 				else switch (data.type) {
@@ -510,14 +547,6 @@
 				return;
 				// #endif
 				// #ifdef H5
-				// if (type == 2) {
-				// 	this.navigator(`/pages/moreProject/moreProject`);
-				// } else {
-				// 	uni.showToast({
-				// 		icon: 'none',
-				// 		title: 'H5不支持打开小程序'
-				// 	})
-				// }
 				uni.showToast({
 					icon: 'none',
 					title: 'H5不支持打开小程序'
@@ -526,7 +555,6 @@
 
 			},
 			navigator(url, t) {
-				// if (this.userInfoData.is_wsxx === 0 && t != '商户设置') return Toast("请完善商户信息");
 				uni.navigateTo({
 					url: url
 				})
@@ -534,6 +562,8 @@
 			getUserInfo: function() {
 				let that = this;
 				getUserInfo().then(res => {
+					showTab(res.data);
+					that.userInfo = res.data;
 					that.userInfoData = res.data;
 					that.$store.commit('SET_USERINFO', res.data);
 					// console.log(res.data.service);
diff --git a/pages/gather/subnvue/concat.nvue b/pages/gather/subnvue/concat.nvue
new file mode 100644
index 0000000..6176600
--- /dev/null
+++ b/pages/gather/subnvue/concat.nvue
@@ -0,0 +1,193 @@
+<template>
+	<view class="" style="width: 750rpx;height: 100%;">
+		<view class="jump" @click="jump">
+			<text class="font">跳过</text>
+		</view>
+		<view class="tabbar" :style="{top:(top-12)+'px',left:(left-12)+'px'}">
+			<image src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/0fa43202312291702314919.png" class="tab-icon">
+			</image>
+		</view>
+		<view class="" class="pointe" :style="{ left:(left-10)+'px',top:(top)+'px'}">
+			<image src="/static/images/pointer.png" style="width: 254rpx;height: 254rpx;" mode=""></image>
+		</view>
+		<view class="center" :style="{left:(left+20)+'px',  top:(top+55)+'px'}">
+			<image src="/static/images/greenLineDown.png" style="width:35px;height: 60px;" mode=""></image>
+		</view>
+		<view class="tips-box" :style="{ left:left+'px',top:(top+80)+'px'}">
+			<view class="tips" style="position: absolute;padding-left: 20px;">
+				<view class="tras" :class="{act:isActive}">
+					<text style="font-size: 28rpx;line-height: 100rpx;color: white;">点击我的页面，进行商户入驻</text>
+				</view>
+			</view>
+			<image src="/static/images/starpng.png" class="start" mode="">
+			</image>
+		</view>
+
+
+		<view class="next-btn center">
+			<text class="next-btn-text font" @click="next">下一步(2/4)</text>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		isNewMer
+	} from '@/api/user.js';
+	export default {
+		data() {
+			return {
+				isActive: false,
+				left: 0,
+				top: 0,
+				subNVue: null,
+				offsetX: 0,
+				offsetY: 0,
+				iconWidth: 0,
+			}
+		},
+		methods: {
+			next() {
+				this.subNVue.hide('zoom-in', 300, )
+				setTimeout(() => {
+					uni.$emit('diverGatherSubEmit');
+				}, 500)
+
+			},
+			jump() {
+				isNewMer(this.$store.state.app.userInfo.uid, this.$store.state.app.userInfo.service?.mer_id, {
+					done: 1
+				}).then(res => {
+					console.log(res, 'res')
+				})
+			}
+		},
+		onLoad() {
+			let that = this
+			this.subNVue = uni.getSubNVueById('concat')
+			uni.$on('diverGatherEmit', (data) => {
+				that.left = data.left
+				that.top = data.top
+			})
+			setTimeout(() => {
+				that.isActive = true
+			}, 500)
+		}
+	}
+</script>
+
+<style>
+	.jump {
+		position: absolute;
+		right: 30rpx;
+		top: 80rpx;
+		border: 1px solid white;
+		padding: 10rpx 20rpx;
+		border-radius: 30rpx;
+	}
+
+	/* .tips {
+		width: 462rpx;
+		height: 106rpx;
+		background-color: #5BE157;
+		border-radius: 20rpx;
+	} */
+	.tips-box {
+		width: 462rpx;
+		height: 178rpx;
+		position: absolute;
+		padding-top: 72rpx;
+		position: absolute;
+	}
+
+	.start {
+		width: 72rpx;
+		height: 72rpx;
+		position: absolute;
+		right: 0;
+		top: 20px;
+	}
+
+	.tips {
+		width: 462rpx;
+		height: 106rpx;
+		background-color: #5BE157;
+		border-radius: 20rpx;
+
+	}
+
+	.center {
+		position: absolute;
+		left: 375rpx;
+		transform: translateX(-50%);
+	}
+
+	.tabbar {
+		width: 136rpx;
+		height: 136rpx;
+		background-color: white;
+		border-radius: 136rpx;
+		position: absolute;
+	}
+
+	.tab-icon {
+		width: 50rpx;
+		height: 50rpx;
+		position: absolute;
+		left: 68rpx;
+		transform: translate(-50%, -50%);
+		top: 68rpx;
+	}
+
+	.te {
+		font-size: 20rpx;
+		position: absolute;
+		left: 68rpx;
+		transform: translate(-50%, 0);
+		top: 100rpx;
+	}
+
+	.pointe {
+		position: absolute;
+	}
+
+
+	.tras {
+		padding-left: 20rpx;
+		position: absolute;
+		z-index: 999 !important;
+		width: 20px;
+		transition-property: width;
+		transition-duration: 3s;
+		transition-delay: 0.1s;
+		transition-timing-function: cubic-bezier(0.25, 0.1, 0.25, 1.0);
+	}
+
+	.act {
+		width: 462rpx;
+	}
+
+	.font {
+		font-size: 28rpx;
+		color: white;
+		lines: 1;
+	}
+
+	.next-btn {
+		position: absolute;
+		bottom: 100px;
+		left: 375rpx;
+		transform: translateX(-50%);
+		width: 240rpx;
+		height: 76rpx;
+		border: 1px solid white;
+		border-radius: 38rpx;
+		background-color: rgba(255, 255, 255, 0.4);
+	}
+
+	.next-btn-text {
+		line-height: 76rpx;
+		text-align: center;
+
+	}
+</style>
\ No newline at end of file
diff --git a/pages/helpPeople/helpPeople.vue b/pages/helpPeople/helpPeople.vue
index 836f6a4..2422d16 100644
--- a/pages/helpPeople/helpPeople.vue
+++ b/pages/helpPeople/helpPeople.vue
@@ -18,6 +18,13 @@
 				我是农民用户
 			</view>
 		</view>
+		<view class="li" style="margin-top: 50rpx;" @click="navSw('/pages/index/index',true)">
+			<u-image src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/48aed202402260946123969.webp" width="690rpx"
+				height="200rpx" style="position: absolute;"></u-image>
+			<view class="btn">
+				我是商户
+			</view>
+		</view>
 	</view>
 </template>
 
@@ -37,7 +44,9 @@
 					url
 				})
 			},
-			navSw(url) {
+			navSw(url, isNewStore) {
+				uni.setStorageSync('newStore', Boolean(isNewStore))
+				// return
 				uni.switchTab({
 					url: url
 				})
diff --git a/pages/index/index.vue b/pages/index/index.vue
index b49b590..e423478 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -11,7 +11,8 @@
 					<!-- #ifdef H5 -->
 					<homeComb v-if="smallPage" class="home-comb" :isScale="isScale" :isMenu="isMenu"
 						:dataConfig="homeCombData" :userInfo="userInfo" :isFixed="isFixed" :isScrolled="isScrolled"
-						@changeDiy="changeDiy"></homeComb>
+						@changeDiy="changeDiy">
+					</homeComb>
 					<view v-for="(item, index) in styleConfig" :key="index">
 						<block
 							v-if="item.name != 'headerSerch' && item.name != 'tabNav' && item.name != 'shopList' && item.name != 'homeComb' && item.name != 'hotRanking' && item.name != 'pageFoot'">
@@ -280,7 +281,7 @@
 		<passwordPopup></passwordPopup>
 		<!-- #endif -->
 		<!--自定义底部tab栏-->
-		<customTab :newData="newData" :activeRouter="activeRouter"></customTab>
+		<!-- <customTab :newData="newData" :activeRouter="activeRouter"></customTab> -->
 		<view v-if="overflow" class="overflow-mask" @touchmove.stop.prevent="() => {}"></view>
 	</view>
 </template>
@@ -297,7 +298,8 @@
 	var statusBarHeight = uni.getSystemInfoSync().statusBarHeight + 'px';
 	let app = getApp();
 	import {
-		getUserInfo
+		getUserInfo,
+		isNewMer
 	} from '@/api/user.js';
 	import {
 		getDiy,
@@ -450,6 +452,8 @@
 		},
 		data() {
 			return {
+				subNvue: null,
+				diverFlag: true,
 				domain: HTTP_REQUEST_URL,
 				couponTypeMsg: {
 					10: '通用券',
@@ -543,7 +547,8 @@
 				preview: false,
 				isSupport: true,
 				isIndexClick: true,
-				scrollTop: 0
+				scrollTop: 0,
+				// newStore:
 			};
 		},
 
@@ -615,7 +620,14 @@
 			};
 		},
 		// #endif
+		created(options) {
+			let routes = getCurrentPages(); // 获取当前打开过的页面路由数组
+			let curRoute = routes[routes.length - 1].route //获取当前页面路由
+			this.activeRouter = '/' + curRoute
+		},
 		onLoad(options) {
+
+
 			let that = this
 			this._options = options;
 			this.diyId = options.diyId || 0;
@@ -633,14 +645,10 @@
 			that.pageLoad(options);
 			this.$store.dispatch('INIT_CONFIG');
 		},
-		created(options) {
-			let routes = getCurrentPages(); // 获取当前打开过的页面路由数组
-			let curRoute = routes[routes.length - 1].route //获取当前页面路由
-			this.activeRouter = '/' + curRoute
-		},
-		onShow() {
-			let that = this;
 
+		onShow() {
+			if (uni.getStorageSync('newStore')) this.openDiver();
+			let that = this;
 			that.isIntegral = uni.getStorageSync('isIntegral')
 			// #ifdef APP-PLUS
 			if (that.appUpdate.openUpgrade == '1') {
@@ -688,7 +696,48 @@
 			}, 50)
 			// #endif
 		},
+
 		methods: {
+			/*新商户引导页相关*/
+			openDiver() {
+				// #ifdef APP
+				this.subNvue = uni.getSubNVueById('newUser')
+				this.subNvue.show('slide-in-left', 300)
+				uni.$on('offSubnvue', () => {
+					this.subNvue.hide('slide-out-left')
+					if (uni.getStorageSync("newStore")) {
+						uni.switchTab({
+							url: '/pages/user/index'
+						})
+					}
+				});
+				// uni.$on('diverIndexSubEmit', () => {
+				// 	this.subNvue.hide('slide-out-left')
+				// 	uni.switchTab({
+				// 		url: '/pages/gather/gather'
+				// 	})
+				// })
+				// #endif
+
+			},
+			/* 新商户发布商品引导页 */
+			openListGoodsDiver() {
+				if (Boolean(this.userInfo.service?.mer_id)) {
+					uni.$on('diverIndexSubEmit', () => {
+						this.subNvue.hide('slide-out-left')
+						uni.switchTab({
+							url: '/pages/gather/gather'
+						})
+					})
+					isNewMer(this.userInfo.uid, this.userInfo.service?.mer_id).then(
+						res => {
+							if (res.data == 'true') {
+								this.subNvue = uni.getSubNVueById('concatIndex')
+								this.subNvue.show('slide-in-left', 300)
+							}
+						})
+				}
+			},
 			loadCoupon() {
 				if (!this.showCoupon && !uni.getStorageSync('show_coupon') && uni.getStorageSync('is_new_user')) {
 					getNewPeopleCouponLst().then(res => {
@@ -1026,6 +1075,9 @@
 					showTab(res.data);
 					that.userInfo = res.data;
 					this.$store.commit('SET_USERINFO', res.data);
+					// #ifdef APP
+					this.openListGoodsDiver()
+					// #endif
 				});
 			},
 			// 记录会员访问
@@ -1286,6 +1338,9 @@
 				}
 			}
 		},
+		onReady() {
+
+		}
 	};
 </script>
 <style>
diff --git a/pages/index/subnvue/concat.nvue b/pages/index/subnvue/concat.nvue
new file mode 100644
index 0000000..b1c0b62
--- /dev/null
+++ b/pages/index/subnvue/concat.nvue
@@ -0,0 +1,213 @@
+<template>
+	<view class="" style="width: 750rpx;height: 100%;">
+		<view class="jump" @click="jump">
+			<text class="font">跳过</text>
+		</view>
+		<view class="next-btn" :style="{top:(offsetY-250)+'px'}">
+			<text class="next-btn-text font" @click="next">下一步(1/4)</text>
+		</view>
+		<view class="tips-box" :style="{right:20, top:(offsetY-218)+'px'}">
+			<view class="tips" style="position: absolute;padding-left: 20px;">
+				<view class="tras" :class="{act:isActive}">
+					<text style="font-size: 28rpx;line-height: 100rpx;color: white;">点击我的页面，进行商户入驻</text>
+				</view>
+			</view>
+			<image src="/static/images/starpng.png" class="start" mode="">
+			</image>
+		</view>
+		<view style="position: absolute;" class="center" :style="{top:(offsetY-120)+'px'}">
+			<image src="/static/images/greenLine.png" style="width:35px;height: 60px;" mode=""></image>
+		</view>
+		<view class="tabbar2 center" :style="{top:(offsetY-68)+'px'}">
+			<image src="/static/images/ydwd.png" class="tab-icon"></image>
+			<text class="te">工作台</text>
+		</view>
+		<view class="pointe2" :style="{top:(offsetY-58)+'px'}">
+			<image src="/static/images/pointer.png" style="width: 254rpx;height: 254rpx;" mode=""></image>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		isNewMer
+	} from '@/api/user.js';
+	export default {
+		data() {
+			return {
+				isActive: false,
+				subNVue: null,
+				screenWidth: 400,
+				offsetX: 0,
+				offsetY: 0,
+				isStore: false,
+			}
+		},
+		methods: {
+			next() {
+				uni.$emit('diverIndexSubEmit');
+
+			},
+			jump() {
+				isNewMer(this.$store.state.app.userInfo.uid, this.$store.state.app.userInfo.service?.mer_id, {
+					done: 1
+				}).then(res => {
+					console.log(res, 'res')
+				})
+				uni.$emit('diverIndexSubEmit');
+			}
+		},
+		onLoad() {
+			uni.$on('diverIndexEmit', (data) => {
+				this.isStore = Boolean(data.mer_info?.mer_name)
+			})
+			let that = this
+			this.subNVue = uni.getSubNVueById('concatIndex')
+			const res = uni.getSystemInfo({
+				success: (res => {
+					this.offsetY = res.screenHeight
+					this.screenWidth = res.screenWidth
+				})
+			});
+			setTimeout(() => {
+				that.isActive = true
+			}, 1000)
+
+		}
+	}
+</script>
+
+<style>
+	.jump {
+		position: absolute;
+		right: 30rpx;
+		top: 80rpx;
+	}
+
+	.tips-box {
+		width: 462rpx;
+		height: 178rpx;
+		position: absolute;
+		padding-top: 72rpx;
+		position: absolute;
+	}
+
+	.start {
+		width: 72rpx;
+		height: 72rpx;
+		position: absolute;
+		right: 0;
+		top: 20px;
+	}
+
+	.tips {
+		width: 462rpx;
+		height: 106rpx;
+		background-color: #5BE157;
+		border-radius: 20rpx;
+
+	}
+
+	.center {
+		position: absolute;
+		left: 375rpx;
+		transform: translateX(-50%);
+	}
+
+	.tabbar {
+		width: 136rpx;
+		height: 136rpx;
+		background-color: white;
+		border-radius: 136rpx;
+		position: absolute;
+		left: 375rpx;
+		transform: translateX(-50%);
+		/* bottom: 0; */
+	}
+
+	.tabbar2 {
+		width: 136rpx;
+		height: 136rpx;
+		background-color: white;
+		border-radius: 136rpx;
+		position: absolute;
+	}
+
+	.tab-icon {
+		width: 50rpx;
+		height: 50rpx;
+		position: absolute;
+		left: 68rpx;
+		transform: translate(-50%, -50%);
+		top: 68rpx;
+	}
+
+	.te {
+		font-size: 20rpx;
+		position: absolute;
+		left: 68rpx;
+		transform: translate(-50%, 0);
+		top: 100rpx;
+	}
+
+	.pointe {
+		position: absolute;
+		left: 420rpx;
+		transform: translateX(-50%);
+	}
+
+	.pointe2 {
+		position: absolute;
+		left: 420rpx;
+		transform: translateX(-50%);
+		/* left: 150rpx; */
+	}
+
+	.tras {
+		padding-left: 20rpx;
+		position: absolute;
+		z-index: 999 !important;
+		width: 0px;
+		transition-property: width;
+		transition-duration: 3s;
+		transition-delay: 0.1s;
+		transition-timing-function: cubic-bezier(0.25, 0.1, 0.25, 1.0);
+	}
+
+	.act {
+		width: 462rpx;
+	}
+
+	.font {
+		font-size: 28rpx;
+		color: white;
+		lines: 1;
+	}
+
+	.next-btn {
+		position: absolute;
+		/* bottom: 100rpx; */
+		left: 375rpx;
+		transform: translateX(-50%);
+		width: 240rpx;
+		height: 76rpx;
+		border: 1px solid white;
+		border-radius: 38rpx;
+		background-color: rgba(255, 255, 255, 0.4);
+	}
+
+	.next-btn-text {
+		line-height: 76rpx;
+		text-align: center;
+		/* background-color: #939393; */
+	}
+
+	.jump {
+		position: absolute;
+		right: 30rpx;
+		top: 80rpx;
+		border: 1px solid white;
+		padding: 10rpx 20rpx;
+		border-radius: 30rpx;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/index/subnvue/newUser.nvue b/pages/index/subnvue/newUser.nvue
new file mode 100644
index 0000000..2ac0b25
--- /dev/null
+++ b/pages/index/subnvue/newUser.nvue
@@ -0,0 +1,166 @@
+<template>
+	<view class="">
+		<view class="jump" @click="jump">
+			<text class="font">跳过</text>
+		</view>
+		<view class="next-btn center" :style="{ left:screenWidth/2,top:(screenHeight-96)}">
+			<text class="next-btn-text font" style="line-height: 76rpx;" @click="next">下一步(1/2)</text>
+		</view>
+		<view class="target" :style="{left:screenWidth/4*3,top:screenHeight-68}">
+			<image src="/static/images/ydwd.png" class="target-icon"></image>
+			<text class="target-text">我的</text>
+		</view>
+		<view :style="{left:screenWidth/4*3,top:screenHeight-130}">
+			<image src="/static/images/pointer.png" style="width: 254rpx;height: 254rpx;"></image>
+		</view>
+		<view class="tips-box" :style="{right:20,top:screenHeight-220}">
+			<view class="tips" style="position: absolute;padding-left: 20px;">
+				<view class="tras" :class="{act:isAct}">
+					<text style="font-size: 28rpx;line-height: 100rpx;color: white;">点击我的页面，进行商户入驻</text>
+				</view>
+			</view>
+			<image src="/static/images/starpng.png" class="start" mode="">
+			</image>
+		</view>
+		<image src="/static/images/greenLine.png" class="greenLine"
+			:style="{left:screenWidth/4*3+15,top:screenHeight-120}" mode=""></image>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				screenHeight: 800,
+				screenWidth: 375,
+				isAct: false
+			}
+		},
+		methods: {
+			jump() {
+				uni.setStorageSync("newStore", false)
+				uni.$emit('offSubnvue');
+			},
+			next() {
+				uni.$emit('offSubnvue');
+			}
+		},
+		onLoad() {
+			let that = this
+			const res = uni.getSystemInfo({
+				success: (res => {
+					this.screenHeight = res.screenHeight
+					this.screenWidth = res.screenWidth
+				})
+			});
+			setTimeout(() => {
+				that.isAct = true
+			})
+
+
+		}
+
+
+	}
+</script>
+
+<style>
+	.jump {
+		position: absolute;
+		right: 30rpx;
+		top: 80rpx;
+		border: 1px solid white;
+		padding: 10rpx 20rpx;
+		border-radius: 30rpx;
+	}
+
+	.font {
+		font-size: 28rpx;
+		color: white;
+		lines: 1;
+		text-align: center;
+	}
+
+	.center {
+		transform: translateX(-50%);
+	}
+
+	.next-btn {
+		position: absolute;
+		width: 240rpx;
+		height: 76rpx;
+		border: 1px solid white;
+		border-radius: 38rpx;
+		background: rgba(255, 255, 255, 0.4);
+	}
+
+	.target {
+		width: 136rpx;
+		height: 136rpx;
+		background-color: white;
+		border-radius: 136rpx;
+	}
+
+	.target-icon {
+		width: 50rpx;
+		height: 50rpx;
+		position: absolute;
+		left: 68rpx;
+		transform: translate(-50%, -50%);
+		top: 68rpx;
+	}
+
+	.target-text {
+		font-size: 20rpx;
+		position: absolute;
+		left: 68rpx;
+		transform: translate(-50%, 0);
+		top: 100rpx;
+	}
+
+	.pointer {
+		position: absolute;
+	}
+
+	.tips-box {
+		width: 462rpx;
+		height: 178rpx;
+		position: absolute;
+		padding-top: 72rpx;
+		position: absolute;
+	}
+
+	.start {
+		width: 72rpx;
+		height: 72rpx;
+		position: absolute;
+		right: 0;
+		top: 20px;
+	}
+
+	.tips {
+		width: 462rpx;
+		height: 106rpx;
+		background-color: #5BE157;
+		border-radius: 20rpx;
+
+	}
+
+	.tras {
+		width: 0px;
+		transition-property: width;
+		transition-duration: 3s;
+		transition-delay: 0.1s;
+		transition-timing-function: cubic-bezier(0.25, 0.1, 0.25, 1.0);
+	}
+
+	.act {
+		width: 462rpx;
+	}
+
+	.greenLine {
+		width: 35px;
+		height: 60px;
+		position: absolute;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/store/applicationRecord/index.vue b/pages/store/applicationRecord/index.vue
index f3f47ea..028f5f5 100644
--- a/pages/store/applicationRecord/index.vue
+++ b/pages/store/applicationRecord/index.vue
@@ -1,7 +1,50 @@
 <template>
-	<view>
+	<view style="padding: 42rpx 50rpx;">
+
+		<view class="card" v-for="item in listData" :key="item.mer_intention_id">
+			<view class="" style="display: flex;align-items: center;">
+				<view class="ciecle"
+					style="width: 24rpx;height: 24rpx;border-radius: 24rpx;border: 1px solid #DDDDDD;margin-right: 30rpx;">
+				</view>
+				<view class="" style="color: #777777;font-size: 24rpx;">
+					{{item.create_time}}
+				</view>
+			</view>
+			<view class=""
+				style="padding:40rpx;margin: 30rpx 0; width: 606rpx;margin-left: 30rpx;border-radius: 16rpx;box-shadow: 0rpx 6rpx 12rpx 2rpx rgba(0,0,0,0.16);">
+				<view class="" v-if="item.status==0" style="color: #20B128;font-size: 32rpx;">
+					待审核
+				</view>
+
+				<view class="" v-if="item.status==1" style="color: #20B128;font-size: 32rpx;">
+					审核通过
+				</view>
+				<view class="" v-if="item.status==2"
+					style="color: #FC452F;font-size: 32rpx;display: flex;justify-content: space-between;">
+					审核失败
+					<view style="color: #20B128;" @click="navgo">
+						重新申请
+					</view>
+				</view>
+				<u-line style="margin: 28rpx 0;"></u-line>
+				<view class="" style="margin-bottom: 20rpx;">
+					{{item.mer_name}}
+				</view>
+				<view class="" v-if="item.status==1" style="font-size: 24rpx; color: #777777;">
+					可以登录我们的工作台，把您的商品推向市场了
+				</view>
+				<view class="" v-if='item.status==2' style="font-size: 24rpx; color: #777777;">
+					备注:{{item.fail_msg}}
+				</view>
+			</view>
+		</view>
+
+
+		<u-button v-if="showBtn" @click="openApplet" color="#3ABD40" shape="circle" text="立即发布产品"></u-button>
+
+
 		<view class="application-record" v-if="listData.length">
-			<view class="card-list" v-for="item in listData" :key="item.mer_intention_id">
+			<!-- <view class="card-list" v-for="item in listData" :key="item.mer_intention_id">
 				<view class="card-top">
 					<view class="title">{{item.mer_name}}</view>
 					<view class="time">提交时间：{{item.create_time}}</view>
@@ -17,7 +60,7 @@
 					</view>
 					<view class="status-btn" @click="jump(item)">{{statusBtn(item.status)}}</view>
 				</view>
-			</view>
+			</view> -->
 		</view>
 		<view class='no-shop' v-if="!listData.length && !loading">
 			<view class='pictrue' style="margin: 0 auto;">
@@ -39,15 +82,22 @@
 	// | Author: CRMEB Team <admin@crmeb.com>
 	// +----------------------------------------------------------------------
 	import {
-		getApplicationRecordList
+		getApplicationRecordList,
+		getUnimpInfo
 	} from '@/api/store.js'
-	import {HTTP_REQUEST_URL} from '@/config/app';
+	import {
+		HTTP_REQUEST_URL
+	} from '@/config/app';
+
+	import uniMP from '@/utils/uniMP.js';
 	export default {
 		data() {
 			return {
-				domain:HTTP_REQUEST_URL,
+				domain: HTTP_REQUEST_URL,
 				loading: false,
+				showBtn: false,
 				listData: [],
+				uniMpInfo: {},
 				pageData: {
 					page: 1,
 					limit: 10,
@@ -71,6 +121,10 @@
 			}
 		},
 		methods: {
+			openApplet() {
+				this.uniMpInfo.showToast = true
+				uniMP.loadAppletMP(this.uniMpInfo)
+			},
 			getListData() {
 				this.loading = true
 				uni.showLoading({
@@ -79,10 +133,22 @@
 				getApplicationRecordList(this.pageData).then(res => {
 					this.count = res.data.count
 					this.listData = this.listData.concat(res.data.list)
+					this.showBtn = (this.listData[this.listData.length - 1].status == 1)
+					if (this.showBtn) {
+						getUnimpInfo().then(res => {
+							this.uniMpInfo = res.data
+						})
+					}
 					uni.hideLoading();
 					this.loading = false
 				})
 			},
+			navgo() {
+				// uni.navigateBack()
+				uni.navigateTo({
+					url: '/pages/store/settled/index?type=1'
+				})
+			},
 			// 跳转逻辑
 			jump(item) {
 				console.log(item)
@@ -127,76 +193,24 @@
 		align-items: center;
 		background-color: #F5F5F5;
 		padding: 20rpx 30rpx;
-		.card-list {
-			width: 100%;
-			background-color: #fff;
-			padding: 20rpx 24rpx;
-			margin: 10rpx 20rpx;
-			border-radius: 12rpx;
-			.card-top {
-				height: 140rpx;
-				.title {
-					font-size: 28rpx;
-					font-weight: bold;
-					color: #333333;
-				}
-				.time {
-					color: #999999;
-					font-size: 24rpx;
-					padding: 5rpx 0;
-				}
-				.reason {
-					color: #E93323;
-					font-weight: bold;
-					font-size: 24rpx;
-				}
-			}
-			.line {
-				height: 2rpx;
-				margin: 20rpx 0 20rpx 0;
-				background-color: #EEEEEE;
-			}
-			.card-bottom {
-				display: flex;
-				justify-content: space-between;
-				align-items: center;
-				color: #333;
-				.card-status {
-					display: flex;
-					align-items: center;
-					.status-icon {
-						width: 30rpx;
-						height: 30rpx;
-						margin: 10rpx;
-					}
-					.status-text {
-						font-size: 28rpx;
-						font-weight: 500;
-					}
-				}
-				.status-btn {
-					font-size: 26rpx;
-					color: #555;
-					border: 1px solid #999999;
-					padding: 8rpx 32rpx;
-					border-radius: 40rpx;
-				}
-			}
-		}
+
 	}
+
 	.no-shop {
 		width: 100%;
 		background-color: #fff;
 		height: 100vh;
+
 		.pictrue {
 			display: flex;
 			flex-direction: column;
 			align-items: center;
 			color: $uni-nothing-text;
+
 			image {
 				width: 414rpx;
 				height: 380rpx;
 			}
 		}
 	}
-</style>
+</style>
\ No newline at end of file
diff --git a/pages/store/settled/index.vue b/pages/store/settled/index.vue
index 24772e2..8a7befd 100644
--- a/pages/store/settled/index.vue
+++ b/pages/store/settled/index.vue
@@ -1,503 +1,402 @@
 <template>
-	<view class="page" :style="{'height':successful?'100vh':''}">
-		<!-- #ifdef MP || APP-PLUS -->
-		<view class="conten-top" :style="'height:'+statusBarHeight+'px'" :class="{'bar-top-bg':barBg}"
-			v-if="!successful">
-			<view class="" style="position: absolute;left: 30rpx;bottom: 15rpx;" @click="logout"><i
-					class="iconfont icon-xiangzuo" style="font-size: 40rpx;text-align: left;color:#fff;"></i></view>
-			<view class=""
-				style="position: absolute;bottom: 15rpx;width: 500rpx; left:50%;transform: translate(-50%);text-align: center;color:#fff;font-size: 32rpx;font-weight: bold;">
-				商家入驻
-			</view>
-		</view>
-		<!-- #endif -->
+	<view class="">
 
-		<!-- #ifdef H5 -->
-		<view class="header" v-if="!successful">
-			<view class="title-bar" :class="{'bar-top-bg':barBg}">
-				<view class="title-bar-icon" @click="logout">
-					<i class="iconfont icon-xiangzuo"></i>
+		<view class="settlementAgreement" v-if="isshow">
+			<view class="setAgCount" style="width: 100%;height: 100%;padding-top: 180rpx;">
+				<view class="" style="width: 60rpx;height: 60rpx; position: absolute;left: 30rpx; top:90rpx"
+					@click="isshow=false,num=10">
+					<i class="iconfont icon-xiangzuo" style="width: 60rpx;height: 60rpx;font-size: 40rpx;"></i>
 				</view>
-				<view class="title-bar-txt">
-					商家入驻
+
+				<div class="title">{{detail.title}}</div>
+				<view class="contenta" v-if="detail.mer_services_agree">
+					<jyf-parser :html="detail.mer_services_agree" ref="article" :tag-style="tagStyle"></jyf-parser>
+
+				</view>
+				<view class="contenta" v-else>
+					<jyf-parser :html="detail.mer_supply_agree" ref="article" :tag-style="tagStyle"></jyf-parser>
+				</view>
+
+				<view class="setAgCountbtn">
+					<view class="border"></view>
+					<button :class="num>0?'setAgCountbtnb':'setAgCountbtnc'" class="btn" :disabled="num!=0"
+						@click="agree">
+						<text v-if="num>0">请仔细阅读协议 {{num}}秒后可提交</text>
+						<text v-else>同意本协议</text>
+					</button>
 				</view>
 			</view>
 		</view>
-		<!-- #endif -->
-
-		<view v-if="!successful" :style="viewColor">
-			<form report-submit='true'>
-				<view class='merchantsSettled'>
-					<view class="merchantBgCount">
-						<image mode="widthFix" class="merchantBg"
-							src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/7d0f8202403160938542943.webp" alt="">
+		<view class="" v-else>
+			<view class="bar" style="padding-top:var(--status-bar-height) ;">
+				<view class="" style="height: 30rpx;">
+				</view>
+				<view class="" style="display: flex;justify-content: space-between;padding: 0 20rpx;">
+					<i class="iconfont icon-xiangzuo" style="color: black;" @click="back"></i>
+					<view class="" style="transform: translateX(50rpx);">
+						商户入住
 					</view>
-					<view class="application-record" @click="jumpToList" v-if="!mer_i_id">
+					<view class="" @click="jumpToList">
 						申请记录
-						<text class="iconfont icon-xiangyou"></text>
-					</view>
-					<view class='list'>
-						<view class="list-title">商家入驻</view>
-						<view class="item">
-							<view class="acea-row row-middle">
-								<text class="item-name">商户名称</text>
-								<input type="text" maxlength="30" placeholder="请输入商户名称"
-									v-model="merchantData.enterprise_name" @input="validateBtn"
-									placeholder-class='placeholder' />
-							</view>
-						</view>
-
-						<view class="item">
-							<view class="uni-list">
-								<view class="uni-list-cell">
-									<view class="uni-list-cell-db acea-row row-middle">
-										<text class="item-name">商户分类</text>
-										<picker @change="bindPickerChange" @columnchange="columnchange" mode="selector"
-											:value="index" :range="array" range-key="category_name">
-											<input placeholder="请选择商户分类" type="text" readonly disabled
-												v-model="mer_classification">
-											<view class='iconfont icon-jiantou'></view>
-										</picker>
-									</view>
-								</view>
-							</view>
-						</view>
-						<view class="item">
-							<view class="uni-list">
-								<view class="uni-list-cell">
-									<view class="uni-list-cell-db acea-row row-middle">
-										<text class="item-name">店铺类型</text>
-										<text class="iconfont wenhao" @click="getAgreement">?</text>
-										<picker @change="bindPickerChange1" :value="index1" :range="storeTypeArr"
-											range-key="type_name">
-											<input placeholder="请选择店铺类型" type="text" disabled readonly
-												v-model="mer_storeType">
-											<view v-if="mer_storeType" @tap.stop="mer_storeType=''"
-												class="iconfont icon-guanbi2"></view>
-											<view class='iconfont icon-jiantou'></view>
-										</picker>
-									</view>
-								</view>
-							</view>
-						</view>
-						<view class="item">
-							<view class="uni-list">
-								<view class="uni-list-cell">
-									<view class="uni-list-cell-db acea-row row-middle">
-										<text class="item-name businessBox">店铺所在地</text>
-										<picker mode=multiSelector @change="bindPickerChange2" :value="index2"
-											:range="business" range-key="name" @columnchange="pickerColumnchange">
-											<view class="businessBox"
-												:style="{'color':(business_name == '' || business_name.length == 5)?'#B2B2B2':''}"
-												style="width: 400rpx;word-break: keep-all;line-height: 40rpx;font-size: 30rpx;">
-												{{(business_name == '' || business_name.length == 5)?'请选择商圈':business_name}}
-											</view>
-											<view class='iconfont icon-jiantou'></view>
-										</picker>
-									</view>
-								</view>
-							</view>
-						</view>
-
-						<view class="item">
-							<view class="uni-list">
-								<view class="uni-list-cell">
-									<view class="uni-list-cell-db acea-row row-middle">
-										<text class="item-name">公司性质</text>
-										<picker @change="natureBusinessChange" mode="selector" :value="index"
-											:range="companyTypeList">
-											<input placeholder="请选择公司性质" type="text" readonly disabled
-												:value="nature_business==''?'':nature_business==1?'对公户':'个体户'">
-											<view class='iconfont icon-jiantou'></view>
-										</picker>
-									</view>
-								</view>
-							</view>
-						</view>
-						<view class="item no-border">
-							<view class='acea-row row-middle'>
-								<text class="item-title" style="margin-right: 20rpx;">请上传营业执照</text>
-								<text class="item-desc">(图片格式支持JPG、PNG、JPEG)</text>
-								<view class="upload">
-									<view v-if="business_license" class='pictrue' @click='uploadpicText'>
-										<image :src='business_license'></image>
-									</view>
-									<view v-else class='pictrue acea-row row-center-wrapper row-column'
-										@click='uploadpicText'>
-										<text class='iconfont icon-icon25201'></text>
-										<view>上传图片</view>
-									</view>
-								</view>
-							</view>
-						</view>
-						<view class="item">
-							<view class="uni-list">
-								<view class="uni-list-cell">
-									<view class="uni-list-cell-db acea-row row-middle">
-										<text class="item-name businessBox">详细地址</text>
-										<input type="text" maxlength="30" placeholder="自动识别"
-											v-model="merchantData.address" @input="validateBtn"
-											placeholder-class='placeholder' />
-									</view>
-								</view>
-							</view>
-						</view>
-						<view class="item">
-							<view class="uni-list">
-								<view class="uni-list-cell">
-									<view class="uni-list-cell-db acea-row row-middle">
-										<text class="item-name businessBox">公司名称</text>
-										<input type="text" maxlength="30" placeholder="自动识别"
-											v-model="merchantData.company_name" @input="validateBtn"
-											placeholder-class='placeholder' />
-									</view>
-								</view>
-							</view>
-						</view>
-						<view class="item">
-							<view class="acea-row row-middle">
-								<text class="item-name">法人名称</text>
-								<input type="text" placeholder="自动识别" v-model="merchantData.user_name"
-									@input="validateBtn" placeholder-class='placeholder' />
-							</view>
-						</view>
-						<view class="item">
-							<view class="uni-list">
-								<view class="uni-list-cell">
-									<view class="uni-list-cell-db acea-row row-middle">
-										<text class="item-name businessBox">社会信用代码</text>
-										<input type="text" maxlength="30" placeholder="自动识别"
-											v-model="merchantData.social_credit_code" @input="validateBtn"
-											placeholder-class='placeholder' />
-									</view>
-								</view>
-							</view>
-						</view>
-						<view class="item no-border">
-							<view class='acea-row row-middle'>
-								<text class="item-title">请上传行业相关其他资质证明图片</text>
-								<text class="item-desc">(图片最多可上传10张,图片格式支持JPG、PNG、JPEG)</text>
-								<view class="upload">
-									<view class='pictrue' v-for="(item,index) in pics" :key="index" :data-index="index"
-										@click="getPhotoClickIdx">
-										<image :src='item'></image>
-										<text class='iconfont icon-guanbi1' @click.stop='DelPic(index)'></text>
-									</view>
-									<view class='pictrue acea-row row-center-wrapper row-column' @click='uploadpic'
-										v-if="pics.length < 10">
-										<text class='iconfont icon-icon25201'></text>
-										<view>上传图片</view>
-									</view>
-								</view>
-							</view>
-						</view>
-
-						<view class="item">
-							<view class="acea-row row-middle">
-								<text class="item-name">联系电话</text>
-								<input type="text" placeholder="请输入手机号" v-model="merchantData.phone"
-									@input="validateBtn" placeholder-class='placeholder' />
-							</view>
-						</view>
-						<view class="item rel">
-							<view class="acea-row row-middle">
-								<text class="item-name">验证码</text>
-								<input type="number" maxlength="4" placeholder="填写验证码" v-model="merchantData.yanzhengma"
-									@input="validateBtn" class="codeIput" placeholder-class='placeholder' />
-								<button class="code" :disabled="disabled" :class="disabled === true ? 'on' : ''"
-									@click="handleVerify">
-									{{ text }}
-								</button>
-							</view>
-						</view>
-						<view class="item" v-if="isShowCode">
-							<view class="acea-row row-middle">
-								<text class="item-name">验证码</text>
-								<input type="number" maxlength="4" placeholder="请输入验证码" class="codeIput"
-									v-model="codeVal" @input="validateBtn" placeholder-class='placeholder' />
-								<view class="imageCode" @click="again">
-									<image :src="codeUrl" />
-								</view>
-							</view>
-						</view>
-
-						<view class="item no-border">
-							<checkbox-group @change='ChangeIsAgree'>
-								<checkbox class="checkbox" :checked="isAgree ? true : false" />已阅读并同意
-							</checkbox-group>
-							<button class="settleAgree" @click="getConfig">《入驻协议》</button>
-						</view>
-
-						<button class='submitBtn' :class="validate === true? 'on':''" @click="formSubmit">
-							提交申请
-						</button>
-					</view>
-				</view>
-			</form>
-			<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">{{isType ? '店铺类型说明' : '商户入驻协议'}}</div>
-					<view class="content">
-						<jyf-parser :html="protocol" ref="article" :tag-style="tagStyle"></jyf-parser>
 					</view>
 				</view>
 			</view>
-			<view class="settlementAgreement" v-if="isshow">
-				<view class="setAgCount" style="width: 100%;height: 100%;padding-top: 180rpx;">
-					<view class="" style="width: 60rpx;height: 60rpx; position: absolute;left: 30rpx; top:90rpx"
-						@click="recuo">
-						<i class="iconfont icon-xiangzuo" style="width: 60rpx;height: 60rpx;font-size: 40rpx;"></i>
+			<view class="content" style="padding-top: var(--status-bar-height);">
+				<view class="" style="height: 80rpx;">
+				</view>
+				<view class="heder-tips">
+					简单3步 享开店好礼
+				</view>
+				<view class="steps">
+					<view class="steps-li" @click="step=1">
+						<view class="num act">
+							1
+						</view>
+						<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" @click="step=2">
+						<view class="num" :class="{act:step>1}">
+							2
+						</view>
+						<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" @click="step=3">
+						<view class="num" :class="{act:step>2}">
+							3
+						</view>
+						<view class="" style="font-size: 28rpx;" :style="{color:step>2?'#35BD3E':''}">
+							入驻审核
+						</view>
 					</view>
 
-					<div class="title">{{detail.title}}</div>
-					<!-- <view style="margin: 20rpx 0;">甲方公司:{{company?company:"暂无公司信息"}}</view>
-					<view style="margin: 20rpx 0;">机构代码:{{organization_code?organization_code:"暂无公司信息"}}</view> -->
-
-					<view class="contenta" v-if="detail.mer_services_agree">
-						<jyf-parser :html="detail.mer_services_agree" ref="article" :tag-style="tagStyle"></jyf-parser>
-
-					</view>
-					<view class="contenta" v-else>
-						<jyf-parser :html="detail.mer_supply_agree" ref="article" :tag-style="tagStyle"></jyf-parser>
+				</view>
+				<view class="" style="display: flex;align-items: center;margin-top: 30rpx;">
+					<u--image :showLoading="true" src="/static/images/YDT.png" style="margin: 0 auto;" width="670rpx"
+						height="202rpx"></u--image>
+				</view>
+				<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">
+							</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>
 
-					<view class="setAgCountbtn">
-						<view class="border"></view>
-						<button :class="num>0?'setAgCountbtnb':'setAgCountbtnc'" class="btn" :disabled="num!=0"
-							@click="agree">
-							<text v-if="num>0">请仔细阅读协议 {{num}}秒后可提交</text>
-							<text v-else>同意本协议</text>
-						</button>
+				<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" style="display: flex;align-items: center;">
+										详细地址 <u--input style="margin-left: 40rpx;width: 500rpx;" border="none"
+											v-model="formData.address">
+										</u--input>
+									</view>
+								</view>
+								<u-line style="margin: 28rpx 0;"></u-line>
+								<view class="card-cont-li">
+									<view class="ellipsis" style="display: flex;align-items: center;">
+										公司名称 <u--input style="margin-left: 40rpx;width: 500rpx;" border="none"
+											v-model="formData.company_name">
+										</u--input>
+									</view>
+								</view>
+								<u-line style="margin: 28rpx 0;"></u-line>
+								<view class="card-cont-li">
+									<view class="ellipsis" style="display: flex;align-items: center;">
+										法人名称 <u--input style="margin-left: 40rpx;width: 500rpx;" border="none"
+											v-model="formData.name">
+										</u--input>
+									</view>
+								</view>
+								<u-line style="margin: 28rpx 0;"></u-line>
+								<view class="card-cont-li">
+									<view class="ellipsis" style="display: flex;align-items: center;">
+										社会信用代码 <u--input @blur='creditCodeInput'
+											style="margin-left: 40rpx;width: 500rpx;" border="none"
+											v-model="formData.social_credit_code">
+										</u--input>
+									</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="margin-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;" v-if='formData.status==0'>等待审核</text>
+								<text style="font-family: PFR;color: #20B128;" v-if='formData.status==1'>审核通过</text>
+								<text style="font-family: PFR;color: #FC452F;" v-if='formData.status==2'>审核失败</text>
+							</view>
+							<view class="" style="color: #777;font-size: 24rpx;margin-top: 28rpx;">
+								提交时间：{{formData.create_time}}
+							</view>
+							<u-line color="#ECECEC" style="margin: 36rpx 0;" v-if='formData.status !=0'></u-line>
+							<view v-if='formData.status==2' class=""
+								style="color: #777;font-size: 24rpx;margin-top: 28rpx;margin-bottom: 36rpx;">
+								备注：{{formData.fail_msg}}
+							</view>
+							<u-button v-if='formData.status==2' @click="step=1" style="color: #FC452F;" color="#F8E9E7"
+								shape="circle" type='error' text="重新申请"></u-button>
+							<view v-if='formData.status==1' class=""
+								style="color: #777;font-size: 24rpx;margin-top: 28rpx;margin-bottom: 36rpx;">
+								可以登录我们的工作台，把您的商品推向市场了
+							</view>
+							<u-button v-if='formData.status==1' @click="openApplet" color="#3ABD40" shape="circle"
+								text="立即发布产品"></u-button>
+						</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" v-if='step!=3'>
+					<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>
-			</view>
-			<view class='loadingicon acea-row row-center-wrapper' v-if="loading">
-				<text class='loading iconfont icon-jiazai' :hidden='loading==false'></text>
-			</view>
-			<authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse">
-			</authorize>
-			<Verify @success="success" :captchaType="'blockPuzzle'" :imgSize="{ width: '330px', height: '155px' }"
-				ref="verify">
-			</Verify>
-		</view>
-		<view class="settledSuccessMain " v-else :style="viewColor">
-			<view class="settledSuccessful">
-				<image class="image" src="../static/images/settledSuccessful.svg" alt="">
-					<view class="title">恭喜，您的资料提交成功！</view>
-					<view class="info">预计15个工作日内审核完毕，平台客服会及时与您联系！</view>
-					<view class="goHome" hover-class="none" @click="goHome">
-						返回首页
-					</view>
+				<Verify @success="success" :captchaType="'blockPuzzle'" :imgSize="{ width: '330px', height: '155px' }"
+					ref="verify">
+				</Verify>
 			</view>
 		</view>
 	</view>
+
+
+
+
 </template>
+
 <script>
-	// +----------------------------------------------------------------------
-	// | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
-	// +----------------------------------------------------------------------
-	// | Copyright (c) 2016~2021 https://www.crmeb.com All rights reserved.
-	// +----------------------------------------------------------------------
-	// | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
-	// +----------------------------------------------------------------------
-	// | Author: CRMEB Team <admin@crmeb.com>
-	// +----------------------------------------------------------------------
-	import {
-		create,
-		verify,
-		merClassifly,
-		getCategoryList,
-		getGoodsDetails,
-		updateGoodsRecord,
-		getStoreTypeApi,
-		agreeiness,
-		merchantLicenseIdentify
-	} from '@/api/store.js';
-	import {
-		getCaptcha,
-		getAgreementApi,
-	} from "@/api/user";
-	import {
-		getStreet,
-		getArea,
-		getVillage,
-		getCitys
-	} from "@/api/article.js"
-	import {
-		mapGetters
-	} from "vuex";
+	// #ifdef APP
+	import uniMP from '@/utils/uniMP.js';
+	// #endif
 	import {
 		configMap
 	} from "@/utils";
 	import {
-		intention,
-	} from "@/api/product"
-	import parser from "@/components/jyf-parser/jyf-parser";
-	import authorize from '@/components/Authorize';
-	import Verify from '@/components/verify/verify.vue';
-	import {
-		HTTP_REQUEST_URL
-	} from '@/config/app';
+		mapGetters
+	} from "vuex";
 	import {
 		Toast
-	} from '../../../libs/uniApi';
-	const app = getApp();
+	} from "../../../libs/uniApi";
+	import {
+		create,
+		verify,
+		merchantLicenseIdentify,
+		merClassifly,
+		getStoreTypeApi,
+		getIntention,
+		getGoodsDetails,
+		getUnimpInfo,
+		agreeiness
+	} from '@/api/store.js';
+	import Verify from '@/components/verify/verify.vue';
 	export default {
 		components: {
-			"jyf-parser": parser,
-			authorize,
 			Verify
 		},
+		// computed: {
+		// 	stroeLength() {
+		// 		return 12
+		// 	}
+		// },
 		data() {
 			return {
-				company: '',
-				organization_code: '',
-				domain: HTTP_REQUEST_URL,
-				cartId: '', //购物车id
-				pinkId: 0, //拼团id
-				couponId: 0, //优惠券id
-				isAuto: false, //没有授权的不会自动授权
-				isShowAuth: false, //是否隐藏授权
-				text: "获取验证码",
-				codeUrl: "",
-				disabled: false,
-				isAgree: false,
-				showProtocol: false,
-				isShowCode: false,
-				loading: false,
 				isshow: false,
-				merchantData: {
-					enterprise_name: "",
-					user_name: "",
-					phone: "",
-					classification: '',
-					social_credit_code: '',
-					company_name: '',
-					address: '',
-					invitation_code: '',
-				},
-				business_license: '', //营业执照
-				bank_front: '', //银行卡照片
-				validate: false,
-				successful: false,
-				keyCode: "",
-				codeVal: "",
-				protocol: this.sys_intention_agree,
-				timer: "",
-				index: 0,
-				index1: 0,
-				index2: [0, 0, 0],
-				mer_classification: "",
-				nature_business: 0,
-				array: [{
-					category_name: '',
-					merchant_category_id: ''
-				}],
-				companyTypeList: ['对公户', '个体户'],
-				bindPickerChangeidx: [],
-				storeTypeArr: [{
-					type_name: '',
-					mer_type_id: ''
-				}],
-				StreetTyoeArr: [{
-					city_id: '',
-					area_id: '',
-					street_id: '',
-					village_id: ''
-				}],
-				mer_storeType: '',
-				city_id: '',
-				area_id: '',
-				street_id: '',
-				village_id: '',
-				isnm: false,
-				isnum: 0,
-				code1: '',
-				code2: '',
-				business_name: '',
-				business: [],
-				pics: [],
 				tagStyle: {
 					img: 'width:100%;display:block;'
 				},
-				mer_i_id: null, // 商户申请id
-				isType: false,
-				num: 10,
+				stroeLength: 0,
+				disabled: false,
+				checkboxValue1: ['1'],
+				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: '获取验证码',
 				detail: {},
-				statusBarHeight: 0,
-				where: {
-					type: 1,
-					page: 1,
-					limit: 10
-				},
-				codenote: [],
-				barBg: false, //导航栏背景
-			};
-		},
-		beforeDestroy() {
-			clearTimeout(this.timer)
-		},
-		computed: configMap({
-			sys_intention_agree: ''
-		}, mapGetters(['isLogin', 'viewColor', 'keyColor'])),
+				uniMpInfo: "",
+				num: 10,
+				formData: {
+					"phone": "",
+					"mer_name": "",
+					"name": "",
+					"code": "",
+					"company_name": "",
+					"address": "",
+					"invitation_code": "",
+					"social_credit_code": "",
+					"merchant_category_id": 0,
+					"merchant_category_name": "",
+					"is_company": 1,
+					"mer_type_id": 0,
+					"mer_storeType": "",
+					province_name: "",
+					mer_intention_id: "",
+					"city_name": "",
+					"area_name": "",
+					"street_name": "",
+					"village_name": '',
+					"is_nmsc": 0,
+					"images": [],
+					step: 1
 
-		onPageScroll(e) {
-			if (e.scrollTop > 50) {
-				this.barBg = true;
-			} else {
-				this.barBg = false;
-			}
-		},
-		onLoad(options) {
-			if (this.isLogin) {
-				this.getClassfication();
-				this.getStoreType();
-			} else {
-				this.isAuto = true;
-				this.isShowAuth = true
-			}
-			if (options.mer_i_id) {
-				this.mer_i_id = options.mer_i_id
-				uni.showLoading({
-					title: '获取数据中',
-				});
-				this.$nextTick(function() {
-					this.getGoodsDetails(options.mer_i_id)
-				})
-			} else this.getCity();
-			this.shoplist('mer_services_agree');
-			this.statusBarHeight = uni.getSystemInfoSync().statusBarHeight + 45;
-		},
-
-		methods: {
-			//获取交易信息
-			codelist() {
-				intention(this.where).then(res => {
-					this.codenote = res.data.list
-				})
-			},
-
-			//退出
-			logout() {
-				uni.switchTab({
-					url: '/pages/user/index'
-				})
-			},
-
-			//关闭弹窗
-			recuo() {
-				if (this.num > 0) {
-					this.num = 10
-					this.isshow = false
-				} else {
-					this.num = 10
-					this.isshow = false
 				}
-			},
+			}
+		},
 
+		computed: configMap({
+				sys_intention_agree: ''
+			},
+			mapGetters(['isLogin', 'viewColor', 'keyColor'])),
+		methods: {
+			creditCodeInput() {
+				this.formData.social_credit_code = this.formData.social_credit_code.replace(/[\u4E00-\u9FA5]/g, '');
+			},
 			countDown() {
 				let {
 					num
@@ -516,363 +415,102 @@
 				}, 1000);
 			},
 
-			//获取商户入驻申请协议
-			shoplist(val) {
-				agreeiness({
-					type: val
-				}).then(res => {
-					this.detail = res.data
-				})
+			back() {
+				uni.navigateBack()
 			},
-
-			// 获取村
-			getVillage(street = null) {
-				const self = this;
-				getVillage({
-					street_code: street
-				}).then(res => {
-					self.$set(self.business, 3, res.data);
-					if (self.mer_i_id && !this.business_name) {
-						let city = self.business[0].find(item => item.code == self.city_id)?.name;
-						const zero = self.business[0].findIndex(item => item.code == self.city_id);
-						this.index2[0] = zero;
-
-						let area = self.business[1].find(item => item.code == self.area_id)?.name;
-						const one = self.business[0].findIndex(item => item.code == self.area_id);
-						this.index2[1] = one;
-
-
-						let street = self.business[2].find(item => item.code == self.street_id)?.name;
-						const two = self.business[0].findIndex(item => item.code == self.street_id);
-						this.index2[2] = two;
-
-						let village = self.business[3].find(item => item.id == self.village_id)?.name;
-						const three = self.business[0].findIndex(item => item.code == self.village_id);
-						this.index2[3] = three;
-
-						this.business_name = `${city} ${area} ${street} ${village}`;
-					}
-				})
+			openApplet() {
+				this.uniMpInfo.showToast = true
+				uniMP.loadAppletMP(this.uniMpInfo)
 			},
-
-			//获取镇
-			getStreet(area = null, street = null) {
-				const self = this;
-				getStreet({
-					area_code: area
-				}).then(res => {
-					this.business[2] = res.data;
-					street = street == null ? self.business[2][0].code : street;
-					self.getVillage(street)
-				})
+			splitAddress(str) {
+				if (!str.includes('省')) str = "四川省" + str;
+				var reg = /.+?(省|市|自治区|自治州|县|区|镇|社区|街道|村|街)/g; // 省市区的正则
+				let list = str.match(reg)
+				console.log(list, 'xiugiahou1de1address')
+				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]
 			},
-
-			//获取区
-			getArea(city = null, area = null, street = null) {
-				getArea({
-					city_code: city
-				}).then(res => {
-					this.business[1] = res.data;
-					area = area == null ? this.business[1][0].code : area;
-					this.getStreet(area, street)
-				})
+			confirmCate(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
 			},
-
-			// 获取市
-			getCity(city = null, area = null, street = null) {
-				getCitys().then(res => {
-					this.business[0] = res.data;
-					const code = this.business[0][0].code; //市 初始化
-					city = city == null ? code : city;
-
-					this.getArea(city, area, street);
-				})
+			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
 			},
-
-			//商圈数据变化
-			pickerColumnchange(e) {
-				if (e.detail.column === 0) { //第0列
-					this.getArea(this.business[0][e.detail.value].code);
-					this.index2[0] = e.detail.value
-					this.index2[1] = 0
-					this.index2[2] = 0
-					this.index2[3] = 0
-				} else if (e.detail.column === 1) {
-					this.getStreet(this.business[1][e.detail.value].code)
-					this.index2[1] = e.detail.value
-					this.index2[2] = 0
-					this.index2[3] = 0
-				} else if (e.detail.column === 2) {
-					this.getVillage(this.business[2][e.detail.value].code)
-					this.index2[2] = e.detail.value
-					this.index2[3] = 0
-				} else if (e.detail.column == 3) {
-					this.index2[3] = e.detail.value
-				}
+			confirmCompany(e) {
+				this.formData.is_company = e.value[0].is_company
+				this.showCompanyType = false
 			},
-
 			getConfig() {
-				this.isType = false;
 				this.showProtocol = true;
 				// 获取配置
 				this.protocol = this.sys_intention_agree;
 			},
-
-			/*获取发票说明*/
-			getAgreement() {
-				let that = this
-				that.showProtocol = true;
-				that.isType = true
-				getAgreementApi('sys_merchant_type').then(res => {
-					that.protocol = res.data.sys_merchant_type
-				})
+			generateRandomNumbers(count, min, max) {
+				const randomNumbers = [];
+				for (let i = 0; i < count; i++) {
+					const number = Math.floor(Math.random() * (max - min + 1) + min);
+					randomNumbers.push(number);
+				}
+				return randomNumbers;
 			},
-
-			// 获取历史提交数据详情
-			getGoodsDetails(id) {
-				getGoodsDetails(id).then(res => {
-					let resData = res.data
-					this.merchantData.enterprise_name = resData.mer_name
-					this.merchantData.user_name = resData.name
-					this.merchantData.phone = resData.phone
-					this.merchantData.social_credit_code = resData.social_credit_code
-					this.merchantData.company_name = resData.company_name
-					this.merchantData.address = resData.address
-					this.merchantData.invitation_code = resData.invitation_code
-					this.merchantData.classification = resData.merchant_category_id
-					this.merchantData.mer_type = resData.mer_type_id
-					this.city_id = resData.city_id;
-					this.area_id = resData.area_id
-					this.street_id = resData.street_id
-					this.village_id = resData.village_id;
-
-					// const bankInfo = resData.financial_bank ? JSON.parse(resData.financial_bank) : '';
-					// this.$set(this.merchantData, 'bank_code', bankInfo.bank_code);
-					// this.$set(this.merchantData, 'bank_username', bankInfo.bank);
-					// this.$set(this.merchantData, 'bank_opening', bankInfo.bank_branch);
-					// this.$set(this.merchantData, 'bank_card_username', bankInfo.name);
-					// this.bank_front = bankInfo.bank_front[0] ? bankInfo.bank_front[0] : '';
-
-					this.nature_business = resData.is_company == 1 ? 1 : 2;
-
-					this.business_license = resData.images[0];
-					resData.images.shift();
-					this.pics = resData.images;
-					this.mer_classification = this.getCategoryName(resData.merchant_category_id, this.array)
-					this.mer_storeType = this.getStoreTypeName(resData.mer_type_id, this.storeTypeArr)
-					this.business_name = '';
-
-					this.getCity(this.city_id, this.area_id, this.street_id);
-					if (resData.mer_type_id != 12) {
-						this.shoplist('mer_services_agree')
-					} else {
-						this.shoplist('mer_supply_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 = this.generateRandomNumbers(1, 10000, 99999)[0];
+						that.formData.company_name = res.data.name;
+					} else {
+						that.$util.Tips({
+							title: "识别失败!"
+						})
+					}
+				}).catch((e) => {
+					uni.hideLoading();
+					that.$util.Tips({
+						title: "识别失败"
+					})
 				})
 			},
-
-			//获取商户分类名称
-			getCategoryName(id, arr) {
-				for (let i = 0; i < arr.length; i++) {
-					if (arr[i].merchant_category_id === id) {
-						return arr[i]['category_name']
-					}
-				}
+			handleVerify() {
+				this.$refs.verify.show();
 			},
-
-			//获取店铺类型名称
-			getStoreTypeName(id, arr) {
-				for (let i = 0; i < arr.length; i++) {
-					if (arr[i].mer_type_id === id) {
-						return arr[i]['type_name']
-					}
-				}
+			success(data) {
+				this.$refs.verify.hide();
+				this.code(data);
 			},
-
-			// 选择公司性质
-			natureBusinessChange(e) {
-				this.nature_business = this.companyTypeList[e.detail.value] == '个体户' ? 2 : 1;
-			},
-
-			bindPickerChange: function(e) {
-				let idx = e.target.value;
-				this.merchantData.classification = this.array[idx]['merchant_category_id']
-				this.mer_classification = this.array[idx]['category_name']
-				this.validateBtn()
-			},
-
-			columnchange(e) {
-				if (e.detail.column == 0) {
-					this.bindPickerChangeidx = this.array[e.detail.value].children;
-				}
-			},
-
-			bindPickerChange1: function(e) {
-				this.index1 = e.target.value
-				let idx = e.target.value
-				this.merchantData.mer_type = this.storeTypeArr[idx]['mer_type_id']
-				this.mer_storeType = this.storeTypeArr[idx]['type_name']
-				this.shoplist('mer_services_agree')
-				// if (this.storeTypeArr[idx]['type_code'] == 'TypeStore' && this.merchantData.mer_type) {
-				// 	this.shoplist('mer_services_agree')
-				// } else {
-				// 	this.shoplist('mer_supply_agree')
-				// }
-				this.validateBtn()
-			},
-
-			bindPickerChange2: function(e) {
-				this.index2 = e.detail.value
-				this.business_name =
-					`${this.business[0][this.index2[0]].name} ${this.business[1][this.index2[1]].name} ${this.business[2][this.index2[2]].name} ${this.business[3][this.index2[3]].name}`
-				this.city_id = this.business[0][this.index2[0]].code;
-				this.area_id = this.business[1][this.index2[1]].code;
-				this.street_id = this.business[2][this.index2[2]].code
-				this.village_id = this.business[3][this.index2[3]].id
-			},
-
-			// 获取商户分类
-			getClassfication: function() {
-				merClassifly().then(res => {
-					this.array = res.data
-				}).catch(res => {
-					this.$util.Tips({
-						title: res
-					});
-				});
-			},
-
-			// 获取店铺类型
-			getStoreType: function() {
-				getStoreTypeApi().then(res => {
-					this.storeTypeArr = res.data
-					// 初始化默认
-					this.merchantData.mer_type = this.storeTypeArr[0].mer_type_id;
-					this.mer_storeType = this.storeTypeArr[0].type_name;
-				}).catch(res => {
-					this.$util.Tips({
-						title: res
-					});
-				});
-			},
-			// 图片预览
-			// 获得相册 idx
-			getPhotoClickIdx(e) {
-				let _this = this;
-				let idx = e.currentTarget.dataset.index;
-				_this.imgPreview(_this.pics, idx);
-			},
-			// 图片预览
-			imgPreview: function(list, idx) {
-				// list：图片 url 数组
-				if (list && list.length > 0) {
-					uni.previewImage({
-						current: list[idx], //  传 Number H5端出现不兼容
-						urls: list
-					});
-				}
-			},
-			// 授权回调
-			onLoadFun: function() {
-				this.isShowAuth = false;
-			},
-			// 授权关闭
-			authColse: function(e) {
-				this.isShowAuth = e
-			},
-			toggleTab(str) {
-				this.$refs[str].show();
-			},
-			// 首页
-			goHome() {
-				uni.switchTab({
-					url: '/pages/index/index'
-				});
-			},
-			again() {
-				this.getcaptcha()
-			},
-
-			// 上传文件
-			uploadpic: function() {
-				let that = this;
-				that.$util.uploadImageOne('upload/image', function(res) {
-					that.pics.push(res.data.path);
-					that.$set(that, 'pics', that.pics);
-				});
-			},
-
-			uploadpicBack: function() {
-				let that = this;
-				that.$util.uploadImageOne('upload/image', function(res) {
-					that.bank_front = res.data.path;
-				});
-			},
-
-			// 上传图片识别文字
-			uploadpicText: function() {
-				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: "识别失败"
-						})
-					})
-				});
-			},
-
-			// 删除图片
-			DelPic: function(index) {
-				let that = this,
-					pic = this.pics[index];
-				that.pics.splice(index, 1);
-				that.$set(that, 'pics', that.pics);
-			},
-
-			getCode() {
-				let that = this
-				getCodeApi().then(res => {
-					that.keyCode = res.data.key;
-				}).catch(res => {
-					that.$util.Tips({
-						title: res
-					});
-				});
-			},
-
 			async code(data) {
 				let that = this;
-				if (!that.merchantData.phone) return that.$util.Tips({
-					title: '请填写手机号码'
-				});
-				if (!/^1(3|4|5|7|8|9|6)\d{9}$/i.test(that.merchantData.phone)) return that.$util.Tips({
-					title: '请输入正确的手机号码'
-				});
 				await verify({
-					phone: that.merchantData.phone,
-					// key: that.codeKey,
-					// code: that.codeVal,
+					phone: that.formData.phone,
 					type: 'intention',
 					captchaType: 'blockPuzzle',
 					captchaVerification: data.captchaVerification
@@ -887,17 +525,6 @@
 					});
 				});
 			},
-
-			getcaptcha() {
-				let that = this
-				getCaptcha().then(data => {
-					that.codeUrl = data.data.captcha; //图片路径
-					that.codeVal = data.data.code; //图片验证码
-					that.codeKey = data.data.key //图片验证码key
-				})
-				that.isShowCode = true;
-			},
-
 			sendCode() {
 				if (this.disabled) return;
 				this.disabled = true;
@@ -915,423 +542,375 @@
 					}
 				}, 1000);
 			},
-
-			onConfirm(val) {
-				this.region = val.checkArr[0] + '-' + val.checkArr[1] + '-' + val.checkArr[2];
+			shoplist(val) {
+				agreeiness({
+					type: val
+				}).then(res => {
+					this.detail = res.data
+				})
 			},
+			submit() {
+				if (!this.checkboxValue1[0]) {
+					return Toast("请勾选用户协议")
+				}
+				this.splitAddress(this.formData.address)
+				this.formData.step = this.step
 
-			ChangeIsAgree: function(e) {
-				this.isAgree = !this.isAgree;
-				this.validateBtn();
+				if (this.step == 2) {
+					this.isshow = true
+					this.countDown()
+				} else {
+					this.agree()
+				}
+				return
+				create(this.formData).then(res => {
+					console.log(res.data.mer_intention_id, 'res')
+					this.formData.mer_intention_id = res.data.mer_intention_id
+					this.formData.status = 0
+					if (this.step == 2) {
+						getIntention(this.$store.state.app.userInfo.uid).then(res => {
+							if (Object.keys(res.data).length == 0) return
+							this.formData = res.data
+							this.step = this.formData.step
+							this.formData.phone = this.$store.state.app.userInfo.account
+						})
+					}
+					this.step++
+				}).catch(err => {
+					console.log(err, 'err')
+					Toast(err)
+				})
 			},
-
-			//提交
 			agree() {
-				let that = this;
-				let requestData = {
-					phone: that.merchantData.phone,
-					mer_name: that.merchantData.enterprise_name,
-					name: that.merchantData.user_name,
-					code: that.merchantData.yanzhengma,
-					company_name: that.merchantData.company_name,
-					address: that.merchantData.address,
-					invitation_code: that.merchantData.invitation_code,
-					social_credit_code: that.merchantData.social_credit_code,
-					merchant_category_id: that.merchantData.classification,
-					merchant_category_name: that.mer_classification,
-					is_company: that.nature_business == 1 ? 1 : 0, // 是否是公司, 1是公司, 0是个体
-					mer_type_id: that.merchantData.mer_type,
-					mer_storeType: this.mer_storeType,
-					city_id: this.city_id,
-					area_id: this.area_id,
-					street_id: this.street_id,
-					village_id: this.village_id,
-					is_nmsc: this.isnum,
-					images: [this.business_license, ...that.pics],
-					// financial_bank: {
-					// 	// 开户信息
-					// 	bank_code: this.merchantData.bank_code,
-					// 	bank: this.merchantData.bank_username,
-					// 	bank_branch: this.merchantData.bank_opening,
-					// 	name: this.nature_business == 1 ? that.merchantData.company_name : this.merchantData
-					// 		.bank_card_username,
-					// 	bank_front: [this.bank_front]
-					// }
-				}
-
-				that.validate = false;
-				if (that.mer_i_id) {
-					updateGoodsRecord(that.mer_i_id, requestData).then(res => {
-						if (res.status == 200) {
-							title: '提交成功',
-							that.loading = true;
-							that.timer = setTimeout(() => {
-								that.successful = true;
-								that.validate = true;
-							}, 1000)
-						}
-					}).catch(res => {
-						this.isshow = false
-						that.validate = true;
-						that.$util.Tips({
-							title: res
-						});
-					})
-				} else {
-					create(requestData).then(data => {
-						if (data.status == 200) {
-							title: '提交成功',
-							that.loading = true;
-							this.timer = setTimeout(() => {
-								that.successful = true;
-								that.validate = true;
-							}, 1000)
-						}
-					}).catch(res => {
-						this.isshow = false
-						that.validate = true;
-						that.$util.Tips({
-							title: res
-						});
-					})
-				}
-			},
-			formSubmit() {
-				if (this.validateForm() && this.validate) {
-					if (this.merchantData.mer_type == '12') return this.agree();
-					if (this.codenote.length == 0) {
-						this.isshow = true
-						this.countDown()
-					} else {
-						if (this.codenote[0].status == 0) {
-							uni.showModal({
-								title: '申请正在审核中，请勿重复提交'
-							})
-						} else {
-							this.isshow = true
-							this.countDown()
-						}
+				this.isshow = false
+				create(this.formData).then(res => {
+					console.log(res.data.mer_intention_id, 'res')
+					this.formData.mer_intention_id = res.data.mer_intention_id
+					this.formData.status = 0
+					if (this.step == 2) {
+						getIntention(this.$store.state.app.userInfo.uid).then(res => {
+							if (Object.keys(res.data).length == 0) return
+							this.formData = res.data
+							this.step = this.formData.step
+							this.formData.phone = this.$store.state.app.userInfo.account
+						})
 					}
-				}
-			},
-			validateBtn: function() {
-				let that = this,
-					value = that.merchantData;
-				if (value.enterprise_name && value.user_name && value.phone && /^1(3|4|5|7|8|9|6)\d{9}$/i.test(
-						value
-						.phone) &&
-					value.yanzhengma && that.isAgree && this.mer_classification) {
-					if (!that.isShowCode) {
-						that.validate = true;
-					} else {
-						if (that.codeVal) {
-							that.validate = true;
-						} else {
-							that.validate = false;
-						}
-					}
-				} else {
-					that.validate = false;
-				}
-			},
-			validateForm: function() {
-				let that = this,
-					value = that.merchantData;
-				if (!value.enterprise_name) return that.$util.Tips({
-					title: '请输入企业名称'
-				});
-				if (!value.social_credit_code) return that.$util.Tips({
-					title: '请输入统一社会信用代码'
-				});
-				if (!value.company_name) return that.$util.Tips({
-					title: '请输入公司名称'
-				});
-				if (!value.address) return that.$util.Tips({
-					title: '请输入详细地址'
-				});
-				if (!value.user_name) return that.$util.Tips({
-					title: '请输入姓名'
-				});
-				if (!value.phone) return that.$util.Tips({
-					title: '请输入手机号'
-				});
-				if (!/^1(3|4|5|7|8|9|6)\d{9}$/i.test(value.phone)) return that.$util.Tips({
-					title: '请输入正确的手机号码'
-				});
-				if (!value.yanzhengma) return that.$util.Tips({
-					title: '请填写验证码'
-				});
-				if (!this.mer_classification) return that.$util.Tips({
-					title: '请选择商户分类'
-				});
-				if (!this.nature_business) return that.$util.Tips({
-					title: '请选择公司性质'
+					this.step++
+				}).catch(err => {
+					console.log(err, 'err')
+					Toast(err)
 				})
-				if (!this.mer_storeType) return that.$util.Tips({
-					title: '请选择店铺类型'
-				})
-				if (!this.business_name) return that.$util.Tips({
-					title: '请选择店铺所在地'
-				})
-				if (!that.isAgree) return that.$util.Tips({
-					title: '请勾选并同意入驻协议'
-				});
-
-				if (that.isShowCode && !that.codeVal) return that.$util.Tips({
-					title: '请填写图片验证码'
-				});
-				if (!that.business_license) return that.$util.Tips({
-					title: '请上传营业执照'
-				});
 
 
-				// if (this.nature_business == 1 && !this.merchantData.bank_code) {
-				// 	return that.$util.Tips({
-				// 		title: '请输入对公账号'
-				// 	});
-				// }
 
-				// if (this.nature_business != 1 && !this.merchantData.bank_code) {
-				// 	return that.$util.Tips({
-				// 		title: '请输入银行卡号'
-				// 	});
-				// }
-
-				// if (!this.merchantData.bank_username) {
-				// 	return that.$util.Tips({
-				// 		title: '请输入开户银行'
-				// 	});
-				// }
-
-				// if (!this.merchantData.bank_opening) {
-				// 	return that.$util.Tips({
-				// 		title: '请输入开户网点'
-				// 	});
-				// }
-
-				// if (this.nature_business == 0 && !this.merchantData.bank_card_username) {
-				// 	return that.$util.Tips({
-				// 		title: '请输入持卡人姓名'
-				// 	});
-				// }
-
-				that.validate = true;
-				return true;
 			},
 			jumpToList() {
 				uni.navigateTo({
 					url: "/pages/store/applicationRecord/index"
 				})
 			},
-			success(data) {
-				this.$refs.verify.hide();
-				this.code(data);
-			},
-			handleVerify() {
-				if (!this.merchantData.phone) return this.$util.Tips({
-					title: '请输入手机号'
-				});
-
-				if (!/^1(3|4|5|7|8|9|6)\d{9}$/i.test(this.merchantData.phone)) return this.$util.Tips({
-					title: '请输入正确的手机号码'
-				});
-				if (!this.isAgree) return this.$util.Tips({
-					title: '请勾选并同意入驻协议'
-				});
-				this.$refs.verify.show();
-			}
+		},
+		onPullDownRefresh: function() {
+			getIntention(this.$store.state.app.userInfo.uid).then(res => {
+				if (Object.keys(res.data).length == 0) return
+				this.formData = res.data
+				this.step = this.formData.step
+				this.formData.phone = this.$store.state.app.userInfo.account
+				if (this.formData.status == 1) {
+					getUnimpInfo().then(res => {
+						this.uniMpInfo = res.data
+					})
+				}
+			})
+			uni.stopPullDownRefresh()
+			// this.page = 1;
+			// this.pageloading = false;
+			// this.loadend = false;
+			// this.assistList = []
+			// this.getAssistProductList();
+		},
+		onLoad(option) {
+			// console.log(this.$store.state.app)
+			this.shoplist('mer_services_agree')
+			this.formData.phone = this.$store.state.app.userInfo.account
+			merClassifly().then(res => {
+				this.MerchantCategoryColumn = [res.data]
+			})
+			getStoreTypeApi().then(res => {
+				this.StoreTypeColumn = [res.data]
+			})
+			getIntention(this.$store.state.app.uid || this.$store.state.app.userInfo.uid).then(res => {
+				if (Object.keys(res.data).length == 0) return
+				this.formData = res.data
+				this.step = this.formData.step
+				this.formData.phone = this.$store.state.app.userInfo.account
+				if (option.type == 1) {
+					this.step = 1
+				}
+				if (this.formData.status == 1) {
+					getUnimpInfo().then(res => {
+						this.uniMpInfo = res.data
+					})
+				}
+			})
 		}
 	}
 </script>
 
-<style scoped lang="scss">
-	.page {
-		width: 750rpx;
-		height: 2400rpx;
-		background: linear-gradient(180deg, #44AF38 0%, #72BE53 100%);
-	}
+<style lang="scss" scoped>
+	.content {
+		min-height: 100vh;
+		background-color: #fff;
+		padding: 40rpx;
+		box-sizing: border-box;
+		font-family: PF;
+		padding-bottom: 200rpx;
 
-	.header {
-		// height: 440rpx;
-		width: 100%;
-		text-align: center;
-		background-color: transparent;
-		// background-image: url(https://lihai001.oss-cn-chengdu.aliyuncs.com/def/96ec1202403151608564555.webp);
-		background-position: center;
+		.heder-tips {
+			font-weight: 400;
+			font-size: 24rpx;
+			color: #20B128;
+			text-align: center;
+			margin-bottom: 50rpx;
 
-		.title-bar {
-			position: fixed;
-			top: 0;
-			height: 88rpx;
-			line-height: 88rpx;
-			width: 100%;
-			z-index: 11;
+		}
 
-			.title-bar-icon {
-				position: absolute;
-				left: 30rpx;
+		.steps {
+			display: flex;
+			justify-content: center;
 
-				.icon-xiangzuo {
-					font-size: 40rpx;
-					text-align: left;
-					color: #fff;
+			.num {
+				width: 52rpx;
+				height: 52rpx;
+				border-radius: 52rpx;
+				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;
+					/* 使用省略号来表示被截断的文本 */
 				}
 			}
+		}
 
-			.title-bar-txt {
-				text-align: center;
-				color: #fff;
+
+		.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;
+		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%;
 			}
 		}
 	}
 
-	/deep/checkbox .uni-checkbox-input.uni-checkbox-input-checked,
-	/deep/checkbox .wx-checkbox-input.wx-checkbox-input-checked {
-		border: 1px solid var(--view-theme) !important;
-		background-color: var(--view-theme) !important;
-		color: #fff !important;
+	.settlementAgreement .setAgCount .close {
+		position: absolute;
+		top: 15rpx;
+		right: 15rpx;
 	}
 
+	.settlementAgreement .setAgCount .icon {
+		font-size: 42rpx;
+		color: #b4b1b4;
+		position: absolute;
+		top: 15rpx;
+		right: 15rpx;
+	}
 
-	.conten-top {
-		width: 100%;
+	.settlementAgreement .setAgCount .title {
+		color: #333;
+		font-size: 32rpx;
 		text-align: center;
-		background-color: transparent;
+		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;
-		top: 0;
-		position: fixed;
-		z-index: 10;
-	}
-
-	.uni-input-placeholder {
-		color: #B2B2B2;
-	}
-
-	.bar-top-bg {
-		background-color: #46CC4B;
-	}
-
-	.item-name {
-		width: 190rpx;
-	}
-
-	.uni-list-cell {
-		position: relative;
-
-		.iconfont {
-			font-size: 14px;
-			color: #7a7a7a;
-			position: absolute;
-			right: 15px;
-			top: 7rpx;
-		}
-
-		.icon-guanbi2 {
-			right: 35px;
-		}
-	}
-
-	.merchantBgCount {
-		line-height: 0;
-	}
-
-	.merchantsSettled {
-		background-image: linear-gradient(var(--view-bntColor21) 0%, var(--view-bntColor22) 100%);
-		min-height: 3200rpx;
-		position: relative;
-	}
-
-	.merchantsSettled .merchantBg {
-		width: 750rpx;
-		width: 100%;
-	}
-
-	.merchantsSettled .list {
-		background-color: #fff;
-		border-radius: 12px;
-		padding: 22px 0;
-		margin: 0 15px;
-		position: absolute;
-		top: 400rpx;
-		width: calc(100% - 30px);
-	}
-
-	.list-title {
-		position: relative;
-		font-weight: 600;
-		font-size: 30rpx;
-		color: #40AE36;
+		width: 93px;
+		line-height: 27px;
+		border: 1px solid var(--view-theme);
+		border-radius: 15px;
+		color: var(--view-theme);
 		text-align: center;
-		margin-bottom: 40rpx;
-
-		&::after {
-			content: "";
-			display: inline-block;
-			position: absolute;
-			bottom: 0;
-			left: 50%;
-			transform: translateX(-50%);
-			width: 233rpx;
-			height: 14rpx;
-			background: #40AE36;
-			opacity: 0.36;
-			filter: blur(6px);
-		}
-	}
-
-	.application-record {
-		position: absolute;
-		display: flex;
-		align-items: center;
-		top: 320rpx;
+		bottom: 8px;
 		right: 0;
+		font-size: 12px;
+	}
+
+	.code.on {
+		background-color: #bbb;
 		color: #fff;
-		font-size: 22rpx;
-		background-color: rgba(0, 0, 0, 0.3);
-		padding: 8rpx 18rpx;
-		border-radius: 20px 0px 0px 20px;
+		border-color: #bbb;
+		height: 50rpx;
 	}
 
-	.merchantsSettled .list .item {
-		padding: 50rpx 0 20rpx;
-		border-bottom: 1px solid #eee;
-		position: relative;
-		margin: 0 20px;
+	.bar {
+		position: fixed;
+		width: 750rpx;
+		box-sizing: border-box;
+		background-color: white;
+		z-index: 999;
 
-		&.no-border {
-			border-bottom: none;
-			padding-left: 0;
-			padding-right: 0;
-		}
-
-		.item-title {
-			color: #666666;
-			font-size: 28rpx;
-			display: block;
-		}
-
-		.item-desc {
-			color: #B2B2B2;
-			font-size: 22rpx;
-			display: block;
-			margin-top: 9rpx;
-			line-height: 36rpx;
-		}
 	}
 
-	.acea-row,
-	.upload {
-		display: -webkit-box;
-		display: -moz-box;
-		display: -webkit-flex;
-		display: -ms-flexbox;
-		display: flex;
-		-webkit-box-lines: multiple;
-		-moz-box-lines: multiple;
-		-o-box-lines: multiple;
-		-webkit-flex-wrap: wrap;
-		-ms-flex-wrap: wrap;
-		flex-wrap: wrap;
+	.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%;
+			}
+		}
 	}
 
 	.upload {
@@ -1523,7 +1102,7 @@
 		color: #fff;
 		background: #E3E3E3;
 		margin-top: 25px;
-		pointer-events: none;
+		// pointer-events: none;
 	}
 
 	.merchantsSettled .submitBtn.on {
diff --git a/pages/store/settled/index1.vue b/pages/store/settled/index1.vue
new file mode 100644
index 0000000..275181f
--- /dev/null
+++ b/pages/store/settled/index1.vue
@@ -0,0 +1,1805 @@
+<template>
+	<view class="page" :style="{'height':successful?'100vh':''}">
+		<!-- #ifdef MP || APP-PLUS -->
+		<view class="conten-top" :style="'height:'+statusBarHeight+'px'" :class="{'bar-top-bg':true}"
+			v-if="!successful">
+			<view class="" style="position: absolute;left: 30rpx;bottom: 15rpx;" @click="logout"><i
+					class="iconfont icon-xiangzuo" style="font-size: 40rpx;text-align: left;color:black;"></i></view>
+			<view class=""
+				style="position: absolute;bottom: 15rpx;width: 500rpx; left:50%;transform: translate(-50%);text-align: center;color:black;font-size: 32rpx;font-weight: bold;">
+				商家入驻
+			</view>
+		</view>
+		<!-- #endif -->
+
+		<!-- #ifdef H5 -->
+		<view class="header" v-if="!successful">
+			<view class="title-bar" :class="{'bar-top-bg':true}">
+				<view class="title-bar-icon" @click="logout">
+					<i class="iconfont icon-xiangzuo" style="color: black;"></i>
+				</view>
+				<view class="title-bar-txt">
+					商家入驻
+				</view>
+			</view>
+		</view>
+		<!-- #endif -->
+		<view class="" style="height: 100rpx;background-color: red;">
+
+		</view>
+
+		<view v-if="!successful" :style="viewColor">
+			<form report-submit='true'>
+				<view class='merchantsSettled'>
+					<view class="application-record" @click="jumpToList" v-if="!mer_i_id">
+						申请记录
+						<text class="iconfont icon-xiangyou"></text>
+					</view>
+					<view class='list'>
+						<view class="list-title">商家入驻</view>
+						<view class="item">
+							<view class="acea-row row-middle">
+								<text class="item-name">商户名称</text>
+								<input type="text" maxlength="30" placeholder="请输入商户名称"
+									v-model="merchantData.enterprise_name" @input="validateBtn"
+									placeholder-class='placeholder' />
+							</view>
+						</view>
+
+						<view class="item">
+							<view class="uni-list">
+								<view class="uni-list-cell">
+									<view class="uni-list-cell-db acea-row row-middle">
+										<text class="item-name">商户分类</text>
+										<picker @change="bindPickerChange" @columnchange="columnchange" mode="selector"
+											:value="index" :range="array" range-key="category_name">
+											<input placeholder="请选择商户分类" type="text" readonly disabled
+												v-model="mer_classification">
+											<view class='iconfont icon-jiantou'></view>
+										</picker>
+									</view>
+								</view>
+							</view>
+						</view>
+						<view class="item">
+							<view class="uni-list">
+								<view class="uni-list-cell">
+									<view class="uni-list-cell-db acea-row row-middle">
+										<text class="item-name">店铺类型</text>
+										<text class="iconfont wenhao" @click="getAgreement">?</text>
+										<picker @change="bindPickerChange1" :value="index1" :range="storeTypeArr"
+											range-key="type_name">
+											<input placeholder="请选择店铺类型" type="text" disabled readonly
+												v-model="mer_storeType">
+											<view v-if="mer_storeType" @tap.stop="mer_storeType=''"
+												class="iconfont icon-guanbi2"></view>
+											<view class='iconfont icon-jiantou'></view>
+										</picker>
+									</view>
+								</view>
+							</view>
+						</view>
+						<view class="item">
+							<view class="uni-list">
+								<view class="uni-list-cell">
+									<view class="uni-list-cell-db acea-row row-middle">
+										<text class="item-name businessBox">店铺所在地</text>
+										<picker mode=multiSelector @change="bindPickerChange2" :value="index2"
+											:range="business" range-key="name" @columnchange="pickerColumnchange">
+											<view class="businessBox"
+												:style="{'color':(business_name == '' || business_name.length == 5)?'#B2B2B2':''}"
+												style="width: 400rpx;word-break: keep-all;line-height: 40rpx;font-size: 30rpx;">
+												{{(business_name == '' || business_name.length == 5)?'请选择商12圈':business_name}}
+											</view>
+											<view class='iconfont icon-jiantou'></view>
+										</picker>
+									</view>
+								</view>
+							</view>
+						</view>
+
+						<view class="item">
+							<view class="uni-list">
+								<view class="uni-list-cell">
+									<view class="uni-list-cell-db acea-row row-middle">
+										<text class="item-name">公司性质</text>
+										<picker @change="natureBusinessChange" mode="selector" :value="index"
+											:range="companyTypeList">
+											<input placeholder="请选择公司性质" type="text" readonly disabled
+												:value="nature_business==''?'':nature_business==1?'对公户':'个体户'">
+											<view class='iconfont icon-jiantou'></view>
+										</picker>
+									</view>
+								</view>
+							</view>
+						</view>
+						<view class="item no-border">
+							<view class='acea-row row-middle'>
+								<text class="item-title" style="margin-right: 20rpx;">请上传营业执照</text>
+								<text class="item-desc">(图片格式支持JPG、PNG、JPEG)</text>
+								<view class="upload">
+									<view v-if="business_license" class='pictrue' @click='uploadpicText'>
+										<image :src='business_license'></image>
+									</view>
+									<view v-else class='pictrue acea-row row-center-wrapper row-column'
+										@click='uploadpicText'>
+										<text class='iconfont icon-icon25201'></text>
+										<view>上传图片</view>
+									</view>
+								</view>
+							</view>
+						</view>
+						<view class="item">
+							<view class="uni-list">
+								<view class="uni-list-cell">
+									<view class="uni-list-cell-db acea-row row-middle">
+										<text class="item-name businessBox">详细地址</text>
+										<input type="text" maxlength="30" placeholder="自动识别"
+											v-model="merchantData.address" @input="validateBtn"
+											placeholder-class='placeholder' />
+									</view>
+								</view>
+							</view>
+						</view>
+						<view class="item">
+							<view class="uni-list">
+								<view class="uni-list-cell">
+									<view class="uni-list-cell-db acea-row row-middle">
+										<text class="item-name businessBox">公司名称</text>
+										<input type="text" maxlength="30" placeholder="自动识别"
+											v-model="merchantData.company_name" @input="validateBtn"
+											placeholder-class='placeholder' />
+									</view>
+								</view>
+							</view>
+						</view>
+						<view class="item">
+							<view class="acea-row row-middle">
+								<text class="item-name">法人名称</text>
+								<input type="text" placeholder="自动识别" v-model="merchantData.user_name"
+									@input="validateBtn" placeholder-class='placeholder' />
+							</view>
+						</view>
+						<view class="item">
+							<view class="uni-list">
+								<view class="uni-list-cell">
+									<view class="uni-list-cell-db acea-row row-middle">
+										<text class="item-name businessBox">社会信用代码</text>
+										<input type="text" maxlength="30" placeholder="自动识别"
+											v-model="merchantData.social_credit_code" @input="validateBtn"
+											placeholder-class='placeholder' />
+									</view>
+								</view>
+							</view>
+						</view>
+						<view class="item no-border">
+							<view class='acea-row row-middle'>
+								<text class="item-title">请上传行业相关其他资质证明图片</text>
+								<text class="item-desc">(图片最多可上传10张,图片格式支持JPG、PNG、JPEG)</text>
+								<view class="upload">
+									<view class='pictrue' v-for="(item,index) in pics" :key="index" :data-index="index"
+										@click="getPhotoClickIdx">
+										<image :src='item'></image>
+										<text class='iconfont icon-guanbi1' @click.stop='DelPic(index)'></text>
+									</view>
+									<view class='pictrue acea-row row-center-wrapper row-column' @click='uploadpic'
+										v-if="pics.length < 10">
+										<text class='iconfont icon-icon25201'></text>
+										<view>上传图片</view>
+									</view>
+								</view>
+							</view>
+						</view>
+
+						<view class="item">
+							<view class="acea-row row-middle">
+								<text class="item-name">联系电话</text>
+								<input type="text" placeholder="请输入手机号" v-model="merchantData.phone"
+									@input="validateBtn" placeholder-class='placeholder' />
+							</view>
+						</view>
+						<view class="item rel">
+							<view class="acea-row row-middle">
+								<text class="item-name">验证码</text>
+								<input type="number" maxlength="4" placeholder="填写验证码" v-model="merchantData.yanzhengma"
+									@input="validateBtn" class="codeIput" placeholder-class='placeholder' />
+								<button class="code" :disabled="disabled" :class="disabled === true ? 'on' : ''"
+									@click="handleVerify">
+									{{ text }}
+								</button>
+							</view>
+						</view>
+						<view class="item" v-if="isShowCode">
+							<view class="acea-row row-middle">
+								<text class="item-name">验证码</text>
+								<input type="number" maxlength="4" placeholder="请输入验证码" class="codeIput"
+									v-model="codeVal" @input="validateBtn" placeholder-class='placeholder' />
+								<view class="imageCode" @click="again">
+									<image :src="codeUrl" />
+								</view>
+							</view>
+						</view>
+
+						<view class="item no-border">
+							<checkbox-group @change='ChangeIsAgree'>
+								<checkbox class="checkbox" :checked="isAgree ? true : false" />已阅读并同意
+							</checkbox-group>
+							<button class="settleAgree" @click="getConfig">《入驻协议》</button>
+						</view>
+
+						<button class='submitBtn' @click="formSubmit">
+							提交申请
+						</button>
+					</view>
+				</view>
+			</form>
+			<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">{{isType ? '店铺类型说明' : '商户入驻协议'}}</div>
+					<view class="content">
+						<jyf-parser :html="protocol" ref="article" :tag-style="tagStyle"></jyf-parser>
+					</view>
+				</view>
+			</view>
+			<view class="settlementAgreement" v-if="isshow">
+				<view class="setAgCount" style="width: 100%;height: 100%;padding-top: 180rpx;">
+					<view class="" style="width: 60rpx;height: 60rpx; position: absolute;left: 30rpx; top:90rpx"
+						@click="recuo">
+						<i class="iconfont icon-xiangzuo" style="width: 60rpx;height: 60rpx;font-size: 40rpx;"></i>
+					</view>
+
+					<div class="title">{{detail.title}}</div>
+					<view class="contenta" v-if="detail.mer_services_agree">
+						<jyf-parser :html="detail.mer_services_agree" ref="article" :tag-style="tagStyle"></jyf-parser>
+
+					</view>
+					<view class="contenta" v-else>
+						<jyf-parser :html="detail.mer_supply_agree" ref="article" :tag-style="tagStyle"></jyf-parser>
+					</view>
+
+					<view class="setAgCountbtn">
+						<view class="border"></view>
+						<button :class="num>0?'setAgCountbtnb':'setAgCountbtnc'" class="btn" :disabled="num!=0"
+							@click="agree">
+							<text v-if="num>0">请仔细阅读协议 {{num}}秒后可提交</text>
+							<text v-else>同意本协议</text>
+						</button>
+					</view>
+				</view>
+			</view>
+			<view class='loadingicon acea-row row-center-wrapper' v-if="loading">
+				<text class='loading iconfont icon-jiazai' :hidden='loading==false'></text>
+			</view>
+			<authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse">
+			</authorize>
+			<Verify @success="success" :captchaType="'blockPuzzle'" :imgSize="{ width: '330px', height: '155px' }"
+				ref="verify">
+			</Verify>
+		</view>
+
+		<view class="settledSuccessMain " v-else :style="viewColor">
+			<view class="settledSuccessful">
+				<image class="image" src="../static/images/settledSuccessful.svg" alt="">
+					<view class="title">恭喜，您的资料提交成功！</view>
+					<view class="info">预计15个工作日内审核完毕，平台客服会及时与您联系！</view>
+					<view class="goHome" hover-class="none" @click="goHome">
+						返回首页
+					</view>
+			</view>
+		</view>
+	</view>
+</template>
+<script>
+	// +----------------------------------------------------------------------
+	// | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
+	// +----------------------------------------------------------------------
+	// | Copyright (c) 2016~2021 https://www.crmeb.com All rights reserved.
+	// +----------------------------------------------------------------------
+	// | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
+	// +----------------------------------------------------------------------
+	// | Author: CRMEB Team <admin@crmeb.com>
+	// +----------------------------------------------------------------------
+	import {
+		create,
+		verify,
+		merClassifly,
+		getCategoryList,
+		getStoreTypeApi,
+		getGoodsDetails,
+		updateGoodsRecord,
+		agreeiness,
+		merchantLicenseIdentify
+	} from '@/api/store.js';
+	import {
+		getCaptcha,
+		getAgreementApi,
+	} from "@/api/user";
+	import {
+		getStreet,
+		getArea,
+		getVillage,
+		getCitys
+	} from "@/api/article.js"
+	import {
+		mapGetters
+	} from "vuex";
+	import {
+		configMap
+	} from "@/utils";
+	import {
+		intention,
+	} from "@/api/product"
+	import parser from "@/components/jyf-parser/jyf-parser";
+	import authorize from '@/components/Authorize';
+	import Verify from '@/components/verify/verify.vue';
+	import {
+		HTTP_REQUEST_URL
+	} from '@/config/app';
+	import {
+		Toast
+	} from '../../../libs/uniApi';
+	const app = getApp();
+	export default {
+		components: {
+			"jyf-parser": parser,
+			authorize,
+			Verify
+		},
+		data() {
+			return {
+				company: '',
+				organization_code: '',
+				domain: HTTP_REQUEST_URL,
+				cartId: '', //购物车id
+				pinkId: 0, //拼团id
+				couponId: 0, //优惠券id
+				isAuto: false, //没有授权的不会自动授权
+				isShowAuth: false, //是否隐藏授权
+				text: "获取验证码",
+				codeUrl: "",
+				disabled: false,
+				isAgree: false,
+				showProtocol: false,
+				isShow: false,
+				loading: false,
+				isshow: false,
+				merchantData: {
+					enterprise_name: "",
+					user_name: "",
+					phone: "",
+					classification: '',
+					social_credit_code: '',
+					company_name: '',
+					address: '',
+					invitation_code: '',
+				},
+				business_license: '', //营业执照
+				bank_front: '', //银行卡照片
+				validate: false,
+				successful: false,
+				keyCode: "",
+				codeVal: "",
+				protocol: this.sys_intention_agree,
+				timer: "",
+				index: 0,
+				index1: 0,
+				index2: [0, 0, 0],
+				mer_classification: "",
+				nature_business: 0,
+				array: [{
+					category_name: '',
+					merchant_category_id: ''
+				}],
+				companyTypeList: ['对公户', '个体户'],
+				bindPickerChangeidx: [],
+				storeTypeArr: [{
+					type_name: '',
+					mer_type_id: ''
+				}],
+				StreetTyoeArr: [{
+					city_id: '',
+					area_id: '',
+					street_id: '',
+					village_id: ''
+				}],
+				mer_storeType: '',
+				city_id: '',
+				area_id: '',
+				street_id: '',
+				village_id: '',
+				isnm: false,
+				isnum: 0,
+				code1: '',
+				code2: '',
+				business_name: '',
+				business: [],
+				pics: [],
+				tagStyle: {
+					img: 'width:100%;display:block;'
+				},
+				mer_i_id: null, // 商户申请id
+				isType: false,
+				num: 10,
+				detail: {},
+				statusBarHeight: 0,
+				where: {
+					type: 1,
+					page: 1,
+					limit: 10
+				},
+				codenote: [],
+				barBg: false, //导航栏背景
+			};
+		},
+		beforeDestroy() {
+			clearTimeout(this.timer)
+		},
+		computed: configMap({
+			sys_intention_agree: ''
+		}, mapGetters(['isLogin', 'viewColor', 'keyColor'])),
+
+		onPageScroll(e) {
+			if (e.scrollTop > 50) {
+				this.barBg = true;
+			} else {
+				this.barBg = false;
+			}
+		},
+		onLoad(options) {
+			if (this.isLogin) {
+				this.getClassfication();
+				this.getStoreType();
+			} else {
+				this.isAuto = true;
+				this.isShowAuth = true
+			}
+			if (options.mer_i_id) {
+				this.mer_i_id = options.mer_i_id
+				uni.showLoading({
+					title: '获取数据中',
+				});
+				this.$nextTick(function() {
+					this.getGoodsDetails(options.mer_i_id)
+				})
+			} else this.getCity();
+			this.shoplist('mer_services_agree');
+			this.statusBarHeight = uni.getSystemInfoSync().statusBarHeight + 45;
+		},
+
+		methods: {
+			//获取交易信息
+			codelist() {
+				intention(this.where).then(res => {
+					this.codenote = res.data.list
+				})
+			},
+
+			//退出
+			logout() {
+				uni.switchTab({
+					url: '/pages/user/index'
+				})
+			},
+
+			//关闭弹窗
+			recuo() {
+				if (this.num > 0) {
+					this.num = 10
+					this.isshow = false
+				} else {
+					this.num = 10
+					this.isshow = false
+				}
+			},
+
+			countDown() {
+				let {
+					num
+				} = this;
+				num = num > 0 ? num - 1 : "0";
+				setTimeout(() => {
+					this.num = num;
+					if (num == '0') {
+						return
+					}
+					if (this.isshow == false && this.num > 0) {
+						this.num = 10
+						return
+					}
+					this.countDown();
+				}, 1000);
+			},
+
+			//获取商户入驻申请协议
+			shoplist(val) {
+				agreeiness({
+					type: val
+				}).then(res => {
+					this.detail = res.data
+				})
+			},
+
+			// 获取村
+			getVillage(street = null) {
+				const self = this;
+				getVillage({
+					street_code: street
+				}).then(res => {
+					self.$set(self.business, 3, res.data);
+					if (self.mer_i_id && !this.business_name) {
+						let city = self.business[0].find(item => item.code == self.city_id)?.name;
+						const zero = self.business[0].findIndex(item => item.code == self.city_id);
+						this.index2[0] = zero;
+
+						let area = self.business[1].find(item => item.code == self.area_id)?.name;
+						const one = self.business[0].findIndex(item => item.code == self.area_id);
+						this.index2[1] = one;
+
+
+						let street = self.business[2].find(item => item.code == self.street_id)?.name;
+						const two = self.business[0].findIndex(item => item.code == self.street_id);
+						this.index2[2] = two;
+
+						let village = self.business[3].find(item => item.id == self.village_id)?.name;
+						const three = self.business[0].findIndex(item => item.code == self.village_id);
+						this.index2[3] = three;
+
+						this.business_name = `${city} ${area} ${street} ${village}`;
+					}
+				})
+			},
+
+			//获取镇
+			getStreet(area = null, street = null) {
+				const self = this;
+				getStreet({
+					area_code: area
+				}).then(res => {
+					this.business[2] = res.data;
+					street = street == null ? self.business[2][0].code : street;
+					self.getVillage(street)
+				})
+			},
+
+			//获取区
+			getArea(city = null, area = null, street = null) {
+				getArea({
+					city_code: city
+				}).then(res => {
+					this.business[1] = res.data;
+					area = area == null ? this.business[1][0].code : area;
+					this.getStreet(area, street)
+				})
+			},
+
+			// 获取市
+			getCity(city = null, area = null, street = null) {
+				getCitys().then(res => {
+					this.business[0] = res.data;
+					const code = this.business[0][0].code; //市 初始化
+					city = city == null ? code : city;
+
+					this.getArea(city, area, street);
+				})
+			},
+
+			//商圈数据变化
+			pickerColumnchange(e) {
+				if (e.detail.column === 0) { //第0列
+					this.getArea(this.business[0][e.detail.value].code);
+					this.index2[0] = e.detail.value
+					this.index2[1] = 0
+					this.index2[2] = 0
+					this.index2[3] = 0
+				} else if (e.detail.column === 1) {
+					this.getStreet(this.business[1][e.detail.value].code)
+					this.index2[1] = e.detail.value
+					this.index2[2] = 0
+					this.index2[3] = 0
+				} else if (e.detail.column === 2) {
+					this.getVillage(this.business[2][e.detail.value].code)
+					this.index2[2] = e.detail.value
+					this.index2[3] = 0
+				} else if (e.detail.column == 3) {
+					this.index2[3] = e.detail.value
+				}
+			},
+
+			getConfig() {
+				this.isType = false;
+				this.showProtocol = true;
+				// 获取配置
+				this.protocol = this.sys_intention_agree;
+			},
+
+			/*获取发票说明*/
+			getAgreement() {
+				let that = this
+				that.showProtocol = true;
+				that.isType = true
+				getAgreementApi('sys_merchant_type').then(res => {
+					that.protocol = res.data.sys_merchant_type
+				})
+			},
+
+			// 获取历史提交数据详情
+			getGoodsDetails(id) {
+				getGoodsDetails(id).then(res => {
+					let resData = res.data
+					this.merchantData.enterprise_name = resData.mer_name
+					this.merchantData.user_name = resData.name
+					this.merchantData.phone = resData.phone
+					this.merchantData.social_credit_code = resData.social_credit_code
+					this.merchantData.company_name = resData.company_name
+					this.merchantData.address = resData.address
+					this.merchantData.invitation_code = resData.invitation_code
+					this.merchantData.classification = resData.merchant_category_id
+					this.merchantData.mer_type = resData.mer_type_id
+					this.city_id = resData.city_id;
+					this.area_id = resData.area_id
+					this.street_id = resData.street_id
+					this.village_id = resData.village_id;
+
+					// const bankInfo = resData.financial_bank ? JSON.parse(resData.financial_bank) : '';
+					// this.$set(this.merchantData, 'bank_code', bankInfo.bank_code);
+					// this.$set(this.merchantData, 'bank_username', bankInfo.bank);
+					// this.$set(this.merchantData, 'bank_opening', bankInfo.bank_branch);
+					// this.$set(this.merchantData, 'bank_card_username', bankInfo.name);
+					// this.bank_front = bankInfo.bank_front[0] ? bankInfo.bank_front[0] : '';
+
+					this.nature_business = resData.is_company == 1 ? 1 : 2;
+
+					this.business_license = resData.images[0];
+					resData.images.shift();
+					this.pics = resData.images;
+					this.mer_classification = this.getCategoryName(resData.merchant_category_id, this.array)
+					this.mer_storeType = this.getStoreTypeName(resData.mer_type_id, this.storeTypeArr)
+					this.business_name = '';
+
+					this.getCity(this.city_id, this.area_id, this.street_id);
+					if (resData.mer_type_id != 12) {
+						this.shoplist('mer_services_agree')
+					} else {
+						this.shoplist('mer_supply_agree')
+					}
+					uni.hideLoading();
+				})
+			},
+
+			//获取商户分类名称
+			getCategoryName(id, arr) {
+				for (let i = 0; i < arr.length; i++) {
+					if (arr[i].merchant_category_id === id) {
+						return arr[i]['category_name']
+					}
+				}
+			},
+
+			//获取店铺类型名称
+			getStoreTypeName(id, arr) {
+				for (let i = 0; i < arr.length; i++) {
+					if (arr[i].mer_type_id === id) {
+						return arr[i]['type_name']
+					}
+				}
+			},
+
+			// 选择公司性质
+			natureBusinessChange(e) {
+				this.nature_business = this.companyTypeList[e.detail.value] == '个体户' ? 2 : 1;
+			},
+
+			bindPickerChange: function(e) {
+				let idx = e.target.value;
+				this.merchantData.classification = this.array[idx]['merchant_category_id']
+				this.mer_classification = this.array[idx]['category_name']
+				this.validateBtn()
+			},
+
+			columnchange(e) {
+				if (e.detail.column == 0) {
+					this.bindPickerChangeidx = this.array[e.detail.value].children;
+				}
+			},
+
+			bindPickerChange1: function(e) {
+				this.index1 = e.target.value
+				let idx = e.target.value
+				this.merchantData.mer_type = this.storeTypeArr[idx]['mer_type_id']
+				this.mer_storeType = this.storeTypeArr[idx]['type_name']
+				this.shoplist('mer_services_agree')
+				// if (this.storeTypeArr[idx]['type_code'] == 'TypeStore' && this.merchantData.mer_type) {
+				// 	this.shoplist('mer_services_agree')
+				// } else {
+				// 	this.shoplist('mer_supply_agree')
+				// }
+				this.validateBtn()
+			},
+
+			bindPickerChange2: function(e) {
+				this.index2 = e.detail.value
+				this.business_name =
+					`${this.business[0][this.index2[0]].name} ${this.business[1][this.index2[1]].name} ${this.business[2][this.index2[2]].name} ${this.business[3][this.index2[3]].name}`
+				this.city_id = this.business[0][this.index2[0]].code;
+				this.area_id = this.business[1][this.index2[1]].code;
+				this.street_id = this.business[2][this.index2[2]].code
+				this.village_id = this.business[3][this.index2[3]].id
+			},
+
+			// 获取商户分类
+			getClassfication: function() {
+				merClassifly().then(res => {
+					this.array = res.data
+				}).catch(res => {
+					this.$util.Tips({
+						title: res
+					});
+				});
+			},
+
+			// 获取店铺类型
+			getStoreType: function() {
+				getStoreTypeApi().then(res => {
+					this.storeTypeArr = res.data
+					// 初始化默认
+					this.merchantData.mer_type = this.storeTypeArr[0].mer_type_id;
+					this.mer_storeType = this.storeTypeArr[0].type_name;
+				}).catch(res => {
+					this.$util.Tips({
+						title: res
+					});
+				});
+			},
+			// 图片预览
+			// 获得相册 idx
+			getPhotoClickIdx(e) {
+				let _this = this;
+				let idx = e.currentTarget.dataset.index;
+				_this.imgPreview(_this.pics, idx);
+			},
+			// 图片预览
+			imgPreview: function(list, idx) {
+				// list：图片 url 数组
+				if (list && list.length > 0) {
+					uni.previewImage({
+						current: list[idx], //  传 Number H5端出现不兼容
+						urls: list
+					});
+				}
+			},
+			// 授权回调
+			onLoadFun: function() {
+				this.isShowAuth = false;
+			},
+			// 授权关闭
+			authColse: function(e) {
+				this.isShowAuth = e
+			},
+			toggleTab(str) {
+				this.$refs[str].show();
+			},
+			// 首页
+			goHome() {
+				uni.switchTab({
+					url: '/pages/index/index'
+				});
+			},
+			again() {
+				this.getcaptcha()
+			},
+
+			// 上传文件
+			uploadpic: function() {
+				let that = this;
+				that.$util.uploadImageOne('upload/image', function(res) {
+					that.pics.push(res.data.path);
+					that.$set(that, 'pics', that.pics);
+				});
+			},
+
+			uploadpicBack: function() {
+				let that = this;
+				that.$util.uploadImageOne('upload/image', function(res) {
+					that.bank_front = res.data.path;
+				});
+			},
+
+			// 上传图片识别文字
+			uploadpicText: function() {
+				let that = this;
+				that.$util.uploadImageOne('upload/image', function(res) {
+					that.business_license = res.data.path;
+
+				});
+			},
+
+			// 删除图片
+			DelPic: function(index) {
+				let that = this,
+					pic = this.pics[index];
+				that.pics.splice(index, 1);
+				that.$set(that, 'pics', that.pics);
+			},
+
+			getCode() {
+				let that = this
+				getCodeApi().then(res => {
+					that.keyCode = res.data.key;
+				}).catch(res => {
+					that.$util.Tips({
+						title: res
+					});
+				});
+			},
+
+			async code(data) {
+				let that = this;
+				if (!that.merchantData.phone) return that.$util.Tips({
+					title: '请填写手机号码'
+				});
+				if (!/^1(3|4|5|7|8|9|6)\d{9}$/i.test(that.merchantData.phone)) return that.$util.Tips({
+					title: '请输入正确的手机号码'
+				});
+				await verify({
+					phone: that.merchantData.phone,
+					// key: that.codeKey,
+					// code: that.codeVal,
+					type: 'intention',
+					captchaType: 'blockPuzzle',
+					captchaVerification: data.captchaVerification
+				}).then(res => {
+					that.$util.Tips({
+						title: res.msg
+					});
+					that.sendCode();
+				}).catch(res => {
+					that.$util.Tips({
+						title: res
+					});
+				});
+			},
+
+			getcaptcha() {
+				let that = this
+				getCaptcha().then(data => {
+					that.codeUrl = data.data.captcha; //图片路径
+					that.codeVal = data.data.code; //图片验证码
+					that.codeKey = data.data.key //图片验证码key
+				})
+				that.isShowCode = true;
+			},
+
+			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);
+			},
+
+			onConfirm(val) {
+				this.region = val.checkArr[0] + '-' + val.checkArr[1] + '-' + val.checkArr[2];
+			},
+
+			ChangeIsAgree: function(e) {
+				this.isAgree = !this.isAgree;
+				this.validateBtn();
+			},
+
+			//提交
+			agree() {
+				let that = this;
+				let requestData = {
+					phone: that.merchantData.phone,
+					mer_name: that.merchantData.enterprise_name,
+					name: that.merchantData.user_name,
+					code: that.merchantData.yanzhengma,
+					company_name: that.merchantData.company_name,
+					address: that.merchantData.address,
+					invitation_code: that.merchantData.invitation_code,
+					social_credit_code: that.merchantData.social_credit_code,
+					merchant_category_id: that.merchantData.classification,
+					merchant_category_name: that.mer_classification,
+					is_company: that.nature_business == 1 ? 1 : 0, // 是否是公司, 1是公司, 0是个体
+					mer_type_id: that.merchantData.mer_type,
+					mer_storeType: this.mer_storeType,
+					city_id: this.city_id,
+					area_id: this.area_id,
+					street_id: this.street_id,
+					village_id: this.village_id,
+					is_nmsc: this.isnum,
+					images: [this.business_license, ...that.pics],
+					// financial_bank: {
+					// 	// 开户信息
+					// 	bank_code: this.merchantData.bank_code,
+					// 	bank: this.merchantData.bank_username,
+					// 	bank_branch: this.merchantData.bank_opening,
+					// 	name: this.nature_business == 1 ? that.merchantData.company_name : this.merchantData
+					// 		.bank_card_username,
+					// 	bank_front: [this.bank_front]
+					// }
+				}
+
+				that.validate = false;
+				if (that.mer_i_id) {
+					updateGoodsRecord(that.mer_i_id, requestData).then(res => {
+						if (res.status == 200) {
+							title: '提交成功',
+							that.loading = true;
+							that.timer = setTimeout(() => {
+								that.successful = true;
+								that.validate = true;
+							}, 1000)
+						}
+					}).catch(res => {
+						this.isshow = false
+						that.validate = true;
+						that.$util.Tips({
+							title: res
+						});
+					})
+				} else {
+					create(requestData).then(data => {
+						if (data.status == 200) {
+							title: '提交成功',
+							that.loading = true;
+							this.timer = setTimeout(() => {
+								that.successful = true;
+								that.validate = true;
+							}, 1000)
+						}
+					}).catch(res => {
+						this.isshow = false
+						that.validate = true;
+						that.$util.Tips({
+							title: res
+						});
+					})
+				}
+			},
+			formSubmit() {
+				if (true) {
+					if (this.merchantData.mer_type == '12') return this.agree();
+					if (this.codenote.length == 0) {
+						this.isshow = true
+						this.countDown()
+					} else {
+						if (this.codenote[0].status == 0) {
+							uni.showModal({
+								title: '申请正在审核中，请勿重复提交'
+							})
+						} else {
+							this.isshow = true
+							this.countDown()
+						}
+					}
+				}
+			},
+			validateBtn: function() {
+				let that = this,
+					value = that.merchantData;
+				if (value.enterprise_name && value.user_name && value.phone && /^1(3|4|5|7|8|9|6)\d{9}$/i.test(
+						value
+						.phone) &&
+					value.yanzhengma && that.isAgree && this.mer_classification) {
+					if (!that.isShowCode) {
+						that.validate = true;
+					} else {
+						if (that.codeVal) {
+							that.validate = true;
+						} else {
+							that.validate = false;
+						}
+					}
+				} else {
+					that.validate = false;
+				}
+			},
+			validateForm: function() {
+				let that = this,
+					value = that.merchantData;
+				if (!value.enterprise_name) return that.$util.Tips({
+					title: '请输入企业名称'
+				});
+				if (!value.social_credit_code) return that.$util.Tips({
+					title: '请输入统一社会信用代码'
+				});
+				if (!value.company_name) return that.$util.Tips({
+					title: '请输入公司名称'
+				});
+				if (!value.address) return that.$util.Tips({
+					title: '请输入详细地址'
+				});
+				if (!value.user_name) return that.$util.Tips({
+					title: '请输入姓名'
+				});
+				if (!value.phone) return that.$util.Tips({
+					title: '请输入手机号'
+				});
+				if (!/^1(3|4|5|7|8|9|6)\d{9}$/i.test(value.phone)) return that.$util.Tips({
+					title: '请输入正确的手机号码'
+				});
+				if (!value.yanzhengma) return that.$util.Tips({
+					title: '请填写验证码'
+				});
+				if (!this.mer_classification) return that.$util.Tips({
+					title: '请选择商户分类'
+				});
+				if (!this.nature_business) return that.$util.Tips({
+					title: '请选择公司性质'
+				})
+				if (!this.mer_storeType) return that.$util.Tips({
+					title: '请选择店铺类型'
+				})
+				if (!this.business_name) return that.$util.Tips({
+					title: '请选择店铺所在地'
+				})
+				if (!that.isAgree) return that.$util.Tips({
+					title: '请勾选并同意入驻协议'
+				});
+
+				if (that.isShowCode && !that.codeVal) return that.$util.Tips({
+					title: '请填写图片验证码'
+				});
+				if (!that.business_license) return that.$util.Tips({
+					title: '请上传营业执照'
+				});
+
+
+				// if (this.nature_business == 1 && !this.merchantData.bank_code) {
+				// 	return that.$util.Tips({
+				// 		title: '请输入对公账号'
+				// 	});
+				// }
+
+				// if (this.nature_business != 1 && !this.merchantData.bank_code) {
+				// 	return that.$util.Tips({
+				// 		title: '请输入银行卡号'
+				// 	});
+				// }
+
+				// if (!this.merchantData.bank_username) {
+				// 	return that.$util.Tips({
+				// 		title: '请输入开户银行'
+				// 	});
+				// }
+
+				// if (!this.merchantData.bank_opening) {
+				// 	return that.$util.Tips({
+				// 		title: '请输入开户网点'
+				// 	});
+				// }
+
+				// if (this.nature_business == 0 && !this.merchantData.bank_card_username) {
+				// 	return that.$util.Tips({
+				// 		title: '请输入持卡人姓名'
+				// 	});
+				// }
+
+				that.validate = true;
+				return true;
+			},
+			jumpToList() {
+				uni.navigateTo({
+					url: "/pages/store/applicationRecord/index"
+				})
+			},
+			success(data) {
+				this.$refs.verify.hide();
+				this.code(data);
+			},
+			handleVerify() {
+				if (!this.merchantData.phone) return this.$util.Tips({
+					title: '请输入手机号'
+				});
+
+				if (!/^1(3|4|5|7|8|9|6)\d{9}$/i.test(this.merchantData.phone)) return this.$util.Tips({
+					title: '请输入正确的手机号码'
+				});
+				if (!this.isAgree) return this.$util.Tips({
+					title: '请勾选并同意入驻协议'
+				});
+				this.$refs.verify.show();
+			}
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	.page {
+		width: 750rpx;
+		height: 2400rpx;
+		// background: linear-gradient(180deg, #44AF38 0%, #72BE53 100%);
+	}
+
+	.header {
+		// height: 440rpx;
+		width: 100%;
+		text-align: center;
+		// background-color: transparent;
+		// background-image: url(https://lihai001.oss-cn-chengdu.aliyuncs.com/def/96ec1202403151608564555.webp);
+		// background-position: center;
+
+		.title-bar {
+			position: fixed;
+			top: 0;
+			height: 88rpx;
+			line-height: 88rpx;
+			width: 100%;
+			z-index: 11;
+
+			.title-bar-icon {
+				position: absolute;
+				left: 30rpx;
+
+				.icon-xiangzuo {
+					font-size: 40rpx;
+					text-align: left;
+					color: #fff;
+				}
+			}
+
+			.title-bar-txt {
+				text-align: center;
+				color: black;
+			}
+		}
+	}
+
+	/deep/checkbox .uni-checkbox-input.uni-checkbox-input-checked,
+	/deep/checkbox .wx-checkbox-input.wx-checkbox-input-checked {
+		border: 1px solid var(--view-theme) !important;
+		background-color: var(--view-theme) !important;
+		color: #fff !important;
+	}
+
+
+	.conten-top {
+		width: 100%;
+		text-align: center;
+		background-color: transparent;
+		position: absolute;
+		top: 0;
+		position: fixed;
+		z-index: 10;
+	}
+
+	.uni-input-placeholder {
+		color: #B2B2B2;
+	}
+
+	.bar-top-bg {
+		background-color: white;
+	}
+
+	.item-name {
+		width: 190rpx;
+	}
+
+	.uni-list-cell {
+		position: relative;
+
+		.iconfont {
+			font-size: 14px;
+			color: #7a7a7a;
+			position: absolute;
+			right: 15px;
+			top: 7rpx;
+		}
+
+		.icon-guanbi2 {
+			right: 35px;
+		}
+	}
+
+	.merchantBgCount {
+		line-height: 0;
+	}
+
+	.merchantsSettled {
+		// background-image: linear-gradient(var(--view-bntColor21) 0%, var(--view-bntColor22) 100%);
+		min-height: 3200rpx;
+		position: relative;
+	}
+
+	.merchantsSettled .merchantBg {
+		width: 750rpx;
+		width: 100%;
+	}
+
+	.merchantsSettled .list {
+		background-color: #fff;
+		border-radius: 12px;
+		padding: 22px 0;
+		margin: 0 15px;
+		position: absolute;
+		top: 400rpx;
+		width: calc(100% - 30px);
+	}
+
+	.list-title {
+		position: relative;
+		font-weight: 600;
+		font-size: 30rpx;
+		color: #40AE36;
+		text-align: center;
+		margin-bottom: 40rpx;
+
+		&::after {
+			content: "";
+			display: inline-block;
+			position: absolute;
+			bottom: 0;
+			left: 50%;
+			transform: translateX(-50%);
+			width: 233rpx;
+			height: 14rpx;
+			// background: #40AE36;
+			opacity: 0.36;
+			filter: blur(6px);
+		}
+	}
+
+	.application-record {
+		position: absolute;
+		display: flex;
+		align-items: center;
+		top: 320rpx;
+		right: 0;
+		color: red;
+		font-size: 22rpx;
+		background-color: rgba(0, 0, 0, 0.3);
+		padding: 8rpx 18rpx;
+		border-radius: 20px 0px 0px 20px;
+	}
+
+	.merchantsSettled .list .item {
+		padding: 50rpx 0 20rpx;
+		border-bottom: 1px solid #eee;
+		position: relative;
+		margin: 0 20px;
+
+		&.no-border {
+			border-bottom: none;
+			padding-left: 0;
+			padding-right: 0;
+		}
+
+		.item-title {
+			color: #666666;
+			font-size: 28rpx;
+			display: block;
+		}
+
+		.item-desc {
+			color: #B2B2B2;
+			font-size: 22rpx;
+			display: block;
+			margin-top: 9rpx;
+			line-height: 36rpx;
+		}
+	}
+
+	.acea-row,
+	.upload {
+		display: -webkit-box;
+		display: -moz-box;
+		display: -webkit-flex;
+		display: -ms-flexbox;
+		display: flex;
+		-webkit-box-lines: multiple;
+		-moz-box-lines: multiple;
+		-o-box-lines: multiple;
+		-webkit-flex-wrap: wrap;
+		-ms-flex-wrap: wrap;
+		flex-wrap: wrap;
+	}
+
+	.upload {
+		margin-top: 20rpx;
+	}
+
+	.acea-row.row-middle {
+		-webkit-box-align: center;
+		-moz-box-align: center;
+		-o-box-align: center;
+		-ms-flex-align: center;
+		-webkit-align-items: center;
+		align-items: center;
+		padding-left: 2px;
+	}
+
+	.acea-row.row-column {
+		-webkit-box-orient: vertical;
+		-moz-box-orient: vertical;
+		-o-box-orient: vertical;
+		-webkit-flex-direction: column;
+		-ms-flex-direction: column;
+		flex-direction: column;
+	}
+
+	.acea-row.row-center-wrapper {
+		-webkit-box-align: center;
+		-moz-box-align: center;
+		-o-box-align: center;
+		-ms-flex-align: center;
+		-webkit-align-items: center;
+		align-items: center;
+		-webkit-box-pack: center;
+		-moz-box-pack: center;
+		-o-box-pack: center;
+		-ms-flex-pack: center;
+		-webkit-justify-content: center;
+		justify-content: center;
+	}
+
+	.merchantsSettled .list .item .pictrue {
+		width: 130rpx;
+		height: 130rpx;
+		margin: 24rpx 22rpx 0 0;
+		position: relative;
+		font-size: 11px;
+		color: #bbb;
+
+		&:nth-child(4n) {
+			margin-right: 0;
+		}
+
+		&:nth-last-child(1) {
+			border: 0.5px solid #ddd;
+			box-sizing: border-box;
+		}
+
+		uni-image,
+		image {
+			width: 100%;
+			height: 100%;
+			border-radius: 1px;
+
+			img {
+				-webkit-touch-callout: none;
+				-webkit-user-select: none;
+				-moz-user-select: none;
+				display: block;
+				position: absolute;
+				top: 0;
+				left: 0;
+				opacity: 0;
+				width: 100%;
+				height: 100%;
+			}
+		}
+
+		.icon-guanbi1 {
+			font-size: 33rpx;
+			position: absolute;
+			top: -10px;
+			right: -10px;
+		}
+	}
+
+	.uni-list-cell-db {
+		position: relative;
+	}
+
+	.wenhao {
+		width: 34rpx;
+		height: 34rpx;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		font-size: 28rpx;
+		border-radius: 50%;
+		background: #E3E3E3;
+		color: #ffffff !important;
+		margin-left: 4rpx;
+		position: absolute;
+		left: 122rpx;
+	}
+
+	.merchantsSettled .list .item .imageCode {
+		position: absolute;
+		top: 7px;
+		right: 0;
+	}
+
+	.merchantsSettled .list .item .icon {
+		font-size: 40rpx;
+		color: #b4b1b4;
+	}
+
+	.merchantsSettled .list .item input {
+		width: 400rpx;
+		font-size: 30rpx;
+	}
+
+	.merchantsSettled .list .item .placeholder {
+		color: #b2b2b2;
+	}
+
+	.merchantsSettled .default {
+		padding: 0 30rpx;
+		height: 90rpx;
+		background-color: #fff;
+		margin-top: 23rpx;
+	}
+
+	.merchantsSettled .default checkbox {
+		margin-right: 15rpx;
+	}
+
+	.merchantsSettled .acea-row uni-image {
+		width: 20px;
+		height: 20px;
+		display: block;
+	}
+
+	.merchantsSettled .list .item .codeIput {
+		width: 125px;
+	}
+
+	.uni-input-input {
+		display: block;
+		height: 100%;
+		background: none;
+		color: inherit;
+		opacity: 1;
+		-webkit-text-fill-color: currentcolor;
+		font: inherit;
+		line-height: inherit;
+		letter-spacing: inherit;
+		text-align: inherit;
+		text-indent: inherit;
+		text-transform: inherit;
+		text-shadow: inherit;
+	}
+
+	.merchantsSettled .list .item .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;
+	}
+
+	.merchantsSettled .list .item .code.on {
+		background-color: #bbb;
+		color: #fff;
+		border-color: #bbb;
+	}
+
+	.merchantsSettled .submitBtn {
+		width: 588rpx;
+		margin: 0 auto;
+		height: 86rpx;
+		border-radius: 25px;
+		text-align: center;
+		line-height: 86rpx;
+		font-size: 15px;
+		color: #fff;
+		background: #E3E3E3;
+		margin-top: 25px;
+		// pointer-events: none;
+	}
+
+	.merchantsSettled .submitBtn.on {
+		background: var(--view-theme);
+		pointer-events: all;
+	}
+
+	uni-checkbox-group,
+	.settleAgree {
+		display: inline-block;
+		font-size: 24rpx;
+	}
+
+	uni-checkbox-group {
+		color: #b2b2b2;
+	}
+
+	.settleAgree {
+		color: var(--view-theme);
+		position: relative;
+		top: 2px;
+		left: 8px;
+	}
+
+	.merchantsSettled uni-checkbox .uni-checkbox-wrapper {
+		width: 30rpx;
+		height: 30rpx;
+		border: 2rpx solid #C3C3C3;
+		border-radius: 15px;
+	}
+
+	.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;
+	}
+
+	.setAgCountbtn {
+		display: flex;
+		justify-content: space-around;
+		position: relative;
+
+		.setAgCountbtna {
+			margin-top: 40rpx;
+			// width: 200rpx;
+			height: 74rpx;
+			text-align: center;
+			line-height: 74rpx;
+			border-radius: 46rpx 46rpx;
+			opacity: 1;
+			border: 2rpx solid #B3B3B3;
+			font-size: 25rpx;
+			font-family: PingFang SC-Medium, PingFang SC;
+			font-weight: 500;
+			color: #737373;
+
+		}
+
+		.setAgCountbtnb {
+			margin-top: 40rpx;
+			padding-left: 20rpx;
+			padding-right: 20rpx;
+			height: 74rpx;
+			text-align: center;
+			line-height: 74rpx;
+			background: #cecece;
+			border-radius: 46rpx 46rpx;
+			opacity: 1;
+
+			font-size: 25rpx;
+			font-family: PingFang SC-Medium, PingFang SC;
+			font-weight: 500;
+			color: #fff;
+
+		}
+
+		.setAgCountbtnc {
+			margin-top: 40rpx;
+			height: 74rpx;
+			text-align: center;
+			line-height: 74rpx;
+			background: linear-gradient(270deg, #3da834 0%, #72BE53 100%);
+			border-radius: 46rpx 46rpx;
+			opacity: 1;
+			font-size: 25rpx;
+			font-family: PingFang SC-Medium, PingFang SC;
+			font-weight: 500;
+			color: #fff;
+
+		}
+
+		.border {
+			position: absolute;
+			top: 0;
+			left: -28rpx;
+			width: 100vw;
+			height: 100%;
+			border-radius: 40rpx 40rpx 0 0;
+			box-shadow: 0px -5px 5px -2px rgba(0, 0, 0, 0.2);
+			/* 在上边框添加阴影 */
+		}
+
+		.btn {
+			width: 694rpx;
+			font-weight: bold;
+			font-size: 34rpx;
+		}
+	}
+
+	.settledSuccessMain {
+		height: 100vh;
+		display: flex;
+		flex-direction: column;
+		background: #fff;
+	}
+
+	.settledSuccessful {
+		flex: 1;
+		width: 100%;
+		padding: 0 56px;
+		height: auto;
+		background: #fff;
+		text-align: center;
+	}
+
+	.settledSuccessful .image {
+		width: 189px;
+		height: 157px;
+		margin-top: 66px;
+	}
+
+	.settledSuccessful .title {
+		color: #333333;
+		font-size: 16px;
+		font-weight: bold;
+		margin-top: 35px;
+	}
+
+	.settledSuccessful .info {
+		color: #A0A0A0;
+		font-size: 13px;
+		margin-top: 12px;
+	}
+
+	.settledSuccessful .goHome {
+		margin: 60px auto 0;
+		line-height: 43px;
+		color: #282828;
+		font-size: 15px;
+		border: 1px solid #B4B4B4;
+		border-radius: 60px;
+	}
+
+	/deep/ uni-checkbox .uni-checkbox-input {
+		width: 15px;
+		height: 15px;
+		position: relative;
+	}
+
+	/deep/ uni-checkbox .uni-checkbox-input.uni-checkbox-input-checked:before {
+		font-size: 14px;
+	}
+
+	.loadingicon {
+		height: 100vh;
+		overflow: hidden;
+		position: absolute;
+		top: 0;
+		left: 0;
+	}
+
+	.icon-xiangyou {
+		font-size: 22rpx;
+	}
+
+	// #ifdef MP
+	checkbox-group {
+		display: inline-block;
+	}
+
+	// #endif
+	.setAgCount {
+		/deep/ table {
+			border: 1px solid #DDD;
+			border-bottom: none;
+			border-right: none;
+		}
+
+		/deep/ td,
+		th {
+			padding: 5rpx 10rpx;
+			border-bottom: 1px solid #DDD;
+			border-right: 1px solid #DDD;
+		}
+	}
+
+	.merchantsSettled .list .items {
+		padding: 50rpx 0 20rpx;
+		border-bottom: 1px solid #eee;
+		position: relative;
+		margin: 0 20px;
+
+		.uni-list-area {
+			height: 50px;
+			display: flex;
+			justify-content: flex-start;
+			align-items: center;
+
+			.uni-list-stree {
+				width: 30%;
+				margin-left: 10px;
+
+				.mer-area {
+					width: 100%;
+					border: 1px solid #C3C3C3;
+
+					picker {
+						display: flex;
+					}
+
+					input {
+						width: 100%;
+						font-size: 30rpx;
+
+					}
+				}
+			}
+		}
+
+	}
+</style>
\ No newline at end of file
diff --git a/pages/user/index.vue b/pages/user/index.vue
index 5738025..63de690 100644
--- a/pages/user/index.vue
+++ b/pages/user/index.vue
@@ -176,11 +176,11 @@
 				<view class="user-menus" style="margin-top: 20rpx;">
 					<view class="title skeleton-rect">我的服务</view>
 					<view class="menu-box">
-						<block v-for="(item,index) in personalMenu" :key="index">
-							<view v-if="item.isShow" class="item">
+						<block v-for="(item,index) in personalMenu" :key="index" :id="'target'+index">
+							<view v-if="item.isShow" class="item ">
 								<view @click="authTo(item.url)" class="item-count">
 									<image v-if="showSkeleton" class="skeleton_image skeleton-radius"></image>
-									<image v-else :src="item.pic"></image>
+									<image v-else :src="item.pic" class="targets"></image>
 									<text>{{item.name}}</text>
 								</view>
 							</view>
@@ -333,9 +333,11 @@
 		},
 		data() {
 			return {
+				elInfo: '',
 				//#ifdef H5
 				isWeixin: this.$wechat.isWeixin(),
 				//#endif
+				subNvue: '',
 				domain: HTTP_REQUEST_URL,
 				showSkeleton: true, //骨架屏显示隐藏
 				isNodes: 0, //控制什么时候开始抓取元素节点,只要数值改变就重新抓取
@@ -460,6 +462,9 @@
 		},
 		onLoad() {
 			// #ifdef APP-PLUS
+			uni.$on('offuserSubnvue', () => {
+				this.subNvue.hide('slide-out-right');
+			})
 			this.appVersion = 'V ' + uni.getSystemInfoSync().appWgtVersion;
 			// #endif
 			// #ifdef H5
@@ -468,12 +473,52 @@
 			if (ENV != 'prod') this.appVersion += " Beta"
 		},
 		onReady() {
+			// #ifdef APP
 			this.isNodes++;
+			let that = this
+			// setTimeout(() => {
+			// 	const query = uni.createSelectorQuery().in(this);
+			// 	query
+			// 		.select(".targets")
+			// 		.boundingClientRect((data) => {
+			// 			that.elInfo = data
+			// 			// #ifdef APP-PLUS
+			// 			if (Boolean(uni.getStorageSync('newStore'))) {
+			// 				that.subNvue = uni.getSubNVueById('userSubnvu')
+			// 				that.subNvue.show('slide-in-left', 300)
+			// 				uni.$emit('openUserSubnvue', JSON.stringify(data))
+			// 			}
+			// 			// #endif
+			// 		})
+			// 		.exec();
+			// }, 500)
+
+			// #endif
+
+
 		},
 		mounted: function() {
 			this.getVersion()
 		},
 		onShow: function() {
+			// #ifdef APP-PLUS
+			setTimeout(() => {
+				const query = uni.createSelectorQuery().in(this);
+				query
+					.select(".targets")
+					.boundingClientRect((data) => {
+						that.elInfo = data
+						// #ifdef APP-PLUS
+						if (Boolean(uni.getStorageSync('newStore'))) {
+							that.subNvue = uni.getSubNVueById('userSubnvu')
+							that.subNvue.show('slide-in-left', 300)
+							uni.$emit('openUserSubnvue', JSON.stringify(data))
+						}
+						// #endif
+					})
+					.exec();
+			}, 800)
+			// #endif
 			let that = this;
 			let routes = getCurrentPages();
 			let curRoute = routes[routes.length - 1].route
diff --git a/pages/user/subnvue/index.nvue b/pages/user/subnvue/index.nvue
new file mode 100644
index 0000000..b006c37
--- /dev/null
+++ b/pages/user/subnvue/index.nvue
@@ -0,0 +1,179 @@
+<template>
+	<view class="">
+		<view class="jump" @click="next">
+			<text class="font">跳过</text>
+		</view>
+		<view class="next-btn center" :style="{ left:screenWidth/2,top:(screenHeight-96)}">
+			<text class="next-btn-text font" style="line-height: 76rpx;" @click="next">我知道了</text>
+		</view>
+		<view class="target" :style="{left:left-20,top:top-13.5}">
+			<image src="http://lihai001.oss-cn-chengdu.aliyuncs.com/def/6202d269b6163b9ec7a4383559fc67a8.png"
+				class="target-icon"></image>
+			<text class="target-text">商家入驻</text>
+		</view>
+		<view :style="{left:left-20+'px',top:top-70+'px'}" class="trans1">
+			<image src="/static/images/pointer.png" style="width: 254rpx;height: 254rpx;"></image>
+		</view>
+		<view class="tips-box" :style="{left:left-13.5,top:top-154}">
+			<view class="tips" style="position: absolute;padding-left: 20px;">
+				<view class="tras" :class="{act:isAct}">
+					<text style="font-size: 28rpx;line-height: 100rpx;color: white;">点击我的页面，进行商户入驻</text>
+				</view>
+			</view>
+			<image src="/static/images/starpng.png" class="start" mode="">
+			</image>
+		</view>
+		<image src="/static/images/greenLine.png" class="greenLine" :style="{left:left-3.5,top:top-70}" mode="">
+		</image>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				screenHeight: 0,
+				screenWidth: 0,
+				isAct: false,
+				left: -100,
+				top: -100,
+			}
+		},
+		methods: {
+			next() {
+				uni.$emit('offuserSubnvue');
+				uni.setStorageSync("newStore", false)
+			}
+		},
+		onLoad() {
+			let that = this
+			uni.$on('openUserSubnvue', (data) => {
+				console.log('data')
+				console.log(data)
+				this.left = JSON.parse(data).left
+				this.top = JSON.parse(data).top
+				console.log(this.left, this.top)
+			})
+			const res = uni.getSystemInfo({
+				success: (res => {
+					this.screenHeight = res.screenHeight
+					this.screenWidth = res.screenWidth
+
+				})
+			});
+			setTimeout(() => {
+				that.isAct = true
+			}, 500)
+		}
+
+
+	}
+</script>
+
+<style>
+	.jump {
+		position: absolute;
+		right: 30rpx;
+		top: 80rpx;
+		border: 1px solid white;
+		padding: 10rpx 20rpx;
+		border-radius: 30rpx;
+	}
+
+	.font {
+		font-size: 28rpx;
+		color: white;
+		lines: 1;
+		text-align: center;
+	}
+
+	.center {
+		transform: translateX(-50%);
+	}
+
+	.next-btn {
+		position: absolute;
+		width: 240rpx;
+		height: 76rpx;
+		border: 1px solid white;
+		border-radius: 38rpx;
+		background: rgba(255, 255, 255, 0.4);
+	}
+
+	.target {
+		width: 136rpx;
+		height: 136rpx;
+		background-color: white;
+		border-radius: 136rpx;
+	}
+
+	.target-icon {
+		width: 50rpx;
+		height: 50rpx;
+		position: absolute;
+		left: 68rpx;
+		transform: translate(-50%, -50%);
+		top: 68rpx;
+	}
+
+	.target-text {
+		font-size: 20rpx;
+		position: absolute;
+		left: 68rpx;
+		transform: translate(-50%, 0);
+		top: 100rpx;
+	}
+
+	.pointer {
+		position: absolute;
+	}
+
+	.tips-box {
+		width: 462rpx;
+		height: 178rpx;
+		position: absolute;
+		padding-top: 72rpx;
+		position: absolute;
+	}
+
+	.start {
+		width: 72rpx;
+		height: 72rpx;
+		position: absolute;
+		right: 0;
+		top: 20px;
+	}
+
+	.tips {
+		width: 462rpx;
+		height: 106rpx;
+		background-color: #5BE157;
+		border-radius: 20rpx;
+
+	}
+
+	.tras {
+		width: 0px;
+		transition-property: width;
+		transition-duration: 3s;
+		transition-delay: 0.1s;
+		transition-timing-function: cubic-bezier(0.25, 0.1, 0.25, 1.0);
+	}
+
+	.trans1 {
+		/* transition-property: left, top;
+		transition-duration: 3s;
+		transition-delay: 0.1s;
+		transition-timing-function: cubic-bezier(0.25, 0.1, 0.25, 1.0); */
+	}
+
+	.act {
+		width: 462rpx;
+	}
+
+	.greenLine {
+		width: 35px;
+		height: 60px;
+		position: absolute;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/users/login/index.vue b/pages/users/login/index.vue
index 3669a20..e40e0de 100644
--- a/pages/users/login/index.vue
+++ b/pages/users/login/index.vue
@@ -1,6 +1,7 @@
 <template>
 	<div :style="viewColor">
-		<div class="register_main" :style="{ 'background-image': formItem == 1 ? `url(${domain}/static/images/logo_bgl.png)` : `url(${domain}/static/images/logo_bgh.png)`}">
+		<div class="register_main"
+			:style="{ 'background-image': formItem == 1 ? `url(${domain}/static/images/logo_bgl.png)` : `url(${domain}/static/images/logo_bgh.png)`}">
 			<view class="system-height" :style="{ height: statusBarHeight }"></view>
 			<!-- #ifdef APP-PLUS -->
 			<view class="title-bar" style="height: 43px;">
@@ -21,12 +22,15 @@
 					<div class="list" :hidden="current !== 0">
 						<form @submit.prevent="submit">
 							<div class="item">
-								<input type="text" placeholder="请输入手机号或账号" placeholder-class="placeholder" v-model="account" required />
+								<input type="text" placeholder="请输入手机号或账号" placeholder-class="placeholder"
+									v-model="account" required />
 							</div>
 							<div class="item">
-								<input type="password" placeholder="填写登录密码" placeholder-class="placeholder" v-model="password" required />
-								<navigator class="forgetPwd" hover-class="none" url="/pages/users/retrievePassword/index">
-									忘记密码
+								<input type="password" placeholder="填写登录密码" placeholder-class="placeholder"
+									v-model="password" required />
+								<navigator class="forgetPwd" hover-class="none"
+									url="/pages/users/retrievePassword/index">
+									忘记密we码
 								</navigator>
 							</div>
 						</form>
@@ -37,8 +41,10 @@
 							<input type="text" placeholder="输入手机号码" placeholder-class="placeholder" v-model="account" />
 						</div>
 						<div class="item">
-							<input type="text" placeholder="填写验证码" placeholder-class="placeholder" class="codeIput" v-model="captcha" />
-							<button class="code" :disabled="disabled" :class="disabled === true ? 'on' : ''" @click="handleVerify">
+							<input type="text" placeholder="填写验证码" placeholder-class="placeholder" class="codeIput"
+								v-model="captcha" />
+							<button class="code" :disabled="disabled" :class="disabled === true ? 'on' : ''"
+								@click="handleVerify">
 								{{ text }}
 							</button>
 						</div>
@@ -49,11 +55,13 @@
 					<div class="tip">
 						<text v-if="current==0" @click="current = 1">手机号登录</text>
 						<text v-else @click="current = 0">账号登录</text>
-					</div>	
+					</div>
 					<div class="protocol acea-row row-between-wrapper">
 						<checkbox-group class="checkgroup" @change='isAgree=!isAgree'>
 							<checkbox class="checkbox" :checked="isAgree ? true : false" />
-							<text class="protocol_text">我已同意<text @click="userAgree" class="font_pro">《用户协议》</text>与<text @click="userPrivacyAgree" class="font_pro">《隐私政策》</text></text>
+							<text class="protocol_text">我已同意<text @click="userAgree"
+									class="font_pro">《用户协议》</text>与<text @click="userPrivacyAgree"
+									class="font_pro">《隐私政策》</text></text>
 						</checkbox-group>
 					</div>
 					<!-- #ifdef APP-PLUS -->
@@ -83,17 +91,23 @@
 							<input type="text" placeholder="请输入手机号" placeholder-class="placeholder" v-model="account" />
 						</div>
 						<div class="item">
-							<input type="text" placeholder="填写验证码" placeholder-class="placeholder" class="codeIput" v-model="captcha" />
-							<button class="code" :disabled="disabled" :class="disabled === true ? 'on' : ''" @click="handleVerify">
+							<input type="text" placeholder="填写验证码" placeholder-class="placeholder" class="codeIput"
+								v-model="captcha" />
+							<button class="code" :disabled="disabled" :class="disabled === true ? 'on' : ''"
+								@click="handleVerify">
 								{{ text }}
 							</button>
 						</div>
 						<div class="item">
-							<input type="password" placeholder="填写您的登录密码" placeholder-class="placeholder" v-model="password" />
+							<input type="password" placeholder="填写您的登录密码" placeholder-class="placeholder"
+								v-model="password" />
 						</div>
 						<div class="item" v-if="isShowCode">
-							<input type="text" placeholder="填写验证码" placeholder-class="placeholder" class="codeIput" v-model="codeVal" />
-							<div class="code" @click="getcaptcha"><image class="code-img" style="width: 100%;height: 100%;" :src="codeUrl" /></div>
+							<input type="text" placeholder="填写验证码" placeholder-class="placeholder" class="codeIput"
+								v-model="codeVal" />
+							<div class="code" @click="getcaptcha">
+								<image class="code-img" style="width: 100%;height: 100%;" :src="codeUrl" />
+							</div>
 						</div>
 					</div>
 					<div class="tip">
@@ -104,7 +118,9 @@
 					<div class="protocol acea-row row-between-wrapper">
 						<checkbox-group class="checkgroup" @change='isAgree=!isAgree'>
 							<checkbox class="checkbox" :checked="isAgree ? true : false" />
-							<text class="protocol_text">我已同意<text @click="userAgree" class="font_pro">《用户协议》</text>与<text @click="userPrivacyAgree" class="font_pro">《隐私政策》</text></text>			
+							<text class="protocol_text">我已同意<text @click="userAgree"
+									class="font_pro">《用户协议》</text>与<text @click="userPrivacyAgree"
+									class="font_pro">《隐私政策》</text></text>
 						</checkbox-group>
 					</div>
 					<!-- #ifdef APP-PLUS -->
@@ -123,7 +139,7 @@
 							</view>
 						</view>
 					</view>
-					<!-- #endif -->			
+					<!-- #endif -->
 				</div>
 				<div class="bottom"></div>
 			</div>
@@ -135,21 +151,27 @@
 						</view>
 						<view class="list">
 							<view class="item">
-								<input type='number' placeholder='填写手机号码' placeholder-class='placeholder' v-model="account"></input>
+								<input type='number' placeholder='填写手机号码' placeholder-class='placeholder'
+									v-model="account"></input>
 							</view>
 							<view class="item">
-								<input type='number' placeholder='填写验证码' placeholder-class='placeholder' class="codeIput" v-model="captcha"></input>
-								<button class="code" :class="disabled === true ? 'on' : ''" :disabled='disabled' @click="handleVerify">
+								<input type='number' placeholder='填写验证码' placeholder-class='placeholder'
+									class="codeIput" v-model="captcha"></input>
+								<button class="code" :class="disabled === true ? 'on' : ''" :disabled='disabled'
+									@click="handleVerify">
 									{{ text }}
 								</button>
 							</view>
 							<view class="item">
-								<input type='password' placeholder='填写登录密码' placeholder-class='placeholder' v-model="password"></input>
+								<input type='password' placeholder='填写登录密码' placeholder-class='placeholder'
+									v-model="password"></input>
 							</view>
 							<view class="protocol acea-row">
 								<checkbox-group class="checkgroup" @change='isAgree=!isAgree'>
 									<checkbox class="checkbox" :checked="isAgree ? true : false" />
-									<text class="protocol_text">您已同意<text @click="userAgree" class="font_pro">《用户协议》</text>与<text @click="userPrivacyAgree" class="font_pro">《隐私政策》</text></text>			
+									<text class="protocol_text">您已同意<text @click="userAgree"
+											class="font_pro">《用户协议》</text>与<text @click="userPrivacyAgree"
+											class="font_pro">《隐私政策》</text></text>
 								</checkbox-group>
 							</view>
 						</view>
@@ -157,10 +179,11 @@
 						<button form-type="submit" @click="auth_token = ''" class="logon back">返回</button>
 					</view>
 				</view>
-				
+
 			</form>
 			<view class="copyright" @click="goCopyUrl">{{copyData}}</view>
-			<Verify @success="success" :captchaType="'blockPuzzle'" :imgSize="{ width: '330px', height: '155px' }" ref="verify"></Verify>
+			<Verify @success="success" :captchaType="'blockPuzzle'" :imgSize="{ width: '330px', height: '155px' }"
+				ref="verify"></Verify>
 		</div>
 	</div>
 </template>
@@ -190,7 +213,10 @@
 		loginMpPhone
 	} from "@/api/user";
 	// #ifdef APP-PLUS
-	import { wechatAppAuth, appleAppAuth } from '@/api/api.js'
+	import {
+		wechatAppAuth,
+		appleAppAuth
+	} from '@/api/api.js'
 	// #endif
 	import attrs, {
 		required,
@@ -209,10 +235,16 @@
 		VUE_APP_API_URL,
 		configMap
 	} from "@/utils";
-	import { HTTP_REQUEST_URL } from '@/config/app';
+	import {
+		HTTP_REQUEST_URL
+	} from '@/config/app';
 	import parser from "@/components/jyf-parser/jyf-parser";
-	import { commonAuth } from '../../../api/public';
-	import { mapGetters} from "vuex";
+	import {
+		commonAuth
+	} from '../../../api/public';
+	import {
+		mapGetters
+	} from "vuex";
 	import Verify from '@/components/verify/verify.vue';
 	const BACK_URL = "login_back_url";
 
@@ -253,13 +285,14 @@
 				copyright: {}
 			};
 		},
-		computed:{
-			...configMap(['login_logo','wechat_phone_switch'], mapGetters(['viewColor'])),
+		computed: {
+			...configMap(['login_logo', 'wechat_phone_switch'], mapGetters(['viewColor'])),
 			copyData() {
-				let copy = this.copyright.status == -1 ? this.copyright.year+" "+this.copyright.url : this.copyright.Copyright
+				let copy = this.copyright.status == -1 ? this.copyright.year + " " + this.copyright.url : this.copyright
+					.Copyright
 				return copy;
 			}
-		}, 
+		},
 		watch: {
 			formItem: function(nval, oVal) {
 				if (nval == 1) {
@@ -282,37 +315,37 @@
 		mounted: function() {
 			this.getVersion();
 		},
-		onReady(){
+		onReady() {
 			let that = this
 			// #ifdef MP
 			wx.login({
-			  success (res) {
-			    if (res.code) {
-			     that.codeVal = res.code
-			    } else {
-			      console.log('登录失败！' + res.errMsg)
-			    }
-			  }
+				success(res) {
+					if (res.code) {
+						that.codeVal = res.code
+					} else {
+						console.log('登录失败！' + res.errMsg)
+					}
+				}
 			})
 			// #endif
 		},
-    onShow() {
-      uni.setStorageSync('tabbar_sale_type', 1);
-    },
+		onShow() {
+			uni.setStorageSync('tabbar_sale_type', 1);
+		},
 		methods: {
 			// #ifdef MP
-			getPhoneNumber(e) {	
+			getPhoneNumber(e) {
 				let that = this;
-				if(!that.isAgree){
+				if (!that.isAgree) {
 					return that.$util.Tips({
 						title: '请勾选用户协议与隐私政策'
 					});
-				}else{
+				} else {
 					loginMpPhone({
-						iv:e.detail.iv,
-						encryptedData:e.detail.encryptedData,
-						code:that.codeVal,
-						auth_token: uni.getStorageSync('auth_token'),
+							iv: e.detail.iv,
+							encryptedData: e.detail.encryptedData,
+							code: that.codeVal,
+							auth_token: uni.getStorageSync('auth_token'),
 						}).then(({
 							data
 						}) => {
@@ -324,10 +357,11 @@
 							});
 							that.$store.commit("SETUID", data.user.uid);
 							that.$store.commit('UPDATE_USERINFO', data.user);
-					
+
 							let method
-							let indexPat = ['/pages/index/index', '/pages/order_addcart/order_addcart', '/pages/goods_cate/goods_cate',
-								'/pages/user/index','/pages/plant_grass/index'
+							let indexPat = ['/pages/index/index', '/pages/order_addcart/order_addcart',
+								'/pages/goods_cate/goods_cate',
+								'/pages/user/index', '/pages/plant_grass/index'
 							]
 							if (indexPat.includes(this.getPath(backUrl))) {
 								method = 'switchTab'
@@ -350,7 +384,7 @@
 							});
 						});
 				}
-				
+
 			},
 			// #endif
 			goCopyUrl() {
@@ -358,20 +392,20 @@
 				location.href = this.copyright.url
 				// #endif
 			},
-			userAgree(){
+			userAgree() {
 				uni.navigateTo({
 					url: '/pages/users/user_about/index?from=sys_user_agree'
 				})
 			},
-			userPrivacyAgree(){
+			userPrivacyAgree() {
 				uni.navigateTo({
 					url: '/pages/users/user_about/index?from=sys_userr_privacy'
 				})
 			},
 			getSystem(system) {
-				if(system.indexOf('iOS') === -1){
+				if (system.indexOf('iOS') === -1) {
 					return system
-				}else{
+				} else {
 					let str = system.split(' ')[1]
 					if (str.indexOf('.')) {
 						return Number(str.split('.')[0])
@@ -388,11 +422,11 @@
 			// 苹果登录
 			appleLogin() {
 				let self = this
-				if(!self.isAgree){
+				if (!self.isAgree) {
 					return self.$util.Tips({
 						title: '请勾选用户协议与隐私政策'
 					});
-				}else{
+				} else {
 					this.account = ''
 					this.captcha = ''
 					uni.showLoading({
@@ -431,19 +465,21 @@
 					})
 				}
 			},
-			appleLoginApi(){
+			appleLoginApi() {
 				let that = this
 				commonAuth({
 					auth: {
-						type:'apple',
+						type: 'apple',
 						auth: {
 							userInfo: that.appleUserInfo,
 							openId: that.appleUserInfo.openId,
-							nickname: (that.appleUserInfo.fullName.familyName || '') + (that.appleUserInfo.fullName.giveName || ''),
+							nickname: (that.appleUserInfo.fullName.familyName || '') + (that.appleUserInfo.fullName
+								.giveName || ''),
 						}
-				}}).then(res => {
+					}
+				}).then(res => {
 					const data = res.data;
-					if(res.data.status == 200){
+					if (res.data.status == 200) {
 						const backUrl = that.$Cache.get(BACK_URL) || "/pages/index/index";
 						that.$Cache.clear(BACK_URL);
 						that.$store.commit("LOGIN", {
@@ -453,8 +489,9 @@
 						that.$store.commit("SETUID", data.result.user.uid);
 						that.$store.commit('UPDATE_USERINFO', data.result.user);
 						let method
-						let indexPat = ['/pages/index/index', '/pages/order_addcart/order_addcart', '/pages/goods_cate/goods_cate',
-							'/pages/user/index','/pages/plant_grass/index'
+						let indexPat = ['/pages/index/index', '/pages/order_addcart/order_addcart',
+							'/pages/goods_cate/goods_cate',
+							'/pages/user/index', '/pages/plant_grass/index'
 						]
 						if (indexPat.includes(this.getPath(backUrl))) {
 							method = 'switchTab'
@@ -470,7 +507,7 @@
 						uni[method]({
 							url: backUrl
 						});
-					}else{
+					} else {
 						uni.hideLoading();
 						that.auth_token = res.data.result.key;
 					}
@@ -521,15 +558,16 @@
 				const that = this
 				commonAuth({
 					auth: {
-						type:'app_wechat',
+						type: 'app_wechat',
 						auth: {
 							code: that.appUserInfo.authResult.access_token,
 							openid: that.appUserInfo.authResult.openid,
 							phone: this.account,
 						}
-				}}).then(res => {
+					}
+				}).then(res => {
 					const data = res.data;
-					if(res.data.status == 200){
+					if (res.data.status == 200) {
 						const backUrl = that.$Cache.get(BACK_URL) || "/pages/index/index";
 						that.$Cache.clear(BACK_URL);
 						that.$store.commit("LOGIN", {
@@ -539,8 +577,9 @@
 						that.$store.commit("SETUID", data.result.user.uid);
 						that.$store.commit('UPDATE_USERINFO', data.result.user);
 						let method
-						let indexPat = ['/pages/index/index', '/pages/order_addcart/order_addcart', '/pages/goods_cate/goods_cate',
-							'/pages/user/index','/pages/plant_grass/index'
+						let indexPat = ['/pages/index/index', '/pages/order_addcart/order_addcart',
+							'/pages/goods_cate/goods_cate',
+							'/pages/user/index', '/pages/plant_grass/index'
 						]
 						if (indexPat.includes(this.getPath(backUrl))) {
 							method = 'switchTab'
@@ -556,11 +595,11 @@
 						uni[method]({
 							url: backUrl
 						});
-					}else{
+					} else {
 						that.auth_token = res.data.result.key;
 						that.bindStatus = true;
 					}
-						uni.hideLoading();
+					uni.hideLoading();
 				}).catch(res => {
 					uni.hideLoading();
 					uni.showToast({
@@ -606,55 +645,56 @@
 				if (!that.isAgree) return that.$util.Tips({
 					title: '请勾选用户协议与隐私政策'
 				});
-				
-				loginMobile({
-					auth_token: uni.getStorageSync('auth_token'),
-					phone: that.account,
-					sms_code: that.captcha,
-					spread: that.$Cache.get("spread"),
-					// #ifdef APP-PLUS
-					user_type: 'app',
-					// #endif
-					// #ifdef H5
-					user_type: 'h5',
-					// #endif
-				})
-				.then(({
-					data
-				}) => {
-					const backUrl = that.$Cache.get(BACK_URL) || "/pages/index/index";
-					that.$Cache.clear(BACK_URL);
-					that.$store.commit("LOGIN", {
-						'token': data.token,
-						'time': data.exp
-					});
-					that.$store.commit("SETUID", data.user.uid);
-					that.$store.commit('UPDATE_USERINFO', data.user);
 
-					let method
-					let indexPat = ['/pages/index/index', '/pages/order_addcart/order_addcart', '/pages/goods_cate/goods_cate',
-						'/pages/user/index'
-					]
-					if (indexPat.includes(this.getPath(backUrl))) {
-						method = 'switchTab'
-					} else {
-						method = 'navigateTo'
-					}
-					if (this.getPath(backUrl) === '/pages/users/login/index') {
-						uni.switchTab({
-							url: '/pages/index/index'
+				loginMobile({
+						auth_token: uni.getStorageSync('auth_token'),
+						phone: that.account,
+						sms_code: that.captcha,
+						spread: that.$Cache.get("spread"),
+						// #ifdef APP-PLUS
+						user_type: 'app',
+						// #endif
+						// #ifdef H5
+						user_type: 'h5',
+						// #endif
+					})
+					.then(({
+						data
+					}) => {
+						const backUrl = that.$Cache.get(BACK_URL) || "/pages/index/index";
+						that.$Cache.clear(BACK_URL);
+						that.$store.commit("LOGIN", {
+							'token': data.token,
+							'time': data.exp
+						});
+						that.$store.commit("SETUID", data.user.uid);
+						that.$store.commit('UPDATE_USERINFO', data.user);
+
+						let method
+						let indexPat = ['/pages/index/index', '/pages/order_addcart/order_addcart',
+							'/pages/goods_cate/goods_cate',
+							'/pages/user/index'
+						]
+						if (indexPat.includes(this.getPath(backUrl))) {
+							method = 'switchTab'
+						} else {
+							method = 'navigateTo'
+						}
+						if (this.getPath(backUrl) === '/pages/users/login/index') {
+							uni.switchTab({
+								url: '/pages/index/index'
+							});
+							return
+						}
+						uni[method]({
+							url: backUrl
+						});
+					})
+					.catch(res => {
+						that.$util.Tips({
+							title: res
 						});
-						return
-					}
-					uni[method]({
-						url: backUrl
 					});
-				})
-				.catch(res => {
-					that.$util.Tips({
-						title: res
-					});
-				});
 			},
 			async register() {
 				let that = this;
@@ -680,36 +720,36 @@
 					title: '请勾选用户协议与隐私政策'
 				});
 				register({
-					auth_token: this.auth_token || uni.getStorageSync('auth_token'),
-					phone: that.account,
-					sms_code: that.captcha,
-					pwd: that.password,
-					spread: that.$Cache.get("spread"),
-					// #ifdef APP-PLUS
-					user_type: 'app',
-					// #endif
-					// #ifdef H5
-					user_type: 'h5',
-					// #endif
-				})
-				.then(res => {
-					const backUrl = that.$Cache.get(BACK_URL) || "/pages/index/index";
-					that.$Cache.clear(BACK_URL);
-					that.$store.commit("LOGIN", {
-						'token': res.data.token,
-						'time': res.data.exp
+						auth_token: this.auth_token || uni.getStorageSync('auth_token'),
+						phone: that.account,
+						sms_code: that.captcha,
+						pwd: that.password,
+						spread: that.$Cache.get("spread"),
+						// #ifdef APP-PLUS
+						user_type: 'app',
+						// #endif
+						// #ifdef H5
+						user_type: 'h5',
+						// #endif
+					})
+					.then(res => {
+						const backUrl = that.$Cache.get(BACK_URL) || "/pages/index/index";
+						that.$Cache.clear(BACK_URL);
+						that.$store.commit("LOGIN", {
+							'token': res.data.token,
+							'time': res.data.exp
+						});
+						that.$store.commit("SETUID", res.data.user.uid);
+						that.$store.commit('UPDATE_USERINFO', res.data.user);
+						uni.switchTab({
+							url: '/pages/user/index'
+						})
+					})
+					.catch(res => {
+						that.$util.Tips({
+							title: res
+						});
 					});
-					that.$store.commit("SETUID", res.data.user.uid);
-					that.$store.commit('UPDATE_USERINFO', res.data.user);					
-					uni.switchTab({
-						url: '/pages/user/index'
-					})						
-				})
-				.catch(res => {
-					that.$util.Tips({
-						title: res
-					});
-				});
 			},
 			async code(data) {
 				let that = this;
@@ -725,7 +765,7 @@
 						type: 'login',
 						key: that.keyCode,
 						// code: that.codeVal,
-						toke:data.token,
+						toke: data.token,
 						captchaType: 'blockPuzzle',
 						captchaVerification: data.captchaVerification
 					})
@@ -792,7 +832,8 @@
 						that.$store.commit('UPDATE_USERINFO', data.user);
 
 						let method
-						let indexPat = ['/pages/index/index', '/pages/order_addcart/order_addcart', '/pages/goods_cate/goods_cate',
+						let indexPat = ['/pages/index/index', '/pages/order_addcart/order_addcart',
+							'/pages/goods_cate/goods_cate',
 							'/pages/user/index'
 						]
 						if (indexPat.includes(this.getPath(backUrl))) {
@@ -808,7 +849,7 @@
 						}
 						uni[method]({
 							url: backUrl
-						});						
+						});
 					})
 					.catch(e => {
 						that.$util.Tips({
@@ -843,51 +884,58 @@
 </script>
 <style lang="scss" scoped>
 	/deep/uni-checkbox .uni-checkbox-input,
-	/deep/checkbox .wx-checkbox-input{
+	/deep/checkbox .wx-checkbox-input {
 		border-radius: 100%;
 		width: 28rpx;
 		height: 28rpx;
 	}
+
 	/deep/checkbox .uni-checkbox-input.uni-checkbox-input-checked,
 	/deep/checkbox .wx-checkbox-input.wx-checkbox-input-checked {
-		border: 1px solid var(--view-theme)!important;
-		background-color: var(--view-theme)!important;
+		border: 1px solid var(--view-theme) !important;
+		background-color: var(--view-theme) !important;
 	}
+
 	.ChangePassword .phone {
 		font-size: 32rpx;
 		font-weight: bold;
 		text-align: center;
 		margin-top: 55rpx;
 	}
-	
+
 	.ChangePassword .list {
 		width: 580rpx;
 		margin: 53rpx auto 0 auto;
 	}
-	
+
 	.ChangePassword .list .item {
 		width: 100%;
 		height: 110rpx;
 		border-bottom: 2rpx solid #f0f0f0;
 	}
-	
+
 	.ChangePassword .list .item input {
 		width: 100%;
 		height: 100%;
 		font-size: 32rpx;
 	}
+
 	.ChangePassword .list .item .placeholder {
 		color: #bbbbbb;
 	}
+
 	.ChangePassword .list .item input.codeIput {
-		width: 240rpx;	
+		width: 240rpx;
 	}
-	.register .whiteBg .title_info text{
+
+	.register .whiteBg .title_info text {
 		color: var(--view-theme);
 	}
+
 	.register .list .item .code {
 		color: var(--view-theme);
 	}
+
 	.title-bar {
 		position: relative;
 		display: flex;
@@ -897,6 +945,7 @@
 		font-weight: 500;
 		color: #333333;
 		line-height: 48rpx;
+
 		.icon {
 			position: absolute;
 			left: 30rpx;
@@ -906,14 +955,15 @@
 			justify-content: center;
 			width: 80rpx;
 			height: 80rpx;
+
 			image {
 				width: 50rpx;
 				height: 50rpx;
 			}
 		}
 	}
-	
-	.getPhoneBtn{
+
+	.getPhoneBtn {
 		font-size: 32rpx;
 		width: 580rpx;
 		height: 90rpx;
@@ -923,15 +973,18 @@
 		margin: 40rpx auto 0 auto;
 		text-align: center;
 		line-height: 90rpx;
-		.iconfont{
+
+		.iconfont {
 			font-size: 32rpx;
 			margin-right: 12rpx;
 		}
 	}
+
 	.code image {
 		width: 100%;
 		height: 100%;
 	}
+
 	.settlementAgreement {
 		width: 100%;
 		height: 100%;
@@ -941,52 +994,63 @@
 		background: rgba(0, 0, 0, .5);
 		z-index: 10;
 	}
-	.protocol_text{
+
+	.protocol_text {
 		color: #999;
 		font-size: 24rpx;
 	}
-	.protocol{
+
+	.protocol {
 		margin-top: 82rpx;
 		justify-content: center;
 	}
-	.protocol_text{
-		.font_pro{
+
+	.protocol_text {
+		.font_pro {
 			color: var(--view-theme);
 		}
 	}
+
 	.appLogin {
 		margin-top: 82rpx;
+
 		.hds {
 			display: flex;
 			justify-content: center;
 			align-items: center;
 			font-size: 24rpx;
-			color: #B4B4B4;	
+			color: #B4B4B4;
+
 			.line {
 				width: 68rpx;
 				height: 1rpx;
 				background: #CCCCCC;
-			}	
+			}
+
 			p {
 				margin: 0 20rpx;
 			}
-		}	
+		}
+
 		.btn-wrapper {
 			display: flex;
 			align-items: center;
 			justify-content: center;
 			margin-top: 30rpx;
+
 			.btn {
 				display: flex;
 				align-items: center;
 				justify-content: center;
 				width: 68rpx;
 				height: 68rpx;
-				border-radius: 50%;	
-				+ .btn {
+				border-radius: 50%;
+
+				+.btn {
 					margin-left: 30rpx;
 				}
 			}
+
 			.apple-btn {
 				display: flex;
 				align-items: center;
@@ -997,31 +1061,38 @@
 				background: #EAEAEA;
 				border-radius: 34rpx;
 				font-size: 24rpx;
+
 				.icon-s-pingguo {
 					color: #333;
 					margin-right: 10rpx;
 					font-size: 34rpx;
 				}
 			}
+
 			.iconfont {
 				font-size: 40rpx;
 				color: #fff;
 			}
+
 			.wx {
 				background-color: #61C64F;
-				&.btn-apple{
+
+				&.btn-apple {
 					margin-right: 0;
 					background-color: #333;
 				}
 			}
+
 			.mima {
 				background-color: #28B3E9;
 			}
+
 			.yanzheng {
 				background-color: #F89C23;
 			}
 		}
 	}
+
 	.whiteBg .logon {
 		display: flex;
 		align-items: center;
@@ -1034,14 +1105,17 @@
 		color: #FFFFFF;
 		font-size: 30rpx;
 	}
-	.whiteBg .back{
-		border: 1px solid  var(--view-theme);
+
+	.whiteBg .back {
+		border: 1px solid var(--view-theme);
 		color: var(--view-theme);
 		margin-top: 30rpx;
 		background-color: transparent;
 	}
+
 	.login-wrapper {
 		padding: 30rpx;
+
 		.shading {
 			display: flex;
 			align-items: center;
@@ -1052,6 +1126,7 @@
 			/* #endif */
 			/* #ifndef APP-VUE */
 			margin-top: 200rpx;
+
 			/* #endif */
 			image {
 				width: 180rpx;
@@ -1059,6 +1134,7 @@
 			}
 		}
 	}
+
 	.copyright {
 		position: fixed;
 		bottom: 30rpx;
@@ -1069,4 +1145,4 @@
 		line-height: 28rpx;
 		color: #9E9E9E;
 	}
-</style>
+</style>
\ No newline at end of file
diff --git a/pages/users/login/login_copy.vue b/pages/users/login/login_copy.vue
index 5518e44..632836f 100644
--- a/pages/users/login/login_copy.vue
+++ b/pages/users/login/login_copy.vue
@@ -1,117 +1,119 @@
 <template>
-	<div :style="viewColor">
-
-		<div class="register absolute" v-if="!auth_token">
-			<div class="login" style="background-size: 100% 100%;background-repeat: no-repeat;">
-				<div class="shading">
-					<div class="pictrue acea-row row-center-wrapper" style="background-color: transparent !important;">
+	<view :style="viewColor">
+		<view class="register absolute" v-if="!auth_token">
+			<!-- <view class="login" style="background-size: 100% 100%;background-repeat: no-repeat;"> -->
+			<view class="login">
+				<view class="shading">
+					<view class="pictrue acea-row row-center-wrapper" style="background-color: transparent !important;">
 						<image src="@/static/images/logo1.png" />
-					</div>
-				</div>
-				<div class="whiteBg" v-if="formItem == 0">
-					<div class="logon" style="display: flex;align-items: center;justify-content: center;"
+					</view>
+				</view>
+				<view class="" style="margin-top: 10rpx;" v-if='formItem==2'>
+					<view style="text-align: center;font-size: 36rpx;color: #20B128;font-weight: 700;">
+						重置密码
+					</view>
+					<view style="text-align: center;color: #BCBCBC;font-size: 24rpx;margin-top: 10rpx;">
+						请输入手机号码和验证码找回密码、重置
+					</view>
+				</view>
+				<view class="whiteBg" v-if="formItem == 0">
+					<view class="logon" style="display: flex;align-items: center;justify-content: center;"
 						@click="wxLogin">
 						<u-icon name="weixin-fill" color="#fff" size="30"></u-icon> 微信一键登录
-					</div>
+					</view>
 
-					<div class="protocol acea-row row-between-wrapper">
+					<view class="protocol acea-row row-between-wrapper">
 						<checkbox-group class="checkgroup" @change='isAgree=!isAgree'>
 							<checkbox class="checkbox" :checked="isAgree ? true : false" />
 							<text class="protocol_text">我已同意<text @click="userAgree"
 									class="font_pro">《用户协议》</text>与<text @click="userPrivacyAgree"
 									class="font_pro">《隐私政策》</text></text>
 						</checkbox-group>
-					</div>
-				</div>
-				<div class="whiteBg" v-else-if="formItem === 1" style="po">
-					<div class="title acea-row row-center-wrapper">
-						<div class="item" :class="current === index ? 'on' : ''" v-for="(item, index) in navList"
+					</view>
+				</view>
+				<view class="whiteBg" v-else-if="formItem === 1">
+					<view class="title acea-row row-center-wrapper">
+						<view class="item" :class="current === index ? 'on' : ''" v-for="(item, index) in navList"
 							@click="navTap(index)" :key="index">
 							{{ item }}
-						</div>
-					</div>
-					<div class="list" :hidden="current !== 1">
+						</view>
+					</view>
+					<view class="list" :hidden="current !== 1">
 						<form @submit.prevent="submit">
-							<div class="item">
-								<div class="acea-row row-middle">
+							<view class="item">
+								<view class="acea-row row-middle">
 									<image src="/static/images/phone_1.png"></image>
 									<input type="number" placeholder="输入账号" placeholder-class="placeholder"
 										v-model="account" required />
-								</div>
-							</div>
-							<div class="item">
-								<div class="acea-row row-middle">
-									<image src="/static/images/code_2.png"></image>
-									<input type="password" placeholder="填写登录密码" placeholder-class="placeholder"
-										v-model="password" required />
-								</div>
-							</div>
+								</view>
+							</view>
+							<view class="item">
+								<view class="acea-row row-middle">
+									<image v-if="type1" @click="type1=false" src="/static/images/eye.png"></image>
+									<image v-else @click="type1=true" src="/static/images/offeye.png"></image>
+									<input :type="type1?'password':'input'" placeholder="填写登录密码"
+										placeholder-class="placeholder" v-model="password" required />
+									<button class="code" @click="formItem=2">
+										忘记密码
+									</button>
+								</view>
+							</view>
 						</form>
-						<div class="tip">
-							<!-- <span @click="formItem = 2" class="font-color-red">立即注册</span> -->
-							<span> </span>
-							<navigator class="forgetPwd" hover-class="none" url="/pages/users/retrievePassword/index">
-								忘记密码
-							</navigator>
-						</div>
-
-					</div>
-					<div class="list" :hidden="current !== 0">
-						<div class="item">
-							<div class="acea-row row-middle">
+					</view>
+					<view class="list" :hidden="current !== 0">
+						<view class="item">
+							<view class="acea-row row-middle">
 								<image src="/static/images/phone_1.png"></image>
 								<input type="number" placeholder="输入手机号码" placeholder-class="placeholder"
 									v-model="account" />
-							</div>
-						</div>
-
-						<div class="item">
-							<div class="acea-row row-middle">
+							</view>
+						</view>
+						<view class="item">
+							<view class="acea-row row-middle">
 								<image src="/static/images/code_2.png"></image>
-
 								<input type="number" placeholder="填写验证码" placeholder-class="placeholder"
 									class="codeIput" v-model="captcha" maxlength="4" />
 								<button class="code" :disabled="disabled" :class="disabled === true ? 'on' : ''"
 									@click="handleVerify">
 									{{ text }}
 								</button>
-							</div>
-						</div>
-						<div class="item" v-if="isShowCode">
-							<div class="acea-row row-middle">
+							</view>
+						</view>
+						<view class="item" v-if="isShowCode">
+							<view class="acea-row row-middle">
 								<image src="/static/images/code_2.png"></image>
 								<input type="number" placeholder="填写验证码" placeholder-class="placeholder"
 									class="codeIput" v-model="codeVal" maxlength="4" />
-								<div class="code" @click="getcaptcha">
+								<view class="code" @click="getcaptcha">
 									<image class="code-img" style="width: 100%;height: 100%;" :src="codeUrl" />
-								</div>
-							</div>
-						</div>
-					</div>
+								</view>
+							</view>
+						</view>
+					</view>
 
-					<div class="logon" @click="loginMobile" :hidden="current !== 0">登录</div>
-					<div class="logon" @click="submit" :hidden="current === 0">登录</div>
-					<div class="protocol acea-row row-between-wrapper">
+					<view class="logon" @click="loginMobile" :hidden="current !== 0">登录</view>
+					<view class="logon" @click="submit" :hidden="current === 0">账号登录</view>
+					<view class="protocol acea-row row-between-wrapper">
 						<checkbox-group class="checkgroup" @change='isAgree=!isAgree'>
 							<checkbox class="checkbox" :checked="isAgree ? true : false" />
 							<text class="protocol_text">我已同意<text @click="userAgree"
 									class="font_pro">《用户协议》</text>与<text @click="userPrivacyAgree"
 									class="font_pro">《隐私政策》</text></text>
 						</checkbox-group>
-					</div>
-				</div>
-				<div class="whiteBg" v-else>
-					<div class="title">注册账号</div>
-					<div class="list">
-						<div class="item">
-							<div class="acea-row row-middle">
+					</view>
+				</view>
+
+				<view class="whiteBg" style="margin-top: 0;" v-else-if='formItem==2'>
+					<view class="list">
+						<view class="item">
+							<view class="acea-row row-middle">
 								<image src="/static/images/phone_1.png"></image>
 								<input type="number" placeholder="输入手机号码" placeholder-class="placeholder"
 									v-model="account" />
-							</div>
-						</div>
-						<div class="item">
-							<div class="acea-row row-middle">
+							</view>
+						</view>
+						<view class="item">
+							<view class="acea-row row-middle">
 								<image src="/static/images/code_2.png"></image>
 								<input type="number" placeholder="填写验证码" maxLength='4' placeholder-class="placeholder"
 									class="codeIput" v-model="captcha" />
@@ -120,49 +122,62 @@
 									@click="handleVerify">
 									{{ text }}
 								</button>
-							</div>
-						</div>
-						<div class="item">
-							<div class="acea-row row-middle">
-								<image src="/static/images/code_1.png"></image>
-								<input type="password" placeholder="填写您的登录密码" placeholder-class="placeholder"
-									v-model="password" />
-							</div>
-						</div>
+							</view>
+						</view>
+						<view class="item">
+							<view class="acea-row row-middle">
+								<image v-if="type2" @click="type2=false" src="/static/images/eye.png"></image>
+								<image v-else @click="type2=true" src="/static/images/offeye.png"></image>
+								<input :type="type2?'password':'input'" placeholder="请输入新密码"
+									placeholder-class="placeholder" v-model="password" />
+							</view>
+						</view>
+						<view class="item">
+							<view class="acea-row row-middle">
+								<image v-if="type3" @click="type3=false" src="/static/images/eye.png"></image>
+								<image v-else @click="type3=true" src="/static/images/offeye.png"></image>
+								<input :type="type3?'password':'input'" placeholder="请再次输入密码"
+									placeholder-class="placeholder" v-model="confirm_pwd" />
+							</view>
+						</view>
 
-						<div class="item" v-if="isShowCode">
-							<div class="acea-row row-middle">
+						<view class="item" v-if="isShowCode">
+							<view class="acea-row row-middle">
 								<image src="/static/images/code_2.png"></image>
 								<input type="number" placeholder="填写验证码" maxlength="4" placeholder-class="placeholder"
 									class="codeIput" v-model="codeVal" />
-								<div class="code" @click="getcaptcha">
+								<view class="code" @click="getcaptcha">
 									<image class="code-img" style="width: 100%;height: 100%;" :src="codeUrl" />
-								</div>
-							</div>
-						</div>
-					</div>
-					<div class="tip">
-						<div>
-							已有账号?
-							<span @click="formItem = 1" class="font-color-red">去登录</span>
-						</div>
-					</div>
-					<div class="logon" @click="register">注册</div>
-					<div class="protocol acea-row row-between-wrapper">
+								</view>
+							</view>
+						</view>
+					</view>
+					<view class="logon" @click="registerReset">完成并登录</view>
+					<view class="protocol acea-row row-between-wrapper">
 						<checkbox-group class="checkgroup" @change='isAgree=!isAgree'>
 							<checkbox class="checkbox" :checked="isAgree ? true : false" />
 							<text class="protocol_text">我已同意<text @click="userAgree"
 									class="font_pro">《用户协议》</text>与<text @click="userPrivacyAgree"
 									class="font_pro">《隐私政策》</text></text>
 						</checkbox-group>
-					</div>
-				</div>
-			</div>
-			<div class="bottom"></div>
+					</view>
+				</view>
+				<view class="footer-btn" v-if="formItem==2">
+					<view class="login-type-btn" :class="{actLoginType:formItem==0}" style="margin-right: 70rpx;">
+						<text v-if='formItem == 1||formItem==2' @click="formItem = 0">微信快捷登录</text>
+						<text v-else @click="appOneClcik">本机一键登录</text>
+					</view>
+					<view class="login-type-btn" :class="{actLoginType:formItem==1}">
+						<text v-if='formItem == 0 ||formItem==2' @click="formItem = 1">更多登录方式</text>
+						<text v-else @click="appOneClcik">本机一键登录</text>
+					</view>
+				</view>
+			</view>
+			<view class="bottom"></view>
 			<view class="settlementAgreement" v-if="showAgreement">
 				<view class="setAgCount">
 					<i class="icon iconfont icon-cha" @click="showAgreement = false"></i>
-					<div class="title">用户协议与隐私政策</div>
+					<view class="title">用户协议与隐私政策</view>
 					<view class="content">
 						<jyf-parser :html="agreement" ref="article" :tag-style="tagStyle"></jyf-parser>
 					</view>
@@ -170,13 +185,18 @@
 			</view>
 
 			<!-- #ifdef APP-PLUS -->
-			<div class="protocol acea-row row-between-wrapper"
-				style="position: fixed; bottom: 160rpx;left: 50%;transform: translate(-50%);">
-				<text class="protocol_text" v-if="formItem==0" @click="formItem = 1 ">其他方式登录</text>
-				<text class="protocol_text" v-else @click="formItem = 0 ">微信快捷登录</text>
-			</div>
+			<view class="footer-btns" v-if="formItem !=2">
+				<view class="login-type-btn" :class="{actLoginType:formItem==0}" style="margin-right: 70rpx;">
+					<text v-if='formItem == 1||formItem==2' @click="formItem = 0">微信快捷登录</text>
+					<text v-else @click="appOneClcik">本机一键登录</text>
+				</view>
+				<view class="login-type-btn" :class="{actLoginType:formItem==1}">
+					<text v-if='formItem == 0 ||formItem==2' @click="formItem = 1">更多登录方式</text>
+					<text v-else @click="appOneClcik">本机一键登录</text>
+				</view>
+			</view>
 			<!-- #endif -->
-		</div>
+		</view>
 		<form report-submit='true' v-if="auth_token">
 			<view class="ChangePassword">
 				<view class="title">
@@ -215,14 +235,57 @@
 				<button form-type="submit" @click="auth_token = ''" class="confirmBnt back">返回</button>
 			</view>
 		</form>
-		<!-- <view class="copyright" @click="goCopyUrl">
-			{{ copyright.status == -1 ? `${copyright.year} ${copyright.url}` : copyright.Copyright }}
-		</view> -->
-
 		<Verify @success="success" :captchaType="'blockPuzzle'" :imgSize="{ width: '330px', height: '155px' }"
 			ref="verify"></Verify>
+		<!-- tips弹窗 -->
+		<u-overlay :show="showTips">
+			<view class="tips">
+				<view class="" style="font-size: 32rpx;">
+					温馨提示
+				</view>
+				<block v-if="tispTile=='密码错误'">
+					<view class="">
+						{{tipsErr}}
+					</view>
+					<view class="" style="display: flex;">
+						<view style="width: 236rpx;height: 84rpx;margin-right:38rpx;">
+							<u-button plain text="找回密码" @tap="showTips=false,formItem=2"></u-button>
+						</view>
+						<view style="width: 236rpx;height: 84rpx;">
+							<u-button color="#46BF6F" text="重新输入" @tap="showTips=false"></u-button>
+						</view>
+					</view>
+				</block>
+				<block v-else-if="tispTile=='验证码错误'">
+					<view class="">
+						验证码错误，请重新收入
+					</view>
+					<view class="" style="display: flex;">
+						<u-button color="#46BF6F" text="确定" @tap="showTips=false"></u-button>
+					</view>
+				</block>
+				<block v-else-if="tispTile=='密码不一致'">
+					<view class="">
+						两次输入的密码不一致，请重新输入
+					</view>
+					<view class="" style="display: flex;">
+						<u-button color="#46BF6F" text="确定" @tap="showTips=false"></u-button>
+					</view>
+				</block>
+				<block v-else>
+					<view class="">
+						{{tispTile}}
+					</view>
+					<view class="" style="display: flex;width: 236rpx;">
+						<u-button color="#46BF6F" text="确定" @tap="showTips=false"></u-button>
+					</view>
+				</block>
+			</view>
+		</u-overlay>
+		<!-- tips结束 -->
 
-	</div>
+
+	</view>
 </template>
 <script>
 	// +----------------------------------------------------------------------
@@ -246,7 +309,9 @@
 		getCaptcha,
 		getAgreementApi,
 		appleLogin,
-		loginMpPhone
+		loginMpPhone,
+		registerForget,
+		phonelogin
 	} from "@/api/user";
 	// #ifdef APP-PLUS
 	import {
@@ -288,6 +353,7 @@
 	} from "../../../libs/uniApi";
 	const BACK_URL = "login_back_url";
 	// #ifdef APP-PLUS
+	import oneClickStyle from "./oneClickStyle.js"
 	var jpushModule = uni.requireNativePlugin("JG-JPush");
 	// #endif
 	export default {
@@ -299,10 +365,17 @@
 		},
 		data: function() {
 			return {
+				type1: true,
+				type2: true,
+				type3: true,
+				tipsErr: "",
+				tispTile: '密码错误',
+				showTips: false,
 				navList: ["快速登录", "账号登录"],
 				current: 0,
 				account: "",
 				password: "",
+				confirm_pwd: "",
 				captcha: "",
 				// #ifdef APP-PLUS
 				formItem: 0,
@@ -337,6 +410,8 @@
 			formItem: function(nval, oVal) {
 				if (nval == 1) {
 					this.type = 'login'
+				} else if (nval == 2) {
+					this.type = 'change_pwd'
 				} else {
 					this.type = 'register'
 				}
@@ -371,9 +446,18 @@
 			// #endif
 		},
 		methods: {
+			showTipsFn(text, err) {
+				this.showTips = true
+				this.tispTile = text
+				this.tipsErr = err || ''
+			},
+			navgo(url) {
+				uni.navigateTo({
+					url
+				})
+			},
 			// #ifdef MP
 			getPhoneNumber(e) {
-
 				let that = this;
 				loginMpPhone({
 						iv: e.detail.iv,
@@ -719,6 +803,7 @@
 						});
 					});
 			},
+			// 快速登录
 			async loginMobile() {
 				let that = this;
 				if (!that.account) return that.$util.Tips({
@@ -792,9 +877,7 @@
 						});
 					})
 					.catch(res => {
-						that.$util.Tips({
-							title: res
-						});
+						that.showTipsFn(res)
 					});
 			},
 			async register() {
@@ -862,6 +945,90 @@
 						});
 					})
 					.catch(res => {
+						console.log(res, 'res')
+						that.showTipsFn('密码错误', res)
+					});
+			},
+			async weixinMerge() {
+				let that = this;
+				if (!that.account) return that.$util.Tips({
+					title: '请输入手机号码'
+				});
+				if (!/^1(3|4|5|7|8|9|6)\d{9}$/i.test(that.account)) return that.$util.Tips({
+					title: '请输入正确的手机号码'
+				});
+				if (!that.captcha) return that.$util.Tips({
+					title: '请输入验证码'
+				});
+				if (!/^[\w\d]+$/i.test(that.captcha)) return that.$util.Tips({
+					title: '请输入正确的验证码'
+				});
+				if (!that.password) return that.$util.Tips({
+					title: '请输入密码'
+				});
+				if (!/^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{6,16}$/i.test(that.password)) return that.$util.Tips({
+					title: '请输入6-16位字母加数字组合'
+				});
+				if (!that.isAgree) return that.$util.Tips({
+					title: '请勾选用户协议与隐私政策'
+				});
+				console.log('绑定前', {
+					auth_token: this.auth_token || uni.getStorageSync('auth_token'),
+					phone: that.account,
+					sms_code: that.captcha,
+					pwd: that.password,
+					spread: that.$Cache.get("spread"),
+					// #ifdef APP-PLUS
+					user_type: 'app',
+					// #endif
+					// #ifdef H5
+					user_type: 'h5',
+					// #endif
+				});
+				userMerge({
+						auth_token: this.auth_token || uni.getStorageSync('auth_token'),
+						phone: that.account,
+						sms_code: that.captcha,
+						pwd: that.password,
+						spread: that.$Cache.get("spread"),
+						// #ifdef APP-PLUS
+						user_type: 'app',
+						// #endif
+						// #ifdef H5
+						user_type: 'h5',
+						// #endif
+					})
+					.then(res => {
+						console.log(res);
+						that.$store.commit("LOGIN", {
+							'token': res.data.token,
+							'time': res.data.exp
+						});
+						that.$store.commit("SETUID", res.data.user.uid);
+						that.$store.commit('UPDATE_USERINFO', res.data.user);
+						const backUrl = that.$Cache.get('login_back_url_weixin') || that.$Cache.get(BACK_URL) ||
+							"/pages/index/index";
+						that.$Cache.clear(BACK_URL);
+						that.$Cache.clear('login_back_url_weixin');
+						let method
+						let indexPat = ['/pages/index/index', '/pages/order_addcart/order_addcart',
+							'/pages/goods_cate/goods_cate',
+							'/pages/user/index'
+						]
+						if (indexPat.includes(this.getPath(backUrl))) {
+							method = 'switchTab'
+						} else {
+							method = 'navigateTo'
+						}
+						uni[method]({
+							url: backUrl,
+							success: () => {
+								this.auth_token = ''
+							}
+						});
+					})
+					.catch(res => {
+						console.log('error', err);
 						that.$util.Tips({
 							title: res
 						});
@@ -963,7 +1130,7 @@
 				// if (that.formItem == 2) that.type = "register";
 				await registerVerify({
 						phone: that.account,
-						type: 'login',
+						type: that.type,
 						key: that.keyCode,
 						// code: that.codeVal,
 						toke: data.token,
@@ -982,6 +1149,38 @@
 						});
 					});
 			},
+			async registerReset() {
+				var that = this;
+				if (!that.account) return that.$util.Tips({
+					title: '请填写手机号码'
+				});
+				if (!/^1(3|4|5|7|8|9|6)\d{9}$/i.test(that.account)) return that.$util.Tips({
+					title: '请输入正确的手机号码'
+				});
+				if (that.password == '123456') return that.$util.Tips({
+					title: '您输入的密码过于简单'
+				});
+				if (that.password != that.confirm_pwd) return that.$util.Tips({
+					title: '两次密码不一致'
+				});
+				if (!that.captcha) return that.$util.Tips({
+					title: '请填写验证码'
+				});
+				registerForget({
+						phone: that.account,
+						sms_code: that.captcha,
+						pwd: that.password,
+						confirm_pwd: that.confirm_pwd
+					})
+					.then(res => {
+						that.submitSuccess(res.data)
+					})
+					.catch(res => {
+						that.$util.Tips({
+							title: res
+						})
+					});
+			},
 			getcaptcha() {
 				let that = this
 				getCaptcha().then(data => {
@@ -1000,6 +1199,8 @@
 				}
 				return url
 			},
+
+			// 账号登录
 			async submit() {
 				let that = this;
 				if (!that.account) return that.$util.Tips({
@@ -1025,54 +1226,58 @@
 					}).then(({
 						data
 					}) => {
-						console.log(data)
-						this.checkOpenId(data.user)
-						const backUrl = that.$Cache.get('login_back_url_weixin') || that.$Cache.get(BACK_URL) ||
-							"/pages/index/index";
-						that.$store.commit("LOGIN", {
-							'token': data.token,
-							'time': data.exp
-						});
-						that.$store.commit("SETUID", data.user.uid);
-						that.$store.commit('UPDATE_USERINFO', data.user);
-
-						if (data.is_new_user && !that.$Cache.get('login_back_url_weixin')) {
-							return uni.navigateTo({
-								url: '/pages/helpPeople/helpPeople'
-							})
-						}
-
-						that.$Cache.clear(BACK_URL);
-						that.$Cache.clear('login_back_url_weixin');
-
-						let method
-						let indexPat = ['/pages/index/index', '/pages/order_addcart/order_addcart',
-							'/pages/goods_cate/goods_cate',
-							'/pages/user/index'
-						]
-						if (indexPat.includes(this.getPath(backUrl))) {
-							method = 'switchTab'
-						} else {
-							method = 'navigateTo'
-						}
-
-						if (this.getPath(backUrl) === '/pages/users/login/index') {
-							uni.switchTab({
-								url: '/pages/index/index'
-							});
-							return
-						}
-						uni[method]({
-							url: backUrl
-						});
+						this.submitSuccess(data)
 					})
 					.catch(e => {
-						console.log(e)
-						that.$util.Tips({
-							title: e
-						});
+						that.showTipsFn("密码错误", e)
 					});
 			},
+
+			// 账号密码验证通过后的逻辑
+			submitSuccess(data) {
+				console.log(data, 'hanshu')
+				let that = this
+				this.checkOpenId(data.user)
+				const backUrl = that.$Cache.get('login_back_url_weixin') || that.$Cache.get(BACK_URL) ||
+					"/pages/index/index";
+				that.$store.commit("LOGIN", {
+					'token': data.token,
+					'time': data.exp
+				});
+				that.$store.commit("SETUID", data.user.uid);
+				that.$store.commit('UPDATE_USERINFO', data.user);
+
+				if (data.is_new_user && !that.$Cache.get('login_back_url_weixin')) {
+					return uni.navigateTo({
+						url: '/pages/helpPeople/helpPeople'
+					})
+				}
+
+				that.$Cache.clear(BACK_URL);
+				that.$Cache.clear('login_back_url_weixin');
+
+				let method
+				let indexPat = ['/pages/index/index', '/pages/order_addcart/order_addcart',
+					'/pages/goods_cate/goods_cate',
+					'/pages/user/index'
+				]
+				if (indexPat.includes(this.getPath(backUrl))) {
+					method = 'switchTab'
+				} else {
+					method = 'navigateTo'
+				}
+
+				if (this.getPath(backUrl) === '/pages/users/login/index') {
+					uni.switchTab({
+						url: '/pages/index/index'
+					});
+					return
+				}
+				uni[method]({
+					url: backUrl
+				});
+			},
+
 			getVersion() {
 				getVersion().then(data => {
 					this.copyright = data.data;
@@ -1144,13 +1349,66 @@
 				})
 				// #endif
 
+			},
+			// app手机号一键登录
+			appOneClcik() {
+				let that = this
+				uni.preLogin({
+					provider: 'univerify',
+					success() {
+						console.log("当前环境支持一键登录")
+						uni.login({
+							provider: 'univerify',
+							univerifyStyle: oneClickStyle,
+							success(res) {
+								console.log(res, 'res')
+								phonelogin({
+									access_token: res.authResult.access_token,
+									openid: res.authResult.openid,
+									auth_token: that.auth_token,
+									user_type: 'app'
+								}).then(res => {
+									uni.closeAuthView()
+									that.submitSuccess(res.data)
+								}).catch(err => {
+									uni.closeAuthView()
+									that.$util.Tips({
+										title: '登录失败，请稍后再试'
+									});
+								})
+								// uniCloud.callFunction({
+								// 	name: 'oneClickLoginFn', 
+								// 	data: {
+								// 		'access_token': res.authResult
+								// 			.access_token, 
+								// 		'openid': res.authResult.openid 
+								// 	}
+								// }).then(res => {
+								// 	console.log(res, '登录成功后的res')
+								// }).catch(err => {
+								// 	console.log(err, 'ererre')
+								// })
+							},
+							fail(res) { // 登录失败
+								console.log(res.errCode)
+								console.log(res.errMsg)
+							}
+						})
+					},
+					fail(res) {
+						that.$util.Tips({
+							title: '当前环境不支持一键登录'
+						});
+					}
+				})
 			}
+
 		}
 	};
 </script>
 <style lang="scss" scoped>
 	page {
-		background-color: #fff !important;
+		background-color: white !important;
 	}
 
 	/deep/uni-checkbox .uni-checkbox-input {
@@ -1531,4 +1789,62 @@
 			font-size: 20rpx;
 		}
 	}
+
+	.footer-btns {
+		position: absolute;
+		bottom: 100rpx;
+		left: 50%;
+		transform: translate(-50%);
+		display: flex;
+		justify-content: space-between;
+		width: 750rpx !important;
+		padding: 0 112rpx;
+
+		.login-type-btn {
+			padding: 12rpx 30rpx;
+			border-radius: 32rpx;
+			background-color: #F6F6F6
+		}
+
+		.actLoginType {
+			color: #20B128;
+			background-color: #E8F7E9;
+		}
+	}
+
+	.footer-btn {
+		display: flex;
+		background-color: white;
+		width: 750rpx !important;
+		padding: 0 112rpx 50rpx 112rpx;
+		margin-top: 30rpx 0 30rpx 0;
+
+		.login-type-btn {
+			padding: 12rpx 30rpx;
+			border-radius: 32rpx;
+			background-color: #F6F6F6
+		}
+
+		.actLoginType {
+			color: #20B128;
+			background-color: #E8F7E9;
+		}
+	}
+
+	.tips {
+		width: 590rpx;
+		height: 354rpx;
+		background-color: white;
+		border-radius: 16rpx;
+		position: absolute;
+		top: 50%;
+		left: 50%;
+		transform: translate(-50%, -50%);
+		box-sizing: border-box;
+		padding: 50rpx 40rpx;
+		display: flex;
+		flex-direction: column;
+		justify-content: space-between;
+		align-items: center;
+	}
 </style>
\ No newline at end of file
diff --git a/pages/users/login/oneClickStyle.js b/pages/users/login/oneClickStyle.js
new file mode 100644
index 0000000..4807592
--- /dev/null
+++ b/pages/users/login/oneClickStyle.js
@@ -0,0 +1,69 @@
+let customStyle = {
+	"fullScreen": true, // 是否全屏显示，默认值： false
+	"backgroundColor": "#ffffff", // 授权页面背景颜色，默认值：#ffffff
+	"backgroundImage": "", // 全屏显示的背景图片，默认值："" （仅支持本地图片，只有全屏显示时支持）
+	"icon": {
+		"path": "static/xxx.png", // 自定义显示在授权框中的logo，仅支持本地图片 默认显示App logo
+		"width": "60px", //图标宽度 默认值：60px
+		"height": "60px" //图标高度 默认值：60px
+	},
+	"closeIcon": {
+		"path": "static/xxx.png", // 自定义显示在授权框中的logo，仅支持本地图片 默认显示App logo
+		"width": "60px", //图标宽度 默认值：60px (HBuilderX 4.0支持)
+		"height": "60px" //图标高度 默认值：60px (HBuilderX 4.0支持)
+	},
+	"phoneNum": {
+		"color": "#202020" // 手机号文字颜色 默认值：#202020
+	},
+	"slogan": {
+		"color": "#BBBBBB" //  slogan 字体颜色 默认值：#BBBBBB
+	},
+	"authButton": {
+		"normalColor": "#3CB625", // 授权按钮正常状态背景颜色 默认值：#3479f5
+		"highlightColor": "#2861c5", // 授权按钮按下状态背景颜色 默认值：#2861c5（仅ios支持）
+		"disabledColor": "#73aaf5", // 授权按钮不可点击时背景颜色 默认值：#73aaf5（仅ios支持）
+		"textColor": "#ffffff", // 授权按钮文字颜色 默认值：#ffffff
+		"title": "本机号码一键登录", // 授权按钮文案 默认值：“本机号码一键登录”
+		"borderRadius": "24px" // 授权按钮圆角 默认值："24px" （按钮高度的一半）
+	},
+	"otherLoginButton": {
+		"visible": true, // 是否显示其他登录按钮，默认值：true
+		"normalColor": "", // 其他登录按钮正常状态背景颜色 默认值：透明
+		"highlightColor": "", // 其他登录按钮按下状态背景颜色 默认值：透明
+		"textColor": "#656565", // 其他登录按钮文字颜色 默认值：#656565
+		"title": "其他登录方式", // 其他登录方式按钮文字 默认值：“其他登录方式”
+		"borderColor": "", //边框颜色 默认值：透明（仅iOS支持）
+		"borderRadius": "0px" // 其他登录按钮圆角 默认值："24px" （按钮高度的一半）
+	},
+	"privacyTerms": {
+		"defaultCheckBoxState": true, // 条款勾选框初始状态 默认值： true
+		"isCenterHint": false, //未勾选服务条款时点击登录按钮的提示是否居中显示 默认值: false (3.7.13+ 版本支持)
+		"uncheckedImage": "", // 可选 条款勾选框未选中状态图片（仅支持本地图片 建议尺寸 24x24px）(3.2.0+ 版本支持)
+		"checkedImage": "", // 可选 条款勾选框选中状态图片（仅支持本地图片 建议尺寸24x24px）(3.2.0+ 版本支持)
+		"checkBoxSize": 12, // 可选 条款勾选框大小
+		"textColor": "#BBBBBB", // 文字颜色 默认值：#BBBBBB
+		"termsColor": "#5496E3", //  协议文字颜色 默认值： #5496E3
+		"prefix": "我已阅读并同意", // 条款前的文案 默认值：“我已阅读并同意”
+		"suffix": "并使用本机号码登录", // 条款后的文案 默认值：“并使用本机号码登录”
+		"privacyItems": [ // 自定义协议条款，最大支持2个，需要同时设置url和title. 否则不生效
+			{
+				"url": "https://", // 点击跳转的协议详情页面
+				"title": "用户服务协议" // 协议名称
+			}
+		]
+	},
+	"buttons": { // 自定义页面下方按钮仅全屏模式生效（3.1.14+ 版本支持）
+		"iconWidth": "45px", // 图标宽度（高度等比例缩放） 默认值：45px
+		"list": [{
+				"provider": "apple",
+				"iconPath": "/static/apple.png" // 图标路径仅支持本地图片
+			},
+			{
+				"provider": "weixin",
+				"iconPath": "/static/wechat.png" // 图标路径仅支持本地图片
+			}
+		]
+	}
+}
+
+export default customStyle
\ No newline at end of file
diff --git a/pages/users/order_list/index.vue b/pages/users/order_list/index.vue
index 5ba1eca..6f7af55 100644
--- a/pages/users/order_list/index.vue
+++ b/pages/users/order_list/index.vue
@@ -603,6 +603,9 @@
 			} else {
 				toLogin()
 			}
+			if (options.sale_type) {
+				this.sale_type = options.sale_type
+			}
 		},
 
 		onReady: function() {
diff --git a/pages/users/refund/detail.vue b/pages/users/refund/detail.vue
index 7ca85e0..2b99825 100644
--- a/pages/users/refund/detail.vue
+++ b/pages/users/refund/detail.vue
@@ -15,9 +15,9 @@
 			</block>
 			<block v-if="type == 2">
 				<view class="txt">请等待商家收货并退款</view>
-				<view class="time">还剩：				
-				<countDown :is-day="true" :tip-text="' '" :day-text="'天'" :hour-text="':'" :minute-text="':'" :second-text="' '"
-				 :datatime="datatime"></countDown>
+				<view class="time">还剩：
+					<countDown :is-day="true" :tip-text="' '" :day-text="'天'" :hour-text="':'" :minute-text="':'"
+						:second-text="' '" :datatime="datatime"></countDown>
 				</view>
 			</block>
 			<block v-if="type == 3">
@@ -59,12 +59,17 @@
 			<view class="title">退款信息</view>
 			<view class="product-box">
 				<view class="product-item" v-for="(item,index) in detail.refundProduct" :key="index">
-					<image class="img-box" :src="item.product.cart_info.productAttr.image" mode="" v-if="item.product.cart_info.productAttr.image"></image>
+					<image class="img-box" :src="item.product.cart_info.productAttr.image" mode=""
+						v-if="item.product.cart_info.productAttr.image"></image>
 					<image class="img-box" :src="item.product.cart_info.product.image" mode="" v-else></image>
 					<view class="msg">
-						<view class="name line1"><text v-if="item.product.cart_info.product_type === 2" class="event_name event_bg">预售</text>{{item.product.cart_info.product.store_name}}</view>
+						<view class="name line1"><text v-if="item.product.cart_info.product_type === 2"
+								class="event_name event_bg">预售</text>{{item.product.cart_info.product.store_name}}
+						</view>
 						<view class="des">{{item.product.cart_info.productAttr.sku}}</view>
-						<view class="price">￥{{item.product.product_type == 3 ? item.product.cart_info.productAssistAttr.assist_price : item.product.product_type == 4 ? item.product.cart_info.activeSku.active_price : item.product.cart_info.productAttr.price}}</view>
+						<view class="price">
+							￥{{item.product.product_type == 3 ? item.product.cart_info.productAssistAttr.assist_price : item.product.product_type == 4 ? item.product.cart_info.activeSku.active_price : item.product.cart_info.productAttr.price}}
+						</view>
 						<view class="num">x {{item.refund_num}}</view>
 					</view>
 				</view>
@@ -76,10 +81,10 @@
 				<view class="txt flex">
 					<text>{{detail.refund_order_sn}}</text>
 					<!-- #ifdef H5 -->
-						<text class='copy copy-data' :data-clipboard-text="detail.refund_order_sn">复制</text>
+					<text class='copy copy-data' :data-clipboard-text="detail.refund_order_sn">复制</text>
 					<!-- #endif -->
 					<!-- #ifdef MP -->
-						<text class='copy' @tap='copy'>复制</text>
+					<text class='copy' @tap='copy'>复制</text>
 					<!-- #endif -->
 				</view>
 			</view>
@@ -95,6 +100,13 @@
 					<text>{{detail.refund_num}}</text>
 				</view>
 			</view>
+
+			<view class="item">
+				<view class="label">退款原因：</view>
+				<view class="txt flex">
+					<text>{{ getRightText(detail.refund_message)   }}</text>
+				</view>
+			</view>
 			<view class="item">
 				<view class="label">申请时间：</view>
 				<view class="txt flex">
@@ -116,7 +128,7 @@
 				</view>
 			</view>
 			<view class="btn-wrapper">
-				<block v-if="type==-1">	
+				<block v-if="type==-1">
 					<view class="btn" @click="applyAgain(detail)">再次申请</view>
 				</block>
 				<block v-else-if="type==1">
@@ -148,35 +160,40 @@
 	// +----------------------------------------------------------------------
 	// | Author: CRMEB Team <admin@crmeb.com>
 	// +----------------------------------------------------------------------
-	import { refundDetail, refundCancelApi } from '@/api/order.js'
+	import {
+		refundDetail,
+		refundCancelApi
+	} from '@/api/order.js'
 	import ClipboardJS from "@/plugin/clipboard/clipboard.js";
 	import countDown from '@/components/countDown'
-	import { mapGetters } from "vuex";
-	export default{
+	import {
+		mapGetters
+	} from "vuex";
+	export default {
 		components: {
-			countDown,	
+			countDown,
 		},
-		computed:{
+		computed: {
 			...mapGetters(['viewColor']),
 		},
-		data(){
-			return{
-				type:0,
-				refund_order_id:0,
-				detail:'',
+		data() {
+			return {
+				type: 0,
+				refund_order_id: 0,
+				detail: '',
 				datatime: 0
 			}
 		},
 		onLoad(options) {
 			uni.setNavigationBarTitle({
-			　　title:'退款详情'
+				title: '退款详情'
 			})
 			this.refund_order_id = options.id
 			this.getDetail()
 		},
 		onReady: function() {
 			// #ifdef H5
-			this.$nextTick(function() {				
+			this.$nextTick(function() {
 				const clipboard = new ClipboardJS(".copy-data");
 				clipboard.on("success", () => {
 					this.$util.Tips({
@@ -186,57 +203,65 @@
 			});
 			// #endif
 		},
-		methods:{
+		methods: {
+			getRightText(str) {
+				const index = str.indexOf("@");
+				if (index !== -1) {
+					return str.substring(0, index);
+				} else {
+					return str
+				}
+			},
 			//联系客服拨打电话
-			call: function(service){
+			call: function(service) {
 				let that = this;
-				if(service){
+				if (service) {
 					uni.showModal({
 						title: '提示',
-						content: '暂无在线客服，确定拨打客服电话:'+that.detail.merchant.service_phone+'吗？',
+						content: '暂无在线客服，确定拨打客服电话:' + that.detail.merchant.service_phone + '吗？',
 						success: function(res) {
 							if (res.confirm) {
 								uni.makePhoneCall({
-								  phoneNumber: that.detail.merchant.service_phone,
+									phoneNumber: that.detail.merchant.service_phone,
 								});
 							}
 						}
 					})
-				}else{
+				} else {
 					return that.$util.Tips({
 						title: '暂无可用客服'
 					})
 				}
 			},
 			//查看大图
-			loookImg(item,index){
+			loookImg(item, index) {
 				uni.previewImage({
 					urls: this.detail.pics,
 					current: this.detail.pics[index]
 				});
 			},
-			getDetail(){
-				refundDetail(this.refund_order_id).then(res=>{
+			getDetail() {
+				refundDetail(this.refund_order_id).then(res => {
 					// status 0审核中 1待发货 2待收货 3已退款 -1已拒绝 
 					this.type = res.data.status
 					this.detail = res.data
 					this.datatime = res.data.auto_refund_time;
-					
+
 				})
 			},
-			goPage(){
+			goPage() {
 				uni.navigateTo({
-					url:'/pages/users/refund/goods/index?id='+this.detail.refund_order_id
+					url: '/pages/users/refund/goods/index?id=' + this.detail.refund_order_id
 				})
 			},
-			applyAgain(item){
+			applyAgain(item) {
 				uni.navigateTo({
-					url:`/pages/order_details/index?order_id=${item.refundProduct[0].product.order_id}`
+					url: `/pages/order_details/index?order_id=${item.refundProduct[0].product.order_id}`
 				})
 			},
-			go(){
+			go() {
 				uni.navigateTo({
-					url:`/pages/users/refund/logistics?orderId=${this.detail.refund_order_id}`
+					url: `/pages/users/refund/logistics?orderId=${this.detail.refund_order_id}`
 				})
 			},
 			/**
@@ -252,30 +277,30 @@
 			},
 			// #endif
 			// 客服
-			goService(){
+			goService() {
 				uni.navigateTo({
-					url:`/pages/chat/customer_list/chat?mer_id=${this.detail.mer_id}&uid=${this.detail.uid}&refund_order_id=${this.detail.refund_order_id}`
+					url: `/pages/chat/customer_list/chat?mer_id=${this.detail.mer_id}&uid=${this.detail.uid}&refund_order_id=${this.detail.refund_order_id}`
 				})
 			},
 			// 取消售后
-			cancelSales(){
+			cancelSales() {
 				let that = this;
 				uni.showModal({
-				  content: '确定要取消售后？',
-				  success: function(res) {
-				    if(res.confirm) {
-				      refundCancelApi(that.detail.refund_order_id).then(res => {
-				      	if (res.status === 200) {
-				      		that.$util.Tips({
-				      			title: res.message
-				      		});
+					content: '确定要取消售后？',
+					success: function(res) {
+						if (res.confirm) {
+							refundCancelApi(that.detail.refund_order_id).then(res => {
+								if (res.status === 200) {
+									that.$util.Tips({
+										title: res.message
+									});
 									that.getDetail();
 								}
-				      })
-				    } else if(res.cancel) {
-				      console.log('用户点击取消');
-				    }
-				  }
+							})
+						} else if (res.cancel) {
+							console.log('用户点击取消');
+						}
+					}
 				});
 			},
 		}
@@ -283,217 +308,251 @@
 </script>
 
 <style lang="scss">
-.refund-detail{
-	.head{
-		display: flex;
-		flex-direction: column;
-		justify-content: center;
-		height: 150rpx;
-		padding: 0 30rpx;
-		color: #fff;
-		background-color: #666666;
-		font-size: 30rpx;
-		.txt{
-			font-weight: bold;
+	.refund-detail {
+		.head {
+			display: flex;
+			flex-direction: column;
+			justify-content: center;
+			height: 150rpx;
+			padding: 0 30rpx;
+			color: #fff;
+			background-color: #666666;
+			font-size: 30rpx;
+
+			.txt {
+				font-weight: bold;
+			}
+
+			.time {
+				margin-top: 10rpx;
+				font-size: 24rpx;
+				opacity: .8;
+
+				.time {
+					display: inline-block;
+					width: 600rpx;
+
+					/deep/ .red {
+						color: #fff;
+					}
+				}
+			}
 		}
-		.time{
-			margin-top: 10rpx;
-			font-size: 24rpx;
-			opacity: .8;
-			.time{
-				display: inline-block;
-				width: 600rpx;
-				/deep/ .red{
+
+		.info-box {
+			margin-top: 12rpx;
+			background-color: #fff;
+
+			.title {
+				padding: 0 32rpx;
+				line-height: 86rpx;
+				border-bottom: 1px solid #F0F0F0;
+				color: #282828;
+			}
+
+			.product-box {
+				.product-item {
+					display: flex;
+					padding: 25rpx 30rpx;
+
+					.img-box {
+						width: 130rpx;
+						height: 130rpx;
+						border-radius: 16rpx;
+					}
+
+					.msg {
+						position: relative;
+						display: flex;
+						flex-direction: column;
+						justify-content: space-between;
+						width: 440rpx;
+						margin-left: 26rpx;
+
+						.name {
+							font-size: 28rpx;
+							color: #282828;
+						}
+
+						.des {
+							font-size: 20rpx;
+							color: #868686;
+						}
+
+						.price {
+							font-size: 26rpx;
+							color: var(--view-priceColor);
+						}
+
+						.num {
+							position: absolute;
+							right: -80rpx;
+							top: 4rpx;
+							color: #868686;
+							font-size: 26rpx;
+						}
+					}
+				}
+
+				.event_name {
+					display: inline-block;
+					margin-right: 9rpx;
+					color: #fff;
+					font-size: 20rpx;
+					padding: 0 8rpx;
+					line-height: 30rpx;
+					text-align: center;
+					border-radius: 6rpx;
+				}
+			}
+
+			.event_bg {
+				background: #FF7F00;
+			}
+
+			.store-info {
+				padding: 30rpx;
+
+				.des {
+					margin-top: 10rpx;
+					font-size: 26rpx;
+					color: #868686;
+				}
+
+				.red-txt {
+					display: flex;
+					align-items: center;
+					margin-top: 10rpx;
+					color: $theme-color;
+					font-size: 24rpx;
+
+					.iconfont {
+						font-size: 30rpx;
+						margin-right: 5rpx;
+						margin-top: 6rpx;
+					}
+				}
+			}
+		}
+
+		.content {
+			margin-top: 12rpx;
+			padding: 30rpx 30rpx 0;
+			background-color: #FFFFFF;
+
+			.item {
+				display: flex;
+				justify-content: space-between;
+				margin-bottom: 30rpx;
+
+				.txt {
+					justify-content: flex-end;
+					align-items: center;
+					width: 450rpx;
+					color: #868686;
+					text-align: right;
+
+					.copy {
+						display: flex;
+						align-items: center;
+						justify-content: center;
+						width: 80rpx;
+						height: 34rpx;
+						margin-left: 20rpx;
+						border: 1px solid #666666;
+						border-radius: 17rpx;
+						font-size: 20rpx;
+						color: #333;
+					}
+				}
+
+				&:last-child {
+					margin-bottom: 0;
+				}
+
+				.upload-img {
+					display: flex;
+					flex-wrap: wrap;
+					margin-top: 20rpx;
+
+					.img-item {
+						position: relative;
+						width: 156rpx;
+						height: 156rpx;
+						margin-right: 23rpx;
+						margin-top: 20rpx;
+
+						&:nth-child(4n) {
+							margin-right: 0;
+						}
+
+						image {
+							width: 156rpx;
+							height: 156rpx;
+							border-radius: 8rpx;
+						}
+					}
+				}
+			}
+
+			.btn-wrapper {
+				position: relative;
+				display: flex;
+				justify-content: flex-end;
+				align-items: center;
+				height: 100rpx;
+
+				button {
+					font-size: 28rpx;
+				}
+
+				.btn {
+					width: 176rpx;
+					height: 60rpx;
+					display: flex;
+					align-items: center;
+					justify-content: center;
+					margin-left: 20rpx;
+					background: var(--view-theme);
+					border-radius: 30rpx;
 					color: #fff;
 				}
+
+				.gray {
+					background: transparent;
+					border: 1px solid #eee;
+					color: #AAAAAA;
+				}
+
+				&:after {
+					content: ' ';
+					position: absolute;
+					top: 0;
+					left: 50%;
+					width: 690rpx;
+					height: 1px;
+					margin-left: -345rpx;
+					background-color: #f0f0f0;
+				}
+			}
+		}
+
+		.box {
+			margin-top: 12rpx;
+			padding: 25rpx 30rpx;
+			background-color: #fff;
+			font-size: 30rpx;
+			color: #282828;
+
+			.des {
+				margin-top: 5rpx;
+				font-size: 26rpx;
+				color: #868686;
 			}
 		}
 	}
 
-	.info-box{
-		margin-top: 12rpx;
-		background-color: #fff;
-		.title{
-			padding: 0 32rpx;
-			line-height: 86rpx;
-			border-bottom: 1px solid #F0F0F0;
-			color: #282828;
-		}
-		.product-box{
-			.product-item{
-				display: flex;
-				padding: 25rpx 30rpx;
-				.img-box{
-					width:130rpx;
-					height:130rpx;
-					border-radius:16rpx;
-				}
-				.msg{
-					position: relative;
-					display: flex;
-					flex-direction: column;
-					justify-content: space-between;
-					width: 440rpx;
-					margin-left: 26rpx;
-					.name{
-						font-size: 28rpx;
-						color: #282828;
-					}
-					.des{
-						font-size: 20rpx;
-						color: #868686;
-					}
-					.price{
-						font-size: 26rpx;
-						color: var(--view-priceColor);
-					}
-					.num{
-						position: absolute;
-						right: -80rpx;
-						top: 4rpx;
-						color: #868686;
-						font-size: 26rpx;
-					}
-				}
-			}			
-			.event_name{
-				display: inline-block;
-				margin-right: 9rpx;
-				color: #fff;
-				font-size: 20rpx;
-				padding: 0 8rpx;
-				line-height: 30rpx;	
-				text-align: center;
-				border-radius: 6rpx;						
-			}
-		}
-		
-		.event_bg{
-			background: #FF7F00;
-		}
-		.store-info{
-			padding: 30rpx;
-			.des{
-				margin-top: 10rpx;
-				font-size: 26rpx;
-				color: #868686;
-			}
-			.red-txt{
-				display: flex;
-				align-items: center;
-				margin-top: 10rpx;
-				color: $theme-color;
-				font-size: 24rpx;
-				.iconfont{
-					font-size: 30rpx;
-					margin-right: 5rpx;
-					margin-top: 6rpx;
-				}
-			}
-		}
+	/deep/.styleAll {
+		color: #fff;
 	}
-	.content{
-		margin-top: 12rpx;
-		padding: 30rpx 30rpx 0;
-		background-color: #FFFFFF;
-		.item{
-			display: flex;
-			justify-content: space-between;
-			margin-bottom: 30rpx;
-			.txt{
-				justify-content: flex-end;
-				align-items: center;
-				width: 450rpx;
-				color: #868686;
-				text-align: right;
-				.copy{
-					display: flex;
-					align-items: center;
-					justify-content: center;
-					width:80rpx;
-					height:34rpx;
-					margin-left: 20rpx;
-					border:1px solid #666666;
-					border-radius:17rpx;
-					font-size: 20rpx;
-					color: #333;
-				}
-			}
-			&:last-child{
-				margin-bottom: 0;
-			}
-			.upload-img{
-				display: flex;
-				flex-wrap: wrap;
-				margin-top: 20rpx;
-				.img-item{
-					position: relative;
-					width: 156rpx;
-					height: 156rpx;
-					margin-right: 23rpx;
-					margin-top: 20rpx;
-					&:nth-child(4n){
-						margin-right: 0;
-					}
-					image{
-						width: 156rpx;
-						height: 156rpx;
-						border-radius: 8rpx;
-					}
-				}
-			}
-		}	
-		.btn-wrapper{
-			position: relative;
-			display: flex;
-			justify-content: flex-end;
-			align-items: center;
-			height: 100rpx;
-			button{
-				font-size: 28rpx;
-			}
-			.btn{
-				width:176rpx;
-				height:60rpx;
-				display: flex;
-				align-items: center;
-				justify-content: center;
-				margin-left: 20rpx;
-				background: var(--view-theme);
-				border-radius:30rpx;
-				color: #fff;
-			}
-			.gray{
-				background: transparent;
-				border: 1px solid #eee;
-				color: #AAAAAA;
-			}
-			&:after{
-				content:' ';
-				position: absolute;
-				top: 0;
-				left: 50%;
-				width: 690rpx;
-				height:1px;
-				margin-left: -345rpx;
-				background-color: #f0f0f0;
-			}
-		}
-	}
-	.box{
-		margin-top: 12rpx;
-		padding:25rpx 30rpx;
-		background-color: #fff;
-		font-size: 30rpx;
-		color: #282828;
-		.des{
-			margin-top: 5rpx;
-			font-size: 26rpx;
-			color: #868686;
-		}
-	}
-}
-/deep/.styleAll{
-	color: #fff;
-}
-</style>
+</style>
\ No newline at end of file
diff --git a/pages/users/retrievePassword/index.vue b/pages/users/retrievePassword/index.vue
index f0d94c4..4ce61f3 100644
--- a/pages/users/retrievePassword/index.vue
+++ b/pages/users/retrievePassword/index.vue
@@ -5,35 +5,42 @@
 				<image :src="login_logo" v-if="login_logo" />
 			</view>
 		</view> -->
-		<view class="whiteBg" style="margin: 0;width: 100%;padding: 50rpx 60rpx;" :style="{ 'background-image': `url(${domain}/static/images/logo_bgl.png)`}">
+		<view class="whiteBg" style="margin: 0;width: 100%;padding: 50rpx 60rpx;"
+			:style="{ 'background-image': `url(${domain}/static/images/logo_bgl.png)`}">
 			<view class="login_title">
 				<view class="title_h">找回密码</view>
 			</view>
 			<form class="list">
 				<view class="item">
-					<input type="number" placeholder="输入手机号码" placeholder-class="placeholder" v-model="account" autocomplete="off" />
+					<input type="number" placeholder="输入手机号码" placeholder-class="placeholder" v-model="account"
+						autocomplete="off" />
 					<!-- <input type="text" style="height: 0;opacity: 0"> -->
 				</view>
 				<view class="item">
-					<input type="password" placeholder="填写您的新密码" placeholder-class="placeholder" v-model="password" autocomplete="off" />
+					<input type="password" placeholder="填写您的新密码" placeholder-class="placeholder" v-model="password"
+						autocomplete="off" />
 				</view>
 				<view class="item">
-					<input type="password" placeholder="再次输入新密码" placeholder-class="placeholder" v-model="confirm_pwd" autocomplete="off" />
+					<input type="password" placeholder="再次输入新密码" placeholder-class="placeholder" v-model="confirm_pwd"
+						autocomplete="off" />
 				</view>
 				<view class="item" style="display: flex;justify-content: space-between;">
-					<input type="number" placeholder="填写验证码" maxlength="4" placeholder-class="placeholder" class="codeIput" v-model="captcha" autocomplete="off" />
-					<button class="code" style="color: #fff;" :disabled="disabled" :class="disabled === true ? 'on' : ''" @click="handleVerify">
+					<input type="number" placeholder="填写验证码" maxlength="4" placeholder-class="placeholder"
+						class="codeIput" v-model="captcha" autocomplete="off" />
+					<button class="code" style="color: #fff;" :disabled="disabled"
+						:class="disabled === true ? 'on' : ''" @click="handleVerify">
 						{{ text }}
 					</button>
 				</view>
 			</form>
 			<view class="logon" @click="registerReset">确认</view>
-			<view class="tip">
+			<!-- <view class="tip">
 				<text @click="back">立即登录</text>
-			</view>
+			</view> -->
 		</view>
 		<view class="bottom"></view>
-      <Verify @success="success" :captchaType="'blockPuzzle'" :imgSize="{ width: '330px', height: '155px' }" ref="verify"></Verify>
+		<Verify @success="success" :captchaType="'blockPuzzle'" :imgSize="{ width: '330px', height: '155px' }"
+			ref="verify"></Verify>
 	</view>
 </template>
 
@@ -48,7 +55,9 @@
 	// | Author: CRMEB Team <admin@crmeb.com>
 	// +----------------------------------------------------------------------
 	const app = getApp();
-	import { mapGetters} from "vuex";
+	import {
+		mapGetters
+	} from "vuex";
 	import sendVerifyCode from "@/mixins/SendVerifyCode";
 	import {
 		registerVerify,
@@ -56,19 +65,25 @@
 		getCodeApi,
 		getCaptcha
 	} from "@/api/user";
-	import { validatorDefaultCatch } from "@/utils/dialog";
+	import {
+		validatorDefaultCatch
+	} from "@/utils/dialog";
 	import attrs, {
 		required,
 		alpha_num,
 		chs_phone
 	} from "@/utils/validate";
-	import { configMap } from '@/utils';
-	import { HTTP_REQUEST_URL } from '@/config/app';
-  import Verify from '@/components/verify/verify.vue';
+	import {
+		configMap
+	} from '@/utils';
+	import {
+		HTTP_REQUEST_URL
+	} from '@/config/app';
+	import Verify from '@/components/verify/verify.vue';
 	export default {
 		name: "RetrievePassword",
-      components: {
-        Verify
+		components: {
+			Verify
 		},
 		mixins: [sendVerifyCode],
 		data: function() {
@@ -85,16 +100,14 @@
 			};
 		},
 		computed: configMap(['login_logo'], mapGetters(['viewColor'])),
-		onReady() {
-		},
-		mounted: function() {
-		},
+		onReady() {},
+		mounted: function() {},
 		methods: {
 			back() {
 				uni.navigateBack();
 			},
 			again() {
-				this.codeUrl =	VUE_APP_API_URL + "/captcha?" + this.keyCode + Date.parse(new Date());
+				this.codeUrl = VUE_APP_API_URL + "/captcha?" + this.keyCode + Date.parse(new Date());
 			},
 
 			async code(data) {
@@ -108,7 +121,7 @@
 				await registerVerify({
 						phone: that.account,
 						type: 'change_pwd',
-            captchaType: 'blockPuzzle',
+						captchaType: 'blockPuzzle',
 						captchaVerification: data.captchaVerification
 					})
 					.then(res => {
@@ -169,7 +182,7 @@
 						})
 					});
 			},
-        success(data) {
+			success(data) {
 				this.$refs.verify.hide();
 				this.code(data);
 			},
@@ -180,13 +193,15 @@
 	};
 </script>
 <style lang="scss" scoped>
-	.register{
+	.register {
 		background: #ffffff;
 		height: 100vh;
 	}
+
 	.register .list .item .code {
 		color: var(--view-theme);
 	}
+
 	.whiteBg .logon {
 		display: flex;
 		align-items: center;
@@ -194,13 +209,14 @@
 		width: 100%;
 		height: 86rpx;
 		margin-top: 48rpx;
-		background-color:var(--view-theme);
+		background-color: var(--view-theme);
 		border-radius: 120rpx;
 		color: #FFFFFF;
 		font-size: 30rpx;
 	}
-	.whiteBg{
+
+	.whiteBg {
 		background-repeat: no-repeat;
 		background-size: 100% auto;
 	}
-</style>
+</style>
\ No newline at end of file
diff --git a/pages/users/user_about/index.vue b/pages/users/user_about/index.vue
index c6636ac..96ef21c 100644
--- a/pages/users/user_about/index.vue
+++ b/pages/users/user_about/index.vue
@@ -42,7 +42,9 @@
 		userOut,
 		getLogout
 	} from '@/api/user.js'
-	import { mapGetters } from "vuex";
+	import {
+		mapGetters
+	} from "vuex";
 	export default {
 		name: 'user_about',
 		data() {
@@ -63,7 +65,7 @@
 			this.setTitle(this.type)
 		},
 		methods: {
-			toCancel(){
+			toCancel() {
 				uni.redirectTo({
 					url: '/pages/users/user_about/index?from=the_cancellation_prompt'
 				})
@@ -77,37 +79,41 @@
 					mask: true
 				});
 				this.moal = false;
-				(new Promise(call=>{
+				(new Promise(call => {
 					userOut().then(res => {
-						if(res.data.status === 200){
+						if (res.data.status === 200) {
 							uni.hideLoading()
 							call()
-						}else{
+						} else {
 							uni.showModal({
 								title: '提示',
 								content: res.message,
-								success: ({confirm}) => {
+								success: ({
+									confirm
+								}) => {
 									if (confirm) {
-										userOut({key: res.data.result.key}).then(res => {
+										userOut({
+											key: res.data.result.key
+										}).then(res => {
 											uni.hideLoading()
-											if(res.data.status === 200){
+											if (res.data.status === 200) {
 												call()
-											}else{
+											} else {
 												this.$util.Tips({
 													title: res.message
 												});
 											}
 										})
-									}else{
+									} else {
 										uni.hideLoading()
 									}
 								}
 							});
 						}
 					})
-				})).then(v=>{
+				})).then(v => {
 					this.$store.commit("LOGOUT");
-					setTimeout(()=>{
+					setTimeout(() => {
 						uni.reLaunch({
 							url: '/pages/index/index'
 						});
@@ -133,7 +139,7 @@
 				this.loaded = false;
 				cacheInfo(this.type).then(res => {
 					this.data = res.data[this.type]
-					if(res.data.title) {
+					if (res.data.title) {
 						uni.setNavigationBarTitle({
 							title: res.data.title
 						})
@@ -181,19 +187,23 @@
 			padding: 30rpx;
 			color: #282828;
 		}
+
 		.cancelTxt {
 			overflow: hidden;
 			overflow-y: auto;
-			image{
+
+			image {
 				max-width: 100%;
 			}
 		}
+
 		.cancel {
 			position: fixed;
 			bottom: 60rpx;
 			left: 0;
 			z-index: 1;
 			width: 100%;
+
 			.checkbox {
 				display: flex;
 				align-items: center;
@@ -201,21 +211,26 @@
 				margin: 0 auto;
 				font-size: 24rpx;
 				font-weight: 400;
+
 				span {
 					margin-left: 5rpx;
 				}
+
 				.font {
 					color: var(--view-theme);
 					font-style: normal;
 				}
+
 				.iconfont {
 					font-size: 28rpx;
 					margin-right: 15rpx;
 				}
-				.icon-xuanzhong1{
+
+				.icon-xuanzhong1 {
 					color: var(--view-theme);
 				}
 			}
+
 			.btn {
 				width: 690rpx;
 				height: 90rpx;
@@ -231,6 +246,7 @@
 			}
 		}
 	}
+
 	.outMoal {
 		width: 100%;
 		height: 100%;
@@ -242,6 +258,7 @@
 		display: flex;
 		align-items: center;
 		justify-content: center;
+
 		.box {
 			position: fixed;
 			width: 590rpx;
@@ -251,15 +268,18 @@
 			border-radius: 20rpx;
 			text-align: center;
 			padding: 50rpx;
+
 			.title {
 				font-size: 30rpx;
 				font-weight: 600;
 				color: #282828;
 			}
+
 			.moalBtn {
 				margin-top: 43rpx;
 				display: flex;
 				justify-content: space-between;
+
 				.ok {
 					width: 234rpx;
 					height: 66rpx;
@@ -269,6 +289,7 @@
 					line-height: 66rpx;
 					color: var(--view-theme);
 				}
+
 				.no {
 					width: 234rpx;
 					height: 66rpx;
@@ -281,4 +302,4 @@
 			}
 		}
 	}
-</style>
+</style>
\ No newline at end of file
diff --git a/pages/users/user_info/index.vue b/pages/users/user_info/index.vue
index 43a74c5..960ba28 100644
--- a/pages/users/user_info/index.vue
+++ b/pages/users/user_info/index.vue
@@ -246,14 +246,14 @@
 			 *
 			 */
 			uploadpic: async function() {
-        // #ifdef APP-PLUS
-        let result = await this.$store.dispatch("permission/requestPermissions",
-        	'CAMERA')
-        if (result !== 1) return;
-        result = await this.$store.dispatch("permission/requestPermissions",
-        	'READ_EXTERNAL_STORAGE')
-        if (result !== 1) return;
-        // #endif	
+				// #ifdef APP-PLUS
+				let result = await this.$store.dispatch("permission/requestPermissions",
+					'CAMERA')
+				if (result !== 1) return;
+				result = await this.$store.dispatch("permission/requestPermissions",
+					'READ_EXTERNAL_STORAGE')
+				if (result !== 1) return;
+				// #endif	
 				let that = this;
 				if (that.open_update_info == 0) {
 					return;
@@ -354,7 +354,7 @@
 						title: '提示',
 						content: '确认退出登录?',
 						success: function(res) {
-              uni.setStorageSync('tabbar_sale_type', 1);
+							uni.setStorageSync('tabbar_sale_type', 1);
 							if (res.confirm) {
 								getLogout()
 									.then(res => {
@@ -677,10 +677,11 @@
 		width: 690rpx;
 		height: 90rpx;
 		border-radius: 45rpx;
-		margin: 80rpx auto 0 auto;
+		margin: 80rpx auto 40rpx auto;
 		color: var(--view-theme);
 		background-color: #ffffff;
 		border: 1px solid var(--view-theme);
+
 	}
 
 	.avatar-box {
diff --git a/static/css/base.css b/static/css/base.css
index 1fc7ce7..38d2842 100644
--- a/static/css/base.css
+++ b/static/css/base.css
@@ -412,4 +412,15 @@ checkbox .uni-checkbox-input.uni-checkbox-input-checked::before {
 	width: 100%;
 	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');
 }
\ No newline at end of file
diff --git a/static/font/PingFangMedium.ttf b/static/font/PingFangMedium.ttf
new file mode 100644
index 0000000..e7a83ac
Binary files /dev/null and b/static/font/PingFangMedium.ttf differ
diff --git a/static/font/PingFangRegular.ttf b/static/font/PingFangRegular.ttf
new file mode 100644
index 0000000..cb66bdd
Binary files /dev/null and b/static/font/PingFangRegular.ttf differ
diff --git a/static/images/YDT.png b/static/images/YDT.png
new file mode 100644
index 0000000..5fcaa8b
Binary files /dev/null and b/static/images/YDT.png differ
diff --git a/static/images/diverPointer.png b/static/images/diverPointer.png
new file mode 100644
index 0000000..edd4fad
Binary files /dev/null and b/static/images/diverPointer.png differ
diff --git a/static/images/eye.png b/static/images/eye.png
new file mode 100644
index 0000000..2dd5181
Binary files /dev/null and b/static/images/eye.png differ
diff --git a/static/images/greenLine.png b/static/images/greenLine.png
new file mode 100644
index 0000000..f7d7d09
Binary files /dev/null and b/static/images/greenLine.png differ
diff --git a/static/images/greenLineDown.png b/static/images/greenLineDown.png
new file mode 100644
index 0000000..46cc650
Binary files /dev/null and b/static/images/greenLineDown.png differ
diff --git a/static/images/offeye.png b/static/images/offeye.png
new file mode 100644
index 0000000..c391c3d
Binary files /dev/null and b/static/images/offeye.png differ
diff --git a/static/images/pointer.png b/static/images/pointer.png
new file mode 100644
index 0000000..251271c
Binary files /dev/null and b/static/images/pointer.png differ
diff --git a/static/images/starpng.png b/static/images/starpng.png
new file mode 100644
index 0000000..51c1e52
Binary files /dev/null and b/static/images/starpng.png differ
diff --git a/static/images/tabSc.png b/static/images/tabSc.png
new file mode 100644
index 0000000..5a4ff90
Binary files /dev/null and b/static/images/tabSc.png differ
diff --git a/static/images/ydwd.png b/static/images/ydwd.png
new file mode 100644
index 0000000..5a4ff90
Binary files /dev/null and b/static/images/ydwd.png differ
diff --git a/store/modules/app.js b/store/modules/app.js
index 6d58ea6..294527c 100644
--- a/store/modules/app.js
+++ b/store/modules/app.js
@@ -9,17 +9,19 @@
 // +----------------------------------------------------------------------
 import {
 	getUserInfo,
-  Appversion
+	Appversion
 } from "../../api/user.js";
 import {
 	LOGIN_STATUS,
 	UID,
-  USER_INFO
+	USER_INFO
 } from '../../config/cache';
 import Cache from '../../utils/cache';
 // #ifdef APP-PLUS
 import Updater from '@/uni_modules/guyue-updater/index';
-import { Toast } from "../../libs/uniApi.js";
+import {
+	Toast
+} from "../../libs/uniApi.js";
 // #endif
 
 
@@ -28,42 +30,44 @@ const state = {
 	token: Cache.get(LOGIN_STATUS) || null,
 	uuid: uni.getStorageSync('uuid') || "",
 	backgroundColor: "#fff",
-	userInfo: (typeof Cache.get('USER_INFO') == 'string' ? JSON.parse(Cache.get('USER_INFO')) : Cache.get('USER_INFO'))||{},
+	userInfo: (typeof Cache.get('USER_INFO') == 'string' ? JSON.parse(Cache.get('USER_INFO')) : Cache.get(
+		'USER_INFO')) || {},
 	uid: Cache.get(UID) || null,
 	globalData: uni.getStorageSync('GLOBAL_DATA') || {},
 	homeActive: false,
 	copyPwd: null,
-	pageFooter:uni.getStorageSync('pageFoot') || {},
+	pageFooter: uni.getStorageSync('pageFoot') || {},
 	keyColor: Cache.get('KEY_COLOR') || '_default',
-	viewColor: Cache.get('VIEW_COLOR') || '--view-theme: #E93323;--view-assist:#FF7612;--view-priceColor:#E93323;--view-bgColor:rgba(255, 118, 18,.1);--view-minorColor:rgba(233, 51, 35,.1);--view-bntColor11:#FDA923;--view-bntColor12:#FD6523;--view-bntColor21:#F11B09;--view-bntColor22:#F67A38;',
+	viewColor: Cache.get('VIEW_COLOR') ||
+		'--view-theme: #E93323;--view-assist:#FF7612;--view-priceColor:#E93323;--view-bgColor:rgba(255, 118, 18,.1);--view-minorColor:rgba(233, 51, 35,.1);--view-bntColor11:#FDA923;--view-bntColor12:#FD6523;--view-bntColor21:#F11B09;--view-bntColor22:#F67A38;',
 };
 
 const mutations = {
-  setLocation(state, data) {
-  	state.location = data
-  	Cache.set('LOCATION_DATA', data);
-  },
+	setLocation(state, data) {
+		state.location = data
+		Cache.set('LOCATION_DATA', data);
+	},
 	LOGIN(state, opt) {
 		state.token = opt.token;
 		Cache.set(LOGIN_STATUS, opt.token, opt.time);
 		uni.removeStorageSync('auth_token');
 	},
-  SET_USERINFO(state, opt){
-    state.userInfo = opt;
-    Cache.set(USER_INFO, opt);
-  },
-	SETUID(state,val){
+	SET_USERINFO(state, opt) {
+		state.userInfo = opt;
+		Cache.set(USER_INFO, opt);
+	},
+	SETUID(state, val) {
 		state.uid = val;
 		Cache.set(UID, val);
 	},
-	SETUUID(state,val){
+	SETUUID(state, val) {
 		state.uuid = val;
 		uni.setStorageSync('uuid', val)
 	},
 	UPDATE_LOGIN(state, token) {
 		state.token = token;
 	},
-	
+
 	LOGOUT(state) {
 		state.token = null;
 		state.uid = null
@@ -99,7 +103,7 @@ const mutations = {
 		uni.setStorageSync('GLOBAL_DATA', key);
 		state.globalData = key;
 	},
-	FOOT_UPLOAD(state,data){
+	FOOT_UPLOAD(state, data) {
 		state.pageFooter = data
 	}
 };
@@ -122,78 +126,77 @@ const actions = {
 
 			});
 	},
-  async INIT_CONFIG({
-  	state,
-  	commit
-  }, data = false) {
-    if(data) {
-      uni.showLoading({
-        title: '加载中'
-      })
-      await uni.$u.sleep(500)
-    }
-    
-  	// #ifdef APP-PLUS
-  	let os = uni.getSystemInfoSync();
-  	let apptype;
-  	if (os.osName == 'ios') {
-  		apptype = 2
-  	} else {
-  		apptype = 1
-  	}
-    console.log({
-  		version: os.appWgtVersion,
-  		type: apptype,
-  		phone_brand:os.brand
-  	});
-  	Appversion({
-  		version: os.appWgtVersion,
-  		type: apptype,
-  		phone_brand:os.brand
-  	}).then((res) => {
-      console.log(res);
-      if(data) uni.hideLoading()
-  		if (Object.keys(res.data.appInfo).length > 0) {
-  			// if(res.data.appInfo.version)	uni.showLoading({
-  			// 	title: '检查更新中'
-  			// })
-  			// 版本更新
-  			if (compareVersions(res.data.appInfo.version, os.appWgtVersion) == 1) {
-  				try {
-  					let info = res.data.appInfo || {};
-  					let version = {
-  						title: info.title || '发现新版本',
-  						content: info.content || '修复了部分BUG',
-  						versionName: info.version || '1.0.1',
-  						brand:res.data.appInfo.phone_brand,
-  						downUrl: info.dow_url || '',
-  						force: info.force == 1 ? true : false, // 是否强制更新
-  						quiet: info.quiet == 1 ? true : false // 是否静默更新
-  					}
-  					Updater.update(version,res.data.appInfo);
-  				} catch (e) {
-  					console.log(e);
-            Toast(e)
-  				}
-  				// uni.hideLoading();
-  			}
-        else {
-          if(data) Toast('已经是最新版本了')
-        }
-  		
-  		} else {
-          if(data) Toast('已经是最新版本了')
-        }
-  	}).catch((err) => {
-      console.log(err);
-      if(data) uni.hideLoading()
-      Toast(err.msg||err.message||err)
-  		// console.log(err)
-  	})
-  
-  
-  	// #endif
-  }
+	async INIT_CONFIG({
+		state,
+		commit
+	}, data = false) {
+		if (data) {
+			uni.showLoading({
+				title: '加载中'
+			})
+			await uni.$u.sleep(500)
+		}
+
+		// #ifdef APP-PLUS
+		let os = uni.getSystemInfoSync();
+		let apptype;
+		if (os.osName == 'ios') {
+			apptype = 2
+		} else {
+			apptype = 1
+		}
+		//  console.log({
+		// 	version: os.appWgtVersion,
+		// 	type: apptype,
+		// 	phone_brand:os.brand
+		// });
+		Appversion({
+			version: os.appWgtVersion,
+			type: apptype,
+			phone_brand: os.brand
+		}).then((res) => {
+			// console.log(res);
+			if (data) uni.hideLoading()
+			if (Object.keys(res.data.appInfo).length > 0) {
+				// if(res.data.appInfo.version)	uni.showLoading({
+				// 	title: '检查更新中'
+				// })
+				// 版本更新
+				if (compareVersions(res.data.appInfo.version, os.appWgtVersion) == 1) {
+					try {
+						let info = res.data.appInfo || {};
+						let version = {
+							title: info.title || '发现新版本',
+							content: info.content || '修复了部分BUG',
+							versionName: info.version || '1.0.1',
+							brand: res.data.appInfo.phone_brand,
+							downUrl: info.dow_url || '',
+							force: info.force == 1 ? true : false, // 是否强制更新
+							quiet: info.quiet == 1 ? true : false // 是否静默更新
+						}
+						Updater.update(version, res.data.appInfo);
+					} catch (e) {
+						console.log(e);
+						Toast(e)
+					}
+					// uni.hideLoading();
+				} else {
+					if (data) Toast('已经是最新版本了')
+				}
+
+			} else {
+				if (data) Toast('已经是最新版本了')
+			}
+		}).catch((err) => {
+			console.log(err);
+			if (data) uni.hideLoading()
+			Toast(err.msg || err.message || err)
+			// console.log(err)
+		})
+
+
+		// #endif
+	}
 };
 
 function compareVersions(version1, version2) {
@@ -216,4 +219,4 @@ export default {
 	state,
 	mutations,
 	actions
-};
+};
\ No newline at end of file
diff --git a/uni.scss b/uni.scss
index 1b6e6d5..05ee476 100644
--- 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;
diff --git a/uniCloud-aliyun/cloudfunctions/oneClickLoginFn/index.js b/uniCloud-aliyun/cloudfunctions/oneClickLoginFn/index.js
new file mode 100644
index 0000000..51899fb
--- /dev/null
+++ b/uniCloud-aliyun/cloudfunctions/oneClickLoginFn/index.js
@@ -0,0 +1,35 @@
+// 下面仅展示客户端使用post方式发送content-type为application/json请求的场景
+exports.main = async (event) => {
+	let body = event.body
+	if (event.isBase64Encoded) {
+		body = Buffer.from(body, 'base64')
+	}
+	const {
+		access_token,
+		openid
+	} = JSON.parse(body)
+	if (!access_token || !openid) {
+		return { // 不建议把完整手机号返回给前端
+			success: false,
+			error: {
+				code: 'params is not fund',
+				message: '参数错误',
+			}
+		}
+	}
+	const res = await uniCloud.getPhoneNumber({
+		provider: 'univerify',
+		appid: '__UNI__3A527D1', // DCloud appid，不同于callFunction方式调用，使用云函数Url化需要传递DCloud appid参数！！！
+		access_token: access_token,
+		openid: openid
+	})
+	console.log(res); // res里包含手机号
+	return { // 不建议把完整手机号返回给前端
+		success: true,
+		info: {
+			code: 0,
+			message: '获取手机号成功',
+			data: res,
+		}
+	}
+}
\ No newline at end of file
diff --git a/uniCloud-aliyun/cloudfunctions/oneClickLoginFn/package.json b/uniCloud-aliyun/cloudfunctions/oneClickLoginFn/package.json
new file mode 100644
index 0000000..7f4ea72
--- /dev/null
+++ b/uniCloud-aliyun/cloudfunctions/oneClickLoginFn/package.json
@@ -0,0 +1,8 @@
+{
+	"name": "oneClickLoginFn",
+	"dependencies": {},
+	"extensions": {
+		"uni-cloud-jql": {},
+		"uni-cloud-verify": {}
+	}
+}
\ No newline at end of file
diff --git a/uniCloud-aliyun/database/JQL查询.jql b/uniCloud-aliyun/database/JQL查询.jql
new file mode 100644
index 0000000..35d21de
--- /dev/null
+++ b/uniCloud-aliyun/database/JQL查询.jql
@@ -0,0 +1,12 @@
+// 本文件用于，使用JQL语法操作项目关联的uniCloud空间的数据库，方便开发调试和远程数据库管理
+// 编写clientDB的js API（也支持常规js语法，比如var），可以对云数据库进行增删改查操作。不支持uniCloud-db组件写法
+// 可以全部运行，也可以选中部分代码运行。点击工具栏上的运行按钮或者按下【F5】键运行代码
+// 如果文档中存在多条JQL语句，只有最后一条语句生效
+// 如果混写了普通js，最后一条语句需是数据库操作语句
+// 此处代码运行不受DB Schema的权限控制，移植代码到实际业务中注意在schema中配好permission
+// 不支持clientDB的action
+// 数据库查询有最大返回条数限制，详见：https://uniapp.dcloud.net.cn/uniCloud/cf-database.html#limit
+// 详细JQL语法，请参考：https://uniapp.dcloud.net.cn/uniCloud/jql.html
+
+// 下面示例查询uni-id-users表的所有数据
+db.collection('uni-id-users').get();
diff --git a/uni_modules/uni-config-center/changelog.md b/uni_modules/uni-config-center/changelog.md
new file mode 100644
index 0000000..57dbcb5
--- /dev/null
+++ b/uni_modules/uni-config-center/changelog.md
@@ -0,0 +1,6 @@
+## 0.0.3（2022-11-11）
+- 修复 config 方法获取根节点为数组格式配置时错误的转化为了对象的Bug
+## 0.0.2（2021-04-16）
+- 修改插件package信息
+## 0.0.1（2021-03-15）
+- 初始化项目
diff --git a/uni_modules/uni-config-center/package.json b/uni_modules/uni-config-center/package.json
new file mode 100644
index 0000000..bace866
--- /dev/null
+++ b/uni_modules/uni-config-center/package.json
@@ -0,0 +1,81 @@
+{
+  "id": "uni-config-center",
+  "displayName": "uni-config-center",
+  "version": "0.0.3",
+  "description": "uniCloud 配置中心",
+  "keywords": [
+    "配置",
+    "配置中心"
+],
+  "repository": "",
+  "engines": {
+    "HBuilderX": "^3.1.0"
+  },
+"dcloudext": {
+    "sale": {
+      "regular": {
+        "price": "0.00"
+      },
+      "sourcecode": {
+        "price": "0.00"
+      }
+    },
+    "contact": {
+      "qq": ""
+    },
+    "declaration": {
+      "ads": "无",
+      "data": "无",
+      "permissions": "无"
+    },
+    "npmurl": "",
+    "type": "unicloud-template-function"
+  },
+  "directories": {
+    "example": "../../../scripts/dist"
+  },
+  "uni_modules": {
+    "dependencies": [],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "y",
+        "aliyun": "y"
+      },
+      "client": {
+        "App": {
+          "app-vue": "u",
+          "app-nvue": "u"
+        },
+        "H5-mobile": {
+          "Safari": "u",
+          "Android Browser": "u",
+          "微信浏览器(Android)": "u",
+          "QQ浏览器(Android)": "u"
+        },
+        "H5-pc": {
+          "Chrome": "u",
+          "IE": "u",
+          "Edge": "u",
+          "Firefox": "u",
+          "Safari": "u"
+        },
+        "小程序": {
+          "微信": "u",
+          "阿里": "u",
+          "百度": "u",
+          "字节跳动": "u",
+          "QQ": "u"
+        },
+        "快应用": {
+          "华为": "u",
+          "联盟": "u"
+        },
+        "Vue": {
+            "vue2": "y",
+            "vue3": "u"
+        }
+      }
+    }
+  }
+}
diff --git a/uni_modules/uni-config-center/readme.md b/uni_modules/uni-config-center/readme.md
new file mode 100644
index 0000000..03f7fc2
--- /dev/null
+++ b/uni_modules/uni-config-center/readme.md
@@ -0,0 +1,93 @@
+# 为什么使用uni-config-center
+
+实际开发中很多插件需要配置文件才可以正常运行，如果每个插件都单独进行配置的话就会产生下面这样的目录结构
+
+```bash
+cloudfunctions
+└─────common 公共模块
+        ├─plugin-a // 插件A对应的目录
+        │  ├─index.js
+        │  ├─config.json // plugin-a对应的配置文件
+        │  └─other-file.cert  // plugin-a依赖的其他文件
+        └─plugin-b // plugin-b对应的目录
+           ├─index.js
+           └─config.json // plugin-b对应的配置文件
+```
+
+假设插件作者要发布一个项目模板，里面使用了很多需要配置的插件，无论是作者发布还是用户使用都是一个大麻烦。
+
+uni-config-center就是用了统一管理这些配置文件的，使用uni-config-center后的目录结构如下
+
+```bash
+cloudfunctions
+└─────common 公共模块
+        ├─plugin-a // 插件A对应的目录
+        │  └─index.js
+        ├─plugin-b // plugin-b对应的目录
+        │  └─index.js
+        └─uni-config-center
+           ├─index.js // config-center入口文件
+           ├─plugin-a
+           │  ├─config.json  // plugin-a对应的配置文件
+           │  └─other-file.cert  // plugin-a依赖的其他文件
+           └─plugin-b
+              └─config.json  // plugin-b对应的配置文件
+```
+
+使用uni-config-center后的优势
+
+- 配置文件统一管理，分离插件主体和配置信息，更新插件更方便
+- 支持对config.json设置schema，插件使用者在HBuilderX内编写config.json文件时会有更好的提示（后续HBuilderX会提供支持）
+
+# 用法
+
+在要使用uni-config-center的公共模块或云函数内引入uni-config-center依赖，请参考：[使用公共模块](https://uniapp.dcloud.net.cn/uniCloud/cf-common)
+
+```js
+const createConfig = require('uni-config-center')
+
+const uniIdConfig = createConfig({
+    pluginId: 'uni-id', // 插件id
+    defaultConfig: { // 默认配置
+        tokenExpiresIn: 7200,
+        tokenExpiresThreshold: 600,
+    },
+    customMerge: function(defaultConfig, userConfig) { // 自定义默认配置和用户配置的合并规则，不设置的情况侠会对默认配置和用户配置进行深度合并
+        // defaudltConfig 默认配置
+        // userConfig 用户配置
+        return Object.assign(defaultConfig, userConfig)
+    }
+})
+
+
+// 以如下配置为例
+// {
+//   "tokenExpiresIn": 7200,
+//   "passwordErrorLimit": 6,
+//   "bindTokenToDevice": false,
+//   "passwordErrorRetryTime": 3600,
+//   "app-plus": {
+//     "tokenExpiresIn": 2592000
+//   },
+//   "service": {
+//     "sms": {
+//       "codeExpiresIn": 300
+//     }
+//   }
+// }
+
+// 获取配置
+uniIdConfig.config() // 获取全部配置，注意：uni-config-center内不存在对应插件目录时会返回空对象
+uniIdConfig.config('tokenExpiresIn') // 指定键值获取配置，返回：7200
+uniIdConfig.config('service.sms.codeExpiresIn') // 指定键值获取配置，返回：300
+uniIdConfig.config('tokenExpiresThreshold', 600) // 指定键值获取配置，如果不存在则取传入的默认值，返回：600
+
+// 获取文件绝对路径
+uniIdConfig.resolve('custom-token.js') // 获取uni-config-center/uni-id/custom-token.js文件的路径
+
+// 引用文件（require）
+uniIDConfig.requireFile('custom-token.js') // 使用require方式引用uni-config-center/uni-id/custom-token.js文件。文件不存在时返回undefined，文件内有其他错误导致require失败时会抛出错误。
+
+// 判断是否包含某文件
+uniIDConfig.hasFile('custom-token.js') // 配置目录是否包含某文件，true: 文件存在，false: 文件不存在
+```
\ No newline at end of file
diff --git a/uni_modules/uni-config-center/uniCloud/cloudfunctions/common/uni-config-center/index.js b/uni_modules/uni-config-center/uniCloud/cloudfunctions/common/uni-config-center/index.js
new file mode 100644
index 0000000..00ba62f
--- /dev/null
+++ b/uni_modules/uni-config-center/uniCloud/cloudfunctions/common/uni-config-center/index.js
@@ -0,0 +1 @@
+"use strict";var t=require("fs"),r=require("path");function e(t){return t&&"object"==typeof t&&"default"in t?t:{default:t}}var n=e(t),o=e(r),i="undefined"!=typeof globalThis?globalThis:"undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{};var u=function(t){var r={exports:{}};return t(r,r.exports),r.exports}((function(t,r){var e="__lodash_hash_undefined__",n=9007199254740991,o="[object Arguments]",u="[object Function]",c="[object Object]",a=/^\[object .+?Constructor\]$/,f=/^(?:0|[1-9]\d*)$/,s={};s["[object Float32Array]"]=s["[object Float64Array]"]=s["[object Int8Array]"]=s["[object Int16Array]"]=s["[object Int32Array]"]=s["[object Uint8Array]"]=s["[object Uint8ClampedArray]"]=s["[object Uint16Array]"]=s["[object Uint32Array]"]=!0,s[o]=s["[object Array]"]=s["[object ArrayBuffer]"]=s["[object Boolean]"]=s["[object DataView]"]=s["[object Date]"]=s["[object Error]"]=s[u]=s["[object Map]"]=s["[object Number]"]=s[c]=s["[object RegExp]"]=s["[object Set]"]=s["[object String]"]=s["[object WeakMap]"]=!1;var l="object"==typeof i&&i&&i.Object===Object&&i,h="object"==typeof self&&self&&self.Object===Object&&self,p=l||h||Function("return this")(),_=r&&!r.nodeType&&r,v=_&&t&&!t.nodeType&&t,d=v&&v.exports===_,y=d&&l.process,g=function(){try{var t=v&&v.require&&v.require("util").types;return t||y&&y.binding&&y.binding("util")}catch(t){}}(),b=g&&g.isTypedArray;function j(t,r,e){switch(e.length){case 0:return t.call(r);case 1:return t.call(r,e[0]);case 2:return t.call(r,e[0],e[1]);case 3:return t.call(r,e[0],e[1],e[2])}return t.apply(r,e)}var w,O,m,A=Array.prototype,z=Function.prototype,M=Object.prototype,x=p["__core-js_shared__"],C=z.toString,F=M.hasOwnProperty,U=(w=/[^.]+$/.exec(x&&x.keys&&x.keys.IE_PROTO||""))?"Symbol(src)_1."+w:"",S=M.toString,I=C.call(Object),P=RegExp("^"+C.call(F).replace(/[\\^$.*+?()[\]{}|]/g,"\\$&").replace(/hasOwnProperty|(function).*?(?=\\\()| for .+?(?=\\\])/g,"$1.*?")+"$"),T=d?p.Buffer:void 0,q=p.Symbol,E=p.Uint8Array,$=T?T.allocUnsafe:void 0,D=(O=Object.getPrototypeOf,m=Object,function(t){return O(m(t))}),k=Object.create,B=M.propertyIsEnumerable,N=A.splice,L=q?q.toStringTag:void 0,R=function(){try{var t=vt(Object,"defineProperty");return t({},"",{}),t}catch(t){}}(),G=T?T.isBuffer:void 0,V=Math.max,W=Date.now,H=vt(p,"Map"),J=vt(Object,"create"),K=function(){function t(){}return function(r){if(!xt(r))return{};if(k)return k(r);t.prototype=r;var e=new t;return t.prototype=void 0,e}}();function Q(t){var r=-1,e=null==t?0:t.length;for(this.clear();++r<e;){var n=t[r];this.set(n[0],n[1])}}function X(t){var r=-1,e=null==t?0:t.length;for(this.clear();++r<e;){var n=t[r];this.set(n[0],n[1])}}function Y(t){var r=-1,e=null==t?0:t.length;for(this.clear();++r<e;){var n=t[r];this.set(n[0],n[1])}}function Z(t){var r=this.__data__=new X(t);this.size=r.size}function tt(t,r){var e=Ot(t),n=!e&&wt(t),o=!e&&!n&&At(t),i=!e&&!n&&!o&&Ft(t),u=e||n||o||i,c=u?function(t,r){for(var e=-1,n=Array(t);++e<t;)n[e]=r(e);return n}(t.length,String):[],a=c.length;for(var f in t)!r&&!F.call(t,f)||u&&("length"==f||o&&("offset"==f||"parent"==f)||i&&("buffer"==f||"byteLength"==f||"byteOffset"==f)||dt(f,a))||c.push(f);return c}function rt(t,r,e){(void 0!==e&&!jt(t[r],e)||void 0===e&&!(r in t))&&ot(t,r,e)}function et(t,r,e){var n=t[r];F.call(t,r)&&jt(n,e)&&(void 0!==e||r in t)||ot(t,r,e)}function nt(t,r){for(var e=t.length;e--;)if(jt(t[e][0],r))return e;return-1}function ot(t,r,e){"__proto__"==r&&R?R(t,r,{configurable:!0,enumerable:!0,value:e,writable:!0}):t[r]=e}Q.prototype.clear=function(){this.__data__=J?J(null):{},this.size=0},Q.prototype.delete=function(t){var r=this.has(t)&&delete this.__data__[t];return this.size-=r?1:0,r},Q.prototype.get=function(t){var r=this.__data__;if(J){var n=r[t];return n===e?void 0:n}return F.call(r,t)?r[t]:void 0},Q.prototype.has=function(t){var r=this.__data__;return J?void 0!==r[t]:F.call(r,t)},Q.prototype.set=function(t,r){var n=this.__data__;return this.size+=this.has(t)?0:1,n[t]=J&&void 0===r?e:r,this},X.prototype.clear=function(){this.__data__=[],this.size=0},X.prototype.delete=function(t){var r=this.__data__,e=nt(r,t);return!(e<0)&&(e==r.length-1?r.pop():N.call(r,e,1),--this.size,!0)},X.prototype.get=function(t){var r=this.__data__,e=nt(r,t);return e<0?void 0:r[e][1]},X.prototype.has=function(t){return nt(this.__data__,t)>-1},X.prototype.set=function(t,r){var e=this.__data__,n=nt(e,t);return n<0?(++this.size,e.push([t,r])):e[n][1]=r,this},Y.prototype.clear=function(){this.size=0,this.__data__={hash:new Q,map:new(H||X),string:new Q}},Y.prototype.delete=function(t){var r=_t(this,t).delete(t);return this.size-=r?1:0,r},Y.prototype.get=function(t){return _t(this,t).get(t)},Y.prototype.has=function(t){return _t(this,t).has(t)},Y.prototype.set=function(t,r){var e=_t(this,t),n=e.size;return e.set(t,r),this.size+=e.size==n?0:1,this},Z.prototype.clear=function(){this.__data__=new X,this.size=0},Z.prototype.delete=function(t){var r=this.__data__,e=r.delete(t);return this.size=r.size,e},Z.prototype.get=function(t){return this.__data__.get(t)},Z.prototype.has=function(t){return this.__data__.has(t)},Z.prototype.set=function(t,r){var e=this.__data__;if(e instanceof X){var n=e.__data__;if(!H||n.length<199)return n.push([t,r]),this.size=++e.size,this;e=this.__data__=new Y(n)}return e.set(t,r),this.size=e.size,this};var it,ut=function(t,r,e){for(var n=-1,o=Object(t),i=e(t),u=i.length;u--;){var c=i[it?u:++n];if(!1===r(o[c],c,o))break}return t};function ct(t){return null==t?void 0===t?"[object Undefined]":"[object Null]":L&&L in Object(t)?function(t){var r=F.call(t,L),e=t[L];try{t[L]=void 0;var n=!0}catch(t){}var o=S.call(t);n&&(r?t[L]=e:delete t[L]);return o}(t):function(t){return S.call(t)}(t)}function at(t){return Ct(t)&&ct(t)==o}function ft(t){return!(!xt(t)||function(t){return!!U&&U in t}(t))&&(zt(t)?P:a).test(function(t){if(null!=t){try{return C.call(t)}catch(t){}try{return t+""}catch(t){}}return""}(t))}function st(t){if(!xt(t))return function(t){var r=[];if(null!=t)for(var e in Object(t))r.push(e);return r}(t);var r=yt(t),e=[];for(var n in t)("constructor"!=n||!r&&F.call(t,n))&&e.push(n);return e}function lt(t,r,e,n,o){t!==r&&ut(r,(function(i,u){if(o||(o=new Z),xt(i))!function(t,r,e,n,o,i,u){var a=gt(t,e),f=gt(r,e),s=u.get(f);if(s)return void rt(t,e,s);var l=i?i(a,f,e+"",t,r,u):void 0,h=void 0===l;if(h){var p=Ot(f),_=!p&&At(f),v=!p&&!_&&Ft(f);l=f,p||_||v?Ot(a)?l=a:Ct(j=a)&&mt(j)?l=function(t,r){var e=-1,n=t.length;r||(r=Array(n));for(;++e<n;)r[e]=t[e];return r}(a):_?(h=!1,l=function(t,r){if(r)return t.slice();var e=t.length,n=$?$(e):new t.constructor(e);return t.copy(n),n}(f,!0)):v?(h=!1,d=f,y=!0?(g=d.buffer,b=new g.constructor(g.byteLength),new E(b).set(new E(g)),b):d.buffer,l=new d.constructor(y,d.byteOffset,d.length)):l=[]:function(t){if(!Ct(t)||ct(t)!=c)return!1;var r=D(t);if(null===r)return!0;var e=F.call(r,"constructor")&&r.constructor;return"function"==typeof e&&e instanceof e&&C.call(e)==I}(f)||wt(f)?(l=a,wt(a)?l=function(t){return function(t,r,e,n){var o=!e;e||(e={});var i=-1,u=r.length;for(;++i<u;){var c=r[i],a=n?n(e[c],t[c],c,e,t):void 0;void 0===a&&(a=t[c]),o?ot(e,c,a):et(e,c,a)}return e}(t,Ut(t))}(a):xt(a)&&!zt(a)||(l=function(t){return"function"!=typeof t.constructor||yt(t)?{}:K(D(t))}(f))):h=!1}var d,y,g,b;var j;h&&(u.set(f,l),o(l,f,n,i,u),u.delete(f));rt(t,e,l)}(t,r,u,e,lt,n,o);else{var a=n?n(gt(t,u),i,u+"",t,r,o):void 0;void 0===a&&(a=i),rt(t,u,a)}}),Ut)}function ht(t,r){return bt(function(t,r,e){return r=V(void 0===r?t.length-1:r,0),function(){for(var n=arguments,o=-1,i=V(n.length-r,0),u=Array(i);++o<i;)u[o]=n[r+o];o=-1;for(var c=Array(r+1);++o<r;)c[o]=n[o];return c[r]=e(u),j(t,this,c)}}(t,r,Pt),t+"")}var pt=R?function(t,r){return R(t,"toString",{configurable:!0,enumerable:!1,value:(e=r,function(){return e}),writable:!0});var e}:Pt;function _t(t,r){var e,n,o=t.__data__;return("string"==(n=typeof(e=r))||"number"==n||"symbol"==n||"boolean"==n?"__proto__"!==e:null===e)?o["string"==typeof r?"string":"hash"]:o.map}function vt(t,r){var e=function(t,r){return null==t?void 0:t[r]}(t,r);return ft(e)?e:void 0}function dt(t,r){var e=typeof t;return!!(r=null==r?n:r)&&("number"==e||"symbol"!=e&&f.test(t))&&t>-1&&t%1==0&&t<r}function yt(t){var r=t&&t.constructor;return t===("function"==typeof r&&r.prototype||M)}function gt(t,r){if(("constructor"!==r||"function"!=typeof t[r])&&"__proto__"!=r)return t[r]}var bt=function(t){var r=0,e=0;return function(){var n=W(),o=16-(n-e);if(e=n,o>0){if(++r>=800)return arguments[0]}else r=0;return t.apply(void 0,arguments)}}(pt);function jt(t,r){return t===r||t!=t&&r!=r}var wt=at(function(){return arguments}())?at:function(t){return Ct(t)&&F.call(t,"callee")&&!B.call(t,"callee")},Ot=Array.isArray;function mt(t){return null!=t&&Mt(t.length)&&!zt(t)}var At=G||function(){return!1};function zt(t){if(!xt(t))return!1;var r=ct(t);return r==u||"[object GeneratorFunction]"==r||"[object AsyncFunction]"==r||"[object Proxy]"==r}function Mt(t){return"number"==typeof t&&t>-1&&t%1==0&&t<=n}function xt(t){var r=typeof t;return null!=t&&("object"==r||"function"==r)}function Ct(t){return null!=t&&"object"==typeof t}var Ft=b?function(t){return function(r){return t(r)}}(b):function(t){return Ct(t)&&Mt(t.length)&&!!s[ct(t)]};function Ut(t){return mt(t)?tt(t,!0):st(t)}var St,It=(St=function(t,r,e){lt(t,r,e)},ht((function(t,r){var e=-1,n=r.length,o=n>1?r[n-1]:void 0,i=n>2?r[2]:void 0;for(o=St.length>3&&"function"==typeof o?(n--,o):void 0,i&&function(t,r,e){if(!xt(e))return!1;var n=typeof r;return!!("number"==n?mt(e)&&dt(r,e.length):"string"==n&&r in e)&&jt(e[r],t)}(r[0],r[1],i)&&(o=n<3?void 0:o,n=1),t=Object(t);++e<n;){var u=r[e];u&&St(t,u,e,o)}return t})));function Pt(t){return t}t.exports=It}));const c=Object.prototype.hasOwnProperty,a=(t,r)=>c.call(t,r);class f{constructor({pluginId:t,defaultConfig:r={},customMerge:e,root:n}){this.pluginId=t,this.defaultConfig=r,this.pluginConfigPath=o.default.resolve(n||__dirname,t),this.customMerge=e,this._config=void 0}resolve(t){return o.default.resolve(this.pluginConfigPath,t)}hasFile(t){return n.default.existsSync(this.resolve(t))}requireFile(t){try{return require(this.resolve(t))}catch(t){if("MODULE_NOT_FOUND"===t.code)return;throw t}}_getUserConfig(){return this.requireFile("config.json")}config(t,r){if(!this._config){const t=this._getUserConfig();this._config=Array.isArray(t)?t:(this.customMerge||u)(this.defaultConfig,t)}let e=this._config;return t?function(t,r,e){if("number"==typeof r)return t[r];if("symbol"==typeof r)return a(t,r)?t[r]:e;const n="string"!=typeof(o=r)?o:o.split(".").reduce(((t,r)=>(r.split(/\[([^}]+)\]/g).forEach((r=>r&&t.push(r))),t)),[]);var o;let i=t;for(let t=0;t<n.length;t++){const r=n[t];if(!a(i,r))return e;i=i[r]}return i}(e,t,r):e}}const s=new class{constructor(){this._configMap=new Map}plugin({pluginId:t,defaultConfig:r,customMerge:e,root:n=__dirname,cache:o=!0}){if(this._configMap.has(t)&&o)return this._configMap.get(t);const i=new f({pluginId:t,defaultConfig:r,customMerge:e,root:n});return o&&this._configMap.set(t,i),i}};var l=s.plugin.bind(s);module.exports=l;
diff --git a/uni_modules/uni-config-center/uniCloud/cloudfunctions/common/uni-config-center/package.json b/uni_modules/uni-config-center/uniCloud/cloudfunctions/common/uni-config-center/package.json
new file mode 100644
index 0000000..9a6dd0d
--- /dev/null
+++ b/uni_modules/uni-config-center/uniCloud/cloudfunctions/common/uni-config-center/package.json
@@ -0,0 +1 @@
+{"name":"uni-config-center","version":"0.0.3","description":"配置中心","main":"index.js","keywords":[],"author":"DCloud","license":"Apache-2.0"}
diff --git a/uni_modules/uni-id-common/changelog.md b/uni_modules/uni-id-common/changelog.md
new file mode 100644
index 0000000..e76f197
--- /dev/null
+++ b/uni_modules/uni-id-common/changelog.md
@@ -0,0 +1,34 @@
+## 1.0.17（2024-04-26）
+- 兼容uni-app-x对客户端uniPlatform的调整（uni-app-x内uniPlatform区分app-android、app-ios）
+## 1.0.16（2023-04-25）
+- 新增maxTokenLength配置，用于限制数据库用户记录token数组的最大长度
+## 1.0.15（2023-04-06）
+- 修复部分语言国际化出错的Bug
+## 1.0.14（2023-03-07）
+- 修复 admin用户包含其他角色时未包含在token的Bug
+## 1.0.13（2022-07-21）
+- 修复 创建token时未传角色权限信息生成的token不正确的bug
+## 1.0.12（2022-07-15）
+- 提升与旧版本uni-id的兼容性（补充读取配置文件时回退平台app-plus、h5），但是仍推荐使用新平台名进行配置（app、web）
+## 1.0.11（2022-07-14）
+- 修复 部分情况下报`read property 'reduce' of undefined`的错误
+## 1.0.10（2022-07-11）
+- 将token存储在用户表的token字段内，与旧版本uni-id保持一致
+## 1.0.9（2022-07-01）
+- checkToken兼容token内未缓存角色权限的情况，此时将查库获取角色权限
+## 1.0.8（2022-07-01）
+- 修复clientDB默认依赖时部分情况下获取不到uni-id配置的Bug
+## 1.0.7（2022-06-30）
+- 修复config文件不合法时未抛出具体错误的Bug
+## 1.0.6（2022-06-28）
+- 移除插件内的数据表schema
+## 1.0.5（2022-06-27）
+- 修复使用多应用配置时报`Cannot read property 'appId' of undefined`的Bug
+## 1.0.4（2022-06-27）
+- 修复使用自定义token内容功能报错的Bug [详情](https://ask.dcloud.net.cn/question/147945)
+## 1.0.2（2022-06-23）
+- 对齐旧版本uni-id默认配置
+## 1.0.1（2022-06-22）
+- 补充对uni-config-center的依赖
+## 1.0.0（2022-06-21）
+- 提供uni-id token创建、校验、刷新接口，简化旧版uni-id公共模块
diff --git a/uni_modules/uni-id-common/package.json b/uni_modules/uni-id-common/package.json
new file mode 100644
index 0000000..5a4f900
--- /dev/null
+++ b/uni_modules/uni-id-common/package.json
@@ -0,0 +1,85 @@
+{
+	"id": "uni-id-common",
+	"displayName": "uni-id-common",
+	"version": "1.0.17",
+	"description": "包含uni-id token生成、校验、刷新功能的云函数公共模块",
+	"keywords": [
+        "uni-id-common",
+        "uniCloud",
+        "token",
+        "权限"
+    ],
+	"repository": "https://gitcode.net/dcloud/uni-id-common",
+	"engines": {
+		"HBuilderX": "^3.1.0"
+	},
+    "dcloudext": {
+        "sale": {
+			"regular": {
+				"price": "0.00"
+			},
+			"sourcecode": {
+				"price": "0.00"
+			}
+		},
+		"contact": {
+			"qq": ""
+		},
+		"declaration": {
+			"ads": "无",
+			"data": "无",
+			"permissions": "无"
+		},
+        "npmurl": "",
+        "type": "unicloud-template-function"
+	},
+	"uni_modules": {
+		"dependencies": ["uni-config-center"],
+		"encrypt": [],
+		"platforms": {
+			"cloud": {
+				"tcb": "y",
+                "aliyun": "y",
+                "alipay": "n"
+			},
+			"client": {
+				"Vue": {
+					"vue2": "u",
+					"vue3": "u"
+				},
+				"App": {
+					"app-vue": "u",
+					"app-nvue": "u"
+				},
+				"H5-mobile": {
+					"Safari": "u",
+					"Android Browser": "u",
+					"微信浏览器(Android)": "u",
+					"QQ浏览器(Android)": "u"
+				},
+				"H5-pc": {
+					"Chrome": "u",
+					"IE": "u",
+					"Edge": "u",
+					"Firefox": "u",
+					"Safari": "u"
+				},
+				"小程序": {
+					"微信": "u",
+					"阿里": "u",
+					"百度": "u",
+					"字节跳动": "u",
+					"QQ": "u",
+					"钉钉": "u",
+					"快手": "u",
+					"飞书": "u",
+                    "京东": "u"
+				},
+				"快应用": {
+					"华为": "u",
+					"联盟": "u"
+				}
+			}
+		}
+	}
+}
diff --git a/uni_modules/uni-id-common/readme.md b/uni_modules/uni-id-common/readme.md
new file mode 100644
index 0000000..5f6a37a
--- /dev/null
+++ b/uni_modules/uni-id-common/readme.md
@@ -0,0 +1,3 @@
+# uni-id-common
+
+文档请参考：[uni-id-common](https://uniapp.dcloud.net.cn/uniCloud/uni-id-common.html)
\ No newline at end of file
diff --git a/uni_modules/uni-id-common/uniCloud/cloudfunctions/common/uni-id-common/index.js b/uni_modules/uni-id-common/uniCloud/cloudfunctions/common/uni-id-common/index.js
new file mode 100644
index 0000000..2078958
--- /dev/null
+++ b/uni_modules/uni-id-common/uniCloud/cloudfunctions/common/uni-id-common/index.js
@@ -0,0 +1 @@
+"use strict";var e,t=(e=require("crypto"))&&"object"==typeof e&&"default"in e?e.default:e;const n={TOKEN_EXPIRED:"uni-id-token-expired",CHECK_TOKEN_FAILED:"uni-id-check-token-failed",PARAM_REQUIRED:"uni-id-param-required",ACCOUNT_EXISTS:"uni-id-account-exists",ACCOUNT_NOT_EXISTS:"uni-id-account-not-exists",ACCOUNT_CONFLICT:"uni-id-account-conflict",ACCOUNT_BANNED:"uni-id-account-banned",ACCOUNT_AUDITING:"uni-id-account-auditing",ACCOUNT_AUDIT_FAILED:"uni-id-account-audit-failed",ACCOUNT_CLOSED:"uni-id-account-closed"};function i(e){return!!e&&("object"==typeof e||"function"==typeof e)&&"function"==typeof e.then}function r(e){if(!e)return;const t=e.match(/^(\d+).(\d+).(\d+)/);return t?t.slice(1,4).map(e=>parseInt(e)):void 0}function o(e,t){const n=r(e),i=r(t);return n?i?function(e,t){const n=Math.max(e.length,t.length);for(let i=0;i<n;i++){const n=e[i],r=t[i];if(n>r)return 1;if(n<r)return-1}return 0}(n,i):1:i?-1:0}const s={"uni-id-token-expired":30203,"uni-id-check-token-failed":30202};function c(e){const{errCode:t,errMsgValue:n}=e;e.errMsg=this._t(t,n),t in s&&(e.code=s[t]),delete e.errMsgValue}function a(e){return"object"===(i=e,Object.prototype.toString.call(i).slice(8,-1).toLowerCase())&&e.errCode&&(t=e.errCode,Object.values(n).includes(t))&&!!e.errCode;var t,i}let u={"zh-Hans":{"uni-id-token-expired":"登录状态失效，token已过期","uni-id-check-token-failed":"token校验未通过","uni-id-param-required":"缺少参数: {param}","uni-id-account-exists":"此账号已注册","uni-id-account-not-exists":"此账号未注册","uni-id-account-conflict":"用户账号冲突","uni-id-account-banned":"从账号已封禁","uni-id-account-auditing":"此账号正在审核中","uni-id-account-audit-failed":"此账号审核失败","uni-id-account-closed":"此账号已注销"},en:{"uni-id-token-expired":"The login status is invalid, token has expired","uni-id-check-token-failed":"Check token failed","uni-id-param-required":"Parameter required: {param}","uni-id-account-exists":"Account exists","uni-id-account-not-exists":"Account does not exists","uni-id-account-conflict":"User account conflict","uni-id-account-banned":"Account has been banned","uni-id-account-auditing":"Account audit in progress","uni-id-account-audit-failed":"Account audit failed","uni-id-account-closed":"Account has been closed"}};try{const e=require.resolve("uni-config-center/uni-id/lang/index.js");u=function(e,t){const n=Object.keys(e);n.push(...Object.keys(t));const i={};for(let r=0;r<n.length;r++){const o=n[r];i[o]=Object.assign({},e[o],t[o])}return i}(u,require(e))}catch(e){}var d=u;function l(e){return e.replace(/=/g,"").replace(/\+/g,"-").replace(/\//g,"_")}function h(e){return JSON.parse((t=function(e){var t=4-(e=e.toString()).length%4;if(4!==t)for(var n=0;n<t;++n)e+="=";return e.replace(/-/g,"+").replace(/_/g,"/")}(e),Buffer.from(t,"base64").toString("utf-8")));var t}function f(e){return l((t=JSON.stringify(e),Buffer.from(t,"utf-8").toString("base64")));var t}function p(e,n){return l(t.createHmac("sha256",n).update(e).digest("base64"))}const k=function(e,t){if("string"!=typeof e)throw new Error("Invalid token");const n=e.split(".");if(3!==n.length)throw new Error("Invalid token");const[i,r,o]=n;if(p(i+"."+r,t)!==o)throw new Error("Invalid token");const s=h(i);if("HS256"!==s.alg||"JWT"!==s.typ)throw new Error("Invalid token");const c=h(r);if(1e3*c.exp<Date.now()){const e=new Error("Token expired");throw e.name="TokenExpiredError",e}return c},g=function(e,t,n={}){const{expiresIn:i}=n;if(!i)throw new Error("expiresIn is required");const r=parseInt(Date.now()/1e3),o={...e,iat:r,exp:r+n.expiresIn},s=f({alg:"HS256",typ:"JWT"})+"."+f(o);return s+"."+p(s,t)},I=uniCloud.database(),_=I.command,C=I.collection("uni-id-users"),T=I.collection("uni-id-roles");class m{constructor({uniId:e}={}){this.uid=null,this.userRecord=null,this.userPermission=null,this.oldToken=null,this.oldTokenPayload=null,this.uniId=e,this.config=this.uniId._getConfig(),this.clientInfo=this.uniId._clientInfo,this.checkConfig()}checkConfig(){const{tokenExpiresIn:e,tokenExpiresThreshold:t}=this.config;if(t>=e)throw new Error("Config error, tokenExpiresThreshold should be less than tokenExpiresIn");t>e/2&&console.warn(`Please check whether the tokenExpiresThreshold configuration is set too large, tokenExpiresThreshold: ${t}, tokenExpiresIn: ${e}`)}get customToken(){return this.uniId.interceptorMap.get("customToken")}isTokenInDb(e){return o(e,"1.0.10")>=0}async getUserRecord(){if(this.userRecord)return this.userRecord;const e=await C.doc(this.uid).get();if(this.userRecord=e.data[0],!this.userRecord)throw{errCode:n.ACCOUNT_NOT_EXISTS};switch(this.userRecord.status){case void 0:case 0:break;case 1:throw{errCode:n.ACCOUNT_BANNED};case 2:throw{errCode:n.ACCOUNT_AUDITING};case 3:throw{errCode:n.ACCOUNT_AUDIT_FAILED};case 4:throw{errCode:n.ACCOUNT_CLOSED}}if(this.oldTokenPayload){if(this.isTokenInDb(this.oldTokenPayload.uniIdVersion)){if(-1===(this.userRecord.token||[]).indexOf(this.oldToken))throw{errCode:n.CHECK_TOKEN_FAILED}}if(this.userRecord.valid_token_date&&this.userRecord.valid_token_date>1e3*this.oldTokenPayload.iat)throw{errCode:n.TOKEN_EXPIRED}}return this.userRecord}async updateUserRecord(e){await C.doc(this.uid).update(e)}async getUserPermission(){if(this.userPermission)return this.userPermission;const e=(await this.getUserRecord()).role||[];if(0===e.length)return this.userPermission={role:[],permission:[]},this.userPermission;if(e.includes("admin"))return this.userPermission={role:e,permission:[]},this.userPermission;const t=await T.where({role_id:_.in(e)}).get(),n=(i=t.data.reduce((e,t)=>(t.permission&&e.push(...t.permission),e),[]),Array.from(new Set(i)));var i;return this.userPermission={role:e,permission:n},this.userPermission}async _createToken({uid:e,role:t,permission:i}={}){if(!t||!i){const e=await this.getUserPermission();t=e.role,i=e.permission}let r={uid:e,role:t,permission:i};if(this.uniId.interceptorMap.has("customToken")){const n=this.uniId.interceptorMap.get("customToken");if("function"!=typeof n)throw new Error("Invalid custom token file");r=await n({uid:e,role:t,permission:i})}const o=Date.now(),{tokenSecret:s,tokenExpiresIn:c,maxTokenLength:a=10}=this.config,u=g({...r,uniIdVersion:"1.0.17"},s,{expiresIn:c}),d=await this.getUserRecord(),l=(d.token||[]).filter(e=>{try{const t=this._checkToken(e);if(d.valid_token_date&&d.valid_token_date>1e3*t.iat)return!1}catch(e){if(e.errCode===n.TOKEN_EXPIRED)return!1}return!0});return l.push(u),l.length>a&&l.splice(0,l.length-a),await this.updateUserRecord({last_login_ip:this.clientInfo.clientIP,last_login_date:o,token:l}),{token:u,tokenExpired:o+1e3*c}}async createToken({uid:e,role:t,permission:i}={}){if(!e)throw{errCode:n.PARAM_REQUIRED,errMsgValue:{param:"uid"}};this.uid=e;const{token:r,tokenExpired:o}=await this._createToken({uid:e,role:t,permission:i});return{errCode:0,token:r,tokenExpired:o}}async refreshToken({token:e}={}){if(!e)throw{errCode:n.PARAM_REQUIRED,errMsgValue:{param:"token"}};this.oldToken=e;const t=this._checkToken(e);this.uid=t.uid,this.oldTokenPayload=t;const{uid:i}=t,{role:r,permission:o}=await this.getUserPermission(),{token:s,tokenExpired:c}=await this._createToken({uid:i,role:r,permission:o});return{errCode:0,token:s,tokenExpired:c}}_checkToken(e){const{tokenSecret:t}=this.config;let i;try{i=k(e,t)}catch(e){if("TokenExpiredError"===e.name)throw{errCode:n.TOKEN_EXPIRED};throw{errCode:n.CHECK_TOKEN_FAILED}}return i}async checkToken(e,{autoRefresh:t=!0}={}){if(!e)throw{errCode:n.PARAM_REQUIRED,errMsgValue:{param:"token"}};this.oldToken=e;const i=this._checkToken(e);this.uid=i.uid,this.oldTokenPayload=i;const{tokenExpiresThreshold:r}=this.config,{uid:o,role:s,permission:c}=i,a={role:s,permission:c};if(!s&&!c){const{role:e,permission:t}=await this.getUserPermission();a.role=e,a.permission=t}if(!r||!t){const e={code:0,errCode:0,...i,...a};return delete e.uniIdVersion,e}const u=Date.now();let d={};1e3*i.exp-u<1e3*r&&(d=await this._createToken({uid:o}));const l={code:0,errCode:0,...i,...a,...d};return delete l.uniIdVersion,l}}var E=Object.freeze({__proto__:null,checkToken:async function(e,{autoRefresh:t=!0}={}){return new m({uniId:this}).checkToken(e,{autoRefresh:t})},createToken:async function({uid:e,role:t,permission:n}={}){return new m({uniId:this}).createToken({uid:e,role:t,permission:n})},refreshToken:async function({token:e}={}){return new m({uniId:this}).refreshToken({token:e})}});const w=require("uni-config-center")({pluginId:"uni-id"});class x{constructor({context:e,clientInfo:t,config:n}={}){this._clientInfo=e?function(e){return{appId:e.APPID,platform:e.PLATFORM,locale:e.LOCALE,clientIP:e.CLIENTIP,deviceId:e.DEVICEID}}(e):t,this._config=n,this.config=this._getOriginConfig(),this.interceptorMap=new Map,w.hasFile("custom-token.js")&&this.setInterceptor("customToken",require(w.resolve("custom-token.js")));this._i18n=uniCloud.initI18n({locale:this._clientInfo.locale,fallbackLocale:"zh-Hans",messages:JSON.parse(JSON.stringify(d))}),d[this._i18n.locale]||this._i18n.setLocale("zh-Hans")}setInterceptor(e,t){this.interceptorMap.set(e,t)}_t(...e){return this._i18n.t(...e)}_parseOriginConfig(e){return Array.isArray(e)?e:e[0]?Object.values(e):e}_getOriginConfig(){if(this._config)return this._config;if(w.hasFile("config.json")){let e;try{e=w.config()}catch(e){throw new Error("Invalid uni-id config file\n"+e.message)}return this._parseOriginConfig(e)}try{return this._parseOriginConfig(require("uni-id/config.json"))}catch(e){throw new Error("Invalid uni-id config file")}}_getAppConfig(){const e=this._getOriginConfig();return Array.isArray(e)?e.find(e=>e.dcloudAppid===this._clientInfo.appId)||e.find(e=>e.isDefaultConfig):e}_getPlatformConfig(){const e=this._getAppConfig();if(!e)throw new Error(`Config for current app (${this._clientInfo.appId}) was not found, please check your config file or client appId`);let t;switch(["app-plus","app-android","app-ios"].indexOf(this._clientInfo.platform)>-1&&(this._clientInfo.platform="app"),"h5"===this._clientInfo.platform&&(this._clientInfo.platform="web"),this._clientInfo.platform){case"web":t="h5";break;case"app":t="app-plus"}const n=[{tokenExpiresIn:7200,tokenExpiresThreshold:1200,passwordErrorLimit:6,passwordErrorRetryTime:3600},e];t&&e[t]&&n.push(e[t]),n.push(e[this._clientInfo.platform]);const i=Object.assign(...n);return["tokenSecret","tokenExpiresIn"].forEach(e=>{if(!i||!i[e])throw new Error(`Config parameter missing, ${e} is required`)}),i}_getConfig(){return this._getPlatformConfig()}}for(const e in E)x.prototype[e]=E[e];function y(e){const t=new x(e);return new Proxy(t,{get(e,t){if(t in e&&0!==t.indexOf("_")){if("function"==typeof e[t])return(n=e[t],function(){let e;try{e=n.apply(this,arguments)}catch(e){if(a(e))return c.call(this,e),e;throw e}return i(e)?e.then(e=>(a(e)&&c.call(this,e),e),e=>{if(a(e))return c.call(this,e),e;throw e}):(a(e)&&c.call(this,e),e)}).bind(e);if("context"!==t&&"config"!==t)return e[t]}var n}})}x.prototype.createInstance=y;const A={createInstance:y};module.exports=A;
diff --git a/uni_modules/uni-id-common/uniCloud/cloudfunctions/common/uni-id-common/package.json b/uni_modules/uni-id-common/uniCloud/cloudfunctions/common/uni-id-common/package.json
new file mode 100644
index 0000000..4986a12
--- /dev/null
+++ b/uni_modules/uni-id-common/uniCloud/cloudfunctions/common/uni-id-common/package.json
@@ -0,0 +1 @@
+{"name":"uni-id-common","version":"1.0.17","description":"uni-id token生成、校验、刷新","main":"index.js","homepage":"https://uniapp.dcloud.io/uniCloud/uni-id-common.html","repository":{"type":"git","url":"git+https://gitee.com/dcloud/uni-id-common.git"},"author":"DCloud","license":"Apache-2.0","dependencies":{"uni-config-center":"file:../../../../../uni-config-center/uniCloud/cloudfunctions/common/uni-config-center"}}
diff --git a/uni_modules/uni-open-bridge-common/uniCloud/cloudfunctions/common/uni-open-bridge-common/bridge-error.js b/uni_modules/uni-open-bridge-common/uniCloud/cloudfunctions/common/uni-open-bridge-common/bridge-error.js
new file mode 100644
index 0000000..95160a4
--- /dev/null
+++ b/uni_modules/uni-open-bridge-common/uniCloud/cloudfunctions/common/uni-open-bridge-common/bridge-error.js
@@ -0,0 +1,26 @@
+'use strict';
+
+class BridgeError extends Error {
+
+  constructor(code, message) {
+    super(message)
+
+    this._code = code
+  }
+
+  get code() {
+    return this._code
+  }
+
+  get errCode() {
+    return this._code
+  }
+
+  get errMsg() {
+    return this.message
+  }
+}
+
+module.exports = {
+  BridgeError
+}
diff --git a/uni_modules/uni-open-bridge-common/uniCloud/cloudfunctions/common/uni-open-bridge-common/config.js b/uni_modules/uni-open-bridge-common/uniCloud/cloudfunctions/common/uni-open-bridge-common/config.js
new file mode 100644
index 0000000..d083f00
--- /dev/null
+++ b/uni_modules/uni-open-bridge-common/uniCloud/cloudfunctions/common/uni-open-bridge-common/config.js
@@ -0,0 +1,124 @@
+'use strict';
+
+const {
+  ProviderType
+} = require('./consts.js')
+
+const configCenter = require('uni-config-center')
+
+// 多维数据为兼容uni-id以前版本配置
+const OauthConfig = {
+  'weixin-app': [
+    ['app', 'oauth', 'weixin'],
+    ['app-plus', 'oauth', 'weixin']
+  ],
+  'weixin-mp': [
+    ['mp-weixin', 'oauth', 'weixin']
+  ],
+  'weixin-h5': [
+    ['web', 'oauth', 'weixin-h5'],
+    ['h5-weixin', 'oauth', 'weixin'],
+    ['h5', 'oauth', 'weixin']
+  ],
+  'weixin-web': [
+    ['web', 'oauth', 'weixin-web']
+  ],
+  'qq-app': [
+    ['app', 'oauth', 'qq'],
+    ['app-plus', 'oauth', 'qq']
+  ],
+  'qq-mp': [
+    ['mp-qq', 'oauth', 'qq']
+  ]
+}
+
+const Support_Platforms = [
+  ProviderType.WEIXIN_MP,
+  ProviderType.WEIXIN_H5,
+  ProviderType.WEIXIN_APP,
+  ProviderType.WEIXIN_WEB,
+  ProviderType.QQ_MP,
+  ProviderType.QQ_APP
+]
+
+class ConfigBase {
+
+  constructor() {
+    const uniIdConfigCenter = configCenter({
+      pluginId: 'uni-id'
+    })
+
+    this._uniIdConfig = uniIdConfigCenter.config()
+  }
+
+  getAppConfig(appid) {
+    if (Array.isArray(this._uniIdConfig)) {
+      return this._uniIdConfig.find((item) => {
+        return (item.dcloudAppid === appid)
+      })
+    }
+    return this._uniIdConfig
+  }
+}
+
+class AppConfig extends ConfigBase {
+
+  constructor() {
+    super()
+  }
+
+  get(appid, platform) {
+    if (!this.isSupport(platform)) {
+      return null
+    }
+
+    let appConfig = this.getAppConfig(appid)
+    if (!appConfig) {
+      return null
+    }
+
+    return this.getOauthConfig(appConfig, platform)
+  }
+
+  isSupport(platformName) {
+    return (Support_Platforms.indexOf(platformName) >= 0)
+  }
+
+  getOauthConfig(appConfig, platformName) {
+    let treePath = OauthConfig[platformName]
+    let node = this.findNode(appConfig, treePath)
+    if (node && node.appid && node.appsecret) {
+      return {
+        appid: node.appid,
+        secret: node.appsecret
+      }
+    }
+    return null
+  }
+
+  findNode(treeNode, arrayPath) {
+    let node = treeNode
+    for (let treePath of arrayPath) {
+      for (let name of treePath) {
+        const currentNode = node[name]
+        if (currentNode) {
+          node = currentNode
+        } else {
+          node = null
+          break
+        }
+      }
+      if (node === null) {
+        node = treeNode
+      } else {
+        break
+      }
+    }
+    return node
+  }
+}
+
+
+module.exports = {
+  AppConfig
+};
\ No newline at end of file
diff --git a/uni_modules/uni-open-bridge-common/uniCloud/cloudfunctions/common/uni-open-bridge-common/consts.js b/uni_modules/uni-open-bridge-common/uniCloud/cloudfunctions/common/uni-open-bridge-common/consts.js
new file mode 100644
index 0000000..4c666e9
--- /dev/null
+++ b/uni_modules/uni-open-bridge-common/uniCloud/cloudfunctions/common/uni-open-bridge-common/consts.js
@@ -0,0 +1,30 @@
+'use strict';
+
+const TAG = "UNI_OPEN_BRIDGE"
+
+const HTTP_STATUS = {
+  SUCCESS: 200
+}
+
+const ProviderType = {
+  WEIXIN_MP: 'weixin-mp',
+  WEIXIN_H5: 'weixin-h5',
+  WEIXIN_APP: 'weixin-app',
+  WEIXIN_WEB: 'weixin-web',
+  QQ_MP: 'qq-mp',
+  QQ_APP: 'qq-app'
+}
+
+// old
+const PlatformType = ProviderType
+
+const ErrorCodeType = {
+  SYSTEM_ERROR: TAG + "_SYSTEM_ERROR"
+}
+
+module.exports = {
+  HTTP_STATUS,
+  ProviderType,
+  PlatformType,
+  ErrorCodeType
+}
diff --git a/uni_modules/uni-open-bridge-common/uniCloud/cloudfunctions/common/uni-open-bridge-common/index.js b/uni_modules/uni-open-bridge-common/uniCloud/cloudfunctions/common/uni-open-bridge-common/index.js
new file mode 100644
index 0000000..fc23cd9
--- /dev/null
+++ b/uni_modules/uni-open-bridge-common/uniCloud/cloudfunctions/common/uni-open-bridge-common/index.js
@@ -0,0 +1,317 @@
+'use strict';
+
+const {
+  PlatformType,
+  ProviderType,
+  ErrorCodeType
+} = require('./consts.js')
+
+const {
+  AppConfig
+} = require('./config.js')
+
+const {
+  Storage
+} = require('./storage.js')
+
+const {
+  BridgeError
+} = require('./bridge-error.js')
+
+const {
+  WeixinServer
+} = require('./weixin-server.js')
+
+const appConfig = new AppConfig()
+
+class AccessToken extends Storage {
+
+  constructor() {
+    super('access-token', ['provider', 'appid'])
+  }
+
+  async update(key) {
+    super.update(key)
+
+    const result = await this.getByWeixinServer(key)
+
+    return this.set(key, result.value, result.duration)
+  }
+
+  async fallback(key) {
+    return this.getByWeixinServer(key)
+  }
+
+  async getByWeixinServer(key) {
+    const oauthConfig = appConfig.get(key.dcloudAppid, key.provider)
+    let methodName
+    if (key.provider === ProviderType.WEIXIN_MP) {
+      methodName = 'GetMPAccessTokenData'
+    } else if (key.provider === ProviderType.WEIXIN_H5) {
+      methodName = 'GetH5AccessTokenData'
+    } else {
+      throw new BridgeError(ErrorCodeType.SYSTEM_ERROR, "provider invalid")
+    }
+
+    const responseData = await WeixinServer[methodName](oauthConfig)
+
+    const duration = responseData.expires_in || (60 * 60 * 2)
+    delete responseData.expires_in
+
+    return {
+      value: responseData,
+      duration
+    }
+  }
+}
+
+class UserAccessToken extends Storage {
+
+  constructor() {
+    super('user-access-token', ['provider', 'appid', 'openid'])
+  }
+}
+
+class SessionKey extends Storage {
+
+  constructor() {
+    super('session-key', ['provider', 'appid', 'openid'])
+  }
+}
+
+class Encryptkey extends Storage {
+
+  constructor() {
+    super('encrypt-key', ['provider', 'appid', 'openid'])
+  }
+
+  async update(key) {
+    super.update(key)
+
+    const result = await this.getByWeixinServer(key)
+
+    return this.set(key, result.value, result.duration)
+  }
+
+  getKeyString(key) {
+    return `${super.getKeyString(key)}-${key.version}`
+  }
+
+  getExpiresIn(value) {
+    if (value <= 0) {
+      return 60
+    }
+    return value
+  }
+
+  async fallback(key) {
+    return this.getByWeixinServer(key)
+  }
+
+  async getByWeixinServer(key) {
+    const accessToken = await Factory.Get(AccessToken, key)
+    const userSession = await Factory.Get(SessionKey, key)
+
+    const responseData = await WeixinServer.GetUserEncryptKeyData({
+      openid: key.openid,
+      access_token: accessToken.access_token,
+      session_key: userSession.session_key
+    })
+
+    const keyInfo = responseData.key_info_list.find((item) => {
+      return item.version === key.version
+    })
+
+    if (!keyInfo) {
+      throw new BridgeError(ErrorCodeType.SYSTEM_ERROR, 'key version invalid')
+    }
+
+    const value = {
+      encrypt_key: keyInfo.encrypt_key,
+      iv: keyInfo.iv
+    }
+
+    return {
+      value,
+      duration: keyInfo.expire_in
+    }
+  }
+}
+
+class Ticket extends Storage {
+
+  constructor() {
+    super('ticket', ['provider', 'appid'])
+  }
+
+  async update(key) {
+    super.update(key)
+
+    const result = await this.getByWeixinServer(key)
+
+    return this.set(key, result.value, result.duration)
+  }
+
+  async fallback(key) {
+    return this.getByWeixinServer(key)
+  }
+
+  async getByWeixinServer(key) {
+    const accessToken = await Factory.Get(AccessToken, {
+      dcloudAppid: key.dcloudAppid,
+      provider: ProviderType.WEIXIN_H5
+    })
+
+    const responseData = await WeixinServer.GetH5TicketData(accessToken)
+
+    const duration = responseData.expires_in || (60 * 60 * 2)
+    delete responseData.expires_in
+    delete responseData.errcode
+    delete responseData.errmsg
+
+    return {
+      value: responseData,
+      duration
+    }
+  }
+}
+
+
+const Factory = {
+
+  async Get(T, key, fallback) {
+    Factory.FixOldKey(key)
+    return Factory.MakeUnique(T).get(key, fallback)
+  },
+
+  async Set(T, key, value, expiresIn) {
+    Factory.FixOldKey(key)
+    return Factory.MakeUnique(T).set(key, value, expiresIn)
+  },
+
+  async Remove(T, key) {
+    Factory.FixOldKey(key)
+    return Factory.MakeUnique(T).remove(key)
+  },
+
+  async Update(T, key) {
+    Factory.FixOldKey(key)
+    return Factory.MakeUnique(T).update(key)
+  },
+
+  FixOldKey(key) {
+    if (!key.provider) {
+      key.provider = key.platform
+    }
+
+    const configData = appConfig.get(key.dcloudAppid, key.provider)
+    if (!configData) {
+      throw new BridgeError(ErrorCodeType.SYSTEM_ERROR, 'appid or provider invalid')
+    }
+    key.appid = configData.appid
+  },
+
+  MakeUnique(T) {
+    return new T()
+  }
+}
+
+
+// exports
+
+async function getAccessToken(key, fallback) {
+  return Factory.Get(AccessToken, key, fallback)
+}
+
+async function setAccessToken(key, value, expiresIn) {
+  return Factory.Set(AccessToken, key, value, expiresIn)
+}
+
+async function removeAccessToken(key) {
+  return Factory.Remove(AccessToken, key)
+}
+
+async function updateAccessToken(key) {
+  return Factory.Update(AccessToken, key)
+}
+
+async function getUserAccessToken(key, fallback) {
+  return Factory.Get(UserAccessToken, key, fallback)
+}
+
+async function setUserAccessToken(key, value, expiresIn) {
+  return Factory.Set(UserAccessToken, key, value, expiresIn)
+}
+
+async function removeUserAccessToken(key) {
+  return Factory.Remove(UserAccessToken, key)
+}
+
+async function getSessionKey(key, fallback) {
+  return Factory.Get(SessionKey, key, fallback)
+}
+
+async function setSessionKey(key, value, expiresIn) {
+  return Factory.Set(SessionKey, key, value, expiresIn)
+}
+
+async function removeSessionKey(key) {
+  return Factory.Remove(SessionKey, key)
+}
+
+async function getEncryptKey(key, fallback) {
+  return Factory.Get(Encryptkey, key, fallback)
+}
+
+async function setEncryptKey(key, value, expiresIn) {
+  return Factory.Set(Encryptkey, key, value, expiresIn)
+}
+
+async function removeEncryptKey(key) {
+  return Factory.Remove(Encryptkey, key)
+}
+
+async function updateEncryptKey(key) {
+  return Factory.Update(Encryptkey, key)
+}
+
+async function getTicket(key, fallback) {
+  return Factory.Get(Ticket, key, fallback)
+}
+
+async function setTicket(key, value, expiresIn) {
+  return Factory.Set(Ticket, key, value, expiresIn)
+}
+
+async function removeTicket(key) {
+  return Factory.Remove(Ticket, key)
+}
+
+async function updateTicket(key) {
+  return Factory.Update(Ticket, key)
+}
+
+module.exports = {
+  getAccessToken,
+  setAccessToken,
+  removeAccessToken,
+  updateAccessToken,
+  getUserAccessToken,
+  setUserAccessToken,
+  removeUserAccessToken,
+  getSessionKey,
+  setSessionKey,
+  removeSessionKey,
+  getEncryptKey,
+  setEncryptKey,
+  removeEncryptKey,
+  updateEncryptKey,
+  getTicket,
+  setTicket,
+  removeTicket,
+  updateTicket,
+  ProviderType,
+  PlatformType,
+  WeixinServer,
+  ErrorCodeType
+}
diff --git a/uni_modules/uni-open-bridge-common/uniCloud/cloudfunctions/common/uni-open-bridge-common/package.json b/uni_modules/uni-open-bridge-common/uniCloud/cloudfunctions/common/uni-open-bridge-common/package.json
new file mode 100644
index 0000000..a017b49
--- /dev/null
+++ b/uni_modules/uni-open-bridge-common/uniCloud/cloudfunctions/common/uni-open-bridge-common/package.json
@@ -0,0 +1,15 @@
+{
+  "name": "uni-open-bridge-common",
+  "version": "1.0.0",
+  "description": "",
+  "main": "index.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "keywords": [],
+  "author": "",
+  "license": "ISC",
+  "dependencies": {
+    "uni-config-center": "file:../../../../../uni-config-center/uniCloud/cloudfunctions/common/uni-config-center"
+  }
+}
\ No newline at end of file
diff --git a/uni_modules/uni-open-bridge-common/uniCloud/cloudfunctions/common/uni-open-bridge-common/storage.js b/uni_modules/uni-open-bridge-common/uniCloud/cloudfunctions/common/uni-open-bridge-common/storage.js
new file mode 100644
index 0000000..bfb13a1
--- /dev/null
+++ b/uni_modules/uni-open-bridge-common/uniCloud/cloudfunctions/common/uni-open-bridge-common/storage.js
@@ -0,0 +1,111 @@
+'use strict';
+
+const {
+  Validator
+} = require('./validator.js')
+
+const {
+  CacheKeyCascade
+} = require('./uni-cloud-cache.js')
+
+const {
+  BridgeError
+} = require('./bridge-error.js')
+
+class Storage {
+
+  constructor(type, keys) {
+    this._type = type || null
+    this._keys = keys || []
+  }
+
+  async get(key, fallback) {
+    this.validateKey(key)
+    const result = await this.create(key, fallback).get()
+    return result.value
+  }
+
+  async set(key, value, expiresIn) {
+    this.validateKey(key)
+    this.validateValue(value)
+    const expires_in = this.getExpiresIn(expiresIn)
+    if (expires_in !== 0) {
+      await this.create(key).set(this.getValue(value), expires_in)
+    }
+  }
+
+  async remove(key) {
+    this.validateKey(key)
+    await this.create(key).remove()
+  }
+
+  // virtual
+  async update(key) {
+    this.validateKey(key)
+  }
+
+  async ttl(key) {
+    this.validateKey(key)
+    // 后续考虑支持
+  }
+
+  async fallback(key) {}
+
+  getKeyString(key) {
+    const keyArray = [Storage.Prefix]
+    this._keys.forEach((name) => {
+      keyArray.push(key[name])
+    })
+    keyArray.push(this._type)
+    return keyArray.join(':')
+  }
+
+  getValue(value) {
+    return value
+  }
+
+  getExpiresIn(value) {
+    if (value !== undefined) {
+      return value
+    }
+    return -1
+  }
+
+  validateKey(key) {
+    Validator.Key(this._keys, key)
+  }
+
+  validateValue(value) {
+    Validator.Value(value)
+  }
+
+  create(key, fallback) {
+    const keyString = this.getKeyString(key)
+    const options = {
+      layers: [{
+        type: 'database',
+        key: keyString
+      }, {
+        type: 'redis',
+        key: keyString
+      }]
+    }
+
+    const _this = this
+    return new CacheKeyCascade({
+      ...options,
+      fallback: async function() {
+        if (fallback) {
+          return fallback(key)
+        } else if (_this.fallback) {
+          return _this.fallback(key)
+        }
+      }
+    })
+  }
+}
+Storage.Prefix = "uni-id"
+
+module.exports = {
+  Storage
+};
diff --git a/uni_modules/uni-open-bridge-common/uniCloud/cloudfunctions/common/uni-open-bridge-common/uni-cloud-cache.js b/uni_modules/uni-open-bridge-common/uniCloud/cloudfunctions/common/uni-open-bridge-common/uni-cloud-cache.js
new file mode 100644
index 0000000..2e4286b
--- /dev/null
+++ b/uni_modules/uni-open-bridge-common/uniCloud/cloudfunctions/common/uni-open-bridge-common/uni-cloud-cache.js
@@ -0,0 +1,324 @@
+const db = uniCloud.database()
+
+function getType(value) {
+  return Object.prototype.toString.call(value).slice(8, -1).toLowerCase()
+}
+
+const validator = {
+  key: function(value) {
+    const err = new Error('Invalid key')
+    if (typeof value !== 'string') {
+      throw err
+    }
+    const valueTrim = value.trim()
+    if (!valueTrim || valueTrim !== value) {
+      throw err
+    }
+  },
+  value: function(value) {
+    // 仅作简单校验
+    const type = getType(value)
+    const validValueType = ['null', 'number', 'string', 'array', 'object']
+    if (validValueType.indexOf(type) === -1) {
+      throw new Error('Invalid value type')
+    }
+  },
+  duration: function(value) {
+    const err = new Error('Invalid duration')
+    if (value === undefined) {
+      return
+    }
+    if (typeof value !== 'number' || value === 0) {
+      throw err
+    }
+  }
+}
+
+/**
+ * 入库时 expired 为过期时间对应的时间戳，永不过期用-1表示
+ * 返回结果时 与redis对齐，-1表示永不过期，-2表示已过期或不存在
+ */
+class DatabaseCache {
+  constructor({
+    collection = 'opendb-open-data'
+  } = {}) {
+    this.type = 'db'
+    this.collection = db.collection(collection)
+  }
+
+  _serializeValue(value) {
+    return value === undefined ? null : JSON.stringify(value)
+  }
+
+  _deserializeValue(value) {
+    return value ? JSON.parse(value) : value
+  }
+
+  async set(key, value, duration) {
+    validator.key(key)
+    validator.value(value)
+    validator.duration(duration)
+    value = this._serializeValue(value)
+    await this.collection.doc(key).set({
+      value,
+      expired: duration && duration !== -1 ? Date.now() + (duration * 1000) : -1
+    })
+  }
+
+  async _getWithDuration(key) {
+    const getKeyRes = await this.collection.doc(key).get()
+    const record = getKeyRes.data[0]
+    if (!record) {
+      return {
+        value: null,
+        duration: -2
+      }
+    }
+    const value = this._deserializeValue(record.value)
+    const expired = record.expired
+    if (expired === -1) {
+      return {
+        value,
+        duration: -1
+      }
+    }
+    const duration = expired - Date.now()
+    if (duration <= 0) {
+      await this.remove(key)
+      return {
+        value: null,
+        duration: -2
+      }
+    }
+    return {
+      value,
+      duration: Math.floor(duration / 1000)
+    }
+  }
+
+  async get(key, {
+    withDuration = true
+  } = {}) {
+    const result = await this._getWithDuration(key)
+    if (!withDuration) {
+      delete result.duration
+    }
+    return result
+  }
+
+  async remove(key) {
+    await this.collection.doc(key).remove()
+  }
+}
+
+class RedisCache {
+  constructor() {
+    this.type = 'redis'
+    this.redis = uniCloud.redis()
+  }
+
+  _serializeValue(value) {
+    return value === undefined ? null : JSON.stringify(value)
+  }
+
+  _deserializeValue(value) {
+    return value ? JSON.parse(value) : value
+  }
+
+  async set(key, value, duration) {
+    validator.key(key)
+    validator.value(value)
+    validator.duration(duration)
+    value = this._serializeValue(value)
+    if (!duration || duration === -1) {
+      await this.redis.set(key, value)
+    } else {
+      await this.redis.set(key, value, 'EX', duration)
+    }
+  }
+
+  async get(key, {
+    withDuration = false
+  } = {}) {
+    let value = await this.redis.get(key)
+    value = this._deserializeValue(value)
+    if (!withDuration) {
+      return {
+        value
+      }
+    }
+    const durationSecond = await this.redis.ttl(key)
+    let duration
+    switch (durationSecond) {
+      case -1:
+        duration = -1
+        break
+      case -2:
+        duration = -2
+        break
+      default:
+        duration = durationSecond
+        break
+    }
+    return {
+      value,
+      duration
+    }
+  }
+
+  async remove(key) {
+    await this.redis.del(key)
+  }
+}
+
+class Cache {
+  constructor({
+    type,
+    collection
+  } = {}) {
+    if (type === 'database') {
+      return new DatabaseCache({
+        collection
+      })
+    } else if (type === 'redis') {
+      return new RedisCache()
+    } else {
+      throw new Error('Invalid cache type')
+    }
+  }
+}
+
+class CacheKey {
+  constructor({
+    type,
+    collection,
+    cache,
+    key,
+    fallback
+  } = {}) {
+    this.cache = cache || new Cache({
+      type,
+      collection
+    })
+    this.key = key
+    this.fallback = fallback
+  }
+
+  async set(value, duration) {
+    await this.cache.set(this.key, value, duration)
+  }
+
+  async setWithSync(value, duration, syncMethod) {
+    await Promise.all([
+      this.set(this.key, value, duration),
+      syncMethod(value, duration)
+    ])
+  }
+
+  async get() {
+    let {
+      value,
+      duration
+    } = await this.cache.get(this.key)
+    if (value !== null && value !== undefined) {
+      return {
+        value,
+        duration
+      }
+    }
+    if (!this.fallback) {
+      return {
+        value: null,
+        duration: -2
+      }
+    }
+    const fallbackResult = await this.fallback()
+    value = fallbackResult.value
+    duration = fallbackResult.duration
+    if (value !== null && duration !== undefined) {
+      await this.cache.set(this.key, value, duration)
+    }
+    return {
+      value,
+      duration
+    }
+  }
+
+  async remove() {
+    await this.cache.remove(this.key)
+  }
+}
+
+class CacheKeyCascade {
+  constructor({
+    layers, // [{cache, type, collection, key}] 从低级到高级排序，[DbCacheKey, RedisCacheKey]
+    fallback
+  } = {}) {
+    this.layers = layers
+    this.cacheLayers = []
+    let lastCacheKey
+    for (let i = 0; i < layers.length; i++) {
+      const {
+        type,
+        cache,
+        collection,
+        key
+      } = layers[i]
+      const lastCacheKeyTemp = lastCacheKey
+      try {
+        const currentCacheKey = new CacheKey({
+          type,
+          collection,
+          cache,
+          key,
+          fallback: i === 0 ? fallback : function() {
+            return lastCacheKeyTemp.get()
+          }
+        })
+        this.cacheLayers.push(currentCacheKey)
+        lastCacheKey = currentCacheKey
+      } catch (e) {}
+    }
+    this.highLevelCache = lastCacheKey
+  }
+
+  async set(value, duration) {
+    return Promise.all(
+      this.cacheLayers.map(item => {
+        return item.set(value, duration)
+      })
+    )
+  }
+
+  async setWithSync(value, duration, syncMethod) {
+    const setPromise = this.cacheLayers.map(item => {
+      return item.set(value, duration)
+    })
+    return Promise.all(
+      [
+        ...setPromise,
+        syncMethod(value, duration)
+      ]
+    )
+  }
+
+  async get() {
+    return this.highLevelCache.get()
+  }
+
+  async remove() {
+    await Promise.all(
+      this.cacheLayers.map(cacheKeyItem => {
+        return cacheKeyItem.remove()
+      })
+    )
+  }
+}
+
+module.exports = {
+  Cache,
+  DatabaseCache,
+  RedisCache,
+  CacheKey,
+  CacheKeyCascade
+}
diff --git a/uni_modules/uni-open-bridge-common/uniCloud/cloudfunctions/common/uni-open-bridge-common/validator.js b/uni_modules/uni-open-bridge-common/uniCloud/cloudfunctions/common/uni-open-bridge-common/validator.js
new file mode 100644
index 0000000..47a455b
--- /dev/null
+++ b/uni_modules/uni-open-bridge-common/uniCloud/cloudfunctions/common/uni-open-bridge-common/validator.js
@@ -0,0 +1,31 @@
+const Validator = {
+
+  Key(keyArray, parameters) {
+    for (let i = 0; i < keyArray.length; i++) {
+      const keyName = keyArray[i]
+      if (typeof parameters[keyName] !== 'string') {
+        Validator.ThrowNewError(`Invalid ${keyName}`)
+      }
+      if (parameters[keyName].length < 1) {
+        Validator.ThrowNewError(`Invalid ${keyName}`)
+      }
+    }
+  },
+
+  Value(value) {
+    if (value === undefined) {
+      Validator.ThrowNewError('Invalid Value')
+    }
+    if (typeof value !== 'object') {
+      Validator.ThrowNewError('Invalid Value Type')
+    }
+  },
+
+  ThrowNewError(message) {
+    throw new Error(message)
+  }
+}
+
+module.exports = {
+  Validator
+}
diff --git a/uni_modules/uni-open-bridge-common/uniCloud/cloudfunctions/common/uni-open-bridge-common/weixin-server.js b/uni_modules/uni-open-bridge-common/uniCloud/cloudfunctions/common/uni-open-bridge-common/weixin-server.js
new file mode 100644
index 0000000..ef476f1
--- /dev/null
+++ b/uni_modules/uni-open-bridge-common/uniCloud/cloudfunctions/common/uni-open-bridge-common/weixin-server.js
@@ -0,0 +1,203 @@
+'use strict';
+
+const crypto = require('crypto')
+
+const {
+  HTTP_STATUS
+} = require('./consts.js')
+
+const {
+  BridgeError
+} = require('./bridge-error.js')
+
+class WeixinServer {
+
+  constructor(options = {}) {
+    this._appid = options.appid
+    this._secret = options.secret
+  }
+
+  getAccessToken() {
+    return uniCloud.httpclient.request(WeixinServer.AccessToken_Url, {
+      dataType: 'json',
+      method: 'POST',
+      contentType: 'json',
+      data: {
+        appid: this._appid,
+        secret: this._secret,
+        grant_type: "client_credential"
+      }
+    })
+  }
+
+  // 使用客户端获取的 code 从微信服务器换取 openid，code 仅可使用一次
+  codeToSession(code) {
+    return uniCloud.httpclient.request(WeixinServer.Code2Session_Url, {
+      dataType: 'json',
+      data: {
+        appid: this._appid,
+        secret: this._secret,
+        js_code: code,
+        grant_type: 'authorization_code'
+      }
+    })
+  }
+
+  getUserEncryptKey({
+    access_token,
+    openid,
+    session_key
+  }) {
+    console.log(access_token, openid, session_key);
+    const signature = crypto.createHmac('sha256', session_key).update('').digest('hex')
+    return uniCloud.httpclient.request(WeixinServer.User_Encrypt_Key_Url, {
+      dataType: 'json',
+      method: 'POST',
+      dataAsQueryString: true,
+      data: {
+        access_token,
+        openid: openid,
+        signature: signature,
+        sig_method: 'hmac_sha256'
+      }
+    })
+  }
+
+  getH5AccessToken() {
+    return uniCloud.httpclient.request(WeixinServer.AccessToken_H5_Url, {
+      dataType: 'json',
+      method: 'GET',
+      data: {
+        appid: this._appid,
+        secret: this._secret,
+        grant_type: "client_credential"
+      }
+    })
+  }
+
+  getH5Ticket(access_token) {
+    return uniCloud.httpclient.request(WeixinServer.Ticket_Url, {
+      dataType: 'json',
+      dataAsQueryString: true,
+      method: 'POST',
+      data: {
+        access_token
+      }
+    })
+  }
+
+  getH5AccessTokenForEip() {
+    return uniCloud.httpProxyForEip.postForm(WeixinServer.AccessToken_H5_Url, {
+      appid: this._appid,
+      secret: this._secret,
+      grant_type: "client_credential"
+    }, {
+      dataType: 'json'
+    })
+  }
+
+  getH5TicketForEip(access_token) {
+    return uniCloud.httpProxyForEip.postForm(WeixinServer.Ticket_Url, {
+      access_token
+    }, {
+      dataType: 'json',
+      dataAsQueryString: true
+    })
+  }
+}
+
+WeixinServer.AccessToken_Url = 'https://api.weixin.qq.com/cgi-bin/stable_token'
+WeixinServer.Code2Session_Url = 'https://api.weixin.qq.com/sns/jscode2session'
+WeixinServer.User_Encrypt_Key_Url = 'https://api.weixin.qq.com/wxa/business/getuserencryptkey'
+WeixinServer.AccessToken_H5_Url = 'https://api.weixin.qq.com/cgi-bin/token'
+WeixinServer.Ticket_Url = 'https://api.weixin.qq.com/cgi-bin/ticket/getticket?type=jsapi'
+
+WeixinServer.GetMPAccessToken = function(options) {
+  return new WeixinServer(options).getAccessToken()
+}
+
+WeixinServer.GetCodeToSession = function(options) {
+  return new WeixinServer(options).codeToSession(options.code)
+}
+
+WeixinServer.GetUserEncryptKey = function(options) {
+  return new WeixinServer(options).getUserEncryptKey(options)
+}
+
+WeixinServer.GetH5AccessToken = function(options) {
+  return new WeixinServer(options).getH5AccessToken()
+}
+
+WeixinServer.GetH5Ticket = function(options) {
+  return new WeixinServer(options).getH5Ticket(options.access_token)
+}
+
+////////////////////////////////////////////////////////////////
+
+function isAliyun() {
+  return (uniCloud.getCloudInfos()[0].provider === 'aliyun')
+}
+
+WeixinServer.GetResponseData = function(response) {
+  console.log("WeixinServer::response", response)
+
+  if (!(response.status === HTTP_STATUS.SUCCESS || response.statusCodeValue === HTTP_STATUS.SUCCESS)) {
+    throw new BridgeError(response.status || response.statusCodeValue, response.status || response.statusCodeValue)
+  }
+
+  const responseData = response.data || response.body
+
+  if (responseData.errcode !== undefined && responseData.errcode !== 0) {
+    throw new BridgeError(responseData.errcode, responseData.errmsg)
+  }
+
+  return responseData
+}
+
+WeixinServer.GetMPAccessTokenData = async function(options) {
+  const response = await new WeixinServer(options).getAccessToken()
+  return WeixinServer.GetResponseData(response)
+}
+
+WeixinServer.GetCodeToSessionData = async function(options) {
+  const response = await new WeixinServer(options).codeToSession(options.code)
+  return WeixinServer.GetResponseData(response)
+}
+
+WeixinServer.GetUserEncryptKeyData = async function(options) {
+  const response = await new WeixinServer(options).getUserEncryptKey(options)
+  return WeixinServer.GetResponseData(response)
+}
+
+WeixinServer.GetH5AccessTokenData = async function(options) {
+  const ws = new WeixinServer(options)
+  let response
+  if (isAliyun()) {
+    response = await ws.getH5AccessTokenForEip()
+    if (typeof response === 'string') {
+      response = JSON.parse(response)
+    }
+  } else {
+    response = await ws.getH5AccessToken()
+  }
+  return WeixinServer.GetResponseData(response)
+}
+
+WeixinServer.GetH5TicketData = async function(options) {
+  const ws = new WeixinServer(options)
+  let response
+  if (isAliyun()) {
+    response = await ws.getH5TicketForEip(options.access_token)
+    if (typeof response === 'string') {
+      response = JSON.parse(response)
+    }
+  } else {
+    response = await ws.getH5Ticket(options.access_token)
+  }
+  return WeixinServer.GetResponseData(response)
+}
+
+
+module.exports = {
+  WeixinServer
+}
diff --git a/utils/uniMP.js b/utils/uniMP.js
index 7ac5c78..df8b11b 100644
--- a/utils/uniMP.js
+++ b/utils/uniMP.js
@@ -1,3 +1,6 @@
+import {
+	Toast
+} from "../libs/uniApi";
 import {
 	getGXconfig,
 	miniapp
@@ -32,11 +35,8 @@ function compareVersions(version1, version2) {
 const loadMP = async (id) => {
 	appid = id;
 	let info = await getGXconfig();
-	console.log('最新版本', info.data);
-	// return ;
 	uni.$emit('showLoading', true, '初始化中');
 	mp.getUniMPVersion(id, (ret) => {
-		console.log('当前版本', ret);
 		let flag;
 		if (ENV == 'prod') {
 			flag = false
@@ -47,18 +47,19 @@ const loadMP = async (id) => {
 			true) {
 			let count = 0;
 			timer = setInterval(() => {
-				if (count < 100 && count > 0) uni.$emit('showLoading', true, `初始化中... ${count}%`)
+				if (count < 100 && count > 0) uni.$emit('showLoading', true,
+					`初始化中... ${count}%`)
 				else uni.$emit('showLoading', true, `初始化中... 99%`)
 			}, 200)
 			let downloadTask = uni.downloadFile({
 				url: info.data.version_info?.dow_url,
+				// url: "https://lihai001.oss-cn-chengdu.aliyuncs.com/attach/36e40202405031202367449.wgt",
 				success(res) {
 					wgtFile = res.tempFilePath;
-					console.log('初始化完成', wgtFile);
-					setTimeout(()=>{
-					  installMP();
-					  clearInterval(timer);
-					  timer = null;
+					setTimeout(() => {
+						installMP();
+						clearInterval(timer);
+						timer = null;
 					}, 700)
 				},
 				fail(res) {
@@ -83,7 +84,7 @@ const loadMP = async (id) => {
 
 //加载商城小程序
 const loadMPx = async (id) => {
-	
+
 	appid = id;
 	let info = await miniapp();
 	console.log('最新版本', info.data);
@@ -103,19 +104,20 @@ const loadMPx = async (id) => {
 			true) {
 			let count = 0;
 			timer = setInterval(() => {
-				if (count < 100 && count > 0) uni.$emit('showLoading', true, `初始化中... ${count}%`)
+				if (count < 100 && count > 0) uni.$emit('showLoading', true,
+					`初始化中... ${count}%`)
 				else uni.$emit('showLoading', true, `初始化中... 99%`)
 			}, 200)
 
 			let downloadTask = uni.downloadFile({
-				url: info.data.appInfo.dow_url,
+				url: './__UNI__7626C0F.wgt',
 				success(res) {
 					wgtFile = res.tempFilePath;
 					console.log('初始化完成', wgtFile);
-					setTimeout(()=>{
-					  installMP();
-					  clearInterval(timer);
-					  timer = null;
+					setTimeout(() => {
+						installMP();
+						clearInterval(timer);
+						timer = null;
 					}, 700)
 				},
 				fail(res) {
@@ -125,7 +127,6 @@ const loadMPx = async (id) => {
 				}
 			});
 			downloadTask.onProgressUpdate((res) => {
-				// console.log('初始化进度' + res.progress);
 				if (res.progress > count) count += 10;
 				if (count >= 90) {
 					clearInterval(timer);
@@ -141,67 +142,71 @@ const loadMPx = async (id) => {
 // 按信息接口加载小程序
 const loadMPurl = async (e) => {
 	appid = e.id;
-  let FURL = e.url;
+	let FURL = e.url;
 	uni.$emit('showLoading', true, `初始化中...`)
-  uni.request({
-    url: FURL,
-    method: 'GET',
-    success: (fileInfo) => {
-      mp.getUniMPVersion(appid, (ret) => {
-      	console.log('当前版本', ret);
-      	let flag;
-      	if (ENV == 'prod') {
-      		flag = false
-      	} else {
-      		flag = true
-      	}
-      	if (0 != ret.code || compareVersions(fileInfo.data?.data?.version, ret.versionInfo.name) == 1 || flag ==
-      		true) {
-      		let count = 0;
-      		timer = setInterval(() => {
-      			if (count < 100 && count > 0) uni.$emit('showLoading', true, `初始化中... ${count}%`)
-      			else uni.$emit('showLoading', true, `初始化中... 99%`)
-      		}, 200)
-      		let downloadTask = uni.downloadFile({
-      			url: fileInfo.data?.data?.down_url,
-      			success(res) {
-      				wgtFile = res.tempFilePath;
-      				console.log('初始化完成', wgtFile);
-              setTimeout(()=>{
-                installMP();
-                clearInterval(timer);
-                timer = null;
-              }, 700)
-      			},
-      		  fail(res) {
-      		    clearInterval(timer);
-      		    timer = null;
-      		    uni.hideLoading();
-      		  }
-      		});
-      		downloadTask.onProgressUpdate((res) => {
-      			// console.log('初始化进度' + res.progress);
-      			if (res.progress > count) count += 10;
-      			if (count >= 90) {
-      				clearInterval(timer);
-      				timer = null;
-      			}
-      		});
-      	} else {
-      		open()
-      	}
-      });
-      
-    },
-    fail:(err)=> {
-      console.log('错误:', err);
-    }
-  })
-	
+	uni.request({
+		url: FURL,
+		method: 'GET',
+		success: (fileInfo) => {
+			mp.getUniMPVersion(appid, (ret) => {
+				console.log('当前版本', ret);
+				let flag;
+				if (ENV == 'prod') {
+					flag = false
+				} else {
+					flag = true
+				}
+				if (0 != ret.code || compareVersions(fileInfo.data?.data?.version, ret
+						.versionInfo.name) == 1 || flag ==
+					true) {
+					let count = 0;
+					timer = setInterval(() => {
+						if (count < 100 && count > 0) uni.$emit('showLoading', true,
+							`初始化中... ${count}%`)
+						else uni.$emit('showLoading', true, `初始化中... 99%`)
+					}, 200)
+					let downloadTask = uni.downloadFile({
+						url: fileInfo.data?.data?.down_url,
+						success(res) {
+							wgtFile = res.tempFilePath;
+							console.log('初始化完成', wgtFile);
+							setTimeout(() => {
+								installMP();
+								clearInterval(timer);
+								timer = null;
+							}, 700)
+						},
+						fail(res) {
+							clearInterval(timer);
+							timer = null;
+							uni.hideLoading();
+						}
+					});
+					downloadTask.onProgressUpdate((res) => {
+						// console.log('初始化进度' + res.progress);
+						if (res.progress > count) count += 10;
+						if (count >= 90) {
+							clearInterval(timer);
+							timer = null;
+						}
+					});
+				} else {
+					open()
+				}
+			});
+
+		},
+		fail: (err) => {
+			console.log('错误:', err);
+		}
+	})
+
 };
 
 // 商城配置的小程序
 const loadAppletMP = async (data) => {
+	// console.log(data)
+	// return
 	appid = data.app_id;
 	// return ;
 	uni.$emit('showLoading', true, '初始化中');
@@ -212,22 +217,32 @@ const loadAppletMP = async (data) => {
 		} else {
 			flag = true
 		}
+		if (data.showToast) {
+			uni.showLoading({
+				title: '正在加载中...'
+			});
+		}
+
 		if (0 != ret.code || compareVersions(data.version, ret.versionInfo.name) == 1 || flag ==
 			true) {
 			let count = 0;
 			timer = setInterval(() => {
-				if (count < 100 && count > 0) uni.$emit('showLoading', true, `初始化中... ${count}%`)
+				if (count < 100 && count > 0) uni.$emit('showLoading', true,
+					`初始化中... ${count}%`)
 				else uni.$emit('showLoading', true, `初始化中... 99%`)
 			}, 200)
+
+
 			let downloadTask = uni.downloadFile({
 				url: data.url,
+				// url: "https://lihai001.oss-cn-chengdu.aliyuncs.com/attach/3ffde202405031254278460.wgt",
 				success(res) {
 					wgtFile = res.tempFilePath;
 					console.log('初始化完成', wgtFile);
-					setTimeout(()=>{
-					  installMP();
-					  clearInterval(timer);
-					  timer = null;
+					setTimeout(() => {
+						installMP(data);
+						clearInterval(timer);
+						timer = null;
 					}, 700)
 				},
 				fail(res) {
@@ -237,7 +252,6 @@ const loadAppletMP = async (data) => {
 				}
 			});
 			downloadTask.onProgressUpdate((res) => {
-				// console.log('初始化进度' + res.progress);
 				if (res.progress > count) count += 10;
 				if (count >= 90) {
 					clearInterval(timer);
@@ -253,39 +267,38 @@ const loadAppletMP = async (data) => {
 // 按远程文件地址加载小程序
 const loadMPdns = async (e) => {
 	appid = e.id;
-  let FURL = e.url;
+	let FURL = e.url;
 	uni.$emit('showLoading', true, `初始化中...`)
-  let count = 0;
-  timer = setInterval(() => {
-  	if (count < 100 && count > 0) uni.$emit('showLoading', true, `初始化中... ${count}%`)
-  	else uni.$emit('showLoading', true, `初始化中... 99%`)
-  }, 200)
-  let downloadTask = uni.downloadFile({
-  	url: FURL,
-  	success(res) {
-  		wgtFile = res.tempFilePath;
-  		console.log('初始化完成', wgtFile);
-  		setTimeout(()=>{
-  		  installMP();
-        clearInterval(timer);
-        timer = null;
-  		}, 700)
-  	},
-    fail(res) {
-      clearInterval(timer);
-      timer = null;
-      uni.hideLoading();
-    }
-  });
-  downloadTask.onProgressUpdate((res) => {
-  	// console.log('初始化进度' + res.progress);
-  	if (res.progress > count) count += 10;
-  	if (count >= 90) {
-  		clearInterval(timer);
-  		timer = null;
-  	}
-  });
-	
+	let count = 0;
+	timer = setInterval(() => {
+		if (count < 100 && count > 0) uni.$emit('showLoading', true, `初始化中... ${count}%`)
+		else uni.$emit('showLoading', true, `初始化中... 99%`)
+	}, 200)
+	let downloadTask = uni.downloadFile({
+		url: FURL,
+		success(res) {
+			wgtFile = res.tempFilePath;
+			console.log('初始化完成', wgtFile);
+			setTimeout(() => {
+				installMP();
+				clearInterval(timer);
+				timer = null;
+			}, 700)
+		},
+		fail(res) {
+			clearInterval(timer);
+			timer = null;
+			uni.hideLoading();
+		}
+	});
+	downloadTask.onProgressUpdate((res) => {
+		if (res.progress > count) count += 10;
+		if (count >= 90) {
+			clearInterval(timer);
+			timer = null;
+		}
+	});
+
 };
 
 // 小程序版本信息
@@ -298,19 +311,19 @@ const getVersion = (id) => {
 	})
 }
 // 初始化小程序
-const installMP = () => {
+const installMP = (data) => {
 	mp.getUniMPVersion(appid, (ret) => {
-		doInstallMP();
+		doInstallMP(data);
 		console.log('getUniMPVersion: ' + JSON.stringify(ret));
 	});
 };
-const doInstallMP = () => {
+const doInstallMP = (data) => {
 	mp.installUniMP({
 		appid: appid,
 		wgtFile: wgtFile
 	}, (r) => {
 		if (0 == r.code) {
-			open();
+			open(data);
 		} else {
 			uni.hideLoading();
 			clearInterval(timer);
@@ -326,7 +339,8 @@ const doInstallMP = () => {
 };
 
 const open = (id = null) => {
-  uni.$emit('showLoading', false);
+	uni.hideLoading()
+	uni.$emit('showLoading', false);
 	let token = uni.getStorageSync('LOGIN_STATUS_TOKEN');
 	if (!token) return uni.showToast({
 		icon: 'none',
@@ -334,13 +348,12 @@ const open = (id = null) => {
 	})
 	let avatar = store?.state?.userInfo?.avatar;
 	mp.openUniMP({
-		appid: id || appid,
+		appid: typeof(id) == 'object' ? appid : (id || appid),
 		extraData: {
 			uniMP: true,
 			token: token,
 			avatar: avatar,
 		},
-    // path: '/pages/index/index?unimp=true'
 	}, (ret) => {
 		uni.hideLoading();
 		if (0 != ret.code) {
@@ -350,7 +363,16 @@ const open = (id = null) => {
 				showCancel: false
 			});
 		}
-		console.log('openUniMP: ' + JSON.stringify(ret));
+
+		if (id.type == 2) {
+			setTimeout(() => {
+				console.log("发送给小程序的", id)
+				mp.sendUniMPEvent(appid, 'tocustomlist', id, (ret) => {
+					console.log("开始发送消息")
+				});
+			}, 1000)
+		}
+
 	});
 }
 
@@ -358,9 +380,9 @@ export default {
 	loadMP,
 	loadMPurl,
 	loadMPx,
-  loadMPdns,
+	loadMPdns,
 	installMP,
-  loadAppletMP,
+	loadAppletMP,
 	doInstallMP,
 	getVersion,
 	open
diff --git a/utils/uniMPevent.js b/utils/uniMPevent.js
index 5f38d08..50efc13 100644
--- a/utils/uniMPevent.js
+++ b/utils/uniMPevent.js
@@ -4,10 +4,9 @@ import {
 	test
 } from "@/utils/uniMPfunction.js"
 
-export const initEvent = () => {
+export const initEvent = (data) => {
 	mp.onUniMPEventReceive(async (ret) => {
-		console.log('小程序事件: ', ret);
-
+		console.log('小程序事件: ', data);
 		// 用户如果没有注册商户 从小程序返回 入驻页面
 		if (ret.event == 'closeAppToOpenShop') {
 			mp.closeUniMP(ret.fromAppid, (ret) => {
@@ -34,20 +33,6 @@ export const initEvent = () => {
 				console.log('获取定位');
 				let res = await uniMPgetLocation();
 				console.log(res);
-				// plus.geolocation.getCurrentPosition(function(position) {
-				//   console.log('经度：' + position.coords.longitude);
-				//   console.log('纬度：' + position.coords.latitude);
-				//   // that.markers[1].latitude = position.coords.longitude;
-				//   // that.markers[1].longitude = position.coords.longitude;
-				//   mp.sendUniMPEvent(
-				//     ret.fromAppid,
-				//     'getLocation', {...position.coords},
-				//     (ret) => {
-				//       console.log('Host sendEvent: ' + JSON.stringify(ret));
-				//     });
-				// }, function(error) {
-				//   console.error('获取位置失败：', error.message);
-				// }, {provider:'gps'});
 				mp.sendUniMPEvent(
 					ret.fromAppid,
 					'getLocation', {
@@ -72,6 +57,10 @@ export const initEvent = () => {
 					console.log('Host sendEvent: ' + JSON.stringify(ret));
 				});
 		}
+
+
+
+
 		if (ret.event == 'log') {
 			// console.log('2222222')