mkm/new_shop_app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
weipengfei 2024-04-03 17:37:49 +08:00
commit da374881c5
3 changed files with 57 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
components/Authorize.vue
View File

@ -6,7 +6,7 @@
<image class="image" :src='routine_logo' mode="aspectFit"></image> <image class="image" :src='routine_logo' mode="aspectFit"></image>
</view> --> </view> -->
<!--#ifdef H5--> <!--#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> <text v-else class='title'>{{title}}</text>
<!--#endif--> <!--#endif-->
<!--#ifdef APP-PLUS--> <!--#ifdef APP-PLUS-->
@ -39,7 +39,7 @@
<!-- #endif --> <!-- #endif -->
<!-- #ifdef H5 --> <!-- #ifdef H5 -->
<button class="item grant" @tap="toWecahtAuth"> <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> <text v-else class="text">去登录</text>
</button> </button>
<!-- #endif --> <!-- #endif -->

25
pages/index/index.vue
View File

@ -93,7 +93,8 @@
</recommend> </recommend>
<view class="loadingicon acea-row row-center-wrapper" <view class="loadingicon acea-row row-center-wrapper"
v-if="hostProduct[hostIndex].length > 0 || hotLoading[hostIndex]"> 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 }} {{ hotTitle }}
</view> </view>
</view> </view>
@ -372,7 +373,9 @@
import { import {
HTTP_REQUEST_URL HTTP_REQUEST_URL
} from '@/config/app'; } from '@/config/app';
import {showTab} from "@/utils/showTab.js"; import {
showTab
} from "@/utils/showTab.js";
export default { export default {
computed: configMap({ computed: configMap({
hide_mer_status: 0, hide_mer_status: 0,
@ -461,7 +464,12 @@
limit: 6 limit: 6
}, },
is_switch: true, is_switch: true,
hostProduct: [[],[],[],[]], hostProduct: [
[],
[],
[],
[]
],
hostIndex: 0, hostIndex: 0,
hotPage: 1, hotPage: 1,
hotLimit: 20, hotLimit: 20,
@ -1045,14 +1053,16 @@
let productList = that.hostProduct; let productList = that.hostProduct;
if (!productList[e]) productList[e] = []; if (!productList[e]) productList[e] = [];
productList[e] = [...productList[e], ...res.data.list]; 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.hotScroll = hotScroll;
that.hotLoading[e] = false; that.hotLoading[e] = false;
that.hotTitle = !hotScroll ? '已全部加载' : '加载更多'; that.hotTitle = !hotScroll ? '已全部加载' : '加载更多';
that.$set(that, 'hostProduct', productList); 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);
}); });
}, },
/** /**
@ -1076,13 +1086,14 @@
let productList = that.hostProduct; let productList = that.hostProduct;
if (!productList[e]) productList[e] = []; if (!productList[e]) productList[e] = [];
productList[e] = [...productList[e], ...list]; 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.hotScroll = hotScroll;
that.hotLoading[e] = false; that.hotLoading[e] = false;
that.hotTitle = !hotScroll ? '已全部加载' : '加载更多'; that.hotTitle = !hotScroll ? '已全部加载' : '加载更多';
that.$set(that, 'hostProduct', productList); 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);
}); });
}, },

3
pages/payment/get_payment.vue
View File

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