code-image-backup-public/lilishop-uniapp
1
0
Fork 0
mirror of https://gitee.com/beijing_hongye_huicheng/lilishop-uniapp.git synced 2025-12-17 16:05:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat: 🎨 合并其他分支代码

Browse Source
This commit is contained in:
学习很差啦
2022-09-23 15:10:25 +08:00
parent a6e48813cd 68dc960232
commit 638e82dd28
31 changed files with 1248 additions and 746 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
pages/cart/payment/payOrder.vue
View File

@@ -138,7 +138,7 @@
if (this.routerVal.recharge_sn) {
// 判断当前是否是充值
this.sn = this.routerVal.recharge_sn;
this.orderType = "RECHARGE";
this.orderType = "RECHARGE";
} else if (this.routerVal.trade_sn) {
this.sn = this.routerVal.trade_sn;
@@ -178,12 +178,12 @@
this.payList = res.data.result.support.filter((item) => {
return item != "ALIPAY";
});
// 充值的话仅保留微信支付
if(this.orderType == "RECHARGE"){
this.payList = res.data.result.support.filter((item) => {
return item == "WECHAT";
});
});
// 充值的话仅保留微信支付
if(this.orderType == "RECHARGE"){
this.payList = res.data.result.support.filter((item) => {
return item == "WECHAT";
});
}
}

8
pages/mine/address/add.vue
View File

@@ -1,11 +1,11 @@
<template>
<view class="add-address">
<div class="uForm">
<u-form :border-bottom="false" :model="form" ref="uForm" :error-type="['toast']" :rule="rules">
<u-form :border-bottom="false" :model="form" ref="uForm" :error-type="['toast']" :rule="rules">
<!-- #ifndef H5 -->
<view class="selectAddress" @click="clickUniMap">
选择收货地址
</view>
</view>
<!-- #endif -->
<u-form-item class="border" label="收货人" label-width="130" prop="name">
<u-input v-model="form.name" clearable placeholder="请输入收货人姓名" />
@@ -162,9 +162,7 @@ export default {
delete this.form.updateTime;
editAddress(this.form).then((res) => {
if (res.data.success) {
uni.navigateTo({
url: `/${beforePage.route}`,
});
uni.navigateBack();
}
});
}

18
pages/mine/address/addressManage.vue
View File

