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

App.vue

@@ -23,6 +23,7 @@
       checkLogin() {
         if (!getToken()) {
           this.$tab.reLaunch('/pages/login') 
+          // this.$tab.reLaunch('/pages/me/me.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
+  })
+}

api/me/me.js

@@ -0,0 +1,16 @@
+import request from '@/utils/request'
+
+// 获取当前积分
+export function getScore(userId) {
+  return request({
+    url: '/score/getScore?userId='+userId,
+    method: 'get'
+  })
+}
+
+export function getUserInfo(userId){
+	return request({
+		url: '/system/user/getWxUserInfo/'+userId,
+		method: 'get'
+	})
+}

config.js

@@ -28,4 +28,4 @@ module.exports = {
 			}
 		]
 	}
-}
+}

manifest.json

@@ -42,7 +42,7 @@
             "sdkConfigs" : {
                 "oauth" : {
                     "weixin" : {
-                        "appid" : "wxf75b34dd1f737174",
+                        "appid" : "wx7abed48bcc12427c",
                         "UniversalLinks" : ""
                     }
                 }
@@ -51,7 +51,7 @@
     },
     "quickapp" : {},
     "mp-weixin" : {
-        "appid" : "wx0904bdfd9c082418",
+        "appid" : "wx7abed48bcc12427c",
         "setting" : {
             "urlCheck" : false
         },
@@ -61,7 +61,8 @@
                 "desc" : "你的位置信息将用于小程序位置接口的效果展示"
             }
         },
-        "plugins" : {}
+        "plugins" : {},
+		"libVersion" :"latest"
     },
     "mp-alipay" : {
         "usingComponents" : true

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,
@@ -94,6 +112,26 @@
 				"navigationBarTextStyle": "white",
 				"navigationBarTitleText": "商品详情页"
 			}
+		},
+		{
+			"path": "pages/handleAffairs/handleAffairs",
+			"style": {
+				"usingComponents": {},
+				"navigationBarBackgroundColor": "#07c160",
+				"navigationBarTextStyle": "white",
+				"navigationBarTitleText": "办事"
+				
+			}
+		},
+		{
+			"path": "pages/themeType/themeType",
+			"style": {
+				"usingComponents": {},
+				"navigationBarBackgroundColor": "#07c160",
+				"navigationBarTextStyle": "white",
+				"navigationBarTitleText": "主题配置类型"
+				
+			}
 		}
 	],
 	"tabBar": {
@@ -143,4 +181,4 @@
 		]
 	},
 	"subPackages": []
-}
+}

pages/cooperative/cooperative.css

