Merge branch 'master' of http://42.193.1.25:9521/r/qyjz_applet

odc.xiaohui

2023-03-06 502f4056d681b27bec8fa1ace2963e2f9db60707

Merge branch 'master' of http://42.193.1.25:9521/r/qyjz_applet

 miniprogram/app.ts

@@ -1,8 +1,8 @@
// app.ts
App({
  globalData: {
    //    url:'https://qyqgawx.cdqingyang.gov.cn/qyjz',
       url:'https://qyqjzdd.cdqingyang.gov.cn/qyjz',
    //    url:'https://qyqjzdd.cdqingyang.gov.cn/qyjz',
       url:'http://192.168.3.220:8080',
    //    url:'http://221.237.182.28:8443/api',
       imageUrl:'http://qyqjzdd.cdqingyang.gov.cn/minio'
},

 miniprogram/pages/icon/9_baoanguangli.png

 miniprogram/pages/user/group/index.ts

@@ -6,11 +6,10 @@
    data: {
        groupList: []
    },
    toHome(){
        wx.navigateTo({url:"../../user/index"})
    toHome() {
        wx.navigateBack()
    },
    openGroup(e) {
        console.log(e)
        wx.navigateTo({
            url: "../../user/group/message/index?id=" + e.currentTarget.id + "&&ban=" + e.currentTarget.dataset.ban + "&&reportId=" + e.currentTarget.dataset.rptid
        })
@@ -39,8 +38,6 @@
            secends = "0" + secends
        }
        time = date.getFullYear() + "-" + month + "-" + day + " " + hours + ":" + minutes + ":" + secends
        console.log(time)
        console.log("lastDate", wx.getStorageSync('time'))
        var lastTime = wx.getStorageSync('time')
        wx.request(
            {
@@ -58,7 +55,6 @@
                        groupList: res.data.data
                    })
                }

            })
    }
})

 miniprogram/pages/user/index.ts

@@ -6,7 +6,7 @@
    data: {
        isShow: false,
        userInfo: {},
        causeList:[]
        causeList: []
    },
    // 事件处理函数
    bindViewTap() {
@@ -17,59 +17,58 @@


    onLoad() {
        if( wx.getStorageSync('info')==''){
        if (wx.getStorageSync('info') == '') {
            wx.redirectTo({
                url: '../user/loginInfo/index'
            })
        }
        wx.request(  
        wx.request(
            {
              url:user.globalData.url+"/wx/publicity?size="+"4",
              method:"GET",
              header:{'token':wx.getStorageSync('token')},
              success:(res)=>{
                console.log(res)
                  this.setData({
                    causeList:res.data.data
                  })
              
              }
                  })
                url: user.globalData.url + "/wx/publicity?size=" + "4",
                method: "GET",
                header: { 'token': wx.getStorageSync('token') },
                success: (res) => {
                    console.log(res)
                    this.setData({
                        causeList: res.data.data
                    })
                }
            })
    },
    getReport() {
        console.log("xxx")
        wx.navigateTo({
            url: '../user/report/index'
        })
    }
    ,getPublicty(){
    },
    getPublicty() {
        console.log("publicty")
        wx.navigateTo({
            url:'../user/pubulicty/index'
            url: '../user/pubulicty/index'
        })
        
    }
    ,getGroup(){
    },
    getGroup() {
        console.log("group")
        wx.navigateTo({
            url:'../user/group/index'
        })}
    ,getCause(){
            url: '../user/group/index'
        })
    },
    getCause() {
        console.log("cause")
        wx.navigateTo({
            url:'../manager/cause/index'
            url: '../manager/cause/index'
        })
    }
    ,getAudi(){
    },
    getAudi() {
        console.log("myself")
        wx.navigateTo({
            url:'../user/myself/index'
            url: '../user/myself/index'
        })
    }
    ,more(){
    },
    more() {
        console.log("myself")
        wx.navigateTo({
            url:'../user/pubulicty/index'
            url: '../user/pubulicty/index'
        })
    }
})

 miniprogram/pages/user/index.wxml

