Merge branch 'master' of http://192.168.10.18:3000/sooka_shop/sooka_consult_uniapp

api/cooperative/cooperative.js

@@ -2,6 +2,13 @@ import upload from '@/utils/upload'
 import request from '@/utils/request'
 
 // 查询合作社列表
+export function getCooperative(query) {
+  return request({
+    url: '/system/cooperative/list',
+    method: 'get',
+    params: query
+  })
+}
 export function getCooperative() {
   return request({
     url: '/system/user/listAll',

api/highFrequencyService/highFrequencyService.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询高频服务列表
+export function listServer(query) {
+  return request({
+    url: '/high/server/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询高频服务详细
+export function getServer(id,type) {
+  return request({
+    url: '/high/server/' + id + '/' + type,
+    method: 'get'
+  })
+}
+
+// 新增高频服务
+export function addServer(data) {
+  return request({
+    url: '/high/server',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改高频服务
+export function updateServer(data) {
+  return request({
+    url: '/high/server',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除高频服务
+export function delServer(id,type) {
+  return request({
+    url: '/high/server/' + id + '/' + type,
+    method: 'delete'
+  })
+}

config.js

@@ -6,6 +6,7 @@ module.exports = {
 	baseUrl: 'http://192.168.4.28:8080',
 	// baseUrl: 'http://192.168.4.11:8080',
 	// baseUrl: 'http://192.168.4.14:8089',
+	baseUrl: 'http://192.168.4.88:8080',
 	baseIconUrl: 'http://119.3.201.155:9000',
 	// baseIconUrl: 'http://192.168.4.14:8080',
 	// 应用信息

pages.json

@@ -26,6 +26,15 @@
 			}
 		},
 		{
+			"path": "pages/specialService/loveAtVillage/details",
+			"style": {
+				"usingComponents": {},
+				"navigationBarBackgroundColor": "#07c160",
+				"navigationBarTextStyle": "white",
+				"navigationBarTitleText": "乡村婚恋详情"
+			}
+		},
+		{
 			"path": "pages/cooperative/details",
 			"style": {
 				"usingComponents": {},
@@ -202,7 +211,7 @@
 		},
 		{
 			"path" : "pages/liveBroadcast/liveBroadcast",
-			"style" : 
+			"style" :
 			{
 				"usingComponents": {},
 				"navigationBarBackgroundColor": "#07c160",

pages/index/index.vue

@@ -377,7 +377,6 @@ export default {
             });
         },
         goSpecialService() {
-		    console.log(66666)
             uni.navigateTo({
                 url: '/pages/specialService/loveAtVillage/loveAtVillage'
             });

pages/specialService/loveAtVillage/details.vue

@@ -4,13 +4,15 @@
         <view class="cooperativeImgBox">
             <image :src="loadImgSrc('/snbj.png')" class="cooperativeImg"></image>
         </view>
-        <view class="itemBox" v-for="(item, index) in list" :key="index">
+        <view class="itemBox">
             <view class="item">
                 <span>
-                    {{ item.title }}：
+                    {{ details.titleName }}
                 </span>
+            </view>
+            <view class="item">
                 <span>
-                    {{ item.content }}
+                    {{ details.textDetails }}
                 </span>
             </view>
         </view>
@@ -18,33 +20,13 @@
 </template>
 
 <script>
+import { listServer, getServer, delServer, addServer, updateServer } from '@/api/highFrequencyService/highFrequencyService';
 export default {
     data() {
         return {
-            list: [
-                {
-                    title: "名称",
-                    content: "第十三号供销社",
-                },
-                {
-                    title: "地址",
-                    content: "十三号街区地下研究所",
-                },
-                {
-                    title: "负责人",
-                    content: "高耀",
-                },
-                {
-                    title: "负责人电话",
-                    content: "13178945612",
-                }
-            ],
-            cooperative: {
-                name:"供销社1",
-                address:"供销社地址1",
-                chargePeople:"负责人1",
-                chargePhone:"13103215236",
-                imgUrl:"/profile/upload/2024/03/01/nacos_20240301145836A002.png"
+            details: {
+                titleName: "-",
+                textDetails: "-",
             }
         }
     }
@@ -52,10 +34,17 @@ export default {
      * 生命周期函数--监听页面加载
      */,
     onLoad(options) {
-        console.log(666)
+        this.getServer(options.id, options.type);
     },
     methods: {
-
+        /** 详情 */
+        getServer(id, type) {
+            getServer(id, type).then(response => {
+                this.details = response.data;
+                console.log(id)
+                console.log(data)
+            });
+        },
     }
 };
 </script>

pages/specialService/loveAtVillage/loveAtVillage.vue

@@ -1,18 +1,13 @@
 <template>
     <view class="container">
         <!-- 供销社列表 -->
-        <view class="rnwdList" @tap="goDetails" v-for="(item, index) in list" :key="index">
-            <view class="cooperativeImgBox">
-                <image :src="loadImgSrc('/snbj.png')" class="cooperativeImg" @tap="goDetails"></image>
+        <view class="rnwdList" v-for="(item, index) in list" :key="index">
+            <view @tap="goDetails(item.id, item.type)" class="cooperativeImgBox">
+                <image :src="loadImgSrc('/snbj.png')" class="cooperativeImg"></image>
             </view>
-            <view class="cooperativeBox">
+            <view @tap="goDetails(item.id, item.type)" class="cooperativeBox">
                 <view class="list">
-                    <span class="listTitle">{{ item.name }}</span>
-                    <view class="jlSj">
-                        <span class="jf">
-                            {{ item.address }}
-                        </span>
-                    </view>
+                    <span class="listTitle">{{ item.titleName }}</span>
                 </view>
             </view>
             <em class="iconfont icon-xiangyoujiantou"></em>
@@ -21,30 +16,14 @@
 </template>
 
 <script>
+import { listServer, getServer, delServer, addServer, updateServer } from '@/api/highFrequencyService/highFrequencyService';
 export default {
     data() {
         return {
             list: [
                 {
-                    name:"供销社1",
-                    address:"供销社地址1",
-                    chargePeople:"负责人1",
-                    chargePhone:"13103215236",
-                    imgUrl:"/profile/upload/2024/03/01/nacos_20240301145836A002.png"
-                },
-                {
-                    name:"供销社2",
-                    address:"供销社地址2",
-                    chargePeople:"负责人2",
-                    chargePhone:"09876543210",
-                    imgUrl:"/profile/upload/2024/03/01/nacos_20240301145836A002.png"
-                },
-                {
-                    name:"供销社3",
-                    address:"供销社地址3",
-                    chargePeople:"负责人3",
-                    chargePhone:"12345678910",
-                    imgUrl:"/profile/upload/2024/03/01/nacos_20240301145836A002.png"
+                    titleName:"-",
+                    imgUrlList:"-"
                 }
             ],
         };
@@ -53,12 +32,20 @@ export default {
      * 生命周期函数--监听页面加载
      */,
     onLoad(options) {
-
+        this.getList(7);
     },
     methods: {
-        goDetails() {
+        /** 查询列表 */
+        getList(type) {
+            this.loading = true;
+            listServer({type: type}).then(response => {
+                this.list = response.rows;
+            });
+        },
+        /** 查询详情 */
+        goDetails(id, type) {
             uni.navigateTo({
-                url: '/pages/cooperative/details'
+                url: '/pages/specialService/loveAtVillage/details?id='+id+'&type='+type
             });
         }
     }