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.json b/pages.json
index 20e808f..a19d067 100644
--- a/pages.json
+++ b/pages.json
@@ -48,6 +48,13 @@
"style": {
"navigationBarTitleText": "服务条款"
}
+ }, {
+ "path": "pages/user/followOfficial",
+ "name": "Official",
+ "auth": true,
+ "style": {
+ "navigationBarTitleText": "关注公众号"
+ }
}, {
"path": "pages/vip/vip",
"name": "vipIndex",
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/coupons/management.vue b/pages/coupons/management.vue
index e31b8e1..ad4fab2 100644
--- a/pages/coupons/management.vue
+++ b/pages/coupons/management.vue
@@ -48,6 +48,9 @@
暂无相关优惠券
+
+
+
@@ -94,14 +97,35 @@
})
})
}
- },
- onNavigationBarButtonTap() {
- this.$Router.push({name: 'couponsAdd'})
}
}
diff --git a/pages/index/index.vue b/pages/index/index.vue
index e3f0ca3..e2fd8d7 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -2,8 +2,8 @@
- {{isAuth ? '能量球' + account.coin : '查看能量球'}}
- {{isAuth ? '能量碎片' + account.crystal : '查看能量碎片'}}
+ {{isAuth ? '能量球' + account.coin : '查看能量球'}}
+ {{isAuth ? '能量碎片' + account.crystal : '查看能量碎片'}}
@@ -55,23 +55,23 @@
@@ -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/instrument/Spread.vue b/pages/instrument/Spread.vue
index 946a64f..3da95e6 100644
--- a/pages/instrument/Spread.vue
+++ b/pages/instrument/Spread.vue
@@ -1,29 +1,27 @@
-
-
-
-
-
-
- {{companyInfo.name}}
- 易货平台
+
+
+
+
+ {{companyInfo.name}}
+
+
+ 邀请你 加入链商星球
-
-
-
-
-
-
- 扫码推广
+
+
+
+
+
+
+ 长按二维码,进行保存
-
-
-
+
@@ -37,6 +35,7 @@
},
created() {
companiesCode().then(res=>{
+ console.log(res.code)
this.companyInfo = res
})
},
@@ -153,75 +152,62 @@
.codeContent {
position: relative;
- width: 100%;
- height: 100vh;
- .codeContent-back {
- width: 100%;
- height: 100%;
- z-index: 1;
+ left: 0;
+ right: 0;
+ top: 0;
+ .codeTop {
position: absolute;
- }
- .codeContent-cont {
left: 5%;
+ top: 240rpx;
width: 90%;
- top: 100px;
- z-index: 2;
- position: absolute;
- }
- .codeContent-tips {
- position: absolute;
- top: 0;
- right: 20rpx;
- width: 200rpx;
- z-index: 2;
- }
- .textContent {
- position: absolute;
- padding: 20rpx 20rpx 0 40rpx;
+ background-color: #FFFFFF;
+ border-radius: 30rpx;
+ padding: 0 50rpx;
box-sizing: border-box;
- width: 70%;
- z-index: 3;
- left: 15%;
- right: 15%;
- top: 140px;
- }
- .company {
- width: 100%;
- .company-logo {
+ box-shadow: 0 0 40rpx rgba(94,59,201,.5);
+ z-index: 2;
+ display: flex;
+ height: 200rpx;
+ .codeTop-cover {
width: 120rpx;
height: 120rpx;
border-radius: 50%;
+ margin: 40rpx 30rpx 0 0;
+ border: 4rpx solid #FFFFFF;
+ box-shadow: 0 5rpx 10rpx rgba(94,59,201,.3);
}
- .company-cont {
- position: absolute;
- width: 100%;
- height: 230rpx;
- left: 0;
- top: 0;
- padding: 20rpx 20rpx 30rpx 210rpx;
- font-size: $title-size;
- .company-name {
+ .codeTop-title {
+ padding-top: 50rpx;
+ .codeTop-name {
font-weight: 600;
- margin: 10rpx 0;
+ font-size: 36rpx;
+ margin-bottom: 10rpx;
}
- .company-tips {
- font-size: 26rpx;
- color: #787878;
+ .codeTop-tips {
+ color: $text-gray-m;
}
}
}
- .code {
+ .codeCode {
+ background-color: #FFFFFF;
+ box-shadow: 0 0 40rpx rgba(27, 0, 111,.4);
+ position: absolute;
+ padding: 400rpx 0 200rpx;
+ left: 10%;
+ top: 160rpx;
+ width: 80%;
+ border-radius: 30rpx;
+ z-index: 1;
text-align: center;
- width: 100%;
- box-sizing: border-box;
- margin-bottom: $margin;
- .code-img {
- width: 90%;
+ .codeImg-code {
+ width: 360rpx;
+ height: 360rpx;
+ margin: 0 0 20rpx;
+ border: 2px solid #f3f3f3;
}
- .code-text {
- color: #787878;
- margin-top: $margin - 10;
- font-size: $title-size;
+ .codeImg-text {
+ font-size: 32rpx;
+ color: $text-color;
}
}
}
diff --git a/pages/instrument/basics.vue b/pages/instrument/basics.vue
index ba494ce..7bcf394 100644
--- a/pages/instrument/basics.vue
+++ b/pages/instrument/basics.vue
@@ -1,5 +1,5 @@
-
+
@@ -8,7 +8,7 @@
-
+
@@ -22,7 +22,7 @@
删除
-
+
@@ -95,8 +95,9 @@
点击查看封面/视频,长按删除封面/视频
-
- 添加展示模块
+
+ 添加模块
+
@@ -116,8 +117,6 @@
},
created() {
Promise.all([basicsInfo('GET', {}), basicsConfig()]).then(res => {
- console.log(res)
-
let info = res[0]
this.logo = info.base.cover
this.description = info.base.description
@@ -306,7 +305,7 @@
},
// 保存基础信息
- onNavigationBarButtonTap(e){
+ onBasicsInfo(){
basicsInfo('PUT', {
cover : this.logo,
description : this.description,
@@ -317,6 +316,7 @@
title : '提示',
content : '基本信息已保存',
showCancel : false,
+ confirmColor: '#8b64fd',
success : modalRes=> {
if(modalRes.confirm){
this.$Router.back()
@@ -335,6 +335,9 @@
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/pages/user/followOfficial.vue b/pages/user/followOfficial.vue
new file mode 100644
index 0000000..f280314
--- /dev/null
+++ b/pages/user/followOfficial.vue
@@ -0,0 +1,20 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/user/index.vue b/pages/user/index.vue
index f6934ab..c729b3e 100644
--- a/pages/user/index.vue
+++ b/pages/user/index.vue
@@ -71,6 +71,9 @@
去开通
+
+ 终身有效
+
@@ -89,7 +92,7 @@
查看会员专属权益
- 全部权益
+ 全部更多
@@ -170,7 +173,7 @@
-
+
企业工具
@@ -291,6 +294,7 @@
userInfo() {
// 读取配置信息
userIndex().then(res=>{
+ console.log(res.identityShow)
this.userData = res
this.helpDoc = res.help_doc
this.userIdentity = res.identityShow
diff --git a/pages/user/partner.vue b/pages/user/partner.vue
index 6b482f4..73d7e5d 100644
--- a/pages/user/partner.vue
+++ b/pages/user/partner.vue
@@ -135,7 +135,8 @@
margin-right: 10rpx;
}
.partner-identity {
- width: 120rpx;
+ width: 84rpx;
+ margin-top: 4rpx;
}
}
}
diff --git a/pages/vip/vip.vue b/pages/vip/vip.vue
index f7ee67b..538c239 100644
--- a/pages/vip/vip.vue
+++ b/pages/vip/vip.vue
@@ -12,28 +12,23 @@
{{item.count.stock > 0 ? '剩余名额:' + item.count.residue : '不限名数'}}
-
-
- {{item.title}}
-
-
-
+
{{item.title}}
-
+
{{item.title}}
-
+
{{item.title}}
-
+
{{item.title}}
@@ -132,7 +127,6 @@
// 当前用户信息
idenInfo(){
identities().then(res => {
- console.log(res.identities)
this.loding = false
this.identitie = res.identities
this.rights = res.identities[this.tabsIndex].rights
@@ -147,6 +141,7 @@
// 切换开通身份
swiperChange(e) {
+ console.log(e.detail.current)
this.tabsIndex = e.detail.current
// 获取当前用户信息
this.idenInfo();
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
diff --git a/static/background/chain-back-02.png b/static/background/chain-back-02.png
index a0f77b9..3c9adda 100644
Binary files a/static/background/chain-back-02.png and b/static/background/chain-back-02.png differ
diff --git a/static/user/follow_back.png b/static/user/follow_back.png
new file mode 100644
index 0000000..671f253
Binary files /dev/null and b/static/user/follow_back.png differ
diff --git a/static/user/index_sign_00.png b/static/user/index_sign_00.png
deleted file mode 100644
index eff9561..0000000
Binary files a/static/user/index_sign_00.png and /dev/null differ
diff --git a/static/user/index_sign_01.png b/static/user/index_sign_01.png
deleted file mode 100644
index 50ab135..0000000
Binary files a/static/user/index_sign_01.png and /dev/null differ
diff --git a/static/user/wallet-code.png b/static/user/wallet-code.png
new file mode 100644
index 0000000..853cffa
Binary files /dev/null and b/static/user/wallet-code.png differ