From d8ee7226825cdf95791cdec563c2b574cf445320 Mon Sep 17 00:00:00 2001
From: shane <88386378@qq.com>
Date: Sun, 5 Dec 2021 01:04:45 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=B0=8F=E7=A8=8B?=
 =?UTF-8?q?=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/vc-recommend/vc-recommend.vue | 2 +-
 components/vc-shop/vc-shop.vue           | 2 +-
 pages/register/register.vue              | 5 +++++
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/components/vc-recommend/vc-recommend.vue b/components/vc-recommend/vc-recommend.vue
index cd3aa1e..3a14edb 100644
--- a/components/vc-recommend/vc-recommend.vue
+++ b/components/vc-recommend/vc-recommend.vue
@@ -62,7 +62,7 @@
 					})
 			},
 			_toGoodsDetail: function(_product) {
-				this.vc.navigateTo({
+				this.vc.navigateToMall({
 					url: '/pages/goods/goods?productId=' + _product.productId+"&shopId="+_product.shopId 
 				},true);
 			}
diff --git a/components/vc-shop/vc-shop.vue b/components/vc-shop/vc-shop.vue
index dd311d5..650f968 100644
--- a/components/vc-shop/vc-shop.vue
+++ b/components/vc-shop/vc-shop.vue
@@ -82,7 +82,7 @@
 			_toShopDetail: function(_shop) {
 				let url = this.openType == "1,3" ? '/pages/cate/cate?shopId=' :
 					'/pages/homemaking/shop?shopId='
-				this.vc.navigateTo({
+				this.vc.navigateToMall({
 					url: url + _shop.shopId
 				}, true);
 			}
diff --git a/pages/register/register.vue b/pages/register/register.vue
index 809b2ae..317a956 100755
--- a/pages/register/register.vue
+++ b/pages/register/register.vue
@@ -18,6 +18,9 @@
 			<input v-model="msgCode" placeholder="请输入短信验证码" name="input"></input>
 			<button class='cu-btn bg-green shadow' :disabled="btnDisabled" @click="sendMsgCode()">{{btnValue}}</button>
 		</view>
+		<view >
+			<view >{{codeMsg}}</view>
+		</view> 
 		<view class="padding flex flex-direction margin-top">
 			<button class="cu-btn bg-green   lg" @click="_doRegister()">绑定</button>
 		</view>
@@ -34,6 +37,7 @@
 			return {
 				link: '',
 				second: 60,
+				codeMsg: '',
 				msgCode: '',
 				areaShow: false,
 				btnValue: '验证码',
@@ -87,6 +91,7 @@
 								icon: 'none',
 								duration: 2000
 							});
+							_that.codeMsg = res.data;
 							wx.hideLoading();
 							_that.timer();
 							return;

From 49f8877e98939cd977a1ef36816c94c3125abd8a Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: Sun, 5 Dec 2021 12:13:44 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/register/register.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pages/register/register.vue b/pages/register/register.vue
index 317a956..5489198 100755
--- a/pages/register/register.vue
+++ b/pages/register/register.vue
@@ -30,7 +30,7 @@
 <script>
 	const context = require("../../context/Java110Context.js");
 	const constant = context.constant;
-	import conf from '../../config.js'
+	import conf from '../../conf/config'
 
 	export default {
 		data() {
@@ -114,6 +114,7 @@
 				});
 			},
 			_doRegister: function(e) {
+				console.log(conf.DEFAULT_COMMUNITY_ID,'123')
 				let obj = {
 					"link": this.link,
 					"msgCode": this.msgCode,