miniprogram / gangjurenminiprogram · 提交

转到一个项目

作者 lihongjuan
提交 e0f55f379df2eb73104ded4a5eb64eac58d421a6 1 个父辈 afb669ad

32452345324

内嵌 并排对比
正在显示 9 个修改的文件 包含 194 行增加 和 131 行删除
... ... @@ -60,6 +60,10 @@
});
return promise;
},
timeFormate(timestamp, timeType) {
if (timestamp) {
var timeStamp = timestamp.length == 13 ? timestamp : timestamp * 1000
... ... @@ -81,7 +85,7 @@
},
globalData: {
userInfo: null,
// baseUrl: 'http://icrgangjuren.w.brotop.cn/'
//baseUrl: 'http://icrgangjuren.w.brotop.cn/'
baseUrl:'https://icr.gangjuren.com/'
}
}
... ...
... ... @@ -184,7 +184,7 @@
app.post("api/index/getBanner", '', 'get')
.then(res => {
console.log(res);
this.imgUrls = res
})
.catch(err => {});
... ... @@ -193,7 +193,7 @@
getintroduce() {
app.post("api/index/getIntroduce", '', 'get')
.then(res => {
console.log(res, "数板数管简介");
this.shubanintro = res[0];
this.shuguanintro = res[1];
... ... @@ -265,6 +265,7 @@
},
onShow() {
uni.setStorageSync("baseurl",'https://icr.gangjuren.com')
//uni.setStorageSync("baseurl",'http://icrgangjuren.w.brotop.cn')
// 判断是否有资格进入详情页
this.get_cations()
}
... ...
... ... @@ -251,7 +251,7 @@
if (this.shouname == '') {
uni.showToast({
title: '请填写收货人姓名',
title: '请填写收件人姓名',
icon: 'none',
})
return false
... ... @@ -259,7 +259,7 @@
if (this.shouphone == '') {
uni.showToast({
title: '请填写收货人电话',
title: '请填写收件人电话',
icon: 'none',
})
... ... @@ -269,16 +269,15 @@
var regshouphone = /^[1][3,4,5,6,7,8,9][0-9]{9}$/;
if (!regshouphone.test(this.shouphone)) {
uni.showToast({
title: '请填写正确的收货人电话',
title: '请填写正确的收件人电话',
icon: 'none',
})
return false
}
if (this.shouaddress == '') {
uni.showToast({
title: '请填写收货人地址',
title: '请填写收件人地址',
icon: 'none',
})
return false
... ...
... ... @@ -61,15 +61,15 @@
<view class="shebeihead shugsj">数管数据</view>
<view class="shengyu" v-if="shenyu_times.times != 0">
<view class="sycishuleft">剩余可用次数：{{shenyu_times.times}}</view>
<view class="sycishuright">
<!-- <view class="sycishuright">
<image src="/static/img/you.png"></image>
</view>
</view> -->
</view>
<view class="shengyu" v-if="shenyu_times.shengyu != 0">
<view class="sycishuleft">剩余可用时间：{{shenyu_times.shengyu}}</view>
<view class="sycishuright">
<!-- <view class="sycishuright">
<image src="/static/img/you.png"></image>
</view>
</view> -->
</view>
<view class="shebeilist">
<view class="sybanhead">
... ...
... ... @@ -289,7 +289,7 @@
};
app.post(url, param, 'post').then(r => {
console.log(r, "获取数板详情")
t.equipment_log = r.equipment_log;
t.biaoshi=r.equipment_log.biaoshi;
t.description=r.equipment_log.description;
... ... @@ -385,7 +385,7 @@
// 来自页面内转发按钮
}
return {
title: "钢聚人小程序",
title: "智能点数小程序",
path: 'pages/shubandetail/shubandetail?share=' + 'true'+'&type='+1+'&number='+this.number+'&id='+this.id
}
},
... ...
... ... @@ -238,7 +238,7 @@
// 来自页面内转发按钮
}
return {
title: "钢聚人小程序",
title: "智能点数小程序",
path: 'pages/shubanxinxi/shubanxinxi?share=' + 'true' + '&type=' + 1 + '&num=' + this.number
}
},
... ...
... ... @@ -3,15 +3,15 @@
<view class="headbox">
<view class="shengyu" v-if="shengyu_time>0">
<view class="remainleft">剩余可用时间：{{days}}天{{hours}}小时{{minutes}}分钟</view>
<view class="remainright">
<!-- <view class="remainright">
<image src="/static/img/row.png"></image>
</view>
</view> -->
</view>
<view class="shengyu cishushengyu" v-if="shengyucishu>0">
<view class="shengyu cishushengyu">
<view class="remainleft">剩余可用次数：{{shengyucishu}}</view>
<view class="remainright">
<!-- <view class="remainright">
<image src="/static/img/row.png"></image>
</view>
</view> -->
</view>
</view>
... ... @@ -24,6 +24,8 @@
<view class="tuce">
<!-- <image src="/static/img/bendi.png"></image> -->
<image :src="upimg"></image>
</view>
<view class="benword">上传图片</view>
</view>
... ... @@ -63,8 +65,8 @@
</view>
<!-- 确定 -->
<view class="queding" @click="queding" v-if="qudingshow">确定</view>
<view class="queding" v-else>确定</view>
<view class="queding shide" @click="queding" v-if="qudingshow">确定</view>
<view class="queding" v-else>确定</view>
<view class="register" v-if="showketime">
<view class="timewrap">
... ... @@ -76,7 +78,16 @@
<view class='quedings' @click="go_shuguan">确定</view>
</view>
</view>
<view class="tupianshangchuan" v-if="picshangchuan">图片上传中</view>
</view>
</template>
... ... @@ -96,7 +107,8 @@
seconds: '',
upload_word: '上传图片',
upimg: '',
qudingshow:true
qudingshow: true,
picshangchuan:false
}
},
methods: {
... ... @@ -104,7 +116,9 @@
//选择照片
shoseimg() {
let t = this;
let baseurl=uni.getStorageSync("baseurl")
let baseurl = uni.getStorageSync("baseurl");
uni.chooseImage({
count: 1,
sizeType: ['original', 'compressed'],
... ... @@ -112,18 +126,27 @@
// sourceType: ['camera'],//拍摄照片
// sourceType: '',
success: (chooseImageRes) => {
console.log(909090808080)
this.picshangchuan=true
// uni.showToast({
// title: '图片上传中',
// icon: 'none'
// })
const tempFilePaths = chooseImageRes.tempFilePaths;
let images = tempFilePaths[0]
console.log(images)
let head = {
'token': uni.getStorageSync('token'),
}
uni.uploadFile({
url: 'https://icr.gangjuren.com/api/person/upload', //仅为示例，非真实的接口地址
url: baseurl + '/api/person/upload', //仅为示例，非真实的接口地址
filePath: tempFilePaths[0],
name: 'images',
token: uni.getStorageSync('token'),
... ... @@ -131,6 +154,10 @@
header: head,
// images:images
success: (uploadFileRes) => {
this.picshangchuan=false
// uni.hideLoading();
console.log(uploadFileRes);
let data = JSON.parse(uploadFileRes.data)
console.log(data)
... ... @@ -140,10 +167,13 @@
});
},
fail: function(err) {
console.log('76543221')
console.log(err, "失败的回调")
}
});
... ... @@ -175,8 +205,8 @@
// });
// }
// });
let baseurl=uni.getStorageSync("baseurl")
let baseurl = uni.getStorageSync("baseurl")
uni.chooseImage({
count: 1,
... ... @@ -185,10 +215,10 @@
sourceType: ['camera'], //拍摄照片
// sourceType: '',
success: (chooseImageRes) => {
console.log(909090808080)
this.picshangchuan=true
const tempFilePaths = chooseImageRes.tempFilePaths;
let images = tempFilePaths[0]
let images = tempFilePaths[0];
console.log(images)
let head = {
'token': uni.getStorageSync('token'),
... ... @@ -196,7 +226,7 @@
}
uni.uploadFile({
url: 'https://icr.gangjuren.com/api/person/upload', //仅为示例，非真实的接口地址
url: baseurl + '/api/person/upload', //仅为示例，非真实的接口地址
filePath: tempFilePaths[0],
name: 'images',
token: uni.getStorageSync('token'),
... ... @@ -204,7 +234,7 @@
header: head,
// images:images
success: (uploadFileRes) => {
console.log(uploadFileRes);
this.picshangchuan=false
let data = JSON.parse(uploadFileRes.data)
console.log(data)
this.upimg = data.data.src
... ... @@ -220,9 +250,8 @@
},
// 获取数管剩余时间次数
// 获取数管剩余时间次数
get_surplus() {
let t = this;
let param = {};
... ... @@ -293,7 +322,7 @@
},
queding() {
let that = this;
that.qudingshow = false
// uni.navigateTo({
// url: '/pages/shuguanshujulist/shuguanshujulist'
// })
... ... @@ -305,20 +334,19 @@
return false
}
that.qudingshow=false
let url = "api/shuguan/setShuguan";
let param = {
image: that.upimg
}
app.post(url, param, 'post').then(r => {
console.log(r)
uni.showToast({
title: '上传成功',
icon: 'none'
})
setTimeout(function() {
uni.navigateTo({
... ... @@ -326,15 +354,15 @@
})
}, 1500)
}).catch(err => {
uni.showToast({
title: err.msg,
icon: 'none'
})
console.log(err)
that.qudingshow = true
console.log('6666', err)
})
... ... @@ -349,7 +377,7 @@
},
onShow() {
console.log(777)
this.qudingshow=true
this.qudingshow = true
},
mounted() {
console.log(77766555)
... ... @@ -381,7 +409,6 @@
.shangchuantu {
width: 686rpx;
background: #fff;
margin: 0 auto;
padding: 40rpx 32rpx;
box-sizing: border-box;
margin: 28rpx auto 0;
... ... @@ -400,6 +427,16 @@
height: 160rpx;
font-size: 0;
margin-right: 28rpx;
position: relative
}
.delcha {
width: 46rpx;
height: 46rpx;
font-size: 0;
position: absolute;
right: -8rpx;
top: -8rpx;
}
.tuup {
... ... @@ -524,4 +561,20 @@
line-height: 100rpx;
margin: 45rpx auto 0;
}
.tupianshangchuan{
width:200rpx;
height:50rpx;
background: #3E3A39;
color:#fff;
font-size: 24rpx;
text-align: center;
line-height: 50rpx;
opacity: 0.5;
position: absolute;
border-radius: 20rpx;
top:45%;
left:50%;
transform: translate(-50%,-50%)
}
</style>
... ...
... ... @@ -28,24 +28,94 @@
<view class="headbox">
<view class="shengyu">
<view class="remainleft">剩余可用时间：{{shengyu_time}}</view>
<view class="remainright">
<!-- <view class="remainright">
<image src="/static/img/row.png"></image>
</view>
</view> -->
</view>
<view class="shengyu cishushengyu">
<view class="remainleft">剩余可用次数：{{times}}</view>
<view class="remainright">
<!-- <view class="remainright">
<image src="/static/img/row.png"></image>
</view>
</view> -->
</view>
</view>
<!--管径描述 -->
<view class="guanjing">
<view class='guanjinghead'>
<view class="gudes">管径描述</view>
<view class="gudes">明确数量</view>
<view class="gudes">疑似数量</view>
<view class="gudes">复核数量</view>
<view class="writeheng"></view>
</view>
<view class="guanlistbox">
<view class="guanlist" v-for="(item,index) in log_list" :key="index" @click="fengxiangshare?fuhe(item.id):''" >
<view class="guanitem">{{item.type}}</view>
<view class="guanitem">{{item.confirmation}}</view>
<view class="guanitem">{{item.distrust}}</view>
<view class="guanitem">{{item.fuhe}}</view>
<view class="write" >
<image src="/static/img/write.png"></image>
</view>
</view>
<!-- <view class="guanlist" v-for="(item,index1) in log_list" :key="index1" v-else>
<view class="guanitem">{{item.type}}</view>
<view class="guanitem">{{item.confirmation}}</view>
<view class="guanitem">{{item.distrust}}</view>
<view class="guanitem">{{item.fuhe}}</view>
<view class="write" >
<image src="/static/img/write.png"></image>
</view>
</view> -->
<!-- <view class="guanlist">
<view class="guanitem">DN50</view>
<view class="guanitem">5000</view>
<view class="guanitem">3000</view>
<view class="guanitem">3000</view>
<view class="write">
<image src="/static/img/write.png"></image>
</view>
</view>
<view class="guanlist">
<view class="guanitem">DN50</view>
<view class="guanitem">5000</view>
<view class="guanitem">3000</view>
<view class="guanitem">3000</view>
<view class="write">
<image src="/static/img/write.png"></image>
</view>
</view> -->
</view>
<view class="dibushujushow">
<view class='dibushujushowitem'>
<view class="dibushutop">明确总数</view>
<view class="dibushubottom">{{count.confirmation}}</view>
</view>
<view class='dibushujushowitem'>
<view class="dibushutop">疑似总数</view>
<view class="dibushubottom">{{count.distrust}}</view>
</view>
<view class='dibushujushowitem'>
<view class="dibushutop">复核总数</view>
<view class="dibushubottom">{{count.fuhe}}</view>
</view>
</view>
</view>
<view class="imgupload">
<view class="shangword">上传图片</view>
<view class="shangbox">
<view class="shangbox">
<view class='shangboxitem' v-for="(item,index) in fileimg" :key="index">
<image :src="item" mode="widthFix" @click="viewimg(index)"></image>
<image :src="item" mode="aspectFit" @click="viewimg(index)"></image>
</view>
</view>
... ... @@ -56,7 +126,7 @@
<view class="shangword shibie">识别图片</view>
<view class="shangbox">
<view class='shangboxitem' v-for="(img,index) in images" :key='index'>
<image :src="img" mode="widthFix" @click="viewimgtu(index)"></image>
<image :src="img" mode="aspectFit" @click="viewimgtu(index)"></image>
</view>
<!-- <view class='shangboxitem'>
<image src="/static/img/shang.png"></image>
... ... @@ -130,74 +200,7 @@
</view>
</view>
</view>
<!--管径描述 -->
<view class="guanjing">
<view class='guanjinghead'>
<view class="gudes">管径描述</view>
<view class="gudes">明确数量</view>
<view class="gudes">疑似数量</view>
<view class="gudes">复核数量</view>
<view class="writeheng"></view>
</view>
<view class="guanlistbox">
<view class="guanlist" v-for="(item,index) in log_list" :key="index" @click="fengxiangshare?fuhe(item.id):''" >
<view class="guanitem">{{item.type}}</view>
<view class="guanitem">{{item.confirmation}}</view>
<view class="guanitem">{{item.distrust}}</view>
<view class="guanitem">{{item.fuhe}}</view>
<view class="write" >
<image src="/static/img/write.png"></image>
</view>
</view>
<!-- <view class="guanlist" v-for="(item,index1) in log_list" :key="index1" v-else>
<view class="guanitem">{{item.type}}</view>
<view class="guanitem">{{item.confirmation}}</view>
<view class="guanitem">{{item.distrust}}</view>
<view class="guanitem">{{item.fuhe}}</view>
<view class="write" >
<image src="/static/img/write.png"></image>
</view>
</view> -->
<!-- <view class="guanlist">
<view class="guanitem">DN50</view>
<view class="guanitem">5000</view>
<view class="guanitem">3000</view>
<view class="guanitem">3000</view>
<view class="write">
<image src="/static/img/write.png"></image>
</view>
</view>
<view class="guanlist">
<view class="guanitem">DN50</view>
<view class="guanitem">5000</view>
<view class="guanitem">3000</view>
<view class="guanitem">3000</view>
<view class="write">
<image src="/static/img/write.png"></image>
</view>
</view> -->
</view>
<view class="dibushujushow">
<view class='dibushujushowitem'>
<view class="dibushutop">明确总数</view>
<view class="dibushubottom">{{count.confirmation}}</view>
</view>
<view class='dibushujushowitem'>
<view class="dibushutop">疑似总数</view>
<view class="dibushubottom">{{count.distrust}}</view>
</view>
<view class='dibushujushowitem'>
<view class="dibushutop">复核总数</view>
<view class="dibushubottom">{{count.fuhe}}</view>
</view>
</view>
</view>
<!-- 遮罩层 -->
<view class="register" v-if="yewushow">
<view class="yewuxinwrap">
... ... @@ -644,7 +647,7 @@
// 来自页面内转发按钮
}
return {
title: "钢聚人小程序",
title: "智能点数小程序",
path: 'pages/shuguanshujudetail/shuguanshujudetail?share=' + 'true' + '&type=' + 1 + '&id=' + this.id
}
},
... ... @@ -871,6 +874,9 @@
padding: 28rpx 34rpx;
box-sizing: border-box;
}
.guanjing{
margin-top:20rpx;
}
.guanlist {
display: flex;
... ...
... ... @@ -10,15 +10,15 @@
<view class="headbox">
<view class="shengyu">
<view class="remainleft">剩余可用时间：{{days}}天{{hours}}小时{{minutes}}分钟</view>
<view class="remainright">
<!-- <view class="remainright">
<image src="/static/img/row.png"></image>
</view>
</view> -->
</view>
<view class="shengyu cishushengyu">
<view class="remainleft">剩余可用次数：{{times}}</view>
<view class="remainright">
<!-- <view class="remainright">
<image src="/static/img/row.png"></image>
</view>
</view> -->
</view>
</view>
... ...