Merge branch 'dev' into test

src/App.vue

@@ -179,6 +179,11 @@ export default {
         this.$u.vuex("vuex_token", userInfo.token);
         this.$u.vuex("vuex_user", userInfo);
         this.$u.vuex("vuex_wx_uid", userInfo.wxopenid);
+		this.track('auth_login', {
+			auth_token: userInfo.token,
+			auth_user: userInfo,
+			auth_wx_uid: userInfo.wxopenid
+		});
       } else {
         this.$u.vuex("vuex_token", "");
         this.$u.vuex("vuex_user", null);
@@ -219,7 +224,7 @@ export default {
       if (AnalysysAgent) {
         // 易观添加事件
         let AnalysysAgent = wx.AnalysysAgent;
-        AnalysysAgent.track("take_order_" + event, properties);
+        AnalysysAgent.track("self_support_" + event, properties);
       }
     },
     identify(userInfo, openid, unionid = null) {

src/pages/exam/index.vue

 <template>
 	<view class="backView">
 		<Settle :index="3">
-			<!-- 			<template v-if="isStart==false">
-				<view class="noticeView">
-					<text class="noticeText">规则：系统随机出现20道考试题目，每道题5分，每题答题时间100秒，在规定时间内答对题目的记分。
-					</text>
-				</view>
-				<view class="bottomView">
-					<view class="bottomBtn" @click="startClick()">
-						<text class="bottomTitle">开始考试答题</text>
-					</view>
-				</view>
-			</template> -->
-			<!-- <template v-if="isStart==true && currentItem"> -->
 			<view class="bottom-padding" v-if="currentItem">
 				<view class="title-view">
 					<view :class="['title-text', {'radio': currentItem.question ? currentItem.question.answerType == 1 : true}]">
@@ -38,13 +26,8 @@
 							:class="item.isSelect ? 'itemText selectedColor' : 'itemText defaultColor' ">{{contentFilter(item.content)}}</view>
 				</view>
 
-				<!--view class="itemView" v-for="(item,ikey) in currentItem.answerList":key="ikey">
-					<text :class="item.isSelect ? 'itemText selectedColor' : 'itemText defaultColor' " 
-					@click="itemClick(item,ikey)">{{item.content}}</text>
-				</view-->
 			</view>
 
-			<!-- </template> -->
 			<template v-slot:bottom>
 				<view class="answerBottomView">
 					<view class="bottom-left-view">
@@ -117,7 +100,7 @@
 			}
 		},
 		onLoad(e) {
-
+			getApp().trackPage('入驻考试答题页')
 
 			//this.postResult()
 			this.getUserExamInfo()

src/pages/exam/start.vue

@@ -30,7 +30,7 @@
 			}
 		},
 		onLoad(e) {
-			
+			getApp().trackPage('入驻开始考试页')
 			
 		},
 		methods: {

src/pages/index/index.vue

@@ -155,7 +155,8 @@
 				return process.uniEnv.qn_base_url + 'weiruzhu.png'
 			},
 		},