@@ -0,0 +1,128 @@
+/* pages/wenda/wenda.wxss */
+.wendaFL {
+    width: 100%;
+    display: flex;
+    justify-content: space-between;
+    margin: 30rpx 0 0 0;
+}
+.wendaFL li {
+    width: 48%;
+    height: 168rpx;
+    position: relative;
+}
+.cooperativeBox{
+    position: relative;
+    left: 30rpx;
+    top: 10rpx;
+    z-index: 0;
+    width: 800rpx;
+    height: 100rpx;
+}
+.cooperativeImgBox{
+    position: relative;
+    left: 0;
+    top: 0;
+    z-index: 0;
+    width: 330rpx;
+    height: 100rpx;
+}
+.cooperativeImg{
+    position: relative;
+    left: 0;
+    top: 0;
+    z-index: 0;
+    width: 100%;
+    height: 100%;
+}
+
+.lbBj {
+    position: absolute;
+    left: 0;
+    top: 0;
+    z-index: 0;
+    width: 100%;
+    height: 100%;
+}
+.wendaFL li h2 {
+    font-size: 36rpx;
+    position: absolute;
+    left: 30rpx;
+    top: 40rpx;
+    z-index: 1;
+    font-weight: bold;
+}
+.wendaFL li span {
+    font-size: 30rpx;
+    position: absolute;
+    left: 30rpx;
+    top: 88rpx;
+    z-index: 1;
+}
+.wendaFL li.sanNong {
+    color: #0d9970;
+}
+.wendaFL li.jiuYe {
+    color: #1e8fb4;
+}
+.wendaFL li.faLv {
+    color: #1e5dab;
+}
+.wendaFL li.jiuZhen {
+    color: #4a700d;
+}
+/* 列表 */
+.rnwdList {
+    width: 100%;
+    display: flex;
+    justify-content: space-between;
+    margin: 20rpx 0;
+}
+.list {
+    width: 79%;
+}
+.lb {
+    background: #0d9970;
+    color: #fff;
+    font-size: 24rpx;
+    width: 12%;
+    text-align: center;
+    padding: 2rpx 0;
+    line-height: 40rpx;
+    height: 40rpx;
+    border-radius: 10rpx;
+}
+.listTitle {
+    font-size: 32rpx;
+    color: #333;
+    line-height: 40rpx;
+}
+.jlSj {
+    height: 40rpx;
+    display: flex;
+    justify-content: space-between;
+    font-size: 24rpx;
+    margin: 20rpx 0 0 0;
+}
+.jf {
+    color: #07c160;
+}
+.icon-jifen {
+    font-size: 28rpx;
+    color: #07c160;
+    margin: 0 0 0 6rpx;
+}
+.ck {
+    color: #c4c4c4;
+}
+.icon-pinglun,
+.icon-chakan,
+.icon-shoucang {
+    font-size: 28rpx;
+    margin: 0 6rpx 0 20rpx;
+    color: #c4c4c4;
+}
+.icon-xiangyoujiantou {
+    font-size: 30rpx;
+    color: #c4c4c4;
+    line-height: 60rpx;
+}

pages/cooperative/cooperative.vue

