Merge branch 'master' of http://git.excellentkk.cn/C.C/nk-shop2.0

components/Authorize.vue

@@ -178,7 +178,7 @@
         console.log(11);
         toLogin(true);
         uni.navigateTo({
-          url: '/pages/users/login/index'
+          url: '/pages/users/login/login_copy'
         })
         console.log(22);
         return
@@ -209,7 +209,7 @@
               } else {
                 uni.setStorageSync('auth_token', res.data.result.key);
                 return uni.navigateTo({
-                  url: '/pages/users/login/index'
+                  url: '/pages/users/login/login_copy'
                 })
               }
             }).catch(res => {

config/app.js

@@ -9,8 +9,8 @@ let httpApiThree
 // 网络接口修改此字符 小程序域名要求https
 // let httpApi = 'http://192.168.31.110:8324' // 测试
 if (process.env.NODE_ENV === "development") {
-  httpApi = "https://crmeb-test.shop.lihaink.cn"
+  // httpApi = "https://crmeb-test.shop.lihaink.cn"
-  // httpApi = "http://192.168.0.109:8325"
+  httpApi = "http://192.168.0.222"
   // #ifdef MP-WEIXIN
   httpApiTwo = "http://cms.com"
   httpApiThree = 'http://ceshi-oa.lihaink.cn'

libs/login.js

@@ -47,7 +47,7 @@ export function toLogin(push, pathLogin) {
 	}
 	// #endif
 	if (!pathLogin)
-		pathLogin = '/page/users/login/index'
+		pathLogin = '/page/users/login/login_copy'
 	Cache.set('login_back_url', path);
 	// #ifdef H5
 	if (isWeixin()) {
@@ -55,9 +55,9 @@ export function toLogin(push, pathLogin) {
 	} else {
 		if (path !== pathLogin) {
 			push ? uni.navigateTo({
-				url: '/pages/users/login/index'
+				url: '/pages/users/login/login_copy'
 			}) : uni.reLaunch({
-				url: '/pages/users/login/index'
+				url: '/pages/users/login/login_copy'
 			});
 		}
 	}
@@ -65,7 +65,7 @@ export function toLogin(push, pathLogin) {
 
 	// #ifdef APP-PLUS
 	uni.navigateTo({
-		url: '/pages/users/login/index',
+		url: '/pages/users/login/login_copy',
 	})
 	// #endif
 }

pages.json

@@ -499,7 +499,7 @@
           }
         },
         {
-          "path": "login/index",
+          "path": "login/login_copy",
           "style": {
             "navigationBarTitleText": "登录",
             "navigationBarBackgroundColor": "#EB5447",

pages/short_video/nvueSwiper/index.nvue

@@ -323,7 +323,7 @@
         aixinTop: 0,
         Rotate: 0,
         currentNav: 1,
-        limit: 3,
+        limit: 10,
         page: 1,
         oldCurrent: 1,
         H5ShareBox: false,

pages/store/home/index.vue

@@ -688,6 +688,7 @@
             this.getCoupon();
             break;
           case 7:
+		    this.loadTitle=''
             this.getProductSpu()
             break;
         }
@@ -787,6 +788,8 @@
 		  that.loadTitle = loadend ? '已全部加载' : '加载更多';
 		  that.$set(that, 'goods', goodsList);
 		  that.$set(that.where, 'page', that.where.page + 1);
+		  console.log(that.loadTitle);
+		  console.log(that.loadend);
 		}).catch(err => {
 		  that.loading = false;
 		  that.goodsLoading = false;
@@ -813,7 +816,7 @@
         const query = uni.createSelectorQuery().in(this);
         query.select('#goods').boundingClientRect(data => {
           if (data.bottom < 1500 && data.top < 0) {
-			  if (this.tabActive == 7) {
+			  if (this.loadend == false) {
 				  this.getProductSpu()
 			  } else {
 				  this.getGoods();
@@ -1146,7 +1149,9 @@
           return false;
         }
         this.goods = []
+		this.where.page=1
         this.tabActive = param;
+		console.log(this.goods);
         this.goodsLoading = this.loadend = this.loading = false
       },
       resetParmas() {

pages/users/login/login_copy.vue

@@ -1,6 +1,7 @@
 <template>
 	<div :style="viewColor">
 	<div class="register absolute" v-if="!auth_token">
+		<div class="login">
 			<div class="shading">
 				<div class="pictrue acea-row row-center-wrapper">
 					<image :src="login_logo" v-if="login_logo" />
@@ -27,10 +28,14 @@
 							</div>
 						</div>
 					</form>
+					<div class="tip">
+						<span @click="formItem = 2" class="font-color-red">立即注册</span>
 						<navigator class="forgetPwd" hover-class="none" url="/pages/users/retrievePassword/index">
 							忘记密码
 						</navigator>
 					</div>
+	
+				</div>
 				<div class="list" :hidden="current !== 1">
 					<div class="item">
 						<div class="acea-row row-middle">
@@ -55,19 +60,15 @@
 						</div>
 					</div>
 				</div>
+		
+				<div class="logon" v-debounce @click="loginMobile" :hidden="current !== 1">登录</div>
+				<div class="logon" v-debounce @click="submit" :hidden="current === 1">登录</div>
 				<div class="protocol acea-row row-between-wrapper">
 					<checkbox-group class="checkgroup" @change='isAgree=!isAgree'>
 						<checkbox class="checkbox" :checked="isAgree ? true : false" />
 						<text class="protocol_text">我已同意<text @click="userAgree" class="font_pro">《用户协议》</text>与<text @click="userPrivacyAgree" class="font_pro">《隐私政策》</text></text>
 					</checkbox-group>
 				</div>
-			<div class="logon" v-debounce @click="loginMobile" :hidden="current !== 1">登录</div>
-			<div class="logon" v-debounce @click="submit" :hidden="current === 1">登录</div>
-			<div class="tip">
-				没有账号?
-				<span @click="formItem = 2" class="font-color-red">立即注册</span>
-			</div>
-			
 				<!-- #ifdef MP -->
 				<view class="appLogin">
 					<view class="hds">
@@ -134,17 +135,20 @@
 						</div>
 					</div>
 				</div>
+				<div class="tip">
+					<div>
+						已有账号?
+						<span @click="formItem = 1" class="font-color-red">去登录</span>
+					</div>
+				</div>
+				<div class="logon" @click="register">注册</div>
 				<div class="protocol acea-row row-between-wrapper">
 					<checkbox-group class="checkgroup" @change='isAgree=!isAgree'>
 						<checkbox class="checkbox" :checked="isAgree ? true : false" />
 						<text class="protocol_text">我已同意<text @click="userAgree" class="font_pro">《用户协议》</text>与<text @click="userPrivacyAgree" class="font_pro">《隐私政策》</text></text>			
 					</checkbox-group>
 				</div>
-			<div class="logon" @click="register">注册</div>
+				
-			<div class="tip">	
-				已有账号?
-				<span @click="formItem = 1" class="font-color-red">立即登录</span>
-			</div>
 				<!-- #ifdef APP-PLUS -->
 				<view class="appLogin" v-if="!appLoginStatus && !appleLoginStatus">
 					<view class="hds">
@@ -163,6 +167,7 @@
 				</view>
 				<!-- #endif -->			
 			</div>
+		</div>
 		<div class="bottom"></div>
 		<view class="settlementAgreement" v-if="showAgreement">
 			<view class="setAgCount">
@@ -273,7 +278,7 @@
 		data: function() {
 			return {
 				navList: ["账号登录", "快速登录"],
-				current: 1,
+				current: 0,
 				account: "",
 				password: "",
 				captcha: "",
@@ -1026,6 +1031,9 @@
 		overflow-y: scroll;
 	}
 	.protocol{
+		display: flex;
+		justify-content: center;
+		text-align: center;
 		margin-top: 30rpx;
 	}
 	.protocol_text{

pages/users/user_goods_collection/index.vue

@@ -286,7 +286,7 @@
 					});
 				}).catch(err => {
 					return that.$util.Tips({
-						title: err,
+						title: '该商品已下架,无法取消收藏',
 					});
 				});;
 			},

pages/users/user_grade/index.vue

@@ -26,7 +26,7 @@
 					</view>
 				</view>
 			</view>
-			<view class="card-wrapper" :style="'background-image: url('+brokerage_bg+')'">
+			<view v-if="next_level" class="card-wrapper" :style="'background-image: url('+brokerage_bg+')'">
 				<view class="growth">
 					<!-- <view class="title">{{curLevel&&curLevel.brokerage_name || ''}}</view> -->
 					<view class="info">今日获得成长值{{growthValue}}点</view>