Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/H5/threeSide

pyt

2025-02-24 e874373045eb487bcd765e9d5fc8a708bc0f2294

Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/H5/threeSide

 H5/pages/components/certificate/certificate.vue

@@ -13,9 +13,9 @@
                                <text>所在党组织：</text>
                            </view>
                            <view class="flex flex-column a-end lh-48">
                                <text>李雷</text>
                                <text>500000000000000000</text>
                                <text>成都市锦江区XXXXX部门</text>
                                <text>{{info.name}}</text>
                                <text>{{info.idCard}}</text>
                                <text>{{info.partyOrganization}}</text>

                            </view>
                        </view>
@@ -25,7 +25,7 @@
                        <view class="btn_left" @click="onclose">
                            关闭
                        </view>
                        <view class="btn_right">
                        <view class="btn_right" @click="onclose">
                            编辑
                        </view>
                    </view>
@@ -37,22 +37,31 @@
</template>

<script>
    import {
        getInfo
    } from './service.js'
    export default {
        props: {
            show: Boolean
        },
        data() {
            return {

info:{},
            };
        },

        methods: {
            open() {

                getInfo().then(resp => {
                    console.log(resp, '党员信息');
                    if(resp.code==200){
                        this.info =resp.data
                    }
                })
            },

            onclose() {
                this.$emit('onCancel',false)
                this.$emit('onCancel', false)
            },
        },
        created() {},

 H5/pages/components/certificate/service.js

@@ -1,8 +1,6 @@
import request from '@/utils/request.js'

export const getBanner =(params)=>{
    return request.get(`/api/huacheng-sangeshenbian/applet/home/banner-list`,params)
export const getInfo =(params)=>{
    return request.get(`/api/huacheng-sangeshenbian/applet/home/party-card-info`,params)
} 
export const getMessagelist =(params)=>{
    return request.post(`/api/huacheng-sangeshenbian/applet/home/message`,params)
} 


 H5/pages/index/index.vue

@@ -115,15 +115,26 @@
                list1: [],
                showData: false,
                isClick: false,
                pageNum:1,
            }
        },
        onLoad() {
this.getBanner()
            this.getBanner()
            this.getMessagelist()
        },
        methods: {
            getBanner(){
                getBanner().then(resp=>{
                    console.log(resp,'获取banner');
            getBanner() {
                getBanner().then(resp => {
                    console.log(resp, '获取banner');
                })
            },
            getMessagelist() {
                const data = {
                    pageNum: this.pageNum,
                    pageSize: 10
                }
                getMessagelist(data).then(resp => {
                    console.log(resp, '获取消息列表');
                })
            },
            change() {

 H5/pages/location/location.vue

@@ -4,9 +4,9 @@
            <view slot="left">
                <image src="/static/location/back.png" class="w-19 h-35" mode=""></image>
            </view>
        </u-navbar>

        <view class="" id="container">

			
        </u-navbar>
        <view class="" id="container">
			
        </view>
        <view class="">
            <view class="searchMain mb-35">
@@ -38,14 +38,14 @@
                latitude: 39.909,
                longitude: 116.39742,
            };
        },

        mounted() {

			
        },
         onReady() {

             var map = new BMapGL.Map("container");          // 创建地图实例 
             var point = new BMapGL.Point(116.404, 39.915);  // 创建点坐标 
             map.centerAndZoom(point, 15);   
        mounted() {
			
        },
         onReady() {
             var map = new BMapGL.Map("container");          // 创建地图实例 
             var point = new BMapGL.Point(116.404, 39.915);  // 创建点坐标 
             map.centerAndZoom(point, 15);   
         }
    }
</script>

 H5/utils/request.js

@@ -19,8 +19,7 @@

    return new Promise(function(resolve, reject) {

        let token = uni.getStorageSync('token') ||
            'eyJhbGciOiJIUzUxMiJ9.eyJzdWIiOjE4OTI0ODk0OTc5Nzk5NDA4NjUsInR5cGUiOjEsImV4cCI6MTc0MTY3MTI5OSwiY3JlYXRlZCI6MTc0MDM3NTI5OTQwNn0.39bIG5k-yClEWnUXvA63rjS631pj6fykU-J6vrC5u3HczL8NSwT_3pdVkj3hr4qikCrE7i9hmNkU_aLch1sw8A'
        let token = 'Bearer eyJhbGciOiJIUzUxMiJ9.eyJzdWIiOjE2MTc3LCJ0eXBlIjoxLCJleHAiOjE3NDE2NjExMDYsImNyZWF0ZWQiOjE3NDAzNjUxMDY1MTh9.XRkMgKjEhRo6_BQK5fEVQ_Pv5bM-xeT36s4ju4Oh1F7ZmkIQOJUrdDnefub13JO6rZs3GT6dKnHZgCSyyQpsjg'
        let header = {
            'content-type': type ? 'application/x-www-form-urlencoded;charset=UTF-8' : 'application/json',
            'Authorization': 'Bearer ' + token,