Merge branch 'master' of https://git.banshouhui.com/lijundan/self-support

src/common/global.js

+
+qn_base_url = 'https://qn-static.banshouhui.com/self-support/'
\ No newline at end of file

src/components/settle/index.vue

@@ -25,7 +25,7 @@
 		},
 		computed: {
 			url() {
-				return '../../static/settle/top' + this.index + '@3x.png'
+				return qn_base_url + 'top' + this.index + '.png'
 			}
 		}
 	}

src/components/settle/services.vue

 <template>
 	<view class="content-view">
 		<view class="headimage-view">
-			<image class="headimage-view-image" src="../../static/settle/kefu@3x.png"></image>
+			<image class="headimage-view-image" :src="kefuImage"></image>
 			<text class="name-text">朱曼婷</text>
 		</view>
 
@@ -11,7 +11,7 @@
 				<view class="content-info-tip">长按二维码添加官方客服微信及时了解审核进度</view>
 			</view>
 			<view class="QRcode-view">
-				<image class="content-info-QRcode" src="../../static/settle/erweima@3x.png"></image>
+				<image class="content-info-QRcode":src="erweimaImage"></image>
 			</view>
 		</view>
 	</view>
@@ -24,6 +24,14 @@
 		},
 		data() {
 			return {}
+		},
+		computed: {
+			erweimaImage() {
+				return qn_base_url + 'erweima.png'
+			},
+			kefuImage() {
+				return qn_base_url + 'kefu.png'
+			}
 		}
 	}
 </script>

src/main.js

@@ -4,6 +4,7 @@ import uView from "uview-ui";
 import vuexStore from "@/store/$u.mixin.js";
 import store from '@/store/index'
 import {router,RouterMount} from '@/router/index.js'  //路径换成自己的
+import './common/global.js'
 Vue.config.productionTip = false
 
 Vue.mixin(vuexStore)

src/pages.json

@@ -145,7 +145,9 @@
 		{
 			"path": "pages/exam/index",
 			"style": {
-				"navigationBarTitleText": "入驻考试"
+				"navigationBarTitleText": "入驻考试",
+				"navigationStyle": "custom",
+				"disableScroll": true
 			}
 		},
 		{
@@ -227,8 +229,8 @@
 				"query": "" //启动参数，在页面的onLoad函数里面得到
 			},
 			{
-				"name": "在线考试-old", //模式名称
-				"path": "pages/exam/start", //启动页面，必选
+				"name": "入驻考试", //模式名称
+				"path": "pages/exam/index", //启动页面，必选
 				"query": "" //启动参数，在页面的onLoad函数里面得到
 			},
 			{

src/pages/learn/exam.vue

@@ -2,7 +2,7 @@
 	<view class="exam-wrap">
 		<Settle :index="3">
 			<view class="tip-text">
-				<image class="tip-image" mode="widthFix" src="../../static/settle/tips1@3x.png"></image>
+				<image class="tip-image" mode="widthFix" :src="tips1Image"></image>
 				<text>接单教程可让您快速了解如何使用小程序，建议先查看并学习教程。</text>
 			</view>
 			<view class="learn-view">
@@ -136,6 +136,9 @@
 					'font-size': '32rpx',
 					'font-weight': 'bold'
 				}