@@ -0,0 +1,178 @@
+<template>
+    <!-- pages/fuwu/fuwu.wxml -->
+    <view class="container">
+        <!-- 供销社列表 -->
+        <view class="rnwdList" @tap="goDetails" v-for="(item, index) in list" :key="index">
+            <!--<span class="lb">{{ item.name }}</span>-->
+            <view class="cooperativeImgBox">
+                <image :src="loadImgSrc('/snbj.png')" class="cooperativeImg" @tap="goDetails"></image>
+            </view>
+            <view class="cooperativeBox">
+                <view class="list">
+                    <span class="listTitle">{{ item.name }}</span>
+                    <view class="jlSj">
+                        <span class="jf">
+                            {{ item.address }}
+                        </span>
+                    </view>
+                </view>
+            </view>
+            <em class="iconfont icon-xiangyoujiantou"></em>
+        </view>
+
+
+        <!-- 问答类别 -->
+
+        <!--<ul class="wendaFL">-->
+            <!--<li class="sanNong">-->
+                <!--<image :src="loadImgSrc('/snbj.png')" class="lbBj" @tap="goSanNong"></image>-->
+                <!--<h2>三农</h2>-->
+                <!--<span>1566</span>-->
+            <!--</li>-->
+            <!--<li class="jiuYe">-->
+                <!--<image :src="loadImgSrc('/jybj.png')" class="lbBj"></image>-->
+                <!--<h2>就业</h2>-->
+                <!--<span>1589</span>-->
+            <!--</li>-->
+        <!--</ul>-->
+        <!--<ul class="wendaFL">-->
+            <!--<li class="faLv">-->
+                <!--<image :src="loadImgSrc('/flbj.png')" class="lbBj"></image>-->
+                <!--<h2>法律</h2>-->
+                <!--<span>6589</span>-->
+            <!--</li>-->
+            <!--<li class="jiuZhen">-->
+                <!--<image :src="loadImgSrc('/jzbj.png')" class="lbBj"></image>-->
+                <!--<h2>就诊</h2>-->
+                <!--<span>1566</span>-->
+            <!--</li>-->
+        <!--</ul>-->
+        <!--<ul class="wendaFL">-->
+            <!--<li class="jiuYe">-->
+                <!--<image :src="loadImgSrc('/zkbj.png')" class="lbBj"></image>-->
+                <!--<h2>智库</h2>-->
+                <!--<span>1589</span>-->
+            <!--</li>-->
+            <!--<li class="sanNong">-->
+                <!--<image :src="loadImgSrc('/lybj.png')" class="lbBj"></image>-->
+                <!--<h2>旅游</h2>-->
+                <!--<span>6589</span>-->
+            <!--</li>-->
+        <!--</ul>-->
+        <!-- 问答列表 -->
+        <!--<view class="rnwdList" @tap="goDetails" v-for="(item, index) in wb" :key="index">-->
+            <!--<span class="lb">{{ item.type }}</span>-->
+
+            <!--<view class="list">-->
+                <!--<span class="listTitle">{{ item.title }}</span>-->
+                <!--<view class="jlSj">-->
+                    <!--<span class="jf">-->
+                        <!--{{ item.jf }}-->
+                        <!--<em class="iconfont icon-jifen"></em>-->
+                    <!--</span>-->
+                    <!--<view class="ck">-->
+                        <!--<span>-->
+                            <!--<em class="iconfont icon-pinglun"></em>-->
+                            <!--{{ item.pl }}-->
+                        <!--</span>-->
+                        <!--<span>-->
+                            <!--<em class="iconfont icon-chakan"></em>-->
+                            <!--{{ item.ck }}-->
+                        <!--</span>-->
+                        <!--<span>-->
+                            <!--<em class="iconfont icon-shoucang"></em>-->
+                            <!--{{ item.dz }}-->
+                        <!--</span>-->
+                    <!--</view>-->
+                <!--</view>-->
+            <!--</view>-->
+
+            <!--<em class="iconfont icon-xiangyoujiantou"></em>-->
+        <!--</view>-->
+    </view>
+</template>
+
+<script>
+// pages/fuwu/fuwu.js
+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"
+                }
+            ],
+
+
+            wb: [
+				{
+					ck: '10',
+					dz: '120',
+					id: 1,
+					jf: '100',
+					pl: '10',
+					title: '探索乡村能源供给新模式',
+					type: '三农'
+				},
+				{
+					ck: '20',
+					dz: '220',
+					id: 2,
+					jf: '200',
+					ly: '20',
+					title: '探索乡村能源供给新模式 美丽新画卷',
+					type: '三农'
+				},
+				{
+					ck: '30',
+					dz: '30',
+					id: 3,
+					jf: '300',
+					pl: '30',
+					title: '探索乡村能源供给新模式 绘就乡村振兴美丽新画卷',
+					type: '三农'
+				}
+			]
+        };
+    }
+    /**
+     * 生命周期函数--监听页面加载
+     */,
+    onLoad(options) {
+    },
+    methods: {
+        goSanNong() {
+            uni.navigateTo({
+                url: '/pages/sannong/sannong'
+            });
+        },
+
+        goDetails() {
+            uni.navigateTo({
+                url: '/pages/cooperative/details'
+            });
+        }
+    }
+};
+</script>
+<style>
+@import './cooperative.css';
+</style>

pages/cooperative/details.vue

