Tang 3 年 前
コミット
e5ee6d93d2

+ 1 - 1
common/methodTool.js

@@ -146,7 +146,7 @@ export default {
 	uploadFile(options, int) {
 		return new Promise((resolve, reject) => {
 			var self = this;
-			if (options.indexOf('//tmp/') === -1) {
+			if (options.indexOf('//tmp') === -1) {
 				resolve(options)
 				return
 			}

+ 1 - 1
common/request.js

@@ -4,7 +4,7 @@ import store from '@/store/index.js'
 import api from './api.js'
 var num = 1
 
-export const BASE_URL = 'http://42.192.164.187:19005' //接口api  http://42.192.164.187:19005 http://192.168.1.222:5055
+export const BASE_URL = 'http://192.168.1.222:5055' //接口api  http://42.192.164.187:19005 http://192.168.1.222:5055
 
 
 export const BASE_IMG_URL = 'https://file-dev.xyyxt.net/' //图片上传api  'https://file.xyyxt.net/

+ 1 - 1
pages/shopping/shoppingCart.vue

@@ -4,7 +4,7 @@
 			<view class="slot-wrap"><image src="/static/logo2.png" style="width: 178rpx;height: 31rpx;margin-left: 30rpx;"></image></view>
 		</u-navbar>
 		<view v-show="isLogin">
-			<view v-if="!list.length"><u-empty text="购物车为空" margin-top="500" mode="list"></u-empty></view>
+			<view v-if="!list.length"><u-empty text="购物车为空" margin-top="500" mode="car"></u-empty></view>
 			<view v-else>
 				<view style="padding: 30rpx;padding-bottom: 98rpx;">
 					<uni-swipe-action>

+ 11 - 3
pages2/msg/detail.vue

@@ -29,7 +29,7 @@
 			</view>
 		</view>
 		<view class="btn1" @click="isOk" v-if="listData.systemStatus === 2 && listData.receiptStatus === 0">我已阅读</view>
-		<view class="btn1" v-if="listData.systemStatus === 1 && getNames(listData.remindId) !== ''" @click="jumpFuns(listData)">{{ getNames(listData.remindId) }}</view>
+		<view class="btn1" v-if="statusGO && listData.systemStatus === 1 && getNames(listData.remindId) !== ''" @click="jumpFuns(listData)">{{ getNames(listData.remindId) }}</view>
 	</view>
 </template>
 
@@ -42,15 +42,16 @@ export default {
 			listData: {},
 			id: null,
 			img1: '/static/icon/msg_icon1.png',
-			img2: '/static/icon/msg_icon2.png'
+			img2: '/static/icon/msg_icon2.png',
+			statusGO: true
 		};
 	},
 	onPullDownRefresh() {},
 	onLoad(option) {
 		this.id = Number(option.id);
-		this.getInfo();
 	},
 	onShow() {
+		this.getInfo();
 		/* if(this.current === 2 && this.$method.isLogin()){
 			this.$refs.refMy.init();
 		} */
@@ -143,6 +144,13 @@ export default {
 		getInfo() {
 			this.$api.getappinformUserId(this.id).then(res => {
 				if (res.data.code === 200) {
+					if (res.data.data.receiptStatus === 1 && (res.data.data.remindId === 2 || res.data.data.remindId === 4)) {
+						this.$api.getbaseprofiletpgetInfo({ goodsId: res.data.data.goodsId }).then(k => {
+							if ((k.data.data.status === 3 && k.data.data.changeStatus === 2) || k.data.data.status === 2 || k.data.data.status === 1) {
+								this.statusGO = false;
+							}
+						});
+					}
 					if (!res.data.data.receiptStatus) {
 						this.$api.courseappinformUser({ id: res.data.data.id, receiptStatus: 1 }).then(res => {
 							if (res.data.code === 200) {

+ 1 - 1
pages2/plan/index.vue

@@ -63,7 +63,7 @@
 								<u-col span="1"><image src="/static/more.png" class="img_more" @click.stop="openShow(item)"></image></u-col>
 							</u-row>
 							<scroll-view style="white-space: nowrap" class="scroll-view_H" scroll-x="true">
-								<view style="margin-top: 30rpx;display: inline-block;width:296rpx;margin-right: 30rpx;" v-for="(items, indexs) in 3" :key="indexs">
+								<view style="margin-top: 30rpx;display: inline-block;width:296rpx;margin-right: 30rpx;" v-for="(items, indexs) in item.goodsVos" :key="indexs">
 									<image :src="$method.splitImgHost(item.goodsVos[0].coverUrl)" class="r_image"></image>
 									<view class="r_t2">{{ item.goodsVos[0].goodsName }}</view>
 								</view>

+ 28 - 8
pages2/verify/input.vue

@@ -249,7 +249,12 @@
 									@tap="mouseDown"
 									canvas-id="handWriting"
 								></canvas>
-								<image v-else style="width:100%;height:100%;" :src="$method.splitImgHost(form[item.fieldKey])" mode=""></image>
+								<view v-else style="width:100%;height: 100%;position: relative;">
+									<view class="ctoples">
+										图片
+									</view>
+									<image style="width:100%;height:100%;" :src="$method.splitImgHost(form[item.fieldKey])" mode=""></image>
+								</view>
 							</view>
 						</u-form-item>
 					</view>
@@ -451,7 +456,7 @@ export default {
 		};
 	},
 	created() {
-		this.$store.getters.dictObj
+		this.$store.getters.dictObj;
 	},
 	onLoad(option) {
 		this.goodsId = Number(option.id);
@@ -596,24 +601,27 @@ export default {
 			this.resultForm(1);
 		},
 		async changePhotoListHeader1(lists, name) {
+			console.log(lists[0].url);
 			if (lists.length) {
 				this.fileList1 = lists;
-				if (lists[0].url.indexOf('//tmp/') !== -1) {
-					this.form.recent_photos = await this.$method.imageInfos(lists[0].url);
+				if (lists[0].url.indexOf('//tmp') !== -1) {
+					this.$set(this.form, 'recent_photos', await this.$method.imageInfos(lists[0].url));
 				}
 			} else {
 				this.fileList1 = [];
 				this.$set(this.form, 'recent_photos', '');
+				console.log(3, this.form.recent_photos);
 			}
 			this.$nextTick(function() {
+				console.log(4);
 				this.resultForm();
 			});
 		},
 		async changePhotoListHeader2(lists, name) {
 			if (lists.length) {
 				this.fileList2 = lists;
-				if (lists[0].url.indexOf('//tmp/') !== -1) {
-					this.form.idcard_face_photo = await this.$method.imageInfos(lists[0].url);
+				if (lists[0].url.indexOf('//tmp') !== -1) {
+					this.$set(this.form, 'idcard_face_photo', await this.$method.imageInfos(lists[0].url));
 				}
 			} else {
 				this.fileList2 = [];
@@ -626,8 +634,8 @@ export default {
 		async changePhotoListHeader3(lists, name) {
 			if (lists.length) {
 				this.fileList3 = lists;
-				if (lists[0].url.indexOf('//tmp/') !== -1) {
-					this.form.idcard_national_photo = await this.$method.imageInfos(lists[0].url);
+				if (lists[0].url.indexOf('//tmp') !== -1) {
+					this.$set(this.form, 'idcard_national_photo', await this.$method.imageInfos(lists[0].url));
 				}
 			} else {
 				this.fileList3 = [];
@@ -802,6 +810,17 @@ page {
 }
 </style>
 <style scope>
+	.ctoples{
+		position: absolute;
+		top: 0;
+		left: 0;
+		padding: 2rpx 23rpx;
+		display: inline-block;
+		background-color: rgba(0,0,0,.4);
+		font-size: 28rpx;
+		color: #fff;
+		border-bottom-right-radius: 24rpx;
+	}
 .handWriting {
 	width: 100%;
 	height: 100%;
@@ -826,6 +845,7 @@ page {
 	border-radius: 24rpx;
 	width: 100%;
 	height: 300rpx;
+	overflow: hidden;
 }
 .headerSDels {
 	height: 58rpx;

+ 60 - 16
pages2/verify/input2.vue

@@ -10,7 +10,7 @@
 		<u-collapse v-if="remarkStatus" :item-style="itemStyle" event-type="close">
 			<u-collapse-item title="审核结果反馈">
 				<view style="padding-bottom: 30rpx;">
-				<text class="collapse-item">{{ remark }}</text>
+					<text class="collapse-item">{{ remark }}</text>
 				</view>
 			</u-collapse-item>
 		</u-collapse>
@@ -28,7 +28,7 @@
 					>
 						<text style="color: blue;position: absolute;top: 20rpx;left: 180rpx;text-decoration: underline;" @click="downDocx(item.url)">点击下载</text>
 						<view class="dis_stys"><text style="color: #999999;">下载承诺书进行填写并签名盖章后上传(≤2M)</text></view>
-						<image v-if="!form[item.fieldKey]" style="width: 169rpx; height: 169rpx;" @click="uploadFieds" src="@/static/info_4.png"></image>
+						<image v-if="!form[item.fieldKey]" style="width: 169rpx; height: 169rpx;" @click="getChast" src="@/static/info_4.png"></image>
 						<view class="quzw" v-if="form[item.fieldKey]">
 							<view v-if="form[item.fieldKey].split('.').splice(-1)[0] == 'docx' || form[item.fieldKey].split('.').splice(-1)[0] == 'doc'" class="borsrs">
 								<image src="@/static/icon/jy_icon.png" style="width: 168rpx; height: 168rpx;"></image>
@@ -42,6 +42,7 @@
 			</u-form>
 		</view>
 		<view @click="submits" class="submit_btn">提交资料</view>
+		<u-action-sheet :list="list" v-model="showTableDown" @click="clickIndex"></u-action-sheet>
 	</view>
 </template>
 
@@ -49,6 +50,15 @@
 export default {
 	data() {
 		return {
+			showTableDown: false,
+			list: [
+				{
+					text: '上传图片'
+				},
+				// {
+				// 	text: '上传文件'
+				// }
+			],
 			itemStyle: {
 				marginTop: '20px',
 				backgroundColor: '#fff',
@@ -60,7 +70,7 @@ export default {
 			},
 			goodsId: null,
 			fileList1: [],
-			id:null,//id有值的话就是修改页面
+			id: null, //id有值的话就是修改页面
 			listData: {}, //页面数据
 			openVerify: false, // 控制是否手动验证
 			nextStatus: false, //是否有下一步
@@ -87,8 +97,8 @@ export default {
 		this.$refs.uForm.setRules(this.rules);
 	},
 	methods: {
-		backPage(){
-			uni.navigateBack()
+		backPage() {
+			uni.navigateBack();
 		},
 		seePhotos(url) {
 			uni.previewImage({
@@ -96,7 +106,7 @@ export default {
 			});
 		},
 		downDocx(url) {
-			this.$api.addWordbaseprofileStamp({goodsId:this.goodsId}).then(res => {
+			this.$api.addWordbaseprofileStamp({ goodsId: this.goodsId }).then(res => {
 				uni.downloadFile({
 					url: this.$method.splitImgHost(res.data.msg),
 					success: result => {
@@ -106,12 +116,46 @@ export default {
 						}
 					}
 				});
-			})
+			});
 		},
 		clearWord() {
 			this.$set(this.form, 'commitment_seal', '');
 			this.titleName = '';
 		},
+		clickIndex(inds){
+			if(inds === 0){
+				this.uploadImgs()
+			}
+			if(inds === 1){
+				this.uploadFieds()
+			}
+		},
+		getChast(){
+			this.showTableDown = true;
+		},
+		uploadImgs(){
+			var self = this
+			uni.chooseImage({
+			    count: 1, //默认9
+			    sizeType: ['original', 'compressed'], //可以指定是原图还是压缩图,默认二者都有
+			    success: function (res) {
+			        if (res.tempFiles[0].size > 2097152) {
+			        	self.$method.showToast('上传图片不得大于2M');
+			        	return;
+			        } else {
+			        	var type = res.tempFiles[0].path.split('.').splice(-1);
+			        	if (type[0] != 'jpg' && type[0] != 'png' && type[0] != 'jpeg') {
+			        		self.$method.showToast('请上传图片格式');
+			        		return;
+			        	}
+			        	self.$set(self.form, 'commitment_seal', res.tempFiles[0].path);
+			        	self.$nextTick(function() {
+			        		this.resultForm();
+			        	});
+			        }
+			    }
+			});
+		},
 		uploadFieds() {
 			var self = this;
 			wx.chooseMessageFile({
@@ -159,26 +203,26 @@ export default {
 							}
 						}
 					})(),
-					status: self.remarkStatus?1:0
+					status: self.remarkStatus ? 1 : 0
 				};
 			}
 			var datas = {
 				goodsId: self.goodsId,
 				keyValue: JSON.stringify(objs)
 			};
-			if(self.remarkStatus){
-				data.id = self.id
+			if (self.remarkStatus) {
+				data.id = self.id;
 				self.$api.editbaseprofileStamp(datas).then(res => {
 					if (res.data.code === 200) {
 						self.$method.showToast('提交成功');
-						uni.navigateBack()
+						uni.navigateBack();
 					}
 				});
-			}else{
+			} else {
 				self.$api.addbaseprofileStamp(datas).then(res => {
 					if (res.data.code === 200) {
 						self.$method.showToast('提交成功');
-						uni.navigateBack()
+						uni.navigateBack();
 					}
 				});
 			}
@@ -225,12 +269,12 @@ export default {
 			this.$api.getbaseprofiletpId(this.goodsId).then(res => {
 				var ast = JSON.parse(res.data.data.keyValue2);
 				self.listData = ast;
-				self.$api.getbaseprofileStampgetInfo({goodsId:self.goodsId}).then(result => {
+				self.$api.getbaseprofileStampgetInfo({ goodsId: self.goodsId }).then(result => {
 					if (result.data.code === 200) {
 						if (result.data.data && result.data.data.status === 3) {
 							self.remark = result.data.data.text;
 							self.remarkStatus = true;
-							self.id = result.data.data.id
+							self.id = result.data.data.id;
 						} else if (result.data.data && (result.data.data.status === 1 || result.data.data.status === 2)) {
 							uni.showModal({
 								showCancel: false,
@@ -264,7 +308,7 @@ page {
 	color: red;
 	font-size: 24rpx;
 }
-.collapse-item{
+.collapse-item {
 	color: #666;
 	font-size: 24rpx;
 	padding-bottom: 30rpx;