Merge remote-tracking branch 'origin/master'

# Conflicts:
#	pages.json
#	pages/index/index.vue

api/handleAffairs/handleAffairs.js

@@ -0,0 +1,10 @@
+import request from '@/utils/request'
+
+// 根据字典类型查询字典数据信息
+export function getList(query) {
+  return request({
+    url: '/dev-api/jnb/topicType/list',
+    method: 'get',
+	params:query
+  })
+}

pages.json

@@ -8,6 +8,24 @@
 			}
 		},
 		{
+			"path": "pages/cooperative/cooperative",
+			"style": {
+				"usingComponents": {},
+				"navigationBarBackgroundColor": "#07c160",
+				"navigationBarTextStyle": "white",
+				"navigationBarTitleText": "供销社"
+			}
+		},
+		{
+			"path": "pages/cooperative/details",
+			"style": {
+				"usingComponents": {},
+				"navigationBarBackgroundColor": "#07c160",
+				"navigationBarTextStyle": "white",
+				"navigationBarTitleText": "供销社详情"
+			}
+		},
+		{
 			"path": "pages/index/index",
 			"style": {
 				"component": true,
@@ -96,11 +114,23 @@
 			}
 		},
 		{
-			"path" : "pages/me/meOperate",
-			"style" : 
-			{
-				"navigationBarTitleText" : "",
-				"enablePullDownRefresh" : false
+			"path": "pages/handleAffairs/handleAffairs",
+			"style": {
+				"usingComponents": {},
+				"navigationBarBackgroundColor": "#07c160",
+				"navigationBarTextStyle": "white",
+				"navigationBarTitleText": "办事"
+				
+			}
+		},
+		{
+			"path": "pages/themeType/themeType",
+			"style": {
+				"usingComponents": {},
+				"navigationBarBackgroundColor": "#07c160",
+				"navigationBarTextStyle": "white",
+				"navigationBarTitleText": "主题配置类型"
+				
 			}
 		}
 	],
@@ -151,4 +181,4 @@
 		]
 	},
 	"subPackages": []
-}
+}

pages/handleAffairs/handleAffairs.vue