@@ -0,0 +1,178 @@
+<template>
+    <!-- pages/fuwu/fuwu.wxml -->
+    <view class="container">
+        <!-- 供销社列表 -->
+        <view class="rnwdList" @tap="goDetails" v-for="(item, index) in list" :key="index">
+            <!--<span class="lb">{{ item.name }}</span>-->
+            <view class="cooperativeImgBox">
+                <image :src="loadImgSrc('/snbj.png')" class="cooperativeImg" @tap="goDetails"></image>
+            </view>
+            <view class="cooperativeBox">
+                <view class="list">
+                    <span class="listTitle">{{ item.name }}</span>
+                    <view class="jlSj">
+                        <span class="jf">
+                            {{ item.address }}
+                        </span>
+                    </view>
+                </view>
+            </view>
+            <em class="iconfont icon-xiangyoujiantou"></em>
+        </view>
+
+
+        <!-- 问答类别 -->
+
+        <!--<ul class="wendaFL">-->
+            <!--<li class="sanNong">-->
+                <!--<image :src="loadImgSrc('/snbj.png')" class="lbBj" @tap="goSanNong"></image>-->
+                <!--<h2>三农</h2>-->
+                <!--<span>1566</span>-->
+            <!--</li>-->
+            <!--<li class="jiuYe">-->
+                <!--<image :src="loadImgSrc('/jybj.png')" class="lbBj"></image>-->
+                <!--<h2>就业</h2>-->
+                <!--<span>1589</span>-->
+            <!--</li>-->
+        <!--</ul>-->
+        <!--<ul class="wendaFL">-->
+            <!--<li class="faLv">-->
+                <!--<image :src="loadImgSrc('/flbj.png')" class="lbBj"></image>-->
+                <!--<h2>法律</h2>-->
+                <!--<span>6589</span>-->
+            <!--</li>-->
+            <!--<li class="jiuZhen">-->
+                <!--<image :src="loadImgSrc('/jzbj.png')" class="lbBj"></image>-->
+                <!--<h2>就诊</h2>-->
+                <!--<span>1566</span>-->
+            <!--</li>-->
+        <!--</ul>-->
+        <!--<ul class="wendaFL">-->
+            <!--<li class="jiuYe">-->
+                <!--<image :src="loadImgSrc('/zkbj.png')" class="lbBj"></image>-->
+                <!--<h2>智库</h2>-->
+                <!--<span>1589</span>-->
+            <!--</li>-->
+            <!--<li class="sanNong">-->
+                <!--<image :src="loadImgSrc('/lybj.png')" class="lbBj"></image>-->
+                <!--<h2>旅游</h2>-->
+                <!--<span>6589</span>-->
+            <!--</li>-->
+        <!--</ul>-->
+        <!-- 问答列表 -->
+        <!--<view class="rnwdList" @tap="goDetails" v-for="(item, index) in wb" :key="index">-->
+            <!--<span class="lb">{{ item.type }}</span>-->
+
+            <!--<view class="list">-->
+                <!--<span class="listTitle">{{ item.title }}</span>-->
+                <!--<view class="jlSj">-->
+                    <!--<span class="jf">-->
+                        <!--{{ item.jf }}-->
+                        <!--<em class="iconfont icon-jifen"></em>-->
+                    <!--</span>-->
+                    <!--<view class="ck">-->
+                        <!--<span>-->
+                            <!--<em class="iconfont icon-pinglun"></em>-->
+                            <!--{{ item.pl }}-->
+                        <!--</span>-->
+                        <!--<span>-->
+                            <!--<em class="iconfont icon-chakan"></em>-->
+                            <!--{{ item.ck }}-->
+                        <!--</span>-->
+                        <!--<span>-->
+                            <!--<em class="iconfont icon-shoucang"></em>-->
+                            <!--{{ item.dz }}-->
+                        <!--</span>-->
+                    <!--</view>-->
+                <!--</view>-->
+            <!--</view>-->
+
+            <!--<em class="iconfont icon-xiangyoujiantou"></em>-->
+        <!--</view>-->
+    </view>
+</template>
+
+<script>
+// pages/fuwu/fuwu.js
+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"
+                }
+            ],
+
+
+            wb: [
+				{
+					ck: '10',
+					dz: '120',
+					id: 1,
+					jf: '100',
+					pl: '10',
+					title: '探索乡村能源供给新模式',
+					type: '三农'
+				},
+				{
+					ck: '20',
+					dz: '220',
+					id: 2,
+					jf: '200',
+					ly: '20',
+					title: '探索乡村能源供给新模式 美丽新画卷',
+					type: '三农'
+				},
+				{
+					ck: '30',
+					dz: '30',
+					id: 3,
+					jf: '300',
+					pl: '30',
+					title: '探索乡村能源供给新模式 绘就乡村振兴美丽新画卷',
+					type: '三农'
+				}
+			]
+        };
+    }
+    /**
+     * 生命周期函数--监听页面加载
+     */,
+    onLoad(options) {
+    },
+    methods: {
+        goSanNong() {
+            uni.navigateTo({
+                url: '/pages/sannong/sannong'
+            });
+        },
+
+        goDetails() {
+            uni.navigateTo({
+                url: '/pages/cooperative/details'
+            });
+        }
+    }
+};
+</script>
+<style>
+@import './cooperative.css';
+</style>

