diff --git a/common/http.interceptor.js b/common/http.interceptor.js
index 7f24251..fd300f9 100644
--- a/common/http.interceptor.js
+++ b/common/http.interceptor.js
@@ -20,7 +20,7 @@ const install = (Vue, vm) => {
// },
// });
Vue.prototype.$u.http.setConfig({
- baseUrl: 'http://192.168.2.8:3302',
+ baseUrl: 'http://192.168.2.157:3302',
// baseUrl: 'https://kang.chuangtewl.com/prod-api',
loadingText: '努力加载中~',
loadingTime: 800,
diff --git a/page_fenbao/addtaocan.vue b/page_fenbao/addtaocan.vue
index 04cb11a..7350439 100644
--- a/page_fenbao/addtaocan.vue
+++ b/page_fenbao/addtaocan.vue
@@ -35,16 +35,16 @@
/时
-
-
+
@@ -99,7 +99,7 @@
price: '',
title: '',
suitId: '',
- array: ['天', '时', '分钟', '秒'],
+ array: ['时', '分钟'],
gmsj: [{
name: '时',
disabled: false
@@ -107,10 +107,6 @@
{
name: '分',
disabled: false
- },
- {
- name: '秒',
- disabled: false
}
],
index: 2,
@@ -132,7 +128,9 @@
titaoc: [],
newobj: [],
listflag: false,
- storeList:[]
+ storeList:[],
+ timeUnit:2,
+ txt:''
}
},
onLoad(option) {
@@ -242,6 +240,13 @@
btnxl(index) {
this.index = index
this.arrflag = false
+ if(index == 0){
+ this.timeUnit = 2
+ this.txt = '时'
+ }else{
+ this.timeUnit = 3
+ this.txt = '分钟'
+ }
},
btnxz() {
if (this.arrflag == true) {
@@ -259,6 +264,13 @@
this.value = res.data.value
this.description = res.data.description
this.deviceList = res.data.storeList
+ if(res.data.timeUnit == 2){
+ this.txt = '时'
+ this.timeUnit = 2
+ }else{
+ this.txt = '分钟'
+ this.timeUnit = 3
+ }
this.deviceList.forEach(item => {
this.tcidlist.push(item.storeId)
})
@@ -319,7 +331,7 @@
value:this.value,
price: this.price,
description: this.description,
- timeUnit:2,
+ timeUnit:this.timeUnit,
storeIds: arrs,
feeMode: 1,
feeType: 1,
@@ -355,7 +367,7 @@
value: this.value,
price: this.price,
description: this.description,
- timeUnit: 2,
+ timeUnit: this.timeUnit,
storeIds: arrs,
feeMode: 1,
feeType:1,
@@ -668,7 +680,7 @@
right: -20rpx;
background: #FFFFFF;
width: 140rpx;
- height: 245rpx;
+ height: 126rpx;
box-shadow: 0rpx 16rpx 40rpx 0rpx rgba(42, 130, 228, 0.1);
padding: 5rpx 0;
box-sizing: border-box;
diff --git a/page_user/homepage.vue b/page_user/homepage.vue
index 93bb72f..34bab8e 100644
--- a/page_user/homepage.vue
+++ b/page_user/homepage.vue
@@ -1,33 +1,36 @@
-
-
- {{infoobj.nickName == undefined ?'--' : infoobj.nickName}}
-
+
+
+ {{infoobj.realName == undefined ?'--' : infoobj.realName}}
+
+
+ {{infoobj.isReal == true ? '已实名' : '去实名'}}
+
+
{{infoobj.phonenumber == undefined ? '--' :infoobj.phonenumber}}
-
- 当前角色：合作伙伴
-
-
- 当前角色：渠道商
-
-
- 当前角色：创业者
-
-
- 当前角色：经营场所
-
-
- {{infoobj.isReal == true ? '已实名' : '去实名'}}
+
+
+ 当前角色：合作伙伴
+
+
+ 当前角色：渠道商
+
+
+ 当前角色：创业者
+
+
+ 当前角色：经营场所
@@ -158,7 +161,9 @@
}
},
onLoad() {
-
+ let today = new Date()
+ this.firsTime = this.formatDate(today)
+ this.lasTime = this.formatDate(today)
},
// 分享到好友（会话）
onShareAppMessage: function() {
@@ -168,9 +173,6 @@
}
},
onShow() {
- let today = new Date()
- this.firsTime = this.formatDate(today)
- this.lasTime = this.formatDate(today)
this.getinfo()
},
// 分享到朋友圈
@@ -182,6 +184,11 @@
}
},
methods: {
+ back(){
+ uni.reLaunch({
+ url:'/pages/index/index'
+ })
+ },
// 获取当前用户信息
getinfo(){
this.$u.get(`/app/user/userInfo`).then(res => {
@@ -315,7 +322,9 @@
/deep/ .u-icon__icon {
padding-bottom: 15rpx;
}
-
+ .onewz{
+ font-size: 28rpx;
+ }
.pages {
width: 750rpx;
padding: 0 46rpx;
@@ -482,12 +491,14 @@
.my{
display: flex;
align-items: center;
- // margin-top: 20rpx;
+ justify-content: space-between;
+ margin-top: 20rpx;
.mylt{
margin-right: 34rpx;
.myname{
font-size: 36rpx;
color: #3D3D3D;
+ margin-right: 10rpx;
}
.mytel{
font-size: 28rpx;
@@ -495,14 +506,16 @@
}
}
.myrt{
- width: 138rpx;
+ width: 110rpx;
height: 50rpx;
background: #7E90E7;
border-radius: 30rpx 30rpx 30rpx 30rpx;
text-align: center;
- line-height: 50rpx;
- font-size: 28rpx;
+ // line-height: 40rpx;
+ font-size: 24rpx;
color: #FFFFFF;
+ padding: 10rpx;
+ box-sizing: border-box;
}
}
}
diff --git a/page_user/orderlist.vue b/page_user/orderlist.vue
index 6eeac15..7f08f03 100644
--- a/page_user/orderlist.vue
+++ b/page_user/orderlist.vue
@@ -114,7 +114,7 @@
},
// 分享到朋友圈
- onShareTimeline: function() {
+ onShareTimeline: function() {
return {
title: '创亿康',
query: '',
diff --git a/page_user/promote.vue b/page_user/promote.vue
index 145841c..d727ac7 100644
--- a/page_user/promote.vue
+++ b/page_user/promote.vue
@@ -3,9 +3,9 @@
-
+
-
+
角色：{{txt}}
@@ -52,6 +52,33 @@
}
},
methods: {
+ drawCanvas() {
+ const ctx = uni.createCanvasContext('qrcode', this);
+ ctx.setFillStyle('red');
+ ctx.fillRect(10, 10, 150, 75);
+ ctx.draw();
+ },
+ saveCanvas() {
+ uni.canvasToTempFilePath({
+ canvasId: 'qrcode',
+ success: (res) => {
+ console.log(res.tempFilePath); // 打印图片路径
+ // 你可以在这里将图片保存到本地或其他操作
+ uni.saveImageToPhotosAlbum({
+ filePath: res.tempFilePath,
+ success: function () {
+ uni.showToast({
+ title: '保存成功',
+ icon: 'success'
+ });
+ }
+ });
+ },
+ fail: (err) => {
+ console.error(err);
+ }
+ });
+ },
// 获取 access_token
// getAccessToken() {
// let appid = 'wx992e3b549e0f879f',
@@ -120,7 +147,10 @@
})
}
- }
+ },
+ mounted() {
+ this.drawCanvas();
+ }
}
@@ -139,25 +169,25 @@
width: 100%;
padding: 48rpx 44rpx;
box-sizing: border-box;
-
+ position: relative;
.pic {
width: 660rpx;
height: 1306rpx;
- position: fixed;
+ position: absolute;
top: 230rpx;
left: 50%;
transform: translateX(-50%);
}
.img {
- // width: 311rpx;
- // height: 311rpx;
- position: fixed;
+ width: 311rpx;
+ height: 311rpx;
+ position: absolute;
top: 750rpx;
left: 50%;
transform: translateX(-50%);
- padding-left: 40rpx;
- padding-right: 20rpx;
+ // padding-left: 40rpx;
+ // padding-right: 20rpx;
box-sizing: border-box;
// border: 1px dashed #ccc;
}
diff --git a/page_user/shiming.vue b/page_user/shiming.vue
index 657df7e..3e923c5 100644
--- a/page_user/shiming.vue
+++ b/page_user/shiming.vue
@@ -73,7 +73,9 @@
})
setTimeout(()=>{
this.flag = false
- uni.navigateBack()
+ uni.reLaunch({
+ url:'/page_user/homepage'
+ })
},1500)
}else{
uni.showToast({
diff --git a/page_user/sjhezuo.vue b/page_user/sjhezuo.vue
index 5444ae4..cda40f7 100644
--- a/page_user/sjhezuo.vue
+++ b/page_user/sjhezuo.vue
@@ -3,27 +3,27 @@
-
+
您的姓名
-
+
您的手机号
-
+
了解信息
-
+
请输入您的真实有效信息，我们将在第一时间联系您
@@ -37,7 +37,7 @@
-
+
@@ -54,7 +54,8 @@
name:'',
tel:'',
msg:'',
- tjflag:true
+ tjflag:true,
+ type:''
}
},
onLoad() {
@@ -77,6 +78,15 @@
}
},
methods: {
+ confirm(){
+ this.type = ''
+ },
+ inp(){
+ this.type = 1
+ },
+ blur(){
+ this.type = ''
+ },
getuserinfo() {
this.$u.get("/app/user/userInfo").then((res) => {
if (res.code == 200) {
@@ -156,6 +166,12 @@
page {
background-color: #F7FAFE;
}
+ #active{
+ position: fixed;
+ bottom: 300rpx !important;
+ left: 50%;
+ transform: translateX(-50%);
+ }
.addmeng{
width: 750rpx;
height: 715rpx;
diff --git a/pages/index/index.vue b/pages/index/index.vue
index e4625ad..ada7a61 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -9,7 +9,7 @@
+ src="https://api.ccttiot.com/smartmeter/img/static/uEAmNMMt65U10qwijrsJ" mode="">
@@ -65,7 +65,7 @@
:interval="interval" :duration="duration">
-
+
@@ -87,7 +87,15 @@
- 推广用户角色:
+ 您的推广人:
+ {{tgobj.userName == undefined ? '--' : tgobj.userName}}（合作伙伴商渠道商创业者场所负责人）
+
+
+ 您的角色:
合作伙伴商
渠道商
创业者
@@ -99,7 +107,7 @@
分成比例:
- {{tgobj.point == undefined ? '--' : tgobj.point}}
+ {{tgobj.point == undefined ? '--' : tgobj.point}}%
@@ -170,7 +178,8 @@
shows: false,
xztxt: '点击选择',
clickPosition: null, // 存储点击位置的像素坐标
- iconflag: false
+ iconflag: false,
+ isReal: ''
};
},
onLoad(option) {
@@ -191,6 +200,14 @@
this.czflag = true
}
})
+ }else if(option.c){
+ this.c = option.c
+ this.$u.get(`/app/shareCode/byCode/${this.c}`).then((res) => {
+ if (res.code == 200) {
+ this.tgobj = res.data
+ this.czflag = true
+ }
+ })
}
},
// 分享到好友（会话）
@@ -288,6 +305,20 @@
duration: 1500
})
this.czflag = false
+ } else if (res.code == 401) {
+ uni.showModal({
+ title: '提示',
+ content: '您当前还未登录，是否去登录？',
+ success: function(res) {
+ if (res.confirm) {
+ uni.navigateTo({
+ url: '/pages/login/login?ids=' + 2
+ })
+ } else if (res.cancel) {
+
+ }
+ }
+ })
} else {
uni.showToast({
title: res.msg,
@@ -374,7 +405,7 @@
const totalLength = chineseLength + englishLength * 2
return -totalLength * 6.5 // 假设每个中文字符对应的 anchorX 偏移是 -6.5
},
-
+ // 扫描二维码
scanQRCode() {
this.$u.get('/app/user/userInfo').then(res => {
if (res.code == 200) {
@@ -383,48 +414,73 @@
onlyFromCamera: true,
scanType: ['qrCode'],
success: res => {
- function getQueryParam(url, paramName) {
- let regex = new RegExp(`[?&]${paramName}=([^&]*)`)
- let results = regex.exec(url);
- return results ? decodeURIComponent(results[1].replace(/\+/g,' ')) : null
- }
- let sceneValue = res.result
- let decodedValue = decodeURIComponent(sceneValue)
- let id = getQueryParam(decodedValue, 's')
- uni.navigateTo({
- url: '/page_user/fuwu?id=' + id
- })
- // console.log(res, id)
- let that = this
- let data = {
- deviceNo: id
- }
- that.$u.get(`/app/device/isBind?deviceNo=${id}`).then(res => {
- if (res.data == 2) {
- that.$u.get(`/app/device/${id}/withSuitList`).then(
- (res) => {
- if (res.code == 200) {
- uni.navigateTo({
- url: '/page_user/fuwu?id=' + id
- })
+ let sceneValue = res.result;
+ let decodedValue = decodeURIComponent(sceneValue);
+ console.log(decodedValue);
+ // 检查decodedValue中是否包含'c'或's'
+ if (decodedValue.includes('?c')) {
+ function getQueryParam(url, paramName) {
+ let regex = new RegExp(`[?&]${paramName}=([^&]*)`)
+ let results = regex.exec(url);
+ return results ? decodeURIComponent(results[1].replace(/\+/g, ' ')) : null
+ }
+ let sceneValue = res.result
+ let decodedValue = decodeURIComponent(sceneValue)
+ let id = getQueryParam(decodedValue, 'c')
+ this.c = id
+ // console.log('接收到的参数:', this.c)
+ this.$u.get(`/app/shareCode/byCode/${this.c}`).then((res) => {
+ if (res.code == 200) {
+ this.tgobj = res.data
+ this.czflag = true
+ }
+ })
+ } else if (decodedValue.includes('?s')) {
+ function getQueryParam(url, paramName) {
+ let regex = new RegExp(`[?&]${paramName}=([^&]*)`)
+ let results = regex.exec(url);
+ return results ? decodeURIComponent(results[1].replace(/\+/g,' ')) : null
+ }
+ let sceneValue = res.result
+ let decodedValue = decodeURIComponent(sceneValue)
+ let id = getQueryParam(decodedValue, 's')
+ uni.navigateTo({
+ url: '/page_user/fuwu?id=' + id
+ })
+ // console.log(res, id)
+ let that = this
+ let data = {
+ deviceNo: id
+ }
+ that.$u.get(`/app/device/isBind?deviceNo=${id}`).then(res => {
+ if (res.data == 2) {
+ that.$u.get(`/app/device/${id}/withSuitList`).then(
+ (res) => {
+ if (res.code == 200) {
+ uni.navigateTo({
+ url: '/page_user/fuwu?id=' + id
+ })
+ }
+ })
+ } else if (res.data == 0) {
+ uni.showModal({
+ title: '提示',
+ content: '该设备未录入,你需进行录入吗？',
+ success: function(res) {
+ if (res.confirm) {
+ uni.navigateTo({
+ url: '/pages/zhuce?sn=' + id
+ })
+ } else if (res.cancel) {
+
+ }
}
})
- } else if (res.data == 0) {
- uni.showModal({
- title: '提示',
- content: '该设备未录入,你需进行录入吗？',
- success: function(res) {
- if (res.confirm) {
- uni.navigateTo({
- url: '/pages/zhuce?sn=' + id
- })
- } else if (res.cancel) {
-
- }
- }
- })
- }
- })
+ }
+ })
+ } else {
+ console.log('既不包含c也不包含s'); // 如果两者都不包含
+ }
},
fail: err => {
console.error('扫描失败：', err)
@@ -486,9 +542,16 @@
url: '/page_user/guzhang'
})
} else if (num == 5) {
- uni.navigateTo({
- url: '/page_user/homepage'
- })
+ if (this.isReal == true) {
+ uni.navigateTo({
+ url: '/page_user/homepage'
+ })
+ } else {
+ uni.navigateTo({
+ url: '/page_user/shiming'
+ })
+ }
+
} else if (num == 6) {
uni.navigateTo({
url: '/page_user/sjhezuo'
@@ -522,39 +585,37 @@
this.iconflag = true
if (e.type == 'end') {
this.jinweidu = e.detail.centerLocation.longitude + ',' + e.detail.centerLocation.latitude
- this.$u.get("/app/store/listNearBy?center=" + this.jinweidu + '&radius=' + 1000).then(res => {
- if (res.code == 200) {
- this.covers = []
- this.listmap = res.data
- this.listmap.forEach(item => {
- // if (item.deviceCount !== null && item.deviceCount > 0) {
- const shopCover = {
- id: parseFloat(item.storeId),
- latitude: item.lat,
- longitude: item.lng,
- width: 25,
- height: 30,
- iconPath: 'https://api.ccttiot.com/smartmeter/img/static/u0yXGqCqoDjuK4QPJHZY',
- // iconPath:item.picture
- label: {
- content: item.name,
- anchorX: this.calculateAnchorX(item.name),
- fontWeight: 700,
- color: '#8883F0',
- borderColor: '#fff',
- borderRadius: 5,
- bgColor: '#fff'
- }
+ this.$u.get("/app/store/listNearBy?center=" + this.jinweidu + '&radius=' + 5000).then(res => {
+ if (res.code == 200) {
+ this.covers = []
+ this.listmap = res.data
+ this.listmap.forEach(item => {
+ // if (item.deviceCount !== null && item.deviceCount > 0) {
+ const shopCover = {
+ id: parseFloat(item.storeId),
+ latitude: item.lat,
+ longitude: item.lng,
+ width: 25,
+ height: 30,
+ iconPath: 'https://api.ccttiot.com/smartmeter/img/static/u0yXGqCqoDjuK4QPJHZY',
+ // iconPath:item.picture
+ label: {
+ content: item.name,
+ anchorX: this.calculateAnchorX(item.name),
+ fontWeight: 700,
+ color: '#8883F0',
+ borderColor: '#fff',
+ borderRadius: 5,
+ bgColor: '#fff'
}
- this.covers.push(shopCover)
- // console.log(this.covers);
- // }
- })
- }
- })
- setTimeout(()=>{
- this.iconflag = false
- },500)
+ }
+ this.covers.push(shopCover)
+ // console.log(this.covers);
+ // }
+ })
+ }
+ })
+ this.iconflag = false
} else {
// this.iconflag = false
}
@@ -590,7 +651,7 @@
this.longitude = Number(res.longitude.toFixed(5)) + 0.005
this.setMapScale()
// 请求附近的店铺
- this.$u.get("/app/store/listNearBy?center=" + this.jinweidu + '&radius=' + 1000).then(
+ this.$u.get("/app/store/listNearBy?center=" + this.jinweidu + '&radius=' + 5000).then(
res => {
if (res.code == 200) {
this.listmap = res.data
@@ -697,12 +758,13 @@
getuserinfo() {
this.$u.get("/app/user/userInfo").then((res) => {
if (res.code == 200) {
+ this.isReal = res.data.isReal
this.userId = res.data.userId
this.isMch = res.data.isMch
uni.setStorageSync('userType', res.data)
this.userType = res.data.type
this.deviceCount = res.data.deviceCount
- } else if(res.code == 401){
+ } else if (res.code == 401) {
this.jmlogin()
}
})
@@ -1069,9 +1131,11 @@
.guangg {
// margin-top: 10rpx;
margin-bottom: 10rpx;
+ border-radius: 20rpx !important;
+ overflow: hidden;
image {
- border-radius: 30rpx;
+ border-radius: 20rpx;
width: 680rpx;
height: 218rpx;
}
@@ -1210,8 +1274,8 @@
position: relative;
.picimg {
- width: 80rpx;
- height: 100rpx;
+ width: 120rpx;
+ height: 120rpx;
position: absolute;
left: 50%;
transform: translateX(-50%);
diff --git a/pages/login/login.vue b/pages/login/login.vue
index 394fcd1..51c5b76 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -64,13 +64,17 @@
id:'',
dlflag:false,
zh:'',
- mm:''
+ mm:'',
+ ids:''
}
},
onLoad(option) {
if(option.id){
this.id = option.id
+ }else if(option.ids){
+ this.ids = option.ids
}
+
},
// 分享到好友（会话）
onShareAppMessage: function () {
@@ -160,7 +164,9 @@
uni.reLaunch({
url:'/page_user/fuwu?id=' + this.id
})
- }else{
+ }else if(this.ids == 2){
+ uni.navigateBack()
+ } else{
uni.reLaunch({
url: '/pages/index/index'
})
diff --git a/pages/myorder/index.vue b/pages/myorder/index.vue
index 8d54446..b85abfb 100644
--- a/pages/myorder/index.vue
+++ b/pages/myorder/index.vue
@@ -6,7 +6,7 @@
+ src="https://api.ccttiot.com/smartmeter/img/static/uEAmNMMt65U10qwijrsJ" mode="">