解决merge

apis/index.js

@@ -30,7 +30,7 @@ const request = (parameter, hideLoding = true) => {
 	// 注入header
 	config.header = {
 		'Accept': 'application/json',
-		'Authorization': store.getters.getToken || ''
+		'Authorization': store.getters.getToken || uni.getStorageSync('token')
 	}
 	// 加载提示
 	if(!hideLoding) uni.showLoading({
@@ -137,6 +137,8 @@ const errToast = (code) => {
 // 更新token
 const updateToken = (token) => {
 	store.commit('setToken', token)
+	// 清除退出登录标识
+	uni.removeStorageSync('isnew')
 }
 
 // 处理登录提示

apis/interfaces/account.js

@@ -24,7 +24,70 @@ const recharge = (data) => {
 	})
 }
 
+// 充值订单信息
+const payment = (data) => {
+	return request({
+		url: "user/transaction/recharge/payment",
+		method: "POST",
+		data
+	})
+}
+
+// 充值记录
+const log = (data) => {
+	return request({
+		url: 'user/transaction/recharge/lists'
+	})
+}
+
+// 获取钱包地址
+const code = () => {
+	return request({
+		url: 'chain/account/code'
+	})
+}
+
+// 转账初始化
+const transfer = () => {
+	return request({
+		url: 'user/transaction/transfer'
+	})
+}
+
+// 设置支付密码
+const setpassword = data => {
+	return request({
+		url: 'user/transaction/setpassword',
+		method: 'POST',
+		data
+	})
+}
+
+// 获取验证码
+const getSms = data => {
+	return request({
+		url: 'user/transaction/setpassword/sms',
+		method: 'POST'
+	})
+}
+
+// 提交转账
+const submitTransfer = data => {
+	return request({
+		url: 'user/transaction/transfer/store',
+		method: 'POST',
+		data
+	})
+}
+
 export {
 	dt,
-	recharge
+	recharge,
+	payment,
+	log,
+	code,
+	transfer,
+	setpassword,
+	getSms,
+	submitTransfer
 }

apis/interfaces/life.js

@@ -15,7 +15,22 @@ const life = () =>{
 	})
 }
 
+// 共分首页
+const glz = () => {
+	return request({
+		url: 'user/glz/index'
+	})
+}
+
+// 签到
+const sign = () => {
+	return request({
+		url: 'user/glz/sign'
+	})
+}
 
 export {
-	life
+	life,
+	glz,
+	sign
 }

apis/interfaces/store.js

@@ -21,16 +21,34 @@ const goods = id => {
 	})
 }
 
-// 套餐列表
-const meals = (id, categoryId) => {
+// 店铺列表
+const shops = (categoryId) => {
 	return request({
-		url: 'mall/meals/' + id,
+		url: 'mall/shops',
 		data: {
 			category_id: categoryId
 		}
 	})
 }
 
+// 店铺详情
+const shopsDetail = (shopId) => {
+	return request({
+		url: 'mall/shops/' + shopId,
+	})
+}
+
+// 店铺商品
+const shopsGoods = (shop_id, category_id) => {
+	return request({
+		url: 'mall/goods',
+		data: {
+			shop_id,
+			category_id
+		}
+	})
+}
+
 // 商品列表
 const lists = data => {
 	return request({
@@ -66,7 +84,9 @@ const classify = id => {
 export {
 	mall,
 	goods,
-	meals,
+	shops,
+	shopsDetail,
+	shopsGoods,
 	lists,
 	buy,
 	verify,

apis/interfaces/team.js

@@ -0,0 +1,21 @@
+
+/**
+ * Web唐明明
+ * 匆匆数载恍如梦，岁月迢迢华发增。
+ * 碌碌无为枉半生，一朝惊醒万事空。
+ * moduleName: 团队
+ */
+
+import { request } from '../index'
+
+// 团队
+const relations = (data) => {
+	return request({
+		url: 'user/relations',
+		data
+	})
+}
+
+export {
+	relations
+}

apis/interfaces/user.js

@@ -14,7 +14,22 @@ const info = () =>{
 	})
 }
 
+// 导出助记词
+const chainSeed = () => {
+	return request({
+		url: 'chain/safe/seed'
+	})
+}
+
+// 获取邀请码
+const invitationCode = () => {
+	return request({
+		url: 'user/invite'
+	})
+}
 
 export {
-	info
+	info,
+	chainSeed,
+	invitationCode
 }

apis/interfaces/vip.js

@@ -18,14 +18,14 @@ const vip = () =>{
 // 开通会员
 const vipPay = () => {
 	return request({
-		url: ''
+		url: 'user/identities/buyvip'
 	})
 }
 
 // 获取支付信息
-const payInfo = () => {
+const payInfo = (orderId) => {
 	return request({
-		url: ''
+		url: 'user/identities/pay/' + orderId + '/wechat'
 	})
 }