Commit e5c9e94b authored by linwenqing's avatar linwenqing

Merge branch 'dev' into test

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