feat: 合并分支

This commit is contained in:
mayubo@gmail.com 2025-06-30 18:04:30 +08:00
commit adae1a52e4
28 changed files with 2162 additions and 559 deletions

View File

@ -1,25 +1,24 @@
<template>
<view>
<u-popup
:show="show"
closeOnClickOverlay
round="20rpx"
@close="onClose"
>
<u-popup :show="show" closeOnClickOverlay round="20rpx" @close="onClose">
<view>
<view class="popup_title">
<view class="popup_label" @click="onClose">取消</view>
<view class="popup_label color_blue" @click="onOk">确认</view>
</view>
<picker-view indicator-style="height: 50px;" style="width: 100%; height: 400rpx;" :value="value" @change="bindChange">
<picker-view indicator-style="height: 50px;" style="width: 100%; height: 400rpx;" :value="id"
@change="bindChange">
<picker-view-column>
<view v-for="(item, index) in provList" :key="index" style="line-height: 50px; text-align: center;">{{item.name}}</view>
<view v-for="(item, index) in provList" :key="index"
style="line-height: 50px; text-align: center;">{{ item.short_name }}</view>
</picker-view-column>
<picker-view-column>
<view v-for="(item, index) in defaultCity" :key="index" style="line-height: 50px; text-align: center;">{{item.name}}</view>
<view v-for="(item, index) in defaultCity" :key="index"
style="line-height: 50px; text-align: center;">{{ item.short_name }}</view>
</picker-view-column>
<picker-view-column>
<view v-for="(item, index) in defaultDist" :key="index" style="line-height: 50px; text-align: center;">{{item.business_name}}</view>
<view v-for="(item, index) in defaultDist" :key="index"
style="line-height: 50px; text-align: center;">{{ item.short_name }}</view>
</picker-view-column>
</picker-view>
@ -53,28 +52,55 @@
defaultDist: [], // /
confirmProv: {}, //
confirmProv1: {},
confirmCity: {}, //
confirmDist: {}, // /
sf: true,
xsq: {},
value2: '',
}
},
methods: {
//
async getProvList() {
const res = await request(apiArr.city, 'POST', {}, { silent: false });
return res;
const res = await request(apiArr.getArea, 'POST', {}, { silent: false });
this.provList = res.rows;
this.confirmProv1 = res.rows[0]
//
this.getCityList();
},
//
async getCityList () {
const res = await request(apiArr.area, 'POST', {}, { silent: false });
return res;
async getCityList(sq, x) {
console.log('11swq', sq);
if (!this.sf) {
console.log('省份没变,查市跟区', this.cityList)
let newDist = this.cityList[sq];
console.log('新的市信息', newDist);
if (this.xsq.ad_code !== newDist.ad_code) {
console.log('新市区跟旧市区不一直')
this.xsq = newDist;
this.getDistList(newDist, x);
}
return
}
const res = await request(apiArr.getArea, 'POST', { parent_ad_code: this.confirmProv1.ad_code }, { silent: false });
this.cityList = res.rows;
let newDist;
this.defaultCity = res.rows;
this.confirmCity = res.rows[0]; //
this.getDistList(newDist, x);
},
// /
async getDistList () {
const res = await request(apiArr.business, 'POST', {}, { silent: false });
return res;
async getDistList(xsq, x) {
const res = await request(apiArr.getArea, 'POST', { parent_ad_code: xsq ? xsq.ad_code : this.confirmCity.ad_code }, { silent: false });
this.distList = res.rows;
this.defaultDist = res.rows;
this.confirmDist = res.rows[0] //
},
async init() {
@ -83,54 +109,8 @@
mask: true
});
try {
const proviceList = uni.getStorageSync('proviceList');
const cityList = uni.getStorageSync('cityList');
const businessList = uni.getStorageSync('businessList');
let provRes, cityRes, distRes;
//
if (proviceList || cityList || businessList) {
provRes = {
rows: proviceList
};
cityRes = {
rows: cityList
};
distRes = {
rows: businessList
};
} else {
[provRes, cityRes, distRes] = await Promise.all([
this.getProvList(),
this.getCityList(),
this.getDistList(),
])
//
uni.setStorageSync('proviceList',provRes.rows)
uni.setStorageSync('cityList',cityRes.rows)
uni.setStorageSync('businessList',distRes.rows)
}
this.getProvList()
uni.hideLoading();
//
let defaultCity = cityRes.rows.filter((item) => {
return item.city_id === provRes.rows[0].city_id
});
let defaultDist = distRes.rows.filter((item) => {
return item.area_id === cityRes.rows[0].area_id
});
this.provList = provRes?.rows; //
this.cityList = cityRes?.rows; //
this.distList = distRes?.rows; //
this.defaultCity = defaultCity; //
this.defaultDist = defaultDist; // /
this.confirmProv = provRes.rows[0];
this.confirmCity = defaultCity[0];
this.confirmDist = defaultDist[0];
} catch (error) {
uni.hideLoading();
console.log('获取省市区信息异常', error);
@ -141,19 +121,21 @@
bindChange(e) {
console.log('[1231331], e', e);
const { value } = e.detail;
const {provList, cityList, distList} = this;
// // /
let newCrty = this.provList[value[0]];
console.log('新的省份信息', newCrty);
console.log('旧的省信息', this.confirmProv1);
if (newCrty.ad_code === this.confirmProv1.ad_code) {
console.log('省份信息没变');
this.sf = false;
} else {
this.sf = true;
}
// /
let newCrty = cityList.filter((item) => item.city_id === provList[value[0]].city_id);
let newDist = distList.filter((item) => item.area_id === newCrty[value[1]].area_id);
this.defaultCity = newCrty;
this.defaultDist = newDist;
//
this.confirmProv = provList[value[0]];
this.confirmCity = newCrty[value[1]];
this.confirmDist = newDist[value[2]];
console.log('this.cityListthis.cityList', this.cityList);
this.confirmProv1 = newCrty
this.getCityList(value[1], value[2])
},
//
@ -167,6 +149,8 @@
this.$emit('selectArea', { confirmProv, confirmCity, confirmDist });
},
},
mounted() {

View File

@ -3,7 +3,6 @@
"sass-loader": "^16.0.5"
},
"dependencies": {
"pinyin-pro": "^3.26.0",
"sass": "^1.89.2",
"uview-ui": "^2.0.38"
}

View File

@ -1,25 +1,42 @@
.main {
margin: 50rpx 80rpx 69rpx;
page {
background-color: #fff;
display: flex;
flex-direction: column;
}
.line {
height: 20rpx;
width: 100%;
background-color: #f6f7fb;
}
.main{
margin: 0 80rpx;
padding-top: 26rpx;
}
.table {
height: 150rpx;
display: flex;
justify-content: center;
flex-direction: column;
border-bottom: 1px solid #ebebeb;
box-sizing: border-box;
margin-bottom: 50rpx;
padding-bottom: 8rpx;
}
.label {
font-weight: bold;
font-size: 32rpx;
color: #000000;
margin-bottom: 20rpx;
}
.tip {
margin-top: 20rpx;
font-weight: bold;
font-size: 26rpx;
color: #999999;
}
.btn {
margin: 0 75rpx 0;
height: 90rpx;
@ -30,15 +47,19 @@
font-size: 36rpx;
color: #ffffff;
text-align: center;
margin-top: 280rpx;
}
.popup_container {
margin: 0 55rpx;
}
.popup_title {
margin-top: 53rpx;
font-size: 26rpx;
color: #222222;
}
.popup_community_name {
margin: 10rpx 0 14rpx;
text-align: center;
@ -46,16 +67,19 @@
font-size: 30rpx;
color: #ff370b;
}
.popup_desc {
font-weight: bold;
font-size: 26rpx;
color: #222222;
margin-bottom: 40rpx;
}
.popup_btn_List {
display: flex;
justify-content: space-around;
}
.popup_btn {
width: 170rpx;
height: 52rpx;
@ -64,6 +88,12 @@
background: #d9d9d9;
border-radius: 100rpx 100rpx 100rpx 100rpx;
}
.popup_btn1 {
background: #ff370b;
}
.flexBox{
display: flex;
align-items: center;
justify-content: space-between;
}

View File

@ -1,38 +1,39 @@
<template>
<view class="container">
<div class="line"></div>
<view class="main">
<view class="table">
<view class="label">小区名称</view>
<input type="text" placeholder="请输入小区名称" :value='name' data-name="name" @input="headerInputClick">
<view class="label">房产</view>
<view class="flexBox" @click="choseCommunity">
<input type="text" disabled placeholder="请选择房产">
<u-icon name="arrow-right"></u-icon>
</view>
</view>
<view class="table">
<view class="label">物业公司</view>
<input type="text" placeholder="请输入物业公司全称" :value='managementName' data-name="managementName" @input="headerInputClick">
<view class="label">姓名</view>
<input type="text" placeholder="请输入姓名">
</view>
<view class="table">
<view class="label">小区地址</view>
<input type="text" placeholder="请输入小区地址" :value='addr' data-name="addr" @input="headerInputClick">
<view class="label">手机</view>
<input type="text" placeholder="请输入手机号">
</view>
<view class="table">
<view class="label">物业服务电话</view>
<input type="number" placeholder="请输入物业服务电话" :maxlength=11 :value='managementMobile' data-name="managementMobile" @input="headerInputClick">
<view class="label">身份</view>
<view class="flexBox" @click="chooseIdentity">
<input type="number" disabled placeholder="请选择身份">
<u-icon name="arrow-right"></u-icon>
</view>
<view class="tip">
注意:新建的小区平台会与物业进行核实核实后自动建立如核实未通过将会创建失败!
</view>
<!-- <view class="tip">
注意业主为在物业登记在册的人员需经过物业审 核确认后即可成为该房产的业主如需帮助可与物 业或平台联系
</view> -->
</view>
<view class="btn" @click="headerSubmitClick">确定</view>
<u-popup :show="show" @close="close" mode="center" customStyle="width: 500rpx;" round="20rpx">
<view class="popup_container">
<view class="popup_title">您是要创建</view>
<view class="popup_community_name">{{ name }}</view>
<view class="popup_desc">新建的小区平台会与物业进行核实核实后自动建立如核实未通过将会创建失败!</view>
<view class="popup_btn_List">
<view class="popup_btn" @click="headerCloseClick">取消</view>
<view class="popup_btn popup_btn1" @click="headerPopupSubmitClick">确定</view>
</view>
</view>
<u-popup :show="show" @close="close" mode="bottom" customStyle="width: 500rpx;" round="20rpx">
<u-picker :show="show" :columns="columns" keyName="label" @cancel="close" @confirm="confirm"></u-picker>
</u-popup>
</view>
</template>
@ -43,17 +44,37 @@ import { apiArr } from '../../../api/community';
export default {
data() {
return {
name: '',
managementName: '',
addr: '',
managementMobile: '',
show: false,
columns: [[
{
label: "业主",
value: "1"
},
{
label: "家属",
value: "2"
},
{
label: "租客",
value: "3"
},
{
label: "访客",
value: "4"
},]
]
}
},
methods: {
headerPopupSubmitClick () {
console.log('提交');
close(){
this.show = false
},
chooseIdentity(){
this.show = true
},
confirm() {
this.show = false
},
headerCloseClick() {
this.show = false;
@ -65,51 +86,11 @@ export default {
this[name] = value;
},
headerSubmitClick() {
if(!this.name) {
uni.showToast({
title: '请输入小区名称',
icon: 'none'
})
return;
}
if(!this.managementName) {
uni.showToast({
title: '请输入物业公司',
icon: 'none'
})
return;
}
if(!this.addr) {
uni.showToast({
title: '请输入小区地址',
icon: 'none'
})
return;
}
if(!this.managementMobile) {
uni.showToast({
title: '请输入物业联系电话',
icon: 'none'
})
return;
}
if(this.managementMobile.length !== 11) {
uni.showToast({
title: '请输入正确的11位电话号码',
icon: 'none'
})
return;
}
if(!isPhone(this.managementMobile)) {
uni.showToast({
title: '请输入正确的手机号',
icon: 'none'
})
return;
}
this.show = true;
}
choseCommunity(){
NavgateTo("/packages/community/choseCommunity/index")
},
},
onLoad(options) {

View File

@ -0,0 +1,288 @@
page {
background-color: #f6f7fb;
}
image {
width: 100%;
height: 100%;
}
.container {}
.currentAdd {
display: flex;
align-items: center;
justify-content: space-between;
padding: 26rpx 20rpx;
box-sizing: border-box;
background-color: #fff;
}
.currentAdd_left {
font-size: 34rpx;
color: #222222;
font-weight: 700;
}
.currentAdd_right {
font-size: 30rpx;
color: #FF370B;
display: flex;
align-items: center;
}
.currentAdd_right image {
width: 30rpx;
height: 27rpx;
margin-left: 10rpx;
}
.search {
display: flex;
align-items: center;
justify-content: space-between;
width: 710rpx;
height: 70rpx;
background: #FFFFFF;
border-radius: 100rpx 100rpx 100rpx 100rpx;
padding: 16rpx 30rpx;
box-sizing: border-box;
margin: 0 auto;
margin-top: 20rpx;
}
.search image {
width: 30rpx;
height: 30rpx;
}
.communityList {
background-color: #fff;
margin-top: 20rpx;
}
.communityItem {
display: flex;
align-items: center;
justify-content: space-between;
padding: 30rpx 20rpx;
border-bottom: 1rpx solid #EBEBEB;
;
}
.communityItem_tit {
font-size: 30rpx;
color: #222222;
}
.communityItem_address {
font-size: 26rpx;
color: #999999;
margin-top: 10rpx;
}
.communityItem_right image {
width: 16rpx;
height: 30rpx;
}
/* 最后一个communityItem */
.communityItem:last-child {
border-bottom: none;
}
.empty {
display: flex;
align-items: center;
justify-content: center;
flex-direction: column;
background-color: #fff;
padding-bottom: 200rpx;
margin-top: 20rpx;
padding-top: 111rpx;
}
.empty image {
width: 340rpx;
height: 225.59rpx;
}
.empty span {
margin-top: -40rpx;
font-size: 26rpx;
color: #999999;
}
.floorList {
background-color: #fff;
margin-top: 20rpx;
display: flex;
align-items: center;
flex-wrap: wrap;
padding: 30rpx 20rpx;
}
.roomList {
background-color: #fff;
margin-top: 20rpx;
display: flex;
align-items: center;
flex-wrap: wrap;
padding: 30rpx 20rpx;
}
.floorItem {
font-size: 28rpx;
color: #222222;
border-radius: 10rpx 10rpx 10rpx 10rpx;
border: 1rpx solid #222222;
margin-right: 46rpx;
margin-bottom: 30rpx;
width: 200rpx;
height: 60rpx;
white-space: nowrap;
display: flex;
align-items: center;
justify-content: center;
}
.floorItem:nth-child(3n) {
margin-right: 0;
}
.active {
border: 1rpx solid #FF370B;
background: #FFF5F5;
position: relative;
}
.active::after {
content: '';
width: 24rpx;
height: 30rpx;
position: absolute;
right: 0;
bottom: 0;
background: url(http://192.168.0.172:5500/com_activeIcon.png) no-repeat;
background-size: 100% 100%;
}
.roomItem {
width: 120rpx;
height: 60rpx;
border-radius: 10rpx 10rpx 10rpx 10rpx;
color: #222222;
border: 1rpx solid #222222;
font-size: 28rpx;
display: flex;
align-items: center;
justify-content: center;
margin-right: 50rpx;
margin-bottom: 30rpx;
white-space: nowrap;
}
.roomItem:nth-child(4n) {
margin-right: 0;
}
.active2 {
border: 1rpx solid #FF370B;
background: #FFF5F5;
position: relative;
}
.active2::after {
content: '';
width: 24rpx;
height: 30rpx;
position: absolute;
right: 0;
bottom: 0;
background: url(http://192.168.0.172:5500/com_activeIcon.png) no-repeat;
background-size: 100% 100%;
}
.dialogBox {
background: rgba(0, 0, 0, 0.16);
position: fixed;
left: 0;
right: 0;
bottom: 0;
top: 0;
display: flex;
align-items: center;
justify-content: center;
}
.dialogBoxCon {
width: 600rpx;
height: 374rpx;
background: #FFFFFF;
border-radius: 20rpx 20rpx 20rpx 20rpx;
box-sizing: border-box;
padding-top: 40rpx;
margin-top: -200rpx;
}
.dialogBoxCon1 {
font-size: 30rpx;
color: #222222;
font-weight: 600;
text-align: center;
}
.dialogBoxCon2 {
font-size: 36rpx;
color: #FF370B;
font-weight: 600;
margin-top: 28rpx;
text-align: center;
}
.dialogBoxCon3 {
font-size: 32rpx;
color: #FF370B;
text-align: center;
}
.dialogBoxConBtnList {
display: flex;
align-items: center;
justify-content: center;
margin-top: 55rpx;
}
.dialogBoxConBtnItem1 {
width: 230rpx;
height: 70rpx;
background: #D9D9D9;
border-radius: 100rpx 100rpx 100rpx 100rpx;
font-size: 36rpx;
color: #222222;
display: flex;
align-items: center;
justify-content: center;
}
.dialogBoxConBtnItem2 {
font-size: 36rpx;
color: #FFFFFF;
width: 230rpx;
height: 70rpx;
background: #FF370B;
border-radius: 100rpx 100rpx 100rpx 100rpx;
margin-left: 50rpx;
display: flex;
align-items: center;
justify-content: center;
}

View File

@ -0,0 +1,132 @@
<template>
<div class="container">
<div class="currentAdd">
<div class="currentAdd_left">河北省衡水市桃城区</div>
<div class="currentAdd_right" @click="changeAddress">
切换城市
<image src="http://192.168.0.172:5500/com_choseAddress.png"></image>
</div>
</div>
<div class="communityBox" v-if="step == 1">
<div class="search">
<input type="text" placeholder="请输入小区名称">
<image src="http://192.168.0.172:5500/com_communitySearchIcon.png"></image>
</div>
<div class="communityList">
<div class="communityItem" v-for="item in 3">
<div class="communityItem_left">
<div class="communityItem_tit">世纪名城东区</div>
<div class="communityItem_address">河北省衡水市中心街120号</div>
</div>
<div class="communityItem_right">
<image src="http://192.168.0.172:5500/com_communityMore.png"></image>
</div>
</div>
</div>
<div class="empty" v-if="false">
<image src="http://192.168.0.172:5500/com_noSearch.png"></image>
<span>未找到康家美园相关信息的小区</span>
</div>
</div>
<div class="communityBox" v-if="step == 2">
<div class="search">
<input type="text" placeholder="请输入楼栋">
<image src="http://192.168.0.172:5500/com_communitySearchIcon.png"></image>
</div>
<div class="floorList">
<div class="floorItem" v-for="(item,index) in 4" :class="index == 1?'active':''">
1号楼2单元
</div>
</div>
<div class="empty" v-if="false">
<image src="http://192.168.0.172:5500/com_noSearch.png"></image>
<span>未找到康家美园相关信息的小区</span>
</div>
</div>
<div class="communityBox" v-if="step == 3">
<div class="search">
<input type="text" placeholder="请输入楼层">
<image src="http://192.168.0.172:5500/com_communitySearchIcon.png"></image>
</div>
<div class="roomList">
<div class="roomItem" v-for="(item,index) in 5" :class="index == 1?'active2':''">
{{ index + 1 }}
</div>
</div>
<div class="empty" v-if="false">
<image src="http://192.168.0.172:5500/com_noSearch.png"></image>
<span>未找到康家美园相关信息的小区</span>
</div>
</div>
<areaPopup :show="show" @selectArea="selectArea" @close="close"></areaPopup>
<div class="dialogBox" v-if="false">
<div class="dialogBoxCon">
<div class="dialogBoxCon1">确认选择</div>
<div class="dialogBoxCon2">世纪名城</div>
<div class="dialogBoxCon3">1栋1单元101室</div>
<div class="dialogBoxConBtnList">
<div class="dialogBoxConBtnItem1">取消</div>
<div class="dialogBoxConBtnItem2">确定</div>
</div>
</div>
</div>
</div>
</template>
<script>
import { apiArr } from '../../../api/community';
import {
request,
picUrl,
uniqueByField,
menuButtonInfo,
NavgateTo
} from '../../../utils';
export default {
data() {
return {
show: false,
step:"3"
}
},
methods: {
changeAddress() {
this.show = true
},
close() {
this.show = false
},
selectArea(e1) {
console.log(e1);
this.show = false
},
},
onLoad(options) {
const meun = menuButtonInfo();
},
onReachBottom() {
},
}
</script>
<style>
@import url("./index.css");
</style>

View File

@ -186,7 +186,7 @@ export default {
},
addCommunity(){
NavgateTo("/packages/community/myCommunity/index")
},
// getCommunityList() {

View File

@ -0,0 +1,98 @@
page {
background-color: #f6f7fb;
padding: 0;
}
.container {
min-height: 100vh;
}
image {
width: 100%;
height: 100%;
}
.empty {
font-size: 28rpx;
color: #999999;
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
margin-top: 180rpx;
}
.empty image {
width: 340rpx;
height: 240rpx;
}
.addBtn {
width: 600rpx;
height: 90rpx;
background: linear-gradient(91deg, #FF7658 0%, #FF370B 100%);
border-radius: 100rpx 100rpx 100rpx 100rpx;
font-size: 36rpx;
color: #FFFFFF;
display: flex;
align-items: center;
justify-content: center;
position: fixed;
left: 50%;
transform: translateX(-50%);
bottom: 100rpx;
}
.communityList {
padding: 0 20rpx;
background-color: #fff;
margin-top: 20rpx;
}
.communityItem {
display: flex;
align-items: center;
justify-content: space-between;
border-bottom: 1rpx solid #EBEBEB;
padding: 30rpx 0;
}
.communityItem_left{
display: flex;
align-items: center;
}
.communityItem_left_img {
width: 160rpx;
height: 140rpx;
border-radius: 20rpx;
overflow: hidden;
margin-right: 30rpx;
}
.communityItem_left_msg{
flex: 1;
}
.communityItem_left_msg_tit {
font-size: 30rpx;
color: #222222;
}
.communityItem_left_msg_tit span {
color: #FF370B;
}
.communityItem_left_msg_msg {
font-size: 26rpx;
color: #999999;
}
.communityItem_right{
width: 34rpx;
height: 34rpx;
margin-left: 80rpx;
}
/* 最后一个 communityItem */
.communityItem:last-child {
border-bottom: none;
}

View File

@ -0,0 +1,57 @@
<template>
<view class="container">
<view class="empty" v-if="false">
<image src="http://192.168.0.172:5500/com_newEmpty.png" alt="" />
没有添加任何房产
</view>
<div class="communityList">
<div class="communityItem" v-for="item in 3">
<div class="communityItem_left">
<div class="communityItem_left_img">
<image src="http://192.168.0.172:5500/test.png"></image>
</div>
<div class="communityItem_left_msg">
<div class="communityItem_left_msg_tit">世纪名城东区<span>5</span></div>
<div class="communityItem_left_msg_msg">河北省 石家庄市 桥西区 塔谈国际 108km</div>
</div>
</div>
<div class="communityItem_right">
<image src="http://192.168.0.172:5500/com_check1.png"></image>
</div>
</div>
</div>
<div class="addBtn" @click="addCommunity">添加我的房产</div>
</view>
</template>
<script>
import { request, NavgateTo, isPhone } from '../../../utils';
import { apiArr } from '../../../api/community';
export default {
data() {
return {
}
},
methods: {
addCommunity(){
NavgateTo("/packages/community/addCommunity/index")
},
},
onLoad(options) {
},
onReachBottom() {
},
}
</script>
<style>
@import url("./index.css");
</style>

View File

@ -39,10 +39,11 @@
}
}
],
"subPackages": [{
"subPackages": [
{
"root": "kitchen",
"pages": [{
"pages": [
{
"path": "index/index",
"style": {
"navigationBarTitleText": "厨房介绍",
@ -65,7 +66,8 @@
},
{
"root": "packages/publicServer",
"pages": [{
"pages": [
{
"path": "index/index",
"style": {
"navigationBarTitleText": "便民服务",
@ -73,11 +75,13 @@
"nav-footer": "/components/nav/nav"
}
}
}]
}
]
},
{
"root": "packages/workOrderDashboard",
"pages": [{
"pages": [
{
"path": "index/index",
"style": {
"navigationStyle": "custom",
@ -96,7 +100,8 @@
},
{
"root": "reservation",
"pages": [{
"pages": [
{
"path": "index/index",
"style": {
"navigationBarTitleText": "活动列表",
@ -127,7 +132,8 @@
},
{
"root": "packages/community",
"pages": [{
"pages": [
{
"path": "index/index",
"style": {
"navigationStyle": "custom",
@ -136,6 +142,30 @@
}
}
},
{
"path": "myCommunity/index",
"style": {
"navigationBarTitleText": "我的房产",
"navigationBarBackgroundColor": "#FFF"
}
},
{
"path": "choseCommunity/index",
"style": {
"navigationBarTitleText": "选择小区",
"navigationBarBackgroundColor": "#FFF",
"usingComponents":{
"areaPopup":"/components/areaPopup/areaPopup"
}
}
},
{
"path": "addCommunity/index",
"style": {
"navigationBarTitleText": "添加房产",
"navigationBarBackgroundColor": "#FFF"
}
},
{
"path": "communityDetail/index",
"style": {
@ -170,12 +200,6 @@
"navigationBarTitleText": "我的车辆"
}
},
{
"path": "addCommunity/index",
"style": {
"navigationBarTitleText": "新建小区"
}
},
{
"path": "oneRepair/index",
"style": {
@ -244,7 +268,8 @@
},
{
"root": "shopWrite",
"pages": [{
"pages": [
{
"path": "index/index",
"style": {
"navigationBarTitleText": "订单核销"
@ -260,7 +285,8 @@
},
{
"root": "packages/user",
"pages": [{
"pages": [
{
"path": "index/index",
"style": {
"navigationBarTitleText": "个人设置",
@ -346,7 +372,8 @@
},
{
"root": "packages/communityService",
"pages": [{
"pages": [
{
"path": "index/index",
"style": {
"navigationBarTitleText": "社区服务",
@ -379,7 +406,8 @@
},
{
"root": "packages/health",
"pages": [{
"pages": [
{
"path": "index/index",
"style": {
"navigationBarTitleText": "智慧康养"
@ -413,7 +441,8 @@
},
{
"root": "packages/aroundShop",
"pages": [{
"pages": [
{
"path": "index/index",
"style": {
"navigationBarTitleText": "周边商家"
@ -423,7 +452,8 @@
},
{
"root": "packages/shopEnter",
"pages": [{
"pages": [
{
"path": "index/index",
"style": {
"navigationBarTitleText": "商家入驻",
@ -441,7 +471,8 @@
},
{
"root": "packages/localLife",
"pages": [{
"pages": [
{
"path": "index/index",
"style": {
"navigationBarTitleText": "本地生活",
@ -524,7 +555,6 @@
]
}
],
"globalStyle": {
"navigationBarTextStyle": "black",
"navigationBarTitleText": "uni-app",

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -41,12 +41,14 @@
"root": "packages/community",
"pages": [
"index/index",
"myCommunity/index",
"choseCommunity/index",
"addCommunity/index",
"communityDetail/index",
"notice/index",
"noticeDesc/index",
"applyOwer/index",
"mycar/index",
"addCommunity/index",
"oneRepair/index",
"repairList/index",
"repairDetail/index",

File diff suppressed because it is too large Load Diff

View File

@ -101,10 +101,17 @@ var components
try {
components = {
uGrid: function () {
<<<<<<< HEAD
return Promise.all(/*! import() | uni_modules/uview-ui/components/u-grid/u-grid */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uview-ui/components/u-grid/u-grid")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uview-ui/components/u-grid/u-grid.vue */ 704))
},
uGridItem: function () {
return Promise.all(/*! import() | uni_modules/uview-ui/components/u-grid-item/u-grid-item */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uview-ui/components/u-grid-item/u-grid-item")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uview-ui/components/u-grid-item/u-grid-item.vue */ 712))
=======
return Promise.all(/*! import() | uni_modules/uview-ui/components/u-grid/u-grid */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uview-ui/components/u-grid/u-grid")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uview-ui/components/u-grid/u-grid.vue */ 721))
},
uGridItem: function () {
return Promise.all(/*! import() | uni_modules/uview-ui/components/u-grid-item/u-grid-item */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uview-ui/components/u-grid-item/u-grid-item")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uview-ui/components/u-grid-item/u-grid-item.vue */ 729))
>>>>>>> c89b8a20bb93a1e1255359a32b748400f92d4b41
},
}
} catch (e) {
@ -256,7 +263,11 @@ var _area = __webpack_require__(/*! ../../api/area.js */ 170);
//
var nav = function nav() {
__webpack_require__.e(/*! require.ensure | components/nav/nav */ "components/nav/nav").then((function () {
<<<<<<< HEAD
return resolve(__webpack_require__(/*! ../../components/nav/nav */ 720));
=======
return resolve(__webpack_require__(/*! ../../components/nav/nav */ 737));
>>>>>>> c89b8a20bb93a1e1255359a32b748400f92d4b41
}).bind(null, __webpack_require__)).catch(__webpack_require__.oe);
};
//1.导入组件

View File

@ -8,6 +8,7 @@
"miniprogram": {
"list": [
{
<<<<<<< HEAD
"name": "省市区联动",
"pathName": "packages/communityService/reservationApply/index",
"query": "",
@ -31,6 +32,10 @@
{
"name": "pages/shopcity/shopcity",
"pathName": "pages/shopcity/shopcity",
=======
"name": "packages/community/choseCommunity/index",
"pathName": "packages/community/choseCommunity/index",
>>>>>>> c89b8a20bb93a1e1255359a32b748400f92d4b41
"query": "",
"launchMode": "default",
"scene": null

View File

@ -101,13 +101,13 @@ var components
try {
components = {
uEmpty: function () {
return Promise.all(/*! import() | uni_modules/uview-ui/components/u-empty/u-empty */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uview-ui/components/u-empty/u-empty")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uview-ui/components/u-empty/u-empty.vue */ 779))
return Promise.all(/*! import() | uni_modules/uview-ui/components/u-empty/u-empty */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uview-ui/components/u-empty/u-empty")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uview-ui/components/u-empty/u-empty.vue */ 795))
},
dropdown: function () {
return __webpack_require__.e(/*! import() | components/dropdown/dropdown */ "components/dropdown/dropdown").then(__webpack_require__.bind(null, /*! @/components/dropdown/dropdown.vue */ 787))
return __webpack_require__.e(/*! import() | components/dropdown/dropdown */ "components/dropdown/dropdown").then(__webpack_require__.bind(null, /*! @/components/dropdown/dropdown.vue */ 803))
},
uPopup: function () {
return Promise.all(/*! import() | uni_modules/uview-ui/components/u-popup/u-popup */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uview-ui/components/u-popup/u-popup")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uview-ui/components/u-popup/u-popup.vue */ 745))
return Promise.all(/*! import() | uni_modules/uview-ui/components/u-popup/u-popup */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uview-ui/components/u-popup/u-popup")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uview-ui/components/u-popup/u-popup.vue */ 761))
},
}
} catch (e) {

View File

@ -162,11 +162,6 @@ picomatch@^2.3.1:
resolved "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz"
integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==
pinyin-pro@^3.26.0:
version "3.26.0"
resolved "https://registry.yarnpkg.com/pinyin-pro/-/pinyin-pro-3.26.0.tgz#9e3b8a9f848263b81552d56e9319f520f7709ad6"
integrity sha512-HcBZZb0pvm0/JkPhZHWA5Hqp2cWHXrrW/WrV+OtaYYM+kf35ffvZppIUuGmyuQ7gDr1JDJKMkbEE+GN0wfMoGg==
readdirp@^4.0.1:
version "4.1.2"
resolved "https://registry.npmjs.org/readdirp/-/readdirp-4.1.2.tgz"