|
@@ -447,22 +447,49 @@ export default {
|
|
|
|
|
|
try {
|
|
|
await this.$onLaunched
|
|
|
-
|
|
|
this.configInfo = await this.$getConfigInfo()
|
|
|
await this.getBannerList()
|
|
|
this.getNoticebar()
|
|
|
-
|
|
|
if (this.isLogin) {
|
|
|
- this.userInfo = await this.$getUserInfo()
|
|
|
- this.isShowMaintenance = await this.checkMaintenance()
|
|
|
- this.getCategoryList()
|
|
|
- this.getServiceList()
|
|
|
- this.getCouponList()
|
|
|
- this.getWebsitList()
|
|
|
- this.getCodeActivityList()
|
|
|
-
|
|
|
- getNoticeNum()
|
|
|
- getOrderNum()
|
|
|
+ try {
|
|
|
+ this.userInfo = await this.$getUserInfo()
|
|
|
+ if (!this.userInfo.isGZSign && !this.userInfo.isFsSign) {
|
|
|
+ this.isShowMaintenance = await this.checkMaintenance()
|
|
|
+ this.getCategoryList()
|
|
|
+ this.getServiceList()
|
|
|
+ this.getCouponList()
|
|
|
+ this.getWebsitList()
|
|
|
+ this.getCodeActivityList()
|
|
|
+ getNoticeNum()
|
|
|
+ getOrderNum()
|
|
|
+ } else {
|
|
|
+ if (this.userInfo.isGZSign) {
|
|
|
+ uni.showModal({
|
|
|
+ title: '温馨提示',
|
|
|
+ content: '广州未签支付确认书!',
|
|
|
+ cancelText: '取消',
|
|
|
+ confirmText: '去签署',
|
|
|
+ success: res => {
|
|
|
+ if (res.confirm) {
|
|
|
+ this.navToPage('/pages/repairConfirmation?type=gz')
|
|
|
+ }
|
|
|
+ }
|
|
|
+ })
|
|
|
+ } else if (this.userInfo.isFsSign) {
|
|
|
+ uni.showModal({
|
|
|
+ title: '温馨提示',
|
|
|
+ content: '佛山未签支付确认书!',
|
|
|
+ cancelText: '取消',
|
|
|
+ confirmText: '去签署',
|
|
|
+ success: res => {
|
|
|
+ if (res.confirm) {
|
|
|
+ this.navToPage('/pages/repairConfirmation?type=fs')
|
|
|
+ }
|
|
|
+ }
|
|
|
+ })
|
|
|
+ }
|
|
|
+ }
|
|
|
+ } catch (error) {}
|
|
|
}
|
|
|
|
|
|
this.$nextTick(() => {
|
|
@@ -530,147 +557,153 @@ export default {
|
|
|
})
|
|
|
}
|
|
|
|
|
|
- // 点击短信链接进入小程序
|
|
|
- if (smsServiceId) {
|
|
|
- this.bindUser(smsServiceId)
|
|
|
- if (this.userInfo.type !== 'SERVICE') {
|
|
|
- this.isSmsReceive = true
|
|
|
- this.isReceiveDialog = true
|
|
|
- }
|
|
|
- }
|
|
|
-
|
|
|
- // 从链接进入小程序
|
|
|
- if (serviceId) {
|
|
|
- this.bindUser(serviceId)
|
|
|
- }
|
|
|
-
|
|
|
- if (goodsId) {
|
|
|
- setTimeout(() => {
|
|
|
- this.toGoodsDetail(goodsId)
|
|
|
- }, 1000)
|
|
|
- }
|
|
|
+ try {
|
|
|
+ this.userInfo = await this.$getUserInfo()
|
|
|
+ if (!this.userInfo.isGZSign && !this.userInfo.isFsSign) {
|
|
|
+ // 点击短信链接进入小程序
|
|
|
+ if (smsServiceId) {
|
|
|
+ this.bindUser(smsServiceId)
|
|
|
+ if (this.userInfo.type !== 'SERVICE') {
|
|
|
+ this.isSmsReceive = true
|
|
|
+ this.isReceiveDialog = true
|
|
|
+ }
|
|
|
+ }
|
|
|
|
|
|
- if (isYB) {
|
|
|
- setTimeout(() => {
|
|
|
- this.toServiceIndex()
|
|
|
- }, 1000)
|
|
|
- }
|
|
|
+ // 从链接进入小程序
|
|
|
+ if (serviceId) {
|
|
|
+ this.bindUser(serviceId)
|
|
|
+ }
|
|
|
|
|
|
- if (isWB) {
|
|
|
- setTimeout(() => {
|
|
|
- this.toMaintenanceCreate()
|
|
|
- }, 1000)
|
|
|
- }
|
|
|
+ if (goodsId) {
|
|
|
+ setTimeout(() => {
|
|
|
+ this.toGoodsDetail(goodsId)
|
|
|
+ }, 1000)
|
|
|
+ }
|
|
|
|
|
|
- if (otherType) {
|
|
|
- // 团购列表
|
|
|
- if (otherType === 'groupbuyList') {
|
|
|
- this.navToPage('/packageMine/pages/groupbuy/list')
|
|
|
- }
|
|
|
- // 活动专区列表
|
|
|
- if (otherType === 'activityList') {
|
|
|
- this.navToPage('/packageGoods/pages/activity?type=' + activityType)
|
|
|
- }
|
|
|
- // 订单列表
|
|
|
- if (otherType === 'orderList') {
|
|
|
- this.navToPage('/packageMine/pages/order/list')
|
|
|
- }
|
|
|
- // 工单列表
|
|
|
- if (otherType === 'workOrderList') {
|
|
|
- this.navToPage('/packageMine/pages/workOrder/list')
|
|
|
- }
|
|
|
- // 优惠券列表
|
|
|
- if (otherType === 'couponList') {
|
|
|
- this.navToPage('/packageMine/pages/coupon/list')
|
|
|
- }
|
|
|
- }
|
|
|
+ if (isYB) {
|
|
|
+ setTimeout(() => {
|
|
|
+ this.toServiceIndex()
|
|
|
+ }, 1000)
|
|
|
+ }
|
|
|
|
|
|
- if (orderId) {
|
|
|
- this.navToPage(`/packageMine/pages/order/detail?orderId=${orderId}`)
|
|
|
- } else if (workOrderId && workOrderTypeId && workOrderType) {
|
|
|
- workOrderType = workOrderType.replace(/\\\\/g, '\\')
|
|
|
- this.navToPage(
|
|
|
- `/packageMine/pages/workOrder/detail?id=${workOrderTypeId}&type=${workOrderType}&orderNo=${workOrderId}`
|
|
|
- )
|
|
|
- } else if (workOrderId) {
|
|
|
- this.navToPage(`/packageMine/pages/workOrder/list`)
|
|
|
- } else if (workOrderImgUrl) {
|
|
|
- this.navToPage(`/packageMine/pages/workOrder/receipt?imgurl=${workOrderImgUrl}`)
|
|
|
- }
|
|
|
+ if (isWB) {
|
|
|
+ setTimeout(() => {
|
|
|
+ this.toMaintenanceCreate()
|
|
|
+ }, 1000)
|
|
|
+ }
|
|
|
|
|
|
- // 扫码进入小程序
|
|
|
- if (scene) {
|
|
|
- console.log(scene)
|
|
|
- // 拿scene的id去获取
|
|
|
- this.$api
|
|
|
- .get('/common/scene', {
|
|
|
- scene: scene
|
|
|
- })
|
|
|
- .then(res => {
|
|
|
- let newScene = res.data.split('&')
|
|
|
- this.scene.type = newScene[0]
|
|
|
- this.scene.serviceId = newScene[2] || ''
|
|
|
- // 如果是商品
|
|
|
- if (newScene[0] == 'goods') {
|
|
|
- this.scene.goodsId = newScene[1]
|
|
|
- this.toGoodsDetail(this.scene.goodsId)
|
|
|
+ if (otherType) {
|
|
|
+ // 团购列表
|
|
|
+ if (otherType === 'groupbuyList') {
|
|
|
+ this.navToPage('/packageMine/pages/groupbuy/list')
|
|
|
}
|
|
|
- // 如果是优惠券
|
|
|
- else if (newScene[0] == 'coupon') {
|
|
|
- this.scene.couponId = newScene[1]
|
|
|
- this.isReceiveDialog = true
|
|
|
- // this.receiveCoupon(this.scene.couponId);
|
|
|
+ // 活动专区列表
|
|
|
+ if (otherType === 'activityList') {
|
|
|
+ this.navToPage('/packageGoods/pages/activity?type=' + activityType)
|
|
|
}
|
|
|
- // 如果是团购分享码
|
|
|
- else if (newScene[0] == 'promotion_group') {
|
|
|
- this.navToPage('/packageMine/pages/groupbuy/list')
|
|
|
+ // 订单列表
|
|
|
+ if (otherType === 'orderList') {
|
|
|
+ this.navToPage('/packageMine/pages/order/list')
|
|
|
}
|
|
|
- // 如果是活动专区分享码
|
|
|
- else if (newScene[0] == 'HDZQ') {
|
|
|
- this.navToPage('/packageGoods/pages/activity?type=' + newScene[1])
|
|
|
+ // 工单列表
|
|
|
+ if (otherType === 'workOrderList') {
|
|
|
+ this.navToPage('/packageMine/pages/workOrder/list')
|
|
|
}
|
|
|
- // 如果是工程维保
|
|
|
- else if (newScene[0] == 'ENGIN_PROJECT_REPAIR') {
|
|
|
- this.$navToPage({
|
|
|
- url: `/packageHome/pages/maintenance/create?projectId=${newScene[1]}`
|
|
|
- })
|
|
|
+ // 优惠券列表
|
|
|
+ if (otherType === 'couponList') {
|
|
|
+ this.navToPage('/packageMine/pages/coupon/list')
|
|
|
}
|
|
|
+ }
|
|
|
|
|
|
- console.log(this.scene)
|
|
|
- if (this.scene.serviceId) {
|
|
|
- this.bindUser(this.scene.serviceId)
|
|
|
- }
|
|
|
- })
|
|
|
- }
|
|
|
+ if (orderId) {
|
|
|
+ this.navToPage(`/packageMine/pages/order/detail?orderId=${orderId}`)
|
|
|
+ } else if (workOrderId && workOrderTypeId && workOrderType) {
|
|
|
+ workOrderType = workOrderType.replace(/\\\\/g, '\\')
|
|
|
+ this.navToPage(
|
|
|
+ `/packageMine/pages/workOrder/detail?id=${workOrderTypeId}&type=${workOrderType}&orderNo=${workOrderId}`
|
|
|
+ )
|
|
|
+ } else if (workOrderId) {
|
|
|
+ this.navToPage(`/packageMine/pages/workOrder/list`)
|
|
|
+ } else if (workOrderImgUrl) {
|
|
|
+ this.navToPage(`/packageMine/pages/workOrder/receipt?imgurl=${workOrderImgUrl}`)
|
|
|
+ }
|
|
|
|
|
|
- this.$api.post('/worker/remind').then(res => {
|
|
|
- this.baoxiandangqianxianxitishi = res.data
|
|
|
- })
|
|
|
+ // 扫码进入小程序
|
|
|
+ if (scene) {
|
|
|
+ console.log(scene)
|
|
|
+ // 拿scene的id去获取
|
|
|
+ this.$api
|
|
|
+ .get('/common/scene', {
|
|
|
+ scene: scene
|
|
|
+ })
|
|
|
+ .then(res => {
|
|
|
+ let newScene = res.data.split('&')
|
|
|
+ this.scene.type = newScene[0]
|
|
|
+ this.scene.serviceId = newScene[2] || ''
|
|
|
+ // 如果是商品
|
|
|
+ if (newScene[0] == 'goods') {
|
|
|
+ this.scene.goodsId = newScene[1]
|
|
|
+ this.toGoodsDetail(this.scene.goodsId)
|
|
|
+ }
|
|
|
+ // 如果是优惠券
|
|
|
+ else if (newScene[0] == 'coupon') {
|
|
|
+ this.scene.couponId = newScene[1]
|
|
|
+ this.isReceiveDialog = true
|
|
|
+ // this.receiveCoupon(this.scene.couponId);
|
|
|
+ }
|
|
|
+ // 如果是团购分享码
|
|
|
+ else if (newScene[0] == 'promotion_group') {
|
|
|
+ this.navToPage('/packageMine/pages/groupbuy/list')
|
|
|
+ }
|
|
|
+ // 如果是活动专区分享码
|
|
|
+ else if (newScene[0] == 'HDZQ') {
|
|
|
+ this.navToPage('/packageGoods/pages/activity?type=' + newScene[1])
|
|
|
+ }
|
|
|
+ // 如果是工程维保
|
|
|
+ else if (newScene[0] == 'ENGIN_PROJECT_REPAIR') {
|
|
|
+ this.$navToPage({
|
|
|
+ url: `/packageHome/pages/maintenance/create?projectId=${newScene[1]}`
|
|
|
+ })
|
|
|
+ }
|
|
|
|
|
|
- this.$api.post('/pg/order/base/status/count', {}).then(res => {
|
|
|
- this.statusCount = res.data
|
|
|
- })
|
|
|
+ console.log(this.scene)
|
|
|
+ if (this.scene.serviceId) {
|
|
|
+ this.bindUser(this.scene.serviceId)
|
|
|
+ }
|
|
|
+ })
|
|
|
+ }
|
|
|
|
|
|
- this.$api
|
|
|
- .post('/pay/orderCount', {
|
|
|
- goodsType: 'P'
|
|
|
- })
|
|
|
- .then(res => {
|
|
|
- this.peijiandzf = res.data.dzf
|
|
|
- console.log(res.data)
|
|
|
- })
|
|
|
+ this.$api.post('/worker/remind').then(res => {
|
|
|
+ this.baoxiandangqianxianxitishi = res.data
|
|
|
+ })
|
|
|
|
|
|
- this.$api
|
|
|
- .post('/pay/orderCount', {
|
|
|
- goodsType: 'M'
|
|
|
- })
|
|
|
- .then(res => {
|
|
|
- this.fucaidzf = res.data.dzf
|
|
|
- console.log(res.data)
|
|
|
- })
|
|
|
+ this.$api.post('/pg/order/base/status/count', {}).then(res => {
|
|
|
+ this.statusCount = res.data
|
|
|
+ })
|
|
|
+
|
|
|
+ this.$api
|
|
|
+ .post('/pay/orderCount', {
|
|
|
+ goodsType: 'P'
|
|
|
+ })
|
|
|
+ .then(res => {
|
|
|
+ this.peijiandzf = res.data.dzf
|
|
|
+ console.log(res.data)
|
|
|
+ })
|
|
|
+
|
|
|
+ this.$api
|
|
|
+ .post('/pay/orderCount', {
|
|
|
+ goodsType: 'M'
|
|
|
+ })
|
|
|
+ .then(res => {
|
|
|
+ this.fucaidzf = res.data.dzf
|
|
|
+ console.log(res.data)
|
|
|
+ })
|
|
|
+ }
|
|
|
+ } catch (error) {}
|
|
|
},
|
|
|
|
|
|
methods: {
|
|
|
+ quqianming(err) {},
|
|
|
// 测试支付
|
|
|
quzhifu() {
|
|
|
mini_env(bool => {
|
|
@@ -708,23 +741,28 @@ export default {
|
|
|
|
|
|
this.configInfo = await this.$getConfigInfo()
|
|
|
await this.getBannerList()
|
|
|
-
|
|
|
- if (this.isLogin) {
|
|
|
- this.userInfo = await this.$getUserInfo()
|
|
|
- this.getCategoryList()
|
|
|
- this.getServiceList()
|
|
|
- this.getCouponList()
|
|
|
- this.getWebsitList()
|
|
|
- this.getCodeActivityList()
|
|
|
- } else {
|
|
|
- await this.wxLogin()
|
|
|
- this.userInfo = await this.$getUserInfo()
|
|
|
- this.getCategoryList()
|
|
|
- this.getServiceList()
|
|
|
- this.getCouponList()
|
|
|
- this.getWebsitList()
|
|
|
- this.getCodeActivityList()
|
|
|
- }
|
|
|
+ try {
|
|
|
+ if (this.isLogin) {
|
|
|
+ this.userInfo = await this.$getUserInfo()
|
|
|
+ if (!this.userInfo.isGZSign && !this.userInfo.isFsSign) {
|
|
|
+ this.getCategoryList()
|
|
|
+ this.getServiceList()
|
|
|
+ this.getCouponList()
|
|
|
+ this.getWebsitList()
|
|
|
+ this.getCodeActivityList()
|
|
|
+ }
|
|
|
+ } else {
|
|
|
+ await this.wxLogin()
|
|
|
+ this.userInfo = await this.$getUserInfo()
|
|
|
+ if (!this.userInfo.isGZSign && !this.userInfo.isFsSign) {
|
|
|
+ this.getCategoryList()
|
|
|
+ this.getServiceList()
|
|
|
+ this.getCouponList()
|
|
|
+ this.getWebsitList()
|
|
|
+ this.getCodeActivityList()
|
|
|
+ }
|
|
|
+ }
|
|
|
+ } catch (error) {}
|
|
|
|
|
|
this.$nextTick(() => {
|
|
|
this.$isResolve()
|