pages/handleAffairs/handleAffairs.vue

@@ -0,0 +1,123 @@
+<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/iconfont/iconfont.css

@@ -1,222 +0,0 @@
-@font-face {
-    font-family: 'iconfont'; /* Project id 3934749 */
-    src: url('http://at.alicdn.com/t/c/font_3934749_vw3yr60jge.woff2?t=1678514567333') format('woff2'),
-        url('http://at.alicdn.com/t/c/font_3934749_vw3yr60jge.woff?t=1678514567333') format('woff'),
-        url('http://at.alicdn.com/t/c/font_3934749_vw3yr60jge.ttf?t=1678514567333') format('truetype');
-}
-
-.iconfont {
-    font-family: 'iconfont' !important;
-    font-size: 16px;
-    font-style: normal;
-    -webkit-font-smoothing: antialiased;
-    -moz-osx-font-smoothing: grayscale;
-}
-
-.icon-zaixiankefu:before {
-    content: '\e617';
-}
-
-.icon-dianpu:before {
-    content: '\e678';
-}
-
-.icon-fenlei:before {
-    content: '\e620';
-}
-
-.icon-tuijianma:before {
-    content: '\e6a7';
-}
-
-.icon-shangpin:before {
-    content: '\e648';
-}
-
-.icon-shangpin2:before {
-    content: '\e622';
-}
-
-.icon-mingxi:before {
-    content: '\e689';
-}
-
-.icon-xinshouyindao:before {
-    content: '\e72f';
-}
-
-.icon-gengduo1:before {
-    content: '\e68b';
-}
-
-.icon-gongxiaoshelogo:before {
-    content: '\e629';
-}
-
-.icon-xinlizixun:before {
-    content: '\e655';
-}
-
-.icon-zhishi:before {
-    content: '\e62f';
-}
-
-.icon-wenzhen:before {
-    content: '\e856';
-}
-
-.icon-jurassic_nav:before {
-    content: '\e69e';
-}
-
-.icon-jurassic_nav1:before {
-    content: '\e69f';
-}
-
-.icon-youdaijiuzhu:before {
-    content: '\e6a0';
-}
-
-.icon-zhibo:before {
-    content: '\e605';
-}
-
-.icon-S_dianhuaxinlizixun:before {
-    content: '\e656';
-}
-
-.icon-zhishi1:before {
-    content: '\e813';
-}
-
-.icon-linshijiuzhu:before {
-    content: '\e653';
-}
-
-.icon-wenzhenguanli:before {
-    content: '\e613';
-}
-
-.icon-bianji:before {
-    content: '\e600';
-}
-
-.icon-shoucang1:before {
-    content: '\e659';
-}
-
-.icon-icon-:before {
-    content: '\e612';
-}
-
-.icon-shoucang2:before {
-    content: '\e603';
-}
-
-.icon-fasong:before {
-    content: '\e604';
-}
-
-.icon-xiangyoujiantou:before {
-    content: '\e641';
-}
-
-.icon-zhishiku1:before {
-    content: '\e650';
-}
-
-.icon-yuandianxiao:before {
-    content: '\e82f';
-}
-
-.icon-iclike:before {
-    content: '\e628';
-}
-
-.icon-falv1:before {
-    content: '\e619';
-}
-
-.icon-pinglun:before {
-    content: '\e63a';
-}
-
-.icon-licaiwenda:before {
-    content: '\e652';
-}
-
-.icon-lvyou:before {
-    content: '\e601';
-}
-
-.icon-jifen:before {
-    content: '\e897';
-}
-
-.icon--fuwu:before {
-    content: '\e8aa';
-}
-
-.icon-zhiku:before {
-    content: '\e6d8';
-}
-
-.icon-chakan:before {
-    content: '\e642';
-}
-
-.icon-shoucang:before {
-    content: '\e633';
-}
-
-.icon-zhishiku:before {
-    content: '\e621';
-}
-
-.icon-gonggao:before {
-    content: '\e60f';
-}
-
-.icon-jiuzhen:before {
-    content: '\ea4b';
-}
-
-.icon-jiuzhen1:before {
-    content: '\e610';
-}
-
-.icon-jiuye:before {
-    content: '\100dd';
-}
-
-.icon-sannongzhengce:before {
-    content: '\100de';
-}
-
-.icon-sannongzhengce1:before {
-    content: '\100e8';
-}
-
-.icon-gengduo:before {
-    content: '\e73a';
-}
-
-.icon-shangcheng11:before {
-    content: '\e67b';
-}
-
-.icon-hangqing:before {
-    content: '\e66c';
-}
-
-.icon-banshidating:before {
-    content: '\e602';
-}
-
-.icon-banshidating1:before {
-    content: '\e606';
-}
-
-.icon-wenhaofill:before {
-    content: '\e72c';
-}

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/me/me.css

