2023.8.15

components/select-region/select-region.vue

@@ -91,6 +91,7 @@
         app.isLoading = true
         RegionModel.getTreeData()
           .then(regions => {
+						console.log(regions);
             // 格式化级联选择器数据
             this.options = this.getOptions(regions)
           })

config.js

@@ -1,7 +1,7 @@
 module.exports = {
 
   // 系统名称
-  name: "萤火商城2.0",
+  name: "养老服务",
 
   // 必填: 后端api地址, 斜杠/结尾, 参照下面格式
   // 例如: https://www.你的域名.com/index.php?s=/api/

pages/goods/detail.vue

@@ -148,7 +148,7 @@
   import SkuPopup from './components/SkuPopup'
   import Comment from './components/Comment'
   import Service from './components/Service'
-	import { goodsDetail } from '@/common/mock.js'
+	// import { goodsDetail } from '@/common/mock.js'
 
   export default {
     components: {
@@ -198,15 +198,15 @@
       // 获取商品信息
       getGoodsDetail() {
         const app = this
-				return app.goods = goodsDetail.data.detail
-        // return new Promise((resolve, reject) => {
-        //   GoodsApi.detail(app.goodsId)
-        //     .then(result => {
-        //       app.goods = result.data.detail
-        //       resolve(result)
-        //     })
-        //     .catch(reject)
-        // })
+				// return app.goods = goodsDetail.data.detail
+        return new Promise((resolve, reject) => {
+          GoodsApi.detail(app.goodsId)
+            .then(result => {
+              app.goods = result.data.detail
+              resolve(result)
+            })
+            .catch(reject)
+        })
       },
 
       // 获取购物车总数量

pages/goods/list.vue

@@ -93,7 +93,7 @@
 	import * as GoodsApi from '@/api/goods'
 	import { getEmptyPaginateObj, getMoreListData } from '@/core/app'
 	import Search from '@/components/search'
-	import { goodsList } from '@/common/mock.js'
+	// import { goodsList } from '@/common/mock.js'
 
 	const pageSize = 15
 	const showViewKey = 'GoodsList-ShowView';
@@ -145,10 +145,6 @@
 			 */
 			upCallback(page) {
 				const app = this
-				// const curPageLen = goodsList.data.length
-				// const totalSize = goodsList.data.total
-				// app.mescroll.endBySize(curPageLen, totalSize)
-				// app.mescroll.endErr()
 				// 设置列表数据
 				app.getGoodsList(page.num)
 					.then(list => {
@@ -170,7 +166,6 @@
 			 */
 			getGoodsList(pageNo = 1) {
 				const app = this
-				console.log(app.options)
 				const param = {
 					sortType: app.sortType,
 					sortPrice: Number(app.sortPrice),
@@ -179,18 +174,18 @@
 					page: pageNo
 				}
 				// 合并新数据
-				const newList = goodsList.data.list
-				app.list.data = getMoreListData(newList, app.list, pageNo)
-				// return new Promise((resolve, reject) => {
-				//   GoodsApi.list(param)
-				//     .then(result => {
-				//       // 合并新数据
-				//       const newList = result.data.list
-				//       app.list.data = getMoreListData(newList, app.list, pageNo)
-				//       resolve(newList)
-				//     })
-				//     .catch(reject)
-				// })
+				// const newList = goodsList.data.list
+				// app.list.data = getMoreListData(newList, app.list, pageNo)
+				return new Promise((resolve, reject) => {
+				  GoodsApi.list(param)
+				    .then(result => {
+				      // 合并新数据
+				      const newList = result.data.list
+				      app.list.data = getMoreListData(newList, app.list, pageNo)
+				      resolve(newList)
+				    })
+				    .catch(reject)
+				})
 			},
 
 			// 切换排序方式

pages/index/index.vue

@@ -9,14 +9,12 @@
 	import { setCartTabBadge } from '@/core/app'
 	import * as Api from '@/api/page'
 	import Page from '@/components/page'
-	import { homePage } from '@/common/mock.js'
+	// import { homePage } from '@/common/mock.js'
 
 	const App = getApp()
 
 	export default {
-		components: {
-			Page
-		},
+		components: {	Page },
 		data() {
 			return {
 				// 页面参数
@@ -56,30 +54,28 @@
 				const app = this
 				const pageId = app.options.pageId || 0
 				// 设置页面数据
-				const { data: { pageData } } = homePage
-				app.page = pageData.page
-				app.items = pageData.items
+				// const { data: { pageData } } = homePage
+				// app.page = pageData.page
+				// app.items = pageData.items
+				// app.setPageBar();
 				// 设置顶部导航栏栏
-				app.setPageBar();
-				// Api.detail(pageId)
-				// 	.then(result => {
-				// 		// 设置页面数据
-				// 		const { data: { pageData } } = result
-				// 		app.page = pageData.page
-				// 		app.items = pageData.items
-				// 		// 设置顶部导航栏栏
-				// 		app.setPageBar();
-				// 	})
-				// 	.finally(() => callback && callback())
+				Api.detail(pageId)
+					.then(result => {
+						// 设置页面数据
+						const { data: { pageData } } = result
+						app.page = pageData.page
+						app.items = pageData.items
+						// 设置顶部导航栏栏
+						app.setPageBar();
+					})
+					.finally(() => callback && callback())
 			},
 
 			/**
 			 * 设置顶部导航栏
 			 */
 			setPageBar() {
-				const {
-					page
-				} = this
+				const { page } = this
 				// 设置页面标题
 				uni.setNavigationBarTitle({
 					title: page.params.title