@@ -86,23 +86,9 @@ export default {
* 进入页面检测当前账户是否登录
*/
onShow() {
let that = this;
if (this.$options.filters.isLogin("auth")) {
if (this.$options.filters.tipsToLogin()) {
this.getAddressList();
} else {
uni.showModal({
title: "提示",
content: "检测到您的账号还未登录,是否去登录？",
confirmColor: this.$lightColor,
success: function (res) {
if (res.confirm) {
that.$options.filters.navigateToLogin();
} else if (res.cancel) {
uni.navigateBack();
}
},
});
}
}
},
methods: {
//获取地址列表

2
pages/mine/myTracks.vue
View File

@@ -256,4 +256,4 @@
display: -webkit-flex;
display: flex;
}
</style>
</style>

10
pages/order/myOrder.vue
View File

@@ -326,10 +326,10 @@ export default {
// this.loadData(this.status);
},
onShow() {
if (!this.tabCurrentIndex) {
this.initData(0);
} else {
if(this.$options.filters.tipsToLogin()){
if (!this.tabCurrentIndex) {
this.initData(0);
}
}
// this.loadData(this.status);
},
@@ -340,7 +340,7 @@ export default {
* 替换onLoad下代码即可
*/
let status = Number(options.status);
this.status = status;
this.status = status;
this.tabCurrentIndex = status;
// if (status == 0) {

20
pages/product/shopPage.vue
View File

@@ -1,6 +1,6 @@
<template>
<div>
<u-navbar :border-bottom="false">
<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,7 +58,7 @@
<!-- menu -->
<!-- 商品 -->
<div class="contant" v-if="current == 0">
<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" />
@@ -84,7 +84,7 @@
</template>
<script>
import { getStoreBaseInfo, getStoreCategory } from "@/api/store.js";
import { getStoreBaseInfo, getStoreCategory } from "@/api/store.js";
import goodsTemplate from '@/components/m-goods-list/list'
import {
receiveCoupons,
@@ -119,7 +119,7 @@ export default {
current(val) {
val == 0 ? ()=>{ this.goodsList = []; this.getGoodsData()} : this.getCategoryData();
},
},
},
components:{goodsTemplate},
/**
@@ -203,10 +203,10 @@ export default {
// "/pages/tabbar/home/web-view?src=https://yzf.qq.com/xv/web/static/chat/index.html?sign=" +
// sign,
// });
// // #endif
uni.navigateTo({
url: `/pages/tabbar/home/web-view?IM=${this.storeId}`,
// // #endif
uni.navigateTo({
url: `/pages/tabbar/home/web-view?IM=${this.storeId}`,
});
},
@@ -235,7 +235,7 @@ export default {
/**
* 搜索
*/
search() {
search() {
console.log("点击")
uni.navigateTo({
url: `/pages/navigation/search/searchPage?storeId=${this.storeId}&keyword=${this.keyword}`,
@@ -261,7 +261,7 @@ 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)
}
},

20
pages/promotion/bargain/detail.vue
View File

@@ -3,7 +3,7 @@
<u-navbar :custom-back="back" back-icon-color="#fff" :background="background" :border-bottom="false">
</u-navbar>
<div class="wrapper">
<div class="wrapper-box">
<!-- 砍价列表 -->
<div class="box box1">
<div class="bargain">
@@ -106,10 +106,6 @@
<popupGoods ref="popupGoods" :buyMask="maskFlag" @closeBuy="closePopupBuy" :goodsDetail="bargainDetail"
:goodsSpec="goodsSpec" v-if="bargainDetail.id " @handleClickSku="getGoodsDetail" />
<!-- 产品详情 -->
<div class=" box4">
</div>
</div>
</div>
</template>
@@ -352,11 +348,11 @@ page {
align-items: center;
padding: 10rpx 0;
}
.wrapper {
background: url("https://lilishop-oss.oss-cn-beijing.aliyuncs.com/aac88f4e8eff452a8010af42c4560b04.png");
.wrapper-box {
background: url("https://lili-system.oss-cn-beijing.aliyuncs.com/kanjia.png");
background-repeat: no-repeat;
background-size: 100% 100%;
height: 700rpx;
height: 506rpx;
width: 100%;
}
@@ -371,16 +367,16 @@ page {
}
}
.box1 {
top: 750rpx;
top: 560rpx;
}
.box2 {
top: 770rpx;
top: 580rpx;
}
.box3 {
top: 790rpx;
top: 600rpx;
}
.box4 {
top: 810rpx;
top: 620 rpx;
height: 200rpx;
}
.bargain-item {

23
pages/promotion/bargain/list.vue
View File

@@ -6,22 +6,7 @@
<!-- 砍价列表 -->
<div class="box">
<!-- 已砍的商品 -->
<div class="bargain" v-if="bargainList.length!=0">
<div class="flex bargain-item" v-for="(item,index) in bargainList" :key="index">
<div class="goods-img">
<u-image width="150" height="150" :src="item.thumbnail"></u-image>
</div>
<div class="goods-config">
<div class="goods-title wes-2">
{{item.goodsName}}
</div>
<div class="flex goods-buy">
<div class="max-price">最低：<span>￥{{item.purchasePrice | unitPrice}}</span></div>
<div class="bargaining" @click="navigateToBargainDetail(item)">参与砍价</div>
</div>
</div>
</div>
</div>
<goodsTemplate type="kanJia" v-if="bargainList.length!=0" :res="bargainList" />
<div class="bargain empty" v-else>
<u-empty text="暂无活动" mode="list"></u-empty>
</div>
@@ -32,7 +17,9 @@
<script>
import { getBargainList } from "@/api/promotions";
import goodsTemplate from '@/components/m-goods-list/promotion'
export default {
components:{goodsTemplate},
data() {
return {
background: {
@@ -91,7 +78,7 @@ page {
background: url("https://lili-system.oss-cn-beijing.aliyuncs.com/kanjia.png");
background-repeat: no-repeat;
background-size: 100% 100%;
height: 600rpx;
height: 506rpx;
width: 100%;
}
@@ -99,7 +86,7 @@ page {
background: #fff;
border-radius: 20rpx;
position: relative;
top: 650rpx;
top: 560rpx;
width: 94%;
margin: 0 auto;
> .bargain {

262
pages/promotion/joinGroup.vue
View File

@@ -1,155 +1,133 @@
<template>
<view class="wrapper">
<view class="wrapper">
<u-navbar :border-bottom="false" :title="title">
<!-- 中间 -->
<view class="slot-wrap container-wrap">
<view v-if="search">
<u-search @search="searchFun()" @custom="searchFun()" v-model="params.goodsName"></u-search>
</view>
</view>
<!-- 右侧 -->
<view slot="right">
<view style="margin-right: 24rpx;" @click="searchFlag()">
<view v-if="search">取消</view>
<u-icon v-if="!search" size="44rpx" name="search"></u-icon>
</view>
</view>
</u-navbar>
<!-- 顶部栏 -->
<div class='header-wraper'>
<image src="/static/join-buy.png"></image>
</div>
<!-- 商品栏 -->
<div class="swiper">
<goodsTemplate v-if="goodsList.length" :res="goodsList" />
<u-empty v-else style="margin-top:20%" text="暂无拼团活动" mode="data"></u-empty>
</div>
<u-navbar :border-bottom="false" :background="background" class="unavbar" :title="title">
<!-- 中间 -->
<view class="slot-wrap container-wrap">
<view v-if="search">
<u-search @search="searchFun()" @custom="searchFun()" v-model="params.goodsName"></u-search>
</view>
</view>
<!-- 右侧 -->
<view slot="right">
<view style="margin-right: 24rpx;" @click="searchFlag()">
<view v-if="search">取消</view>
<u-icon v-if="!search" size="44rpx" name="search"></u-icon>
</view>
</view>
</u-navbar>
<!-- 顶部栏 -->
<!-- 商品栏 -->
<div class="swiper">
<div v-if="groupBuy.length !=0">
<view class="view-item" v-for="(groupItem, groupIndex) in groupBuy" :key="groupIndex">
<view class="view-left">
<u-image border-radius="10" shape="square" :src="groupItem.thumbnail" width="186rpx" height="186rpx">
<view slot="error" style="font-size: 24rpx;">加载失败</view>
</u-image>
</view>
<view class="view-content">
<view class="view-content-name">
{{ groupItem.goodsName }}
</view>
<view class="view-content-bottom">
<view>
<view class="view-content-price">
<!-- ￥{{groupItem.sales_price | unitPrice }} <span v-if="groupItem.point">+{{groupItem.point}}积分</span> -->
￥{{groupItem.price | unitPrice }}
</view>
<view class="view-content-original_price">
￥{{ groupItem.originalPrice | unitPrice }}
</view>
</view>
<view>
<view class="btn-group" @click="toHref(groupItem)"> 去拼团 </view>
<view class="buy-content">已售{{groupItem.num || 0}}件</view>
</view>
</view>
</view>
</view>
<u-loadmore bg-color='#f8f8f8' :status="status" />
</div>
<u-empty v-else style="margin-top:20%" text="暂无拼团活动" mode="data"></u-empty>
</div>
</view>
</view>
</template>
<script>
import * as API_Promotions from "@/api/promotions";
import * as API_Goods from "@/api/goods";
export default {
components: {},
data() {
return {
status: "loadmore",
is_empty: false,
search: false,
title: "拼团活动",
background: {
backgroundColor: "#fff",
},
empty: false,
params: {
pageNumber: 1,
pageSize: 10,
categoryPath: "",
goodsName: "",
},
groupBuy: [],
};
},
mounted() {},
watch: {
search(val) {
val ? (this.title = "") : (this.title = "拼团活动");
},
},
onReachBottom() {
this.loadMore();
},
// 点击搜索按钮
onNavigationBarButtonTap(e) {
this.popupFlag = !this.popupFlag;
},
async onLoad() {
this.GET_AssembleGoods();
},
import * as API_Promotions from "@/api/promotions";
import * as API_Goods from "@/api/goods";
import goodsTemplate from '@/components/m-goods-list/promotion.vue'
export default {
components: {
goodsTemplate
},
data() {
return {
is_empty: false,
search: false,
title: "拼团活动",
methods: {
loadMore() {
this.params.pageNumber++;
this.GET_AssembleGoods();
},
searchFlag() {
this.search = !this.search;
},
empty: false,
params: {
pageNumber: 1,
pageSize: 10,
categoryPath: "",
goodsName: "",
},
goodsList: [],
};
},
mounted() {},
watch: {
search(val) {
val ? (this.title = "") : (this.title = "拼团活动");
},
},
onReachBottom() {
this.loadMore();
},
// 点击搜索按钮
onNavigationBarButtonTap(e) {
this.popupFlag = !this.popupFlag;
},
async onLoad() {
this.GET_AssembleGoods();
},
toHref(goods) {
uni.navigateTo({
url: `/pages/product/goods?id=${goods.skuId}&goodsId=${goods.goodsId}`,
});
},
searchFun() {
this.groupBuy = [];
this.GET_AssembleGoods();
},
// 请求拼团数据
GET_AssembleGoods() {
this.status = "loading";
const params = JSON.parse(JSON.stringify(this.params));
if (params.category_id === 0) delete params.category_id;
methods: {
loadMore() {
this.params.pageNumber++;
this.GET_AssembleGoods();
},
searchFlag() {
this.search = !this.search;
},
API_Promotions.getAssembleList(params)
.then((response) => {
const data = response.data.result.records;
toHref(goods) {
uni.navigateTo({
url: `/pages/product/goods?id=${goods.skuId}&goodsId=${goods.goodsId}`,
});
},
searchFun() {
this.goodsList = [];
this.GET_AssembleGoods();
},
// 请求拼团数据
GET_AssembleGoods() {
if (!data || !data.length) {
this.is_empty = true;
this.status = "nomore";
} else {
if (data.length <= this.params.pageSize) {
this.status = "nomore";
} else {
this.status = "loadmore";
}
this.is_empty = false;
this.groupBuy.push(...(data || []));
}
})
.catch(() => {});
},
},
};
const params = JSON.parse(JSON.stringify(this.params));
if (params.category_id === 0) delete params.category_id;
API_Promotions.getAssembleList(params)
.then((response) => {
const data = response.data.result.records;
if (!data || !data.length) {
this.is_empty = true;
} else {
if (data.length <= this.params.pageSize) {
} else {
}
this.is_empty = false;
this.goodsList.push(...(data || []));
}
})
.catch(() => {});
},
},
};
</script>
<style lang="scss" scoped>
@import "./style.scss";
.header-wraper {
background: url('/static/bg.png');
height: 200rpx;
display: flex;
align-items: center;
justify-content: center;
>image{
width: 188rpx;
height: 60rpx;
}
}
</style>

58
pages/promotion/point/pointList.vue
View File

@@ -23,8 +23,8 @@
<u-loading slot="loading"></u-loading>
</u-image>
<view class="index-item-title">{{ item.goodsName }}</view>
<view class="index-item-price">
{{ item.points }}积分
<view class="index-item-price flex flex-a-c flex-j-sb">
<div class="point"><span>{{ item.points }}</span>积分</div>
<span class="tipsMkt">¥{{ item.originalPrice | unitPrice }}</span>
</view>
</view>
@@ -194,46 +194,12 @@ page {
height: 100%;
}
.tipsMkt {
float: right;
color: #c0c4cc;
font-size: 24rpx;
font-size: 24rpx !important;
text-decoration: line-through;
margin-right: 20rpx;
margin-right: 20rpx !important;
}
.header {
background: $light-color;
position: relative;
color: #fff;
display: flex;
height: 80rpx;
align-items: center;
justify-content: center;
font-size: 26rpx;
font-size: 34rpx;
.left,
.right {
position: absolute;
width: max-content;
height: max-content;
top: 0;
bottom: 0;
margin: auto;
}
.left {
float: left;
top: 0;
bottom: 0;
left: 20rpx;
}
.right {
float: right;
right: 20rpx;
}
}
.index {
height: 100vh;
@@ -341,15 +307,19 @@ page {
overflow: hidden;
}
.index-item-title-desc {
font-size: 25rpx;
color: #999999;
margin-top: 10rpx;
}
.index-item-price {
font-size: 28rpx;
color: #ff5a10;
overflow: hidden;
color: $main-color;
padding: 20rpx 0 0 20rpx;
>.point{
>span{
font-size: 42rpx;
font-weight: bold;
margin-right:10rpx;
}
}
}
</style>

55
pages/promotion/seckill.vue
View File

@@ -1,7 +1,8 @@
<template>
<view class="sale">
<view class="sale-head">
<image src="@/pages/promotion/static/head-sample.png"></image>
<u-navbar title='限时抢购'></u-navbar>
<view class="header-wraper">
<image mode="widthFix" src="/static/seckill.png"></image>
</view>
<scroll-view scroll-x>
<view class="index-navs">
@@ -14,10 +15,7 @@
</view>
</view>
</view>
<view class="trailer" v-if="timeLine[nav] && times">
{{ timeLine[nav].distanceStartTime === 0 ? (onlyOne ? '距结束' : '距下一轮') : '距开始' }}
{{ times.hours == '00' ? '0' : times.hours }}小时{{ times.minutes }}分{{ times.seconds }}秒
</view>
</scroll-view>
<view class="sale-items" v-if="goodsList.length > 0">
<goodsTemplate :res="goodsList" />
@@ -39,7 +37,7 @@
getSeckillTimeGoods
} from "@/api/promotions.js";
import Foundation from "@/utils/Foundation.js";
import goodsTemplate from '@/components/m-goods-list/seckill.vue'
import goodsTemplate from '@/components/m-goods-list/promotion.vue'
export default {
components: {
goodsTemplate
@@ -184,10 +182,15 @@
}
}
.sale-head {
image {
width: 100%;
height: 280rpx;
.header-wraper {
background: url('/static/bg.png');
height: 200rpx;
display: flex;
align-items: center;
justify-content: center;
>image{
width: 300rpx;
height: 100rpx;
}
}
@@ -195,22 +198,8 @@
padding-top: 20rpx;
}
.trailer {
height: 100rpx;
background: #ffffff;
display: -webkit-box;
display: -webkit-flex;
display: flex;
justify-content: center;
align-items: center;
font-size: 22rpx;
color: #666666;
box-sizing: border-box;
position: relative;
z-index: 0;
}
.index-navs {
background: #fff;
background-color: #f7f7f7;
display: -webkit-box;
display: -webkit-flex;
@@ -241,17 +230,19 @@
height: 115rpx;
line-height: 1em;
position: relative;
font-size: 32rpx;
font-weight: bold;
&-active {
background-image: url(/static/seckill/active.png);
background-size: 100% 115rpx;
background-repeat: no-repeat;
color: #ffffff;
color: $main-color;
position: relative;
z-index: 30;
.index-nav-desc {
color: #ffffff;
color: #fff;
font-weight: bold;
background: $main-color;
padding: 6rpx 16rpx;
border-radius: 50px;
}
}
}

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

@@ -111,8 +111,8 @@
预估到手价 ￥<span>{{ formatPrice(skuItem.priceDetailDTO.flowPrice)[0]}}</span>
<span>.{{ formatPrice(skuItem.priceDetailDTO.flowPrice)[1] }} </span>
</div>
<div style='margin-left: 20rpx;' v-if="!skuItem.checked && skuItem.errorMessage">
{{skuItem.errorMessage}}
<div style='margin-left: 20rpx;' v-if="!skuItem.checked && skuItem.errorMessage">
{{skuItem.errorMessage}}
</div>
</view>
</view>

19
pages/tabbar/home/template/tpl_goods.vue
View File

@@ -24,7 +24,9 @@
{{ item.title }}
</div>
<div class="goods-bottom">
<div class="goods-price">￥{{ item.price | unitPrice }}</div>
<div class="goods-price"> ¥<span>{{ formatPrice(item.price )[0] }} </span>.{{
formatPrice(item.price )[1]
}}</div>
</div>
</div>
</div>
@@ -56,6 +58,13 @@ export default {
},
mounted() {},
methods: {
// 格式化金钱 1999 --> [1999,00]
formatPrice(val) {
if (typeof val == "undefined") {
return val;
}
return val.toFixed(2).split(".");
},
handleClick(item) {
uni.navigateTo({
url: `/pages/product/goods?id=${item.id}&goodsId=${item.goodsId}`,
@@ -163,13 +172,11 @@ $w_94: 94%;
> .goods-price {
line-height: 2;
color: $main-color;
>span{
font-size: 42rpx;
}
}
}
}
.goods-icon {
right: 10rpx;
top: 10rpx;
position: absolute;
}
</style>

8
pages/tabbar/home/views.vue
View File

@@ -129,10 +129,10 @@ export default {
}
});
},
// 是否有网络链接
isConnected(val) {
val ? this.init() : "";
},
// 是否有网络链接
isConnected(val){
val ? this.init() : ''
},
/**
* TODO 扫码功能后续还会后续增加