dev
liuyongli 3 years ago
parent 732695f1be
commit 9396c9c903

@ -64,7 +64,6 @@ Component({
}
arr.push(ele.Time)
})
console.log(dName)
this.setData({
positiveOption:brokenLine(dName,bar,dColor,arr),
})

@ -112,7 +112,6 @@ Component({
data[index].push(j.value)
}
}
console.log(data);
//横轴,数据,纵轴
this.setData({
brandOption4: sHistogram(xMsg, data, ['事件一', '事件二'], dColor)

@ -31,7 +31,7 @@
</view>
</view>
<view class="loading" hidden="{{!loadMore}}">正在载入更多...</view>
<view class="loading" hidden="{{!loadAll}}" wx:if="{{totalNum>0}}">已加载全部</view>
<view class="loading" hidden="{{!loadAll}}" wx:if="{{iPageIndex>1}}">已加载全部</view>
</scroll-view>
</view>
@ -58,7 +58,7 @@
</view>
</view>
<view class="loading" hidden="{{!loadMore}}">正在载入更多...</view>
<view class="loading" hidden="{{!loadAll}}" wx:if="{{totalNum>0}}">已加载全部</view>
<view class="loading" hidden="{{!loadAll}}" wx:if="{{iPageIndex>1}}">已加载全部</view>
</scroll-view>
</van-tab>
</van-tabs>

@ -150,7 +150,6 @@ Page({
this.setData({
crisisNum: val.totalNum
})
console.log('cd',val.totalNum > 999)
}).then(res => {
this.setData({
crisisList: res

@ -36,7 +36,7 @@
</view>
</view>
<view class="loading" hidden="{{!loadMore}}">正在载入更多...</view>
<view class="loading" hidden="{{!loadAll}}" wx:if="{{totalNum>0}}">已加载全部</view>
<view class="loading" hidden="{{!loadAll}}" wx:if="{{iPageIndex>1}}">已加载全部</view>
<van-dialog use-slot title="注意" show="{{ showDialog }}" bind:confirm="cdialog">
<view class="tc-d-t">结束时间不能小于开始时间</view>
</van-dialog>

@ -41,7 +41,7 @@
</view>
</view>
<view class="loading" hidden="{{!loadMore}}">正在载入更多...</view>
<view class="loading" hidden="{{!loadAll}}" wx:if="{{totalNum>0}}">已加载全部</view>
<view class="loading" hidden="{{!loadAll}}" wx:if="{{iPageIndex>1}}">已加载全部</view>
</view>
<!-- </view> -->

@ -72,8 +72,7 @@ Page({
let date = this.getLastMonth(res, i);
dateArr.push(date);
};
console.log('xsd',dateArr)
this.setData({dateList: dateArr});
this.setData({dateList: dateArr, currentDate: dateArr[0]});
})
},
getLastMonth(dt, number = 0) {

@ -12,7 +12,7 @@
<view class="top">
<!-- <view class="box_title"> -->
<van-dropdown-menu custom-class="dropdown-menu1" >
<van-dropdown-item title="{{currentDate == ''?'选择日期':currentDate}}">
<van-dropdown-item title="{{currentDate}}">
<view style="margin: 24rpx">
<view class="filter">
<view wx:for="{{dateList}}" wx:key="index">
@ -95,7 +95,7 @@
<van-buttom bindtap="a">点击加载</van-buttom>
</view> -->
<view class="loading" hidden="{{!loadMore}}">正在载入更多...</view>
<view class="loading" hidden="{{!loadAll}}" wx:if="{{totalNum>0}}">已加载全部</view>
<view class="loading" hidden="{{!loadAll}}" wx:if="{{iPageIndex>1}}">已加载全部</view>
</view>
</view>
</view>

@ -21,5 +21,5 @@
</view>
</view>
<view class="loading" hidden="{{!loadMore}}">正在载入更多...</view>
<view class="loading" hidden="{{!loadAll}}" wx:if="{{totalNum>0}}">已加载全部</view>
<view class="loading" hidden="{{!loadAll}}" wx:if="{{iPageIndex>1}}">已加载全部</view>
</view>

@ -70,7 +70,7 @@
</view>
</van-checkbox-group>
<view class="loading" hidden="{{!loadMore}}">正在载入更多...</view>
<view class="loading" hidden="{{!loadAll}}" wx:if="{{totalNum>0}}">已加载全部</view>
<view class="loading" hidden="{{!loadAll}}" wx:if="{{iPageIndex>1}}">已加载全部</view>
<view class="tdl-footer" style="display: flex;justify-content: space-between;">
<view style="width: 40%;margin-top: 3%;margin-left: 64rpx">
<van-checkbox-group value="{{ isSelectAll }}" bind:change="changeSelectAll">

@ -72,7 +72,7 @@
</van-checkbox-group>
<!-- <van-button custom-class="bottom-button" bind:click="loadMore">点击加载更多</van-button> -->
<view class="loading" hidden="{{!loadMore}}">正在载入更多...</view>
<view class="loading" hidden="{{!loadAll}}" wx:if="{{totalNum>0}}">已加载全部</view>
<view class="loading" hidden="{{!loadAll}}" wx:if="{{iPageIndex>1}}">已加载全部</view>
</view>
<view class="tdl-footer" style="display: flex;justify-content: space-between">
<view style="width: 40%;margin-top: 3%;margin-left: 64rpx">

@ -70,7 +70,7 @@
</view>
</van-checkbox-group>
<view class="loading" hidden="{{!loadMore}}">正在载入更多...</view>
<view class="loading" hidden="{{!loadAll}}" wx:if="{{totalNum>0}}">已加载全部</view>
<view class="loading" hidden="{{!loadAll}}" wx:if="{{iPageIndex>1}}">已加载全部</view>
<view class="tdl-footer" style="display: flex;justify-content: space-between">
<view style="width: 40%;margin-top: 3%;margin-left: 64rpx">
<van-checkbox-group value="{{ isSelectAll }}" bind:change="changeSelectAll">

@ -104,7 +104,7 @@
</view>
</view>
<view class="loading" hidden="{{!loadMore}}">正在载入更多...</view>
<view class="loading" hidden="{{!loadAll}}" wx:if="{{totalNum>0}}">已加载全部</view>
<view class="loading" hidden="{{!loadAll}}" wx:if="{{iPageIndex>1}}">已加载全部</view>
</van-checkbox-group>
</view>
<view class="tdl-footer" style="display: flex;justify-content: space-between;">

@ -28,16 +28,21 @@ Page({
},
// 上传头像的验证
beforeRead(event) {
const { file, callback } = event.detail;
const {
file,
callback
} = event.detail;
callback(file.type === 'image');
},
// 上传图片
afterRead(event) {
const { file } = event.detail;
const {
file
} = event.detail;
let url = file.url;
let base64 = wx.getFileSystemManager().readFileSync(url, "base64");
let unionID = wx.getStorageSync('unionID');
if(!unionID) {
if (!unionID) {
return false;
}
let obj = {
@ -56,7 +61,7 @@ Page({
})
},
getUser() {
if(wx.getStorageSync("userInfo")) {
if (wx.getStorageSync("userInfo")) {
let userInfo = wx.getStorageSync("userInfo");
this.setData({
nickName: userInfo.nickName,
@ -77,11 +82,18 @@ Page({
},
layout() {
let that = this;
let obj = {
action: 'LogOut',
openid: wx.getStorageSync('openid'),
token: wx.getStorageSync('token') || 't%2BrswgjvzGM='
}
app.globalData.request(obj, (res => {
if (res.Code == 1) {
wx.showModal({
title: '提示',
content: "确定要退出嘛?",
success(res) {
if(res.confirm) {
if (res.confirm) {
wx.setStorageSync("userInfo", null);
wx.setStorageSync("token", "");
wx.setStorageSync("openid", "");
@ -89,7 +101,12 @@ Page({
}
}
})
} else {
wx.showModal({
title: '提示',
content: err.Msg,
})
}
}))
}
});

@ -11,6 +11,6 @@
<van-image width="48rpx" height="48rpx" fit='cover' src="{{imageUrl}}/my_right.png" custom-class='img2' />
</view>
<view class="loading" hidden="{{!loadMore}}">正在载入更多...</view>
<view class="loading" hidden="{{!loadAll}}" wx:if="{{totalNum>0}}">已加载全部</view>
<view class="loading" hidden="{{!loadAll}}" wx:if="{{iPageIndex>1}}">已加载全部</view>
</scroll-view>
</view>

@ -59,6 +59,7 @@ Page({
sVerifycode: e.detail.value
})
},
//获取验证码
captcha() {
let b = this.validPhone();
@ -101,18 +102,59 @@ Page({
brandName: this.data.brandName,
sVerifycode: this.data.sVerifycode,
}
app.globalData.request(obj).then((res) => {
// app.globalData.request(obj).then((res) => {
// console.log('cd',res)
// wx.showModal({
// title: '提示',
// content: res.Msg,
// })
// })
app.globalData.request(obj, (res) => {
if (res.Code == 1) {
wx.showModal({
title: '提示',
content: data.Msg,
content: res.Msg,
})
}).catch(err => {
} else {
wx.showModal({
title: '提示',
content: err.Msg,
})
}
})
},
getlist() {
let obj = {
action: 'ifUserAdminOnly',
sUserName: this.data.sUserName,
sPhone: this.data.sPhone,
sEmail: this.data.sEmail,
}
console.log('cdssx', obj)
app.globalData.request(obj, (res) => {
console.log('cdx', res.data)
if (res.Code == 1) {
wx.showModal({
title: '提示',
content: res.Msg,
success(res) {
if (res.confirm) {
this.captcha()
} else {
}
}
})
} else {
wx.showModal({
title: '提示',
content: res.Msg,
})
}
})
},
validPhone() {
let b = true;
let sPhone = this.data.sPhone;

@ -16,7 +16,7 @@
<view style="font-size:28rpx;font-weight:bolder;margin-top: 32rpx;margin-left: 32rpx">验证码</view>
<view style="display: flex;">
<input width="260px" value="{{sVerifycode}}" placeholder="请输入验证码" placeholder-class="placeholder-style" bindinput="codeInput"></input>
<button class="captcha" bindtap="captcha" disabled="{{captchaDisabled}}" plain="true" disabled-class="disabled">{{captchaLabel}}</button>
<button class="captcha" bindtap="getlist" disabled="{{captchaDisabled}}" plain="true" disabled-class="disabled">{{captchaLabel}}</button>
</view>
<button class="bts" bindtap="Submit">提交审核</button>

@ -75,7 +75,7 @@ Page({
let data = arr[0];
let c1 = data._source.content.replace(/\<img/gi, '<img class="imgs"');
let c2 = doStr(data._source.content.replace(/\<img/gi, '<img class="imgs"'), 700);
let title = doStr(data._source.title.replace(/\<img/gi, '<img class="imgs2"'), 300);
let title = doStr(data._source.title, 200);
this.setData({
source: data._source.source,
user_author: data._source.user_author,

@ -16,8 +16,8 @@
</view>
</view>
<view class="d-top-cp-d2">
<!-- {{title}} -->
<rich-text nodes="{{title}}"></rich-text>
{{title}}
<!-- <rich-text nodes="{{title}}"></rich-text> -->
</view>
<view class="d-top-cp-d3"></view>
<view class="d-top-cp-d4">
@ -67,7 +67,7 @@
</view>
</view>
<view class="loading" hidden="{{!loadMore}}">正在载入更多...</view>
<view class="loading" hidden="{{!loadAll}}" wx:if="{{totalNum>1}}" >已加载全部</view>
<view class="loading" hidden="{{!loadAll}}" wx:if="{{iPageIndex===1}}" >已加载全部</view>
</scroll-view>
</view>
<van-dialog title="复制成功" use-slot show="{{ showDialog }}">

Loading…
Cancel
Save