zhuce
/
lilishop-uniapp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop-uniapp

master
misworga831 2023-08-25 13:59:08 +08:00
parent 2c4c0ea4f0 63fee6f272
commit f5716c901d
6 changed files with 33 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/connect.js
View File

@ -26,7 +26,7 @@ export function webConnect(code) {
export function openIdLogin(params, clientType) {
return http.request({
url: `passport/connect/connect/app/login`,
method: Method.GET,
method: Method.POST,
needToken: true,
data: params,
header: {

6
pages/order/fillorder.vue
View File

@ -4,7 +4,7 @@
<div
class="address-box"
@click="clickToAddress()"
v-if="shippingText == 'LOGISTICS'"
v-if="shippingText == 'LOGISTICS' && orderMessage.cartTypeEnum != 'VIRTUAL'"
>
<div class="user-box flex">
<div class="flex-8">
@ -651,7 +651,7 @@ export default {
});
return false;
}
} else if (this.shippingText === "LOGISTICS") {
} else if (this.shippingText === "LOGISTICS" && this.orderMessage.cartTypeEnum != 'VIRTUAL') {
if (!this.address.id) {
uni.showToast({
title: "请选择地址",
@ -853,7 +853,7 @@ export default {
</script>
<style scoped>
page {
background: #ededed !important;
background: #f7f7f7;
}
</style>
<style scoped lang="scss">

3
pages/passport/login.vue
View File

@ -453,10 +453,11 @@
uuid: uni.getStorageSync("openid"), //联合登陆id
source: uni.getStorageSync("type"), //联合登陆类型
nickname: uni.getStorageSync("nickname"), // 昵称
username: uni.getStorageSync("openid"), // 昵称
avatar: uni.getStorageSync("avatar"), // 头像
uniAccessToken: uni.getStorageSync("uni_access_token"), //第三方token
type:this.clientType,
token:{unionId:""}
token:{unionId:"",openId:uni.getStorageSync("openid")}
};
uni.getStorageSync("unionId") ? (params.token.unionId = uni.getStorageSync("unionId")) : delete params.token;

36
pages/tabbar/cart/cartList.vue
View File

@ -88,25 +88,27 @@
</view>
<!-- 如果当有促销并且促销是 限时抢购 -->
<!-- promotions -->
<div class="promotions-list" v-if="Object.keys(skuItem.promotionMap).length != 0"
>
<div class="promotions-item-seckill" v-if="getPromotion(skuItem).includes('SECKILL')">
距秒杀结束: <u-count-down show-border :hide-zero-day="true" :color="$mainColor" border-color="#ededed"
font-size="24" :timestamp="getCountDownTime(skuItem)">
</u-count-down>
<div class="promotions-list" v-if="Object.keys(skuItem.promotionMap).length != 0"
>
<div class="promotions-item-seckill" v-if="getPromotion(skuItem).includes('SECKILL')">
距秒杀结束: <u-count-down show-border :hide-zero-day="true" :color="$mainColor" border-color="#ededed"
font-size="24" :timestamp="getCountDownTime(skuItem)">
</u-count-down>
</div>
</div>
</div>
<!-- 此处先隐藏 对于预估到手价来说 前端无法真正的计算出来，光靠促销模式进行展示可能有些不妥。所以暂且隐藏 -->
<!-- 如果有活动 并且是选中的状态,显示预估到手价格 -->
<!-- <div class="priceDetail-flowPrice" :class="{'main-color':skuItem.priceDetailDTO}"
v-if="skuItem.priceDetailDTO && skuItem.invalid == 0 && Object.keys(skuItem.promotionMap).length != 0 && skuItem.checked && skuItem.checked">
预估到手价 ￥<span>{{ $options.filters.goodsFormatPrice(skuItem.priceDetailDTO.flowPrice)[0]}}</span>
<span>.{{ $options.filters.goodsFormatPrice(skuItem.priceDetailDTO.flowPrice)[1] }} </span>
</div> -->
<div style='margin-left: 20rpx;' v-if="!skuItem.checked && skuItem.errorMessage">
{{skuItem.errorMessage}}
</div>
<!-- 此处先隐藏 对于预估到手价来说 前端无法真正的计算出来，光靠促销模式进行展示可能有些不妥。所以暂且隐藏 -->
<!-- 如果有活动 并且是选中的状态,显示预估到手价格 -->
<!-- <div class="priceDetail-flowPrice" :class="{'main-color':skuItem.priceDetailDTO}"
v-if="skuItem.priceDetailDTO && skuItem.invalid == 0 && Object.keys(skuItem.promotionMap).length != 0 && skuItem.checked && skuItem.checked">
预估到手价 ￥<span>{{ $options.filters.goodsFormatPrice(skuItem.priceDetailDTO.flowPrice)[0]}}</span>
<span>.{{ $options.filters.goodsFormatPrice(skuItem.priceDetailDTO.flowPrice)[1] }} </span>
</div> -->
<div style='margin-left: 20rpx;' v-if="!skuItem.checked && skuItem.errorMessage">
{{skuItem.errorMessage}}
</div>
</p>
</view>
</view>
</u-swipe-action>

2
pages/tabbar/screen/fullScreen.vue
View File

@ -1,5 +1,5 @@
<template>
<u-modal v-model="show" cancelText="不同意" confirmText="同意" showCancelButton="btnShow" title="服务协议和隐私政策" @confirm="confirm" @cancel="cancel">
<u-modal v-model="show" cancelText="不同意" confirmText="同意" showCancelButton title="服务协议和隐私政策" @confirm="confirm" @cancel="cancel">
<view class="u-update-content">
请您务必审慎阅读,充分理解“服务协议”和“隐私政策”各条款，
包括但不限于：为了更好的向你提供服务，我们需要收集你的设备标识,

2
pages/tabbar/user/my.vue
View File

@ -98,7 +98,7 @@ export default {
},
onLoad() { },
onShow() {
this.userInfo = this.$options.filters.isLogin();
this.userInfo = this.$options.filters.isLogin() || {};
if (this.$options.filters.isLogin("auth")) {
this.getUserOrderNum();
} else {