@@ -1 +1,137 @@
 /* pages/me.wxss */
+/* #ifndef APP-PLUS-NVUE */
+page {
+    min-height: 100%;
+    height: auto;
+}
+/* #endif */
+
+/* 解决头条小程序字体图标不显示问题，因为头条运行时自动插入了span标签，且有全局字体 */
+/* #ifdef MP-TOUTIAO */
+/* text :not(view) {
+    font-family: uniicons;
+} */
+/* #endif */
+
+.uni-icon {
+    font-family: uniicons;
+    font-weight: normal;
+}
+
+.uni-container {
+    padding: 15px;
+    background-color: #f8f8f8;
+}
+
+.uni-header-logo {
+	/* #ifdef H5 */
+	display: flex;
+	/* #endif */
+    padding: 15px 15px;
+    flex-direction: column;
+    justify-content: center;
+    align-items: center;
+    margin-top: 10rpx;
+}
+
+.uni-header-image {
+    width: 80px;
+    height: 80px;
+}
+
+.uni-hello-text {
+    margin-bottom: 20px;
+}
+
+.hello-text {
+    color: #7A7E83;
+    font-size: 14px;
+    line-height: 20px;
+}
+
+.hello-link {
+    color: #7A7E83;
+    font-size: 14px;
+    line-height: 20px;
+}
+
+.uni-panel {
+    margin-bottom: 12px;
+}
+
+.uni-panel-h {
+	/* #ifdef H5 */
+	display: flex;
+	/* #endif */
+    background-color: #ffffff;
+    flex-direction: row !important;
+	/* justify-content: space-between !important; */
+    align-items: center !important;
+    padding: 12px;
+	/* #ifdef H5 */
+	cursor: pointer;
+	/* #endif */
+}
+/*
+.uni-panel-h:active {
+    background-color: #f8f8f8;
+}
+ */
+.uni-panel-h-on {
+    background-color: #f0f0f0;
+}
+
+.uni-panel-text {
+    flex: 1;
+    color: #000000;
+    font-size: 14px;
+    font-weight: normal;
+}
+
+.uni-panel-icon {
+    margin-left: 15px;
+    color: #999999;
+    font-size: 14px;
+    font-weight: normal;
+    transform: rotate(0deg);
+    transition-duration: 0s;
+    transition-property: transform;
+}
+
+.uni-panel-icon-on {
+    transform: rotate(180deg);
+}
+
+.uni-navigate-item {
+	/* #ifdef H5 */
+	display: flex;
+	/* #endif */
+    flex-direction: row;
+    align-items: center;
+    background-color: #FFFFFF;
+    border-top-style: solid;
+    border-top-color: #f0f0f0;
+    border-top-width: 1px;
+    padding: 12px;
+	/* #ifdef H5 */
+	cursor: pointer;
+	/* #endif */
+}
+
+.uni-navigate-item:active {
+    background-color: #f8f8f8;
+}
+
+.uni-navigate-text {
+    flex: 1;
+    color: #000000;
+    font-size: 14px;
+    font-weight: normal;
+}
+
+.uni-navigate-icon {
+    margin-left: 15px;
+    color: #999999;
+    font-size: 14px;
+    font-weight: normal;
+}

