Merge branch 'master' of https://gitea.lihaink.cn/mkm/new_shop_app

components/Authorize.vue

@@ -6,7 +6,7 @@
 				<image class="image" :src='routine_logo' mode="aspectFit"></image>
 			</view> -->
 			<!--#ifdef H5-->
-			<text v-if="isWeixin" class='title'>{{isPay?'付款提醒':'授权提醒'}}</text>
+			<text v-if="isWeixin" class='title'>{{isPay?'支付提醒':'授权提醒'}}</text>
 			<text v-else class='title'>{{title}}</text>
 			<!--#endif-->
 			<!--#ifdef APP-PLUS-->
@@ -39,7 +39,7 @@
 				<!-- #endif -->
 				<!-- #ifdef H5 -->
 				<button class="item grant" @tap="toWecahtAuth">
-					<text v-if="isWeixin" class="text">{{isPay?'去支付':'去授权'}}</text>
+					<text v-if="isWeixin" class="text">{{isPay?'确认':'去授权'}}</text>
 					<text v-else class="text">去登录</text>
 				</button>
 				<!-- #endif -->
@@ -91,7 +91,7 @@
 				type: Boolean,
 				default: false
 			},
-      isPay:{
+			isPay: {
 				type: Boolean,
 				default: false
 			},
@@ -152,7 +152,7 @@
 				this.editModal = false
 			},
 			// #endif
-      setPayInfo(e){
+			setPayInfo(e) {
 				this.payInfo = e;
 			},
 			setAuthStatus() {

pages/index/index.vue

@@ -93,7 +93,8 @@
 							</recommend>
 							<view class="loadingicon acea-row row-center-wrapper"
 								v-if="hostProduct[hostIndex].length > 0 || hotLoading[hostIndex]">
-								<text class="loading iconfont icon-jiazai" :hidden="hotLoading[hostIndex] == false"></text>
+								<text class="loading iconfont icon-jiazai"
+									:hidden="hotLoading[hostIndex] == false"></text>
 								{{ hotTitle }}
 							</view>
 						</view>
@@ -372,7 +373,9 @@
 	import {
 		HTTP_REQUEST_URL
 	} from '@/config/app';
-  import {showTab} from "@/utils/showTab.js";
+	import {
+		showTab
+	} from "@/utils/showTab.js";
 	export default {
 		computed: configMap({
 				hide_mer_status: 0,
@@ -461,7 +464,12 @@
 					limit: 6
 				},
 				is_switch: true,
-				hostProduct: [[],[],[],[]],
+				hostProduct: [
+					[],
+					[],
+					[],
+					[]
+				],
 				hostIndex: 0,
 				hotPage: 1,
 				hotLimit: 20,
@@ -1012,9 +1020,9 @@
 			changeRecommedTab(e) {
 				this.hotPage = 1;
 				this.hotScroll = true;
-        this.hostIndex = e-1;
+				this.hostIndex = e - 1;
 				let hostList = this.hostProduct;
-        hostList[e-1] = [];
+				hostList[e - 1] = [];
 				this.$set(this, 'hostProduct', hostList);
 				this.loadGoods(e);
 			},
@@ -1033,7 +1041,7 @@
 			/**
 			 * 获取我的推荐
 			 */
-			get_host_product: function(e=0) {
+			get_host_product: function(e = 0) {
 				let that = this;
 				let num = that.hotLimit;
 				if (!that.hotScroll) return;
@@ -1043,22 +1051,24 @@
 				getProductHot(that.hotPage, that.hotLimit, 1, 1).then(res => {
 					let list = res.data.list;
 					let productList = that.hostProduct;
-          if(!productList[e]) productList[e] = [];
+					if (!productList[e]) productList[e] = [];
 					productList[e] = [...productList[e], ...res.data.list];
-					let hotScroll = list.length <= num && list.length != 0;
+					let hotScroll = list.length <= res.data.limit && list.length != 0;
 					that.hotScroll = hotScroll;
 					that.hotLoading[e] = false;
 					that.hotTitle = !hotScroll ? '已全部加载' : '加载更多';
 
 					that.$set(that, 'hostProduct', productList);
-          if(this.hostIndex==e) this.$forceUpdate();
+					if (this.hostIndex == e) this.$forceUpdate();
-					that.$set(that, 'hotPage', that.hotPage + 1);
+
+					that.$set(that, 'hotPage', res.data.page + 1);
+					that.$set(that, 'hotLimit', res.data.limit);
 				});
 			},
 			/**
 			 * 获取里海云仓, 云市场, 名优特产
 			 */
-			get_host_home: function(query = {}, e=1) {
+			get_host_home: function(query = {}, e = 1) {
 				let that = this;
 				let num = that.hotLimit;
 				if (!that.hotScroll) return;
@@ -1074,15 +1084,16 @@
 				}).then(res => {
 					let list = res.data.list;
 					let productList = that.hostProduct;
-					if(!productList[e]) productList[e] = [];
+					if (!productList[e]) productList[e] = [];
 					productList[e] = [...productList[e], ...list];
-					let hotScroll = list.length <= num && list.length != 0;
+					let hotScroll = list.length <= res.data.limit && list.length != 0;
 					that.hotScroll = hotScroll;
 					that.hotLoading[e] = false;
 					that.hotTitle = !hotScroll ? '已全部加载' : '加载更多';
 					that.$set(that, 'hostProduct', productList);
-          if(this.hostIndex==e) this.$forceUpdate();
+					if (this.hostIndex == e) this.$forceUpdate();
-					that.$set(that, 'hotPage', that.hotPage + 1);
+					that.$set(that, 'hotPage', res.data.page + 1);
+					that.$set(that, 'hotLimit', res.data.limit);
 				});
 			},
 

pages/payment/get_payment.vue

@@ -56,7 +56,8 @@
 			</view>
 
 			<!-- 登陆 -->
-			<authorize :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse" @onLoadFun="onLoadFun" />
+			<authorize :isAuto="isAuto" :is-pay="true" :isShowAuth="isShowAuth" @authColse="authColse"
+				@onLoadFun="onLoadFun" />
 		</view>
 
 		<!-- 无商户信息提示 -->