diff --git a/components/shopro-auth-modal/shopro-auth-modal.vue b/components/shopro-auth-modal/shopro-auth-modal.vue
index 49174fc..edf502e 100644
--- a/components/shopro-auth-modal/shopro-auth-modal.vue
+++ b/components/shopro-auth-modal/shopro-auth-modal.vue
@@ -3,7 +3,7 @@
 		<view class="login-wrap cu-dialog form-wrap  safe-area-inset-bottom" @tap.stop
 			style="border-radius: 20rpx 20rpx 0 0;">
 			<!-- 1.账号密码登录 -->
-			<view v-if="authType === 'accountLogin'" >
+			<view v-if="authType === 'accountLogin'">
 				<!-- 标题 -->
 				<view class="head-box u-m-b-60 u-flex-col ">
 					<view class="u-flex u-m-b-20">
@@ -46,13 +46,14 @@
 					立即注册
 				</button>
 			</view>
-			
+
 
 			<!-- 2.短信登录 -->
 			<view v-if="authType === 'smsLogin'">
 				<view class="head-box u-m-b-60">
 					<view class="u-flex u-m-b-20">
-						<view class="head-title-active u-m-r-40" @tap="showAuthModal('accountLogin')" style="display: none;">
+						<view class="head-title-active u-m-r-40" @tap="showAuthModal('accountLogin')"
+							style="display: none;">
 							账号登录
 						</view>
 						<view class="head-title head-title-line head-title-animation">
@@ -338,351 +339,372 @@
 </template>
 
 <script>
