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

src/common/api/order.js

@@ -75,6 +75,11 @@ let orderApiFun = function(vm){
 	 */
 	let getWatermark = async (params = {}) => await vm.$u.get(prefix + vm.vuex_token + '/photo/watermark', params);
 	
+	/**
+	 * 保存师傅水印
+	 */
+	let saveWatermark = async (params = {}) => await vm.$u.post(prefix + vm.vuex_token + '/photo/watermark', params);
+
 	/**
 	 * 获取师傅开放可选时间段
 	 */
@@ -144,6 +149,7 @@ let orderApiFun = function(vm){
 		orderStandard,
 		saveImage,
 		getWatermark,
+		saveWatermark,
 		openTimerange,
 		contactTime,
 		checkRejectable,

src/components/createCom/XhFiles.vue

@@ -73,6 +73,12 @@
 		},
 		methods: {
 			selectUpload(){
+				if (this.imgList.length === 10) {
+					return this.$refs.uToast.show({
+						title: '图片已超出最大数量',
+						type: 'error',
+					})
+				}
 				// 弹窗展示
 				this.maskShow = true
 			},

src/components/photo/preview.vue

@@ -125,7 +125,7 @@
 				photo.currentItemLength = 10
 				this.continuePhoto()
 				// 完成本项
-				this.$emit('finish')
+				//this.$emit('finish')
 			},
 			// 确认图片
 			continuePhoto() {
@@ -139,7 +139,7 @@
 			},
 			submitFile() {
 				const photo = getApp().globalData.photo
-				photo.currentItemLength = photo.currentItemLength + 1
+				if (photo.currentItemLength < 10) photo.currentItemLength = photo.currentItemLength + 1
 				uni.hideLoading()
 				// 当前项的图片显示
 				// 拍照项张数目增加 等于10张

src/components/photo/setting.vue

@@ -9,20 +9,20 @@
 				<text class="itemTitle">保存原图</text>
 				<text class="itemNotice">拍照后另保存一张无水印的图片</text>
 			</view>
-			<switch class="itemSwitch" :checked="result['has_origin']" @change="handleOrigineChange" color="#007AFF" />
+			<switch class="itemSwitch" :checked="result['hasOrigin']" @change="handleOrigineChange" color="#007AFF" />
 		</view>
 		<view class="itemView" v-if="showTitleSwitch">
 			<view class="itemTitleView" @click="itemClick({},-1)">
 				<text class="itemTitle">水印标题</text>
-				<text class="itemNotice">{{result['lower_right']['title_text'] || '点击可编辑更改'}}</text>
+				<text class="itemNotice">{{result['lowerLeft']['title'] || '点击可编辑更改'}}</text>
 			</view>
-			<switch class="itemSwitch" disabled :checked="result['lower_right']['title_text'] != ''"
+			<switch class="itemSwitch" disabled :checked="result['lowerLeft']['title'] != ''"
 				@click="handleClickTitleSwitch" color="#007AFF" />
 		</view>
 		<view class="itemView" v-for="(item,ikey) in itemList" :key="ikey">
 			<view class="itemTitleView" @click="itemClick(item,ikey)">
-				<text class="itemTitle">{{item['watemark_text'] || '自定义' + (ikey + 1)}}</text>
-				<text class="itemNotice">{{item['watemark_value'] || '点击可编辑更改'}}</text>
+				<text class="itemTitle">{{item['watemarkText'] || '自定义' + (ikey + 1)}}</text>
+				<text class="itemNotice">{{item['watemarkValue'] || '点击可编辑更改'}}</text>
 			</view>
 			<switch class="itemSwitch" :checked="item['enable']" @change="itemChange(item, ikey)" color="#007AFF" />
 		</view>
@@ -33,8 +33,8 @@
 				<view class="inputBackView">
 					<view class="ph-pop-left-view">
 						<view class="leftInputView">
-							<input class="leftInput" type="text" v-model="currenItem['watemark_text']"
-								@input="leftInput()" :disabled="currenItem.type === 'title_text'" placeholder="请输入"
+							<input class="leftInput" type="text" v-model="currenItem['watemarkText']"
+								@input="leftInput()" :disabled="currenItem.type === '备注'" placeholder="请输入"
 								maxlength="10" />
 						</view>
 						<view class="ph-pop-tip-view" v-if="showTipLeft">*必填项</view>
@@ -42,7 +42,7 @@
 					<view class="ph-pop-mid-view">：</view>
 					<view>
 						<view class="rightInputView">
-							<input class="rightInput" type="text" v-model="currenItem['watemark_value']"
+							<input class="rightInput" type="text" v-model="currenItem['watemarkValue']"
 								@input="rightInput()" placeholder="请输入内容" maxlength="30" />
 						</view>
 						<view class="ph-pop-tip-view" v-if="showTipRight">*必填项</view>
@@ -72,14 +72,14 @@
 				isPopShow: false,
 				icon_close_new: '',
 				result: {
-					has_origin: true,
-					lower_right: {
+					hasOrigin: true,
+					lowerLeft: {
 						body: []
 					}
 				},
 				currenItem: {
-					'watemark_text': '',
-					'watemark_value': ''
+					'watemarkText': '',
+					'watemarkValue': ''
 				},
 				editingItem: {},
 				showTipLeft: false,
@@ -89,10 +89,11 @@
 		},
 		computed: {
 			itemList() {
-				if (this.result['lower_right']) {
-					var arr = this.result['lower_right']['body']
+				console.log(this.result)
+				if (this.result['lowerLeft']) {
+					var arr = this.result['lowerLeft']['body']
 					return arr.filter((item) => {
-						return item.watemark_type === '备注'
+						return item.watemarkType === '备注'
 					})
 				} else {
 					return []
@@ -100,7 +101,7 @@
 
 			},
 			showTitleSwitch() {
-				return this.result['lower_right'].hasOwnProperty('title_text')
+				return this.result['lowerLeft'].hasOwnProperty('title')
 			},
 			customStyleCancel() {
 				return {
@@ -122,54 +123,43 @@
 			getApp().trackPage('水印设置页')
 			const globalData = getApp().globalData
 			this.icon_close_new = globalData.icon_close_new
-			this.systemId = globalData.photo.currentItem.systemId
+			this.systemId = globalData.photo.currentItem.partnerCompanyId
 			this.getItemList()
 		},
 		methods: {
 			getItemList: function() {
-				// this.systemId = '79550af260555cc20afb34156c94b32c' // 测试数据
 				this.loading = true
-				this.$u.api.getUserWatermark({
-					'token': this.vuex_token,
-					'system_id': this.systemId
-				}).then(res => {
-					if (res && res.result) {
-						if(res.result.error_code){
-							uni.showToast({title: res.result.error_msg})
-						}else{
-							this.result = res.result
-						}
-					}else{
-						uni.showToast({title: '网络异常'})
+				this.$u.api.getWatermark({partnerCompanyId:this.systemId}).then(res => {
+					if (res.code == 200) {
+						this.result = res.data
+					} else {
+						uni.showToast({title: res.data.message})
 					}
 					this.loading = false
 				})
 			},
 			saveUserWatermark: function() {
 				this.loading = true
-				this.$u.api.saveUserWatermark({
-					'token': this.vuex_token,
-					'watermark': this.result
-				}).then(res => {
-					if (res.result.code == true) {
-						const photo = getApp().globalData.photo
-						photo.waterSetting = this.result
+				this.$u.api.saveWatermark(this.result).then(res=>{
+					if(res.code === 200){
+						uni.showToast({title:'保存成功'})
+						getApp().globalData.photo.waterSetting = this.result
+						this.$emit("changeWatermark", this.result);
 					}else{
-						uni.showToast({title: res.result.msg})
+						uni.showToast({title: res.message})
 					}
-
 					this.loading = false
 				})
 			},
 
 			//保存原图 开关
 			handleOrigineChange: function(e) {
-				this.result['has_origin'] = !this.result['has_origin']
+				this.result['hasOrigin'] = !this.result['hasOrigin']
 				this.saveUserWatermark()
 			},
 
 			handleClickTitleSwitch: function(e) {
-				var string = this.result['lower_right']['title_text'] ? '水印标题不可关闭' : '请先编辑该自定义项'
+				var string = this.result['lowerLeft']['title'] ? '水印标题不可关闭' : '请先编辑该自定义项'
 				uni.showToast({
 					icon: 'none',
 					title: string
@@ -178,7 +168,7 @@
 
 			//自定义 开关
 			itemChange: function(item, ikey) {
-				if (item['watemark_value']) {
+				if (item['watemarkValue']) {
 					// 修改
 					item['enable'] = !item['enable']
 					this.saveUserWatermark()
@@ -194,9 +184,9 @@
 			itemClick: function(item, ikey) {
 				if (ikey === -1) {
 					this.currenItem = {
-						'watemark_text': '水印标题',
-						'watemark_value': this.result['lower_right']['title_text'],
-						'type': 'title_text'
+						'watemarkText': '水印标题',
+						'watemarkValue': this.result['lowerLeft']['title'],
+						'type': '备注'
 					}
 				} else {
 					this.editingItem = item
@@ -210,7 +200,7 @@
 
 			//左侧输入框
 			leftInput: function(e) {
-				if (this.currenItem['watemark_text']) {
+				if (this.currenItem['watemarkText']) {
 					this.showTipLeft = false
 				}
 
@@ -218,7 +208,7 @@
 
 			//右侧输入框
 			rightInput: function(e) {
-				if (this.currenItem['watemark_value']) {
+				if (this.currenItem['watemarkValue']) {
 					this.showTipRight = false
 				}
 			},
@@ -227,8 +217,8 @@
 			popCancelClick: function() {
 				this.isPopShow = false
 				this.currenItem = {
-					'watemark_text': '',
-					'watemark_value': ''
+					'watemarkText': '',
+					'watemarkValue': ''
 				}
 			},
 
@@ -241,22 +231,22 @@
 			},
 			//自定义弹窗 保存
 			popSaveClick: function() {
-				if (this.currenItem['watemark_text'] && this.currenItem['watemark_value']) {
+				if (this.currenItem['watemarkText'] && this.currenItem['watemarkValue']) {
 					this.isPopShow = false
-					if (this.currenItem.type === 'title_text') {
-						this.result['lower_right']['title_text'] = this.currenItem['watemark_value']
+					if (this.currenItem.type === '备注') {
+						this.result['lowerLeft']['title'] = this.currenItem['watemarkValue']
 					} else {
-						this.editingItem['watemark_text'] = this.currenItem['watemark_text']
-						this.editingItem['watemark_value'] = this.currenItem['watemark_value']
+						this.editingItem['watemarkText'] = this.currenItem['watemarkText']
+						this.editingItem['watemarkValue'] = this.currenItem['watemarkValue']
 						this.editingItem['enable'] = true
 					}
 					this.saveUserWatermark()
 				} else {
 					// 提示
-					if (!this.currenItem['watemark_text']) {
+					if (!this.currenItem['watemarkText']) {
 						this.showTipLeft = true
 					}
-					if (!this.currenItem['watemark_value']) {
+					if (!this.currenItem['watemarkValue']) {
 						this.showTipRight = true
 					}
 				}

src/components/take/index.vue

@@ -7,7 +7,7 @@
 						src="/static/photo/icon-switch.png"></cover-image>
 					<cover-image @click="setCameraInfo('flash')" class="icon" mode="aspectFit"
 						:src="'/static/photo/icon-light-' + cameraInfo.flash +'.png'"></cover-image>
-					<cover-image v-if="currentItem.system_id" @click="changeType(3)" class="icon" mode="aspectFit"
+					<cover-image v-if="currentItem.partnerCompanyId" @click="changeType(3)" class="icon" mode="aspectFit"
 						src="/static/photo/icon-setting.png"></cover-image>
 				</cover-view>
 			</cover-view>
@@ -39,7 +39,7 @@
 			</view>
 		</view>
 		<photo-preview v-if="showType === 2" @changeType="changeType" @finish="finish" />
-		<photo-setting v-if="showType === 3" @changeType="changeType" />
+		<photo-setting v-if="showType === 3" @changeType="changeType" @changeWatermark="changeWatermark"/>
 	</view>
 </template>
 
@@ -128,10 +128,10 @@
 			titleTxt() {
 				const waterSetting = this.waterSetting
 				let txt = ''
-				if (!waterSetting || !waterSetting.lower_right) {
+				if (!waterSetting || !waterSetting.lowerLeft) {
 					return ''
 				}
-				txt = waterSetting.lower_right && waterSetting.lower_right.title_text || ''
+				txt = waterSetting.lowerLeft && waterSetting.lowerLeft.title || ''
 				return txt
 			},
 			settingTxtArr() {
@@ -144,17 +144,17 @@
 				let settingTxtArr = []
 				const typeArr = ['经度', '纬度', '地址', '时间']
 				const waterSetting = this.waterSetting
-				if (!waterSetting || !waterSetting.lower_right || !waterSetting.lower_right.body) {
+				if (!waterSetting || !waterSetting.lowerLeft || !waterSetting.lowerLeft.body) {
 					return arr
 				}
-				const settingArr = waterSetting.lower_right.body
+				const settingArr = waterSetting.lowerLeft.body
 				settingArr.map(item => {
-					const idx = typeArr.indexOf(item.watemark_type)
-					if (item.enable && (idx > -1 || (item.watemark_value && item.watemark_text))) {
+					const idx = typeArr.indexOf(item.watemarkType)
+					if (item.enable && (idx > -1 || (item.watemarkValue && item.watemarkText))) {
 						if (idx > -1) {
 							settingTxtArr.push(arr[idx])
 						} else {
-							settingTxtArr.push(item.watemark_text + '：' + item.watemark_value)
+							settingTxtArr.push(item.watemarkText + '：' + item.watemarkValue)
 						}
 					}
 				})
@@ -191,6 +191,9 @@
 			changeType(type) {
 				this.showType = type
 			},
+			changeWatermark(watermark){
+				this.waterSetting = watermark
+			},
 			updateTime() {
 				this.waterInfo.date = this.getTime()
 				// let timer = setTimeout(() => {

src/pages/order/complete.vue

@@ -124,6 +124,7 @@
 				inGuaranteePeriod:'',
                 list: [],
                 tabIndex: 0,
+				show200: true, // 基础信息显示金额输入框
                 scrollTop: 0, //tab标题的滚动条位置
                 oldScrollTop: 0,
                 current: 0, // 预设当前项的值
@@ -238,9 +239,6 @@
 					'font-size': '32rpx',
 				}
 			},
-			show200() { /// 基础信息显示金额输入框
-				return this.form.paymentMethodsType != '03'
-			}
         },
         methods: {
 			getCompleteData() {//获取工单配置的完工项目
@@ -400,6 +398,7 @@
 						}
 					}
 				}
+
                 console.log(this.form)
             },
             nextStep() {

src/pages/photo/list.vue

@@ -177,7 +177,6 @@
 				self.$u.api.orderStandard(data).then((res) => {
 					this.loading = false
 					if (res.code == 200) {
-						console.log("===", res.data)
 						if(res.data && res.data.length > 0){
 							let dataList = []
 							var  flag = false;
@@ -205,6 +204,7 @@
 									}
 								}
 							})
+							console.log("===", dataList)
 							this.handleData(dataList)
 						}
 					} else {
@@ -217,7 +217,6 @@
 				this.dataList = result
 				if (result.length > 0) {
 					var item = result[0]
-					getApp().globalData.photo.waterSetting = this.userWatermark 
 					this.rightList = item.list
 				}
 			},
@@ -448,7 +447,6 @@
 		background-color: #FAFAFA;
 		width: 100%;
 		height: 100rpx;
-		position: fixed;
 		display: flex;
 		flex-direction: row;
 		z-index: 1;
@@ -501,6 +499,6 @@
 	}
 	
 	.scroll-y {
-		height: 80vh;
+		height: 73vh;
 	}
 </style>