爱尚家接口合并到cms-api.websoft.top

2025-06-08 11:17:30 +08:00
parent 2c77a45e5d
commit 522281300f
8 changed files with 168 additions and 36 deletions
--- a/.idea/UniappTool.xml
+++ b/.idea/UniappTool.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="cn.fjdmy.uniapp.UniappProjectDataService">
+    <option name="basePath" value="$PROJECT_DIR$" />
+    <option name="generalBasePath" value="$PROJECT_DIR$" />
+    <option name="manifestPath" value="$PROJECT_DIR$/manifest.json" />
+    <option name="pagesPath" value="$PROJECT_DIR$/pages.json" />
+    <option name="scanNum" value="1" />
+    <option name="type" value="store" />
+    <option name="uniapp" value="true" />
+  </component>
+</project>
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="AutoImportSettings">
+    <option name="autoReloadType" value="SELECTIVE" />
+  </component>
+  <component name="ChangeListManager">
+    <list default="true" id="ec5c6cc2-d0e3-4470-b342-660aa89effe0" name="Changes" comment="爱尚家接口合并到cms-api.websoft.top">
+      <change afterPath="$PROJECT_DIR$/.idea/UniappTool.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/api/upload.js" beforeDir="false" afterPath="$PROJECT_DIR$/api/upload.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/config.js" beforeDir="false" afterPath="$PROJECT_DIR$/config.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/core/config/defaultConfig.js" beforeDir="false" afterPath="$PROJECT_DIR$/core/config/defaultConfig.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pages/house/house.vue" beforeDir="false" afterPath="$PROJECT_DIR$/pages/house/house.vue" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pages/user/user.vue" beforeDir="false" afterPath="$PROJECT_DIR$/pages/user/user.vue" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/sub_pages/house/detail.vue" beforeDir="false" afterPath="$PROJECT_DIR$/sub_pages/house/detail.vue" afterDir="false" />
+    </list>
+    <option name="SHOW_DIALOG" value="false" />
+    <option name="HIGHLIGHT_CONFLICTS" value="true" />
+    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
+    <option name="LAST_RESOLUTION" value="IGNORE" />
+  </component>
+  <component name="Git.Settings">
+    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
+  </component>
+  <component name="ProjectColorInfo">{
+  &quot;associatedIndex&quot;: 0
+}</component>
+  <component name="ProjectId" id="2tFRTotWfsbrz2IuBO7ypG53vZ5" />
+  <component name="ProjectViewState">
+    <option name="hideEmptyMiddlePackages" value="true" />
+    <option name="showLibraryContents" value="true" />
+  </component>
+  <component name="PropertiesComponent"><![CDATA[{
+  "keyToString": {
+    "RunOnceActivity.ShowReadmeOnStart": "true",
+    "RunOnceActivity.git.unshallow": "true",
+    "git-widget-placeholder": "master",
+    "last_opened_file_path": "/Users/gxwebsoft/APP/anshangjia-uniapp",
+    "node.js.detected.package.eslint": "true",
+    "node.js.detected.package.tslint": "true",
+    "node.js.selected.package.eslint": "(autodetect)",
+    "node.js.selected.package.tslint": "(autodetect)",
+    "nodejs_package_manager_path": "npm",
+    "ts.external.directory.path": "/Applications/WebStorm.app/Contents/plugins/javascript-plugin/jsLanguageServicesImpl/external",
+    "vue.rearranger.settings.migration": "true"
+  }
+}]]></component>
+  <component name="RecentsManager">
+    <key name="CopyFile.RECENT_KEYS">
+      <recent name="$PROJECT_DIR$/api" />
+    </key>
+  </component>
+  <component name="SharedIndexes">
+    <attachedChunks>
+      <set>
+        <option value="bundled-js-predefined-d6986cc7102b-6a121458b545-JavaScript-WS-251.25410.117" />
+      </set>
+    </attachedChunks>
+  </component>
+  <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
+  <component name="TaskManager">
+    <task active="true" id="Default" summary="Default task">
+      <changelist id="ec5c6cc2-d0e3-4470-b342-660aa89effe0" name="Changes" comment="" />
+      <created>1739945847092</created>
+      <option name="number" value="Default" />
+      <option name="presentableId" value="Default" />
+      <updated>1739945847092</updated>
+      <workItem from="1739945848459" duration="64000" />
+      <workItem from="1741164043468" duration="2014000" />
+      <workItem from="1741271209571" duration="704000" />
+      <workItem from="1741504149918" duration="1325000" />
+      <workItem from="1741575271954" duration="1234000" />
+      <workItem from="1749352256910" duration="256000" />
+    </task>
+    <task id="LOCAL-00001" summary="爱尚家接口合并到cms-api.websoft.top">
+      <option name="closed" value="true" />
+      <created>1741166460514</created>
+      <option name="number" value="00001" />
+      <option name="presentableId" value="LOCAL-00001" />
+      <option name="project" value="LOCAL" />
+      <updated>1741166460514</updated>
+    </task>
+    <option name="localTasksCounter" value="2" />
+    <servers />
+  </component>
+  <component name="TypeScriptGeneratedFilesManager">
+    <option name="version" value="3" />
+  </component>
+  <component name="VcsManagerConfiguration">
+    <MESSAGE value="爱尚家接口合并到cms-api.websoft.top" />
+    <option name="LAST_COMMIT_MESSAGE" value="爱尚家接口合并到cms-api.websoft.top" />
+  </component>
+</project>
--- 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}) => {

 // 	// 获取临时凭证
--- 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,
--- a/core/config/defaultConfig.js
+++ b/core/config/defaultConfig.js
@@ -9,7 +9,7 @@ export default {
   * 后端api地址 (必填; 斜杠/结尾; 请确保能访问)
   * 例如: https://www.你的域名.com/index.php?s=/api/
   */
-  apiUrl: "https://open.gxwebsoft.com/api",
+  apiUrl: "https://server.gxwebsoft.com/api",

  /**
   * 商城ID (必填)
--- 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)
 			},
--- a/pages/user/user.vue
+++ b/pages/user/user.vue
@@ -15,7 +15,7 @@
 				<view class="user-content">
 					<view class="nick-name">
 						<!-- {{ userInfo.certification }} -->
- 						<text>{{ userInfo.nickname }}</text>
+ 						<text>{{ userInfo.nickname }}-{{ userInfo.userId }}</text>
 						<image v-if="userInfo.sex == 1" src="../../static/icon/sex_man.png" mode="widthFix"></image>
 						<image v-if="userInfo.sex == 2" src="../../static/icon/sex_woman.png" mode="widthFix"></image>
 					</view>
--- a/sub_pages/house/detail.vue
+++ b/sub_pages/house/detail.vue
@@ -5,7 +5,7 @@
 		<view class="swiper">
 			<view v-show="swiperType == 'image'">
 				<u-swiper :list="swiperList" height="500rpx" :radius="0" @change="e => currentNum = e.current"
-					indicatorStyle="right: 20px; bottom: 50px" @click="click">
+					indicatorStyle="right: 20px; bottom: 50px" @click="onSwiper">
 					<view slot="indicator" class="indicator-num">
 						<text class="indicator-num__text">{{ currentNum + 1 }}/{{ swiperList.length }}</text>
 					</view>
@@ -116,6 +116,18 @@
 			</view>
 		</view>
 		
+		<template v-if="isManager">
+			<u-gap></u-gap>
+			<view class="house-card">
+				<view class="title">
+					管理员备注
+				</view>
+				<view class="about">
+					<mp-html :content="form.comments" />
+				</view>
+			</view>
+		</template>
+		
 		<!-- 房源位置 -->
 		<u-gap></u-gap>
 		<view class="house-card">
@@ -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) {