diff --git a/.idea/UniappTool.xml b/.idea/UniappTool.xml
new file mode 100644
index 0000000..8694db6
--- /dev/null
+++ b/.idea/UniappTool.xml
@@ -0,0 +1,12 @@
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
new file mode 100644
index 0000000..8ea190b
--- /dev/null
+++ b/.idea/workspace.xml
@@ -0,0 +1,93 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {
+ "associatedIndex": 0
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 1739945847092
+
+
+ 1739945847092
+
+
+
+
+
+
+
+
+
+ 1741166460514
+
+
+
+ 1741166460514
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/api/upload.js b/api/upload.js
index f8bdcd7..48173ca 100644
--- a/api/upload.js
+++ b/api/upload.js
@@ -10,7 +10,7 @@ import appConfig from '@/config.js'
// export const uploadFile = (file) => http.upload(fileUrl + '/api/file/upload', file)
// 阿里云OSS
-export const uploadFile = (file) => http.upload('https://open.gxwebsoft.com/api/oss/upload', file)
+export const uploadFile = (file) => http.upload('https://server.gxwebsoft.com/api/oss/upload', file)
// export const uploadFile = async ({filePath}) => {
// // 获取临时凭证
@@ -53,4 +53,4 @@ export const getTempOssToken = () => http.get('/oss/getTempToken')
export default {
uploadFile,
getTempOssToken
-}
\ No newline at end of file
+}
diff --git a/config.js b/config.js
index 4ff046a..76325aa 100755
--- a/config.js
+++ b/config.js
@@ -8,8 +8,14 @@ module.exports = {
// 应用秘钥
appSecret: '1f1d186d98ea4620ac65afbf34940051',
+ // 生产环境
+ serverUrl: 'https://server.gxwebsoft.com/api',
+ apiUrl: 'https://cms-api.websoft.top/api',
+ socketUrl: 'wss://server.gxwebsoft.com',
+ fileUrl: 'https://file.wsdns.cn',
+
// 开发环境
- // apiUrl: "http://127.0.0.1:9095/api",
+ // apiUrl: "http://127.0.0.1:9000/api",
// socketUrl: 'ws://localhost:9190',
// fileUrl: 'https://file.wsdns.cn',
// apiUrl: "http://47.119.165.234:5483/api",
@@ -18,14 +24,7 @@ module.exports = {
// 测试环境
// 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',
+ // fileUrl: 'https://file.wsdns.cn',
// 游客 userId
userId: 3373,
diff --git a/core/config/defaultConfig.js b/core/config/defaultConfig.js
index 510fddd..41bd0ec 100755
--- a/core/config/defaultConfig.js
+++ b/core/config/defaultConfig.js
@@ -9,14 +9,14 @@ export default {
* 后端api地址 (必填; 斜杠/结尾; 请确保能访问)
* 例如: https://www.你的域名.com/index.php?s=/api/
*/
- apiUrl: "https://open.gxwebsoft.com/api",
+ apiUrl: "https://server.gxwebsoft.com/api",
/**
- * 商城ID (必填)
+ * 商城ID (必填)
* 可在超管后台-商城列表中查看
*/
storeId: 10001,
-
+
// 租户ID
tenantId: 10048,
diff --git a/pages/house/house.vue b/pages/house/house.vue
index 6d91ba5..06649c9 100644
--- a/pages/house/house.vue
+++ b/pages/house/house.vue
@@ -272,32 +272,47 @@
this.list1 = [];
this.list2 = [];
this.page = 1
- console.log('extentScene: ', this.where.extentScene);
- if (text == '0-100㎡') {
- this.where.extentScene = '100'
+ console.log(text,'text...')
+ if (text == '50平以下') {
+ this.where.extentStart = '0'
+ this.where.extentEnd = '50'
}
- if (text == '100-150㎡') {
- this.where.extentScene = '100-150'
+ if (text == '50~100平') {
+ this.where.extentStart = '50'
+ this.where.extentEnd = '100'
}
- if (text == '150-200㎡') {
- this.where.extentScene = '150-200'
+ if (text == '100~200平') {
+ this.where.extentStart = '100'
+ this.where.extentEnd = '200'
}
- if (text == '200-300㎡') {
- this.where.extentScene = '200-300'
+ if (text == '200~300平') {
+ this.where.extentStart = '200'
+ this.where.extentEnd = '300'
}
- if (text == '300-400㎡') {
- this.where.extentScene = '300-400'
+ if (text == '300~500平') {
+ this.where.extentStart = '300'
+ this.where.extentEnd = '500'
}
if (text == '400-600㎡') {
- this.where.extentScene = '400-600'
+ this.where.extentStart = '100'
+ this.where.extentEnd = '200'
}
- if (text == '600-1000㎡') {
- this.where.extentScene = '600-1000'
+ if (text == '500~1000平') {
+ this.where.extentStart = '500'
+ this.where.extentEnd = '1000'
}
- if (text == '1000㎡以上') {
- this.where.extentScene = '1000'
+ if (text == '1000平以上') {
+ this.where.extentStart = '1000'
+ this.where.extentEnd = '20000'
+ }
+ if (text == '面积(大-小)'){
+ this.where.sort = 'extent'
+ this.where.order = 'desc'
+ }
+ if (text == '面积(小-大)'){
+ this.where.sort = 'extent'
+ this.where.order = 'asc'
}
-
this.onRefreshList()
// this.$push('/sub_pages/member/member', this.where)
},
diff --git a/pages/user/user.vue b/pages/user/user.vue
index 7c31160..f774152 100644
--- a/pages/user/user.vue
+++ b/pages/user/user.vue
@@ -15,7 +15,7 @@
- {{ userInfo.nickname }}
+ {{ userInfo.nickname }}-{{ userInfo.userId }}
diff --git a/sub_pages/house/detail.vue b/sub_pages/house/detail.vue
index 63e1c6b..e25fd71 100644
--- a/sub_pages/house/detail.vue
+++ b/sub_pages/house/detail.vue
@@ -5,7 +5,7 @@
+ indicatorStyle="right: 20px; bottom: 50px" @click="onSwiper">
{{ currentNum + 1 }}/{{ swiperList.length }}
@@ -115,7 +115,19 @@
-
+
+
+
+
+
+ 管理员备注
+
+
+
+
+
+
+
@@ -362,6 +374,9 @@
}
},
methods: {
+ onSwiper(e) {
+ console.log(e,'deeeeee')
+ },
getHouseInfo() {
const app = this
const {
@@ -410,8 +425,6 @@
phoneNumber: this.phone
})
}
-
-
},
makePhoneCall() {
if (!this.form.phone) {