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

.env.js

 ;
 (function() {
-	let NODE_ENV = 'dev'; // dev:开发环境 | test:测试环境  
+	let NODE_ENV = 'test'; // dev:开发环境 | test:测试环境  
 	let ENV_VAR = null;
 	if (process.env.NODE_ENV === "development") {
 		if (NODE_ENV === 'dev') {
@@ -10,7 +10,8 @@
 		}
 
 	} else if (process.env.NODE_ENV === "production") {
-		ENV_VAR = require('./.env.prod.js');
+		ENV_VAR = require('./.env.prod.js');
+		//ENV_VAR = require('./.env.test.js');
 	}
 	if (ENV_VAR) {
 		process.uniEnv = {};

src/components/order/index.vue

@@ -357,7 +357,7 @@
 					display: flex;
 					align-items: center;
 					align-items: flex-start;
-
+					text-align: left;
 					.address-image {
 						width: 26rpx;
 						height: 28rpx;

src/components/photo/preview.vue

@@ -50,7 +50,7 @@
 			// if(e.standardId) {
 			// 	this.standardId = e.standardId
 			// }
-			this.token = getApp().globalData.token
+			this.token = this.vuex_token
 		},
 		methods: {
 			// 保存照片到本地

src/components/photo/setting.vue

@@ -130,7 +130,7 @@
 				// this.systemId = '79550af260555cc20afb34156c94b32c' // 测试数据
 				this.loading = true
 				this.$u.api.getUserWatermark({
-					'token': getApp().globalData.token,
+					'token': this.vuex_token,
 					'system_id': this.systemId
 				}).then(res => {
 					if (res && res.result) {
@@ -148,7 +148,7 @@
 			saveUserWatermark: function() {
 				this.loading = true
 				this.$u.api.saveUserWatermark({
-					'token': getApp().globalData.token,
+					'token': this.vuex_token,
 					'watermark': this.result
 				}).then(res => {
 					if (res.result.code == true) {

src/components/take/index.vue

 <template>
-	<view>
+	<view class="camera">
 		<view class="camera-container" v-if="showType === 1">
 			<cover-view class="header-box" :style="{'height':navHeight/2 + 'px'}">
 				<cover-view class="inner">
@@ -26,7 +26,8 @@
 			<cover-view class="bottom-box" v-if="!standardShow">
 				<cover-image class="icon" src='/static/photo/icon-back.png' mode="" @click="goBack"></cover-image>
 				<cover-image class='icon-take icon' src='/static/photo/icon-take.png' @click="$u.debounce(takePhoto, 500)"> </cover-image>
-				<cover-image class='icon' src='/static/photo/icon-standard.png' @click="standardShow = true"> </cover-image>
+				<cover-image class='icon' src='/static/photo/icon-standard.png' @click="standardShow = true" v-if="standardStatus"> </cover-image>
+				<view class='icon' v-else></view>
 			</cover-view>
 			<canvas canvas-id="canvas" id="photoCanvas" class="canvas"
 				:style="{'width':750 + 'rpx','height': cameraHeight + 'rpx'}"></canvas>
@@ -101,7 +102,8 @@
 				ratio: 0,
 				cameraChange: false,
 				waterSetting: null,
-				shadowInitShow: false, // 第一次进入页面需显示弹窗
+				shadowInitShow: false, // 第一次进入页面需显示弹窗
+				standardStatus: false // 是否显示拍照要求
 			}
 		},
 		created(e) {
@@ -119,6 +121,7 @@
 			if (this.currentItem.images.length > 0) {
 				this.shadowInitShow = true
 				this.standardShow = true
+				this.standardStatus = true
 			}
 		},
 		computed: {
@@ -474,7 +477,17 @@
 		}
 	}
 </script>
-<style scoped lang="scss">
+<style scoped lang="scss">
+	.camera {
+		position:fixed;
+		padding:0;
+		margin:0;
+		top:0;
+		left:0;
+		width: 100%;
+		height: 100%;
+		z-index: 999999;
+	}
 	.camera-container {
 		// padding-top:var(--status-bar-height);
 		min-height: 100vh;

src/pages/index/index.vue

@@ -183,7 +183,6 @@
 					if (result && result.record) {
 						vm.loaded = true;
 						vm.needSettled = result.needSettled;
-						vm.needSettled = false
 						vm.status = Number(result.record.status || '0');
 						// vm.status = 8
 					}
@@ -347,11 +346,18 @@
 							for (var i in res.data) {
 								count += res.data[i]
 							}
-							// 修改tab总数
-							uni.setTabBarBadge({
-								index: 1,
-								text: String(count)
-							})
+							// 修改tab总数
+							if (count > 0) {
+								uni.setTabBarBadge({
+									index: 1,
+									text: String(count)
+								})
+							} else  {
+								uni.removeTabBarBadge({
+									index: 1
+								})
+							}
+							
 						}
 
 					} else {
@@ -483,7 +489,7 @@
 
 				.tip-other {
 					font-size: 28rpx;
-					color: #333333;
+					color: #666666;
 					margin-bottom: 20rpx;
 				}
 

src/pages/order/complete.vue

@@ -215,7 +215,7 @@
                 return process.uniEnv.qn_base_url + 'mixing.png'
             },
             buttonStyle() {
-                return this.submitBtnStatus ? {
+                return {
                     'color': '#FFFFFF',
                     'background-color': '#2272FF;',
                     'width': '300rpx',
@@ -223,14 +223,6 @@
                     'font-size': '32rpx',
                     'font-weight': 'bold',
 					'margin-left': '50rpx'
-                } : {
-                    'color': '#FFFFFF',
-                    'background-color': '#D1D4D4;',
-                    'width': '300rpx',
-                    'height': '104rpx',
-                    'font-size': '32rpx',
-                    'font-weight': 'bold',
-					'margin-left': '50rpx'
                 }
             },
 			customStyle() {

src/pages/order/detail.vue

@@ -119,7 +119,7 @@
 				<view v-if="showCenterBtn" @click="handleBtn"  class="button" :class="['center-button-view', btnClass]">
 					<text>{{ centerButtonText }}</text>
 					<view v-if="order.currentOverTime"  class="time-view">
-						<text>{{order.currentOverTime > new Date().getTime()?'剩':'超'}}</text>
+						<text style="padding-right: 8rpx;">{{order.currentOverTime > new Date().getTime()?'剩':'超'}}</text>
 						<u-count-down 
 							:timestamp="timestampDiff(order.currentOverTime)" 
 							font-size="20" 
@@ -381,6 +381,7 @@
 					if (res.code == 200) {
 						self.order = res.data
 						this.getCurrentBtn()
+						self.timeOutChange(self.order.currentOverTime)
 						if(self.order.isFirstOrder){
 							this.visibale = true
 						}
@@ -563,7 +564,16 @@
 					data.coordinate = this.dataValue ? this.dataValue[0]+','+this.dataValue[1]:''
 					data.url = this.errorSignUrl?this.errorSignUrl:''
 				}else  if(this.submitType === 'toFilish'){ // 去完工
-					this.filish()
+					if (this.order.categoryName != '充电桩') {
+						 uni.showModal({
+						        title: '提示',
+						        content: '非充电桩订单，请在扳手APP进行完工',
+								showCancel:false,
+								confirmText: '好的',
+						    })
+					} else {
+						this.filish()
+					}
 					return
 				}
 				this.$u.api[this.submitType](data, this.order.orderId).then(res => {

src/pages/order/index.vue

@@ -274,10 +274,16 @@
 								count += res.data[i]
 							}
 							// 修改tab总数
-							uni.setTabBarBadge({
-								index: 1,
-								text: String(count)
-							})
+							if (count > 0) {
+								uni.setTabBarBadge({
+									index: 1,
+									text: String(count)
+								})
+							} else  {
+								uni.removeTabBarBadge({
+									index: 1
+								})
+							}
 						}
 					} else {
 						console.log(res.message, "获取订单数量失败！");

src/pages/photo/list.vue

@@ -146,7 +146,7 @@
 				this.loading = true
 				let that = this
 				this.$u.cloudApi.getGroupStandardV2({
-					'token': getApp().globalData.token,
+					'token': this.vuex_token,
 					'classify_id': this.classifyId,
 					'system_id': this.systemId,
 					'brand_id': this.brandId
@@ -253,7 +253,7 @@
 			// 清除图片
 			handleClickSure: function() {
 				this.$u.cloudApi.cleanImage({
-					'token': getApp().globalData.token,
+					'token': this.vuex_token,
 				}).then(res => {
 					this.isPopShow = false
 					if (res && res.result) {

src/pages/photo/preview.vue

@@ -49,7 +49,7 @@
 				this.standardId = e.standardId
 			}
 
-			this.token = getApp().globalData.token
+			this.token = this.vuex_token
 		},
 		methods: {
 			// 保存照片到本地

src/pages/photo/setting.vue

@@ -130,7 +130,7 @@
 				// this.systemId = '79550af260555cc20afb34156c94b32c' // 测试数据
 				this.loading = true
 				this.$u.cloudApi.getUserWatermark({
-					'token': getApp().globalData.token,
+					'token': this.vuex_token,
 					'system_id': this.systemId
 				}).then(res => {
 					if (res && res.result) {
@@ -148,7 +148,7 @@
 			saveUserWatermark: function() {
 				this.loading = true
 				this.$u.cloudApi.saveUserWatermark({
-					'token': getApp().globalData.token,
+					'token': this.vuex_token,
 					'watermark': this.result
 				}).then(res => {
 					if (res.result.code == true) {

src/pages/settle/base.vue

@@ -360,7 +360,7 @@
 					return;
 				}
 				uni.showToast({
-					title: '入驻基本信息提交成功',
+					title: '提交成功',
 					icon: 'success'
 				});
 				let timer = setTimeout(() => {

src/pages/settle/file.vue

@@ -23,7 +23,7 @@
 						></image>
 					</view>
 					<view class="card-info-view" v-if="index == 0 
-					&& ((fileInfo.id_card_name || fileInfo.id_card_number || fileInfo.id_card_date) || frontErrorMsg || backErrorMsg)">
+					&& ((fileInfo.id_card_name || fileInfo.id_card_number || fileInfo.id_card_expire) || frontErrorMsg || backErrorMsg)">
 						<view class="card-list-view" v-for="(value, cardkey) in cardTitle" :key="cardkey">
 							<view class="card-list-item">
 								<text>{{ value }}</text>
@@ -31,7 +31,7 @@
 							</view>
 							<view class="line-view"></view>
 							<view class="card-item-error" v-if="((cardkey == 'id_card_name' || cardkey == 'id_card_number') && frontErrorMsg)">{{ frontErrorMsg }}</view>
-							<view class="card-item-error" v-if="(cardkey == 'id_card_date' && backErrorMsg)">{{ backErrorMsg }}</view>
+							<view class="card-item-error" v-if="(cardkey == 'id_card_expire' && backErrorMsg)">{{ backErrorMsg }}</view>
 						</view>
 					</view>
 					<view v-if="index == 0" class="bottom-tip-view">
@@ -105,7 +105,7 @@ export default {
 				id: "",
 				id_card_name: "",
 				id_card_number: "",
-				id_card_date: '',
+				id_card_expire: '',
 				id_card_front: "",
 				id_card_back: "",
 				electrician_certificate: "",
@@ -221,7 +221,7 @@ export default {
 			return {
 				'id_card_name': '姓名',
 				'id_card_number': '身份证号',
-				'id_card_date': '有效期'
+				'id_card_expire': '有效期'
 			}
 		},
 		anquanImage() {
@@ -407,9 +407,9 @@ export default {
 					res.data.id_card_number || "";
 				this.frontErrorMsg = (!this.fileInfo.id_card_name || !this.fileInfo.id_card_number) ? "识别失败，请重新上传" : ''
 			} else {
-				this.fileInfo.id_card_date = res.data.id_card_date || "";
+				this.fileInfo.id_card_expire = res.data.id_card_expire || "";
 				this.fileInfo.id_card_back_check = true;
-				this.backErrorMsg = !this.fileInfo.id_card_date ? "识别失败，请重新上传" : ''
+				this.backErrorMsg = !this.fileInfo.id_card_expire ? "识别失败，请重新上传" : ''
 			}
 		},
 		checkFileInfo() {

src/plugins/uploader/request/upload/qiniuUploader.js

@@ -156,7 +156,7 @@
   function uploadURLFromRegionCode(code) {
     var uploadURL = null;
     switch (code) {
-      case 'ECN': uploadURL = 'https://up.qbox.me'; break;
+      case 'ECN': uploadURL = 'https://upload.qiniup.com'; break;
       case 'NCN': uploadURL = 'https://up-z1.qbox.me'; break;
       case 'SCN': uploadURL = 'https://up-z2.qbox.me'; break;
       case 'NA': uploadURL = 'https://up-na0.qbox.me'; break;