@@ -0,0 +1,124 @@
+<template>
+	<view>
+			<view class="gpfwNav">
+				<ul >
+					<li v-for="(item,index) in gridtTypeLits" :key="index" >
+						<image :src="loadImgSrc(item.fileUrl)" @click="querygrid">{{item.name}}</image>
+					</li>
+					</ul>
+			</view>
+	</view>
+
+</template>
+
+<script>
+	import {
+		getList
+	} from '@/api/handleAffairs/handleAffairs.js';
+
+	export default {
+		data() {
+			return {
+				gridtTypeLits: [],
+			};
+		},
+		created() {
+			this.getList();
+		},
+		methods: {
+			querygrid(){
+				console.log(1)
+			}
+			getList() {
+				const _that = this
+				// getList().then(res =>{
+				//  this.gridtTypeLits = res
+				//  console.log(res)
+				// });
+				uni.request({
+					url: 'http://localhost:88/dev-api/jnb/gridType/list',
+					header: {
+							Authorization: "Bearer eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6IjNjNWZjYTQzLTYyN2ItNGYwMC04MGJlLWU0YjBkMjA3Y2U2ZiJ9.o0mAHq3FPNIyVk3cewMMzWdLZRAC5EG4eUNzKq2K8Gq_A9s5TUJYn0vWMzVtbdm0BnAUOrxnwvyEvNXcRj3f0w"
+						},
+					data: {
+						yesOrNoShow: "0"
+					},
+					success(res) {
+						_that.gridtTypeLits = res.data.rows
+						// this.gridtTypeLits = res.data.rows
+						
+					}
+				})
+			},
+			// 	go() {
+			// 	uni.navigateTo({
+			// 		url: '/pages/themeType/themeType'
+			// 	});
+			// }
+		}
+	}
+</script>
+<style scoped>
+.gpfwNav ul {
+    width: 100%;
+    display: flex;
+    flex-wrap: wrap;
+}
+
+.gpfwNav ul li {
+    margin: 20rpx 2.5% 30rpx 2.5%;
+    font-size: 30rpx;
+    color: #333;
+    width: 20%;
+    text-align: center;
+}
+
+.gpfwNav ul li view {
+    width: 80rpx;
+    height: 80rpx;
+    margin: 0 auto 20rpx auto;
+    border-radius: 20rpx;
+    text-align: center;
+    line-height: 80rpx;
+}
+
+.gpfwNav ul li view em {
+    font-size: 50rpx;
+    color: #fff;
+}
+
+.gpfwNav ul li view.lvxd {
+    background: -webkit-linear-gradient(#eca6a6, #fd8585);
+    background: -o-linear-gradient(#eca6a6, #fd8585);
+    background: -moz-linear-gradient(#eca6a6, #fd8585);
+    background: linear-gradient(#eca6a6, #fd8585);
+}
+
+.gpfwNav ul li view.xlzx {
+    background: -webkit-linear-gradient(#bab3ec, #8170ff);
+    background: -o-linear-gradient(#bab3ec, #8170ff);
+    background: -moz-linear-gradient(#bab3ec, #8170ff);
+    background: linear-gradient(#bab3ec, #8170ff);
+}
+
+.gpfwNav ul li view.xswz {
+    background: -webkit-linear-gradient(#afd0ec, #61c5ff);
+    background: -o-linear-gradient(#afd0ec, #61c5ff);
+    background: -moz-linear-gradient(#afd0ec, #61c5ff);
+    background: linear-gradient(#afd0ec, #61c5ff);
+}
+
+.gpfwNav ul li view.gxs {
+    background: -webkit-linear-gradient(#c1fdc9, #57f5a1);
+    background: -o-linear-gradient(#c1fdc9, #57f5a1);
+    background: -moz-linear-gradient(#c1fdc9, #57f5a1);
+    background: linear-gradient(#c1fdc9, #57f5a1);
+}
+
+.gpfwNav ul li view.more {
+    background: -webkit-linear-gradient(#46aef7, #1dd5e6);
+    background: -o-linear-gradient(#46aef7, #1dd5e6);
+    background: -moz-linear-gradient(#46aef7, #1dd5e6);
+    background: linear-gradient(#46aef7, #1dd5e6);
+}
+</style>

pages/index/index.vue

@@ -12,7 +12,7 @@
                     <span>问吧</span>
                 </li>
                 <li>
-                    <view class="hq"><em class="iconfont icon-hangqing"></em></view>
+                    <view class="hq" @tap="goHangQing"><em class="iconfont icon-hangqing"></em></view>
                     <span>行情</span>
                 </li>
                 <li>
@@ -20,7 +20,7 @@
                     <span>商城</span>
                 </li>
                 <li>
-                    <view class="bs"><em class="iconfont icon-banshidating1"></em></view>
+                    <view class="bs" @tap="goBanShi"><em class="iconfont icon-banshidating1"></em></view>
                     <span>办事</span>
                 </li>
             </ul>
@@ -110,7 +110,7 @@
                         <span>线上问诊</span>
                     </li>
                     <li>
-                        <view class="gxs"><em class="iconfont icon-gongxiaoshelogo"></em></view>
+                        <view class="gxs" @tap="goCooperative"><em class="iconfont icon-gongxiaoshelogo"></em></view>
                         <span>供销社</span>
                     </li>
                     <li>
@@ -332,7 +332,11 @@ export default {
                 url: '/pages/wenba/wenba'
             });
         },
-
+      goHangQing() {
+        uni.navigateTo({
+          url: '/pages/hangqing/hangqing'
+        });
+      },
         goShangCheng() {
             uni.navigateTo({
                 url: '/pages/shangcheng/shangcheng'
@@ -343,7 +347,18 @@ export default {
             uni.navigateTo({
                 url: '/pages/wenbaxiangqing/wenbaxiangqing'
             });
-        }
+        },
+
+        goCooperative() {
+            uni.navigateTo({
+                url: '/pages/cooperative/cooperative'
+            });
+        },
+		goBanShi() {
+			uni.navigateTo({
+				url: '/pages/handleAffairs/handleAffairs'
+			});
+		}
     }
 };
 </script>

pages/themeType/themeType.vue

@@ -0,0 +1,22 @@
+<template>
+	<view>
+		<view>我是主题配置</view>
+	</view>
+	  
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			};
+		},
+		 methods: {
+		
+		  }
+		}
+</script>
+<style scoped>
+
+</style>