Commit 9411997e authored by 和慭琛's avatar 和慭琛

Merge branch 'dev-photo-tools'

parents 43d5f1df ad702724
......@@ -15,10 +15,10 @@
//https://system.dev.banshouhui.com
//正式环境
domain_Name: 'https://system.banshouhui.com',
//domain_Name: 'https://system.banshouhui.com',
//测试环境
//domain_Name: 'https://system.dev.banshouhui.com',
domain_Name: 'https://system.dev.banshouhui.com',
//http://192.168.0.208:8192
//小青本地环境
......@@ -190,6 +190,76 @@
getProtocolContent: function() {
this.protocolContent
},
/* ------------------------- 数据埋点begin ------------------------------ */
track(event, properties) {
if (AnalysysAgent) {
// 易观添加事件
let AnalysysAgent = wx.AnalysysAgent;
AnalysysAgent.track("take_order_" + event, properties);
}
},
identify(userInfo, openid, unionid = null) {
// 设备身份表示
if (AnalysysAgent) {
let setProfile = {
'openid': openid,
'unionid': unionid,
}
setProfile = Object.assign(setProfile, userInfo)
AnalysysAgent.profileSet(setProfile);
}
},
setUserId(userId) {
// 用户id设置
if (AnalysysAgent) {
AnalysysAgent.alias(userId + '')
}
},
setUser(user) {
// 用户附加属性
if (AnalysysAgent) {
let userInfo = {
'mobile':user.mobile,
'userfrom_id':user.uid,
'userfrom':'家维广场',
'avatar':user.avatar,
'nickname':user.nickname,
'username':user.username,
'wxhuid':user.wxhuid,
'id':user.id,
'money': user.money,
'score':user.score
};
Object.keys(userInfo).map(key=>{
if(key && userInfo[key]){
AnalysysAgent.profileAppend(key,userInfo[key])
}
})
}
},
share(toShareProperties, trackProperties) {
if (AnalysysAgent) {
AnalysysAgent.share(toShareProperties, trackProperties);
}
},
trackPage(pageName, properties){
if (AnalysysAgent) {
AnalysysAgent.pageView(pageName, properties);
}
},
initShare(option){
console.log(option,'option-initShare')
option = option || {}
if (AnalysysAgent && option.user_id) {
let shareUserInfo = {
'share_from_id':option.user_id || '',
'share_from_nickname':option.user_name || '',
}
AnalysysAgent.registerSuperProperties(shareUserInfo);
}
},
/* ------------------------- 数据埋点end ------------------------------ */
},
......
......@@ -8,13 +8,58 @@
{
"path": "pages/settle/index",
"style": {
"navigationBarTitleText": "充电桩安装招募"
}
},
{
"path": "pages/settle/base",
"style": {
"navigationBarTitleText": "入驻信息"
}
},
{
"path": "pages/index/index",
"style": {
"navigationBarTitleText": "下单"
}
},
{
"path": "pages/sign/index",
"style": {
"navigationBarTitleText": "入驻签约"
}
},
{
"path": "pages/exam/index",
"style": {
"navigationBarTitleText": "入驻考试"
}
},
{
"path": "pages/video/index",
"style": {
"navigationBarTitleText": "培训&考试"
}
},
{
"path": "pages/photo/product",
......@@ -25,7 +70,7 @@
{
"path": "pages/take/detail",
......@@ -41,9 +86,7 @@
"navigationBarTitleText": "拍照",
"navigationBarBackgroundColor":"#333333",
"navigationBarTextStyle":"#FFFFFF",
"app-plus": {//app平台
"bounce": "none"//禁止滚动
}
"disableScroll":true
}
},
......@@ -54,7 +97,8 @@
"style": {
"navigationBarTitleText": "图片展示",
"navigationBarBackgroundColor":"#333333",
"navigationBarTextStyle":"#FFFFFF"
"navigationBarTextStyle":"#FFFFFF",
"disableScroll":true
}
},
......@@ -90,27 +134,14 @@
{
"path": "pages/photo/take",
"style": {
"navigationBarTitleText": "拍照-ljd"
"navigationBarTitleText": "拍照-ljd",
"disableScroll":true
}
},
// {
// "path": "pages/photo/index",
// "style": {
// "navigationBarTitleText": "拍照"
// }
// },
{
"path": "pages/index/success",
"style": {
......@@ -120,16 +151,6 @@
// {
// "path": "pages/take/try",
// "style": {
// "navigationBarTitleText": "接单",
// "enablePullDownRefresh": true
// }
// },
{
"path": "pages/login/wxlogin",
"style": {
......
This diff is collapsed.
......@@ -100,7 +100,6 @@
<text class="agreeTitle" @click="agreeClick(isAgree)">我已阅读并同意</text>
<text class="agreeProtocol" @click="protocolClick()">《服务协议》</text>
</view>
</view>
<view class="bottomView">
<view class="bottomLeftView" @click="mineClick()">
......@@ -123,6 +122,7 @@
</view>
</view>
</view>
</view>
</template>
......@@ -165,7 +165,7 @@
},
onLoad(e) {
getApp().trackPage('下单页')
//+ '?orderId=' + this.orderId + '&toWhere=detail'
if(e && e.toWhere){
this.toWhere(e)
......@@ -229,6 +229,12 @@
methods: {
hideClick:function(){
uni.navigateTo({
url: '/pages/exam/index',
})
},
doNothing:function(){},
toWhere: function(e){
......@@ -445,8 +451,10 @@
return
}
// yuan /pages/take/index
uni.navigateTo({
url: '/pages/take/index'
url: '/pages/exam/index'
})
......@@ -700,6 +708,8 @@
checkClean: function (){
console.log('checkClean:' + this.isClean)
// uni.getStorage({
// key: 'token',
// success: function (res) {
......@@ -1247,4 +1257,10 @@
justify-content: center;
}
.hideBtn{
background-color: #007AFF;
width: 100%;
height: 80rpx;
}
</style>
......@@ -87,7 +87,7 @@
}
},
onLoad() {
getApp().trackPage('下单列表页')
this.icon_noData = getApp().globalData.icon_noData
this.icon_i = getApp().globalData.icon_i
},
......
......@@ -51,7 +51,7 @@
}
},
onLoad(e) {
getApp().trackPage('下单成功页')
if(e && e.activeService && e.activeService.length>0){
//console.log(e.activeService)
this.activeService = e.activeService
......
......@@ -31,6 +31,7 @@
}
},
onLoad() {
getApp().trackPage('授权登录页')
this.icon_notice = getApp().globalData.icon_auth_notice
this.icon_auth_notice_new = getApp().globalData.icon_auth_notice_new
//this.domain_name = getApp().globalData.domain_Name
......
......@@ -22,7 +22,7 @@
}
},
onLoad(e) {
getApp().trackPage('选择品牌页')
if(e && e.product_code){
this.product_code = e.product_code
}
......
......@@ -75,6 +75,7 @@
// }
},
onLoad(e) {
getApp().trackPage('照片规范详情页')
this.initData(e)
},
......
......@@ -43,7 +43,7 @@
}
},
onLoad(e) {
getApp().trackPage('照片规范列表页')
if(e && e.product){
this.product = e.product
}
......
......@@ -13,6 +13,7 @@
}
},
onLoad(e) {
getApp().trackPage('照片预览页')
console.log(e,'e')
if(e.img){
this.images = [e.img]
......
......@@ -20,6 +20,7 @@
}
},
onLoad(e) {
getApp().trackPage('选择产品页')
this.getProductList()
},
......
......@@ -55,6 +55,7 @@
}
},
onLoad(e) {
getApp().trackPage('拍照页')
this.ctx = uni.createCameraContext();
this.date = '时间:' + this.getTime()
this.getLocation()
......
......@@ -64,6 +64,7 @@
}
},
onLoad(e) {
getApp().trackPage('拍照页')
this.ctx = uni.createCameraContext();
this.date = this.getTime()
this.getLocation()
......
<template>
<view class="back_view">
入驻基本信息
</view>
</template>
<script>
export default {
data() {
return {
protocolContent:''
}
},
onLoad(e) {
if(e && e.activeService && e.activeService.length>0){
//console.log(e.activeService)
this.activeService = e.activeService
}
},
methods: {
//拨打客服 点击
phoneCallClick: function (phone) {
uni.makePhoneCall({
phoneNumber: phone
});
},
}
}
</script>
<style>
.back_view{
background-color: #FFFFFF;
position: absolute;
top: 0;
left: 0;
width: 100%;
display: flex;
flex-direction: column;
}
</style>
<template>
<view class="back_view">
<image class="theme_image" :src="theme_url" mode="aspectFill"></image>
<view class="bottom_view">
<view :class="isStop ? 'bottom_btn apply_color' : 'bottom_btn default_color' "
@click="applyClick()">
<text class="bottom_title" v-if="!isStop">浏览 {{count}} 秒后可申请入驻</text>
<text class="bottom_title" v-if="isStop">申请入驻</text>
</view>
</view>
</view>
</template>
<script>
export default {
data() {
return {
theme_url:'https://qn-static.banshouhui.com/settle_theme.png',
count:8,
isStop:false,
}
},
onLoad(e) {
this.startCounting()
},
methods: {
startCounting : function () {
if(this.isStop){
return
}
this.count = this.count - 1
if(this.count > 0){
setTimeout(this.startCounting, 1000);
}else{
this.isStop = true
}
},
applyClick: function () {
if(!this.isStop){
return
}
uni.navigateTo({
url:'/pages/settle/base'
})
},
}
}
</script>
<style>
.back_view{
background-color: #FFFFFF;
position: absolute;
top: 0;
left: 0;
width: 100%;
display: flex;
flex-direction: column;
}
.theme_image{
width: 100%;
height: 3000rpx;
}
.bottom_view{
background-color: #002CC0;
width: 100%;
height: 200rpx;
display: flex;
align-content: center;
justify-content: center;
}
.bottom_btn{
margin-top: 30rpx;
width: 600rpx;
height: 100rpx;
border: 4rpx solid #FFFFFF;
display: flex;
align-items: center;
justify-content: center;
}
.bottom_title{
font-size: 32rpx;
color: #FFFFFF;
}
.default_color{
background-color: #002CC0;
}
.apply_color{
background-color: #2272FF;
}
</style>
<template>
<view class="">
签约界面
</view>
</template>
<script>
export default {
data() {
return {
protocolContent:''
}
},
onLoad(e) {
},
methods: {
//拨打客服 点击
phoneCallClick: function (phone) {
uni.makePhoneCall({
phoneNumber: phone
});
},
}
}
</script>
<style>
</style>
......@@ -172,7 +172,7 @@
TimeID:-1,
userType:'',
isContentShow:true,
fromWhere:'',
//退单弹窗相关
isCancelShow:false,
result:{
......@@ -196,6 +196,7 @@
},
onLoad(e) {
getApp().trackPage('工单详情页')
console.log(e)
if(e && e.orderId){
this.orderId = e.orderId
......@@ -205,6 +206,11 @@
this.isBottomShow = e.isBottomShow
}
if(e && e.fromWhere){
this.fromWhere = e.fromWhere
}
this.datetime = this.getTime()
//console.log('当前时间:'+this.datetime)
......@@ -570,7 +576,7 @@
},
//退单点击
cancelClick: function () {
clearTimeout(this.TimeID);
......@@ -605,6 +611,8 @@
//退单请求
cancelPost: function (rejectReason) {
let that = this
uni.showLoading({
title:'请稍候'
......@@ -633,8 +641,14 @@
title:'退单成功',
})
var delta = 1
if(that.fromWhere == '抢单页'){
delta = 2
}
setTimeout(function() {
uni.navigateBack({})
uni.navigateBack({
delta:delta
})
}, 1000);
}else{
......
......@@ -255,7 +255,7 @@
}
},
onLoad(e) {
getApp().trackPage('工单完工页')
this.icon_close_new = getApp().globalData.icon_close_new
this.getTopInfo(e)
......
......@@ -183,7 +183,7 @@
},
onLoad() {
getApp().trackPage('抢单广场页')
this.icon_noData = getApp().globalData.icon_noData
this.icon_trangle_up = getApp().globalData.icon_trangle_up
this.icon_selected = getApp().globalData.icon_selected
......
......@@ -40,7 +40,7 @@
}
},
onLoad(e) {
getApp().trackPage('服务措施页')
if(e && e.orderId){
this.orderId = e.orderId
}
......
......@@ -26,7 +26,7 @@
<view class="itemView u-m-t-30">
<view class="u-p-l-30 u-p-r-30">
<text class="titleText">产品:</text>
<text class="contentText u-m-l-10" v-if="orderInfo.brandName">{{orderInfo.brandName}}-{{categoryName}}</text>
<text class="contentText u-m-l-10" v-if="orderInfo.brandName">{{orderInfo.brandName}}-{{orderInfo.categoryName}}</text>
</view>
</view>
<view class="itemView u-m-t-30">
......@@ -96,6 +96,8 @@
}
},
onLoad(e) {
getApp().trackPage('抢单页')
if(e && e.orderId){
this.orderId = e.orderId
......@@ -521,7 +523,8 @@
setTimeout(function() {
uni.navigateTo({
url: '/pages/take/detail'
+'?orderId='+that.orderId,
+'?orderId='+that.orderId
+'&fromWhere=抢单页',
})
}, 1000);
......
......@@ -13,7 +13,14 @@
},
onLoad(e) {
getApp().trackPage('内置网页')
if(e && e.url){
this.webUrl = e.url
return
}
//https://system.banshouhui.com/weixiuapp/site/index.html#/?pioneerId=40
getApp().trackPage('师傅入驻页')
this.webUrl = getApp().globalData.domain_Name
+ '/weixiuapp/site/index.html#/?pioneerId=40'
//console.log(this.webUrl)
......
<template>
<view class="backView">
<view class="itemView" v-for="(item,ikey) in dataList":key="ikey"
@click="itemClick(item,ikey)">
<view class="titleView">
<text class="title">{{item.title}}</text>
<image class="arrow" :src="icon_arrow_right" mode=""></image>
</view>
<text class="notice">时长:5分钟,已完成学习</text>
</view>
<view class="bottomView">
<view class="bottomBtn" @click="examClick()">
<text class="bottomTitle">完成学习后,可参加考试</text>
</view>
</view>
</view>
</template>
<script>
export default {
data() {
return {
icon_arrow_right:'',
dataList:[],
}
},
onLoad(e) {
this.icon_arrow_right = getApp().globalData.icon_arrow_right
this.getData()
},
methods: {
//获取数据
getData: function () {
this.dataList = [
{
'title':'第一章 希望的终结',
},
{
'title':'第二章 困惑的浪漫',
},
{
'title':'第三章 诸神的黄昏',
},
];
},
itemClick: function (item , ikey) {
uni.navigateTo({
url:'/pages/take/web'
+'?url=' + 'https://www.baidu.com',
})
},
//参加考试
examClick: function () {
uni.navigateTo({
url:'/pages/exam/index'
})
}
}
}
</script>
<style>
.backView{
background-color: #FFFFFF;
position: absolute;
top: 0;
left: 0;
width: 100%;
display: flex;
flex-direction: column;
}
.itemView{
background-color: #FAFAFA;
width: 100%;
display: flex;
flex-direction: column;
border-bottom: 2rpx solid #999999;
}
.titleView{
background-color: #FFFFFF;
width: 100%;
height: 80rpx;
display: flex;
flex-direction: row;
align-items: center;
justify-content: space-between;
border-bottom: 2rpx solid #999999;
}
.title{
font-size: 28rpx;
margin-left: 40rpx;
}
.arrow{
width: 16rpx;
height: 28rpx;
margin-right: 40rpx;
}
.notice{
padding-left: 40rpx;
padding-top: 20rpx;
padding-bottom: 20rpx;
font-size: 28rpx;
color: #999999;
}
.bottomView{
background-color: #FFFFFF;
width: 100%;
height: 140rpx;
display: flex;
align-items: center;
justify-content: center;
position: fixed;
bottom: 0;
}
.bottomBtn{
background-color: #007AFF;
width: 60%;
height: 80rpx;
border-radius: 40rpx;
display: flex;
align-items: center;
justify-content: center;
}
.bottomTitle{
font-size: 32rpx;
color: #FFFFFF;
}
</style>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment