Merge branch 'master' of http://git.zthymaoyi.com/gdc/yiliangyiyun-app

components/upload.vue

@@ -407,42 +407,42 @@
 					}
 				)
 				// 创建上传对象
-				const task = uni.uploadFile({
-					url: this.action,
-					filePath: this.lists[index].url,
-					name: this.name,
-					formData: this.formData,
-					header: this.header,
-					success: res => {
-						// 判断是否json字符串，将其转为json格式
-						let data = this.toJson && this.checkIsJSON(res.data) ? JSON.parse(res.data) : res
-							.data;
-						if (![200, 201].includes(res.statusCode)) {
-							this.uploadError(index, data);
-						} else {
-							// 上传成功
-							this.lists[index].response = data;
-							this.lists[index].progress = 100;
-							this.lists[index].error = false;
-							this.$emit('on-success', data, index, this.lists);
-						}
-					},
-					fail: e => {
-						this.uploadError(index, e);
-					},
-					complete: res => {
-						uni.hideLoading();
-						this.uploading = false;
-						this.uploadFile(index + 1);
-						this.$emit('on-change', res, index, this.lists);
-					}
-				});
-				task.onProgressUpdate(res => {
-					if (res.progress > 0) {
-						this.lists[index].progress = res.progress;
-						this.$emit('on-progress', res, index, this.lists);
-					}
-				});
+				// const task = uni.uploadFile({
+				// 	url: this.action,
+				// 	filePath: this.lists[index].url,
+				// 	name: this.name,
+				// 	formData: this.formData,
+				// 	header: this.header,
+				// 	success: res => {
+				// 		// 判断是否json字符串，将其转为json格式
+				// 		let data = this.toJson && this.checkIsJSON(res.data) ? JSON.parse(res.data) : res
+				// 			.data;
+				// 		if (![200, 201].includes(res.statusCode)) {
+				// 			this.uploadError(index, data);
+				// 		} else {
+				// 			// 上传成功
+				// 			this.lists[index].response = data;
+				// 			this.lists[index].progress = 100;
+				// 			this.lists[index].error = false;
+				// 			// this.$emit('on-success', data, index, this.lists);
+				// 		}
+				// 	},
+				// 	fail: e => {
+				// 		this.uploadError(index, e);
+				// 	},
+				// 	complete: res => {
+				// 		uni.hideLoading();
+				// 		this.uploading = false;
+				// 		this.uploadFile(index + 1);
+				// 		this.$emit('on-change', res, index, this.lists);
+				// 	}
+				// });
+				// task.onProgressUpdate(res => {
+				// 	if (res.progress > 0) {
+				// 		this.lists[index].progress = res.progress;
+				// 		this.$emit('on-progress', res, index, this.lists);
+				// 	}
+				// });
 			},
 			// 上传失败
 			uploadError(index, err) {

manifest.json

@@ -81,6 +81,7 @@
                     "<uses-permission android:name=\"android.permission.CALL_PHONE\"/>",
                     "<uses-permission android:name=\"android.permission.CAMERA\"/>",
                     "<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
                     "<uses-permission android:name=\"android.permission.RECORD_AUDIO\"/>"
                 ]
             },

pageA/product/Identity_switching.vue

@@ -150,7 +150,7 @@
 			},
 			checkBox(e, item) {
 				for (var i = 0; i < this.lists.length; i++) {
-					this.lists[i].checked = true
+					this.lists[i].checked = false
 				}
 				item.checked = true
 				this.$api.doRequest('post', '/identityAuthenticationInfo/api/setDefault', {
@@ -159,13 +159,6 @@
 						commonId: this.userInfo.id
 					}).then(res => {
 						if (res.data.code == 200) {
-							// this.lists = res.data.data.records
-
-							uni.navigateBack({
-
-								delta: 1
-
-							})
 						}
 					})
 					.catch(res => {

pageA/product/business_buy.vue

@@ -119,7 +119,7 @@
 			<view v-if="purchaseOrder.procurementPlanType=='期货'" class="c-row b-b align-start">
 				<view class="title">包装费（元/吨）</view>
 				<view class="con-list">
-					<input placeholder="请填写包装费" name="input" @input='someprice' v-model="packingFee"></input>
+					<input placeholder="请填写包装费" name="input" placeholder-style="font-size: 12px;" @input='someprice' v-model="packingFee"></input>
 					
 				</view>
 			</view>
@@ -216,7 +216,7 @@
 				unloadingFee: 0,
 				packingMoney: 0,
 				packing: '散装',
-				packingFee: 0,
+				packingFee: null,
 				// choice : false,
 			};
 		},
@@ -244,7 +244,7 @@
 			
 		},
 		onShow() {
-			if( this.$store.state.choice != "" ){
+			if( this.$store.state.choice != "" && this.goods.customerTypeFlag){
 				if(this.goods.customerTypeFlag==1){
 					this.goods.customerName = this.$store.state.choice
 				}else if(this.goods.customerTypeFlag==2){

pageA/product/business_sale.vue

@@ -156,7 +156,7 @@
 					},
 					purchaseOrder: {
 						invoiceFee:0,
-						packingFee:0,
+						packingFee:null,
 						packingType:"散装",
 						packingTypeKey:1,
 						type:'不开发票',

pageA/product/lookup.vue

@@ -4,7 +4,7 @@
 			<view style='background:#fff;display:flex;' class="cu-bar search">
 			<view style='flex:6;' class="search-form round" >
 				<text style='color: #ccc;text-indent:6px;' class="cuIcon-search"></text>
-				<input type="text" maxlength="20" v-model="searchKeyWord" @confirm="doSearch()" @input='search' placeholder="请输入货名或标题" confirm-type="search"></input>
+				<input type="text" maxlength="20" :focus="true" v-model="searchKeyWord" @confirm="doSearch()" @input='search' placeholder="请输入货名或标题" confirm-type="search"></input>
 				
 			</view>
 			<view @click='doSearch()' style="width:4%;flex:1;">搜索</view>

pageA/product/sales_detail.vue

@@ -310,6 +310,7 @@
 					// 失败回调
 					fail: (res) => {
 						console.log('调用失败!')
+						that.contactUs()
 					}
 					
 				  });

pageD/identity/companyIdentity.vue

@@ -211,7 +211,6 @@
 				this.imgUrls.splice(index, 1);
 			},
 			jumpUrl() {
-				debugger
 				if (this.consentStatus) {
 					if (!this.identityAuthenticationInfo.compName) {
 						this.$api.msg('公司名称不能为空')

pageD/identity/driverIdentity.vue

@@ -1,27 +1,16 @@
 <template>
 	<view class="center">
-
 		<view>
-			<view style="margin: 0 auto;height: 240px;" v-if="id1 != ''" @click="idUp">
-				<image v-bind:src="id1" class="picture"></image>
-				<view class="floats" v-if="certificates == true">
-					<image src="../../static/img/authentication/xiangji@3x.png" style="width: 60px;height: 50px;">
-					</image>
-					<view class="words">
-						上传身份证头像页
-					</view>
-				</view>
-			</view>
-			<view style="margin: 0 auto;height: 240px;" v-if="id2 != ''" @click="idLow">
-				<image v-bind:src="id2" class="picture"></image>
-				<view class="floats" v-if="certificatesTwo == true">
-					<image src="../../static/img/authentication/xiangji@3x.png" style="width: 60px;height: 50px;">
-					</image>
-					<view class="words">
-						上传身份证国徽页
-					</view>
-				</view>
-			</view>
+			<!-- 个人身份证正面 -->
+			<upload class="upload" ref="upload" :action="action" :max-size="maxSize" :max-count="1"
+				:size-type="['compressed']" @on-success="getImgUrl1" @on-error="onError" @on-remove="onRemove"
+				@on-uploaded="isAdd = true" :before-upload="filterFileType" :options="uploadOptions1"
+				:custom="uploadCustom1" @on-progress="onProgress"></upload>
+			<!-- 个人身份证反面 -->
+			<upload class="upload" ref="upload" :action="action" :max-size="maxSize" :max-count="1"
+				:size-type="['compressed']" @on-success="getImgUrl2" @on-error="onError" @on-remove="onRemove"
+				@on-uploaded="isAdd = true" :before-upload="filterFileType" :options="uploadOptions2"
+				:custom="uploadCustom2" @on-progress="onProgress"></upload>
 		</view>
 		<view class="information">
 			<view class="c-row b-b">
@@ -39,15 +28,15 @@
 			<view class="c-row b-b">
 				<text class="tit">手机号</text>
 				<view class="con-list">
-					<input placeholder="请填写手机号" maxlength = "11" @input='phoneinput' name="input" v-model="DriverViewInfo.driverPhone"></input>
+					<input placeholder="请填写手机号" maxlength="11" @input='phoneinput' name="input"
+						v-model="DriverViewInfo.driverPhone"></input>
 				</view>
 			</view>
 			<view style='padding:10px;' class="c-row b-b">
-				<button :class='!sendDisabled?"active getcode":"getcode"' @click='getcode'
-					>{{sendText}}</button>
-					<view class="con-list">
-						<input v-model='verifyCode' maxlength = "6"  placeholder="请输入验证码" type="text">
-					</view>
+				<button :class='!sendDisabled?"active getcode":"getcode"' @click='getcode'>{{sendText}}</button>
+				<view class="con-list">
+					<input v-model='verifyCode' maxlength="6" placeholder="请输入验证码" type="text">
+				</view>
 			</view>
 			<view class="c-row ">
 				<text class="tit">常驻城市</text>
@@ -62,12 +51,31 @@
 </template>
 
 <script>
+	import upload from '@/components/upload.vue';
 	import {
 		mapState
 	} from 'vuex';
 	export default {
+		components: {
+			upload
+		},
 		data() {
 			return {
+				action: this.$uploadUrl,
+				maxSize: 5 * 1024 * 1024, //限制文件大小 2M
+				btnLoading: false, //防止重复点击
+				isAdd: true,
+				imgUrls: [],
+				uploadCustom1: true,
+				uploadCustom2: true,
+				uploadOptions1: {
+					"text": "上传身份证头像页",
+					"bgc": "https://taohaoliang.oss-cn-beijing.aliyuncs.com/app/tmp/identityup%282%29.png"
+				},
+				uploadOptions2: {
+					"text": "上传身份证国徽页",
+					"bgc": "https://taohaoliang.oss-cn-beijing.aliyuncs.com/app/tmp/identitylow%282%29.png"
+				},
 				goods: {},
 				ModelIndex: '高栏',
 				Model: '',
@@ -91,18 +99,17 @@
 				carLongType: ['13', '9.6', '8.2', '8.7', '11.7', '12.5', '13.7', '15', '16', '17.5'],
 				driverCarInfoList: {},
 				driverPayeeInfoList: {},
-				DriverViewInfo: {
-				},
+				DriverViewInfo: {},
 				verifyCode: "",
 				codestatus: false,
 				customerPhone: '',
 				addressUrl: [],
-				personImgs:{},
-				certificatesTwo:true,
-				certificates:true,
-				verification:true,
-				region:"请选择常驻城市",
-				show:false,
+				personImgs: {},
+				certificatesTwo: true,
+				certificates: true,
+				verification: true,
+				region: "请选择常驻城市",
+				show: false,
 				params: {
 					province: true,
 					city: true,
@@ -113,6 +120,91 @@
 			...mapState(['hasLogin', 'userInfo'])
 		},
 		methods: {
+			filterFileType(index, lists) {
+				if (lists[index].fileType != 'jpg' && lists[index].fileType != 'png' && lists[index].fileType != 'gif') {
+					lists.splice(index, 1);
+					// 当前文件不支持
+					uni.showModal({
+						title: '暂不支持当前图片类型',
+						showCancel: false
+					});
+				} else {
+					this.isAdd = false;
+				}
+			},
+			onError(error) {
+				alert(error)
+				console.log('------------error-----------')
+				console.log(error)
+			},
+			onProgress(e) {
+				console.log(e)
+			},
+			onRemove(index) {
+				this.imgUrls.splice(index, 1);
+			},
+			//身份证正面
+			getImgUrl1(src) {
+				console.log(src)
+				console.log('------------res-----------')
+				let that = this;
+				that.id[0] = src
+				that.id1 = src
+				that.certificates = false
+				that.personImgs.personImg = that.id[0]
+				that.$api.doRequest('get', '/driverViewInfo/personShibie', that
+					.personImgs).then(res => {
+					if (res.data.data.recPerson != null) {
+						if (res.data.data.recPerson != "") {
+							that.$set(that.DriverViewInfo, 'driverName', res
+								.data.data.recPerson)
+						}
+					}
+					if (res.data.data.recPersonNo != null) {
+						if (res.data.data.recPersonNo != "") {
+							that.$set(that.DriverViewInfo, 'numberCard', res
+								.data.data.recPersonNo)
+						}
+					}
+				}).catch(res => {
+					uni.showToast({
+						title: res.data.message,
+						icon: 'none',
+						duration: 2000
+					})
+				})
+			},
+			//身份证反面
+			getImgUrl2(res) {
+				console.log(res)
+				console.log('------------res-----------')
+				let that = this;
+				that.id[1] = res
+				that.id2 = res
+				that.certificatesTwo = false
+				that.personImgs.personImg = that.id[1]
+				that.$api.doRequest('get', '/driverViewInfo/personShibie', that
+					.personImgs).then(res => {
+					if (res.data.data.recPerson != null) {
+						if (res.data.data.recPerson != "") {
+							that.$set(that.DriverViewInfo, 'driverName', res
+								.data.data.recPerson)
+						}
+					}
+					if (res.data.data.recPersonNo != null) {
+						if (res.data.data.recPersonNo != "") {
+							that.$set(that.DriverViewInfo, 'numberCard', res
+								.data.data.recPersonNo)
+						}
+					}
+				}).catch(res => {
+					uni.showToast({
+						title: res.data.message,
+						icon: 'none',
+						duration: 2000
+					})
+				})
+			},
 			phoneinput(e) {
 				if (e.detail.value.length == 11) {
 					this.codestatus = true
@@ -144,7 +236,7 @@
 					this.$api.msg('姓名输入错误')
 					return
 				}
-			
+
 				if (!this.DriverViewInfo.numberCard) {
 					this.$api.msg('身份证号不能为空')
 					return
@@ -161,11 +253,11 @@
 					this.$api.msg('手机号输入错误')
 					return
 				}
-				if(!this.verifyCode){
+				if (!this.verifyCode) {
 					this.$api.msg('验证码不能为空')
 					return
 				}
-				if(this.verifyCode.length != 6){
+				if (this.verifyCode.length != 6) {
 					this.$api.msg('验证码输入错误')
 					return
 				}
@@ -188,7 +280,7 @@
 								url: `/pageD/identity/driverIdentityTwo?DriverViewInfo=` + model,
 							})
 						} else {
-							uni.showToast({		
+							uni.showToast({
 								title: res.data.message,
 								icon: 'none',
 								duration: 2000
@@ -255,82 +347,6 @@
 				this.carLongIndex = e.detail.value
 				this.carLong = this.carLongType[this.carLongIndex];
 			},
-			idUp() {
-				var that = this
-				uni.chooseImage({
-					success: function(res) {
-						uni.uploadFile({
-							url: 'https://www.zthymaoyi.com/upload/admin',
-							filePath: res.tempFilePaths[0],
-							name: 'file',
-							success(res) {
-								var data = res.data
-								var strToObj = JSON.parse(data)
-								that.id[0] = strToObj.url
-								that.id1 = strToObj.url
-								that.certificates = false
-								that.personImgs.personImg = that.id[0]
-								that.$api.doRequest('get', '/driverViewInfo/personShibie', that.personImgs).then(res => {
-									if(res.data.data.recPerson != null){
-										if(res.data.data.recPerson != ""){
-											that.$set(that.DriverViewInfo,'driverName',res.data.data.recPerson)
-										}
-									}
-									if(res.data.data.recPersonNo != null){
-										if(res.data.data.recPersonNo != ""){
-											that.$set(that.DriverViewInfo,'numberCard',res.data.data.recPersonNo)
-										}
-									}
-								}).catch(res => {
-									uni.showToast({
-										title: res.data.message,
-										icon: 'none',
-										duration: 2000
-									})
-								})
-							}
-						})
-					}
-				})	
-			},
-			idLow() {
-				var that = this
-				uni.chooseImage({
-					success: function(res) {
-						uni.uploadFile({
-							url: 'https://www.zthymaoyi.com/upload/admin',
-							filePath: res.tempFilePaths[0],
-							name: 'file',
-							success(res) {
-								var data = res.data
-								var strToObj = JSON.parse(data)
-								that.id[1] = strToObj.url
-								that.id2 = strToObj.url
-								that.certificatesTwo = false
-								that.personImgs.personImg = that.id[1]
-								that.$api.doRequest('get', '/driverViewInfo/personShibie', that.personImgs).then(res => {
-									if(res.data.data.recPerson != null){
-										if(res.data.data.recPerson != ""){
-											that.$set(that.DriverViewInfo,'driverName',res.data.data.recPerson)
-										}
-									}
-									if(res.data.data.recPersonNo != null){
-										if(res.data.data.recPersonNo != ""){
-											that.$set(that.DriverViewInfo,'numberCard',res.data.data.recPersonNo)
-										}
-									}
-								}).catch(res => {
-									uni.showToast({
-										title: res.data.message,
-										icon: 'none',
-										duration: 2000
-									})
-								})
-							}
-						})
-					}
-				})
-			},
 			commit() {
 				this.DriverViewInfo.addressUrl = this.addressUrl.toString()
 				this.DriverViewInfo.driverCarInfoList = [this.driverCarInfoList]
@@ -391,6 +407,7 @@
 		padding-right: 20rpx;
 		font-size: 12px;
 	}
+
 	.getcode {
 		font-size: 14px;
 		color: #AFB3BF;
@@ -530,14 +547,20 @@
 		background-color: #22C572;
 		color: white;
 	}
-	.words{
+
+	.words {
 		font-size: 18px;
 		font-weight: 600;
 		color: #617E8B;
-		}
-		.floats{
-			position: relative;
-			top: -150px;
-			text-align: center;
-		}
+	}
+
+	.floats {
+		position: relative;
+		top: -150px;
+		text-align: center;
+	}
+
+	.upload {
+		margin: 20rpx 0;
+	}
 </style>

pageD/identity/driverIdentityThree.vue

@@ -16,35 +16,47 @@
 					@on-uploaded="isAdd = true" :before-upload="filterFileType" :options="uploadOptions"
 					:custom="uploadCustom" @on-progress="onProgress"></upload>
 			</view>
-			<view style="margin: 0 auto;height: 240px;" v-if="drives != ''" @click="drive">
-				<image v-bind:src="drives" class="picture"></image>
+			<view style="margin: 0 auto;height: 240px;" v-if="drives != ''">
+				<!-- <image v-bind:src="drives" class="picture"></image>
 				<view class="floats" v-if="certificatesTwo == true">
 					<image src="../../static/img/authentication/xiangji@3x.png" style="width: 60px;height: 50px;">
 					</image>
 					<view class="words">
 						上传驾驶证
 					</view>
-				</view>
+				</view> -->
+				<upload class="upload" ref="upload" :action="action" :max-size="maxSize" :max-count="1"
+					:size-type="['compressed']" @on-success="getImgUrl1" @on-error="onError" @on-remove="onRemove"
+					@on-uploaded="isAdd = true" :before-upload="filterFileType" :options="uploadOptions1"
+					:custom="uploadCustom1" @on-progress="onProgress"></upload>
 			</view>
-			<view style="margin: 0 auto;height: 240px;" v-if="practices != ''" @click="practice">
-				<image v-bind:src="practices" class="picture"></image>
+			<view style="margin: 0 auto;height: 240px;" v-if="practices != ''" >
+				<!-- <image v-bind:src="practices" class="picture"></image>
 				<view class="floats" v-if="certificatesThree == true">
 					<image src="../../static/img/authentication/xiangji@3x.png" style="width: 60px;height: 50px;">
 					</image>
 					<view class="words">
 						上传道路运营证
 					</view>
-				</view>
+				</view> -->
+				<upload class="upload" ref="upload" :action="action" :max-size="maxSize" :max-count="1"
+					:size-type="['compressed']" @on-success="getImgUrl2" @on-error="onError" @on-remove="onRemove"
+					@on-uploaded="isAdd = true" :before-upload="filterFileType" :options="uploadOptions2"
+					:custom="uploadCustom2" @on-progress="onProgress"></upload>
 			</view>
-			<view style="margin: 0 auto;height: 240px;" v-if="operates != ''" class="fujian" @click="operate">
-				<image v-bind:src="operates" class="picture"></image>
+			<view style="margin: 0 auto;height: 240px;" v-if="operates != ''" class="fujian" >
+				<!-- <image v-bind:src="operates" class="picture"></image>
 				<view class="floats" v-if="certificatesFour == true">
 					<image src="../../static/img/authentication/xiangji@3x.png" style="width: 60px;height: 50px;">
 					</image>
 					<view class="words">
 						上传从业资格证
 					</view>
-				</view>
+				</view> -->
+				<upload class="upload" ref="upload" :action="action" :max-size="maxSize" :max-count="1"
+					:size-type="['compressed']" @on-success="getImgUrl3" @on-error="onError" @on-remove="onRemove"
+					@on-uploaded="isAdd = true" :before-upload="filterFileType" :options="uploadOptions3"
+					:custom="uploadCustom3" @on-progress="onProgress"></upload>
 			</view>
 			<button class="btns btn" @click="commit">提交</button>
 
@@ -71,9 +83,23 @@
 				imgUrls: [],
 				uploadCustom: true,
 				uploadCustom1: true,
+				uploadCustom2: true,
+				uploadCustom3: true,
 				uploadOptions: {
 					"text": "上传行驶证",
-					"bgc": "https://taohaoliang.oss-cn-beijing.aliyuncs.com/app/tmp/bankup%282%29.png"
+					"bgc": "https://taohaoliang.oss-cn-beijing.aliyuncs.com/app/tmp/travel.png"
+				},
+				uploadOptions1: {
+					"text": "上传驾驶证",
+					"bgc": "https://taohaoliang.oss-cn-beijing.aliyuncs.com/app/tmp/drive.png"
+				},
+				uploadOptions2: {
+					"text": "上传道路运营证",
+					"bgc": ""
+				},
+				uploadOptions3: {
+					"text": "上传从业资格证",
+					"bgc": ""
 				},
 				travels: "../../static/img/authentication/travel(3).png",
 				drives: "../../static/img/authentication/drive(3).png",
@@ -109,11 +135,37 @@
 			},
 			getImgUrl(res) {
 				console.log(res)
-				console.log('------------res-----------')
-				that.travels = res
-				that.addressUrl[0] = res
-				that.certificates = false
+				console.log('------------res1-----------')
+				this.travels = res
+				this.addressUrl[0] = res
+				this.certificates = false
 
+			},
+			getImgUrl1(res) {
+				console.log(res)
+				console.log('------------res2-----------')
+				this.drives = res
+				this.addressUrl[1] = res
+				this.certificatesTwo = false
+			
+			},
+			getImgUrl2(res) {
+				console.log(res)
+				console.log('------------res3-----------')
+				this.practices = res
+				this.addressUrl[2] = res
+				this.certificatesThree = false
+				
+			
+			},
+			getImgUrl3(res) {
+				console.log(res)
+				console.log('------------res4-----------')
+				
+				this.operates =res
+				this.addressUrl[3] =res
+				this.certificatesFour = false
+			
 			},
 			onError(error) {
 				alert(error)
@@ -127,7 +179,6 @@
 				this.imgUrls.splice(index, 1);
 			},
 			commit() {
-				var that = this
 				if (this.addressUrl[0] == "" || this.addressUrl[0] == null) {
 					this.$api.msg('请上传行驶证！')
 					return
@@ -331,63 +382,63 @@
 			// 		}
 			// 	})
 			// },
-			drive() {
-				var that = this
-				uni.chooseImage({
-					success: function(res) {
-						uni.uploadFile({
-							url: 'https://www.zthymaoyi.com/upload/admin',
-							filePath: res.tempFilePaths[0],
-							name: 'file',
-							success(res) {
-								var data = res.data
-								var strToObj = JSON.parse(data)
-								that.drives = strToObj.url
-								that.addressUrl[1] = strToObj.url
-								that.certificatesTwo = false
-							}
-						})
-					}
-				})
-			},
-			practice() {
-				var that = this
-				uni.chooseImage({
-					success: function(res) {
-						uni.uploadFile({
-							url: 'https://www.zthymaoyi.com/upload/admin',
-							filePath: res.tempFilePaths[0],
-							name: 'file',
-							success(res) {
-								var data = res.data
-								var strToObj = JSON.parse(data)
-								that.practices = strToObj.url
-								that.addressUrl[2] = strToObj.url
-								that.certificatesThree = false
-							}
-						})
-					}
-				})
-			},
-			operate() {
-				var that = this
-				uni.chooseImage({
-					success: function(res) {
-						uni.uploadFile({
-							url: 'https://www.zthymaoyi.com/upload/admin',
-							filePath: res.tempFilePaths[0],
-							name: 'file',
-							success(res) {
-								var data = res.data
-								var strToObj = JSON.parse(data)
-								that.operates = strToObj.url
-								that.addressUrl[3] = strToObj.url
-								that.certificatesFour = false
-							}
-						})
-					}
-				})
-			},
+			// drive() {
+			// 	var that = this
+			// 	uni.chooseImage({
+			// 		success: function(res) {
+			// 			uni.uploadFile({
+			// 				url: 'https://www.zthymaoyi.com/upload/admin',
+			// 				filePath: res.tempFilePaths[0],
+			// 				name: 'file',
+			// 				success(res) {
+			// 					var data = res.data
+			// 					var strToObj = JSON.parse(data)
+			// 					that.drives = strToObj.url
+			// 					that.addressUrl[1] = strToObj.url
+			// 					that.certificatesTwo = false
+			// 				}
+			// 			})
+			// 		}
+			// 	})
+			// },
+			// practice() {
+			// 	var that = this
+			// 	uni.chooseImage({
+			// 		success: function(res) {
+			// 			uni.uploadFile({
+			// 				url: 'https://www.zthymaoyi.com/upload/admin',
+			// 				filePath: res.tempFilePaths[0],
+			// 				name: 'file',
+			// 				success(res) {
+			// 					var data = res.data
+			// 					var strToObj = JSON.parse(data)
+			// 					that.practices = strToObj.url
+			// 					that.addressUrl[2] = strToObj.url
+			// 					that.certificatesThree = false
+			// 				}
+			// 			})
+			// 		}
+			// 	})
+			// },
+			// operate() {
+			// 	var that = this
+			// 	uni.chooseImage({
+			// 		success: function(res) {
+			// 			uni.uploadFile({
+			// 				url: 'https://www.zthymaoyi.com/upload/admin',
+			// 				filePath: res.tempFilePaths[0],
+			// 				name: 'file',
+			// 				success(res) {
+			// 					var data = res.data
+			// 					var strToObj = JSON.parse(data)
+			// 					that.operates = strToObj.url
+			// 					that.addressUrl[3] = strToObj.url
+			// 					that.certificatesFour = false
+			// 				}
+			// 			})
+			// 		}
+			// 	})
+			// },
 
 		}
 	}

pages.json

@@ -173,8 +173,7 @@
 		{
 			"path": "pages/attestation/index",
 			"style": {
-				"navigationBarTitleText": "身份认证",
-				"enablePullDownRefresh": true
+				"navigationBarTitleText": "身份认证"
 			}
 		},
 		{

pages/sale/information.vue

@@ -99,7 +99,7 @@
 			<view style='border-bottom:1px solid #EEEEEE;' class='guess-section-wrap-content1'>
 				<view style='border-bottom:1px solid #eee;padding:15px;' class='flex justify-between'  v-for='(item, index) in newsInfo' :key="index" @click="navToDetailPage(item.id)">
 					<view>
-						<view style='font-size:16px;height:54px;'>{{item.title}}</view>
+						<view class="list-row-titel">{{item.title}}</view>
 						<view style='color:#B2B3BB;font-size:12px;'><text style='margin-right:5px;'>{{item.from}}</text>{{item.gmtUpdate}}</view>
 					</view>
 					<view><image style='width:100px;height:72px;border-radius:5px;' :src='item.titleImg'></image></view>
@@ -321,9 +321,6 @@
 					that.categoryList = data
 					uni.hideLoading()
 				})
-				uni.showLoading({
-					title: '正在加载',
-				})
 				// 工厂价格
 				that.$api.request('news', 'getFactoryPriceInfo',{
 					category:this.category,
@@ -372,9 +369,6 @@
 					that.newsInfo = data
 					uni.hideLoading()
 				})
-				uni.showLoading({
-					title: '正在加载',
-				})
 				that.$api.request('integral', 'getIndexData', failres => {
 					that.$api.msg(failres.errmsg)
 					this.isLoadMore = false
@@ -498,10 +492,6 @@
 				const that = this
 				var pages=that.pages
 				var limit=that.limit
-							   
-				uni.showLoading({
-					title: '正在加载',
-				})
 				that.$api.request('news', 'getNewsInfo', {
 					category:2,
 					page: 1,
@@ -975,4 +965,20 @@
 			width: 100%;
 		}
 	}
+	.title{
+		font-size: 34rpx;
+		font-weight: 700;
+		color: #333333;
+	}
+	.list-row-titel{
+		text-overflow: -o-ellipsis-lastline;
+		overflow: hidden;
+		text-overflow: ellipsis;display:
+		-webkit-box;-webkit-line-clamp: 2;
+		-webkit-box-orient: vertical;
+		font-size:16px;
+		height:45px;
+		padding-right: 40rpx;
+		margin-bottom: 26rpx;
+	}
 </style>

pages/user/setUp.vue

@@ -9,7 +9,7 @@
 				<image src="../../static/img/myimg/gengduo1@3x.png" class="arrow" ></image>
 			</view>
 		</view>
-		<view class="flex headPortrait justify-between" @click="nickname">
+		<view class="flex headPortrait justify-between" @click="nickname(username)">
 			<view class="title">昵称</view>
 			<view class="nextStep flex">
 				<view class="username">
@@ -54,9 +54,9 @@
 					url: `/pages/user/set_picture`
 				})
 			},
-			nickname(){
+			nickname(username){
 				uni.navigateTo({
-					url: `/pages/user/set_nickname`
+					url: `/pages/user/set_nickname?nickname=${username}`
 				})
 			}
 		}

pages/user/set_nickname.vue

@@ -24,6 +24,9 @@
 				deptListurl: {},
 			}
 		},
+		onLoad(param) {
+			this.nickname = param.nickname
+		},
 		computed: {
 			...mapState(['hasLogin', 'userInfo'])
 		},
@@ -114,7 +117,7 @@
 
 	.texts {
 		line-height: 50px;
-		color: #C6C6C8;
+		/* color: #C6C6C8; */
 		font-size: 16px;
 		/* placeholder-style="font-size:18px" */
 	}