diff --git a/common/http.interceptor.js b/common/http.interceptor.js
index 9277b6b..e4cdbde 100644
--- a/common/http.interceptor.js
+++ b/common/http.interceptor.js
@@ -20,8 +20,8 @@ const install = (Vue, vm) => {
// },
// });
Vue.prototype.$u.http.setConfig({
- baseUrl: 'http://192.168.2.143:10002',
- // baseUrl: 'https://kg.chuantewulian.cn/prod-api',
+ // baseUrl: 'http://192.168.2.143:10002',
+ baseUrl: 'https://kg.chuantewulian.cn/prod-api',
loadingText: '努力加载中~',
loadingTime: 1000,
// 设置自定义头部content-type
@@ -108,20 +108,19 @@ const install = (Vue, vm) => {
if (res.code) {
console.log('登录！', res);
let data = {
- wxOpenId: res.code,
-
- };
+ loginCode: res.code,
+ }
vm.$u.post('/app/auth/wxLogin',data).then(res=>{
if (res.code == 10003) {
- uni.navigateTo({
- url:'/pages/login/login'
- })
+ // uni.navigateTo({
+ // url:'/pages/login/login'
+ // })
} else if (res.code == 200) {
// console.log("老用户登录",res.data)
- uni.switchTab({
- url:'/pages/index/index'
- })
+ // uni.switchTab({
+ // url:'/pages/index/index'
+ // })
}
});
diff --git a/page_components/eletj.vue b/page_components/eletj.vue
index cfd850a..0139e40 100644
--- a/page_components/eletj.vue
+++ b/page_components/eletj.vue
@@ -47,7 +47,7 @@
- 剩余时长：{{ setMode == null ? timeday : setMode}}
+ 剩余时长：{{ setMode == null ? timeday : setMode}} 分钟
@@ -625,7 +625,7 @@
// flex-wrap: nowrap;
width: 100%;
justify-content: space-between;
- padding-left: 80rpx;
+ padding-left: 210rpx;
padding-right: 80rpx;
box-sizing: border-box;
@@ -654,7 +654,7 @@
// flex-wrap: nowrap;
width: 100%;
justify-content: space-between;
- padding-left: 45rpx;
+ padding-left: 220rpx;
padding-right: 80rpx;
box-sizing: border-box;
.cont {
diff --git a/page_components/fuwu/index.vue b/page_components/fuwu/index.vue
index e4069ff..b2be418 100644
--- a/page_components/fuwu/index.vue
+++ b/page_components/fuwu/index.vue
@@ -372,6 +372,7 @@
clearInterval(this.timer);
that.timer = null;
}
+ that.$u.put(`/app/bill/${that.orderno}/refreshPayResult`).then(res => {})
// 支付成功逻辑
uni.reLaunch({
url: '/pages/shouye/index'
diff --git a/page_components/wentdetail.vue b/page_components/wentdetail.vue
index d824bb1..0fdd49e 100644
--- a/page_components/wentdetail.vue
+++ b/page_components/wentdetail.vue
@@ -4,7 +4,7 @@
height='50'>
- {{listobj.title}}
+ {{listobj.title == undefined ? '' : listobj.title}}
@@ -58,7 +58,8 @@
left: 0;
.box{
width: 750rpx;
- height: 1440rpx;
+ height: 90vh;
+ overflow: scroll;
background: #F4F5F7;
border-radius: 0rpx 0rpx 0rpx 0rpx;
padding: 40rpx;
diff --git a/page_fenbao/statulist/about/index.vue b/page_fenbao/statulist/about/index.vue
index 0066df6..b113b04 100644
--- a/page_fenbao/statulist/about/index.vue
+++ b/page_fenbao/statulist/about/index.vue
@@ -4,7 +4,7 @@
height='50'>
- {{obj.title}}
+ {{obj.title == undefined ? '' : obj.title}}
diff --git a/page_fenbao/statulist/myorder/detailxq/index.vue b/page_fenbao/statulist/myorder/detailxq/index.vue
index b45a8b3..1987da0 100644
--- a/page_fenbao/statulist/myorder/detailxq/index.vue
+++ b/page_fenbao/statulist/myorder/detailxq/index.vue
@@ -343,7 +343,7 @@
}
.listxq{
width: 680rpx;
- height: 760rpx;
+ height: 780rpx;
background: #FFFFFF;
border-radius: 20rpx 20rpx 20rpx 20rpx;
margin: auto;
diff --git a/page_fenbao/statulist/question/xiangqing/index.vue b/page_fenbao/statulist/question/xiangqing/index.vue
index 4ea46a6..ed5a540 100644
--- a/page_fenbao/statulist/question/xiangqing/index.vue
+++ b/page_fenbao/statulist/question/xiangqing/index.vue
@@ -4,7 +4,7 @@
height='50'>
- {{listobj.title}}
+ {{listobj.title == undefined ? '' : listobj.title}}
{{listobj.content}}
diff --git a/page_user/sbdetail.vue b/page_user/sbdetail.vue
index 6102d6c..17db555 100644
--- a/page_user/sbdetail.vue
+++ b/page_user/sbdetail.vue
@@ -66,7 +66,7 @@
- {{ setMode == null ? timeday : setMode}}
+ {{ setMode == null ? timeday : setMode}} 分钟
@@ -81,21 +81,21 @@
其他
-
+
充值记录
-
+
归零
-
+
@@ -109,7 +109,7 @@
用电分析
-->
-
+
@@ -117,23 +117,23 @@
-
+
收费方式
-
+
设置
-
+
-
+
配网
@@ -150,7 +150,7 @@
请输入您需要充值的时长(分钟)
-
+
取消
空闲
-
+
未分配店铺
S/N码：{{item.deviceNo}}
-
+
归属店铺: {{item.storeName == null ? '--' : item.storeName}}
-
+
@@ -20,7 +20,7 @@
-
+
{{item.deviceName}}
@@ -29,31 +29,33 @@
-
+
+ style="width: 96rpx;height:94rpx;">
+ style="width: 96rpx;height:94rpx;">
+ style="width: 96rpx;height:94rpx;">
-
+
-
+
+
+
@@ -215,9 +217,9 @@
- btnitem(){
+ btnitem(deviceId){
uni.navigateTo({
- url:'/page_components/eletj'
+ url:'/page_components/eletj?id=' + deviceId
})
},
// 点击显示使用中设备