diff --git a/apis/interfaces/account.js b/apis/interfaces/account.js
index df0db6e..fba83aa 100644
--- a/apis/interfaces/account.js
+++ b/apis/interfaces/account.js
@@ -95,6 +95,29 @@ const paymentpre = () => {
})
}
+// 我的版通账户信息
+const wbtInfo = () => {
+ return request({
+ url: 'wallet/wbt/info'
+ })
+}
+
+// 是否绑定了文版通账户
+const wbtCheck = () => {
+ return request({
+ url: 'wallet/wbt/check'
+ })
+}
+
+// 绑定账户版通账户
+const wbtBind = (data) => {
+ return request({
+ url: 'wallet/wbt/bind',
+ data:data,
+ method:'POST',
+ })
+}
+
export {
dt,
recharge,
@@ -106,6 +129,9 @@ export {
getSms,
submitTransfer,
integral,
- paymentpre
+ paymentpre,
+ wbtInfo,
+ wbtCheck,
+ wbtBind
}
diff --git a/apis/interfaces/news.js b/apis/interfaces/news.js
new file mode 100644
index 0000000..4e49eab
--- /dev/null
+++ b/apis/interfaces/news.js
@@ -0,0 +1,40 @@
+
+/**
+ * Web-zdx
+ * moduleName: 消息中心
+ */
+
+import {
+ request
+} from '../index'
+
+
+
+// 意见反馈通知列表
+const list = (type,data) => {
+ return request({
+ url: 'notifications/'+type+'/list',
+ data:data,
+ })
+}
+// 意见反馈 详情
+const detail = (notification_id) => {
+ return request({
+ url: 'notifications/'+notification_id,
+ })
+}
+
+// 全部已读
+const readAll = (type) => {
+ return request({
+ url: 'notifications/'+type,
+ method:'PUT',
+ })
+}
+
+
+export {
+ list,
+ detail,
+ readAll,
+}
diff --git a/apis/interfaces/user.js b/apis/interfaces/user.js
index 6ed83d7..c5e2a65 100644
--- a/apis/interfaces/user.js
+++ b/apis/interfaces/user.js
@@ -30,8 +30,31 @@ const invitationCode = () => {
})
}
+// 绑定分享关系
+const relationsBind = (invite) => {
+ return request({
+ url: 'user/relations/bind',
+ data: {
+ invite
+ },
+ method: 'POST'
+ })
+}
+
+// 确认绑定关系
+const relationsVerify = (invite) => {
+ return request({
+ url: 'user/relations/verify',
+ data: {
+ invite
+ }
+ })
+}
+
export {
info,
chainSeed,
- invitationCode
+ invitationCode,
+ relationsBind,
+ relationsVerify
}
diff --git a/pages.json b/pages.json
index acd2cc6..deb0c6f 100644
--- a/pages.json
+++ b/pages.json
@@ -1,505 +1,549 @@
{
- "pages": [{
- "path": "pages/auth/auth",
- "name": "Auth",
- "style": {
- "navigationBarTitleText": "登录",
- "navigationStyle": "custom"
- }
- },
- {
- "path": "pages/auth/role",
- "name": "AuthRole",
- "style": {
- "navigationBarTitleText": "角色创建",
- "navigationBarBackgroundColor": "#FFF",
- "app-plus": {
- "titleNView": {
- "buttons": [{
- "text": "退出登录",
- "fontSize": "14",
- "width": "80px",
- "color": "#34CE98"
- }]
- }
- }
- }
- }, {
- "path": "pages/life/life",
- "name": "Life",
- "style": {
- "navigationBarTitleText": "共力人生",
- "navigationStyle": "custom",
- "app-plus": {
- "titleNView": {
- "type": "transparent"
- }
- }
- }
- },
- {
- "path": "pages/store/index",
- "name": "Store",
- "style": {
- "navigationBarTitleText": "DT商城",
- "enablePullDownRefresh": true,
- "app-plus": {
- "titleNView": {
- "backgroundColor": "#fff",
- "buttons": [{
- "float": "right",
- "text": "\ue603",
- "fontSrc": "/static/iconfont.ttf",
- "color": "#000",
- "fontSize": "20px"
- }]
- }
- }
- }
- },
- {
- "path": "pages/user/index",
- "name": "User",
- "style": {
- "navigationBarTitleText": "我的",
- "navigationBarTextStyle": "white",
- "app-plus": {
- "titleNView": {
- "backgroundColor": "#34CE98",
- "type": "transparent"
- }
- }
- }
- },
- {
- "path": "pages/setting/setting",
- "name": "Setting",
- "style": {
- "navigationBarTitleText": "设置中心",
- "navigationBarBackgroundColor": "#34CE98",
- "navigationBarTextStyle": "white"
- }
- },
- {
- "path": "pages/store/goods",
- "name": "StoreGoods",
- "style": {
- "navigationStyle": "custom",
- "navigationBarTitleText": "详情",
- "app-plus": {
- "titleNView": {
- "backgroundColor": "#FFFFFF",
- "type": "transparent"
- }
- }
- }
- },
- {
- "path": "pages/store/buy",
- "name": "StoreBuy",
- "style": {
- "navigationBarTitleText": "确认订单",
- "enablePullDownRefresh": false
- }
- },
- {
- "path": "pages/order/index",
- "name": "Order",
- "style": {
- "navigationBarTitleText": "我的订单",
- "navigationBarBackgroundColor": "#FFFFFF",
- "enablePullDownRefresh": false
- }
- }, {
- "path": "pages/order/logistics",
- "name": "OrderLogistics",
- "style": {
- "navigationBarTitleText": "物流进度",
- "navigationBarBackgroundColor": "#FFFFFF",
- "enablePullDownRefresh": false
- }
- },
- {
- "path": "pages/order/details",
- "name": "OrderDetails",
- "style": {
- "navigationBarTitleText": "订单详情",
- "enablePullDownRefresh": false
- }
- },
- {
- "path": "pages/address/index",
- "name": "Address",
- "style": {
- "navigationBarTitleText": "收货地址"
- }
- },
- {
- "path": "pages/address/edit",
- "name": "AddressEdit",
- "style": {
- "navigationBarTitleText": "编辑",
- "enablePullDownRefresh": false
- }
- },
- {
- "path": "pages/pay/pay",
- "name": "Pay",
- "style": {
- "navigationBarTitleText": "收银台",
- "navigationBarBackgroundColor": "#FFFFFF"
- }
- },
- {
- "path": "pages/store/list",
- "name": "StoreList",
- "style": {
- "navigationBarTitleText": "商品",
- "navigationBarBackgroundColor": "#FFFFFF",
- "enablePullDownRefresh": true
- }
- },
- {
- "path": "pages/store/meals",
- "name": "StoreMeals",
- "style": {
- "navigationBarTitleText": "套餐",
- "navigationBarBackgroundColor": "#FFFFFF",
- "enablePullDownRefresh": true
- }
- },
- {
- "path": "pages/store/search",
- "name": "StoreSearch",
- "style": {
- "navigationBarTitleText": "搜索",
- "navigationBarBackgroundColor": "#FFFFFF"
- }
- },
- {
- "path": "pages/refund/list",
- "name": "OrderRefund",
- "style": {
- "navigationBarTitleText": "退换货",
- "navigationBarBackgroundColor": "#FFFFFF"
- }
- }, {
- "path": "pages/refund/exchange",
- "name": "Exchange",
- "style": {
- "navigationBarTitleText": "换货",
- "navigationBarBackgroundColor": "#FFFFFF"
- }
- },
-
- {
- "path": "pages/refund/detail",
- "name": "OrderRefundDetail",
- "style": {
- "navigationBarTitleText": "退货退款详情",
- "navigationBarBackgroundColor": "#FFFFFF"
- }
- },
- {
- "path": "pages/refund/aftersale",
- "name": "AfterSale",
- "style": {
- "navigationBarTitleText": " 选择售后类型",
- "navigationBarBackgroundColor": "#FFFFFF"
- }
- },
- {
- "path": "pages/refund/refund_history",
- "name": "RefundHistory",
- "style": {
- "navigationBarTitleText": "售后历史",
- "navigationBarBackgroundColor": "#FFFFFF"
- }
- },
- {
- "path": "pages/refund/deliver_form",
- "name": "DeliverForm",
- "style": {
- "navigationBarTitleText": "填写物流信息",
- "navigationBarBackgroundColor": "#FFFFFF"
- }
- },
- {
- "path": "pages/refund/refund_or_exchange_apply",
- "name": "RefundOrExchangeApply",
- "style": {
- "navigationBarTitleText": "退换货申请",
- "navigationBarBackgroundColor": "#FFFFFF"
- }
- },
- {
- "path": "pages/refund/refund_money",
- "name": "RefundMoney",
- "style": {
- "navigationBarTitleText": "申请退款",
- "navigationBarBackgroundColor": "#FFFFFF"
- }
- },
- {
- "path": "pages/account/integral",
- "name": "AccountIntegral",
- "style": {
- "navigationBarTitleText": "共力分",
- "navigationBarBackgroundColor": "#34CE98",
- "navigationBarTextStyle": "white"
- }
- }, {
- "path": "pages/account/dt",
- "name": "AccountDt",
- "style": {
- "navigationBarTitleText": "DT积分",
- "navigationBarBackgroundColor": "#34CE98",
- "backgroundColorTop": "#34CE98",
- "navigationBarTextStyle": "white",
- "app-plus": {
- "titleNView": {
- "buttons": [{
- "text": "收款",
- "width": "60",
- "fontSize": "14"
- }]
- }
- }
- }
- }, {
- "path": "pages/account/recharge",
- "name": "AccountRecharge",
- "style": {
- "navigationBarTitleText": "充值",
- "navigationBarBackgroundColor": "#FFFFFF",
- "app-plus": {
- "titleNView": {
- "buttons": [{
- "text": "充值记录",
- "width": "80",
- "fontSize": "14"
- }]
- }
- }
- }
- }, {
- "path": "pages/vip/vip",
- "name": "Vip",
- "style": {
- "navigationBarTitleText": "共力会员",
- "navigationBarBackgroundColor": "#242430",
- "navigationBarTextStyle": "white",
- "backgroundColorTop": "#242430"
- }
- }, {
- "path": "pages/vip/agreement",
- "style": {
- "navigationBarTitleText": "共力会员协议",
- "navigationBarBackgroundColor": "#FFFFFF"
- }
- }, {
- "path": "pages/team/index",
- "name": "Team",
- "style": {
- "navigationBarTitleText": "共力团队"
- }
- },
- {
- "path": "pages/store/shop/shopDetail",
- "name": "ShopDetail",
- "style": {
- "navigationStyle": "custom"
- }
- },
- {
- "path": "pages/store/shop/shopList",
- "name": "ShopList",
- "style": {
- "navigationBarTitleText": "店铺",
- "navigationBarBackgroundColor": "#FFFFFF",
- "enablePullDownRefresh": true
- }
- }, {
- "path": "pages/account/log",
- "name": "AccountLog",
- "style": {
- "navigationBarTitleText": "充值记录",
- "navigationBarBackgroundColor": "#FFFFFF"
- }
- }, {
- "path": "pages/account/transfer",
- "name": "AccountTransfer",
- "style": {
- "navigationBarTitleText": "转账",
- "navigationBarBackgroundColor": "#F3F6FB"
- }
- }, {
- "path": "pages/account/resetPassword",
- "name": "AccountResetPassword",
- "style": {
- "navigationBarTitleText": "钱包密码",
- "navigationBarBackgroundColor": "#F3F6FB"
- }
- }, {
- "path": "pages/account/results",
- "name": "Accountresults",
- "style": {
- "navigationBarTitleText": "转账结果",
- "navigationBarBackgroundColor": "#FFFFFF"
- }
- }, {
- "path": "pages/account/code",
- "name": "AccountCode",
- "style": {
- "navigationBarTitleText": "收款码",
- "navigationBarBackgroundColor": "#34CE98",
- "backgroundColorTop": "#34CE98",
- "navigationBarTextStyle": "white"
- }
- }, {
- "path": "pages/invitation/invitation",
- "name": "Invitation",
- "style": {
- "navigationStyle": "custom",
- "disableScroll": true
- }
- }, {
- "path": "pages/life/capacity",
- "name": "Capacity",
- "style": {
- "navigationBarTitleText": "-",
- "app-plus": {
- "titleNView": {
- "buttons": [{
- "text": "重置签到",
- "fontSize": "14",
- "width": "80px",
- "color": "#34CE98"
- }]
- }
+ "pages": [{
+ "path": "pages/auth/auth",
+ "name": "Auth",
+ "style": {
+ "navigationBarTitleText": "登录",
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ "path": "pages/auth/role",
+ "name": "AuthRole",
+ "style": {
+ "navigationBarTitleText": "角色创建",
+ "navigationBarBackgroundColor": "#FFF",
+ "app-plus": {
+ "titleNView": {
+ "buttons": [{
+ "text": "退出登录",
+ "fontSize": "14",
+ "width": "80px",
+ "color": "#34CE98"
+ }]
+ }
}
- }
- }, {
- "path": "pages/feedback/feedback",
- "name": "Feedback",
- "style": {
- "navigationBarTitleText": "意见反馈",
- "enablePullDownRefresh": false,
- "navigationBarBackgroundColor": "#FFFFFF",
- "app-plus": {
- "titleNView": {
- "type": "default",
- "buttons": [{
- "float": "right",
- "text": "微信客服",
- "width": "80px",
- "fontSize": "14px",
- "color": "#34CE98"
- }]
- }
- }
- }
- }, {
- "path": "pages/vip/growth",
- "style": {
- "navigationBarTitleText": "成长体系",
- "navigationBarBackgroundColor": "#FFFFFF",
- "enablePullDownRefresh": false
- }
- }, {
- "path": "pages/supplier/supplier",
- "name": "Supplier",
- "style": {
- "navigationBarTitleText": "供应商入驻",
- "enablePullDownRefresh": false,
- "backgroundColorTop": "#201f48",
- "navigationBarBackgroundColor": "#201f48",
- "navigationBarTextStyle": "white"
- }
- }, {
- "path": "pages/board/board",
- "name": "DataBoard",
- "style": {
- "navigationBarTitleText": "平台数据看板",
- "enablePullDownRefresh": true,
- "navigationBarBackgroundColor": "#FFFFFF"
- }
- },
+ }
+ }, {
+ "path": "pages/life/life",
+ "name": "Life",
+ "style": {
+ "navigationBarTitleText": "共力人生",
+ "navigationStyle": "custom",
+ "app-plus": {
+ "titleNView": {
+ "type": "transparent"
+ }
+ }
+ }
+ },
+ {
+ "path": "pages/store/index",
+ "name": "Store",
+ "style": {
+ "navigationBarTitleText": "DT商城",
+ "enablePullDownRefresh": true,
+ "app-plus": {
+ "titleNView": {
+ "backgroundColor": "#fff",
+ "buttons": [{
+ "float": "right",
+ "text": "\ue603",
+ "fontSrc": "/static/iconfont.ttf",
+ "color": "#000",
+ "fontSize": "20px"
+ }]
+ }
+ }
+ }
+ },
+ {
+ "path": "pages/user/index",
+ "name": "User",
+ "style": {
+ "navigationBarTitleText": "我的",
+ "navigationBarTextStyle": "white",
+ "app-plus": {
+ "titleNView": {
+ "backgroundColor": "#34CE98",
+ "type": "transparent"
+ }
+ }
+ }
+ },
+ {
+ "path": "pages/setting/setting",
+ "name": "Setting",
+ "style": {
+ "navigationBarTitleText": "设置中心",
+ "navigationBarBackgroundColor": "#34CE98",
+ "navigationBarTextStyle": "white"
+ }
+ },
+ {
+ "path": "pages/store/goods",
+ "name": "StoreGoods",
+ "style": {
+ "navigationStyle": "custom",
+ "navigationBarTitleText": "详情",
+ "app-plus": {
+ "titleNView": {
+ "backgroundColor": "#FFFFFF",
+ "type": "transparent"
+ }
+ }
+ }
+ },
+ {
+ "path": "pages/store/buy",
+ "name": "StoreBuy",
+ "style": {
+ "navigationBarTitleText": "确认订单",
+ "enablePullDownRefresh": false
+ }
+ },
+ {
+ "path": "pages/order/index",
+ "name": "Order",
+ "style": {
+ "navigationBarTitleText": "我的订单",
+ "navigationBarBackgroundColor": "#FFFFFF",
+ "enablePullDownRefresh": false
+ }
+ }, {
+ "path": "pages/order/logistics",
+ "name": "OrderLogistics",
+ "style": {
+ "navigationBarTitleText": "物流进度",
+ "navigationBarBackgroundColor": "#FFFFFF",
+ "enablePullDownRefresh": false
+ }
+ },
+ {
+ "path": "pages/order/details",
+ "name": "OrderDetails",
+ "style": {
+ "navigationBarTitleText": "订单详情",
+ "enablePullDownRefresh": false
+ }
+ },
+ {
+ "path": "pages/address/index",
+ "name": "Address",
+ "style": {
+ "navigationBarTitleText": "收货地址"
+ }
+ },
+ {
+ "path": "pages/address/edit",
+ "name": "AddressEdit",
+ "style": {
+ "navigationBarTitleText": "编辑",
+ "enablePullDownRefresh": false
+ }
+ },
+ {
+ "path": "pages/pay/pay",
+ "name": "Pay",
+ "style": {
+ "navigationBarTitleText": "收银台",
+ "navigationBarBackgroundColor": "#FFFFFF"
+ }
+ },
+ {
+ "path": "pages/store/list",
+ "name": "StoreList",
+ "style": {
+ "navigationBarTitleText": "商品",
+ "navigationBarBackgroundColor": "#FFFFFF",
+ "enablePullDownRefresh": true
+ }
+ },
+ {
+ "path": "pages/store/meals",
+ "name": "StoreMeals",
+ "style": {
+ "navigationBarTitleText": "套餐",
+ "navigationBarBackgroundColor": "#FFFFFF",
+ "enablePullDownRefresh": true
+ }
+ },
+ {
+ "path": "pages/store/search",
+ "name": "StoreSearch",
+ "style": {
+ "navigationBarTitleText": "搜索",
+ "navigationBarBackgroundColor": "#FFFFFF"
+ }
+ },
+ {
+ "path": "pages/refund/list",
+ "name": "OrderRefund",
+ "style": {
+ "navigationBarTitleText": "退换货",
+ "navigationBarBackgroundColor": "#FFFFFF"
+ }
+ }, {
+ "path": "pages/refund/exchange",
+ "name": "Exchange",
+ "style": {
+ "navigationBarTitleText": "换货",
+ "navigationBarBackgroundColor": "#FFFFFF"
+ }
+ },
+
+ {
+ "path": "pages/refund/detail",
+ "name": "OrderRefundDetail",
+ "style": {
+ "navigationBarTitleText": "退货退款详情",
+ "navigationBarBackgroundColor": "#FFFFFF"
+ }
+ },
+ {
+ "path": "pages/refund/aftersale",
+ "name": "AfterSale",
+ "style": {
+ "navigationBarTitleText": " 选择售后类型",
+ "navigationBarBackgroundColor": "#FFFFFF"
+ }
+ },
+ {
+ "path": "pages/refund/refund_history",
+ "name": "RefundHistory",
+ "style": {
+ "navigationBarTitleText": "售后历史",
+ "navigationBarBackgroundColor": "#FFFFFF"
+ }
+ },
+ {
+ "path": "pages/refund/deliver_form",
+ "name": "DeliverForm",
+ "style": {
+ "navigationBarTitleText": "填写物流信息",
+ "navigationBarBackgroundColor": "#FFFFFF"
+ }
+ },
+ {
+ "path": "pages/refund/refund_or_exchange_apply",
+ "name": "RefundOrExchangeApply",
+ "style": {
+ "navigationBarTitleText": "退换货申请",
+ "navigationBarBackgroundColor": "#FFFFFF"
+ }
+ },
+ {
+ "path": "pages/refund/refund_money",
+ "name": "RefundMoney",
+ "style": {
+ "navigationBarTitleText": "申请退款",
+ "navigationBarBackgroundColor": "#FFFFFF"
+ }
+ },
{
- "path" : "pages/chat/index",
- "style" : {
- "navigationBarTitleText" : "我的圈子",
- "enablePullDownRefresh" : true,
- "app-plus" : {
- "bounce" : "none",
- "titleNView" : {
- "type" : "transparent",
- "buttons" : [
- {
- "background" : "rgba(255,255,255,0.2)",
- "color" : "#696969",
- "type" : "none",
- "fontSrc" : "/static/fonts/iconfont1.ttf",
- "text" : "\ue608" //小相机
- }
- ]
- }
- }
+ "path": "pages/account/integral",
+ "name": "AccountIntegral",
+ "style": {
+ "navigationBarTitleText": "共力分",
+ "navigationBarBackgroundColor": "#34CE98",
+ "navigationBarTextStyle": "white"
}
- },
- {
- "path" : "pages/chat/publish",
- "style" : {
- "navigationBarTitleText" : "发布"
- }
- }
- ,{
- "path" : "pages/rank/index",
- "style" :
- {
- "navigationBarTitleText": "会员推荐",
- "enablePullDownRefresh": false,
- "navigationBarTextStyle":"white",
- "navigationBarBackgroundColor":"#34CE98"
- }
-
+ },{
+ "path": "pages/account/wbtBind",
+ "name": "WbtBind",
+ "style": {
+ "navigationBarTitleText": "绑定文版通账户",
+ "navigationBarBackgroundColor": "#34CE98",
+ "navigationBarTextStyle": "white"
+ }
+ }, {
+ "path": "pages/account/dt",
+ "name": "AccountDt",
+ "style": {
+ "navigationBarTitleText": "DT积分",
+ "navigationBarBackgroundColor": "#34CE98",
+ "backgroundColorTop": "#34CE98",
+ "navigationBarTextStyle": "white",
+ "app-plus": {
+ "titleNView": {
+ "buttons": [{
+ "text": "收款",
+ "width": "60",
+ "fontSize": "14"
+ }]
+ }
+ }
+ }
+ }, {
+ "path": "pages/account/recharge",
+ "name": "AccountRecharge",
+ "style": {
+ "navigationBarTitleText": "充值",
+ "navigationBarBackgroundColor": "#FFFFFF",
+ "app-plus": {
+ "titleNView": {
+ "buttons": [{
+ "text": "充值记录",
+ "width": "80",
+ "fontSize": "14"
+ }]
+ }
+ }
+ }
+ }, {
+ "path": "pages/vip/vip",
+ "name": "Vip",
+ "style": {
+ "navigationBarTitleText": "共力会员",
+ "navigationBarBackgroundColor": "#242430",
+ "navigationBarTextStyle": "white",
+ "backgroundColorTop": "#242430"
+ }
+ }, {
+ "path": "pages/vip/agreement",
+ "style": {
+ "navigationBarTitleText": "共力会员协议",
+ "navigationBarBackgroundColor": "#FFFFFF"
+ }
+ }, {
+ "path": "pages/team/index",
+ "name": "Team",
+ "style": {
+ "navigationBarTitleText": "共力团队"
+ }
+ },
+ {
+ "path": "pages/store/shop/shopDetail",
+ "name": "ShopDetail",
+ "style": {
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ "path": "pages/store/shop/shopList",
+ "name": "ShopList",
+ "style": {
+ "navigationBarTitleText": "店铺",
+ "navigationBarBackgroundColor": "#FFFFFF",
+ "enablePullDownRefresh": true
+ }
+ }, {
+ "path": "pages/account/log",
+ "name": "AccountLog",
+ "style": {
+ "navigationBarTitleText": "充值记录",
+ "navigationBarBackgroundColor": "#FFFFFF"
+ }
+ }, {
+ "path": "pages/account/transfer",
+ "name": "AccountTransfer",
+ "style": {
+ "navigationBarTitleText": "转账",
+ "navigationBarBackgroundColor": "#F3F6FB"
+ }
+ }, {
+ "path": "pages/account/resetPassword",
+ "name": "AccountResetPassword",
+ "style": {
+ "navigationBarTitleText": "钱包密码",
+ "navigationBarBackgroundColor": "#F3F6FB"
+ }
+ }, {
+ "path": "pages/account/results",
+ "name": "Accountresults",
+ "style": {
+ "navigationBarTitleText": "转账结果",
+ "navigationBarBackgroundColor": "#FFFFFF"
+ }
+ }, {
+ "path": "pages/account/code",
+ "name": "AccountCode",
+ "style": {
+ "navigationBarTitleText": "收款码",
+ "navigationBarBackgroundColor": "#34CE98",
+ "backgroundColorTop": "#34CE98",
+ "navigationBarTextStyle": "white"
+ }
+ }, {
+ "path": "pages/invitation/invitation",
+ "name": "Invitation",
+ "style": {
+ "navigationStyle": "custom",
+ "disableScroll": true
+ }
+ }, {
+ "path": "pages/life/capacity",
+ "name": "Capacity",
+ "style": {
+ "navigationBarTitleText": "-",
+ "app-plus": {
+ "titleNView": {
+ "buttons": [{
+ "text": "重置签到",
+ "fontSize": "14",
+ "width": "80px",
+ "color": "#34CE98"
+ }]
+ }
+ }
+ }
+ }, {
+ "path": "pages/feedback/feedback",
+ "name": "Feedback",
+ "style": {
+ "navigationBarTitleText": "意见反馈",
+ "enablePullDownRefresh": false,
+ "navigationBarBackgroundColor": "#FFFFFF",
+ "app-plus": {
+ "titleNView": {
+ "type": "default",
+ "buttons": [{
+ "float": "right",
+ "text": "微信客服",
+ "width": "80px",
+ "fontSize": "14px",
+ "color": "#34CE98"
+ }]
+ }
+ }
+ }
+ }, {
+ "path": "pages/vip/growth",
+ "style": {
+ "navigationBarTitleText": "成长体系",
+ "navigationBarBackgroundColor": "#FFFFFF",
+ "enablePullDownRefresh": false
+ }
+ }, {
+ "path": "pages/supplier/supplier",
+ "name": "Supplier",
+ "style": {
+ "navigationBarTitleText": "供应商入驻",
+ "enablePullDownRefresh": false,
+ "backgroundColorTop": "#201f48",
+ "navigationBarBackgroundColor": "#201f48",
+ "navigationBarTextStyle": "white"
+ }
+ }, {
+ "path": "pages/board/board",
+ "name": "DataBoard",
+ "style": {
+ "navigationBarTitleText": "平台数据看板",
+ "enablePullDownRefresh": true,
+ "navigationBarBackgroundColor": "#FFFFFF"
+ }
+ },
+ {
+ "path": "pages/chat/index",
+ "style": {
+ "navigationBarTitleText": "我的圈子",
+ "enablePullDownRefresh": true,
+ "app-plus": {
+ "bounce": "none",
+ "titleNView": {
+ "type": "transparent",
+ "buttons": [{
+ "background": "rgba(255,255,255,0.2)",
+ "color": "#696969",
+ "type": "none",
+ "fontSrc": "/static/fonts/iconfont1.ttf",
+ "text": "\ue608" //小相机
+ }]
+ }
+ }
+ }
+ },
+ {
+ "path": "pages/chat/publish",
+ "style": {
+ "navigationBarTitleText": "发布"
+ }
+ }, {
+ "path": "pages/rank/index",
+ "style": {
+ "navigationBarTitleText": "会员推荐",
+ "enablePullDownRefresh": false,
+ "navigationBarTextStyle": "white",
+ "navigationBarBackgroundColor": "#34CE98"
+ }
+
+ }, {
+ "path": "pages/news/index",
+ "name": "newsIndex",
+ "style": {
+ "navigationBarTitleText": "消息中心",
+ "enablePullDownRefresh": false,
+ "app-plus": {
+ "titleNView": {
+ "type": "default",
+ "buttons": [{
+ "float": "right",
+ "text": " 全部已读",
+ "width": "80px",
+ "fontSize": "14px",
+ "color": "#34CE98"
+ }]
+ }
+ }
+ }
+ }, {
+ "path": "pages/news/detail",
+ "name": "newsDetail",
+ "style": {
+ "navigationBarTitleText": "反馈详情",
+ "enablePullDownRefresh": false,
+ "app-plus": {
+ "titleNView": {
+ "type": "default",
+ "buttons": [{
+ "float": "right",
+ "text": "微信客服",
+ "width": "80px",
+ "fontSize": "14px",
+ "color": "#34CE98"
+ }]
+ }
+ }
+ }
+
}
],
- "tabBar": {
- "borderStyle": "white",
- "selectedColor": "#34CE98",
- "list": [{
- "iconPath": "static/tabBar/tabBar_00.png",
- "selectedIconPath": "static/tabBar/tabBar_show_00.png",
- "pagePath": "pages/life/life",
- "text": "共力人生"
- }, {
- "iconPath": "static/tabBar/tabBar_02.png",
- "selectedIconPath": "static/tabBar/tabBar_show_02.png",
- "pagePath": "pages/store/index",
- "text": "DT商城"
- },
- {
- "iconPath": "static/tabBar/tabBar_05.png",
- "selectedIconPath": "static/tabBar/tabBar_show_05.png",
- "pagePath": "pages/rank/index",
- "text": "周排行榜"
- },
- {
- "iconPath": "static/tabBar/tabBar_03.png",
- "selectedIconPath": "static/tabBar/tabBar_show_03.png",
- "pagePath": "pages/user/index",
- "text": "我的"
- }]
- },
- "globalStyle": {
- "navigationBarTextStyle": "black",
- "navigationBarTitleText": "ZH健康",
- "navigationBarBackgroundColor": "#F3F6FB",
- "backgroundColorTop": "#F3F6FB",
- "backgroundColorBottom": "#F3F6FB"
- },
- "easycom": {
- "^u-(.*)": "uview-ui/components/u-$1/u-$1.vue"
- }
+ "tabBar": {
+ "borderStyle": "white",
+ "selectedColor": "#34CE98",
+ "list": [{
+ "iconPath": "static/tabBar/tabBar_00.png",
+ "selectedIconPath": "static/tabBar/tabBar_show_00.png",
+ "pagePath": "pages/life/life",
+ "text": "共力人生"
+ }, {
+ "iconPath": "static/tabBar/tabBar_02.png",
+ "selectedIconPath": "static/tabBar/tabBar_show_02.png",
+ "pagePath": "pages/store/index",
+ "text": "DT商城"
+ },
+ {
+ "iconPath": "static/tabBar/tabBar_05.png",
+ "selectedIconPath": "static/tabBar/tabBar_show_05.png",
+ "pagePath": "pages/rank/index",
+ "text": "周排行榜"
+ },
+ {
+ "iconPath": "static/tabBar/tabBar_03.png",
+ "selectedIconPath": "static/tabBar/tabBar_show_03.png",
+ "pagePath": "pages/user/index",
+ "text": "我的"
+ }
+ ]
+ },
+ "globalStyle": {
+ "navigationBarTextStyle": "black",
+ "navigationBarTitleText": "ZH健康",
+ "navigationBarBackgroundColor": "#F3F6FB",
+ "backgroundColorTop": "#F3F6FB",
+ "backgroundColorBottom": "#F3F6FB"
+ },
+ "easycom": {
+ "^u-(.*)": "uview-ui/components/u-$1/u-$1.vue"
+ }
}
diff --git a/pages/account/dt.vue b/pages/account/dt.vue
index bc05c01..4cb66f2 100644
--- a/pages/account/dt.vue
+++ b/pages/account/dt.vue
@@ -13,17 +13,17 @@
DT积分冻结
- {{frozenScore}}
+ {{frozenScore || '0.0000'}}
-
+
账户记录
-
- {{item.remark}}
-
+
+ {{item.remark}}
+
{{item.created_at}}
@@ -38,12 +38,25 @@
+
+
+
+
+
+ 文版通充值
+
+
+
+ 微信充值
+
+
+
+
+
diff --git a/pages/news/detail.vue b/pages/news/detail.vue
new file mode 100644
index 0000000..1418cf1
--- /dev/null
+++ b/pages/news/detail.vue
@@ -0,0 +1,316 @@
+
+
+
+
+
+ 官方客服回复
+
+ {{notificationInfo.detail.created_at}}
+
+
+ A : {{notificationInfo.content}}
+
+
+
+
+
+ 我的意见与建议
+ {{notificationInfo.created_at}}
+
+
+ 页面闪退
+ 操作体验
+ 账号问题
+ 功能异常
+ 产品建议
+ 其他问题
+
+
+
+
+
+ 上传应用截图({{notificationImg.length}}/8)
+ 上传出现问题的应用图片；
+
+
+
+
+
+
+
+
+ 问题说明
+ 请对您所遇到的问题进行尽可能详细的描述
+
+
+ {{description.length}}/200
+
+
+
+ 联系方式
+
+
+
+
+
+
+
+
+
+
+ 扫描企业微信二维码，添加微信客服
+
+
+
+
+
+
+
+
+
diff --git a/pages/news/index.vue b/pages/news/index.vue
new file mode 100644
index 0000000..a8519ca
--- /dev/null
+++ b/pages/news/index.vue
@@ -0,0 +1,174 @@
+
+
+
+
+
+
+
+
+
+ 系统反馈
+ 官方
+
+ {{item.created_at}}
+
+ 快捷反馈:{{item.content}}
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/order/index.vue b/pages/order/index.vue
index 6b84f10..0b41c87 100644
--- a/pages/order/index.vue
+++ b/pages/order/index.vue
@@ -100,7 +100,7 @@
orders({
state: this.tabs[this.index].type,
page: this.page
- }).then(res => {
+ }).then(res => {
if (res.page.current === 1) {
this.array = []
}
@@ -114,7 +114,8 @@
stateText: val.state,
cans: val.can,
shop: val.shop,
- goods_id:val.items[0].sku.goods_id
+ goods_id:val.items[0].sku.goods_id,
+ unit:val.items[0].sku.unit
}
})
this.array = this.array.concat(ordersArr)
@@ -149,10 +150,8 @@
success: (res) => {
if (res.confirm) {
cancel(orderNo).then(res => {
- console.log(res)
let orderIndex = this.array.findIndex(val => val.no === e
.order.no)
- console.log(this.index, typeof this.index, orderIndex);
if (this.index == '0') {
this.array[orderIndex].stateText = "已取消";
this.array[orderIndex].cans = {
@@ -208,10 +207,8 @@
success: (res) => {
if (res.confirm) {
sign(orderNo).then(res => {
- console.log(res)
let orderIndex = this.array.findIndex(val => val.no === e
.order.no)
- console.log(this.index, typeof this.index, orderIndex);
if (this.index == '0') {
this.array[orderIndex].stateText = "已签收";
this.array[orderIndex].cans = {
diff --git a/pages/refund/aftersale.vue b/pages/refund/aftersale.vue
index e6692a8..28f58c0 100644
--- a/pages/refund/aftersale.vue
+++ b/pages/refund/aftersale.vue
@@ -8,7 +8,8 @@
{{goodsInfo.goods_name}}
- {{goodsInfo.shop.name}}
+ {{goodsInfo.shop.name}}
+ {{goodsInfo.unit}}
{{goodsInfo.price || '0'}}
DT积分
@@ -22,7 +23,7 @@
退货
@@ -38,7 +39,7 @@
换货
@@ -182,6 +183,11 @@
font-size: 26rpx;
padding-top: 6rpx;
// @extend .ellipsis-1;
+ }
+ &>.unit{
+ color:#999;
+ font-size: 26rpx;
+ padding-top: 10rpx;
}
&>.price {
@@ -248,8 +254,8 @@
font-weight: bold;
.icon {
- width: 60rpx;
- height: 60rpx;
+ width: 46rpx;
+ height: 46rpx;
border-radius: 50%;
margin-right: $margin - 10;
}
diff --git a/pages/refund/detail.vue b/pages/refund/detail.vue
index 70844ae..15e94e9 100644
--- a/pages/refund/detail.vue
+++ b/pages/refund/detail.vue
@@ -16,7 +16,10 @@
{{goodsInfo.goods_name}}
- {{goodsInfo.shop.name}}
+ {{goodsInfo.shop.name}}
+
+ {{goodsInfo.unit}}
+
共 {{goodsInfo.qty}} 件
@@ -318,6 +321,11 @@
font-size: 26rpx;
padding-top: 6rpx;
// @extend .ellipsis-1;
+ }
+ .unit{
+ color:#999;
+ font-size: 26rpx;
+ padding-top: 10rpx;
}
&>.price {
diff --git a/pages/refund/list.vue b/pages/refund/list.vue
index 3fa89ec..f973495 100644
--- a/pages/refund/list.vue
+++ b/pages/refund/list.vue
@@ -23,7 +23,13 @@
- {{item.items[0].goods_name}}
+
+ {{item.items[0].goods_name}}
+
+ {{item.items[0].sku.unit}}
+
+
+
{{item.items[0].price}}DT积分
共{{item.items[0].qty}}件
@@ -85,7 +91,7 @@
getOrder() {
refunds({
page: this.page
- }).then(res => {
+ }).then(res => {
if (res.page.current === 1) {
this.array = []
}
@@ -234,6 +240,11 @@
padding-left: $margin;
font-size: 28rpx;
line-height: 40rpx;
+ }
+ .unit{
+ color:#999;
+ font-size: 26rpx;
+ padding-top: 10rpx;
}
.order--count {
diff --git a/pages/refund/refund_history.vue b/pages/refund/refund_history.vue
index 2e847cf..5ad6411 100644
--- a/pages/refund/refund_history.vue
+++ b/pages/refund/refund_history.vue
@@ -5,21 +5,24 @@
{{goodsInfo.goods_name}}
{{goodsInfo.shop.name}}
+
+ {{goodsInfo.unit}}
+
共 {{goodsInfo.qty}} 件
-
-
-
-
- 申请金额{{refund_total || '0.00'}} DT
-
-
- 合计退款{{refund_total|| '0.00'}} DT
-
-
-
+
+
+
+
+ 申请金额{{refund_total || '0.00'}} DT
+
+
+ 合计退款{{refund_total|| '0.00'}} DT
+
+
+
@@ -39,14 +42,14 @@
data() {
return {
logs: [],
- goodsInfo: {},
- refund_total:''
+ goodsInfo: {},
+ refund_total: ''
}
},
onLoad() {
refundsLogs(this.$Route.query.id).then(res => {
- this.logs = res.logs
- this.goodsInfo = res.refund.items[0]
+ this.logs = res.logs
+ this.goodsInfo = res.refund.items[0]
this.refund_total = res.refund.refund_total
}).catch(err => {
uni.showToast({
@@ -76,8 +79,8 @@
$radius: 10rpx;
.RefundHistory {
- padding: $padding;
- min-height: 100vh;
+ padding: $padding;
+ min-height: 100vh;
background-color: #f9f9f9;
}
@@ -124,8 +127,8 @@
border-radius: $radius $radius 0 0;
z-index: 9;
padding: $margin;
- overflow: hidden;
- margin-top: 30rpx;
+ overflow: hidden;
+ margin-top: 30rpx;
min-height: 50vh;
.item {
@@ -214,6 +217,12 @@
// @extend .ellipsis-1;
}
+ .unit {
+ color: #999;
+ font-size: 26rpx;
+ padding-top: 10rpx;
+ }
+
&>.price {
padding-top: 10rpx;
display: flex;
@@ -250,31 +259,31 @@
}
}
- }
-
- .total {
- background-color: #fff;
- padding: 0 $padding $padding $padding;
- border-top: solid 2rpx #f9f9f9;
- font-size: 28rpx;
- color: #333;
-
- .total-item {
- flex: 1;
- display: flex;
- flex-direction: row;
- align-items: center;
- justify-content: space-between;
- box-sizing: border-box;
- padding-top: $padding;
-
- text {
- font-size: 32rpx;
- }
- }
-
- .grey {
- color: #666;
- }
+ }
+
+ .total {
+ background-color: #fff;
+ padding: 0 $padding $padding $padding;
+ border-top: solid 2rpx #f9f9f9;
+ font-size: 28rpx;
+ color: #333;
+
+ .total-item {
+ flex: 1;
+ display: flex;
+ flex-direction: row;
+ align-items: center;
+ justify-content: space-between;
+ box-sizing: border-box;
+ padding-top: $padding;
+
+ text {
+ font-size: 32rpx;
+ }
+ }
+
+ .grey {
+ color: #666;
+ }
}
diff --git a/pages/refund/refund_money.vue b/pages/refund/refund_money.vue
index 321dd9b..6979d11 100644
--- a/pages/refund/refund_money.vue
+++ b/pages/refund/refund_money.vue
@@ -10,6 +10,9 @@
{{goodsInfo.goods_name}}
{{goodsInfo.shop.name}}
+
+ {{goodsInfo.unit}}
+
{{goodsInfo.price || '0'}}
DT积分
@@ -22,7 +25,7 @@
申请类型
- 我要退款（无需退货）
+ 我要退款（无需退货）
申请原因
@@ -82,8 +85,8 @@
params = {
title: this.ttext,
remark: this.remark,
- pictures: [],
- type:1,
+ pictures: [],
+ type: 1,
};
if (this.ttext === '请选择申请原因') {
uni.showToast({
@@ -179,6 +182,7 @@
}
}
}
+
.goods-item {
background-color: #Fff;
width: 100%;
@@ -219,6 +223,12 @@
// @extend .ellipsis-1;
}
+ &>.unit {
+ color: #999;
+ font-size: 26rpx;
+ padding-top: 10rpx;
+ }
+
&>.price {
padding-top: 10rpx;
display: flex;
diff --git a/pages/refund/refund_or_exchange_apply.vue b/pages/refund/refund_or_exchange_apply.vue
index 374d176..8a2f1dd 100644
--- a/pages/refund/refund_or_exchange_apply.vue
+++ b/pages/refund/refund_or_exchange_apply.vue
@@ -8,7 +8,10 @@
{{goodsInfo.goods_name}}
- {{goodsInfo.shop.name}}
+ {{goodsInfo.shop.name}}
+
+ {{goodsInfo.unit}}
+
{{goodsInfo.price || '0'}}
DT积分
@@ -242,6 +245,11 @@
font-size: 26rpx;
padding-top: 6rpx;
// @extend .ellipsis-1;
+ }
+ &>.unit{
+ color:#999;
+ font-size: 26rpx;
+ padding-top: 10rpx;
}
&>.price {
diff --git a/pages/store/buy.vue b/pages/store/buy.vue
index d77bf25..633a308 100644
--- a/pages/store/buy.vue
+++ b/pages/store/buy.vue
@@ -63,7 +63,7 @@
export default {
data() {
return {
- qty : 1,
+ qty : 0,
goodsInfo : [],
total : 0,
freight : 0,
@@ -74,6 +74,7 @@
},
onShow(){
if(JSON.stringify(this.$store.getters.getAddress) !== '{}') this.address = this.$store.getters.getAddress
+ this.qty= this.$Route.query.qty;
},
mounted() {
this.getBuy()
diff --git a/pages/store/goods.vue b/pages/store/goods.vue
index 7e97702..9b9e01b 100644
--- a/pages/store/goods.vue
+++ b/pages/store/goods.vue
@@ -1,322 +1,614 @@
-
-
-
-
-
-
-
-
-
-
-
-
- {{current}}/{{goods.pictures.length}}
-
-
-
-
- {{goods.name}}
- {{goods.description}}
-
-
- {{goods.price.show}}DT积分
-
- 库存量{{goods.skus[0].stock}}
-
-
- 规格 : {{goods.skus[0].unit_text}}
-
-
-
-
-
-
-
- {{goods.shop.name}}
- 店铺评分:5.0 服务态度:5.0
-
-
- 全部商品 {{goods.shop.goods_count || 0}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/pages/user/index.vue b/pages/user/index.vue
index 2bb8f12..c193d29 100644
--- a/pages/user/index.vue
+++ b/pages/user/index.vue
@@ -1,12 +1,15 @@
-
-
-
+
+
+
+
+
+
+
-
{{ userInfo.nickname }}
@@ -91,6 +94,17 @@
导出助记词
+
+
+
+ 文版通账号
+
+
+
+
+
+ {{hasPassword ? '修改' : '设置'}}支付密码
+
@@ -116,12 +130,19 @@
供应商入驻
-
-
- {{hasPassword ? '修改' : '设置'}}支付密码
-
-
-
+
+
+
+
+ 绑定分享关系
+
+
+
+
+ {{share.nickname}}
+
+
+
@@ -149,7 +170,7 @@
The total force ecological
-
+
导出助记词
@@ -160,6 +181,18 @@
+
+
+
+
+ 文版通账号
+ 请务必抄下文版通账号并存在安全的地方，若文版通账号丢失，重装或换设备登录时将无法查看历史消息！若文版通账号被他人获取，将可能获取你的信息！
+ 账号：{{wbtAccount}}
+
+
+
+
@@ -169,21 +202,46 @@
placeholder="输入支付密码" />
-
+
+
+
+
+
+ 邀请码
+ 请输入好友的邀请码
+
+
+
+
+
+ 邀请用户
+ 请确认绑定关系用户信息
+
+
+
+ {{invitationUser.nickname}}
+ {{invitationUser.username}}
+
+
+