2023-02-22

业务功能完善
This commit is contained in:
2023-02-22 19:58:07 +08:00
parent 190466c9c6
commit 515ae22389
53 changed files with 4148 additions and 1338 deletions

View File

@@ -1,12 +1,17 @@
<template>
<view class="content" style="display: flex;flex-direction: column;">
<!-- #ifdef MP-WEIXIN -->
<view style="width: 100%;position: fixed;top: 0;z-index: 99;background: #FFFFFF;" :style="{'height':statusBarHeight+'px' }"></view>
<view class="getPosition" style="height: 90upx;position: fixed;z-index: 99;width: 100%" :style="{'top':statusBarHeight+'px' }">
<view style="width: 100%;position: fixed;top: 0;z-index: 99;background: #FFFFFF;"
:style="{'height':statusBarHeight+'px' }"></view>
<view class="getPosition" style="height: 90upx;position: fixed;z-index: 99;width: 100%"
:style="{'top':statusBarHeight+'px' }">
<text>分类</text>
</view>
<view class="" @click="search()" style="background: #FFFFFF;height: 80upx;display: flex;justify-content: center;align-items: center;" :style="[{'margin-top': statusBarHeight+45+'px'}]">
<input class="" type="text" value="" placeholder="输入关键字搜索" style="font-size: 28upx;background: #F5F5F5;height: 60upx;width: 90%;border-radius: 50upx;text-align: center;" />
<view class="" @click="search()"
style="background: #FFFFFF;height: 80upx;display: flex;justify-content: center;align-items: center;"
:style="[{'margin-top': statusBarHeight+45+'px'}]">
<input class="" type="text" value="" placeholder="输入关键字搜索"
style="font-size: 28upx;background: #F5F5F5;height: 60upx;width: 90%;border-radius: 50upx;text-align: center;" />
</view>
<!-- 占位 -->
<!-- <view class="" :style="[{'height': statusBarHeight+45+'px'}]"></view> -->
@@ -17,19 +22,21 @@
<input type="text" value="" placeholder="输入关键字搜索" class="input" style="font-size: 28upx;text-align: center;"/>
</view>
</view> -->
<view class="" :style="{height: height + 'px'}" style="display: flex;flex-direction: row;">
<view class="" style="display: flex;flex-direction: row;height: 100%;">
<scroll-view scroll-y class="left-aside">
<view v-for="item in flist" :key="item.id" class="f-item b-b" :class="{ active: item.id === currentId }" @click="tabtap(item)">{{ item.name }}</view>
<view v-for="item in flist" :key="item.id" class="f-item b-b" :class="{ active: item.id === currentId }"
@click="tabtap(item)">{{ item.name }}</view>
</scroll-view>
<scroll-view scroll-with-animation scroll-y class="right-aside" @scroll="asideScroll" :scroll-top="tabScrollTop">
<scroll-view scroll-with-animation scroll-y class="right-aside" @scroll="asideScroll"
:scroll-top="tabScrollTop">
<view v-for="item in slist" :key="item.id" class="s-list" :id="'main-' + item.id">
<text class="s-item">{{ item.name }}</text>
<view class="t-list" >
<view v-if="titem.pid === item.id" class="t-item" v-for="titem in tlist" :key="titem.id">
<image :src="titem.pic" @click="navToDetailPage(titem)"></image>
<text @click="navToDetailPage(titem)">{{titem.name}}</text>
</view>
</view>
<view class="t-list">
<view v-if="titem.pid === item.id" class="t-item" v-for="titem in tlist" :key="titem.id">
<image :src="titem.pic" @click="navToDetailPage(titem)"></image>
<text @click="navToDetailPage(titem)">{{titem.name}}</text>
</view>
</view>
</view>
</scroll-view>
</view>
@@ -39,200 +46,217 @@
</template>
<script>
import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue';
import Api from '@/common/api';
export default {
components: {
mallplusCopyright
},
data() {
return {
sizeCalcState: false,
tabScrollTop: 0,
currentId: 1,
flist: [],
slist: [],
tlist: [],
import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue';
import Api from '@/common/api';
export default {
components: {
mallplusCopyright
},
data() {
return {
sizeCalcState: false,
tabScrollTop: 0,
currentId: 1,
flist: [],
slist: [],
tlist: [],
height: '',
statusBarHeight: '',
};
},
onLoad() {
this.statusBarHeight = uni.getSystemInfoSync().statusBarHeight
this.height = uni.getSystemInfoSync().windowHeight - (this.statusBarHeight+80)
height: '',
statusBarHeight: '',
};
},
onLoad() {
this.statusBarHeight = uni.getSystemInfoSync().statusBarHeight
this.height = uni.getSystemInfoSync().windowHeight - (this.statusBarHeight + 80)
console.log("height", this.height);
this.loadData();
},
methods: {
async loadData() {
this.loadData();
},
methods: {
async loadData() {
let list = this.$db.get('categoryList' )
if(!list){
let params = {};
list = await Api.apiCall('get', Api.goods.typeGoodsList, params);
this.$db.set('categoryList', list)
}
let list = this.$db.get('categoryList')
if (!list) {
let params = {};
list = await Api.apiCall('get', Api.goods.typeGoodsList, params);
this.$db.set('categoryList', list)
}
if(list){
list.forEach(item => {
if (item.level==0) {
this.flist.push(item); //pid为父级id, 没有pid或者pid=0是一级分类
} else if (item.level==1) {
this.slist.push(item); //没有价格的是2级分类
} else {
this.tlist.push(item); //3级分类
}
if (list) {
list.forEach(item => {
if (item.level == 0) {
this.flist.push(item); //pid为父级id, 没有pid或者pid=0是一级分类
} else if (item.level == 1) {
this.slist.push(item); //没有价格的是2级分类
} else {
this.tlist.push(item); //3级分类
}
});
}
},
//一级分类点击
tabtap(item) {
if (!this.sizeCalcState) {
this.calcSize();
}
this.currentId = item.id;
console.log(item.id);
let index = this.slist.findIndex(sitem => sitem.pid === item.id);
if (index >= 0) {
this.tabScrollTop = this.slist[index].top;
}
},
//右侧栏滚动
asideScroll(e) {
if (!this.sizeCalcState) {
this.calcSize();
}
let scrollTop = e.detail.scrollTop;
let tabs = this.slist.filter(item => item.top <= scrollTop).reverse();
if (tabs.length > 0) {
this.currentId = tabs[0].pid;
}
},
//计算右侧栏每个tab的高度等信息
calcSize() {
let h = 0;
this.slist.forEach(item => {
let view = uni.createSelectorQuery().select('#main-' + item.id);
view.fields({
size: true
},
data => {
item.top = h;
h += data.height;
item.bottom = h;
}
).exec();
});
}
},
//一级分类点击
tabtap(item) {
if (!this.sizeCalcState) {
this.calcSize();
}
this.currentId = item.id;
console.log(item.id);
let index = this.slist.findIndex(sitem => sitem.pid === item.id);
if(index>=0){
this.tabScrollTop = this.slist[index].top;
}
},
//右侧栏滚动
asideScroll(e) {
if (!this.sizeCalcState) {
this.calcSize();
}
let scrollTop = e.detail.scrollTop;
let tabs = this.slist.filter(item => item.top <= scrollTop).reverse();
if (tabs.length > 0) {
this.currentId = tabs[0].pid;
}
},
//计算右侧栏每个tab的高度等信息
calcSize() {
let h = 0;
this.slist.forEach(item => {
let view = uni.createSelectorQuery().select('#main-' + item.id);
view.fields(
{
size: true
},
data => {
item.top = h;
h += data.height;
item.bottom = h;
}
).exec();
});
this.sizeCalcState = true;
},
navToList(sid) {
uni.navigateTo({
url: `../../pagesA/product/list?sid=${sid}`
});
},
//详情页
navToDetailPage(item) {
//测试数据没有写id用title代替
let id = item.id;
uni.navigateTo({
url: `../../pagesA/product/product?id=${id}`
});
},
}
};
this.sizeCalcState = true;
},
navToList(sid) {
uni.navigateTo({
url: `../../pagesA/product/list?sid=${sid}`
});
},
//详情页
navToDetailPage(item) {
//测试数据没有写id用title代替
let id = item.id;
uni.navigateTo({
url: `../../pagesA/product/product?id=${id}`
});
},
}
};
</script>
<style lang="scss">
page,
.content {
height: 100%;
background-color: #f8f8f8;
}
page,
.content {
height: 100%;
background-color: #f8f8f8;
}
.content {
display: flex;
}
.left-aside {
flex-shrink: 0;
width: 200upx;
height: 100%;
background-color: #fff;
}
.f-item {
display: flex;
align-items: center;
justify-content: center;
width: 100%;
height: 100upx;
font-size: 28upx;
color: $font-color-base;
position: relative;
&.active {
color: $base-color;
background: #f8f8f8;
&:before {
content: '';
position: absolute;
left: 0;
top: 50%;
transform: translateY(-50%);
height: 36upx;
width: 8upx;
background-color: $base-color;
border-radius: 0 4px 4px 0;
opacity: 0.8;
.content {
display: flex;
}
.left-aside {
flex-shrink: 0;
width: 200upx;
height: 100%;
background-color: #fff;
}
.f-item {
display: flex;
align-items: center;
justify-content: center;
width: 100%;
height: 100upx;
font-size: 28upx;
color: $font-color-base;
position: relative;
&.active {
color: $base-color;
background: #f8f8f8;
&:before {
content: '';
position: absolute;
left: 0;
top: 50%;
transform: translateY(-50%);
height: 36upx;
width: 8upx;
background-color: $base-color;
border-radius: 0 4px 4px 0;
opacity: 0.8;
}
}
}
}
.right-aside {
flex: 1;
overflow: hidden;
padding-left: 20upx;
}
.s-item {
display: flex;
align-items: center;
height: 70upx;
padding-top: 8upx;
font-size: 28upx;
color: $font-color-dark;
}
.t-list {
display: flex;
flex-wrap: wrap;
width: 100%;
background: #fff;
padding-top: 12upx;
&:after {
content: '';
flex: 99;
height: 0;
.right-aside {
flex: 1;
overflow: hidden;
padding-left: 20upx;
}
}
.t-item {
flex-shrink: 0;
display: flex;
justify-content: center;
align-items: center;
flex-direction: column;
width: 176upx;
font-size: 26upx;
color: #666;
padding-bottom: 20upx;
image {
width: 140upx;
height: 140upx;
.s-item {
display: flex;
align-items: center;
height: 70upx;
padding-top: 8upx;
font-size: 28upx;
color: $font-color-dark;
}
}
.getPosition{
.t-list {
display: flex;
flex-wrap: wrap;
width: 100%;
background: #fff;
padding-top: 12upx;
&:after {
content: '';
flex: 99;
height: 0;
}
}
.t-item {
flex-shrink: 0;
display: flex;
justify-content: center;
align-items: center;
flex-direction: column;
width: 176upx;
font-size: 26upx;
color: #666;
padding-bottom: 20upx;
image {
width: 130upx;
height: 130upx;
}
text{
padding-left: 5px;
padding-right: 5px;
overflow: hidden;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-line-clamp: 2;
-webkit-box-orient: vertical;
}
}
.getPosition {
height: 100upx;
display: flex;
justify-content: center;

View File

@@ -28,10 +28,10 @@
<image src="/static/shwz_icon.png"></image>
<text>生活物资</text>
</view>
<view class="cate-item" @click="navToTabPage('../../pagesA/product/groupList')">
<!-- <view class="cate-item" @click="navToTabPage('../../pagesA/product/groupList')">
<image src="/static/temp/fabfa-dropbox.png"></image>
<text>拼团特价</text>
</view>
</view> -->
<view class="cate-item" @click="navToTabPage('/pagesU/notice/subjectList')">
<image src="/static/njfw_icon.png"></image>
<text>农机服务</text>
@@ -65,7 +65,7 @@
</view> -->
<!-- 秒杀楼层 https://s.click.taobao.com/Wds7c1w -->
<view class="seckill-section m-t"
<!-- <view class="seckill-section m-t"
v-if="homeFlashPromotion.flashSessionInfoList && homeFlashPromotion.flashSessionInfoList.length > 0">
<view class="s-header">
<view class="" style="width: 80%;display: flex;flex-direction: row;align-items: center;">
@@ -93,7 +93,7 @@
</view>
</scroll-view>
</view>
</view>
</view> -->
<!-- <view class="f-header m-t" @click="navToTabPage('../../pagesC/store/storeList')">
<image src="/static/temp/nav1.png"></image>
<view class="tit-box">
@@ -112,9 +112,10 @@
</view> -->
<!-- 优惠券 https://s.click.taobao.com/OPh3c1w -->
<coupon v-for="(item, index) in couponList" :key="index" v-bind:item="item" theme="#ff0000"></coupon>
<coupon v-for="(item, index) in couponList" :key="index" v-bind:item="item" theme="#ff0000" ref="SubComponent"
@callParentMethod="callParentMethod"></coupon>
<!-- 团购楼层 -->
<!-- 团购楼层
<view class="f-header m-t" @click="navToTabPage('../../pagesA/product/groupList')"
v-if="groupHotGoodsList.length > 0">
<image src="/static/temp/h1.png"></image>
@@ -144,10 +145,10 @@
</view>
</swiper-item>
</swiper>
</view>
</view> -->
<!-- 分类推荐楼层 -->
<view class="f-header m-t" @click="navToTabPage('../../pagesA/product/list')" v-if="false">
<!-- <view class="f-header m-t" @click="navToTabPage('../../pagesA/product/list')" v-if="false">
<image src="/static/temp/h1.png"></image>
<view class="tit-box">
<text class="tit">分类精选</text>
@@ -172,7 +173,7 @@
</view>
</view>
</scroll-view>
</view>
</view> -->
<!-- 新品推荐 -->
<view v-if='homeNewProductList && homeNewProductList.length>0' class="f-header m-t"
@@ -193,7 +194,7 @@
<text class="title clamp">{{ item.productName }}</text>
<view>
<text class="price">惠农价¥{{ item.price }}</text>
<!-- <text class="m-price"> 县区商超价¥{{ item.price }}</text> -->
<text class="m-price">市场价¥{{ item.originalPrice }}</text>
</view>
@@ -219,17 +220,19 @@
<text class="title clamp">{{ item.productName }}</text>
<view>
<text class="price">惠农价¥{{ item.price }}</text>
<!-- <text class="m-price">县区商超价¥{{ item.price }}</text> -->
<text class="m-price">市场价¥{{ item.originalPrice }}</text>
</view>
</view>
</view>
<!-- 新品上市 -->
<view class="f-header m-t" @click="navToTabPage('../../pagesA/product/list')">
<!-- <view class="f-header m-t" @click="navToTabPage('../../pagesA/product/list')"> -->
<view class="f-header m-t" @click="navToTabPage('../../pagesA/product/list?isFenxiao=1')">
<image src="/static/temp/h1.png"></image>
<view class="tit-box">
<text class="tit">新品上市</text>
<text class="tit">商品列表</text>
</view>
<text class="yticon icon-you"></text>
</view>
@@ -241,11 +244,14 @@
<image :src="item.pic" mode="aspectFill"></image>
</view>
<text class="title clamp">{{ item.name }}</text>
<!-- <text class="label">【{{ item.storeName }}】</text> -->
<text class="price">惠农价¥{{ item.price }}</text>
<view>
<text class="price">惠农价¥{{ item.price }}</text>
<text class="m-price">市场价¥{{ item.originalPrice }}</text>
</view>
</view>
<uni-load-more :status="loadingType"></uni-load-more>
</view>
<uni-load-more :status="loadingType"></uni-load-more>
<!-- <mallplusCopyright></mallplusCopyright> -->
</view>
</template>
@@ -355,6 +361,20 @@
},
},
methods: {
clickParentMethod() {
console.log('clickParentMethod')
this.$refs.SubComponent.callSubMethod()
},
callParentMethod(val) {
console.log('callParentMethod: ' + val)
// 默认去遍历list集合将集合中的每个元素传入到function的item里
var index = this.couponList.findIndex(function(item) {
return item.id == val.id;
})
this.couponList.splice(index, 1);
},
async sysInfoMethod() {
let params = {};
let list = this.$db.get('sysInfo')
@@ -435,10 +455,10 @@
async loadData() {
this.getBanner();
this.getHotGoodsList();
// this.getHotGoodsList();
//this.getFlashPromotion();
this.getCouponList();
this.getStoreList();
// this.getStoreList();
this.homeNewProduct();
this.homeRecommendProduct();
@@ -532,9 +552,16 @@
} else {
this.loadingType = 'more';
}
// let params = {
// pageNum: this.pageNum
// };
let params = {
pageNum: this.pageNum
};
pageNum: this.pageNum,
productCategoryId: "",
type: 1,
productAttributeCategoryId: ""
};;
let list = await Api.apiCall('get', Api.goods.goodsList, params);
let goodsList = list.records;
@@ -1038,10 +1065,9 @@
}
.m-price {
font-size: $font-sm + 2upx;
text-decoration: line-through;
font-size: $font-sm;
color: $font-color-light;
margin-left: 8upx;
margin-left: 10upx;
}
}
}
@@ -1140,10 +1166,9 @@
}
.m-price {
font-size: $font-sm + 2upx;
text-decoration: line-through;
font-size: $font-sm;
color: $font-color-light;
margin-left: 8upx;
margin-left: 10upx;
}
.pro-box {
@@ -1207,16 +1232,15 @@
}
.price {
font-size: 18px;
font-size: 16px;
color: $uni-color-primary;
line-height: 1;
}
.m-price {
font-size: $font-sm + 2upx;
text-decoration: line-through;
font-size: $font-sm;
color: $font-color-light;
margin-left: 8upx;
margin-left: 10upx;
}
.coupon_box {

View File

@@ -0,0 +1,98 @@
<template>
<view class="container">
<view class="introduce-section">
<text class="title">{{ info.params }}</text>
<view class="bot-row">
<text>{{ info.code }}</text>
<text>{{ info.ctime | formatCreateTime }}</text>
</view>
</view>
<view class="c-list">
<text >{{ info.content }}</text>
</view>
</view>
</template>
<script>
import Api from '@/common/api';
import {
formatDate
} from '@/common/date';
export default {
data() {
return {
info: {
}
};
},
async onLoad() {
// 别问我啥意思。这是官方文档提供的
this.page = this.getOpenerEventChannel();
// 你可以在这里直接接受,这里不是$on
this.page.on('sendTestValue', (data) => {
// 这是data 就是上个页面传递的对象了
console.log("消息", data)
this.info = data.info
})
},
filters: {
formatCreateTime(time) {
let date = new Date(time);
return formatDate(date, 'MM-dd')
},
},
methods: {
}
};
</script>
<style lang="scss">
page {
background: $page-color-base;
}
/* 标题简介 */
.introduce-section {
background: #fff;
padding: 20upx 30upx;
.title {
font-size: 32upx;
color: $font-color-dark;
height: 50upx;
line-height: 50upx;
}
.bot-row {
display: flex;
align-items: center;
height: 50upx;
font-size: $font-sm;
color: $font-color-light;
text {
flex: 1;
}
}
}
.c-list {
display: flex;
margin-top: 10px;
height: 850px;
padding: 10rpx;
background-color: #fff;
}
</style>

View File

@@ -0,0 +1,296 @@
<template>
<view class="content">
<view class="goods-list">
<view v-for="(item, index) in goodsList" :key="index" class="goods-item">
<view class="listcard" @click="navToDetailPage(item)">
<view class="listcard-image">
<image :src="item.code=='交易物流'?pic1:pic2" mode="aspectFill"></image>
</view>
<view class="listcard-content">
<view class="listcard-content_title">
<text>{{item.code}}</text>
<text class="text2">{{item.ctime | formatCreateTime }}</text>
</view>
<text class="listcard-content_title_text">{{item.params}}</text>
</view>
</view>
</view>
</view>
<!-- <uni-load-more :status="loadingType"></uni-load-more> -->
</view>
</template>
<script>
import Api from '@/common/api';
import {
formatDate
} from '@/common/date';
export default {
data() {
return {
pageNum: 1,
pic2: "https://desk-fd.zol-img.com.cn/t_s960x600c5/g1/M0B/03/06/ChMljl402K6IOTZbAARWayFg6S4AAQJPwFhuRIABFaD752.jpg",
pic1: "https://ts1.cn.mm.bing.net/th/id/R-C.2ce48cd4a70b48403a56e9ea8c710355?rik=tU9CL%2fR0TMLEYA&riu=http%3a%2f%2fwww.kutoo8.com%2fupload%2fimage%2f63051471%2f4_1920x1080.jpg&ehk=wZm6BwD%2b8TIDXmqxTntxftDP8IzjD8g3hhI6bEwdb54%3d&risl=&pid=ImgRaw&r=0",
goodsList: [
// {
// title: "交易物流",
// pic: "https://desk-fd.zol-img.com.cn/t_s960x600c5/g1/M0B/03/06/ChMljl402K6IOTZbAARWayFg6S4AAQJPwFhuRIABFaD752.jpg",
// createTime: "02-12",
// content: "您的订单商品已经到取货点请在7日内取出。",
// },
// {
// title: "云链助手",
// pic: "https://ts1.cn.mm.bing.net/th/id/R-C.2ce48cd4a70b48403a56e9ea8c710355?rik=tU9CL%2fR0TMLEYA&riu=http%3a%2f%2fwww.kutoo8.com%2fupload%2fimage%2f63051471%2f4_1920x1080.jpg&ehk=wZm6BwD%2b8TIDXmqxTntxftDP8IzjD8g3hhI6bEwdb54%3d&risl=&pid=ImgRaw&r=0",
// createTime: "01-10",
// content: "春天已经至,已到施肥时间。",
// }
]
};
},
onLoad(options) {
// #ifdef H5
this.headerTop = document.getElementsByTagName('uni-page-head')[0].offsetHeight + 'px';
// #endif
// this.loadData();
},
onShow() {
this.loadData();
},
onPageScroll(e) {
//兼容iOS端下拉时顶部漂移
// if (e.scrollTop >= 0) {
// this.headerPosition = 'fixed';
// } else {
// this.headerPosition = 'absolute';
// }
},
//下拉刷新
onPullDownRefresh() {
this.pageNum = this.pageNum + 1;
this.loadData('refresh');
},
//加载更多
onReachBottom() {
this.pageNum = this.pageNum + 1;
this.loadData();
},
filters: {
formatCreateTime(time) {
let date = new Date(time);
return formatDate(date, 'MM-dd')
},
},
methods: {
//加载商品 ,带下拉刷新和上滑加载
async loadData(type = 'add', loading) {
//没有更多直接返回
if (type === 'add') {
if (this.loadingType === 'nomore') {
return;
}
this.loadingType = 'loading';
} else {
this.loadingType = 'more';
}
let params = {};
let list = await Api.apiCall('get', Api.member.mesList, params);
console.log("消息列表", list)
this.goodsList = list;
// let goodsList = await this.$api.json('goodsList');
// if (type === 'refresh') {
// this.goodsList = [];
// }
// this.goodsList = this.goodsList.concat(goodsList);
//判断是否还有下一页有是more 没有是nomore(测试数据判断大于20就没有了)
this.loadingType = this.goodsList.length > list.total ? 'nomore' : 'more';
if (type === 'refresh') {
if (loading == 1) {
uni.hideLoading();
} else {
uni.stopPullDownRefresh();
}
}
},
//详情
navToDetailPage(item) {
console.log("消息>>>>", item)
//测试数据没有写id用title代替
// let id = item.id;
uni.navigateTo({
url: '/pages/index/messageDetail',
// 版本2.8.9+ 支持
success: (res) => {
// 和上面其实没差什么,但是这种方式是可以的 这里不是$emit
res.eventChannel.emit('sendTestValue', {
info: item
})
}
});
},
stopPrevent() {}
}
};
</script>
<style lang="scss">
page,
.content {
background: $page-color-base;
}
.listcard {
display: flex;
align-items: center;
padding: 10px;
margin: 15px;
border-radius: 5px;
box-shadow: 0 0 5px 1px rgba($color:#000000, $alpha:0.1);
box-sizing: border-box;
.listcard-image {
flex-shrink: 0;
width: 50px;
height: 50px;
border-radius: 5px;
overflow: hidden;
image {
width: 100%;
height: 100%;
}
}
.listcard-content {
display: flex;
flex-direction: column;
padding-left: 10px;
width: 100%;
justify-content: space-between;
.listcard-content_title {
display: flex;
flex-direction: row;
justify-content: space-between;
font-size: 14px;
color: #333;
font-weight: 400;
line-height: 1.2;
position: relative;
text {
font-size: 22px;
overflow: hidden;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-line-clamp: 1;
-webkit-box-orient: vertical;
}
.text2 {
color: #999;
font-size: 18px;
}
}
.listcard-content_title_text {
margin-top: 5px;
font-size: 18px;
color: #999;
overflow: hidden;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-line-clamp: 1;
-webkit-box-orient: vertical;
}
.listcard-content_des {
display: flex;
justify-content: space-between;
font-size: 12px;
.listcard-content_des-label {
display: flex;
.listcard-content_des-label-item {
padding: 0 5px;
margin-right: 5px;
border-radius: 15px;
color: #f00;
border: 1px #f00 solid;
}
}
.listcard-content_des-browe {
color: #999;
font-size: 15px;
line-height: 1.5;
}
}
}
&.mode-column {
.list-content {
width: 100%;
padding-left: 0;
}
.listcard-image {
display: flex;
margin-top: 10px;
width: 100%;
height: 80px;
.listcard-image_item {
margin-left: 10px;
width: 100%;
border-radius: 5px;
overflow: hidden;
&:first-child {
margin-left: 0;
}
image {
width: 100%;
height: 100%;
}
}
}
.listcard-content_des {
margin-top: 10px;
}
}
&.mode-image {
flex-direction: column;
.listcard-image {
width: 100%;
height: 100px;
}
.listcard-content {
padding-left: 0;
margin-top: 10px;
.listcard-content_des {
display: flex;
align-items: center;
margin-top: 10px;
}
}
}
}
</style>

View File

@@ -100,7 +100,7 @@
<!--<list-cell icon="icon-share" iconColor="#9789f7" title="分享" tips="邀请好友赢10万大礼"></list-cell>
<list-cell icon="icon-pinglun-copy" iconColor="#ee883b" title="晒单" tips="晒单抢红包"></list-cell>-->
<list-cell icon="icon-shoucang_xuanzhongzhuangtai" iconColor="#54b4ef" title="我的收藏" @eventClick="navTo('../../pagesU/user/collect')"></list-cell>
<list-cell
<!-- <list-cell
icon="icon-share cgtt"
iconColor="#0e68d7"
v-if="!userDetailInfo.storeId"
@@ -128,7 +128,7 @@
v-if="userDetailInfo.roomNums"
title="社区主页"
@eventClick="navTo('../../pagesA/build/community')"
></list-cell>
></list-cell> -->
<!-- <list-cell
icon="icon-pinglun-copy"
iconColor="#0e68d7"

File diff suppressed because it is too large Load Diff

View File

@@ -523,7 +523,9 @@
console.log("1111111111");
if (data) {
console.log(data);
console.log("22222222222");
that.login(data);
console.log("33333333333333");
uni.setStorageSync('userInfos', data.userInfo);
uni.setStorageSync('token', data.tokenHead + data.token);
// uni.setStorageSync('adminToken', data.tokenHead + data.token);

View File

@@ -10,7 +10,7 @@
<view class="input-content">
<view class="input-item">
<text class="tit">手机号码</text>
<input type="number" v-model="phone" placeholder="请输入手机号码" />
<input type="number" v-model="phone" maxlength="11" placeholder="请输入手机号码" />
</view>
<view class="input-item">
<text class="tit">密码</text>
@@ -21,9 +21,9 @@
<input type="password" placeholder="请输入确认密码" v-model="confimpassword" @confirm="reg" />
</view>
<view class="input-item">
<text class="tit">邀请码</text>
<input type="number" v-model="invitecode" placeholder="请输入邀请码" />
</view>
<text class="tit">邀请码</text>
<input type="number" v-model="invitecode" placeholder="请输入邀请码" />
</view>
</view>
<button class="confirm-btn" @click="reg" :disabled="logining">注册</button>
@@ -39,218 +39,279 @@
</template>
<script>
import { mapMutations } from 'vuex';
import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue';
import Api from '@/common/api';
import {
mapMutations,
mapState
} from 'vuex';
import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue';
import Api from '@/common/api';
import store from '@/store/index';
export default {
components: {
mallplusCopyright
},
data() {
return {
invitecode: '',
phone: '',
password: '',
confimpassword: '',
logining: false
};
},
onLoad() {},
computed: {
...mapState(['hasLogin', 'userInfo'])
},
methods: {
...mapMutations(['login']),
inputChange(e) {
const key = e.currentTarget.dataset.key;
this[key] = e.detail.value;
},
navBack() {
uni.switchTab({
url: '/pages/index/index'
});
},
toForget() {
uni.navigateTo({
url: '../../pagesU/user/forget'
})
},
toRegist() {
uni.navigateTo({
url: '/pages/public/login'
});
},
async reg() {
var that = this;
let phoneReg = /^1[1-9][0-9]\d{8}$/;
try {
if (this.phone == '') {
throw '请填写手机号';
}
if (!phoneReg.test(this.phone)) {
throw '手机号格式有误';
}
if (this.password == '') {
throw '请填写密码';
}
} catch (err) {
this.$api.msg(err);
return;
}
let params;
//有推荐码的话,带上
var invitecode = this.$db.get('invitecode')
if (invitecode) {
data.invitecode = invitecode
params = {
phone: this.phone,
password: this.password,
confimpassword: this.confimpassword,
source: 3,
invitecode: invitecode
};
} else {
params = {
phone: this.phone,
password: this.password,
confimpassword: this.confimpassword,
source: 3,
invitecode: this.invitecode
};
}
let data = await Api.apiCall('post', Api.index.simpleReg, params);
export default {
components: {
mallplusCopyright
},
data() {
return {
invitecode:'',
phone: '',
password: '',
confimpassword: '',
logining: false
};
},
onLoad() {},
methods: {
// uni.navigateTo({
// url: '/pages/public/login'
// });
// 注册成功 直接默认登录
let params2 = {
phone: this.phone,
password: this.password
};
let data2 = await Api.apiCall('post', Api.index.login, params2);
//this.logining = false;
console.log("1111111111");
if (data2) {
console.log(data2);
that.login(data2);
uni.setStorageSync('userInfos', data2.userInfo);
uni.setStorageSync('token', data2.tokenHead + data2.token);
// uni.setStorageSync('adminToken', data.tokenHead + data.token);
console.log(uni.getStorageSync('token'));
uni.navigateBack({
delta: 2
});
inputChange(e) {
const key = e.currentTarget.dataset.key;
this[key] = e.detail.value;
},
navBack() {
uni.switchTab({
url: '/pages/index/index'
});
},
toForget(){
uni.navigateTo({
url: '../../pagesU/user/forget'
})
},
toRegist() {
uni.navigateTo({
url: '/pages/public/login'
});
},
async reg() {
let phoneReg = /^1[1-9][0-9]\d{8}$/;
try {
if (this.phone == '') {
throw '请填写手机号';
}
if (!phoneReg.test(this.phone)) {
throw '手机号格式有误';
}
if (this.password == '') {
throw '请填写密码';
}
} catch (err) {
this.$api.msg(err);
return;
}
let params ;
//有推荐码的话,带上
var invitecode = this.$db.get('invitecode')
if (invitecode) {
data.invitecode = invitecode
params = { phone: this.phone, password: this.password, confimpassword: this.confimpassword ,source:3,invitecode:invitecode};
}else {
params = { phone: this.phone, password: this.password, confimpassword: this.confimpassword ,source:3,invitecode:this.invitecode};
}
let data = await Api.apiCall('post', Api.index.simpleReg, params);
uni.navigateTo({
url: '/pages/public/login'
});
}
}
};
};
</script>
<style lang="scss">
page {
background: #fff;
}
.container {
padding-top: 115px;
position: relative;
width: 100vw;
height: 120vh;
overflow: hidden;
background: #fff;
}
.wrapper {
position: relative;
z-index: 90;
background: #fff;
padding-bottom: 30upx;
}
.back-btn {
position: absolute;
left: 40upx;
z-index: 9999;
padding-top: var(--status-bar-height);
top: 40upx;
font-size: 40upx;
color: $font-color-dark;
}
.left-top-sign {
font-size: 120upx;
color: $page-color-base;
position: relative;
left: -16upx;
}
.right-top-sign {
position: absolute;
top: 80upx;
right: -30upx;
z-index: 95;
&:before,
&:after {
display: block;
content: '';
width: 400upx;
height: 80upx;
background: #b4f3e2;
page {
background: #fff;
}
&:before {
transform: rotate(50deg);
border-radius: 0 50px 0 0;
.container {
padding-top: 115px;
position: relative;
width: 100vw;
height: 120vh;
overflow: hidden;
background: #fff;
}
&:after {
.wrapper {
position: relative;
z-index: 90;
background: #fff;
padding-bottom: 30upx;
}
.back-btn {
position: absolute;
right: -198upx;
top: 0;
transform: rotate(-50deg);
border-radius: 50px 0 0 0;
/* background: pink; */
left: 40upx;
z-index: 9999;
padding-top: var(--status-bar-height);
top: 40upx;
font-size: 40upx;
color: $font-color-dark;
}
}
.left-bottom-sign {
position: absolute;
left: -270upx;
bottom: -320upx;
border: 100upx solid #d0d1fd;
border-radius: 50%;
padding: 180upx;
}
.welcome {
position: relative;
left: 50upx;
top: -90upx;
font-size: 46upx;
color: #555;
text-shadow: 1px 0px 1px rgba(0, 0, 0, 0.3);
}
.input-content {
padding: 0 60upx;
}
.input-item {
display: flex;
flex-direction: column;
align-items: flex-start;
justify-content: center;
padding: 0 30upx;
background: $page-color-light;
height: 120upx;
border-radius: 4px;
margin-bottom: 50upx;
&:last-child {
margin-bottom: 0;
.left-top-sign {
font-size: 120upx;
color: $page-color-base;
position: relative;
left: -16upx;
}
.tit {
height: 50upx;
line-height: 56upx;
.right-top-sign {
position: absolute;
top: 80upx;
right: -30upx;
z-index: 95;
&:before,
&:after {
display: block;
content: '';
width: 400upx;
height: 80upx;
background: #b4f3e2;
}
&:before {
transform: rotate(50deg);
border-radius: 0 50px 0 0;
}
&:after {
position: absolute;
right: -198upx;
top: 0;
transform: rotate(-50deg);
border-radius: 50px 0 0 0;
/* background: pink; */
}
}
.left-bottom-sign {
position: absolute;
left: -270upx;
bottom: -320upx;
border: 100upx solid #d0d1fd;
border-radius: 50%;
padding: 180upx;
}
.welcome {
position: relative;
left: 50upx;
top: -90upx;
font-size: 46upx;
color: #555;
text-shadow: 1px 0px 1px rgba(0, 0, 0, 0.3);
}
.input-content {
padding: 0 60upx;
}
.input-item {
display: flex;
flex-direction: column;
align-items: flex-start;
justify-content: center;
padding: 0 30upx;
background: $page-color-light;
height: 120upx;
border-radius: 4px;
margin-bottom: 50upx;
&:last-child {
margin-bottom: 0;
}
.tit {
height: 50upx;
line-height: 56upx;
font-size: $font-sm + 2upx;
color: $font-color-base;
}
input {
height: 60upx;
font-size: $font-base + 2upx;
color: $font-color-dark;
width: 100%;
}
}
.confirm-btn {
width: 630upx;
height: 76upx;
line-height: 76upx;
border-radius: 50px;
margin-top: 70upx;
background: $uni-color-primary;
color: #fff;
font-size: $font-lg;
&:after {
border-radius: 100px;
}
}
.forget-section {
font-size: $font-sm + 2upx;
color: $font-color-spec;
text-align: center;
margin-top: 40upx;
}
.register-section {
position: absolute;
left: 0;
bottom: 40upx;
width: 100%;
font-size: $font-sm + 2upx;
color: $font-color-base;
}
input {
height: 60upx;
font-size: $font-base + 2upx;
color: $font-color-dark;
width: 100%;
}
}
text-align: center;
.confirm-btn {
width: 630upx;
height: 76upx;
line-height: 76upx;
border-radius: 50px;
margin-top: 70upx;
background: $uni-color-primary;
color: #fff;
font-size: $font-lg;
&:after {
border-radius: 100px;
text {
color: $font-color-spec;
margin-left: 10upx;
}
}
}
.forget-section {
font-size: $font-sm + 2upx;
color: $font-color-spec;
text-align: center;
margin-top: 40upx;
}
.register-section {
position: absolute;
left: 0;
bottom: 40upx;
width: 100%;
font-size: $font-sm + 2upx;
color: $font-color-base;
text-align: center;
text {
color: $font-color-spec;
margin-left: 10upx;
}
}
</style>

View File

@@ -21,10 +21,10 @@
<text class="cell-tit">清除缓存</text>
<text class="cell-more yticon icon-you"></text>
</view>
<view class="list-cell b-b" @click="navTo('关于Dcloud')" hover-class="cell-hover" :hover-stay-time="50">
<!-- <view class="list-cell b-b" @click="navTo('关于Dcloud')" hover-class="cell-hover" :hover-stay-time="50">
<text class="cell-tit">关于{{ sysInfo.name }}</text>
<text class="cell-more yticon icon-you"></text>
</view>
</view> -->
<view class="list-cell" @click="updateApp()">
<text class="cell-tit">检查更新</text>
<!-- <text class="cell-tip">当前版本 {{sysInfo.version}}</text> -->