pages/me/me.vue

@@ -1,46 +1,124 @@
 <template>
-    <!-- pages/me.wxml -->
+	<!-- pages/me.wxml -->
+	<view class="uni-container">
+		<view class="uni-header-logo">
+			<img class="uni-header-image" :src="initInfo.headImg == null || initInfo.headImg == '' ? 'http://116.142.80.12:9000/10_03.png' : initInfo.headImg" />
+			<span>{{initInfo.name == null || initInfo.name == '' ? initInfo.wechatName : initInfo.name}}</span>
+			<text>{{initInfo.scoreNum}}</text>
+		</view>
+		<view class="uni-panel" v-for="(item, index) in list" :key="item.id">
+			<view class="uni-panel-h" :class="item.open ? 'uni-panel-h-on' : ''" @click="goDetailPage(index, item.id)">
+				<text class="uni-panel-text">{{item.name}}</text>
+				<text class="uni-panel-icon uni-icon" :class="item.open ? 'uni-panel-icon-on' : ''">{{item.pages ? '&#xe581;' : '&#xe470;'}}</text>
+			</view>
+		</view>
+	</view>
 </template>
 
 <script>
+import {getScore, getUserInfo} from '@/api/me/me.js'
 // pages/me.js
 export default {
-    data() {
-        return {};
-    }
-    /**
-     * 生命周期函数--监听页面加载
-     */,
-    onLoad(options) {},
-    /**
-     * 生命周期函数--监听页面初次渲染完成
-     */
-    onReady() {},
-    /**
-     * 生命周期函数--监听页面显示
-     */
-    onShow() {},
-    /**
-     * 生命周期函数--监听页面隐藏
-     */
-    onHide() {},
-    /**
-     * 生命周期函数--监听页面卸载
-     */
-    onUnload() {},
-    /**
-     * 页面相关事件处理函数--监听用户下拉动作
-     */
-    onPullDownRefresh() {},
-    /**
-     * 页面上拉触底事件的处理函数
-     */
-    onReachBottom() {},
-    /**
-     * 用户点击右上角分享
-     */
-    onShareAppMessage() {},
-    methods: {}
+	data() {
+		return {
+			initInfo:{
+				userId: null,
+				scoreNum: 0,
+				wechatName: "微信用户",
+				name: null,
+				headImg: null,
+			},
+			list: [
+				{
+					id: 'me/meOperate',//id是文件路径
+					name: '我的积分流水',
+					open: false,
+					pages: ['meOperate']
+				},
+				{
+					id: 'wenba/wenba',
+					name: '我的问答',
+					open: false,
+					pages: ['meOperate']
+				}
+			]
+		};
+	},
+	/**
+	 * 生命周期函数--监听页面加载
+	 */ onLoad(options) {},
+	/**
+	 * 生命周期函数--监听页面初次渲染完成
+	 */
+	onReady() {
+		this.userId = getApp().globalData.userId
+		this.getUserInfoByUserId(this.userId)
+		this.getScoreForMe(this.userId)
+	},
+	/**
+	 * 生命周期函数--监听页面显示
+	 */
+	onShow() {},
+	/**
+	 * 生命周期函数--监听页面隐藏
+	 */
+	onHide() {},
+	/**
+	 * 生命周期函数--监听页面卸载
+	 */
+	onUnload() {},
+	/**
+	 * 页面相关事件处理函数--监听用户下拉动作
+	 */
+	onPullDownRefresh() {},
+	/**
+	 * 页面上拉触底事件的处理函数
+	 */
+	onReachBottom() {},
+	/**
+	 * 用户点击右上角分享
+	 */
+	onShareAppMessage() {},
+	methods: {
+		goDetailPage(panel, e) {
+			if (typeof e === 'string') {
+				const url = '/pages/' + e
+				if (this.hasLeftWin) {
+					uni.reLaunch({
+						url: url
+					})
+				} else {
+					uni.navigateTo({
+						url: url
+					})
+				}
+			} else {
+				if (this.hasLeftWin) {
+					uni.reLaunch({
+						url: e.url
+					})
+				} else {
+					uni.navigateTo({
+						url: e.url
+					})
+				}
+			}
+		},
+		//获取用户信息：用户名称：头像
+		getUserInfoByUserId(userId){
+			getUserInfo(userId).then(res =>{
+				this.initInfo.wechatName = res.data.wechatName;
+				this.initInfo.name = res.data.name;
+				this.initInfo.wechatName = res.data.wechatName;
+			})
+		},
+		//获取当前积分
+		getScoreForMe(userId){
+			getScore(this.userId).then(res =>{
+				this.initInfo.scoreNum = res.data.scoreNum
+			})
+		}
+	}
 };
 </script>
 <style>