@@ -14,7 +14,7 @@
            <text class="font-wenzi">公共宣传</text>
        </view>
        <view class="box1" bindtap="getReport">
            <image class="icon" src="../icon/9-报案管理.png"></image>
            <image class="icon" src="../icon/9_baoanguangli.png"></image>
            <text class="font-wenzi">我要报案</text>
        </view>
        <view class="box1" bindtap="getAudi">
@@ -24,7 +24,7 @@
    </view>
    <!-- <view class="container3">
        <view class="box3" bindtap="getReport">
            <image class="icon" src="../icon/9-报案管理.png"></image>
            <image class="icon" src="../icon/9_baoanguangli.png"></image>
            <text class="font-wenzi">我要报案</text>
        </view>
        <view class="box4" bindtap="getAudi">

 miniprogram/pages/user/pubulicty/index.ts

@@ -3,24 +3,23 @@
const userCause = getApp()

Page({
  data: {
    causeList:[],
    isShow:false
  },
  // 事件处理函数
  onLoad() {
    wx.request(  
        {
          url:userCause.globalData.url+"/wx/publicity",
          method:"GET",
          header:{'token':wx.getStorageSync('token')},
          success:(res)=>{
            console.log(res)
              this.setData({
                causeList:res.data.data
              })
              
          }
              })
    data: {
        causeList: [],
        isShow: false
    },
    // 事件处理函数
    onLoad() {
        wx.request(
            {
                url: userCause.globalData.url + "/wx/publicity",
                method: "GET",
                header: { 'token': wx.getStorageSync('token') },
                success: (res) => {
                    console.log(res)
                    this.setData({
                        causeList: res.data.data
                    })
                }
            })
    }
})

 miniprogram/pages/user/pubulicty/index.wxml

@@ -1,13 +1,16 @@
<!--index.wxml-->
<view class="container">
    <view  class="imageView">
        <image  style="width:100%;"  class="indexImage" src="../../../image/5f9c1ee836fbee333ca3a0088e53d2f.png"></image>
    <view class="imageView">
        <image style="width:100%;" class="indexImage" src="../../../image/test3.jpg"></image>
        <!-- <text class="font-name">青阳经侦</text> -->
    </view>
</view>
<view class="content">
    <view class="lists" wx:for="{{causeList}}" wx:key="id">
            <view class="item2">{{item.releaseTime}}</view>
            <view class="item">{{item.publicityTitle}}</view>
            <view class="item3">{{item.text}}</view>
    <view class="content" style="width:100%;">
        <view class="lists" wx:for="{{causeList}}" wx:key="id">
            <view class="lists-top">
                <view class="lists-top-title">{{item.publicityTitle}}</view>
                <view class="lists-top-time">{{item.releaseTime}}</view>
            </view>
            <view class="lists-content">{{item.text}}</view>
        </view>
    </view>
</view>

 miniprogram/pages/user/pubulicty/index.wxss

@@ -1,33 +1,42 @@
.imageView {
    width: 100%;
}

.imageView{
    position:absolute;
    top: 0;
    left: 0;
    right: 0;
}
.container{
.container {
    width: 100%;
}
.content{
    margin-top: 12%;

.content {
    margin-top: 1rem;
}
.lists{
    /* margin-top: 50% ; */
    border-bottom: 1px solid rgba(0,0,0,0.1);

.lists {
    margin-top: 0.5rem;
    border-bottom: 1px solid rgba(0, 0, 0, 0.1);
    width: 100%;
    margin-left: 2%;
}
.item{
    font-size: 14px;
    margin-bottom: 1%;

.lists .lists-top {
    display: flex;
    justify-content: space-between;
}
.item2{

.lists .lists-top .lists-top-time {
    font-size: 12px;
    float: right;
    margin-right: 40%;
    color:rgba(0,0,0,0.5);
    margin-bottom: 1%;
    color: rgba(0, 0, 0, 0.5);
    margin-right: 0.5rem;
}
.item3{

.lists .lists-top .lists-top-title {
    font-size: 14px;
    margin-right: 40%;
    font-weight: bold;
    margin-left: 0.5rem;
}

.lists .lists-content {
    font-size: 11px;
    margin-bottom: 2%;
    margin: 0.5rem;
    margin-bottom: 0.5rem;
}