diff --git a/api/address.js b/api/address.js
deleted file mode 100644
index 5bfe930..0000000
--- a/api/address.js
+++ /dev/null
@@ -1,15 +0,0 @@
-//请求工具参考https://ext.dcloud.net.cn/plugin?id=392
-const { http } = uni.$u
-
-//获得用户收件地址列表
-export const getAddressList = params => http.get('/member/address/list', params)
-//创建用户收件地址
-export const createAddress = data => http.post('/member/address/create', data)
-//通过ID获得用户收件地址
-export const getAddressById = params => http.get('/member/address/get', { params })
-//获得默认的用户收件地址
-export const getDefaultUserAddress = params => http.get('/member/address/get-default', { params })
-//更新用户收件地址
-export const updateAddress = params => http.put('/member/address/update', params)
-//删除用户收件地址
-export const deleteAddress = params => http.delete('/member/address/delete', {}, { params })
diff --git a/api/auth.js b/api/auth.js
index af91882..417f095 100644
--- a/api/auth.js
+++ b/api/auth.js
@@ -1,19 +1,46 @@
-import code from "../uni_modules/uview-ui/libs/config/props/code"
-
+import { encrypt } from "@/utils/encrypt.js";
+import request from '@/utils/request'
//请求工具参考https://ext.dcloud.net.cn/plugin?id=392
-const { http } = uni.$u
+const {
+ http
+} = uni.$u
//使用手机 + 密码登录
-export const passwordLogin = data => http.post('/auth/login', data)
+export const passwordLogin = data => {
+ data.password = encrypt(data.password);
+ return http.post('/auth/login', data)
+}
+
+// export function passwordLogin(username, password, code, uuid) {
+// const data = {
+// username,
+// password: encrypt(password),
+// code,
+// uuid
+// }
+// return request({
+// 'url': '/auth/login',
+// headers: {
+// isToken: false
+// },
+// 'method': 'post',
+// 'data': data
+// })
+// }
+
//钉钉登录
-export const dingLogin = code => http.post('/auth/dingding/login?code='+code)
+export const dingLogin = code => http.post('/auth/dingding/login?code=' + code)
//发送手机验证码
export const sendSmsCode = data => http.post('/member/auth/send-sms-code', data)
//使用手机 + 验证码登录
export const smsLogin = data => http.post('/member/auth/sms-login', data)
//微信小程序的一键登录
export const weixinMiniAppLogin = data => http.post('/member/auth/weixin-mini-app-login', data)
+// 获取验证码
+export const getCodeImg = params => http.get('/captchaImage')
//刷新令牌
-export const refreshToken = data => http.post('/member/auth/refresh-token', {data})
+export const refreshToken = data => http.post('/member/auth/refresh-token', {
+ data
+})
//退出登录
export const logout = data => http.delete('/auth/logout', data)
diff --git a/api/cart.js b/api/cart.js
deleted file mode 100644
index c7d0a00..0000000
--- a/api/cart.js
+++ /dev/null
@@ -1,5 +0,0 @@
-const { http } = uni.$u
-
-//获取购物车数据
-export const getCartProductDetail = () => http.get('/trade/cart/get-detail')
-
diff --git a/api/category.js b/api/category.js
deleted file mode 100644
index 630efd2..0000000
--- a/api/category.js
+++ /dev/null
@@ -1,5 +0,0 @@
-//请求工具参考https://ext.dcloud.net.cn/plugin?id=392
-const { http } = uni.$u
-
-// 查询分类列表
-export const categoryListData = params => http.get('product/category/list', { params })
diff --git a/api/order.js b/api/order.js
deleted file mode 100644
index cc305f1..0000000
--- a/api/order.js
+++ /dev/null
@@ -1,6 +0,0 @@
-const { http } = uni.$u
-
-// 获得订单交易分页
-export const getOrderPage = params => http.get('/trade/order/page', { params })
-// 获得交易订单详情
-export const getOrderDetail = params => http.get('/trade/order/get-detail', { params })
diff --git a/api/product.js b/api/product.js
deleted file mode 100644
index 627013c..0000000
--- a/api/product.js
+++ /dev/null
@@ -1,8 +0,0 @@
-//请求工具参考https://ext.dcloud.net.cn/plugin?id=392
-const { http } = uni.$u
-
-// 查询商品spu列表
-export const productSpuPage = params => http.get('product/spu/page', { params })
-
-// 查询商品
-export const getSpuDetail = id => http.get('product/spu/get-detail?id=' + id, { })
diff --git a/api/total.js b/api/total.js
index 42b9a2f..b89ccaa 100644
--- a/api/total.js
+++ b/api/total.js
@@ -4,10 +4,10 @@ const { http } = uni.$u
export const getStatisticsReport = id => http.get('/insight/statistics/report/'+id)
// 待开发用户池数据分析
-export const getStatisticsPool = params => http.get('/insight/statistics/pool',params)
+export const getStatisticsPool = params => http.get('/insight/statistics/pool',{params})
// /statistics/pool
-export const getStatisticsLogin = params => http.get('/insight/statistics/login',params)
+export const getStatisticsLogin = params => http.get('/insight/statistics/login',{params})
// 访问量和浏览量
// /statistics/login
diff --git a/common/config.js b/common/config.js
index 24d25a6..c66d45b 100644
--- a/common/config.js
+++ b/common/config.js
@@ -1,9 +1,9 @@
module.exports = {
//后端接口地址
// baseUrl: 'http://10.11.38.240:9001', //内网开发环境
- // baseUrl: 'http://172.17.56.37:18082/api', //测试环境
+ baseUrl: 'http://172.17.56.37:18082/api', //测试环境
// baseUrl: 'http://172.17.56.16:18082/api', //ip正式环境
- baseUrl: 'https://scdcapp.chinagasholdings.com/api', //域名正式环境
+ // baseUrl: 'https://scdcapp.chinagasholdings.com/api', //域名正式环境
// 超时
timeout: 30000,
// 禁用 Cookie 等信息
diff --git a/package-lock.json b/package-lock.json
index 25366e6..f574e90 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -10,6 +10,11 @@
"promise-polyfill": "^7.1.0"
}
},
+ "jsencrypt": {
+ "version": "3.3.2",
+ "resolved": "https://registry.npmmirror.com/jsencrypt/-/jsencrypt-3.3.2.tgz",
+ "integrity": "sha512-arQR1R1ESGdAxY7ZheWr12wCaF2yF47v5qpB76TtV64H1pyGudk9Hvw8Y9tb/FiTIaaTRUyaSnm5T/Y53Ghm/A=="
+ },
"promise-polyfill": {
"version": "7.1.2",
"resolved": "https://registry.npmmirror.com/promise-polyfill/-/promise-polyfill-7.1.2.tgz",
diff --git a/package.json b/package.json
index 7854da3..c4951e2 100644
--- a/package.json
+++ b/package.json
@@ -6,6 +6,7 @@
]
},
"dependencies": {
- "dingtalk-jsapi": "^3.0.29"
+ "dingtalk-jsapi": "^3.0.29",
+ "jsencrypt": "^3.3.2"
}
}
diff --git a/pages.json b/pages.json
index b2313f6..608ebbd 100644
--- a/pages.json
+++ b/pages.json
@@ -7,6 +7,7 @@
"path": "pages/market/index",
"style": {
"navigationBarTitleText": "市场资讯",
+ "navigationStyle": "custom",
"enablePullDownRefresh": true
}
}, {
@@ -18,35 +19,41 @@
}, {
"path": "pages/market/total",
"style": {
- "navigationBarTitleText": "数据统计"
+ "navigationBarTitleText": "数据统计",
+ "navigationStyle": "custom"
}
}, {
"path": "pages/market/insight",
"style": {
"enablePullDownRefresh": true,
- "navigationBarTitleText": "市场洞察"
+ "navigationBarTitleText": "市场洞察",
+ "navigationStyle": "custom"
}
}, {
"path": "pages/market/researchReport",
"style": {
- "navigationBarTitleText": "研究报告"
+ "navigationBarTitleText": "研究报告",
+ "navigationStyle": "custom"
}
}, {
"path": "pages/market/knowledgeBase",
"style": {
- "navigationBarTitleText": "知识库"
+ "navigationBarTitleText": "知识库",
+ "navigationStyle": "custom"
}
},
{
"path": "pages/market/userDetails",
"style": {
- "navigationBarTitleText": "居民用户详情"
+ "navigationBarTitleText": "居民用户详情",
+ "navigationStyle": "custom"
}
},
{
"path": "pages/market/reportDetails",
"style": {
- "navigationBarTitleText": "报告详情"
+ "navigationBarTitleText": "报告详情",
+ "navigationStyle": "custom"
}
}
],
diff --git a/pages/login/mobile.vue b/pages/login/mobile.vue
index 4782491..bbf9f66 100644
--- a/pages/login/mobile.vue
+++ b/pages/login/mobile.vue
@@ -14,20 +14,15 @@
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 记住密码
+
登录
-
+