+			},
+			tips1Image() {
+				return qn_base_url + 'tips1@3x.png'
 			}
 		},
 		onLoad() {

src/pages/settle/base.vue

@@ -3,13 +3,13 @@
 		<Settle :index="2">
 			<view class="base-list">
 				<view class="tip-text">
-					<image class="tip-image" mode="widthFix" src="../../static/settle/anquan@3x.png"></image>
+					<image class="tip-image" mode="widthFix" :src="anquanImage"></image>
 					<text>身份证照片、电工证照片、行驶证/驾驶证照片及车辆照片仅用于申请入驻。</text>
 				</view>
 				<view class="base-item">
 					<view class="item item-select" @click="gopage('/pages/settle/select?selectType=area')">
 						<view class="flex-center">
-							<image class="item-image" src="../../static/settle/mixing@3x.png"></image>
+							<image class="item-image" :src="mixingImage"></image>
 							<text class="label">接单城市</text>
 						</view>
 						<p :class="['u-flex-1 u-text-right txt', {before: !cityText}]">{{ cityText ? '已选择' : '去选择' }}
@@ -25,7 +25,7 @@
 				<view class="base-item" style="height: 600rpx;">
 					<view class="item item-select" @click="gopage('/pages/settle/select?selectType=working_age')">
 						<view class="flex-center">
-							<image class="item-image" src="../../static/settle/mixing@3x.png"></image>
+							<image class="item-image" :src="mixingImage"></image>
 							<text class="label">电工工龄(年)</text>
 						</view>
 						<p :class="['u-flex-1 u-text-right area', {before: !baseInfo.working_age}]">
@@ -47,11 +47,11 @@
 					<view>
 						<view class="item item-select" @click="locationClick()">
 							<view class="flex-center">
-								<image class="item-image" src="../../static/settle/mixing@3x.png"></image>
+								<image class="item-image" :src="mixingImage"></image>
 								<text class="itemTitle">详细地址</text>
 							</view>
 							<view class="flex-center">
-								<image class="item-image-l" src="../../static/settle/dizhi@3x.png"></image>
+								<image class="item-image-l" :src="dizhiImage"></image>
 								<text class="right-label blueColor">自动定位</text>
 							</view>
 						</view>
@@ -123,6 +123,15 @@
 			},
 			cityText() {
 				return this.areaTxts.join('、')
+			},
+			anquanImage() {
+				return qn_base_url + 'anquan.png'
+			},
+			mixingImage() {
+				return qn_base_url + 'mixing.png'
+			},
+			dizhiImage() {
+				return qn_base_url + 'dizhi.png'
 			}
 		},
 		components: {

src/pages/settle/file.vue

@@ -2,13 +2,13 @@
 	<view class="page-content">
 		<Settle :index="2">
 			<view class="tip-text">
-				<image class="tip-image" mode="widthFix" src="../../static/settle/anquan@3x.png"></image>
+				<image class="tip-image" mode="widthFix" :src="anquanImage"></image>
 				<text>身份证照片、电工证照片、行驶证/驾驶证照片及车辆照片仅用于申请入驻。</text>
 			</view>
 			<view class="info-view">
 				<view v-for="(fileItem, index) in formShowList" class="title-view" :key="index">
 					<view>
-						<image class="title-image" src="../../static/settle/mixing@3x.png"></image>
+						<image class="title-image" :src="mixingImage"></image>
 						<text>{{ fileItem.label }}</text>
 					</view>
 					<view class="info-tip-text">{{ fileItem.tips }}</view>
@@ -23,7 +23,7 @@
 						></image>
 					</view>
 					<view v-if="index == 0" class="bottom-tip-view">
-						<image class="bottom-tip-image" mode="widthFix" src="../../static/settle/tishi@3x.png"></image>
+						<image class="bottom-tip-image" mode="widthFix" :src="qn_base_url + 'tishi.png'"></image>
 						<text>所上传的身份证信息必须与银行卡开户绑定身份证信息一致，否则将导致订单报酬无法交付</text>
 					</view>
 					<view class="card-info-view" v-if="index == 0 
@@ -116,14 +116,14 @@ export default {
 				 * vehicle:车辆照
 				 **/
 				other_photos: {
-					"driver_license": {
-						"url": "",
+					driver_license: {
+						url: "",
 					},
-					"driving_license": {
-						"url": "",
+					driving_license: {
+						url: "",
 					},
-					"vehicle":{
-						"url": "",
+					vehicle: {
+						url: "",
 					},
 				},
 				id_card_back_check: false,
@@ -134,7 +134,8 @@ export default {
 				electrician_certificate: [],
 				driver_license: [],
 				driving_license: [],
-				vehicle: [],
+				vehicle_front: [],
+				vehicle_side: [],
 			},
 			formShowList: [{
 					filedName: "id_card_front",
@@ -143,7 +144,7 @@ export default {
 					label: "实名认证",
 					tips: "上传二代身份证照片，图片大小不大于3M",
 					imgs: [],
-					placeholderImages: ['../../static/settle/renxiang@3x.png', '../../static/settle/guohui@3x.png']
+					placeholderImages: [qn_base_url + 'renxiang.png', qn_base_url + 'guohui.png']
 				},
 				// {
 				// 	filedName: "id_card_back",
@@ -160,24 +161,24 @@ export default {
 					maxImgs: 1,
 					tips: "上传电工证证照片，图片大小不大于3M",
 					imgs: [],
-					placeholderImages: ['../../static/settle/diangong@3x.png']
+					placeholderImages: [qn_base_url + 'diangong.png']
 				},
 				{
 					filedName: "driver_license",
 					label: "驾驶证/行驶证照片",
 					imgs: [],
 					maxImgs: 999,
-					tips: "两证单张照片需包含两页内容，图片大小不大于3M",
-					placeholderImages: ['../../static/settle/jiashi@3x.png', '../../static/settle/jiashi@3x.png']
+					tips: "两证单张照片需包含两页内容，每种证件只上传一张照片",
+					placeholderImages: [qn_base_url + 'jiashi.png', qn_base_url + 'jiashi.png']
 				},
 				{
-					filedName: "vehicle",
+					filedName: "vehicle_front",
 					label: "车辆照",
 					maxImgs: 1,
-					tips: "两证单张照片需包含两页内容，图片大小不大于3M",
+					tips: "上传车辆照片",
 					imgs: [],
-					placeholderImages: ['../../static/settle/zhengmian@3x.png',
-						'../../static/settle/cemian@3x.png']
+					placeholderImages: [qn_base_url + 'zhengmian.png',
+						qn_base_url + 'cemian.png']
 				},
 
 			],
@@ -222,6 +223,12 @@ export default {
 				'id_card_number': '身份证号',
 				'id_card_date': '有效期'
 			}
+		},
+		anquanImage() {
+			return qn_base_url + 'anquan.png'
+		},
+		mixingImage() {
+			return qn_base_url + 'mixing.png'
 		}
 	},
 	components: {
@@ -253,8 +260,8 @@ export default {
 			self.uploadType = item.filedName || ''
 			// 默认上传证件类型图片
 			let attr = {category: self.categories[1]}
-			switch (index) {
-				case 0:
+			switch (item.filedName) {
+				case 'id_card_front':
 					// 身份证
 					// 上传图片
 					// 成功之后更新 fileInfo、  item里的imgs
@@ -267,6 +274,26 @@ export default {
 						self.uploadType  = "id_card_back"
 					}
 					break;
+				case 'driver_license':
+					// 驾驶证/行驶证
+					if(key == 0) {
+						// 驾驶证照片
+						self.uploadType  = "driver_license"
+					} else {
+						// 行驶证照片
+						self.uploadType  = "driving_license"
+					}
+					break;
+				case 'vehicle_front':
+					// 车辆照
+					if(key == 0) {
+						// 车辆正面照片
+						self.uploadType  = "vehicle_front"
+					} else {
+						// 车辆侧面照片
+						self.uploadType  = "vehicle_side"
+					}
+					break;
 				default:
 					//其他
 					// 上传图片
@@ -289,15 +316,23 @@ export default {
 			if (uploadImgs && uploadImgs.length < 1) {
 				return
 			}
-			if (uploadType === 'driver_license' || uploadType === 'driving_license' || uploadType === 'vehicle') {
-				const otherImgs = this.imgObj[uploadType]
+			let photoType = uploadType;
+			if(uploadType === 'vehicle_front' || uploadType === 'vehicle_side') {
+				photoType = 'vehicle'
+			}
+			if (photoType === 'driver_license' || photoType === 'driving_license' || photoType === 'vehicle') {
+				let otherImgs = this.imgObj[uploadType]
+				if (photoType === 'vehicle') {
+					otherImgs = this.imgObj['vehicle_front'].concat(this.imgObj['vehicle_side'])
+				}
+				
 				let imgs = []
 				otherImgs.map(item => {
 					const img = item.key || item.src || ''
 					imgs.push(img)
 				})
-				this.fileInfo[uploadType] = imgs.join(',')
 				
+				this.fileInfo['other_photos'][photoType]['url'] = imgs.join(',')
 				return
 			}
 			this.fileInfo[uploadType] = uploadImgs[0].key || uploadImgs[0].src || ''
@@ -362,6 +397,9 @@ export default {
 			const fileInfo = this.fileInfo;
 
 			let checkFunc = function(item) {
+				if(item.filedName === 'id_card') {
+					const value = fileInfo['id_card_front'];
+				}
 				const value = fileInfo[item.filedName];
 				const tips = "请上传您的" + item.label;
 				if (!value) {
@@ -406,7 +444,9 @@ export default {
 			if (!this.checkFileInfo()) {
 				return;
 			}
-			const fileInfo = this.fileInfo;
+			let fileInfo = this.fileInfo;
+			debugger
+			fileInfo.other_photos = JSON.stringify(fileInfo.other_photos)
 			let submitInfoData = {
 				...fileInfo,
 				recommender: getApp().globalData.settleRecommend

src/pages/settle/pay-ensure.vue

@@ -22,7 +22,7 @@
 			<template v-slot:bottom>
 				<view class="btn-wrap flex-xc">
 					<button class="btn-submit" :disabled="saving" @click="paySubmit">
-						<image class="button-image" mode="widthFix" src="../../static/settle/weixin@3x.png"></image>
+						<image class="button-image" mode="widthFix" :src="weixinImage"></image>
 						<text>{{saving ? '支付中……' : '微信支付'}}</text>
 					</button>
 				</view>
@@ -63,7 +63,11 @@
 				this.getBaseInfo()
 			}
 		},
-		computed: {},
+		computed: {
+			weixinImage() {
+				return qn_base_url + 'weixin.png'
+			}
+		},
 		watch: {
 			isRefresh(val) {
 				this.getBaseInfo()
@@ -75,7 +79,7 @@
 		methods: {
 			successCallback() {
 				uni.navigateTo({
-					url: '/pages/settle/prompt'
+					url: '/pages/settle/prompt' + '?pageIndex=' + '4'
 				})
 			},
 			async getBaseInfo() {

src/pages/settle/prompt.vue

@@ -4,7 +4,7 @@
 			<view class="content-view">
 				<view class="u-flex u-row-center">
 					<image :class="['icon', {active: status != 1}]"
-						:src="status == 1 ? require('@/static/settle/chenggong@3x.png') : require('@/static/settle/icon-prompt@3x.png')">
+						:src="imageUrl">
 					</image>
 				</view>
 				<view class="txt-box">
@@ -95,9 +95,9 @@
 		},
 		computed: {
 			imageUrl() {
-				return this.status == 1 ? require('@/static/settle/chenggong@3x.png') : require(
-					'@/static/settle/icon-prompt@3x.png')
-			}
+				return this.status == 1 ? qn_base_url + 'chenggong.png' : qn_base_url + 'icon-prompt.png'
+			},
+			
 		},
 		onLoad(e) {
 			if (e) {
@@ -115,7 +115,6 @@
 				this.getBaseInfo()
 			}
 		},
-		computed: {},
 		components: {
 
 		},

src/pages/settle/sign-contract.vue

@@ -2,7 +2,7 @@
 	<view class="page-content">
 		<Settle :index="4">
 			<view class="tip-text">
-				<image class="tip-image" mode="widthFix" src="../../static/settle/tips3@3x.png"></image>
+				<image class="tip-image" mode="widthFix" :src="tips3Image"></image>
 				<text>身份证信息、银行卡相关信息、签约人信息须为同一人，否则无法入驻。</text>
 			</view>
 			
@@ -130,6 +130,9 @@
 			},
 			placeholderStyle() {
 				return 'color:#999999;font-size:28rpx'
+			},
+			tips3Image() {
+				return qn_base_url + 'tips3.png'
 			}
 		},
 		components: {