From 90f64982078dca70bacf3241e01b98612e08fa02 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=94=90=E6=98=8E=E6=98=8E?= <970899069@qq.com>
Date: Mon, 27 Sep 2021 14:18:19 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E5=87=BA=E5=86=97=E4=BD=99=E4=BB=A3?=
=?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
apis/interfaces/address.js | 62 ---------
apis/interfaces/auth.js | 10 --
apis/interfaces/company.js | 35 -----
apis/interfaces/coupon.js | 83 -----------
apis/interfaces/index.js | 123 ----------------
pages/company/approve.vue | 3 -
pages/company/prompt.vue | 62 ---------
pages/company/registered.vue | 147 --------------------
pages/index/deal.vue | 173 -----------------------
pages/index/index.vue | 4 +-
pages/index/info.vue | 209 ----------------------------
pages/index/kline.vue | 163 ----------------------
pages/login/guide.vue | 263 -----------------------------------
pages/login/login.vue | 31 +++--
pages/setting/setting.vue | 2 +-
public/userAuth.js | 7 -
16 files changed, 18 insertions(+), 1359 deletions(-)
delete mode 100644 apis/interfaces/address.js
delete mode 100644 apis/interfaces/coupon.js
delete mode 100644 apis/interfaces/index.js
delete mode 100644 pages/company/prompt.vue
delete mode 100644 pages/company/registered.vue
delete mode 100644 pages/index/deal.vue
delete mode 100644 pages/index/info.vue
delete mode 100644 pages/index/kline.vue
delete mode 100644 pages/login/guide.vue
diff --git a/apis/interfaces/address.js b/apis/interfaces/address.js
deleted file mode 100644
index eee503d..0000000
--- a/apis/interfaces/address.js
+++ /dev/null
@@ -1,62 +0,0 @@
-/**
- * zdx
- * moduleName: 地址
- */
-
-import { request } from '../index'
-
-// 地址列表
-const addresses = () => {
- return request({
- url: 'mall/addresses',
- method: 'GET'
- })
-}
-
-// 新增地址
-const addAddresses = (data) => {
- return request({
- url: 'mall/addresses',
- method: 'post',
- data: data
- })
-}
-// 根据地址id获取地址的详细信息
-const getAddresses = (id) => {
- return request({
- url: 'mall/addresses/'+id,
- method: 'get'
- })
-}
-// 编辑
-const editAddresses = (id,data) => {
- return request({
- url: 'mall/addresses/'+id,
- method: 'put',
- data:data
- })
-}
-// 删除
-const delAddresses = (id) => {
- return request({
- url: 'mall/addresses/'+id,
- method: 'DELETE'
- })
-}
-// 默认
-const defaultAddresses = (id) => {
- return request({
- url: 'mall/addresses/'+id+'/default',
- method: 'post'
- })
-}
-
-
-export {
- addresses,
- addAddresses,
- getAddresses,
- editAddresses,
- delAddresses,
- defaultAddresses
-}
diff --git a/apis/interfaces/auth.js b/apis/interfaces/auth.js
index fc6e49c..48ee742 100644
--- a/apis/interfaces/auth.js
+++ b/apis/interfaces/auth.js
@@ -8,15 +8,6 @@
import { request } from '../index'
-// 一键登录
-const keyAuth = (data) => {
- return request({
- url: 'user/socialite/login/unicloud/app',
- method: 'POST',
- data: data
- })
-}
-
// 验证码登录
const smsAuth = (data) =>{
return request({
@@ -36,7 +27,6 @@ const getSms = (data) =>{
}
export {
- keyAuth,
smsAuth,
getSms
}
diff --git a/apis/interfaces/company.js b/apis/interfaces/company.js
index 23dca6c..78f8aaf 100644
--- a/apis/interfaces/company.js
+++ b/apis/interfaces/company.js
@@ -8,22 +8,6 @@
import { request } from '../index'
-// 企业注册配置信息
-const createConfig = () => {
- return request({
- url: 'companies/inits/create'
- })
-}
-
-// 企业行业信息
-const inits = data => {
- return request({
- url: 'companies/inits',
- method: 'POST',
- data
- })
-}
-
// 企业认证配置信息
const appliesCreate = () => {
return request({
@@ -40,21 +24,6 @@ const applies = (data,method) => {
})
}
-// 企业认证前置条件
-const isallow = () => {
- return request({
- url: 'companies/applies/isallow',
- method: 'POST'
- })
-}
-
-// 企业申请状态
-const appliesQuery = () => {
- return request({
- url: 'companies/applies/query'
- })
-}
-
// 企业信息展示
const appliesInfo = () => {
return request({
@@ -71,12 +40,8 @@ const appliesCategory = data => {
}
export {
- createConfig,
- inits,
appliesCreate,
applies,
- isallow,
- appliesQuery,
appliesInfo,
appliesCategory
}
diff --git a/apis/interfaces/coupon.js b/apis/interfaces/coupon.js
deleted file mode 100644
index 7969eb0..0000000
--- a/apis/interfaces/coupon.js
+++ /dev/null
@@ -1,83 +0,0 @@
-/**
- * Web-zdx
- * moduleName: 优惠券相关
- */
-
-import { request } from '../index'
-
-// 我的优惠券
-const myCoupon = (data) => {
- return request({
- url: 'coupons/user/coupons',
- method: 'get',
- data: data
- })
-}
-
-// 优惠券分组列表
-const getCouponsListById = (id,data) => {
- return request({
- url: 'coupons/user/coupons/'+id+'/list',
- data:data
- })
-}
-
-// 根据优惠券id获取优惠券的详情信息
-const getCouponsInfoById = (id) => {
- return request({
- url: 'coupons/user/coupons/'+id,
- })
-}
-
-
-// 根据企业id获取企业首页的轮播图列表
-const couponsByCompanyId = (data) => {
- return request({
- url: 'coupons/all',
- method: 'get',
- data: data
- })
-}
-
-// 领取优惠券
-const couponsGrant = (id) => {
- return request({
- url: 'coupons/'+id+'/grant',
- method: 'POST'
- })
-}
-// 获取优惠券可使用商品
-const getGoodsByGrantId = (data) => {
- return request({
- url: 'user/coupons/goods',
- data: data
- })
-}
-
-// 使用提货券兑换商品
-const exchangeGoods = (data) => {
- return request({
- url: 'user/coupons/exchange',
- method: 'POST',
- data: data
- })
-}
-
-// 获取核销二维码
-const getQrcodeByGrantId = (data) => {
- return request({
- url: 'coupons/user/coupons/qrcode',
- data: data
- })
-}
-
-export {
- myCoupon,
- couponsByCompanyId,
- couponsGrant,
- getGoodsByGrantId,
- exchangeGoods,
- getCouponsListById,
- getCouponsInfoById,
- getQrcodeByGrantId
-}
diff --git a/apis/interfaces/index.js b/apis/interfaces/index.js
deleted file mode 100644
index 8343eea..0000000
--- a/apis/interfaces/index.js
+++ /dev/null
@@ -1,123 +0,0 @@
-/**
- * Web-zdx
- * moduleName: 商城首页
- */
-
-import { request } from '../index'
-
-// 首页信息
-const index = () => {
- return request({
- url: 'mall',
- method: 'GET'
- })
-}
-// 今日特惠页面 (大于三显示3个 两个显示两个 1个就显示一张图)
-const indexT = (data) => {
- return request({
- url: 'mall/goods',
- method: 'GET',
- data:data
- })
-}
-// 获取首页弹窗
-const popups = () => {
- return request({
- url: 'popups/mall',
- method: 'GET'
- })
-}
-const banner = () => {
- return request({
- url: 'mall/banners',
- method: 'GET'
- })
-}
-
-// 全养头条
-const cmsArticles = () => {
- return request({
- url: 'cms/articles',
- method: 'GET'
- })
-}
-
-// 全养头条详情
-const cmsArticlesDetail = (id) => {
- return request({
- url: 'cms/articles/'+id,
- method: 'GET'
- })
-}
-
-// 获取是否有未读消息
-const notifyCounts = () => {
- return request({
- url: 'notifications/counts',
- method: 'GET'
- })
-}
-
-// 判断是否能跳转到钱包页面
-const canGoWallet = () => {
- return request({
- url: 'user/datas',
- method: 'GET'
- })
-}
-
-// 是否设置了激活激活钱包
-const security = () => {
- return request({
- url: 'chain/safe/security',
- method: 'GET'
- })
-}
-
-// 是否个人认证成功
-const certified = () => {
- return request({
- url: 'user/certified',
- method: 'GET'
- })
-}
-
-// 获取首页商品列表 taos ='淘宝客' goods/mall (自己商品)
-const getIndexGoodsList = (name,data) => {
- return request({
- url: name,
- method: 'GET',
- data:data
- })
-}
-// 获取淘宝客的标签
-const getTaoCategories = () =>{
- return request({
- url: 'tao/categories',
- method: 'GET'
- })
-}
-// 获取自营的标签
-const getTags = () =>{
- return request({
- url: 'mall/tags',
- method: 'GET'
- })
-}
-
-
-export {
- index,
- cmsArticles,
- notifyCounts,
- cmsArticlesDetail,
- canGoWallet,
- security,
- certified,
- getIndexGoodsList,
- getTaoCategories,
- getTags,
- banner,
- popups,
- indexT
-}
diff --git a/pages/company/approve.vue b/pages/company/approve.vue
index b01ddc6..8f3b19b 100644
--- a/pages/company/approve.vue
+++ b/pages/company/approve.vue
@@ -97,9 +97,6 @@
};
},
created(){
-
- console.log(this.$Route)
-
// 读取配置信息
appliesCreate().then(res=>{
this.industry = res
diff --git a/pages/company/prompt.vue b/pages/company/prompt.vue
deleted file mode 100644
index f10878e..0000000
--- a/pages/company/prompt.vue
+++ /dev/null
@@ -1,62 +0,0 @@
-
-
-
- 恭喜您,已注册成功
- 开通会员认证企业信息立即获得授信易货额,即可开始易货之旅
-
-
-
-
-
-
-
diff --git a/pages/company/registered.vue b/pages/company/registered.vue
deleted file mode 100644
index 2d8e453..0000000
--- a/pages/company/registered.vue
+++ /dev/null
@@ -1,147 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
- {{industry[industryIndex].title}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/pages/index/deal.vue b/pages/index/deal.vue
deleted file mode 100644
index 3533994..0000000
--- a/pages/index/deal.vue
+++ /dev/null
@@ -1,173 +0,0 @@
-
-
-
-
-
- 区块HASH
- {{info.hash || '-'}}
- 复制
-
-
- 交易数据
-
- {{ info.tx_count || '-' }}
-
-
-
- 区块高度
-
- {{ info.height || '-' }}
-
-
-
- 时间
-
- {{ info.block_time || '-' }}
-
-
-
- 上一块
-
- {{ info.parent_hash || '-' }}
-
-
-
- 区块难度
-
- {{ info.difficulty || '-' }}
-
-
-
- 默克尔跟
-
- {{ info.tx_hash || '-' }}
-
-
-
- 状态哈希
-
- {{ info.state_hash || '-' }}
-
-
-
-
-
-
- 交易记录
-
-
-
-
-
-
-
-
diff --git a/pages/index/index.vue b/pages/index/index.vue
index bfdfb92..e2fd8d7 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -90,7 +90,6 @@
-
-
diff --git a/pages/index/kline.vue b/pages/index/kline.vue
deleted file mode 100644
index b0a2013..0000000
--- a/pages/index/kline.vue
+++ /dev/null
@@ -1,163 +0,0 @@
-
-
-
-
-
-
-
-
-
diff --git a/pages/login/guide.vue b/pages/login/guide.vue
deleted file mode 100644
index 8a7cc01..0000000
--- a/pages/login/guide.vue
+++ /dev/null
@@ -1,263 +0,0 @@
-
-
-
-
-
-
- 链商星球(中国)
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 快捷登录
-
-
-
-
-
- 未注册的手机号验证后将自动创建账号,登录即表示同意接收用户隐私规格和用户服务协议
-
-
-
-
-
-
-
-
diff --git a/pages/login/login.vue b/pages/login/login.vue
index 8a7cc01..eedf1c9 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -1,20 +1,19 @@
-
链商星球(中国)
-
+
-
+
-
+
@@ -23,7 +22,7 @@
快捷登录
-
+
@@ -88,6 +87,13 @@
icon: "none"
})
})
+ },
+ // 提示信息
+ onShowToast(){
+ uni.showToast({
+ title: '微信登录暂未开放,敬请期待',
+ icon : 'none'
+ })
}
}
}
@@ -115,7 +121,6 @@
.top-bg {
position: absolute;
bottom: 30rpx;
- // left: 2rpx;
z-index: 2;
width: 740rpx;
margin-left: 40rpx;
@@ -128,12 +133,11 @@
justify-content: center;
box-sizing: border-box;
color: #7f56a4;
- font-size: 18px;
-
+ font-size: $title-size;
.top-logo {
margin-bottom: 20rpx;
- width: 240rpx;
- height: 240rpx;
+ width: 146rpx;
+ height: 146rpx;
}
}
}
@@ -173,11 +177,10 @@
&.sms {
padding-right: 200rpx;
-
.sms-btn[size='mini'] {
width: 200rpx;
- height: 80rpx;
- line-height: 80rpx;
+ height: 77rpx;
+ line-height: 77rpx;
position: absolute;
top: 0;
right: 0;
@@ -187,11 +190,9 @@
border-left: solid 1rpx $border-color;
color: $text-price;
font-size: $title-size-lg;
-
&::after {
border: none;
}
-
&[disabled] {
color: rgba($color: $text-price, $alpha: .6);
background: $border-color-lg;
diff --git a/pages/setting/setting.vue b/pages/setting/setting.vue
index 3bfdf4d..8ec4f9a 100644
--- a/pages/setting/setting.vue
+++ b/pages/setting/setting.vue
@@ -277,7 +277,7 @@
},
loginOut() {
- uni.removeStorageSync('token')
+ this.$store.commit('setToken', '')
uni.reLaunch({
url: '/pages/login/login'
})
diff --git a/public/userAuth.js b/public/userAuth.js
index fd9b22b..1a53d89 100644
--- a/public/userAuth.js
+++ b/public/userAuth.js
@@ -123,13 +123,6 @@ class userAuth {
icon : 'none'
})
}
-
- /**
- * 处理登录状态维护
- */
- updAuthToken(){
-
- }
}
export default userAuth