-		onLoad(e) {
+		onLoad(e) {
+			app.trackPage('自营平台首页')
 			this._freshing = false;
 			if(this.vuex_token) {
 				this.getOrderCount()

src/pages/index/learn.vue

@@ -412,6 +412,7 @@ export default {
         };
     },
     onLoad(param) {
+		getApp().trackPage('学习首页')
         var that = this;
         try {
             if (param.tabs) {

src/pages/index/mine.vue

@@ -133,6 +133,7 @@
 			}
 		},
 		onLoad() {
+			app.trackPage('我的首页')
 			if(this.vuex_token && !this.settled) {
 				this.getData()
 			}

src/pages/index/order.vue

@@ -91,6 +91,7 @@
 			};
 		},
 		onLoad(e) {
+			getApp().trackPage('订单首页')
 			this._freshing = false;
 			// this.getLocation(); // 不需要获取位置
 			// this.getOrderCount();

src/pages/learn/answer.vue

@@ -113,6 +113,7 @@ export default {
         },
     },
     onLoad(e) {
+		getApp().trackPage('学习考试答题页')
         this.examId = e.examId;
         this.userExamId = e.userExamId;
         this.getNext();

src/pages/learn/assessment.vue

@@ -37,6 +37,7 @@ export default {
         };
     },
     onLoad(param) {
+		getApp().trackPage('学习开始考试页')
         this.examId = param.examId;
         this.getExamResult();
         // this.getUserExamInfo();

src/pages/learn/course-detail.vue

@@ -87,6 +87,7 @@ export default {
     },
   },
   onLoad(e) {
+	  app.trackPage('入驻培训视频页')
     if (e) {
       if (e.courseId) {
         this.courseId = e.courseId;

src/pages/learn/curriculum.vue

@@ -57,9 +57,8 @@
 			}
 		},
 		onLoad(a){
-			console.log(a)
+			getApp().trackPage('学习课程简介页')
 			this.params.course_id=a.course_id
-			console.log(this.params.course_id)
 			this.getCapterDetails()
 			this.getCourseInfo()
 		},

src/pages/learn/exam-pass.vue

@@ -39,6 +39,7 @@ export default {
         };
     },
     onLoad(a) {
+		getApp().trackPage('学习考试成功页')
         this.examId = a.examId;
         this.userExamId = a.userExamId;
         this.getCourseResult();

src/pages/learn/news-details.vue

@@ -24,6 +24,7 @@
             }
         },
         onLoad() {
+			getApp().trackPage('消息通知详情页')
             var that = this;
             const eventChannel = this.getOpenerEventChannel()
             eventChannel.on('acceptDataFromLearn', function(data) {

src/pages/learn/result.vue

@@ -43,6 +43,7 @@ export default {
         };
     },
     onLoad(a) {
+		getApp().trackPage('学习考试失败页')
         this.userExamId = a.userExamId;
         this.examId = a.examId;
         this.getCourseResult();

src/pages/learn/section.vue

@@ -109,6 +109,7 @@
             },
         },
         onLoad(e) {
+			getApp().trackPage('学习视频详情页')
             this.section_id = e.section_id
             this.params.course_id = e.course_id
             this.getCapterDetails()

src/pages/login/index.vue

@@ -204,6 +204,11 @@ export default {
 			this.$u.vuex('vuex_token',userInfo.token);
 			this.$u.vuex('vuex_user', userInfo);
 			this.$u.vuex('vuex_wx_uid', userInfo.wxopenid);
+			app.track('auth_login', {
+				auth_token: userInfo.token,
+				auth_user: userInfo,
+				auth_wx_uid: userInfo.wxopenid
+			});
 		  } else {
 		    this.$u.vuex('vuex_token', '');
 			this.$u.vuex('vuex_user', null);

src/pages/mine/address/addSite.vue

@@ -82,6 +82,7 @@ export default {
 	},
 	computed: {},
 	async onLoad(e) {
+		getApp().trackPage('我的收获地址修改页')
 		if(e && e.title) {
 			this.title = decodeURIComponent(e.title)
 		}

src/pages/mine/address/index.vue

@@ -40,6 +40,9 @@ export default {
 			return this.settled && this.settled.address && this.settled.id_card_name
 		},
 	},
+	onLoad() {
+		getApp().trackPage('我的收获地址页')
+	},
 	onShow() {
 		if(!this.vuex_token) {
 			this.$u.route({url: 'pages/login/index'})

src/pages/mine/cert/detail.vue

@@ -26,6 +26,7 @@
             }
         },
         onLoad() {
+			getApp().trackPage('我的证件详情页')
             var that = this;
             const eventChannel = this.getOpenerEventChannel()
             eventChannel.on('acceptDataFromCert', function(data) {

src/pages/mine/cert/index.vue

@@ -86,6 +86,7 @@
             }
         },
         onLoad() {
+			getApp().trackPage('我的证件列表页')
             let that = this;
             this.$u.api
                 .getCertList()

src/pages/mine/contract/index.vue

@@ -34,6 +34,7 @@ export default {
         };
     },
     onLoad() {
+		getApp().trackPage('我的合同列表页')
         this.getContract(this.type);
     },
     computed: {},

src/pages/mine/contract/out.vue

@@ -12,6 +12,7 @@ export default {
         };
     },
     onLoad(option) {
+		getApp().trackPage('我的合同详情页')
         this.url = option.url;
         var app = getApp();
         this.url = app.globalData.contractUrl;

src/pages/mine/customer/index.vue

@@ -19,6 +19,7 @@
 			};
 		},
 		onLoad(e) {
+			getApp().trackPage('联系客服页')
 			if (e && e.type) {
 				this.type = e.type
 			}

src/pages/mine/deposit/index.vue

@@ -52,6 +52,7 @@
 			},
 		},
 		onLoad() {
+			getApp().trackPage('配件押金列表页')
 			if(!this.vuex_token) {
 				this.$u.route({url: 'pages/login/index'})
 			} else if(!this.settled) {

src/pages/mine/wallet/index.vue

@@ -126,6 +126,9 @@
 				return ['settlement','statement']
 			}
 		},
+		onLoad() {
+			getApp().trackPage('我的钱包页')
+		},
 		onShow() {
 			// 未登录，先跳转登录
 			if(!this.vuex_token) {

src/pages/mine/wallet/settlement.vue

@@ -77,6 +77,7 @@
 			},
 		},
 		onLoad() {
+			getApp().trackPage('结算账单列表页')
 			this.loadPayRecord()
 		},
 		methods: {

src/pages/mine/wallet/statement.vue

@@ -97,6 +97,7 @@
 			},
 		},
 		onLoad() {
+			getApp().trackPage('收入流水列表页')
 			this.loadStatement()
 		},
 		methods: {

src/pages/mine/wallet/withdraw.vue

@@ -47,6 +47,7 @@
 			},
 		},
 		onLoad() {
+			getApp().trackPage('钱包提现页')
 			this.loadAssets()
 		},
 		methods: {

src/pages/mine/warehouse/index.vue

@@ -61,6 +61,7 @@
 		},
 		computed: {},
 		onLoad() {
+			getApp().trackPage('我的仓库列表页')
 			this.getData();
 		},
 		methods: {

src/pages/order/complete.vue

@@ -196,6 +196,7 @@
             // console.log(allComponents,'allComponents')
         },
         onLoad(option) {
+			getApp().trackPage('订单完工信息页')
             if (option) {
                 this.orderId = option.orderId
 				this.categoryId = option.categoryId

src/pages/order/detail.vue

@@ -180,7 +180,7 @@
 					</view>
 				</view>
 			</view>
-			<take-photo type="test" v-if="takeStatus" @close="closeTake" :num="1"></take-photo>
+			<take-photo type="test" v-if="takeStatus" @close="closeTake" :upload="false" :num="1"></take-photo>
 			<PopView title="查看交互规范" message="为完善交付质量，请查看对应的交付规范" :visible.sync="visibale" @click="handleClick"/>
 		</template>
 	</view>
@@ -190,6 +190,7 @@
 	import appointTime from '@/components/appoint/appoint-time.vue'
 	import takePhoto from '@/components/take/index.vue'
 	import PopView from "@/components/popView/index.vue"
+	import baseFile from '@/components/upload/index'
 	let now = new Date(new Date().toLocaleDateString()).getTime();
 	export default {
 		components: {
@@ -197,6 +198,7 @@
 			'take-photo': takePhoto,
 			PopView
 		},
+		mixins: [baseFile],
 		data() {
 			return {
 				readMore: true,
@@ -266,6 +268,7 @@
 			}
 		},
 		onLoad(option) {
+			getApp().trackPage('订单详情页')
 			// 生命周期函数--监听页面加载
 			if (option && option.id) {
 				this.orderId = option.id
@@ -406,12 +409,14 @@
 				uni.hideTabBar()
 				this.takeStatus = true
 			},
-			closeTake(img) {
+			async closeTake(img) {
 				this.takeStatus = false
 				// 获取返回的图片 ,如果返回的图片存在则直接异常签约，成功后跳转到去完工页面，
 				if(img){ // 拍照完成
+					const files = img.map(v => v.path)
+					const value = await this.saveToTask(files)
 					this.isErrorSign = true
-					this.errorSignUrl = img[img.length-1].key
+					this.errorSignUrl = value[0].key
 					this.handleBtn()
 				}else{
 					this.$refs.uToast.show({
@@ -689,6 +694,7 @@
 					
 					if ((res.data.code!==undefined && res.data.code === 200)
 					 || (res.code!==undefined && res.code === 200) ) {
+						this.trackOrder()
 						this.$refs.uToast.show({
 							title: this.centerButtonText + '操作成功',
 							type: 'success',
@@ -718,6 +724,15 @@
 					}
 				})
 			},
+			trackOrder() {
+				// 接单成功事件，签到成功事件
+				if(this.submitType == 'orderAccept'
+					|| this.submitType == 'maintainWorkerCheckin') {
+					getApp().track(this.submitType, {
+						orderId: this.order.orderId
+					});
+				}
+			},
 			commonToast(message,type,url,params){ // 统一得toast
 				this.$refs.uToast.show({
 					title: message,

src/pages/order/feedback.vue

@@ -161,6 +161,7 @@ export default {
 		}
 	},
 	async onLoad(e) {
+		getApp().trackPage('订单过程反馈页')
 		if (e) {
 			this.orderId = e.orderId || null;
 			this.categoryId = e.categoryId || null;

src/pages/order/material.vue

@@ -129,6 +129,7 @@
 			},
 		},
 		onLoad(option) {
+			getApp().trackPage('订单材料列表页')
 			this.orderId = option.orderId
 			this.fieldName = option.fieldName
 			const eventChannel = this.getOpenerEventChannel();

src/pages/order/refuse.vue

@@ -62,6 +62,7 @@
 			PopView
 		},
 		onLoad(e) {
+			getApp().trackPage('订单拒单页')
 			if(e && e.orderId) {
 				this.orderId = e.orderId
 				if(e.count) {

src/pages/order/search.vue

@@ -66,6 +66,7 @@
 			};
 		},
 		onLoad() {
+			getApp().trackPage('订单搜索页')
 			// this.searchOrder()
 		},
 		onReachBottom() {

src/pages/settle/age.vue

@@ -27,7 +27,7 @@
 			}
 		},
 		onLoad(e) {
-			
+			getApp().trackPage('入驻工龄选择页')
 			this.getAgeData()
 		},
 		methods: {

src/pages/settle/base.vue

@@ -107,6 +107,7 @@
 			}
 		},
 		onLoad(e) {
+			getApp().trackPage('入驻基本信息提交页')
 			this.initLocation()
 		},
 		onShow() {

src/pages/settle/file.vue

@@ -187,6 +187,7 @@ export default {
 		}
 	},
 	onLoad(e) {
+		getApp().trackPage('入驻证件信息上传页')
 		this.initSettledInfo()
 	},
 	updated() {

src/pages/settle/index.vue

@@ -81,6 +81,7 @@
 			}
 		},
 		onLoad(e) {
+			getApp().trackPage('入驻首页')
 			this.initpageData(e)
 			this.startCounting()
 		},

src/pages/settle/pay-ensure.vue

@@ -56,7 +56,7 @@
 			}
 		},
 		onLoad(e) {
-
+			getApp().trackPage('入驻配件押金支付页')
 		},
 		onShow() {
 			if (!this.settledInfo.record.deposit) {
@@ -112,6 +112,10 @@
 				uni.showToast({
 					title: '支付成功',
 				})
+				// 完成入驻后事件
+				getApp().track('settle_success', {
+					settle_id: this.settledInfo.record.id
+				});
 				let timer = setTimeout(() => {
 					clearTimeout(timer)
 					this.successCallback()

src/pages/settle/prompt.vue

@@ -108,6 +108,7 @@
 			},
 		},
 		onLoad(e) {
+			getApp().trackPage('入驻结果中转页')
 			if (e) {
 				if (e.pageIndex) {
 					this.pageIndex = e.pageIndex;

src/pages/settle/sign-contract.vue

@@ -102,7 +102,9 @@
 				count: 9,
 			}
 		},
-		onLoad(e) {},
+		onLoad(e) {
+			getApp().trackPage('入驻签约信息页')
+		},
 		onShow() {
 			/** 测试提了bug：ID1001079【首页-入驻-在线签约】：输入好各个字段信息，切换到其他APP再切换回来，会把已填的信息自动清空
 			不知道这一段当初为什么加，就屏蔽了