修改移动端授权登录bug,没有展示自营标志，以及新增商品详情 自营以及商品数量收藏数量展示
lemon橪
parent
2f180d5178
commit
1489deb618
1
App.vue
1
App.vue
|
|
@ -65,7 +65,6 @@ export default {
|
|||
this.getClipboard();
|
||||
// #endif
|
||||
},
|
||||
|
||||
methods: {
|
||||
// TODO 开屏广告 后续优化添加
|
||||
launch() {
|
||||
|
|
|
|||
|
|
@ -4,10 +4,10 @@
|
|||
*/
|
||||
// 开发环境
|
||||
const dev = {
|
||||
common: "http://192.168.0.100:8890",
|
||||
buyer: "http://192.168.0.100:8888",
|
||||
// common: "https://common-api.pickmall.cn",
|
||||
// buyer: "https://buyer-api.pickmall.cn",
|
||||
// common: "http://192.168.0.100:8890",
|
||||
// buyer: "http://192.168.0.100:8888",
|
||||
common: "https://common-api.pickmall.cn",
|
||||
buyer: "https://buyer-api.pickmall.cn",
|
||||
};
|
||||
// 生产环境
|
||||
const prod = {
|
||||
|
|
|
|||
|
|
@ -408,7 +408,9 @@
|
|||
{
|
||||
"path": "wechatMPLogin",
|
||||
"style": {
|
||||
"navigationBarTitleText": "小程序登录"
|
||||
"navigationBarTitleText": "小程序登录",
|
||||
"navigationStyle": "custom",
|
||||
"navigationBarTextStyle": "black"
|
||||
}
|
||||
}
|
||||
]
|
||||
|
|
|
|||
|
|
@ -179,7 +179,7 @@
|
|||
</div>
|
||||
<div class="storeSellerName">
|
||||
<div class="textHidden">
|
||||
<u-tag style="margin-right: 10rpx" size="mini" mode="dark" v-if="item.selfOperated == 1" text="自营" type="error" />
|
||||
<u-tag style="margin-right: 10rpx" size="mini" mode="dark" v-if="item.selfOperated" text="自营" type="error" />
|
||||
<span>{{ item.storeName || "暂无" }}</span>
|
||||
</div>
|
||||
<span>
|
||||
|
|
@ -314,7 +314,7 @@ export default {
|
|||
isSWitch: false,
|
||||
|
||||
params: {
|
||||
pageNumber: 0,
|
||||
pageNumber: 1,
|
||||
pageSize: 10,
|
||||
// sort: 'grade_asc',
|
||||
sort: "releaseTime",
|
||||
|
|
@ -324,7 +324,7 @@ export default {
|
|||
minPrice: "",
|
||||
maxPrice: "",
|
||||
sortParams: {
|
||||
pageNumber: 0,
|
||||
pageNumber: 1,
|
||||
pageSize: 10,
|
||||
|
||||
// price: "", //价格,示例值(10_30)
|
||||
|
|
@ -474,7 +474,7 @@ export default {
|
|||
this.minPrice = "";
|
||||
this.maxPrice = "";
|
||||
this.params = {
|
||||
pageNumber: 0,
|
||||
pageNumber: 1,
|
||||
pageSize: 10,
|
||||
};
|
||||
this.loadData();
|
||||
|
|
@ -545,7 +545,7 @@ export default {
|
|||
},
|
||||
|
||||
tabClick(index, type) {
|
||||
this.params.pageNumber = 0;
|
||||
this.params.pageNumber = 1;
|
||||
this.params.pageSize = 10;
|
||||
// this.params.order = "desc";
|
||||
if (this.params.sort == type) {
|
||||
|
|
@ -687,7 +687,7 @@ export default {
|
|||
this.isShowSeachGoods = true;
|
||||
this.$refs.mSearch.isShowSeachGoods = true;
|
||||
this.params.keyword = keyword;
|
||||
this.params.pageNumber = 0;
|
||||
this.params.pageNumber = 1;
|
||||
this.$set(this.sortParams, "keyword", keyword);
|
||||
|
||||
this.loadData("refresh", 1);
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
</template>
|
||||
|
||||
<script>
|
||||
import { webConnect, openIdLogin } from "@/api/connect.js";
|
||||
import { openIdLogin } from "@/api/connect.js";
|
||||
import { whetherNavigate } from "@/utils/Foundation"; //登录跳转
|
||||
import { getUserInfo } from "@/api/members";
|
||||
import storage from "@/utils/storage.js";
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
<template>
|
||||
<view class="container">
|
||||
<u-modal v-model="phoneAuthPopup" :title="projectName+'商城'" :show-confirm-button="false">
|
||||
<u-navbar :custom-back="back" title="小程序登录"></u-navbar>
|
||||
<u-modal v-model="phoneAuthPopup" :mask-close-able="true" :title="projectName+'商城'" :show-confirm-button="false">
|
||||
<div class="tips">
|
||||
为了更好地用户体验，需要您授权手机号
|
||||
</div>
|
||||
|
|
@ -18,8 +19,7 @@
|
|||
<view>您的公开信息（昵称、头像）</view>
|
||||
</view>
|
||||
<view class="btns">
|
||||
<button type="primary" bindtap="getUserProfile" @click="getUserProfile()"
|
||||
class="btn-auth">确认微信授权</button>
|
||||
<button type="primary" bindtap="getUserProfile" @click="getUserProfile()" class="btn-auth">确认微信授权</button>
|
||||
</view>
|
||||
</div>
|
||||
</view>
|
||||
|
|
@ -27,13 +27,10 @@
|
|||
</template>
|
||||
|
||||
<script>
|
||||
import {
|
||||
mpAutoLogin
|
||||
} from "@/api/connect.js";
|
||||
import { mpAutoLogin } from "@/api/connect.js";
|
||||
|
||||
import {
|
||||
getUserInfo
|
||||
} from "@/api/members";
|
||||
import { whetherNavigate } from "@/utils/Foundation"; //登录跳转
|
||||
import { getUserInfo } from "@/api/members";
|
||||
import storage from "@/utils/storage.js";
|
||||
export default {
|
||||
data() {
|
||||
|
|
@ -43,15 +40,20 @@
|
|||
// 授权信息展示，商城名称
|
||||
projectName: "LiLi",
|
||||
//微信返回信息，用于揭秘信息，获取sessionkey
|
||||
code: '',
|
||||
code: "",
|
||||
//微信昵称
|
||||
nickName: '',
|
||||
nickName: "",
|
||||
//微信头像
|
||||
image: '',
|
||||
image: "",
|
||||
};
|
||||
},
|
||||
|
||||
//微信小程序进入页面，先获取code，否则几率出现code和后续交互数据不对应情况
|
||||
mounted() {
|
||||
|
||||
// 小程序默认分享
|
||||
uni.showShareMenu({ withShareTicket: true });
|
||||
|
||||
let that = this;
|
||||
//获取code
|
||||
uni.login({
|
||||
|
|
@ -61,12 +63,24 @@
|
|||
});
|
||||
},
|
||||
methods: {
|
||||
/**
|
||||
* TODO 此方法不一定是最优解，如果有更好的办法请在 https://gitee.com/beijing_hongye_huicheng/lilishop/issues 中提出
|
||||
* 小程序返回bug
|
||||
* 1.介于微信登录是在login.vue的基础上作为判断跳转来
|
||||
* 所以在页面栈中会自动记录回退路径，所以导致每次微信小程序点击回退就会自动返回login页面
|
||||
* 当然login页面的判断就是 没有登录就会跳转到微信小程序页面 导致了无法回退到之前页面
|
||||
* 2.解决方法： 尝试在回退的时候判断地址，让回退多一级这样就避免了
|
||||
*/
|
||||
|
||||
back() {
|
||||
whetherNavigate('wx');
|
||||
},
|
||||
//获取用户信息
|
||||
getUserProfile(e) {
|
||||
let that = this;
|
||||
// 推荐使用wx.getUserProfile获取用户信息，开发者每次通过该接口获取用户个人信息均需用户确认
|
||||
uni.getUserProfile({
|
||||
desc: '用于完善会员资料', // 声明获取用户个人信息后的用途，后续会展示在弹窗中，请谨慎填写
|
||||
desc: "用于完善会员资料", // 声明获取用户个人信息后的用途，后续会展示在弹窗中，请谨慎填写
|
||||
success: (res) => {
|
||||
that.nickName = res.userInfo.nickName;
|
||||
that.image = res.userInfo.avatarUrl;
|
||||
|
|
@ -79,13 +93,11 @@
|
|||
"https://thirdwx.qlogo.cn/mmopen/vi_32/POgEwh4mIHO4nibH0KlMECNjjGxQUq24ZEaGT4poC6icRiccVGKSyXwibcPq4BWmiaIGuG1icwxaQX6grC9VemZoJ8rg/132";
|
||||
//展示手机号获取授权
|
||||
this.phoneAuthPopup = true;
|
||||
}
|
||||
})
|
||||
},
|
||||
});
|
||||
},
|
||||
//获取手机号授权
|
||||
getPhoneNumber(e) {
|
||||
|
||||
let that = this;
|
||||
let iv = e.detail.iv;
|
||||
let encryptedData = e.detail.encryptedData;
|
||||
if (!e.detail.encryptedData) {
|
||||
|
|
@ -123,14 +135,12 @@
|
|||
});
|
||||
}, 500);
|
||||
});
|
||||
|
||||
});
|
||||
|
||||
},
|
||||
},
|
||||
};
|
||||
</script>
|
||||
<style>
|
||||
<style lang="scss" scoped>
|
||||
/*微信授权*/
|
||||
page {
|
||||
background-color: #ffffff;
|
||||
|
|
|
|||
|
|
@ -442,6 +442,11 @@ export default {
|
|||
},
|
||||
async onLoad(options) {
|
||||
this.routerVal = options;
|
||||
|
||||
// #ifdef MP-WEIXIN
|
||||
// 小程序默认分享
|
||||
uni.showShareMenu({ withShareTicket: true });
|
||||
// #endif
|
||||
},
|
||||
async onShow() {
|
||||
this.goodsDetail = {};
|
||||
|
|
|
|||
|
|
@ -6,14 +6,14 @@
|
|||
<u-image width="120rpx" mode="aspectFit" height="120rpx" :src="storeDetail.storeLogo"></u-image>
|
||||
</view>
|
||||
<view class="name-star star-con">
|
||||
<text class="name">{{ storeDetail.storeName }}</text>
|
||||
<view>
|
||||
<text :class="{ star: storeDetail.store_service_credit > 0 }"></text>
|
||||
<text :class="{ star: storeDetail.store_service_credit > 1 }"></text>
|
||||
<text :class="{ star: storeDetail.store_service_credit > 2 }"></text>
|
||||
<text :class="{ star: storeDetail.store_service_credit > 3 }"></text>
|
||||
<text :class="{ star: storeDetail.store_service_credit > 4 }"></text>
|
||||
</view>
|
||||
<div class="name">
|
||||
{{ storeDetail.storeName }}
|
||||
<span v-if="storeDetail.selfOperated == 1" class="shopTag">自营</span>
|
||||
</div>
|
||||
<div class="store-row">
|
||||
<div class="collectionNum">{{ storeDetail.collectionNum || 0 }}人关注</div>
|
||||
<div class="goodsNum">{{ storeDetail.goodsNum || 0 }}件商品</div>
|
||||
</div>
|
||||
</view>
|
||||
<view class="to-store-btn" @click="tostorePage(goodsDetail)">
|
||||
<view>进店逛逛</view>
|
||||
|
|
@ -58,9 +58,8 @@ export default {
|
|||
// 点击商品
|
||||
clickGoods(val) {
|
||||
uni.navigateTo({
|
||||
url: `/pages/product/goods?id=${val.id}&goodsId=${val.goodsId}`
|
||||
url: `/pages/product/goods?id=${val.id}&goodsId=${val.goodsId}`,
|
||||
});
|
||||
|
||||
},
|
||||
|
||||
tostorePage(val) {
|
||||
|
|
@ -73,7 +72,6 @@ export default {
|
|||
</script>
|
||||
|
||||
<style lang="scss" scoped>
|
||||
|
||||
@import "../product.scss";
|
||||
.recommend-item-name {
|
||||
height: 70rpx;
|
||||
|
|
@ -108,6 +106,16 @@ export default {
|
|||
}
|
||||
}
|
||||
|
||||
.shopTag{
|
||||
background: $main-color;
|
||||
font-size: 24rpx;
|
||||
padding: 0 12rpx;
|
||||
margin-left: 10rpx;
|
||||
font-weight: normal;
|
||||
border-radius: 10rpx;
|
||||
color: #fff;
|
||||
}
|
||||
|
||||
.recommend-list-view {
|
||||
width: 100%;
|
||||
}
|
||||
|
|
@ -135,6 +143,7 @@ export default {
|
|||
font-size: 30rpx;
|
||||
|
||||
.name {
|
||||
display: flex;
|
||||
width: 100%;
|
||||
font-weight: 700;
|
||||
font-size: 28rpx;
|
||||
|
|
@ -143,7 +152,8 @@ export default {
|
|||
}
|
||||
|
||||
.to-store-btn {
|
||||
padding: 20rpx 0;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
|
||||
> view {
|
||||
font-size: 24rpx;
|
||||
|
|
@ -164,7 +174,6 @@ export default {
|
|||
flex-direction: column;
|
||||
|
||||
view {
|
||||
flex: 1;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
|
||||
|
|
@ -215,4 +224,16 @@ export default {
|
|||
|
||||
margin: 20rpx 0 0 0;
|
||||
}
|
||||
.goodsNum,
|
||||
.collectionNum {
|
||||
font-size: 24rpx;
|
||||
color: #999;
|
||||
}
|
||||
.store-row {
|
||||
display: flex;
|
||||
margin: 10rpx 0;
|
||||
> div {
|
||||
margin-right: 20rpx;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
|
|
|
|||
|
|
@ -59,7 +59,12 @@ export default {
|
|||
this.storeId = options.id;
|
||||
|
||||
},
|
||||
mounted() {},
|
||||
mounted() {
|
||||
// #ifdef MP-WEIXIN
|
||||
// 小程序默认分享
|
||||
uni.showShareMenu({ withShareTicket: true });
|
||||
// #endif
|
||||
},
|
||||
|
||||
methods: {
|
||||
// 点击分享
|
||||
|
|
|
|||
|
|
@ -192,6 +192,12 @@ export default {
|
|||
WEIXIN_num: "", //购物车兼容微信步进器
|
||||
};
|
||||
},
|
||||
mounted() {
|
||||
// #ifdef MP-WEIXIN
|
||||
// 小程序默认分享
|
||||
uni.showShareMenu({ withShareTicket: true });
|
||||
// #endif
|
||||
},
|
||||
/**
|
||||
* 初始化信息
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -47,6 +47,10 @@ export default {
|
|||
},
|
||||
onLoad() {
|
||||
this.loadData();
|
||||
// #ifdef MP-WEIXIN
|
||||
// 小程序默认分享
|
||||
uni.showShareMenu({ withShareTicket: true });
|
||||
// #endif
|
||||
},
|
||||
methods: {
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -94,6 +94,10 @@ export default {
|
|||
|
||||
mounted() {
|
||||
this.init();
|
||||
// #ifdef MP-WEIXIN
|
||||
// 小程序默认分享
|
||||
uni.showShareMenu({ withShareTicket: true });
|
||||
// #endif
|
||||
},
|
||||
methods: {
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -14,21 +14,19 @@
|
|||
* 计算出当前router路径
|
||||
* 1.如果跳转的链接为登录页面或跳转的链接为空页面。则会重新跳转到首页
|
||||
* 2.都不满足返回跳转页面
|
||||
* @param type 'default' || 'wx' //返回地址会做判断默认为default
|
||||
*/
|
||||
export function whetherNavigate() {
|
||||
|
||||
export function whetherNavigate(type = "default") {
|
||||
if (getCurrentPages().length > 1) {
|
||||
if ((getCurrentPages().length - 2).route == "pages/passport/login") {
|
||||
uni.switchTab({
|
||||
url: "/pages/tabbar/home/index",
|
||||
});
|
||||
navigationToBack(type);
|
||||
} else {
|
||||
if (
|
||||
!(getCurrentPages().length - 2).route ||
|
||||
(getCurrentPages().length - 2).route == "undefined"
|
||||
) {
|
||||
uni.switchTab({
|
||||
url: "/pages/tabbar/home/index",
|
||||
});
|
||||
navigationToBack(type);
|
||||
} else {
|
||||
uni.navigateBack({
|
||||
delta: getCurrentPages().length - 2,
|
||||
|
|
@ -156,6 +154,20 @@ export function countTimeDown(seconds) {
|
|||
};
|
||||
}
|
||||
|
||||
|
||||
function navigationToBack(type) {
|
||||
if (type == "wx") {
|
||||
// console.log(getCurrentPages().length - 3)
|
||||
uni.navigateBack({
|
||||
delta: getCurrentPages().length ,
|
||||
});
|
||||
} else {
|
||||
uni.switchTab({
|
||||
url: "/pages/tabbar/home/index",
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 计算当前时间到第二天0点的倒计时[秒]
|
||||
* @returns {number}
|
||||
|
|
@ -181,5 +193,5 @@ module.exports = {
|
|||
randomString,
|
||||
countTimeDown,
|
||||
theNextDayTime,
|
||||
whetherNavigate
|
||||
whetherNavigate,
|
||||
};
|
||||
|
|
|
|||
Loading…
Reference in New Issue