Browse Source

功能完善

master
lzh 2 years ago
parent
commit
c6c6e72936
  1. BIN
      docs/2.11 汇融云链.zip
  2. 31
      docs/xiugai/20230211/20230211.txt
  3. 6
      mallplus-admin/src/main/resources/application-dev.properties
  4. 4
      mallplus-admin/src/main/resources/application.properties
  5. 2
      mallplus-mbg/src/main/java/com/zscat/mallplus/enums/ConstansValue.java
  6. 7
      mallplus-portal/src/main/resources/application-dev.properties
  7. 1
      mallplus-portal/src/main/resources/application.properties
  8. 29
      mallplusui-uniapp-app/common/api.js
  9. 233
      mallplusui-uniapp-app/components/coolc-coupon/coolc-coupon.vue
  10. 71
      mallplusui-uniapp-app/components/likes/likes.vue
  11. 4
      mallplusui-uniapp-app/components/mall-copyright/mallplusCopyright.vue
  12. 8
      mallplusui-uniapp-app/config/baseUrl.js
  13. 8
      mallplusui-uniapp-app/manifest.json
  14. 99
      mallplusui-uniapp-app/pages.json
  15. 686
      mallplusui-uniapp-app/pages/cart/cart.vue
  16. 2118
      mallplusui-uniapp-app/pages/index/index.vue
  17. 269
      mallplusui-uniapp-app/pages/index/lease.vue
  18. 3
      mallplusui-uniapp-app/pages/index/user.vue
  19. 6
      mallplusui-uniapp-app/pages/order/createOrder.vue
  20. 2
      mallplusui-uniapp-app/pages/public/index.vue
  21. 1272
      mallplusui-uniapp-app/pages/public/login.vue
  22. 2
      mallplusui-uniapp-app/pages/public/loginCode.vue
  23. 2
      mallplusui-uniapp-app/pages/public/reg.vue
  24. 2
      mallplusui-uniapp-app/pages/set/set.vue
  25. 1655
      mallplusui-uniapp-app/pagesA/build/community.vue
  26. 808
      mallplusui-uniapp-app/pagesA/build/communityList.vue
  27. 12
      mallplusui-uniapp-app/pagesA/build/notice.vue
  28. 2
      mallplusui-uniapp-app/pagesA/product/giftList.vue
  29. 2
      mallplusui-uniapp-app/pagesA/product/groupActivityList.vue
  30. 2
      mallplusui-uniapp-app/pagesA/product/groupList.vue
  31. 2
      mallplusui-uniapp-app/pagesA/product/list.vue
  32. 2
      mallplusui-uniapp-app/pagesA/product/paiMaiList.vue
  33. 1
      mallplusui-uniapp-app/pagesA/product/product.vue
  34. 2
      mallplusui-uniapp-app/pagesA/product/tagGoodslist.vue
  35. 1242
      mallplusui-uniapp-app/pagesC/seller/index.vue
  36. 2
      mallplusui-uniapp-app/pagesC/seller/login.vue
  37. 2
      mallplusui-uniapp-app/pagesU/address/addressManage.vue
  38. BIN
      mallplusui-uniapp-app/static/logo.png
  39. BIN
      mallplusui-uniapp-app/static/temp/ad1.jpg
  40. BIN
      mallplusui-uniapp-app/static/temp/antFill-gift.png
  41. BIN
      mallplusui-uniapp-app/static/temp/antFill-home.png
  42. BIN
      mallplusui-uniapp-app/static/temp/fabfa-dropbox.png
  43. BIN
      mallplusui-uniapp-app/static/temp/fasfa-archive.png
  44. BIN
      mallplusui-uniapp-app/static/temp/fasfa-history.png
  45. BIN
      mallplusui-uniapp-app/static/temp/fasfa-shopping.png
  46. BIN
      mallplusui-uniapp-app/static/temp/fasfa-sitemap.png
  47. BIN
      mallplusui-uniapp-app/static/temp/fasfa-street.png
  48. BIN
      mallplusui-uniapp-app/static/temp/fasfa-truck.png
  49. BIN
      mallplusui-uniapp-app/static/temp/fasfausers.png
  50. 4
      mallplusui-web-admin/config/dev.env.js
  51. 21
      mallplusui-web-admin/src/views/build/community/components/CommunityDetail.vue

BIN
docs/2.11 汇融云链.zip

Binary file not shown.

31
docs/xiugai/20230211/20230211.txt

@ -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

@ -18,9 +18,11 @@ spring.redis.pool.min-idle=0
# \u8FDE\u63A5\u8D85\u65F6\u65F6\u95F4\uFF08\u6BEB\u79D2\uFF09
spring.redis.timeout=0
#===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.password=root
#spring.datasource.password=root
spring.datasource.password=1LAiGz$t1*Iw
spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
spring.datasource.type=com.alibaba.druid.pool.DruidDataSource
spring.datasource.druid.initialSize=5

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

@ -20,9 +20,7 @@ aliyun.oss.bucketName=yxt-sc
aliyun.oss.policy.expire=300
aliyun.oss.maxSize=10
#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=
#===OSS end===

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

@ -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 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

@ -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://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://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.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.username=root
#spring.datasource.password=123456

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

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

29
mallplusui-uniapp-app/common/api.js

