diff --git a/api/config.js b/api/config.js
new file mode 100755
index 0000000..4ff046a
--- /dev/null
+++ b/api/config.js
@@ -0,0 +1,39 @@
+module.exports = {
+ // 系统名称
+ name: "爱尚家",
+ // 应用ID
+ appId: 10100,
+ // 租户ID
+ tenantId: 10058,
+ // 应用秘钥
+ appSecret: '1f1d186d98ea4620ac65afbf34940051',
+
+ // 开发环境
+ // apiUrl: "http://127.0.0.1:9095/api",
+ // socketUrl: 'ws://localhost:9190',
+ // fileUrl: 'https://file.wsdns.cn',
+ // apiUrl: "http://47.119.165.234:5483/api",
+
+
+ // 测试环境
+ // apiUrl: 'https://server.gxwebsoft.com/api',
+ // socketUrl: 'wss://server.gxwebsoft.com',
+ fileUrl: 'https://file.wsdns.cn',
+
+ // 生产环境
+ serverUrl: 'https://server.gxwebsoft.com/api',
+ apiUrl: 'https://cms-api.websoft.top/api',
+ socketUrl: 'wss://server.gxwebsoft.com',
+
+ // fileUrl: 'https://oss.jimeigroup.cn',
+
+ // 游客 userId
+ userId: 3373,
+ // 用户ID前缀
+ userIdPrefix: 6675,
+ // AccessKeyID
+ accessKey: 'AI4TyZKCjOUwfq2qtZ',
+ // AccessSecret
+ accessSecret: 'rITq2UmCZ3FVEfMBbzVQoqlfjedFREwh'
+
+}
diff --git a/api/dict.js b/api/dict.js
index 49d7000..e5fdbeb 100644
--- a/api/dict.js
+++ b/api/dict.js
@@ -1,9 +1,12 @@
import http from './index.js';
+import {
+ serverUrl
+} from '@/config.js';
// 读取字典数据
-export const getDictionaryOptions = (params) => http.get('/system/dict-data', {params})
+export const getDictionaryOptions = (params) => http.get(serverUrl + '/system/dict-data', {params})
-export const listDictionary = (params) => http.get('/system/dict/tree', {params})
+export const listDictionary = (params) => http.get(serverUrl + '/system/dict/tree', {params})
export default {
diff --git a/api/house-info.js b/api/house-info.js
index 7448f8d..ff7ec00 100644
--- a/api/house-info.js
+++ b/api/house-info.js
@@ -1,31 +1,31 @@
import http from './index.js';
// 分页查询房源信息
-export const pageHouseInfo = (params) => http.get('/house/info/page', {params})
+export const pageHouseInfo = (params) => http.get('/house/house-info/page', {params})
// 查询全部房源信息
-export const listHouseInfo = (params) => http.get('/house/info', {params})
+export const listHouseInfo = (params) => http.get('/house/house-info', {params})
// 查询房源信息(当期登录用户)
-export const getHouseInfo = (userId) => http.get('/house/info/' + userId)
+export const getHouseInfo = (userId) => http.get('/house/house-info/' + userId)
// 查询会员资料
-export const getUserDetail = (userId) => http.get('/house/info/detail/' + userId)
+export const getUserDetail = (userId) => http.get('/house/house-info/detail/' + userId)
// 新增房源信息
-export const addHouseInfo = (data) => http.post('/house/info', data)
+export const addHouseInfo = (data) => http.post('/house/house-info', data)
// 编辑房源信息
-export const updateHouseInfo = (data) => http.put('/house/info', data)
+export const updateHouseInfo = (data) => http.put('/house/house-info', data)
// 删除房源信息
-export const removeHouseInfo = (id) => http.delete('/house/info/' + id)
+export const removeHouseInfo = (id) => http.delete('/house/house-info/' + id)
// 收藏房源
-export const likeHouse = (data) => http.post('/house/like-log', data)
-export const getLikeHouseList = () => http.get('/house/like-log')
-export const getViewsHouseList = () => http.get('/house/views-log')
+export const likeHouse = (data) => http.post('/house/house-like-log', data)
+export const getLikeHouseList = () => http.get('/house/house-like-log')
+export const getViewsHouseList = () => http.get('/house/house-views-log')
export default {
pageHouseInfo,
diff --git a/api/house-reservation.js b/api/house-reservation.js
index 5a409d3..0396bd7 100644
--- a/api/house-reservation.js
+++ b/api/house-reservation.js
@@ -1,19 +1,19 @@
import http from './index.js';
// 分页查询房源信息
-export const pageHouseReservation = (params) => http.get('/house/reservation/page', {params})
+export const pageHouseReservation = (params) => http.get('/house/house-reservation/page', {params})
// 查询全部房源信息
-export const listHouseReservation = (params) => http.get('/house/reservation', {params})
+export const listHouseReservation = (params) => http.get('/house/house-reservation', {params})
// 查询房源信息(当期登录用户)
-export const getHouseReservation = (userId) => http.get('/house/reservation/' + userId)
+export const getHouseReservation = (userId) => http.get('/house/house-reservation/' + userId)
// 新增房源信息
-export const addHouseReservation = (data) => http.post('/house/reservation', data)
+export const addHouseReservation = (data) => http.post('/house/house-reservation', data)
// 删除房源信息
-export const removeHouseReservation = (id) => http.get('/house/reservation/remove/' + id)
+export const removeHouseReservation = (id) => http.get('/house/house-reservation/remove/' + id)
export default {
pageHouseReservation,
diff --git a/api/login.js b/api/login.js
index 1a6839d..6f2d9a0 100644
--- a/api/login.js
+++ b/api/login.js
@@ -1,5 +1,6 @@
import http from './index.js';
import {
+ serverUrl,
apiUrl,
fileUrl,
accessKey,
@@ -37,18 +38,18 @@ export const getCaptcha = (params) => http.get('/captcha', {
})
// 发送短信验证码
-export const sendSmsCaptcha = (params) => http.post('/open/sendSmsCaptcha', {
+export const sendSmsCaptcha = (params) => http.post(serverUrl + '/open/sendSmsCaptcha', {
params
})
// 获取微信openId
-export const getWxOpenId = (data) => http.post('/wx-login/getWxOpenId', data)
+export const getWxOpenId = (data) => http.post(serverUrl + '/wx-login/getWxOpenId', data)
// 支付宝授权码换取userId
export const getAuthCode = (data) => http.post('/open/login-alipay/getAuthCode', data)
// 微信手机号码登录
-export const loginMpWxMobile = (data) => http.post('/wx-login/loginByMpWxPhone', data)
+export const loginMpWxMobile = (data) => http.post(serverUrl + '/wx-login/loginByMpWxPhone', data)
// 获取支付宝手机号码
export const getPhoneNumber = (data, config) => http.post('/shop/payment/getPhoneNumber', data, config)
diff --git a/api/redis-util.js b/api/redis-util.js
index ddf6d6a..79a5afe 100644
--- a/api/redis-util.js
+++ b/api/redis-util.js
@@ -1,5 +1,7 @@
import http from './index.js';
-
+import {
+ serverUrl
+} from '@/config.js';
/**
* 缓存工具包
* @author 科技小王子
@@ -7,9 +9,9 @@ import http from './index.js';
*/
// 获取配置信息
-export const getConfig = () => http.get('/system/cache/config')
+export const getConfig = () => http.get(serverUrl + '/system/cache/config')
// 添加关注
-export const addFocus = (data) => http.post('/shop/user-follow', data)
+export const addFocus = (data) => http.post(serverUrl + '/shop/user-follow', data)
export default {
getConfig,
diff --git a/api/user-referee.js b/api/user-referee.js
index 81537bb..873f935 100644
--- a/api/user-referee.js
+++ b/api/user-referee.js
@@ -1,16 +1,16 @@
import http from './index.js';
// 分页查询推荐关系
-export const pageUserReferee = (params) => http.get('/shop/user-referee/page', {params})
+export const pageUserReferee = (params) => http.get('/shop/shop-user-referee/page', {params})
// 查询全部推荐关系
-export const listUserReferee = (params) => http.get('/shop/user-referee', {params})
+export const listUserReferee = (params) => http.get('/shop/shop-user-referee', {params})
// 修改推荐关系
-export const addUserReferee = (data) => http.post('/shop/user-referee', data)
+export const addUserReferee = (data) => http.post('/shop/shop-user-referee', data)
// 删除推荐关系
-export const removeUserReferee = (id) => http.delete('/shop/user-referee/' + id)
+export const removeUserReferee = (id) => http.delete('/shop/shop-user-referee/' + id)
export default {
pageUserReferee,
diff --git a/api/user.js b/api/user.js
index e340f4c..3df1649 100644
--- a/api/user.js
+++ b/api/user.js
@@ -1,7 +1,7 @@
import http from './index.js';
// 获取用户资料
-export const getUser = (params) => http.get('/auth/user', {params})
+export const getUser = (params) => http.get('https://server.gxwebsoft.com/api/auth/user', {params})
// 修改用户资料
export const updateUser = (data) => http.put('/system/user', data)
diff --git a/config.js b/config.js
index 12d5ecf..4ff046a 100755
--- a/config.js
+++ b/config.js
@@ -12,14 +12,17 @@ module.exports = {
// apiUrl: "http://127.0.0.1:9095/api",
// socketUrl: 'ws://localhost:9190',
// fileUrl: 'https://file.wsdns.cn',
+ // apiUrl: "http://47.119.165.234:5483/api",
+
// 测试环境
// apiUrl: 'https://server.gxwebsoft.com/api',
// socketUrl: 'wss://server.gxwebsoft.com',
- fileUrl: 'https://file.wsdns.com',
+ fileUrl: 'https://file.wsdns.cn',
// 生产环境
- apiUrl: 'https://open.gxwebsoft.com/api',
+ serverUrl: 'https://server.gxwebsoft.com/api',
+ apiUrl: 'https://cms-api.websoft.top/api',
socketUrl: 'wss://server.gxwebsoft.com',
// fileUrl: 'https://oss.jimeigroup.cn',
@@ -33,4 +36,4 @@ module.exports = {
// AccessSecret
accessSecret: 'rITq2UmCZ3FVEfMBbzVQoqlfjedFREwh'
-}
\ No newline at end of file
+}
diff --git a/manifest.json b/manifest.json
index 3176646..32a2dbe 100755
--- a/manifest.json
+++ b/manifest.json
@@ -126,7 +126,7 @@
"mode" : "hash",
"base" : "/love/"
},
- "title" : "爱尚客网"
+ "title" : "爱尚家"
}
}
/* ios打包配置 *//* SDK配置 */
diff --git a/pages.json b/pages.json
index 3bba06a..6c07240 100755
--- a/pages.json
+++ b/pages.json
@@ -117,7 +117,7 @@
{
"path": "pages/login/index",
"style": {
- "navigationBarTitleText": "爱尚客"
+ "navigationBarTitleText": "爱尚家"
}
},
{
@@ -173,7 +173,7 @@
"rpxCalcIncludeWidth": 9999, // rpx 计算特殊处理的值，始终按实际的设备宽度计算，单位 rpx，默认值为 750
// #endif
"navigationBarBackgroundColor": "#ffffff",
- "navigationBarTitleText": "爱尚客",
+ "navigationBarTitleText": "爱尚家",
"navigationBarTextStyle": "black",
"backgroundTextStyle": "dark"
},
diff --git a/pages/checkout/checkout.vue b/pages/checkout/checkout.vue
index 700d7b9..7b3398b 100644
--- a/pages/checkout/checkout.vue
+++ b/pages/checkout/checkout.vue
@@ -49,7 +49,7 @@
- 购买代表同意爱尚客网
+ 购买代表同意爱尚家网
《人工牵线协议》
diff --git a/pages/flash/index.vue b/pages/flash/index.vue
index 42a2278..0d297da 100644
--- a/pages/flash/index.vue
+++ b/pages/flash/index.vue
@@ -76,14 +76,15 @@
},
// 1. 未登录则使用免密登录方式登录(游客身份)
onLogin() {
- const token = storage.get(ACCESS_TOKEN)
- if (!token) {
- getToken().then(res => {
- uni.reLaunch({
- url: '/pages/index/index'
- })
- })
- }
+ uni.reLaunch({
+ url: '/pages/index/index'
+ })
+ // const token = storage.get(ACCESS_TOKEN)
+ // if (!token) {
+ // getToken().then(res => {
+
+ // })
+ // }
}
}
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 9b0ccc4..ec38212 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -134,8 +134,8 @@
canReset: false,
disabled: false,
swiperList: [
- 'https://file.wsdns.cn/20230802/1116a02b07904991b2ebdc2c3da4a691.png',
- 'https://file.wsdns.cn/20230802/f33f5ac239c843438b36f40941d946ef.png',
+ 'https://oss.wsdns.cn/20240708/9e1f58e7fc7b4bad92edd852ff34dbcb.png?x-oss-process=image/resize,w_750/quality,Q_90',
+ 'https://oss.wsdns.cn/20240708/c95838b78b5746eb934daffb12a2efdc.png?x-oss-process=image/resize,w_750/quality,Q_90',
],
hotKeywords: [
'五象航洋城',
diff --git a/pages/user/user.vue b/pages/user/user.vue
index ccbf50f..7c31160 100644
--- a/pages/user/user.vue
+++ b/pages/user/user.vue
@@ -181,7 +181,7 @@
@click="$push('pages/checkout/checkout',{priceId,planId,comments,price})">
- 购买即同意爱尚客网《人工牵线协议》
+ 购买即同意爱尚家网《人工牵线协议》
@@ -214,7 +214,7 @@
@click="$push('pages/checkout/checkout',{priceId,planId,comments,price})">
- 购买即同意爱尚客网《人工牵线协议》
+ 购买即同意爱尚家网《服务协议》
diff --git a/sub_pages/checkout/checkout copy.vue b/sub_pages/checkout/checkout copy.vue
index 4f7fb36..9bfeb7e 100644
--- a/sub_pages/checkout/checkout copy.vue
+++ b/sub_pages/checkout/checkout copy.vue
@@ -59,7 +59,7 @@
- 购买代表同意爱尚客网
+ 购买代表同意爱尚家网
《婚介协议》
diff --git a/sub_pages/dealer/grade/grade.vue b/sub_pages/dealer/grade/grade.vue
index d02be13..830f001 100644
--- a/sub_pages/dealer/grade/grade.vue
+++ b/sub_pages/dealer/grade/grade.vue
@@ -32,7 +32,7 @@
- 购买代表同意爱尚客网
+ 购买代表同意爱尚家网
《品牌合作协议》
diff --git a/sub_pages/dealer/poster/poster.vue b/sub_pages/dealer/poster/poster.vue
index a4400f6..8a4d6a1 100644
--- a/sub_pages/dealer/poster/poster.vue
+++ b/sub_pages/dealer/poster/poster.vue
@@ -98,7 +98,7 @@
console.log(res.target)
}
return {
- title: '爱尚客',
+ title: '爱尚家',
path: 'pages/index/index?user_id=' + uni.getStorageSync('userId')
}
},
@@ -179,7 +179,7 @@
scene: "WXSceneSession",
type: 5,
imageUrl: "https://file.wsdns.cn/qrcode/M4WhwQv2.png",
- title: '爱尚客',
+ title: '爱尚家',
miniProgram: {
id: 'gh_39f1f8019c3f',
path: 'pages/index/index',
diff --git a/sub_pages/house/add.vue b/sub_pages/house/add.vue
index e10f0fb..123f7e4 100644
--- a/sub_pages/house/add.vue
+++ b/sub_pages/house/add.vue
@@ -72,7 +72,7 @@
-
+
@@ -114,7 +114,7 @@
-
+
@@ -173,9 +173,17 @@
房源视频
-
+
+
+ X
+
+
+
+
+
+ 上传视频
@@ -192,6 +200,18 @@
+
+
+ 管理员备注
+
+
+
+
+
+
+
+
{
+ this.$toast('删除成功')
+ })
+ },
confirmRegion(e) {
diff --git a/sub_pages/house/detail.vue b/sub_pages/house/detail.vue
index e09ddd7..63e1c6b 100644
--- a/sub_pages/house/detail.vue
+++ b/sub_pages/house/detail.vue
@@ -4,22 +4,24 @@
-
{{ currentNum + 1 }}/{{ swiperList.length }}
-
+
- 图片
- 视频
+
+ 图片
+
+ 视频
-
+
@@ -29,9 +31,9 @@
-
-
-
+
+
+
@@ -69,7 +71,7 @@
区/县：{{ form.region || '' }}
- 详细地址：{{ form.address || '' }}
+ 物业地址：{{ form.address || '' }}
租金(元/m²)：{{ form.rent || '' }}
@@ -78,10 +80,10 @@
房号：{{ form.roomNumber || '' }}
- 密码：{{ form.password || '' }}
+ 如何看房：{{ form.password || '' }}
- 业主电话：{{ form.phone || '' }}
- 物业费：{{ form.propertyFees || '' }}
+ 业主电话：{{ form.phone || '' }}
+ 物业费(元/m²)：{{ form.propertyFees || '' }}
佣金：{{ form.commission || '' }}
@@ -153,7 +155,8 @@
收藏
-
+
@@ -319,25 +322,25 @@
onLoad(options) {
this.houseId = options.houseId
this.getHouseInfo()
-
- if(options.user_id) {
+
+ if (options.user_id) {
getAgentUser(options.user_id).then(res => {
this.agentUser = res.data
})
- }else {
+ } else {
DictApi.getDictionaryOptions({
dictCode: 'service'
}).then(res => {
this.phone = res.data[0].dictDataCode
})
}
- getUser().then(res=>{
- this.isManager = res.data.gradeId == 16
- }).catch((err)=>{
+ getUser().then(res => {
+ this.isManager = res.data.gradeId == 16
+ }).catch((err) => {
console.log(err);
})
-
-
+
+
},
onShow() {},
onBackPress() {},
@@ -370,15 +373,15 @@
app.swiperList = app.form.files
app.form.houseLabel = JSON.parse(res.data.houseLabel) || []
// app.form.supporting = JSON.parse(res.data.supporting) || []
-
- try{
+
+ try {
app.form.supporting = JSON.parse(app.form.supporting)
- console.log('app.form.supporting: ',app.form.supporting);
- }catch(e){
+ console.log('app.form.supporting: ', app.form.supporting);
+ } catch (e) {
console.log(e);
//TODO handle the exception
}
-
+
uni.$u.mpShare = {
title: `${app.form.houseTitle} ${app.form.monthlyRent}元/月 ${app.form.houseType} ${app.form.extent}m²`,
path: `sub_pages/house/detail?houseId=${app.form.houseId}&user_id=${uni.getStorageSync('userId')}`
@@ -393,7 +396,7 @@
HouseInfoApi.likeHouse({
houseId: this.form.houseId,
houseUserId: this.form.userId
- }).then(res=>{
+ }).then(res => {
app.form.liked = res.data
})
},
@@ -402,13 +405,36 @@
uni.makePhoneCall({
phoneNumber: this.agentUser.phone
})
- }else if(this.phone) {
+ } else if (this.phone) {
uni.makePhoneCall({
phoneNumber: this.phone
})
}
-
-
+
+
+ },
+ makePhoneCall() {
+ if (!this.form.phone) {
+ uni.showToast({
+ title: '暂无电话号码',
+ icon: 'none'
+ })
+ return
+ }
+
+ uni.makePhoneCall({
+ phoneNumber: this.form.phone,
+ success: () => {
+ console.log('拨打电话成功')
+ },
+ fail: (err) => {
+ console.log('拨打电话失败', err)
+ uni.showToast({
+ title: '拨打电话失败',
+ icon: 'none'
+ })
+ }
+ })
}
},
watch: {
@@ -478,6 +504,7 @@
.label {
margin: 10rpx 0;
display: flex;
+
.u-page__tag-item {
margin-bottom: 10rpx;
margin-right: 10rpx;
@@ -651,17 +678,20 @@
.demo-layout {
color: #ff0000;
}
- .video-box{
+
+ .video-box {
width: 750rpx;
height: 500rpx;
text-align: center;
+
.swiper-video {
width: 100%;
height: 100%;
- margin: auto;
+ margin: auto;
}
}
- .swiper-switch{
+
+ .swiper-switch {
position: absolute;
display: flex;
border-radius: 20rpx;
@@ -670,6 +700,7 @@
background-color: rgba(0, 0, 0, 0.35);
left: 30rpx;
bottom: 100rpx;
+
&-item {
color: #FFFFFF;
flex: 1;
@@ -677,10 +708,11 @@
font-size: 24rpx;
line-height: 40rpx;
border-radius: 20rpx;
+
&.active {
background-color: #FFFFFF;
color: #333333;
-
+
}
}
}
diff --git a/sub_pages/house/house.vue b/sub_pages/house/house.vue
index 13203f6..b3376a5 100644
--- a/sub_pages/house/house.vue
+++ b/sub_pages/house/house.vue
@@ -121,9 +121,9 @@
methods: {
onRefreshList() {
const app = this
- const userId = uni.getStorageSync('userId')
+ // const userId = uni.getStorageSync('userId')
app.where.page = app.page
- app.where.userId = userId
+ // app.where.userId = userId
return new Promise((resolve, reject) => {
HouseInfoApi.pageHouseInfo(app.where)
.then(result => {
@@ -404,4 +404,4 @@
opacity: 0.9;
}
}
-
\ No newline at end of file
+
diff --git a/sub_pages/user/poster/poster.vue b/sub_pages/user/poster/poster.vue
index 467a6d1..2528135 100644
--- a/sub_pages/user/poster/poster.vue
+++ b/sub_pages/user/poster/poster.vue
@@ -235,7 +235,7 @@
scene: "WXSceneSession",
type: 5,
imageUrl: "https://file.wsdns.cn/qrcode/M4WhwQv2.png",
- title: '爱尚客',
+ title: '爱尚家',
miniProgram: {
id: 'gh_39f1f8019c3f',
path: 'pages/index/index',
diff --git a/sub_pages/user/poster/poster2.vue b/sub_pages/user/poster/poster2.vue
index d52e072..41abae2 100644
--- a/sub_pages/user/poster/poster2.vue
+++ b/sub_pages/user/poster/poster2.vue
@@ -98,7 +98,7 @@
console.log(res.target)
}
return {
- title: '爱尚客',
+ title: '爱尚家',
path: 'pages/index/index?user_id=' + uni.getStorageSync('userId')
}
},
@@ -179,7 +179,7 @@
scene: "WXSceneSession",
type: 5,
imageUrl: "https://file.wsdns.cn/qrcode/M4WhwQv2.png",
- title: '爱尚客',
+ title: '爱尚家',
miniProgram: {
id: 'gh_39f1f8019c3f',
path: 'pages/index/index',