diff --git a/components/diy_goodsGroup/diy_goodsGroup.js b/components/diy_goodsGroup/diy_goodsGroup.js
index 889a03c..5072fd3 100644
--- a/components/diy_goodsGroup/diy_goodsGroup.js
+++ b/components/diy_goodsGroup/diy_goodsGroup.js
@@ -112,7 +112,7 @@ Component({
   },
 
   pageLifetimes: {
-    //游客登陆后，只要更新卡的情况
+    //游客登录后，只要更新卡的情况
     show: function () {
         //--初始化卡类--
         this.card_init();
diff --git a/components/diy_service/diy_service.wxml b/components/diy_service/diy_service.wxml
index 73fe0dc..f2c6c0a 100644
--- a/components/diy_service/diy_service.wxml
+++ b/components/diy_service/diy_service.wxml
@@ -1,6 +1,6 @@
 <!--有在线客户 和 打电话-->
 <block wx:if="{{sys_switch.weapp_customertype}}">
-   <!-- 判断是不是有登陆  -->
+   <!-- 判断是不是有登录  -->
    <view  wx:if="{{userInfo}}" class="custom-service" bindtap="go_user" >
 	    <view style="text-align: center;">
 		  <image class="cs-img" src="{{object.img}}"></image>
diff --git a/components/goods_list/goods_list.js b/components/goods_list/goods_list.js
index fd484ac..153a4f1 100644
--- a/components/goods_list/goods_list.js
+++ b/components/goods_list/goods_list.js
@@ -24,7 +24,7 @@ Component({
   ready: function () {
   },
   pageLifetimes:{
-    //要处理一下，游客登陆后的界面的变化,主要还该是改变会员
+    //要处理一下，游客登录后的界面的变化,主要还该是改变会员
     show: function () {
       this.init();
     }
diff --git a/packageA/pages/activity_share/activity_share.js b/packageA/pages/activity_share/activity_share.js
index 2c7e35a..5383241 100644
--- a/packageA/pages/activity_share/activity_share.js
+++ b/packageA/pages/activity_share/activity_share.js
@@ -59,7 +59,7 @@ Page({
 	 var StaffId=options.StaffId;
 	 var StorageId=options.StorageId;
      if(first_leader){
-     	  //--  user_id代过来免登陆 --
+     	  //--  user_id代过来免登录 --
           getApp().globalData.user_id=first_leader;
      	  getApp().getUserFir();
 		  
diff --git a/packageA/pages/goods_share/goods_share.js b/packageA/pages/goods_share/goods_share.js
index 313d6da..fbc4d48 100644
--- a/packageA/pages/goods_share/goods_share.js
+++ b/packageA/pages/goods_share/goods_share.js
@@ -36,7 +36,7 @@ Page({
 	 var StaffId=options.StaffId;
 	 var StorageId=options.StorageId;
      if(first_leader){
-		  //--  user_id代过来免登陆 --
+		  //--  user_id代过来免登录 --
           getApp().globalData.user_id=first_leader;
 		  getApp().getUserFir();
 	  
diff --git a/packageA/pages/jfbuy/jfbuy.js b/packageA/pages/jfbuy/jfbuy.js
index 8edae35..433181a 100644
--- a/packageA/pages/jfbuy/jfbuy.js
+++ b/packageA/pages/jfbuy/jfbuy.js
@@ -80,7 +80,7 @@ Page({
      // //接受有没有导购的参数
      // var first_leader=options.first_leader;
      // if(first_leader){
-     // 	  //--  user_id代过来免登陆 --
+     // 	  //--  user_id代过来免登录 --
      //      getApp().globalData.user_id=first_leader;
      // 	  getApp().getUserFir();
      //  }
diff --git a/packageA/pages/liveStreamDetails/liveStreamDetails.js b/packageA/pages/liveStreamDetails/liveStreamDetails.js
index 24b87c4..a62fe51 100644
--- a/packageA/pages/liveStreamDetails/liveStreamDetails.js
+++ b/packageA/pages/liveStreamDetails/liveStreamDetails.js
@@ -403,7 +403,7 @@ drawText: function(ctx, str, leftWidth, initHeight, titleHeight, canvasWidth, un
 	var storageId=options.storageId;
 
 	if(first_leader){
-		 //--  user_id代过来免登陆 --
+		 //--  user_id代过来免登录 --
 	     getApp().globalData.first_leader=first_leader;	  
 	     //调用接口判断是不是会员
 	     getApp().request.promiseGet("/api/weshop/shoppingGuide/get/"+o.stoid+"/"+first_leader,{}).then(res=>{
diff --git a/packageA/pages/live_share/live_share.js b/packageA/pages/live_share/live_share.js
index c2d1c9c..7d3f742 100644
--- a/packageA/pages/live_share/live_share.js
+++ b/packageA/pages/live_share/live_share.js
@@ -31,7 +31,7 @@ Page({
 	  var StaffId=options.StaffId;
 	  var StorageId=options.StorageId;
 	  if(first_leader){
-	  		  //--  user_id代过来免登陆 --
+	  		  //--  user_id代过来免登录 --
 	          getApp().globalData.user_id=first_leader;
 	  		  getApp().getUserFir();
 			  //设置分享会员和导购id和归属门店ID
diff --git a/packageA/pages/quan/quan.js b/packageA/pages/quan/quan.js
index 0336b3d..b53a556 100644
--- a/packageA/pages/quan/quan.js
+++ b/packageA/pages/quan/quan.js
@@ -29,7 +29,7 @@ Page({
 	  var StaffId=options.StaffId;
 	  var StorageId=options.StorageId;
 	  if(first_leader){
-	  	   //--  user_id代过来免登陆 --
+	  	   //--  user_id代过来免登录 --
 	       getApp().globalData.user_id=first_leader;
 	  	   getApp().getUserFir();
 		   //设置分享会员和导购id和归属门店ID
diff --git a/packageA/pages/quan_pro/quan_pro.js b/packageA/pages/quan_pro/quan_pro.js
index e5c6b48..370eced 100644
--- a/packageA/pages/quan_pro/quan_pro.js
+++ b/packageA/pages/quan_pro/quan_pro.js
@@ -23,7 +23,7 @@ Page({
 	var th = this;
 	var first_leader=t.first_leader;
 	if(first_leader){
-		 //--  user_id代过来免登陆 --
+		 //--  user_id代过来免登录 --
 	     getApp().globalData.first_leader=first_leader;	    	 
 	     //调用接口判断是不是会员
 	     getApp().request.promiseGet("/api/weshop/shoppingGuide/get/"+os.stoid+"/"+first_leader,{}).then(res=>{
diff --git a/pages/cart/cart/cart.js b/pages/cart/cart/cart.js
index ec3ce0b..ab25a7e 100644
--- a/pages/cart/cart/cart.js
+++ b/pages/cart/cart/cart.js
@@ -44,7 +44,7 @@ Page({
       title: "购物车",
     })
    
-    //判断是否有登陆
+    //判断是否有登录
     t.auth.hadAuth() && t.getUserInfo(function() {
       a.getCardList();
     });
diff --git a/pages/giftpack/giftpacklist/giftpacklist.js b/pages/giftpack/giftpacklist/giftpacklist.js
index b641929..eebada5 100644
--- a/pages/giftpack/giftpacklist/giftpacklist.js
+++ b/pages/giftpack/giftpacklist/giftpacklist.js
@@ -41,7 +41,7 @@ Page({
 	//-- 获取分享人的ID --
 	var first_leader=options.first_leader;
 	if(first_leader){
-		 //--  user_id代过来免登陆 --
+		 //--  user_id代过来免登录 --
 	     getApp().globalData.first_leader=first_leader;	  	  
 	     //调用接口判断是不是会员
 	     getApp().request.promiseGet("/api/weshop/shoppingGuide/get/"+os.stoid+"/"+first_leader,{}).then(res=>{
diff --git a/pages/index/index/index.js b/pages/index/index/index.js
index 811ce34..d656ff9 100644
--- a/pages/index/index/index.js
+++ b/pages/index/index/index.js
@@ -85,7 +85,7 @@ Page({
 	}
 	
 	if(first_leader){
-		 //--  user_id代过来免登陆 --
+		 //--  user_id代过来免登录 --
 	     getApp().globalData.first_leader=first_leader;	  
 	     //调用接口判断是不是会员
 	     getApp().request.promiseGet("/api/weshop/shoppingGuide/get/"+os.stoid+"/"+first_leader,{}).then(res=>{
diff --git a/pages/togoin/togoin.js b/pages/togoin/togoin.js
index 5fa8b65..ec03e0a 100644
--- a/pages/togoin/togoin.js
+++ b/pages/togoin/togoin.js
@@ -67,7 +67,7 @@ Page({
 				 that.setData({user:user})				 
                  //如果有会员的话,没有sessionKey
                  if(!e.data.data.sessionKey){
-					 getApp().showWarning("登陆成功");
+					 getApp().showWarning("登录成功");
                      getApp().globalData.userInfo=e.data.data;
 					 getApp().globalData.user_id=e.data.data.user_id;
 					 getApp().globalData.openid = e.data.data.weapp_openid;
@@ -89,7 +89,7 @@ Page({
     })
   },
   
-  //暂不登陆，返回上一页
+  //暂不登录，返回上一页
   cancle_bind:function () {
      wx.navigateBack({ delta: 1})
   },
diff --git a/pages/togoin/togoin.wxml b/pages/togoin/togoin.wxml
index 0330745..81a94df 100644
--- a/pages/togoin/togoin.wxml
+++ b/pages/togoin/togoin.wxml
@@ -16,20 +16,20 @@
       <button hidden="{{user}}"  class="getPhoneNumber" open-type="getUserInfo"  bindgetuserinfo="bindGetUserInfo">
         <view class="flex flex-center2 ali-c">
           <image class="we_chat" src="{{imghots}}/miniapp/images/we_chat.png"></image>
-          <view>微信账号快捷登陆</view>
+          <view>微信账号快捷登录</view>
         </view>
       </button>  
 	  <!-- 点击显示绑定手机的对话框 -->	
 	  <button  hidden="{{!user}}" class="getPhoneNumber" bindtap="show_bind_mobile">
 		  <view  class="flex flex-center2 ali-c" >
 			<image class="we_chat" src="{{imghots}}/miniapp/images/we_chat.png"></image>
-			<view>微信账号快捷登陆</view>
+			<view>微信账号快捷登录</view>
 		  </view>
 	  </button>	  
     </view>
 
     <view class="userlongin flex-center2 flex fs30 jc_sb" style="margin: 0 130rpx">
-      <view bindtap="cancle_bind">暂不登陆</view> 
+      <view bindtap="cancle_bind">暂不登录</view> 
     </view>
 
   </view>
@@ -41,7 +41,7 @@
 	<view class="cover-layer" bindtap="close_pop"></view>	
 	<view class="p_content">
 		<view class="p_title flex ali-c fs34">
-			请授权绑定手机号完成注册，拒绝将登陆失败
+			请授权绑定手机号完成注册，拒绝将登录失败
 		</view>
 		<view class="flex btn_view">
 			<view bindtap="close_pop" style="height: 100%; line-height:normal;" class="txt-center f2 flex ali-c flex-center2 fs36 b_right">拒绝</view>        
diff --git a/pages/user/return_goods_list/return_goods_list.js b/pages/user/return_goods_list/return_goods_list.js
index d137523..b7add3a 100644
--- a/pages/user/return_goods_list/return_goods_list.js
+++ b/pages/user/return_goods_list/return_goods_list.js
@@ -15,7 +15,7 @@ Page({
     },
     onLoad: function() {
       var th=this,ts=s;
-      //确保有登陆
+      //确保有登录
       e.getUserInfo(function(){
         ts.init(th, "", "list"), th.requestReturnGoods();
       })