@ -1,10 +1,10 @@
import store from '../store/index';
export default {
// qq 237524947 wx15d4269d3210863d
//BASEURI: 'http://localhost:8083/api/',
BASEURI: 'http://127.0.0.1:8083/api/',
ADMINURI: 'http://127.0.0.1:8085/',
ESURI: 'http://127.0.0.1:8081/',
BASEURI: 'http://mall.yyundong.com/portalapi/api/',
// BASEURI: 'http://www.yyundong.com:8083/api/',
ADMINURI: 'http://mall.yyundong.com/adminapi/',
ESURI: 'http://www.yyundong.com:8081/',
h5Appid: 'wxb4660f37187c0b8e', // h5微信登录的appId 暂时测试用
source: 1, //1 weixinApplet 2 h5Source 3 pcSource 4 android 5ios
es: {
@ -52,8 +52,8 @@ export default {
shopDetail: 'single/store/shopDetail', // 门店详情
storeClassList: 'single/store/storeClass/list', // 商户内部分类
storeCommentList: 'single/store/storeComment/list', // 商户评论
noticeList: 'single/home/notice/list',
noticeDetail: 'single/home/notice/detail',
noticeList: 'single/home/notice/list',
noticeDetail: 'single/home/notice/detail',
},
member: {
applyMember: 'single/user/applyMember', // 会员升级等级
@ -74,9 +74,9 @@ export default {
storeDetail1: 'single/store/detail1', // 商户详情 带用户
store: 'single/store/home', // 商户主页
storeList: 'single/store/store/list', // 商户列表
memberTagList: 'single/user/memberTag/list', // 商户列表
addStoreComment: 'single/store/addStoreComment', // 商户addStoreComment
memberBlanceLogList: 'single/user/memberBlanceLog/list',
memberTagList: 'single/user/memberTag/list', // 商户列表
addStoreComment: 'single/store/addStoreComment', // 商户addStoreComment
memberBlanceLogList: 'single/user/memberBlanceLog/list',
},
build: {
getBuildNoticeByPage: 'single/build/getBuildNoticeByPage', // 所有社区和房间
@ -93,7 +93,7 @@ export default {
},
goods: {
tagGoodsList: 'single/pms/tag/goods', // 查询标签商品
tagGoodsList: 'single/pms/tag/goods', // 查询标签商品
goodsPromoto: 'single/sms/detail', // 单个商品的优惠详情
secskillDetail: 'single/pms/secskill/detail', // 查询秒杀商品详情信息
groupGoodsDetail: 'single/pms/goodsGroup/detail', // 查询拼团商品详情信息
@ -258,6 +258,7 @@ export default {
let token = uni.getStorageSync('token') || '';
let fullurl = this.BASEURI + endpoint;
console.log("fullurl",fullurl);
var contentType = 'application/x-www-form-urlencoded';
data.authorization = token;
@ -272,11 +273,6 @@ export default {
// 'authorization1': Authorization || ''
},
});
console.log('fullurl,',fullurl)
console.log('data,',data)
console.log('token,',token)
console.log('error,',error)
console.log('res,',res)
if (load) {
uni.hideLoading();
}
@ -311,9 +307,10 @@ export default {
console.log(fullurl);
console.log(res.data.data);
if (res.data.code == 200) {
console.log("===>>>");
return res.data.data;
} else {
console.log(">>>>>=");
if (res.data) {
if (!res.data.msg) {
res.data.msg = res.data.data;

233
mallplusui-uniapp-app/components/coolc-coupon/coolc-coupon.vue

@ -1,93 +1,190 @@
<template>
<view class="coupon-item">
<view class="coupon-item">
<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="end_time">{{item.endTime | formatCreateTime}}前使用</view>
<view >
<view class="demand">{{ item.minPoint }} {{ item.amount }}</view>
<view>
<view class="demand">{{ item.minPoint }} {{ item.amount }}</view>
</view>
</view>
<view class="get-btn" v-if="!types" :style="{color:color, borderColor:color, background:solid}" @click="acceptCoupon(item)" >立即领取</view>
<navigator class="get-btn" v-if="types" :style="{color:color, borderColor:color, background:solid}" :url='item.url' @click="acceptCoupon(item)">立即使用</navigator>
</view>
<view class="get-btn" v-if="!types" :style="{color:color, borderColor:color, background:solid}"
@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>
</template>
<script>
import Api from '@/common/api';
import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue';
import { formatDate } from '@/common/date';
import Api from '@/common/api';
import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue';
import {
formatDate
} from '@/common/date';
export default {
components:{
export default {
components: {
},
data() {
return {
}
},
props:{
item:{
type: Object
},
types:{
type: String,
default: ''
data() {
return {
types: false
}
},
theme:{
type: String,
default: '#ff9000'
props: {
item: {
type: Object
},
theme: {
type: String,
default: '#ff9000'
},
solid: {
type: String,
default: '#ffffff'
},
color: {
type: String,
default: '#ff9000'
},
},
solid:{
type: String,
default: '#ffffff'
filters: {
formatCreateTime(time) {
let date = new Date(time);
return formatDate(date, 'yyyy-MM-dd hh:mm:ss')
},
},
color:{
type: String,
default: '#ff9000'
},
},
filters: {
formatCreateTime(time) {
let date = new Date(time);
return formatDate(date, 'yyyy-MM-dd hh:mm:ss')
},
},
methods: {
async acceptCoupon(item){
uni.showLoading({
title: '请稍后'
});
methods: {
async acceptCoupon(item) {
this.types =!this.types
uni.showLoading({
title: '请稍后'
});
let params = { couponId: item.id };
let data = await Api.apiCall('post', Api.index.acceptCoupon, params);
console.log(data);
if (data) {
this.$api.msg(data);
}
uni.hideLoading();
let params = {
couponId: item.id
};
let data = await Api.apiCall('post', Api.index.acceptCoupon, params);
console.log(data);
if (data) {
this.$api.msg(data);
}
uni.hideLoading();
},
},
async useCoupon(item){
uni.showLoading({
title: '请稍后'
});
}
}
}
}
</script>
<style lang='scss'>
.coupon-item {
width:100%; height:auto; display:table; border-radius:10upx; padding:0 20upx; margin-top:22upx; border:1px solid #eeeeee; position:relative;
.coupon-money {
width:465upx; height:auto; display:table; float:left; padding:26upx 0; border-style:none dotted none none; border-color:#eeeeee;
.coupon-item {
width: 100%;
height: auto;
display: table;
border-radius: 10upx;
padding: 0 20upx;
margin-top: 22upx;
border: 1px solid #eeeeee;
position: relative;
.coupon-money {
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;
}
.tit {
width: 100%;
height: 50upx;
line-height: 50upx;
font-size: $font-sm;
color: $font-color-999;
}
.nick { width:100%; height:50upx; line-height:30upx; font-size:$font-sm; 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; }
.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;
}
.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; }
.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>

71
mallplusui-uniapp-app/components/likes/likes.vue

@ -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

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

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

@ -5,13 +5,13 @@ if (process.env.NODE_ENV === 'development') {
// baseUrl = "http://localhost:7001/";
// socketUrl = "ws://localhost:8001/";
// baseUrl = "http://26077a35f5.wicp.vip:43609/";
baseUrl = "http://192.168.3.108:8083/";
socketUrl = "ws://192.168.3.108:8083/";
baseUrl = "http://www.yyundong.com:8083/";
socketUrl = "ws://8192.168.43.195:8083/";
} 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/";
socketUrl = "ws://192.168.3.108:8083/";
socketUrl = "ws://192.168.43.195:8083/";
}
const courtConfig = {
//微信公众号APPID

8
mallplusui-uniapp-app/manifest.json

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

99
mallplusui-uniapp-app/pages.json

@ -2,10 +2,11 @@
"pages": [{
"path": "pages/index/index",
"style": {
"enablePullDownRefresh": true,
// #ifdef MP
"navigationBarTitleText": "mallcloud商城",
"navigationBarTitleText": "汇融云链",
"navigationStyle": "custom",
"enablePullDownRefresh": true,
// #endif
"app-plus": {
"titleNView": {
@ -13,7 +14,7 @@
"searchInput": {
"backgroundColor": "rgba(231, 231, 231,.7)",
"borderRadius": "16px",
"placeholder": "请输入地址 如:大钟寺",
"placeholder": "请输入要查询的信息",
"disabled": true,
"placeholderColor": "#606266"
},
@ -59,7 +60,17 @@
}
}
}
}, {
}, {
"path": "pages/index/lease",
"style": {
"navigationBarTitleText": "农机租赁"
// "app-plus": {
// "titleNView": {
// "type": "transparent"
// }
// }
}
}, {
"path": "pages/order/orderDetail",
"style": {
"navigationBarTitleText": "详情展示",
@ -80,7 +91,7 @@
}
}
},
{
{
"path": "pages/set/set",
"style": {
"navigationBarTitleText": "设置"
@ -96,13 +107,13 @@
"path": "pages/index/nearbyBusiness",
"style": {
"navigationBarTitleText": "附近商家"
// #ifdef MP-WEIXIN
,
// #ifdef MP-WEIXIN
,
"navigationStyle": "custom"
// #endif
}
},
{
{
"path": "pages/cart/cart",
"style": {
"navigationBarTitleText": "购物车"
@ -178,12 +189,12 @@
"style": {
"navigationBarTitleText": "我的订单",
"enablePullDownRefresh": true,
"onReachBottomDistance":126 ,// px
"onReachBottomDistance": 126, // px
"app-plus": {
"bounce": "none"
}
}
},{
}, {
"path": "pages/order/createOrder",
"style": {
"navigationBarTitleText": "创建订单"
@ -209,7 +220,7 @@
"style": {
"navigationBarTitleText": "支付成功"
}
}, {
}, {
"path": "pages/category/category",
"style": {
"navigationBarTitleText": "分类",
@ -249,7 +260,7 @@
"style": {
"navigationBarTitleText": "支付结果"
}
}, {
}, {
"path": "pages/integral/home/home",
"style": {
"navigationBarTitleText": "我的积分"
@ -266,11 +277,9 @@
}
}
],
"subPackages": [
{
"subPackages": [{
"root": "pagesC",
"pages": [
{
"pages": [{
"path": "store/list",
"style": {
"enablePullDownRefresh": true,
@ -291,7 +300,7 @@
"navigationBarTitleText": "商户入驻"
}
}, {
}, {
"path": "store/businessDetails",
"style": {
"navigationBarTitleText": "店铺详情展示",
@ -345,12 +354,13 @@
{
"path": "seller/index",
"style": {
"navigationBarTitleText": "卖家中心",
"app-plus": {
"titleNView": {
"type": "transparent"
}
}
"navigationBarTitleText": "卖家中心"
// "navigationStyle": "custom"
// "app-plus": {
// "titleNView": {
// "type": "transparent"
// }
// }
}
},
{
@ -449,8 +459,7 @@
},
{
"root": "pagesA",
"pages": [
{
"pages": [{
"path": "product/categoryAttr",
"style": {
"navigationBarTitleText": "类型商品",
@ -475,12 +484,12 @@
{
"path": "product/tag",
"style": {
"navigationBarTitleText": "精选标签",
"app-plus": {
"titleNView": {
"type": "transparent"
}
}
"navigationBarTitleText": "精选标签"
// "app-plus": {
// "titleNView": {
// "type": "transparent"
// }
// }
}
},
{
@ -574,8 +583,8 @@
{
"path" : "build/repairOrder/repairOrder",
"style" : {
"path": "build/repairOrder/repairOrder",
"style": {
"navigationBarTitleText": "维修录单"
}
},
@ -597,7 +606,7 @@
}, {
"path": "build/communityList",
"style": {
"navigationBarTitleText": "社区列表"
"navigationBarTitleText": "农村社区列表"
}
},
{
@ -671,7 +680,7 @@
"navigationBarTitleText": "邀请好友佣金"
}
},{
}, {
"path": "user/balance",
"style": {
"navigationBarTitleText": "我的钱包"
@ -724,13 +733,13 @@
"bounce": "none"
}
}
},{
}, {
"path": "user/profile",
"style": {
"enablePullDownRefresh": true,
"navigationBarTitleText": "个人信息"
}
},{
}, {
"path": "user/applyMember",
"style": {
"navigationBarTitleText": "升级会员",
@ -740,12 +749,12 @@
}
}
}
},{
}, {
"path": "notice/notice",
"style": {
"navigationBarTitleText": "通知"
}
},{
}, {
"path": "notice/subjectList",
"style": {
"navigationBarTitleText": "秒杀列表",
@ -802,12 +811,12 @@
"selectedIconPath": "static/tab-cate-current.png",
"text": "分类"
},
{
"pagePath": "pages/index/nearbyBusiness",
"iconPath": "static/fujin.png",
"selectedIconPath": "static/fujin_.png",
"text": "附近商家"
},
{
"pagePath": "pages/index/nearbyBusiness",
"iconPath": "static/fujin.png",
"selectedIconPath": "static/fujin_.png",
"text": "附近商家"
},
{
"pagePath": "pages/cart/cart",
"iconPath": "static/tab-cart.png",

686
mallplusui-uniapp-app/pages/cart/cart.vue

@ -8,7 +8,8 @@
<image src="/static/emptyCart.jpg" mode="aspectFit"></image>
<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 v-else class="empty-tips">
空空如也
@ -21,21 +22,18 @@
<block v-for="(item, index) in cartList" :key="item.id">
<view class="cart-item" :class="{ 'b-b': index !== cartList.length - 1 }">
<view class="image-wrapper">
<image
:src="item.productPic"
class="loaded"
mode="aspectFill"
lazy-load
@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>
<image :src="item.productPic" class="loaded" mode="aspectFill" lazy-load
@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 class="item-right">
<text class="clamp title">{{ item.productName }}</text>
<text class="attr">{{ item.productAttr }}</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>
<text class="del-btn yticon icon-fork" @click="deleteCartItem(index)"></text>
</view>
@ -45,7 +43,8 @@
<!-- 底部菜单栏 -->
<view class="action-section">
<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>
<view class="total-box">
@ -60,360 +59,391 @@
</view>
</view>
<mallplusCopyright></mallplusCopyright>
</view>
</template>
<script>
import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue';
import Api from '@/common/api';
import { mapState } from 'vuex';
import uniNumberBox from '@/components/uni-number-box.vue';
import navBar from '@/components/zhouWei-navBar';
export default {
components: {
uniNumberBox,
navBar,
mallplusCopyright
},
data() {
return {
total: 0, //
allChecked: false, // true|false
empty: false, // true|false
promoteAmount: 0,
cartList: [],
statusBarHeight: ''
};
},
async onShow() {
if (this.hasLogin) {
this.loadData();
}
},
async onLoad() {
this.statusBarHeight = uni.getSystemInfoSync().statusBarHeight;
},
watch: {
//
cartList(e) {
let empty = e.length === 0 ? true : false;
if (this.empty !== empty) {
this.empty = empty;
}
}
},
computed: {
...mapState(['hasLogin', 'userInfo'])
},
methods: {
//
async loadData() {
let params = {};
let list = await Api.apiCall('get', Api.order.cartList, params);
// let list = await this.$api.json('cartList');
let cartList = list.cartItemList.map(item => {
item.checked = '1';
return item;
});
this.cartList = cartList;
this.promoteAmount = list.promoteAmount;
this.calcTotal(); //
},
//image
onImageLoad(key, index) {
this.$set(this[key][index], 'loaded', 'loaded');
import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue';
import Api from '@/common/api';
import {
mapState
} from 'vuex';
import uniNumberBox from '@/components/uni-number-box.vue';
import navBar from '@/components/zhouWei-navBar';
export default {
components: {
uniNumberBox,
navBar,
mallplusCopyright
},
//image
onImageError(key, index) {
this[key][index].image = '/static/errorImage.jpg';
},
navToLogin() {
uni.navigateTo({
url: '/pages/public/login'
});
data() {
return {
total: 0, //
allChecked: false, // true|false
empty: false, // true|false
promoteAmount: 0,
cartList: [],
statusBarHeight: ''
};
},
//
check(type, index) {
if (type === 'item') {
this.cartList[index].checked = !this.cartList[index].checked;
} else {
const checked = !this.allChecked;
const list = this.cartList;
list.forEach(item => {
item.checked = checked;
});
this.allChecked = checked;
async onShow() {
if (this.hasLogin) {
this.loadData();
}
this.calcTotal(type);
},
//
numberChange(data) {
this.cartList[data.index].quantity = data.number;
let params = { id: this.cartList[data.index].id, quantity: data.number };
data = Api.apiCall('get', Api.order.updateQuantity, params);
this.calcTotal();
async onLoad() {
this.statusBarHeight = uni.getSystemInfoSync().statusBarHeight;
},
//
deleteCartItem(index) {
var that = this;
uni.showModal({
title: '提示',
content: '确定将此商品移出购物车吗',
success: res => {
if(res.confirm){
let list = that.cartList;
let row = list[index];
let id = row.id;
let params = { cart_id_list: id };
Api.apiCall('post', Api.order.deleteCart, params);
that.cartList.splice(index, 1);
that.calcTotal();
uni.hideLoading();
}
},
});
},
//
clearCart() {
var that = this;
uni.showModal({
title: '提示',
content: '确定将购物车清空吗',
success: res => {
if(res.confirm){
let params = {};
Api.apiCall('post', Api.order.clearCart, params);
this.cartList = [];
}
watch: {
//
cartList(e) {
let empty = e.length === 0 ? true : false;
if (this.empty !== empty) {
this.empty = empty;
}
});
},
//
calcTotal() {
let list = this.cartList;
if (list.length === 0) {
this.empty = true;
return;
}
let total = 0;
let checked = true;
list.forEach(item => {
if (item.checked === true || item.checked === '1') {
total += item.price * item.quantity;
} else if (checked === true) {
checked = false;
}
});
total = total - this.promoteAmount;
this.allChecked = checked;
this.total = Number(total.toFixed(2));
},
//
createOrder() {
let list = this.cartList;
var ids = '';
list.forEach(item => {
if (item.checked === true || item.checked === '1') {
ids = item.id + ',' + ids;
computed: {
...mapState(['hasLogin', 'userInfo'])
},
methods: {
//
async loadData() {
let params = {};
let list = await Api.apiCall('get', Api.order.cartList, params);
// let list = await this.$api.json('cartList');
let cartList = list.cartItemList.map(item => {
item.checked = '1';
return item;
});
this.cartList = cartList;
this.promoteAmount = list.promoteAmount;
this.calcTotal(); //
},
//image
onImageLoad(key, index) {
this.$set(this[key][index], 'loaded', 'loaded');
},
//image
onImageError(key, index) {
this[key][index].image = '/static/errorImage.jpg';
},
navToLogin() {
uni.navigateTo({
url: '/pages/public/login'
});
},
//
check(type, index) {
if (type === 'item') {
this.cartList[index].checked = !this.cartList[index].checked;
} else {
const checked = !this.allChecked;
const list = this.cartList;
list.forEach(item => {
item.checked = checked;
});
this.allChecked = checked;
}
});
let cartIds = ids.substr(0, ids.length - 1);
let dataJson ={};
this.calcTotal(type);
},
//
numberChange(data) {
this.cartList[data.index].quantity = data.number;
let params = {
id: this.cartList[data.index].id,
quantity: data.number
};
data = Api.apiCall('get', Api.order.updateQuantity, params);
this.calcTotal();
},
//
deleteCartItem(index) {
var that = this;
uni.showModal({
title: '提示',
content: '确定将此商品移出购物车吗',
success: res => {
if (res.confirm) {
let list = that.cartList;
let row = list[index];
let id = row.id;
let params = {
cart_id_list: id
};
Api.apiCall('post', Api.order.deleteCart, params);
that.cartList.splice(index, 1);
that.calcTotal();
uni.hideLoading();
}
},
});
},
//
clearCart() {
var that = this;
uni.showModal({
title: '提示',
content: '确定将购物车清空吗',
success: res => {
if (res.confirm) {
let params = {};
Api.apiCall('post', Api.order.clearCart, params);
this.cartList = [];
}
}
});
},
//
calcTotal() {
let list = this.cartList;
if (list.length === 0) {
this.empty = true;
return;
}
let total = 0;
let checked = true;
list.forEach(item => {
if (item.checked === true || item.checked === '1') {
total += item.price * item.quantity;
} else if (checked === true) {
checked = false;
}
});
total = total - this.promoteAmount;
this.allChecked = checked;
this.total = Number(total.toFixed(2));
},
//
createOrder() {
let list = this.cartList;
var ids = '';
list.forEach(item => {
if (item.checked === true || item.checked === '1') {
ids = item.id + ',' + ids;
}
});
let cartIds = ids.substr(0, ids.length - 1);
let dataJson = {};
dataJson.type=2;
dataJson.cartIds=cartIds;
let url='/pages/order/createStoreOrder?dataJson=' + JSON.stringify(dataJson)
dataJson.type = 2;
dataJson.cartIds = cartIds;
let url = '/pages/order/createStoreOrder?dataJson=' + JSON.stringify(dataJson)
uni.navigateTo({
url: url
});
uni.navigateTo({
url: url
});
}
}
}
};
};
</script>
<style lang="scss">
.container {
padding-bottom: 134upx;
/* 空白页 */
.empty {
position: fixed;
left: 0;
top: 0;
width: 100%;
height: 100vh;
padding-bottom: 100upx;
display: flex;
justify-content: center;
flex-direction: column;
align-items: center;
background: #fff;
image {
width: 240upx;
height: 160upx;
margin-bottom: 30upx;
}
.empty-tips {
.container {
padding-bottom: 134upx;
/* 空白页 */
.empty {
position: fixed;
left: 0;
top: 0;
width: 100%;
height: 100vh;
padding-bottom: 100upx;
display: flex;
font-size: $font-sm + 2upx;
color: $font-color-disabled;
.navigator {
color: $uni-color-primary;
margin-left: 16upx;
justify-content: center;
flex-direction: column;
align-items: center;
background: #fff;
image {
width: 240upx;
height: 160upx;
margin-bottom: 30upx;
}
.empty-tips {
display: flex;
font-size: $font-sm + 2upx;
color: $font-color-disabled;
.navigator {
color: $uni-color-primary;
margin-left: 16upx;
}
}
}
}
}
/* 购物车列表项 */
.cart-item {
display: flex;
position: relative;
padding: 30upx 40upx;
.image-wrapper {
width: 230upx;
height: 230upx;
flex-shrink: 0;
position: relative;
image {
border-radius: 8upx;
}
}
.checkbox {
position: absolute;
left: -16upx;
top: -16upx;
z-index: 8;
font-size: 44upx;
line-height: 1;
padding: 4upx;
color: $font-color-disabled;
background: #fff;
border-radius: 50px;
}
.item-right {
/* 购物车列表项 */
.cart-item {
display: flex;
flex-direction: column;
flex: 1;
overflow: hidden;
position: relative;
padding-left: 30upx;
.title,
.price {
font-size: $font-base + 2upx;
color: $font-color-dark;
height: 40upx;
line-height: 40upx;
}
.attr {
font-size: $font-sm + 2upx;
color: $font-color-light;
height: 50upx;
line-height: 50upx;
padding: 30upx 40upx;
.image-wrapper {
width: 230upx;
height: 230upx;
flex-shrink: 0;
position: relative;
image {
border-radius: 8upx;
}
}
.price {
height: 50upx;
line-height: 50upx;
.checkbox {
position: absolute;
left: -16upx;
top: -16upx;
z-index: 8;
font-size: 44upx;
line-height: 1;
padding: 4upx;
color: $font-color-disabled;
background: #fff;
border-radius: 50px;
}
}
.del-btn {
padding: 4upx 10upx;
font-size: 34upx;
height: 50upx;
color: $font-color-light;
}
}
/* 底部栏 */
.action-section {
/* #ifdef H5 */
margin-bottom: 100upx;
/* #endif */
position: fixed;
left: 30upx;
bottom: 30upx;
z-index: 95;
display: flex;
align-items: center;
width: 690upx;
height: 100upx;
padding: 0 30upx;
background: rgba(255, 255, 255, 0.9);
box-shadow: 0 0 20upx 0 rgba(0, 0, 0, 0.5);
border-radius: 16upx;
.checkbox {
height: 52upx;
position: relative;
image {
width: 52upx;
height: 100%;
.item-right {
display: flex;
flex-direction: column;
flex: 1;
overflow: hidden;
position: relative;
z-index: 5;
padding-left: 30upx;
.title,
.price {
font-size: $font-base + 2upx;
color: $font-color-dark;
height: 40upx;
line-height: 40upx;
}
.attr {
font-size: $font-sm + 2upx;
color: $font-color-light;
height: 50upx;
line-height: 50upx;
}
.price {
height: 50upx;
line-height: 50upx;
}
}
}
.clear-btn {
position: absolute;
left: 26upx;
top: 0;
z-index: 4;
width: 0;
height: 52upx;
line-height: 52upx;
padding-left: 38upx;
font-size: $font-base;
color: #fff;
background: $font-color-disabled;
border-radius: 0 50px 50px 0;
opacity: 0;
transition: 0.2s;
&.show {
opacity: 1;
width: 120upx;
.del-btn {
padding: 4upx 10upx;
font-size: 34upx;
height: 50upx;
color: $font-color-light;
}
}
.total-box {
flex: 1;
/* 底部栏 */
.action-section {
/* #ifdef H5 */
margin-bottom: 100upx;
/* #endif */
position: fixed;
left: 30upx;
bottom: 30upx;
z-index: 95;
display: flex;
flex-direction: column;
text-align: right;
padding-right: 40upx;
.price {
font-size: $font-lg;
color: $font-color-dark;
align-items: center;
width: 690upx;
height: 100upx;
padding: 0 30upx;
background: rgba(255, 255, 255, 0.9);
box-shadow: 0 0 20upx 0 rgba(0, 0, 0, 0.5);
border-radius: 16upx;
.checkbox {
height: 52upx;
position: relative;
image {
width: 52upx;
height: 100%;
position: relative;
z-index: 5;
}
}
.coupon {
font-size: $font-sm;
color: $font-color-light;
text {
.clear-btn {
position: absolute;
left: 26upx;
top: 0;
z-index: 4;
width: 0;
height: 52upx;
line-height: 52upx;
padding-left: 38upx;
font-size: $font-base;
color: #fff;
background: $font-color-disabled;
border-radius: 0 50px 50px 0;
opacity: 0;
transition: 0.2s;
&.show {
opacity: 1;
width: 120upx;
}
}
.total-box {
flex: 1;
display: flex;
flex-direction: column;
text-align: right;
padding-right: 40upx;
.price {
font-size: $font-lg;
color: $font-color-dark;
}
.coupon {
font-size: $font-sm;
color: $font-color-light;
text {
color: $font-color-dark;
}
}
}
.confirm-btn {
padding: 0 38upx;
margin: 0;
border-radius: 100px;
height: 76upx;
line-height: 76upx;
font-size: $font-base + 2upx;
background: $uni-color-primary;
box-shadow: 1px 2px 5px rgba(217, 60, 93, 0.72);
}
}
.confirm-btn {
padding: 0 38upx;
margin: 0;
border-radius: 100px;
height: 76upx;
line-height: 76upx;
font-size: $font-base + 2upx;
background: $uni-color-primary;
box-shadow: 1px 2px 5px rgba(217, 60, 93, 0.72);
/* 复选框选中状态 */
.action-section .checkbox.checked,
.cart-item .checkbox.checked {
color: $uni-color-primary;
}
.getPosition {
height: 100upx;
display: flex;
justify-content: center;
align-items: center;
font-size: 32upx;
background-color: #fff;
}
}
/* 复选框选中状态 */
.action-section .checkbox.checked,
.cart-item .checkbox.checked {
color: $uni-color-primary;
}
.getPosition {
height: 100upx;
display: flex;
justify-content: center;
align-items: center;
font-size: 32upx;
background-color: #fff;
}
</style>

2118
mallplusui-uniapp-app/pages/index/index.vue

File diff suppressed because it is too large

269
mallplusui-uniapp-app/pages/index/lease.vue

@ -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

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

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

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

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

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

1272
mallplusui-uniapp-app/pages/public/login.vue

File diff suppressed because it is too large

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

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

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

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

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

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

1655
mallplusui-uniapp-app/pagesA/build/community.vue

File diff suppressed because it is too large

808
mallplusui-uniapp-app/pagesA/build/communityList.vue

@ -3,27 +3,32 @@
<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 === 2 }" @click="tabClick(2)">
<!-- <view class="nav-item" :class="{ current: filterIndex === 2 }" @click="tabClick(2)">
<text>楼房</text>
<view class="p-box">
<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>
</view>
</view>
</view> -->
<text class="cate-item yticon icon-fenlei1" @click="toggleCateMask('show')"></text>
</view>
<!-- 列表显示 -->
<view class="goods-list-vertical" >
<view v-for="(item, index) in goodsList" :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-vertical">
<view v-for="(item, index) in goodsList" :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-right-top">
<text class="">{{ item.name }}</text>
<text class="text1">{{ item.name }}</text>
<text class="text2">地址:卡就哦啊四到哦啊四到哦啊四到哦啊四到哦啊四到哦啊四到哦啊四到哦啊四到四的</text>
<text class="text2">电话:13623307393</text>
</view>
<view class="goods-right-bottom">
<!-- <view class="goods-right-bottom">
<text class="price">均价:{{ item.price }}</text>
<text class="sale" v-if="geohash">距离: {{item.distance.toFixed(4)}}</text>
</view>
</view> -->
</view>
</view>
</view>
@ -35,422 +40,475 @@
</template>
<script>
import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue';
import Api from '@/common/api';
import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
export default {
components: {
uniLoadMore
},
data() {
return {
cateMaskState: 0, //
headerPosition: 'fixed',
headerTop: '0px',
keyword: '',
loadingType: 'more', //
filterIndex: 0,
cateId: 0, //id
pageNum: 1,
cid: null,
geohash:'',
priceOrder: 0, //1 2
cateList: [],
goodsList: []
};
},
onLoad(options) {
// #ifdef H5
this.headerTop = document.getElementsByTagName('uni-page-head')[0].offsetHeight + 'px';
// #endif
this.keyword = options.keyword;
this.cateId = options.sid;
//this.loadCateList(options.fid, options.sid);
if(options.geohash){
this.geohash=options.geohash;
this.nearCommunity(options.geohash);
}else{
console.log(options.geohash)
this.loadData();
}
},
onPageScroll(e) {
//iOS
if (e.scrollTop >= 0) {
this.headerPosition = 'fixed';
} else {
this.headerPosition = 'absolute';
}
},
//
onPullDownRefresh() {
this.pageNum = this.pageNum + 1;
this.loadData('refresh');
},
//
onReachBottom() {
this.pageNum = this.pageNum + 1;
this.loadData();
},
methods: {
async nearCommunity(geohash) {
let params = params = { geohash: geohash, pageSize: 10,distance:240 };
let data = await Api.apiCall('get', Api.build.nearCommunityList, params);
if (data) {
this.goodsList = data || [];
}
import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue';
import Api from '@/common/api';
import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
export default {
components: {
uniLoadMore
},
data() {
return {
cateMaskState: 0, //
headerPosition: 'fixed',
headerTop: '0px',
keyword: '',
loadingType: 'more', //
filterIndex: 0,
cateId: 0, //id
pageNum: 1,
cid: null,
geohash: '',
priceOrder: 0, //1 2
cateList: [],
goodsList: []
};
},
//
async loadData(type = 'add', loading) {
//
if (type === 'add') {
if (this.loadingType === 'nomore') {
return;
}
this.loadingType = 'loading';
} else {
this.loadingType = 'more';
}
let params;
if (this.keyword) {
params = { pageNum: this.pageNum, keyword: this.keyword };
onLoad(options) {
// #ifdef H5
this.headerTop = document.getElementsByTagName('uni-page-head')[0].offsetHeight + 'px';
// #endif
this.keyword = options.keyword;
this.cateId = options.sid;
//this.loadCateList(options.fid, options.sid);
if (options.geohash) {
this.geohash = options.geohash;
this.nearCommunity(options.geohash);
} else {
params = { pageNum: this.pageNum };
console.log(options.geohash)
this.loadData();
}
let list = await Api.apiCall('get', Api.build.communityList, params);
let goodsList = list.records;
// let goodsList = await this.$api.json('goodsList');
if (type === 'refresh') {
this.goodsList = [];
}
//
if (this.filterIndex === 1) {
goodsList.sort((a, b) => b.sales - a.sales);
},
onPageScroll(e) {
//iOS
if (e.scrollTop >= 0) {
this.headerPosition = 'fixed';
} else {
this.headerPosition = 'absolute';
}
if (this.filterIndex === 2) {
goodsList.sort((a, b) => {
if (this.priceOrder == 1) {
return a.counts - b.counts;
},
//
onPullDownRefresh() {
this.pageNum = this.pageNum + 1;
this.loadData('refresh');
},
//
onReachBottom() {
this.pageNum = this.pageNum + 1;
this.loadData();
},
methods: {
async nearCommunity(geohash) {
let params = params = {
geohash: geohash,
pageSize: 10,
distance: 240
};
let data = await Api.apiCall('get', Api.build.nearCommunityList, params);
if (data) {
this.goodsList = data || [];
}
},
//
async loadData(type = 'add', loading) {
//
if (type === 'add') {
if (this.loadingType === 'nomore') {
return;
}
return b.counts - a.counts;
});
}
this.loadingType = 'loading';
} else {
this.loadingType = 'more';
}
let params;
this.goodsList = this.goodsList.concat(goodsList);
if (this.keyword) {
params = {
pageNum: this.pageNum,
keyword: this.keyword
};
} else {
params = {
pageNum: this.pageNum
};
}
let list = await Api.apiCall('get', Api.build.communityList, params);
let goodsList = list.records;
// let goodsList = await this.$api.json('goodsList');
if (type === 'refresh') {
this.goodsList = [];
}
//
if (this.filterIndex === 1) {
goodsList.sort((a, b) => b.sales - a.sales);
}
if (this.filterIndex === 2) {
goodsList.sort((a, b) => {
if (this.priceOrder == 1) {
return a.counts - b.counts;
}
return b.counts - a.counts;
});
}
//more nomore(20)
this.loadingType = this.goodsList.length > list.total ? 'nomore' : 'more';
if (type === 'refresh') {
if (loading == 1) {
uni.hideLoading();
this.goodsList = this.goodsList.concat(goodsList);
//more nomore(20)
this.loadingType = this.goodsList.length > list.total ? 'nomore' : 'more';
if (type === 'refresh') {
if (loading == 1) {
uni.hideLoading();
} else {
uni.stopPullDownRefresh();
}
}
},
//
tabClick(index) {
this.pageNum = 1;
if (this.filterIndex === index && index !== 2) {
return;
}
this.filterIndex = index;
if (index === 2) {
this.priceOrder = this.priceOrder === 1 ? 2 : 1;
} else {
uni.stopPullDownRefresh();
this.priceOrder = 0;
}
}
},
//
tabClick(index) {
this.pageNum = 1;
if (this.filterIndex === index && index !== 2) {
return;
}
this.filterIndex = index;
if (index === 2) {
this.priceOrder = this.priceOrder === 1 ? 2 : 1;
} else {
this.priceOrder = 0;
}
uni.pageScrollTo({
duration: 300,
scrollTop: 0
});
this.loadData('refresh', 1);
uni.pageScrollTo({
duration: 300,
scrollTop: 0
});
this.loadData('refresh', 1);
},
//
toggleCateMask(type) {
let timer = type === 'show' ? 10 : 300;
let state = type === 'show' ? 1 : 0;
this.cateMaskState = 2;
setTimeout(() => {
this.cateMaskState = state;
}, timer);
},
//
changeCate(item) {
console.log(item.id);
this.pageNum = 1;
this.cateId = item.id;
this.toggleCateMask();
uni.pageScrollTo({
duration: 300,
scrollTop: 0
});
this.loadData('refresh', 1);
},
//
toggleCateMask(type) {
console.log("type", type);
let timer = type === 'show' ? 10 : 300;
let state = type === 'show' ? 1 : 0;
this.cateMaskState = 2;
setTimeout(() => {
this.cateMaskState = state;
}, timer);
},
//
changeCate(item) {
console.log(item.id);
this.pageNum = 1;
this.cateId = item.id;
this.toggleCateMask();
uni.pageScrollTo({
duration: 300,
scrollTop: 0
});
this.loadData('refresh', 1);
},
//
navToDetailPage(item) {
//idtitle
let id = item.id;
uni.navigateTo({
url: `../../pagesA/build/community?communityId=${id}`
});
},
stopPrevent() {}
}
};
},
//
navToDetailPage(item) {
//idtitle
let id = item.id;
let name = item.name;
uni.navigateTo({
url: `../../pagesA/build/community?communityId=${id}&name=${name}`
});
},
stopPrevent() {}
}
};
</script>
<style lang="scss">
page,
.content {
background: $page-color-base;
}
.content {
padding-top: 96upx;
}
.navbar {
position: fixed;
left: 0;
top: var(--window-top);
display: flex;
width: 100%;
height: 80upx;
background: #fff;
box-shadow: 0 2upx 10upx rgba(0, 0, 0, 0.06);
z-index: 10;
.nav-item {
flex: 1;
display: flex;
justify-content: center;
align-items: center;
height: 100%;
font-size: 30upx;
color: $font-color-dark;
position: relative;
&.current {
color: $base-color;
&:after {
content: '';
position: absolute;
left: 50%;
bottom: 0;
transform: translateX(-50%);
width: 120upx;
height: 0;
border-bottom: 4upx solid $base-color;
}
}
page,
.content {
background: $page-color-base;
}
.p-box {
.content {
padding-top: 96upx;
}
.navbar {
position: fixed;
left: 0;
top: var(--window-top);
display: flex;
flex-direction: column;
.yticon {
width: 100%;
height: 70upx;
background: #fff;
box-shadow: 0 2upx 10upx rgba(0, 0, 0, 0.06);
z-index: 10;
padding-left: 20px;
.nav-item {
flex: 1;
display: flex;
align-items: center;
justify-content: center;
width: 30upx;
height: 14upx;
line-height: 1;
margin-left: 4upx;
font-size: 26upx;
color: #888;
&.active {
height: 100%;
font-size: 30upx;
color: $font-color-dark;
position: relative;
&.current {
color: $base-color;
&:after {
content: '';
position: absolute;
left: 9%;
bottom: 0;
transform: translateX(-50%);
width: 120upx;
height: 0;
border-bottom: 4upx solid $base-color;
}
}
}
.xia {
transform: scaleY(-1);
.p-box {
display: flex;
flex-direction: column;
.yticon {
display: flex;
align-items: center;
justify-content: center;
width: 30upx;
height: 14upx;
line-height: 1;
margin-left: 4upx;
font-size: 26upx;
color: #888;
&.active {
color: $base-color;
}
}
.xia {
transform: scaleY(-1);
}
}
}
.cate-item {
display: flex;
justify-content: center;
align-items: center;
height: 100%;
width: 80upx;
position: relative;
font-size: 44upx;
&:after {
content: '';
position: absolute;
left: 0;
top: 50%;
transform: translateY(-50%);
border-left: 1px solid #ddd;
width: 0;
height: 36upx;
.cate-item {
display: flex;
justify-content: center;
align-items: center;
height: 100%;
width: 80upx;
position: relative;
font-size: 44upx;
&:after {
content: '';
position: absolute;
left: 0;
top: 50%;
transform: translateY(-50%);
border-left: 1px solid #ddd;
width: 0;
height: 36upx;
}
}
}
}
/* 分类 */
.cate-mask {
position: fixed;
left: 0;
top: var(--window-top);
bottom: 0;
width: 100%;
background: rgba(0, 0, 0, 0);
z-index: 95;
transition: 0.3s;
.cate-content {
width: 630upx;
height: 100%;
background: #fff;
float: right;
transform: translateX(100%);
/* 分类 */
.cate-mask {
position: fixed;
left: 0;
top: var(--window-top);
bottom: 0;
width: 100%;
background: rgba(0, 0, 0, 0);
z-index: 95;
transition: 0.3s;
}
&.none {
display: none;
}
&.show {
background: rgba(0, 0, 0, 0.4);
.cate-content {
transform: translateX(0);
width: 630upx;
height: 100%;
background: #fff;
float: right;
transform: translateX(100%);
transition: 0.3s;
}
&.none {
display: none;
}
&.show {
background: rgba(0, 0, 0, 0.4);
.cate-content {
transform: translateX(0);
}
}
}
}
.cate-list {
display: flex;
flex-direction: column;
height: 100%;
.cate-item {
display: flex;
align-items: center;
height: 90upx;
padding-left: 30upx;
font-size: 28upx;
color: #555;
position: relative;
}
.two {
height: 64upx;
color: #303133;
font-size: 30upx;
background: #f8f8f8;
}
.active {
color: $base-color;
}
}
/* 商品列表 */
.goods-list {
display: flex;
flex-wrap: wrap;
padding: 20upx 20upx 0 20upx;
background: #fff;
.goods-item {
.cate-list {
display: flex;
flex-direction: column;
width: 48%;
padding-bottom: 40upx;
&:nth-child(2n + 1) {
margin-right: 4%;
height: 100%;
.cate-item {
display: flex;
align-items: center;
height: 90upx;
padding-left: 30upx;
font-size: 28upx;
color: #555;
position: relative;
}
}
.image-wrapper {
width: 100%;
height: 330upx;
border-radius: 3px;
overflow: hidden;
image {
width: 100%;
height: 100%;
opacity: 1;
.two {
height: 64upx;
color: #303133;
font-size: 30upx;
background: #f8f8f8;
}
}
.title {
font-size: $font-lg;
color: $font-color-dark;
line-height: 80upx;
}
.price-box {
display: flex;
align-items: center;
justify-content: space-between;
padding-right: 10upx;
font-size: 24upx;
color: $font-color-light;
}
.price {
font-size: $font-lg;
color: $uni-color-primary;
line-height: 1;
&:before {
content: '';
font-size: 26upx;
.active {
color: $base-color;
}
}
}
.goods-list-vertical {
display: flex;
flex-wrap: wrap;
padding: 0upx 20upx;
background: #fff;
.goods-item-vertical {
/* 商品列表 */
.goods-list {
display: flex;
flex-direction: row;
height: 280upx;
align-items: center;
justify-content: center;
border-bottom: 1upx solid #eeeeee;
.image-wrapper-vertical {
width: 240upx;
height: 240upx;
flex-wrap: wrap;
padding: 20upx 20upx 0 20upx;
background: #fff;
.goods-item {
display: flex;
align-items: center;
justify-content: center;
margin-right: 10upx;
flex-direction: column;
width: 48%;
padding-bottom: 40upx;
&:nth-child(2n + 1) {
margin-right: 4%;
}
}
.image-wrapper {
width: 100%;
height: 330upx;
border-radius: 3px;
overflow: hidden;
image {
width: 240upx;
height: 240upx;
width: 100%;
height: 100%;
opacity: 1;
}
}
.goods-list-right {
width: 470upx;
.goods-right-top {
height: 200upx;
text {
font-size: 32upx;
text-overflow: -o-ellipsis-lastline;
overflow: hidden;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-line-clamp: 2;
-webkit-box-orient: vertical;
}
.title {
font-size: $font-lg;
color: $font-color-dark;
line-height: 80upx;
}
.price-box {
display: flex;
align-items: center;
justify-content: space-between;
padding-right: 10upx;
font-size: 24upx;
color: $font-color-light;
}
.price {
font-size: $font-lg;
color: $uni-color-primary;
line-height: 1;
&:before {
content: '';
font-size: 26upx;
}
.goods-right-bottom {
}
}
.goods-list-vertical {
display: flex;
flex-wrap: wrap;
padding: 0upx 20upx;
background: #fff;
.goods-item-vertical {
display: flex;
flex-direction: row;
height: 200upx;
.image-wrapper-vertical {
width: 200upx;
display: flex;
align-items: center;
justify-content: space-between;
.price {
font-size: $font-lg;
color: $uni-color-primary;
line-height: 1;
&:before {
content: '';
font-size: 26upx;
justify-content: center;
margin-right: 10upx;
image {
width: 150upx;
height: 150upx;
}
}
.goods-list-right {
display: flex;
flex-direction: column;
width: 470upx;
.goods-right-top {
.text1 {
margin-top: 10px;
font-size: 32upx;
text-overflow: -o-ellipsis-lastline;
overflow: hidden;
text-overflow: ellipsis;
display: -webkit-box;
-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;
}
}
.sale {
color: $font-color-light;
font-size: 28upx;
.goods-right-bottom {
display: flex;
align-items: center;
justify-content: space-between;
.price {
font-size: $font-lg;
color: $uni-color-primary;
line-height: 1;
&:before {
content: '';
font-size: 26upx;
}
}
.sale {
color: $font-color-light;
font-size: 28upx;
}
}
}
}
}
}
</style>

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

@ -23,11 +23,19 @@ export default {
return {
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() {
this.loadData();
// this.loadData();
},
onPageScroll(e) {
//iOS

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

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

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

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

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

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

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

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

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

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

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

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

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

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

1242
mallplusui-uniapp-app/pagesC/seller/index.vue

File diff suppressed because it is too large

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

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

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

@ -7,7 +7,7 @@
</view>
<view class="row b-b">
<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 class="row b-b">

BIN
mallplusui-uniapp-app/static/logo.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 66 KiB

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

Binary file not shown.

Before

Width:  |  Height:  |  Size: 33 KiB

After

Width:  |  Height:  |  Size: 19 KiB

BIN
mallplusui-uniapp-app/static/temp/antFill-gift.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 640 B

BIN
mallplusui-uniapp-app/static/temp/antFill-home.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 449 B

BIN
mallplusui-uniapp-app/static/temp/fabfa-dropbox.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 885 B

BIN
mallplusui-uniapp-app/static/temp/fasfa-archive.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 329 B

BIN
mallplusui-uniapp-app/static/temp/fasfa-history.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
mallplusui-uniapp-app/static/temp/fasfa-shopping.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 976 B

BIN
mallplusui-uniapp-app/static/temp/fasfa-sitemap.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 539 B

BIN
mallplusui-uniapp-app/static/temp/fasfa-street.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 905 B

BIN
mallplusui-uniapp-app/static/temp/fasfa-truck.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 812 B

BIN
mallplusui-uniapp-app/static/temp/fasfausers.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

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

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

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

@ -8,8 +8,8 @@
<el-form-item label="小区栋数:" prop="counts">
<el-input v-model="community.counts"></el-input>
</el-form-item>
<el-form-item label="小区地址:" prop="address">
<el-input v-model="community.address"></el-input>
<el-form-item label="小区地址:" prop="details">
<el-input v-model="community.details"></el-input>
</el-form-item>
<el-form-item label="地标:" prop="nearbyLandmarks">
@ -19,6 +19,9 @@
<el-form-item label="电话:" prop="phone">
<el-input v-model="community.phone"></el-input>
</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">
<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>'}]">
</bm-copyright>
<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>-->
</baidu-map>
@ -60,6 +63,7 @@
import BmCityList from 'vue-baidu-map/components/controls/CityList';
import BmCopyright from 'vue-baidu-map/components/controls/Copyright';
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 SingleUpload from '@/components/Upload/singleUpload'
import {formatDate} from '@/utils/date';
@ -68,7 +72,7 @@
};
export default {
name: 'CommunityDetail',
components:{SingleUpload,BaiduMap,BmLocalSearch,BmCityList,BmView,BmCopyright},
components:{SingleUpload,BaiduMap,BmLocalSearch,BmCityList,BmView,BmCopyright,BmMarker},
props: {
isEdit: {
type: Boolean,
@ -108,6 +112,15 @@
if (this.isEdit) {
getCommunity(this.$route.query.id).then(response => {
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{
this.community = Object.assign({},defaultCommunity);

Loading…
Cancel
Save