diff --git a/miniprogram/api/login/login.js b/miniprogram/api/login/login.js
index 95909dd..cd02cd9 100644
--- a/miniprogram/api/login/login.js
+++ b/miniprogram/api/login/login.js
@@ -14,7 +14,7 @@ export function loginRq(data) {
// 注册用户
export function registerPhone(data) {
return request({
- url: '/changyang_user_login/login',
+ url: '/social_user_login/login',
method: "post",
data
});
diff --git a/miniprogram/api/selfRequest.js b/miniprogram/api/selfRequest.js
index 584ce07..f572777 100644
--- a/miniprogram/api/selfRequest.js
+++ b/miniprogram/api/selfRequest.js
@@ -18,9 +18,13 @@ export function request(params) {
header["Authorization"] = 'Bearer ' + wx.getStorageSync('token');
}
// 地区id
- data.tenantId = app.tenantId
+ if (wx.getStorageSync('tenantId')) {
+ data.tenantId = wx.getStorageSync('tenantId')
+ }
// 园区id
- data.parkId = app.parkId
+ if (wx.getStorageSync('parkId')) {
+ data.parkId = wx.getStorageSync('parkId')
+ }
// 加载中
wx.showLoading({
diff --git a/miniprogram/app.js b/miniprogram/app.js
index d8137e2..8770cdd 100644
--- a/miniprogram/app.js
+++ b/miniprogram/app.js
@@ -1,18 +1,18 @@
App({
// 配置信息
APPID: 'wx5582a07c1fbbcf06',
- APPSECRET: 'e0ef2bac28df376d8855d04ee8828d73',
- tenantId : '12', // 地区
- parkId : '26', // 园区id
- parkName : '长阳智会云控', // 园区名称
+ APPSECRET: 'ad24130a8919c613efd9538f69abafd3',
+ // tenantId : '12', // 地区
+ // parkId : '26', // 园区id
+ // parkName : '长阳智会云控', // 园区名称
// 本地测试
- // DOMAIN_NAME_PREFIX: 'http://192.168.0.11',
- // DOMAIN_NAME: 'http://192.168.0.11:9227', //接口域名
- // IMG_NAME: 'http://192.168.0.11:9227',
+ DOMAIN_NAME_PREFIX: 'http://192.168.0.30',
+ DOMAIN_NAME: 'http://192.168.0.30:9227', //接口域名
+ IMG_NAME: 'http://192.168.0.30:9227',
// 生产
- DOMAIN_NAME_PREFIX: 'https://www.chuangzhikj.com',
- DOMAIN_NAME: 'https://www.chuangzhikj.com/saas-ics', //接口域名
- IMG_NAME: 'https://www.chuangzhikj.com/saas-ics',
+ // DOMAIN_NAME_PREFIX: 'https://www.chuangzhikj.com',
+ // DOMAIN_NAME: 'https://www.chuangzhikj.com/saas-ics', //接口域名
+ // IMG_NAME: 'https://www.chuangzhikj.com/saas-ics',
globals: {
refreshMyPages: false,
homedata: {},
diff --git a/miniprogram/pages/index/index.js b/miniprogram/pages/index/index.js
index 00cd86d..40d8023 100644
--- a/miniprogram/pages/index/index.js
+++ b/miniprogram/pages/index/index.js
@@ -200,14 +200,11 @@ Page({
wx.setStorageSync('openid', userDetail.openid)
wx.setStorageSync('user', userDetail)
wx.setStorageSync('userId', userDetail.id)
- wx.setStorageSync('tenantId', app.tenantId)
- wx.setStorageSync('parkId', app.parkId)
- wx.setStorageSync('parkName', app.parkName)
_this.setData({
userDetail
})
// 查询轮播图
- getParkRq(app.parkId).then(res => {
+ getParkRq(userDetail.parkId).then(res => {
console.log('getParkRq', res);
let bannerList = res.bannerImages.map(item => item.url)
_this.setData({
diff --git a/miniprogram/pages/login/login.js b/miniprogram/pages/login/login.js
index ef66755..16dc3bf 100644
--- a/miniprogram/pages/login/login.js
+++ b/miniprogram/pages/login/login.js
@@ -76,6 +76,7 @@ Page({
wx.setStorageSync('user', user)
wx.setStorageSync('userId', user.id)
wx.setStorageSync('token', token)
+ wx.setStorageSync('tenantId', user.tenantId)
wx.setStorageSync('parkId', user.parkId)
wx.setStorageSync('parkName', user.parkName)
diff --git a/miniprogram/pages/reportRepair/repair/case/case.wxml b/miniprogram/pages/reportRepair/repair/case/case.wxml
index 295d88e..30180e8 100644
--- a/miniprogram/pages/reportRepair/repair/case/case.wxml
+++ b/miniprogram/pages/reportRepair/repair/case/case.wxml
@@ -12,8 +12,14 @@
派单信息
+ 2022-11-15 10:25:23
+
+
+ 报修人电话:19883286522
+
+
diff --git a/miniprogram/pages/reportRepair/repair/case/case.wxss b/miniprogram/pages/reportRepair/repair/case/case.wxss
index 8c7d208..3715827 100644
--- a/miniprogram/pages/reportRepair/repair/case/case.wxss
+++ b/miniprogram/pages/reportRepair/repair/case/case.wxss
@@ -77,4 +77,22 @@
top: 100%;
left: 50%;
transform: translateX(-50%);
+}
+
+
+.topHead .progressView .point .time {
+ position: absolute;
+ top: calc(100% + 20rpx);
+ left: 50%;
+ transform: translateX(-50%);
+ width: 140rpx;
+
+ word-break: break-all;
+ font-size: 24rpx;
+ color: #cccccc;
+ text-align: center;
+}
+
+.topHead .personMsgView{
+ border: 1rpx solid red;
}
\ No newline at end of file