other_project/mallplus
7
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

功能完善

Browse Source
This commit is contained in:
lzh
2023-02-12 19:08:38 +08:00
parent 9a3693f2c8
commit c6c6e72936
51 changed files with 5015 additions and 3847 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
docs/2.11 汇融云链.zip Normal file
View File

Binary file not shown.

31
docs/xiugai/20230211/20230211.txt Normal file
View File

@@ -0,0 +1,31 @@
1.团购已经添加商品但不能在“拼团特价”里显示
2.优惠券不能使用
3.“精选标签”和“卖家中心”里面的功能没有调整
4.点击“卖家中心”一直在请稍候的状态
5.“物业管理”里“小区列表”没有添加功能，编辑信息时不能保存字段，同时地图不能选点，增加一个上传图片功能如产品图片。
6.“农村社区”里的“社区列表”改为“农村社区列表”，列表显示村名、地址、电话，去掉均价。上面去掉“楼房”搜索项。
7.“社区主页”变更为村名，“社区活动”变更为“社区公告”，去掉“费用管理”，“社区服务”改为“限时抢购”，“社区拍卖”改为“农机租赁”，农机租赁可先做成文章形式的，以发布信息方式体现。下方放“社区团购”、“社区特供”分别对应首页的“拼团特价”、“区域商品”、“积分兑换”。
3.“精选标签”和“卖家中心”里面的功能没有调整 （郭兴）
应该怎么调整？
4.点击“精选标签”一直在请稍候的状态 （郭兴）
这三个接口需要调整
orderStatic: 'home/orderStatic', // 订单统计
goodsStatic: 'home/goodsStatic', // 商品统计
userStatic: 'home/userStatic', //会员统计
bannerList: 'sms/SmsHomeAdvertise/list', // 首页banner
6.“农村社区”里的“社区列表”改为“农村社区列表”，（完成）
列表显示村名、地址、电话，去掉均价。 列表显示字段 需要接口调整
communityList: 'single/build/communityList', // 所有社区和房间
nearCommunityList: 'single/build/near/communityList', // 周边社区
上面去掉“楼房”搜索项。 （完成）
7.“社区主页”变更为村名，“社区活动”变更为“社区公告”，去掉“费用管理”，“社区服务”改为“限时抢购”，“社区拍卖”改为“农机租赁”，（完成）
农机租赁可先做成文章形式的，以发布信息方式体现。（不理解需求）
下方放“社区团购”、“社区特供”分别对应首页的“拼团特价”、“区域商品”、“积分兑换”。（不理解需求，俩个对应三个？？）

6
mallplus-admin/src/main/resources/application-dev.properties
View File

@@ -18,9 +18,11 @@ spring.redis.pool.min-idle=0
# \u8FDE\u63A5\u8D85\u65F6\u65F6\u95F4\uFF08\u6BEB\u79D2\uFF09 # \u8FDE\u63A5\u8D85\u65F6\u65F6\u95F4\uFF08\u6BEB\u79D2\uFF09
spring.redis.timeout=0 spring.redis.timeout=0
#===redis end=== #===redis end===
spring.datasource.url=jdbc:mysql://localhost:3306/mallplus1?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&useSSL=false&useTimezone=true&serverTimezone=GMT%2B8 #spring.datasource.url=jdbc:mysql://localhost:3306/mallplus1?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&useSSL=false&useTimezone=true&serverTimezone=GMT%2B8
spring.datasource.url=jdbc:mysql://8.130.39.13:3306/mallplus1?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&useSSL=false&useTimezone=true&serverTimezone=GMT%2B8
spring.datasource.username=root spring.datasource.username=root
spring.datasource.password=root #spring.datasource.password=root
spring.datasource.password=1LAiGz$t1*Iw
spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
spring.datasource.type=com.alibaba.druid.pool.DruidDataSource spring.datasource.type=com.alibaba.druid.pool.DruidDataSource
spring.datasource.druid.initialSize=5 spring.datasource.druid.initialSize=5

4
mallplus-admin/src/main/resources/application.properties
View File

@@ -20,9 +20,7 @@ aliyun.oss.bucketName=yxt-sc
aliyun.oss.policy.expire=300 aliyun.oss.policy.expire=300
aliyun.oss.maxSize=10 aliyun.oss.maxSize=10
#aliyun.oss.callback=http://39.104.100.138:8085/aliyun/oss/callback #aliyun.oss.callback=http://39.104.100.138:8085/aliyun/oss/callback
aliyun.oss.callback=https://mall.yyundong.com/adminapi/aliyun/oss/callback
aliyun.oss.dir.prefix= aliyun.oss.dir.prefix=
#===OSS end=== #===OSS end===

2
mallplus-mbg/src/main/java/com/zscat/mallplus/enums/ConstansValue.java
View File

@@ -26,6 +26,6 @@ public class ConstansValue {
public static final String sampleSubjectList = "id, category_id, title, pic, product_count, recommend_status, create_time, collect_count, read_count, comment_count, album_pics, description, show_status, forward_count, category_name, area_id, school_id, member_id, area_name, school_name, reward, member_name, video_src, type"; public static final String sampleSubjectList = "id, category_id, title, pic, product_count, recommend_status, create_time, collect_count, read_count, comment_count, album_pics, description, show_status, forward_count, category_name, area_id, school_id, member_id, area_name, school_name, reward, member_name, video_src, type";
public static final String sampleCommunityList = "id, company_id, name, pic, price,wuyecompany,wuyefei,latitude,longitude,create_time "; public static final String sampleCommunityList = "id, company_id, name, pic, price, details,wuyecompany,wuyefei,latitude,longitude,create_time ";
} }

7
mallplus-portal/src/main/resources/application-dev.properties
View File

@@ -1,7 +1,8 @@
#spring.datasource.url=jdbc:mysql://39.104.142.92:3306/mallplus?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&useSSL=false&useTimezone=true&serverTimezone=GMT%2B8 spring.datasource.url=jdbc:mysql://8.130.39.13:3306/mallplus1?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&useSSL=false&useTimezone=true&serverTimezone=GMT%2B8
spring.datasource.url=jdbc:mysql://127.0.0.1:3306/mallplus1?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&useSSL=false&useTimezone=true&serverTimezone=GMT%2B8 #spring.datasource.url=jdbc:mysql://127.0.0.1:3306/mallplus1?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&useSSL=false&useTimezone=true&serverTimezone=GMT%2B8
spring.datasource.username=root spring.datasource.username=root
spring.datasource.password=root spring.datasource.password=1LAiGz$t1*Iw
#spring.datasource.password=root
#spring.datasource.url=jdbc:mysql://39.104.142.92:3306/mallplus?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&useSSL=false&useTimezone=true&serverTimezone=GMT%2B8 #spring.datasource.url=jdbc:mysql://39.104.142.92:3306/mallplus?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&useSSL=false&useTimezone=true&serverTimezone=GMT%2B8
#spring.datasource.username=root #spring.datasource.username=root
#spring.datasource.password=123456 #spring.datasource.password=123456

1
mallplus-portal/src/main/resources/application.properties
View File

@@ -1,6 +1,7 @@
spring.jackson.time-zone=GMT+8 spring.jackson.time-zone=GMT+8
#\u9ED8\u8BA4\u4E3A\u5F00\u53D1\u73AF\u5883 #\u9ED8\u8BA4\u4E3A\u5F00\u53D1\u73AF\u5883
spring.profiles.active=test spring.profiles.active=test
#spring.profiles.active=dev
#===server start=== #===server start===
server.port=8083 server.port=8083
#===server end=== #===server end===

17
mallplusui-uniapp-app/common/api.js
View File

