bug修改
This commit is contained in:
@@ -1,27 +1,43 @@
|
||||
// app.js
|
||||
import UserApi from 'assets/js/http/userApi'
|
||||
import { wxBind } from 'assets/js/common'
|
||||
App({
|
||||
onLaunch() {
|
||||
// 展示本地存储能力
|
||||
const logs = wx.getStorageSync('logs') || []
|
||||
logs.unshift(Date.now())
|
||||
wx.setStorageSync('logs', logs)
|
||||
// wx.getStorage({
|
||||
// key: 'X-Access-Token',
|
||||
// success: (res) =>{// 缓存中登录过,直接进小程序
|
||||
// wx.switchTab({
|
||||
// url: 'pages/home/home',
|
||||
// })
|
||||
// },
|
||||
// fail: function(){
|
||||
// // 缓存中没有登录过默认app.json的登录页
|
||||
// }
|
||||
// })
|
||||
// 登录
|
||||
wx.login({
|
||||
success: res => {
|
||||
// 发送 res.code 到后台换取 openId, sessionKey, unionId
|
||||
// 长时间不操作导致token失效之后执行自动微信登录操作
|
||||
wx.getStorage({
|
||||
key: 'rsaPublicKey',
|
||||
success(result){
|
||||
wxBind((res)=>{
|
||||
let params = {
|
||||
openId: res.data.openid,
|
||||
rsaPublicKey: result.rsaPublicKey
|
||||
}
|
||||
UserApi.wxLogin(params).then(res=>{
|
||||
if(res.success) { // 已经用手机号登录过,此时用微信快捷登录时,把微信的个人信息存进缓存(微信信息在缓存的userInfoTemp)
|
||||
wx.setStorageSync('userInfo', res.result.userInfo)
|
||||
wx.setStorage({
|
||||
key: 'X-Access-Token',
|
||||
data: res.result.token
|
||||
})
|
||||
wx.switchTab({
|
||||
url: '../home/home',
|
||||
})
|
||||
}else{ // 首次登录不能直接用微信快捷登录
|
||||
wx.showToast({
|
||||
title: '暂无授权手机号, 请重新登录',
|
||||
icon: 'none',
|
||||
duration: 2000
|
||||
})
|
||||
}
|
||||
})
|
||||
})
|
||||
}
|
||||
})
|
||||
|
||||
},
|
||||
globalData: {
|
||||
userInfo: null
|
||||
|
||||
@@ -41,7 +41,7 @@ Page({
|
||||
// 分标委详情页
|
||||
detail(e){
|
||||
wx.navigateTo({
|
||||
url: `../committeeDetail/committeeDetail?id=${e.currentTarget.dataset.committee.id}`,
|
||||
url: `../committeeDetail/committeeDetail?id=${e.currentTarget.dataset.committee.id}&name=${e.currentTarget.dataset.committee.name}`,
|
||||
})
|
||||
},
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{
|
||||
"navigationBarTitleText": "分标委",
|
||||
"navigationBarTitleText": "项目",
|
||||
"usingComponents": {}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -8,6 +8,7 @@ Page({
|
||||
*/
|
||||
data: {
|
||||
form: {},
|
||||
name: '',
|
||||
id: '', // 在工作组id,项目id
|
||||
projectFileList: [], // 项目资料文件
|
||||
meetingList: [] // 会议文件
|
||||
@@ -35,12 +36,15 @@ Page({
|
||||
* 生命周期函数--监听页面加载
|
||||
*/
|
||||
onLoad: function (options) {
|
||||
this.setData({
|
||||
name: options.name
|
||||
})
|
||||
wx.showToast({
|
||||
title: '加载中...',
|
||||
icon: 'loading'
|
||||
})
|
||||
this.data.id = options.id
|
||||
MeetingApi.meetingList({caseCommitteeId: this.data.id}).then(res=>{
|
||||
MeetingApi.meetingList({caseCommitteeId: this.data.id, meetingSignUpType: 2, column: 'pm.createTime', order: 'desc'}).then(res=>{
|
||||
if(res.success){
|
||||
if(res.result.records && res.result.records.length <= 2){
|
||||
this.setData({
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{
|
||||
"navigationBarTitleText": "详情",
|
||||
"navigationBarTitleText": "项目详情",
|
||||
"usingComponents": {}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
<view class="basic-info">
|
||||
<view class="meeting-name">
|
||||
<text>项目名称</text>
|
||||
<text>{{form.name}}</text>
|
||||
<text>{{name}}</text>
|
||||
</view>
|
||||
<view style="height: auto !important;">
|
||||
<text>项目资料</text>
|
||||
@@ -26,4 +26,4 @@
|
||||
</view>
|
||||
<text wx:if="{{meetingList.length == 0}}" class="no-data" style="height: 40px;">暂无会议记录!</text>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
@@ -41,6 +41,11 @@ page{
|
||||
.meeting-name{
|
||||
margin-bottom: 10px;
|
||||
}
|
||||
.meeting-name text:nth-child(2){
|
||||
text-overflow:ellipsis;
|
||||
overflow: hidden;
|
||||
white-space: nowrap;
|
||||
}
|
||||
.meeting-files{
|
||||
margin-top: 10px;
|
||||
flex-direction: column;
|
||||
@@ -145,6 +150,7 @@ page{
|
||||
.info-file text{
|
||||
display: block;
|
||||
width: 100%;
|
||||
text-align: right;
|
||||
overflow:hidden;
|
||||
text-overflow: ellipsis;
|
||||
white-space: nowrap;
|
||||
@@ -267,4 +273,4 @@ page{
|
||||
display: block;
|
||||
text-align: center;
|
||||
line-height: 40px;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -7,6 +7,12 @@ Page({
|
||||
data: {
|
||||
form: {}
|
||||
},
|
||||
// 跳转项目详情
|
||||
projectDetail(e){
|
||||
wx.navigateTo({
|
||||
url: `../projectDetail/projectDetail?id=${e.currentTarget.dataset.file.id}`,
|
||||
})
|
||||
},
|
||||
// 查看物流
|
||||
track(e){
|
||||
// 查看物流
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{
|
||||
"navigationBarTitleText": "详情",
|
||||
"navigationBarTitleText": "合同详情",
|
||||
"usingComponents": {}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -17,12 +17,12 @@
|
||||
</view>
|
||||
<view>
|
||||
<text>合同金额</text>
|
||||
<text>{{form.contractAmount ? form.contractAmount + '元' : 0}}</text>
|
||||
<text>{{form.contractAmount ? form.contractAmount + '元' : ''}}</text>
|
||||
</view>
|
||||
<view>
|
||||
<text>关联项目</text>
|
||||
<view class="ass-project">
|
||||
<text wx:for="{{form.listProject}}" data-file="{{item}}" wx:key="item">{{item.chargeProject}}撒打算打sadsaasdsadas算阿江河湖海三打算</text>
|
||||
<text wx:for="{{form.listProject}}" data-file="{{item}}" wx:key="item" bindtap="projectDetail">{{item.chargeProject}}</text>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
@@ -30,9 +30,10 @@
|
||||
<view class="title">
|
||||
<text>邮寄信息</text>
|
||||
</view>
|
||||
<view class="email-info">
|
||||
<text>{{form.contractNum}}由{{form.payMailContract.createBy}}于{{form.payMailContract.createTime}}邮寄,快递号:{{form.payMailContract.postNo}}</text>
|
||||
<view class="email-info" wx:if="{{form.contractNum}}">
|
||||
<text>{{form.contractNum}}由{{form.payMailContract.mailName}}于{{form.payMailContract.createTime}}邮寄,快递号:{{form.payMailContract.postNo}}</text>
|
||||
<text bindtap="track">查看物流</text>
|
||||
</view>
|
||||
<text wx:if="{{!form.contractNum}}" class="no-data">暂无邮寄记录!</text>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
{
|
||||
"navigationBarTitleText": "忘记密码",
|
||||
"usingComponents": {}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -16,7 +16,7 @@
|
||||
</view>
|
||||
<view class="form-item">
|
||||
<view class="text-label">新密码</view>
|
||||
<view class="text-value">
|
||||
<view class="text-value text-password">
|
||||
<input name="password" value="{{password}}" password="{{show}}" placeholder="请输入新密码" />
|
||||
<image src="../../assets/images/show.png" class="show" wx:if="{{!show}}" bindtap="showPassword"></image>
|
||||
<image src="../../assets/images/none.png" class="show" wx:if="{{show}}" bindtap="showPassword"></image>
|
||||
@@ -24,7 +24,7 @@
|
||||
</view>
|
||||
<view class="form-item">
|
||||
<view class="text-label">确认密码</view>
|
||||
<view class="text-value">
|
||||
<view class="text-value text-password">
|
||||
<input name="verifyPassword" bindblur="bindBlurInput" value="{{verifyPassword}}" password="{{showVerify}}" placeholder="请输入确认密码" />
|
||||
<image src="../../assets/images/show.png" class="show" wx:if="{{!showVerify}}" bindtap="showPasswordVerify"></image>
|
||||
<image src="../../assets/images/none.png" class="show" wx:if="{{showVerify}}" bindtap="showPasswordVerify"></image>
|
||||
|
||||
@@ -9,6 +9,9 @@ page {
|
||||
.text-value{
|
||||
position: relative;
|
||||
}
|
||||
.text-password input{
|
||||
padding-right: 30px;
|
||||
}
|
||||
.show{
|
||||
width: 15px;
|
||||
height: 15px;
|
||||
@@ -16,4 +19,4 @@ page {
|
||||
right: 10px;
|
||||
top: 8px;
|
||||
z-index: 9;
|
||||
}
|
||||
}
|
||||
|
||||
+2
-1
@@ -11,7 +11,7 @@ Page({
|
||||
date: '',
|
||||
list: [], // 消息列表
|
||||
selectArr: [
|
||||
{ path: '../../assets/images/laikuan.png', text: '来款项目' },
|
||||
{ path: '../../assets/images/laikuan.png', text: '项目' },
|
||||
{ path: '../../assets/images/gongzuozu.png', text: '工作组' },
|
||||
{ path: '../../assets/images/fenbiaowei.png', text: '分标委' },
|
||||
{ path: '../../assets/images/huiyi.png', text: '会议活动' },
|
||||
@@ -98,6 +98,7 @@ Page({
|
||||
const templateCode = e.currentTarget.dataset.message.templateCode
|
||||
if(readFlag == 0) { // 标记已读
|
||||
UserApi.messageStatus({anntId: e.currentTarget.dataset.message.anntId}).then(res=>{
|
||||
this.loadData()
|
||||
wx.showToast({
|
||||
title: '已读成功',
|
||||
icon: 'none'
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
{
|
||||
"navigationBarTitleText": "首页",
|
||||
"usingComponents": {},
|
||||
"navigationStyle": "custom"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -30,7 +30,7 @@
|
||||
</picker>
|
||||
</view>
|
||||
<view class="select-item">
|
||||
<picker mode="date" value="{{searchParams.startTime}}" start="2021-01-01" end="2030-12-31" bindchange="bindDateChange">
|
||||
<picker mode="date" value="{{searchParams.startTime}}" start="2000-01-01" end="2050-12-31" bindchange="bindDateChange">
|
||||
<view class="picker">
|
||||
<text wx:if="{{!searchParams.startTime}}">时间</text>
|
||||
<text wx:if="{{searchParams.startTime}}">{{searchParams.startTime}}</text>
|
||||
@@ -58,7 +58,7 @@
|
||||
</view>
|
||||
</view>
|
||||
<view wx:if="{{list.length === 0}}" class="no-data">
|
||||
<text>暂无数据</text>
|
||||
<text>暂无消息通知!</text>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
@@ -67,12 +67,14 @@ page{
|
||||
border-radius: 10px;
|
||||
}
|
||||
.list-content .list-content-item{
|
||||
height: 60px;
|
||||
min-height: 50px;
|
||||
padding: 5px 0;
|
||||
border-bottom: 0.5px solid #f5f5f5;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
justify-content: space-around;
|
||||
position: relative;
|
||||
|
||||
}
|
||||
.list-content-item:last-child{
|
||||
border: 0;
|
||||
@@ -104,9 +106,13 @@ page{
|
||||
.content-bottom{
|
||||
color: #555;
|
||||
font-size: 13px;
|
||||
white-space: nowrap;
|
||||
display: -webkit-box;
|
||||
-webkit-box-orient: vertical;
|
||||
-webkit-line-clamp: 3;
|
||||
text-overflow: ellipsis;
|
||||
overflow: hidden;
|
||||
line-height: 20px;
|
||||
margin-top: 5px;
|
||||
}
|
||||
.status{
|
||||
position: absolute;
|
||||
|
||||
+100
-25
@@ -9,8 +9,10 @@ Page({
|
||||
captcha: '',
|
||||
openId: '',
|
||||
count: 60,
|
||||
userInfoTemp: '',
|
||||
rsaPublicKey: '',
|
||||
showGetCaptcha: true
|
||||
showGetCaptcha: true,
|
||||
authorize: false // 默认没有微信授权
|
||||
},
|
||||
|
||||
bindInputPhone(e) {
|
||||
@@ -87,33 +89,98 @@ Page({
|
||||
},
|
||||
// 微信登录
|
||||
wxLogin(){
|
||||
wx.showToast({
|
||||
title: '登录中...',
|
||||
icon: 'loading'
|
||||
})
|
||||
const that = this
|
||||
wxBind((res)=>{
|
||||
let params = {
|
||||
openId: res.data.openid,
|
||||
rsaPublicKey: that.data.rsaPublicKey
|
||||
}
|
||||
UserApi.wxLogin(params).then(res=>{
|
||||
if(res.success) {// 已经用手机号登录过,此时用微信快捷登录时,把微信的个人信息存进缓存(微信信息在缓存的userInfoTemp)
|
||||
wx.setStorageSync('userInfo', res.result.userInfo)
|
||||
wx.setStorage({
|
||||
key: 'X-Access-Token',
|
||||
data: res.result.token
|
||||
})
|
||||
wx.switchTab({
|
||||
url: '../home/home',
|
||||
})
|
||||
}else{ // 首次登录不能直接用微信快捷登录
|
||||
wx.getStorage({
|
||||
key: 'authorize',
|
||||
success(result){
|
||||
// 做过查看微信用户信息
|
||||
if(result.data){ // 做过用户信息获取
|
||||
wx.showToast({
|
||||
title: '暂无授权手机号',
|
||||
icon: 'none'
|
||||
title: '登录中...',
|
||||
icon: 'loading'
|
||||
})
|
||||
wxBind((res)=>{
|
||||
let params = {
|
||||
openId: res.data.openid,
|
||||
rsaPublicKey: that.data.rsaPublicKey
|
||||
}
|
||||
UserApi.wxLogin(params).then(res=>{
|
||||
if(res.success) {// 已经用手机号登录过,此时用微信快捷登录时,把微信的个人信息存进缓存(微信信息在缓存的userInfoTemp)
|
||||
wx.setStorageSync('userInfo', res.result.userInfo)
|
||||
wx.setStorage({
|
||||
key: 'X-Access-Token',
|
||||
data: res.result.token
|
||||
})
|
||||
wx.switchTab({
|
||||
url: '../home/home',
|
||||
})
|
||||
wx.setStorageSync('authorize', true) // 设置有过微信授权
|
||||
wx.setStorageSync('avatarUrl', that.data.userInfoTemp.avatarUrl)
|
||||
}else{ // 首次登录不能直接用微信快捷登录
|
||||
wx.showToast({
|
||||
title: '暂无授权手机号',
|
||||
icon: 'none'
|
||||
})
|
||||
}
|
||||
})
|
||||
})
|
||||
}else{
|
||||
that.getUserInfo()
|
||||
}
|
||||
})
|
||||
},
|
||||
fail(err){
|
||||
// 没有做过查看微信用户信息
|
||||
that.getUserInfo()
|
||||
}
|
||||
})
|
||||
},
|
||||
// 获取用户信息,微信登录
|
||||
getUserInfo(){
|
||||
const that = this
|
||||
wx.getUserProfile({
|
||||
desc: '用于完善用户信息',
|
||||
success(result){
|
||||
let userInfoTemp = JSON.parse(result.rawData)
|
||||
wx.setStorage({
|
||||
key: 'userInfoTemp',
|
||||
data: userInfoTemp
|
||||
})
|
||||
that.setData({
|
||||
userInfoTemp
|
||||
})
|
||||
wx.showToast({
|
||||
title: '登录中...',
|
||||
icon: 'loading'
|
||||
})
|
||||
wxBind((res)=>{
|
||||
let params = {
|
||||
openId: res.data.openid,
|
||||
rsaPublicKey: that.data.rsaPublicKey
|
||||
}
|
||||
UserApi.wxLogin(params).then(res=>{
|
||||
if(res.success) {// 已经用手机号登录过,此时用微信快捷登录时,把微信的个人信息存进缓存(微信信息在缓存的userInfoTemp)
|
||||
wx.setStorageSync('userInfo', res.result.userInfo)
|
||||
wx.setStorage({
|
||||
key: 'X-Access-Token',
|
||||
data: res.result.token
|
||||
})
|
||||
wx.switchTab({
|
||||
url: '../home/home',
|
||||
})
|
||||
wx.setStorageSync('authorize', true) // 设置有过微信授权
|
||||
wx.setStorageSync('avatarUrl', that.data.userInfoTemp.avatarUrl)
|
||||
}else{ // 首次登录不能直接用微信快捷登录
|
||||
wx.showToast({
|
||||
title: '暂无授权手机号',
|
||||
icon: 'none'
|
||||
})
|
||||
}
|
||||
})
|
||||
})
|
||||
},
|
||||
fail(err){
|
||||
wx.setStorageSync('authorize', false)
|
||||
}
|
||||
})
|
||||
},
|
||||
// 登录
|
||||
@@ -201,7 +268,15 @@ Page({
|
||||
})
|
||||
},
|
||||
onLoad(){
|
||||
|
||||
const that = this
|
||||
wx.getStorage({
|
||||
key: 'userInfoTemp',
|
||||
success(res){
|
||||
that.setData({
|
||||
userInfoTemp: res.data
|
||||
})
|
||||
}
|
||||
})
|
||||
},
|
||||
/**
|
||||
* 生命周期函数--监听页面显示
|
||||
|
||||
@@ -15,7 +15,7 @@ Page({
|
||||
meetingStartTime: '', // 开始时间
|
||||
meetingEndTime: '', // 结束时间
|
||||
// 创建时间倒叙排序
|
||||
column: 'createTime',
|
||||
column: 'pm.createTime',
|
||||
order: 'desc'
|
||||
},
|
||||
// 会议筛选参数
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
</picker>
|
||||
</view>
|
||||
<view class="select-item">
|
||||
<picker mode="date" start="2021-01-01" end="2030-12-31" bindchange="bindDateChange">
|
||||
<picker mode="date" start="2000-01-01" end="2050-12-31" bindchange="bindDateChange">
|
||||
<view class="picker">
|
||||
<text>时间</text>
|
||||
</view>
|
||||
|
||||
+21
-12
@@ -9,6 +9,7 @@ Page({
|
||||
data: {
|
||||
userId: '',
|
||||
name: '',
|
||||
avatarUrl: '', // 头像
|
||||
phone: '未知手机号',
|
||||
rsaPublicKey: '',
|
||||
},
|
||||
@@ -37,17 +38,12 @@ Page({
|
||||
success(res) {
|
||||
if (res.confirm) {
|
||||
UserApi.wxUnbind().then(res => {
|
||||
if (res.success) {
|
||||
wx.clearStorage()
|
||||
wx.redirectTo({
|
||||
url: '../login/login',
|
||||
})
|
||||
} else {
|
||||
wx.clearStorage()
|
||||
wx.redirectTo({
|
||||
url: '../login/login',
|
||||
})
|
||||
}
|
||||
wx.removeStorage({key:'userInfo'})
|
||||
wx.removeStorage({key:'X-Access-Token'})
|
||||
wx.removeStorage({key:'avatarUrl'})
|
||||
wx.redirectTo({
|
||||
url: '../login/login',
|
||||
})
|
||||
})
|
||||
} else if (res.cancel) {}
|
||||
}
|
||||
@@ -115,7 +111,9 @@ Page({
|
||||
success(res) {
|
||||
if (res.confirm) {
|
||||
UserApi.logout().then(res => {
|
||||
wx.clearStorage()
|
||||
wx.removeStorage({key:'userInfo'})
|
||||
wx.removeStorage({key:'X-Access-Token'})
|
||||
wx.removeStorage({key:'avatarUrl'})
|
||||
wx.redirectTo({
|
||||
url: '../login/login',
|
||||
})
|
||||
@@ -124,6 +122,17 @@ Page({
|
||||
}
|
||||
})
|
||||
},
|
||||
onLoad(){
|
||||
const that = this
|
||||
wx.getStorage({
|
||||
key: 'avatarUrl',
|
||||
success(res){
|
||||
that.setData({
|
||||
avatarUrl: res.data
|
||||
})
|
||||
}
|
||||
})
|
||||
},
|
||||
/**
|
||||
* 生命周期函数--监听页面显示
|
||||
*/
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
{
|
||||
"navigationBarTitleText": "我的",
|
||||
"usingComponents": {},
|
||||
"navigationStyle": "custom"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -5,7 +5,8 @@
|
||||
<!-- 顶部选项栏 -->
|
||||
<view class="select-box">
|
||||
<view class="avator">
|
||||
<image src="../../assets/images/tx.png"></image>
|
||||
<image wx:if="{{!avatarUrl}}" src="../../assets/images/tx.png"></image>
|
||||
<image wx:if="{{avatarUrl}}" src="{{avatarUrl}}"></image>
|
||||
<view class="info">
|
||||
<text wx:if="{{!name}}" bindtap="goLogin">未登录</text>
|
||||
<text wx:if="{{name}}">{{name}}</text>
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
</view>
|
||||
<view class="form-item">
|
||||
<view class="text-label">密码</view>
|
||||
<view class="text-value">
|
||||
<view class="text-value text-password">
|
||||
<input name="password" value="{{password}}" password="{{show}}" placeholder="请输入密码" />
|
||||
<image src="../../assets/images/show.png" class="show" wx:if="{{!show}}" bindtap="showPassword"></image>
|
||||
<image src="../../assets/images/none.png" class="show" wx:if="{{show}}" bindtap="showPassword"></image>
|
||||
|
||||
@@ -9,6 +9,9 @@
|
||||
.text-value{
|
||||
position: relative;
|
||||
}
|
||||
.text-password input{
|
||||
padding-right: 30px;
|
||||
}
|
||||
.forget{
|
||||
color: #999;
|
||||
font-size: 14px;
|
||||
@@ -38,4 +41,4 @@
|
||||
right: 10px;
|
||||
top: 8px;
|
||||
z-index: 9;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -18,7 +18,7 @@
|
||||
</view>
|
||||
<!-- 年份 -->
|
||||
<view class="select-item">
|
||||
<picker mode="date" fields="year" start="2021" end="2030" bindchange="bindDateChange">
|
||||
<picker mode="date" fields="year" start="2000" end="2050" bindchange="bindDateChange">
|
||||
<view class="picker">
|
||||
<text>时间</text>
|
||||
</view>
|
||||
@@ -35,7 +35,7 @@
|
||||
<text class="{{item.needInvoice === 0 ? '' : 'all'}}">{{item.needInvoice === 0 ? '不需要发票' : '需要发票'}}</text>
|
||||
<text class="{{item.inAccount === 0 ? '' : item.inAccount === 2 ? 'half' : 'all'}}">到账</text>
|
||||
<text class="{{item.makeInvoice === 0 ? '' : item.makeInvoice === 2 ? 'half' : 'all'}}">开票</text>
|
||||
<text class="{{item.mail === 0 ? '' : item.mail === 2 ? 'half' : 'all'}}">邮寄</text>
|
||||
<text class="{{item.mail === 0 ? '' : 'all'}}">邮寄</text>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
@@ -43,4 +43,4 @@
|
||||
<text>暂无数据</text>
|
||||
</view>
|
||||
<popup visible="{{visible}}" bindclose="close" outClickCanClose="true" bindok="ok" data="{{data}}"></popup>
|
||||
<dateMonth visible="{{visibleDate}}" mode="year" outClickCanClose="true" bindok="dateOk" bindclose="close"></dateMonth>
|
||||
<dateMonth visible="{{visibleDate}}" mode="year" outClickCanClose="true" bindok="dateOk" bindclose="close"></dateMonth>
|
||||
|
||||
@@ -105,7 +105,9 @@ Page({
|
||||
showMeeting: true
|
||||
})
|
||||
MeetingApi.meetingList({
|
||||
workingGroupProjectId: this.data.id
|
||||
workingGroupProjectId: this.data.id,
|
||||
column: 'pm.createTime',
|
||||
order: 'desc'
|
||||
}).then(res => {
|
||||
console.log(res)
|
||||
if (res.success) {
|
||||
@@ -204,4 +206,4 @@ Page({
|
||||
onShareAppMessage: function () {
|
||||
|
||||
}
|
||||
})
|
||||
})
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{
|
||||
"navigationBarTitleText": "详情",
|
||||
"navigationBarTitleText": "项目详情",
|
||||
"usingComponents": {}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
</view>
|
||||
<view>
|
||||
<text>运行年份</text>
|
||||
<text>{{form.year}}年</text>
|
||||
<text>{{form.year ? form.year + '年' : ''}}</text>
|
||||
</view>
|
||||
<view>
|
||||
<text>项目负责人</text>
|
||||
@@ -19,11 +19,11 @@
|
||||
</view>
|
||||
<view>
|
||||
<text>应付金额</text>
|
||||
<text>{{form.receivableAmount ? form.receivableAmount + '元' : '0'}}</text>
|
||||
<text>{{form.receivableAmount ? form.receivableAmount + '元' : ''}}</text>
|
||||
</view>
|
||||
<view>
|
||||
<text>实付金额</text>
|
||||
<text>{{form.paidAmount ? form.paidAmount + '元' : '0'}}</text>
|
||||
<text>{{form.paidAmount ? form.paidAmount + '元' : ''}}</text>
|
||||
</view>
|
||||
<view>
|
||||
<text>企业联系人</text>
|
||||
@@ -107,6 +107,7 @@
|
||||
<image wx:if='{{item.sendMethod === 1}}' src="../../assets/images/ems.png"></image>
|
||||
<text>{{item.sendMethod_dictText ? item.sendMethod_dictText : '未邮寄'}}</text>
|
||||
</view>
|
||||
<view class="way project-name">项目名称:{{item.chargeCompanyName}}</view>
|
||||
<view class="way-info">
|
||||
<view class="way-left">
|
||||
<text class="way-left-text green">票</text>
|
||||
@@ -121,7 +122,7 @@
|
||||
<view class="way-left">
|
||||
<text class="way-left-text blue">邮</text>
|
||||
<view class="way-center">
|
||||
<text>邮寄人:{{item.contactName}}</text>
|
||||
<text>邮寄人:{{item.mailName ? item.mailName : '无'}}</text>
|
||||
<text>邮寄时间:{{item.sendDate ? item.sendDate : '无'}}</text>
|
||||
</view>
|
||||
</view>
|
||||
@@ -134,4 +135,4 @@
|
||||
</view>
|
||||
<text class="no-data" style="height: 50px;" wx:if="{{!form.mailBill}}">暂无邮寄记录!</text>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
@@ -134,6 +134,16 @@ page{
|
||||
padding: 0 !important;
|
||||
height: auto !important;
|
||||
}
|
||||
.project-name{
|
||||
display: block !important;
|
||||
width: 100%;
|
||||
overflow: hidden !important;
|
||||
text-overflow: ellipsis !important;
|
||||
white-space: nowrap !important;
|
||||
box-sizing: border-box;
|
||||
height: 40px !important;
|
||||
line-height: 40px;
|
||||
}
|
||||
.info-file{
|
||||
padding: 0 !important;
|
||||
display: flex;
|
||||
@@ -179,21 +189,32 @@ page{
|
||||
height: 23px;
|
||||
margin-right: 10px;
|
||||
}
|
||||
.way-info{
|
||||
display: flex;
|
||||
}
|
||||
.way-info .way-left{
|
||||
padding: 0;
|
||||
display: flex;
|
||||
justify-content: flex-start !important;
|
||||
width: 70%;
|
||||
}
|
||||
.way-info .way-center{
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
justify-content: space-between;
|
||||
align-items: flex-start;
|
||||
flex-direction: column;
|
||||
justify-content: space-between;
|
||||
align-items: flex-start;
|
||||
width: 100%;
|
||||
overflow: hidden;
|
||||
}
|
||||
.way-info .way-center text:nth-child(1){
|
||||
color: #333;
|
||||
display: block;
|
||||
width: 100%;
|
||||
font-size: 14px;
|
||||
flex-shrink: 0;
|
||||
overflow: hidden;
|
||||
white-space: nowrap;
|
||||
text-overflow: ellipsis;
|
||||
}
|
||||
.way-info .way-center text:nth-child(2){
|
||||
color: #999;
|
||||
@@ -202,29 +223,35 @@ page{
|
||||
}
|
||||
.way-info .green {
|
||||
width: 20px;
|
||||
height: 20px;
|
||||
background: #069F99;
|
||||
color: #fff;
|
||||
font-size: 11px;
|
||||
text-align: center;
|
||||
line-height: 20px;
|
||||
border-radius: 5px;
|
||||
height: 20px;
|
||||
background: #069F99;
|
||||
color: #fff;
|
||||
font-size: 11px;
|
||||
text-align: center;
|
||||
line-height: 20px;
|
||||
border-radius: 5px;
|
||||
}
|
||||
.way-info .blue {
|
||||
width: 20px;
|
||||
height: 20px;
|
||||
background: #0A72F7;
|
||||
color: #fff;
|
||||
font-size: 11px;
|
||||
text-align: center;
|
||||
line-height: 20px;
|
||||
border-radius: 5px;
|
||||
height: 20px;
|
||||
background: #0A72F7;
|
||||
color: #fff;
|
||||
font-size: 11px;
|
||||
text-align: center;
|
||||
line-height: 20px;
|
||||
border-radius: 5px;
|
||||
}
|
||||
.way-info .way-right{
|
||||
flex-shrink: 0;
|
||||
width: 30%;
|
||||
word-break: break-word;
|
||||
padding: 0;
|
||||
color: #666;
|
||||
font-size: 12px;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
display: -webkit-box;
|
||||
-webkit-line-clamp: 3;
|
||||
-webkit-box-orient: vertical;
|
||||
}
|
||||
.basic-info .look-progress{
|
||||
padding: 0 15px;
|
||||
@@ -268,4 +295,4 @@ page{
|
||||
display: block;
|
||||
text-align: center;
|
||||
line-height: 40px;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
{
|
||||
"navigationBarTitleText": "设置密码",
|
||||
"usingComponents": {}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<form bindsubmit="formSubmit" class="form-box">
|
||||
<view class="form-item">
|
||||
<view class="text-label">密码</view>
|
||||
<view class="text-value">
|
||||
<view class="text-value text-password">
|
||||
<input name="newPassword" bindblur="bindBlurInput" value="{{newPassword}}" password="{{show}}" placeholder="请输入密码" />
|
||||
<image src="../../assets/images/show.png" class="show" wx:if="{{!show}}" bindtap="showPassword"></image>
|
||||
<image src="../../assets/images/none.png" class="show" wx:if="{{show}}" bindtap="showPassword"></image>
|
||||
@@ -12,7 +12,7 @@
|
||||
</view>
|
||||
<view class="form-item">
|
||||
<view class="text-label">确认密码</view>
|
||||
<view class="text-value">
|
||||
<view class="text-value text-password">
|
||||
<input name="verifyPassword" bindblur="bindBlurInput" value="{{verifyPassword}}" password="{{showVerify}}" placeholder="请输入确认密码" />
|
||||
<image src="../../assets/images/show.png" class="show" wx:if="{{!showVerify}}" bindtap="showPasswordVerify"></image>
|
||||
<image src="../../assets/images/none.png" class="show" wx:if="{{showVerify}}" bindtap="showPasswordVerify"></image>
|
||||
@@ -22,4 +22,4 @@
|
||||
<button type="primary" formType="submit">登录</button>
|
||||
</view>
|
||||
</form>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
@@ -10,6 +10,9 @@ page {
|
||||
.text-value{
|
||||
position: relative;
|
||||
}
|
||||
.text-password input{
|
||||
padding-right: 30px;
|
||||
}
|
||||
.set-password{
|
||||
display: block;
|
||||
font-size: 16px;
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
<form bindsubmit="formSubmit" class="form-box">
|
||||
<view class="form-item">
|
||||
<view class="text-label">旧密码</view>
|
||||
<view class="text-value">
|
||||
<view class="text-value text-password">
|
||||
<input name="oldpassword" value="{{oldpassword}}" password="{{showOld}}" placeholder="请输入旧密码" />
|
||||
<image src="../../assets/images/show.png" class="show" wx:if="{{!showOld}}" bindtap="showPasswordOld"></image>
|
||||
<image src="../../assets/images/none.png" class="show" wx:if="{{showOld}}" bindtap="showPasswordOld"></image>
|
||||
@@ -11,7 +11,7 @@
|
||||
</view>
|
||||
<view class="form-item">
|
||||
<view class="text-label">新密码</view>
|
||||
<view class="text-value">
|
||||
<view class="text-value text-password">
|
||||
<input name="password" value="{{password}}" password="{{show}}" placeholder="请输入新密码" />
|
||||
<image src="../../assets/images/show.png" class="show" wx:if="{{!show}}" bindtap="showPassword"></image>
|
||||
<image src="../../assets/images/none.png" class="show" wx:if="{{show}}" bindtap="showPassword"></image>
|
||||
@@ -19,7 +19,7 @@
|
||||
</view>
|
||||
<view class="form-item">
|
||||
<view class="text-label">确认新密码</view>
|
||||
<view class="text-value">
|
||||
<view class="text-value text-password">
|
||||
<input name="confirmpassword" value="{{confirmpassword}}" password="{{showVerify}}" placeholder="请输入确认新密码" />
|
||||
<image src="../../assets/images/show.png" class="show" wx:if="{{!showVerify}}" bindtap="showPasswordVerify"></image>
|
||||
<image src="../../assets/images/none.png" class="show" wx:if="{{showVerify}}" bindtap="showPasswordVerify"></image>
|
||||
|
||||
@@ -8,6 +8,9 @@
|
||||
.text-value{
|
||||
position: relative;
|
||||
}
|
||||
.text-password input{
|
||||
padding-right: 30px;
|
||||
}
|
||||
.show{
|
||||
width: 15px;
|
||||
height: 15px;
|
||||
@@ -15,4 +18,4 @@
|
||||
right: 10px;
|
||||
top: 8px;
|
||||
z-index: 9;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
{
|
||||
"navigationBarTitleText": "签名",
|
||||
"usingComponents": {}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user