-/**
- * 登录提示页
- */
-
-import FormValidate from "@/shopro/validate/form";
-import schema from "@/uview-ui/libs/util/async-validator";
-import wechat from "@/shopro/wechat/wechat";
-import { mapMutations, mapActions, mapState, mapGetters } from "vuex";
-// #ifdef APP-PLUS
-import apple from "@/shopro/apple";
-// #endif
-
-export default {
-	name: "shoproAuthModal",
-	data() {
-		return {
-			platform: this.$platform.get(),
-			device: this.$platform.device(),
-			form: {
-				// 1.账号密码登录
-				accountLogin: {
-					data: {
-						account: "", // 账号
-						password: "" // 密码
-					},
-					rules: {
-						account: FormValidate.account,
-						password: FormValidate.password
-					},
-					error: {
-						account: "",
-						password: ""
-					}
-				},
+	/**
+	 * 登录提示页
+	 */
 
-				// 2.短信登录
-				smsLogin: {
-					data: {
-						mobile: "", // 手机号
-						code: "", // 验证码
-						isMobileEnd: false // 手机号输入完毕
-					},
-					rules: {
-						code: FormValidate.code,
-						mobile: FormValidate.mobile
+	import FormValidate from "@/shopro/validate/form";
+	import schema from "@/uview-ui/libs/util/async-validator";
+	import wechat from "@/shopro/wechat/wechat";
+	import jsonrpc from "@/shopro/request/indexJson.js";
+	import {
+		mapMutations,
+		mapActions,
+		mapState,
+		mapGetters
+	} from "vuex";
+	// #ifdef APP-PLUS
+	import apple from "@/shopro/apple";
+
+
+	// #endif
+
+	export default {
+		name: "shoproAuthModal",
+		data() {
+			return {
+				platform: this.$platform.get(),
+				device: this.$platform.device(),
+				form: {
+					// 1.账号密码登录
+					accountLogin: {
+						data: {
+							account: "", // 账号
+							password: "" // 密码
+						},
+						rules: {
+							account: FormValidate.account,
+							password: FormValidate.password
+						},
+						error: {
+							account: "",
+							password: ""
+						}
 					},
-					error: {
-						mobile: "", // 手机号
-						code: "" // 验证码
-					}
-				},
-				// 3.注册
-				register: {
-					data: {
-						mobile: "", // 手机号
-						code: "", // 验证码
-						password: "", // 密码
-						isMobileEnd: false // 手机号输入完毕
+
+					// 2.短信登录
+					smsLogin: {
+						data: {
+							mobile: "1336943778", // 手机号
+							code: "666666", // 验证码
+							isMobileEnd: false // 手机号输入完毕
+						},
+						rules: {
+							code: FormValidate.code,
+							mobile: FormValidate.mobile
+						},
+						error: {
+							mobile: "", // 手机号
+							code: "" // 验证码
+						}
 					},
-					rules: {
-						code: FormValidate.code,
-						mobile: FormValidate.mobile,
-						password: FormValidate.password
+					// 3.注册
+					register: {
+						data: {
+							mobile: "1336943778", // 手机号
+							code: "666666", // 验证码
+							password: "", // 密码
+							isMobileEnd: false // 手机号输入完毕
+						},
+						rules: {
+							code: FormValidate.code,
+							mobile: FormValidate.mobile,
+							password: FormValidate.password
+						},
+						error: {
+							mobile: "", // 手机号
+							code: "", // 验证码
+							password: "" // 密码
+						}
 					},
-					error: {
-						mobile: "", // 手机号
-						code: "", // 验证码
-						password: "" // 密码
-					}
-				},
 
-				// 4.忘记密码
-				forgotPwd: {
-					data: {
-						mobile: "", //手机号
-						code: "", //验证码
-						password: "", //密码
-						isMobileEnd: false // 手机号输入完毕
+					// 4.忘记密码
+					forgotPwd: {
+						data: {
+							mobile: "", //手机号
+							code: "", //验证码
+							password: "", //密码
+							isMobileEnd: false // 手机号输入完毕
+						},
+						rules: {
+							mobile: FormValidate.mobile,
+							code: FormValidate.code,
+							password: FormValidate.password
+						},
+						error: {
+							mobile: "", //手机号
+							code: "", //验证码
+							password: "" //密码
+						}
 					},
-					rules: {
-						mobile: FormValidate.mobile,
-						code: FormValidate.code,
-						password: FormValidate.password
+					// 5.绑定手机号
+					bindMobile: {
+						data: {
+							mobile: "", //手机号
+							code: "", //验证码
+							isMobileEnd: false // 手机号输入完毕
+						},
+						rules: {
+							code: FormValidate.code,
+							mobile: FormValidate.mobile
+						},
+						error: {
+							mobile: "", //手机号
+							code: "" //验证码
+						}
 					},
-					error: {
-						mobile: "", //手机号
-						code: "", //验证码
-						password: "" //密码
+					// 6.修改密码
+					changePwd: {
+						data: {
+							oldPassword: "", //旧密码
+							newPassword: "", //新密码
+							reNewPassword: "" //确认密码
+						},
+						rules: {
+							oldPassword: FormValidate.password,
+							newPassword: FormValidate.password,
+							reNewPassword: [{
+									required: true,
+									message: "请重新输入密码",
+									trigger: ["change", "blur"]
+								},
+								{
+									validator: (rule, value, callback) => {
+										return value === this.form.changePwd.data.newPassword;
+									},
+									message: "两次输入的密码不一致",
+									trigger: ["change", "blur"]
+								}
+							]
+						},
+						error: {
+							oldPassword: "", //旧密码
+							newPassword: "", //新密码
+							reNewPassword: "" //确认密码
+						}
 					}
 				},
-				// 5.绑定手机号
-				bindMobile: {
-					data: {
-						mobile: "", //手机号
-						code: "", //验证码
-						isMobileEnd: false // 手机号输入完毕
-					},
-					rules: {
-						code: FormValidate.code,
-						mobile: FormValidate.mobile
-					},
-					error: {
-						mobile: "", //手机号
-						code: "" //验证码
-					}
+				codeText: "获取验证码",
+				disabledCode: false,
+				protocol: false, //是否同意隐私协议
+				placeholderStyle: "font-size: 30rpx; font-weight: 500;color:#C2C7CF;"
+			};
+		},
+
+		computed: {
+			...mapGetters(["initShop", "isLogin", "authType"]),
+			showAuth: {
+				get() {
+					return !!this.authType;
 				},
-				// 6.修改密码
-				changePwd: {
-					data: {
-						oldPassword: "", //旧密码
-						newPassword: "", //新密码
-						reNewPassword: "" //确认密码
-					},
-					rules: {
-						oldPassword: FormValidate.password,
-						newPassword: FormValidate.password,
-						reNewPassword: [
-							{
-								required: true,
-								message: "请重新输入密码",
-								trigger: ["change", "blur"]
-							},
-							{
-								validator: (rule, value, callback) => {
-									return value === this.form.changePwd.data.newPassword;
-								},
-								message: "两次输入的密码不一致",
-								trigger: ["change", "blur"]
-							}
-						]
-					},
-					error: {
-						oldPassword: "", //旧密码
-						newPassword: "", //新密码
-						reNewPassword: "" //确认密码
-					}
+				set(value) {
+					value ? uni.hideTabBar() : uni.showTabBar();
 				}
-			},
-			codeText: "获取验证码",
-			disabledCode: false,
-			protocol: false, //是否同意隐私协议
-			placeholderStyle: "font-size: 30rpx; font-weight: 500;color:#C2C7CF;"
-		};
-	},
-
-	computed: {
-		...mapGetters(["initShop", "isLogin", "authType"]),
-		showAuth: {
-			get() {
-				return !!this.authType;
-			},
-			set(value) {
-				value ? uni.hideTabBar() : uni.showTabBar();
 			}
-		}
-	},
-
-	watch: {
-	  authType(newAuthType, oldAuthType) {
-	    // 在这里执行你的逻辑，例如设置默认值
-	    if (newAuthType === "accountLogin") {
-	      this.$store.commit("setAuthType", "smsLogin");
-	    }
-	  }
-	},
-
-
-	mounted() { 
-		
-		},
-	methods: {
-		...mapActions(["getUserInfo", "showAuthModal"]),
-
-		// 检测
-		checkValue(e, key) {
-			
-			// this.validation(key);
 		},
 
-		// 校验数据
-		validation(key, callback = () => { }) {
-			
-			let that = this;
-			//拿到需要校验的数据
-			let fieldValue = this.form[this.authType].data[key];
-			//拿到需要检验的规则
-			let rules = this.form[this.authType].rules[key];
-			// 判空
-			if (!rules || rules.length === 0) {
-				return callback("");
-			}
-			// 设置当前的装填，标识为校验中
-			let validateState = "validating";
-			// 调用async-validator的方法
-			let validator = new schema({
-				[key]: rules
-			});
-			// 校验
-			validator.validate(
-				{
-					[key]: fieldValue
-				},
-				{
-					firstFields: true
-				},
-				(errors, fields) => {
-					// 记录状态和报错信息
-					validateState = !errors ? "success" : "error";
-					let validateMessage = errors ? errors[0].message : "";
-					that.form[that.authType].error[key] = validateMessage;
-					callback(validateMessage);
+		watch: {
+			authType(newAuthType, oldAuthType) {
+				// 在这里执行你的逻辑，例如设置默认值
+				if (newAuthType === "accountLogin") {
+					this.$store.commit("setAuthType", "smsLogin");
 				}
-			);
+			}
 		},
 
-		// 校验全部数据
-		validateAll(callback) {
-			let that = this;
-			return new Promise(resolve => {
-				// 对当前所有表单检验
-				let valid = true; // 默认通过
-				let count = 0; // 用于标记是否检查完毕
-				let errorArr = []; // 存放错误信息
-				let curFormData = that.form[that.authType].data;
-				Object.keys(curFormData).map(field => {
-					that.validation(field, error => {
-						// 如果回调有error
-						if (error) {
-							valid = false;
-							errorArr.push(error);
+
+		mounted() {
+
+		},
+		methods: {
+			...mapActions(["getUserInfoJson", "getUserInfo", "showAuthModal"]),
+			// 获取短信验证码
+			getSmsCode(type) {
+				const that = this;
+				if (that.form[this.authType].data.isMobileEnd && !that.disabledCode) {
+					jsonrpc("user.smsJson", {
+							mobile: that.form[this.authType].data.mobile,
+							event: type
+						},
+						"获取验证码中..."
+					).then(res => {
+						console.log(res)
+						if (res.error.code === 200) {
+							that.codeChange();
+							that.$u.toast("验证码已发送，请注意查收短信");
+						} else {
+							that.$u.toast(res.msg);
 						}
-						if (++count === Object.keys(curFormData).length) {
-							resolve(valid);
-							if (errorArr.length) {
-								this.$u.toast(errorArr[0]);
-							}
-							if (typeof callback == "function") callback(valid);
+					});
+				} else {
+					that.$u.toast("请稍后再试");
+				}
+				/* if (that.form[this.authType].data.isMobileEnd && !that.disabledCode) {
+					that.$http(
+						"common.smsSend", {
+							mobile: that.form[this.authType].data.mobile,
+							event: type
+						},
+						"获取验证码中..."
+					).then(res => {
+						if (res.code === 1) {
+							that.codeChange();
+							that.$u.toast("验证码已发送，请注意查收短信");
+						} else {
+							that.$u.toast(res.msg);
 						}
 					});
-				});
-			});
-		},
+				} else {
+					that.$u.toast("请稍后再试");
+				} */
+			},
 
-		// 手机号是否输入完毕
-		mobileInput(e, key) {
-			this.form[this.authType].data.isMobileEnd = this.$u.test.mobile(
-				this.form[this.authType].data.mobile
-			);
-			this.validation(key);
-		},
+			// 检测
+			checkValue(e, key) {
 
-		closeAuthModal() {
-			this.$store.dispatch("showAuthModal", "");
-		},
+				// this.validation(key);
+			},
+
+			// 校验数据
+			validation(key, callback = () => {}) {
 
-		// 获取短信验证码
-		getSmsCode(type) {
-			const that = this;
-			if (that.form[this.authType].data.isMobileEnd && !that.disabledCode) {
-				that.$http(
-					"common.smsSend",
-					{
-						mobile: that.form[this.authType].data.mobile,
-						event: type
+				let that = this;
+				//拿到需要校验的数据
+				let fieldValue = this.form[this.authType].data[key];
+				//拿到需要检验的规则
+				let rules = this.form[this.authType].rules[key];
+				// 判空
+				if (!rules || rules.length === 0) {
+					return callback("");
+				}
+				// 设置当前的装填，标识为校验中
+				let validateState = "validating";
+				// 调用async-validator的方法
+				let validator = new schema({
+					[key]: rules
+				});
+				// 校验
+				validator.validate({
+						[key]: fieldValue
+					}, {
+						firstFields: true
 					},
-					"获取验证码中..."
-				).then(res => {
-					if (res.code === 1) {
-						that.codeChange();
-						that.$u.toast("验证码已发送，请注意查收短信");
-					} else {
-						that.$u.toast(res.msg);
+					(errors, fields) => {
+						// 记录状态和报错信息
+						validateState = !errors ? "success" : "error";
+						let validateMessage = errors ? errors[0].message : "";
+						that.form[that.authType].error[key] = validateMessage;
+						callback(validateMessage);
 					}
+				);
+			},
+
+			// 校验全部数据
+			validateAll(callback) {
+				let that = this;
+				return new Promise(resolve => {
+					// 对当前所有表单检验
+					let valid = true; // 默认通过
+					let count = 0; // 用于标记是否检查完毕
+					let errorArr = []; // 存放错误信息
+					let curFormData = that.form[that.authType].data;
+					Object.keys(curFormData).map(field => {
+						that.validation(field, error => {
+							// 如果回调有error
+							if (error) {
+								valid = false;
+								errorArr.push(error);
+							}
+							if (++count === Object.keys(curFormData).length) {
+								resolve(valid);
+								if (errorArr.length) {
+									this.$u.toast(errorArr[0]);
+								}
+								if (typeof callback == "function") callback(valid);
+							}
+						});
+					});
 				});
-			} else {
-				that.$u.toast("请稍后再试");
-			}
-		},
+			},
 
-		// 倒计时
-		codeChange() {
-			if (this.disabledCode) return;
-			this.disabledCode = true;
-			let n = 60;
-			this.codeText = n + "s";
-			const run = setInterval(() => {
-				n -= 1;
-				if (n < 0) {
-					clearInterval(run);
-				}
+			// 手机号是否输入完毕
+			mobileInput(e, key) {
+				this.form[this.authType].data.isMobileEnd = this.$u.test.mobile(
+					this.form[this.authType].data.mobile
+				);
+				this.validation(key);
+			},
+
+			closeAuthModal() {
+				this.$store.dispatch("showAuthModal", "");
+			},
+
+
+			// 倒计时
+			codeChange() {
+				if (this.disabledCode) return;
+				this.disabledCode = true;
+				let n = 60;
 				this.codeText = n + "s";
-				if (this.codeText < 0 + "s") {
-					this.disabledCode = false;
-					this.codeText = "重新获取";
-				}
-			}, 1000);
-		},
+				const run = setInterval(() => {
+					n -= 1;
+					if (n < 0) {
+						clearInterval(run);
+					}
+					this.codeText = n + "s";
+					if (this.codeText < 0 + "s") {
+						this.disabledCode = false;
+						this.codeText = "重新获取";
+					}
+				}, 1000);
+			},
 
-		// 规则校验
-		validateSubmit() {
-			if (
-				["accountLogin", "smsLogin", "register"].includes(this.authType) &&
-				!this.protocol
-			) {
-				this.$u.toast("请同意用户协议");
-				return false;
-			}
-			return this.validateAll();
-		},
+			// 规则校验
+			validateSubmit() {
+				if (
+					["accountLogin", "smsLogin", "register"].includes(this.authType) &&
+					!this.protocol
+				) {
+					this.$u.toast("请同意用户协议");
+					return false;
+				}
+				return this.validateAll();
+			},
 
-		// 第三方登录
-		async thirdLogin(provider, payload = null) {
-			if (this.platform === 'wxMiniProgram' && payload === null) return;
-			if (!this.protocol) {
-				this.$u.toast("请同意用户协议");
-				return false;
-			}
-			const that = this;
-			let token = "";
-			switch (provider) {
-				case "wechat":
-					token = await wechat.login(payload);
-					break;
-				case "alipay":
-					break;
-				case "apple":
-					token = await apple.appleIdOauth();
-					break;
-				default:
-					break;
-			}
-			if (token) {
-				that.closeAuthModal();
-				that.getUserInfo(token);
-			}
-		},
+			// 第三方登录
+			async thirdLogin(provider, payload = null) {
+				if (this.platform === 'wxMiniProgram' && payload === null) return;
+				if (!this.protocol) {
+					this.$u.toast("请同意用户协议");
+					return false;
+				}
+				const that = this;
+				let token = "";
+				switch (provider) {
+					case "wechat":
+						token = await wechat.login(payload);
+						break;
+					case "alipay":
+						break;
+					case "apple":
+						token = await apple.appleIdOauth();
+						break;
+					default:
+						break;
+				}
+				if (token) {
+					that.closeAuthModal();
+					that.getUserInfo(token);
+				}
+			},
 
-		// 1.账号登录
-		async accountLoginSubmit() {
-			let that = this;
-			(await that.validateSubmit()) &&
+			// 1.账号登录
+			async accountLoginSubmit() {
+				let that = this;
+				(await that.validateSubmit()) &&
 				that
 					.$http(
-						"user.accountLogin",
-						{
+						"user.accountLogin", {
 							account: that.form["accountLogin"].data.account,
 							password: that.form["accountLogin"].data.password
 						},
@@ -695,38 +717,51 @@ export default {
 							that.$u.toast(res.msg);
 						}
 					});
-		},
+			},
 
-		// 2.短信登录
-		async smsLoginSubmit() {
-			let that = this;
-			(await that.validateSubmit()) &&
-				that
-					.$http(
-						"user.smsLogin",
-						{
-							mobile: that.form["smsLogin"].data.mobile,
-							code: that.form["smsLogin"].data.code
-						},
-						"登录中..."
-					)
-					.then(res => {
-						if (res.code === 1) {
-							that.closeAuthModal();
-							that.getUserInfo(res.data.token);
-							that.$u.toast(res.msg);
-						}
-					});
-		},
+			// 2.短信登录
+			async smsLoginSubmit() {
+				let that = this;
 
-		// 3.注册
-		async registerSubmit() {
-			let that = this;
-			(await that.validateSubmit()) &&
+				(await that.validateSubmit()) &&
+				jsonrpc("user.smsLoginJson", {
+						mobile: that.form["smsLogin"].data.mobile,
+						verification_code: that.form["smsLogin"].data.code
+					},
+					"登录中..."
+				).then(res => {
+					console.log(res)
+					if (res.error.code === 200) {
+						// that.getUserInfo(res.result.token);
+						that.getUserInfoJson(res.result.token);
+						that.closeAuthModal();
+						that.$u.toast(res.error.message);
+					} else {
+						that.$u.toast(res.error.message);
+					}
+				});
+				/* (await that.validateSubmit()) &&
+				that.$http("user.smsLogin", {
+						mobile: that.form["smsLogin"].data.mobile,
+						code: that.form["smsLogin"].data.code
+					},
+					"登录中..."
+				).then(res => {
+					if (res.code === 1) {
+						that.closeAuthModal();
+						that.getUserInfo(res.data.token);
+						that.$u.toast(res.msg);
+					}
+				}); */
+			},
+
+			// 3.注册
+			async registerSubmit() {
+				let that = this;
+				(await that.validateSubmit()) &&
 				that
 					.$http(
-						"user.register",
-						{
+						"user.register", {
 							mobile: that.form["register"].data.mobile,
 							code: that.form["register"].data.code,
 							password: that.form["register"].data.password
@@ -740,16 +775,15 @@ export default {
 							that.getUserInfo(res.data.token);
 						}
 					});
-		},
+			},
 
-		// 4.忘记密码
-		async forgotPwdSubmit() {
-			let that = this;
-			(await that.validateSubmit()) &&
+			// 4.忘记密码
+			async forgotPwdSubmit() {
+				let that = this;
+				(await that.validateSubmit()) &&
 				that
 					.$http(
-						"user.forgotPwd",
-						{
+						"user.forgotPwd", {
 							mobile: that.form["forgotPwd"].data.mobile,
 							code: that.form["forgotPwd"].data.code,
 							password: that.form["forgotPwd"].data.password
@@ -766,16 +800,15 @@ export default {
 							}
 						}
 					});
-		},
+			},
 
-		// 5.绑定手机
-		async bindMobileSubmit() {
-			let that = this;
-			(await that.validateSubmit()) &&
+			// 5.绑定手机
+			async bindMobileSubmit() {
+				let that = this;
+				(await that.validateSubmit()) &&
 				that
 					.$http(
-						"user.bindMobile",
-						{
+						"user.bindMobile", {
 							mobile: that.form["bindMobile"].data.mobile,
 							code: that.form["bindMobile"].data.code,
 							password: that.form["bindMobile"].data.password
@@ -789,16 +822,15 @@ export default {
 							that.getUserInfo();
 						}
 					});
-		},
+			},
 
-		// 6.修改密码
-		async changePwdSubmit() {
-			let that = this;
-			(await that.validateSubmit()) &&
+			// 6.修改密码
+			async changePwdSubmit() {
+				let that = this;
+				(await that.validateSubmit()) &&
 				that
 					.$http(
-						"user.changePwd",
-						{
+						"user.changePwd", {
 							oldpassword: that.form["changePwd"].data.oldPassword,
 							newpassword: that.form["changePwd"].data.newPassword
 						},
@@ -811,199 +843,199 @@ export default {
 							that.getUserInfo(res.data.userinfo.token);
 						}
 					});
+			}
 		}
-	}
-};
+	};
 </script>
 
 <style lang="scss" scoped>
-@keyframes title-animation {
-	0% {
-		font-size: 32rpx;
-	}
+	@keyframes title-animation {
+		0% {
+			font-size: 32rpx;
+		}
 
-	100% {
-		font-size: 36rpx;
-	}
-}
-
-.form-wrap {
-	.form-item {
-		display: flex;
-		flex-direction: column;
-		font-size: 28rpx;
-		padding: 20rpx 0;
-		color: $u-main-color;
-		box-sizing: border-box;
-		line-height: $u-form-item-height;
-		width: 100%;
-
-		.item-title {
-			width: 140rpx;
-			font-size: 30rpx;
-			color: #333;
-			font-weight: 600;
-			text-align: left;
+		100% {
+			font-size: 36rpx;
 		}
+	}
 
-		.message-error {
-			text-align: left;
-			font-size: 24rpx;
-			line-height: 24rpx;
-			color: $u-type-error;
-			margin-top: 12rpx;
-			margin-left: 120rpx;
+	.form-wrap {
+		.form-item {
+			display: flex;
+			flex-direction: column;
+			font-size: 28rpx;
+			padding: 20rpx 0;
+			color: $u-main-color;
+			box-sizing: border-box;
+			line-height: $u-form-item-height;
+			width: 100%;
+
+			.item-title {
+				width: 140rpx;
+				font-size: 30rpx;
+				color: #333;
+				font-weight: 600;
+				text-align: left;
+			}
+
+			.message-error {
+				text-align: left;
+				font-size: 24rpx;
+				line-height: 24rpx;
+				color: $u-type-error;
+				margin-top: 12rpx;
+				margin-left: 120rpx;
+			}
 		}
 	}
-}
 
-.login-wrap {
-	padding: 50rpx 34rpx;
-	min-height: 700rpx;
-	background-color: #fff;
+	.login-wrap {
+		padding: 50rpx 34rpx;
+		min-height: 700rpx;
+		background-color: #fff;
 
-	.head-box {
-		.head-title {
-			min-width: 160rpx;
-			font-size: 36rpx;
-			font-weight: bold;
-			color: #333333;
-			line-height: 36rpx;
+		.head-box {
+			.head-title {
+				min-width: 160rpx;
+				font-size: 36rpx;
+				font-weight: bold;
+				color: #333333;
+				line-height: 36rpx;
+			}
+
+			.head-title-active {
+				width: 160rpx;
+				font-size: 32rpx;
+				font-weight: 600;
+				color: #999;
+				line-height: 36rpx;
+			}
+
+			.head-title-animation {
+				animation-name: title-animation;
+				animation-duration: 0.1s;
+				animation-timing-function: ease-out;
+				animation-fill-mode: forwards;
+			}
+
+			.head-title-line {
+				position: relative;
+
+				&::before {
+					content: "";
+					width: 1rpx;
+					height: 34rpx;
+					background-color: #e4e7ed;
+					position: absolute;
+					left: -30rpx;
+					top: 50%;
+					transform: translateY(-50%);
+				}
+			}
+
+			.head-subtitle {
+				font-size: 26rpx;
+				font-weight: 400;
+				color: #c2c7cf;
+				text-align: left;
+				display: flex;
+			}
+		}
+
+		.code-btn[disabled] {
+			background-color: #fff;
 		}
 
-		.head-title-active {
+		.code-btn-start {
 			width: 160rpx;
-			font-size: 32rpx;
-			font-weight: 600;
-			color: #999;
-			line-height: 36rpx;
+			line-height: 56rpx;
+			border: 1rpx solid #e9b766;
+			border-radius: 28rpx;
+			font-size: 26rpx;
+			font-weight: 400;
+			color: #e9b766;
+			opacity: 0.5;
 		}
 
-		.head-title-animation {
-			animation-name: title-animation;
-			animation-duration: 0.1s;
-			animation-timing-function: ease-out;
-			animation-fill-mode: forwards;
+		.forgot-btn {
+			width: 160rpx;
+			line-height: 56rpx;
+			font-size: 30rpx;
+			font-weight: 500;
+			color: #999;
 		}
 
-		.head-title-line {
-			position: relative;
-
-			&::before {
-				content: "";
-				width: 1rpx;
-				height: 34rpx;
-				background-color: #e4e7ed;
-				position: absolute;
-				left: -30rpx;
-				top: 50%;
-				transform: translateY(-50%);
-			}
+		.code-btn-end {
+			opacity: 1 !important;
 		}
 
-		.head-subtitle {
+		.login-btn-start {
+			width: 158rpx;
+			line-height: 56rpx;
+			background: linear-gradient(90deg, #e9b461, #eecc89);
+			border-radius: 28rpx;
 			font-size: 26rpx;
-			font-weight: 400;
-			color: #c2c7cf;
-			text-align: left;
-			display: flex;
+			font-weight: 500;
+			color: #ffffff;
 		}
-	}
-
-	.code-btn[disabled] {
-		background-color: #fff;
-	}
 
-	.code-btn-start {
-		width: 160rpx;
-		line-height: 56rpx;
-		border: 1rpx solid #e9b766;
-		border-radius: 28rpx;
-		font-size: 26rpx;
-		font-weight: 400;
-		color: #e9b766;
-		opacity: 0.5;
-	}
+		.type-btn {
+			padding: 20rpx;
+			margin: 40rpx auto;
+			width: 200rpx;
+			font-size: 30rpx;
+			font-weight: 500;
+			color: #999999;
+		}
 
-	.forgot-btn {
-		width: 160rpx;
-		line-height: 56rpx;
-		font-size: 30rpx;
-		font-weight: 500;
-		color: #999;
-	}
+		.auto-login-box {
+			width: 100%;
 
-	.code-btn-end {
-		opacity: 1 !important;
-	}
+			.auto-login-img {
+				width: 68rpx;
+				height: 68rpx;
+				border-radius: 50%;
+				margin: 0 30rpx;
+			}
+		}
 
-	.login-btn-start {
-		width: 158rpx;
-		line-height: 56rpx;
-		background: linear-gradient(90deg, #e9b461, #eecc89);
-		border-radius: 28rpx;
-		font-size: 26rpx;
-		font-weight: 500;
-		color: #ffffff;
-	}
+		.agreement-box {
+			margin: 80rpx auto 0;
 
-	.type-btn {
-		padding: 20rpx;
-		margin: 40rpx auto;
-		width: 200rpx;
-		font-size: 30rpx;
-		font-weight: 500;
-		color: #999999;
-	}
+			.protocol-check {
+				transform: scale(0.7);
+			}
 
-	.auto-login-box {
-		width: 100%;
+			.agreement-text {
+				font-size: 26rpx;
+				font-weight: 500;
+				color: #999999;
 
-		.auto-login-img {
-			width: 68rpx;
-			height: 68rpx;
-			border-radius: 50%;
-			margin: 0 30rpx;
+				.tcp-text {
+					color: #e9b562;
+				}
+			}
 		}
 	}
 
-	.agreement-box {
-		margin: 80rpx auto 0;
-
-		.protocol-check {
-			transform: scale(0.7);
+	// 修改密码
+	.editPwd-btn-box {
+		.save-btn {
+			width: 690rpx;
+			line-height: 70rpx;
+			background: linear-gradient(90deg, #e9b461, #eecc89);
+			border-radius: 35rpx;
+			font-size: 28rpx;
+			font-weight: 500;
+			color: #ffffff;
 		}
 
-		.agreement-text {
-			font-size: 26rpx;
+		.forgot-btn {
+			width: 690rpx;
+			line-height: 70rpx;
+			font-size: 28rpx;
 			font-weight: 500;
 			color: #999999;
-
-			.tcp-text {
-				color: #e9b562;
-			}
 		}
 	}
-}
-
-// 修改密码
-.editPwd-btn-box {
-	.save-btn {
-		width: 690rpx;
-		line-height: 70rpx;
-		background: linear-gradient(90deg, #e9b461, #eecc89);
-		border-radius: 35rpx;
-		font-size: 28rpx;
-		font-weight: 500;
-		color: #ffffff;
-	}
-
-	.forgot-btn {
-		width: 690rpx;
-		line-height: 70rpx;
-		font-size: 28rpx;
-		font-weight: 500;
-		color: #999999;
-	}
-}
-</style>
+</style>
\ No newline at end of file
diff --git a/components/shopro-goods-card/shopro-goods-card.vue b/components/shopro-goods-card/shopro-goods-card.vue
index 2aa27ca..28711cf 100644
--- a/components/shopro-goods-card/shopro-goods-card.vue
+++ b/components/shopro-goods-card/shopro-goods-card.vue
@@ -50,7 +50,11 @@
 			</slot>
 		</view>
 		<!-- 规格弹窗 -->
-		<shopro-sku v-if="showSku && goodsInfo.id" v-model="showSku" :goodsInfo="goodsInfo" buyType="cart"></shopro-sku>
+
+		<shopro-sku v-if="showSku && goodsInfo && goodsInfo.id" v-model="showSku" :goodsInfo="goodsInfo"
+			buyType="cart"></shopro-sku>
+
+
 	</view>
 </template>
 
@@ -68,7 +72,12 @@
 	 * @property {Array} tagTextList - 活动标签
 	 * @event {Function} click 商品被点击
 	 */
-	import { mapMutations, mapActions, mapState, mapGetters } from 'vuex';
+	import {
+		mapMutations,
+		mapActions,
+		mapState,
+		mapGetters
+	} from 'vuex';
 	export default {
 		components: {},
 		data() {
@@ -184,7 +193,10 @@
 					confirmColor: '#f0c785',
 					content: `是否确认从购物车中删除此商品?`,
 					success: res => {
-						res.confirm && this.changeCartList({ ids: [cartGoodId], art: 'delete' });
+						res.confirm && this.changeCartList({
+							ids: [cartGoodId],
+							art: 'delete'
+						});
 					}
 				});
 			},
@@ -206,8 +218,14 @@
 
 			// 添加购物车,多规格
 			async selSku(info) {
+				console.log("selSku")
 				if (this.detail.activity_type) {
-					this.$Router.push({ path: '/pages/goods/detail', query: { id: this.detail.id } });
+					this.$Router.push({
+						path: '/pages/goods/detail',
+						query: {
+							id: this.detail.id
+						}
+					});
 					return;
 				}
 				this.goodsInfo = {};
@@ -229,14 +247,21 @@
 
 			// 加入购物车
 			addCart(sku) {
+				console.log("cart ")
 				if (sku.stock <= 0) {
 					this.$u.toast('库存不足');
 					return;
 				}
 				if (this.detail.activity_type) {
-					this.$Router.push({ path: '/pages/goods/detail', query: { id: this.detail.id } });
+					this.$Router.push({
+						path: '/pages/goods/detail',
+						query: {
+							id: this.detail.id
+						}
+					});
 					return;
 				}
+
 				let confirmGoodsList = {
 					list: [{
 						goods_id: sku.goods_id,
@@ -244,7 +269,7 @@
 						sku_price_id: sku.id,
 						goods_price: sku.price
 					}],
-					from: 'goods'
+					// from: 'goods'
 				};
 				this.addCartGoods(confirmGoodsList).then(res => {
 					if (res.code === 1) {
@@ -345,4 +370,4 @@
 			}
 		}
 	}
-</style>
+</style>
\ No newline at end of file
diff --git a/components/shopro-sku/shopro-sku.vue b/components/shopro-sku/shopro-sku.vue
index 14044c9..5d0a8c1 100644
--- a/components/shopro-sku/shopro-sku.vue
+++ b/components/shopro-sku/shopro-sku.vue
@@ -160,7 +160,7 @@
 		},
 
 		methods: {
-			...mapActions(['addCartGoods', 'getCartList']),
+			...mapActions(['addCartGoodsJson','addCartGoods', 'getCartList']),
 			jump(path, parmas) {
 				this.$Router.push({
 					path: path,
@@ -343,10 +343,11 @@
 						list: [that.confirmGoodsInfo],
 						from: 'goods'
 					};
-					that.addCartGoods(confirmGoodsList).then(res => {
-						if (res.code === 1) {
+					that.addCartGoodsJson(confirmGoodsList).then(res => {
+						console.log(res)
+						if (res.error.code === 200) {
 							that.showModal = false;
-							that.$u.toast(res.msg);
+							that.$u.toast(res.error.msg);
 						}
 					});
 				}
@@ -369,6 +370,7 @@
 			},
 			// 确定
 			confirm() {
+				console.log("confirm")
 				if (this.confirmSku()) {
 					switch (this.buyType) {
 						case 'cart':
diff --git a/main.js b/main.js
index 760391b..228060f 100644
--- a/main.js
+++ b/main.js
@@ -17,7 +17,7 @@ async function bootstrap() {
 	Vue.use(uView);
 	// 加载shopro
 	Vue.use(shopro);
-Vue.use(jsonrpc);	
+	Vue.use(jsonrpc);
 	const app = new Vue({
 		store,
 		...App
diff --git a/pages/goods/detail.vue b/pages/goods/detail.vue
index 9fc648b..ae48e7b 100644
--- a/pages/goods/detail.vue
+++ b/pages/goods/detail.vue
@@ -210,6 +210,7 @@ import shComment from './components/sh-comment.vue';
 import share from '@/shopro/share';
 
 import { mapMutations, mapActions, mapState, mapGetters } from 'vuex';
+import jsonrpc from "@/shopro/request/indexJson.js"
 export default {
 	components: {
 		shServe,
@@ -361,7 +362,7 @@ export default {
 		getGoodsDetail() {
 			let that = this;
 			return new Promise((resolve, reject) => {
-				that.$jsonrpc('goods.detail',{id: that.$Route.query.id},'',
+				jsonrpc('goods.detail',{id: that.$Route.query.id},'',
 					false).then(res=>{
 						console.log(res)
 						if (res.error.code === 200) {
diff --git a/pages/goods/list.vue b/pages/goods/list.vue
index fd460c2..b48e7fb 100644
--- a/pages/goods/list.vue
+++ b/pages/goods/list.vue
@@ -15,7 +15,7 @@
 		<view class="u-waterfall u-p-16" v-if="!isEmpty">
 			<view id="u-left-column" class="u-column">
 				<view class="goods-item u-m-b-16 u-flex u-row-center u-col-center" v-for="leftGoods in leftList" :key="leftGoods.id">
-					<shopro-goods-card
+					<shopro-goods-card v-if="leftGoods"
 						:detail="leftGoods"
 						:type="leftGoods.activity_type"
 						:image="leftGoods.image"
@@ -31,7 +31,7 @@
 			</view>
 			<view id="u-right-column" class="u-column">
 				<view class="goods-item u-m-b-16 u-flex u-row-center u-col-center" v-for="rightGoods in rightList" :key="rightGoods.id">
-					<shopro-goods-card
+					<shopro-goods-card v-if="rightGoods"
 						:detail="rightGoods"
 						:type="rightGoods.activity_type"
 						:image="rightGoods.image"
@@ -58,6 +58,7 @@
 
 <script>
 import shFilter from './components/sh-filter.vue';
+import jsonrpc from '@/shopro/request/indexJson.js';
 import { mapMutations, mapActions, mapState } from 'vuex';
 let systemInfo = uni.getSystemInfoSync();
 let historyTag = uni.getStorageSync('searchHistoryArr') ? JSON.parse(uni.getStorageSync('searchHistoryArr')) : [];
@@ -181,7 +182,7 @@ export default {
 			let that = this;
 			that.loadStatus = 'loading';
 			console.log("good list ")
-			this.$jsonrpc('goods.list2',this.listParams,'加载中...').then(res=>{
+			jsonrpc('goods.list2',this.listParams,'加载中...').then(res=>{
 				console.log(res)
 				if (this.searchVal && !historyTag.includes(this.searchVal)) {
 					let searchHistoryArr = JSON.stringify(this.getArr(historyTag, this.searchVal));
diff --git a/pages/index/cart.vue b/pages/index/cart.vue
index fed6e4e..50828a6 100644
--- a/pages/index/cart.vue
+++ b/pages/index/cart.vue
@@ -40,8 +40,9 @@
 									<text
 										class="order-price font-OPPOSANS">￥{{ g.sku_price ? g.sku_price.price : 0 }}</text>
 									<u-number-box :value="g.goods_num" :long-press="false" :min="0" :step="1"
-										:index="index" :max="!g.sku_price ? 0: (g.sku_price.stock > 999 ? 999 : g.sku_price.stock)" @min="onMin(g)"
-										@minus="changeNum($event, g)" @plus="changeNum($event, g)"
+										:index="index"
+										:max="!g.sku_price ? 0: (g.sku_price.stock > 999 ? 999 : g.sku_price.stock)"
+										@min="onMin(g)" @minus="changeNum($event, g)" @plus="changeNum($event, g)"
 										@change="changeNum($event, g)">
 									</u-number-box>
 								</view>
@@ -73,7 +74,12 @@
 </template>
 
 <script>
-	import { mapMutations, mapActions, mapState, mapGetters } from 'vuex';
+	import {
+		mapMutations,
+		mapActions,
+		mapState,
+		mapGetters
+	} from 'vuex';
 	let timer = null;
 	export default {
 		components: {},
@@ -90,13 +96,13 @@
 			}
 		},
 		onShow() {
-			this.isLogin && this.getCartList();
+			this.isLogin && this.getCartListJson();
 		},
 		onHide() {
 			this.isTool = false;
 		},
 		methods: {
-			...mapActions(['getCartList', 'changeCartList']),
+			...mapActions(['getCartListJson', 'getCartList', 'changeCartList', 'changeCartListJson']),
 
 			// 到达最小值
 			onMin(g) {
@@ -105,7 +111,10 @@
 					confirmColor: '#f0c785',
 					content: `是否确认从购物车中删除此商品?`,
 					success: res => {
-						res.confirm && this.changeCartList({ ids: [g.id], art: 'delete' });
+						res.confirm && this.changeCartListJson({
+							ids: [g.id],
+							art: 'delete'
+						});
 					}
 				});
 			},
@@ -114,9 +123,13 @@
 				uni.showLoading({
 					mask: true
 				});
-				e.value > 0 && this.changeCartList({ ids: [g.id], goodsNum: e.value, art: 'change' });
+				e.value > 0 && this.changeCartListJson({
+					ids: [g.id],
+					goodsNum: e.value,
+					art: 'change'
+				});
 				uni.hideLoading();
-				await this.getCartList();
+				await this.getCartListJson();
 			},
 
 			// 单选
@@ -142,7 +155,9 @@
 			// 结算
 			onPay() {
 				let that = this;
-				let { cartList } = this;
+				let {
+					cartList
+				} = this;
 				if (this.isSel) {
 					let confirmcartList = [];
 					let isActivity = false;
@@ -155,11 +170,14 @@
 							if (item.cart_type === 'activity') {
 								isActivity = true;
 							}
+							console.log(item)
 							confirmcartList.push({
 								goods_id: item.goods_id,
 								sku_price_id: item.sku_price_id,
 								goods_price: item.sku_price ? item.sku_price.price : 0,
-								goods_num: item.goods_num
+								goods_num: item.goods_num,
+								cart_id: item.id
+
 							});
 						}
 					}
@@ -167,20 +185,28 @@
 						this.$u.toast('活动商品只能单独购买');
 						return false;
 					}
-					that.jump('/pages/order/confirm', { goodsList: confirmcartList, from: 'cart' });
+					that.jump('/pages/order/confirm', {
+						goodsList: confirmcartList,
+						from: 'cart'
+					});
 				}
 			},
 			// 删除
 			goodsDelete() {
 				let that = this;
-				let { cartList } = this;
+				let {
+					cartList
+				} = this;
 				let selectedIdsArray = [];
 				cartList.map(item => {
 					if (item.checked) {
 						selectedIdsArray.push(item.id);
 					}
 				});
-				this.changeCartList({ ids: selectedIdsArray, art: 'delete' });
+				this.changeCartListJson({
+					ids: selectedIdsArray,
+					art: 'delete'
+				});
 			}
 		}
 	};
@@ -368,4 +394,4 @@
 			color: rgba(#fff, 0.9);
 		}
 	}
-</style>
+</style>
\ No newline at end of file
diff --git a/pages/index/category.vue b/pages/index/category.vue
index aaa2edc..aaab803 100644
--- a/pages/index/category.vue
+++ b/pages/index/category.vue
@@ -16,69 +16,76 @@
 </template>
 
 <script>
-import takeoutCatgory from './category/takeout-catgory.vue';
-import threeCatgory from './category/three-catgory.vue';
-import twoCatgory from './category/two-catgory.vue';
-import oneCatgory from './category/one-catgory.vue';
-import { mapMutations, mapActions, mapState, mapGetters } from 'vuex';
-import jsonrpc from "@/shopro/jsonrpc/jsonrpc2.0.js"
-export default {
-	components: {
-		takeoutCatgory,
-		threeCatgory,
-		twoCatgory,
-		oneCatgory
-	},
-	data() {
-		return {
-			categoryType: 0, //1:快速购买,2:一级分类，3:二级分类，4:三级分类
-			categoryStyleId: 0 //分类Id
-		};
-	},
-	computed: {
-		...mapGetters(['authType'])
-	},
-	onLoad() {
-		this.getCategory();
-	},
-	methods: {
-		/**
-		 * 获取分类数据
-		 *  type4:三级分类， type3:二级分类 ,type2:一级分类,type1:快速购买
-		 */
-		getCategory() {
-			
-	this.$jsonrpc('category.info',{id: this.$Route.query.id ? this.$Route.query.id : 0}).then(res =>{
-		
-		if (res.result?.type) {
-			this.categoryType = Number(res.result.type);
-			this.categoryStyleId = Number(res.result.id);
-			uni.setNavigationBarTitle({
-				title: res.result?.name
-			});
-		}
-	})
-		/* 	this.$http('category.info', {		id: this.$Route.query.id ? this.$Route.query.id : 0}).then(res => {
-			
-				if (res.code === 1) {
-					if (res.data?.type) {
-						this.categoryType = Number(res.data.type);
-						this.categoryStyleId = Number(res.data.id);
+	import takeoutCatgory from './category/takeout-catgory.vue';
+	import threeCatgory from './category/three-catgory.vue';
+	import twoCatgory from './category/two-catgory.vue';
+	import oneCatgory from './category/one-catgory.vue';
+	import {
+		mapMutations,
+		mapActions,
+		mapState,
+		mapGetters
+	} from 'vuex';
+	import jsonrpc from "@/shopro/request/indexJson.js"
+	export default {
+		components: {
+			takeoutCatgory,
+			threeCatgory,
+			twoCatgory,
+			oneCatgory
+		},
+		data() {
+			return {
+				categoryType: 0, //1:快速购买,2:一级分类，3:二级分类，4:三级分类
+				categoryStyleId: 0 //分类Id
+			};
+		},
+		computed: {
+			...mapGetters(['authType'])
+		},
+		onLoad() {
+			this.getCategory();
+		},
+		methods: {
+			/**
+			 * 获取分类数据
+			 *  type4:三级分类， type3:二级分类 ,type2:一级分类,type1:快速购买
+			 */
+			getCategory() {
+	
+				jsonrpc('category.info', {
+					id: this.$Route.query.id ? this.$Route.query.id : 0
+				}).then(res => {
+
+					if (res.result?.type) {
+						this.categoryType = Number(res.result.type);
+						this.categoryStyleId = Number(res.result.id);
 						uni.setNavigationBarTitle({
-							title: res.data?.name
+							title: res.result?.name
 						});
 					}
-				}
-			}); */
+				})
+				/* 	this.$http('category.info', {		id: this.$Route.query.id ? this.$Route.query.id : 0}).then(res => {
+					
+						if (res.code === 1) {
+							if (res.data?.type) {
+								this.categoryType = Number(res.data.type);
+								this.categoryStyleId = Number(res.data.id);
+								uni.setNavigationBarTitle({
+									title: res.data?.name
+								});
+							}
+						}
+					}); */
+			}
 		}
-	}
-};
+	};
 </script>
 
 <style lang="scss">
-.category-box {
-	height: 100%;
-	flex: 1;
-	overflow: hidden;
-}
-</style>
+	.category-box {
+		height: 100%;
+		flex: 1;
+		overflow: hidden;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/index/category/takeout-catgory.vue b/pages/index/category/takeout-catgory.vue
index c61c23c..3582df0 100644
--- a/pages/index/category/takeout-catgory.vue
+++ b/pages/index/category/takeout-catgory.vue
@@ -2,8 +2,7 @@
 	<view class="catgory-wrap">
 		<view class="u-flex wrapper-box">
 			<!-- 左侧分类列表 -->
-			<scroll-view scroll-y scroll-with-animation class="u-tab-view menu-scroll-view"
-				:scroll-top="scrollLeftTop">
+			<scroll-view scroll-y scroll-with-animation class="u-tab-view menu-scroll-view" :scroll-top="scrollLeftTop">
 				<view v-for="(item, index) in tabbarList" :key="index" class="u-tab-item u-ellipsis-1"
 					:class="[currentTab == index ? 'u-tab-item-active' : '']" :data-current="index"
 					@tap.stop="swichMenu(index)">
@@ -103,7 +102,13 @@
 </template>
 
 <script>
-	import { mapMutations, mapActions, mapState, mapGetters } from 'vuex';
+	import {
+		mapMutations,
+		mapActions,
+		mapState,
+		mapGetters
+	} from 'vuex';
+	import jsonrpc from '@/shopro/request/indexJson.js';
 	export default {
 		components: {},
 		data() {
@@ -171,7 +176,12 @@
 			...mapActions(['getCartList', 'changeCartList', 'addCartGoods']),
 			// 跳转详情
 			toGoodDetail(id) {
-				this.$Router.push({ path: '/pages/goods/detail', query: { id: id } });
+				this.$Router.push({
+					path: '/pages/goods/detail',
+					query: {
+						id: id
+					}
+				});
 			},
 
 			// 百分比
@@ -197,10 +207,10 @@
 			// 获取分类
 			async getCategory() {
 				console.log("getCategory#@#@")
-			const tabbarData = await this.$jsonrpc('category.detail', {
+				const tabbarData = await jsonrpc('category.detail', {
 					id: this.categoryStyleId
 				});
-					
+
 				/* const tabbarData = await this.$http('category.detail', {
 					id: this.categoryStyleId
 				}); */
@@ -260,7 +270,9 @@
 					const query = uni.createSelectorQuery().in(this);
 					query
 						.select('.' + elClass)
-						.fields({ size: true }, res => {
+						.fields({
+							size: true
+						}, res => {
 							// 如果节点尚未生成，res值为null，循环调用执行
 							if (!res) {
 								setTimeout(() => {
@@ -313,7 +325,10 @@
 					confirmColor: '#f0c785',
 					content: `是否确认从购物车中删除此商品?`,
 					success: res => {
-						res.confirm && this.changeCartList({ ids: [cartGoodId], art: 'delete' });
+						res.confirm && this.changeCartList({
+							ids: [cartGoodId],
+							art: 'delete'
+						});
 					}
 				});
 			},
@@ -407,8 +422,8 @@
 		flex: 1;
 		display: flex;
 		overflow: hidden;
-	
-	// 左侧menu
+
+		// 左侧menu
 		.u-tab-view {
 			width: 200rpx;
 			height: 100%;
@@ -605,4 +620,4 @@
 			}
 		}
 	}
-</style>
+</style>
\ No newline at end of file
diff --git a/pages/index/category/three-catgory.vue b/pages/index/category/three-catgory.vue
index ce22ed4..b1f4fc7 100644
--- a/pages/index/category/three-catgory.vue
+++ b/pages/index/category/three-catgory.vue
@@ -3,7 +3,8 @@
 		<view class="u-flex u-col-center wrapper-box">
 			<view class="scroll-box" style="background-color: #F6F6F6;">
 				<scroll-view class="left u-flex-col u-col-center" enable-back-to-top scroll-y>
-					<view class="type-list u-ellipsis-1" :class="[{ 'list-active': listId == index }]" v-for="(item, index) in categoryData" :key="index" @tap="onType(index)">
+					<view class="type-list u-ellipsis-1" :class="[{ 'list-active': listId == index }]"
+						v-for="(item, index) in categoryData" :key="index" @tap="onType(index)">
 						<view class="line" :class="[{ 'line-active': listId == index }]"></view>
 						{{ item.name }}
 					</view>
@@ -13,18 +14,22 @@
 			<view style="height: 100%;width: 100%;">
 				<scroll-view scroll-y class="scroll-box" enable-back-to-top scroll-with-animation>
 					<view class="right" v-if="categoryData.length">
-						<image class="type-img" v-if="categoryData[listId].image" :src="categoryData[listId].image" mode="aspectFill"></image>
+						<image class="type-img" v-if="categoryData[listId].image" :src="categoryData[listId].image"
+							mode="aspectFill"></image>
 
 						<view class="item-list" v-for="(list, index1) in categoryData[listId].children" :key="index1">
 							<view class="type-box u-flex u-row-between u-col-center">
 								<text class="type-title">{{ list.name }}</text>
-								<view class="more u-flex u-col-center" @tap="jump('/pages/goods/list', { id: list.id })">
+								<view class="more u-flex u-col-center"
+									@tap="jump('/pages/goods/list', { id: list.id })">
 									<text>查看更多</text>
-									<view class="u-iconfont uicon-arrow-right" style="color: #999;font-size: 28rpx;"></view>
+									<view class="u-iconfont uicon-arrow-right" style="color: #999;font-size: 28rpx;">
+									</view>
 								</view>
 							</view>
 							<view class="item-box u-flex">
-								<view class="u-flex-col goods-item" @tap="jump('/pages/goods/list', { id: mlist.id })" v-for="(mlist, index2) in list.children" :key="index2">
+								<view class="u-flex-col goods-item" @tap="jump('/pages/goods/list', { id: mlist.id })"
+									v-for="(mlist, index2) in list.children" :key="index2">
 									<image class="item-img" lazy-load :src="mlist.image" mode="aspectFill"></image>
 									<view class="item-title u-ellipsis-1 ">{{ mlist.name }}</view>
 								</view>
@@ -32,11 +37,9 @@
 						</view>
 
 						<!-- 缺省页 -->
-						<shopro-empty
-							v-show="!categoryData[listId].children.length"
+						<shopro-empty v-show="!categoryData[listId].children.length"
 							:image="$IMG_URL + '/imgs/empty/empty_goods.png'"
-							tipText="暂无该商品，还有更多好货等着你噢~"
-						></shopro-empty>
+							tipText="暂无该商品，还有更多好货等着你噢~"></shopro-empty>
 						<view class="hack-tabbar"></view>
 					</view>
 				</scroll-view>
@@ -46,173 +49,179 @@
 </template>
 
 <script>
-import { mapMutations, mapActions, mapState, mapGetters } from 'vuex';
-export default {
-	components: {},
-	data() {
-		return {
-			listId: 0,
-			categoryData: {}
-		};
-	},
-	computed: {},
-	props: {
-		categoryStyleId: {
-			type: Number,
-			default: 0
-		}
-	},
-	async created() {
-		console.log('%c当前分类：三级分类', 'color:green;background:yellow');
-		await this.getCategory();
-	},
-	methods: {
-		getCategory() {
-			
-			this.$jsonrpc('category.info', {
-				id: this.categoryStyleId
-			}).then(res => {
-			
-				
-					this.categoryData = res.result.children;
-				
-			});
-			/* this.$http('category.detail', {
-				id: this.categoryStyleId
-			}).then(res => {
-				if (res.code === 1) {
-					this.categoryData = res.data.children;
-				}
-			}); */
+	import jsonrpc from "@/shopro/request/indexJson.js"
+	import {
+		mapMutations,
+		mapActions,
+		mapState,
+		mapGetters
+	} from 'vuex';
+	export default {
+		components: {},
+		data() {
+			return {
+				listId: 0,
+				categoryData: {}
+			};
 		},
-		onType(id) {
-			this.listId = id;
+		computed: {},
+		props: {
+			categoryStyleId: {
+				type: Number,
+				default: 0
+			}
+		},
+		async created() {
+			console.log('%c当前分类：三级分类', 'color:green;background:yellow');
+			await this.getCategory();
 		},
-		// 路由跳转
-		jump(path, parmas) {
-			this.$Router.push({
-				path: path,
-				query: parmas
-			});
+		methods: {
+			getCategory() {
+
+				jsonrpc('category.info', {
+					id: this.categoryStyleId
+				}).then(res => {
+
+					this.categoryData = res.result.children;
+
+				});
+				/* this.$http('category.detail', {
+					id: this.categoryStyleId
+				}).then(res => {
+					if (res.code === 1) {
+						this.categoryData = res.data.children;
+					}
+				}); */
+			},
+			onType(id) {
+				this.listId = id;
+			},
+			// 路由跳转
+			jump(path, parmas) {
+				this.$Router.push({
+					path: path,
+					query: parmas
+				});
+			}
 		}
-	}
-};
+	};
 </script>
 
 <style lang="scss">
-.hack-tabbar {
-	height: calc(100rpx + env(safe-area-inset-bottom) / 2);
-	width: 100%;
-}
-.content_box {
-	margin-top: 1upx;
-	display: flex;
-	flex-direction: column;
-	overflow: hidden;
-	height: 100%;
-}
-
-.wrapper-box {
-	flex: 1;
-	margin-top: 1upx;
-	height: 100%;
-}
-
-.scroll-box {
-	height: 100%;
-	flex: 1;
-	background: #fff;
-}
-
-.left {
-	width: 200upx;
-	height: 100%;
-	flex: 1;
-
-	.list-active {
-		background: #fff;
-		color: #333333 !important;
-		font-weight: bold !important;
+	.hack-tabbar {
+		height: calc(100rpx + env(safe-area-inset-bottom) / 2);
+		width: 100%;
 	}
 
-	.line-active {
-		background: #e6b873;
+	.content_box {
+		margin-top: 1upx;
+		display: flex;
+		flex-direction: column;
+		overflow: hidden;
+		height: 100%;
 	}
 
-	.type-list {
-		height: 84upx;
-		position: relative;
-		width: 200rpx;
-		padding-left: 16rpx;
-		line-height: 84rpx;
-		font-size: 28upx;
-		font-weight: 400;
-		color: rgba(102, 102, 102, 1);
-
-		.line {
-			width: 10upx;
-			height: 100%;
-			position: absolute;
-			left: 0;
-		}
+	.wrapper-box {
+		flex: 1;
+		margin-top: 1upx;
+		height: 100%;
 	}
-}
-
-.right {
-	padding: 0 30upx;
-	flex: 1;
-	height: 100%;
-
-	.type-img {
-		width: 505rpx;
-		height: 150rpx;
-		background: #ccc;
-		border-radius: 10rpx;
-		margin-top: 30rpx;
+
+	.scroll-box {
+		height: 100%;
+		flex: 1;
+		background: #fff;
 	}
 
-	.item-list {
-		.type-box {
-			height: 84rpx;
+	.left {
+		width: 200upx;
+		height: 100%;
+		flex: 1;
 
-			.type-title {
-				font-size: 28rpx;
-				font-weight: bold;
-			}
+		.list-active {
+			background: #fff;
+			color: #333333 !important;
+			font-weight: bold !important;
+		}
 
-			.more {
-				font-size: 26rpx;
-				color: #999;
+		.line-active {
+			background: #e6b873;
+		}
+
+		.type-list {
+			height: 84upx;
+			position: relative;
+			width: 200rpx;
+			padding-left: 16rpx;
+			line-height: 84rpx;
+			font-size: 28upx;
+			font-weight: 400;
+			color: rgba(102, 102, 102, 1);
+
+			.line {
+				width: 10upx;
+				height: 100%;
+				position: absolute;
+				left: 0;
 			}
 		}
+	}
 
-		.item-box {
-			flex-wrap: wrap;
+	.right {
+		padding: 0 30upx;
+		flex: 1;
+		height: 100%;
+
+		.type-img {
+			width: 505rpx;
+			height: 150rpx;
+			background: #ccc;
+			border-radius: 10rpx;
+			margin-top: 30rpx;
+		}
 
-			.goods-item {
-				margin-right: 20rpx;
-				margin-bottom: 20rpx;
+		.item-list {
+			.type-box {
+				height: 84rpx;
 
-				&:nth-child(3n) {
-					margin-right: 0;
+				.type-title {
+					font-size: 28rpx;
+					font-weight: bold;
 				}
 
-				.item-img {
-					width: 150rpx;
-					height: 150rpx;
-					background: #f5f5f5;
-					border-radius: 6rpx;
+				.more {
+					font-size: 26rpx;
+					color: #999;
 				}
+			}
 
-				.item-title {
-					font-size: 24rpx;
-					line-height: 24rpx;
-					margin-top: 10rpx;
-					width: 150rpx;
-					text-align: center;
+			.item-box {
+				flex-wrap: wrap;
+
+				.goods-item {
+					margin-right: 20rpx;
+					margin-bottom: 20rpx;
+
+					&:nth-child(3n) {
+						margin-right: 0;
+					}
+
+					.item-img {
+						width: 150rpx;
+						height: 150rpx;
+						background: #f5f5f5;
+						border-radius: 6rpx;
+					}
+
+					.item-title {
+						font-size: 24rpx;
+						line-height: 24rpx;
+						margin-top: 10rpx;
+						width: 150rpx;
+						text-align: center;
+					}
 				}
 			}
 		}
 	}
-}
-</style>
+</style>
\ No newline at end of file
diff --git a/pages/index/category/two-catgory.vue b/pages/index/category/two-catgory.vue
index d0f8880..14a509e 100644
--- a/pages/index/category/two-catgory.vue
+++ b/pages/index/category/two-catgory.vue
@@ -3,14 +3,10 @@
 		<view class="u-flex u-col-center wrapper-box">
 			<view class="scroll-box" style="background-color: #F6F6F6;">
 				<scroll-view class="left u-flex-col u-col-center" enable-back-to-top scroll-y>
-					<view
-						class="type-list u-flex u-col-center"
-						:class="[{ 'list-active': listId == index }]"
-						v-for="(item, index) in categoryData"
-						:key="index"
-						@tap="onType(index)"
-					>
-						<view class="u-ellipsis-1  list-item" :class="[{ 'line-active': listId == index }]">{{ item.name }}</view>
+					<view class="type-list u-flex u-col-center" :class="[{ 'list-active': listId == index }]"
+						v-for="(item, index) in categoryData" :key="index" @tap="onType(index)">
+						<view class="u-ellipsis-1  list-item" :class="[{ 'line-active': listId == index }]">
+							{{ item.name }}</view>
 					</view>
 					<view class="hack-tabbar"></view>
 				</scroll-view>
@@ -18,7 +14,8 @@
 			<view style="height: 100%;width: 100%;">
 				<scroll-view scroll-y class="scroll-box" enable-back-to-top scroll-with-animation>
 					<view class="right" v-if="categoryData.length">
-						<image class="type-img" v-if="categoryData[listId].image" :src="categoryData[listId].image" lazy-load mode="aspectFill"></image>
+						<image class="type-img" v-if="categoryData[listId].image" :src="categoryData[listId].image"
+							lazy-load mode="aspectFill"></image>
 						<view class="type-box u-flex u-col-center u-row-center">
 							<view class="u-iconfont uicon-minus" style="color: #d3d3d3;font-size: 28rpx;"></view>
 							<text class="type-title">{{ categoryData[listId].name }}</text>
@@ -26,24 +23,18 @@
 						</view>
 						<view class="item-list">
 							<view class="item-box u-flex">
-								<view
-									class="u-flex-col u-col-center goods-item"
+								<view class="u-flex-col u-col-center goods-item"
 									@tap="jump('/pages/goods/list', { id: list.id })"
-									v-for="(list, index1) in categoryData[listId].children"
-									:key="index1"
-								>
+									v-for="(list, index1) in categoryData[listId].children" :key="index1">
 									<image class="item-img" lazy-load :src="list.image" mode="aspectFill"></image>
 									<view class="item-title u-ellipsis-1 ">{{ list.name }}</view>
 								</view>
 							</view>
 
 							<!-- 缺省页 -->
-							<shopro-empty
-								v-show="!categoryData[listId].children.length"
-								:image="$IMG_URL + '/imgs/empty/empty_goods.png'"
-								marginTop="200rpx"
-								tipText="暂无该商品，还有更多好货等着你噢~"
-							></shopro-empty>
+							<shopro-empty v-show="!categoryData[listId].children.length"
+								:image="$IMG_URL + '/imgs/empty/empty_goods.png'" marginTop="200rpx"
+								tipText="暂无该商品，还有更多好货等着你噢~"></shopro-empty>
 							<view class="hack-tabbar"></view>
 						</view>
 					</view>
@@ -54,168 +45,179 @@
 </template>
 
 <script>
-import { mapMutations, mapActions, mapState, mapGetters } from 'vuex';
-export default {
-	components: {},
-	data() {
-		return {
-			listId: 0,
-			categoryData: {}
-		};
-	},
-	computed: {},
-	props: {
-		categoryStyleId: {
-			type: Number,
-			default: 0
-		}
-	},
-	created() {
-		console.log('%c当前分类：二级分类', 'color:green;background:yellow');
-		this.getCategory();
-	},
-	methods: {
-		getCategory() {
-			console.log("getCategory333")
-			this.$jsonrpc('category.detail', {
-				id: this.categoryStyleId
-			}).then(res => {
-				
-					this.categoryData = res.result.children;
-				
-			});
-			/* this.$http('category.detail', {
-				id: this.categoryStyleId
-			}).then(res => {
-				if (res.code === 1) {
-					this.categoryData = res.data.children;
-				}
-			}); */
+	import {
+		mapMutations,
+		mapActions,
+		mapState,
+		mapGetters
+	} from 'vuex';
+	import jsonrpc from '@/shopro/request/indexJson.js';
+	export default {
+		components: {},
+		data() {
+			return {
+				listId: 0,
+				categoryData: {}
+			};
 		},
-		onType(id) {
-			this.listId = id;
+		computed: {},
+		props: {
+			categoryStyleId: {
+				type: Number,
+				default: 0
+			}
 		},
-		// 路由跳转
-		jump(path, parmas) {
-			this.$Router.push({
-				path: path,
-				query: parmas
-			});
+		created() {
+			console.log('%c当前分类：二级分类', 'color:green;background:yellow');
+			this.getCategory();
+		},
+		methods: {
+			getCategory() {
+
+				jsonrpc('category.detail', {
+					id: this.categoryStyleId
+				}).then(res => {
+
+					this.categoryData = res.result.children;
+
+				});
+				/* this.$http('category.detail', {
+					id: this.categoryStyleId
+				}).then(res => {
+					if (res.code === 1) {
+						this.categoryData = res.data.children;
+					}
+				}); */
+			},
+			onType(id) {
+				this.listId = id;
+			},
+			// 路由跳转
+			jump(path, parmas) {
+				this.$Router.push({
+					path: path,
+					query: parmas
+				});
+			}
 		}
-	}
-};
+	};
 </script>
 
 <style lang="scss">
-.hack-tabbar {
-	height: calc(100rpx + env(safe-area-inset-bottom) / 2);
-	width: 100%;
-}
-.content_box {
-	display: flex;
-	flex-direction: column;
-	overflow: hidden;
-	height: 100%;
-}
-
-.wrapper-box {
-	flex: 1;
-	margin-top: 1upx;
-	height: 100%;
-}
-
-.scroll-box {
-	height: 100%;
-	flex: 1;
-	background: #fff;
-}
-
-.left {
-	width: 200upx;
-	height: 100%;
-	flex: 1;
-
-	.list-active {
-		background: #fff;
-		color: #ffff !important;
-	}
-	.list-item {
-		width: 180rpx;
-		height: 64rpx;
-		line-height: 64rpx;
-		padding-left: 14rpx;
+	.hack-tabbar {
+		height: calc(100rpx + env(safe-area-inset-bottom) / 2);
+		width: 100%;
 	}
-	.line-active {
-		width: 180rpx;
-		height: 64rpx;
-		background: #e6b873;
-		border-radius: 0rpx 32rpx 32rpx 0rpx;
-		color: #fff;
+
+	.content_box {
+		display: flex;
+		flex-direction: column;
+		overflow: hidden;
+		height: 100%;
 	}
 
-	.type-list {
-		height: 100rpx;
-		position: relative;
-		width: 200rpx;
-		font-size: 28upx;
-		font-weight: 400;
-		color: rgba(102, 102, 102, 1);
+	.wrapper-box {
+		flex: 1;
+		margin-top: 1upx;
+		height: 100%;
 	}
-}
-
-.right {
-	padding: 0 30upx;
-	flex: 1;
-	height: 100%;
-
-	.type-img {
-		width: 505rpx;
-		height: 150rpx;
-		background: #ccc;
-		margin-top: 30rpx;
-		border-radius: 10rpx;
+
+	.scroll-box {
+		height: 100%;
+		flex: 1;
+		background: #fff;
 	}
-	.type-box {
-		height: 84rpx;
 
-		.type-title {
-			font-size: 28rpx;
-			font-weight: bold;
-			padding: 0 16rpx;
+	.left {
+		width: 200upx;
+		height: 100%;
+		flex: 1;
+
+		.list-active {
+			background: #fff;
+			color: #ffff !important;
+		}
+
+		.list-item {
+			width: 180rpx;
+			height: 64rpx;
+			line-height: 64rpx;
+			padding-left: 14rpx;
+		}
+
+		.line-active {
+			width: 180rpx;
+			height: 64rpx;
+			background: #e6b873;
+			border-radius: 0rpx 32rpx 32rpx 0rpx;
+			color: #fff;
 		}
-		.more {
-			font-size: 26rpx;
-			color: #999;
+
+		.type-list {
+			height: 100rpx;
+			position: relative;
+			width: 200rpx;
+			font-size: 28upx;
+			font-weight: 400;
+			color: rgba(102, 102, 102, 1);
 		}
 	}
 
-	.item-list {
-		.item-box {
-			flex-wrap: wrap;
+	.right {
+		padding: 0 30upx;
+		flex: 1;
+		height: 100%;
+
+		.type-img {
+			width: 505rpx;
+			height: 150rpx;
+			background: #ccc;
+			margin-top: 30rpx;
+			border-radius: 10rpx;
+		}
 
-			.goods-item {
-				margin-right: 20rpx;
-				margin-bottom: 20rpx;
+		.type-box {
+			height: 84rpx;
 
-				&:nth-child(3n) {
-					margin-right: 0;
-				}
+			.type-title {
+				font-size: 28rpx;
+				font-weight: bold;
+				padding: 0 16rpx;
+			}
 
-				.item-img {
-					width: 150rpx;
-					height: 150rpx;
-					border-radius: 6rpx;
-					background: #f5f5f5;
-				}
+			.more {
+				font-size: 26rpx;
+				color: #999;
+			}
+		}
 
-				.item-title {
-					font-size: 24rpx;
-					margin-top: 10rpx;
-					width: 150rpx;
-					text-align: center;
+		.item-list {
+			.item-box {
+				flex-wrap: wrap;
+
+				.goods-item {
+					margin-right: 20rpx;
+					margin-bottom: 20rpx;
+
+					&:nth-child(3n) {
+						margin-right: 0;
+					}
+
+					.item-img {
+						width: 150rpx;
+						height: 150rpx;
+						border-radius: 6rpx;
+						background: #f5f5f5;
+					}
+
+					.item-title {
+						font-size: 24rpx;
+						margin-top: 10rpx;
+						width: 150rpx;
+						text-align: center;
+					}
 				}
 			}
 		}
 	}
-}
-</style>
+</style>
\ No newline at end of file
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 728ead7..1b6d473 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -154,7 +154,7 @@ export default {
 		};
 	},
 	computed: {
-		...mapGetters(['initShop', 'homeTemplate', 'hasTemplate', 'isLogin']),
+		...mapGetters(['getCartListJson','initShop', 'homeTemplate', 'hasTemplate', 'isLogin']),
 		// 头部模块数据
 		headSwiperList() {
 			if (this.homeTemplate?.length) {
@@ -177,7 +177,8 @@ export default {
 	onShow() {
 		let that = this;
 		this.enable = true;
-		this.isLogin && this.getCartList();
+		// this.isLogin && this.getCartList();
+		this.isLogin && this.getCartListJson();
 		// 网络变化检测
 		uni.onNetworkStatusChange(res => {
 			this.isConnected = res.isConnected;
diff --git a/pages/index/user.vue b/pages/index/user.vue
index e18f843..183df8f 100644
--- a/pages/index/user.vue
+++ b/pages/index/user.vue
@@ -107,21 +107,23 @@ export default {
 	onShow() {
 		if (this.isLogin) {
 			this.init();
-			this.getUserData();
+			// this.getUserData();
 		}
 		this.enable = true;
 	},
 
 	methods: {
-		...mapActions(['getUserInfo', 'showAuthModal', 'getUserData']),
+		...mapActions(['getUserInfoJson','getUserInfo', 'showAuthModal', 'getUserData']),
 		onShare() {
 			this.showShare = true;
 			uni.hideTabBar();
 		},
 		// 初始化
 		init() {
-			this.getUserInfo()
+			this.getUserInfoJson()
+			// this.getUserInfo()
 				.then(res => {
+					
 					uni.stopPullDownRefresh();
 				})
 				.catch(e => {
diff --git a/pages/index/user/userinfo-card.vue b/pages/index/user/userinfo-card.vue
index 4c65ebf..4d5a36c 100644
--- a/pages/index/user/userinfo-card.vue
+++ b/pages/index/user/userinfo-card.vue
@@ -81,6 +81,7 @@
  */
 import { mapMutations, mapActions, mapState, mapGetters } from 'vuex';
 import wechat from '@/shopro/wechat/wechat';
+import jsonrpc from '@/shopro/request/indexJson.js'
 export default {
 	components: {},
 	data() {
@@ -126,7 +127,7 @@ export default {
 		}
 	},
 	methods: {
-		...mapActions(['getUserInfo', 'showAuthModal']),
+		...mapActions(['getUserInfoJson','getUserInfo', 'showAuthModal']),
 		jump(path, query) {
 			this.$Router.push({
 				path: path,
@@ -141,7 +142,8 @@ export default {
 		async refreshWechatUser() {
 			this.showModal = false;
 			let token = await wechat.refresh();
-			token && this.getUserInfo(token);
+			token && this.getUserInfoJson(token);
+			// token && this.getUserInfo(token);
 		},
 		// 跳转门店
 		goStore() {
diff --git a/pages/order/confirm.vue b/pages/order/confirm.vue
index dc14bd5..4e5ad35 100644
--- a/pages/order/confirm.vue
+++ b/pages/order/confirm.vue
@@ -1,2059 +1,1859 @@
 <!-- 确认订单 -->
 <template>
-  <view class="order-wrap">
-    <!-- 地址栏 -->
-    <view
-      class="head_box"
-      v-if="orderPre.need_address"
-      @tap="jump('/pages/user/address/list', { from: 'order' })"
-    >
-      <view class="add-address-box u-flex u-flex-1" v-if="!addressId">
-        <view class="box-bg u-p-30 u-flex-1 u-flex u-row-between">
-          <text class="select-notice">请选择收货地址</text>
-          <text
-            class="u-iconfont uicon-arrow-right"
-            style="color: #bfbfbf"
-          ></text>
-        </view>
-      </view>
-      <view class="add-address-box u-p-30" v-else>
-        <view class="top u-flex">
-          <text class="name">{{ addressData.consignee }}</text>
-          <text class="phone">{{ addressData.phone }}</text>
-          <text class="tag" v-show="addressData.is_default == 1">默认</text>
-        </view>
-        <view class="detail u-flex u-row-between">
-          <view class="address">
-            {{ addressData.province_name }}{{ addressData.city_name
+	<view class="order-wrap">
+		<!-- 地址栏 -->
+		<view class="head_box" v-if="orderPre.need_address" @tap="jump('/pages/user/address/list', { from: 'order' })">
+			<view class="add-address-box u-flex u-flex-1" v-if="!addressId">
+				<view class="box-bg u-p-30 u-flex-1 u-flex u-row-between">
+					<text class="select-notice">请选择收货地址</text>
+					<text class="u-iconfont uicon-arrow-right" style="color: #bfbfbf"></text>
+				</view>
+			</view>
+			<view class="add-address-box u-p-30" v-else>
+				<view class="top u-flex">
+					<text class="name">{{ addressData.consignee }}</text>
+					<text class="phone">{{ addressData.phone }}</text>
+					<text class="tag" v-show="addressData.is_default == 1">默认</text>
+				</view>
+				<view class="detail u-flex u-row-between">
+					<view class="address">
+						{{ addressData.province_name }}{{ addressData.city_name
             }}{{ addressData.area_name }}{{ addressData.address }}
-          </view>
-          <text
-            class="u-iconfont uicon-arrow-right"
-            style="color: #bfbfbf"
-          ></text>
-        </view>
-      </view>
-    </view>
-
-    <view class="u-m-b-10">
-      <!-- 确认订单商品卡片 -->
-      <view class="goods-list" v-for="g in perGoodsList" :key="g.sku_price_id">
-        <view class="goods-card u-p-30">
-          <shopro-mini-card :title="g.detail.title" :image="g.detail.image">
-            <template #describe>
-              <view class="order-sku u-ellipsis-1">
-                <text class="order-num">
-                  {{
+					</view>
+					<text class="u-iconfont uicon-arrow-right" style="color: #bfbfbf"></text>
+				</view>
+			</view>
+		</view>
+
+		<view class="u-m-b-10">
+			<!-- 确认订单商品卡片 -->
+			<view class="goods-list" v-for="g in perGoodsList" :key="g.sku_price_id">
+				<view class="goods-card u-p-30">
+					<shopro-mini-card :title="g.detail.title" :image="g.detail.image">
+						<template #describe>
+							<view class="order-sku u-ellipsis-1">
+								<text class="order-num">
+									{{
                     g.detail.current_sku_price &&
                     g.detail.current_sku_price.goods_sku_text
                       ? g.detail.current_sku_price.goods_sku_text
                       : ""
                   }}
-                </text>
-              </view>
-            </template>
-            <template #cardBottom>
-              <view class="goods-price u-flex u-row-between">
-                <view class="">
-                  <text v-show="orderType === 'score'"
-                    >{{ g.detail.current_sku_price.score }}积分+</text
-                  >
-                  <text>￥{{ g.detail.current_sku_price.price }}</text>
-                </view>
-                <text class="goods-num">x{{ g.goods_num }}</text>
-              </view>
-            </template>
-          </shopro-mini-card>
-        </view>
-
-        <!-- 配送方式 -->
-        <view
-          class="logistic item-list u-flex u-row-between"
-          @tap="onSelExpressType(g)"
-        >
-          <view class="item-title">配送方式</view>
-          <view class="u-flex">
-            <view class="detail">{{ getCurGoodsExpress(g) }}</view>
-            <text
-              class="u-iconfont uicon-arrow-right"
-              style="color: #bfbfbf"
-            ></text>
-          </view>
-        </view>
-      </view>
-
-      <block v-if="perGoodsList.length">
-        <!-- 备注 -->
-        <view class="remark-box u-flex item-list u-p-30">
-          <view class="item-title">备注</view>
-          <input
-            class="item-input"
-            placeholder-class="input-pl"
-            type="text"
-            v-model="remark"
-            placeholder="建议留言前先于卖家沟通确认"
-          />
-        </view>
-
-        <!-- 选择优惠券 -->
-        <sh-select-coupon
-          v-if="hasCoupons"
-          :couponList="couponList"
-          @change="selectCoupon"
-        ></sh-select-coupon>
-
-        <!-- 积分 -->
-        <view
-          class="score item-list u-flex u-row-between"
-          v-show="orderType === 'score'"
-        >
-          <view class="u-flex"><text class="item-title">积分</text></view>
-          <view class="price">-{{ orderPre.score_amount || 0 }}积分</view>
-        </view>
-        <!-- 金额明细 -->
-        <view class="u-flex u-row-between item-list border-top u-m-b-10">
-          <view class="item-title">商品金额</view>
-          <view class="u-flex">
-            <text class="price">￥{{ orderPre.goods_amount || "0.00" }}</text>
-          </view>
-        </view>
-
-        <!-- 活动优惠 -->
-        <u-collapse
-          v-if="
+								</text>
+							</view>
+						</template>
+						<template #cardBottom>
+							<view class="goods-price u-flex u-row-between">
+								<view class="">
+									<text v-show="orderType === 'score'">
+										{{ g.detail.current_sku_price && g.detail.current_sku_price.score ? g.detail.current_sku_price.score + '积分+' : '' }}
+										<!-- 	{{ g.detail.current_sku_price.score }}积分+ --></text>
+									<text>￥<!-- {{ g.detail.current_sku_price.price }} -->
+										<!-- {{ g.detail.current_sku_price && g.detail.current_sku_price.price ? g.detail.current_sku_price.price : '0.00' }} -->
+										{{ g.pay_price && g.pay_price ? g.pay_price : '0.00' }}
+									</text>
+								</view>
+								<text class="goods-num">x{{ g.goods_num }}</text>
+							</view>
+						</template>
+					</shopro-mini-card>
+				</view>
+
+				<!-- 配送方式 -->
+				<view class="logistic item-list u-flex u-row-between" @tap="onSelExpressType(g)">
+					<view class="item-title">配送方式</view>
+					<view class="u-flex">
+						<view class="detail">{{ getCurGoodsExpress(g) }}</view>
+						<text class="u-iconfont uicon-arrow-right" style="color: #bfbfbf"></text>
+					</view>
+				</view>
+			</view>
+
+			<block v-if="perGoodsList.length">
+				<!-- 备注 -->
+				<view class="remark-box u-flex item-list u-p-30">
+					<view class="item-title">备注</view>
+					<input class="item-input" placeholder-class="input-pl" type="text" v-model="remark"
+						placeholder="建议留言前先于卖家沟通确认" />
+				</view>
+
+				<!-- 选择优惠券 -->
+				<sh-select-coupon v-if="hasCoupons" :couponList="couponList" @change="selectCoupon"></sh-select-coupon>
+
+				<!-- 积分 -->
+				<view class="score item-list u-flex u-row-between" v-show="orderType === 'score'">
+					<view class="u-flex"><text class="item-title">积分</text></view>
+					<view class="price">-{{ orderPre.score_amount || 0 }}积分</view>
+				</view>
+				<!-- 金额明细 -->
+				<view class="u-flex u-row-between item-list border-top u-m-b-10">
+					<view class="item-title">商品金额</view>
+					<view class="u-flex">
+						<text class="price">￥{{ orderPre.goods_amount || "0.00" }}</text>
+					</view>
+				</view>
+
+				<!-- 活动优惠 -->
+				<u-collapse v-if="
             orderPre.activity_discount_infos &&
             orderPre.activity_discount_infos.length &&
             Number(orderPre.activity_discount_money)
-          "
-          event-type="close"
-          :arrow="true"
-          :accordion="true"
-          arrowColor="#bfbfbf"
-          :head-style="{ background: '#fff', height: '100rpx' }"
-        >
-          <u-collapse-item>
-            <block slot="title">
-              <view
-                style="width: 680rpx; padding-right: 0"
-                class="u-flex u-row-between item-list"
-              >
-                <view class="item-title">活动优惠</view>
-                <view class="u-flex">
-                  <text class="price" style="margin-right: 0"
-                    >-￥{{ orderPre.activity_discount_money || "0.00" }}</text
-                  >
-                </view>
-              </view>
-            </block>
-            <view
-              class=""
-              v-for="item in orderPre.activity_discount_infos"
-              :key="item.activity_id"
-            >
-              <view
-                class="u-flex u-row-between item-list"
-                v-if="item.activity_type !== 'free_shipping'"
-              >
-                <view class="item-title">{{ item.activity_title }}</view>
-                <view class="u-flex">
-                  <text class="price" style="color: #666"
-                    >-￥{{ item.activity_discount_money || "0.00" }}</text
-                  >
-                </view>
-              </view>
-            </view>
-          </u-collapse-item>
-        </u-collapse>
-        <!-- 价格 -->
-        <view class="price-box u-flex u-row-between item-list">
-          <view class="item-title u-flex u-col-center">
-            <view class="u-m-r-10">运费</view>
-            <view
-              class="activity-title"
-              v-if="Number(orderPre.dispatch_discount_money) > 0"
-              >活动减￥ {{ orderPre.dispatch_discount_money }}</view
-            >
-          </view>
-          <view class="u-flex">
-            <text
-              class="origin-price u-m-r-10"
-              v-if="Number(orderPre.dispatch_discount_money) > 0"
-              >-￥{{ orderPre.dispatch_amount }}</text
-            >
-            <text class="price"
-              >￥{{
+          " event-type="close" :arrow="true" :accordion="true" arrowColor="#bfbfbf"
+					:head-style="{ background: '#fff', height: '100rpx' }">
+					<u-collapse-item>
+						<block slot="title">
+							<view style="width: 680rpx; padding-right: 0" class="u-flex u-row-between item-list">
+								<view class="item-title">活动优惠</view>
+								<view class="u-flex">
+									<text class="price"
+										style="margin-right: 0">-￥{{ orderPre.activity_discount_money || "0.00" }}</text>
+								</view>
+							</view>
+						</block>
+						<view class="" v-for="item in orderPre.activity_discount_infos" :key="item.activity_id">
+							<view class="u-flex u-row-between item-list" v-if="item.activity_type !== 'free_shipping'">
+								<view class="item-title">{{ item.activity_title }}</view>
+								<view class="u-flex">
+									<text class="price"
+										style="color: #666">-￥{{ item.activity_discount_money || "0.00" }}</text>
+								</view>
+							</view>
+						</view>
+					</u-collapse-item>
+				</u-collapse>
+				<!-- 价格 -->
+				<view class="price-box u-flex u-row-between item-list">
+					<view class="item-title u-flex u-col-center">
+						<view class="u-m-r-10">运费</view>
+						<view class="activity-title" v-if="Number(orderPre.dispatch_discount_money) > 0">活动减￥
+							{{ orderPre.dispatch_discount_money }}
+						</view>
+					</view>
+					<view class="u-flex">
+						<text class="origin-price u-m-r-10"
+							v-if="Number(orderPre.dispatch_discount_money) > 0">-￥{{ orderPre.dispatch_amount }}</text>
+						<text class="price">￥{{
                 Number(orderPre.dispatch_amount) -
                   Number(orderPre.dispatch_discount_money) || "0.00"
-              }}</text
-            >
-          </view>
-        </view>
-
-        <!-- 发票 -->
-        <view
-          v-if="orderPre && Number(orderPre.invoice_amount)"
-          class="u-flex u-row-between item-list u-p-20 border-top"
-        >
-          <view class="item-title">申请发票</view>
-          <view class="u-flex u-col-center" @tap="onInvoice">
-            <text
-              class="selected-invoice"
-              style="font-size: 28rpx; color: #c4c4c4"
-              >{{ selectedInvoice }}</text
-            >
-            <text
-              class="u-iconfont uicon-arrow-right"
-              style="color: #bfbfbf"
-            ></text>
-          </view>
-        </view>
-      </block>
-    </view>
-
-    <!-- 底部 -->
-    <view class="foot-box-wrap">
-      <view class="foot-box u-flex u-row-between safe-area-inset-bottom">
-        <view class="u-flex">
-          <text class="num">共{{ totalNum }}件</text>
-          <view class="all-money">
-            <text>合计：</text>
-            <text class="price">￥{{ orderPre.total_fee || "0.00" }}</text>
-          </view>
-        </view>
-        <button
-          class="cu-btn sub-btn"
-          @tap="subOrder"
-          :disabled="isDisabled"
-          hover-class="btn-hover"
-        >
-          提交订单
-        </button>
-      </view>
-    </view>
-
-    <!-- 发票弹窗 -->
-    <u-popup
-      v-model="showInvoice"
-      @close="showInvoice = false"
-      safe-area-inset-bottom
-      mode="bottom"
-      :closeable="false"
-      border-radius="20"
-    >
-      <view class="invoice-modal page_box">
-        <view class="invoice-head u-flex u-col-center">
-          <view
-            class="head-nav u-flex u-col-center u-row-center"
-            @tap="changeInvoiceType('person')"
-          >
-            <text
-              class="nav-title"
-              :class="{ 'nav-title--active': invoiceType === 'person' }"
-              >个人</text
-            >
-            <view
-              v-show="invoiceType === 'person'"
-              class="head-nav--active"
-            ></view>
-          </view>
-          <view
-            class="head-nav u-flex u-col-center u-row-center"
-            @tap="changeInvoiceType('company')"
-          >
-            <text
-              class="nav-title"
-              :class="{ 'nav-title--active': invoiceType === 'company' }"
-              >企/事业单位</text
-            >
-            <view
-              v-show="invoiceType === 'company'"
-              class="head-nav--active"
-            ></view>
-          </view>
-        </view>
-        <view class="invoice-content content_box">
-          <u-form
-            :labelStyle="{
+              }}</text>
+					</view>
+				</view>
+
+				<!-- 发票 -->
+				<view v-if="orderPre && Number(orderPre.invoice_amount)"
+					class="u-flex u-row-between item-list u-p-20 border-top">
+					<view class="item-title">申请发票</view>
+					<view class="u-flex u-col-center" @tap="onInvoice">
+						<text class="selected-invoice"
+							style="font-size: 28rpx; color: #c4c4c4">{{ selectedInvoice }}</text>
+						<text class="u-iconfont uicon-arrow-right" style="color: #bfbfbf"></text>
+					</view>
+				</view>
+			</block>
+		</view>
+
+		<!-- 底部 -->
+		<view class="foot-box-wrap">
+			<view class="foot-box u-flex u-row-between safe-area-inset-bottom">
+				<view class="u-flex">
+					<text class="num">共{{ totalNum }}件</text>
+					<view class="all-money">
+						<text>合计：</text>
+						<text class="price">￥{{ orderPre.total_fee || "0.00" }}</text>
+					</view>
+				</view>
+				<button class="cu-btn sub-btn" @tap="subOrder" :disabled="isDisabled" hover-class="btn-hover">
+					提交订单
+				</button>
+			</view>
+		</view>
+
+		<!-- 发票弹窗 -->
+		<u-popup v-model="showInvoice" @close="showInvoice = false" safe-area-inset-bottom mode="bottom"
+			:closeable="false" border-radius="20">
+			<view class="invoice-modal page_box">
+				<view class="invoice-head u-flex u-col-center">
+					<view class="head-nav u-flex u-col-center u-row-center" @tap="changeInvoiceType('person')">
+						<text class="nav-title" :class="{ 'nav-title--active': invoiceType === 'person' }">个人</text>
+						<view v-show="invoiceType === 'person'" class="head-nav--active"></view>
+					</view>
+					<view class="head-nav u-flex u-col-center u-row-center" @tap="changeInvoiceType('company')">
+						<text class="nav-title"
+							:class="{ 'nav-title--active': invoiceType === 'company' }">企/事业单位</text>
+						<view v-show="invoiceType === 'company'" class="head-nav--active"></view>
+					</view>
+				</view>
+				<view class="invoice-content content_box">
+					<u-form :labelStyle="{
               'font-size': '28rpx',
               'font-weight': '600',
               color: '#595959',
               'padding-left': '20rpx',
-            }"
-            label-position="left"
-            :model="invoiceForm.model"
-            :rules="invoiceForm.rules"
-            ref="invoiceRef"
-            :errorType="['toast']"
-          >
-            <u-form-item
-              class="u-p-r-20"
-              label-width="150"
-              label="名称:"
-              prop="header_name"
-            >
-              <u-input
-                placeholder="请填写名称"
-                v-model="invoiceForm.model.header_name"
-                type="text"
-              ></u-input>
-            </u-form-item>
-            <u-form-item
-              class="u-p-r-20"
-              v-if="invoiceType === 'company'"
-              label-width="220"
-              label="纳税人识别号:"
-              prop="tax_no"
-            >
-              <u-input
-                placeholder="请输入纳税人识别号"
-                v-model="invoiceForm.model.tax_no"
-                type="text"
-              ></u-input>
-            </u-form-item>
-            <u-form-item
-              class="u-p-r-20"
-              label-width="150"
-              label="手机号:"
-              prop="mobile"
-            >
-              <u-input
-                placeholder="请输入填写手机号"
-                v-model="invoiceForm.model.mobile"
-                type="number"
-              ></u-input>
-            </u-form-item>
-          </u-form>
-        </view>
-        <view class="invoice-foot">
-          <view class="invoite-price u-flex u-col-center u-row-center u-m-b-40">
-            <text class="price-title">可开票金额：</text>
-            <text class="price-num">{{ orderPre.invoice_amount }}元</text>
-          </view>
-          <view class="u-flex u-col-center u-row-around u-p-b-30">
-            <button class="cancel-btn u-reset-button" @tap="cancelInvoice">
-              取消
-            </button>
-            <button class="save-btn u-reset-button" @tap="saveInvoice">
-              确定
-            </button>
-          </view>
-        </view>
-      </view>
-    </u-popup>
-
-    <!-- 配送方式弹窗 -->
-    <u-popup
-      v-model="showExpressType"
-      @close="showExpressType = false"
-      safe-area-inset-bottom
-      mode="bottom"
-      :closeable="false"
-      border-radius="20"
-    >
-      <!-- 配送方式tab-->
-      <view class="express-type page_box">
-        <view class="express-type__head head-box u-flex u-col-center">
-          <view
-            class="express-type__head-nav u-flex u-col-center u-row-center"
-            v-for="(nav, index) in expressType"
-            :key="nav.id"
-            @tap="changeExpressType(nav.value)"
-            v-if="inExpressType.includes(nav.value)"
-          >
-            <text
-              class="head-nav__title"
-              :class="{
+            }" label-position="left" :model="invoiceForm.model" :rules="invoiceForm.rules" ref="invoiceRef"
+						:errorType="['toast']">
+						<u-form-item class="u-p-r-20" label-width="150" label="名称:" prop="header_name">
+							<u-input placeholder="请填写名称" v-model="invoiceForm.model.header_name" type="text"></u-input>
+						</u-form-item>
+						<u-form-item class="u-p-r-20" v-if="invoiceType === 'company'" label-width="220" label="纳税人识别号:"
+							prop="tax_no">
+							<u-input placeholder="请输入纳税人识别号" v-model="invoiceForm.model.tax_no" type="text"></u-input>
+						</u-form-item>
+						<u-form-item class="u-p-r-20" label-width="150" label="手机号:" prop="mobile">
+							<u-input placeholder="请输入填写手机号" v-model="invoiceForm.model.mobile" type="number"></u-input>
+						</u-form-item>
+					</u-form>
+				</view>
+				<view class="invoice-foot">
+					<view class="invoite-price u-flex u-col-center u-row-center u-m-b-40">
+						<text class="price-title">可开票金额：</text>
+						<text class="price-num">{{ orderPre.invoice_amount }}元</text>
+					</view>
+					<view class="u-flex u-col-center u-row-around u-p-b-30">
+						<button class="cancel-btn u-reset-button" @tap="cancelInvoice">
+							取消
+						</button>
+						<button class="save-btn u-reset-button" @tap="saveInvoice">
+							确定
+						</button>
+					</view>
+				</view>
+			</view>
+		</u-popup>
+
+		<!-- 配送方式弹窗 -->
+		<u-popup v-model="showExpressType" @close="showExpressType = false" safe-area-inset-bottom mode="bottom"
+			:closeable="false" border-radius="20">
+			<!-- 配送方式tab-->
+			<view class="express-type page_box">
+				<view class="express-type__head head-box u-flex u-col-center">
+					<view class="express-type__head-nav u-flex u-col-center u-row-center"
+						v-for="(nav, index) in expressType" :key="nav.id" @tap="changeExpressType(nav.value)"
+						v-if="inExpressType.includes(nav.value)">
+						<text class="head-nav__title" :class="{
                 'head-nav__title--active': expressTypeCur === nav.value,
-              }"
-              >{{ nav.title }}</text
-            >
-            <view
-              :class="expressClass"
-              v-show="expressTypeCur === nav.value"
-            ></view>
-          </view>
-        </view>
-        <view class="express-type__content content_box">
-          <!-- 快递 -->
-          <!-- 空 -->
-          <view
-            class="empty-address u-flex u-col-center"
-            v-if="
+              }">{{ nav.title }}</text>
+						<view :class="expressClass" v-show="expressTypeCur === nav.value"></view>
+					</view>
+				</view>
+				<view class="express-type__content content_box">
+					<!-- 快递 -->
+					<!-- 空 -->
+					<view class="empty-address u-flex u-col-center" v-if="
               !addressId &&
               expressTypeCur !== 'selfetch' &&
               expressTypeCur !== 'autosend'
-            "
-            @tap="jump('/pages/user/address/list', { from: 'order' })"
-          >
-            请选择收货地址
-
-            <text
-              class="u-iconfont uicon-arrow-right"
-              style="color: #999"
-            ></text>
-          </view>
-          <!-- 地址 -->
-          <view
-            class="express-address"
-            v-if="expressTypeCur == 'express' && addressId"
-          >
-            <view
-              class="express-top u-flex u-row-between"
-              @tap="jump('/pages/user/address/list', { from: 'order' })"
-            >
-              <view class="u-flex">
-                <text
-                  class="tag"
-                  style="white-space: nowrap"
-                  v-show="addressData.is_default == 1"
-                  >默认</text
-                >
-                <text class="address"
-                  >{{ addressData.province_name }}{{ addressData.city_name
-                  }}{{ addressData.area_name }}{{ addressData.address }}</text
-                >
-                <view class="address-guide"
-                  ><text
-                    class="u-iconfont uicon-arrow-right"
-                    style="color: #bfbfbf"
-                  ></text
-                ></view>
-              </view>
-
-              <view class="address-location u-flex-col u-col-center">
-                <image
-                  class="location-img"
-                  :src="$IMG_URL + '/imgs/order/e0.png'"
-                  mode=""
-                ></image>
-                <text class="location-text">物流快递</text>
-              </view>
-            </view>
-            <view class="express-content">
-              <view class="phone-box1">
-                <text class="name">{{ addressData.consignee }}</text>
-                <text class="phone">{{ addressData.phone }}</text>
-              </view>
-            </view>
-          </view>
-          <!-- 自提  -->
-          <view class="express-address" v-if="expressTypeCur == 'selfetch'">
-            <!-- 定位 -->
-            <view class="u-flex-col u-col-center location-box" v-if="!lat">
-              <image
-                class="nolocation-img"
-                :src="$IMG_URL + '/imgs/order/location.png'"
-                mode=""
-              ></image>
-              <text class="location-title">开启定位服务</text>
-              <text class="location-tip">为你推荐更精准的位置信息噢~</text>
-              <button class="u-reset-button open-location" @tap="getLocation">
-                去开启
-              </button>
-            </view>
-            <!-- 已定位 -->
-            <view class="" v-else>
-              <view
-                class="express-top u-flex u-col-center u-row-between"
-                @tap="
+            " @tap="jump('/pages/user/address/list', { from: 'order' })">
+						请选择收货地址
+
+						<text class="u-iconfont uicon-arrow-right" style="color: #999"></text>
+					</view>
+					<!-- 地址 -->
+					<view class="express-address" v-if="expressTypeCur == 'express' && addressId">
+						<view class="express-top u-flex u-row-between"
+							@tap="jump('/pages/user/address/list', { from: 'order' })">
+							<view class="u-flex">
+								<text class="tag" style="white-space: nowrap"
+									v-show="addressData.is_default == 1">默认</text>
+								<text class="address">{{ addressData.province_name }}{{ addressData.city_name
+                  }}{{ addressData.area_name }}{{ addressData.address }}</text>
+								<view class="address-guide"><text class="u-iconfont uicon-arrow-right"
+										style="color: #bfbfbf"></text></view>
+							</view>
+
+							<view class="address-location u-flex-col u-col-center">
+								<image class="location-img" :src="$IMG_URL + '/imgs/order/e0.png'" mode=""></image>
+								<text class="location-text">物流快递</text>
+							</view>
+						</view>
+						<view class="express-content">
+							<view class="phone-box1">
+								<text class="name">{{ addressData.consignee }}</text>
+								<text class="phone">{{ addressData.phone }}</text>
+							</view>
+						</view>
+					</view>
+					<!-- 自提  -->
+					<view class="express-address" v-if="expressTypeCur == 'selfetch'">
+						<!-- 定位 -->
+						<view class="u-flex-col u-col-center location-box" v-if="!lat">
+							<image class="nolocation-img" :src="$IMG_URL + '/imgs/order/location.png'" mode=""></image>
+							<text class="location-title">开启定位服务</text>
+							<text class="location-tip">为你推荐更精准的位置信息噢~</text>
+							<button class="u-reset-button open-location" @tap="getLocation">
+								去开启
+							</button>
+						</view>
+						<!-- 已定位 -->
+						<view class="" v-else>
+							<view class="express-top u-flex u-col-center u-row-between" @tap="
                   jump('/pages/order/express/store-address', {
                     goodsId: currentGoodsId,
                     lat: lat,
                     lng: lng,
                     storeId: storeInfo ? storeInfo.id : 0,
                   })
-                "
-              >
-                <view class="u-flex">
-                  <text class="tag1" v-if="addressData.is_default == 1"
-                    >最近</text
-                  >
-                  <text class="address">{{
+                ">
+								<view class="u-flex">
+									<text class="tag1" v-if="addressData.is_default == 1">最近</text>
+									<text class="address">{{
                     storeInfo ? storeInfo.name : "暂无自提点"
                   }}</text>
-                  <text
-                    class="u-iconfont uicon-arrow-right"
-                    style="color: #999"
-                  ></text>
-                </view>
-                <view class="address-location u-flex-col u-col-center">
-                  <image
-                    class="location-img"
-                    :src="$IMG_URL + '/imgs/order/e1.png'"
-                    mode=""
-                  ></image>
-                  <view class="location-text"
-                    >距您{{ storeInfo ? storeInfo.distance_text : 0 }}</view
-                  >
-                </view>
-              </view>
-              <view class="express-content u-flex u-col-cetner">
-                <view class="time-box">
-                  <view class="box-title u-m-b-20">到店时间</view>
-                  <view
-                    class="box-content u-flex u-col-center"
-                    @tap="checkExpressTime('selfetch')"
-                  >
-                    <text class="box-text"
-                      >{{ checkTime[checkDayCur].title
+									<text class="u-iconfont uicon-arrow-right" style="color: #999"></text>
+								</view>
+								<view class="address-location u-flex-col u-col-center">
+									<image class="location-img" :src="$IMG_URL + '/imgs/order/e1.png'" mode=""></image>
+									<view class="location-text">距您{{ storeInfo ? storeInfo.distance_text : 0 }}</view>
+								</view>
+							</view>
+							<view class="express-content u-flex u-col-cetner">
+								<view class="time-box">
+									<view class="box-title u-m-b-20">到店时间</view>
+									<view class="box-content u-flex u-col-center" @tap="checkExpressTime('selfetch')">
+										<text class="box-text">{{ checkTime[checkDayCur].title
                       }}{{
                         checkTime[checkDayCur].timeRange[checkTimeCur]
-                      }}</text
-                    >
-                    <text
-                      class="u-iconfont uicon-arrow-right"
-                      style="color: #999"
-                    ></text>
-                  </view>
-                </view>
-                <view class="box-line"></view>
-                <view class="phone-box">
-                  <view class="box-title u-m-b-20">预留电话</view>
-                  <view class="box-content u-flex" style="width: 340rpx">
-                    <u-input
-                      placeholder="请输入预留电话"
-                      placeholderStyle="font-size:24rpx"
-                      border
-                      height="40"
-                      :focus="getFocus"
-                      v-model="selfPhone"
-                      type="number"
-                    ></u-input>
-                  </view>
-                </view>
-              </view>
-              <view class="express-bottom" @tap="checkProtocol">
-                <u-checkbox active-color="#f0c785" :value="isProtocol">
-                  <view class="protocol">
-                    同意并接受
-                    <text
-                      class="protocol-text"
-                      @tap.stop="
+                      }}</text>
+										<text class="u-iconfont uicon-arrow-right" style="color: #999"></text>
+									</view>
+								</view>
+								<view class="box-line"></view>
+								<view class="phone-box">
+									<view class="box-title u-m-b-20">预留电话</view>
+									<view class="box-content u-flex" style="width: 340rpx">
+										<u-input placeholder="请输入预留电话" placeholderStyle="font-size:24rpx" border
+											height="40" :focus="getFocus" v-model="selfPhone" type="number"></u-input>
+									</view>
+								</view>
+							</view>
+							<view class="express-bottom" @tap="checkProtocol">
+								<u-checkbox active-color="#f0c785" :value="isProtocol">
+									<view class="protocol">
+										同意并接受
+										<text class="protocol-text" @tap.stop="
                         jump('/pages/public/richtext', {
                           id: initStore.selfetch_protocol,
                         })
-                      "
-                      >《到店自提服务协议》</text
-                    >
-                  </view>
-                </u-checkbox>
-              </view>
-            </view>
-          </view>
-          <!-- 商家配送 -->
-          <view
-            class="express-address"
-            v-if="expressTypeCur == 'store' && addressId"
-          >
-            <view
-              class="express-top u-flex u-row-between"
-              @tap="jump('/pages/user/address/list', { from: 'order' })"
-            >
-              <view class="">
-                <text class="tag" v-if="addressData.is_default == 1">默认</text>
-                <text class="address"
-                  >{{ addressData.province_name }}{{ addressData.city_name
-                  }}{{ addressData.area_name }}{{ addressData.address }}</text
-                >
-                <text
-                  class="address-guide u-iconfont uicon-arrow-right"
-                  style="color: #999"
-                ></text>
-              </view>
-
-              <view class="address-location u-flex-col u-col-center">
-                <image
-                  class="location-img"
-                  :src="$IMG_URL + '/imgs/order/e2.png'"
-                  mode=""
-                ></image>
-                <text class="location-text">商家配送</text>
-              </view>
-            </view>
-            <view class="express-content u-flex">
-              <view class="time-box">
-                <view class="box-title u-m-b-20">配送时间</view>
-                <view
-                  class="box-content u-flex"
-                  @tap="checkExpressTime('store')"
-                >
-                  <text class="box-text"
-                    >{{ checkTime[checkDayCur].title
-                    }}{{ checkTime[checkDayCur].timeRange[checkTimeCur] }}</text
-                  >
-                  <text
-                    class="u-iconfont uicon-arrow-right"
-                    style="color: #999"
-                  ></text>
-                </view>
-              </view>
-              <view class="box-line"></view>
-              <view class="phone-box">
-                <view class="box-title u-m-b-20">预留电话</view>
-                <view class="box-content u-flex">
-                  <view class="box-content u-flex" style="width: 340rpx">
-                    <u-input
-                      placeholder="请输入预留电话"
-                      placeholderStyle="font-size:24rpx"
-                      border
-                      height="40"
-                      :focus="getFocus"
-                      v-model="selfPhone"
-                      type="number"
-                    ></u-input>
-                  </view>
-                </view>
-              </view>
-            </view>
-          </view>
-          <!-- 自动发货 -->
-          <view class="express-address" v-if="expressTypeCur == 'autosend'">
-            <view class="express-top u-flex u-row-between">
-              <text class="dispatch-notice"
-                >订单支付完成后，请在订单详情页查看发货信息</text
-              >
-              <view class="address-location u-flex-col u-col-center">
-                <image
-                  class="location-img"
-                  :src="$IMG_URL + '/imgs/order/e3.png'"
-                  mode=""
-                ></image>
-                <text class="location-text">自动发货</text>
-              </view>
-            </view>
-          </view>
-        </view>
-        <view
-          class="express-type__bottom u-flex u-row-between u-p-b-20"
-          v-show="
+                      ">《到店自提服务协议》</text>
+									</view>
+								</u-checkbox>
+							</view>
+						</view>
+					</view>
+					<!-- 商家配送 -->
+					<view class="express-address" v-if="expressTypeCur == 'store' && addressId">
+						<view class="express-top u-flex u-row-between"
+							@tap="jump('/pages/user/address/list', { from: 'order' })">
+							<view class="">
+								<text class="tag" v-if="addressData.is_default == 1">默认</text>
+								<text class="address">{{ addressData.province_name }}{{ addressData.city_name
+                  }}{{ addressData.area_name }}{{ addressData.address }}</text>
+								<text class="address-guide u-iconfont uicon-arrow-right" style="color: #999"></text>
+							</view>
+
+							<view class="address-location u-flex-col u-col-center">
+								<image class="location-img" :src="$IMG_URL + '/imgs/order/e2.png'" mode=""></image>
+								<text class="location-text">商家配送</text>
+							</view>
+						</view>
+						<view class="express-content u-flex">
+							<view class="time-box">
+								<view class="box-title u-m-b-20">配送时间</view>
+								<view class="box-content u-flex" @tap="checkExpressTime('store')">
+									<text class="box-text">{{ checkTime[checkDayCur].title
+                    }}{{ checkTime[checkDayCur].timeRange[checkTimeCur] }}</text>
+									<text class="u-iconfont uicon-arrow-right" style="color: #999"></text>
+								</view>
+							</view>
+							<view class="box-line"></view>
+							<view class="phone-box">
+								<view class="box-title u-m-b-20">预留电话</view>
+								<view class="box-content u-flex">
+									<view class="box-content u-flex" style="width: 340rpx">
+										<u-input placeholder="请输入预留电话" placeholderStyle="font-size:24rpx" border
+											height="40" :focus="getFocus" v-model="selfPhone" type="number"></u-input>
+									</view>
+								</view>
+							</view>
+						</view>
+					</view>
+					<!-- 自动发货 -->
+					<view class="express-address" v-if="expressTypeCur == 'autosend'">
+						<view class="express-top u-flex u-row-between">
+							<text class="dispatch-notice">订单支付完成后，请在订单详情页查看发货信息</text>
+							<view class="address-location u-flex-col u-col-center">
+								<image class="location-img" :src="$IMG_URL + '/imgs/order/e3.png'" mode=""></image>
+								<text class="location-text">自动发货</text>
+							</view>
+						</view>
+					</view>
+				</view>
+				<view class="express-type__bottom u-flex u-row-between u-p-b-20" v-show="
             expressTypeCur !== 'selfetch' ||
             (expressTypeCur == 'selfetch' && lat)
-          "
-        >
-          <button class="u-reset-button cancel-btn" @tap="hideExpressType">
-            取消
-          </button>
-          <button class="u-reset-button save-btn" @tap="saveExpressType">
-            确定
-          </button>
-        </view>
-      </view>
-    </u-popup>
-
-    <!-- 配送时间弹窗 -->
-    <u-popup
-      v-model="showCheckTime"
-      mode="bottom"
-      safe-area-inset-bottom
-      :closeable="true"
-      close-icon-pos="top-right"
-      border-radius="20"
-    >
-      <view class="checkTime-box page_box">
-        <view class="checkTime-head">选择{{ checkType }}时间</view>
-        <view class="checkTime-content content_box u-flex">
-          <view class="checkTime-content__left">
-            <view
-              v-for="(day, index) in checkTime"
-              :key="day.value"
-              class="left-item u-flex u-row-center u-col-center"
-              @tap="check('day', index)"
-              :class="{ 'item--active': checkDayCur == index }"
-            >
-              {{ day.title }}
-            </view>
-          </view>
-          <scroll-view
-            class="checkTime-content__right scroll-box"
-            :scroll-into-view="'c' + checkTimeId"
-            scroll-y
-            scroll-with-animation
-          >
-            <view v-if="checkTime[checkDayCur].timeRange.length > 0">
-              <view
-                v-for="(time, index) in checkTime[checkDayCur].timeRange"
-                :key="time"
-                class="right-item"
-                :id="'c' + time.split(':')[0]"
-                @tap="check('time', index)"
-                :class="{ 'item--active': checkTimeCur == index }"
-              >
-                <view>{{ time }}</view>
-              </view>
-            </view>
-            <view v-else class="right-item-none">请选择其它日期</view>
-          </scroll-view>
-        </view>
-        <view class="checkTime-foot u-flex u-row-center u-col-center"
-          ><button class="u-reset-button save-btn" @tap="showCheckTime = false">
-            保存并使用
-          </button></view
-        >
-      </view>
-    </u-popup>
-  </view>
+          ">
+					<button class="u-reset-button cancel-btn" @tap="hideExpressType">
+						取消
+					</button>
+					<button class="u-reset-button save-btn" @tap="saveExpressType">
+						确定
+					</button>
+				</view>
+			</view>
+		</u-popup>
+
+		<!-- 配送时间弹窗 -->
+		<u-popup v-model="showCheckTime" mode="bottom" safe-area-inset-bottom :closeable="true"
+			close-icon-pos="top-right" border-radius="20">
+			<view class="checkTime-box page_box">
+				<view class="checkTime-head">选择{{ checkType }}时间</view>
+				<view class="checkTime-content content_box u-flex">
+					<view class="checkTime-content__left">
+						<view v-for="(day, index) in checkTime" :key="day.value"
+							class="left-item u-flex u-row-center u-col-center" @tap="check('day', index)"
+							:class="{ 'item--active': checkDayCur == index }">
+							{{ day.title }}
+						</view>
+					</view>
+					<scroll-view class="checkTime-content__right scroll-box" :scroll-into-view="'c' + checkTimeId"
+						scroll-y scroll-with-animation>
+						<view v-if="checkTime[checkDayCur].timeRange.length > 0">
+							<view v-for="(time, index) in checkTime[checkDayCur].timeRange" :key="time"
+								class="right-item" :id="'c' + time.split(':')[0]" @tap="check('time', index)"
+								:class="{ 'item--active': checkTimeCur == index }">
+								<view>{{ time }}</view>
+							</view>
+						</view>
+						<view v-else class="right-item-none">请选择其它日期</view>
+					</scroll-view>
+				</view>
+				<view class="checkTime-foot u-flex u-row-center u-col-center"><button class="u-reset-button save-btn"
+						@tap="showCheckTime = false">
+						保存并使用
+					</button></view>
+			</view>
+		</u-popup>
+	</view>
 </template>
 
 <script>
-import shSelectCoupon from "./components/sh-select-coupon.vue";
-import { mapMutations, mapActions, mapState, mapGetters } from "vuex";
-import Auth from "@/shopro/permission/index.js";
-export default {
-  components: {
-    shSelectCoupon,
-  },
-  data() {
-    return {
-      platform: this.$platform.get(),
-      totalNum: 0,
-      couponList: [], //优惠券列表
-      addressData: {}, //收货地址
-      addressId: 0, //收货地址ID
-      customStyle: {
-        //自定义按钮样式
-        width: "210rpx",
-        lineHeight: "70rpx",
-        background:
-          "linear-gradient(90deg, rgba(233, 180, 97, 1), rgba(238, 204, 137, 1))",
-        boxShadow: " 0px 7rpx 6rpx 0px rgba(229, 138, 0, 0.22)",
-        borderRadius: "100rpx",
-        fontSize: "28rpx",
-        border: "none",
-        color: "#fff",
-        margin: "0",
-      },
-      isDisabled: false, //提交
-      showCheckTime: false, //配送时间弹窗。
-      checkTime: {}, //配送时间数据
-      showExpressType: false, //配送方式弹窗
-      expressTypeMap: {
-        express: "物流快递",
-        selfetch: "到店/自提",
-        store: "商家配送",
-        autosend: "自动发货",
-      },
-      expressType: [
-        //配送方式
-        {
-          id: "e1",
-          title: "物流快递",
-          value: "express",
-        },
-        {
-          id: "e2",
-          title: "到店/自提",
-          value: "selfetch",
-        },
-        {
-          id: "e3",
-          title: "商家配送",
-          value: "store",
-        },
-        {
-          id: "e4",
-          title: "自动发货",
-          value: "autosend",
-        },
-      ],
-      storeList: [], //门店列表
-      storeInfo: {
-        id: 0,
-        name: "",
-        dispatch_text: "",
-      }, //自提点商家信息
-      from: "",
-      orderType: "",
-      grouponBuyType: "alone",
-      grouponId: 0,
-      goodsList: [], //传递过来的参数
-      perGoodsList: {}, //确认单订单商品
-      currentGoodsId: 0, //当前商品id.
-      currentSkuId: 0, //商品的规格ID
-      remark: "",
-      orderPre: {},
-      couponId: 0,
-      couponPrice: "选择优惠券",
-      expressTypeCur: "",
-      inExpressType: [], //当前商品支持的配送方式。
-
-      isProtocol: true, //自提协议。
-      selfPhone: "", //编辑手机号
-      getFocus: false, //获取焦点。
-      checkType: "自提",
-      checkTimeCur: 0, //默认选中时间。
-      checkTimeId: "c1", //锚点用
-      checkDayCur: 0, //默认日期
-      lat: 0, //地理位置
-      lng: 0,
-
-      showInvoice: false, //申请发票
-      invoiceType: "person",
-      selectedInvoice: "不开具发票",
-      invoiceForm: {
-        model: {
-          header_name: "",
-          mobile: "",
-          tax_no: "",
-          type: "person",
-        },
-        rules: {
-          mobile: [
-            {
-              required: true,
-              message: "请输入手机号",
-              trigger: ["change", "blur"],
-            },
-            {
-              validator: (rule, value, callback) => {
-                return this.$u.test.mobile(value);
-              },
-              message: "手机号码不正确",
-              trigger: ["change", "blur"],
-            },
-          ],
-          header_name: [
-            {
-              required: true,
-              message: "请填写名称",
-              trigger: ["change", "blur"],
-            },
-          ],
-        },
-      },
-    };
-  },
-  computed: {
-    ...mapGetters(["initStore"]),
-    expressClass() {
-      let cl = "head-nav--active";
-      const { expressType, expressTypeCur } = this;
-      if (expressTypeCur === 0) {
-        cl = "head-nav__left--active";
-      }
-      if (expressTypeCur === expressType.length - 1) {
-        cl = "head-nav__right--active";
-      }
-      return cl;
-    },
-    // 是否可以使用优惠券
-    hasCoupons() {
-      if (this.couponList.length && !this.orderPre.activity_type) {
-        return true;
-      }
-      return Boolean(
-        this.couponList.length &&
-          this.orderPre.activity_type &&
-          this.orderPre.activity_type.indexOf("groupon") === -1 &&
-          this.orderPre.activity_type.indexOf("seckill") === -1 &&
-          this.orderType !== "score"
-      );
-    },
-  },
-  onShow() {
-    // 监听选择自提点
-    uni.$once("SELECT_STORE", (res) => {
-      this.storeInfo = JSON.parse(res.storeInfo);
-    });
-    // 监听地址
-    uni.$on("SELECT_ADDRESS", (res) => {
-      if (res.addressData) {
-        this.addressData = JSON.parse(res.addressData);
-        this.addressId = this.addressData.id;
-      } else {
-        this.addressId = 0;
-      }
-      this.getPre();
-      res.addressData && uni.$off("SELECT_ADDRESS");
-    });
-  },
-  async onLoad() {
-    this.goodsList = this.$Route.query.goodsList;
-    this.from = this.$Route.query.from;
-    this.orderType = this.$Route.query.orderType;
-    this.grouponBuyType = this.$Route.query.grouponBuyType;
-    this.grouponId = this.$Route.query.grouponId;
-    await this.init();
-  },
-  methods: {
-    ...mapActions(["getCartList"]),
-    // 切换发票类型
-    changeInvoiceType(type) {
-      this.invoiceType = type;
-      this.invoiceForm.model.type = type;
-    },
-    // 点击开发票
-    onInvoice() {
-      this.showInvoice = !this.showInvoice;
-      this.$nextTick(() => {
-        if (this.showInvoice) {
-          this.invoiceForm.model.type = "person";
-          this.$refs.invoiceRef.setRules(this.invoiceForm.rules);
-        }
-      });
-    },
-    // 发票确认取消
-    cancelInvoice() {
-      this.selectedInvoice = "不开具发票";
-      Object.keys(this.invoiceForm.model).map(
-        (key) => (this.invoiceForm.model[key] = "")
-      );
-      this.showInvoice = false;
-    },
-    saveInvoice() {
-      this.$refs.invoiceRef.validate((valid) => {
-        if (valid) {
-          if (
-            this.invoiceType === "company" &&
-            !this.invoiceForm.model.tax_no
-          ) {
-            this.$u.toast("请输入纳税人识别号");
-          }
-          this.selectedInvoice = this.invoiceForm.model.header_name;
-          this.showInvoice = false;
-        }
-      });
-    },
-
-    // 初始化
-    init() {
-      uni.showLoading({
-        title: "加载中...",
-        mask: true,
-      });
-      return Promise.all([
-        this.getDefaultAddress(),
-        this.initDate(),
-        this.getCoupons(),
-      ]).then(() => {
-        uni.hideLoading();
-      });
-    },
-    jump(path, parmas) {
-      this.$Router.push({
-        path: path,
-        query: parmas,
-      });
-    },
-
-    // 格式化选择时间
-    initDate() {
-      const weekRange = {
-        0: "周日",
-        1: "周一",
-        2: "周二",
-        3: "周三",
-        4: "周四",
-        5: "周五",
-        6: "周六",
-      };
-	  const timeRange = [
-	    "08:00",
-	    "09:00",
-	    "10:00",
-	    "11:00",
-	    "12:00",
-	    "13:00",
-	    "14:00",
-	    "15:00",
-	    "16:00",
-	    "17:00",
-	    "18:00",
-	    "19:00",
-	  ];
-      let now = new Date().getTime();
-      let today = this.$u.timeFormat(now);
-      let tomorrow = this.$u.timeFormat(now + 86400000);
-      let aftertomorrow = this.$u.timeFormat(now + 172800000);
-      let week1 = weekRange[new Date().getDay()];
-      let week2 = weekRange[new Date(now + 86400000).getDay()];
-      let week3 = weekRange[new Date(now + 172800000).getDay()];
-
-
-      function getTimeRange() {
-        const nowHours = new Date().getHours();
-        return timeRange.filter((item) => item.split(":")[0] > nowHours);
-      }
-
-      const selectDays = [
-        {
-          title: "今天（" + week1 + "）",
-          value: today,
-          timeRange: getTimeRange(),
-        },
-        {
-          title: "明天（" + week2 + "）",
-          value: tomorrow,
-          timeRange,
-        },
-        {
-          title: "后天（" + week3 + "）",
-          value: aftertomorrow,
-          timeRange,
-        },
-      ];
-	  if(selectDays[0].timeRange.length === 0) {
-		  selectDays.shift();
-	  }
-      this.checkTime = selectDays;
-    },
-
-    // 格式日期
-    check(type, index) {
-      if (type == "day") {
-        this.checkDayCur = index;
-      }
-
-      if (type == "time") {
-        this.checkTimeCur = index;
-        this.checkTimeId =
-          this.checkTime[this.checkDayCur].timeRange[index].split(":")[0];
-      }
-    },
-
-    // 获取当前商品配送方式
-    getCurGoodsExpress(goods) {
-      for (let item of this.goodsList) {
-        if (
-          item.goods_id == goods.goods_id &&
-          goods.sku_price_id == item.sku_price_id
-        ) {
-          return this.expressTypeMap[item.dispatch_type];
-        }
-      }
-    },
-
-    // 获取位置
-    async getLocation() {
-      let authState = await new Auth("userLocation").check();
-      // #ifdef MP ||　APP-VUE
-      authState &&
-        uni.getLocation({
-          type: "gcj02",
-          success: (res) => {
-            this.lng = res.longitude;
-            this.lat = res.latitude;
-            this.getStoreAddress();
-          },
-          fail: (err) => {
-            console.log("确认订单自提位置：", err);
-          },
-        });
-      // #endif
-      // #ifdef H5
-      uni.getLocation({
-        type: "gcj02",
-        success: (res) => {
-          this.lng = res.longitude;
-          this.lat = res.latitude;
-          this.getStoreAddress();
-        },
-      });
-      // #endif
-    },
-    // 获取商品支持的自提点。
-    getStoreAddress() {
-      let that = this;
-      that
-        .$http("goods.storeAddress", {
-          id: that.currentGoodsId,
-          latitude: that.lat,
-          longitude: that.lng,
-        })
-        .then((res) => {
-          if (res.code == 1) {
-            that.storeInfo = res.data.data[0];
-            that.storeList = res.data.data;
-          }
-        });
-    },
-    // 订单信息
-    getPre() {
-      let that = this;
-      that
-        .$http("order.pre", {
-          goods_list: that.goodsList,
-          from: that.from,
-          address_id: that.addressId,
-          coupons_id: that.couponId,
-          order_type: that.orderType,
-          buy_type: that.grouponBuyType,
-          groupon_id: that.grouponId,
-        })
-        .then((res) => {
-          if (res.data) {
-            that.orderPre = res.data;
-            that.perGoodsList = res.data.new_goods_list;
-            that.totalNum = 0;
-            that.perGoodsList.map((item) => {
-              item.selType = item.dispatch_type;
-              that.totalNum += item.goods_num;
-              that.goodsList.forEach((goods) => {
-                if (
-                  item.goods_id == goods.goods_id &&
-                  item.sku_price_id == goods.sku_price_id
-                ) {
-                  goods.dispatch_type = item.dispatch_type;
-
-                  if (item.store_id) {
-                    goods.store_id = item.store_id;
-                  }
-                }
-              });
-            });
-          }
-        });
-    },
-    // 提交订单
-    subOrder() {
-      let that = this;
-      that.isDisabled = true;
-      that
-        .$http(
-          "order.createOrder",
-          {
-            goods_list: that.goodsList,
-            from: that.from,
-            address_id: that.addressId,
-            coupons_id: that.couponId,
-            remark: that.remark,
-            order_type: that.orderType,
-            buy_type: that.grouponBuyType,
-            groupon_id: that.grouponId,
-            invoice:
-              Number(that.orderPre.invoice_amount) &&
-              that.selectedInvoice !== "不开具发票"
-                ? {
-                    ...that.invoiceForm.model,
-                    amount: that.orderPre.invoice_amount,
-                  }
-                : {},
-          },
-          "提交中..."
-        )
-        .then((res) => {
-          that.isDisabled = false;
-          if (res.code === 1) {
-            that.getCartList();
-            that.$Router.replace({
-              path:
-                res.data.status > 0
-                  ? `/pages/order/payment/result`
-                  : `/pages/order/payment/method`,
-              query: {
-                orderId: res.data.id,
-                payState: res.data.status > 0 ? "success" : "paying",
-                orderType: "goods",
-              },
-            });
-          }
-        });
-    },
-
-    // 初始地址
-    getDefaultAddress() {
-      this.$http("address.defaults", {}, "", false).then((res) => {
-        if (res.code === 1 && res.data) {
-          this.addressData = res.data;
-          this.addressId = res.data.id;
-        }
-        this.getPre();
-      });
-    },
-
-    // 可用优惠券
-    getCoupons() {
-      let that = this;
-      that
-        .$http("order.coupons", {
-          goods_list: that.goodsList,
-          from: that.from,
-          address_id: that.addressId,
-          coupons_id: that.couponId,
-          order_type: that.orderType,
-        })
-        .then((res) => {
-          if (res.code === 1) {
-            that.couponList = res.data;
-          }
-        });
-    },
-
-    // 选择优惠券
-    selectCoupon(index) {
-      this.couponId = index >= 0 ? this.couponList[index].user_coupons_id : 0;
-      this.getPre();
-    },
-
-    // 显示配送方式弹窗
-    async onSelExpressType(goods) {
-      this.showExpressType = true;
-      this.inExpressType = goods.detail.dispatch_type_arr;
-      this.currentGoodsId = goods.goods_id;
-      this.currentSkuId = goods.sku_price_id;
-      this.goodsList.forEach((item) => {
-        if (
-          item.goods_id == this.currentGoodsId &&
-          this.currentSkuId == item.sku_price_id
-        ) {
-          this.expressTypeCur = item.dispatch_type;
-          this.selfPhone = item.dispatch_phone
-            ? item.dispatch_phone
-            : this.addressData && this.addressData.phone;
-          this.checkDayCur = item.checkDayCur ? item.checkDayCur : 0;
-          this.checkTimeCur = item.checkTimeCur ? item.checkTimeCur : 0;
-          if (this.expressTypeCur == "selfetch") {
-            !this.lat && this.getLocation();
-            this.storeList.forEach((store) => {
-              if (item.store_id == store.id) {
-                this.storeInfo = store;
-              }
-            });
-            this.selfPhone = item.dispatch_phone
-              ? item.dispatch_phone
-              : this.addressData && this.addressData.phone;
-          }
-        }
-      });
-    },
-    // 关闭配送方式弹窗
-    hideExpressType() {
-      this.showExpressType = false;
-      this.changeGoodsList();
-    },
-    // 保存配送方式
-    saveExpressType() {
-      if (this.expressTypeCur === "selfetch") {
-        if (!this.storeInfo) {
-          this.$u.toast("暂无自提点，请选择其他配送方式");
-          return false;
-        }
-        if (!this.isProtocol) {
-          this.$u.toast("请先勾选门店协议");
-          return false;
-        }
-      }
-
-      this.showExpressType = false;
-      this.changeGoodsList();
-      this.getPre();
-    },
-
-    // 更改提交数据
-    changeGoodsList() {
-      this.goodsList.forEach((goods) => {
-        if (
-          goods.goods_id == this.currentGoodsId &&
-          this.currentSkuId == goods.sku_price_id
-        ) {
-          goods.dispatch_type = this.expressTypeCur;
-          goods.dispatch_phone = this.selfPhone;
-          goods.dispatch_date =
-            this.checkTime[this.checkDayCur].value +
-            " " +
-            this.checkTime[this.checkDayCur].timeRange[this.checkTimeCur] +
-            ":00";
-          if (this.expressTypeCur == "selfetch") {
-            if (!this.storeInfo) {
-              this.$u.toast("暂无自提点，请选择其他配送方式");
-              return false;
-            }
-            goods.store_id = this.storeInfo.id;
-          }
-          goods.checkDayCur = this.checkDayCur;
-          goods.checkTimeCur = this.checkTimeCur;
-        }
-      });
-    },
-
-    // 选择快递方式
-    changeExpressType(cur) {
-      this.expressTypeCur = cur;
-      this.getFocus = false;
-      cur === "selfetch" && !this.lat && this.getLocation();
-    },
-
-    // 是否同意协议
-    checkProtocol() {
-      this.isProtocol = !this.isProtocol;
-    },
-    // 选择配送时间
-    checkExpressTime(type) {
-      switch (type) {
-        case "store":
-          this.checkType = "配送";
-          break;
-        case "selfetch":
-          this.checkType = "自提";
-          break;
-        default:
-          this.checkType = "自提";
-      }
-      this.showCheckTime = !this.showCheckTime;
-    },
-  },
-};
+	import jsonrpc from '@/shopro/request/indexJson.js'
+	import shSelectCoupon from "./components/sh-select-coupon.vue";
+	import {
+		mapMutations,
+		mapActions,
+		mapState,
+		mapGetters
+	} from "vuex";
+	import Auth from "@/shopro/permission/index.js";
+	export default {
+		components: {
+			shSelectCoupon,
+		},
+		data() {
+			return {
+				platform: this.$platform.get(),
+				totalNum: 0,
+				couponList: [], //优惠券列表
+				addressData: {}, //收货地址
+				addressId: 0, //收货地址ID
+				customStyle: {
+					//自定义按钮样式
+					width: "210rpx",
+					lineHeight: "70rpx",
+					background: "linear-gradient(90deg, rgba(233, 180, 97, 1), rgba(238, 204, 137, 1))",
+					boxShadow: " 0px 7rpx 6rpx 0px rgba(229, 138, 0, 0.22)",
+					borderRadius: "100rpx",
+					fontSize: "28rpx",
+					border: "none",
+					color: "#fff",
+					margin: "0",
+				},
+				isDisabled: false, //提交
+				showCheckTime: false, //配送时间弹窗。
+				checkTime: {}, //配送时间数据
+				showExpressType: false, //配送方式弹窗
+				expressTypeMap: {
+					express: "物流快递",
+					selfetch: "到店/自提",
+					store: "商家配送",
+					autosend: "自动发货",
+				},
+				expressType: [
+					//配送方式
+					{
+						id: "e1",
+						title: "物流快递",
+						value: "express",
+					},
+					{
+						id: "e2",
+						title: "到店/自提",
+						value: "selfetch",
+					},
+					{
+						id: "e3",
+						title: "商家配送",
+						value: "store",
+					},
+					{
+						id: "e4",
+						title: "自动发货",
+						value: "autosend",
+					},
+				],
+				storeList: [], //门店列表
+				storeInfo: {
+					id: 0,
+					name: "",
+					dispatch_text: "",
+				}, //自提点商家信息
+				from: "",
+				orderType: "",
+				grouponBuyType: "alone",
+				grouponId: 0,
+				goodsList: [], //传递过来的参数
+				perGoodsList: {}, //确认单订单商品
+				currentGoodsId: 0, //当前商品id.
+				currentSkuId: 0, //商品的规格ID
+				remark: "",
+				orderPre: {},
+				couponId: 0,
+				couponPrice: "选择优惠券",
+				expressTypeCur: "",
+				inExpressType: [], //当前商品支持的配送方式。
+
+				isProtocol: true, //自提协议。
+				selfPhone: "", //编辑手机号
+				getFocus: false, //获取焦点。
+				checkType: "自提",
+				checkTimeCur: 0, //默认选中时间。
+				checkTimeId: "c1", //锚点用
+				checkDayCur: 0, //默认日期
+				lat: 0, //地理位置
+				lng: 0,
+
+				showInvoice: false, //申请发票
+				invoiceType: "person",
+				selectedInvoice: "不开具发票",
+				invoiceForm: {
+					model: {
+						header_name: "",
+						mobile: "",
+						tax_no: "",
+						type: "person",
+					},
+					rules: {
+						mobile: [{
+								required: true,
+								message: "请输入手机号",
+								trigger: ["change", "blur"],
+							},
+							{
+								validator: (rule, value, callback) => {
+									return this.$u.test.mobile(value);
+								},
+								message: "手机号码不正确",
+								trigger: ["change", "blur"],
+							},
+						],
+						header_name: [{
+							required: true,
+							message: "请填写名称",
+							trigger: ["change", "blur"],
+						}, ],
+					},
+				},
+			};
+		},
+		computed: {
+			...mapGetters(["initStore"]),
+			expressClass() {
+				let cl = "head-nav--active";
+				const {
+					expressType,
+					expressTypeCur
+				} = this;
+				if (expressTypeCur === 0) {
+					cl = "head-nav__left--active";
+				}
+				if (expressTypeCur === expressType.length - 1) {
+					cl = "head-nav__right--active";
+				}
+				return cl;
+			},
+			// 是否可以使用优惠券
+			hasCoupons() {
+				if (this.couponList.length && !this.orderPre.activity_type) {
+					return true;
+				}
+				return Boolean(
+					this.couponList.length &&
+					this.orderPre.activity_type &&
+					this.orderPre.activity_type.indexOf("groupon") === -1 &&
+					this.orderPre.activity_type.indexOf("seckill") === -1 &&
+					this.orderType !== "score"
+				);
+			},
+		},
+		onShow() {
+			// 监听选择自提点
+			uni.$once("SELECT_STORE", (res) => {
+				this.storeInfo = JSON.parse(res.storeInfo);
+			});
+			// 监听地址
+			uni.$on("SELECT_ADDRESS", (res) => {
+				if (res.addressData) {
+					this.addressData = JSON.parse(res.addressData);
+					this.addressId = this.addressData.id;
+				} else {
+					this.addressId = 0;
+				}
+				this.getPre();
+				res.addressData && uni.$off("SELECT_ADDRESS");
+			});
+		},
+		async onLoad() {
+			this.goodsList = this.$Route.query.goodsList;
+			this.from = this.$Route.query.from;
+			this.orderType = this.$Route.query.orderType;
+			this.grouponBuyType = this.$Route.query.grouponBuyType;
+			this.grouponId = this.$Route.query.grouponId;
+			await this.init();
+		},
+		methods: {
+			...mapActions(["getCartList"]),
+			// 切换发票类型
+			changeInvoiceType(type) {
+				this.invoiceType = type;
+				this.invoiceForm.model.type = type;
+			},
+			// 点击开发票
+			onInvoice() {
+				this.showInvoice = !this.showInvoice;
+				this.$nextTick(() => {
+					if (this.showInvoice) {
+						this.invoiceForm.model.type = "person";
+						this.$refs.invoiceRef.setRules(this.invoiceForm.rules);
+					}
+				});
+			},
+			// 发票确认取消
+			cancelInvoice() {
+				this.selectedInvoice = "不开具发票";
+				Object.keys(this.invoiceForm.model).map(
+					(key) => (this.invoiceForm.model[key] = "")
+				);
+				this.showInvoice = false;
+			},
+			saveInvoice() {
+				this.$refs.invoiceRef.validate((valid) => {
+					if (valid) {
+						if (
+							this.invoiceType === "company" &&
+							!this.invoiceForm.model.tax_no
+						) {
+							this.$u.toast("请输入纳税人识别号");
+						}
+						this.selectedInvoice = this.invoiceForm.model.header_name;
+						this.showInvoice = false;
+					}
+				});
+			},
+
+			// 初始化
+			init() {
+				uni.showLoading({
+					title: "加载中...",
+					mask: true,
+				});
+				return Promise.all([
+					this.getDefaultAddress(),
+					this.initDate(),
+					this.getCoupons(),
+				]).then(() => {
+					uni.hideLoading();
+				});
+			},
+			jump(path, parmas) {
+				this.$Router.push({
+					path: path,
+					query: parmas,
+				});
+			},
+
+			// 格式化选择时间
+			initDate() {
+				const weekRange = {
+					0: "周日",
+					1: "周一",
+					2: "周二",
+					3: "周三",
+					4: "周四",
+					5: "周五",
+					6: "周六",
+				};
+				const timeRange = [
+					"08:00",
+					"09:00",
+					"10:00",
+					"11:00",
+					"12:00",
+					"13:00",
+					"14:00",
+					"15:00",
+					"16:00",
+					"17:00",
+					"18:00",
+					"19:00",
+				];
+				let now = new Date().getTime();
+				let today = this.$u.timeFormat(now);
+				let tomorrow = this.$u.timeFormat(now + 86400000);
+				let aftertomorrow = this.$u.timeFormat(now + 172800000);
+				let week1 = weekRange[new Date().getDay()];
+				let week2 = weekRange[new Date(now + 86400000).getDay()];
+				let week3 = weekRange[new Date(now + 172800000).getDay()];
+
+
+				function getTimeRange() {
+					const nowHours = new Date().getHours();
+					return timeRange.filter((item) => item.split(":")[0] > nowHours);
+				}
+
+				const selectDays = [{
+						title: "今天（" + week1 + "）",
+						value: today,
+						timeRange: getTimeRange(),
+					},
+					{
+						title: "明天（" + week2 + "）",
+						value: tomorrow,
+						timeRange,
+					},
+					{
+						title: "后天（" + week3 + "）",
+						value: aftertomorrow,
+						timeRange,
+					},
+				];
+				if (selectDays[0].timeRange.length === 0) {
+					selectDays.shift();
+				}
+				this.checkTime = selectDays;
+			},
+
+			// 格式日期
+			check(type, index) {
+				if (type == "day") {
+					this.checkDayCur = index;
+				}
+
+				if (type == "time") {
+					this.checkTimeCur = index;
+					this.checkTimeId =
+						this.checkTime[this.checkDayCur].timeRange[index].split(":")[0];
+				}
+			},
+
+			// 获取当前商品配送方式
+			getCurGoodsExpress(goods) {
+				for (let item of this.goodsList) {
+					console.log("item", item)
+					if (
+						item.goods_id == goods.goods_id &&
+						goods.sku_price_id == item.sku_price_id
+					) {
+						console.log(this.expressTypeMap["express"])
+						return this.expressTypeMap["express"];
+						/* 	return this.expressTypeMap[item.dispatch_type]; */
+					}
+					return this.expressTypeMap["express"];
+				}
+			},
+
+			// 获取位置
+			async getLocation() {
+				let authState = await new Auth("userLocation").check();
+				// #ifdef MP ||　APP-VUE
+				authState &&
+					uni.getLocation({
+						type: "gcj02",
+						success: (res) => {
+							this.lng = res.longitude;
+							this.lat = res.latitude;
+							this.getStoreAddress();
+						},
+						fail: (err) => {
+							console.log("确认订单自提位置：", err);
+						},
+					});
+				// #endif
+				// #ifdef H5
+				uni.getLocation({
+					type: "gcj02",
+					success: (res) => {
+						this.lng = res.longitude;
+						this.lat = res.latitude;
+						this.getStoreAddress();
+					},
+				});
+				// #endif
+			},
+			// 获取商品支持的自提点。
+			getStoreAddress() {
+				let that = this;
+				that
+					.$http("goods.storeAddress", {
+						id: that.currentGoodsId,
+						latitude: that.lat,
+						longitude: that.lng,
+					})
+					.then((res) => {
+						if (res.code == 1) {
+							that.storeInfo = res.data.data[0];
+							that.storeList = res.data.data;
+						}
+					});
+			},
+			// 订单信息
+			getPre() {
+				let that = this;
+				jsonrpc("order.pre", {
+					goods_list: that.goodsList,
+					from: that.from,
+					address_id: that.addressId,
+					coupons_id: that.couponId,
+					order_type: that.orderType,
+					buy_type: that.grouponBuyType,
+					groupon_id: that.grouponId,
+				}).then((res) => {
+					console.log(res)
+					if (res.result) {
+						that.orderPre = res.result;
+						that.perGoodsList = res.result.new_goods_list;
+						that.totalNum = 0;
+						that.perGoodsList.map((item) => {
+							item.selType = item.dispatch_type;
+							that.totalNum += item.goods_num;
+							that.goodsList.forEach((goods) => {
+								if (
+									item.goods_id == goods.goods_id &&
+									item.sku_price_id == goods.sku_price_id
+								) {
+									goods.dispatch_type = "express";
+									/* 	goods.dispatch_type = item.dispatch_type; */
+									if (item.store_id) {
+										goods.store_id = item.store_id;
+									}
+								}
+							});
+						});
+					}
+
+				});
+				/* 
+				that.$http("order.pre", {
+					goods_list: that.goodsList,
+					from: that.from,
+					address_id: that.addressId,
+					coupons_id: that.couponId,
+					order_type: that.orderType,
+					buy_type: that.grouponBuyType,
+					groupon_id: that.grouponId,
+				}).then((res) => {
+					if (res.data) {
+						that.orderPre = res.data;
+						that.perGoodsList = res.data.new_goods_list;
+						that.totalNum = 0;
+						that.perGoodsList.map((item) => {
+							item.selType = item.dispatch_type;
+							that.totalNum += item.goods_num;
+							that.goodsList.forEach((goods) => {
+								if (
+									item.goods_id == goods.goods_id &&
+									item.sku_price_id == goods.sku_price_id
+								) {
+									goods.dispatch_type = item.dispatch_type;
+
+									if (item.store_id) {
+										goods.store_id = item.store_id;
+									}
+								}
+							});
+						});
+					}
+				}); */
+			},
+			// 提交订单
+			subOrder() {
+				let that = this;
+				that.isDisabled = true;
+				jsonrpc(
+						"order.createOrder", {
+							goods_list: that.goodsList,
+							from: that.from,
+							address_id: that.addressId,
+							coupons_id: that.couponId,
+							remark: that.remark,
+							order_type: that.orderType,
+							buy_type: that.grouponBuyType,
+							groupon_id: that.grouponId,
+							invoice: Number(that.orderPre.invoice_amount) &&
+								that.selectedInvoice !== "不开具发票" ? {
+									...that.invoiceForm.model,
+									amount: that.orderPre.invoice_amount,
+								} : {},
+						},
+						"提交中..."
+					)
+					.then((res) => {
+						that.isDisabled = false;
+						if (res.error.code === 200) {
+							that.getCartList();
+							that.$Router.replace({
+								path: res.result.status > 0 ?
+									`/pages/order/payment/result` : `/pages/order/payment/method`,
+								query: {
+									orderId: res.result.id,
+									payState: res.result.status > 0 ? "success" : "paying",
+									orderType: "goods",
+								},
+							});
+						}
+					});
+				/* 	that.$http(
+							"order.createOrder", {
+								goods_list: that.goodsList,
+								from: that.from,
+								address_id: that.addressId,
+								coupons_id: that.couponId,
+								remark: that.remark,
+								order_type: that.orderType,
+								buy_type: that.grouponBuyType,
+								groupon_id: that.grouponId,
+								invoice: Number(that.orderPre.invoice_amount) &&
+									that.selectedInvoice !== "不开具发票" ? {
+										...that.invoiceForm.model,
+										amount: that.orderPre.invoice_amount,
+									} : {},
+							},
+							"提交中..."
+						)
+						.then((res) => {
+							that.isDisabled = false;
+							if (res.code === 1) {
+								that.getCartList();
+								that.$Router.replace({
+									path: res.data.status > 0 ?
+										`/pages/order/payment/result` : `/pages/order/payment/method`,
+									query: {
+										orderId: res.data.id,
+										payState: res.data.status > 0 ? "success" : "paying",
+										orderType: "goods",
+									},
+								});
+							}
+						}); */
+			},
+
+			// 初始地址
+			getDefaultAddress() {
+				this.$http("address.defaults", {}, "", false).then((res) => {
+					if (res.code === 1 && res.data) {
+						this.addressData = res.data;
+						this.addressId = res.data.id;
+					}
+					this.getPre();
+				});
+			},
+
+			// 可用优惠券
+			getCoupons() {
+				let that = this;
+				that
+					.$http("order.coupons", {
+						goods_list: that.goodsList,
+						from: that.from,
+						address_id: that.addressId,
+						coupons_id: that.couponId,
+						order_type: that.orderType,
+					})
+					.then((res) => {
+						if (res.code === 1) {
+							that.couponList = res.data;
+						}
+					});
+			},
+
+			// 选择优惠券
+			selectCoupon(index) {
+				this.couponId = index >= 0 ? this.couponList[index].user_coupons_id : 0;
+				this.getPre();
+			},
+
+			// 显示配送方式弹窗
+			async onSelExpressType(goods) {
+				this.showExpressType = true;
+				this.inExpressType = goods.detail.dispatch_type_arr;
+				this.currentGoodsId = goods.goods_id;
+				this.currentSkuId = goods.sku_price_id;
+				this.goodsList.forEach((item) => {
+					if (
+						item.goods_id == this.currentGoodsId &&
+						this.currentSkuId == item.sku_price_id
+					) {
+						/* this.expressTypeCur = item.dispatch_type; */
+						this.expressTypeCur = "express";
+						this.selfPhone = item.dispatch_phone ?
+							item.dispatch_phone :
+							this.addressData && this.addressData.phone;
+						this.checkDayCur = item.checkDayCur ? item.checkDayCur : 0;
+						this.checkTimeCur = item.checkTimeCur ? item.checkTimeCur : 0;
+						if (this.expressTypeCur == "selfetch") {
+							!this.lat && this.getLocation();
+							this.storeList.forEach((store) => {
+								if (item.store_id == store.id) {
+									this.storeInfo = store;
+								}
+							});
+							this.selfPhone = item.dispatch_phone ?
+								item.dispatch_phone :
+								this.addressData && this.addressData.phone;
+						}
+					}
+				});
+			},
+			// 关闭配送方式弹窗
+			hideExpressType() {
+				this.showExpressType = false;
+				this.changeGoodsList();
+			},
+			// 保存配送方式
+			saveExpressType() {
+				if (this.expressTypeCur === "selfetch") {
+					if (!this.storeInfo) {
+						this.$u.toast("暂无自提点，请选择其他配送方式");
+						return false;
+					}
+					if (!this.isProtocol) {
+						this.$u.toast("请先勾选门店协议");
+						return false;
+					}
+				}
+
+				this.showExpressType = false;
+				this.changeGoodsList();
+				this.getPre();
+			},
+
+			// 更改提交数据
+			changeGoodsList() {
+				this.goodsList.forEach((goods) => {
+					if (
+						goods.goods_id == this.currentGoodsId &&
+						this.currentSkuId == goods.sku_price_id
+					) {
+						goods.dispatch_type = this.expressTypeCur;
+						goods.dispatch_phone = this.selfPhone;
+						goods.dispatch_date =
+							this.checkTime[this.checkDayCur].value +
+							" " +
+							this.checkTime[this.checkDayCur].timeRange[this.checkTimeCur] +
+							":00";
+						if (this.expressTypeCur == "selfetch") {
+							if (!this.storeInfo) {
+								this.$u.toast("暂无自提点，请选择其他配送方式");
+								return false;
+							}
+							goods.store_id = this.storeInfo.id;
+						}
+						goods.checkDayCur = this.checkDayCur;
+						goods.checkTimeCur = this.checkTimeCur;
+					}
+				});
+			},
+
+			// 选择快递方式
+			changeExpressType(cur) {
+				this.expressTypeCur = cur;
+				this.getFocus = false;
+				cur === "selfetch" && !this.lat && this.getLocation();
+			},
+
+			// 是否同意协议
+			checkProtocol() {
+				this.isProtocol = !this.isProtocol;
+			},
+			// 选择配送时间
+			checkExpressTime(type) {
+				switch (type) {
+					case "store":
+						this.checkType = "配送";
+						break;
+					case "selfetch":
+						this.checkType = "自提";
+						break;
+					default:
+						this.checkType = "自提";
+				}
+				this.showCheckTime = !this.showCheckTime;
+			},
+		},
+	};
 </script>
 
 <style lang="scss" scoped>
-// 发票弹窗
-.invoice-modal {
-  width: 750rpx;
-  background-color: #fff;
-  border-radius: 20rpx 20rpx 0 0;
-  height: 700rpx;
-  overflow: visible;
-
-  .invoice-foot {
-    .price-title {
-      font-size: 28rpx;
-      font-weight: 400;
-      color: #333333;
-    }
-
-    .price-num {
-      font-size: 28rpx;
-      font-weight: 500;
-      color: #eab662;
-    }
-
-    .cancel-btn {
-      width: 335rpx;
-      line-height: 74rpx;
-      background: rgba(238, 238, 238, 1);
-      border-radius: 37rpx;
-      font-size: 28rpx;
-      font-weight: 400;
-      color: rgba(51, 51, 51, 1);
-    }
-
-    .save-btn {
-      width: 335rpx;
-      line-height: 74rpx;
-      background: linear-gradient(
-        90deg,
-        rgba(233, 180, 97, 1),
-        rgba(238, 204, 137, 1)
-      );
-      border-radius: 37rpx;
-      font-size: 28rpx;
-      font-weight: 400;
-      color: rgba(255, 255, 255, 1);
-    }
-  }
-
-  .invoice-head {
-    width: 100%;
-    height: 80rpx;
-    background: #f8e3bd;
-    border-radius: 20rpx 20rpx 0 0;
-
-    .head-nav {
-      width: (750rpx/2);
-      position: relative;
-      height: 100%;
-    }
-
-    .nav-title {
-      font-size: 24rpx;
-      font-weight: 500;
-      color: #666;
-      position: relative;
-      z-index: 6;
-    }
-
-    .nav-title--active {
-      color: #a8700d;
-      font-size: 26rpx;
-    }
-
-    .head-nav--active {
-      position: absolute;
-      left: 50%;
-      transform: translateX(-50%);
-      bottom: 0;
-      background: #fff;
-      width: 100%;
-      height: 80rpx;
-      background-color: #fff;
-      border-radius: 20rpx 20rpx 0px 0px;
-
-      &::after {
-        content: "";
-        display: block;
-        width: 40rpx;
-        height: 80rpx;
-        position: absolute;
-        transform: skewX(20deg);
-        background: #fff;
-        border-top-right-radius: 20rpx;
-        top: 0;
-        right: -15rpx;
-      }
-
-      &::before {
-        content: "";
-        display: block;
-        width: 40rpx;
-        height: 80rpx;
-        position: absolute;
-        transform: skewX(-20deg);
-        background: #fff;
-        border-top-left-radius: 20rpx;
-        top: 0;
-        left: -15rpx;
-      }
-    }
-  }
-}
-
-// 收货地址栏
-.head_box {
-  background-color: #fff;
-}
-
-.add-address-box {
-  min-height: 100rpx;
-  background: url($IMG_URL + "/imgs/order/order_address_line.png") no-repeat;
-  background-size: 100% auto;
-  background-position: bottom center;
-
-  .select-notice {
-    font-weight: 400;
-    color: rgba(153, 153, 153, 1);
-    line-height: 40rpx;
-  }
-
-  .name,
-  .phone {
-    font-size: 30rpx;
-    font-weight: 500;
-  }
-
-  .phone {
-    margin: 0 20rpx;
-  }
-
-  .tag {
-    background: rgba(233, 191, 113, 0.2);
-    border-radius: 6rpx;
-    padding: 0 16rpx;
-    line-height: 38rpx;
-    color: #a8700d;
-    font-size: 22rpx;
-  }
-
-  .detail {
-    .address {
-      margin-top: 25rpx;
-      width: 543rpx;
-      font-size: 26rpx;
-
-      font-weight: 400;
-      color: rgba(153, 153, 153, 1);
-      line-height: 40rpx;
-    }
-  }
-}
-
-// 备注
-.remark-box {
-  margin-top: 20rpx;
-  background: #fff;
-  padding: 25rpx;
-
-  .item-input {
-    flex: 1;
-    text-align: end;
-    font-size: 28rpx;
-  }
-
-  .input-pl {
-    color: #c4c4c4;
-  }
-}
-
-// 商品卡片
-.goods-list {
-  background: #fff;
-  margin-top: 20rpx;
-
-  .goods-card {
-    min-height: 200rpx;
-
-    .goods-price {
-      font-size: 30rpx;
-      font-weight: 500;
-      width: 480rpx;
-      color: #333333;
-
-      .goods-num {
-        font-size: 28rpx;
-        color: #c4c4c4;
-      }
-    }
-
-    .order-sku {
-      font-size: 24rpx;
-      font-weight: 400;
-      color: rgba(153, 153, 153, 1);
-      width: 440rpx;
-      margin-bottom: 20rpx;
-
-      .order-num {
-        margin-right: 10rpx;
-      }
-    }
-  }
-}
-
-.item-list {
-  height: 100rpx;
-  background: #fff;
-  padding: 0 25rpx;
-
-  .item-title {
-    font-size: 28rpx;
-    margin-right: 20rpx;
-
-    .activity-title {
-      font-size: 26rpx;
-      color: #999;
-    }
-  }
-
-  .detail {
-    font-size: 28rpx;
-    color: #333;
-  }
-
-  .origin-price {
-    font-size: 26rpx;
-    color: #666;
-    text-decoration: line-through;
-  }
-
-  .price {
-    font-size: 26rpx;
-    color: #ff0000;
-    margin-right: 40rpx;
-  }
-
-  .sel-coupon {
-    font-size: 26rpx;
-    color: #c4c4c4;
-    margin-right: 20rpx;
-  }
-}
-
-.logistic,
-.price-box,
-.remark-box,
-.score,
-.coupon {
-  border-top: 1rpx solid rgba(#dfdfdf, 0.5);
-}
-
-.border-top {
-  border-top: 1rpx solid rgba(#dfdfdf, 0.5);
-}
-
-.foot-box-wrap {
-  height: calc(100rpx + env(safe-area-inset-bottom) / 2);
-  padding-bottom: calc(env(safe-area-inset-bottom) / 2);
-  position: relative;
-  width: 100%;
-  z-index: 70;
-}
-
-.foot-box {
-  position: fixed;
-  display: flex;
-  align-items: center;
-  width: 100%;
-  height: calc(100rpx + env(safe-area-inset-bottom) / 2);
-  border-top: 1rpx solid #eeeeee;
-  background-color: #fff;
-  z-index: 998;
-  bottom: 0;
-  padding-bottom: calc(env(safe-area-inset-bottom) / 2);
-  padding: 0 30rpx;
-
-  .btn-hover {
-    color: #fff;
-  }
-
-  .num {
-    font-size: 26rpx;
-    color: #999;
-  }
-
-  .all-money {
-    margin: 0 60rpx 0 20rpx;
-
-    .price {
-      color: #ff0000;
-    }
-  }
-
-  .sub-btn {
-    width: 210rpx;
-    line-height: 70rpx;
-    background: linear-gradient(
-      90deg,
-      rgba(233, 180, 97, 1),
-      rgba(238, 204, 137, 1)
-    );
-    box-shadow: 0px 7rpx 6rpx 0px rgba(229, 138, 0, 0.22);
-    border-radius: 50rpx;
-    font-size: 28rpx;
-    color: #fff;
-  }
-}
-
-// 弹窗之配送方式
-// 配送方式
-.express-type {
-  width: 750rpx;
-  background-color: #fff;
-  border-radius: 20rpx 20rpx 0 0;
-  height: 700rpx;
-  overflow: visible;
-
-  .express-type__head {
-    width: 100%;
-    height: 80rpx;
-    background: #f8e3bd;
-    border-radius: 20rpx 20rpx 0 0;
-
-    &-nav {
-      width: (750rpx/4);
-      position: relative;
-      height: 100%;
-    }
-
-    .head-nav--active {
-      position: absolute;
-      left: 50%;
-      transform: translateX(-50%);
-      bottom: 0;
-      background: #fff;
-      width: 100%;
-      height: 80rpx;
-      background-color: #fff;
-      border-radius: 20rpx 20rpx 0px 0px;
-
-      &::after {
-        content: "";
-        display: block;
-        width: 40rpx;
-        height: 80rpx;
-        position: absolute;
-        transform: skewX(20deg);
-        background: #fff;
-        border-top-right-radius: 20rpx;
-        top: 0;
-        right: -15rpx;
-      }
-
-      &::before {
-        content: "";
-        display: block;
-        width: 40rpx;
-        height: 80rpx;
-        position: absolute;
-        transform: skewX(-20deg);
-        background: #fff;
-        border-top-left-radius: 20rpx;
-        top: 0;
-        left: -15rpx;
-      }
-    }
-
-    .head-nav__left--active {
-      position: absolute;
-      left: 50%;
-      transform: translateX(-50%);
-      bottom: 0;
-      background: #fff;
-      width: 100%;
-      height: 74rpx;
-      background-color: #fff;
-      border-radius: 20rpx 20rpx 0px 0px;
-
-      &::after {
-        content: "";
-        display: block;
-        width: 40rpx;
-        height: 74rpx;
-        position: absolute;
-        transform: skewX(20deg);
-        background: #fff;
-        border-top-right-radius: 20rpx;
-        top: 0;
-        right: -15rpx;
-      }
-    }
-
-    .head-nav__right--active {
-      position: absolute;
-      left: 50%;
-      transform: translateX(-50%);
-      bottom: 0;
-      background: #fff;
-      width: 100%;
-      height: 74rpx;
-      background-color: #fff;
-      border-radius: 20rpx 20rpx 0px 0px;
-
-      &::before {
-        content: "";
-        display: block;
-        width: 40rpx;
-        height: 74rpx;
-        position: absolute;
-        transform: skewX(-20deg);
-        background: #fff;
-        border-top-left-radius: 20rpx;
-        top: 0;
-        left: -15rpx;
-      }
-    }
-
-    .head-nav__title {
-      font-size: 24rpx;
-      font-weight: 500;
-      color: #666;
-      position: relative;
-      z-index: 6;
-    }
-
-    .head-nav__title--active {
-      color: #a8700d;
-      font-size: 26rpx;
-    }
-  }
-
-  .express-type__content {
-    .empty-address {
-      height: 120rpx;
-      padding: 0 25rpx;
-      font-size: 28rpx;
-
-      font-weight: 400;
-      color: rgba(153, 153, 153, 1);
-    }
-
-    // 无定位
-    .location-box {
-      height: 500rpx;
-      justify-content: center;
-
-      .nolocation-img {
-        width: 74rpx;
-        height: 90rpx;
-        margin-bottom: 40rpx;
-      }
-
-      .location-title {
-        font-size: 35rpx;
-
-        font-weight: bold;
-        color: rgba(70, 53, 27, 1);
-        margin-bottom: 20rpx;
-      }
-
-      .location-tip {
-        font-size: 28rpx;
-
-        font-weight: 400;
-        color: rgba(153, 153, 153, 1);
-        margin-bottom: 40rpx;
-      }
-
-      .open-location {
-        width: 492rpx;
-        line-height: 70rpx;
-        background: linear-gradient(
-          90deg,
-          rgba(233, 180, 97, 1),
-          rgba(238, 204, 137, 1)
-        );
-        box-shadow: 0px 7rpx 6rpx 0px rgba(229, 138, 0, 0.22);
-        border-radius: 35rpx;
-        font-size: 28rpx;
-
-        font-weight: 500;
-        color: rgba(255, 255, 255, 1);
-      }
-    }
-
-    // 快递
-    .express-address {
-      position: relative;
-      padding: 30rpx 25rpx;
-      background: url($IMG_URL + "/imgs/order/address_bg.png") no-repeat;
-      background-size: 430rpx 300rpx;
-      background-position: top right;
-
-      .express-top {
-        margin-bottom: 20rpx;
-        width: 550rpx;
-        text-align: left;
-
-        .address {
-          font-size: 28rpx;
-          font-weight: 500;
-          color: rgba(51, 51, 51, 1);
-          line-height: 40rpx;
-          text-align: left;
-        }
-
-        .dispatch-notice {
-          font-size: 28rpx;
-
-          font-weight: 500;
-          color: rgba(51, 51, 51, 1);
-          line-height: 40rpx;
-          text-align: left;
-        }
-
-        .address-location {
-          position: absolute;
-          right: 60rpx;
-          top: 30rpx;
-
-          .location-img {
-            width: 80rpx;
-            height: 90rpx;
-          }
-
-          .location-text {
-            font-size: 18rpx;
-
-            font-weight: 500;
-            color: rgba(51, 51, 51, 1);
-          }
-        }
-
-        .tag {
-          background: rgba(233, 191, 113, 0.2);
-          border-radius: 6rpx;
-          padding: 0 16rpx;
-          line-height: 38rpx;
-          color: #a8700d;
-          font-size: 22rpx;
-          margin-right: 20rpx;
-        }
-
-        .tag1 {
-          background: rgba(53, 190, 105, 0.2);
-          border-radius: 6rpx;
-          padding: 0 16rpx;
-          line-height: 38rpx;
-          color: #1bbc50;
-          font-size: 22rpx;
-          margin-right: 20rpx;
-        }
-
-        .address-guide {
-          position: absolute;
-          right: 25rpx;
-          top: 40rpx;
-          color: #999999;
-        }
-      }
-
-      .express-content {
-        margin-bottom: 20rpx;
-
-        .box-line {
-          width: 1rpx;
-          height: 61rpx;
-          border-left: 1rpx solid rgba(238, 238, 238, 1);
-          margin: 0 40rpx;
-        }
-
-        .phone-box1 {
-          .name,
-          .phone {
-            font-size: 26rpx;
-
-            font-weight: 400;
-            color: rgba(102, 102, 102, 1);
-          }
-
-          .phone {
-            margin-left: 20rpx;
-          }
-        }
-
-        .time-box,
-        .phone-box {
-          text-align: left;
-          min-height: 120rpx;
-
-          .box-title {
-            font-size: 24rpx;
-
-            font-weight: 400;
-            color: #666;
-            padding-bottom: 10rpx;
-          }
-
-          .box-text {
-            font-size: 24rpx;
-
-            font-weight: 500;
-            color: #333;
-          }
-
-          .edit-phone {
-            width: 160rpx;
-            font-size: 24rpx;
-
-            font-weight: 500;
-            color: #333;
-          }
-
-          .box-icon {
-            font-size: 28rpx;
-            color: #999;
-            display: inline-block;
-            width: 40rpx;
-            text-align: center;
-            line-height: 40rpx;
-          }
-        }
-      }
-
-      .express-bottom {
-        .protocol {
-          font-size: 24rpx;
-
-          font-weight: 400;
-          color: rgba(102, 102, 102, 1);
-
-          .protocol-text {
-            color: #6487a4;
-          }
-        }
-      }
-    }
-  }
-
-  .express-type__bottom {
-    height: 90rpx;
-    padding: 0 30rpx;
-
-    .cancel-btn {
-      width: 335rpx;
-      line-height: 74rpx;
-      background: rgba(238, 238, 238, 1);
-      border-radius: 37rpx;
-      font-size: 28rpx;
-      font-weight: 400;
-      color: rgba(51, 51, 51, 1);
-    }
-
-    .save-btn {
-      width: 335rpx;
-      line-height: 74rpx;
-      background: linear-gradient(
-        90deg,
-        rgba(233, 180, 97, 1),
-        rgba(238, 204, 137, 1)
-      );
-      border-radius: 37rpx;
-      font-size: 28rpx;
-      font-weight: 400;
-      color: rgba(255, 255, 255, 1);
-    }
-  }
-}
-
-// 选择配送给时间
-.checkTime-box {
-  background: rgba(255, 255, 255, 1);
-  border-radius: 20rpx 20rpx 0px 0px;
-  height: 720rpx;
-  text-align: center;
-
-  .checkTime-head {
-    font-size: 32rpx;
-
-    font-weight: 500;
-    color: rgba(51, 51, 51, 1);
-    line-height: 100rpx;
-    position: relative;
-  }
-
-  .checkTime-foot {
-    height: 100rpx;
-
-    .save-btn {
-      width: 690rpx;
-      line-height: 80rpx;
-      background: linear-gradient(
-        90deg,
-        rgba(240, 199, 133, 1),
-        rgba(246, 214, 157, 1)
-      );
-      border-radius: 40rpx;
-      font-size: 30rpx;
-
-      font-weight: 500;
-      color: rgba(255, 255, 255, 1);
-    }
-  }
-
-  .checkTime-content {
-    .checkTime-content__left {
-      height: 100%;
-      width: 190rpx;
-      background: #f5f5f5;
-
-      .left-item {
-        font-size: 26rpx;
-
-        font-weight: 500;
-        color: rgba(51, 51, 51, 1);
-        height: 100rpx;
-        width: 100%;
-      }
-    }
-
-    .checkTime-content__right {
-      flex: 1;
-      height: 100%;
-      overflow-y: auto;
-
-      .right-item {
-        font-size: 26rpx;
-
-        font-weight: 500;
-        color: rgba(51, 51, 51, 1);
-        width: 100%;
-        text-align: center;
-        border-bottom: 1rpx solid rgba(#dfdfdf, 0.6);
-        margin: 0 30rpx;
-        line-height: 100rpx;
-      }
-      .right-item-none {
-        font-size: 32rpx;
-        font-weight: 500;
-        color: #999999;
-        width: 100%;
-        text-align: center;
-        margin-top: 200rpx;
-      }
-    }
-
-    .item--active {
-      font-size: 26rpx;
-      font-weight: 500;
-      color: rgba(168, 112, 13, 1) !important;
-      background-color: #fff;
-    }
-  }
-}
-</style>
+	// 发票弹窗
+	.invoice-modal {
+		width: 750rpx;
+		background-color: #fff;
+		border-radius: 20rpx 20rpx 0 0;
+		height: 700rpx;
+		overflow: visible;
+
+		.invoice-foot {
+			.price-title {
+				font-size: 28rpx;
+				font-weight: 400;
+				color: #333333;
+			}
+
+			.price-num {
+				font-size: 28rpx;
+				font-weight: 500;
+				color: #eab662;
+			}
+
+			.cancel-btn {
+				width: 335rpx;
+				line-height: 74rpx;
+				background: rgba(238, 238, 238, 1);
+				border-radius: 37rpx;
+				font-size: 28rpx;
+				font-weight: 400;
+				color: rgba(51, 51, 51, 1);
+			}
+
+			.save-btn {
+				width: 335rpx;
+				line-height: 74rpx;
+				background: linear-gradient(90deg,
+						rgba(233, 180, 97, 1),
+						rgba(238, 204, 137, 1));
+				border-radius: 37rpx;
+				font-size: 28rpx;
+				font-weight: 400;
+				color: rgba(255, 255, 255, 1);
+			}
+		}
+
+		.invoice-head {
+			width: 100%;
+			height: 80rpx;
+			background: #f8e3bd;
+			border-radius: 20rpx 20rpx 0 0;
+
+			.head-nav {
+				width: (750rpx/2);
+				position: relative;
+				height: 100%;
+			}
+
+			.nav-title {
+				font-size: 24rpx;
+				font-weight: 500;
+				color: #666;
+				position: relative;
+				z-index: 6;
+			}
+
+			.nav-title--active {
+				color: #a8700d;
+				font-size: 26rpx;
+			}
+
+			.head-nav--active {
+				position: absolute;
+				left: 50%;
+				transform: translateX(-50%);
+				bottom: 0;
+				background: #fff;
+				width: 100%;
+				height: 80rpx;
+				background-color: #fff;
+				border-radius: 20rpx 20rpx 0px 0px;
+
+				&::after {
+					content: "";
+					display: block;
+					width: 40rpx;
+					height: 80rpx;
+					position: absolute;
+					transform: skewX(20deg);
+					background: #fff;
+					border-top-right-radius: 20rpx;
+					top: 0;
+					right: -15rpx;
+				}
+
+				&::before {
+					content: "";
+					display: block;
+					width: 40rpx;
+					height: 80rpx;
+					position: absolute;
+					transform: skewX(-20deg);
+					background: #fff;
+					border-top-left-radius: 20rpx;
+					top: 0;
+					left: -15rpx;
+				}
+			}
+		}
+	}
+
+	// 收货地址栏
+	.head_box {
+		background-color: #fff;
+	}
+
+	.add-address-box {
+		min-height: 100rpx;
+		background: url($IMG_URL + "/imgs/order/order_address_line.png") no-repeat;
+		background-size: 100% auto;
+		background-position: bottom center;
+
+		.select-notice {
+			font-weight: 400;
+			color: rgba(153, 153, 153, 1);
+			line-height: 40rpx;
+		}
+
+		.name,
+		.phone {
+			font-size: 30rpx;
+			font-weight: 500;
+		}
+
+		.phone {
+			margin: 0 20rpx;
+		}
+
+		.tag {
+			background: rgba(233, 191, 113, 0.2);
+			border-radius: 6rpx;
+			padding: 0 16rpx;
+			line-height: 38rpx;
+			color: #a8700d;
+			font-size: 22rpx;
+		}
+
+		.detail {
+			.address {
+				margin-top: 25rpx;
+				width: 543rpx;
+				font-size: 26rpx;
+
+				font-weight: 400;
+				color: rgba(153, 153, 153, 1);
+				line-height: 40rpx;
+			}
+		}
+	}
+
+	// 备注
+	.remark-box {
+		margin-top: 20rpx;
+		background: #fff;
+		padding: 25rpx;
+
+		.item-input {
+			flex: 1;
+			text-align: end;
+			font-size: 28rpx;
+		}
+
+		.input-pl {
+			color: #c4c4c4;
+		}
+	}
+
+	// 商品卡片
+	.goods-list {
+		background: #fff;
+		margin-top: 20rpx;
+
+		.goods-card {
+			min-height: 200rpx;
+
+			.goods-price {
+				font-size: 30rpx;
+				font-weight: 500;
+				width: 480rpx;
+				color: #333333;
+
+				.goods-num {
+					font-size: 28rpx;
+					color: #c4c4c4;
+				}
+			}
+
+			.order-sku {
+				font-size: 24rpx;
+				font-weight: 400;
+				color: rgba(153, 153, 153, 1);
+				width: 440rpx;
+				margin-bottom: 20rpx;
+
+				.order-num {
+					margin-right: 10rpx;
+				}
+			}
+		}
+	}
+
+	.item-list {
+		height: 100rpx;
+		background: #fff;
+		padding: 0 25rpx;
+
+		.item-title {
+			font-size: 28rpx;
+			margin-right: 20rpx;
+
+			.activity-title {
+				font-size: 26rpx;
+				color: #999;
+			}
+		}
+
+		.detail {
+			font-size: 28rpx;
+			color: #333;
+		}
+
+		.origin-price {
+			font-size: 26rpx;
+			color: #666;
+			text-decoration: line-through;
+		}
+
+		.price {
+			font-size: 26rpx;
+			color: #ff0000;
+			margin-right: 40rpx;
+		}
+
+		.sel-coupon {
+			font-size: 26rpx;
+			color: #c4c4c4;
+			margin-right: 20rpx;
+		}
+	}
+
+	.logistic,
+	.price-box,
+	.remark-box,
+	.score,
+	.coupon {
+		border-top: 1rpx solid rgba(#dfdfdf, 0.5);
+	}
+
+	.border-top {
+		border-top: 1rpx solid rgba(#dfdfdf, 0.5);
+	}
+
+	.foot-box-wrap {
+		height: calc(100rpx + env(safe-area-inset-bottom) / 2);
+		padding-bottom: calc(env(safe-area-inset-bottom) / 2);
+		position: relative;
+		width: 100%;
+		z-index: 70;
+	}
+
+	.foot-box {
+		position: fixed;
+		display: flex;
+		align-items: center;
+		width: 100%;
+		height: calc(100rpx + env(safe-area-inset-bottom) / 2);
+		border-top: 1rpx solid #eeeeee;
+		background-color: #fff;
+		z-index: 998;
+		bottom: 0;
+		padding-bottom: calc(env(safe-area-inset-bottom) / 2);
+		padding: 0 30rpx;
+
+		.btn-hover {
+			color: #fff;
+		}
+
+		.num {
+			font-size: 26rpx;
+			color: #999;
+		}
+
+		.all-money {
+			margin: 0 60rpx 0 20rpx;
+
+			.price {
+				color: #ff0000;
+			}
+		}
+
+		.sub-btn {
+			width: 210rpx;
+			line-height: 70rpx;
+			background: linear-gradient(90deg,
+					rgba(233, 180, 97, 1),
+					rgba(238, 204, 137, 1));
+			box-shadow: 0px 7rpx 6rpx 0px rgba(229, 138, 0, 0.22);
+			border-radius: 50rpx;
+			font-size: 28rpx;
+			color: #fff;
+		}
+	}
+
+	// 弹窗之配送方式
+	// 配送方式
+	.express-type {
+		width: 750rpx;
+		background-color: #fff;
+		border-radius: 20rpx 20rpx 0 0;
+		height: 700rpx;
+		overflow: visible;
+
+		.express-type__head {
+			width: 100%;
+			height: 80rpx;
+			background: #f8e3bd;
+			border-radius: 20rpx 20rpx 0 0;
+
+			&-nav {
+				width: (750rpx/4);
+				position: relative;
+				height: 100%;
+			}
+
+			.head-nav--active {
+				position: absolute;
+				left: 50%;
+				transform: translateX(-50%);
+				bottom: 0;
+				background: #fff;
+				width: 100%;
+				height: 80rpx;
+				background-color: #fff;
+				border-radius: 20rpx 20rpx 0px 0px;
+
+				&::after {
+					content: "";
+					display: block;
+					width: 40rpx;
+					height: 80rpx;
+					position: absolute;
+					transform: skewX(20deg);
+					background: #fff;
+					border-top-right-radius: 20rpx;
+					top: 0;
+					right: -15rpx;
+				}
+
+				&::before {
+					content: "";
+					display: block;
+					width: 40rpx;
+					height: 80rpx;
+					position: absolute;
+					transform: skewX(-20deg);
+					background: #fff;
+					border-top-left-radius: 20rpx;
+					top: 0;
+					left: -15rpx;
+				}
+			}
+
+			.head-nav__left--active {
+				position: absolute;
+				left: 50%;
+				transform: translateX(-50%);
+				bottom: 0;
+				background: #fff;
+				width: 100%;
+				height: 74rpx;
+				background-color: #fff;
+				border-radius: 20rpx 20rpx 0px 0px;
+
+				&::after {
+					content: "";
+					display: block;
+					width: 40rpx;
+					height: 74rpx;
+					position: absolute;
+					transform: skewX(20deg);
+					background: #fff;
+					border-top-right-radius: 20rpx;
+					top: 0;
+					right: -15rpx;
+				}
+			}
+
+			.head-nav__right--active {
+				position: absolute;
+				left: 50%;
+				transform: translateX(-50%);
+				bottom: 0;
+				background: #fff;
+				width: 100%;
+				height: 74rpx;
+				background-color: #fff;
+				border-radius: 20rpx 20rpx 0px 0px;
+
+				&::before {
+					content: "";
+					display: block;
+					width: 40rpx;
+					height: 74rpx;
+					position: absolute;
+					transform: skewX(-20deg);
+					background: #fff;
+					border-top-left-radius: 20rpx;
+					top: 0;
+					left: -15rpx;
+				}
+			}
+
+			.head-nav__title {
+				font-size: 24rpx;
+				font-weight: 500;
+				color: #666;
+				position: relative;
+				z-index: 6;
+			}
+
+			.head-nav__title--active {
+				color: #a8700d;
+				font-size: 26rpx;
+			}
+		}
+
+		.express-type__content {
+			.empty-address {
+				height: 120rpx;
+				padding: 0 25rpx;
+				font-size: 28rpx;
+
+				font-weight: 400;
+				color: rgba(153, 153, 153, 1);
+			}
+
+			// 无定位
+			.location-box {
+				height: 500rpx;
+				justify-content: center;
+
+				.nolocation-img {
+					width: 74rpx;
+					height: 90rpx;
+					margin-bottom: 40rpx;
+				}
+
+				.location-title {
+					font-size: 35rpx;
+
+					font-weight: bold;
+					color: rgba(70, 53, 27, 1);
+					margin-bottom: 20rpx;
+				}
+
+				.location-tip {
+					font-size: 28rpx;
+
+					font-weight: 400;
+					color: rgba(153, 153, 153, 1);
+					margin-bottom: 40rpx;
+				}
+
+				.open-location {
+					width: 492rpx;
+					line-height: 70rpx;
+					background: linear-gradient(90deg,
+							rgba(233, 180, 97, 1),
+							rgba(238, 204, 137, 1));
+					box-shadow: 0px 7rpx 6rpx 0px rgba(229, 138, 0, 0.22);
+					border-radius: 35rpx;
+					font-size: 28rpx;
+
+					font-weight: 500;
+					color: rgba(255, 255, 255, 1);
+				}
+			}
+
+			// 快递
+			.express-address {
+				position: relative;
+				padding: 30rpx 25rpx;
+				background: url($IMG_URL + "/imgs/order/address_bg.png") no-repeat;
+				background-size: 430rpx 300rpx;
+				background-position: top right;
+
+				.express-top {
+					margin-bottom: 20rpx;
+					width: 550rpx;
+					text-align: left;
+
+					.address {
+						font-size: 28rpx;
+						font-weight: 500;
+						color: rgba(51, 51, 51, 1);
+						line-height: 40rpx;
+						text-align: left;
+					}
+
+					.dispatch-notice {
+						font-size: 28rpx;
+
+						font-weight: 500;
+						color: rgba(51, 51, 51, 1);
+						line-height: 40rpx;
+						text-align: left;
+					}
+
+					.address-location {
+						position: absolute;
+						right: 60rpx;
+						top: 30rpx;
+
+						.location-img {
+							width: 80rpx;
+							height: 90rpx;
+						}
+
+						.location-text {
+							font-size: 18rpx;
+
+							font-weight: 500;
+							color: rgba(51, 51, 51, 1);
+						}
+					}
+
+					.tag {
+						background: rgba(233, 191, 113, 0.2);
+						border-radius: 6rpx;
+						padding: 0 16rpx;
+						line-height: 38rpx;
+						color: #a8700d;
+						font-size: 22rpx;
+						margin-right: 20rpx;
+					}
+
+					.tag1 {
+						background: rgba(53, 190, 105, 0.2);
+						border-radius: 6rpx;
+						padding: 0 16rpx;
+						line-height: 38rpx;
+						color: #1bbc50;
+						font-size: 22rpx;
+						margin-right: 20rpx;
+					}
+
+					.address-guide {
+						position: absolute;
+						right: 25rpx;
+						top: 40rpx;
+						color: #999999;
+					}
+				}
+
+				.express-content {
+					margin-bottom: 20rpx;
+
+					.box-line {
+						width: 1rpx;
+						height: 61rpx;
+						border-left: 1rpx solid rgba(238, 238, 238, 1);
+						margin: 0 40rpx;
+					}
+
+					.phone-box1 {
+
+						.name,
+						.phone {
+							font-size: 26rpx;
+
+							font-weight: 400;
+							color: rgba(102, 102, 102, 1);
+						}
+
+						.phone {
+							margin-left: 20rpx;
+						}
+					}
+
+					.time-box,
+					.phone-box {
+						text-align: left;
+						min-height: 120rpx;
+
+						.box-title {
+							font-size: 24rpx;
+
+							font-weight: 400;
+							color: #666;
+							padding-bottom: 10rpx;
+						}
+
+						.box-text {
+							font-size: 24rpx;
+
+							font-weight: 500;
+							color: #333;
+						}
+
+						.edit-phone {
+							width: 160rpx;
+							font-size: 24rpx;
+
+							font-weight: 500;
+							color: #333;
+						}
+
+						.box-icon {
+							font-size: 28rpx;
+							color: #999;
+							display: inline-block;
+							width: 40rpx;
+							text-align: center;
+							line-height: 40rpx;
+						}
+					}
+				}
+
+				.express-bottom {
+					.protocol {
+						font-size: 24rpx;
+
+						font-weight: 400;
+						color: rgba(102, 102, 102, 1);
+
+						.protocol-text {
+							color: #6487a4;
+						}
+					}
+				}
+			}
+		}
+
+		.express-type__bottom {
+			height: 90rpx;
+			padding: 0 30rpx;
+
+			.cancel-btn {
+				width: 335rpx;
+				line-height: 74rpx;
+				background: rgba(238, 238, 238, 1);
+				border-radius: 37rpx;
+				font-size: 28rpx;
+				font-weight: 400;
+				color: rgba(51, 51, 51, 1);
+			}
+
+			.save-btn {
+				width: 335rpx;
+				line-height: 74rpx;
+				background: linear-gradient(90deg,
+						rgba(233, 180, 97, 1),
+						rgba(238, 204, 137, 1));
+				border-radius: 37rpx;
+				font-size: 28rpx;
+				font-weight: 400;
+				color: rgba(255, 255, 255, 1);
+			}
+		}
+	}
+
+	// 选择配送给时间
+	.checkTime-box {
+		background: rgba(255, 255, 255, 1);
+		border-radius: 20rpx 20rpx 0px 0px;
+		height: 720rpx;
+		text-align: center;
+
+		.checkTime-head {
+			font-size: 32rpx;
+
+			font-weight: 500;
+			color: rgba(51, 51, 51, 1);
+			line-height: 100rpx;
+			position: relative;
+		}
+
+		.checkTime-foot {
+			height: 100rpx;
+
+			.save-btn {
+				width: 690rpx;
+				line-height: 80rpx;
+				background: linear-gradient(90deg,
+						rgba(240, 199, 133, 1),
+						rgba(246, 214, 157, 1));
+				border-radius: 40rpx;
+				font-size: 30rpx;
+
+				font-weight: 500;
+				color: rgba(255, 255, 255, 1);
+			}
+		}
+
+		.checkTime-content {
+			.checkTime-content__left {
+				height: 100%;
+				width: 190rpx;
+				background: #f5f5f5;
+
+				.left-item {
+					font-size: 26rpx;
+
+					font-weight: 500;
+					color: rgba(51, 51, 51, 1);
+					height: 100rpx;
+					width: 100%;
+				}
+			}
+
+			.checkTime-content__right {
+				flex: 1;
+				height: 100%;
+				overflow-y: auto;
+
+				.right-item {
+					font-size: 26rpx;
+
+					font-weight: 500;
+					color: rgba(51, 51, 51, 1);
+					width: 100%;
+					text-align: center;
+					border-bottom: 1rpx solid rgba(#dfdfdf, 0.6);
+					margin: 0 30rpx;
+					line-height: 100rpx;
+				}
+
+				.right-item-none {
+					font-size: 32rpx;
+					font-weight: 500;
+					color: #999999;
+					width: 100%;
+					text-align: center;
+					margin-top: 200rpx;
+				}
+			}
+
+			.item--active {
+				font-size: 26rpx;
+				font-weight: 500;
+				color: rgba(168, 112, 13, 1) !important;
+				background-color: #fff;
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages/order/detail.vue b/pages/order/detail.vue
index 5983d0d..ca2bca4 100644
--- a/pages/order/detail.vue
+++ b/pages/order/detail.vue
@@ -24,7 +24,7 @@
 			<!-- 订单信息 -->
 			<view class="order-list" v-for="order in orderDetail.item" :key="order.id">
 				<view class="order-card" @tap="jump('/pages/goods/detail', { id: order.goods_id })">
-					<shopro-mini-card :title="order.goods_title" :image="order.goods_image">
+					<shopro-mini-card :title="order.goods.title" :image="order.goods.image">
 						<template #describe>
 							<view class="order-sku u-ellipsis-1">
 								<text class="order-num">数量:{{ order.goods_num || 0 }};</text>
@@ -33,7 +33,7 @@
 						</template>
 						<template #cardBottom>
 							<view class="card-price-box u-flex">
-								<text class="order-price font-OPPOSANS">￥{{ order.goods_price || 0 }}</text>
+								<text class="order-price font-OPPOSANS">￥{{ order.goods.total_sales || 0 }}</text>
 								<button class="u-reset-button status-btn" v-if="order.status_name">{{ order.status_name }}</button>
 							</view>
 						</template>
@@ -180,6 +180,7 @@
 </template>
 
 <script>
+	import jsonrpc from "@/shopro/request/indexJson.js"
 export default {
 	components: {},
 	data() {
@@ -237,6 +238,17 @@ export default {
 		// 订单详情
 		getOrderDetail() {
 			let that = this;
+			
+			jsonrpc('order.detail', {
+				id: that.$Route.query.id
+			}).then(res => {
+				if (res.error.code === 200) {
+					that.orderDetail = res.result;
+					that.orderDetail.createtime = that.$u.timeFormat(res.result.createtime, 'yyyy-mm-dd hh:MM');
+					that.orderDetail.paytime = that.$u.timeFormat(res.result.paytime, 'yyyy-mm-dd hh:MM');
+				}
+			});
+			/* 
 			that.$http('order.detail', {
 				id: that.$Route.query.id
 			}).then(res => {
@@ -245,7 +257,7 @@ export default {
 					that.orderDetail.createtime = that.$u.timeFormat(res.data.createtime, 'yyyy-mm-dd hh:MM');
 					that.orderDetail.paytime = that.$u.timeFormat(res.data.paytime, 'yyyy-mm-dd hh:MM');
 				}
-			});
+			}); */
 		},
 		// 复制
 		onCopy(code) {
diff --git a/pages/order/list.vue b/pages/order/list.vue
index 5c1523f..b3eff31 100644
--- a/pages/order/list.vue
+++ b/pages/order/list.vue
@@ -22,7 +22,7 @@
 					</view>
 					<view class="goods-order" v-for="goods in order.item" :key="goods.id">
 						<view class="order-content">
-							<shopro-mini-card :title="goods.goods_title" :image="goods.goods_image">
+							<shopro-mini-card :title="goods.goods.title" :image="goods.goods.image">
 								<template #describe>
 									<view class="order-sku u-ellipsis-1">
 										<text class="order-num">数量:{{ goods.goods_num || 0 }};</text>
@@ -31,7 +31,7 @@
 								</template>
 								<template #cardBottom>
 									<view class="order-price-box u-flex ">
-										<text class="order-price font-OPPOSANS">￥{{ goods.goods_price || 0 }}</text>
+										<text class="order-price font-OPPOSANS">￥{{ goods.goods.total_sales || 0 }}</text>
 										<button class="u-reset-button status-btn"
 											v-if="goods.status_name">{{ goods.status_name }}</button>
 									</view>
@@ -82,6 +82,7 @@
 </template>
 
 <script>
+	import jsonrpc from "@/shopro/request/indexJson.js"
 	export default {
 		components: {},
 		data() {
@@ -152,7 +153,18 @@
 			getOrderList() {
 				let that = this;
 				that.loadStatus = 'loading';
-				that.$http('order.index', {
+				jsonrpc('order.index', {
+					type: that.orderType,
+					page: that.currentPage
+				}, '加载中...').then(res => {
+					if (res.error.code === 200) {
+						that.orderList = [...that.orderList, ...res.result.result_order];
+						that.isEmpty = !that.orderList.length;
+						that.lastPage = res.result.last_page;
+						that.loadStatus = that.currentPage < res.result.last_page ? 'loadmore' : 'nomore';
+					}
+				});
+				/* that.$http('order.index', {
 					type: that.orderType,
 					page: that.currentPage
 				}, '加载中...').then(res => {
@@ -162,7 +174,7 @@
 						that.lastPage = res.data.last_page;
 						that.loadStatus = that.currentPage < res.data.last_page ? 'loadmore' : 'nomore';
 					}
-				});
+				}); */
 			},
 
 			// 加载更多
diff --git a/pages/order/payment/method.vue b/pages/order/payment/method.vue
index e8f5fe2..0fa3a7a 100644
--- a/pages/order/payment/method.vue
+++ b/pages/order/payment/method.vue
@@ -55,6 +55,7 @@
 	/**
 	 * 接收商品订单orderType:goods，充值订单orderType:recharge
 	 */
+	import jsonrpc from "@/shopro/request/indexJson.js"
 	import Pay from '@/shopro/pay';
 	import { mapMutations, mapActions, mapState, mapGetters } from 'vuex';
 	let timer;
@@ -165,6 +166,21 @@
 			// 支付商品订单信息
 			getGoodsOrderDetail() {
 				let that = this;
+			
+				jsonrpc('order.detail', {
+					id: that.$Route.query.orderId
+				}).then(res => {
+					if (res.error.code === 200) {
+						
+						that.orderDetail = res.result;
+						if (res.data.ext_arr !== null) {
+							that.countDown();
+						} else {
+							that.isCountDown = false;
+						}
+					}
+				});
+				/* 
 				that.$http('order.detail', {
 					id: that.$Route.query.orderId
 				}).then(res => {
@@ -176,7 +192,7 @@
 							that.isCountDown = false;
 						}
 					}
-				});
+				}); */
 			},
 
 			// 充值订单信息
diff --git a/shopro/request/apis.js b/shopro/request/apis.js
index 4d7b7f2..5fda99d 100644
--- a/shopro/request/apis.js
+++ b/shopro/request/apis.js
@@ -77,6 +77,7 @@ export default {
 			method: "POST",
 			// desc: '发送短信',
 		},
+
 	},
 
 	/** 分类 ↓ **/
@@ -257,14 +258,24 @@ export default {
 
 	/** 用户 ↓ **/
 	user: {
-
+		smsJson: {
+			url: "user/getLoginOrRegSMSVerificationCode",
+			auth: false,
+			method: "POST",
+			// desc: '账号密码登录',
+		},
 		accountLogin: {
 			url: "user/accountLogin",
 			auth: false,
 			method: "POST",
 			// desc: '账号密码登录',
 		},
-
+		smsLoginJson: {
+			url: "user/loginOrRegByMobile",
+			auth: false,
+			method: "POST",
+			// desc: '短信登录',
+		},
 		smsLogin: {
 			url: "user/smsLogin",
 			auth: false,
@@ -299,7 +310,12 @@ export default {
 			method: "POST",
 			// desc: '修改密码',
 		},
-
+		infoJson: {
+			url: "user/myinfo",
+			auth: true,
+			method: "GET",
+			// desc: '用户信息'
+		},
 		info: {
 			url: "user",
 			auth: true,
@@ -486,6 +502,12 @@ export default {
 
 	/** 购物车 ↓ **/
 	cart: {
+		mycart: {
+			url: "cart/mycart",
+			auth: true,
+			method: "POST",
+			// desc: '购物车商品列表',
+		},
 		index: {
 			url: "cart",
 			auth: true,
@@ -498,7 +520,6 @@ export default {
 			method: "POST",
 			// desc: '添加购物车',
 		},
-
 		edit: {
 			url: "cart/edit",
 			auth: true,
@@ -670,7 +691,7 @@ export default {
 			// desc: '充值'
 		},
 		rechargeLog: {
-			url: "trade_order/index", 
+			url: "trade_order/index",
 			auth: true,
 			method: "GET",
 			// desc: '充值记录'
@@ -788,4 +809,4 @@ export default {
 	}
 
 
-};
+};
\ No newline at end of file
diff --git a/shopro/request/indexJson.js b/shopro/request/indexJson.js
index 975edc8..bcd0a2f 100644
--- a/shopro/request/indexJson.js
+++ b/shopro/request/indexJson.js
@@ -1,82 +1,79 @@
-
-
 import Request from './request'
 import apiList from './apis.js'
 import store from '@/shopro/store/index.js'
 
 const shoproRequest = new Request();
 
-export default {
-  install(Vue) {
-    Vue.prototype.$jsonrpc = function (
-      url,
-      data = {},
-      toastBefore = '', // 请求前加载提示
-      toastAfter = true, // 请求后错误提示
-    ) {
-     
-      if (typeof url !== "string") {
-        return;
-      }
-      let api = getApiPath(url);
-      /* 请求之前拦截器 */
-      shoproRequest.interceptor.request((config, cancel) => {
-        let token = uni.getStorageSync('token');
-        if (api.auth && !token) {
-          store.dispatch('showAuthModal',"smsLogin");
-          uni.hideLoading();
-          throw (`暂未登录,已阻止此次API请求: '${api.url}'`);
-        }
-        token && shoproRequest.setConfig(config => {
-          config.header.token = token;
-        });
-        if (toastBefore !== '') {
-          uni.showLoading({
-            title: toastBefore,
-            mask: true
-          });
-        }
-        return config;
-      });
+export default function jsonrpc(
+	url,
+	data = {},
+	toastBefore = '', // 请求前加载提示
+	toastAfter = true, // 请求后错误提示
+) {
+
+	if (typeof url !== "string") {
+		return;
+	}
+	let api = getApiPath(url);
+	/* 请求之前拦截器 */
+	shoproRequest.interceptor.request((config, cancel) => {
+		let token = uni.getStorageSync('token');
+		if (api.auth && !token) {
+			console.log(token)
+			store.dispatch('showAuthModal', "smsLogin");
+			uni.hideLoading();
+			throw (`暂未登录,已阻止此次API请求: '${api.url}'`);
+		}
+		token && shoproRequest.setConfig(config => {
+			config.header.token = token;
+		});
+		if (toastBefore !== '') {
+			uni.showLoading({
+				title: toastBefore,
+				mask: true
+			});
+		}
+		return config;
+	});
 
-      /* 请求之后拦截器 */
-      shoproRequest.interceptor.response((response) => {
-        uni.hideLoading();
-        if (response.code === 0) {
-          if (toastAfter) {
-            uni.showToast({
-              title: response.msg || '请求出错,稍后重试',
-              icon: 'none',
-              duration: 1000,
-              mask: true
-            });
-          }
-        }
+	/* 请求之后拦截器 */
+	shoproRequest.interceptor.response((response) => {
+		uni.hideLoading();
+		if (response.code === 0) {
+			if (toastAfter) {
+				uni.showToast({
+					title: response.msg || '请求出错,稍后重试',
+					icon: 'none',
+					duration: 1000,
+					mask: true
+				});
+			}
+		}
 
-        // token过期注销
-        if (response.code === 401) {
-          store.dispatch('logout');
-          store.dispatch('showAuthModal');
-          throw (`登录已过期或注销,已阻止此次API请求: '${api.url}'`);
-        }
-        return response;
-      });
+		// token过期注销
+		if (response.code === 401) {
+			store.dispatch('logout');
+			store.dispatch('showAuthModal');
+			throw (`登录已过期或注销,已阻止此次API请求: '${api.url}'`);
+		}
+		return response;
+	});
 
-      return shoproRequest.requestJson({
-        url: api.url,
-        data,
-        method: api.method
-      });
-    }
-  }
-};
+	return shoproRequest.requestJson({
+		url: api.url,
+		data,
+		method: api.method
+	});
+}
+
+;
 
 // 组装接口路径
 function getApiPath(url) {
-  let apiArray = url.split(".");
-  let api = apiList;
-  apiArray.forEach(v => {
-    api = api[v];
-  });
-  return api;
-}
+	let apiArray = url.split(".");
+	let api = apiList;
+	apiArray.forEach(v => {
+		api = api[v];
+	});
+	return api;
+}
\ No newline at end of file
diff --git a/shopro/request/request.js b/shopro/request/request.js
index 3eedc06..74a1bcc 100644
--- a/shopro/request/request.js
+++ b/shopro/request/request.js
@@ -139,7 +139,9 @@ async requestJson(options = {}) {
 		
 		return new Promise((resolve, reject) => {
 			let createJsonRpc ={
-				method: '/'+options.url 
+				jsonrpc:"2.0",
+				method: '/'+options.url,
+				session:localStorage.getItem('token')
 			}
 			createJsonRpc.params ={
 				...options.data
diff --git a/shopro/store/modules/cart.js b/shopro/store/modules/cart.js
index 58e2b3a..1ac859d 100644
--- a/shopro/store/modules/cart.js
+++ b/shopro/store/modules/cart.js
@@ -1,6 +1,6 @@
 // 购物车模块
 import http from '@/shopro/request/index'
-
+import jsonrpc from '@/shopro/request/indexJson.js'
 const state = {
 	cartList: [], //购物车列表
 	checkCart: {}, //检测是否是购物车数据的对象
@@ -114,10 +114,32 @@ const mutations = {
 }
 
 const actions = {
+	getCartListJson({
+		commit
+	}) {
+		return new Promise((resolve, reject) => {
+			jsonrpc('cart.mycart').then(res => {
+				console.log(res)
+				if (res.error.code === 200) {
+					let cartData = res.result;
+					cartData.length && cartData.map(item => {
+						item.checked = true;
+					})
+					commit('CART_LIST', cartData);
+					commit('checkCartList');
+					commit('getCheckCart')
+				}
+
+			}).catch(e => {
+				reject(e)
+			})
+		})
+	},
 	// 购物车数据（查）
 	getCartList({
 		commit
 	}) {
+
 		return new Promise((resolve, reject) => {
 			http('cart.index').then(res => {
 				if (res.code === 1) {
@@ -135,6 +157,22 @@ const actions = {
 			})
 		})
 	},
+	addCartGoodsJson({
+		dispatch
+	}, data) {
+		return new Promise((resolve, reject) => {
+			jsonrpc('cart.add', {
+				goods_list: data.list,
+				from: data.from
+			}).then(res => {
+				// console.log(res)
+				res.error.code === 200 && dispatch('getCartList');
+				resolve(res)
+			}).catch(e => {
+				reject(e)
+			})
+		})
+	},
 	// 添加到购物车（增）
 	addCartGoods({
 		dispatch
@@ -151,6 +189,26 @@ const actions = {
 			})
 		})
 	},
+	changeCartListJson({
+		commit,
+		dispatch
+	}, param) {
+		return new Promise((resolve, reject) => {
+			jsonrpc('cart.edit', {
+				cart_list: param.ids,
+				value: param.goodsNum || null,
+				act: param.art
+			}).then(res => {
+				if (param.art === 'delete' && res.error.code === 200) {
+					dispatch('getCartListJson');
+				}
+				commit('checkCartList');
+				resolve(res)
+			}).catch(e => {
+				reject(e)
+			})
+		})
+	},
 	// 修改购物车商品数量（改）|| 删除购物车商品（删）
 	changeCartList({
 		commit,
@@ -179,4 +237,4 @@ export default {
 	mutations,
 	actions,
 	getters
-}
+}
\ No newline at end of file
diff --git a/shopro/store/modules/user.js b/shopro/store/modules/user.js
index ab75976..9fb9405 100644
--- a/shopro/store/modules/user.js
+++ b/shopro/store/modules/user.js
@@ -1,5 +1,6 @@
 // 用户数据模块
 import http from '@/shopro/request/index'
+import jsonrpc from '@/shopro/request/indexJson.js'
 import store from '@/shopro/store'
 import tools from '@/shopro/utils/tools'
 import wechat from '@/shopro/wechat/wechat'
@@ -26,6 +27,46 @@ const getters = {
 }
 
 const actions = {
+	getUserInfoJson({
+		commit,
+		dispatch,
+		getters,
+		state
+	}, token = '') {
+		return new Promise((resolve, reject) => {
+			token && uni.setStorageSync('token', token);
+			console.log("get user info json")
+			jsonrpc('user.infoJson').then(res => {
+					console.log(res)
+					if (res.error.code === 200) {
+						let lastLoginStatus = getters.isLogin;
+						commit('userInfo', res.result);
+						commit('isLogin', true);
+						dispatch('showAuthModal', '');
+						!lastLoginStatus && share.setShareInfo();
+						// 存在分享信息 添加分享记录
+						let spm = uni.getStorageSync('spm');
+						if (spm) {
+							http('common.shareAdd', {
+								spm: spm
+							});
+							uni.removeStorageSync('spm');
+						}
+						resolve(res.result)
+					}
+
+				}).then(
+					/* () => {
+										// 只有在登录的时候请求购物车信息，订单信息，获取登录信息之后。
+										token && dispatch('getCartList');
+										token && dispatch('getUserData');
+									} */
+				)
+				.catch(e => {
+					reject(e)
+				})
+		})
+	},
 	// 获取用户信息
 	getUserInfo({
 		commit,
@@ -33,31 +74,33 @@ const actions = {
 		getters,
 		state
 	}, token = '') {
+
 		return new Promise((resolve, reject) => {
 			token && uni.setStorageSync('token', token);
+
 			http('user.info').then(res => {
-				if (res.code === 1) {
-					let lastLoginStatus = getters.isLogin;
-					commit('userInfo', res.data);
-					commit('isLogin', true);
-					dispatch('showAuthModal', '');
-					!lastLoginStatus && share.setShareInfo();
-					// 存在分享信息 添加分享记录
-					let spm = uni.getStorageSync('spm');
-					if (spm) {
-						http('common.shareAdd', {
-							spm: spm
-						});
-						uni.removeStorageSync('spm');
+					if (res.code === 1) {
+						let lastLoginStatus = getters.isLogin;
+						commit('userInfo', res.data);
+						commit('isLogin', true);
+						dispatch('showAuthModal', '');
+						!lastLoginStatus && share.setShareInfo();
+						// 存在分享信息 添加分享记录
+						let spm = uni.getStorageSync('spm');
+						if (spm) {
+							http('common.shareAdd', {
+								spm: spm
+							});
+							uni.removeStorageSync('spm');
+						}
+						resolve(res.data)
 					}
-					resolve(res.data)
-				}
 
-			}).then(() => {
-				// 只有在登录的时候请求购物车信息，订单信息，获取登录信息之后。
-				token && dispatch('getCartList');
-				token && dispatch('getUserData');
-			})
+				}).then(() => {
+					// 只有在登录的时候请求购物车信息，订单信息，获取登录信息之后。
+					token && dispatch('getCartList');
+					token && dispatch('getUserData');
+				})
 				.catch(e => {
 					reject(e)
 				})
@@ -163,8 +206,8 @@ const actions = {
 
 const mutations = {
 	setAuthType(state, authType) {
-	      state.authType = authType;
-	    },
+		state.authType = authType;
+	},
 	token(state, payload) {
 		state.token = payload;
 		uni.setStorageSync("token", payload);
@@ -225,9 +268,9 @@ const mutations = {
 		Object.keys(typeMap).forEach(key => {
 			idsMap[key] = []
 			typeMap[key].forEach(item => {
-                if (messageIdsObj[item]) {
-                    idsMap[key].push(messageIdsObj[item])
-                }
+				if (messageIdsObj[item]) {
+					idsMap[key].push(messageIdsObj[item])
+				}
 			})
 		})
 		state.subscribeMessageIdsMap = idsMap
@@ -241,4 +284,4 @@ export default {
 	mutations,
 	actions,
 	getters
-}
+}
\ No newline at end of file