pages/me/meOperate.vue

@@ -0,0 +1,22 @@
+<template>
+	<view>
+		
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style>
+
+</style>

pages/themeType/themeType.vue

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

pages/wenbaxiangqing/wenbaxiangqing.vue

@@ -46,8 +46,8 @@
                     <view class="txTime">
                         <image :src="loadImgSrc('/moren.png')"></image>
                         <view class="time">
-                            <p>{{ e.deptName }}</p>
-                            <span>{{ e.updateTime }}</span>
+                            <p>国家乡村振兴局</p>
+                            <span>2023-2-27 16:04</span>
                         </view>
                     </view>
 					<!-- <div class="effectBox"  :style="{ top: adoptTopSize + '%' }">精选答案</div> -->
@@ -60,7 +60,7 @@
         <view class="fabiaoPl" :class="isCollection ? 'collect' : 'not-collect'">
             <view class="shuRu">
                 <em class="iconfont icon-bianji"></em>
-                <input placeholder="请输入内容，友好回答" v-model="anwserVal"/>
+                <input placeholder="请输入内容，友好回答" />
             </view>
             <em 
 				class="iconfont icon-shoucang" 
@@ -143,6 +143,7 @@ export default {
      * 用户点击右上角分享
      */
     onShareAppMessage() {},
+    methods: {}
 };
 </script>
 <style lang="scss">

store/modules/user.js

@@ -42,7 +42,9 @@ const user = {
     Login({ commit }, code) {
       return new Promise((resolve, reject) => {
         wxLogin(code).then(res => {
-          setToken(res.token)
+          setToken(res.data.token)
+		  //全局设置userId
+		  getApp().globalData.userId= res.data.userId
           commit('SET_TOKEN', res.token)
           resolve()
         }).catch(error => {