Commit e5c9e94b authored by linwenqing's avatar linwenqing

Merge branch 'dev' into test

parents fa8ed8ef a7c95785
......@@ -11,7 +11,9 @@
<u-loading slot="loading"></u-loading>
<view slot="error" style="font-size: 24rpx;">加载失败</view>
</u-image>
<u-button class="settle-button" type="primary" :open-type="openTypes[typeIndex]" show-message-card send-message-title="点击下方客服会话添加订单助手" shape="circle" @click="download" :custom-style="buttonStyle">
<u-button class="settle-button" type="primary" :open-type="openTypes[typeIndex]" show-message-card
send-message-title="点击下方客服会话添加订单助手" shape="circle" @click="download" :send-message-img="kefuzxiaoxiImage"
send-message-path="/pages/index/index" :custom-style="buttonStyle">
{{buttonText[typeIndex]}}
</u-button>
<view class="bottom-view" v-if="isMine">
......@@ -38,12 +40,14 @@
}
},
data() {
return {
};
return {};
},
computed: {
cusQrcode() {
cusQrcode() {
return process.uniEnv.qn_base_url + (this.isMine ? 'erweima-rk.png' : 'dingdanzhushou.png')
},
kefuzxiaoxiImage() {
return process.uniEnv.qn_base_url + 'kefuzxiaoxi.png'
},
minekefutuImage() {
return process.uniEnv.qn_base_url + this.imageName
......@@ -56,46 +60,46 @@
},
isExclusive() {
return this.type == 'exclusive'
},
isPop() {
return this.type == 'pop'
},
isPop() {
return this.type == 'pop'
},
phoneIcon() {
return process.uniEnv.qn_base_url + 'dianhua.png'
},
buttonStyle() {
return this.isMine ? {
'width': "300rpx",
'height': "80rpx",
"font-size": "32rpx",
"font-weight": "bold",
} : {
'width': "400rpx",
'height': "100rpx",
"font-size": "32rpx",
return this.isMine ? {
'width': "300rpx",
'height': "80rpx",
"font-size": "32rpx",
"font-weight": "bold",
} : {
'width': "400rpx",
'height': "100rpx",
"font-size": "32rpx",
"font-weight": "bold",
};
},
types() {
return ['exclusive', 'pop', 'mine']
},
typeIndex() {
return this.types.indexOf(this.type)
},
types() {
return ['exclusive', 'pop', 'mine']
},
typeIndex() {
return this.types.indexOf(this.type)
},
phone() {
return '18124099271'
},
openTypes() {
return ['contact', 'contact', '']
},
buttonText() {
return ['追加','追加','点击下载']
},
titleText() {
return ['添加订单助手', '添加订单助手', '客服微信']
},
tipText() {
return ['在对话框输入“加入”,即可获取二维码,添加订单助手', '在对话框输入“加入”,即可获取二维码,添加订单助手', '下载二维码添加官方客服微信']
},
openTypes() {
return ['contact', 'contact', '']
},
buttonText() {
return ['追加', '追加', '点击下载']
},
titleText() {
return ['添加订单助手', '添加订单助手', '客服微信']
},
tipText() {
return ['在对话框输入“加入”,即可获取二维码,添加订单助手', '在对话框输入“加入”,即可获取二维码,添加订单助手', '下载二维码添加官方客服微信']
}
},
methods: {
......@@ -105,11 +109,11 @@
complete() {}
});
},
download() {
if (!this.isMine) {
this.$emit('click')
return
}
download() {
if (!this.isMine) {
this.$emit('click')
return
}
let self = this
uni.downloadFile({ //获得二维码的临时地址
url: self.cusQrcode,
......@@ -118,8 +122,8 @@
uni.saveImageToPhotosAlbum({
filePath: result.tempFilePath, //传入临时地址
success(e) {
self.$u.toast('保存成功!');
self.$emit('click')
self.$u.toast('保存成功!');
self.$emit('click')
},
fail(res) {
if (res.errMsg.indexOf('auth') != -1) {
......@@ -131,7 +135,8 @@
if (res.confirm) {
uni.openSetting({
success(res) {
console.log(res.authSetting)
console.log(res
.authSetting)
}
});
}
......@@ -140,7 +145,7 @@
})
} else if (res.errMsg) {
self.$u.toast('保存失败!');
}
}
},
})
}
......@@ -166,47 +171,50 @@
flex-direction: column;
align-items: center;
.title-view {
text-align: center;
display: flex;
justify-content: center;
align-items: center;
flex-direction: column;
color: #999999;
font-size: 28rpx;
padding-left: 40rpx;
padding-right: 60rpx;
.title-view {
text-align: center;
display: flex;
justify-content: center;
align-items: center;
flex-direction: column;
color: #999999;
font-size: 28rpx;
padding-left: 40rpx;
padding-right: 60rpx;
margin-top: 20rpx;
&.is-mine {
display: inline;
font-size: 24rpx;
color: #666666;
width: 100%;
margin-top: 10rpx;
&.is-mine {
display: inline;
font-size: 24rpx;
color: #666666;
width: 100%;
margin-top: 10rpx;
}
.title-text {
font-weight: bold;
color: #333333;
font-size: 40rpx;
margin: 0 0 30rpx 0;
&.is-mine {
font-size: 32rpx;
margin-right: 30rpx;
color: #333333;
font-size: 40rpx;
margin: 0 0 30rpx 0;
&.is-mine {
font-size: 32rpx;
margin-right: 30rpx;
}
}
}
.qrcode {
width: 600rpx;
height: 440rpx;
margin-top: 30rpx;
margin-bottom: 40rpx;
&.is-mine {
margin-top: 60rpx;
margin-bottom: 60rpx;
width: 400rpx;
height: 400rpx;
.qrcode {
width: 600rpx;
height: 440rpx;
margin-top: 30rpx;
margin-bottom: 40rpx;
&.is-mine {
margin-top: 60rpx;
margin-bottom: 60rpx;
width: 400rpx;
height: 400rpx;
}
}
......@@ -254,16 +262,17 @@
height: 56rpx;
}
}
}
.settle-button {
margin-bottom: 14rpx;
}
.pop-tip-view {
text-align: center;
color: #333333;
font-size: 28rpx;
margin: 0rpx 60rpx 40rpx 60rpx;
}
.settle-button {
margin-bottom: 14rpx;
}
.pop-tip-view {
text-align: center;
color: #333333;
font-size: 28rpx;
margin: 0rpx 60rpx 40rpx 60rpx;
}
.tip-view {
......
......@@ -9,8 +9,10 @@
title-bold="true"
></u-navbar>
<view class="content-cody">
<view class="title">{{ info.type }}</view>
<view class="content" v-for="item in info.url"><image :src="item" mode="aspectFit"></image></view>
<view v-for="item,key in info.url" :key="key">
<view class="title">{{ info.desc[key] }}</view>
<image class="content" :src="item" mode="aspectFit"></image>
</view>
</view>
</view>
</template>
......@@ -34,6 +36,7 @@
let urlArr = data.url.split(',');
that.info.type = data.type;
that.info.url = urlArr;
that.info.desc = data.desc;
console.log(urlArr);
}catch(e){}
console.log(that.info);
......
......@@ -31,56 +31,65 @@
isUpload: false,
isUploadName: "未上传",
keyName: "id_card",
color: "#999999"
color: "#999999",
desc: ['身份证人像面', '身份证国徽面'],
},
electrician_certificate: {
name: "电工证",
isUpload: false,
isUploadName: "未上传",
keyName: "electrician_certificate",
color: "#999999"
color: "#999999",
desc: ['电工证正面'],
},
driver_license: {
name: "驾驶证",
isUpload: false,
isUploadName: "未上传",
keyName: "driver_license",
color: "#999999"
color: "#999999",
desc: ['驾驶证正面'],
},
driving_license: {
name: "行驶证",
isUpload: false,
isUploadName: "未上传",
keyName: "driving_license",
color: "#999999"
color: "#999999",
desc: ['行驶证正面'],
},
vehicle: {
name: "车辆照",
isUpload: false,
isUploadName: "未上传",
keyName: "vehicle",
color: "#999999"
color: "#999999",
desc: ['车辆正面/看到车牌', '车辆侧面/看到外观'],
},
high_sky_license: {
name: "高空证",
isUpload: false,
isUploadName: "未上传",
keyName: "high_sky_license",
color: "#999999"
color: "#999999",
desc: ['高空证正面'],
},
refrigeration_license: {
name: "制冷证",
isUpload: false,
isUploadName: "未上传",
keyName: "refrigeration_license",
color: "#999999"
color: "#999999",
desc: ['制冷证正面'],
},
business_license: {
name: "营业执照",
isUpload: false,
isUploadName: "未上传",
keyName: "business_license",
color: "#999999"
color: "#999999",
desc: ['营业执照正面'],
},
}
}
......@@ -111,6 +120,7 @@
},
toDetail(key) {
let data = this.list[key].data;
data.desc = this.list[key].desc;
if(data.status != 1){
wx.navigateTo({
url: '/pages/mine/cert/upload?type=' + data.type_key
......
......@@ -12,20 +12,15 @@
请点击上传图片,图片大小不大于3M
</view>
<view class="upload-container">
<view class="img-container" v-for="(item, index) in imgList[key].desc"
:class="{'u-margin-left-30': index>0}" :key="index">
<image class="upload-img" @click="handleClick(type, index)" :src="imgs[index]" mode="aspectFill">
<view class="img-container" v-for="(item, index) in imgList[key].desc" :key="index">
<image class="upload-img" @click="handleClick(type, index)" :src="imgs[index]" mode="widthFix">
</image>
<text class="img-desc">{{ item }}</text>
</view>
</view>
<view class="notice-bottom">
<image :src="icon" class="icon"></image>
<text class="u-padding-left-10">若无需上传证件反面照,则点击上传正面照即可</text>
</view>
<view class="button-container">
<view class="submit-button" :class="{'is-ok': isOk}" @click="submitCert()">提交</view>
</view>
</view>
<view class="button-container">
<view class="submit-button" :class="{'is-ok': isOk}" @click="submitCert()">提交</view>
</view>
</view>
</template>
......@@ -45,8 +40,8 @@
type: null,
isOk: false,
imgs: [
process.uniEnv.qn_base_url + "sahgnchuanzhaopian.png",
process.uniEnv.qn_base_url + "sahgnchuanzhaopian.png",
process.uniEnv.qn_base_url + "shangchuanzhaopian-big.png",
process.uniEnv.qn_base_url + "shangchuanzhaopian-big.png",
],
imgList: [{
typeKey: 'id_card',
......@@ -225,7 +220,7 @@
height: 104rpx;
background: #D1D4D4;
border-radius: 52rpx;
margin-top: 250rpx;
margin-top: 224rpx;
text-align: center;
line-height: 104rpx;
display: inline-block;
......@@ -240,16 +235,12 @@
.button-container {
text-align: center;
}
.upload-container {
display: flex;
padding-bottom: 30rpx;
}
.upload-img {
margin-top: 30rpx;
width: 300rpx;
height: 226rpx;
width: 100%;
}
.two {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment