Skip to content

S
self-support
Commit a7c95785 authored by linwenqing's avatar linwenqing
Browse files
Options

Merge branch 'dev-fix' into dev

parents 9a7963f9 35022fa2
Hide whitespace changes
Inline Side-by-side
Showing with 33 additions and 29 deletions
src/pages/mine/cert/detail.vue
View file @ a7c95785
...@@ -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);
......
src/pages/mine/cert/index.vue
View file @ a7c95785
...@@ -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
......
src/pages/mine/cert/upload.vue
View file @ a7c95785
...@@ -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