优化分享链接多次提示问题,优化店铺点击搜索bug,优化登录页面在h5部分手机显示第三方登录样式问题
parent
109af44c6b
commit
bbf0f39d69
9
App.vue
9
App.vue
|
@ -65,8 +65,8 @@ export default {
|
|||
|
||||
onShow() {
|
||||
// #ifndef H5
|
||||
this.getClipboard();
|
||||
// #endif
|
||||
this.getClipboard();
|
||||
// #endif
|
||||
// #ifdef APP-PLUS
|
||||
|
||||
if (storage.getShow()) {
|
||||
|
@ -148,10 +148,13 @@ export default {
|
|||
*/
|
||||
async getClipboard() {
|
||||
let res = await getClipboardData();
|
||||
|
||||
/**
|
||||
* 解析粘贴板数据
|
||||
*/
|
||||
if (res.indexOf(config.shareLink) != -1) {
|
||||
|
||||
if (res.indexOf(config.shareLink) != -1 && (res!= this.$store.state.shareLink)) {
|
||||
this.$store.state.shareLink = res
|
||||
uni.showModal({
|
||||
title: "提示",
|
||||
content: "检测到一个分享链接是否跳转?",
|
||||
|
|
|
@ -846,7 +846,7 @@ page {
|
|||
display: flex;
|
||||
width: 590rpx;
|
||||
position: absolute;
|
||||
bottom: 20px;
|
||||
top: 1200rpx;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
}
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
<template>
|
||||
<div>
|
||||
<u-navbar :border-bottom="false">
|
||||
<u-search v-model="keyword" @search="search" @click="search" placeholder="请输入搜索"></u-search>
|
||||
<u-navbar :border-bottom="false">
|
||||
<u-search v-model="keyword" @custom='search' :show-action="true" action-text="搜索" :animation="true" @search="search" @click="search" placeholder="请输入搜索"></u-search>
|
||||
</u-navbar>
|
||||
<div class="wrapper">
|
||||
<!-- 店铺信息模块 -->
|
||||
|
@ -58,9 +58,10 @@
|
|||
<!-- menu -->
|
||||
|
||||
<!-- 商品 -->
|
||||
<div class="contant" v-if="current == 0">
|
||||
<view v-if="!goodsList.length" class="empty">暂无商品信息</view>
|
||||
<goodsTemplate :res="goodsList" :storeName="false" />
|
||||
<div class="contant" v-if="current == 0">
|
||||
|
||||
<u-empty style='margin-top:100rpx' v-if="goodsList.length == 0" class="empty" text='暂无商品信息'></u-empty>
|
||||
<goodsTemplate v-else :res="goodsList" :storeName="false" />
|
||||
</div>
|
||||
<!-- 全部分类 -->
|
||||
<div class="category" v-if="current == 1">
|
||||
|
@ -73,7 +74,7 @@
|
|||
</div>
|
||||
<!-- 分类子级 -->
|
||||
<div class="child-list" v-if="item.children && item.children.length!=0">
|
||||
<div class="child" @click="getCategoryGoodsList(child)" v-for="(child,i) in item.children">{{child.labelName}}
|
||||
<div class="child" @click="getCategoryGoodsList(child)" :key='i' v-for="(child,i) in item.children">{{child.labelName}}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
@ -111,7 +112,7 @@ export default {
|
|||
couponList: [], //优惠券列表
|
||||
categoryList: [],
|
||||
couponParams: { pageNumber: 1, pageSize: 50, storeId: "" },
|
||||
goodsParams: { pageNumber: 1, pageSize: 50, storeId: "" },
|
||||
goodsParams: { pageNumber: 1, pageSize: 10, storeId: "" },
|
||||
};
|
||||
},
|
||||
watch: {
|
||||
|
@ -234,7 +235,8 @@ export default {
|
|||
/**
|
||||
* 搜索
|
||||
*/
|
||||
search() {
|
||||
search() {
|
||||
console.log("点击")
|
||||
uni.navigateTo({
|
||||
url: `/pages/navigation/search/searchPage?storeId=${this.storeId}&keyword=${this.keyword}`,
|
||||
});
|
||||
|
@ -259,7 +261,8 @@ export default {
|
|||
async getGoodsData() {
|
||||
let res = await getGoodsList(this.goodsParams);
|
||||
if (res.data.success) {
|
||||
this.goodsList.push(...res.data.result.content);
|
||||
this.goodsList.push(...res.data.result.content);
|
||||
console.log(this.goodsList)
|
||||
}
|
||||
},
|
||||
|
||||
|
|
|
@ -6,6 +6,7 @@ Vue.use(Vuex);
|
|||
|
||||
const store = new Vuex.Store({
|
||||
state: {
|
||||
shareLink:"", //分享链接
|
||||
verificationKey: "", //获取key表示验证通过
|
||||
distributionId:"", //分销员Id 如果当前账户从未登录过时记录
|
||||
hasLogin: storage.getHasLogin(),
|
||||
|
|
Loading…
Reference in New Issue