@@ -1,10 +1,10 @@
import store from '../store/index'; import store from '../store/index';
export default { export default {
// qq 237524947 wx15d4269d3210863d // qq 237524947 wx15d4269d3210863d
//BASEURI: 'http://localhost:8083/api/', BASEURI: 'http://mall.yyundong.com/portalapi/api/',
BASEURI: 'http://127.0.0.1:8083/api/', // BASEURI: 'http://www.yyundong.com:8083/api/',
ADMINURI: 'http://127.0.0.1:8085/', ADMINURI: 'http://mall.yyundong.com/adminapi/',
ESURI: 'http://127.0.0.1:8081/', ESURI: 'http://www.yyundong.com:8081/',
h5Appid: 'wxb4660f37187c0b8e', // h5微信登录的appId 暂时测试用 h5Appid: 'wxb4660f37187c0b8e', // h5微信登录的appId 暂时测试用
source: 1, //1 weixinApplet 2 h5Source 3 pcSource 4 android 5ios source: 1, //1 weixinApplet 2 h5Source 3 pcSource 4 android 5ios
es: { es: {
@@ -258,6 +258,7 @@ export default {
let token = uni.getStorageSync('token') || ''; let token = uni.getStorageSync('token') || '';
let fullurl = this.BASEURI + endpoint; let fullurl = this.BASEURI + endpoint;
console.log("fullurl",fullurl);
var contentType = 'application/x-www-form-urlencoded'; var contentType = 'application/x-www-form-urlencoded';
data.authorization = token; data.authorization = token;
@@ -272,11 +273,6 @@ export default {
// 'authorization1': Authorization || '' // 'authorization1': Authorization || ''
}, },
}); });
console.log('fullurl,',fullurl)
console.log('data,',data)
console.log('token,',token)
console.log('error,',error)
console.log('res,',res)
if (load) { if (load) {
uni.hideLoading(); uni.hideLoading();
} }
@@ -311,9 +307,10 @@ export default {
console.log(fullurl); console.log(fullurl);
console.log(res.data.data); console.log(res.data.data);
if (res.data.code == 200) { if (res.data.code == 200) {
console.log("===>>>");
return res.data.data; return res.data.data;
} else { } else {
console.log(">>>>>=");
if (res.data) { if (res.data) {
if (!res.data.msg) { if (!res.data.msg) {
res.data.msg = res.data.data; res.data.msg = res.data.data;

167
mallplusui-uniapp-app/components/coolc-coupon/coolc-coupon.vue
View File

@@ -1,49 +1,49 @@
<template> <template>
<view class="coupon-item"> <view class="coupon-item">
<view class="coupon-money"> <view class="coupon-money">
<view class="nick" ></view> <view class="nick">{{item.name}}</view>
<view class="layof" :style="{color:theme}">￥{{item.amount}}</view> <view class="layof" :style="{color:theme}">￥{{item.amount}}</view>
<view class="end_time">{{item.endTime | formatCreateTime}}前使用</view> <view class="end_time">{{item.endTime | formatCreateTime}}前使用</view>
<view > <view>
<view class="demand">满{{ item.minPoint }} 减 {{ item.amount }}</view> <view class="demand">满{{ item.minPoint }} 减 {{ item.amount }}</view>
</view> </view>
</view> </view>
<view class="get-btn" v-if="!types" :style="{color:color, borderColor:color, background:solid}" @click="acceptCoupon(item)" >立即领取</view> <view class="get-btn" v-if="!types" :style="{color:color, borderColor:color, background:solid}"
<navigator class="get-btn" v-if="types" :style="{color:color, borderColor:color, background:solid}" :url='item.url' @click="acceptCoupon(item)">立即使用</navigator> @click="acceptCoupon(item)">立即领取</view>
<navigator class="get-btn" v-if="types" :style="{color:color, borderColor:color, background:solid}"
:url='item.url' @click="useCoupon(item)">立即使用</navigator>
</view> </view>
</template> </template>
<script> <script>
import Api from '@/common/api'; import Api from '@/common/api';
import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue'; import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue';
import { formatDate } from '@/common/date'; import {
formatDate
} from '@/common/date';
export default { export default {
components:{ components: {
}, },
data() { data() {
return { return {
types: false
} }
}, },
props:{ props: {
item:{ item: {
type: Object type: Object
}, },
types:{ theme: {
type: String,
default: ''
},
theme:{
type: String, type: String,
default: '#ff9000' default: '#ff9000'
}, },
solid:{ solid: {
type: String, type: String,
default: '#ffffff' default: '#ffffff'
}, },
color:{ color: {
type: String, type: String,
default: '#ff9000' default: '#ff9000'
}, },
@@ -55,12 +55,15 @@ export default {
}, },
}, },
methods: { methods: {
async acceptCoupon(item){ async acceptCoupon(item) {
this.types =!this.types
uni.showLoading({ uni.showLoading({
title: '请稍后' title: '请稍后'
}); });
let params = { couponId: item.id }; let params = {
couponId: item.id
};
let data = await Api.apiCall('post', Api.index.acceptCoupon, params); let data = await Api.apiCall('post', Api.index.acceptCoupon, params);
console.log(data); console.log(data);
if (data) { if (data) {
@@ -69,25 +72,119 @@ export default {
uni.hideLoading(); uni.hideLoading();
}, },
async useCoupon(item){
uni.showLoading({
title: '请稍后'
});
}
}
} }
}
</script> </script>
<style lang='scss'> <style lang='scss'>
.coupon-item { .coupon-item {
width:100%; height:auto; display:table; border-radius:10upx; padding:0 20upx; margin-top:22upx; border:1px solid #eeeeee; position:relative; width: 100%;
height: auto;
display: table;
border-radius: 10upx;
padding: 0 20upx;
margin-top: 22upx;
border: 1px solid #eeeeee;
position: relative;
.coupon-money { .coupon-money {
width:465upx; height:auto; display:table; float:left; padding:26upx 0; border-style:none dotted none none; border-color:#eeeeee; width: 465upx;
height: auto;
display: table;
float: left;
padding: 26upx 0;
border-style: none dotted none none;
border-color: #eeeeee;
.nick { width:100%; height:50upx; line-height:30upx; font-size:$font-sm; color:$font-color-999; } .nick {
.tit { width:100%; height:50upx; line-height:50upx; font-size:$font-sm; color:$font-color-999; } width: 100%;
.demand { width:100%; height:30upx; line-height:30upx; font-size:$font-sm; color:$font-color-999; } height: 50upx;
line-height: 30upx;
.layof { width:100%; height:48upx; line-height:30upx; font-size:44upx; color:#ff9000; font-weight:bold; } font-size: $font-sm;
.end_time { width:100%; height:30upx; line-height:30upx; font-size:$font-sm; color:$font-color-999; } color: $font-color-999;
}
.tit {
width: 100%;
height: 50upx;
line-height: 50upx;
font-size: $font-sm;
color: $font-color-999;
}
.demand {
width: 100%;
height: 30upx;
line-height: 30upx;
font-size: $font-sm;
color: $font-color-999;
}
.layof {
width: 100%;
height: 48upx;
line-height: 30upx;
font-size: 44upx;
color: #ff9000;
font-weight: bold;
}
.end_time {
width: 100%;
height: 30upx;
line-height: 30upx;
font-size: $font-sm;
color: $font-color-999;
}
}
.get-btn {
width: 146upx;
height: 52upx;
line-height: 50upx;
position: absolute;
top: 50%;
right: 26upx;
margin-top: -26upx;
text-align: center;
border-radius: 60upx;
color: #ff9000;
border: 1px solid #ff9000;
font-size: $font-sm;
float: right;
}
}
.coupon-item:after {
width: 40upx;
height: 20upx;
position: absolute;
left: 460upx;
top: -1px;
border-radius: 0 0 40upx 40upx;
content: "";
display: block;
background: $bgcolor_white;
border: 1px solid #eeeeee;
border-top: 0px;
}
.coupon-item:before {
width: 40upx;
height: 20upx;
position: absolute;
left: 460upx;
bottom: -1px;
border-radius: 40upx 40upx 0 0;
content: "";
display: block;
background: $bgcolor_white;
border: 1px solid #eeeeee;
border-bottom: 0px;
} }
.get-btn { width:146upx; height:52upx; line-height:50upx; position:absolute; top:50%; right:26upx; margin-top:-26upx; text-align:center; border-radius:60upx; color:#ff9000; border:1px solid #ff9000; font-size:$font-sm; float:right; }
}
.coupon-item:after { width:40upx; height:20upx; position:absolute; left:460upx; top:-1px; border-radius:0 0 40upx 40upx; content:""; display:block; background:$bgcolor_white; border:1px solid #eeeeee; border-top:0px; }
.coupon-item:before { width:40upx; height:20upx; position:absolute; left:460upx; bottom:-1px; border-radius:40upx 40upx 0 0; content:""; display:block; background:$bgcolor_white; border:1px solid #eeeeee; border-bottom:0px; }
</style> </style>

71
mallplusui-uniapp-app/components/likes/likes.vue Normal file
View File

@@ -0,0 +1,71 @@
<template>
<view class="icons" @click.stop="likeTab">
<uni-icons size="20" color="#f07373" :type="like?'heart-filled':'heart'" ></uni-icons>
</view>
</template>
<script>
export default {
props:{
item:{
type:Object,
default(){
return {}
}
},
types:{
type:String,
default:''
}
},
watch:{
item(newVal){
this.like = this.item.is_like
}
},
created() {
this.like = this.item.is_like
},
data() {
return {
like:false
};
},
methods:{
likeTab(){
this.like = !this.like;
this.updateLikes();
},
updateLikes(){
uni.showLoading();
this.$api.update_likes({
user_id:'5f3d11c03d11c60001141e5f',
article_id:this.item._id
}).then(res=>{
uni.hideLoading();
console.log(res);
uni.showToast({
title:this.like?"收藏成功":"取消收藏",
icon:'none'
})
uni.$emit('update_article',this.types)
}).catch(()=>{
uni.hideLoading();
})
}
}
}
</script>
<style lang="scss">
.icons {
position: absolute;
right: 0;
top: 0;
display: flex;
justify-content: center;
align-items: center;
width: 20px;
height: 20px;
}
</style>

4
mallplusui-uniapp-app/components/mall-copyright/mallplusCopyright.vue
View File

@@ -21,6 +21,10 @@ export default {
<style> <style>
.cpr{ .cpr{
width: 100%;
position: absolute;
bottom: 0;
justify-self: center;
text-align: center; text-align: center;
font-size: 24upx; font-size: 24upx;
margin: 20upx 0; margin: 20upx 0;

8
mallplusui-uniapp-app/config/baseUrl.js
View File

@@ -5,13 +5,13 @@ if (process.env.NODE_ENV === 'development') {
// baseUrl = "http://localhost:7001/"; // baseUrl = "http://localhost:7001/";
// socketUrl = "ws://localhost:8001/"; // socketUrl = "ws://localhost:8001/";
// baseUrl = "http://26077a35f5.wicp.vip:43609/"; // baseUrl = "http://26077a35f5.wicp.vip:43609/";
baseUrl = "http://192.168.3.108:8083/"; baseUrl = "http://www.yyundong.com:8083/";
socketUrl = "ws://192.168.3.108:8083/"; socketUrl = "ws://8192.168.43.195:8083/";
} else if (process.env.NODE_ENV === 'production') { } else if (process.env.NODE_ENV === 'production') {
// 生产环境 // 生产环境
baseUrl = "http://192.168.3.108:8083/"; baseUrl = "http://www.yyundong.com:8083/";
// baseUrl = "http://192.168.43.195:8083/"; // baseUrl = "http://192.168.43.195:8083/";
socketUrl = "ws://192.168.3.108:8083/"; socketUrl = "ws://192.168.43.195:8083/";
} }
const courtConfig = { const courtConfig = {
//微信公众号APPID //微信公众号APPID

8
mallplusui-uniapp-app/manifest.json
View File

@@ -1,6 +1,6 @@
{ {
"name" : "宇运动商城", "name" : "汇融云链",
"appid" : "__UNI__0802E33", "appid" : "__UNI__FB2C9C4",
"description" : "", "description" : "",
"versionName" : "4.0.0.0", "versionName" : "4.0.0.0",
"versionCode" : 4000, "versionCode" : 4000,
@@ -55,7 +55,9 @@
"<uses-permission android:name=\"android.permission.BLUETOOTH_ADMIN\"/>" "<uses-permission android:name=\"android.permission.BLUETOOTH_ADMIN\"/>"
] ]
}, },
"ios" : {}, "ios" : {
"dSYMs" : false
},
"sdkConfigs" : { "sdkConfigs" : {
"oauth" : { "oauth" : {
"weixin" : { "weixin" : {

73
mallplusui-uniapp-app/pages.json
View File

@@ -2,10 +2,11 @@
"pages": [{ "pages": [{
"path": "pages/index/index", "path": "pages/index/index",
"style": { "style": {
// #ifdef MP
"navigationBarTitleText": "mallcloud商城",
"navigationStyle": "custom",
"enablePullDownRefresh": true, "enablePullDownRefresh": true,
// #ifdef MP
"navigationBarTitleText": "汇融云链",
"navigationStyle": "custom",
// #endif // #endif
"app-plus": { "app-plus": {
"titleNView": { "titleNView": {
@@ -13,7 +14,7 @@
"searchInput": { "searchInput": {
"backgroundColor": "rgba(231, 231, 231,.7)", "backgroundColor": "rgba(231, 231, 231,.7)",
"borderRadius": "16px", "borderRadius": "16px",
"placeholder": "请输入地址 如：大钟寺", "placeholder": "请输入要查询的信息",
"disabled": true, "disabled": true,
"placeholderColor": "#606266" "placeholderColor": "#606266"
}, },
@@ -59,6 +60,16 @@
} }
} }
} }
}, {
"path": "pages/index/lease",
"style": {
"navigationBarTitleText": "农机租赁"
// "app-plus": {
// "titleNView": {
// "type": "transparent"
// }
// }
}
}, { }, {
"path": "pages/order/orderDetail", "path": "pages/order/orderDetail",
"style": { "style": {
@@ -178,12 +189,12 @@
"style": { "style": {
"navigationBarTitleText": "我的订单", "navigationBarTitleText": "我的订单",
"enablePullDownRefresh": true, "enablePullDownRefresh": true,
"onReachBottomDistance":126 ,//距离底部多远时触发 单位px "onReachBottomDistance": 126, //距离底部多远时触发 单位px
"app-plus": { "app-plus": {
"bounce": "none" "bounce": "none"
} }
} }
},{ }, {
"path": "pages/order/createOrder", "path": "pages/order/createOrder",
"style": { "style": {
"navigationBarTitleText": "创建订单" "navigationBarTitleText": "创建订单"
@@ -266,11 +277,9 @@
} }
} }
], ],
"subPackages": [ "subPackages": [{
{
"root": "pagesC", "root": "pagesC",
"pages": [ "pages": [{
{
"path": "store/list", "path": "store/list",
"style": { "style": {
"enablePullDownRefresh": true, "enablePullDownRefresh": true,
@@ -345,12 +354,13 @@
{ {
"path": "seller/index", "path": "seller/index",
"style": { "style": {
"navigationBarTitleText": "卖家中心", "navigationBarTitleText": "卖家中心"
"app-plus": { // "navigationStyle": "custom"
"titleNView": { // "app-plus": {
"type": "transparent" // "titleNView": {
} // "type": "transparent"
} // }
// }
} }
}, },
{ {
@@ -449,8 +459,7 @@
}, },
{ {
"root": "pagesA", "root": "pagesA",
"pages": [ "pages": [{
{
"path": "product/categoryAttr", "path": "product/categoryAttr",
"style": { "style": {
"navigationBarTitleText": "类型商品", "navigationBarTitleText": "类型商品",
@@ -475,12 +484,12 @@
{ {
"path": "product/tag", "path": "product/tag",
"style": { "style": {
"navigationBarTitleText": "精选标签", "navigationBarTitleText": "精选标签"
"app-plus": { // "app-plus": {
"titleNView": { // "titleNView": {
"type": "transparent" // "type": "transparent"
} // }
} // }
} }
}, },
{ {
@@ -574,8 +583,8 @@
{ {
"path" : "build/repairOrder/repairOrder", "path": "build/repairOrder/repairOrder",
"style" : { "style": {
"navigationBarTitleText": "维修录单" "navigationBarTitleText": "维修录单"
} }
}, },
@@ -597,7 +606,7 @@
}, { }, {
"path": "build/communityList", "path": "build/communityList",
"style": { "style": {
"navigationBarTitleText": "社区列表" "navigationBarTitleText": "农村社区列表"
} }
}, },
{ {
@@ -671,7 +680,7 @@
"navigationBarTitleText": "邀请好友佣金" "navigationBarTitleText": "邀请好友佣金"
} }
},{ }, {
"path": "user/balance", "path": "user/balance",
"style": { "style": {
"navigationBarTitleText": "我的钱包" "navigationBarTitleText": "我的钱包"
@@ -724,13 +733,13 @@
"bounce": "none" "bounce": "none"
} }
} }
},{ }, {
"path": "user/profile", "path": "user/profile",
"style": { "style": {
"enablePullDownRefresh": true, "enablePullDownRefresh": true,
"navigationBarTitleText": "个人信息" "navigationBarTitleText": "个人信息"
} }
},{ }, {
"path": "user/applyMember", "path": "user/applyMember",
"style": { "style": {
"navigationBarTitleText": "升级会员", "navigationBarTitleText": "升级会员",
@@ -740,12 +749,12 @@
} }
} }
} }
},{ }, {
"path": "notice/notice", "path": "notice/notice",
"style": { "style": {
"navigationBarTitleText": "通知" "navigationBarTitleText": "通知"
} }
},{ }, {
"path": "notice/subjectList", "path": "notice/subjectList",
"style": { "style": {
"navigationBarTitleText": "秒杀列表", "navigationBarTitleText": "秒杀列表",

114
mallplusui-uniapp-app/pages/cart/cart.vue
View File

@@ -8,7 +8,8 @@
<image src="/static/emptyCart.jpg" mode="aspectFit"></image> <image src="/static/emptyCart.jpg" mode="aspectFit"></image>
<view v-if="hasLogin" class="empty-tips"> <view v-if="hasLogin" class="empty-tips">
空空如也 空空如也
<navigator class="navigator" v-if="hasLogin" url="../index/index" open-type="switchTab">随便逛逛></navigator> <navigator class="navigator" v-if="hasLogin" url="../index/index" open-type="switchTab">随便逛逛>
</navigator>
</view> </view>
<view v-else class="empty-tips"> <view v-else class="empty-tips">
空空如也 空空如也
@@ -21,21 +22,18 @@
<block v-for="(item, index) in cartList" :key="item.id"> <block v-for="(item, index) in cartList" :key="item.id">
<view class="cart-item" :class="{ 'b-b': index !== cartList.length - 1 }"> <view class="cart-item" :class="{ 'b-b': index !== cartList.length - 1 }">
<view class="image-wrapper"> <view class="image-wrapper">
<image <image :src="item.productPic" class="loaded" mode="aspectFill" lazy-load
:src="item.productPic" @load="onImageLoad('cartList', index)" @error="onImageError('cartList', index)"></image>
class="loaded" <view class="yticon icon-xuanzhong2 checkbox"
mode="aspectFill" :class="{ checked: item.checked === '1' || item.checked }"
lazy-load @click="check('item', index)"></view>
@load="onImageLoad('cartList', index)"
@error="onImageError('cartList', index)"
></image>
<view class="yticon icon-xuanzhong2 checkbox" :class="{ checked: item.checked === '1' || item.checked }" @click="check('item', index)"></view>
</view> </view>
<view class="item-right"> <view class="item-right">
<text class="clamp title">{{ item.productName }}</text> <text class="clamp title">{{ item.productName }}</text>
<text class="attr">{{ item.productAttr }}</text> <text class="attr">{{ item.productAttr }}</text>
<text class="price">¥{{ item.price }}</text> <text class="price">¥{{ item.price }}</text>
<uni-number-box class="step" :min="1" :value="item.quantity" :isMin="item.quantity === 1" :index="index" @eventChange="numberChange"></uni-number-box> <uni-number-box class="step" :min="1" :value="item.quantity" :isMin="item.quantity === 1"
:index="index" @eventChange="numberChange"></uni-number-box>
</view> </view>
<text class="del-btn yticon icon-fork" @click="deleteCartItem(index)"></text> <text class="del-btn yticon icon-fork" @click="deleteCartItem(index)"></text>
</view> </view>
@@ -45,7 +43,8 @@
<!-- 底部菜单栏 --> <!-- 底部菜单栏 -->
<view class="action-section"> <view class="action-section">
<view class="checkbox"> <view class="checkbox">
<image :src="allChecked ? '/static/selected.png' : '/static/select.png'" mode="aspectFit" @click="check('all')"></image> <image :src="allChecked ? '/static/selected.png' : '/static/select.png'" mode="aspectFit"
@click="check('all')"></image>
<view class="clear-btn" :class="{ show: allChecked }" @click="clearCart">清空</view> <view class="clear-btn" :class="{ show: allChecked }" @click="clearCart">清空</view>
</view> </view>
<view class="total-box"> <view class="total-box">
@@ -60,17 +59,18 @@
</view> </view>
</view> </view>
<mallplusCopyright></mallplusCopyright>
</view> </view>
</template> </template>
<script> <script>
import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue'; import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue';
import Api from '@/common/api'; import Api from '@/common/api';
import { mapState } from 'vuex'; import {
import uniNumberBox from '@/components/uni-number-box.vue'; mapState
import navBar from '@/components/zhouWei-navBar'; } from 'vuex';
export default { import uniNumberBox from '@/components/uni-number-box.vue';
import navBar from '@/components/zhouWei-navBar';
export default {
components: { components: {
uniNumberBox, uniNumberBox,
navBar, navBar,
@@ -152,7 +152,10 @@ export default {
//数量 //数量
numberChange(data) { numberChange(data) {
this.cartList[data.index].quantity = data.number; this.cartList[data.index].quantity = data.number;
let params = { id: this.cartList[data.index].id, quantity: data.number }; let params = {
id: this.cartList[data.index].id,
quantity: data.number
};
data = Api.apiCall('get', Api.order.updateQuantity, params); data = Api.apiCall('get', Api.order.updateQuantity, params);
this.calcTotal(); this.calcTotal();
}, },
@@ -163,11 +166,13 @@ export default {
title: '提示', title: '提示',
content: '确定将此商品移出购物车吗', content: '确定将此商品移出购物车吗',
success: res => { success: res => {
if(res.confirm){ if (res.confirm) {
let list = that.cartList; let list = that.cartList;
let row = list[index]; let row = list[index];
let id = row.id; let id = row.id;
let params = { cart_id_list: id }; let params = {
cart_id_list: id
};
Api.apiCall('post', Api.order.deleteCart, params); Api.apiCall('post', Api.order.deleteCart, params);
that.cartList.splice(index, 1); that.cartList.splice(index, 1);
that.calcTotal(); that.calcTotal();
@@ -183,7 +188,7 @@ export default {
title: '提示', title: '提示',
content: '确定将购物车清空吗', content: '确定将购物车清空吗',
success: res => { success: res => {
if(res.confirm){ if (res.confirm) {
let params = {}; let params = {};
Api.apiCall('post', Api.order.clearCart, params); Api.apiCall('post', Api.order.clearCart, params);
this.cartList = []; this.cartList = [];
@@ -221,11 +226,11 @@ export default {
} }
}); });
let cartIds = ids.substr(0, ids.length - 1); let cartIds = ids.substr(0, ids.length - 1);
let dataJson ={}; let dataJson = {};
dataJson.type=2; dataJson.type = 2;
dataJson.cartIds=cartIds; dataJson.cartIds = cartIds;
let url='/pages/order/createStoreOrder?dataJson=' + JSON.stringify(dataJson) let url = '/pages/order/createStoreOrder?dataJson=' + JSON.stringify(dataJson)
uni.navigateTo({ uni.navigateTo({
url: url url: url
@@ -234,12 +239,13 @@ export default {
} }
} }
}; };
</script> </script>
<style lang="scss"> <style lang="scss">
.container { .container {
padding-bottom: 134upx; padding-bottom: 134upx;
/* 空白页 */ /* 空白页 */
.empty { .empty {
position: fixed; position: fixed;
@@ -253,36 +259,43 @@ export default {
flex-direction: column; flex-direction: column;
align-items: center; align-items: center;
background: #fff; background: #fff;
image { image {
width: 240upx; width: 240upx;
height: 160upx; height: 160upx;
margin-bottom: 30upx; margin-bottom: 30upx;
} }
.empty-tips { .empty-tips {
display: flex; display: flex;
font-size: $font-sm + 2upx; font-size: $font-sm + 2upx;
color: $font-color-disabled; color: $font-color-disabled;
.navigator { .navigator {
color: $uni-color-primary; color: $uni-color-primary;
margin-left: 16upx; margin-left: 16upx;
} }
} }
} }
} }
/* 购物车列表项 */
.cart-item { /* 购物车列表项 */
.cart-item {
display: flex; display: flex;
position: relative; position: relative;
padding: 30upx 40upx; padding: 30upx 40upx;
.image-wrapper { .image-wrapper {
width: 230upx; width: 230upx;
height: 230upx; height: 230upx;
flex-shrink: 0; flex-shrink: 0;
position: relative; position: relative;
image { image {
border-radius: 8upx; border-radius: 8upx;
} }
} }
.checkbox { .checkbox {
position: absolute; position: absolute;
left: -16upx; left: -16upx;
@@ -295,6 +308,7 @@ export default {
background: #fff; background: #fff;
border-radius: 50px; border-radius: 50px;
} }
.item-right { .item-right {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
@@ -302,6 +316,7 @@ export default {
overflow: hidden; overflow: hidden;
position: relative; position: relative;
padding-left: 30upx; padding-left: 30upx;
.title, .title,
.price { .price {
font-size: $font-base + 2upx; font-size: $font-base + 2upx;
@@ -309,26 +324,30 @@ export default {
height: 40upx; height: 40upx;
line-height: 40upx; line-height: 40upx;
} }
.attr { .attr {
font-size: $font-sm + 2upx; font-size: $font-sm + 2upx;
color: $font-color-light; color: $font-color-light;
height: 50upx; height: 50upx;
line-height: 50upx; line-height: 50upx;
} }
.price { .price {
height: 50upx; height: 50upx;
line-height: 50upx; line-height: 50upx;
} }
} }
.del-btn { .del-btn {
padding: 4upx 10upx; padding: 4upx 10upx;
font-size: 34upx; font-size: 34upx;
height: 50upx; height: 50upx;
color: $font-color-light; color: $font-color-light;
} }
} }
/* 底部栏 */
.action-section { /* 底部栏 */
.action-section {
/* #ifdef H5 */ /* #ifdef H5 */
margin-bottom: 100upx; margin-bottom: 100upx;
/* #endif */ /* #endif */
@@ -344,9 +363,11 @@ export default {
background: rgba(255, 255, 255, 0.9); background: rgba(255, 255, 255, 0.9);
box-shadow: 0 0 20upx 0 rgba(0, 0, 0, 0.5); box-shadow: 0 0 20upx 0 rgba(0, 0, 0, 0.5);
border-radius: 16upx; border-radius: 16upx;
.checkbox { .checkbox {
height: 52upx; height: 52upx;
position: relative; position: relative;
image { image {
width: 52upx; width: 52upx;
height: 100%; height: 100%;
@@ -354,6 +375,7 @@ export default {
z-index: 5; z-index: 5;
} }
} }
.clear-btn { .clear-btn {
position: absolute; position: absolute;
left: 26upx; left: 26upx;
@@ -369,29 +391,35 @@ export default {
border-radius: 0 50px 50px 0; border-radius: 0 50px 50px 0;
opacity: 0; opacity: 0;
transition: 0.2s; transition: 0.2s;
&.show { &.show {
opacity: 1; opacity: 1;
width: 120upx; width: 120upx;
} }
} }
.total-box { .total-box {
flex: 1; flex: 1;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
text-align: right; text-align: right;
padding-right: 40upx; padding-right: 40upx;
.price { .price {
font-size: $font-lg; font-size: $font-lg;
color: $font-color-dark; color: $font-color-dark;
} }
.coupon { .coupon {
font-size: $font-sm; font-size: $font-sm;
color: $font-color-light; color: $font-color-light;
text { text {
color: $font-color-dark; color: $font-color-dark;
} }
} }
} }
.confirm-btn { .confirm-btn {
padding: 0 38upx; padding: 0 38upx;
margin: 0; margin: 0;
@@ -402,18 +430,20 @@ export default {
background: $uni-color-primary; background: $uni-color-primary;
box-shadow: 1px 2px 5px rgba(217, 60, 93, 0.72); box-shadow: 1px 2px 5px rgba(217, 60, 93, 0.72);
} }
} }
/* 复选框选中状态 */
.action-section .checkbox.checked, /* 复选框选中状态 */
.cart-item .checkbox.checked { .action-section .checkbox.checked,
.cart-item .checkbox.checked {
color: $uni-color-primary; color: $uni-color-primary;
} }
.getPosition {
.getPosition {
height: 100upx; height: 100upx;
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
font-size: 32upx; font-size: 32upx;
background-color: #fff; background-color: #fff;
} }
</style> </style>

366
mallplusui-uniapp-app/pages/index/index.vue
View File

File diff suppressed because it is too large Load Diff

269
mallplusui-uniapp-app/pages/index/lease.vue Normal file
View File

@@ -0,0 +1,269 @@
<template>
<view class="home">
<view class="home-list">
<view v-for="(item,index) in tableList" :key="item._id" :item="item">
<view @click="open">
<!-- 基础卡片 -->
<view v-if="item.mode==='base'" class="listcard">
<view class="listcard-image">
<image :src="item.cover[0]" mode="aspectFill"></image>
</view>
<view class="listcard-content">
<view class="listcard-content_title">
<text>{{item.title}}</text>
<likes :types="types" :item="item"></likes>
</view>
<view class="listcard-content_des">
<view class="listcard-content_des-label">
<view class="listcard-content_des-label-item">{{item.classify}}</view>
</view>
<view class="listcard-content_des-browe">{{item.browse_count}}浏览</view>
</view>
</view>
</view>
<!-- 多图模式 -->
<view v-if="item.mode==='column'" class="listcard mode-column">
<view class="listcard-content">
<view class="listcard-content_title">
<text>{{item.title}}</text>
<likes :types="types" :item="item"></likes>
</view>
<view class="listcard-image">
<view v-if="index<3" v-for="(item,index) in item.cover" :key="index"
class="listcard-image_item">
<image :src="item" mode="aspectFill"></image>
</view>
</view>
<view class="listcard-content_des">
<view class="listcard-content_des-label">
<view class="listcard-content_des-label-item">{{item.classify}}</view>
</view>
<view class="listcard-content_des-browe">{{item.browse_count}}浏览</view>
</view>
</view>
</view>
<!-- 大图模式 -->
<view v-if="item.mode==='image'" class="listcard mode-image">
<view class="listcard-image">
<image :src="item.cover[0]" mode="aspectFill"></image>
</view>
<view class="listcard-content">
<view class="listcard-content_title">
<text>{{item.title}}</text>
<likes :types="types" :item="item"></likes>
</view>
<view class="listcard-content_des">
<view class="listcard-content_des-label">
<view class="listcard-content_des-label-item">{{item.classify}}</view>
</view>
<view class="listcard-content_des-browe">{{item.browse_count}}浏览</view>
</view>
</view>
</view>
</view>
</view>
</view>
</view>
</template>
<script>
export default {
data() {
return {
types:"",
tableList: [{
_id: 1,
title: "到速度奥昂是大宋到速度奥昂是大宋到速度奥昂是大宋",
mode: 'base',
cover: [
"https://ts1.cn.mm.bing.net/th/id/R-C.df4462fabf18edd07195679a5f8a37e5?rik=FnNvr9jWWjHCVQ&riu=http%3a%2f%2fseopic.699pic.com%2fphoto%2f50059%2f8720.jpg_wh1200.jpg&ehk=ofb4q76uCls2S07aIlc8%2bab3H5zwrmj%2bhqiZ%2fyw3Ghw%3d&risl=&pid=ImgRaw&r=0"
],
classify: 111,
browse_count: 111
},
{
_id: 2,
title: "啊实打实大苏打实打实打算大苏打",
mode: 'column',
cover: [
"https://pic3.zhimg.com/v2-58d652598269710fa67ec8d1c88d8f03_r.jpg?source=1940ef5c",
"https://pic3.zhimg.com/v2-58d652598269710fa67ec8d1c88d8f03_r.jpg?source=1940ef5c",
"https://pic3.zhimg.com/v2-c6ae9c3aff36b9b221258f6a90577902_r.jpg",
"https://pic3.zhimg.com/v2-c6ae9c3aff36b9b221258f6a90577902_r.jpg"
],
classify: 222,
browse_count: 222
},
{
_id: 3,
title: "都是否定的撒撒大撒反对的飒飒的撒范德萨",
mode: 'image',
cover: [
"https://ts1.cn.mm.bing.net/th?id=OIP-C.kJE5c2uL7he1BwdQb3-APAHaNK&w=187&h=333&c=8&rs=1&qlt=90&o=6&pid=3.1&rm=2"
],
classify: 333,
browse_count: 333
},
],
};
},
methods: {
open() {
}
}
};
</script>
<style lang="scss">
page {
height: 100%;
display: flex;
}
.home {
display: flex;
flex-direction: column;
flex: 1;
overflow: hidden;
.home-list {
flex: 1;
box-sizing: border-box;
}
}
.listcard {
display: flex;
padding: 15px;
margin: 20px;
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: 80px;
height: 80px;
border-radius: 8px;
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 {
padding-right: 30px;
font-size: 14px;
color: #333;
font-weight: 400;
line-height: 1.2;
position: relative;
text {
overflow: hidden;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-line-clamp: 2;
-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;
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>

3
mallplusui-uniapp-app/pages/index/user.vue
View File

@@ -32,7 +32,7 @@
<text class="yticon icon-iLinkapp-"></text> <text class="yticon icon-iLinkapp-"></text>
{{ userDetailInfo.memberLevelName || '开通会员' }} {{ userDetailInfo.memberLevelName || '开通会员' }}
</view> </view>
<text class="e-m">Mallplus</text> <text class="e-m">汇融云链</text>
<text class="e-b">升级会员享受更多折扣 一测就上线</text> <text class="e-b">升级会员享受更多折扣 一测就上线</text>
</view> </view>
</view> </view>
@@ -144,7 +144,6 @@
<neil-modal :show="inputShow" @close="cancel" title="编辑" @cancel="cancel" @confirm="confirm"> <neil-modal :show="inputShow" @close="cancel" title="编辑" @cancel="cancel" @confirm="confirm">
<input v-model="inputContent" style="margin:20upx" placeholder="请输入..." /> <input v-model="inputContent" style="margin:20upx" placeholder="请输入..." />
</neil-modal> </neil-modal>
<mallplusCopyright></mallplusCopyright>
</view> </view>
</template> </template>
<script> <script>

6
mallplusui-uniapp-app/pages/order/createOrder.vue
View File

@@ -121,7 +121,7 @@
<view class="coupon-item" v-if="couponList.length > 0" v-for="(item, index) in couponList" :key="index"> <view class="coupon-item" v-if="couponList.length > 0" v-for="(item, index) in couponList" :key="index">
<view class="con" @click="selectCoupon(item)"> <view class="con" @click="selectCoupon(item)">
<view class="left"> <view class="left">
<text class="title">{{ item.name }}</text> <text class="title">{{ item.coupon.name }}</text>
<text class="time">有效期至{{item.coupon.endTime | formatCreateTime}}</text> <text class="time">有效期至{{item.coupon.endTime | formatCreateTime}}</text>
</view> </view>
<view class="right"> <view class="right">
@@ -270,7 +270,7 @@ import Api from '@/common/api';
if (this.addressData) { if (this.addressData) {
this.addressId = this.addressData.id; this.addressId = this.addressData.id;
} }
console.log("优惠券",data.couponHistoryDetailList);
this.couponList = data.couponHistoryDetailList; this.couponList = data.couponHistoryDetailList;
this.memberReceiveAddressList = data.memberReceiveAddressListaddress; this.memberReceiveAddressList = data.memberReceiveAddressListaddress;
@@ -696,8 +696,6 @@ import Api from '@/common/api';
.mask-content { .mask-content {
width: 100%; width: 100%;
min-height: 30vh;
max-height: 70vh;
background: #f3f3f3; background: #f3f3f3;
transform: translateY(100%); transform: translateY(100%);
transition: 0.3s; transition: 0.3s;

2
mallplusui-uniapp-app/pages/public/index.vue
View File

@@ -36,7 +36,7 @@
<!-- #endif --> <!-- #endif -->
</view> </view>
<mallplusCopyright></mallplusCopyright> <!-- <mallplusCopyright></mallplusCopyright> -->
</view> </view>
</template> </template>

366
mallplusui-uniapp-app/pages/public/login.vue
View File

@@ -1,79 +1,124 @@
<template> <template>
<view class="container"> <view class="container">
<view class="left-bottom-sign"></view> <view class="left-bottom-sign"></view>
<view class="back-btn yticon icon-zuojiantou-up" @click="navBack"></view> <!-- <view class="back-btn yticon icon-zuojiantou-up" @click="navBack"></view> -->
<view class="right-top-sign"></view> <view class="right-top-sign"></view>
<!-- 设置白色背景防止软键盘把下部绝对定位元素顶上来盖住输入框等 --> <!-- 设置白色背景防止软键盘把下部绝对定位元素顶上来盖住输入框等 -->
<!-- <view class="left-top-sign">{{ sysInfo.name }}LOGIN</view> -->
<view class="welcome">欢迎回来！汇融云链</view>
<view class="wrapper"> <view class="wrapper">
<!-- #ifdef H5 --> <!-- #ifdef H5 -->
<view class="left-top-sign">{{ sysInfo.name }}LOGIN</view>
<view class="welcome">欢迎回来！{{ sysInfo.name }}</view>
<view class="input-content"> <view class="input-content">
<view class="select_lay">
<text class="select_lay_text" :class="{'select_lay_text1':selectKey===0}" @click="selectType(0)">免密登录</text>
<text class="select_lay_text" :class="{'select_lay_text1':selectKey===1}" @click="selectType(1)">账号登录</text>
</view>
<view class="input-item"> <view class="input-item">
<text class="tit">手机号码</text> <text class="tit">手机号码</text>
<input type="number" v-model="phone" placeholder="请输入手机号码" /> <input type="number" v-model="phone" maxlength="11" placeholder="请输入手机号码" />
</view> </view>
<view class="input-item"> <view class="input-item" v-if="show">
<text class="tit">密码</text> <text class="tit">密码</text>
<input type="password" placeholder="请输入密码" v-model="password" @confirm="toLogin" /> <input type="password" placeholder="请输入密码" v-model="password" @confirm="toLogin" />
</view> </view>
<view class="input-item" v-if="!show">
<text class="tit">验证码</text>
<view class="input-item-right">
<input type="number" maxlength="6" placeholder="请输入验证码" v-model="code" @confirm="toLogin"
style="width: 70%;" />
<view class="codeText" v-if="coding == false" @click="getCode()">获取验证码</view>
<view class="authTime" v-else>{{ auth_time }}秒</view>
</view>
</view>
</view> </view>
<button class="confirm-btn" @click="toLogin" :disabled="logining">登录</button> <button class="confirm-btn" @click="toLogin" :disabled="logining">登录</button>
<view class="login_bot">
<view class="forget-section" @click="toForget">忘记密码?</view> <view class="forget-section" @click="toForget">忘记密码?</view>
<view class="forget-section" @click="toLoginCode">验证码登录</view>
<br/>
<view class="register-section"> <view class="register-section">
还没有账号? 还没有账号?
<text @click="toRegist">马上注册</text> <text @click="toRegist">马上注册</text>
</view> </view>
</view>
<br />
<!-- #endif --> <!-- #endif -->
<!-- #ifdef MP-WEIXIN --> <!-- #ifdef MP-WEIXIN -->
<button class="confirm-btn" open-type="getUserInfo" @getuserinfo="wxGetUserInfo" withCredentials="true" v-if="isGetPhone == false">微信登录</button> <button class="confirm-btn" open-type="getUserInfo" @getuserinfo="wxGetUserInfo" withCredentials="true"
<button class="confirm-btn" open-type="getPhoneNumber" @getphonenumber="getPhoneNumber" v-if="isGetPhone == true">获取手机号</button> v-if="isGetPhone == false">微信登录</button>
<button class="confirm-btn" open-type="getPhoneNumber" @getphonenumber="getPhoneNumber"
v-if="isGetPhone == true">获取手机号</button>
<!-- #endif --> <!-- #endif -->
<!-- #ifdef APP-PLUS --> <!-- #ifdef APP-PLUS -->
<view class="left-top-sign">{{ sysInfo.name }}LOGIN</view>
<view class="welcome">欢迎回来！{{ sysInfo.name }}</view>
<view class="input-content"> <view class="input-content">
<view class="select_lay">
<text :class="{'select_lay_text1':selectKey===0}" @click="selectType(0)">免密登录</text>
<text class="select_lay_text" :class="{'select_lay_text1':selectKey===1}" @click="selectType(1)">账号登录</text>
</view>
<view class="input-item"> <view class="input-item">
<text class="tit">手机号码</text> <text class="tit">手机号码</text>
<input type="number" v-model="phone" placeholder="请输入手机号码" /> <input type="number" v-model="phone" maxlength="11" placeholder="请输入手机号码" />
</view> </view>
<view class="input-item"> <view class="input-item" v-if="show">
<text class="tit">密码</text> <text class="tit">密码</text>
<input type="password" placeholder="请输入密码" v-model="password" @confirm="toLogin" /> <input type="password" placeholder="请输入密码" v-model="password" @confirm="toLogin" />
</view> </view>
<view class="input-item" v-if="!show">
<text class="tit">验证码</text>
<view class="input-item-right">
<input type="number" maxlength="6" placeholder="请输入验证码" v-model="code" @confirm="toLogin"
style="width: 70%;" />
<view class="codeText" v-if="coding == false" @click="getCode()">获取验证码</view>
<view class="authTime" v-else>{{ auth_time }}秒</view>
</view>
</view>
</view> </view>
<button class="confirm-btn" @click="toLogin" :disabled="logining">登录</button> <button class="confirm-btn" @click="toLogin" :disabled="logining">登录</button>
<!-- <button v-if="isWeiXin == 1" class="confirm-btn" @click="wechatH5Login" :disabled="logining">微信授权登录</button> --> <!-- <button v-if="isWeiXin == 1" class="confirm-btn" @click="wechatH5Login" :disabled="logining">微信授权登录</button> -->
<view class="login_bot">
<view class="forget-section" @click="toForget">忘记密码?</view> <view class="forget-section" @click="toForget">忘记密码?</view>
<view class="forget-section" @click="toLoginCode">验证码登录</view>
<br/><view class="register-section"> <view class="register-section">
还没有账号? 还没有账号?
<text @click="toRegist">马上注册</text> <text @click="toRegist">马上注册</text>
</view> </view>
</view>
<br />
<!-- #endif --> <!-- #endif -->
</view> </view>
<mallplusCopyright></mallplusCopyright> <!-- <mallplusCopyright></mallplusCopyright> -->
</view> </view>
</template> </template>
<script> <script>
import { mapMutations, mapState } from 'vuex'; import {
import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue'; mapMutations,
import Api from '@/common/api'; mapState
import store from '@/store/index'; } from 'vuex';
export default { import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue';
import Api from '@/common/api';
import store from '@/store/index';
export default {
components: { components: {
mallplusCopyright mallplusCopyright
}, },
data() { data() {
return { return {
show: false,
selectKey:0,
code: '',
coding: false,
auth_time: 60,
phone: '', phone: '',
password: '', password: '',
isWeiXin: 0, isWeiXin: 0,
@@ -95,6 +140,11 @@ export default {
}, },
methods: { methods: {
...mapMutations(['login']), ...mapMutations(['login']),
selectType(index){
this.selectKey=index
this.show = !this.show
},
inputChange(e) { inputChange(e) {
const key = e.currentTarget.dataset.key; const key = e.currentTarget.dataset.key;
this[key] = e.detail.value; this[key] = e.detail.value;
@@ -104,6 +154,35 @@ export default {
url: '../../pagesU/user/forget' url: '../../pagesU/user/forget'
}); });
}, },
// 获取验证码
async getCode() {
var myreg = /^[1][3,4,5,6,7,8,9][0-9]{9}$/;
if (!myreg.test(this.phone)) {
uni.showToast({
icon: 'none',
title: '请输入正确的手机号码'
});
return false;
}
//设置倒计时秒
this.auth_time = 60;
this.coding = true;
var auth_timetimer = setInterval(() => {
this.auth_time--;
if (this.auth_time < 0) {
this.coding = false;
clearInterval(auth_timetimer);
}
}, 1000);
//获取验证码
let params = {
phone: this.phone
};
let data = await Api.apiCall('post', Api.index.sendCodes, params);
if (data) {
}
},
toLoginCode() { toLoginCode() {
uni.navigateTo({ uni.navigateTo({
url: '/pages/public/loginCode' url: '/pages/public/loginCode'
@@ -330,42 +409,73 @@ export default {
success: function(info) { success: function(info) {
console.log('-------获取微信用户所有-----'); console.log('-------获取微信用户所有-----');
console.log(JSON.stringify(info.userInfo)); console.log(JSON.stringify(info.userInfo));
let logparams1 = { logs: JSON.stringify(info.userInfo) }; let logparams1 = {
Api.apiCall('get', Api.index.logs, logparams1); logs: JSON.stringify(info.userInfo)
};
Api.apiCall('get', Api.index.logs,
logparams1);
// 与服务器交互将数据提交到服务端数据库 // 与服务器交互将数据提交到服务端数据库
uni.request({ uni.request({
url: Api.BASEURI + Api.index.appLogin, url: Api.BASEURI + Api.index
.appLogin,
method: 'POST', method: 'POST',
header: { 'content-type': 'application/x-www-form-urlencoded' }, header: {
'content-type': 'application/x-www-form-urlencoded'
},
data: { data: {
sex: info.userInfo.gender, sex: info.userInfo.gender,
city: info.userInfo.country + '-' + info.userInfo.province + '-' + info.userInfo.city, city: info.userInfo
.country + '-' + info
.userInfo.province +
'-' + info.userInfo
.city,
source: 1, source: 1,
openid: info.userInfo.openId, openid: info.userInfo
unionid: info.userInfo.openId, .openId,
nickname: info.userInfo.nickName, unionid: info.userInfo
headimgurl: info.userInfo.avatarUrl .openId,
nickname: info.userInfo
.nickName,
headimgurl: info.userInfo
.avatarUrl
}, },
success: res => { success: res => {
console.log(JSON.stringify(res)); console.log(JSON
.stringify(res)
);
// 登录成功 记录会员信息到本地 // 登录成功 记录会员信息到本地
if (res) { if (res) {
uni.setStorageSync('userInfo', res.data.userInfo); uni.setStorageSync(
uni.setStorageSync('token', res.data.tokenHead + res.data.token); 'userInfo',
res.data
.userInfo);
uni.setStorageSync(
'token',
res.data
.tokenHead +
res.data
.token);
uni.switchTab({ uni.switchTab({
url: '/pages/index/index' url: '/pages/index/index'
}); });
} else { } else {
uni.showToast({ title: res.data }); uni.showToast({
title: res
.data
});
} }
}, },
fail: e => { fail: e => {
console.log(JSON.stringify(e)); console.log(JSON
.stringify(e));
} }
}); });
let logparams = { logs: JSON.stringify(info.userInfo) }; let logparams = {
Api.apiCall('get', Api.index.logs, logparams); logs: JSON.stringify(info.userInfo)
};
Api.apiCall('get', Api.index.logs,
logparams);
} }
}); });
} }
@@ -377,6 +487,17 @@ export default {
async toLogin() { async toLogin() {
var that = this; var that = this;
let phoneReg = /^1[1-9][0-9]\d{8}$/; let phoneReg = /^1[1-9][0-9]\d{8}$/;
if(that.selectKey==0){
// 免密登录
uni.showToast({
icon: 'none',
title: '暂不支持此登录方式'
});
return;
}else{
// 账号登录
try { try {
if (this.phone == '') { if (this.phone == '') {
throw '请填写手机号'; throw '请填写手机号';
@@ -391,20 +512,28 @@ export default {
this.$api.msg(err); this.$api.msg(err);
return; return;
} }
console.log("1111111111");
this.logining = false; this.logining = false;
let params = { phone: this.phone, password: this.password }; let params = {
phone: this.phone,
password: this.password
};
let data = await Api.apiCall('post', Api.index.login, params); let data = await Api.apiCall('post', Api.index.login, params);
//this.logining = false; //this.logining = false;
console.log("1111111111");
if (data) { if (data) {
console.log(data); console.log(data);
that.login(data); that.login(data);
uni.setStorageSync('userInfos', data.userInfo); uni.setStorageSync('userInfos', data.userInfo);
uni.setStorageSync('token', data.tokenHead + data.token); uni.setStorageSync('token', data.tokenHead + data.token);
// uni.setStorageSync('adminToken', data.tokenHead + data.token);
console.log(uni.getStorageSync('token')); console.log(uni.getStorageSync('token'));
uni.switchTab({ uni.switchTab({
url: '/pages/index/user' url: '/pages/index/user'
}); });
} }
}
}, },
getuserinfoh5appwx() { getuserinfoh5appwx() {
var that = this; var that = this;
@@ -418,10 +547,13 @@ export default {
uni.request({ uni.request({
url: Api.BASEURI + Api.index.appLogin, url: Api.BASEURI + Api.index.appLogin,
method: 'POST', method: 'POST',
header: { 'content-type': 'application/x-www-form-urlencoded' }, header: {
'content-type': 'application/x-www-form-urlencoded'
},
data: { data: {
sex: info.userInfo.gender, sex: info.userInfo.gender,
city: info.userInfo.country + '-' + info.userInfo.province + '-' + info.userInfo.city, city: info.userInfo.country + '-' + info.userInfo
.province + '-' + info.userInfo.city,
source: 1, source: 1,
unionid: info.userInfo.openId, unionid: info.userInfo.openId,
@@ -435,14 +567,18 @@ export default {
if (res) { if (res) {
console.log(res); console.log(res);
that.login(res.data.data); that.login(res.data.data);
uni.setStorageSync('userInfos', res.data.data.userInfo); uni.setStorageSync('userInfos', res.data
uni.setStorageSync('token', res.data.data.tokenHead + res.data.data.token); .data.userInfo);
uni.setStorageSync('token', res.data.data
.tokenHead + res.data.data.token);
uni.switchTab({ uni.switchTab({
url: '/pages/index/index' url: '/pages/index/index'
}); });
} else { } else {
uni.showToast({ title: res.data }); uni.showToast({
title: res.data
});
} }
}, },
fail: e => { fail: e => {
@@ -451,39 +587,46 @@ export default {
}); });
}, },
fail: () => { fail: () => {
uni.showToast({ title: '微信登录授权失败' }); uni.showToast({
title: '微信登录授权失败'
});
} }
}); });
}, },
fail: () => { fail: () => {
uni.showToast({ title: '微信登录授权失败' }); uni.showToast({
title: '微信登录授权失败'
});
uni.hideLoading(); uni.hideLoading();
} }
}); });
} }
} }
}; };
</script> </script>
<style lang="scss"> <style lang="scss">
page { page {
background: #fff; background: #fff;
} }
.container {
.container {
padding-top: 115px; padding-top: 115px;
position: relative; position: relative;
width: 100vw; width: 100vw;
height: 100vh; height: 100vh;
overflow: hidden; overflow: hidden;
background: #fff; background: #fff;
} }
.wrapper {
.wrapper {
position: relative; position: relative;
z-index: 90; z-index: 90;
background: #fff; background: #fff;
padding-bottom: 40upx; padding-bottom: 40upx;
} }
.back-btn {
.back-btn {
position: absolute; position: absolute;
left: 40upx; left: 40upx;
z-index: 9999; z-index: 9999;
@@ -491,18 +634,21 @@ page {
top: 40upx; top: 40upx;
font-size: 40upx; font-size: 40upx;
color: $font-color-dark; color: $font-color-dark;
} }
.left-top-sign {
.left-top-sign {
font-size: 120upx; font-size: 120upx;
color: $page-color-base; color: $page-color-base;
position: relative; position: relative;
left: -16upx; left: -16upx;
} }
.right-top-sign {
.right-top-sign {
position: absolute; position: absolute;
top: 80upx; top: 80upx;
right: -30upx; right: -30upx;
z-index: 95; z-index: 95;
&:before, &:before,
&:after { &:after {
display: block; display: block;
@@ -511,10 +657,12 @@ page {
height: 80upx; height: 80upx;
background: #b4f3e2; background: #b4f3e2;
} }
&:before { &:before {
transform: rotate(50deg); transform: rotate(50deg);
border-radius: 0 50px 0 0; border-radius: 0 50px 0 0;
} }
&:after { &:after {
position: absolute; position: absolute;
right: -198upx; right: -198upx;
@@ -523,27 +671,53 @@ page {
border-radius: 50px 0 0 0; border-radius: 50px 0 0 0;
/* background: pink; */ /* background: pink; */
} }
} }
.left-bottom-sign {
.left-bottom-sign {
position: absolute; position: absolute;
left: -270upx; left: -270upx;
bottom: -320upx; bottom: -320upx;
border: 100upx solid #d0d1fd; border: 100upx solid #d0d1fd;
border-radius: 50%; border-radius: 50%;
padding: 180upx; padding: 180upx;
} }
.welcome {
.welcome {
margin-top: 150px;
position: relative; position: relative;
left: 50upx; left: 50upx;
top: -90upx; top: -90upx;
font-size: 46upx; font-size: 46upx;
color: #555; color: #555;
text-shadow: 1px 0px 1px rgba(0, 0, 0, 0.3); text-shadow: 1px 0px 1px rgba(0, 0, 0, 0.3);
} }
.input-content {
.select_lay {
display: flex;
margin-top: -65upx;
margin-bottom: 15upx;
align-items: center;
.select_lay_text {
margin-left: 30upx;
}
.select_lay_text1 {
font-size: 30upx;
color: #4395FF;
}
.select_lay_text2 {
font-size: 28upx;
color: #000;
}
}
.input-content {
padding: 0 60upx; padding: 0 60upx;
} }
.input-item {
.input-item {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
align-items: flex-start; align-items: flex-start;
@@ -553,24 +727,53 @@ page {
height: 120upx; height: 120upx;
border-radius: 4px; border-radius: 4px;
margin-bottom: 50upx; margin-bottom: 50upx;
&:last-child { &:last-child {
margin-bottom: 0; margin-bottom: 0;
} }
.tit { .tit {
height: 50upx; height: 50upx;
line-height: 56upx; line-height: 56upx;
font-size: $font-sm + 2upx; font-size: $font-sm + 2upx;
color: $font-color-base; color: $font-color-base;
} }
input { input {
height: 60upx; height: 60upx;
font-size: $font-base + 2upx; font-size: $font-base + 2upx;
color: $font-color-dark; color: $font-color-dark;
width: 100%; width: 100%;
} }
}
.confirm-btn { .input-item-right {
display: flex;
flex-direction: row;
align-items: center;
width: 100%;
justify-content: space-between;
}
.codeText {
font-size: 28upx;
width: 25%;
display: flex;
align-items: center;
justify-content: center;
color: #fa436a;
}
.authTime {
font-size: 28upx;
width: 25%;
display: flex;
align-items: center;
justify-content: center;
color: #fa436a;
}
}
.confirm-btn {
width: 630upx; width: 630upx;
height: 76upx; height: 76upx;
line-height: 76upx; line-height: 76upx;
@@ -579,27 +782,36 @@ page {
background: $uni-color-primary; background: $uni-color-primary;
color: #fff; color: #fff;
font-size: $font-lg; font-size: $font-lg;
&:after { &:after {
border-radius: 100px; border-radius: 100px;
} }
} }
.forget-section {
.login_bot {
display: flex;
margin-top: 15upx;
margin-left: 70upx;
margin-right: 70upx;
flex-direction: row;
justify-content: space-between;
}
.forget-section {
font-size: $font-sm + 2upx; font-size: $font-sm + 2upx;
color: $font-color-spec; color: $font-color-spec;
text-align: center; text-align: center;
margin-top: 40upx; }
}
.register-section { .register-section {
position: absolute;
left: 0;
bottom: 50upx; bottom: 50upx;
width: 100%;
font-size: $font-sm + 2upx; font-size: $font-sm + 2upx;
color: $font-color-base; color: $font-color-base;
text-align: center; text-align: center;
text { text {
color: $font-color-spec; color: $font-color-spec;
margin-left: 10upx; margin-left: 10upx;
} }
} }
</style> </style>

2
mallplusui-uniapp-app/pages/public/loginCode.vue
View File

@@ -28,7 +28,7 @@
还没有账号? 还没有账号?
<text @click="toRegist">马上注册</text> <text @click="toRegist">马上注册</text>
</view> </view>
<mallplusCopyright></mallplusCopyright> <!-- <mallplusCopyright></mallplusCopyright> -->
</view> </view>
</template> </template>

2
mallplusui-uniapp-app/pages/public/reg.vue
View File

@@ -33,7 +33,7 @@
已经有账号? 已经有账号?
<text @click="toRegist">马上登录</text> <text @click="toRegist">马上登录</text>
</view> </view>
<mallplusCopyright></mallplusCopyright> <!-- <mallplusCopyright></mallplusCopyright> -->
</view> </view>
</template> </template>

2
mallplusui-uniapp-app/pages/set/set.vue
View File

@@ -31,7 +31,7 @@
<text class="cell-more yticon icon-you"></text> <text class="cell-more yticon icon-you"></text>
</view> </view>
<view class="list-cell log-out-btn" @click="toLogout"><text class="cell-tit">退出登录</text></view> <view class="list-cell log-out-btn" @click="toLogout"><text class="cell-tit">退出登录</text></view>
<mallplusCopyright></mallplusCopyright> <!-- <mallplusCopyright></mallplusCopyright> -->
</view> </view>
</template> </template>

299
mallplusui-uniapp-app/pagesA/build/community.vue
View File

@@ -2,7 +2,8 @@
<view class="container"> <view class="container">
<!-- 小程序头部兼容 --> <!-- 小程序头部兼容 -->
<!-- #ifdef MP --> <!-- #ifdef MP -->
<view class="MP-search" @click="search()" style=""><input class="MP-search-input" type="text" disabled="true" placeholder="输入关键字搜索" /></view> <view class="MP-search" @click="search()" style=""><input class="MP-search-input" type="text" disabled="true"
placeholder="输入关键字搜索" /></view>
<!-- #endif --> <!-- #endif -->
<!-- 头部轮播 --> <!-- 头部轮播 -->
@@ -17,7 +18,8 @@
<!-- 背景色区域 --> <!-- 背景色区域 -->
<view class="titleNview-background" :style="{ backgroundColor: titleNViewBackground }"></view> <view class="titleNview-background" :style="{ backgroundColor: titleNViewBackground }"></view>
<swiper class="carousel" circular @change="swiperChange"> <swiper class="carousel" circular @change="swiperChange">
<swiper-item v-for="(item, index) in carouselList" :key="index" class="carousel-item" @click="navToDetailPageL(item.url)"> <swiper-item v-for="(item, index) in carouselList" :key="index" class="carousel-item"
@click="navToDetailPageL(item.url)">
<image :src="item.pic" /> <image :src="item.pic" />
</swiper-item> </swiper-item>
</swiper> </swiper>
@@ -32,25 +34,23 @@
<view class="cate-section"> <view class="cate-section">
<view class="cate-item" @click="navToTabPage('../../pagesA/build/notice')"> <view class="cate-item" @click="navToTabPage('../../pagesA/build/notice')">
<image src="/static/temp/c3.png"></image> <image src="/static/temp/c3.png"></image>
<text>社区活动</text> <text>社区公告</text>
</view> </view>
<view class="cate-item" @click="navToTabPage('../../pagesA/build/repairOrder/repairOrder')"> <view class="cate-item" @click="navToTabPage('/pages/index/secskill')">
<image src="/static/temp/c5.png"></image> <image src="/static/temp/c7.png"></image>
<text>费用管理</text>
</view>
<view class="cate-item" @click="navToTabPage('../../pagesA/build/groupList')">
<image src="/static/temp/c6.png"></image>
<text>社区团购</text> <text>社区团购</text>
</view> </view>
<view class="cate-item" @click="navToTabPage('/pages/index/secskill')"> <view class="cate-item" @click="navToTabPage('/pages/index/secskill')">
<image src="/static/temp/c7.png"></image> <image src="/static/temp/c7.png"></image>
<text>社区服务</text> <text>社区特供</text>
</view> </view>
<view class="cate-item" @click="navToTabPage('../../pagesA/product/paiMaiList')"> <!-- <view class="cate-item" @click="navToTabPage('../../pagesA/product/paiMaiList')"> -->
<view class="cate-item" @click="navToTabPage('/pages/index/lease')">
<image src="/static/temp/c8.png"></image> <image src="/static/temp/c8.png"></image>
<text>社区拍卖</text> <text>农机租赁</text>
</view> </view>
</view> </view>
<view class="f-header m-t" @click="navToTabPage('../../pagesA/build/communityList?geohash='+geohash)"> <view class="f-header m-t" @click="navToTabPage('../../pagesA/build/communityList?geohash='+geohash)">
<image src="/static/temp/nav1.png"></image> <image src="/static/temp/nav1.png"></image>
<view class="tit-box"> <view class="tit-box">
@@ -59,25 +59,39 @@
</view> </view>
<text class="yticon icon-you"></text> <text class="yticon icon-you"></text>
</view> </view>
<view class="cate-section"> <!-- <view class="cate-section">
<view class="cate-item" @click="navToTabPageStore(item1.id)" v-for="(item1, index) in communityList" :key="index"> <view class="cate-item" @click="navToTabPageStore(item1.id)" v-for="(item1, index) in communityList"
:key="index">
<image :src="item1.pic"></image> <image :src="item1.pic"></image>
<text>{{ item1.name }}</text> <text>{{ item1.name }}</text>
</view> </view>
</view> </view> -->
<!-- 新品上市 --> <!-- 新品上市 -->
<view class="f-header m-t" @click="navToTabPage('../../pagesA/build/floorList')"> <view class="f-header m-t" @click="navToTabPage('../../pagesA/build/floorList')">
<image src="/static/temp/h1.png"></image> <image src="/static/temp/h1.png"></image>
<view class="tit-box"> <view class="tit-box">
<text class="tit">房屋列表</text> <text class="tit">社区团购</text>
<text class="tit2">Guess You Like It</text> <text class="tit2">Guess You Like It</text>
</view> </view>
<text class="yticon icon-you"></text> <text class="yticon icon-you"></text>
</view> </view>
<view class="goods-list-vertical">
<view v-for="(item, index) in newProductList" :key="index" class="goods-item-vertical" @click="navToDetailPage(item)"> <view class="f-header m-t" @click="navToTabPage('../../pagesA/build/floorList')">
<view class="image-wrapper-vertical"><image :src="item.pic" mode="aspectFill"></image></view> <image src="/static/temp/h1.png"></image>
<view class="tit-box">
<text class="tit">社区特供</text>
<text class="tit2">Guess You Like It</text>
</view>
<text class="yticon icon-you"></text>
</view>
<!-- <view class="goods-list-vertical">
<view v-for="(item, index) in newProductList" :key="index" class="goods-item-vertical"
@click="navToDetailPage(item)">
<view class="image-wrapper-vertical">
<image :src="item.pic" mode="aspectFill"></image>
</view>
<view class="goods-list-right"> <view class="goods-list-right">
<view class="goods-right-top"> <view class="goods-right-top">
<text class="">{{ item.name }}</text> <text class="">{{ item.name }}</text>
@@ -88,21 +102,25 @@
</view> </view>
</view> </view>
</view> </view>
</view> </view> -->
</view> </view>
</view> </view>
</template> </template>
<script> <script>
import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue'; import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue';
import Api from '@/common/api'; import Api from '@/common/api';
import coupon from '@/components/coolc-coupon/coolc-coupon'; import coupon from '@/components/coolc-coupon/coolc-coupon';
import { formatDate } from '@/common/date'; import {
import { mapState } from 'vuex'; formatDate
import navBar from '@/components/zhouWei-navBar'; } from '@/common/date';
import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue'; import {
export default { mapState
} from 'vuex';
import navBar from '@/components/zhouWei-navBar';
import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
export default {
components: { components: {
coupon, coupon,
@@ -124,7 +142,7 @@ export default {
homeFlashPromotion: [], // 当前秒杀场次 homeFlashPromotion: [], // 当前秒杀场次
subjectList: [], //推荐专题 subjectList: [], //推荐专题
floorList: [], floorList: [],
geohash:'', geohash: '',
communityList: [], communityList: [],
communityList1: [], communityList1: [],
groupHotGoodsList: [], groupHotGoodsList: [],
@@ -150,11 +168,16 @@ export default {
onShareAppMessage() {}, onShareAppMessage() {},
async onLoad(ops) { async onLoad(ops) {
console.log(ops)
if (ops.communityId && ops.communityId != undefined) { if (ops.communityId && ops.communityId != undefined) {
this.communityId = ops.communityId; this.communityId = ops.communityId;
} else { } else {
this.communityId = 0; this.communityId = 0;
} }
uni.setNavigationBarTitle({
title: ops.name
});
this.getNewProductList('refresh'); this.getNewProductList('refresh');
this.loadData(); this.loadData();
//this.nearCommunity(); //this.nearCommunity();
@@ -166,7 +189,9 @@ export default {
* 加载首页数据 * 加载首页数据
*/ */
async loadData() { async loadData() {
let params = { communityId: this.communityId }; let params = {
communityId: this.communityId
};
let data = await Api.apiCall('get', Api.build.home, params); let data = await Api.apiCall('get', Api.build.home, params);
if (data) { if (data) {
this.carouselList = data.advertiseList || []; this.carouselList = data.advertiseList || [];
@@ -176,8 +201,8 @@ export default {
this.community = data.community || []; this.community = data.community || [];
console.log(this.community) console.log(this.community)
console.log(this.community.latitude) console.log(this.community.latitude)
if(this.community.latitude){ if (this.community.latitude) {
this.geohash=this.community.latitude+','+ this.community.longitude; this.geohash = this.community.latitude + ',' + this.community.longitude;
} }
} }
//this.loadData2(); //this.loadData2();
@@ -187,8 +212,12 @@ export default {
* 获取轮播图 * 获取轮播图
*/ */
async nearCommunity() { async nearCommunity() {
if(this.community.latitude){ if (this.community.latitude) {
let params = params = { geohash: this.community.latitude+','+ this.community.longitude, pageSize: 10,distance:40 }; let params = params = {
geohash: this.community.latitude + ',' + this.community.longitude,
pageSize: 10,
distance: 40
};
let data = await Api.apiCall('get', Api.build.nearCommunityList, params); let data = await Api.apiCall('get', Api.build.nearCommunityList, params);
if (data) { if (data) {
this.communityList = data || []; this.communityList = data || [];
@@ -219,7 +248,10 @@ export default {
} else { } else {
this.loadingType = 'more'; this.loadingType = 'more';
} }
let params = { pageNum: this.pageNum, communityId: this.communityId }; let params = {
pageNum: this.pageNum,
communityId: this.communityId
};
let list = await Api.apiCall('get', Api.build.floorList, params); let list = await Api.apiCall('get', Api.build.floorList, params);
let goodsList = list.records; let goodsList = list.records;
@@ -333,11 +365,11 @@ export default {
}); });
} }
} }
}; };
</script> </script>
<style lang="scss"> <style lang="scss">
.MP-search { .MP-search {
background: #ffffff; background: #ffffff;
height: 80upx; height: 80upx;
display: flex; display: flex;
@@ -346,22 +378,25 @@ export default {
position: fixed; position: fixed;
width: 100%; width: 100%;
z-index: 999; z-index: 999;
} }
.MP-search-input {
.MP-search-input {
font-size: 28upx; font-size: 28upx;
background: #f5f5f5; background: #f5f5f5;
height: 60upx; height: 60upx;
width: 90%; width: 90%;
border-radius: 50upx; border-radius: 50upx;
text-align: center; text-align: center;
} }
.mp-search-box {
.mp-search-box {
position: absolute; position: absolute;
left: 0; left: 0;
top: 30upx; top: 30upx;
z-index: 9999; z-index: 9999;
width: 100%; width: 100%;
padding: 0 80upx; padding: 0 80upx;
.ser-input { .ser-input {
flex: 1; flex: 1;
height: 60upx; height: 60upx;
@@ -372,40 +407,47 @@ export default {
border-radius: 20px; border-radius: 20px;
background: rgba(255, 255, 255, 0.6); background: rgba(255, 255, 255, 0.6);
} }
} }
page {
page {
.cate-section { .cate-section {
position: relative; position: relative;
z-index: 5; z-index: 5;
border-radius: 16upx 16upx 0 0; border-radius: 16upx 16upx 0 0;
margin-top: -20upx; margin-top: -20upx;
} }
.carousel-section { .carousel-section {
padding: 0; padding: 0;
.titleNview-placing { .titleNview-placing {
padding-top: 0; padding-top: 0;
height: 0; height: 0;
} }
.carousel { .carousel {
.carousel-item { .carousel-item {
padding: 0; padding: 0;
} }
} }
.swiper-dots { .swiper-dots {
left: 45upx; left: 45upx;
bottom: 40upx; bottom: 40upx;
} }
} }
} }
page { page {
background: #f5f5f5; background: #f5f5f5;
} }
.m-t {
.m-t {
margin-top: 20upx; margin-top: 20upx;
} }
/* 头部 轮播图 */
.carousel-section { /* 头部 轮播图 */
.carousel-section {
position: relative; position: relative;
padding-top: 10px; padding-top: 10px;
@@ -423,8 +465,9 @@ page {
height: 426upx; height: 426upx;
transition: 0.4s; transition: 0.4s;
} }
} }
.carousel {
.carousel {
width: 100%; width: 100%;
height: 350upx; height: 350upx;
@@ -440,8 +483,9 @@ page {
height: 100%; height: 100%;
border-radius: 10upx; border-radius: 10upx;
} }
} }
.swiper-dots {
.swiper-dots {
display: flex; display: flex;
position: absolute; position: absolute;
left: 60upx; left: 60upx;
@@ -470,15 +514,17 @@ page {
color: #fff; color: #fff;
transform: translateX(-50%); transform: translateX(-50%);
} }
} }
/* 分类 */
.cate-section { /* 分类 */
.cate-section {
display: flex; display: flex;
justify-content: space-around; justify-content: space-around;
align-items: center; align-items: center;
flex-wrap: wrap; flex-wrap: wrap;
padding: 30upx 22upx; padding: 30upx 22upx;
background: #fff; background: #fff;
.cate-item { .cate-item {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
@@ -486,6 +532,7 @@ page {
font-size: $font-sm + 2upx; font-size: $font-sm + 2upx;
color: $font-color-dark; color: $font-color-dark;
} }
/* 原图标颜色太深,不想改图了,所以加了透明度 */ /* 原图标颜色太深,不想改图了,所以加了透明度 */
image { image {
width: 88upx; width: 88upx;
@@ -495,35 +542,42 @@ page {
opacity: 0.7; opacity: 0.7;
box-shadow: 4upx 4upx 20upx rgba(250, 67, 106, 0.3); box-shadow: 4upx 4upx 20upx rgba(250, 67, 106, 0.3);
} }
} }
.ad-1 {
.ad-1 {
width: 100%; width: 100%;
height: 210upx; height: 210upx;
padding: 10upx 0; padding: 10upx 0;
background: #fff; background: #fff;
image { image {
width: 100%; width: 100%;
height: 100%; height: 100%;
} }
} }
/* 秒杀专区 */
.seckill-section { /* 秒杀专区 */
.seckill-section {
padding: 0upx 20upx 20upx; padding: 0upx 20upx 20upx;
background: #fff; background: #fff;
.s-header { .s-header {
display: flex; display: flex;
align-items: center; align-items: center;
height: 90upx; height: 90upx;
line-height: 1; line-height: 1;
.s-img { .s-img {
width: 140upx; width: 140upx;
height: 30upx; height: 30upx;
} }
.tip { .tip {
font-size: $font-base; font-size: $font-base;
color: $font-color-light; color: $font-color-light;
// margin: 0 20upx 0 40upx; // margin: 0 20upx 0 40upx;
} }
.timer { .timer {
display: inline-block; display: inline-block;
width: 40upx; width: 40upx;
@@ -536,6 +590,7 @@ page {
border-radius: 2px; border-radius: 2px;
background: rgba(0, 0, 0, 0.8); background: rgba(0, 0, 0, 0.8);
} }
.icon-you { .icon-you {
font-size: $font-lg; font-size: $font-lg;
color: $font-color-light; color: $font-color-light;
@@ -543,112 +598,135 @@ page {
text-align: right; text-align: right;
} }
} }
.floor-list { .floor-list {
white-space: nowrap; white-space: nowrap;
} }
.scoll-wrapper { .scoll-wrapper {
display: flex; display: flex;
align-items: flex-start; align-items: flex-start;
} }
.floor-item { .floor-item {
width: 150upx; width: 150upx;
margin-right: 20upx; margin-right: 20upx;
font-size: $font-sm + 2upx; font-size: $font-sm + 2upx;
color: $font-color-dark; color: $font-color-dark;
line-height: 1.8; line-height: 1.8;
image { image {
width: 150upx; width: 150upx;
height: 150upx; height: 150upx;
border-radius: 6upx; border-radius: 6upx;
} }
.price { .price {
color: $uni-color-primary; color: $uni-color-primary;
} }
} }
} }
.f-header { .f-header {
display: flex; display: flex;
align-items: center; align-items: center;
height: 140upx; height: 140upx;
padding: 0upx 20upx; padding: 0upx 20upx;
background: #fff; background: #fff;
image { image {
flex-shrink: 0; flex-shrink: 0;
width: 80upx; width: 80upx;
height: 80upx; height: 80upx;
margin-right: 20upx; margin-right: 20upx;
} }
.tit-box { .tit-box {
flex: 1; flex: 1;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
} }
.tit { .tit {
font-size: $font-lg + 2upx; font-size: $font-lg + 2upx;
color: #font-color-dark; color: #font-color-dark;
line-height: 1.3; line-height: 1.3;
} }
.tit2 { .tit2 {
font-size: $font-sm; font-size: $font-sm;
color: $font-color-light; color: $font-color-light;
} }
.icon-you { .icon-you {
font-size: $font-lg + 2upx; font-size: $font-lg + 2upx;
color: $font-color-light; color: $font-color-light;
} }
} }
/* 团购楼层 */
.group-section { /* 团购楼层 */
.group-section {
background: #fff; background: #fff;
.g-swiper { .g-swiper {
height: 650upx; height: 650upx;
padding-bottom: 20upx; padding-bottom: 20upx;
} }
.g-swiper-item { .g-swiper-item {
width: 100%; width: 100%;
padding: 0 20upx; padding: 0 20upx;
display: flex; display: flex;
} }
image { image {
width: 100%; width: 100%;
height: 460upx; height: 460upx;
border-radius: 4px; border-radius: 4px;
} }
.g-item { .g-item {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
overflow: hidden; overflow: hidden;
} }
.left { .left {
flex: 1.2; flex: 1.2;
// margin-right: 24upx; // margin-right: 24upx;
.t-box { .t-box {
padding-top: 20upx; padding-top: 20upx;
} }
} }
.right { .right {
flex: 0.8; flex: 0.8;
flex-direction: column-reverse; flex-direction: column-reverse;
.t-box { .t-box {
padding-bottom: 20upx; padding-bottom: 20upx;
} }
} }
.t-box { .t-box {
height: 160upx; height: 160upx;
font-size: $font-base + 2upx; font-size: $font-base + 2upx;
color: $font-color-dark; color: $font-color-dark;
line-height: 1.6; line-height: 1.6;
} }
.price { .price {
color: $uni-color-primary; color: $uni-color-primary;
} }
.m-price { .m-price {
font-size: $font-sm + 2upx; font-size: $font-sm + 2upx;
text-decoration: line-through; text-decoration: line-through;
color: $font-color-light; color: $font-color-light;
margin-left: 8upx; margin-left: 8upx;
} }
.pro-box { .pro-box {
display: flex; display: flex;
align-items: center; align-items: center;
@@ -657,22 +735,26 @@ page {
color: $font-base; color: $font-base;
padding-right: 10upx; padding-right: 10upx;
} }
.progress-box { .progress-box {
flex: 1; flex: 1;
border-radius: 10px; border-radius: 10px;
overflow: hidden; overflow: hidden;
margin-right: 8upx; margin-right: 8upx;
} }
} }
/* 分类推荐楼层 */
.hot-floor { /* 分类推荐楼层 */
.hot-floor {
width: 100%; width: 100%;
overflow: hidden; overflow: hidden;
margin-bottom: 20upx; margin-bottom: 20upx;
.floor-img-box { .floor-img-box {
width: 100%; width: 100%;
height: 320upx; height: 320upx;
position: relative; position: relative;
&:after { &:after {
content: ''; content: '';
position: absolute; position: absolute;
@@ -683,10 +765,12 @@ page {
background: linear-gradient(rgba(255, 255, 255, 0.06) 30%, #f8f8f8); background: linear-gradient(rgba(255, 255, 255, 0.06) 30%, #f8f8f8);
} }
} }
.floor-img { .floor-img {
width: 100%; width: 100%;
height: 100%; height: 100%;
} }
.floor-list { .floor-list {
white-space: nowrap; white-space: nowrap;
padding: 20upx; padding: 20upx;
@@ -699,25 +783,30 @@ page {
position: relative; position: relative;
z-index: 1; z-index: 1;
} }
.scoll-wrapper { .scoll-wrapper {
display: flex; display: flex;
align-items: flex-start; align-items: flex-start;
} }
.floor-item { .floor-item {
width: 180upx; width: 180upx;
margin-right: 20upx; margin-right: 20upx;
font-size: $font-sm + 2upx; font-size: $font-sm + 2upx;
color: $font-color-dark; color: $font-color-dark;
line-height: 1.8; line-height: 1.8;
image { image {
width: 180upx; width: 180upx;
height: 180upx; height: 180upx;
border-radius: 6upx; border-radius: 6upx;
} }
.price { .price {
color: $uni-color-primary; color: $uni-color-primary;
} }
} }
.more { .more {
display: flex; display: flex;
align-items: center; align-items: center;
@@ -730,39 +819,47 @@ page {
background: #f3f3f3; background: #f3f3f3;
font-size: $font-base; font-size: $font-base;
color: $font-color-light; color: $font-color-light;
text:first-child { text:first-child {
margin-bottom: 4upx; margin-bottom: 4upx;
} }
} }
} }
/* 单条商品 */
.goods-box-single { /* 单条商品 */
.goods-box-single {
display: flex; display: flex;
padding: 20upx 0; padding: 20upx 0;
.goods-img { .goods-img {
display: block; display: block;
width: 120upx; width: 120upx;
height: 120upx; height: 120upx;
} }
.right { .right {
flex: 1; flex: 1;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
padding: 0 30upx 0 24upx; padding: 0 30upx 0 24upx;
overflow: hidden; overflow: hidden;
.title { .title {
font-size: $font-base + 2upx; font-size: $font-base + 2upx;
color: $font-color-dark; color: $font-color-dark;
line-height: 1; line-height: 1;
} }
.attr-box { .attr-box {
font-size: $font-sm + 2upx; font-size: $font-sm + 2upx;
color: $font-color-light; color: $font-color-light;
padding: 10upx 12upx; padding: 10upx 12upx;
} }
.price { .price {
font-size: $font-base + 2upx; font-size: $font-base + 2upx;
color: $font-color-dark; color: $font-color-dark;
&:before { &:before {
content: '￥'; content: '￥';
font-size: $font-sm; font-size: $font-sm;
@@ -770,38 +867,43 @@ page {
} }
} }
} }
} }
.price-box { .price-box {
display: flex; display: flex;
justify-content: flex-end; justify-content: flex-end;
align-items: baseline; align-items: baseline;
padding: 20upx 30upx; padding: 20upx 30upx;
font-size: $font-sm + 2upx; font-size: $font-sm + 2upx;
color: $font-color-light; color: $font-color-light;
.num { .num {
margin: 0 8upx; margin: 0 8upx;
color: $font-color-dark; color: $font-color-dark;
} }
.price { .price {
font-size: $font-lg; font-size: $font-lg;
color: $font-color-dark; color: $font-color-dark;
&:before { &:before {
content: '￥'; content: '￥';
font-size: $font-sm; font-size: $font-sm;
margin: 0 2upx 0 8upx; margin: 0 2upx 0 8upx;
} }
} }
} }
.action-box {
.action-box {
display: flex; display: flex;
justify-content: flex-end; justify-content: flex-end;
align-items: center; align-items: center;
height: 100upx; height: 100upx;
position: relative; position: relative;
padding-right: 30upx; padding-right: 30upx;
} }
.action-btn {
.action-btn {
width: 160upx; width: 160upx;
height: 60upx; height: 60upx;
margin: 0; margin: 0;
@@ -813,54 +915,64 @@ page {
color: $font-color-dark; color: $font-color-dark;
background: #fff; background: #fff;
border-radius: 100px; border-radius: 100px;
&:after { &:after {
border-radius: 100px; border-radius: 100px;
} }
&.recom { &.recom {
background: #fff9f9; background: #fff9f9;
color: $base-color; color: $base-color;
&:after { &:after {
border-color: #f7bcc8; border-color: #f7bcc8;
} }
} }
} }
/* 猜你喜欢 */ /* 猜你喜欢 */
.guess-section { .guess-section {
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
padding: 0 30upx; padding: 0 30upx;
background: #fff; background: #fff;
.guess-item { .guess-item {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
width: 48%; width: 48%;
padding-bottom: 40upx; padding-bottom: 40upx;
&:nth-child(2n + 1) { &:nth-child(2n + 1) {
margin-right: 4%; margin-right: 4%;
} }
} }
.image-wrapper { .image-wrapper {
width: 100%; width: 100%;
height: 330upx; height: 330upx;
border-radius: 3px; border-radius: 3px;
overflow: hidden; overflow: hidden;
image { image {
width: 100%; width: 100%;
height: 100%; height: 100%;
opacity: 1; opacity: 1;
} }
} }
.title { .title {
font-size: $font-lg; font-size: $font-lg;
color: $font-color-dark; color: $font-color-dark;
line-height: 80upx; line-height: 80upx;
} }
.price { .price {
font-size: $font-lg; font-size: $font-lg;
color: $uni-color-primary; color: $uni-color-primary;
line-height: 1; line-height: 1;
} }
.coupon_box { .coupon_box {
width: 100%; width: 100%;
height: auto; height: auto;
@@ -880,6 +992,7 @@ page {
text-align: center; text-align: center;
position: relative; position: relative;
} }
.text span { .text span {
width: 180upx; width: 180upx;
height: 40upx; height: 40upx;
@@ -895,20 +1008,23 @@ page {
font-size: $font-base; font-size: $font-base;
} }
} }
} }
.getPosition {
.getPosition {
height: 100upx; height: 100upx;
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
font-size: 32upx; font-size: 32upx;
background-color: #fff; background-color: #fff;
} }
.goods-list-vertical {
.goods-list-vertical {
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
padding: 0upx 20upx; padding: 0upx 20upx;
background: #fff; background: #fff;
.goods-item-vertical { .goods-item-vertical {
display: flex; display: flex;
flex-direction: row; flex-direction: row;
@@ -916,6 +1032,7 @@ page {
align-items: center; align-items: center;
justify-content: center; justify-content: center;
border-bottom: 1upx solid #eeeeee; border-bottom: 1upx solid #eeeeee;
.image-wrapper-vertical { .image-wrapper-vertical {
width: 240upx; width: 240upx;
height: 240upx; height: 240upx;
@@ -923,15 +1040,19 @@ page {
align-items: center; align-items: center;
justify-content: center; justify-content: center;
margin-right: 10upx; margin-right: 10upx;
image { image {
width: 240upx; width: 240upx;
height: 240upx; height: 240upx;
} }
} }
.goods-list-right { .goods-list-right {
width: 470upx; width: 470upx;
.goods-right-top { .goods-right-top {
height: 200upx; height: 200upx;
text { text {
font-size: 32upx; font-size: 32upx;
text-overflow: -o-ellipsis-lastline; text-overflow: -o-ellipsis-lastline;
@@ -942,19 +1063,23 @@ page {
-webkit-box-orient: vertical; -webkit-box-orient: vertical;
} }
} }
.goods-right-bottom { .goods-right-bottom {
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
.price { .price {
font-size: $font-lg; font-size: $font-lg;
color: $uni-color-primary; color: $uni-color-primary;
line-height: 1; line-height: 1;
&:before { &:before {
content: ''; content: '';
font-size: 26upx; font-size: 26upx;
} }
} }
.sale { .sale {
color: $font-color-light; color: $font-color-light;
font-size: 28upx; font-size: 28upx;
@@ -962,5 +1087,5 @@ page {
} }
} }
} }
} }
</style> </style>

164
mallplusui-uniapp-app/pagesA/build/communityList.vue
View File

@@ -3,27 +3,32 @@
<view class="navbar" :style="{ position: headerPosition, top: headerTop }"> <view class="navbar" :style="{ position: headerPosition, top: headerTop }">
<view class="nav-item" :class="{ current: filterIndex === 0 }" @click="tabClick(0)">综合排序</view> <view class="nav-item" :class="{ current: filterIndex === 0 }" @click="tabClick(0)">综合排序</view>
<view class="nav-item" :class="{ current: filterIndex === 2 }" @click="tabClick(2)"> <!-- <view class="nav-item" :class="{ current: filterIndex === 2 }" @click="tabClick(2)">
<text>楼房</text> <text>楼房</text>
<view class="p-box"> <view class="p-box">
<text :class="{ active: priceOrder === 1 && filterIndex === 2 }" class="yticon icon-shang"></text> <text :class="{ active: priceOrder === 1 && filterIndex === 2 }" class="yticon icon-shang"></text>
<text :class="{ active: priceOrder === 2 && filterIndex === 2 }" class="yticon icon-shang xia"></text> <text :class="{ active: priceOrder === 2 && filterIndex === 2 }" class="yticon icon-shang xia"></text>
</view> </view>
</view> </view> -->
<text class="cate-item yticon icon-fenlei1" @click="toggleCateMask('show')"></text> <text class="cate-item yticon icon-fenlei1" @click="toggleCateMask('show')"></text>
</view> </view>
<!-- 列表显示 --> <!-- 列表显示 -->
<view class="goods-list-vertical" > <view class="goods-list-vertical">
<view v-for="(item, index) in goodsList" :key="index" class="goods-item-vertical" @click="navToDetailPage(item)"> <view v-for="(item, index) in goodsList" :key="index" class="goods-item-vertical"
<view class="image-wrapper-vertical"><image :src="item.pic" mode="aspectFill"></image></view> @click="navToDetailPage(item)">
<view class="image-wrapper-vertical">
<image :src="item.pic" mode="aspectFill"></image>
</view>
<view class="goods-list-right"> <view class="goods-list-right">
<view class="goods-right-top"> <view class="goods-right-top">
<text class="">{{ item.name }}</text> <text class="text1">{{ item.name }}</text>
<text class="text2">地址:卡就哦啊四到哦啊四到哦啊四到哦啊四到哦啊四到哦啊四到哦啊四到哦啊四到四的</text>
<text class="text2">电话:13623307393</text>
</view> </view>
<view class="goods-right-bottom"> <!-- <view class="goods-right-bottom">
<text class="price">均价:{{ item.price }}</text> <text class="price">均价:{{ item.price }}</text>
<text class="sale" v-if="geohash">距离: {{item.distance.toFixed(4)}}</text> <text class="sale" v-if="geohash">距离: {{item.distance.toFixed(4)}}</text>
</view> </view> -->
</view> </view>
</view> </view>
</view> </view>
@@ -35,10 +40,10 @@
</template> </template>
<script> <script>
import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue'; import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue';
import Api from '@/common/api'; import Api from '@/common/api';
import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue'; import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
export default { export default {
components: { components: {
uniLoadMore uniLoadMore
}, },
@@ -53,7 +58,7 @@ export default {
cateId: 0, //已选三级分类id cateId: 0, //已选三级分类id
pageNum: 1, pageNum: 1,
cid: null, cid: null,
geohash:'', geohash: '',
priceOrder: 0, //1 价格从低到高 2价格从高到低 priceOrder: 0, //1 价格从低到高 2价格从高到低
cateList: [], cateList: [],
goodsList: [] goodsList: []
@@ -67,10 +72,10 @@ export default {
this.keyword = options.keyword; this.keyword = options.keyword;
this.cateId = options.sid; this.cateId = options.sid;
//this.loadCateList(options.fid, options.sid); //this.loadCateList(options.fid, options.sid);
if(options.geohash){ if (options.geohash) {
this.geohash=options.geohash; this.geohash = options.geohash;
this.nearCommunity(options.geohash); this.nearCommunity(options.geohash);
}else{ } else {
console.log(options.geohash) console.log(options.geohash)
this.loadData(); this.loadData();
} }
@@ -97,7 +102,11 @@ export default {
}, },
methods: { methods: {
async nearCommunity(geohash) { async nearCommunity(geohash) {
let params = params = { geohash: geohash, pageSize: 10,distance:240 }; let params = params = {
geohash: geohash,
pageSize: 10,
distance: 240
};
let data = await Api.apiCall('get', Api.build.nearCommunityList, params); let data = await Api.apiCall('get', Api.build.nearCommunityList, params);
if (data) { if (data) {
this.goodsList = data || []; this.goodsList = data || [];
@@ -117,9 +126,14 @@ export default {
let params; let params;
if (this.keyword) { if (this.keyword) {
params = { pageNum: this.pageNum, keyword: this.keyword }; params = {
pageNum: this.pageNum,
keyword: this.keyword
};
} else { } else {
params = { pageNum: this.pageNum }; params = {
pageNum: this.pageNum
};
} }
let list = await Api.apiCall('get', Api.build.communityList, params); let list = await Api.apiCall('get', Api.build.communityList, params);
@@ -174,6 +188,7 @@ export default {
}, },
//显示分类面板 //显示分类面板
toggleCateMask(type) { toggleCateMask(type) {
console.log("type", type);
let timer = type === 'show' ? 10 : 300; let timer = type === 'show' ? 10 : 300;
let state = type === 'show' ? 1 : 0; let state = type === 'show' ? 1 : 0;
this.cateMaskState = 2; this.cateMaskState = 2;
@@ -198,49 +213,53 @@ export default {
navToDetailPage(item) { navToDetailPage(item) {
//测试数据没有写id，用title代替 //测试数据没有写id，用title代替
let id = item.id; let id = item.id;
let name = item.name;
uni.navigateTo({ uni.navigateTo({
url: `../../pagesA/build/community?communityId=${id}` url: `../../pagesA/build/community?communityId=${id}&name=${name}`
}); });
}, },
stopPrevent() {} stopPrevent() {}
} }
}; };
</script> </script>
<style lang="scss"> <style lang="scss">
page, page,
.content { .content {
background: $page-color-base; background: $page-color-base;
} }
.content {
padding-top: 96upx;
}
.navbar { .content {
padding-top: 96upx;
}
.navbar {
position: fixed; position: fixed;
left: 0; left: 0;
top: var(--window-top); top: var(--window-top);
display: flex; display: flex;
width: 100%; width: 100%;
height: 80upx; height: 70upx;
background: #fff; background: #fff;
box-shadow: 0 2upx 10upx rgba(0, 0, 0, 0.06); box-shadow: 0 2upx 10upx rgba(0, 0, 0, 0.06);
z-index: 10; z-index: 10;
padding-left: 20px;
.nav-item { .nav-item {
flex: 1; flex: 1;
display: flex; display: flex;
justify-content: center;
align-items: center; align-items: center;
height: 100%; height: 100%;
font-size: 30upx; font-size: 30upx;
color: $font-color-dark; color: $font-color-dark;
position: relative; position: relative;
&.current { &.current {
color: $base-color; color: $base-color;
&:after { &:after {
content: ''; content: '';
position: absolute; position: absolute;
left: 50%; left: 9%;
bottom: 0; bottom: 0;
transform: translateX(-50%); transform: translateX(-50%);
width: 120upx; width: 120upx;
@@ -249,9 +268,11 @@ page,
} }
} }
} }
.p-box { .p-box {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
.yticon { .yticon {
display: flex; display: flex;
align-items: center; align-items: center;
@@ -262,14 +283,17 @@ page,
margin-left: 4upx; margin-left: 4upx;
font-size: 26upx; font-size: 26upx;
color: #888; color: #888;
&.active { &.active {
color: $base-color; color: $base-color;
} }
} }
.xia { .xia {
transform: scaleY(-1); transform: scaleY(-1);
} }
} }
.cate-item { .cate-item {
display: flex; display: flex;
justify-content: center; justify-content: center;
@@ -278,6 +302,7 @@ page,
width: 80upx; width: 80upx;
position: relative; position: relative;
font-size: 44upx; font-size: 44upx;
&:after { &:after {
content: ''; content: '';
position: absolute; position: absolute;
@@ -289,10 +314,10 @@ page,
height: 36upx; height: 36upx;
} }
} }
} }
/* 分类 */ /* 分类 */
.cate-mask { .cate-mask {
position: fixed; position: fixed;
left: 0; left: 0;
top: var(--window-top); top: var(--window-top);
@@ -310,9 +335,11 @@ page,
transform: translateX(100%); transform: translateX(100%);
transition: 0.3s; transition: 0.3s;
} }
&.none { &.none {
display: none; display: none;
} }
&.show { &.show {
background: rgba(0, 0, 0, 0.4); background: rgba(0, 0, 0, 0.4);
@@ -320,11 +347,13 @@ page,
transform: translateX(0); transform: translateX(0);
} }
} }
} }
.cate-list {
.cate-list {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
height: 100%; height: 100%;
.cate-item { .cate-item {
display: flex; display: flex;
align-items: center; align-items: center;
@@ -334,48 +363,56 @@ page,
color: #555; color: #555;
position: relative; position: relative;
} }
.two { .two {
height: 64upx; height: 64upx;
color: #303133; color: #303133;
font-size: 30upx; font-size: 30upx;
background: #f8f8f8; background: #f8f8f8;
} }
.active { .active {
color: $base-color; color: $base-color;
} }
} }
/* 商品列表 */ /* 商品列表 */
.goods-list { .goods-list {
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
padding: 20upx 20upx 0 20upx; padding: 20upx 20upx 0 20upx;
background: #fff; background: #fff;
.goods-item { .goods-item {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
width: 48%; width: 48%;
padding-bottom: 40upx; padding-bottom: 40upx;
&:nth-child(2n + 1) { &:nth-child(2n + 1) {
margin-right: 4%; margin-right: 4%;
} }
} }
.image-wrapper { .image-wrapper {
width: 100%; width: 100%;
height: 330upx; height: 330upx;
border-radius: 3px; border-radius: 3px;
overflow: hidden; overflow: hidden;
image { image {
width: 100%; width: 100%;
height: 100%; height: 100%;
opacity: 1; opacity: 1;
} }
} }
.title { .title {
font-size: $font-lg; font-size: $font-lg;
color: $font-color-dark; color: $font-color-dark;
line-height: 80upx; line-height: 80upx;
} }
.price-box { .price-box {
display: flex; display: flex;
align-items: center; align-items: center;
@@ -384,67 +421,88 @@ page,
font-size: 24upx; font-size: 24upx;
color: $font-color-light; color: $font-color-light;
} }
.price { .price {
font-size: $font-lg; font-size: $font-lg;
color: $uni-color-primary; color: $uni-color-primary;
line-height: 1; line-height: 1;
&:before { &:before {
content: ''; content: '';
font-size: 26upx; font-size: 26upx;
} }
} }
} }
.goods-list-vertical {
.goods-list-vertical {
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
padding: 0upx 20upx; padding: 0upx 20upx;
background: #fff; background: #fff;
.goods-item-vertical { .goods-item-vertical {
display: flex; display: flex;
flex-direction: row; flex-direction: row;
height: 280upx; height: 200upx;
align-items: center;
justify-content: center;
border-bottom: 1upx solid #eeeeee;
.image-wrapper-vertical { .image-wrapper-vertical {
width: 240upx; width: 200upx;
height: 240upx;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
margin-right: 10upx; margin-right: 10upx;
image { image {
width: 240upx; width: 150upx;
height: 240upx; height: 150upx;
} }
} }
.goods-list-right { .goods-list-right {
display: flex;
flex-direction: column;
width: 470upx; width: 470upx;
.goods-right-top { .goods-right-top {
height: 200upx; .text1 {
text { margin-top: 10px;
font-size: 32upx; font-size: 32upx;
text-overflow: -o-ellipsis-lastline; text-overflow: -o-ellipsis-lastline;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
display: -webkit-box; display: -webkit-box;
-webkit-line-clamp: 2; -webkit-line-clamp: 1;
-webkit-box-orient: vertical;
}
.text2{
margin-top: 10px;
color: #555;
font-size: 30upx;
text-overflow: -o-ellipsis-lastline;
overflow: hidden;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-line-clamp: 1;
-webkit-box-orient: vertical; -webkit-box-orient: vertical;
} }
} }
.goods-right-bottom { .goods-right-bottom {
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
.price { .price {
font-size: $font-lg; font-size: $font-lg;
color: $uni-color-primary; color: $uni-color-primary;
line-height: 1; line-height: 1;
&:before { &:before {
content: ''; content: '';
font-size: 26upx; font-size: 26upx;
} }
} }
.sale { .sale {
color: $font-color-light; color: $font-color-light;
font-size: 28upx; font-size: 28upx;
@@ -452,5 +510,5 @@ page,
} }
} }
} }
} }
</style> </style>

12
mallplusui-uniapp-app/pagesA/build/notice.vue
View File

@@ -23,11 +23,19 @@ export default {
return { return {
pageNum: 1, pageNum: 1,
goodsList: [] goodsList: [
{
id:"25",
createTime :"2020-02-02",
title:"测试标签",
pic:"https://pic3.zhimg.com/v2-c6ae9c3aff36b9b221258f6a90577902_r.jpg",
content:"爱上科技大厦送i的阿松i到速度奥昂是大宋i的"
}
]
}; };
}, },
onLoad() { onLoad() {
this.loadData(); // this.loadData();
}, },
onPageScroll(e) { onPageScroll(e) {
//兼容iOS端下拉时顶部漂移 //兼容iOS端下拉时顶部漂移

2
mallplusui-uniapp-app/pagesA/product/giftList.vue
View File

@@ -36,7 +36,7 @@
</scroll-view> </scroll-view>
</view> </view>
</view> </view>
<mallplusCopyright></mallplusCopyright> <!-- <mallplusCopyright></mallplusCopyright> -->
</view> </view>
</template> </template>

2
mallplusui-uniapp-app/pagesA/product/groupActivityList.vue
View File

@@ -23,7 +23,7 @@
</view> </view>
</view> </view>
<uni-load-more :status="loadingType"></uni-load-more> <uni-load-more :status="loadingType"></uni-load-more>
<mallplusCopyright></mallplusCopyright> <!-- <mallplusCopyright></mallplusCopyright> -->
</view> </view>
</template> </template>

2
mallplusui-uniapp-app/pagesA/product/groupList.vue
View File

@@ -36,7 +36,7 @@
</scroll-view> </scroll-view>
</view> </view>
</view> </view>
<mallplusCopyright></mallplusCopyright> <!-- <mallplusCopyright></mallplusCopyright> -->
</view> </view>
</template> </template>

2
mallplusui-uniapp-app/pagesA/product/list.vue
View File

@@ -63,7 +63,7 @@
</scroll-view> </scroll-view>
</view> </view>
</view> </view>
<mallplusCopyright></mallplusCopyright> <!-- <mallplusCopyright></mallplusCopyright> -->
</view> </view>
</template> </template>

2
mallplusui-uniapp-app/pagesA/product/paiMaiList.vue
View File

@@ -36,7 +36,7 @@
</scroll-view> </scroll-view>
</view> </view>
</view> </view>
<mallplusCopyright></mallplusCopyright> <!-- <mallplusCopyright></mallplusCopyright> -->
</view> </view>
</template> </template>

1
mallplusui-uniapp-app/pagesA/product/product.vue
View File

@@ -500,6 +500,7 @@ export default {
uni.navigateTo({ uni.navigateTo({
url url
}); });
return;
} }
let userInfo = uni.getStorageSync('userInfo'); let userInfo = uni.getStorageSync('userInfo');
if (userInfo && userInfo.storeId && userInfo.storeId == this.goods.storeId) { if (userInfo && userInfo.storeId && userInfo.storeId == this.goods.storeId) {

2
mallplusui-uniapp-app/pagesA/product/tagGoodslist.vue
View File

@@ -61,7 +61,7 @@
</scroll-view> </scroll-view>
</view> </view>
</view> </view>
<mallplusCopyright></mallplusCopyright> <!-- <mallplusCopyright></mallplusCopyright> -->
</view> </view>
</template> </template>

256
mallplusui-uniapp-app/pagesC/seller/index.vue
View File

@@ -12,7 +12,8 @@
<!-- 背景色区域 --> <!-- 背景色区域 -->
<view class="titleNview-background" :style="{ backgroundColor: titleNViewBackground }"></view> <view class="titleNview-background" :style="{ backgroundColor: titleNViewBackground }"></view>
<swiper class="carousel" circular @change="swiperChange"> <swiper class="carousel" circular @change="swiperChange">
<swiper-item v-for="(item, index) in carouselList" :key="index" class="carousel-item" @click="navToDetailPageL(item.url)"> <swiper-item v-for="(item, index) in carouselList" :key="index" class="carousel-item"
@click="navToDetailPageL(item.url)">
<image :src="item.pic" /> <image :src="item.pic" />
</swiper-item> </swiper-item>
</swiper> </swiper>
@@ -61,22 +62,25 @@
<uni-grid-item marker="badge" :text="orderData.yesOrderPay+''" type="primary"> <uni-grid-item marker="badge" :text="orderData.yesOrderPay+''" type="primary">
<text class="text" @click="navToTabPage('../../pagesC/seller/order?status=0')">昨日总额</text> <text class="text" @click="navToTabPage('../../pagesC/seller/order?status=0')">昨日总额</text>
</uni-grid-item> </uni-grid-item>
<uni-grid-item marker="badge" :text="orderStatusCount.status0+''" type="error" > <uni-grid-item marker="badge" :text="orderStatusCount.status0+''" type="error">
<text class="text" @click="navToTabPage('../../pagesC/seller/order?status=12')">待付款</text> <text class="text" @click="navToTabPage('../../pagesC/seller/order?status=12')">待付款</text>
</uni-grid-item> </uni-grid-item>
<uni-grid-item marker="badge" :text="orderStatusCount.status1+''" type="success" > <uni-grid-item marker="badge" :text="orderStatusCount.status1+''" type="success">
<text class="text" @click="navToTabPage('../../pagesC/seller/order?status=2')">待发货</text> <text class="text" @click="navToTabPage('../../pagesC/seller/order?status=2')">待发货</text>
</uni-grid-item> </uni-grid-item>
<uni-grid-item marker="badge" :text="orderStatusCount.status5+''" type="warning" > <uni-grid-item marker="badge" :text="orderStatusCount.status5+''" type="warning">
<text class="text" @click="navToTabPage('../../pagesC/seller/order?status=13')">申请退款</text> <text class="text" @click="navToTabPage('../../pagesC/seller/order?status=13')">申请退款</text>
</uni-grid-item> </uni-grid-item>
<uni-grid-item marker="badge" :text="orderStatusCount.status14+''" type="warning" > <uni-grid-item marker="badge" :text="orderStatusCount.status14+''" type="warning">
<text class="text" @click="navToTabPage('../../pagesC/seller/order?status=15')">已关闭</text> <text class="text" @click="navToTabPage('../../pagesC/seller/order?status=15')">已关闭</text>
</uni-grid-item> </uni-grid-item>
</uni-grid> </uni-grid>
</view> </view>
<view class="ad-1"><image src="/static/temp/ad1.jpg" @click="navToDetailPageL('https://s.click.taobao.com/0T59c1w')" mode="scaleToFill"></image></view> <view class="ad-1">
<image src="/static/temp/ad1.jpg" @click="navToDetailPageL('https://s.click.taobao.com/0T59c1w')"
mode="scaleToFill"></image>
</view>
<view> <view>
<uni-grid :column="3" :hor="35" :ver="-45"> <uni-grid :column="3" :hor="35" :ver="-45">
@@ -101,7 +105,10 @@
</uni-grid> </uni-grid>
</view> </view>
<view class="ad-1"><image src="/static/temp/ad1.jpg" @click="navToDetailPageL('https://s.click.taobao.com/0T59c1w')" mode="scaleToFill"></image></view> <view class="ad-1">
<image src="/static/temp/ad1.jpg" @click="navToDetailPageL('https://s.click.taobao.com/0T59c1w')"
mode="scaleToFill"></image>
</view>
<view> <view>
<uni-grid :column="3" :hor="35" :ver="-45"> <uni-grid :column="3" :hor="35" :ver="-45">
@@ -126,24 +133,27 @@
</uni-grid> </uni-grid>
</view> </view>
<mallplusCopyright></mallplusCopyright> <!-- <mallplusCopyright></mallplusCopyright> -->
</view> </view>
</template> </template>
<script> <script>
import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue'; import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue';
import Api from '@/common/api'; import Api from '@/common/api';
import coupon from '@/components/coolc-coupon/coolc-coupon'; import coupon from '@/components/coolc-coupon/coolc-coupon';
import { formatDate } from '@/common/date'; import {
import uniGrid from "@/components/uni-grid/uni-grid.vue" formatDate
import uniGridItem from "@/components/uni-grid-item/uni-grid-item.vue" } from '@/common/date';
export default { import uniGrid from "@/components/uni-grid/uni-grid.vue"
components: { import uniGridItem from "@/components/uni-grid-item/uni-grid-item.vue"
export default {
components: {
mallplusCopyright, mallplusCopyright,
coupon coupon,
,uniGrid,uniGridItem uniGrid,
uniGridItem
}, },
data() { data() {
return { return {
@@ -155,10 +165,10 @@ components: {
orderData: '', orderData: '',
goodsData: '', goodsData: '',
userData: '', userData: '',
orderStatusCount:'' orderStatusCount: ''
}; };
}, },
onShow: function() { onShow: function() {
this.loadData(); this.loadData();
}, },
onLoad(ops) { onLoad(ops) {
@@ -172,19 +182,18 @@ onShow: function() {
*/ */
async loadData() { async loadData() {
let adminToken = uni.getStorageSync('adminToken') || ''; let adminToken = uni.getStorageSync('adminToken') || '';
console.log('adminToken:'+adminToken) console.log('adminToken:' + adminToken)
if(!adminToken){ if (!adminToken) {
uni.navigateTo({ uni.navigateTo({
url: '../../pagesC/seller/login' url: '../../pagesC/seller/login'
}); });
return
}
}
let params = {}; let params = {};
let orderResp = await Api.apiAdminCall('get', Api.admin.orderStatic, params,true); let orderResp = await Api.apiAdminCall('get', Api.admin.orderStatic, params, true);
this.orderData = orderResp; this.orderData = orderResp;
this.orderStatusCount=orderResp.orderStatusCount this.orderStatusCount = orderResp.orderStatusCount
let goodsResp = await Api.apiAdminCall('get', Api.admin.goodsStatic, params); let goodsResp = await Api.apiAdminCall('get', Api.admin.goodsStatic, params);
this.goodsData = goodsResp; this.goodsData = goodsResp;
@@ -228,7 +237,7 @@ uni.navigateTo({
}, },
//详情页 //详情页
navToDetailPageL(url) { navToDetailPageL(url) {
window.location.href =url; window.location.href = url;
}, },
//详情页 //详情页
navToCouponDetailPage(item) { navToCouponDetailPage(item) {
@@ -238,12 +247,14 @@ uni.navigateTo({
url: `/pages/product/product?id=${id}` url: `/pages/product/product?id=${id}`
}); });
}, },
async acceptCoupon(item){ async acceptCoupon(item) {
uni.showLoading({ uni.showLoading({
title: '请稍后' title: '请稍后'
}); });
let params = { couponId: item.id }; let params = {
couponId: item.id
};
let data = await Api.apiAdminCall('post', Api.admin.acceptCoupon, params); let data = await Api.apiAdminCall('post', Api.admin.acceptCoupon, params);
console.log(data); console.log(data);
if (data) { if (data) {
@@ -308,17 +319,18 @@ uni.navigateTo({
}); });
} }
} }
}; };
</script> </script>
<style lang="scss"> <style lang="scss">
.mp-search-box { .mp-search-box {
position: absolute; position: absolute;
left: 0; left: 0;
top: 30upx; top: 30upx;
z-index: 9999; z-index: 9999;
width: 100%; width: 100%;
padding: 0 80upx; padding: 0 80upx;
.ser-input { .ser-input {
flex: 1; flex: 1;
height: 56upx; height: 56upx;
@@ -329,40 +341,47 @@ uni.navigateTo({
border-radius: 20px; border-radius: 20px;
background: rgba(255, 255, 255, 0.6); background: rgba(255, 255, 255, 0.6);
} }
} }
page {
page {
.cate-section { .cate-section {
position: relative; position: relative;
z-index: 5; z-index: 5;
border-radius: 16upx 16upx 0 0; border-radius: 16upx 16upx 0 0;
margin-top: -20upx; margin-top: -20upx;
} }
.carousel-section { .carousel-section {
padding: 0; padding: 0;
.titleNview-placing { .titleNview-placing {
padding-top: 0; padding-top: 0;
height: 0; height: 0;
} }
.carousel { .carousel {
.carousel-item { .carousel-item {
padding: 0; padding: 0;
} }
} }
.swiper-dots { .swiper-dots {
left: 45upx; left: 45upx;
bottom: 40upx; bottom: 40upx;
} }
} }
} }
page { page {
background: #f5f5f5; background: #f5f5f5;
} }
.m-t {
.m-t {
margin-top: 16upx; margin-top: 16upx;
} }
/* 头部 轮播图 */
.carousel-section { /* 头部 轮播图 */
.carousel-section {
position: relative; position: relative;
padding-top: 10px; padding-top: 10px;
@@ -380,8 +399,9 @@ page {
height: 426upx; height: 426upx;
transition: 0.4s; transition: 0.4s;
} }
} }
.carousel {
.carousel {
width: 100%; width: 100%;
height: 350upx; height: 350upx;
@@ -397,8 +417,9 @@ page {
height: 100%; height: 100%;
border-radius: 10upx; border-radius: 10upx;
} }
} }
.swiper-dots {
.swiper-dots {
display: flex; display: flex;
position: absolute; position: absolute;
left: 60upx; left: 60upx;
@@ -427,15 +448,17 @@ page {
color: #fff; color: #fff;
transform: translateX(-50%); transform: translateX(-50%);
} }
} }
/* 分类 */
.cate-section { /* 分类 */
.cate-section {
display: flex; display: flex;
justify-content: space-around; justify-content: space-around;
align-items: center; align-items: center;
flex-wrap: wrap; flex-wrap: wrap;
padding: 30upx 22upx; padding: 30upx 22upx;
background: #fff; background: #fff;
.cate-item { .cate-item {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
@@ -443,6 +466,7 @@ page {
font-size: $font-sm + 2upx; font-size: $font-sm + 2upx;
color: $font-color-dark; color: $font-color-dark;
} }
/* 原图标颜色太深,不想改图了,所以加了透明度 */ /* 原图标颜色太深,不想改图了,所以加了透明度 */
image { image {
width: 88upx; width: 88upx;
@@ -452,35 +476,42 @@ page {
opacity: 0.7; opacity: 0.7;
box-shadow: 4upx 4upx 20upx rgba(250, 67, 106, 0.3); box-shadow: 4upx 4upx 20upx rgba(250, 67, 106, 0.3);
} }
} }
.ad-1 {
.ad-1 {
width: 100%; width: 100%;
height: 210upx; height: 210upx;
padding: 10upx 0; padding: 10upx 0;
background: #fff; background: #fff;
image { image {
width: 100%; width: 100%;
height: 100%; height: 100%;
} }
} }
/* 秒杀专区 */
.seckill-section { /* 秒杀专区 */
.seckill-section {
padding: 4upx 30upx 24upx; padding: 4upx 30upx 24upx;
background: #fff; background: #fff;
.s-header { .s-header {
display: flex; display: flex;
align-items: center; align-items: center;
height: 92upx; height: 92upx;
line-height: 1; line-height: 1;
.s-img { .s-img {
width: 140upx; width: 140upx;
height: 30upx; height: 30upx;
} }
.tip { .tip {
font-size: $font-base; font-size: $font-base;
color: $font-color-light; color: $font-color-light;
margin: 0 20upx 0 40upx; margin: 0 20upx 0 40upx;
} }
.timer { .timer {
display: inline-block; display: inline-block;
width: 40upx; width: 40upx;
@@ -493,6 +524,7 @@ page {
border-radius: 2px; border-radius: 2px;
background: rgba(0, 0, 0, 0.8); background: rgba(0, 0, 0, 0.8);
} }
.icon-you { .icon-you {
font-size: $font-lg; font-size: $font-lg;
color: $font-color-light; color: $font-color-light;
@@ -500,112 +532,135 @@ page {
text-align: right; text-align: right;
} }
} }
.floor-list { .floor-list {
white-space: nowrap; white-space: nowrap;
} }
.scoll-wrapper { .scoll-wrapper {
display: flex; display: flex;
align-items: flex-start; align-items: flex-start;
} }
.floor-item { .floor-item {
width: 150upx; width: 150upx;
margin-right: 20upx; margin-right: 20upx;
font-size: $font-sm + 2upx; font-size: $font-sm + 2upx;
color: $font-color-dark; color: $font-color-dark;
line-height: 1.8; line-height: 1.8;
image { image {
width: 150upx; width: 150upx;
height: 150upx; height: 150upx;
border-radius: 6upx; border-radius: 6upx;
} }
.price { .price {
color: $uni-color-primary; color: $uni-color-primary;
} }
} }
} }
.f-header { .f-header {
display: flex; display: flex;
align-items: center; align-items: center;
height: 140upx; height: 140upx;
padding: 6upx 30upx 8upx; padding: 6upx 30upx 8upx;
background: #fff; background: #fff;
image { image {
flex-shrink: 0; flex-shrink: 0;
width: 80upx; width: 80upx;
height: 80upx; height: 80upx;
margin-right: 20upx; margin-right: 20upx;
} }
.tit-box { .tit-box {
flex: 1; flex: 1;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
} }
.tit { .tit {
font-size: $font-lg + 2upx; font-size: $font-lg + 2upx;
color: #font-color-dark; color: #font-color-dark;
line-height: 1.3; line-height: 1.3;
} }
.tit2 { .tit2 {
font-size: $font-sm; font-size: $font-sm;
color: $font-color-light; color: $font-color-light;
} }
.icon-you { .icon-you {
font-size: $font-lg + 2upx; font-size: $font-lg + 2upx;
color: $font-color-light; color: $font-color-light;
} }
} }
/* 团购楼层 */
.group-section { /* 团购楼层 */
.group-section {
background: #fff; background: #fff;
.g-swiper { .g-swiper {
height: 650upx; height: 650upx;
padding-bottom: 30upx; padding-bottom: 30upx;
} }
.g-swiper-item { .g-swiper-item {
width: 100%; width: 100%;
padding: 0 30upx; padding: 0 30upx;
display: flex; display: flex;
} }
image { image {
width: 100%; width: 100%;
height: 460upx; height: 460upx;
border-radius: 4px; border-radius: 4px;
} }
.g-item { .g-item {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
overflow: hidden; overflow: hidden;
} }
.left { .left {
flex: 1.2; flex: 1.2;
margin-right: 24upx; margin-right: 24upx;
.t-box { .t-box {
padding-top: 20upx; padding-top: 20upx;
} }
} }
.right { .right {
flex: 0.8; flex: 0.8;
flex-direction: column-reverse; flex-direction: column-reverse;
.t-box { .t-box {
padding-bottom: 20upx; padding-bottom: 20upx;
} }
} }
.t-box { .t-box {
height: 160upx; height: 160upx;
font-size: $font-base + 2upx; font-size: $font-base + 2upx;
color: $font-color-dark; color: $font-color-dark;
line-height: 1.6; line-height: 1.6;
} }
.price { .price {
color: $uni-color-primary; color: $uni-color-primary;
} }
.m-price { .m-price {
font-size: $font-sm + 2upx; font-size: $font-sm + 2upx;
text-decoration: line-through; text-decoration: line-through;
color: $font-color-light; color: $font-color-light;
margin-left: 8upx; margin-left: 8upx;
} }
.pro-box { .pro-box {
display: flex; display: flex;
align-items: center; align-items: center;
@@ -614,22 +669,26 @@ page {
color: $font-base; color: $font-base;
padding-right: 10upx; padding-right: 10upx;
} }
.progress-box { .progress-box {
flex: 1; flex: 1;
border-radius: 10px; border-radius: 10px;
overflow: hidden; overflow: hidden;
margin-right: 8upx; margin-right: 8upx;
} }
} }
/* 分类推荐楼层 */
.hot-floor { /* 分类推荐楼层 */
.hot-floor {
width: 100%; width: 100%;
overflow: hidden; overflow: hidden;
margin-bottom: 20upx; margin-bottom: 20upx;
.floor-img-box { .floor-img-box {
width: 100%; width: 100%;
height: 320upx; height: 320upx;
position: relative; position: relative;
&:after { &:after {
content: ''; content: '';
position: absolute; position: absolute;
@@ -640,10 +699,12 @@ page {
background: linear-gradient(rgba(255, 255, 255, 0.06) 30%, #f8f8f8); background: linear-gradient(rgba(255, 255, 255, 0.06) 30%, #f8f8f8);
} }
} }
.floor-img { .floor-img {
width: 100%; width: 100%;
height: 100%; height: 100%;
} }
.floor-list { .floor-list {
white-space: nowrap; white-space: nowrap;
padding: 20upx; padding: 20upx;
@@ -656,25 +717,30 @@ page {
position: relative; position: relative;
z-index: 1; z-index: 1;
} }
.scoll-wrapper { .scoll-wrapper {
display: flex; display: flex;
align-items: flex-start; align-items: flex-start;
} }
.floor-item { .floor-item {
width: 180upx; width: 180upx;
margin-right: 20upx; margin-right: 20upx;
font-size: $font-sm + 2upx; font-size: $font-sm + 2upx;
color: $font-color-dark; color: $font-color-dark;
line-height: 1.8; line-height: 1.8;
image { image {
width: 180upx; width: 180upx;
height: 180upx; height: 180upx;
border-radius: 6upx; border-radius: 6upx;
} }
.price { .price {
color: $uni-color-primary; color: $uni-color-primary;
} }
} }
.more { .more {
display: flex; display: flex;
align-items: center; align-items: center;
@@ -687,39 +753,47 @@ page {
background: #f3f3f3; background: #f3f3f3;
font-size: $font-base; font-size: $font-base;
color: $font-color-light; color: $font-color-light;
text:first-child { text:first-child {
margin-bottom: 4upx; margin-bottom: 4upx;
} }
} }
} }
/* 单条商品 */ /* 单条商品 */
.goods-box-single { .goods-box-single {
display: flex; display: flex;
padding: 20upx 0; padding: 20upx 0;
.goods-img { .goods-img {
display: block; display: block;
width: 120upx; width: 120upx;
height: 120upx; height: 120upx;
} }
.right { .right {
flex: 1; flex: 1;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
padding: 0 30upx 0 24upx; padding: 0 30upx 0 24upx;
overflow: hidden; overflow: hidden;
.title { .title {
font-size: $font-base + 2upx; font-size: $font-base + 2upx;
color: $font-color-dark; color: $font-color-dark;
line-height: 1; line-height: 1;
} }
.attr-box { .attr-box {
font-size: $font-sm + 2upx; font-size: $font-sm + 2upx;
color: $font-color-light; color: $font-color-light;
padding: 10upx 12upx; padding: 10upx 12upx;
} }
.price { .price {
font-size: $font-base + 2upx; font-size: $font-base + 2upx;
color: $font-color-dark; color: $font-color-dark;
&:before { &:before {
content: '￥'; content: '￥';
font-size: $font-sm; font-size: $font-sm;
@@ -736,13 +810,16 @@ page {
padding: 20upx 30upx; padding: 20upx 30upx;
font-size: $font-sm + 2upx; font-size: $font-sm + 2upx;
color: $font-color-light; color: $font-color-light;
.num { .num {
margin: 0 8upx; margin: 0 8upx;
color: $font-color-dark; color: $font-color-dark;
} }
.price { .price {
font-size: $font-lg; font-size: $font-lg;
color: $font-color-dark; color: $font-color-dark;
&:before { &:before {
content: '￥'; content: '￥';
font-size: $font-sm; font-size: $font-sm;
@@ -750,6 +827,7 @@ page {
} }
} }
} }
.action-box { .action-box {
display: flex; display: flex;
justify-content: flex-end; justify-content: flex-end;
@@ -758,6 +836,7 @@ page {
position: relative; position: relative;
padding-right: 30upx; padding-right: 30upx;
} }
.action-btn { .action-btn {
width: 160upx; width: 160upx;
height: 60upx; height: 60upx;
@@ -770,12 +849,15 @@ page {
color: $font-color-dark; color: $font-color-dark;
background: #fff; background: #fff;
border-radius: 100px; border-radius: 100px;
&:after { &:after {
border-radius: 100px; border-radius: 100px;
} }
&.recom { &.recom {
background: #fff9f9; background: #fff9f9;
color: $base-color; color: $base-color;
&:after { &:after {
border-color: #f7bcc8; border-color: #f7bcc8;
} }
@@ -783,51 +865,83 @@ page {
} }
/* 猜你喜欢 */ /* 猜你喜欢 */
.guess-section { .guess-section {
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
padding: 0 30upx; padding: 0 30upx;
background: #fff; background: #fff;
.guess-item { .guess-item {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
width: 48%; width: 48%;
padding-bottom: 40upx; padding-bottom: 40upx;
&:nth-child(2n + 1) { &:nth-child(2n + 1) {
margin-right: 4%; margin-right: 4%;
} }
} }
.image-wrapper { .image-wrapper {
width: 100%; width: 100%;
height: 330upx; height: 330upx;
border-radius: 3px; border-radius: 3px;
overflow: hidden; overflow: hidden;
image { image {
width: 100%; width: 100%;
height: 100%; height: 100%;
opacity: 1; opacity: 1;
} }
} }
.title { .title {
font-size: $font-lg; font-size: $font-lg;
color: $font-color-dark; color: $font-color-dark;
line-height: 80upx; line-height: 80upx;
} }
.price { .price {
font-size: $font-lg; font-size: $font-lg;
color: $uni-color-primary; color: $uni-color-primary;
line-height: 1; line-height: 1;
} }
.coupon_box { .coupon_box {
width:100%; height:auto; display:table; padding:6upx 26upx 26upx 26upx; width: 100%;
height: auto;
display: table;
padding: 6upx 26upx 26upx 26upx;
} }
.other_type { .other_type {
width:100%; height:90upx; padding-top:50upx; width: 100%;
height: 90upx;
padding-top: 50upx;
.text { width:100%; border-top:1px solid #eeeeee; display:block; text-align:center; position:relative; } .text {
.text span { width:180upx; height:40upx; line-height:40upx; color:#999999; display:block; background:#ffffff; position:absolute; left:50%; top:50%; margin-left:-90upx; margin-top:-20upx; font-size:$font-base; } width: 100%;
border-top: 1px solid #eeeeee;
display: block;
text-align: center;
position: relative;
}
.text span {
width: 180upx;
height: 40upx;
line-height: 40upx;
color: #999999;
display: block;
background: #ffffff;
position: absolute;
left: 50%;
top: 50%;
margin-left: -90upx;
margin-top: -20upx;
font-size: $font-base;
}
}
} }
}
</style> </style>

2
mallplusui-uniapp-app/pagesC/seller/login.vue
View File

@@ -24,7 +24,7 @@
还没有账号? 还没有账号?
<text @click="toRegist">马上注册</text> <text @click="toRegist">马上注册</text>
</view> </view>
<mallplusCopyright></mallplusCopyright> <!-- <mallplusCopyright></mallplusCopyright> -->
</view> </view>
</template> </template>

2
mallplusui-uniapp-app/pagesU/address/addressManage.vue
View File

@@ -7,7 +7,7 @@
</view> </view>
<view class="row b-b"> <view class="row b-b">
<text class="tit">手机号</text> <text class="tit">手机号</text>
<input class="input" type="number" v-model="addressData.phoneNumber" placeholder="收货人手机号码" placeholder-class="placeholder" /> <input class="input" type="number" maxlength="11" v-model="addressData.phoneNumber" placeholder="收货人手机号码" placeholder-class="placeholder" />
</view> </view>
<view class="row b-b"> <view class="row b-b">

BIN
mallplusui-uniapp-app/static/logo.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 66 KiB

BIN
mallplusui-uniapp-app/static/temp/ad1.jpg
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 33 KiB

After

Width:  |  Height:  |  Size: 19 KiB

BIN
mallplusui-uniapp-app/static/temp/antFill-gift.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 640 B

BIN
mallplusui-uniapp-app/static/temp/antFill-home.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 449 B

BIN
mallplusui-uniapp-app/static/temp/fabfa-dropbox.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 885 B

BIN
mallplusui-uniapp-app/static/temp/fasfa-archive.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 329 B

BIN
mallplusui-uniapp-app/static/temp/fasfa-history.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
mallplusui-uniapp-app/static/temp/fasfa-shopping.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 976 B

BIN
mallplusui-uniapp-app/static/temp/fasfa-sitemap.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 539 B

BIN
mallplusui-uniapp-app/static/temp/fasfa-street.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 905 B

BIN
mallplusui-uniapp-app/static/temp/fasfa-truck.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 812 B

BIN
mallplusui-uniapp-app/static/temp/fasfausers.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

4
mallplusui-web-admin/config/dev.env.js
View File

@@ -3,6 +3,6 @@ const merge = require('webpack-merge')
const prodEnv = require('./prod.env') const prodEnv = require('./prod.env')
module.exports = merge(prodEnv, { module.exports = merge(prodEnv, {
NODE_ENV: 'development', NODE_ENV: '"development"',
BASE_API: 'http://127.0.0.1:8085' BASE_API: '"http://127.0.0.1:8085"'
}) })

21
mallplusui-web-admin/src/views/build/community/components/CommunityDetail.vue
View File

@@ -8,8 +8,8 @@
<el-form-item label="小区栋数：" prop="counts"> <el-form-item label="小区栋数：" prop="counts">
<el-input v-model="community.counts"></el-input> <el-input v-model="community.counts"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="小区地址：" prop="address"> <el-form-item label="小区地址：" prop="details">
<el-input v-model="community.address"></el-input> <el-input v-model="community.details"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="地标：" prop="nearbyLandmarks"> <el-form-item label="地标：" prop="nearbyLandmarks">
@@ -19,6 +19,9 @@
<el-form-item label="电话：" prop="phone"> <el-form-item label="电话：" prop="phone">
<el-input v-model="community.phone"></el-input> <el-input v-model="community.phone"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="照片：" prop="pic">
<single-upload v-model="community.pic"></single-upload>
</el-form-item>
<el-form-item label="地图：" prop="phone"> <el-form-item label="地图：" prop="phone">
<input v-model.number="center.lng" /> <input v-model.number="center.lng" />
@@ -41,7 +44,7 @@
:copyright="[{id: 1, content: 'Copyright Message', bounds: {ne: {lng: 110, lat: 40}, sw:{lng: 0, lat: 0}}}, {id: 2, content: '<a>宇运动多租户商城</a>'}]"> :copyright="[{id: 1, content: 'Copyright Message', bounds: {ne: {lng: 110, lat: 40}, sw:{lng: 0, lat: 0}}}, {id: 2, content: '<a>宇运动多租户商城</a>'}]">
</bm-copyright> </bm-copyright>
<bm-city-list anchor="BMAP_ANCHOR_TOP_LEFT" @changeAfter="changeAfters"></bm-city-list> <bm-city-list anchor="BMAP_ANCHOR_TOP_LEFT" @changeAfter="changeAfters"></bm-city-list>
<bm-marker :position="center" :dragging="false" />
<!-- <bm-local-search :keyword="keyword" :auto-viewport="true" :location="location"></bm-local-search>--> <!-- <bm-local-search :keyword="keyword" :auto-viewport="true" :location="location"></bm-local-search>-->
</baidu-map> </baidu-map>
@@ -60,6 +63,7 @@
import BmCityList from 'vue-baidu-map/components/controls/CityList'; import BmCityList from 'vue-baidu-map/components/controls/CityList';
import BmCopyright from 'vue-baidu-map/components/controls/Copyright'; import BmCopyright from 'vue-baidu-map/components/controls/Copyright';
import BmView from 'vue-baidu-map/components/map/MapView'; import BmView from 'vue-baidu-map/components/map/MapView';
import BmMarker from 'vue-baidu-map/components/overlays/Marker'
import {createCommunity, getCommunity, updateCommunity} from '@/api/build/community' import {createCommunity, getCommunity, updateCommunity} from '@/api/build/community'
import SingleUpload from '@/components/Upload/singleUpload' import SingleUpload from '@/components/Upload/singleUpload'
import {formatDate} from '@/utils/date'; import {formatDate} from '@/utils/date';
@@ -68,7 +72,7 @@
}; };
export default { export default {
name: 'CommunityDetail', name: 'CommunityDetail',
components:{SingleUpload,BaiduMap,BmLocalSearch,BmCityList,BmView,BmCopyright}, components:{SingleUpload,BaiduMap,BmLocalSearch,BmCityList,BmView,BmCopyright,BmMarker},
props: { props: {
isEdit: { isEdit: {
type: Boolean, type: Boolean,
@@ -108,6 +112,15 @@
if (this.isEdit) { if (this.isEdit) {
getCommunity(this.$route.query.id).then(response => { getCommunity(this.$route.query.id).then(response => {
this.community = response.data; this.community = response.data;
if(this.community.latitude){
this.center.lat=this.community.latitude;
}
if(this.community.longitude){
this.center.lng=this.community.longitude;
}
if(this.community.city){
this.location=this.community.city;
}
}); });
}else{ }else{
this.community = Object.assign({},defaultCommunity); this.community = Object.assign({},defaultCommunity);