From 4fddcba605350f4dd1a8cd8d97f570f2b6920467 Mon Sep 17 00:00:00 2001 From: xpz2018 <107107461@qq.com> Date: Tue, 12 Oct 2021 10:44:58 +0800 Subject: [PATCH] no message --- app.json | 2 +- pages/home/index/index.js | 2 +- pages/html/integral/index.wxss | 62 ------------------- .../pages}/html/integral/index.js | 16 ++--- .../pages}/html/integral/index.json | 1 - .../pages}/html/integral/index.wxml | 1 - submodel/pages/html/integral/index.wxss | 17 +++++ utils/util.js | 4 +- 8 files changed, 26 insertions(+), 79 deletions(-) delete mode 100644 pages/html/integral/index.wxss rename {pages => submodel/pages}/html/integral/index.js (93%) rename {pages => submodel/pages}/html/integral/index.json (93%) rename {pages => submodel/pages}/html/integral/index.wxml (98%) create mode 100644 submodel/pages/html/integral/index.wxss diff --git a/app.json b/app.json index e6d454e..9854880 100644 --- a/app.json +++ b/app.json @@ -38,7 +38,6 @@ "pages/html/banner/index", "pages/html/html/index", "pages/html/notice/index", - "pages/html/integral/index", "pages/ztbvip/index" ], "subpackages": [ @@ -52,6 +51,7 @@ "pages/home/bill/index", "pages/home/bill-detail/index", "pages/html/personal/index", + "pages/html/integral/index", "pages/html/logistics/index", "pages/html/service/index", "pages/html/agreement/index", diff --git a/pages/home/index/index.js b/pages/home/index/index.js index e91be05..a3fcdd4 100644 --- a/pages/home/index/index.js +++ b/pages/home/index/index.js @@ -104,7 +104,7 @@ Component({ } else if (e.currentTarget.id == 'balance') { util.navigateTo('/pages/withdrawal/balance/index') } else if (e.currentTarget.id == 'integral') { - util.navigateTo('/pages/html/integral/index') + util.navigateTo('/submodel/pages/html/integral/index') } else if (e.currentTarget.id == 'article') { util.navigateTo('/pages/article/list/index') } else if (e.currentTarget.id == 'adress') { diff --git a/pages/html/integral/index.wxss b/pages/html/integral/index.wxss deleted file mode 100644 index 62fe7b1..0000000 --- a/pages/html/integral/index.wxss +++ /dev/null @@ -1,62 +0,0 @@ -/* pages/ztbvip/index.wxss */ -page { - background-color: #fff; -} - -.openVip { - padding: 16rpx; - text-align: center; -} - -.openVip21 { - border-radius: 6%; - border: 2rpx solid #DBDBDB; -} - -.openVip22 { - border-radius: 6%; - border: 2rpx solid #d0a45c; - background-color: #fefaf1; -} - -.openVipBtn { - background-color: #f2d48e; - color: white; - font-weight: 300; -} - -.cu-tags { - border-top-left-radius: 24rpx; - border-bottom-right-radius: 24rpx; - background-color: #dd514c; - position: absolute; - top: 0rpx; - left: 16rpx; - font-size: 24rpx; - padding: 10rpx 16rpx; - color: var(--white); -} - -.name { - display: -webkit-box; - overflow: hidden; - text-overflow: ellipsis; - word-wrap: break-word; - white-space: normal !important; - -webkit-line-clamp: 1; - -webkit-box-orient: vertical; -} - -.back-iet { - width: 750rpx; - height: 520rpx; - background-image: url('https://pic.downk.cc/item/5f65a974160a154a678ab604.png'); -} - -.good-bg { - width: 330rpx; - height: 360rpx; - padding: 2rpx; - background: #FFFFFF; - box-shadow: 3px 3px 8px rgba(0, 0, 0, 0.1); -} diff --git a/pages/html/integral/index.js b/submodel/pages/html/integral/index.js similarity index 93% rename from pages/html/integral/index.js rename to submodel/pages/html/integral/index.js index 0717607..8e1ea11 100644 --- a/pages/html/integral/index.js +++ b/submodel/pages/html/integral/index.js @@ -1,14 +1,11 @@ -import { getBaseInfo, getTaskList, getPointList, getPointProduct } from "../../../api/ztb" -const util = require('../../../utils/util') -const events = require('../../../utils/event') -import WxCountUp from '../../../utils/countup' +import { getBaseInfo, getTaskList, getPointList, getPointProduct } from "../../../../api/ztb" +const util = require('../../../../utils/util') +const events = require('../../../../utils/event') +import WxCountUp from '../../../../utils/countup' const app = getApp() Page({ - - /** - * 页面的初始数据 - */ + data: { height: app.globalData.fragmentHeight, userInfo: null, @@ -17,9 +14,6 @@ Page({ pointList: null, toViewId: null }, - /** - * 生命周期函数--监听页面加载 - */ onLoad: function (options) { this.setData({ userInfo: app.globalData.userInfo, height: app.globalData.fragmentHeight }) this.fetchUserInfo() diff --git a/pages/html/integral/index.json b/submodel/pages/html/integral/index.json similarity index 93% rename from pages/html/integral/index.json rename to submodel/pages/html/integral/index.json index 7bf9979..1bd8a4a 100644 --- a/pages/html/integral/index.json +++ b/submodel/pages/html/integral/index.json @@ -1,5 +1,4 @@ { - "component": true, "usingComponents": { "wux-button": "/components/button/index", "wux-image": "/components/image/index", diff --git a/pages/html/integral/index.wxml b/submodel/pages/html/integral/index.wxml similarity index 98% rename from pages/html/integral/index.wxml rename to submodel/pages/html/integral/index.wxml index bc5512f..d1acdcf 100644 --- a/pages/html/integral/index.wxml +++ b/submodel/pages/html/integral/index.wxml @@ -1,4 +1,3 @@ - 积分中心 diff --git a/submodel/pages/html/integral/index.wxss b/submodel/pages/html/integral/index.wxss new file mode 100644 index 0000000..d08cfa4 --- /dev/null +++ b/submodel/pages/html/integral/index.wxss @@ -0,0 +1,17 @@ +page { + background-color: #fff; +} + +.back-iet { + width: 750rpx; + height: 520rpx; + background-image: url('https://pic.downk.cc/item/5f65a974160a154a678ab604.png'); +} + +.good-bg { + width: 330rpx; + height: 360rpx; + padding: 2rpx; + background: #FFFFFF; + box-shadow: 3px 3px 8px rgba(0, 0, 0, 0.1); +} diff --git a/utils/util.js b/utils/util.js index 8e47e7b..f7e06a7 100644 --- a/utils/util.js +++ b/utils/util.js @@ -173,7 +173,7 @@ const tokenList = [ '/pages/home/setting/index', '/submodel/pages/address/list/index', '/pages/article/list/index', - '/pages/html/integral/index', + '/submodel/pages/html/integral/index', '/pages/withdrawal/balance/index', '/pages/agent/order/index', '/pages/home/idcard/index', @@ -236,7 +236,7 @@ function navigateTarget(redirectInfo){ } else if(redirectInfo.targetView == 'personalBillDetail'){ navigateTo('/submodel/pages/home/bill/index') } else if(redirectInfo.targetView == 'myScore'){ - navigateTo('/pages/html/integral/index') + navigateTo('/submodel/pages/html/integral/index') } else if(redirectInfo.targetView == 'myBalance'){ navigateTo('/pages/withdrawal/balance/index') } else if(redirectInfo.targetView == 'myProxyList'){